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

etrax: Remove unused eth irq line. 

The ethernet blocks irq line to report errors is unimplemented in QEMU.
Remove it for now.

Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
This commit is contained in:
Edgar E. Iglesias 2009-05-18 21:34:00 +02:00
parent 340d96e7ce
commit 678fdca87a
4 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/axis_dev88.c
View File

@ -302,10 +302,9 @@ void axisdev88_init (ram_addr_t ram_size,
} }
/* Add the two ethernet blocks. */ /* Add the two ethernet blocks. */
eth[0] = etraxfs_eth_init(&nd_table[0], env, irq + 25, 0x30034000, 1); eth[0] = etraxfs_eth_init(&nd_table[0], env, 0x30034000, 1);
if (nb_nics > 1) if (nb_nics > 1)
eth[1] = etraxfs_eth_init(&nd_table[1], env, eth[1] = etraxfs_eth_init(&nd_table[1], env, 0x30036000, 2);
irq + 26, 0x30036000, 2);
/* The DMA Connector block is missing, hardwire things for now. */ /* The DMA Connector block is missing, hardwire things for now. */
etraxfs_dmac_connect_client(etraxfs_dmac, 0, eth[0]); etraxfs_dmac_connect_client(etraxfs_dmac, 0, eth[0]);

5
hw/etraxfs.c
View File

@ -93,10 +93,9 @@ void bareetraxfs_init (ram_addr_t ram_size,
} }
/* Add the two ethernet blocks. */ /* Add the two ethernet blocks. */
eth[0] = etraxfs_eth_init(&nd_table[0], env, irq + 25, 0x30034000, 1); eth[0] = etraxfs_eth_init(&nd_table[0], env, 0x30034000, 1);
if (nb_nics > 1) if (nb_nics > 1)
eth[1] = etraxfs_eth_init(&nd_table[1], env, eth[1] = etraxfs_eth_init(&nd_table[1], env, 0x30036000, 2);
irq + 26, 0x30036000, 2);
/* The DMA Connector block is missing, hardwire things for now. */ /* The DMA Connector block is missing, hardwire things for now. */
etraxfs_dmac_connect_client(etraxfs_dmac, 0, eth[0]); etraxfs_dmac_connect_client(etraxfs_dmac, 0, eth[0]);

2
hw/etraxfs.h
View File

@ -26,4 +26,4 @@
qemu_irq *etraxfs_pic_init(CPUState *env, target_phys_addr_t base); qemu_irq *etraxfs_pic_init(CPUState *env, target_phys_addr_t base);
void *etraxfs_eth_init(NICInfo *nd, CPUState *env, void *etraxfs_eth_init(NICInfo *nd, CPUState *env,
qemu_irq *irq, target_phys_addr_t base, int phyaddr); target_phys_addr_t base, int phyaddr);

4
hw/etraxfs_eth.c
View File

@ -320,7 +320,6 @@ static void mdio_cycle(struct qemu_mdio *bus)
struct fs_eth struct fs_eth
{ {
CPUState *env; CPUState *env;
qemu_irq *irq;
VLANClientState *vc; VLANClientState *vc;
int ethregs; int ethregs;
@ -565,7 +564,7 @@ static void eth_cleanup(VLANClientState *vc)
} }
void *etraxfs_eth_init(NICInfo *nd, CPUState *env, void *etraxfs_eth_init(NICInfo *nd, CPUState *env,
qemu_irq *irq, target_phys_addr_t base, int phyaddr) target_phys_addr_t base, int phyaddr)
{ {
struct etraxfs_dma_client *dma = NULL; struct etraxfs_dma_client *dma = NULL;
struct fs_eth *eth = NULL; struct fs_eth *eth = NULL;
@ -582,7 +581,6 @@ void *etraxfs_eth_init(NICInfo *nd, CPUState *env,
dma[1].client.pull = NULL; dma[1].client.pull = NULL;
eth->env = env; eth->env = env;
eth->irq = irq;
eth->dma_out = dma; eth->dma_out = dma;
eth->dma_in = dma + 1; eth->dma_in = dma + 1;