Revision 1cf0d2b8

b/hw/vt82c686.c
326 326
    VT686AC97State *s = DO_UPCAST(VT686AC97State, dev, dev);
327 327
    uint8_t *pci_conf = s->dev.config;
328 328

  
329
    pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_VIA);
330
    pci_config_set_device_id(pci_conf, PCI_DEVICE_ID_VIA_AC97);
331
    pci_config_set_class(pci_conf, PCI_CLASS_MULTIMEDIA_AUDIO);
332
    pci_config_set_revision(pci_conf, 0x50);
333

  
334 329
    pci_set_word(pci_conf + PCI_COMMAND, PCI_COMMAND_INVALIDATE |
335 330
                 PCI_COMMAND_PARITY);
336 331
    pci_set_word(pci_conf + PCI_STATUS, PCI_STATUS_CAP_LIST |
......
353 348
    .qdev.desc          = "AC97",
354 349
    .qdev.size          = sizeof(VT686AC97State),
355 350
    .init               = vt82c686b_ac97_initfn,
351
    .vendor_id          = PCI_VENDOR_ID_VIA,
352
    .device_id          = PCI_DEVICE_ID_VIA_AC97,
353
    .revision           = 0x50,
354
    .class_id           = PCI_CLASS_MULTIMEDIA_AUDIO,
356 355
};
357 356

  
358 357
static void vt82c686b_ac97_register(void)
......
367 366
    VT686MC97State *s = DO_UPCAST(VT686MC97State, dev, dev);
368 367
    uint8_t *pci_conf = s->dev.config;
369 368

  
370
    pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_VIA);
371
    pci_config_set_device_id(pci_conf, PCI_DEVICE_ID_VIA_MC97);
372
    pci_config_set_class(pci_conf, PCI_CLASS_COMMUNICATION_OTHER);
373
    pci_config_set_revision(pci_conf, 0x30);
374

  
375 369
    pci_set_word(pci_conf + PCI_COMMAND, PCI_COMMAND_INVALIDATE |
376 370
                 PCI_COMMAND_VGA_PALETTE);
377 371
    pci_set_word(pci_conf + PCI_STATUS, PCI_STATUS_DEVSEL_MEDIUM);
......
393 387
    .qdev.desc          = "MC97",
394 388
    .qdev.size          = sizeof(VT686MC97State),
395 389
    .init               = vt82c686b_mc97_initfn,
390
    .vendor_id          = PCI_VENDOR_ID_VIA,
391
    .device_id          = PCI_DEVICE_ID_VIA_MC97,
392
    .class_id           = PCI_CLASS_COMMUNICATION_OTHER,
393
    .revision           = 0x30,
396 394
};
397 395

  
398 396
static void vt82c686b_mc97_register(void)
......
409 407
    uint8_t *pci_conf;
410 408

  
411 409
    pci_conf = s->dev.config;
412
    pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_VIA);
413
    pci_config_set_device_id(pci_conf, PCI_DEVICE_ID_VIA_ACPI);
414
    pci_config_set_class(pci_conf, PCI_CLASS_BRIDGE_OTHER);
415
    pci_config_set_revision(pci_conf, 0x40);
416

  
417 410
    pci_set_word(pci_conf + PCI_COMMAND, 0);
418 411
    pci_set_word(pci_conf + PCI_STATUS, PCI_STATUS_FAST_BACK |
419 412
                 PCI_STATUS_DEVSEL_MEDIUM);
......
462 455
    .qdev.vmsd          = &vmstate_acpi,
463 456
    .init               = vt82c686b_pm_initfn,
464 457
    .config_write       = pm_write_config,
458
    .vendor_id          = PCI_VENDOR_ID_VIA,
459
    .device_id          = PCI_DEVICE_ID_VIA_ACPI,
460
    .class_id           = PCI_CLASS_BRIDGE_OTHER,
461
    .revision           = 0x40,
465 462
    .qdev.props         = (Property[]) {
466 463
        DEFINE_PROP_UINT32("smb_io_base", VT686PMState, smb_io_base, 0),
467 464
        DEFINE_PROP_END_OF_LIST(),
......
496 493
    isa_bus_new(&d->qdev);
497 494

  
498 495
    pci_conf = d->config;
499
    pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_VIA);
500
    pci_config_set_device_id(pci_conf, PCI_DEVICE_ID_VIA_ISA_BRIDGE);
501
    pci_config_set_class(pci_conf, PCI_CLASS_BRIDGE_ISA);
502 496
    pci_config_set_prog_interface(pci_conf, 0x0);
503
    pci_config_set_revision(pci_conf,0x40); /* Revision 4.0 */
504 497

  
505 498
    wmask = d->wmask;
506 499
    for (i = 0x00; i < 0xff; i++) {
......
531 524
    .qdev.no_user = 1,
532 525
    .init         = vt82c686b_initfn,
533 526
    .config_write = vt82c686b_write_config,
527
    .vendor_id    = PCI_VENDOR_ID_VIA,
528
    .device_id    = PCI_DEVICE_ID_VIA_ISA_BRIDGE,
529
    .class_id     = PCI_CLASS_BRIDGE_ISA,
530
    .revision     = 0x40,
534 531
};
535 532

  
536 533
static void vt82c686b_register(void)

Also available in: Unified diff