From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44664) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UkwFR-0000xb-Ff for qemu-devel@nongnu.org; Fri, 07 Jun 2013 08:58:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UkwFP-00084e-P7 for qemu-devel@nongnu.org; Fri, 07 Jun 2013 08:58:29 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53769 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UkwFP-000842-Fq for qemu-devel@nongnu.org; Fri, 07 Jun 2013 08:58:27 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Fri, 7 Jun 2013 14:58:10 +0200 Message-Id: <1370609900-21998-3-git-send-email-afaerber@suse.de> In-Reply-To: <1370609900-21998-1-git-send-email-afaerber@suse.de> References: <1370609900-21998-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 v2 02/12] cs4231a: QOM'ify some more 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?= , anthony@codemonkey.ws Introduce type constant and cast macro. Replace reset hook with DeviceClass::reset callback. Signed-off-by: Andreas F=C3=A4rber --- hw/audio/cs4231a.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/hw/audio/cs4231a.c b/hw/audio/cs4231a.c index cc605e5..d3ce739 100644 --- a/hw/audio/cs4231a.c +++ b/hw/audio/cs4231a.c @@ -56,6 +56,9 @@ static struct { #define CS_REGS 16 #define CS_DREGS 32 =20 +#define TYPE_CS4231A "cs4231a" +#define CS4231A(obj) OBJECT_CHECK (CSState, (obj), TYPE_CS4231A) + typedef struct CSState { ISADevice dev; QEMUSoundCard card; @@ -208,9 +211,9 @@ static int16_t ALawDecompressTable[256] =3D 944, 912, 1008, 976, 816, 784, 880, 848 }; =20 -static void cs_reset (void *opaque) +static void cs4231a_reset (DeviceState *dev) { - CSState *s =3D opaque; + CSState *s =3D CS4231A (dev); =20 s->regs[Index_Address] =3D 0x40; s->regs[Index_Data] =3D 0x00; @@ -643,7 +646,7 @@ static const MemoryRegionOps cs_ioport_ops =3D { =20 static int cs4231a_initfn (ISADevice *dev) { - CSState *s =3D DO_UPCAST (CSState, dev, dev); + CSState *s =3D CS4231A (dev); =20 isa_init_irq (dev, &s->pic, s->irq); =20 @@ -652,16 +655,13 @@ static int cs4231a_initfn (ISADevice *dev) =20 DMA_register_channel (s->dma, cs_dma_read, s); =20 - qemu_register_reset (cs_reset, s); - cs_reset (s); - AUD_register_card ("cs4231a", &s->card); return 0; } =20 static int cs4231a_init (ISABus *bus) { - isa_create_simple (bus, "cs4231a"); + isa_create_simple (bus, TYPE_CS4231A); return 0; } =20 @@ -677,13 +677,14 @@ static void cs4231a_class_initfn (ObjectClass *klas= s, void *data) DeviceClass *dc =3D DEVICE_CLASS (klass); ISADeviceClass *ic =3D ISA_DEVICE_CLASS (klass); ic->init =3D cs4231a_initfn; + dc->reset =3D cs4231a_reset; dc->desc =3D "Crystal Semiconductor CS4231A"; dc->vmsd =3D &vmstate_cs4231a; dc->props =3D cs4231a_properties; } =20 static const TypeInfo cs4231a_info =3D { - .name =3D "cs4231a", + .name =3D TYPE_CS4231A, .parent =3D TYPE_ISA_DEVICE, .instance_size =3D sizeof (CSState), .class_init =3D cs4231a_class_initfn, --=20 1.8.1.4