Install keymaps from new location

[qemu] / hw / versatilepb.c

diff --git a/hw/versatilepb.c b/hw/versatilepb.c
index f1c529c..03cf4d8 100644 (file)
--- a/hw/versatilepb.c
+++ b/hw/versatilepb.c
@@ -20,6 +20,7 @@
 
 typedef struct vpb_sic_state
 {
+  SysBusDevice busdev;
   uint32_t level;
   uint32_t mask;
   uint32_t pic_enable;
@@ -128,24 +129,21 @@ static CPUWriteMemoryFunc *vpb_sic_writefn[] = {
    vpb_sic_write
 };
 
-static qemu_irq *vpb_sic_init(uint32_t base, qemu_irq *parent, int irq)
+static void vpb_sic_init(SysBusDevice *dev)
 {
-    vpb_sic_state *s;
-    qemu_irq *qi;
+    vpb_sic_state *s = FROM_SYSBUS(vpb_sic_state, dev);
     int iomemtype;
     int i;
 
-    s = (vpb_sic_state *)qemu_mallocz(sizeof(vpb_sic_state));
-    qi = qemu_allocate_irqs(vpb_sic_set_irq, s, 32);
+    qdev_init_gpio_in(&dev->qdev, vpb_sic_set_irq, 32);
     for (i = 0; i < 32; i++) {
-        s->parent[i] = parent[i];
+        sysbus_init_irq(dev, &s->parent[i]);
     }
-    s->irq = irq;
+    s->irq = 31;
     iomemtype = cpu_register_io_memory(0, vpb_sic_readfn,
                                        vpb_sic_writefn, s);
-    cpu_register_physical_memory(base, 0x00001000, iomemtype);
+    sysbus_init_mmio(dev, 0x1000, iomemtype);
     /* ??? Save/restore.  */
-    return qi;
 }
 
 /* Board init.  */
@@ -166,7 +164,7 @@ static void versatile_init(ram_addr_t ram_size,
     ram_addr_t ram_offset;
     qemu_irq *cpu_pic;
     qemu_irq pic[32];
-    qemu_irq *sic;
+    qemu_irq sic[32];
     DeviceState *dev;
     PCIBus *pci_bus;
     NICInfo *nd;
@@ -190,14 +188,21 @@ static void versatile_init(ram_addr_t ram_size,
     dev = sysbus_create_varargs("pl190", 0x10140000,
                                 cpu_pic[0], cpu_pic[1], NULL);
     for (n = 0; n < 32; n++) {
-        pic[n] = qdev_get_irq_sink(dev, n);
+        pic[n] = qdev_get_gpio_in(dev, n);
+    }
+    dev = sysbus_create_simple("versatilepb_sic", 0x10003000, NULL);
+    for (n = 0; n < 32; n++) {
+        sysbus_connect_irq(sysbus_from_qdev(dev), n, pic[n]);
+        sic[n] = qdev_get_gpio_in(dev, n);
     }
-    sic = vpb_sic_init(0x10003000, pic, 31);
 
     sysbus_create_simple("pl050_keyboard", 0x10006000, sic[3]);
     sysbus_create_simple("pl050_mouse", 0x10007000, sic[4]);
 
-    pci_bus = pci_vpb_init(sic + 27, 0);
+    dev = sysbus_create_varargs("versatile_pci", 0x40000000,
+                                sic[27], sic[28], sic[29], sic[30], NULL);
+    pci_bus = (PCIBus *)qdev_get_child_bus(dev, "pci");
+
     /* The Versatile PCI bridge does not provide access to PCI IO space,
        so many of the qemu PCI devices are not useable.  */
     for(n = 0; n < nb_nics; n++) {
@@ -224,7 +229,7 @@ static void versatile_init(ram_addr_t ram_size,
     sysbus_create_simple("pl011", 0x101f3000, pic[14]);
     sysbus_create_simple("pl011", 0x10009000, sic[6]);
 
-    pl080_init(0x10130000, pic[17], 8);
+    sysbus_create_simple("pl080", 0x10130000, pic[17]);
     sysbus_create_simple("sp804", 0x101e2000, pic[4]);
     sysbus_create_simple("sp804", 0x101e3000, pic[5]);
 
@@ -304,16 +309,32 @@ static void vab_init(ram_addr_t ram_size,
                    initrd_filename, cpu_model, 0x25e);
 }
 
-QEMUMachine versatilepb_machine = {
+static QEMUMachine versatilepb_machine = {
     .name = "versatilepb",
     .desc = "ARM Versatile/PB (ARM926EJ-S)",
     .init = vpb_init,
     .use_scsi = 1,
 };
 
-QEMUMachine versatileab_machine = {
+static QEMUMachine versatileab_machine = {
     .name = "versatileab",
     .desc = "ARM Versatile/AB (ARM926EJ-S)",
     .init = vab_init,
     .use_scsi = 1,
 };
+
+static void versatile_machine_init(void)
+{
+    qemu_register_machine(&versatilepb_machine);
+    qemu_register_machine(&versatileab_machine);
+}
+
+machine_init(versatile_machine_init);
+
+static void versatilepb_register_devices(void)
+{
+    sysbus_register_dev("versatilepb_sic", sizeof(vpb_sic_state),
+                        vpb_sic_init);
+}
+
+device_init(versatilepb_register_devices)