From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37454) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V26pN-0002z5-Io for qemu-devel@nongnu.org; Wed, 24 Jul 2013 17:42:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V26pL-0004oR-2A for qemu-devel@nongnu.org; Wed, 24 Jul 2013 17:42:33 -0400 Received: from cantor2.suse.de ([195.135.220.15]:48443 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V26pK-0004oH-Oy for qemu-devel@nongnu.org; Wed, 24 Jul 2013 17:42:30 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 24 Jul 2013 23:42:09 +0200 Message-Id: <1374702140-13771-5-git-send-email-afaerber@suse.de> In-Reply-To: <1374702140-13771-1-git-send-email-afaerber@suse.de> References: <1374702140-13771-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 04/14] exynos4210_uart: QOM'ify List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Maksim Kozlov , Igor Mitsyanko , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Evgeny Voevodin , Dmitry Solodkiy Signed-off-by: Andreas F=C3=A4rber --- hw/char/exynos4210_uart.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/hw/char/exynos4210_uart.c b/hw/char/exynos4210_uart.c index 855ce7a..eef23a0 100644 --- a/hw/char/exynos4210_uart.c +++ b/hw/char/exynos4210_uart.c @@ -166,8 +166,13 @@ typedef struct { uint32_t size; } Exynos4210UartFIFO; =20 -typedef struct { - SysBusDevice busdev; +#define TYPE_EXYNOS4210_UART "exynos4210.uart" +#define EXYNOS4210_UART(obj) \ + OBJECT_CHECK(Exynos4210UartState, (obj), TYPE_EXYNOS4210_UART) + +typedef struct Exynos4210UartState { + SysBusDevice parent_obj; + MemoryRegion iomem; =20 uint32_t reg[EXYNOS4210_UART_REGS_MEM_SIZE / sizeof(uint= 32_t)]; @@ -538,8 +543,7 @@ static void exynos4210_uart_event(void *opaque, int e= vent) =20 static void exynos4210_uart_reset(DeviceState *dev) { - Exynos4210UartState *s =3D - container_of(dev, Exynos4210UartState, busdev.qdev); + Exynos4210UartState *s =3D EXYNOS4210_UART(dev); int regs_number =3D sizeof(exynos4210_uart_regs)/sizeof(Exynos4210Ua= rtReg); int i; =20 @@ -582,10 +586,10 @@ static const VMStateDescription vmstate_exynos4210_= uart =3D { }; =20 DeviceState *exynos4210_uart_create(hwaddr addr, - int fifo_size, - int channel, - CharDriverState *chr, - qemu_irq irq) + int fifo_size, + int channel, + CharDriverState *chr, + qemu_irq irq) { DeviceState *dev; SysBusDevice *bus; @@ -593,7 +597,7 @@ DeviceState *exynos4210_uart_create(hwaddr addr, const char chr_name[] =3D "serial"; char label[ARRAY_SIZE(chr_name) + 1]; =20 - dev =3D qdev_create(NULL, "exynos4210.uart"); + dev =3D qdev_create(NULL, TYPE_EXYNOS4210_UART); =20 if (!chr) { if (channel >=3D MAX_SERIAL_PORTS) { @@ -627,7 +631,7 @@ DeviceState *exynos4210_uart_create(hwaddr addr, =20 static int exynos4210_uart_init(SysBusDevice *dev) { - Exynos4210UartState *s =3D FROM_SYSBUS(Exynos4210UartState, dev); + Exynos4210UartState *s =3D EXYNOS4210_UART(dev); =20 /* memory mapping */ memory_region_init_io(&s->iomem, OBJECT(s), &exynos4210_uart_ops, s, @@ -662,7 +666,7 @@ static void exynos4210_uart_class_init(ObjectClass *k= lass, void *data) } =20 static const TypeInfo exynos4210_uart_info =3D { - .name =3D "exynos4210.uart", + .name =3D TYPE_EXYNOS4210_UART, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(Exynos4210UartState), .class_init =3D exynos4210_uart_class_init, --=20 1.8.1.4