WebSVN – Kolibri OS – Diff – /drivers/video/drm/radeon/pci.c

 #include
 #include
 #include
-#include
 #include
+#include
 #include
 static LIST_HEAD(devices);
         res  = &dev->resource[pos];
         reg = PCI_BASE_ADDRESS_0 + (pos << 2);
-        l = PciRead32(dev->bus, dev->devfn, reg);
+        l = PciRead32(dev->busnr, dev->devfn, reg);
-        PciWrite32(dev->bus, dev->devfn, reg, ~0);
+        PciWrite32(dev->busnr, dev->devfn, reg, ~0);
-        sz = PciRead32(dev->bus, dev->devfn, reg);
+        sz = PciRead32(dev->busnr, dev->devfn, reg);
-        PciWrite32(dev->bus, dev->devfn, reg, l);
+        PciWrite32(dev->busnr, dev->devfn, reg, l);
         if (!sz || sz == 0xffffffff)
         if (is_64bit_memory(l))
+        {
             u32_t szhi, lhi;
-            lhi = PciRead32(dev->bus, dev->devfn, reg+4);
+            lhi = PciRead32(dev->busnr, dev->devfn, reg+4);
-            PciWrite32(dev->bus, dev->devfn, reg+4, ~0);
+            PciWrite32(dev->busnr, dev->devfn, reg+4, ~0);
-            szhi = PciRead32(dev->bus, dev->devfn, reg+4);
+            szhi = PciRead32(dev->busnr, dev->devfn, reg+4);
-            PciWrite32(dev->bus, dev->devfn, reg+4, lhi);
+            PciWrite32(dev->busnr, dev->devfn, reg+4, lhi);
             sz64 = ((u64_t)szhi << 32) | raw_sz;
             l64 = ((u64_t)lhi << 32) | l;
             sz64 = pci_size64(l64, sz64, PCI_BASE_ADDRESS_MEM_MASK);
             next++;
+            }
             else if (lhi)
