uhci: Use only one queue for ctrl endpoints

[qemu.git] / hw / nand.c

diff --git a/hw/nand.c b/hw/nand.c
index c27783e8ac360fc5ef6153fde38d0758b8a6c666..01f3adaee11d18444ff46512aa19430f600503f4 100644 (file)
--- a/hw/nand.c
+++ b/hw/nand.c
@@ -11,6 +11,9 @@
  * from ST Microelectronics.
  *
  * This code is licensed under the GNU GPL v2.
  * from ST Microelectronics.
  *
  * This code is licensed under the GNU GPL v2.

+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.

  */
 
 #ifndef NAND_IO
  */
 
 #ifndef NAND_IO


@@ -19,6 +22,7 @@
 # include "flash.h"
 # include "blockdev.h"
 # include "sysbus.h"
 # include "flash.h"
 # include "blockdev.h"
 # include "sysbus.h"

+#include "qemu-error.h"

 
 # define NAND_CMD_READ0                0x00
 # define NAND_CMD_READ1                0x01
 
 # define NAND_CMD_READ0                0x00
 # define NAND_CMD_READ1                0x01


@@ -384,18 +388,23 @@ static int nand_device_init(SysBusDevice *dev)
         nand_init_2048(s);
         break;
     default:
         nand_init_2048(s);
         break;
     default:

-        hw_error("%s: Unsupported NAND block size.\n", __func__);
+        error_report("Unsupported NAND block size");
+        return -1;

     }
 
     pagesize = 1 << s->oob_shift;
     s->mem_oob = 1;
     }
 
     pagesize = 1 << s->oob_shift;
     s->mem_oob = 1;

-    if (s->bdrv && bdrv_getlength(s->bdrv) >=
-            (s->pages << s->page_shift) + (s->pages << s->oob_shift)) {
-        pagesize = 0;
-        s->mem_oob = 0;
-    }
-
-    if (!s->bdrv) {
+    if (s->bdrv) {
+        if (bdrv_is_read_only(s->bdrv)) {
+            error_report("Can't use a read-only drive");
+            return -1;
+        }
+        if (bdrv_getlength(s->bdrv) >=
+                (s->pages << s->page_shift) + (s->pages << s->oob_shift)) {
+            pagesize = 0;
+            s->mem_oob = 0;
+        }
+    } else {

         pagesize += 1 << s->page_shift;
     }
     if (pagesize) {
         pagesize += 1 << s->page_shift;
     }
     if (pagesize) {


@@ -408,23 +417,34 @@ static int nand_device_init(SysBusDevice *dev)
     return 0;
 }
 
     return 0;
 }
 

-static SysBusDeviceInfo nand_info = {
-    .init = nand_device_init,
-    .qdev.name = "nand",
-    .qdev.size = sizeof(NANDFlashState),
-    .qdev.reset = nand_reset,
-    .qdev.vmsd = &vmstate_nand,
-    .qdev.props = (Property[]) {
-        DEFINE_PROP_UINT8("manufacturer_id", NANDFlashState, manf_id, 0),
-        DEFINE_PROP_UINT8("chip_id", NANDFlashState, chip_id, 0),
-        DEFINE_PROP_DRIVE("drive", NANDFlashState, bdrv),
-        DEFINE_PROP_END_OF_LIST()
-    }
+static Property nand_properties[] = {
+    DEFINE_PROP_UINT8("manufacturer_id", NANDFlashState, manf_id, 0),
+    DEFINE_PROP_UINT8("chip_id", NANDFlashState, chip_id, 0),
+    DEFINE_PROP_DRIVE("drive", NANDFlashState, bdrv),
+    DEFINE_PROP_END_OF_LIST(),

 };
 
 };
 

