Changeset ab87db5 in mainline for uspace/app

Timestamp:

2019-02-23T17:16:01Z (7 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

Location:

uspace/app

Files:

• kio/kio.c (modified) (1 diff)
• trace/ipcp.c (modified) (9 diffs)
• trace/trace.c (modified) (1 diff)
• wavplay/dplay.c (modified) (2 diffs)
• wavplay/drec.c (modified) (2 diffs)

uspace/app/kio/kio.c

@@ -164 +164 @@
         fibril_mutex_lock(&mtx);
 
-        size_t kio_start = (size_t) IPC_GET_ARG1(*call);
-        size_t kio_len = (size_t) IPC_GET_ARG2(*call);
-        size_t kio_stored = (size_t) IPC_GET_ARG3(*call);
+        size_t kio_start = (size_t) ipc_get_arg1(call);
+        size_t kio_len = (size_t) ipc_get_arg2(call);
+        size_t kio_stored = (size_t) ipc_get_arg3(call);
 
         size_t offset = (kio_start + kio_len - kio_stored) % kio_length;

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;
@@ -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,

uspace/app/trace/trace.c

@@ -302 +302 @@
         phandle = (cap_phone_handle_t) sc_args[0];
 
-        IPC_SET_IMETHOD(call, sc_args[1]);
-        IPC_SET_ARG1(call, sc_args[2]);
-        IPC_SET_ARG2(call, sc_args[3]);
-        IPC_SET_ARG3(call, sc_args[4]);
-        IPC_SET_ARG4(call, sc_args[5]);
-        IPC_SET_ARG5(call, 0);
+        ipc_set_imethod(&call, sc_args[1]);
+        ipc_set_arg1(&call, sc_args[2]);
+        ipc_set_arg2(&call, sc_args[3]);
+        ipc_set_arg3(&call, sc_args[4]);
+        ipc_set_arg4(&call, sc_args[5]);
+        ipc_set_arg5(&call, 0);
 
         ipcp_call_out(phandle, &call, 0);

uspace/app/wavplay/dplay.c

@@ -103 +103 @@
                 async_get_call(&call);
 
-                switch (IPC_GET_IMETHOD(call)) {
+                switch (ipc_get_imethod(&call)) {
                 case PCM_EVENT_PLAYBACK_STARTED:
                 case PCM_EVENT_FRAMES_PLAYED:
-                        printf("%" PRIun " frames: ", IPC_GET_ARG1(call));
+                        printf("%" PRIun " frames: ", ipc_get_arg1(&call));
                         async_answer_0(&call, EOK);
                         break;
@@ -118 +118 @@
                         return;
                 default:
-                        printf("Unknown event %" PRIun ".\n", IPC_GET_IMETHOD(call));
+                        printf("Unknown event %" PRIun ".\n", ipc_get_imethod(&call));
                         async_answer_0(&call, ENOTSUP);
                         continue;

uspace/app/wavplay/drec.c

@@ -103 +103 @@
                 async_get_call(&call);
 
-                switch (IPC_GET_IMETHOD(call)) {
+                switch (ipc_get_imethod(&call)) {
                 case PCM_EVENT_CAPTURE_TERMINATED:
                         printf("Recording terminated\n");
@@ -109 +109 @@
                         break;
                 case PCM_EVENT_FRAMES_CAPTURED:
-                        printf("%" PRIun " frames\n", IPC_GET_ARG1(call));
+                        printf("%" PRIun " frames\n", ipc_get_arg1(&call));
                         break;
                 default:
-                        printf("Unknown event %" PRIun ".\n", IPC_GET_IMETHOD(call));
+                        printf("Unknown event %" PRIun ".\n", ipc_get_imethod(&call));
                         async_answer_0(&call, ENOTSUP);
                         continue;