Changes in uspace/srv/hw/irc/i8259/i8259.c [ffa2c8ef:15f3c3f] in mainline

File:

• uspace/srv/hw/irc/i8259/i8259.c (modified) (7 diffs)

uspace/srv/hw/irc/i8259/i8259.c

@@ -38 +38 @@
 #include <ipc/services.h>
 #include <ipc/irc.h>
-#include <ipc/ns.h>
+#include <ns.h>
 #include <sysinfo.h>
 #include <as.h>
@@ -50 +50 @@
 #include <async.h>
 #include <stdio.h>
-#include <ipc/devmap.h>
+#include <ipc/loc.h>
 
 #define NAME  "i8259"
@@ -98 +98 @@
  * @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 i8259_connection(ipc_callid_t iid, ipc_call_t *icall)
+static void i8259_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
         ipc_callid_t callid;
@@ -112 +112 @@
         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)) {
@@ -136 +142 @@
         
         if ((sysinfo_get_value("i8259", &i8259) != EOK) || (!i8259)) {
-                printf(NAME ": No i8259 found\n");
+                printf("%s: No i8259 found\n", NAME);
                 return false;
         }
@@ -144 +150 @@
             (pio_enable((void *) IO_RANGE1_START, IO_RANGE1_SIZE,
             (void **) &io_range1) != EOK)) {
-                printf(NAME ": i8259 not accessible\n");
+                printf("%s: i8259 not accessible\n", NAME);
                 return false;
         }
         
         async_set_client_connection(i8259_connection);
-        service_register(SERVICE_I8259);
+        service_register(SERVICE_IRC);
         
         return true;
@@ -156 +162 @@
 int main(int argc, char **argv)
 {
-        printf(NAME ": HelenOS i8259 driver\n");
+        printf("%s: HelenOS i8259 driver\n", NAME);
         
         if (!i8259_init())
                 return -1;
         
-        printf(NAME ": Accepting connections\n");
+        printf("%s: Accepting connections\n", NAME);
+        task_retval(0);
         async_manager();