[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 026/173] milkymist-vgafb: QOM cast cleanup
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 026/173] milkymist-vgafb: QOM cast cleanup |
Date: |
Mon, 29 Jul 2013 21:18:03 +0200 |
Introduce a type constant, use QOM casts and rename the parent field.
Signed-off-by: Andreas Färber <address@hidden>
---
hw/display/milkymist-vgafb.c | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/hw/display/milkymist-vgafb.c b/hw/display/milkymist-vgafb.c
index 870b339..5150cb4 100644
--- a/hw/display/milkymist-vgafb.c
+++ b/hw/display/milkymist-vgafb.c
@@ -63,8 +63,13 @@ enum {
CTRL_RESET = (1<<0),
};
+#define TYPE_MILKYMIST_VGAFB "milkymist-vgafb"
+#define MILKYMIST_VGAFB(obj) \
+ OBJECT_CHECK(MilkymistVgafbState, (obj), TYPE_MILKYMIST_VGAFB)
+
struct MilkymistVgafbState {
- SysBusDevice busdev;
+ SysBusDevice parent_obj;
+
MemoryRegion regs_region;
QemuConsole *con;
@@ -84,6 +89,7 @@ static int vgafb_enabled(MilkymistVgafbState *s)
static void vgafb_update_display(void *opaque)
{
MilkymistVgafbState *s = opaque;
+ SysBusDevice *sbd;
DisplaySurface *surface = qemu_console_surface(s->con);
int first = 0;
int last = 0;
@@ -93,6 +99,7 @@ static void vgafb_update_display(void *opaque)
return;
}
+ sbd = SYS_BUS_DEVICE(s);
int dest_width = s->regs[R_HRES];
switch (surface_bits_per_pixel(surface)) {
@@ -122,7 +129,7 @@ static void vgafb_update_display(void *opaque)
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_HRES],
s->regs[R_VRES],
@@ -256,7 +263,7 @@ static const MemoryRegionOps vgafb_mmio_ops = {
static void milkymist_vgafb_reset(DeviceState *d)
{
- MilkymistVgafbState *s = container_of(d, MilkymistVgafbState, busdev.qdev);
+ MilkymistVgafbState *s = MILKYMIST_VGAFB(d);
int i;
for (i = 0; i < R_MAX; i++) {
@@ -277,7 +284,7 @@ static const GraphicHwOps vgafb_ops = {
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,
"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 = {
- .name = "milkymist-vgafb",
+ .name = TYPE_MILKYMIST_VGAFB,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(MilkymistVgafbState),
.class_init = milkymist_vgafb_class_init,
--
1.8.1.4
- [Qemu-devel] [PULL 018/173] milkymist-ac97: QOM cast cleanup, (continued)
- [Qemu-devel] [PULL 018/173] milkymist-ac97: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 019/173] pl041: Rename pl041_state to PL041State, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 020/173] pl041: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 021/173] onenand: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 022/173] exynos4210_fimd: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 023/173] g364fb: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 024/173] jazz_led: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 025/173] milkymist-tmu2: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 028/173] pl110: QOM'ify pl110, pl110_versatile and pl111, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 030/173] imx_avic: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 026/173] milkymist-vgafb: QOM cast cleanup,
Andreas Färber <=
- [Qemu-devel] [PULL 031/173] imx_ccm: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 027/173] pl110: Rename pl110_state to PL110State, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 029/173] tcx: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 032/173] armv7m: QOM cast cleanup for BitBandState, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 033/173] highbank: QOM cast cleanup for HighbankRegsState, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 034/173] integratorcp: QOM cast cleanup for integratorcm_state, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 036/173] musicpal: Fix typo in name of local function, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 035/173] integratorcp: QOM cast cleanup for icp_pic_state, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 037/173] musicpal: QOM cast cleanup for mv88w8618_eth_state, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 038/173] musicpal: QOM cast cleanup for musicpal_lcd_state, Andreas Färber, 2013/07/29