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

Timestamp:

2017-11-25T11:12:23Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

98cb5e0d

Parents:

f571ca49 (diff), 0851a3d (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:

Merge branch 'master' into callcaps

File:

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

uspace/drv/char/i8042/i8042.c

@@ -2 +2 @@
  * Copyright (c) 2001-2004 Jakub Jermar
  * Copyright (c) 2006 Josef Cejka
- * Copyright (c) 2014 Jiri Svoboda
+ * Copyright (c) 2017 Jiri Svoboda
  * Copyright (c) 2011 Jan Vesely
  * All rights reserved.
@@ -39 +39 @@
  */
 
+#include <adt/circ_buf.h>
 #include <ddf/log.h>
 #include <ddf/interrupt.h>
@@ -130 +131 @@
 {
         i8042_t *controller = ddf_dev_data_get(dev);
+        int rc;
         
         const uint8_t status = IPC_GET_ARG1(*call);
         const uint8_t data = IPC_GET_ARG2(*call);
         
-        buffer_t *buffer = (status & i8042_AUX_DATA) ?
-            &controller->aux_buffer : &controller->kbd_buffer;
-        
-        buffer_write(buffer, data);
+        i8042_port_t *port = (status & i8042_AUX_DATA) ?
+            controller->aux : controller->kbd;
+        
+        fibril_mutex_lock(&port->buf_lock);
+        
+        rc = circ_buf_push(&port->cbuf, &data);
+        if (rc != EOK)
+                ddf_msg(LVL_ERROR, "Buffer overrun");
+
+        fibril_mutex_unlock(&port->buf_lock);
+        fibril_condvar_broadcast(&port->buf_cv);
 }
 
@@ -159 +168 @@
         const size_t cmd_count = sizeof(i8042_cmds) / sizeof(irq_cmd_t);
         irq_cmd_t cmds[cmd_count];
+        ddf_fun_t *kbd_fun;
+        ddf_fun_t *aux_fun;
         i8042_regs_t *ar;
-
+        
         int rc;
         bool kbd_bound = false;
         bool aux_bound = false;
-
-        dev->kbd_fun = NULL;
-        dev->aux_fun = NULL;
         
         if (regs->size < sizeof(i8042_regs_t)) {
@@ -178 +186 @@
         }
         
-        dev->kbd_fun = ddf_fun_create(ddf_dev, fun_inner, "ps2a");
-        if (dev->kbd_fun == NULL) {
+        kbd_fun = ddf_fun_create(ddf_dev, fun_inner, "ps2a");
+        if (kbd_fun == NULL) {
                 rc = ENOMEM;
                 goto error;
         };
         
-        dev->kbd = ddf_fun_data_alloc(dev->kbd_fun, sizeof(i8042_port_t));
+        dev->kbd = ddf_fun_data_alloc(kbd_fun, sizeof(i8042_port_t));
         if (dev->kbd == NULL) {
                 rc = ENOMEM;
@@ -190 +198 @@
         }
         
+        dev->kbd->fun = kbd_fun;
         dev->kbd->ctl = dev;
         chardev_srvs_init(&dev->kbd->cds);
         dev->kbd->cds.ops = &i8042_chardev_ops;
         dev->kbd->cds.sarg = dev->kbd;
-        
-        rc = ddf_fun_add_match_id(dev->kbd_fun, "char/xtkbd", 90);
+        fibril_mutex_initialize(&dev->kbd->buf_lock);
+        fibril_condvar_initialize(&dev->kbd->buf_cv);
+        
+        rc = ddf_fun_add_match_id(dev->kbd->fun, "char/xtkbd", 90);
         if (rc != EOK)
                 goto error;
         
-        dev->aux_fun = ddf_fun_create(ddf_dev, fun_inner, "ps2b");
-        if (dev->aux_fun == NULL) {
+        aux_fun = ddf_fun_create(ddf_dev, fun_inner, "ps2b");
+        if (aux_fun == NULL) {
                 rc = ENOMEM;
                 goto error;
         }
         
-        dev->aux = ddf_fun_data_alloc(dev->aux_fun, sizeof(i8042_port_t));
+        dev->aux = ddf_fun_data_alloc(aux_fun, sizeof(i8042_port_t));
         if (dev->aux == NULL) {
                 rc = ENOMEM;
@@ -211 +222 @@
         }
         
+        dev->aux->fun = aux_fun;
         dev->aux->ctl = dev;
         chardev_srvs_init(&dev->aux->cds);
         dev->aux->cds.ops = &i8042_chardev_ops;
         dev->aux->cds.sarg = dev->aux;
-        
-        rc = ddf_fun_add_match_id(dev->aux_fun, "char/ps2mouse", 90);
+        fibril_mutex_initialize(&dev->aux->buf_lock);
+        fibril_condvar_initialize(&dev->aux->buf_cv);
+        
+        rc = ddf_fun_add_match_id(dev->aux->fun, "char/ps2mouse", 90);
         if (rc != EOK)
                 goto error;
         
-        ddf_fun_set_conn_handler(dev->kbd_fun, i8042_char_conn);
-        ddf_fun_set_conn_handler(dev->aux_fun, i8042_char_conn);
-        
-        buffer_init(&dev->kbd_buffer, dev->kbd_data, BUFFER_SIZE);
-        buffer_init(&dev->aux_buffer, dev->aux_data, BUFFER_SIZE);
+        ddf_fun_set_conn_handler(dev->kbd->fun, i8042_char_conn);
+        ddf_fun_set_conn_handler(dev->aux->fun, i8042_char_conn);
+        
+        circ_buf_init(&dev->kbd->cbuf, dev->kbd->buf_data, BUFFER_SIZE, 1);
+        circ_buf_init(&dev->aux->cbuf, dev->aux->buf_data, BUFFER_SIZE, 1);
         fibril_mutex_initialize(&dev->write_guard);
         
-        rc = ddf_fun_bind(dev->kbd_fun);
+        rc = ddf_fun_bind(dev->kbd->fun);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed to bind keyboard function: %s.",
-                    ddf_fun_get_name(dev->kbd_fun));
+                    ddf_fun_get_name(dev->kbd->fun));
                 goto error;
         }
         kbd_bound = true;
         
