Commit deb54399 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Define PCI vendor and device IDs in pci.h (Stuart Brady) 



This patch defines PCI vendor and device IDs in pci.h (matching those
from Linux's pci_ids.h), and uses those definitions where appropriate.

Change from v1:
  Introduces pci_config_set_vendor_id() / pci_config_set_device_id()
  accessors as suggested by Anthony Liguori.

Signed-off-by: default avatarStuart Brady <stuart.brady@gmail.com>
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6442 c046a42c-6fe2-441c-8c8c-71466251a162
parent 90a1e3c0

hw/ac97.c

+2 −5
Original line number Diff line number Diff line
@@ -1336,11 +1336,8 @@ int ac97_init (PCIBus *bus, AudioState *audio) 
    s = &d->ac97;

    s->pci_dev = &d->dev;

    c = d->dev.config;

    c[0x00] = 0x86;      /* vid vendor id intel ro */

    c[0x01] = 0x80;      /* intel */



    c[0x02] = 0x15;      /* did device id 82801 ro */

    c[0x03] = 0x24;      /* 82801aa */

    pci_config_set_vendor_id(c, PCI_VENDOR_ID_INTEL); /* ro */

    pci_config_set_device_id(c, PCI_DEVICE_ID_INTEL_82801AA_5); /* ro */



    c[0x04] = 0x00;      /* pcicmd pci command rw, ro */

    c[0x05] = 0x00;

hw/acpi.c

+2 −4
Original line number Diff line number Diff line
@@ -503,10 +503,8 @@ i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, 
                                         devfn, NULL, pm_write_config);

    pm_state = s;

    pci_conf = s->dev.config;

    pci_conf[0x00] = 0x86;

    pci_conf[0x01] = 0x80;

    pci_conf[0x02] = 0x13;

    pci_conf[0x03] = 0x71;

    pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_INTEL);

    pci_config_set_device_id(pci_conf, PCI_DEVICE_ID_INTEL_82371AB_3);

    pci_conf[0x06] = 0x80;

    pci_conf[0x07] = 0x02;

    pci_conf[0x08] = 0x03; // revision number

hw/apb_pci.c

+2 −4
Original line number Diff line number Diff line
@@ -252,10 +252,8 @@ PCIBus *pci_apb_init(target_phys_addr_t special_base, 


    d = pci_register_device(s->bus, "Advanced PCI Bus", sizeof(PCIDevice),

                            0, NULL, NULL);

    d->config[0x00] = 0x8e; // vendor_id : Sun

    d->config[0x01] = 0x10;

    d->config[0x02] = 0x00; // device_id

    d->config[0x03] = 0xa0;

    pci_config_set_vendor_id(d->config, PCI_VENDOR_ID_SUN);

    pci_config_set_device_id(d->config, PCI_DEVICE_ID_SUN_SABRE);

    d->config[0x04] = 0x06; // command = bus master, pci mem

    d->config[0x05] = 0x00;

    d->config[0x06] = 0xa0; // status = fast back-to-back, 66MHz, no error

hw/cirrus_vga.c

+3 −6
Original line number Diff line number Diff line
@@ -173,8 +173,7 @@ 
#define CIRRUS_MMIO_LINEDRAW_MODE     0x39	// byte

#define CIRRUS_MMIO_BLTSTATUS         0x40	// byte



// PCI 0x00: vendor, 0x02: device

#define PCI_VENDOR_CIRRUS             0x1013

// PCI 0x02: device

#define PCI_DEVICE_CLGD5462           0x00d0

#define PCI_DEVICE_CLGD5465           0x00d6
@@ -3376,10 +3375,8 @@ void pci_cirrus_vga_init(PCIBus *bus, uint8_t *vga_ram_base, 
                                                 sizeof(PCICirrusVGAState),

                                                 -1, NULL, pci_cirrus_write_config);

    pci_conf = d->dev.config;

    pci_conf[0x00] = (uint8_t) (PCI_VENDOR_CIRRUS & 0xff);

    pci_conf[0x01] = (uint8_t) (PCI_VENDOR_CIRRUS >> 8);

    pci_conf[0x02] = (uint8_t) (device_id & 0xff);

    pci_conf[0x03] = (uint8_t) (device_id >> 8);

    pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_CIRRUS);

    pci_config_set_device_id(pci_conf, device_id);

    pci_conf[0x04] = PCI_COMMAND_IOACCESS | PCI_COMMAND_MEMACCESS;

    pci_conf[0x0a] = PCI_CLASS_SUB_VGA;

    pci_conf[0x0b] = PCI_CLASS_BASE_DISPLAY;

hw/e1000.c

+2 −2
Original line number Diff line number Diff line
@@ -1049,8 +1049,8 @@ pci_e1000_init(PCIBus *bus, NICInfo *nd, int devfn) 
    pci_conf = d->dev.config;

    memset(pci_conf, 0, 256);



    *(uint16_t *)(pci_conf+0x00) = cpu_to_le16(0x8086);

    *(uint16_t *)(pci_conf+0x02) = cpu_to_le16(E1000_DEVID);

    pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_INTEL);

    pci_config_set_device_id(pci_conf, E1000_DEVID);

    *(uint16_t *)(pci_conf+0x04) = cpu_to_le16(0x0407);

    *(uint16_t *)(pci_conf+0x06) = cpu_to_le16(0x0010);

    pci_conf[0x08] = 0x03;