Browse Source

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>
Eduardo Habkost 5 years ago
parent
commit
3c03b56370
2 changed files with 3 additions and 2 deletions
  1. 2 2
      hw/net/mcf_fec.c
  2. 1 0
      include/hw/m68k/mcf_fec.h

+ 2 - 2
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_MAX_FRAME_SIZE 2032
 #define FEC_MIB_SIZE 64
 #define FEC_MIB_SIZE 64
 
 
-typedef struct {
+struct mcf_fec_state {
     SysBusDevice parent_obj;
     SysBusDevice parent_obj;
 
 
     MemoryRegion iomem;
     MemoryRegion iomem;
@@ -56,7 +56,7 @@ typedef struct {
     uint32_t etdsr;
     uint32_t etdsr;
     uint32_t emrbr;
     uint32_t emrbr;
     uint32_t mib[FEC_MIB_SIZE];
     uint32_t mib[FEC_MIB_SIZE];
-} mcf_fec_state;
+};
 
 
 #define FEC_INT_HB   0x80000000
 #define FEC_INT_HB   0x80000000
 #define FEC_INT_BABR 0x40000000
 #define FEC_INT_BABR 0x40000000

+ 1 - 0
include/hw/m68k/mcf_fec.h

@@ -11,6 +11,7 @@
 #define HW_M68K_MCF_FEC_H
 #define HW_M68K_MCF_FEC_H
 
 
 #define TYPE_MCF_FEC_NET "mcf-fec"
 #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 MCF_FEC_NET(obj) OBJECT_CHECK(mcf_fec_state, (obj), TYPE_MCF_FEC_NET)
 
 
 #define FEC_NUM_IRQ 13
 #define FEC_NUM_IRQ 13