[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH qom-next for-1.6 5/6] puv3_gpio: QOM cast cleanup
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH qom-next for-1.6 5/6] puv3_gpio: QOM cast cleanup |
Date: |
Fri, 26 Jul 2013 17:56:17 +0200 |
Signed-off-by: Andreas Färber <address@hidden>
---
hw/gpio/puv3_gpio.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/hw/gpio/puv3_gpio.c b/hw/gpio/puv3_gpio.c
index 18671eb..39840aa 100644
--- a/hw/gpio/puv3_gpio.c
+++ b/hw/gpio/puv3_gpio.c
@@ -14,8 +14,12 @@
#undef DEBUG_PUV3
#include "hw/unicore32/puv3.h"
-typedef struct {
- SysBusDevice busdev;
+#define TYPE_PUV3_GPIO "puv3_gpio"
+#define PUV3_GPIO(obj) OBJECT_CHECK(PUV3GPIOState, (obj), TYPE_PUV3_GPIO)
+
+typedef struct PUV3GPIOState {
+ SysBusDevice parent_obj;
+
MemoryRegion iomem;
qemu_irq irq[9];
@@ -96,7 +100,7 @@ static const MemoryRegionOps puv3_gpio_ops = {
static int puv3_gpio_init(SysBusDevice *dev)
{
- PUV3GPIOState *s = FROM_SYSBUS(PUV3GPIOState, dev);
+ PUV3GPIOState *s = PUV3_GPIO(dev);
s->reg_GPLR = 0;
s->reg_GPDR = 0;
@@ -127,7 +131,7 @@ static void puv3_gpio_class_init(ObjectClass *klass, void
*data)
}
static const TypeInfo puv3_gpio_info = {
- .name = "puv3_gpio",
+ .name = TYPE_PUV3_GPIO,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(PUV3GPIOState),
.class_init = puv3_gpio_class_init,
--
1.8.1.4
- [Qemu-devel] [PATCH qom-next for-1.6 0/6] gpio: QOM cast cleanups, Andreas Färber, 2013/07/26
- [Qemu-devel] [PATCH qom-next for-1.6 1/6] omap_gpio: QOM cast cleanup for omap_gpif_s, Andreas Färber, 2013/07/26
- [Qemu-devel] [PATCH qom-next for-1.6 2/6] omap_gpio: QOM cast cleanup for omap2_gpif_s, Andreas Färber, 2013/07/26
- [Qemu-devel] [PATCH qom-next for-1.6 4/6] pl061: QOM'ify pl061 and pl061_luminary, Andreas Färber, 2013/07/26
- [Qemu-devel] [PATCH qom-next for-1.6 6/6] gpio/zaurus: QOM cast cleanup, Andreas Färber, 2013/07/26
- [Qemu-devel] [PATCH qom-next for-1.6 5/6] puv3_gpio: QOM cast cleanup,
Andreas Färber <=
- [Qemu-devel] [PATCH qom-next for-1.6 3/6] pl061: Rename pl061_state to PL061State, Andreas Färber, 2013/07/26