aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEduardo Habkost <ehabkost@redhat.com>2020-08-25 15:20:16 -0400
committerEduardo Habkost <ehabkost@redhat.com>2020-08-27 14:04:54 -0400
commit3c03b563706bcf64ad4d8d63bd56e5bfb8141efc (patch)
treed71f60503f1d7be765b28fe56fb6537bd453e478
parent3932885af6878cc2486213c71c308cd5bc0db36b (diff)
downloadqemu-3c03b563706bcf64ad4d8d63bd56e5bfb8141efc.zip
qemu-3c03b563706bcf64ad4d8d63bd56e5bfb8141efc.tar.gz
qemu-3c03b563706bcf64ad4d8d63bd56e5bfb8141efc.tar.bz2
mcf_fec: Move mcf_fec_state typedef to header
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>
-rw-r--r--hw/net/mcf_fec.c4
-rw-r--r--include/hw/m68k/mcf_fec.h1
2 files changed, 3 insertions, 2 deletions
diff --git a/hw/net/mcf_fec.c b/hw/net/mcf_fec.c
index 2813458..25e3e45 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
diff --git a/include/hw/m68k/mcf_fec.h b/include/hw/m68k/mcf_fec.h
index eeb471f..c09e33a 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