Changes in uspace/drv/char/i8042/i8042.h [0851a3d:7ee7e6a] in mainline

File:

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

uspace/drv/char/i8042/i8042.h

@@ -2 +2 @@
  * Copyright (c) 2006 Josef Cejka
  * Copyright (c) 2011 Jan Vesely
- * Copyright (c) 2017 Jiri Svoboda
  * All rights reserved.
  *
@@ -41 +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"
@@ -60 +59 @@
 /** i8042 Port. */
 typedef struct {
-        /** Controller */
-        struct i8042 *ctl;
-        /** Device function */
-        ddf_fun_t *fun;
-        /** Character device server data */
-        chardev_srvs_t cds;
-        /** Circular buffer */
-        circ_buf_t cbuf;
-        /** Buffer data space */
-        uint8_t buf_data[BUFFER_SIZE];
-        /** Protect buffer */
-        fibril_mutex_t buf_lock;
-        /** Signal new data in buffer */
-        fibril_condvar_t buf_cv;
+        struct i8042 *ctl;              /**< Controller */
+        chardev_srvs_t cds;             /**< Character device server data */
 } i8042_port_t;
 
 /** i8042 Controller. */
 typedef struct i8042 {
-        /**< I/O registers. */
-        i8042_regs_t *regs;
-        /** Keyboard port */
+        i8042_regs_t *regs;             /**< I/O registers. */
+        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. */
+        uint8_t aux_data[BUFFER_SIZE];  /**< Primary port buffer space. */
+        uint8_t kbd_data[BUFFER_SIZE];  /**< Aux. port buffer space. */
         i8042_port_t *kbd;
-        /** AUX port */
         i8042_port_t *aux;
-        /** Prevents simultanous port writes.*/
-        fibril_mutex_t write_guard;
+        fibril_mutex_t write_guard;     /**< Prevents simultanous port writes.*/
 } i8042_t;
+
 
 extern int i8042_init(i8042_t *, addr_range_t *, int, int, ddf_dev_t *);