Changeset 6e3b9a58 in mainline for uspace/drv/pciintel/pci.c

Timestamp:

2011-03-18T14:17:27Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

bb41b85

Parents:

a8def7d (diff), 4f66cc7b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merged changes from branch lelian/hidd

File:

• uspace/drv/pciintel/pci.c (modified) (1 diff)

uspace/drv/pciintel/pci.c

@@ -92 +92 @@
         pci_fun_t *dev_data = (pci_fun_t *) fnode->driver_data;
 
-  sysarg_t apic;
-  sysarg_t i8259;
+        sysarg_t apic;
+        sysarg_t i8259;
 
         int irc_phone = -1;
-        int irc_service = 0;
-
-  if ((sysinfo_get_value("apic", &apic) == EOK) && (apic)) {
-    irc_service = SERVICE_APIC;
+        int irc_service = -1;
+
+        if ((sysinfo_get_value("apic", &apic) == EOK) && (apic)) {
+                irc_service = SERVICE_APIC;
         } else if ((sysinfo_get_value("i8259", &i8259) == EOK) && (i8259)) {
-    irc_service = SERVICE_I8259;
-        }
-
-  if (irc_service == 0)
+                irc_service = SERVICE_I8259;
+        }
+
+        if (irc_service == -1) {
                 return false;
+        }
 
         irc_phone = service_connect_blocking(irc_service, 0, 0);
-        if (irc_phone < 0)
+        if (irc_phone < 0) {
                 return false;
+        }
 
         size_t i;
-  for (i = 0; i < dev_data->hw_resources.count; i++) {
+        for (i = 0; i < dev_data->hw_resources.count; i++) {
                 if (dev_data->hw_resources.resources[i].type == INTERRUPT) {
                         int irq = dev_data->hw_resources.resources[i].res.interrupt.irq;