1b53ecd909
TYPE_IOMMU_MEMORY_REGION is a direct subtype of TYPE_MEMORY_REGION.
Its instance struct is IOMMUMemoryRegion, and its first member is a
MemoryRegion. Correct. Its class struct is IOMMUMemoryRegionClass,
and its first member is a DeviceClass. Wrong. Messed up when commit
1221a47467 introduced the QOM type. It even included hw/qdev-core.h
just for that.
TYPE_MEMORY_REGION doesn't bother to define a class struct. This is
fine, it simply defaults to its super-type TYPE_OBJECT's class struct
ObjectClass. Changing IOMMUMemoryRegionClass's first member's type to
ObjectClass would be a minimal fix, if a bit brittle: if
TYPE_MEMORY_REGION ever acquired own class struct, we'd have to update
IOMMUMemoryRegionClass to use it.
Fix it the clean and robust way instead: give TYPE_MEMORY_REGION its
own class struct MemoryRegionClass now, and use it for
IOMMUMemoryRegionClass's first member.
Revert the include of hw/qdev-core.h, and fix the few files that have
come to rely on it.
Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20190812052359.30071-5-armbru@redhat.com>
69 lines
2.0 KiB
C
69 lines
2.0 KiB
C
#ifndef HW_PCNET_H
|
|
#define HW_PCNET_H
|
|
|
|
#define PCNET_IOPORT_SIZE 0x20
|
|
#define PCNET_PNPMMIO_SIZE 0x20
|
|
|
|
#define PCNET_LOOPTEST_CRC 1
|
|
#define PCNET_LOOPTEST_NOCRC 2
|
|
|
|
#include "exec/memory.h"
|
|
#include "hw/irq.h"
|
|
|
|
/* BUS CONFIGURATION REGISTERS */
|
|
#define BCR_MSRDA 0
|
|
#define BCR_MSWRA 1
|
|
#define BCR_MC 2
|
|
#define BCR_LNKST 4
|
|
#define BCR_LED1 5
|
|
#define BCR_LED2 6
|
|
#define BCR_LED3 7
|
|
#define BCR_FDC 9
|
|
#define BCR_BSBC 18
|
|
#define BCR_EECAS 19
|
|
#define BCR_SWS 20
|
|
#define BCR_PLAT 22
|
|
|
|
#define BCR_TMAULOOP(S) !!((S)->bcr[BCR_MC ] & 0x4000)
|
|
#define BCR_APROMWE(S) !!((S)->bcr[BCR_MC ] & 0x0100)
|
|
#define BCR_DWIO(S) !!((S)->bcr[BCR_BSBC] & 0x0080)
|
|
#define BCR_SSIZE32(S) !!((S)->bcr[BCR_SWS ] & 0x0100)
|
|
#define BCR_SWSTYLE(S) ((S)->bcr[BCR_SWS ] & 0x00FF)
|
|
|
|
typedef struct PCNetState_st PCNetState;
|
|
|
|
struct PCNetState_st {
|
|
NICState *nic;
|
|
NICConf conf;
|
|
QEMUTimer *poll_timer;
|
|
int rap, isr, lnkst;
|
|
uint32_t rdra, tdra;
|
|
uint8_t prom[16];
|
|
uint16_t csr[128];
|
|
uint16_t bcr[32];
|
|
int xmit_pos;
|
|
uint64_t timer;
|
|
MemoryRegion mmio;
|
|
uint8_t buffer[4096];
|
|
qemu_irq irq;
|
|
void (*phys_mem_read)(void *dma_opaque, hwaddr addr,
|
|
uint8_t *buf, int len, int do_bswap);
|
|
void (*phys_mem_write)(void *dma_opaque, hwaddr addr,
|
|
uint8_t *buf, int len, int do_bswap);
|
|
void *dma_opaque;
|
|
int tx_busy;
|
|
int looptest;
|
|
};
|
|
|
|
void pcnet_h_reset(void *opaque);
|
|
void pcnet_ioport_writew(void *opaque, uint32_t addr, uint32_t val);
|
|
uint32_t pcnet_ioport_readw(void *opaque, uint32_t addr);
|
|
void pcnet_ioport_writel(void *opaque, uint32_t addr, uint32_t val);
|
|
uint32_t pcnet_ioport_readl(void *opaque, uint32_t addr);
|
|
uint32_t pcnet_bcr_readw(PCNetState *s, uint32_t rap);
|
|
ssize_t pcnet_receive(NetClientState *nc, const uint8_t *buf, size_t size_);
|
|
void pcnet_set_link_status(NetClientState *nc);
|
|
void pcnet_common_init(DeviceState *dev, PCNetState *s, NetClientInfo *info);
|
|
extern const VMStateDescription vmstate_pcnet;
|
|
#endif
|