Changeset 5dd9209 in mainline for uspace/drv/pciintel/pci.c

Timestamp:

2011-03-04T17:19:14Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

3faf416c

Parents:

21bb58d (diff), 969a6ff (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 development/ changes

File:

• uspace/drv/pciintel/pci.c (modified) (3 diffs)

uspace/drv/pciintel/pci.c

@@ -94 +94 @@
   sysarg_t apic;
   sysarg_t i8259;
+
         int irc_phone = -1;
         int irc_service = 0;
@@ -103 +104 @@
         }
 
-  if (irc_service) {
-    while (irc_phone < 0)
-      irc_phone = service_connect_blocking(irc_service, 0, 0);
-  } else {
+  if (irc_service == 0)
                 return false;
-        }
+
+        irc_phone = service_connect_blocking(irc_service, 0, 0);
+        if (irc_phone < 0)
+                return false;
 
         size_t i;
@@ -114 +115 @@
                 if (dev_data->hw_resources.resources[i].type == INTERRUPT) {
                         int irq = dev_data->hw_resources.resources[i].res.interrupt.irq;
-                        async_msg_1(irc_phone, IRC_ENABLE_INTERRUPT, irq);
+                        int rc = async_req_1_0(irc_phone, IRC_ENABLE_INTERRUPT, irq);
+                        if (rc != EOK) {
+                                async_hangup(irc_phone);
+                                return false;
+                        }
                 }
         }