Changeset 432a269 in mainline for uspace/drv/bus/usb/usbhid/kbd/kbddev.h

Timestamp:

2011-09-16T21:13:57Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

3a11f17

Parents:

c0e53ff (diff), fd07e526 (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/bus/usb/usbhid/kbd/kbddev.h (modified) (3 diffs)

uspace/drv/bus/usb/usbhid/kbd/kbddev.h

@@ -38 +38 @@
 
 #include <stdint.h>
-
+#include <async.h>
 #include <fibril_synch.h>
-
 #include <usb/hid/hid.h>
 #include <usb/hid/hidparser.h>
@@ -58 +57 @@
  * data, such as currently pressed keys, modifiers and lock keys.
  *
- * Also holds a IPC phone to the console (since there is now no other way to 
+ * Also holds a IPC session to the console (since there is now no other way to 
  * communicate with it).
  *
@@ -83 +82 @@
         unsigned lock_keys;
         
-        /** IPC phone to the console device (for sending key events). */
-        int console_phone;
+        /** IPC session to the console device (for sending key events). */
+        async_sess_t *console_sess;
         
         /** @todo What is this actually? */