Use correct types to enable > 2G support, based on a patch from

[qemu] / hw / gumstix.c

diff --git a/hw/gumstix.c b/hw/gumstix.c
index 15562b7..28be8d7 100644 (file)
--- a/hw/gumstix.c
+++ b/hw/gumstix.c
@@ -41,12 +41,13 @@
 
 static const int sector_len = 128 * 1024;
 
-static void connex_init(int ram_size, int vga_ram_size,
+static void connex_init(ram_addr_t ram_size, int vga_ram_size,
                 const char *boot_device, DisplayState *ds,
                 const char *kernel_filename, const char *kernel_cmdline,
                 const char *initrd_filename, const char *cpu_model)
 {
     struct pxa2xx_state_s *cpu;
+    int index;
 
     uint32_t connex_rom = 0x01000000;
     uint32_t connex_ram = 0x04000000;
@@ -59,14 +60,15 @@ static void connex_init(int ram_size, int vga_ram_size,
 
     cpu = pxa255_init(connex_ram, ds);
 
-    if (pflash_table[0] == NULL) {
+    index = drive_get_index(IF_PFLASH, 0, 0);
+    if (index == -1) {
         fprintf(stderr, "A flash image must be given with the "
                 "'pflash' parameter\n");
         exit(1);
     }
 
-    if (!pflash_register(0x00000000, qemu_ram_alloc(connex_rom),
-            pflash_table[0], sector_len, connex_rom / sector_len,
+    if (!pflash_cfi01_register(0x00000000, qemu_ram_alloc(connex_rom),
+            drives_table[index].bdrv, sector_len, connex_rom / sector_len,
             2, 0, 0, 0, 0)) {
         fprintf(stderr, "qemu: Error registering flash memory.\n");
         exit(1);
@@ -79,12 +81,13 @@ static void connex_init(int ram_size, int vga_ram_size,
                     pxa2xx_gpio_in_get(cpu->gpio)[36]);
 }
 
-static void verdex_init(int ram_size, int vga_ram_size,
+static void verdex_init(ram_addr_t ram_size, int vga_ram_size,
                 const char *boot_device, DisplayState *ds,
                 const char *kernel_filename, const char *kernel_cmdline,
                 const char *initrd_filename, const char *cpu_model)
 {
     struct pxa2xx_state_s *cpu;
+    int index;
 
     uint32_t verdex_rom = 0x02000000;
     uint32_t verdex_ram = 0x10000000;
@@ -97,14 +100,15 @@ static void verdex_init(int ram_size, int vga_ram_size,
 
     cpu = pxa270_init(verdex_ram, ds, cpu_model ?: "pxa270-c0");
 
-    if (pflash_table[0] == NULL) {
+    index = drive_get_index(IF_PFLASH, 0, 0);
+    if (index == -1) {
         fprintf(stderr, "A flash image must be given with the "
                 "'pflash' parameter\n");
         exit(1);
     }
 
-    if (!pflash_register(0x00000000, qemu_ram_alloc(verdex_rom),
-            pflash_table[0], sector_len, verdex_rom / sector_len,
+    if (!pflash_cfi01_register(0x00000000, qemu_ram_alloc(verdex_rom),
+            drives_table[index].bdrv, sector_len, verdex_rom / sector_len,
             2, 0, 0, 0, 0)) {
         fprintf(stderr, "qemu: Error registering flash memory.\n");
         exit(1);