Changeset 2020

Timestamp:

04/02/09 21:21:33 (3 years ago)

Author:

mwhitworth

Message:

Add PciDisableDevice function, rework PCI resource code.

Files:

• Whitix/trunk/devices/pci/pci_lib.c (modified) (4 diffs)

Whitix/trunk/devices/pci/pci_lib.c

@@ -110 +110 @@
 SYMBOL_EXPORT(PciEnableDevice);
 
+int PciDisableDevice(struct PciDevice* device)
+{
+        /* Disable BARs */
+        WORD command;
+        
+        if (PciReadConfigWord(device, PCI_COMMAND, &command))
+                return -EIO;
+                
+        command &= ~(PCI_COMMAND_IO | PCI_COMMAND_MEM);
+        
+        return PciWriteConfigWord(device, PCI_COMMAND, command);
+}
+
+SYMBOL_EXPORT(PciDisableDevice);
+
 int PciSetMaster(struct PciDevice* device)
 {
@@ -124 +139 @@
 SYMBOL_EXPORT(PciSetMaster);
 
-int PciRegisterDriver(struct PciDriver* pciDriver)
+int PciRegisterDriverMod(struct Module* module, struct PciDriver* pciDriver)
 {
         /* Add it to the global list of PCI drivers, after checking that it
@@ -137 +152 @@
 
         ListAddTail(&pciDriver->next, &pciDriverList);
+
+        pciDriver->module = module;
         
         extern struct ListHead pciBusList;
@@ -146 +163 @@
 }
 
-SYMBOL_EXPORT(PciRegisterDriver);
-
-unsigned long PciResourceStart(struct PciDevice* device, int index)
-{
-        if (index < 0 || index >= 6)
-                return -EINVAL;
-
-        return PCI_RES_BEGIN_MASK(device->spaces[index]);
-}
-
-SYMBOL_EXPORT(PciResourceStart);
+SYMBOL_EXPORT(PciRegisterDriverMod);