Changeset 20a3465 in mainline for uspace/drv/bus/usb/usbhid/kbd/kbddev.h

Timestamp:

2011-10-30T19:50:54Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

3ce78580, 48902fa

Parents:

4c3ad56 (diff), 45bf63c (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) (2 diffs)

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

@@ -75 +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 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). 
          * 
@@ -111 +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;