From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33076) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1toc-0002IO-6F for qemu-devel@nongnu.org; Wed, 24 Jul 2013 03:49:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V1toT-0005hL-HG for qemu-devel@nongnu.org; Wed, 24 Jul 2013 03:48:54 -0400 Received: from cantor2.suse.de ([195.135.220.15]:44049 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1toT-0005hD-74 for qemu-devel@nongnu.org; Wed, 24 Jul 2013 03:48:45 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 24 Jul 2013 09:48:19 +0200 Message-Id: <1374652104-26756-25-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 24/29] strongarm: QOM'ify StrongARMRTCState 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/strongarm.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/hw/arm/strongarm.c b/hw/arm/strongarm.c index 457f9c7..78211a0 100644 --- a/hw/arm/strongarm.c +++ b/hw/arm/strongarm.c @@ -242,8 +242,13 @@ static const TypeInfo strongarm_pic_info =3D { * trim delete isn't emulated, so * f =3D 32 768 / (RTTR_trim + 1) */ =20 -typedef struct { - SysBusDevice busdev; +#define TYPE_STRONGARM_RTC "strongarm-rtc" +#define STRONGARM_RTC(obj) \ + OBJECT_CHECK(StrongARMRTCState, (obj), TYPE_STRONGARM_RTC) + +typedef struct StrongARMRTCState { + SysBusDevice parent_obj; + MemoryRegion iomem; uint32_t rttr; uint32_t rtsr; @@ -374,7 +379,7 @@ static const MemoryRegionOps strongarm_rtc_ops =3D { =20 static int strongarm_rtc_init(SysBusDevice *dev) { - StrongARMRTCState *s =3D FROM_SYSBUS(StrongARMRTCState, dev); + StrongARMRTCState *s =3D STRONGARM_RTC(dev); struct tm tm; =20 s->rttr =3D 0x0; @@ -443,7 +448,7 @@ static void strongarm_rtc_sysbus_class_init(ObjectCla= ss *klass, void *data) } =20 static const TypeInfo strongarm_rtc_sysbus_info =3D { - .name =3D "strongarm-rtc", + .name =3D TYPE_STRONGARM_RTC, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(StrongARMRTCState), .class_init =3D strongarm_rtc_sysbus_class_init, @@ -1599,7 +1604,7 @@ StrongARMState *sa1110_init(MemoryRegion *sysmem, qdev_get_gpio_in(s->pic, SA_PIC_OSTC3), NULL); =20 - sysbus_create_simple("strongarm-rtc", 0x90010000, + sysbus_create_simple(TYPE_STRONGARM_RTC, 0x90010000, qdev_get_gpio_in(s->pic, SA_PIC_RTC_ALARM)); =20 s->gpio =3D strongarm_gpio_init(0x90040000, s->pic); --=20 1.8.1.4