diff options
| author | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-01-13 19:39:36 +0000 |
|---|---|---|
| committer | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-01-13 19:39:36 +0000 |
| commit | 05c2be35e1092ed21b45ab8806e51e604b374cc1 (patch) | |
| tree | 282e33540c3e7b006d41cf9aec84c119f5223aef /hw/stellaris.c | |
| parent | 293769131feb165f9cf3df6fe220cc06acb80372 (diff) | |
| download | qemu-05c2be35e1092ed21b45ab8806e51e604b374cc1.tar.gz qemu-05c2be35e1092ed21b45ab8806e51e604b374cc1.tar.bz2 qemu-05c2be35e1092ed21b45ab8806e51e604b374cc1.zip | |
Check NIC model in some NIC init functions (Mark McLoughlin)
Some NIC init functions are only called when that model is
the only valid model. In that case, it makes sense to use
qemu_check_nic_model() from the NIC init function itself.
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6286 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/stellaris.c')
| -rw-r--r-- | hw/stellaris.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/hw/stellaris.c b/hw/stellaris.c index 703ef7e42c..7069518bd7 100644 --- a/hw/stellaris.c +++ b/hw/stellaris.c @@ -1361,10 +1361,8 @@ static void stellaris_init(const char *kernel_filename, const char *cpu_model, pl022_init(0x40008000, pic[7], NULL, NULL); } } - if (board->dc4 & (1 << 28)) { - /* FIXME: Obey network model. */ + if (board->dc4 & (1 << 28)) stellaris_enet_init(&nd_table[0], 0x40048000, pic[42]); - } if (board->peripherals & BP_GAMEPAD) { qemu_irq gpad_irq[5]; static const int gpad_keycode[5] = { 0xc8, 0xd0, 0xcb, 0xcd, 0x1d }; |