From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55980) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t0M-0002ax-9u for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t0F-0002J9-GN for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:14 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53269 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t0F-0002Iv-6N for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:07 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:18:11 +0200 Message-Id: <1375125630-24869-35-git-send-email-afaerber@suse.de> In-Reply-To: <1375125630-24869-1-git-send-email-afaerber@suse.de> References: <1375125630-24869-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 034/173] integratorcp: QOM cast cleanup for integratorcm_state List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Paul Brook Rename to IntegratorCMState, introduce type constant and use QOM cast. Signed-off-by: Andreas F=C3=A4rber --- hw/arm/integratorcp.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c index 249a430..58f4ed7 100644 --- a/hw/arm/integratorcp.c +++ b/hw/arm/integratorcp.c @@ -15,8 +15,15 @@ #include "exec/address-spaces.h" #include "sysemu/sysemu.h" =20 -typedef struct { - SysBusDevice busdev; +#define TYPE_INTEGRATOR_CM "integrator_core" +#define INTEGRATOR_CM(obj) \ + OBJECT_CHECK(IntegratorCMState, (obj), TYPE_INTEGRATOR_CM) + +typedef struct IntegratorCMState { + /*< private >*/ + SysBusDevice parent_obj; + /*< public >*/ + MemoryRegion iomem; uint32_t memsz; MemoryRegion flash; @@ -31,7 +38,7 @@ typedef struct { uint32_t int_level; uint32_t irq_enabled; uint32_t fiq_enabled; -} integratorcm_state; +} IntegratorCMState; =20 static uint8_t integrator_spd[128] =3D { 128, 8, 4, 11, 9, 1, 64, 0, 2, 0xa0, 0xa0, 0, 0, 8, 0, 1, @@ -41,7 +48,7 @@ static uint8_t integrator_spd[128] =3D { static uint64_t integratorcm_read(void *opaque, hwaddr offset, unsigned size) { - integratorcm_state *s =3D (integratorcm_state *)opaque; + IntegratorCMState *s =3D opaque; if (offset >=3D 0x100 && offset < 0x200) { /* CM_SPD */ if (offset >=3D 0x180) @@ -108,7 +115,7 @@ static uint64_t integratorcm_read(void *opaque, hwadd= r offset, } } =20 -static void integratorcm_do_remap(integratorcm_state *s) +static void integratorcm_do_remap(IntegratorCMState *s) { /* Sync memory region state with CM_CTRL REMAP bit: * bit 0 =3D> flash at address 0; bit 1 =3D> RAM @@ -116,7 +123,7 @@ static void integratorcm_do_remap(integratorcm_state = *s) memory_region_set_enabled(&s->flash, !(s->cm_ctrl & 4)); } =20 -static void integratorcm_set_ctrl(integratorcm_state *s, uint32_t value) +static void integratorcm_set_ctrl(IntegratorCMState *s, uint32_t value) { if (value & 8) { qemu_system_reset_request(); @@ -133,7 +140,7 @@ static void integratorcm_set_ctrl(integratorcm_state = *s, uint32_t value) integratorcm_do_remap(s); } =20 -static void integratorcm_update(integratorcm_state *s) +static void integratorcm_update(IntegratorCMState *s) { /* ??? The CPU irq/fiq is raised when either the core module or base= PIC are active. */ @@ -144,7 +151,7 @@ static void integratorcm_update(integratorcm_state *s= ) static void integratorcm_write(void *opaque, hwaddr offset, uint64_t value, unsigned size) { - integratorcm_state *s =3D (integratorcm_state *)opaque; + IntegratorCMState *s =3D opaque; switch (offset >> 2) { case 2: /* CM_OSC */ if (s->cm_lock =3D=3D 0xa05f) @@ -226,7 +233,7 @@ static const MemoryRegionOps integratorcm_ops =3D { =20 static int integratorcm_init(SysBusDevice *dev) { - integratorcm_state *s =3D FROM_SYSBUS(integratorcm_state, dev); + IntegratorCMState *s =3D INTEGRATOR_CM(dev); =20 s->cm_osc =3D 0x01000048; /* ??? What should the high bits of this value be? */ @@ -474,7 +481,7 @@ static void integratorcp_init(QEMUMachineInitArgs *ar= gs) memory_region_init_alias(ram_alias, NULL, "ram.alias", ram, 0, ram_s= ize); memory_region_add_subregion(address_space_mem, 0x80000000, ram_alias= ); =20 - dev =3D qdev_create(NULL, "integrator_core"); + dev =3D qdev_create(NULL, TYPE_INTEGRATOR_CM); qdev_prop_set_uint32(dev, "memsz", ram_size >> 20); qdev_init_nofail(dev); sysbus_mmio_map((SysBusDevice *)dev, 0, 0x10000000); @@ -524,7 +531,7 @@ static void integratorcp_machine_init(void) machine_init(integratorcp_machine_init); =20 static Property core_properties[] =3D { - DEFINE_PROP_UINT32("memsz", integratorcm_state, memsz, 0), + DEFINE_PROP_UINT32("memsz", IntegratorCMState, memsz, 0), DEFINE_PROP_END_OF_LIST(), }; =20 @@ -538,9 +545,9 @@ static void core_class_init(ObjectClass *klass, void = *data) } =20 static const TypeInfo core_info =3D { - .name =3D "integrator_core", + .name =3D TYPE_INTEGRATOR_CM, .parent =3D TYPE_SYS_BUS_DEVICE, - .instance_size =3D sizeof(integratorcm_state), + .instance_size =3D sizeof(IntegratorCMState), .class_init =3D core_class_init, }; =20 --=20 1.8.1.4