Changeset f9b2cb4c in mainline for uspace/lib/c/generic/io

Timestamp:

2015-08-23T12:50:23Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

9ef495f

Parents:

0dd16778

Message:

unify interface API

• introduce new interfaces
• unify location service clients to always expect service ID as the second argument
• remove obsolete methods that take explicit exchange management arguments (first phase)
• use interfaces in device drivers, devman, location service, logger, inet

Location:

uspace/lib/c/generic/io

Files:

• console.c (modified) (2 diffs)
• input.c (modified) (1 diff)
• io.c (modified) (1 diff)
• log.c (modified) (1 diff)
• logctl.c (modified) (1 diff)

uspace/lib/c/generic/io/console.c

@@ -49 +49 @@
                 return NULL;
         
-        ctrl->input_sess = fsession(EXCHANGE_SERIALIZE, ifile);
+        ctrl->input_sess = fsession(ifile, INTERFACE_CONSOLE);
         if (!ctrl->input_sess) {
                 free(ctrl);
@@ -55 +55 @@
         }
         
-        ctrl->output_sess = fsession(EXCHANGE_SERIALIZE, ofile);
+        ctrl->output_sess = fsession(ofile, INTERFACE_CONSOLE);
         if (!ctrl->output_sess) {
                 free(ctrl);

uspace/lib/c/generic/io/input.c

@@ -58 +58 @@
         async_exch_t *exch = async_exchange_begin(sess);
 
-        int rc = async_connect_to_me(exch, 0, 0, 0, input_cb_conn, input);
+        port_id_t port;
+        int rc = async_create_callback_port(exch, INTERFACE_INPUT_CB, 0, 0,
+            input_cb_conn, input, &port);
+        
         async_exchange_end(exch);
 

uspace/lib/c/generic/io/io.c

@@ -748 +748 @@
 }
 
-async_sess_t *fsession(exch_mgmt_t mgmt, FILE *stream)
+async_sess_t *fsession(FILE *stream, iface_t iface)
 {
         if (stream->fd >= 0) {
                 if (stream->sess == NULL)
-                        stream->sess = fd_session(mgmt, stream->fd);
+                        stream->sess = fd_session(stream->fd, iface);
                 
                 return stream->sess;

uspace/lib/c/generic/io/log.c

@@ -166 +166 @@
                 return ENOMEM;
 
-        logger_session = service_connect_blocking_iface(EXCHANGE_SERIALIZE,
-            LOGGER_INTERFACE_WRITER, SERVICE_LOGGER, 0);
+        logger_session = service_connect_blocking(SERVICE_LOGGER,
+            INTERFACE_LOGGER_WRITER, 0);
         if (logger_session == NULL) {
                 return ENOMEM;

uspace/lib/c/generic/io/logctl.c

@@ -48 +48 @@
 
         if (logger_session == NULL) {
-                logger_session = service_connect_blocking_iface(EXCHANGE_SERIALIZE,
-                    LOGGER_INTERFACE_CONTROL, SERVICE_LOGGER, 0);
+                logger_session = service_connect_blocking(SERVICE_LOGGER,
+                    INTERFACE_LOGGER_CONTROL, 0);
                 if (logger_session == NULL)
                         return ENOMEM;