Changeset e7588a8 in mainline for uspace/drv/char/i8042/i8042.h

Timestamp:

2017-11-24T02:21:56Z (6 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

File:

• uspace/drv/char/i8042/i8042.h (modified) (3 diffs)

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. */