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

Timestamp:

2011-06-10T10:14:26Z (14 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

ab547063

Parents:

9536e6e (diff), 390d80d (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

File:

• uspace/srv/hw/irc/apic/apic.c (modified) (4 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>
@@ -79 +79 @@
                 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)) {
                 case IRC_ENABLE_INTERRUPT:
@@ -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();