qdev-properties.c: Separate core from the code used only by qemu-system-*

[qemu.git] / hw / empty_slot.c

diff --git a/hw/empty_slot.c b/hw/empty_slot.c
index da8adc4d03e2361680165f2ba281bcdee7fb3f08..23978eb1495471629606bab171fe4d59de8a7b95 100644 (file)
--- a/hw/empty_slot.c
+++ b/hw/empty_slot.c
@@ -24,34 +24,30 @@
 
 typedef struct EmptySlot {
     SysBusDevice busdev;
+    MemoryRegion iomem;
     uint64_t size;
 } EmptySlot;
 
-static uint32_t empty_slot_readl(void *opaque, target_phys_addr_t addr)
+static uint64_t empty_slot_read(void *opaque, hwaddr addr,
+                                unsigned size)
 {
     DPRINTF("read from " TARGET_FMT_plx "\n", addr);
     return 0;
 }
 
-static void empty_slot_writel(void *opaque, target_phys_addr_t addr,
-                              uint32_t val)
+static void empty_slot_write(void *opaque, hwaddr addr,
+                             uint64_t val, unsigned size)
 {
-    DPRINTF("write 0x%x to " TARGET_FMT_plx "\n", val, addr);
+    DPRINTF("write 0x%x to " TARGET_FMT_plx "\n", (unsigned)val, addr);
 }
 
-CPUReadMemoryFunc * const empty_slot_read[3] = {
-    empty_slot_readl,
-    empty_slot_readl,
-    empty_slot_readl,
+static const MemoryRegionOps empty_slot_ops = {
+    .read = empty_slot_read,
+    .write = empty_slot_write,
+    .endianness = DEVICE_NATIVE_ENDIAN,
 };
 
-static CPUWriteMemoryFunc * const empty_slot_write[3] = {
-    empty_slot_writel,
-    empty_slot_writel,
-    empty_slot_writel,
-};
-
-void empty_slot_init(target_phys_addr_t addr, uint64_t slot_size)
+void empty_slot_init(hwaddr addr, uint64_t slot_size)
 {
     if (slot_size > 0) {
         /* Only empty slots larger than 0 byte need handling. */
@@ -73,24 +69,30 @@ void empty_slot_init(target_phys_addr_t addr, uint64_t slot_size)
 static int empty_slot_init1(SysBusDevice *dev)
 {
     EmptySlot *s = FROM_SYSBUS(EmptySlot, dev);
-    ram_addr_t empty_slot_offset;
 
-    empty_slot_offset = cpu_register_io_memory(empty_slot_read,
-                                               empty_slot_write, s,
-                                               DEVICE_NATIVE_ENDIAN);
-    sysbus_init_mmio(dev, s->size, empty_slot_offset | IO_MEM_RAM);
+    memory_region_init_io(&s->iomem, &empty_slot_ops, s,
+                          "empty-slot", s->size);
+    sysbus_init_mmio(dev, &s->iomem);
     return 0;
 }
 
-static SysBusDeviceInfo empty_slot_info = {
-    .init = empty_slot_init1,
-    .qdev.name  = "empty_slot",
-    .qdev.size  = sizeof(EmptySlot),
+static void empty_slot_class_init(ObjectClass *klass, void *data)
+{
+    SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
+
+    k->init = empty_slot_init1;
+}
+
+static TypeInfo empty_slot_info = {
+    .name          = "empty_slot",
+    .parent        = TYPE_SYS_BUS_DEVICE,
+    .instance_size = sizeof(EmptySlot),
+    .class_init    = empty_slot_class_init,
 };
 
-static void empty_slot_register_devices(void)
+static void empty_slot_register_types(void)
 {
-    sysbus_register_withprop(&empty_slot_info);
+    type_register_static(&empty_slot_info);
 }
 
-device_init(empty_slot_register_devices);
+type_init(empty_slot_register_types)