Changeset 78aa0ab in mainline

Timestamp:

2011-12-09T16:56:17Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

dd28c1a

Parents:

7f1669f

Message:

i8042: Use one device structure instead of multiple separate variables.

Location:

uspace/drv/char/i8042

Files:

• i8042.c (modified) (12 diffs)
• i8042.h (modified) (1 diff)

uspace/drv/char/i8042/i8042.c ¶

@@ -68 +68 @@
 
 
-enum {
-        DEVID_PRI = 0, /**< primary device */
-        DEVID_AUX = 1, /**< AUX device */
-        MAX_DEVS  = 2
-};
-
 static irq_cmd_t i8042_cmds[] = {
         {
@@ -106 +100 @@
 };
 
-static uintptr_t i8042_physical;
-static uintptr_t i8042_kernel;
-static i8042_regs_t * i8042;
-
-static i8042_port_t i8042_port[MAX_DEVS];
+static i8042_dev_t device;
 
 static void wait_ready(void)
 {
-        while (pio_read_8(&i8042->status) & i8042_INPUT_FULL);
+        while (pio_read_8(&device.regs->status) & i8042_INPUT_FULL);
 }
 
 static void i8042_irq_handler(ipc_callid_t iid, ipc_call_t *call);
 static void i8042_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg);
-static int i8042_init(void);
+static int i8042_init(i8042_dev_t *dev);
 static void i8042_port_write(int devid, uint8_t data);
 
@@ -127 +117 @@
         char name[16];
         int i, rc;
-        char dchar[MAX_DEVS] = { 'a', 'b' };
+        const char dchar[MAX_DEVS] = { 'a', 'b' };
 
         printf(NAME ": i8042 PS/2 port driver\n");
@@ -137 +127 @@
         }
 
-        if (i8042_init() != EOK)
+        if (i8042_init(&device) != EOK)
                 return -1;
 
         for (i = 0; i < MAX_DEVS; i++) {
-                i8042_port[i].client_sess = NULL;
+                device.port[i].client_sess = NULL;
 
                 snprintf(name, 16, "%s/ps2%c", NAMESPACE, dchar[i]);
-                rc = loc_service_register(name, &i8042_port[i].service_id);
+                rc = loc_service_register(name, &device.port[i].service_id);
                 if (rc != EOK) {
                         printf(NAME ": Unable to register device %s.\n", name);
@@ -160 +150 @@
 }
 
-static int i8042_init(void)
-{
+static int i8042_init(i8042_dev_t *dev)
+{
+        static uintptr_t i8042_physical;
+        static uintptr_t i8042_kernel;
+        assert(dev);
         if (sysinfo_get_value("i8042.address.physical", &i8042_physical) != EOK)
                 return -1;
@@ -172 +165 @@
                 return -1;
         
-        i8042 = vaddr;
+        dev->regs = vaddr;
         
         sysarg_t inr_a;
@@ -187 +180 @@
         /* Disable kbd and aux */
         wait_ready();
-        pio_write_8(&i8042->status, i8042_CMD_WRITE_CMDB);
-        wait_ready();
-        pio_write_8(&i8042->data, i8042_KBD_DISABLE | i8042_AUX_DISABLE);
+        pio_write_8(&dev->regs->status, i8042_CMD_WRITE_CMDB);
+        wait_ready();
+        pio_write_8(&dev->regs->data, i8042_KBD_DISABLE | i8042_AUX_DISABLE);
 
         /* Flush all current IO */
-        while (pio_read_8(&i8042->status) & i8042_OUTPUT_FULL)
-                (void) pio_read_8(&i8042->data);
+        while (pio_read_8(&dev->regs->status) & i8042_OUTPUT_FULL)
+                (void) pio_read_8(&dev->regs->data);
 
         i8042_kbd.cmds[0].addr = (void *) &((i8042_regs_t *) i8042_kernel)->status;
@@ -203 +196 @@
 
         wait_ready();
-        pio_write_8(&i8042->status, i8042_CMD_WRITE_CMDB);
-        wait_ready();
-        pio_write_8(&i8042->data, i8042_KBD_IE | i8042_KBD_TRANSLATE |
+        pio_write_8(&dev->regs->status, i8042_CMD_WRITE_CMDB);
+        wait_ready();
+        pio_write_8(&dev->regs->data, i8042_KBD_IE | i8042_KBD_TRANSLATE |
             i8042_AUX_IE);
 
@@ -229 +222 @@
         dev_id = -1;
         for (i = 0; i < MAX_DEVS; i++) {
-                if (i8042_port[i].service_id == dsid)
+                if (device.port[i].service_id == dsid)
                         dev_id = i;
         }
@@ -256 +249 @@
                     async_callback_receive_start(EXCHANGE_SERIALIZE, &call);
                 if (sess != NULL) {
-                        if (i8042_port[dev_id].client_sess == NULL) {
-                                i8042_port[dev_id].client_sess = sess;
+                        if (device.port[dev_id].client_sess == NULL) {
+                                device.port[dev_id].client_sess = sess;
                                 retval = EOK;
                         } else
@@ -283 +276 @@
         if (devid == DEVID_AUX) {
                 wait_ready();
-                pio_write_8(&i8042->status, i8042_CMD_WRITE_AUX);
-        }
-        wait_ready();
-        pio_write_8(&i8042->data, data);
+                pio_write_8(&device.regs->status, i8042_CMD_WRITE_AUX);
+        }
+        wait_ready();
+        pio_write_8(&device.regs->data, data);
 }
 
@@ -303 +296 @@
         }
 
-        if (i8042_port[devid].client_sess != NULL) {
+        if (device.port[devid].client_sess != NULL) {
                 async_exch_t *exch =
-                    async_exchange_begin(i8042_port[devid].client_sess);
+                    async_exchange_begin(device.port[devid].client_sess);
                 async_msg_1(exch, IPC_FIRST_USER_METHOD, data);
                 async_exchange_end(exch);

uspace/drv/char/i8042/i8042.h ¶

@@ -56 +56 @@
 } i8042_port_t;
 
+enum {
+        DEVID_PRI = 0, /**< primary device */
+        DEVID_AUX = 1, /**< AUX device */
+        MAX_DEVS  = 2
+};
+
+typedef struct {
+        i8042_regs_t *regs;
+        i8042_port_t port[MAX_DEVS];
+} i8042_dev_t;
+
 #endif