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 7dc038ee1140b078c583dd4a9d7de55b67fd27f0..eea5b09c3b399be0ae1bac1db1c46049834e3b3c 100644 (file)
--- a/src/pci.h
+++ b/src/pci.h
@@ -3,49 +3,66 @@
 
 #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 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);
-
-int pci_find_device(u16 vendid, u16 devid, int index, PCIDevice *dev);
-int pci_find_class(u32 classid, int index, PCIDevice *dev);
+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_vga(void);
+int pci_find_device(u16 vendid, u16 devid);
+int pci_find_class(u16 classid);
 
-/****************************************************************
- * PCI definitions
- ****************************************************************/
+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))
 
-#define PCI_VENDOR_ID          0x00    /* 16 bits */
-#define PCI_DEVICE_ID          0x02    /* 16 bits */
-#define PCI_COMMAND            0x04    /* 16 bits */
-#define  PCI_COMMAND_IO                0x1     /* Enable response in I/O space */
-#define  PCI_COMMAND_MEMORY    0x2     /* Enable response in Memory space */
-#define PCI_CLASS_DEVICE        0x0a    /* Device class */
-#define PCI_INTERRUPT_LINE     0x3c    /* 8 bits */
-#define PCI_INTERRUPT_PIN      0x3d    /* 8 bits */
-#define PCI_MIN_GNT            0x3e    /* 8 bits */
-#define PCI_MAX_LAT            0x3f    /* 8 bits */
+// pirtable.c
+void create_pirtable(void);
 
 
 /****************************************************************
  * PIR table
  ****************************************************************/
 
+extern u16 PirOffset;
+
+struct link_info {
+    u8 link;
+    u16 bitmap;
+} PACKED;
+
+struct pir_slot {
+    u8 bus;
+    u8 dev;
+    struct link_info links[4];
+    u8 slot_nr;
+    u8 reserved;
+} PACKED;
+
 struct pir_header {
     u32 signature;
     u16 version;
@@ -57,22 +74,10 @@ struct pir_header {
     u32 miniport_data;
     u8 reserved[11];
     u8 checksum;
+    struct pir_slot slots[0];
 } PACKED;
 
 #define PIR_SIGNATURE 0x52495024 // $PIR
 
-struct link_info {
-    u8 link;
-    u16 bitmap;
-} PACKED;
-
-struct pir_slot {
-    u8 bus;
-    u8 dev;
-    struct link_info links[4];
-    u8 slot_nr;
-    u8 reserved;
-} PACKED;
-
 
 #endif