Changeset bc73be3 in mainline for uspace/drv/hid/xtkbd/xtkbd.c

Timestamp:

2019-06-27T08:51:20Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, topic/msim-upgrade, topic/simplify-dev-export

Children:

8add15e0

Parents:

ad40b74b (diff), aeba767 (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.

Message:

cpp: merge and resolve conflicts

File:

• uspace/drv/hid/xtkbd/xtkbd.c (modified) (2 diffs)

uspace/drv/hid/xtkbd/xtkbd.c

@@ -344 +344 @@
 static void default_connection_handler(ddf_fun_t *fun, ipc_call_t *icall)
 {
-        const sysarg_t method = IPC_GET_IMETHOD(*icall);
+        const sysarg_t method = ipc_get_imethod(icall);
         xt_kbd_t *kbd = ddf_dev_data_get(ddf_fun_get_dev(fun));
         unsigned mods;
@@ -355 +355 @@
                  * assume AT keyboard with Scan Code Set 1.
                  */
-                mods = IPC_GET_ARG1(*icall);
+                mods = ipc_get_arg1(icall);
                 const uint8_t status = 0 |
                     ((mods & KM_CAPS_LOCK) ? LI_CAPS : 0) |