proxmox-mirrors/qemu
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu synced 2025-07-09 08:42:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

etrax-eth: Convert to MemoryRegion

Browse Source 
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Edgar E. Iglesias 2011-08-11 13:47:48 +02:00 committed by Avi Kivity
parent 9dcb06ce1d
commit 06dccb82df
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
hw/etraxfs_eth.c
View File

@ -320,6 +320,7 @@ static void mdio_cycle(struct qemu_mdio *bus)
struct fs_eth struct fs_eth
{ {
SysBusDevice busdev; SysBusDevice busdev;
MemoryRegion mmio;
NICState *nic; NICState *nic;
NICConf conf; NICConf conf;
int ethregs; int ethregs;
@ -373,7 +374,8 @@ static void eth_validate_duplex(struct fs_eth *eth)
} }
} }
static uint32_t eth_readl (void *opaque, target_phys_addr_t addr) static uint64_t
eth_read(void *opaque, target_phys_addr_t addr, unsigned int size)
{ {
struct fs_eth *eth = opaque; struct fs_eth *eth = opaque;
uint32_t r = 0; uint32_t r = 0;
@ -417,9 +419,11 @@ static void eth_update_ma(struct fs_eth *eth, int ma)
} }
static void static void
eth_writel (void *opaque, target_phys_addr_t addr, uint32_t value) eth_write(void *opaque, target_phys_addr_t addr,
uint64_t val64, unsigned int size)
{ {
struct fs_eth *eth = opaque; struct fs_eth *eth = opaque;
uint32_t value = val64;
addr >>= 2; addr >>= 2;
switch (addr) switch (addr)
@ -553,14 +557,14 @@ static void eth_set_link(VLANClientState *nc)
eth->phy.link = !nc->link_down; eth->phy.link = !nc->link_down;
} }
static CPUReadMemoryFunc * const eth_read[] = { static const MemoryRegionOps eth_ops = {
NULL, NULL, .read = eth_read,
&eth_readl, .write = eth_write,
}; .endianness = DEVICE_LITTLE_ENDIAN,
.valid = {
static CPUWriteMemoryFunc * const eth_write[] = { .min_access_size = 4,
NULL, NULL, .max_access_size = 4
&eth_writel, }
}; };
static void eth_cleanup(VLANClientState *nc) static void eth_cleanup(VLANClientState *nc)
@ -589,7 +593,6 @@ static NetClientInfo net_etraxfs_info = {
static int fs_eth_init(SysBusDevice *dev) static int fs_eth_init(SysBusDevice *dev)
{ {
struct fs_eth *s = FROM_SYSBUS(typeof(*s), dev); struct fs_eth *s = FROM_SYSBUS(typeof(*s), dev);
int eth_regs;
if (!s->dma_out || !s->dma_in) { if (!s->dma_out || !s->dma_in) {
hw_error("Unconnected ETRAX-FS Ethernet MAC.\n"); hw_error("Unconnected ETRAX-FS Ethernet MAC.\n");
@ -600,9 +603,8 @@ static int fs_eth_init(SysBusDevice *dev)
s->dma_in->client.opaque = s; s->dma_in->client.opaque = s;
s->dma_in->client.pull = NULL; s->dma_in->client.pull = NULL;
eth_regs = cpu_register_io_memory(eth_read, eth_write, s, memory_region_init_io(&s->mmio, &eth_ops, s, "etraxfs-eth", 0x5c);
DEVICE_LITTLE_ENDIAN); sysbus_init_mmio_region(dev, &s->mmio);
sysbus_init_mmio(dev, 0x5c, eth_regs);
qemu_macaddr_default_if_unset(&s->conf.macaddr); qemu_macaddr_default_if_unset(&s->conf.macaddr);
s->nic = qemu_new_nic(&net_etraxfs_info, &s->conf, s->nic = qemu_new_nic(&net_etraxfs_info, &s->conf,