diff options
| -rw-r--r-- | hw/axis_dev88.c | 5 | ||||
| -rw-r--r-- | hw/etraxfs.c | 5 | ||||
| -rw-r--r-- | hw/etraxfs.h | 2 | ||||
| -rw-r--r-- | hw/etraxfs_eth.c | 4 |
4 files changed, 6 insertions, 10 deletions
diff --git a/hw/axis_dev88.c b/hw/axis_dev88.c index 74bc133985..980f609031 100644 --- a/hw/axis_dev88.c +++ b/hw/axis_dev88.c @@ -302,10 +302,9 @@ void axisdev88_init (ram_addr_t ram_size, } /* 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) - eth[1] = etraxfs_eth_init(&nd_table[1], env, - irq + 26, 0x30036000, 2); + eth[1] = etraxfs_eth_init(&nd_table[1], env, 0x30036000, 2); /* The DMA Connector block is missing, hardwire things for now. */ etraxfs_dmac_connect_client(etraxfs_dmac, 0, eth[0]); diff --git a/hw/etraxfs.c b/hw/etraxfs.c index d67592926e..7b2db91979 100644 --- a/hw/etraxfs.c +++ b/hw/etraxfs.c @@ -93,10 +93,9 @@ void bareetraxfs_init (ram_addr_t ram_size, } /* 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) - eth[1] = etraxfs_eth_init(&nd_table[1], env, - irq + 26, 0x30036000, 2); + eth[1] = etraxfs_eth_init(&nd_table[1], env, 0x30036000, 2); /* The DMA Connector block is missing, hardwire things for now. */ etraxfs_dmac_connect_client(etraxfs_dmac, 0, eth[0]); diff --git a/hw/etraxfs.h b/hw/etraxfs.h index f11572a05f..cdbe58bd9b 100644 --- a/hw/etraxfs.h +++ b/hw/etraxfs.h @@ -26,4 +26,4 @@ qemu_irq *etraxfs_pic_init(CPUState *env, target_phys_addr_t base); 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); diff --git a/hw/etraxfs_eth.c b/hw/etraxfs_eth.c index bfc19262f5..68b8de38eb 100644 --- a/hw/etraxfs_eth.c +++ b/hw/etraxfs_eth.c @@ -320,7 +320,6 @@ static void mdio_cycle(struct qemu_mdio *bus) struct fs_eth { CPUState *env; - qemu_irq *irq; VLANClientState *vc; int ethregs; @@ -565,7 +564,7 @@ static void eth_cleanup(VLANClientState *vc) } 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 fs_eth *eth = NULL; @@ -582,7 +581,6 @@ void *etraxfs_eth_init(NICInfo *nd, CPUState *env, dma[1].client.pull = NULL; eth->env = env; - eth->irq = irq; eth->dma_out = dma; eth->dma_in = dma + 1; |