Changeset c028b22 in mainline for uspace/srv/hw/irc/apic/apic.c

Timestamp:

2011-07-08T17:01:01Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cc1a727

Parents:

4e36219 (diff), 026793d (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

File:

• uspace/srv/hw/irc/apic/apic.c (modified) (5 diffs)

uspace/srv/hw/irc/apic/apic.c

@@ -38 +38 @@
 #include <ipc/services.h>
 #include <ipc/irc.h>
-#include <ipc/ns.h>
+#include <ns.h>
 #include <sysinfo.h>
 #include <as.h>
@@ -64 +64 @@
  * @param iid   Hash of the request that opened the connection.
  * @param icall Call data of the request that opened the connection.
- *
+ * @param arg   Local argument.
  */
-static void apic_connection(ipc_callid_t iid, ipc_call_t *icall)
+static void apic_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
         ipc_callid_t callid;
@@ -78 +78 @@
         while (true) {
                 callid = async_get_call(&call);
+                
+                if (!IPC_GET_IMETHOD(call)) {
+                        /* The other side has hung up. */
+                        async_answer_0(callid, EOK);
+                        return;
+                }
                 
                 switch (IPC_GET_IMETHOD(call)) {
@@ -102 +108 @@
         
         if ((sysinfo_get_value("apic", &apic) != EOK) || (!apic)) {
-                printf(NAME ": No APIC found\n");
+                printf("%s: No APIC found\n", NAME);
                 return false;
         }
@@ -114 +120 @@
 int main(int argc, char **argv)
 {
-        printf(NAME ": HelenOS APIC driver\n");
+        printf("%s: HelenOS APIC driver\n", NAME);
         
         if (!apic_init())
                 return -1;
         
-        printf(NAME ": Accepting connections\n");
+        printf("%s: Accepting connections\n", NAME);
+        task_retval(0);
         async_manager();