From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48625) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1uYG-0008LP-4O for qemu-devel@nongnu.org; Wed, 24 Jul 2013 04:36:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V1uYD-0006Lw-9A for qemu-devel@nongnu.org; Wed, 24 Jul 2013 04:36:04 -0400 Received: from cantor2.suse.de ([195.135.220.15]:46189 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1uYD-0006Lm-3q for qemu-devel@nongnu.org; Wed, 24 Jul 2013 04:36:01 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 24 Jul 2013 10:35:51 +0200 Message-Id: <1374654954-30128-2-git-send-email-afaerber@suse.de> In-Reply-To: <1374654954-30128-1-git-send-email-afaerber@suse.de> References: <1374654954-30128-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 1/4] cs4231: QOM'ify List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Vassili Karpov (malc)" , =?UTF-8?q?Andreas=20F=C3=A4rber?= Signed-off-by: Andreas F=C3=A4rber --- hw/audio/cs4231.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/hw/audio/cs4231.c b/hw/audio/cs4231.c index fabe9e6..d19195a 100644 --- a/hw/audio/cs4231.c +++ b/hw/audio/cs4231.c @@ -33,8 +33,13 @@ #define CS_DREGS 32 #define CS_MAXDREG (CS_DREGS - 1) =20 +#define TYPE_CS4231 "SUNW,CS4231" +#define CS4231(obj) \ + OBJECT_CHECK(CSState, (obj), TYPE_CS4231) + typedef struct CSState { - SysBusDevice busdev; + SysBusDevice parent_obj; + MemoryRegion iomem; qemu_irq irq; uint32_t regs[CS_REGS]; @@ -47,7 +52,7 @@ typedef struct CSState { =20 static void cs_reset(DeviceState *d) { - CSState *s =3D container_of(d, CSState, busdev.qdev); + CSState *s =3D CS4231(d); =20 memset(s->regs, 0, CS_REGS * 4); memset(s->dregs, 0, CS_DREGS); @@ -111,7 +116,7 @@ static void cs_mem_write(void *opaque, hwaddr addr, break; case 4: if (val & 1) { - cs_reset(&s->busdev.qdev); + cs_reset(DEVICE(s)); } val &=3D 0x7f; s->regs[saddr] =3D val; @@ -142,7 +147,7 @@ static const VMStateDescription vmstate_cs4231 =3D { =20 static int cs4231_init1(SysBusDevice *dev) { - CSState *s =3D FROM_SYSBUS(CSState, dev); + CSState *s =3D CS4231(dev); =20 memory_region_init_io(&s->iomem, OBJECT(s), &cs_mem_ops, s, "cs4321"= , CS_SIZE); @@ -168,7 +173,7 @@ static void cs4231_class_init(ObjectClass *klass, voi= d *data) } =20 static const TypeInfo cs4231_info =3D { - .name =3D "SUNW,CS4231", + .name =3D TYPE_CS4231, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(CSState), .class_init =3D cs4231_class_init, --=20 1.8.1.4