Changes in uspace/app/trace/ipcp.c [09ab0a9a:5e801dc] in mainline

File:

• uspace/app/trace/ipcp.c (modified) (9 diffs)

uspace/app/trace/ipcp.c

@@ -72 +72 @@
 proto_t *proto_unknown;         /**< Protocol with no known methods. */
 
-static size_t pending_call_key_hash(void *key)
-{
-        cap_call_handle_t *chandle = (cap_call_handle_t *) key;
-        return CAP_HANDLE_RAW(*chandle);
+static size_t pending_call_key_hash(const void *key)
+{
+        const cap_call_handle_t *chandle = key;
+        return cap_handle_raw(*chandle);
 }
 
@@ -81 +81 @@
 {
         pending_call_t *hs = hash_table_get_inst(item, pending_call_t, link);
-        return CAP_HANDLE_RAW(hs->call_handle);
-}
-
-static bool pending_call_key_equal(void *key, const ht_link_t *item)
-{
-        cap_call_handle_t *chandle = (cap_call_handle_t *) key;
+        return cap_handle_raw(hs->call_handle);
+}
+
+static bool pending_call_key_equal(const void *key, const ht_link_t *item)
+{
+        const cap_call_handle_t *chandle = key;
         pending_call_t *hs = hash_table_get_inst(item, pending_call_t, link);
 
@@ -104 +104 @@
         // XXX: there is no longer a limit on the number of phones as phones are
         // now handled using capabilities
-        if (CAP_HANDLE_RAW(phone) < 0 || CAP_HANDLE_RAW(phone) >= MAX_PHONE)
+        if (cap_handle_raw(phone) < 0 || cap_handle_raw(phone) >= MAX_PHONE)
                 return;
-        connections[CAP_HANDLE_RAW(phone)].server = server;
-        connections[CAP_HANDLE_RAW(phone)].proto = proto;
-        have_conn[CAP_HANDLE_RAW(phone)] = 1;
+        connections[cap_handle_raw(phone)].server = server;
+        connections[cap_handle_raw(phone)].proto = proto;
+        have_conn[cap_handle_raw(phone)] = 1;
 }
 
 void ipcp_connection_clear(cap_phone_handle_t phone)
 {
-        have_conn[CAP_HANDLE_RAW(phone)] = 0;
-        connections[CAP_HANDLE_RAW(phone)].server = 0;
-        connections[CAP_HANDLE_RAW(phone)].proto = NULL;
+        have_conn[cap_handle_raw(phone)] = 0;
+        connections[cap_handle_raw(phone)].server = 0;
+        connections[cap_handle_raw(phone)].proto = NULL;
 }
 
@@ -184 +184 @@
         int i;
 
-        if (have_conn[CAP_HANDLE_RAW(phandle)])
-                proto = connections[CAP_HANDLE_RAW(phandle)].proto;
+        if (have_conn[cap_handle_raw(phandle)])
+                proto = connections[cap_handle_raw(phandle)].proto;
         else
                 proto = NULL;
@@ -194 +194 @@
                 printf("Call handle: %p, phone: %p, proto: %s, method: ",
                     chandle, phandle, (proto ? proto->name : "n/a"));
-                ipc_m_print(proto, IPC_GET_IMETHOD(*call));
+                ipc_m_print(proto, ipc_get_imethod(call));
                 printf(" args: (%" PRIun ", %" PRIun ", %" PRIun ", "
                     "%" PRIun ", %" PRIun ")\n",
@@ -203 +203 @@
 
                 if (proto != NULL) {
-                        oper = proto_get_oper(proto, IPC_GET_IMETHOD(*call));
+                        oper = proto_get_oper(proto, ipc_get_imethod(call));
                 } else {
                         oper = NULL;
@@ -262 +262 @@
 
         phone = pcall->phone_handle;
-        method = IPC_GET_IMETHOD(pcall->question);
-        retval = IPC_GET_RETVAL(*answer);
+        method = ipc_get_imethod(&pcall->question);
+        retval = ipc_get_retval(answer);
 
         resp = answer->args;
@@ -270 +270 @@
                 printf("Response to %p: retval=%s, args = (%" PRIun ", "
                     "%" PRIun ", %" PRIun ", %" PRIun ", %" PRIun ")\n",
-                    call_handle, str_error_name(retval), IPC_GET_ARG1(*answer),
-                    IPC_GET_ARG2(*answer), IPC_GET_ARG3(*answer),
-                    IPC_GET_ARG4(*answer), IPC_GET_ARG5(*answer));
+                    call_handle, str_error_name(retval), ipc_get_arg1(answer),
+                    ipc_get_arg2(answer), ipc_get_arg3(answer),
+                    ipc_get_arg4(answer), ipc_get_arg5(answer));
         }
 
@@ -305 +305 @@
             (retval == 0)) {
                 /* Connected to a service (through NS) */
-                service = IPC_GET_ARG2(pcall->question);
+                service = ipc_get_arg2(&pcall->question);
                 proto = proto_get_by_srv(service);
                 if (proto == NULL)
                         proto = proto_unknown;
 
-                cphone = (cap_phone_handle_t) IPC_GET_ARG5(*answer);
+                cphone = (cap_phone_handle_t) ipc_get_arg5(answer);
                 if ((display_mask & DM_SYSTEM) != 0) {
                         printf("Registering connection (phone %p, protocol: %s)\n", cphone,