[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH qom-next for-1.6 10/14] milkymist-uart: QOM'ify
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH qom-next for-1.6 10/14] milkymist-uart: QOM'ify |
Date: |
Wed, 24 Jul 2013 23:42:15 +0200 |
Signed-off-by: Andreas Färber <address@hidden>
---
hw/char/milkymist-uart.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/hw/char/milkymist-uart.c b/hw/char/milkymist-uart.c
index 46deab2..2e4b5c5 100644
--- a/hw/char/milkymist-uart.c
+++ b/hw/char/milkymist-uart.c
@@ -52,8 +52,13 @@ enum {
DBG_BREAK_EN = (1<<0),
};
+#define TYPE_MILKYMIST_UART "milkymist-uart"
+#define MILKYMIST_UART(obj) \
+ OBJECT_CHECK(MilkymistUartState, (obj), TYPE_MILKYMIST_UART)
+
struct MilkymistUartState {
- SysBusDevice busdev;
+ SysBusDevice parent_obj;
+
MemoryRegion regs_region;
CharDriverState *chr;
qemu_irq irq;
@@ -179,7 +184,7 @@ static void uart_event(void *opaque, int event)
static void milkymist_uart_reset(DeviceState *d)
{
- MilkymistUartState *s = container_of(d, MilkymistUartState, busdev.qdev);
+ MilkymistUartState *s = MILKYMIST_UART(d);
int i;
for (i = 0; i < R_MAX; i++) {
@@ -192,12 +197,12 @@ static void milkymist_uart_reset(DeviceState *d)
static int milkymist_uart_init(SysBusDevice *dev)
{
- MilkymistUartState *s = FROM_SYSBUS(typeof(*s), dev);
+ MilkymistUartState *s = MILKYMIST_UART(dev);
sysbus_init_irq(dev, &s->irq);
memory_region_init_io(&s->regs_region, OBJECT(s), &uart_mmio_ops, s,
- "milkymist-uart", R_MAX * 4);
+ "milkymist-uart", R_MAX * 4);
sysbus_init_mmio(dev, &s->regs_region);
s->chr = qemu_char_get_next_serial();
@@ -230,7 +235,7 @@ static void milkymist_uart_class_init(ObjectClass *klass,
void *data)
}
static const TypeInfo milkymist_uart_info = {
- .name = "milkymist-uart",
+ .name = TYPE_MILKYMIST_UART,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(MilkymistUartState),
.class_init = milkymist_uart_class_init,
--
1.8.1.4
- [Qemu-devel] [PATCH qom-next for-1.6 02/14] escc: QOM'ify, (continued)
- [Qemu-devel] [PATCH qom-next for-1.6 02/14] escc: QOM'ify, Andreas Färber, 2013/07/24
- [Qemu-devel] [PATCH qom-next for-1.6 01/14] cadence_uart: QOM'ify, Andreas Färber, 2013/07/24
- [Qemu-devel] [PATCH qom-next for-1.6 03/14] etraxfs_ser: QOM'ify, Andreas Färber, 2013/07/24
- [Qemu-devel] [PATCH qom-next for-1.6 05/14] grlib_apbuart: QOM'ify, Andreas Färber, 2013/07/24
- [Qemu-devel] [PATCH qom-next for-1.6 06/14] imx_serial: QOM'ify, Andreas Färber, 2013/07/24
- [Qemu-devel] [PATCH qom-next for-1.6 04/14] exynos4210_uart: QOM'ify, Andreas Färber, 2013/07/24
- [Qemu-devel] [PATCH qom-next for-1.6 07/14] lm32_juart: Relocate and tidy header, Andreas Färber, 2013/07/24
- [Qemu-devel] [PATCH qom-next for-1.6 09/14] lm32_uart: QOM'ify, Andreas Färber, 2013/07/24
- [Qemu-devel] [PATCH qom-next for-1.6 08/14] lm32_juart: QOM'ify, Andreas Färber, 2013/07/24
- [Qemu-devel] [PATCH qom-next for-1.6 10/14] milkymist-uart: QOM'ify,
Andreas Färber <=
- [Qemu-devel] [PATCH qom-next for-1.6 12/14] pl011: QOM'ify pl011 and pl011_luminary, Andreas Färber, 2013/07/24
- [Qemu-devel] [PATCH qom-next for-1.6 11/14] pl011: Rename pl011_state, Andreas Färber, 2013/07/24
- [Qemu-devel] [PATCH qom-next for-1.6 14/14] xilinx_uartlite: QOM'ify, Andreas Färber, 2013/07/24
- [Qemu-devel] [PATCH qom-next for-1.6 13/14] xilinx_uartlite: Rename xlx_uartlite to XilinxUARTLite, Andreas Färber, 2013/07/24
- Re: [Qemu-devel] [PATCH qom-next for-1.6 00/14] char: QOM cast cleanups, Andreas Färber, 2013/07/26