Changeset 26e7d6d in mainline for uspace/srv/hw/char/i8042/i8042.h

Timestamp:

2011-09-19T16:31:00Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a347a11

Parents:

3842a955 (diff), 086290d (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/srv/hw/char/i8042/i8042.h (modified) (3 diffs)

uspace/srv/hw/char/i8042/i8042.h

@@ -39 +39 @@
 #define i8042_H_
 
+#include <sys/types.h>
 #include <libarch/ddi.h>
-#include <libarch/types.h>
+#include <async.h>
 
 /** i8042 HW I/O interface */
@@ -52 +53 @@
 /** Softstate structure, one for each serial port (primary and aux). */
 typedef struct {
-        devmap_handle_t devmap_handle;
-        int client_phone;
+        service_id_t service_id;
+        async_sess_t *client_sess;
 } i8042_port_t;
 
@@ -60 +61 @@
 /**
  * @}
- */ 
+ */