aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authoredgar_igl <edgar_igl@c046a42c-6fe2-441c-8c8c-71466251a162>2008-05-18 08:51:28 +0000
committeredgar_igl <edgar_igl@c046a42c-6fe2-441c-8c8c-71466251a162>2008-05-18 08:51:28 +0000
commit4eeed608c5999f52c1fe682262721fb01aee26e9 (patch)
tree8e56fa3f84efdc99544911dbc2848e8287df0962 /hw
parentf6953f1345daeea02986fcb78d19f4727bf9992c (diff)
ETRAX: Connect both ethernet controllers.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4488 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw')
-rw-r--r--hw/etraxfs.c16
1 files changed, 11 insertions, 5 deletions
diff --git a/hw/etraxfs.c b/hw/etraxfs.c
index 19ec21c37f..7b3e2ab671 100644
--- a/hw/etraxfs.c
+++ b/hw/etraxfs.c
@@ -60,7 +60,7 @@ void bareetraxfs_init (ram_addr_t ram_size, int vga_ram_size,
{
CPUState *env;
qemu_irq *pic;
- struct etraxfs_dma_client *eth0;
+ struct etraxfs_dma_client *eth[2] = {NULL, NULL};
int kernel_size;
int i;
ram_addr_t phys_ram;
@@ -106,12 +106,18 @@ void bareetraxfs_init (ram_addr_t ram_size, int vga_ram_size,
etraxfs_dmac_connect(etraxfs_dmac, i, pic + 7 + i, i & 1);
}
- /* It has 2, but let's start with one ethernet block. */
- eth0 = etraxfs_eth_init(&nd_table[0], env, pic + 25, 0xb0034000);
+ /* Add the two ethernet blocks. */
+ eth[0] = etraxfs_eth_init(&nd_table[0], env, pic + 25, 0xb0034000);
+ if (&nd_table[1])
+ eth[1] = etraxfs_eth_init(&nd_table[1], env, pic + 26, 0xb0036000);
/* The DMA Connector block is missing, hardwire things for now. */
- etraxfs_dmac_connect_client(etraxfs_dmac, 0, eth0);
- etraxfs_dmac_connect_client(etraxfs_dmac, 1, eth0 + 1);
+ etraxfs_dmac_connect_client(etraxfs_dmac, 0, eth[0]);
+ etraxfs_dmac_connect_client(etraxfs_dmac, 1, eth[0] + 1);
+ if (eth[1]) {
+ etraxfs_dmac_connect_client(etraxfs_dmac, 6, eth[1]);
+ etraxfs_dmac_connect_client(etraxfs_dmac, 7, eth[1] + 1);
+ }
/* 2 timers. */
etraxfs_timer_init(env, pic + 0x1b, 0xb001e000);