Changeset ff381a7 in mainline for uspace/srv/logger/main.c

Timestamp:

2015-11-02T20:54:19Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d8513177

Parents:

3feeab2 (diff), 5265eea4 (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/logger/main.c (modified) (2 diffs)

uspace/srv/logger/main.c

@@ -48 +48 @@
 #include "logger.h"
 
-static void connection_handler(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+static void connection_handler_control(ipc_callid_t iid, ipc_call_t *icall,
+    void *arg)
 {
-        logger_interface_t iface = IPC_GET_ARG1(*icall);
+        logger_connection_handler_control(iid);
+}
 
-        switch (iface) {
-        case LOGGER_INTERFACE_CONTROL:
-                logger_connection_handler_control(iid);
-                break;
-        case LOGGER_INTERFACE_WRITER:
-                logger_connection_handler_writer(iid);
-                break;
-        default:
-                async_answer_0(iid, EINVAL);
-                break;
-        }
+static void connection_handler_writer(ipc_callid_t iid, ipc_call_t *icall,
+    void *arg)
+{
+        logger_connection_handler_writer(iid);
 }
 
@@ -73 +68 @@
                 parse_level_settings(argv[i]);
         }
-
-        async_set_client_connection(connection_handler);
         
-        int rc = service_register(SERVICE_LOGGER);
+        port_id_t port;
+        int rc = async_create_port(INTERFACE_LOGGER_CONTROL,
+            connection_handler_control, NULL, &port);
+        if (rc != EOK)
+                return rc;
+        
+        rc = async_create_port(INTERFACE_LOGGER_WRITER,
+            connection_handler_writer, NULL, &port);
+        if (rc != EOK)
+                return rc;
+        
+        rc = service_register(SERVICE_LOGGER);
         if (rc != EOK) {
                 printf(NAME ": failed to register: %s.\n", str_error(rc));