From c1e1a491906bd1d769edb16f2b2be7ff6833d26f Mon Sep 17 00:00:00 2001 From: edgar_igl Date: Wed, 7 Jan 2009 22:46:50 +0000 Subject: [PATCH] ETRAX: Always provide a valid net model. Signed-off-by: Edgar E. Iglesias git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6226 c046a42c-6fe2-441c-8c8c-71466251a162 --- hw/axis_dev88.c | 5 ++++- hw/etraxfs.c | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/hw/axis_dev88.c b/hw/axis_dev88.c index 3f90fa538e..f7bdd1465b 100644 --- a/hw/axis_dev88.c +++ b/hw/axis_dev88.c @@ -303,9 +303,12 @@ void axisdev88_init (ram_addr_t ram_size, int vga_ram_size, } /* Add the two ethernet blocks. */ + nd_table[0].model = nd_table[0].model ? nd_table[0].model : "fseth"; eth[0] = etraxfs_eth_init(&nd_table[0], env, pic->irq + 25, 0x30034000); - if (nb_nics > 1) + if (nb_nics > 1) { + nd_table[1].model = nd_table[1].model ? nd_table[1].model : "fseth"; eth[1] = etraxfs_eth_init(&nd_table[1], env, pic->irq + 26, 0x30036000); + } /* 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 5cd56f3699..01b5a6e6fe 100644 --- a/hw/etraxfs.c +++ b/hw/etraxfs.c @@ -94,9 +94,12 @@ void bareetraxfs_init (ram_addr_t ram_size, int vga_ram_size, } /* Add the two ethernet blocks. */ + nd_table[0].model = nd_table[0].model ? nd_table[0].model : "fseth"; eth[0] = etraxfs_eth_init(&nd_table[0], env, pic->irq + 25, 0x30034000); - if (nb_nics > 1) + if (nb_nics > 1) { + nd_table[1].model = nd_table[1].model ? nd_table[1].model : "fseth"; eth[1] = etraxfs_eth_init(&nd_table[1], env, pic->irq + 26, 0x30036000); + } /* The DMA Connector block is missing, hardwire things for now. */ etraxfs_dmac_connect_client(etraxfs_dmac, 0, eth[0]); -- 2.11.4.GIT