ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mcf_fec: convert to memory API 

Signed-off-by: Benoît Canet <benoit.canet@gmail.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Benoît Canet 2011-11-24 14:31:14 +01:00 committed by Avi Kivity
parent aa6e4986b8
commit c65fc1dff3
3 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/mcf.h
View File

@ -18,7 +18,8 @@ void mcf_uart_mm_init(struct MemoryRegion *sysmem,
qemu_irq *mcf_intc_init(target_phys_addr_t base, CPUState *env); qemu_irq *mcf_intc_init(target_phys_addr_t base, CPUState *env);
/* mcf_fec.c */ /* mcf_fec.c */
void mcf_fec_init(NICInfo *nd, target_phys_addr_t base, qemu_irq *irq); void mcf_fec_init(struct MemoryRegion *sysmem, NICInfo *nd,
target_phys_addr_t base, qemu_irq *irq);
/* mcf5206.c */ /* mcf5206.c */
qemu_irq *mcf5206_init(struct MemoryRegion *sysmem, qemu_irq *mcf5206_init(struct MemoryRegion *sysmem,

3
hw/mcf5208.c
View File

@ -234,7 +234,8 @@ static void mcf5208evb_init(ram_addr_t ram_size,
exit(1); exit(1);
} }
if (nd_table[0].vlan) if (nd_table[0].vlan)
mcf_fec_init(&nd_table[0], 0xfc030000, pic + 36); mcf_fec_init(address_space_mem, &nd_table[0],
0xfc030000, pic + 36);
/* 0xfc000000 SCM. */ /* 0xfc000000 SCM. */
/* 0xfc004000 XBS. */ /* 0xfc004000 XBS. */

38
hw/mcf_fec.c
View File

@ -10,6 +10,7 @@
#include "mcf.h" #include "mcf.h"
/* For crc32 */ /* For crc32 */
#include <zlib.h> #include <zlib.h>
#include "exec-memory.h"
//#define DEBUG_FEC 1 //#define DEBUG_FEC 1
@ -23,8 +24,9 @@ do { printf("mcf_fec: " fmt , ## __VA_ARGS__); } while (0)
#define FEC_MAX_FRAME_SIZE 2032 #define FEC_MAX_FRAME_SIZE 2032
typedef struct { typedef struct {
MemoryRegion *sysmem;
MemoryRegion iomem;
qemu_irq *irq; qemu_irq *irq;
int mmio_index;
NICState *nic; NICState *nic;
NICConf conf; NICConf conf;
uint32_t irq_state; uint32_t irq_state;
@ -214,7 +216,8 @@ static void mcf_fec_reset(mcf_fec_state *s)
s->rfsr = 0x500; s->rfsr = 0x500;
} }
static uint32_t mcf_fec_read(void *opaque, target_phys_addr_t addr) static uint64_t mcf_fec_read(void *opaque, target_phys_addr_t addr,
unsigned size)
{ {
mcf_fec_state *s = (mcf_fec_state *)opaque; mcf_fec_state *s = (mcf_fec_state *)opaque;
switch (addr & 0x3ff) { switch (addr & 0x3ff) {
@ -251,7 +254,8 @@ static uint32_t mcf_fec_read(void *opaque, target_phys_addr_t addr)
} }
} }
static void mcf_fec_write(void *opaque, target_phys_addr_t addr, uint32_t value) static void mcf_fec_write(void *opaque, target_phys_addr_t addr,
uint64_t value, unsigned size)
{ {
mcf_fec_state *s = (mcf_fec_state *)opaque; mcf_fec_state *s = (mcf_fec_state *)opaque;
switch (addr & 0x3ff) { switch (addr & 0x3ff) {
@ -429,23 +433,18 @@ static ssize_t mcf_fec_receive(VLANClientState *nc, const uint8_t *buf, size_t s
return size; return size;
} }
static CPUReadMemoryFunc * const mcf_fec_readfn[] = { static const MemoryRegionOps mcf_fec_ops = {
mcf_fec_read, .read = mcf_fec_read,
mcf_fec_read, .write = mcf_fec_write,
mcf_fec_read .endianness = DEVICE_NATIVE_ENDIAN,
};
static CPUWriteMemoryFunc * const mcf_fec_writefn[] = {
mcf_fec_write,
mcf_fec_write,
mcf_fec_write
}; };
static void mcf_fec_cleanup(VLANClientState *nc) static void mcf_fec_cleanup(VLANClientState *nc)
{ {
mcf_fec_state *s = DO_UPCAST(NICState, nc, nc)->opaque; mcf_fec_state *s = DO_UPCAST(NICState, nc, nc)->opaque;
cpu_unregister_io_memory(s->mmio_index); memory_region_del_subregion(s->sysmem, &s->iomem);
memory_region_destroy(&s->iomem);
g_free(s); g_free(s);
} }
@ -458,18 +457,19 @@ static NetClientInfo net_mcf_fec_info = {
.cleanup = mcf_fec_cleanup, .cleanup = mcf_fec_cleanup,
}; };
void mcf_fec_init(NICInfo *nd, target_phys_addr_t base, qemu_irq *irq) void mcf_fec_init(MemoryRegion *sysmem, NICInfo *nd,
target_phys_addr_t base, qemu_irq *irq)
{ {
mcf_fec_state *s; mcf_fec_state *s;
qemu_check_nic_model(nd, "mcf_fec"); qemu_check_nic_model(nd, "mcf_fec");
s = (mcf_fec_state *)g_malloc0(sizeof(mcf_fec_state)); s = (mcf_fec_state *)g_malloc0(sizeof(mcf_fec_state));
s->sysmem = sysmem;
s->irq = irq; s->irq = irq;
s->mmio_index = cpu_register_io_memory(mcf_fec_readfn,
mcf_fec_writefn, s, memory_region_init_io(&s->iomem, &mcf_fec_ops, s, "fec", 0x400);
DEVICE_NATIVE_ENDIAN); memory_region_add_subregion(sysmem, base, &s->iomem);
cpu_register_physical_memory(base, 0x400, s->mmio_index);
s->conf.macaddr = nd->macaddr; s->conf.macaddr = nd->macaddr;
s->conf.vlan = nd->vlan; s->conf.vlan = nd->vlan;