[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH qom-next for-1.6 01/14] cadence_uart: QOM'ify
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH qom-next for-1.6 01/14] cadence_uart: QOM'ify |
Date: |
Wed, 24 Jul 2013 23:42:06 +0200 |
Signed-off-by: Andreas Färber <address@hidden>
---
hw/char/cadence_uart.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/hw/char/cadence_uart.c b/hw/char/cadence_uart.c
index 4d457f8..3c2e960 100644
--- a/hw/char/cadence_uart.c
+++ b/hw/char/cadence_uart.c
@@ -106,8 +106,12 @@
#define R_MAX (R_TTRIG + 1)
+#define TYPE_CADENCE_UART "cadence_uart"
+#define CADENCE_UART(obj) OBJECT_CHECK(UartState, (obj), TYPE_CADENCE_UART)
+
typedef struct {
- SysBusDevice busdev;
+ SysBusDevice parent_obj;
+
MemoryRegion iomem;
uint32_t r[R_MAX];
uint8_t r_fifo[RX_FIFO_SIZE];
@@ -442,7 +446,7 @@ static void cadence_uart_reset(UartState *s)
static int cadence_uart_init(SysBusDevice *dev)
{
- UartState *s = FROM_SYSBUS(UartState, dev);
+ UartState *s = CADENCE_UART(dev);
memory_region_init_io(&s->iomem, OBJECT(s), &uart_ops, s, "uart", 0x1000);
sysbus_init_mmio(dev, &s->iomem);
@@ -504,7 +508,7 @@ static void cadence_uart_class_init(ObjectClass *klass,
void *data)
}
static const TypeInfo cadence_uart_info = {
- .name = "cadence_uart",
+ .name = TYPE_CADENCE_UART,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(UartState),
.class_init = cadence_uart_class_init,
--
1.8.1.4
- [Qemu-devel] [PATCH qom-next for-1.6 00/14] char: QOM cast cleanups, Andreas Färber, 2013/07/24
- [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 <=
- [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, 2013/07/24
- [Qemu-devel] [PATCH qom-next for-1.6 12/14] pl011: QOM'ify pl011 and pl011_luminary, Andreas Färber, 2013/07/24