Changeset 9f97ffe in mainline for uspace/drv/char/i8042/i8042.h

Timestamp:

2011-12-26T15:44:00Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

d56ab85

Parents:

c6c5ff3b

Message:

i8042: Use cyclic buffer to store device data.

File:

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

uspace/drv/char/i8042/i8042.h

@@ -1 +1 @@
 /*
  * Copyright (c) 2006 Josef Cejka
+ * Copyright (c) 2011 Jan Vesely
  * All rights reserved.
  *
@@ -26 +27 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
 /** @addtogroup kbd_port
  * @ingroup  kbd
  * @{
  */
-
 /** @file
  * @brief i8042 port driver.
@@ -45 +44 @@
 #include <ddf/driver.h>
 
+#include "buffer.h"
+
+#define BUFFER_SIZE 12
+
 /** i8042 HW I/O interface */
 typedef struct {
@@ -52 +55 @@
 } __attribute__ ((packed)) i8042_regs_t;
 
-/** Softstate structure, one for each serial port (primary and aux). */
-/*
-typedef struct {
-        service_id_t service_id;
-        async_sess_t *client_sess;
-} i8042_port_t;
-*/
-
 typedef struct i8042 i8042_t;
-
-enum {
-        DEVID_PRI = 0, /**< primary device */
-        DEVID_AUX = 1, /**< AUX device */
-        MAX_DEVS  = 2
-};
 
 struct i8042 {
         i8042_regs_t *regs;
-//      i8042_port_t port[MAX_DEVS];
         ddf_fun_t *kbd_fun;
         ddf_fun_t *mouse_fun;
-        char * kbd_buffer;
-        char * kbd_buffer_end;
-        char * aux_buffer;
-        char * aux_buffer_end;
-        fibril_mutex_t guard;
-        fibril_condvar_t data_avail;
+        buffer_t aux_buffer;
+        buffer_t kbd_buffer;
+        uint8_t aux_data[BUFFER_SIZE];
+        uint8_t kbd_data[BUFFER_SIZE];
+        fibril_mutex_t write_guard;
 };