diff options
| author | Edgar E. Iglesias <edgar.iglesias@gmail.com> | 2009-06-15 21:00:50 +0200 |
|---|---|---|
| committer | Edgar E. Iglesias <edgar.iglesias@gmail.com> | 2009-06-15 21:00:50 +0200 |
| commit | ba494313d386475e849b536fe0eb1cd05d8dfa68 (patch) | |
| tree | a3550840454f9c3c5e71a0c4117f14eb82a896bb /hw/axis_dev88.c | |
| parent | e510e05b5d68386a0518e69eaf364a34bdb6283c (diff) | |
| download | qemu-ba494313d386475e849b536fe0eb1cd05d8dfa68.tar.gz | |
etrax: Don't pass CPUState to peripherals.
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Diffstat (limited to 'hw/axis_dev88.c')
| -rw-r--r-- | hw/axis_dev88.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/axis_dev88.c b/hw/axis_dev88.c index fc527cbecb..c4e09dd5ee 100644 --- a/hw/axis_dev88.c +++ b/hw/axis_dev88.c @@ -309,16 +309,16 @@ void axisdev88_init (ram_addr_t ram_size, nmi[0] = qdev_get_gpio_in(dev, 30); nmi[1] = qdev_get_gpio_in(dev, 31); - etraxfs_dmac = etraxfs_dmac_init(env, 0x30000000, 10); + etraxfs_dmac = etraxfs_dmac_init(0x30000000, 10); for (i = 0; i < 10; i++) { /* On ETRAX, odd numbered channels are inputs. */ etraxfs_dmac_connect(etraxfs_dmac, i, irq + 7 + i, i & 1); } /* Add the two ethernet blocks. */ - eth[0] = etraxfs_eth_init(&nd_table[0], env, 0x30034000, 1); + eth[0] = etraxfs_eth_init(&nd_table[0], 0x30034000, 1); if (nb_nics > 1) - eth[1] = etraxfs_eth_init(&nd_table[1], env, 0x30036000, 2); + eth[1] = etraxfs_eth_init(&nd_table[1], 0x30036000, 2); /* The DMA Connector block is missing, hardwire things for now. */ etraxfs_dmac_connect_client(etraxfs_dmac, 0, eth[0]); |