Changeset 95a47b0 in mainline

Timestamp:

2019-02-06T13:25:12Z (5 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

ab87db5

Parents:

fafb8e5

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-02 14:30:19)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-06 13:25:12)

Message:

Turn ipc_get_*/ipc_set_* into functions

Files:

• abi/include/abi/ipc/ipc.h (modified) (3 diffs)
• uspace/lib/c/generic/async/server.c (modified) (1 diff)

abi/include/abi/ipc/ipc.h

@@ -36 +36 @@
 #define ABI_IPC_IPC_H_
 
+#include <stdint.h>
 #include <abi/proc/task.h>
 #include <abi/cap.h>
+#include <_bits/errno.h>
 
 /** Length of data being transferred with IPC call
@@ -71 +73 @@
  */
 #define DATA_XFER_LIMIT  (64 * 1024)
-
-/* Macros for manipulating calling data */
-#define ipc_set_retval(data, retval)  ((data)->args[0] = (sysarg_t) (retval))
-#define ipc_set_imethod(data, val)    ((data)->args[0] = (val))
-#define ipc_set_arg1(data, val)       ((data)->args[1] = (val))
-#define ipc_set_arg2(data, val)       ((data)->args[2] = (val))
-#define ipc_set_arg3(data, val)       ((data)->args[3] = (val))
-#define ipc_set_arg4(data, val)       ((data)->args[4] = (val))
-#define ipc_set_arg5(data, val)       ((data)->args[5] = (val))
-
-#define ipc_get_imethod(data)  ((data)->args[0])
-#define ipc_get_retval(data)   ((errno_t) (data)->args[0])
-
-#define ipc_get_arg1(data)  ((data)->args[1])
-#define ipc_get_arg2(data)  ((data)->args[2])
-#define ipc_get_arg3(data)  ((data)->args[3])
-#define ipc_get_arg4(data)  ((data)->args[4])
-#define ipc_get_arg5(data)  ((data)->args[5])
 
 /* Forwarding flags. */
@@ -128 +112 @@
 } ipc_data_t;
 
+/* Functions for manipulating calling data */
+
+static inline void ipc_set_retval(ipc_data_t *data, errno_t retval)
+{
+        data->args[0] = (sysarg_t) retval;
+}
+
+static inline void ipc_set_imethod(ipc_data_t *data, sysarg_t val)
+{
+        data->args[0] = val;
+}
+
+static inline void ipc_set_arg1(ipc_data_t *data, sysarg_t val)
+{
+        data->args[1] = val;
+}
+
+static inline void ipc_set_arg2(ipc_data_t *data, sysarg_t val)
+{
+        data->args[2] = val;
+}
+
+static inline void ipc_set_arg3(ipc_data_t *data, sysarg_t val)
+{
+        data->args[3] = val;
+}
+
+static inline void ipc_set_arg4(ipc_data_t *data, sysarg_t val)
+{
+        data->args[4] = val;
+}
+
+static inline void ipc_set_arg5(ipc_data_t *data, sysarg_t val)
+{
+        data->args[5] = val;
+}
+
+static inline sysarg_t ipc_get_imethod(ipc_data_t *data)
+{
+        return data->args[0];
+}
+static inline errno_t ipc_get_retval(ipc_data_t *data)
+{
+        return (errno_t) data->args[0];
+}
+
+static inline sysarg_t ipc_get_arg1(ipc_data_t *data)
+{
+        return data->args[1];
+}
+
+static inline sysarg_t ipc_get_arg2(ipc_data_t *data)
+{
+        return data->args[2];
+}
+
+static inline sysarg_t ipc_get_arg3(ipc_data_t *data)
+{
+        return data->args[3];
+}
+
+static inline sysarg_t ipc_get_arg4(ipc_data_t *data)
+{
+        return data->args[4];
+}
+
+static inline sysarg_t ipc_get_arg5(ipc_data_t *data)
+{
+        return data->args[5];
+}
+
 #endif
 

uspace/lib/c/generic/async/server.c

@@ -656 +656 @@
         }
 
-        ht_link_t *link = hash_table_find(&notification_hash_table,
-            &ipc_get_imethod(call));
+        sysarg_t imethod = ipc_get_imethod(call);
+        ht_link_t *link = hash_table_find(&notification_hash_table, &imethod);
         if (!link) {
                 /* Invalid notification. */