Changeset dd28c1a in mainline for uspace/drv/char/i8042/i8042.c

Timestamp:

2011-12-09T17:01:16Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

979c5729

Parents:

78aa0ab

Message:

i8042: Less function use global parameter.

File:

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

uspace/drv/char/i8042/i8042.c

@@ -102 +102 @@
 static i8042_dev_t device;
 
-static void wait_ready(void)
-{
-        while (pio_read_8(&device.regs->status) & i8042_INPUT_FULL);
+static void wait_ready(i8042_dev_t *dev)
+{
+        assert(dev);
+        while (pio_read_8(&dev->regs->status) & i8042_INPUT_FULL);
 }
 
@@ -110 +111 @@
 static void i8042_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg);
 static int i8042_init(i8042_dev_t *dev);
-static void i8042_port_write(int devid, uint8_t data);
+static void i8042_port_write(i8042_dev_t *dev, int devid, uint8_t data);
 
 
@@ -179 +180 @@
         
         /* Disable kbd and aux */
-        wait_ready();
+        wait_ready(dev);
         pio_write_8(&dev->regs->status, i8042_CMD_WRITE_CMDB);
-        wait_ready();
+        wait_ready(dev);
         pio_write_8(&dev->regs->data, i8042_KBD_DISABLE | i8042_AUX_DISABLE);
 
@@ -195 +196 @@
             NAME, inr_a, inr_b);
 
-        wait_ready();
+        wait_ready(dev);
         pio_write_8(&dev->regs->status, i8042_CMD_WRITE_CMDB);
-        wait_ready();
+        wait_ready(dev);
         pio_write_8(&dev->regs->data, i8042_KBD_IE | i8042_KBD_TRANSLATE |
             i8042_AUX_IE);
@@ -259 +260 @@
                                 printf(NAME ": write %" PRIun " to devid %d\n",
                                     IPC_GET_ARG1(call), dev_id);
-                                i8042_port_write(dev_id, IPC_GET_ARG1(call));
+                                i8042_port_write(&device, dev_id, IPC_GET_ARG1(call));
                                 retval = 0;
                                 break;
@@ -272 +273 @@
 }
 
-void i8042_port_write(int devid, uint8_t data)
-{
+void i8042_port_write(i8042_dev_t *dev, int devid, uint8_t data)
+{
+        assert(dev);
         if (devid == DEVID_AUX) {
-                wait_ready();
-                pio_write_8(&device.regs->status, i8042_CMD_WRITE_AUX);
-        }
-        wait_ready();
-        pio_write_8(&device.regs->data, data);
+                wait_ready(dev);
+                pio_write_8(&dev->regs->status, i8042_CMD_WRITE_AUX);
+        }
+        wait_ready(dev);
+        pio_write_8(&dev->regs->data, data);
 }