Changeset ab87db5 in mainline for uspace/srv/hid/input

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/srv/hid/input

Files:

• ctl/kbdev.c (modified) (2 diffs)
• input.c (modified) (3 diffs)
• proto/mousedev.c (modified) (2 diffs)

uspace/srv/hid/input/ctl/kbdev.c

@@ -160 +160 @@
                 async_get_call(&call);
 
-                if (!IPC_GET_IMETHOD(call)) {
+                if (!ipc_get_imethod(&call)) {
                         async_answer_0(&call, EOK);
                         kbdev_destroy(kbdev);
@@ -166 +166 @@
                 }
 
-                switch (IPC_GET_IMETHOD(call)) {
+                switch (ipc_get_imethod(&call)) {
                 case KBDEV_EVENT:
                         /* Got event from keyboard device */
                         retval = 0;
-                        type = IPC_GET_ARG1(call);
-                        key = IPC_GET_ARG2(call);
+                        type = ipc_get_arg1(&call);
+                        key = ipc_get_arg2(&call);
                         kbd_push_event(kbdev->kbd_dev, type, key);
                         break;

uspace/srv/hid/input/input.c

@@ -334 +334 @@
                 async_get_call(&call);
 
-                if (!IPC_GET_IMETHOD(call)) {
+                if (!ipc_get_imethod(&call)) {
                         if (client->sess != NULL) {
                                 async_hangup(client->sess);
@@ -353 +353 @@
                                 async_answer_0(&call, ELIMIT);
                 } else {
-                        switch (IPC_GET_IMETHOD(call)) {
+                        switch (ipc_get_imethod(&call)) {
                         case INPUT_ACTIVATE:
                                 active_client = client;
@@ -368 +368 @@
 static void kconsole_event_handler(ipc_call_t *call, void *arg)
 {
-        if (IPC_GET_ARG1(*call)) {
+        if (ipc_get_arg1(call)) {
                 /* Kernel console activated */
                 active = false;

uspace/srv/hid/input/proto/mousedev.c

@@ -79 +79 @@
                 async_get_call(&call);
 
-                if (!IPC_GET_IMETHOD(call)) {
+                if (!ipc_get_imethod(&call)) {
                         async_answer_0(&call, EOK);
                         mousedev_destroy(mousedev);
@@ -87 +87 @@
                 errno_t retval;
 
-                switch (IPC_GET_IMETHOD(call)) {
+                switch (ipc_get_imethod(&call)) {
                 case MOUSEEV_MOVE_EVENT:
                         mouse_push_event_move(mousedev->mouse_dev,
-                            IPC_GET_ARG1(call), IPC_GET_ARG2(call),
-                            IPC_GET_ARG3(call));
+                            ipc_get_arg1(&call), ipc_get_arg2(&call),
+                            ipc_get_arg3(&call));
                         retval = EOK;
                         break;
                 case MOUSEEV_ABS_MOVE_EVENT:
                         mouse_push_event_abs_move(mousedev->mouse_dev,
-                            IPC_GET_ARG1(call), IPC_GET_ARG2(call),
-                            IPC_GET_ARG3(call), IPC_GET_ARG4(call));
+                            ipc_get_arg1(&call), ipc_get_arg2(&call),
+                            ipc_get_arg3(&call), ipc_get_arg4(&call));
                         retval = EOK;
                         break;
                 case MOUSEEV_BUTTON_EVENT:
                         mouse_push_event_button(mousedev->mouse_dev,
-                            IPC_GET_ARG1(call), IPC_GET_ARG2(call));
+                            ipc_get_arg1(&call), ipc_get_arg2(&call));
                         retval = EOK;
                         break;