Commit 3079c59ac254cd2316c529a9e45cc9e1146434f5
1 parent
b62b461b
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
Showing
1 changed file
with
4 additions
and
4 deletions
hw/ppc_chrp.c
| @@ -473,14 +473,14 @@ static void ppc_chrp_init (int ram_size, int vga_ram_size, int boot_device, | @@ -473,14 +473,14 @@ static void ppc_chrp_init (int ram_size, int vga_ram_size, int boot_device, | ||
| 473 | 473 | ||
| 474 | /* XXX: suppress that */ | 474 | /* XXX: suppress that */ |
| 475 | isa_pic = pic_init(pic_irq_request, NULL); | 475 | isa_pic = pic_init(pic_irq_request, NULL); |
| 476 | - | 476 | + |
| 477 | /* XXX: use Mac Serial port */ | 477 | /* XXX: use Mac Serial port */ |
| 478 | serial_init(&pic_set_irq_new, isa_pic, 0x3f8, 4, serial_hds[0]); | 478 | serial_init(&pic_set_irq_new, isa_pic, 0x3f8, 4, serial_hds[0]); |
| 479 | - | ||
| 480 | for(i = 0; i < nb_nics; i++) { | 479 | for(i = 0; i < nb_nics; i++) { |
| 481 | - pci_ne2000_init(pci_bus, &nd_table[i], -1); | 480 | + if (!nd_table[i].model) |
| 481 | + nd_table[i].model = "ne2k_pci"; | ||
| 482 | + pci_nic_init(pci_bus, &nd_table[i], -1); | ||
| 482 | } | 483 | } |
| 483 | - | ||
| 484 | #if 1 | 484 | #if 1 |
| 485 | ide0_mem_index = pmac_ide_init(&bs_table[0], set_irq, pic, 0x13); | 485 | ide0_mem_index = pmac_ide_init(&bs_table[0], set_irq, pic, 0x13); |
| 486 | ide1_mem_index = pmac_ide_init(&bs_table[2], set_irq, pic, 0x14); | 486 | ide1_mem_index = pmac_ide_init(&bs_table[2], set_irq, pic, 0x14); |