Re: [PATCH v3 13/23] hw/net/dp8393x.c: move TYPE_DP8393X and dp8393xState into dp8393x.h

[Jason Wang]

On Mon, Jun 5, 2023 at 12:18 AM Laurent Vivier <laurent@vivier.eu> wrote:
>
> Jason,
>
> if you agree with the changes I will merge them via the m68k branch.

Yes.

Acked-by: Jason Wang <jasowang@redhat.com>

Thanks

>
> Thanks,
> Laurent
>
> Le 04/06/2023 à 15:14, Mark Cave-Ayland a écrit :
> > This is to enable them to be used outside of dp8393x.c.
> >
> > Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> > CC: Jason Wang <jasowang@redhat.com>
> > Reviewed-by: Laurent Vivier <laurent@vivier.eu>
> > ---
> >   hw/net/dp8393x.c         | 32 +--------------------
> >   include/hw/net/dp8393x.h | 60 ++++++++++++++++++++++++++++++++++++++++
> >   2 files changed, 61 insertions(+), 31 deletions(-)
> >   create mode 100644 include/hw/net/dp8393x.h
> >
> > diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c
> > index 45b954e46c..a596f7fbc6 100644
> > --- a/hw/net/dp8393x.c
> > +++ b/hw/net/dp8393x.c
> > @@ -20,6 +20,7 @@
> >   #include "qemu/osdep.h"
> >   #include "hw/irq.h"
> >   #include "hw/qdev-properties.h"
> > +#include "hw/net/dp8393x.h"
> >   #include "hw/sysbus.h"
> >   #include "migration/vmstate.h"
> >   #include "net/net.h"
> > @@ -85,7 +86,6 @@ static const char *reg_names[] = {
> >   #define SONIC_MPT    0x2e
> >   #define SONIC_MDT    0x2f
> >   #define SONIC_DCR2   0x3f
> > -#define SONIC_REG_COUNT  0x40
> >
> >   #define SONIC_CR_HTX     0x0001
> >   #define SONIC_CR_TXP     0x0002
> > @@ -139,36 +139,6 @@ static const char *reg_names[] = {
> >   #define SONIC_DESC_EOL   0x0001
> >   #define SONIC_DESC_ADDR  0xFFFE
> >
> > -#define TYPE_DP8393X "dp8393x"
> > -OBJECT_DECLARE_SIMPLE_TYPE(dp8393xState, DP8393X)
> > -
> > -struct dp8393xState {
> > -    SysBusDevice parent_obj;
> > -
> > -    /* Hardware */
> > -    uint8_t it_shift;
> > -    bool big_endian;
> > -    bool last_rba_is_full;
> > -    qemu_irq irq;
> > -    int irq_level;
> > -    QEMUTimer *watchdog;
> > -    int64_t wt_last_update;
> > -    NICConf conf;
> > -    NICState *nic;
> > -    MemoryRegion mmio;
> > -
> > -    /* Registers */
> > -    uint16_t cam[16][3];
> > -    uint16_t regs[SONIC_REG_COUNT];
> > -
> > -    /* Temporaries */
> > -    uint8_t tx_buffer[0x10000];
> > -    int loopback_packet;
> > -
> > -    /* Memory access */
> > -    MemoryRegion *dma_mr;
> > -    AddressSpace as;
> > -};
> >
> >   /*
> >    * Accessor functions for values which are formed by
> > diff --git a/include/hw/net/dp8393x.h b/include/hw/net/dp8393x.h
> > new file mode 100644
> > index 0000000000..4a3f7478be
> > --- /dev/null
> > +++ b/include/hw/net/dp8393x.h
> > @@ -0,0 +1,60 @@
> > +/*
> > + * QEMU NS SONIC DP8393x netcard
> > + *
> > + * Copyright (c) 2008-2009 Herve Poussineau
> > + *
> > + * This program is free software; you can redistribute it and/or
> > + * modify it under the terms of the GNU General Public License as
> > + * published by the Free Software Foundation; either version 2 of
> > + * the License, or (at your option) any later version.
> > + *
> > + * This program is distributed in the hope that it will be useful,
> > + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > + * GNU General Public License for more details.
> > + *
> > + * You should have received a copy of the GNU General Public License along
> > + * with this program; if not, see <http://www.gnu.org/licenses/>.
> > + */
> > +
> > +#ifndef HW_NET_DP8393X_H
> > +#define HW_NET_DP8393X_H
> > +
> > +#include "hw/sysbus.h"
> > +#include "net/net.h"
> > +#include "exec/memory.h"
> > +
> > +#define SONIC_REG_COUNT  0x40
> > +
> > +#define TYPE_DP8393X "dp8393x"
> > +OBJECT_DECLARE_SIMPLE_TYPE(dp8393xState, DP8393X)
> > +
> > +struct dp8393xState {
> > +    SysBusDevice parent_obj;
> > +
> > +    /* Hardware */
> > +    uint8_t it_shift;
> > +    bool big_endian;
> > +    bool last_rba_is_full;
> > +    qemu_irq irq;
> > +    int irq_level;
> > +    QEMUTimer *watchdog;
> > +    int64_t wt_last_update;
> > +    NICConf conf;
> > +    NICState *nic;
> > +    MemoryRegion mmio;
> > +
> > +    /* Registers */
> > +    uint16_t cam[16][3];
> > +    uint16_t regs[SONIC_REG_COUNT];
> > +
> > +    /* Temporaries */
> > +    uint8_t tx_buffer[0x10000];
> > +    int loopback_packet;
> > +
> > +    /* Memory access */
> > +    MemoryRegion *dma_mr;
> > +    AddressSpace as;
> > +};
> > +
> > +#endif
>
>