[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH qom-next for-1.6 14/14] zynq_slcr: QOM cast cleanup
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH qom-next for-1.6 14/14] zynq_slcr: QOM cast cleanup |
Date: |
Fri, 26 Jul 2013 23:34:14 +0200 |
Signed-off-by: Andreas Färber <address@hidden>
---
hw/misc/zynq_slcr.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/hw/misc/zynq_slcr.c b/hw/misc/zynq_slcr.c
index fc7a85f..e42a5b0 100644
--- a/hw/misc/zynq_slcr.c
+++ b/hw/misc/zynq_slcr.c
@@ -114,8 +114,12 @@ typedef enum {
RESET_MAX
} ResetValues;
-typedef struct {
- SysBusDevice busdev;
+#define TYPE_ZYNQ_SLCR "xilinx,zynq_slcr"
+#define ZYNQ_SLCR(obj) OBJECT_CHECK(ZynqSLCRState, (obj), TYPE_ZYNQ_SLCR)
+
+typedef struct ZynqSLCRState {
+ SysBusDevice parent_obj;
+
MemoryRegion iomem;
union {
@@ -158,9 +162,8 @@ typedef struct {
static void zynq_slcr_reset(DeviceState *d)
{
+ ZynqSLCRState *s = ZYNQ_SLCR(d);
int i;
- ZynqSLCRState *s =
- FROM_SYSBUS(ZynqSLCRState, SYS_BUS_DEVICE(d));
DB_PRINT("RESET\n");
@@ -492,7 +495,7 @@ static const MemoryRegionOps slcr_ops = {
static int zynq_slcr_init(SysBusDevice *dev)
{
- ZynqSLCRState *s = FROM_SYSBUS(ZynqSLCRState, dev);
+ ZynqSLCRState *s = ZYNQ_SLCR(dev);
memory_region_init_io(&s->iomem, OBJECT(s), &slcr_ops, s, "slcr", 0x1000);
sysbus_init_mmio(dev, &s->iomem);
@@ -523,7 +526,7 @@ static void zynq_slcr_class_init(ObjectClass *klass, void
*data)
static const TypeInfo zynq_slcr_info = {
.class_init = zynq_slcr_class_init,
- .name = "xilinx,zynq_slcr",
+ .name = TYPE_ZYNQ_SLCR,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(ZynqSLCRState),
};
--
1.8.1.4
- [Qemu-devel] [PATCH qom-next for-1.6 06/14] imx_ccm: QOM cast cleanup, (continued)
- [Qemu-devel] [PATCH qom-next for-1.6 06/14] imx_ccm: QOM cast cleanup, Andreas Färber, 2013/07/26
- [Qemu-devel] [PATCH qom-next for-1.6 07/14] lm32_sys: QOM cast cleanup, Andreas Färber, 2013/07/26
- [Qemu-devel] [PATCH qom-next for-1.6 08/14] milkymist-hpdmc: QOM cast cleanup, Andreas Färber, 2013/07/26
- [Qemu-devel] [PATCH qom-next for-1.6 01/14] arm_l2x0: Rename l2x0_state to L2x0State, Andreas Färber, 2013/07/26
- [Qemu-devel] [PATCH qom-next for-1.6 11/14] puv3_pm: QOM cast cleanup, Andreas Färber, 2013/07/26
- [Qemu-devel] [PATCH qom-next for-1.6 09/14] milkymist-pfpu: QOM cast cleanup, Andreas Färber, 2013/07/26
- [Qemu-devel] [PATCH qom-next for-1.6 12/14] slavio_misc: QOM cast cleanup for MiscState, Andreas Färber, 2013/07/26
- [Qemu-devel] [PATCH qom-next for-1.6 10/14] mst_fpga: QOM cast cleanup, Andreas Färber, 2013/07/26
- [Qemu-devel] [PATCH qom-next for-1.6 13/14] slavio_misc: QOM cast cleanup for APCState, Andreas Färber, 2013/07/26
- [Qemu-devel] [PATCH qom-next for-1.6 14/14] zynq_slcr: QOM cast cleanup,
Andreas Färber <=