Changeset fafb8e5 in mainline for uspace/app

Timestamp:

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

95a47b0

Parents:

eb13ef8

git-author:

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

git-committer:

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

Message:

Mechanically lowercase IPC_SET_*/IPC_GET_*

Location:

uspace/app

Files:

• kio/kio.c (modified) (1 diff)
• trace/ipcp.c (modified) (5 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

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