ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

lm32_juart: QOM cast cleanup 

Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Andreas Färber 2013-07-24 22:56:36 +02:00
parent 0ee10242fd
commit a0b97927e3
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hw/char/lm32_juart.c
View File

@ -38,8 +38,11 @@ enum {
JRX_FULL = (1<<8), JRX_FULL = (1<<8),
}; };
#define LM32_JUART(obj) OBJECT_CHECK(LM32JuartState, (obj), TYPE_LM32_JUART)
struct LM32JuartState { struct LM32JuartState {
SysBusDevice busdev; SysBusDevice parent_obj;
CharDriverState *chr; CharDriverState *chr;
uint32_t jtx; uint32_t jtx;
@ -49,7 +52,7 @@ typedef struct LM32JuartState LM32JuartState;
uint32_t lm32_juart_get_jtx(DeviceState *d) 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); trace_lm32_juart_get_jtx(s->jtx);
return 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) 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); trace_lm32_juart_get_jrx(s->jrx);
return 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) 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; unsigned char ch = jtx & 0xff;
trace_lm32_juart_set_jtx(s->jtx); 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) 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); trace_lm32_juart_set_jrx(s->jrx);
s->jrx &= ~JRX_FULL; s->jrx &= ~JRX_FULL;
@ -104,7 +107,7 @@ static void juart_event(void *opaque, int event)
static void juart_reset(DeviceState *d) static void juart_reset(DeviceState *d)
{ {
LM32JuartState *s = container_of(d, LM32JuartState, busdev.qdev); LM32JuartState *s = LM32_JUART(d);
s->jtx = 0; s->jtx = 0;
s->jrx = 0; s->jrx = 0;
@ -112,7 +115,7 @@ static void juart_reset(DeviceState *d)
static int lm32_juart_init(SysBusDevice *dev) 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(); s->chr = qemu_char_get_next_serial();
if (s->chr) { if (s->chr) {
@ -145,7 +148,7 @@ static void lm32_juart_class_init(ObjectClass *klass, void *data)
} }
static const TypeInfo lm32_juart_info = { static const TypeInfo lm32_juart_info = {
.name = "lm32-juart", .name = TYPE_LM32_JUART,
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(LM32JuartState), .instance_size = sizeof(LM32JuartState),
.class_init = lm32_juart_class_init, .class_init = lm32_juart_class_init,

5
hw/lm32/lm32.h
View File

@ -1,8 +1,7 @@
#ifndef HW_LM32_H #ifndef HW_LM32_H
#define HW_LM32_H 1 #define HW_LM32_H 1
#include "hw/char/lm32_juart.h"
#include "qemu-common.h"
static inline DeviceState *lm32_pic_init(qemu_irq cpu_irq) static inline DeviceState *lm32_pic_init(qemu_irq cpu_irq)
{ {
@ -21,7 +20,7 @@ static inline DeviceState *lm32_juart_init(void)
{ {
DeviceState *dev; DeviceState *dev;
dev = qdev_create(NULL, "lm32-juart"); dev = qdev_create(NULL, TYPE_LM32_JUART);
qdev_init_nofail(dev); qdev_init_nofail(dev);
return dev; return dev;

2
include/hw/char/lm32_juart.h
View File

@ -3,6 +3,8 @@
#include "hw/qdev.h" #include "hw/qdev.h"
#define TYPE_LM32_JUART "lm32-juart"
uint32_t lm32_juart_get_jtx(DeviceState *d); uint32_t lm32_juart_get_jtx(DeviceState *d);
uint32_t lm32_juart_get_jrx(DeviceState *d); uint32_t lm32_juart_get_jrx(DeviceState *d);
void lm32_juart_set_jtx(DeviceState *d, uint32_t jtx); void lm32_juart_set_jtx(DeviceState *d, uint32_t jtx);