Changeset 56ea46ba in rtems


Ignore:
Timestamp:
Apr 7, 2015, 12:25:23 PM (4 years ago)
Author:
Daniel Hellstrom <daniel@…>
Branches:
4.11, master
Children:
c1c37a1
Parents:
1f66914
git-author:
Daniel Hellstrom <daniel@…> (04/07/15 12:25:23)
git-committer:
Daniel Hellstrom <daniel@…> (04/16/15 23:10:26)
Message:

DRVMGR: PCI BUS converted to BSD header

File:
1 edited

Legend:

Unmodified
Added
Removed
  • cpukit/libpci/pci_bus.c

    r1f66914 r56ea46ba  
    298298                return;
    299299
    300         if ((devinfo->id.class >> 8) == PCI_CLASS_BRIDGE_PCI)
     300        if ((devinfo->id.class >> 8) == PCID_PCI2PCI_BRIDGE)
    301301                print_line(p, "PCI BRIDGE DEVICE");
    302302        else
     
    460460
    461461        /* Read Device and Vendor */
    462         pci_cfg_r16(pcidev, PCI_VENDOR_ID, &pciinfo->id.vendor);
    463         pci_cfg_r16(pcidev, PCI_DEVICE_ID, &pciinfo->id.device);
    464         pci_cfg_r32(pcidev, PCI_CLASS_REVISION, &pciinfo->id.class);
     462        pci_cfg_r16(pcidev, PCIR_VENDOR, &pciinfo->id.vendor);
     463        pci_cfg_r16(pcidev, PCIR_DEVICE, &pciinfo->id.device);
     464        pci_cfg_r32(pcidev, PCIR_REVID, &pciinfo->id.class);
    465465        pciinfo->rev = pciinfo->id.class & 0xff;
    466466        pciinfo->id.class = pciinfo->id.class >> 8;
    467467
    468468        /* Devices have subsytem device and vendor ID */
    469         if ((pciinfo->id.class >> 8) != PCI_CLASS_BRIDGE_PCI) {
    470                 pci_cfg_r16(pcidev, PCI_SUBSYSTEM_VENDOR_ID,
     469        if ((pciinfo->id.class >> 8) != PCID_PCI2PCI_BRIDGE) {
     470                pci_cfg_r16(pcidev, PCIR_SUBVEND_0,
    471471                                                        &pciinfo->id.subvendor);
    472                 pci_cfg_r16(pcidev, PCI_SUBSYSTEM_ID, &pciinfo->id.subdevice);
     472                pci_cfg_r16(pcidev, PCIR_SUBDEV_0, &pciinfo->id.subdevice);
    473473        } else {
    474474                pciinfo->id.subvendor = 0;
     
    477477
    478478        /* Read IRQ information set by PCI layer */
    479         pci_cfg_r8(pcidev, PCI_INTERRUPT_LINE, &pciinfo->irq);
     479        pci_cfg_r8(pcidev, PCIR_INTLINE, &pciinfo->irq);
    480480
    481481        /* Save Location */
Note: See TracChangeset for help on using the changeset viewer.