[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 02/16] xilinx_axienet: Defined and use type cast
From: |
peter . crosthwaite |
Subject: |
[Qemu-devel] [PATCH v6 02/16] xilinx_axienet: Defined and use type cast macro |
Date: |
Tue, 16 Apr 2013 10:19:27 +1000 |
From: Peter Crosthwaite <address@hidden>
Standard QOM cast macro. Replaces usages of FROM_SYSBUS
Signed-off-by: Peter Crosthwaite <address@hidden>
Reviewed-by: Andreas Färber <address@hidden>
Acked-by: Edgar E. Iglesias <address@hidden>
---
hw/net/xilinx_axienet.c | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/hw/net/xilinx_axienet.c b/hw/net/xilinx_axienet.c
index 4cd048f..6cb9a9b 100644
--- a/hw/net/xilinx_axienet.c
+++ b/hw/net/xilinx_axienet.c
@@ -32,6 +32,11 @@
#define DPHY(x)
+#define TYPE_XILINX_AXI_ENET "xlnx.axi-ethernet"
+
+#define XILINX_AXI_ENET(obj) \
+ OBJECT_CHECK(XilinxAXIEnet, (obj), TYPE_XILINX_AXI_ENET)
+
/* Advertisement control register. */
#define ADVERTISE_10HALF 0x0020 /* Try for 10mbps half-duplex */
#define ADVERTISE_10FULL 0x0040 /* Try for 10mbps full-duplex */
@@ -848,7 +853,7 @@ static NetClientInfo net_xilinx_enet_info = {
static int xilinx_enet_init(SysBusDevice *dev)
{
- XilinxAXIEnet *s = FROM_SYSBUS(typeof(*s), dev);
+ XilinxAXIEnet *s = XILINX_AXI_ENET(dev);
sysbus_init_irq(dev, &s->irq);
@@ -873,7 +878,7 @@ static int xilinx_enet_init(SysBusDevice *dev)
static void xilinx_enet_initfn(Object *obj)
{
- XilinxAXIEnet *s = FROM_SYSBUS(typeof(*s), SYS_BUS_DEVICE(obj));
+ XilinxAXIEnet *s = XILINX_AXI_ENET(obj);
Error *errp = NULL;
object_property_add_link(obj, "axistream-connected", TYPE_STREAM_SLAVE,
@@ -901,7 +906,7 @@ static void xilinx_enet_class_init(ObjectClass *klass, void
*data)
}
static const TypeInfo xilinx_enet_info = {
- .name = "xlnx.axi-ethernet",
+ .name = TYPE_XILINX_AXI_ENET,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(XilinxAXIEnet),
.class_init = xilinx_enet_class_init,
--
1.7.0.4
- [Qemu-devel] [PATCH v6 00/16] Stream Patches, peter . crosthwaite, 2013/04/15
- [Qemu-devel] [PATCH v6 01/16] xilinx_axienet: typedef XilinxAXIEnet struct, peter . crosthwaite, 2013/04/15
- [Qemu-devel] [PATCH v6 02/16] xilinx_axienet: Defined and use type cast macro,
peter . crosthwaite <=
- [Qemu-devel] [PATCH v6 03/16] xilinx_axienet: Register reset properly, peter . crosthwaite, 2013/04/15
- [Qemu-devel] [PATCH v6 04/16] xilinx_axienet: converted init->realize, peter . crosthwaite, 2013/04/15
- [Qemu-devel] [PATCH v6 05/16] xilinx_axidma: typedef XilinxAXIDMA struct, peter . crosthwaite, 2013/04/15
- [Qemu-devel] [PATCH v6 06/16] xilinx_axidma: Defined and use type cast macro, peter . crosthwaite, 2013/04/15
- [Qemu-devel] [PATCH v6 07/16] xilinx_axidma: Register reset properly, peter . crosthwaite, 2013/04/15
- [Qemu-devel] [PATCH v6 08/16] xilinx_axidma: converted init->realize, peter . crosthwaite, 2013/04/15
- [Qemu-devel] [PATCH v6 09/16] petalogix_ml605_mmu: Fix machine node attachment, peter . crosthwaite, 2013/04/15
- [Qemu-devel] [PATCH v6 10/16] petalogix_ml605_mmu: Attach ethernet to machine, peter . crosthwaite, 2013/04/15
- [Qemu-devel] [PATCH v6 11/16] xilinx_axienet: Create Proxy object for stream, peter . crosthwaite, 2013/04/15
- [Qemu-devel] [PATCH v6 12/16] xilinx_axidma: Create Proxy object for stream, peter . crosthwaite, 2013/04/15