Changeset 925a21e in mainline for uspace/drv/bus/usb/usbhid/kbd/kbddev.h

Timestamp:

2011-09-24T14:20:29Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5bf76c1

Parents:

867e2555 (diff), 1ab4aca (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) (4 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? */
@@ -131 +130 @@
 int usb_kbd_is_ready_to_destroy(const usb_kbd_t *kbd_dev);
 
-void usb_kbd_free(usb_kbd_t **kbd_dev);
+void usb_kbd_destroy(usb_kbd_t *kbd_dev);
 
 void usb_kbd_push_ev(struct usb_hid_dev *hid_dev, usb_kbd_t *kbd_dev,