From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32979) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1toV-00024v-I2 for qemu-devel@nongnu.org; Wed, 24 Jul 2013 03:48:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V1toN-0005eA-Q7 for qemu-devel@nongnu.org; Wed, 24 Jul 2013 03:48:47 -0400 Received: from cantor2.suse.de ([195.135.220.15]:44016 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1toN-0005dZ-Eo for qemu-devel@nongnu.org; Wed, 24 Jul 2013 03:48:39 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 24 Jul 2013 09:48:09 +0200 Message-Id: <1374652104-26756-15-git-send-email-afaerber@suse.de> In-Reply-To: <1374652104-26756-1-git-send-email-afaerber@suse.de> References: <1374652104-26756-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] [PATCH qom-next for-1.6 14/29] pxa2xx: QOM'ify PXA2xxRTCState 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 Signed-off-by: Andreas F=C3=A4rber --- hw/arm/pxa2xx.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/hw/arm/pxa2xx.c b/hw/arm/pxa2xx.c index babe22e..6548338 100644 --- a/hw/arm/pxa2xx.c +++ b/hw/arm/pxa2xx.c @@ -798,8 +798,15 @@ static int pxa2xx_ssp_init(SysBusDevice *sbd) #define RTCPICR 0x34 /* RTC Periodic Interrupt Counter register */ #define PIAR 0x38 /* RTC Periodic Interrupt Alarm register */ =20 +#define TYPE_PXA2XX_RTC "pxa2xx_rtc" +#define PXA2XX_RTC(obj) \ + OBJECT_CHECK(PXA2xxRTCState, (obj), TYPE_PXA2XX_RTC) + typedef struct { - SysBusDevice busdev; + /*< private >*/ + SysBusDevice parent_obj; + /*< public >*/ + MemoryRegion iomem; uint32_t rttr; uint32_t rtsr; @@ -1110,7 +1117,7 @@ static const MemoryRegionOps pxa2xx_rtc_ops =3D { =20 static int pxa2xx_rtc_init(SysBusDevice *dev) { - PXA2xxRTCState *s =3D FROM_SYSBUS(PXA2xxRTCState, dev); + PXA2xxRTCState *s =3D PXA2XX_RTC(dev); struct tm tm; int wom; =20 @@ -1205,7 +1212,7 @@ static void pxa2xx_rtc_sysbus_class_init(ObjectClas= s *klass, void *data) } =20 static const TypeInfo pxa2xx_rtc_sysbus_info =3D { - .name =3D "pxa2xx_rtc", + .name =3D TYPE_PXA2XX_RTC, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(PXA2xxRTCState), .class_init =3D pxa2xx_rtc_sysbus_class_init, @@ -2128,7 +2135,7 @@ PXA2xxState *pxa270_init(MemoryRegion *address_spac= e, s->pcmcia[0] =3D pxa2xx_pcmcia_init(address_space, 0x20000000); s->pcmcia[1] =3D pxa2xx_pcmcia_init(address_space, 0x30000000); =20 - sysbus_create_simple("pxa2xx_rtc", 0x40900000, + sysbus_create_simple(TYPE_PXA2XX_RTC, 0x40900000, qdev_get_gpio_in(s->pic, PXA2XX_PIC_RTCALARM)); =20 s->i2c[0] =3D pxa2xx_i2c_init(0x40301600, @@ -2259,7 +2266,7 @@ PXA2xxState *pxa255_init(MemoryRegion *address_spac= e, unsigned int sdram_size) s->pcmcia[0] =3D pxa2xx_pcmcia_init(address_space, 0x20000000); s->pcmcia[1] =3D pxa2xx_pcmcia_init(address_space, 0x30000000); =20 - sysbus_create_simple("pxa2xx_rtc", 0x40900000, + sysbus_create_simple(TYPE_PXA2XX_RTC, 0x40900000, qdev_get_gpio_in(s->pic, PXA2XX_PIC_RTCALARM)); =20 s->i2c[0] =3D pxa2xx_i2c_init(0x40301600, --=20 1.8.1.4