Changes in uspace/drv/bus/usb/usbhid/kbd/kbddev.h [5f6e25e:4578a6e] in mainline

File:

• uspace/drv/bus/usb/usbhid/kbd/kbddev.h (modified) (5 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).
  *
@@ -76 +75 @@
         /** Currently pressed modifiers (bitmap). */
         uint8_t modifiers;
-        
+
         /** Currently active modifiers including locks. Sent to the console. */
         unsigned mods;
-        
+
         /** Currently active lock keys. */
         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? */
         ddf_dev_ops_t ops;
-        
+
         /** Information for auto-repeat of keys. */
         usb_kbd_repeat_t repeat;
-        
+
         /** Mutex for accessing the information about auto-repeat. */
-        fibril_mutex_t *repeat_mtx;
-        
+        fibril_mutex_t repeat_mtx;
+
         uint8_t *output_buffer;
-        
+
         size_t output_size;
-        
+
         size_t led_output_size;
-        
+
         usb_hid_report_path_t *led_path;
-        
+
         int32_t *led_data;
-        
+
         /** State of the structure (for checking before use). 
          * 
@@ -112 +111 @@
          */
         int initialized;
+
+        /** DDF function */
+        ddf_fun_t *fun;
 } usb_kbd_t;
 
 /*----------------------------------------------------------------------------*/
 
-usb_endpoint_description_t usb_hid_kbd_poll_endpoint_description;
+extern const usb_endpoint_description_t usb_hid_kbd_poll_endpoint_description;
 
 const char *HID_KBD_FUN_NAME;
@@ -133 +135 @@
 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,
+void usb_kbd_push_ev(usb_kbd_t *kbd_dev,
     int type, unsigned int key);