[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH qom-next for-1.6 08/14] lm32_juart: QOM'ify
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH qom-next for-1.6 08/14] lm32_juart: QOM'ify |
Date: |
Wed, 24 Jul 2013 23:42:13 +0200 |
Signed-off-by: Andreas Färber <address@hidden>
---
hw/char/lm32_juart.c | 19 +++++++++++--------
hw/lm32/lm32.h | 5 ++---
include/hw/char/lm32_juart.h | 2 ++
3 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/hw/char/lm32_juart.c b/hw/char/lm32_juart.c
index 154511e..252fe46 100644
--- a/hw/char/lm32_juart.c
+++ b/hw/char/lm32_juart.c
@@ -38,8 +38,11 @@ enum {
JRX_FULL = (1<<8),
};
+#define LM32_JUART(obj) OBJECT_CHECK(LM32JuartState, (obj), TYPE_LM32_JUART)
+
struct LM32JuartState {
- SysBusDevice busdev;
+ SysBusDevice parent_obj;
+
CharDriverState *chr;
uint32_t jtx;
@@ -49,7 +52,7 @@ typedef struct LM32JuartState LM32JuartState;
uint32_t lm32_juart_get_jtx(DeviceState *d)
{
- LM32JuartState *s = container_of(d, LM32JuartState, busdev.qdev);
+ LM32JuartState *s = LM32_JUART(d);
trace_lm32_juart_get_jtx(s->jtx);
return s->jtx;
@@ -57,7 +60,7 @@ uint32_t lm32_juart_get_jtx(DeviceState *d)
uint32_t lm32_juart_get_jrx(DeviceState *d)
{
- LM32JuartState *s = container_of(d, LM32JuartState, busdev.qdev);
+ LM32JuartState *s = LM32_JUART(d);
trace_lm32_juart_get_jrx(s->jrx);
return s->jrx;
@@ -65,7 +68,7 @@ uint32_t lm32_juart_get_jrx(DeviceState *d)
void lm32_juart_set_jtx(DeviceState *d, uint32_t jtx)
{
- LM32JuartState *s = container_of(d, LM32JuartState, busdev.qdev);
+ LM32JuartState *s = LM32_JUART(d);
unsigned char ch = jtx & 0xff;
trace_lm32_juart_set_jtx(s->jtx);
@@ -78,7 +81,7 @@ void lm32_juart_set_jtx(DeviceState *d, uint32_t jtx)
void lm32_juart_set_jrx(DeviceState *d, uint32_t jtx)
{
- LM32JuartState *s = container_of(d, LM32JuartState, busdev.qdev);
+ LM32JuartState *s = LM32_JUART(d);
trace_lm32_juart_set_jrx(s->jrx);
s->jrx &= ~JRX_FULL;
@@ -104,7 +107,7 @@ static void juart_event(void *opaque, int event)
static void juart_reset(DeviceState *d)
{
- LM32JuartState *s = container_of(d, LM32JuartState, busdev.qdev);
+ LM32JuartState *s = LM32_JUART(d);
s->jtx = 0;
s->jrx = 0;
@@ -112,7 +115,7 @@ static void juart_reset(DeviceState *d)
static int lm32_juart_init(SysBusDevice *dev)
{
- LM32JuartState *s = FROM_SYSBUS(typeof(*s), dev);
+ LM32JuartState *s = LM32_JUART(dev);
s->chr = qemu_char_get_next_serial();
if (s->chr) {
@@ -145,7 +148,7 @@ static void lm32_juart_class_init(ObjectClass *klass, void
*data)
}
static const TypeInfo lm32_juart_info = {
- .name = "lm32-juart",
+ .name = TYPE_LM32_JUART,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(LM32JuartState),
.class_init = lm32_juart_class_init,
diff --git a/hw/lm32/lm32.h b/hw/lm32/lm32.h
index 236686e..18aa6fd 100644
--- a/hw/lm32/lm32.h
+++ b/hw/lm32/lm32.h
@@ -1,8 +1,7 @@
#ifndef HW_LM32_H
#define HW_LM32_H 1
-
-#include "qemu-common.h"
+#include "hw/char/lm32_juart.h"
static inline DeviceState *lm32_pic_init(qemu_irq cpu_irq)
{
@@ -21,7 +20,7 @@ static inline DeviceState *lm32_juart_init(void)
{
DeviceState *dev;
- dev = qdev_create(NULL, "lm32-juart");
+ dev = qdev_create(NULL, TYPE_LM32_JUART);
qdev_init_nofail(dev);
return dev;
diff --git a/include/hw/char/lm32_juart.h b/include/hw/char/lm32_juart.h
index 1cd3148..70dc416 100644
--- a/include/hw/char/lm32_juart.h
+++ b/include/hw/char/lm32_juart.h
@@ -3,6 +3,8 @@
#include "hw/qdev.h"
+#define TYPE_LM32_JUART "lm32-juart"
+
uint32_t lm32_juart_get_jtx(DeviceState *d);
uint32_t lm32_juart_get_jrx(DeviceState *d);
void lm32_juart_set_jtx(DeviceState *d, uint32_t jtx);
--
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, 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 <=
- [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
- [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