[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 19/53] mcf_fec: Move mcf_fec_state typedef to header
From: |
Eduardo Habkost |
Subject: |
[PULL 19/53] mcf_fec: Move mcf_fec_state typedef to header |
Date: |
Thu, 27 Aug 2020 15:20:48 -0400 |
Move typedef closer to the type check macros, to make it easier
to convert the code to OBJECT_DEFINE_TYPE() in the future.
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Tested-By: Roman Bolshakov <r.bolshakov@yadro.com>
Message-Id: <20200825192110.3528606-21-ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
include/hw/m68k/mcf_fec.h | 1 +
hw/net/mcf_fec.c | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/include/hw/m68k/mcf_fec.h b/include/hw/m68k/mcf_fec.h
index eeb471f9c9..c09e33a57c 100644
--- a/include/hw/m68k/mcf_fec.h
+++ b/include/hw/m68k/mcf_fec.h
@@ -11,6 +11,7 @@
#define HW_M68K_MCF_FEC_H
#define TYPE_MCF_FEC_NET "mcf-fec"
+typedef struct mcf_fec_state mcf_fec_state;
#define MCF_FEC_NET(obj) OBJECT_CHECK(mcf_fec_state, (obj), TYPE_MCF_FEC_NET)
#define FEC_NUM_IRQ 13
diff --git a/hw/net/mcf_fec.c b/hw/net/mcf_fec.c
index 281345862c..25e3e453ab 100644
--- a/hw/net/mcf_fec.c
+++ b/hw/net/mcf_fec.c
@@ -32,7 +32,7 @@ do { printf("mcf_fec: " fmt , ## __VA_ARGS__); } while (0)
#define FEC_MAX_FRAME_SIZE 2032
#define FEC_MIB_SIZE 64
-typedef struct {
+struct mcf_fec_state {
SysBusDevice parent_obj;
MemoryRegion iomem;
@@ -56,7 +56,7 @@ typedef struct {
uint32_t etdsr;
uint32_t emrbr;
uint32_t mib[FEC_MIB_SIZE];
-} mcf_fec_state;
+};
#define FEC_INT_HB 0x80000000
#define FEC_INT_BABR 0x40000000
--
2.26.2
- [PULL 06/53] allwinner-h3: Rename memmap enum constants, (continued)
- [PULL 06/53] allwinner-h3: Rename memmap enum constants, Eduardo Habkost, 2020/08/27
- [PULL 09/53] aspeed_timer: Fix ASPEED_TIMER macro definition, Eduardo Habkost, 2020/08/27
- [PULL 08/53] opentitan: Rename memmap enum constants, Eduardo Habkost, 2020/08/27
- [PULL 10/53] versatile: Fix typo in PCI_VPB_HOST definition, Eduardo Habkost, 2020/08/27
- [PULL 07/53] aspeed_soc: Rename memmap/irqmap enum constants, Eduardo Habkost, 2020/08/27
- [PULL 11/53] virtio-ccw: Fix definition of VIRTIO_CCW_BUS_GET_CLASS, Eduardo Habkost, 2020/08/27
- [PULL 12/53] hvf: Add missing include, Eduardo Habkost, 2020/08/27
- [PULL 14/53] tulip: Move TulipState typedef to header, Eduardo Habkost, 2020/08/27
- [PULL 15/53] throttle-groups: Move ThrottleGroup typedef to header, Eduardo Habkost, 2020/08/27
- [PULL 17/53] i8254: Move PITCommonState/PITCommonClass typedefs to i8254.h, Eduardo Habkost, 2020/08/27
- [PULL 19/53] mcf_fec: Move mcf_fec_state typedef to header,
Eduardo Habkost <=
- [PULL 13/53] hcd-dwc2: Rename USB_*CLASS macros for consistency, Eduardo Habkost, 2020/08/27
- [PULL 16/53] pci: Move PCIBusClass typedef to pci.h, Eduardo Habkost, 2020/08/27
- [PULL 18/53] hvf: Move HVFState typedef to hvf.h, Eduardo Habkost, 2020/08/27
- [PULL 20/53] s390_flic: Move KVMS390FLICState typedef to header, Eduardo Habkost, 2020/08/27
- [PULL 22/53] nubus: Delete unused NUBUS_BRIDGE macro, Eduardo Habkost, 2020/08/27
- [PULL 21/53] can_emu: Delete macros for non-existing typedef, Eduardo Habkost, 2020/08/27
- [PULL 23/53] platform-bus: Delete macros for non-existing typedef, Eduardo Habkost, 2020/08/27
- [PULL 25/53] xen-legacy-backend: Add missing typedef XenLegacyDevice, Eduardo Habkost, 2020/08/27
- [PULL 26/53] spapr: Move typedef SpaprMachineState to spapr.h, Eduardo Habkost, 2020/08/27
- [PULL 27/53] s390x: Move typedef SCLPEventFacility to event-facility.h, Eduardo Habkost, 2020/08/27