Changeset bb97118 in mainline for uspace/app/trace/ipcp.c

Timestamp:

2019-02-06T13:25:12Z (6 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:

eb13ef8

Parents:

d066259

git-author:

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

git-committer:

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

Message:

Convert CAP_HANDLE_RAW and CAP_HANDLE_VALID into functions

File:

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

uspace/app/trace/ipcp.c

@@ -75 +75 @@
 {
         cap_call_handle_t *chandle = (cap_call_handle_t *) key;
-        return CAP_HANDLE_RAW(*chandle);
+        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);
+        return cap_handle_raw(hs->call_handle);
 }
 
@@ -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;