diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2009-07-22 16:42:57 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-07-27 14:08:23 -0500 |
| commit | 751c6a17042b5d011013d6963c0505d671cf708e (patch) | |
| tree | 61a769ed1a1c16ebdfc1397ce9d775222dfa8e57 /hw/omap_sx1.c | |
| parent | 8a14daa5a1ae22fcfc317f4727a88d6c15c39aae (diff) | |
kill drives_table
First step cleaning up the drives handling. This one does nothing but
removing drives_table[], still it became seriously big.
drive_get_index() is gone and is replaced by drives_get() which hands
out DriveInfo pointers instead of a table index. This needs adaption in
*tons* of places all over.
The drives are now maintained as linked list.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/omap_sx1.c')
| -rw-r--r-- | hw/omap_sx1.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/hw/omap_sx1.c b/hw/omap_sx1.c index 1ba42f6cd1..22f801b57e 100644 --- a/hw/omap_sx1.c +++ b/hw/omap_sx1.c @@ -127,7 +127,7 @@ static void sx1_init(ram_addr_t ram_size, static uint32_t cs2val = 0x00001139; static uint32_t cs3val = 0x00001139; ram_addr_t phys_flash; - int index; + DriveInfo *dinfo; int fl_idx; uint32_t flash_size = flash0_size; @@ -151,9 +151,9 @@ static void sx1_init(ram_addr_t ram_size, fl_idx = 0; - if ((index = drive_get_index(IF_PFLASH, 0, fl_idx)) > -1) { + if ((dinfo = drive_get(IF_PFLASH, 0, fl_idx)) != NULL) { if (!pflash_cfi01_register(OMAP_CS0_BASE, qemu_ram_alloc(flash_size), - drives_table[index].bdrv, sector_size, flash_size / sector_size, + dinfo->bdrv, sector_size, flash_size / sector_size, 4, 0, 0, 0, 0)) { fprintf(stderr, "qemu: Error registering flash memory %d.\n", fl_idx); @@ -162,7 +162,7 @@ static void sx1_init(ram_addr_t ram_size, } if ((version == 1) && - (index = drive_get_index(IF_PFLASH, 0, fl_idx)) > -1) { + (dinfo = drive_get(IF_PFLASH, 0, fl_idx)) != NULL) { cpu_register_physical_memory(OMAP_CS1_BASE, flash1_size, (phys_flash = qemu_ram_alloc(flash1_size)) | IO_MEM_ROM); @@ -171,7 +171,7 @@ static void sx1_init(ram_addr_t ram_size, OMAP_CS1_SIZE - flash1_size, io); if (!pflash_cfi01_register(OMAP_CS1_BASE, qemu_ram_alloc(flash1_size), - drives_table[index].bdrv, sector_size, flash1_size / sector_size, + dinfo->bdrv, sector_size, flash1_size / sector_size, 4, 0, 0, 0, 0)) { fprintf(stderr, "qemu: Error registering flash memory %d.\n", fl_idx); |