On 20/08/2020 02.11, Eduardo Habkost wrote:
> 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é <berra...@redhat.com>
> Signed-off-by: Eduardo Habkost <ehabk...@redhat.com>
> ---
> Changes v1 -> v2: none
>
> ---
> Cc: Thomas Huth <h...@tuxfamily.org>
> Cc: Jason Wang <jasow...@redhat.com>
> Cc: qemu-devel@nongnu.org
> ---
> 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
>
Reviewed-by: Thomas Huth <th...@redhat.com>
