Be sure to add "void" to all function prototypes that take no args.

[seabios.git] / src / pci.h

diff --git a/src/pci.h b/src/pci.h
index cb3b786843ec6b2b6cf45fe97feaa92b6c6e4aed..eea5b09c3b399be0ae1bac1db1c46049834e3b3c 100644 (file)
--- a/src/pci.h
+++ b/src/pci.h
@@ -3,47 +3,53 @@
 
 #include "types.h" // u32
 
-typedef struct PCIDevice {
-    u8 bus;
-    u8 devfn;
-} PCIDevice;
-
-static inline PCIDevice pci_bd(u8 bus, u8 devfn) {
-    struct PCIDevice d = {bus, devfn};
-    return d;
-}
-static inline u16 pci_to_bdf(PCIDevice d) {
-    return (d.bus << 8) | d.devfn;
-}
 static inline u8 pci_bdf_to_bus(u16 bdf) {
     return bdf >> 8;
 }
+static inline u8 pci_bdf_to_devfn(u16 bdf) {
+    return bdf & 0xff;
+}
+static inline u16 pci_bdf_to_busdev(u16 bdf) {
+    return bdf & ~0x07;
+}
 static inline u8 pci_bdf_to_dev(u16 bdf) {
     return (bdf >> 3) & 0x1f;
 }
 static inline u8 pci_bdf_to_fn(u16 bdf) {
     return bdf & 0x07;
 }
+static inline u16 pci_to_bdf(int bus, int dev, int fn) {
+    return (bus<<8) | (dev<<3) | fn;
+}
 
-void pci_config_writel(PCIDevice d, u32 addr, u32 val);
-void pci_config_writew(PCIDevice d, u32 addr, u16 val);
-void pci_config_writeb(PCIDevice d, u32 addr, u8 val);
-u32 pci_config_readl(PCIDevice d, u32 addr);
-u16 pci_config_readw(PCIDevice d, u32 addr);
-u8 pci_config_readb(PCIDevice d, u32 addr);
+void pci_config_writel(u16 bdf, u32 addr, u32 val);
+void pci_config_writew(u16 bdf, u32 addr, u16 val);
+void pci_config_writeb(u16 bdf, u32 addr, u8 val);
+u32 pci_config_readl(u16 bdf, u32 addr);
+u16 pci_config_readw(u16 bdf, u32 addr);
+u8 pci_config_readb(u16 bdf, u32 addr);
+void pci_config_maskw(u16 bdf, u32 addr, u16 off, u16 on);
 
-int pci_find_device(u16 vendid, u16 devid, int index, PCIDevice *dev);
-int pci_find_classprog(u32 classprog, int index, PCIDevice *dev);
-int pci_find_class(u16 classid, int index, PCIDevice *dev);
+int pci_find_vga(void);
+int pci_find_device(u16 vendid, u16 devid);
+int pci_find_class(u16 classid);
+
+int pci_next(int bdf, int *pmax);
+#define foreachpci(BDF, MAX)                    \
+    for (MAX=0x0100, BDF=pci_next(0, &MAX)      \
+         ; BDF >= 0                             \
+         ; BDF=pci_next(BDF+1, &MAX))
 
 // pirtable.c
-void create_pirtable();
+void create_pirtable(void);
 
 
 /****************************************************************
  * PIR table
  ****************************************************************/
 
+extern u16 PirOffset;
+
 struct link_info {
     u8 link;
     u16 bitmap;