Changeset ab87db5 in mainline for uspace/drv/char

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/drv/char

Files:

• i8042/i8042.c (modified) (1 diff)
• msim-con/msim-con.c (modified) (2 diffs)
• ns8250/ns8250.c (modified) (2 diffs)
• pc-lpt/pc-lpt.c (modified) (1 diff)
• pl050/pl050.c (modified) (1 diff)

uspace/drv/char/i8042/i8042.c

@@ -132 +132 @@
         errno_t rc;
 
-        const uint8_t status = IPC_GET_ARG1(*call);
-        const uint8_t data = IPC_GET_ARG2(*call);
+        const uint8_t status = ipc_get_arg1(call);
+        const uint8_t data = ipc_get_arg2(call);
 
         i8042_port_t *port = (status & i8042_AUX_DATA) ?

uspace/drv/char/msim-con/msim-con.c

@@ -71 +71 @@
         fibril_mutex_lock(&con->buf_lock);
 
-        c = IPC_GET_ARG2(*call);
+        c = ipc_get_arg2(call);
         rc = circ_buf_push(&con->cbuf, &c);
         if (rc != EOK)
@@ -156 +156 @@
         return EOK;
 error:
-        if (CAP_HANDLE_VALID(con->irq_handle))
+        if (cap_handle_valid(con->irq_handle))
                 async_irq_unsubscribe(con->irq_handle);
         if (bound)

uspace/drv/char/ns8250/ns8250.c

@@ -1080 +1080 @@
 {
         ns8250_t *ns8250 = srv_ns8250(srv);
-        sysarg_t method = IPC_GET_IMETHOD(*call);
+        sysarg_t method = ipc_get_imethod(call);
         errno_t ret;
         unsigned int baud_rate, parity, word_length, stop_bits;
@@ -1093 +1093 @@
 
         case SERIAL_SET_COM_PROPS:
-                baud_rate = IPC_GET_ARG1(*call);
-                parity = IPC_GET_ARG2(*call);
-                word_length = IPC_GET_ARG3(*call);
-                stop_bits = IPC_GET_ARG4(*call);
+                baud_rate = ipc_get_arg1(call);
+                parity = ipc_get_arg2(call);
+                word_length = ipc_get_arg3(call);
+                stop_bits = ipc_get_arg4(call);
                 ret = ns8250_set_props(ns8250->dev, baud_rate, parity, word_length,
                     stop_bits);

uspace/drv/char/pc-lpt/pc-lpt.c

@@ -173 +173 @@
         return EOK;
 error:
-        if (CAP_HANDLE_VALID(lpt->irq_handle))
+        if (cap_handle_valid(lpt->irq_handle))
                 async_irq_unsubscribe(lpt->irq_handle);
         if (bound)

uspace/drv/char/pl050/pl050.c

@@ -157 +157 @@
         }
 
-        pl050->buffer[pl050->buf_wp] = IPC_GET_ARG2(*call);
+        pl050->buffer[pl050->buf_wp] = ipc_get_arg2(call);
         pl050->buf_wp = nidx;
         fibril_condvar_broadcast(&pl050->buf_cv);