Changeset e7588a8 in mainline

Timestamp:

2017-11-24T02:21:56Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

0851a3d

Parents:

221176c1

Message:

i8042 can use adt/circ_buf.h

Location:

uspace/drv/char/i8042

Files:

• buffer.h (deleted)
• i8042.c (modified) (7 diffs)
• i8042.h (modified) (3 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) ?
+        circ_buf_t *cbuf = (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(cbuf, &data);
+        if (rc != EOK)
+                ddf_msg(LVL_ERROR, "Buffer overrun");
+
+        fibril_mutex_unlock(&port->buf_lock);
+        fibril_condvar_broadcast(&port->buf_cv);
 }
 
@@ -194 +205 @@
         dev->kbd->cds.ops = &i8042_chardev_ops;
         dev->kbd->cds.sarg = dev->kbd;
+        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);
@@ -215 +228 @@
         dev->aux->cds.ops = &i8042_chardev_ops;
         dev->aux->cds.sarg = dev->aux;
+        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);
@@ -223 +238 @@
         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);
+        circ_buf_init(&dev->kbd_buffer, dev->kbd_data, BUFFER_SIZE, 1);
+        circ_buf_init(&dev->aux_buffer, dev->aux_data, BUFFER_SIZE, 1);
         fibril_mutex_initialize(&dev->write_guard);
         
@@ -377 +392 @@
 {
         i8042_port_t *port = (i8042_port_t *)srv->srvs->sarg;
+        size_t p;
         i8042_t *i8042 = port->ctl;
         uint8_t *destp = (uint8_t *)dest;
         int rc;
-        size_t i;
-        
-        buffer_t *buffer = (port == i8042->aux) ?
+        
+        circ_buf_t *cbuf = (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(cbuf) == 0)
+                fibril_condvar_wait(&port->buf_cv, &port->buf_lock);
+
+        p = 0;
+        while (p < size) {
+                rc = circ_buf_pop(cbuf, &destp[p]);
                 if (rc != EOK)
                         break;
-                ++destp;
-        }
-        
-        *nread = i;
+                ++p;
+        }
+
+        fibril_mutex_unlock(&port->buf_lock);
+
+        *nread = p;
         return EOK;
 }

uspace/drv/char/i8042/i8042.h

@@ -40 +40 @@
 #define i8042_H_
 
+#include <adt/circ_buf.h>
 #include <io/chardev_srv.h>
 #include <ddi.h>
 #include <fibril_synch.h>
 #include <ddf/driver.h>
-#include "buffer.h"
 
 #define NAME  "i8042"
@@ -61 +61 @@
         struct i8042 *ctl;              /**< Controller */
         chardev_srvs_t cds;             /**< Character device server data */
+        fibril_mutex_t buf_lock;        /**< Protect buffer */
+        fibril_condvar_t buf_cv;        /**< Signal new data in buffer */
 } i8042_port_t;
 
@@ -68 +70 @@
         ddf_fun_t *kbd_fun;             /**< Pirmary port device function. */
         ddf_fun_t *aux_fun;             /**< Auxiliary port device function. */
-        buffer_t kbd_buffer;            /**< Primary port buffer. */
-        buffer_t aux_buffer;            /**< Aux. port buffer. */
+        circ_buf_t kbd_buffer;          /**< Primary port buffer. */
+        circ_buf_t aux_buffer;          /**< Aux. port buffer. */
         uint8_t aux_data[BUFFER_SIZE];  /**< Primary port buffer space. */
         uint8_t kbd_data[BUFFER_SIZE];  /**< Aux. port buffer space. */