Revision 7899f799 hw/mips_fulong2e.c

b/hw/mips_fulong2e.c
219 219
#ifdef HAS_AUDIO
220 220
static void audio_init (PCIBus *pci_bus)
221 221
{
222
    vt82c686b_ac97_init(pci_bus, (FULONG2E_VIA_SLOT << 3) + 5);
223
    vt82c686b_mc97_init(pci_bus, (FULONG2E_VIA_SLOT << 3) + 6);
222
    vt82c686b_ac97_init(pci_bus, PCI_DEVFN(FULONG2E_VIA_SLOT, 5));
223
    vt82c686b_mc97_init(pci_bus, PCI_DEVFN(FULONG2E_VIA_SLOT, 6));
224 224
}
225 225
#endif
226 226

  
......
349 349
        hd[i] = drive_get(IF_IDE, i / MAX_IDE_DEVS, i % MAX_IDE_DEVS);
350 350
    }
351 351

  
352
    via_devfn = vt82c686b_init(pci_bus, FULONG2E_VIA_SLOT << 3);
352
    via_devfn = vt82c686b_init(pci_bus, PCI_DEVFN(FULONG2E_VIA_SLOT, 0));
353 353
    if (via_devfn < 0) {
354 354
        fprintf(stderr, "vt82c686b_init error \n");
355 355
        exit(1);
356 356
    }
357 357

  
358 358
    isa_bus_irqs(i8259);
359
    vt82c686b_ide_init(pci_bus, hd, (FULONG2E_VIA_SLOT << 3) + 1);
360
    usb_uhci_vt82c686b_init(pci_bus, (FULONG2E_VIA_SLOT << 3) + 2);
361
    usb_uhci_vt82c686b_init(pci_bus, (FULONG2E_VIA_SLOT << 3) + 3);
359
    vt82c686b_ide_init(pci_bus, hd, PCI_DEVFN(FULONG2E_VIA_SLOT, 1));
360
    usb_uhci_vt82c686b_init(pci_bus, PCI_DEVFN(FULONG2E_VIA_SLOT, 2));
361
    usb_uhci_vt82c686b_init(pci_bus, PCI_DEVFN(FULONG2E_VIA_SLOT, 3));
362 362

  
363
    smbus = vt82c686b_pm_init(pci_bus, (FULONG2E_VIA_SLOT << 3) + 4,
363
    smbus = vt82c686b_pm_init(pci_bus, PCI_DEVFN(FULONG2E_VIA_SLOT, 4),
364 364
                              0xeee1, NULL);
365 365
    eeprom_buf = qemu_mallocz(8 * 256); /* XXX: make this persistent */
366 366
    memcpy(eeprom_buf, eeprom_spd, sizeof(eeprom_spd));

Also available in: Unified diff