diff options
author | j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-04-04 08:00:14 +0000 |
---|---|---|
committer | j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-04-04 08:00:14 +0000 |
commit | 3079c59ac254cd2316c529a9e45cc9e1146434f5 (patch) | |
tree | f2485f9c48b2297090a21a0e3b947a820efb6888 /hw | |
parent | b62b461bd3850d21c18056a94181828c94ea2f79 (diff) |
Change NIC registration to be consistent with other machines definitions.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2594 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw')
-rw-r--r-- | hw/ppc_chrp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/ppc_chrp.c b/hw/ppc_chrp.c index e9d6670e43..55ca6ac532 100644 --- a/hw/ppc_chrp.c +++ b/hw/ppc_chrp.c @@ -473,14 +473,14 @@ static void ppc_chrp_init (int ram_size, int vga_ram_size, int boot_device, /* XXX: suppress that */ isa_pic = pic_init(pic_irq_request, NULL); - + /* XXX: use Mac Serial port */ serial_init(&pic_set_irq_new, isa_pic, 0x3f8, 4, serial_hds[0]); - for(i = 0; i < nb_nics; i++) { - pci_ne2000_init(pci_bus, &nd_table[i], -1); + if (!nd_table[i].model) + nd_table[i].model = "ne2k_pci"; + pci_nic_init(pci_bus, &nd_table[i], -1); } - #if 1 ide0_mem_index = pmac_ide_init(&bs_table[0], set_irq, pic, 0x13); ide1_mem_index = pmac_ide_init(&bs_table[2], set_irq, pic, 0x14); |