[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH qom-next for-1.6 05/14] grlib_apbuart: QOM'ify
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH qom-next for-1.6 05/14] grlib_apbuart: QOM'ify |
Date: |
Wed, 24 Jul 2013 23:42:10 +0200 |
Signed-off-by: Andreas Färber <address@hidden>
---
hw/char/grlib_apbuart.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/hw/char/grlib_apbuart.c b/hw/char/grlib_apbuart.c
index 82e1b95..35ef661 100644
--- a/hw/char/grlib_apbuart.c
+++ b/hw/char/grlib_apbuart.c
@@ -67,8 +67,13 @@
#define FIFO_LENGTH 1024
+#define TYPE_GRLIB_APB_UART "grlib,apbuart"
+#define GRLIB_APB_UART(obj) \
+ OBJECT_CHECK(UART, (obj), TYPE_GRLIB_APB_UART)
+
typedef struct UART {
- SysBusDevice busdev;
+ SysBusDevice parent_obj;
+
MemoryRegion iomem;
qemu_irq irq;
@@ -232,7 +237,7 @@ static const MemoryRegionOps grlib_apbuart_ops = {
static int grlib_apbuart_init(SysBusDevice *dev)
{
- UART *uart = FROM_SYSBUS(typeof(*uart), dev);
+ UART *uart = GRLIB_APB_UART(dev);
qemu_chr_add_handlers(uart->chr,
grlib_apbuart_can_receive,
@@ -252,7 +257,7 @@ static int grlib_apbuart_init(SysBusDevice *dev)
static void grlib_apbuart_reset(DeviceState *d)
{
- UART *uart = container_of(d, UART, busdev.qdev);
+ UART *uart = GRLIB_APB_UART(d);
/* Transmitter FIFO and shift registers are always empty in QEMU */
uart->status = UART_TRANSMIT_FIFO_EMPTY | UART_TRANSMIT_SHIFT_EMPTY;
@@ -279,7 +284,7 @@ static void grlib_apbuart_class_init(ObjectClass *klass,
void *data)
}
static const TypeInfo grlib_apbuart_info = {
- .name = "grlib,apbuart",
+ .name = TYPE_GRLIB_APB_UART,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(UART),
.class_init = grlib_apbuart_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, 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 <=
- [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
- [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