[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 029/173] tcx: QOM cast cleanup
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 029/173] tcx: QOM cast cleanup |
Date: |
Mon, 29 Jul 2013 21:18:06 +0200 |
Introduce a type constant, use QOM casts and rename the parent field.
Signed-off-by: Andreas Färber <address@hidden>
---
hw/display/tcx.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/hw/display/tcx.c b/hw/display/tcx.c
index 9fd48b5..24876d3 100644
--- a/hw/display/tcx.c
+++ b/hw/display/tcx.c
@@ -34,8 +34,12 @@
#define TCX_THC_NREGS_24 0x1000
#define TCX_TEC_NREGS 0x1000
+#define TYPE_TCX "SUNW,tcx"
+#define TCX(obj) OBJECT_CHECK(TCXState, (obj), TYPE_TCX)
+
typedef struct TCXState {
- SysBusDevice busdev;
+ SysBusDevice parent_obj;
+
QemuConsole *con;
uint8_t *vram;
uint32_t *vram24, *cplane;
@@ -423,7 +427,7 @@ static const VMStateDescription vmstate_tcx = {
static void tcx_reset(DeviceState *d)
{
- TCXState *s = container_of(d, TCXState, busdev.qdev);
+ TCXState *s = TCX(d);
/* Initialize palette */
memset(s->r, 0, 256);
@@ -523,7 +527,7 @@ static const GraphicHwOps tcx24_ops = {
static int tcx_init1(SysBusDevice *dev)
{
- TCXState *s = FROM_SYSBUS(TCXState, dev);
+ TCXState *s = TCX(dev);
ram_addr_t vram_offset = 0;
int size;
uint8_t *vram_base;
@@ -609,7 +613,7 @@ static void tcx_class_init(ObjectClass *klass, void *data)
}
static const TypeInfo tcx_info = {
- .name = "SUNW,tcx",
+ .name = TYPE_TCX,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(TCXState),
.class_init = tcx_class_init,
--
1.8.1.4
- [Qemu-devel] [PULL 021/173] onenand: QOM cast cleanup, (continued)
- [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, 2013/07/29
- [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 <=
- [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
- [Qemu-devel] [PULL 039/173] musicpal: QOM cast cleanup mv88w8618_pic_state, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 040/173] musicpal: QOM cast cleanup for mv88w8618_pit_state, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 041/173] musicpal: QOM cast cleanup for mv88w8618_flashcfg, Andreas Färber, 2013/07/29