Changeset 1925 for Whitix/trunk/devices/pci/pci_core.c

Timestamp:

02/25/09 19:37:39 (3 years ago)

Author:

mwhitworth

Message:

Add ->driver field, add documentation and remove magic numbers.

Files:

• Whitix/trunk/devices/pci/pci_core.c (modified) (6 diffs)

Whitix/trunk/devices/pci/pci_core.c

@@ -70 +70 @@
                 default: return -EINVAL;
         }
-
+        
         return 0;
 }
@@ -92 +92 @@
 
         base=0xCFC+(reg & 0x03);
-        outd(0xCF8,u.n);
+        
+        outd(0xCF8, u.n);
+        
         switch (bytes)
         {
@@ -126 +128 @@
 };
 
+#define PCI_WRITE_TEST  0xFFFFFFFF
+#define PCI_BAR_BASE    0x10
+
 int PciDeviceProbe(struct PciDevice* device)
 {
         /* Fill in device-specific information, such as IRQ, I/O and memory. */
-        DWORD v;
+        BYTE irq;
+        DWORD v, size;
         int i;
-        int bus, dev, func;
-
-        bus=device->bus->index;
-        dev=device->dev;
-        func=device->func;
 
         for (i=0; i<6; i++)
         {
-                PciRead(bus, dev, func, (i*4)+0x10, 4, &v);
-                if (v)
-                {
-                        DWORD v2;
-                        PciWrite(bus, dev, func, i*4+0x10, 0xFFFFFFFF, 4);
-                        PciRead(bus, dev, func, i*4+0x10, 4, &v2);
-                        v2 &= 0xFFFFFFF0;
-                        PciWrite(bus, dev, func, i*4+0x10, v, 4);
-                        if (v2 == 0 || v2 == 0xFFFFFFFF)
-                                continue;
-
-                        if (v == 0xFFFFFFFF)
-                                v=0;
-
-                        device->spaces[i]=v;
-                }
-        }
-
-        /* Why v? */
-        PciRead(bus, dev, func, 0x3D, 1, &v);
-
-        if (v)
-        {
-                PciRead(bus, dev, func, 0x3C, 1, &v);
-                device->irq=(BYTE)v;
+                PciReadConfigDword(device, PCI_BAR_BASE + (i << 2), &v);
+        
+                PciWriteConfigDword(device, PCI_BAR_BASE + (i << 2), PCI_WRITE_TEST);
+                PciReadConfigDword(device, PCI_BAR_BASE + (i << 2), &size);
+                
+                PciWriteConfigDword(device, PCI_BAR_BASE + (i << 2), v);
+                
+                if (!size || size == 0xFFFFFFFF)
+                        continue;
+                        
+                if (v == PCI_WRITE_TEST)
+                        v = 0;
+                
+                size &= 0xFFFFFFF0;
+                                                        
+                /* Parse the base address register. */
+                device->spaces[i] = v;
+        }
+
+        PciReadConfigByte(device, 0x3D, &irq);
+
+        if (irq)
+        {
+                PciReadConfigByte(device, 0x3C, &irq);
+                device->irq = irq;
         }
 
@@ -264 +265 @@
 {
         struct PciDeviceId* currId;
+        int ret;
 
         /* Search through each device id entry, looking for a match. */
-        currId=driver->idTable;
+        currId = driver->idTable;
 
         while (currId->vendorId)
@@ -276 +278 @@
                         ((currId->class ^ device->devClass) & currId->classMask)*/)
                 {
+                        device->driver = driver;
+                        
                         /* Matched! Start up the device. */
-                        return driver->initOne(device, currId);
+                        ret = driver->initOne(device, currId);
+                        
+                        if (ret)
+                                device->driver = NULL;
+                                
+                        return ret;
                 }
 
@@ -364 +373 @@
         PciScanBus(0);
 
+        /* Add devices to IcFs */
+
         return 0;
 }