Changeset 2008 for Whitix

Timestamp:

04/02/09 21:13:07 (3 years ago)

Author:

mwhitworth

Message:

Rework PCI code to use generic resource layer, add defines and more prototypes, add module parameter to driver registration function.

Files:

• Whitix/trunk/include/pci.h (modified) (8 diffs)

Whitix/trunk/include/pci.h

@@ -20 +20 @@
 #define PCI_H
 
+#include <devices/bus.h>
 #include <console.h>
+#include <module.h>
 #include <typedefs.h>
+#include <resource.h>
 
 struct PciBus
@@ -28 +31 @@
         struct ListHead next;
         struct ListHead deviceList;
+        struct KeBus bus;
 };
 
@@ -34 +38 @@
 struct PciDevice
 {
+        /* PCI configuration information; cached. */
+        BYTE dev, func, headerType;
+        DWORD vendorId, deviceId;
+        int irq;
+        DWORD devClass;
+        WORD subVendor, subDevice;
+
+        struct Resource spaces[6];
+        
+        /* PCI layer data. */
         struct PciBus* bus;
-        BYTE dev,func;
-        WORD vendorId,deviceId;
-        BYTE devClass,subClass,irq;
-        WORD subVendor, subDevice;
-        DWORD spaces[6]; /* I/O or memory space */
+        struct PciDriver* driver;
+        struct KeBusEntry entry;
         
-        struct PciDriver* driver;
         void* driverData;
 
         struct ListHead next;
 };
+
+#define PciSetData(driver, data) ((driver)->driverData = (data))
 
 /* PCI BIOS structure. */
@@ -69 +81 @@
 #define PCI_INTERRUPT_PIN       0x3D
 
+#define PCI_PRIMARY_BUS         0x18
+#define PCI_SECONDARY_BUS       0x19
+
+#define PCI_WRITE_TEST  0xFFFFFFFF
+#define PCI_BAR_BASE    0x10
+
+/* NUmber of I/O resource slots for each device. */
+#define PCI_NUM_RESOURCES       6
+
+#define PCI_RESOURCE_IO         0x01
+
 extern int (*PciRead)(int bus, int dev, int func, int reg, int bytes, DWORD* val);
 extern int (*PciWrite)(int bus, int dev, int func, int reg, DWORD v, int bytes);
@@ -87 +110 @@
 #define PciIdTableEnd() {0, 0, 0, 0, 0, 0, NULL}
 
+#define PCI_ID_DATA(id) ((id)->data)
+
 struct PciDeviceId
 {
@@ -94 +119 @@
         void* data;
 };
+
+/* PCI device classes. */
+#define PCI_BASE_CLASS_DISPLAY          0x03
 
 struct PciDriver
@@ -104 +132 @@
 
         /* Internal data */
+        struct Module* module;
         struct ListHead next;
         void* data;
@@ -110 +139 @@
 /* PCI library functions. Used by drivers. */
 int PciEnableDevice(struct PciDevice* device);
-int PciRegisterDriver(struct PciDriver* pciDriver);
-unsigned long PciResourceStart(struct PciDevice* device, int index);
+int PciDisableDevice(struct PciDevice* device);
+int PciSetMaster(struct PciDevice* device);
+int PciRegisterDriverMod(struct Module* module, struct PciDriver* pciDriver);
+#define PciRegisterDriver(driver) (PciRegisterDriverMod(THIS_MODULE, (driver)))
+
 int PciWriteConfigByte(struct PciDevice* device, int reg, BYTE value);
 int PciReadConfigByte(struct PciDevice* device, int reg, BYTE* value);
 int PciReadConfigWord(struct PciDevice* device, int reg, WORD* value);
+int PciWriteConfigWord(struct PciDevice* device, int reg, WORD value);
 
 int PciReadConfigDword(struct PciDevice* device, int reg, DWORD* value);
 int PciWriteConfigDword(struct PciDevice* device, int reg, DWORD value);
 
+/* Inline library functions */
+static inline unsigned long PciResourceStart(struct PciDevice* device, int index)
+{
+        if (index < 0 || index >= 6)
+                return 0;
+                
+        return device->spaces[index].start;
+}
+
+static inline unsigned long PciResourceLen(struct PciDevice* device, int index)
+{
+        if (index < 0 || index >= 6)
+                return 0;
+                
+        return device->spaces[index].len;
+}
+
+static inline unsigned long PciResourceFlags(struct PciDevice* device, int index)
+{
+        if (index < 0 || index >= 6)
+                return 0;
+                
+        return device->spaces[index].flags;
+}
+
 #endif