Changeset 8e7c9fe in mainline for uspace/drv/bus/usb/usbhid/kbd/kbddev.h

Timestamp:

2014-09-12T03:45:25Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (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

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

• uspace/drv/bus/usb/usbhid/kbd/kbddev.h (modified) (4 diffs)

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

@@ -45 +45 @@
 #include <usb/dev/pipes.h>
 #include <usb/dev/driver.h>
-
+#include "../usbhid.h"
 #include "kbdrepeat.h"
-
-struct usb_hid_dev;
-
 
 /**
@@ -65 +62 @@
 typedef struct usb_kbd_t {
         /** Link to HID device structure */
-        struct usb_hid_dev *hid_dev;
-
+        usb_hid_dev_t *hid_dev;
+        
         /** Previously pressed keys (not translated to key codes). */
         int32_t *keys_old;
@@ -75 +72 @@
         /** Currently pressed modifiers (bitmap). */
         uint8_t modifiers;
-
+        
         /** Currently active modifiers including locks. Sent to the console. */
-        unsigned mods;
-
+        unsigned int mods;
+        
         /** Currently active lock keys. */
-        unsigned lock_keys;
-
+        unsigned int lock_keys;
+        
         /** IPC session to client (for sending key events). */
         async_sess_t *client_sess;
-
+        
         /** Information for auto-repeat of keys. */
         usb_kbd_repeat_t repeat;
-
+        
         /** Mutex for accessing the information about auto-repeat. */
         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). 
-         * 
+         *
          * 0 - not initialized
          * 1 - initialized
@@ -108 +105 @@
          */
         int initialized;
-
+        
         /** DDF function */
         ddf_fun_t *fun;
 } usb_kbd_t;
 
-
-
 extern const usb_endpoint_description_t usb_hid_kbd_poll_endpoint_description;
 
-const char *HID_KBD_FUN_NAME;
-const char *HID_KBD_CLASS_NAME;
+extern const char *HID_KBD_FUN_NAME;
+extern const char *HID_KBD_CATEGORY;
 
-
-
-int usb_kbd_init(struct usb_hid_dev *hid_dev, void **data);
-
-bool usb_kbd_polling_callback(struct usb_hid_dev *hid_dev, void *data);
-
-int usb_kbd_is_initialized(const usb_kbd_t *kbd_dev);
-
-int usb_kbd_is_ready_to_destroy(const usb_kbd_t *kbd_dev);
-
-void usb_kbd_destroy(usb_kbd_t *kbd_dev);
-
-void usb_kbd_push_ev(usb_kbd_t *kbd_dev,
-    int type, unsigned int key);
-
-void usb_kbd_deinit(struct usb_hid_dev *hid_dev, void *data);
-
-int usb_kbd_set_boot_protocol(struct usb_hid_dev *hid_dev);
+extern int usb_kbd_init(usb_hid_dev_t *, void **);
+extern bool usb_kbd_polling_callback(usb_hid_dev_t *, void *);
+extern int usb_kbd_is_initialized(const usb_kbd_t *);
+extern int usb_kbd_is_ready_to_destroy(const usb_kbd_t *);
+extern void usb_kbd_destroy(usb_kbd_t *);
+extern void usb_kbd_push_ev(usb_kbd_t *, int, unsigned int);
+extern void usb_kbd_deinit(usb_hid_dev_t *, void *);
+extern int usb_kbd_set_boot_protocol(usb_hid_dev_t *);
 
 #endif /* USB_HID_KBDDEV_H_ */