Changeset 15d0046 in mainline for uspace/drv/char/i8042/i8042.h

Timestamp:

2014-09-12T13:22:33Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9b20126

Parents:

8db09e4 (diff), 105d8d6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

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

uspace/drv/char/i8042/i8042.h

@@ -40 +40 @@
 #define i8042_H_
 
+#include <io/chardev_srv.h>
 #include <sys/types.h>
 #include <fibril_synch.h>
@@ -56 +57 @@
 } __attribute__ ((packed)) i8042_regs_t;
 
-/** i8042 driver structure. */
+/** i8042 Port. */
+typedef struct {
+        struct i8042 *ctl;              /**< Controller */
+        chardev_srvs_t cds;             /**< Character device server data */
+} i8042_port_t;
+
+/** i8042 Controller. */
 typedef struct i8042 {
         i8042_regs_t *regs;             /**< I/O registers. */
@@ -65 +72 @@
         uint8_t aux_data[BUFFER_SIZE];  /**< Primary port buffer space. */
         uint8_t kbd_data[BUFFER_SIZE];  /**< Aux. port buffer space. */
+        i8042_port_t *kbd;
+        i8042_port_t *aux;
         fibril_mutex_t write_guard;     /**< Prevents simultanous port writes.*/
 } i8042_t;
 
-int i8042_init(i8042_t *, addr_range_t *, int, int, ddf_dev_t *);
+
+extern int i8042_init(i8042_t *, addr_range_t *, int, int, ddf_dev_t *);
 
 #endif