+            {
                 /* 64-bit wide address, treat as disabled */
-                PciWrite32(dev->bus, dev->devfn, reg,
+                PciWrite32(dev->busnr, dev->devfn, reg,
                         l & ~(u32_t)PCI_BASE_ADDRESS_MEM_MASK);
-                PciWrite32(dev->bus, dev->devfn, reg+4, 0);
+                PciWrite32(dev->busnr, dev->devfn, reg+4, 0);
                 res->start = 0;
                 res->end = sz;
+            }
 #endif
+        }
+    }
+    {
         dev->rom_base_reg = rom;
         res = &dev->resource[PCI_ROM_RESOURCE];
-        l = PciRead32(dev->bus, dev->devfn, rom);
+        l = PciRead32(dev->busnr, dev->devfn, rom);
-        PciWrite32(dev->bus, dev->devfn, rom, ~PCI_ROM_ADDRESS_ENABLE);
+        PciWrite32(dev->busnr, dev->devfn, rom, ~PCI_ROM_ADDRESS_ENABLE);
-        sz = PciRead32(dev->bus, dev->devfn, rom);
+        sz = PciRead32(dev->busnr, dev->devfn, rom);
-        PciWrite32(dev->bus, dev->devfn, rom, l);
+        PciWrite32(dev->busnr, dev->devfn, rom, l);
         if (l == 0xffffffff)
             l = 0;
 static void pci_read_irq(struct pci_dev *dev)
+{
     u8_t irq;
-    irq = PciRead8(dev->bus, dev->devfn, PCI_INTERRUPT_PIN);
+    irq = PciRead8(dev->busnr, dev->devfn, PCI_INTERRUPT_PIN);
     dev->pin = irq;
     if (irq)
-        irq = PciRead8(dev->bus, dev->devfn, PCI_INTERRUPT_LINE);
+        irq = PciRead8(dev->busnr, dev->devfn, PCI_INTERRUPT_LINE);
     dev->irq = irq;
 };
-static int pci_setup_device(struct pci_dev *dev)
+int pci_setup_device(struct pci_dev *dev)
+{
     u32_t  class;
-    class = PciRead32(dev->bus, dev->devfn, PCI_CLASS_REVISION);
+    class = PciRead32(dev->busnr, dev->devfn, PCI_CLASS_REVISION);
             if (class == PCI_CLASS_BRIDGE_PCI)
                 goto bad;
             pci_read_irq(dev);
             pci_read_bases(dev, 6, PCI_ROM_ADDRESS);
-            dev->subsystem_vendor = PciRead16(dev->bus, dev->devfn,PCI_SUBSYSTEM_VENDOR_ID);
+            dev->subsystem_vendor = PciRead16(dev->busnr, dev->devfn,PCI_SUBSYSTEM_VENDOR_ID);
-            dev->subsystem_device = PciRead16(dev->bus, dev->devfn, PCI_SUBSYSTEM_ID);
+            dev->subsystem_device = PciRead16(dev->busnr, dev->devfn, PCI_SUBSYSTEM_ID);
             /*
              *      Do the ugly legacy mode stuff here rather than broken chip
              *      quirk code. Legacy mode ATA controllers have fixed
              *      addresses. These are not always echoed in BAR0-3, and
             if (class == PCI_CLASS_STORAGE_IDE)
+            {
                 u8_t progif;
-                progif = PciRead8(dev->bus, dev->devfn,PCI_CLASS_PROG);
+                progif = PciRead8(dev->busnr, dev->devfn,PCI_CLASS_PROG);
                 if ((progif & 1) == 0)
+                {
                     dev->resource[0].start = 0x1F0;
                     dev->resource[0].end = 0x1F7;
                     dev->resource[0].flags = LEGACY_IO_RESOURCE;
                 if (class != PCI_CLASS_BRIDGE_CARDBUS)
                         goto bad;
                 pci_read_irq(dev);
                 pci_read_bases(dev, 1, 0);
-                dev->subsystem_vendor = PciRead16(dev->bus,
+                dev->subsystem_vendor = PciRead16(dev->busnr,
                                                   dev->devfn,
                                                   PCI_CB_SUBSYSTEM_VENDOR_ID);
-                dev->subsystem_device = PciRead16(dev->bus,
+                dev->subsystem_device = PciRead16(dev->busnr,
                                                   dev->devfn,
                                                   PCI_CB_SUBSYSTEM_ID);
                 break;
     return 0;
 };
-static pci_dev_t* pci_scan_device(u32_t bus, int devfn)
+static pci_dev_t* pci_scan_device(u32_t busnr, int devfn)
+{
     pci_dev_t  *dev;
     u32_t   id;
     u8_t    hdr;
     int     timeout = 10;
-    id = PciRead32(bus,devfn, PCI_VENDOR_ID);
+    id = PciRead32(busnr, devfn, PCI_VENDOR_ID);
         delay(timeout/10);
         timeout *= 2;
-        id = PciRead32(bus, devfn, PCI_VENDOR_ID);
+        id = PciRead32(busnr, devfn, PCI_VENDOR_ID);
         /* Card hasn't responded in 60 seconds?  Must be stuck. */
         if (timeout > 60 * 100)
         {
             printk(KERN_WARNING "Device %04x:%02x:%02x.%d not "
-                   "responding\n", bus,PCI_SLOT(devfn),PCI_FUNC(devfn));
+                   "responding\n", busnr,PCI_SLOT(devfn),PCI_FUNC(devfn));
             return NULL;
         }
     };
-    hdr = PciRead8(bus, devfn, PCI_HEADER_TYPE);
+    hdr = PciRead8(busnr, devfn, PCI_HEADER_TYPE);
     dev = (pci_dev_t*)kzalloc(sizeof(pci_dev_t), 0);
     INIT_LIST_HEAD(&dev->link);
     if(unlikely(dev == NULL))
         return NULL;
 int pci_find_capability(struct pci_dev *dev, int cap)
+{
     int pos;
-    pos = __pci_bus_find_cap_start(dev->bus, dev->devfn, dev->hdr_type);
+    pos = __pci_bus_find_cap_start(dev->busnr, dev->devfn, dev->hdr_type);
     if (pos)
-        pos = __pci_find_next_cap(dev->bus, dev->devfn, pos, cap);
+        pos = __pci_find_next_cap(dev->busnr, dev->devfn, pos, cap);
     u16_t cmd, old_cmd;
     int  idx;
     struct resource *r;
-    cmd = PciRead16(dev->bus, dev->devfn, PCI_COMMAND);
+    cmd = PciRead16(dev->busnr, dev->devfn, PCI_COMMAND);
     old_cmd = cmd;
     for (idx = 0; idx < PCI_NUM_RESOURCES; idx++)
+    {
         /* Only set up the requested stuff */
         if (!(mask & (1 << idx)))
+    }
     if (cmd != old_cmd) {
         printk("PCI: Enabling device %s (%04x -> %04x)\n",
                 pci_name(dev), old_cmd, cmd);
-        PciWrite16(dev->bus, dev->devfn, PCI_COMMAND, cmd);
+        PciWrite16(dev->busnr, dev->devfn, PCI_COMMAND, cmd);
     }
     return 0;
+}

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/radeon/pci.c – Rev 2004 → 2160