From: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [6226] ETRAX: Always provide a valid net model.
Date: Wed, 07 Jan 2009 22:46:50 +0000 [thread overview]
Message-ID: <E1LKhAo-0007Nv-TU@cvs.savannah.gnu.org> (raw)
Revision: 6226
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6226
Author: edgar_igl
Date: 2009-01-07 22:46:50 +0000 (Wed, 07 Jan 2009)
Log Message:
-----------
ETRAX: Always provide a valid net model.
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Modified Paths:
--------------
trunk/hw/axis_dev88.c
trunk/hw/etraxfs.c
Modified: trunk/hw/axis_dev88.c
===================================================================
--- trunk/hw/axis_dev88.c 2009-01-07 20:07:09 UTC (rev 6225)
+++ trunk/hw/axis_dev88.c 2009-01-07 22:46:50 UTC (rev 6226)
@@ -303,9 +303,12 @@
}
/* 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]);
Modified: trunk/hw/etraxfs.c
===================================================================
--- trunk/hw/etraxfs.c 2009-01-07 20:07:09 UTC (rev 6225)
+++ trunk/hw/etraxfs.c 2009-01-07 22:46:50 UTC (rev 6226)
@@ -94,9 +94,12 @@
}
/* 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]);
reply other threads:[~2009-01-07 22:46 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1LKhAo-0007Nv-TU@cvs.savannah.gnu.org \
--to=edgar.iglesias@gmail.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).