Changeset ab87db5 in mainline for uspace/lib/hound/src/protocol.c

Timestamp:

2019-02-23T17:16:01Z (5 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

8c193d83, ca0e838

Parents:

bc417660 (diff), 95a47b0 (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.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-23 17:16:01)

git-committer:

GitHub <noreply@…> (2019-02-23 17:16:01)

Message:

Merge pull request #157

Turn some function-like macros into functions

File:

• uspace/lib/hound/src/protocol.c (modified) (15 diffs)

uspace/lib/hound/src/protocol.c

@@ -140 +140 @@
         async_exchange_end(exch);
         if (ret == EOK) {
-                *id = (hound_context_id_t) IPC_GET_ARG1(call);
+                *id = (hound_context_id_t) ipc_get_arg1(&call);
         }
 
@@ -158 +158 @@
         async_exch_t *exch = async_exchange_begin(sess);
         const errno_t ret = async_req_1_0(exch, IPC_M_HOUND_CONTEXT_UNREGISTER,
-            CAP_HANDLE_RAW(id));
+            cap_handle_raw(id));
         async_exchange_end(exch);
         return ret;
@@ -203 +203 @@
                 return ret;
         }
-        unsigned name_count = IPC_GET_ARG1(res_call);
+        unsigned name_count = ipc_get_arg1(&res_call);
 
         /* Start receiving names */
@@ -315 +315 @@
         };
 
-        return async_req_4_0(exch, IPC_M_HOUND_STREAM_ENTER, CAP_HANDLE_RAW(id),
+        return async_req_4_0(exch, IPC_M_HOUND_STREAM_ENTER, cap_handle_raw(id),
             flags, c.arg, bsize);
 }
@@ -406 +406 @@
                 async_get_call(&call);
 
-                switch (IPC_GET_IMETHOD(call)) {
+                switch (ipc_get_imethod(&call)) {
                 case IPC_M_HOUND_CONTEXT_REGISTER:
                         /* check interface functions */
@@ -413 +413 @@
                                 break;
                         }
-                        bool record = IPC_GET_ARG1(call);
+                        bool record = ipc_get_arg1(&call);
                         void *name;
 
@@ -431 +431 @@
                                 async_answer_0(&call, ret);
                         } else {
-                                async_answer_1(&call, EOK, CAP_HANDLE_RAW(context));
+                                async_answer_1(&call, EOK, cap_handle_raw(context));
                         }
                         break;
@@ -442 +442 @@
 
                         /* get id, 1st param */
-                        context = (hound_context_id_t) IPC_GET_ARG1(call);
+                        context = (hound_context_id_t) ipc_get_arg1(&call);
                         ret = server_iface->rem_context(server_iface->server,
                             context);
@@ -455 +455 @@
 
                         char **list = NULL;
-                        flags = IPC_GET_ARG1(call);
-                        size_t count = IPC_GET_ARG2(call);
-                        const bool conn = IPC_GET_ARG3(call);
+                        flags = ipc_get_arg1(&call);
+                        size_t count = ipc_get_arg2(&call);
+                        const bool conn = ipc_get_arg3(&call);
                         char *conn_name = NULL;
                         ret = EOK;
@@ -568 +568 @@
 
                         /* get parameters */
-                        context = (hound_context_id_t) IPC_GET_ARG1(call);
-                        flags = IPC_GET_ARG2(call);
-                        const format_convert_t c = { .arg = IPC_GET_ARG3(call) };
+                        context = (hound_context_id_t) ipc_get_arg1(&call);
+                        flags = ipc_get_arg2(&call);
+                        const format_convert_t c = { .arg = ipc_get_arg3(&call) };
                         const pcm_format_t f = {
                                 .sampling_rate = c.f.rate * 100,
@@ -576 +576 @@
                                 .sample_format = c.f.format,
                         };
-                        size_t bsize = IPC_GET_ARG4(call);
+                        size_t bsize = ipc_get_arg4(&call);
 
                         void *stream;
@@ -640 +640 @@
         /* accept data write or drain */
         while (async_data_write_receive(&call, &size) ||
-            (IPC_GET_IMETHOD(call) == IPC_M_HOUND_STREAM_DRAIN)) {
+            (ipc_get_imethod(&call) == IPC_M_HOUND_STREAM_DRAIN)) {
                 /* check drain first */
-                if (IPC_GET_IMETHOD(call) == IPC_M_HOUND_STREAM_DRAIN) {
+                if (ipc_get_imethod(&call) == IPC_M_HOUND_STREAM_DRAIN) {
                         errno_t ret = ENOTSUP;
                         if (server_iface->drain_stream)
@@ -668 +668 @@
                 }
         }
-        const errno_t ret = IPC_GET_IMETHOD(call) == IPC_M_HOUND_STREAM_EXIT ?
+        const errno_t ret = ipc_get_imethod(&call) == IPC_M_HOUND_STREAM_EXIT ?
             EOK : EINVAL;
 
@@ -687 +687 @@
         /* accept data read and drain */
         while (async_data_read_receive(&call, &size) ||
-            (IPC_GET_IMETHOD(call) == IPC_M_HOUND_STREAM_DRAIN)) {
+            (ipc_get_imethod(&call) == IPC_M_HOUND_STREAM_DRAIN)) {
                 /* drain does not make much sense but it is allowed */
-                if (IPC_GET_IMETHOD(call) == IPC_M_HOUND_STREAM_DRAIN) {
+                if (ipc_get_imethod(&call) == IPC_M_HOUND_STREAM_DRAIN) {
                         errno_t ret = ENOTSUP;
                         if (server_iface->drain_stream)
@@ -712 +712 @@
                 }
         }
-        const errno_t ret = IPC_GET_IMETHOD(call) == IPC_M_HOUND_STREAM_EXIT ?
+        const errno_t ret = ipc_get_imethod(&call) == IPC_M_HOUND_STREAM_EXIT ?
             EOK : EINVAL;