[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [COMMIT 82634c2] ARM RealView sytem controller qdev conve
From: |
Anthony Liguori |
Subject: |
[Qemu-commits] [COMMIT 82634c2] ARM RealView sytem controller qdev conversion |
Date: |
Thu, 14 May 2009 21:41:30 -0000 |
From: Paul Brook <address@hidden>
Signed-off-by: Paul Brook <address@hidden>
diff --git a/hw/arm_sysctl.c b/hw/arm_sysctl.c
index 62222a1..1ddb4a2 100644
--- a/hw/arm_sysctl.c
+++ b/hw/arm_sysctl.c
@@ -7,13 +7,14 @@
* This code is licenced under the GPL.
*/
-#include "hw.h"
+#include "sysbus.h"
#include "primecell.h"
#include "sysemu.h"
#define LOCK_VALUE 0xa05f
typedef struct {
+ SysBusDevice busdev;
uint32_t sys_id;
uint32_t leds;
uint16_t lockval;
@@ -188,18 +189,36 @@ static CPUWriteMemoryFunc *arm_sysctl_writefn[] = {
arm_sysctl_write
};
-void arm_sysctl_init(uint32_t base, uint32_t sys_id)
+static void arm_sysctl_init1(SysBusDevice *dev)
{
- arm_sysctl_state *s;
+ arm_sysctl_state *s = FROM_SYSBUS(arm_sysctl_state, dev);
int iomemtype;
- s = (arm_sysctl_state *)qemu_mallocz(sizeof(arm_sysctl_state));
- s->sys_id = sys_id;
+ s->sys_id = qdev_get_prop_int(&dev->qdev, "sys_id", 0);
/* The MPcore bootloader uses these flags to start secondary CPUs.
We don't use a bootloader, so do this here. */
s->flags = 3;
iomemtype = cpu_register_io_memory(0, arm_sysctl_readfn,
arm_sysctl_writefn, s);
- cpu_register_physical_memory(base, 0x00001000, iomemtype);
+ sysbus_init_mmio(dev, 0x1000, iomemtype);
/* ??? Save/restore. */
}
+
+/* Legacy helper function. */
+void arm_sysctl_init(uint32_t base, uint32_t sys_id)
+{
+ DeviceState *dev;
+
+ dev = qdev_create(NULL, "realview_sysctl");
+ qdev_set_prop_int(dev, "sys_id", sys_id);
+ qdev_init(dev);
+ sysbus_mmio_map(sysbus_from_qdev(dev), 0, base);
+}
+
+static void arm_sysctl_register_devices(void)
+{
+ sysbus_register_dev("realview_sysctl", sizeof(arm_sysctl_state),
+ arm_sysctl_init1);
+}
+
+device_init(arm_sysctl_register_devices)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-commits] [COMMIT 82634c2] ARM RealView sytem controller qdev conversion,
Anthony Liguori <=