vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

milkymist-vgafb: QOM cast cleanup 

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

Signed-off-by: Andreas Färber <afaerber@suse.de>
master
Andreas Färber 2013-07-25 00:53:39 +02:00
parent 56299135f5
commit 54df97bb0c
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hw/display/milkymist-vgafb.c
View File

@ -63,8 +63,13 @@ enum {
CTRL_RESET = (1<<0), CTRL_RESET = (1<<0),
}; };
#define TYPE_MILKYMIST_VGAFB "milkymist-vgafb"
#define MILKYMIST_VGAFB(obj) \
OBJECT_CHECK(MilkymistVgafbState, (obj), TYPE_MILKYMIST_VGAFB)
struct MilkymistVgafbState { struct MilkymistVgafbState {
SysBusDevice busdev; SysBusDevice parent_obj;
MemoryRegion regs_region; MemoryRegion regs_region;
QemuConsole *con; QemuConsole *con;
@ -84,6 +89,7 @@ static int vgafb_enabled(MilkymistVgafbState *s)
static void vgafb_update_display(void *opaque) static void vgafb_update_display(void *opaque)
{ {
MilkymistVgafbState *s = opaque; MilkymistVgafbState *s = opaque;
SysBusDevice *sbd;
DisplaySurface *surface = qemu_console_surface(s->con); DisplaySurface *surface = qemu_console_surface(s->con);
int first = 0; int first = 0;
int last = 0; int last = 0;
@ -93,6 +99,7 @@ static void vgafb_update_display(void *opaque)
return; return;
} }
sbd = SYS_BUS_DEVICE(s);
int dest_width = s->regs[R_HRES]; int dest_width = s->regs[R_HRES];
switch (surface_bits_per_pixel(surface)) { switch (surface_bits_per_pixel(surface)) {
@ -122,7 +129,7 @@ static void vgafb_update_display(void *opaque)
break; break;
} }
framebuffer_update_display(surface, sysbus_address_space(&s->busdev), framebuffer_update_display(surface, sysbus_address_space(sbd),
s->regs[R_BASEADDRESS] + s->fb_offset, s->regs[R_BASEADDRESS] + s->fb_offset,
s->regs[R_HRES], s->regs[R_HRES],
s->regs[R_VRES], s->regs[R_VRES],
@ -256,7 +263,7 @@ static const MemoryRegionOps vgafb_mmio_ops = {
static void milkymist_vgafb_reset(DeviceState *d) static void milkymist_vgafb_reset(DeviceState *d)
{ {
MilkymistVgafbState *s = container_of(d, MilkymistVgafbState, busdev.qdev); MilkymistVgafbState *s = MILKYMIST_VGAFB(d);
int i; int i;
for (i = 0; i < R_MAX; i++) { for (i = 0; i < R_MAX; i++) {
@ -277,7 +284,7 @@ static const GraphicHwOps vgafb_ops = {
static int milkymist_vgafb_init(SysBusDevice *dev) static int milkymist_vgafb_init(SysBusDevice *dev)
{ {
MilkymistVgafbState *s = FROM_SYSBUS(typeof(*s), dev); MilkymistVgafbState *s = MILKYMIST_VGAFB(dev);
memory_region_init_io(&s->regs_region, OBJECT(s), &vgafb_mmio_ops, s, memory_region_init_io(&s->regs_region, OBJECT(s), &vgafb_mmio_ops, s,
"milkymist-vgafb", R_MAX * 4); "milkymist-vgafb", R_MAX * 4);
@ -324,7 +331,7 @@ static void milkymist_vgafb_class_init(ObjectClass *klass, void *data)
} }
static const TypeInfo milkymist_vgafb_info = { static const TypeInfo milkymist_vgafb_info = {
.name = "milkymist-vgafb", .name = TYPE_MILKYMIST_VGAFB,
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(MilkymistVgafbState), .instance_size = sizeof(MilkymistVgafbState),
.class_init = milkymist_vgafb_class_init, .class_init = milkymist_vgafb_class_init,