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

exynos4210_uart: QOM cast cleanup 

Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Andreas Färber 2013-07-24 22:21:05 +02:00
parent 81069b2054
commit 61149ff687
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hw/char/exynos4210_uart.c
View File

@ -166,8 +166,13 @@ typedef struct {
uint32_t size; uint32_t size;
} Exynos4210UartFIFO; } Exynos4210UartFIFO;
typedef struct { #define TYPE_EXYNOS4210_UART "exynos4210.uart"
SysBusDevice busdev; #define EXYNOS4210_UART(obj) \
OBJECT_CHECK(Exynos4210UartState, (obj), TYPE_EXYNOS4210_UART)
typedef struct Exynos4210UartState {
SysBusDevice parent_obj;
MemoryRegion iomem; MemoryRegion iomem;
uint32_t reg[EXYNOS4210_UART_REGS_MEM_SIZE / sizeof(uint32_t)]; uint32_t reg[EXYNOS4210_UART_REGS_MEM_SIZE / sizeof(uint32_t)];
@ -538,8 +543,7 @@ static void exynos4210_uart_event(void *opaque, int event)
static void exynos4210_uart_reset(DeviceState *dev) static void exynos4210_uart_reset(DeviceState *dev)
{ {
Exynos4210UartState *s = Exynos4210UartState *s = EXYNOS4210_UART(dev);
container_of(dev, Exynos4210UartState, busdev.qdev);
int regs_number = sizeof(exynos4210_uart_regs)/sizeof(Exynos4210UartReg); int regs_number = sizeof(exynos4210_uart_regs)/sizeof(Exynos4210UartReg);
int i; int i;
@ -582,10 +586,10 @@ static const VMStateDescription vmstate_exynos4210_uart = {
}; };
DeviceState *exynos4210_uart_create(hwaddr addr, DeviceState *exynos4210_uart_create(hwaddr addr,
int fifo_size, int fifo_size,
int channel, int channel,
CharDriverState *chr, CharDriverState *chr,
qemu_irq irq) qemu_irq irq)
{ {
DeviceState *dev; DeviceState *dev;
SysBusDevice *bus; SysBusDevice *bus;
@ -593,7 +597,7 @@ DeviceState *exynos4210_uart_create(hwaddr addr,
const char chr_name[] = "serial"; const char chr_name[] = "serial";
char label[ARRAY_SIZE(chr_name) + 1]; char label[ARRAY_SIZE(chr_name) + 1];
dev = qdev_create(NULL, "exynos4210.uart"); dev = qdev_create(NULL, TYPE_EXYNOS4210_UART);
if (!chr) { if (!chr) {
if (channel >= MAX_SERIAL_PORTS) { if (channel >= MAX_SERIAL_PORTS) {
@ -627,7 +631,7 @@ DeviceState *exynos4210_uart_create(hwaddr addr,
static int exynos4210_uart_init(SysBusDevice *dev) static int exynos4210_uart_init(SysBusDevice *dev)
{ {
Exynos4210UartState *s = FROM_SYSBUS(Exynos4210UartState, dev); Exynos4210UartState *s = EXYNOS4210_UART(dev);
/* memory mapping */ /* memory mapping */
memory_region_init_io(&s->iomem, OBJECT(s), &exynos4210_uart_ops, s, memory_region_init_io(&s->iomem, OBJECT(s), &exynos4210_uart_ops, s,
@ -662,7 +666,7 @@ static void exynos4210_uart_class_init(ObjectClass *klass, void *data)
} }
static const TypeInfo exynos4210_uart_info = { static const TypeInfo exynos4210_uart_info = {
.name = "exynos4210.uart", .name = TYPE_EXYNOS4210_UART,
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(Exynos4210UartState), .instance_size = sizeof(Exynos4210UartState),
.class_init = exynos4210_uart_class_init, .class_init = exynos4210_uart_class_init,