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

exynos4210_fimd: QOM cast cleanup 

Introduce a type constant, use QOM casts and rename the parent field.

Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Andreas Färber 2013-07-25 00:24:50 +02:00
parent af073cd9de
commit f27321aa3a
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hw/display/exynos4210_fimd.c
View File

@ -292,8 +292,13 @@ struct Exynos4210fimdWindow {
hwaddr fb_len; /* Framebuffer length */ hwaddr fb_len; /* Framebuffer length */
}; };
#define TYPE_EXYNOS4210_FIMD "exynos4210.fimd"
#define EXYNOS4210_FIMD(obj) \
OBJECT_CHECK(Exynos4210fimdState, (obj), TYPE_EXYNOS4210_FIMD)
typedef struct { typedef struct {
SysBusDevice busdev; SysBusDevice parent_obj;
MemoryRegion iomem; MemoryRegion iomem;
QemuConsole *console; QemuConsole *console;
qemu_irq irq[3]; qemu_irq irq[3];
@ -1108,6 +1113,7 @@ static inline int fimd_get_buffer_id(Exynos4210fimdWindow *w)
* VIDOSDA, VIDOSDB, VIDWADDx and SHADOWCON registers */ * VIDOSDA, VIDOSDB, VIDWADDx and SHADOWCON registers */
static void fimd_update_memory_section(Exynos4210fimdState *s, unsigned win) static void fimd_update_memory_section(Exynos4210fimdState *s, unsigned win)
{ {
SysBusDevice *sbd = SYS_BUS_DEVICE(s);
Exynos4210fimdWindow *w = &s->window[win]; Exynos4210fimdWindow *w = &s->window[win];
hwaddr fb_start_addr, fb_mapped_len; hwaddr fb_start_addr, fb_mapped_len;
@ -1131,8 +1137,8 @@ static void fimd_update_memory_section(Exynos4210fimdState *s, unsigned win)
* does not support hot-unplug. * does not support hot-unplug.
*/ */
memory_region_unref(w->mem_section.mr); memory_region_unref(w->mem_section.mr);
w->mem_section = memory_region_find(sysbus_address_space(&s->busdev), w->mem_section = memory_region_find(sysbus_address_space(sbd),
fb_start_addr, w->fb_len); fb_start_addr, w->fb_len);
assert(w->mem_section.mr); assert(w->mem_section.mr);
assert(w->mem_section.offset_within_address_space == fb_start_addr); assert(w->mem_section.offset_within_address_space == fb_start_addr);
DPRINT_TRACE("Window %u framebuffer changed: address=0x%08x, len=0x%x\n", DPRINT_TRACE("Window %u framebuffer changed: address=0x%08x, len=0x%x\n",
@ -1328,7 +1334,7 @@ static void exynos4210_fimd_update(void *opaque)
static void exynos4210_fimd_reset(DeviceState *d) static void exynos4210_fimd_reset(DeviceState *d)
{ {
Exynos4210fimdState *s = DO_UPCAST(Exynos4210fimdState, busdev.qdev, d); Exynos4210fimdState *s = EXYNOS4210_FIMD(d);
unsigned w; unsigned w;
DPRINT_TRACE("Display controller reset\n"); DPRINT_TRACE("Display controller reset\n");
@ -1900,7 +1906,7 @@ static const GraphicHwOps exynos4210_fimd_ops = {
static int exynos4210_fimd_init(SysBusDevice *dev) static int exynos4210_fimd_init(SysBusDevice *dev)
{ {
Exynos4210fimdState *s = FROM_SYSBUS(Exynos4210fimdState, dev); Exynos4210fimdState *s = EXYNOS4210_FIMD(dev);
s->ifb = NULL; s->ifb = NULL;
@ -1927,7 +1933,7 @@ static void exynos4210_fimd_class_init(ObjectClass *klass, void *data)
} }
static const TypeInfo exynos4210_fimd_info = { static const TypeInfo exynos4210_fimd_info = {
.name = "exynos4210.fimd", .name = TYPE_EXYNOS4210_FIMD,
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(Exynos4210fimdState), .instance_size = sizeof(Exynos4210fimdState),
.class_init = exynos4210_fimd_class_init, .class_init = exynos4210_fimd_class_init,