Changeset c6c5ff3b in mainline

Timestamp:

2011-12-26T14:39:18Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9f97ffe

Parents:

19e00de4

Message:

i8042: Improve readability.

File:

• uspace/drv/char/i8042/i8042.c (modified) (4 diffs)

uspace/drv/char/i8042/i8042.c

@@ -146 +146 @@
         const uint8_t status = IPC_GET_ARG1(*call);
         const uint8_t data = IPC_GET_ARG2(*call);
-        char ** buffer = (status & i8042_AUX_DATA) ?
-            &controller->aux_buffer : &controller->kbd_buffer;
-        char * buffer_end = (status & i8042_AUX_DATA) ?
-            controller->aux_buffer_end : controller->kbd_buffer_end;
+        const bool aux = (status & i8042_AUX_DATA);
+        char ** buffer =
+            aux ? &controller->aux_buffer : &controller->kbd_buffer;
+        char * buffer_end =
+            aux ? controller->aux_buffer_end : controller->kbd_buffer_end;
+
         if (*buffer != NULL && *buffer < buffer_end) {
                 *(*buffer) = data;
@@ -156 +158 @@
         } else {
                 ddf_msg(LVL_WARN, "Unhandled %s data: %hhx , status: %hhx.",
-                    (status & i8042_AUX_DATA) ? "AUX" : "KBD", data, status);
+                    aux ? "AUX" : "KBD", data, status);
         }
 
@@ -322 +324 @@
         controller->kbd_buffer = buffer;
         controller->kbd_buffer_end = buffer + size;
+
         /* Wait for buffer to be filled */
         while (controller->kbd_buffer != controller->kbd_buffer_end)
@@ -363 +366 @@
         controller->aux_buffer = buffer;
         controller->aux_buffer_end = buffer + size;
+
         /* Wait for buffer to be filled */
         while (controller->aux_buffer != controller->aux_buffer_end)