From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56366) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t0n-0003Up-KC for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t0h-0002St-HA for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:41 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53369 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t0h-0002Sk-91 for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:35 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id CA54BA531D for ; Mon, 29 Jul 2013 21:21:34 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:18:39 +0200 Message-Id: <1375125630-24869-63-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 062/173] escc: 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/char/escc.c | 19 +++++++++++-------- include/hw/char/escc.h | 1 + 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/hw/char/escc.c b/hw/char/escc.c index 4c42198..6397f6f 100644 --- a/hw/char/escc.c +++ b/hw/char/escc.c @@ -96,8 +96,11 @@ typedef struct ChannelState { uint8_t rx, tx; } ChannelState; =20 +#define ESCC(obj) OBJECT_CHECK(ESCCState, (obj), TYPE_ESCC) + typedef struct ESCCState { - SysBusDevice busdev; + SysBusDevice parent_obj; + struct ChannelState chn[2]; uint32_t it_shift; MemoryRegion mmio; @@ -309,7 +312,7 @@ static void escc_reset_chn(ChannelState *s) =20 static void escc_reset(DeviceState *d) { - ESCCState *s =3D container_of(d, ESCCState, busdev.qdev); + ESCCState *s =3D ESCC(d); =20 escc_reset_chn(&s->chn[0]); escc_reset_chn(&s->chn[1]); @@ -534,7 +537,7 @@ static void escc_mem_write(void *opaque, hwaddr addr, escc_reset_chn(&serial->chn[1]); return; case MINTR_RST_ALL: - escc_reset(&serial->busdev.qdev); + escc_reset(DEVICE(serial)); return; } break; @@ -691,7 +694,7 @@ MemoryRegion *escc_init(hwaddr base, qemu_irq irqA, q= emu_irq irqB, SysBusDevice *s; ESCCState *d; =20 - dev =3D qdev_create(NULL, "escc"); + dev =3D qdev_create(NULL, TYPE_ESCC); qdev_prop_set_uint32(dev, "disabled", 0); qdev_prop_set_uint32(dev, "frequency", clock); qdev_prop_set_uint32(dev, "it_shift", it_shift); @@ -707,7 +710,7 @@ MemoryRegion *escc_init(hwaddr base, qemu_irq irqA, q= emu_irq irqB, sysbus_mmio_map(s, 0, base); } =20 - d =3D FROM_SYSBUS(ESCCState, s); + d =3D ESCC(s); return &d->mmio; } =20 @@ -852,7 +855,7 @@ void slavio_serial_ms_kbd_init(hwaddr base, qemu_irq = irq, DeviceState *dev; SysBusDevice *s; =20 - dev =3D qdev_create(NULL, "escc"); + dev =3D qdev_create(NULL, TYPE_ESCC); qdev_prop_set_uint32(dev, "disabled", disabled); qdev_prop_set_uint32(dev, "frequency", clock); qdev_prop_set_uint32(dev, "it_shift", it_shift); @@ -869,7 +872,7 @@ void slavio_serial_ms_kbd_init(hwaddr base, qemu_irq = irq, =20 static int escc_init1(SysBusDevice *dev) { - ESCCState *s =3D FROM_SYSBUS(ESCCState, dev); + ESCCState *s =3D ESCC(dev); unsigned int i; =20 s->chn[0].disabled =3D s->disabled; @@ -924,7 +927,7 @@ static void escc_class_init(ObjectClass *klass, void = *data) } =20 static const TypeInfo escc_info =3D { - .name =3D "escc", + .name =3D TYPE_ESCC, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(ESCCState), .class_init =3D escc_class_init, diff --git a/include/hw/char/escc.h b/include/hw/char/escc.h index bda3213..2742d70 100644 --- a/include/hw/char/escc.h +++ b/include/hw/char/escc.h @@ -2,6 +2,7 @@ #define HW_ESCC_H 1 =20 /* escc.c */ +#define TYPE_ESCC "escc" #define ESCC_SIZE 4 MemoryRegion *escc_init(hwaddr base, qemu_irq irqA, qemu_irq irqB, CharDriverState *chrA, CharDriverState *chrB, --=20 1.8.1.4