Various cosmetic and coding style fixes in src/devices.

[coreboot.git] / src / include / device / pci.h

diff --git a/src/include/device/pci.h b/src/include/device/pci.h
index ad005cfe89701880c169d8902497827204d600c1..6af723d7453964ba849938706697ccacddf44448 100644 (file)
--- a/src/include/device/pci.h
+++ b/src/include/device/pci.h
@@ -15,6 +15,7 @@
 #ifndef PCI_H
 #define PCI_H
 
+#include <stdint.h>
 #include <device/pci_def.h>
 #include <device/resource.h>
 #include <device/device.h>
@@ -38,7 +39,7 @@ struct pci_bus_operations {
 };
 
 struct pci_driver {
-       struct device_operations *ops;
+       const struct device_operations *ops;
        unsigned short vendor;
        unsigned short device;
 };
@@ -61,7 +62,7 @@ void pci_bus_enable_resources(device_t dev);
 void pci_bus_reset(struct bus *bus);
 device_t pci_probe_dev(device_t dev, struct bus *bus, unsigned devfn);
 unsigned int do_pci_scan_bridge(device_t bus, unsigned int max,
-       unsigned int (*do_scan_bus)(struct bus *bus, 
+       unsigned int (*do_scan_bus)(struct bus *bus,
                unsigned min_devfn, unsigned max_devfn, unsigned int max));
 unsigned int pci_scan_bridge(device_t bus, unsigned int max);
 unsigned int pci_scan_bus(struct bus *bus, unsigned min_devfn, unsigned max_devfn, unsigned int max);
@@ -73,7 +74,7 @@ unsigned pci_find_capability(device_t dev, unsigned cap);
 struct resource *pci_get_resource(struct device *dev, unsigned long index);
 void pci_dev_set_subsystem(device_t dev, unsigned vendor, unsigned device);
 void pci_dev_init(struct device *dev);
-void pci_level_irq(unsigned char intNum);
+
 void pci_assign_irqs(unsigned bus, unsigned slot,
                     const unsigned char pIntAtoD[4]);
 
@@ -97,6 +98,8 @@ static inline const struct pci_bus_operations *ops_pci_bus(struct bus *bus)
        if (bus && bus->dev && bus->dev->ops) {
                bops = bus->dev->ops->ops_pci_bus;
        }
+       if (!bops)
+               bops = pci_remember_direct();
        return bops;
 }