Merge remote-tracking branch 'kraxel/usb.29' into staging

[qemu.git] / hw / sun4m.c

diff --git a/hw/sun4m.c b/hw/sun4m.c
index dcaed3877379438761884e1145c5e3cb43d82645..314edc4d87357e6018353a9e72ea46cb818b43c5 100644 (file)
--- a/hw/sun4m.c
+++ b/hw/sun4m.c
@@ -216,13 +216,13 @@ static void nvram_init(M48t59State *nvram, uint8_t *macaddr,
 
 static DeviceState *slavio_intctl;
 
 
 static DeviceState *slavio_intctl;
 

-void pic_info(Monitor *mon)
+void sun4m_pic_info(Monitor *mon)

 {
     if (slavio_intctl)
         slavio_pic_info(mon, slavio_intctl);
 }
 
 {
     if (slavio_intctl)
         slavio_pic_info(mon, slavio_intctl);
 }
 

-void irq_info(Monitor *mon)
+void sun4m_irq_info(Monitor *mon)

 {
     if (slavio_intctl)
         slavio_irq_info(mon, slavio_intctl);
 {
     if (slavio_intctl)
         slavio_irq_info(mon, slavio_intctl);


@@ -593,19 +593,25 @@ static void idreg_init(target_phys_addr_t addr)
     cpu_physical_memory_write_rom(addr, idreg_data, sizeof(idreg_data));
 }
 
     cpu_physical_memory_write_rom(addr, idreg_data, sizeof(idreg_data));
 }
 

+typedef struct IDRegState {
+    SysBusDevice busdev;
+    MemoryRegion mem;
+} IDRegState;
+

 static int idreg_init1(SysBusDevice *dev)
 {
 static int idreg_init1(SysBusDevice *dev)
 {

-    ram_addr_t idreg_offset;
+    IDRegState *s = FROM_SYSBUS(IDRegState, dev);

 
 

-    idreg_offset = qemu_ram_alloc(NULL, "sun4m.idreg", sizeof(idreg_data));
-    sysbus_init_mmio(dev, sizeof(idreg_data), idreg_offset | IO_MEM_ROM);
+    memory_region_init_ram(&s->mem, NULL, "sun4m.idreg", sizeof(idreg_data));
+    memory_region_set_readonly(&s->mem, true);
+    sysbus_init_mmio_region(dev, &s->mem);

     return 0;
 }
 
 static SysBusDeviceInfo idreg_info = {
     .init = idreg_init1,
     .qdev.name  = "macio_idreg",
     return 0;
 }
 
 static SysBusDeviceInfo idreg_info = {
     .init = idreg_init1,
     .qdev.name  = "macio_idreg",

-    .qdev.size  = sizeof(SysBusDevice),
+    .qdev.size  = sizeof(IDRegState),

 };
 
 static void idreg_register_devices(void)
 };
 
 static void idreg_register_devices(void)


@@ -615,6 +621,11 @@ static void idreg_register_devices(void)
 
 device_init(idreg_register_devices);
 
 
 device_init(idreg_register_devices);
 

+typedef struct AFXState {
+    SysBusDevice busdev;
+    MemoryRegion mem;
+} AFXState;
+

 /* SS-5 TCX AFX register */
 static void afx_init(target_phys_addr_t addr)
 {
 /* SS-5 TCX AFX register */
 static void afx_init(target_phys_addr_t addr)
 {


@@ -630,17 +641,17 @@ static void afx_init(target_phys_addr_t addr)
 
 static int afx_init1(SysBusDevice *dev)
 {
 
 static int afx_init1(SysBusDevice *dev)
 {

-    ram_addr_t afx_offset;
+    AFXState *s = FROM_SYSBUS(AFXState, dev);

 
 

-    afx_offset = qemu_ram_alloc(NULL, "sun4m.afx", 4);
-    sysbus_init_mmio(dev, 4, afx_offset | IO_MEM_RAM);
+    memory_region_init_ram(&s->mem, NULL, "sun4m.afx", 4);
+    sysbus_init_mmio_region(dev, &s->mem);

     return 0;
 }
 
 static SysBusDeviceInfo afx_info = {
     .init = afx_init1,
     .qdev.name  = "tcx_afx",
     return 0;
 }
 
 static SysBusDeviceInfo afx_info = {
     .init = afx_init1,
     .qdev.name  = "tcx_afx",

-    .qdev.size  = sizeof(SysBusDevice),
+    .qdev.size  = sizeof(AFXState),

 };
 
 static void afx_register_devices(void)
 };
 
 static void afx_register_devices(void)


@@ -650,6 +661,11 @@ static void afx_register_devices(void)
 
 device_init(afx_register_devices);
 
 
 device_init(afx_register_devices);
 

+typedef struct PROMState {
+    SysBusDevice busdev;
+    MemoryRegion prom;
+} PROMState;
+

 /* Boot PROM (OpenBIOS) */
 static uint64_t translate_prom_address(void *opaque, uint64_t addr)
 {
 /* Boot PROM (OpenBIOS) */
 static uint64_t translate_prom_address(void *opaque, uint64_t addr)
 {


@@ -693,17 +709,18 @@ static void prom_init(target_phys_addr_t addr, const char *bios_name)
 
 static int prom_init1(SysBusDevice *dev)
 {
 
 static int prom_init1(SysBusDevice *dev)
 {

-    ram_addr_t prom_offset;
+    PROMState *s = FROM_SYSBUS(PROMState, dev);

 
 

-    prom_offset = qemu_ram_alloc(NULL, "sun4m.prom", PROM_SIZE_MAX);
-    sysbus_init_mmio(dev, PROM_SIZE_MAX, prom_offset | IO_MEM_ROM);
+    memory_region_init_ram(&s->prom, NULL, "sun4m.prom", PROM_SIZE_MAX);
+    memory_region_set_readonly(&s->prom, true);
+    sysbus_init_mmio_region(dev, &s->prom);

     return 0;
 }
 
 static SysBusDeviceInfo prom_info = {
     .init = prom_init1,
     .qdev.name  = "openprom",
     return 0;
 }
 
 static SysBusDeviceInfo prom_info = {
     .init = prom_init1,
     .qdev.name  = "openprom",

-    .qdev.size  = sizeof(SysBusDevice),
+    .qdev.size  = sizeof(PROMState),

     .qdev.props = (Property[]) {
         {/* end of property list */}
     }
     .qdev.props = (Property[]) {
         {/* end of property list */}
     }


@@ -719,19 +736,17 @@ device_init(prom_register_devices);
 typedef struct RamDevice
 {
     SysBusDevice busdev;
 typedef struct RamDevice
 {
     SysBusDevice busdev;

+    MemoryRegion ram;

     uint64_t size;
 } RamDevice;
 
 /* System RAM */
 static int ram_init1(SysBusDevice *dev)
 {
     uint64_t size;
 } RamDevice;
 
 /* System RAM */
 static int ram_init1(SysBusDevice *dev)
 {

-    ram_addr_t RAM_size, ram_offset;

     RamDevice *d = FROM_SYSBUS(RamDevice, dev);
 
     RamDevice *d = FROM_SYSBUS(RamDevice, dev);
 

-    RAM_size = d->size;
-
-    ram_offset = qemu_ram_alloc(NULL, "sun4m.ram", RAM_size);
-    sysbus_init_mmio(dev, RAM_size, ram_offset);
+    memory_region_init_ram(&d->ram, NULL, "sun4m.ram", d->size);
+    sysbus_init_mmio_region(dev, &d->ram);

     return 0;
 }
 
     return 0;
 }