vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net: convert etrax to NICState 

Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
master
Mark McLoughlin 2009-11-25 18:49:18 +00:00 committed by Anthony Liguori
parent 05f41fe365
commit 163bf3a56d
1 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
hw/etraxfs_eth.c
View File

@ -319,7 +319,8 @@ static void mdio_cycle(struct qemu_mdio *bus)
struct fs_eth
{
VLANClientState *vc;
NICState *nic;
NICConf conf;
int ethregs;
/* Two addrs in the filter. */
@ -495,15 +496,15 @@ static int eth_match_groupaddr(struct fs_eth *eth, const unsigned char *sa)
return match;
}
static int eth_can_receive(VLANClientState *vc)
static int eth_can_receive(VLANClientState *nc)
{
return 1;
}
static ssize_t eth_receive(VLANClientState *vc, const uint8_t *buf, size_t size)
static ssize_t eth_receive(VLANClientState *nc, const uint8_t *buf, size_t size)
{
unsigned char sa_bcast[6] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
struct fs_eth *eth = vc->opaque;
struct fs_eth *eth = DO_UPCAST(NICState, nc, nc)->opaque;
int use_ma0 = eth->regs[RW_REC_CTRL] & 1;
int use_ma1 = eth->regs[RW_REC_CTRL] & 2;
int r_bcast = eth->regs[RW_REC_CTRL] & 8;
@ -533,15 +534,15 @@ static int eth_tx_push(void *opaque, unsigned char *buf, int len)
struct fs_eth *eth = opaque;
D(printf("%s buf=%p len=%d\n", __func__, buf, len));
qemu_send_packet(eth->vc, buf, len);
qemu_send_packet(&eth->nic->nc, buf, len);
return len;
}
static void eth_set_link(VLANClientState *vc)
static void eth_set_link(VLANClientState *nc)
{
struct fs_eth *eth = vc->opaque;
D(printf("%s %d\n", __func__, vc->link_down));
eth->phy.link = !vc->link_down;
struct fs_eth *eth = DO_UPCAST(NICState, nc, nc)->opaque;
D(printf("%s %d\n", __func__, nc->link_down));
eth->phy.link = !nc->link_down;
}
static CPUReadMemoryFunc * const eth_read[] = {
@ -554,9 +555,9 @@ static CPUWriteMemoryFunc * const eth_write[] = {
&eth_writel,
};
static void eth_cleanup(VLANClientState *vc)
static void eth_cleanup(VLANClientState *nc)
{
struct fs_eth *eth = vc->opaque;
struct fs_eth *eth = DO_UPCAST(NICState, nc, nc)->opaque;
cpu_unregister_io_memory(eth->ethregs);
@ -564,6 +565,15 @@ static void eth_cleanup(VLANClientState *vc)
qemu_free(eth);
}
static NetClientInfo net_etraxfs_info = {
.type = NET_CLIENT_TYPE_NIC,
.size = sizeof(NICState),
.can_receive = eth_can_receive,
.receive = eth_receive,
.cleanup = eth_cleanup,
.link_status_changed = eth_set_link,
};
void *etraxfs_eth_init(NICInfo *nd, target_phys_addr_t base, int phyaddr)
{
struct etraxfs_dma_client *dma = NULL;
@ -590,13 +600,12 @@ void *etraxfs_eth_init(NICInfo *nd, target_phys_addr_t base, int phyaddr)
eth->ethregs = cpu_register_io_memory(eth_read, eth_write, eth);
cpu_register_physical_memory (base, 0x5c, eth->ethregs);
eth->vc = qemu_new_vlan_client(NET_CLIENT_TYPE_NIC,
nd->vlan, nd->netdev,
nd->model, nd->name,
eth_can_receive, eth_receive,
NULL, NULL, eth_cleanup, eth);
eth->vc->opaque = eth;
eth->vc->link_status_changed = eth_set_link;
memcpy(eth->conf.macaddr.a, nd->macaddr, sizeof(nd->macaddr));
eth->conf.vlan = nd->vlan;
eth->conf.peer = nd->netdev;
eth->nic = qemu_new_nic(&net_etraxfs_info, &eth->conf,
nd->model, nd->name, eth);
return dma;
}