openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

tusb6010: QOM cast cleanup 

Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Andreas Färber 2013-07-27 15:30:21 +02:00
parent c275471eb1
commit 453be7a6fc
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hw/timer/tusb6010.c
View File

@ -26,8 +26,12 @@
#include "hw/devices.h" #include "hw/devices.h"
#include "hw/sysbus.h" #include "hw/sysbus.h"
#define TYPE_TUSB6010 "tusb6010"
#define TUSB(obj) OBJECT_CHECK(TUSBState, (obj), TYPE_TUSB6010)
typedef struct TUSBState { typedef struct TUSBState {
SysBusDevice busdev; SysBusDevice parent_obj;
MemoryRegion iomem[2]; MemoryRegion iomem[2];
qemu_irq irq; qemu_irq irq;
MUSBState *musb; MUSBState *musb;
@ -740,7 +744,7 @@ static void tusb6010_irq(void *opaque, int source, int level)
static void tusb6010_reset(DeviceState *dev) static void tusb6010_reset(DeviceState *dev)
{ {
TUSBState *s = FROM_SYSBUS(TUSBState, SYS_BUS_DEVICE(dev)); TUSBState *s = TUSB(dev);
int i; int i;
s->test_reset = TUSB_PROD_TEST_RESET_VAL; s->test_reset = TUSB_PROD_TEST_RESET_VAL;
@ -774,18 +778,20 @@ static void tusb6010_reset(DeviceState *dev)
musb_reset(s->musb); musb_reset(s->musb);
} }
static int tusb6010_init(SysBusDevice *dev) static int tusb6010_init(SysBusDevice *sbd)
{ {
TUSBState *s = FROM_SYSBUS(TUSBState, dev); DeviceState *dev = DEVICE(sbd);
TUSBState *s = TUSB(dev);
s->otg_timer = qemu_new_timer_ns(vm_clock, tusb_otg_tick, s); s->otg_timer = qemu_new_timer_ns(vm_clock, tusb_otg_tick, s);
s->pwr_timer = qemu_new_timer_ns(vm_clock, tusb_power_tick, s); s->pwr_timer = qemu_new_timer_ns(vm_clock, tusb_power_tick, s);
memory_region_init_io(&s->iomem[1], OBJECT(s), &tusb_async_ops, s, memory_region_init_io(&s->iomem[1], OBJECT(s), &tusb_async_ops, s,
"tusb-async", UINT32_MAX); "tusb-async", UINT32_MAX);
sysbus_init_mmio(dev, &s->iomem[0]); sysbus_init_mmio(sbd, &s->iomem[0]);
sysbus_init_mmio(dev, &s->iomem[1]); sysbus_init_mmio(sbd, &s->iomem[1]);
sysbus_init_irq(dev, &s->irq); sysbus_init_irq(sbd, &s->irq);
qdev_init_gpio_in(&dev->qdev, tusb6010_irq, musb_irq_max + 1); qdev_init_gpio_in(dev, tusb6010_irq, musb_irq_max + 1);
s->musb = musb_init(&dev->qdev, 1); s->musb = musb_init(dev, 1);
return 0; return 0;
} }
@ -799,7 +805,7 @@ static void tusb6010_class_init(ObjectClass *klass, void *data)
} }
static const TypeInfo tusb6010_info = { static const TypeInfo tusb6010_info = {
.name = "tusb6010", .name = TYPE_TUSB6010,
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(TUSBState), .instance_size = sizeof(TUSBState),
.class_init = tusb6010_class_init, .class_init = tusb6010_class_init,