Changeset 51e5608 in mainline for uspace/drv/pciintel/pci.c

Timestamp:

2011-03-27T17:58:54Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

27bdfa5, 79e1abd, a8ac368, cd1e6b62

Parents:

b330b309 (diff), df81f9ca (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:

Merge mainline changes (0.4.3 Sashimi)

File:

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

uspace/drv/pciintel/pci.c

@@ -95 +95 @@
         sysarg_t i8259;
 
-        int irc_phone = -1;
-        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 == -1) {
-                return false;
-        }
-
-        irc_phone = service_connect_blocking(irc_service, 0, 0);
+        int irc_phone = ENOTSUP;
+
+        if (((sysinfo_get_value("apic", &apic) == EOK) && (apic))
+            || ((sysinfo_get_value("i8259", &i8259) == EOK) && (i8259))) {
+                irc_phone = service_connect_blocking(SERVICE_IRC, 0, 0);
+        }
+
         if (irc_phone < 0) {
                 return false;