Changeset 70922c2 in mainline for uspace/drv/char/i8042/i8042.c

Timestamp:

2012-02-01T00:09:22Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

ffcc5776

Parents:

cb3dbb63 (diff), 3d4750f (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:

Mainline changes.

File:

• uspace/drv/char/i8042/i8042.c (modified) (1 diff)

uspace/drv/char/i8042/i8042.c

@@ -307 +307 @@
         
         for (size_t i = 0; i < size; ++i) {
-                wait_ready(controller);
-                
-                if (controller->aux_fun == fun)
+                if (controller->aux_fun == fun) {
+                        wait_ready(controller);
                         pio_write_8(&controller->regs->status,
                             i8042_CMD_WRITE_AUX);
+                }
                 
+                wait_ready(controller);
                 pio_write_8(&controller->regs->data, buffer[i]);
         }