-        rc = ddf_fun_bind(dev->aux_fun);
+        rc = ddf_fun_bind(dev->aux->fun);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed to bind aux function: %s.",
-                    ddf_fun_get_name(dev->aux_fun));
+                    ddf_fun_get_name(dev->aux->fun));
                 goto error;
         }
@@ -317 +331 @@
 error:
         if (kbd_bound)
-                ddf_fun_unbind(dev->kbd_fun);
+                ddf_fun_unbind(dev->kbd->fun);
         if (aux_bound)
-                ddf_fun_unbind(dev->aux_fun);
-        if (dev->kbd_fun != NULL)
-                ddf_fun_destroy(dev->kbd_fun);
-        if (dev->aux_fun != NULL)
-                ddf_fun_destroy(dev->aux_fun);
+                ddf_fun_unbind(dev->aux->fun);
+        if (dev->kbd->fun != NULL)
+                ddf_fun_destroy(dev->kbd->fun);
+        if (dev->aux->fun != NULL)
+                ddf_fun_destroy(dev->aux->fun);
 
         return rc;
@@ -377 +391 @@
 {
         i8042_port_t *port = (i8042_port_t *)srv->srvs->sarg;
-        i8042_t *i8042 = port->ctl;
+        size_t p;
         uint8_t *destp = (uint8_t *)dest;
         int rc;
-        size_t i;
-        
-        buffer_t *buffer = (port == i8042->aux) ?
-            &i8042->aux_buffer : &i8042->kbd_buffer;
-        
-        for (i = 0; i < size; ++i) {
-                rc = buffer_read(buffer, destp, i == 0);
+        
+        fibril_mutex_lock(&port->buf_lock);
+        
+        while (circ_buf_nused(&port->cbuf) == 0)
+                fibril_condvar_wait(&port->buf_cv, &port->buf_lock);
+
+        p = 0;
+        while (p < size) {
+                rc = circ_buf_pop(&port->cbuf, &destp[p]);
                 if (rc != EOK)
                         break;
-                ++destp;
-        }
-        
-        *nread = i;
+                ++p;
+        }
+
+        fibril_mutex_unlock(&port->buf_lock);
+
+        *nread = p;
         return EOK;
 }