From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38121) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YVhTK-00050g-5A for qemu-devel@nongnu.org; Wed, 11 Mar 2015 10:18:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YVhTJ-0002hw-5n for qemu-devel@nongnu.org; Wed, 11 Mar 2015 10:18:54 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:55225) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YVhTI-0002gl-PC for qemu-devel@nongnu.org; Wed, 11 Mar 2015 10:18:53 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1YVhTG-0001zX-L3 for qemu-devel@nongnu.org; Wed, 11 Mar 2015 14:18:50 +0000 From: Peter Maydell Date: Wed, 11 Mar 2015 14:18:48 +0000 Message-Id: <1426083530-7591-9-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1426083530-7591-1-git-send-email-peter.maydell@linaro.org> References: <1426083530-7591-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PULL 08/10] integrator/cp: Model CP control registers as sysbus device List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org From: Jan Kiszka No new features yet, just encapsulation. Signed-off-by: Jan Kiszka Message-id: 3829c7c7e01cd3ccf15a1198f114e4d675974ae0.1426004843.git.jan.kiszka@siemens.com Reviewed-by: Peter Crosthwaite Signed-off-by: Peter Maydell --- hw/arm/integratorcp.c | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c index 949ae1e..0dbda3a 100644 --- a/hw/arm/integratorcp.c +++ b/hw/arm/integratorcp.c @@ -406,6 +406,18 @@ static int icp_pic_init(SysBusDevice *sbd) /* CP control registers. */ +#define TYPE_ICP_CONTROL_REGS "icp-ctrl-regs" +#define ICP_CONTROL_REGS(obj) \ + OBJECT_CHECK(ICPCtrlRegsState, (obj), TYPE_ICP_CONTROL_REGS) + +typedef struct ICPCtrlRegsState { + /*< private >*/ + SysBusDevice parent_obj; + /*< public >*/ + + MemoryRegion iomem; +} ICPCtrlRegsState; + static uint64_t icp_control_read(void *opaque, hwaddr offset, unsigned size) { @@ -444,15 +456,14 @@ static const MemoryRegionOps icp_control_ops = { .endianness = DEVICE_NATIVE_ENDIAN, }; -static void icp_control_init(hwaddr base) +static void icp_control_init(Object *obj) { - MemoryRegion *io; + SysBusDevice *sbd = SYS_BUS_DEVICE(obj); + ICPCtrlRegsState *s = ICP_CONTROL_REGS(obj); - io = (MemoryRegion *)g_malloc0(sizeof(MemoryRegion)); - memory_region_init_io(io, NULL, &icp_control_ops, NULL, - "control", 0x00800000); - memory_region_add_subregion(get_system_memory(), base, io); - /* ??? Save/restore. */ + memory_region_init_io(&s->iomem, OBJECT(s), &icp_control_ops, s, + "icp_ctrl_regs", 0x00800000); + sysbus_init_mmio(sbd, &s->iomem); } @@ -541,7 +552,7 @@ static void integratorcp_init(MachineState *machine) sysbus_create_simple("pl031", 0x15000000, pic[8]); sysbus_create_simple("pl011", 0x16000000, pic[1]); sysbus_create_simple("pl011", 0x17000000, pic[2]); - icp_control_init(0xcb000000); + sysbus_create_simple(TYPE_ICP_CONTROL_REGS, 0xcb000000, NULL); sysbus_create_simple("pl050_keyboard", 0x18000000, pic[3]); sysbus_create_simple("pl050_mouse", 0x19000000, pic[4]); sysbus_create_simple(TYPE_INTEGRATOR_DEBUG, 0x1a000000, 0); @@ -606,10 +617,18 @@ static const TypeInfo icp_pic_info = { .class_init = icp_pic_class_init, }; +static const TypeInfo icp_ctrl_regs_info = { + .name = TYPE_ICP_CONTROL_REGS, + .parent = TYPE_SYS_BUS_DEVICE, + .instance_size = sizeof(ICPCtrlRegsState), + .instance_init = icp_control_init, +}; + static void integratorcp_register_types(void) { type_register_static(&icp_pic_info); type_register_static(&core_info); + type_register_static(&icp_ctrl_regs_info); } type_init(integratorcp_register_types) -- 1.9.1