From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57204) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t1e-0004qS-5J for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t1R-0002nH-DH for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:34 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53484 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t1R-0002n6-51 for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:21 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id A82B1A531D for ; Mon, 29 Jul 2013 21:22:20 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:19:41 +0200 Message-Id: <1375125630-24869-125-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 124/173] smc91c111: QOM cast cleanup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= Signed-off-by: Andreas F=C3=A4rber --- hw/net/smc91c111.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/hw/net/smc91c111.c b/hw/net/smc91c111.c index c49e37a..f5963e2 100644 --- a/hw/net/smc91c111.c +++ b/hw/net/smc91c111.c @@ -16,8 +16,12 @@ /* Number of 2k memory pages available. */ #define NUM_PACKETS 4 =20 +#define TYPE_SMC91C111 "smc91c111" +#define SMC91C111(obj) OBJECT_CHECK(smc91c111_state, (obj), TYPE_SMC91C1= 11) + typedef struct { - SysBusDevice busdev; + SysBusDevice parent_obj; + NICState *nic; NICConf conf; uint16_t tcr; @@ -254,7 +258,8 @@ static void smc91c111_queue_tx(smc91c111_state *s, in= t packet) =20 static void smc91c111_reset(DeviceState *dev) { - smc91c111_state *s =3D FROM_SYSBUS(smc91c111_state, SYS_BUS_DEVICE(d= ev)); + smc91c111_state *s =3D SMC91C111(dev); + s->bank =3D 0; s->tx_fifo_len =3D 0; s->tx_fifo_done_len =3D 0; @@ -302,8 +307,9 @@ static void smc91c111_writeb(void *opaque, hwaddr off= set, return; case 5: SET_HIGH(rcr, value); - if (s->rcr & RCR_SOFT_RST) - smc91c111_reset(&s->busdev.qdev); + if (s->rcr & RCR_SOFT_RST) { + smc91c111_reset(DEVICE(s)); + } return; case 10: case 11: /* RPCR */ /* Ignored */ @@ -744,16 +750,18 @@ static NetClientInfo net_smc91c111_info =3D { .cleanup =3D smc91c111_cleanup, }; =20 -static int smc91c111_init1(SysBusDevice *dev) +static int smc91c111_init1(SysBusDevice *sbd) { - smc91c111_state *s =3D FROM_SYSBUS(smc91c111_state, dev); + DeviceState *dev =3D DEVICE(sbd); + smc91c111_state *s =3D SMC91C111(dev); + memory_region_init_io(&s->mmio, OBJECT(s), &smc91c111_mem_ops, s, "smc91c111-mmio", 16); - sysbus_init_mmio(dev, &s->mmio); - sysbus_init_irq(dev, &s->irq); + sysbus_init_mmio(sbd, &s->mmio); + sysbus_init_irq(sbd, &s->irq); qemu_macaddr_default_if_unset(&s->conf.macaddr); s->nic =3D qemu_new_nic(&net_smc91c111_info, &s->conf, - object_get_typename(OBJECT(dev)), dev->qdev.id= , s); + object_get_typename(OBJECT(dev)), dev->id, s); qemu_format_nic_info_str(qemu_get_queue(s->nic), s->conf.macaddr.a); /* ??? Save/restore. */ return 0; @@ -776,7 +784,7 @@ static void smc91c111_class_init(ObjectClass *klass, = void *data) } =20 static const TypeInfo smc91c111_info =3D { - .name =3D "smc91c111", + .name =3D TYPE_SMC91C111, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(smc91c111_state), .class_init =3D smc91c111_class_init, @@ -795,7 +803,7 @@ void smc91c111_init(NICInfo *nd, uint32_t base, qemu_= irq irq) SysBusDevice *s; =20 qemu_check_nic_model(nd, "smc91c111"); - dev =3D qdev_create(NULL, "smc91c111"); + dev =3D qdev_create(NULL, TYPE_SMC91C111); qdev_set_nic_properties(dev, nd); qdev_init_nofail(dev); s =3D SYS_BUS_DEVICE(dev); --=20 1.8.1.4