-static void nand_create_device(void)
+static void nand_class_init(ObjectClass *klass, void *data)

 {
 {

-    sysbus_register_withprop(&nand_info);
+    DeviceClass *dc = DEVICE_CLASS(klass);
+    SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
+
+    k->init = nand_device_init;
+    dc->reset = nand_reset;
+    dc->vmsd = &vmstate_nand;
+    dc->props = nand_properties;
+}
+
+static TypeInfo nand_info = {
+    .name          = "nand",
+    .parent        = TYPE_SYS_BUS_DEVICE,
+    .instance_size = sizeof(NANDFlashState),
+    .class_init    = nand_class_init,
+};
+
+static void nand_register_types(void)
+{
+    type_register_static(&nand_info);

 }
 
 /*
 }
 
 /*


@@ -615,7 +635,7 @@ DeviceState *nand_init(BlockDriverState *bdrv, int manf_id, int chip_id)
     return dev;
 }
 
     return dev;
 }
 

-device_init(nand_create_device)
+type_init(nand_register_types)

 
 #else
 
 
 #else
 


@@ -634,7 +654,7 @@ static void glue(nand_blk_write_, PAGE_SIZE)(NANDFlashState *s)
         sector = SECTOR(s->addr);
         off = (s->addr & PAGE_MASK) + s->offset;
         soff = SECTOR_OFFSET(s->addr);
         sector = SECTOR(s->addr);
         off = (s->addr & PAGE_MASK) + s->offset;
         soff = SECTOR_OFFSET(s->addr);

-        if (bdrv_read(s->bdrv, sector, iobuf, PAGE_SECTORS) == -1) {
+        if (bdrv_read(s->bdrv, sector, iobuf, PAGE_SECTORS) < 0) {

             printf("%s: read error in sector %" PRIu64 "\n", __func__, sector);
             return;
         }
             printf("%s: read error in sector %" PRIu64 "\n", __func__, sector);
             return;
         }


@@ -646,21 +666,23 @@ static void glue(nand_blk_write_, PAGE_SIZE)(NANDFlashState *s)
                             MIN(OOB_SIZE, off + s->iolen - PAGE_SIZE));
         }
 
                             MIN(OOB_SIZE, off + s->iolen - PAGE_SIZE));
         }
 

-        if (bdrv_write(s->bdrv, sector, iobuf, PAGE_SECTORS) == -1)
+        if (bdrv_write(s->bdrv, sector, iobuf, PAGE_SECTORS) < 0) {

             printf("%s: write error in sector %" PRIu64 "\n", __func__, sector);
             printf("%s: write error in sector %" PRIu64 "\n", __func__, sector);

+        }

     } else {
         off = PAGE_START(s->addr) + (s->addr & PAGE_MASK) + s->offset;
         sector = off >> 9;
         soff = off & 0x1ff;
     } else {
         off = PAGE_START(s->addr) + (s->addr & PAGE_MASK) + s->offset;
         sector = off >> 9;
         soff = off & 0x1ff;

-        if (bdrv_read(s->bdrv, sector, iobuf, PAGE_SECTORS + 2) == -1) {
+        if (bdrv_read(s->bdrv, sector, iobuf, PAGE_SECTORS + 2) < 0) {

             printf("%s: read error in sector %" PRIu64 "\n", __func__, sector);
             return;
         }
 
         mem_and(iobuf + soff, s->io, s->iolen);
 
             printf("%s: read error in sector %" PRIu64 "\n", __func__, sector);
             return;
         }
 
         mem_and(iobuf + soff, s->io, s->iolen);
 

-        if (bdrv_write(s->bdrv, sector, iobuf, PAGE_SECTORS + 2) == -1)
+        if (bdrv_write(s->bdrv, sector, iobuf, PAGE_SECTORS + 2) < 0) {

             printf("%s: write error in sector %" PRIu64 "\n", __func__, sector);
             printf("%s: write error in sector %" PRIu64 "\n", __func__, sector);

+        }

     }
     s->offset = 0;
 }
     }
     s->offset = 0;
 }


@@ -684,31 +706,37 @@ static void glue(nand_blk_erase_, PAGE_SIZE)(NANDFlashState *s)
         i = SECTOR(addr);
         page = SECTOR(addr + (ADDR_SHIFT + s->erase_shift));
         for (; i < page; i ++)
         i = SECTOR(addr);
         page = SECTOR(addr + (ADDR_SHIFT + s->erase_shift));
         for (; i < page; i ++)

-            if (bdrv_write(s->bdrv, i, iobuf, 1) == -1)
+            if (bdrv_write(s->bdrv, i, iobuf, 1) < 0) {

                 printf("%s: write error in sector %" PRIu64 "\n", __func__, i);
                 printf("%s: write error in sector %" PRIu64 "\n", __func__, i);

+            }

     } else {
         addr = PAGE_START(addr);
         page = addr >> 9;
     } else {
         addr = PAGE_START(addr);
         page = addr >> 9;

-        if (bdrv_read(s->bdrv, page, iobuf, 1) == -1)
+        if (bdrv_read(s->bdrv, page, iobuf, 1) < 0) {

             printf("%s: read error in sector %" PRIu64 "\n", __func__, page);
             printf("%s: read error in sector %" PRIu64 "\n", __func__, page);

+        }

         memset(iobuf + (addr & 0x1ff), 0xff, (~addr & 0x1ff) + 1);
         memset(iobuf + (addr & 0x1ff), 0xff, (~addr & 0x1ff) + 1);

-        if (bdrv_write(s->bdrv, page, iobuf, 1) == -1)
+        if (bdrv_write(s->bdrv, page, iobuf, 1) < 0) {

             printf("%s: write error in sector %" PRIu64 "\n", __func__, page);
             printf("%s: write error in sector %" PRIu64 "\n", __func__, page);

+        }

 
         memset(iobuf, 0xff, 0x200);
         i = (addr & ~0x1ff) + 0x200;
         for (addr += ((PAGE_SIZE + OOB_SIZE) << s->erase_shift) - 0x200;
                         i < addr; i += 0x200)
 
         memset(iobuf, 0xff, 0x200);
         i = (addr & ~0x1ff) + 0x200;
         for (addr += ((PAGE_SIZE + OOB_SIZE) << s->erase_shift) - 0x200;
                         i < addr; i += 0x200)

-            if (bdrv_write(s->bdrv, i >> 9, iobuf, 1) == -1)
+            if (bdrv_write(s->bdrv, i >> 9, iobuf, 1) < 0) {

                 printf("%s: write error in sector %" PRIu64 "\n",
                        __func__, i >> 9);
                 printf("%s: write error in sector %" PRIu64 "\n",
                        __func__, i >> 9);

+            }

 
         page = i >> 9;
 
         page = i >> 9;

-        if (bdrv_read(s->bdrv, page, iobuf, 1) == -1)
+        if (bdrv_read(s->bdrv, page, iobuf, 1) < 0) {

             printf("%s: read error in sector %" PRIu64 "\n", __func__, page);
             printf("%s: read error in sector %" PRIu64 "\n", __func__, page);

+        }

         memset(iobuf, 0xff, ((addr - 1) & 0x1ff) + 1);
         memset(iobuf, 0xff, ((addr - 1) & 0x1ff) + 1);

-        if (bdrv_write(s->bdrv, page, iobuf, 1) == -1)
+        if (bdrv_write(s->bdrv, page, iobuf, 1) < 0) {

             printf("%s: write error in sector %" PRIu64 "\n", __func__, page);
             printf("%s: write error in sector %" PRIu64 "\n", __func__, page);

+        }

     }
 }
 
     }
 }
 


@@ -720,18 +748,20 @@ static void glue(nand_blk_load_, PAGE_SIZE)(NANDFlashState *s,
 
     if (s->bdrv) {
         if (s->mem_oob) {
 
     if (s->bdrv) {
         if (s->mem_oob) {

-            if (bdrv_read(s->bdrv, SECTOR(addr), s->io, PAGE_SECTORS) == -1)
+            if (bdrv_read(s->bdrv, SECTOR(addr), s->io, PAGE_SECTORS) < 0) {

                 printf("%s: read error in sector %" PRIu64 "\n",
                                 __func__, SECTOR(addr));
                 printf("%s: read error in sector %" PRIu64 "\n",
                                 __func__, SECTOR(addr));

+            }

             memcpy(s->io + SECTOR_OFFSET(s->addr) + PAGE_SIZE,
                             s->storage + (PAGE(s->addr) << OOB_SHIFT),
                             OOB_SIZE);
             s->ioaddr = s->io + SECTOR_OFFSET(s->addr) + offset;
         } else {
             if (bdrv_read(s->bdrv, PAGE_START(addr) >> 9,
             memcpy(s->io + SECTOR_OFFSET(s->addr) + PAGE_SIZE,
                             s->storage + (PAGE(s->addr) << OOB_SHIFT),
                             OOB_SIZE);
             s->ioaddr = s->io + SECTOR_OFFSET(s->addr) + offset;
         } else {
             if (bdrv_read(s->bdrv, PAGE_START(addr) >> 9,

-                                    s->io, (PAGE_SECTORS + 2)) == -1)
+                                    s->io, (PAGE_SECTORS + 2)) < 0) {

                 printf("%s: read error in sector %" PRIu64 "\n",
                                 __func__, PAGE_START(addr) >> 9);
                 printf("%s: read error in sector %" PRIu64 "\n",
                                 __func__, PAGE_START(addr) >> 9);

+            }

             s->ioaddr = s->io + (PAGE_START(addr) & 0x1ff) + offset;
         }
     } else {
             s->ioaddr = s->io + (PAGE_START(addr) & 0x1ff) + offset;
         }
     } else {