Changeset 5bf4310 in mainline

Timestamp:

2013-03-24T19:07:43Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

03c2d5f

Parents:

6ec1d48

Message:

libhound: Fix switch to to stream

Location:

uspace/lib/hound/src

Files:

• client.c (modified) (1 diff)
• protocol.c (modified) (5 diffs)

uspace/lib/hound/src/client.c

@@ -214 +214 @@
                 new_stream->format = format;
                 new_stream->context = hound;
-                int ret = hound_service_stream_enter(new_stream->exch,
+                const int ret = hound_service_stream_enter(new_stream->exch,
                     hound->id, flags, format, bsize);
                 if (ret != EOK) {

uspace/lib/hound/src/protocol.c

@@ -256 +256 @@
  ****/
 
-static int hound_server_read_data(void *stream);
-static int hound_server_write_data(void *stream);
+static void hound_server_read_data(void *stream);
+static void hound_server_write_data(void *stream);
 static const hound_server_iface_t *server_iface;
 
@@ -435 +435 @@
                             server_iface->server, id);
                         if (rec) {
-                                hound_server_write_data(stream);
+                                if(server_iface->stream_data_read) {
+                                        async_answer_0(callid, EOK);
+                                        hound_server_write_data(stream);
+                                } else {
+                                        async_answer_0(callid, ENOTSUP);
+                                }
                         } else {
-                                hound_server_read_data(stream);
+                                if (server_iface->stream_data_write) {
+                                        async_answer_0(callid, EOK);
+                                        hound_server_read_data(stream);
+                                } else {
+                                        async_answer_0(callid, ENOTSUP);
+                                }
                         }
                         break;
@@ -453 +463 @@
 }
 
-static int hound_server_read_data(void *stream)
-{
-        if (!server_iface || !server_iface->stream_data_write)
-                return ENOTSUP;
-
+static void hound_server_read_data(void *stream)
+{
         ipc_callid_t callid;
         ipc_call_t call;
@@ -478 +485 @@
 
         async_answer_0(callid, ret);
-        return ret;
-}
-
-static int hound_server_write_data(void *stream)
-{
-        if (!server_iface || !server_iface->stream_data_read)
-                return ENOTSUP;
+}
+
+static void hound_server_write_data(void *stream)
+{
 
         ipc_callid_t callid;
@@ -505 +509 @@
 
         async_answer_0(callid, ret);
-        return ret;
 }