scsi: add channel to addressing

[qemu.git] / hw / gumstix.c

diff --git a/hw/gumstix.c b/hw/gumstix.c
index ee63f634cc9b1b4f7a4e2c69843c1bca54b38fbc..686a5ed86d74e69bfb50f069fa5c6759a1792ecb 100644 (file)
--- a/hw/gumstix.c
+++ b/hw/gumstix.c
@@ -35,10 +35,10 @@
 #include "pxa.h"
 #include "net.h"
 #include "flash.h"
 #include "pxa.h"
 #include "net.h"
 #include "flash.h"

-#include "sysemu.h"

 #include "devices.h"
 #include "boards.h"
 #include "blockdev.h"
 #include "devices.h"
 #include "boards.h"
 #include "blockdev.h"

+#include "exec-memory.h"

 
 static const int sector_len = 128 * 1024;
 
 
 static const int sector_len = 128 * 1024;
 


@@ -50,11 +50,12 @@ static void connex_init(ram_addr_t ram_size,
     PXA2xxState *cpu;
     DriveInfo *dinfo;
     int be;
     PXA2xxState *cpu;
     DriveInfo *dinfo;
     int be;

+    MemoryRegion *address_space_mem = get_system_memory();

 
     uint32_t connex_rom = 0x01000000;
     uint32_t connex_ram = 0x04000000;
 
 
     uint32_t connex_rom = 0x01000000;
     uint32_t connex_ram = 0x04000000;
 

-    cpu = pxa255_init(connex_ram);
+    cpu = pxa255_init(address_space_mem, connex_ram);

 
     dinfo = drive_get(IF_PFLASH, 0, 0);
     if (!dinfo) {
 
     dinfo = drive_get(IF_PFLASH, 0, 0);
     if (!dinfo) {


@@ -68,8 +69,7 @@ static void connex_init(ram_addr_t ram_size,
 #else
     be = 0;
 #endif
 #else
     be = 0;
 #endif

-    if (!pflash_cfi01_register(0x00000000, qemu_ram_alloc(NULL, "connext.rom",
-                                                          connex_rom),
+    if (!pflash_cfi01_register(0x00000000, NULL, "connext.rom", connex_rom,

                                dinfo->bdrv, sector_len, connex_rom / sector_len,
                                2, 0, 0, 0, 0, be)) {
         fprintf(stderr, "qemu: Error registering flash memory.\n");
                                dinfo->bdrv, sector_len, connex_rom / sector_len,
                                2, 0, 0, 0, 0, be)) {
         fprintf(stderr, "qemu: Error registering flash memory.\n");


@@ -89,11 +89,12 @@ static void verdex_init(ram_addr_t ram_size,
     PXA2xxState *cpu;
     DriveInfo *dinfo;
     int be;
     PXA2xxState *cpu;
     DriveInfo *dinfo;
     int be;

+    MemoryRegion *address_space_mem = get_system_memory();

 
     uint32_t verdex_rom = 0x02000000;
     uint32_t verdex_ram = 0x10000000;
 
 
     uint32_t verdex_rom = 0x02000000;
     uint32_t verdex_ram = 0x10000000;
 

-    cpu = pxa270_init(verdex_ram, cpu_model ?: "pxa270-c0");
+    cpu = pxa270_init(address_space_mem, verdex_ram, cpu_model ?: "pxa270-c0");

 
     dinfo = drive_get(IF_PFLASH, 0, 0);
     if (!dinfo) {
 
     dinfo = drive_get(IF_PFLASH, 0, 0);
     if (!dinfo) {


@@ -107,8 +108,7 @@ static void verdex_init(ram_addr_t ram_size,
 #else
     be = 0;
 #endif
 #else
     be = 0;
 #endif

-    if (!pflash_cfi01_register(0x00000000, qemu_ram_alloc(NULL, "verdex.rom",
-                                                          verdex_rom),
+    if (!pflash_cfi01_register(0x00000000, NULL, "verdex.rom", verdex_rom,

                                dinfo->bdrv, sector_len, verdex_rom / sector_len,
                                2, 0, 0, 0, 0, be)) {
         fprintf(stderr, "qemu: Error registering flash memory.\n");
                                dinfo->bdrv, sector_len, verdex_rom / sector_len,
                                2, 0, 0, 0, 0, be)) {
         fprintf(stderr, "qemu: Error registering flash memory.\n");