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

Timestamp:

2011-12-25T19:51:11Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

a8f7029

Parents:

5960b48

Message:

i8042: Start turning into standard char devices.

File:

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

uspace/drv/char/i8042/i8042.h

@@ -42 +42 @@
 #include <libarch/ddi.h>
 #include <async.h>
+#include <fibril_synch.h>
 #include <ddf/driver.h>
 
@@ -52 +53 @@
 
 /** 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 {
@@ -63 +68 @@
 };
 
-typedef struct {
+struct i8042 {
         i8042_regs_t *regs;
-        i8042_port_t port[MAX_DEVS];
+//      i8042_port_t port[MAX_DEVS];
         ddf_fun_t *kbd_fun;
         ddf_fun_t *mouse_fun;
-} i8042_t;
+        fibril_mutex_t guard;
+        fibril_condvar_t data_avail;
+};
 
 int i8042_init(i8042_t *, void *, size_t, int, int, ddf_dev_t *);
+int i8042_write_kbd(i8042_t *, uint8_t);
+int i8042_read_kbd(i8042_t *, uint8_t *);
+int i8042_write_aux(i8042_t *, uint8_t);
+int i8042_read_aux(i8042_t *, uint8_t *);
 
 #endif