Changeset 494eaf7 in mainline for uspace/drv/usbhid/kbddev.h

Timestamp:

2011-03-01T16:43:05Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

ac8285d

Parents:

cc44f7e (diff), 1c6c4092 (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:

Merged: HID driver refactoring, works also with more keyboards.

File:

• uspace/drv/usbhid/kbddev.h (moved) (moved from uspace/drv/usbhid/hid.h ) (3 diffs)

uspace/drv/usbhid/kbddev.h

@@ -31 +31 @@
  */
 /** @file
- * Common definitions.
+ * USB HID keyboard device structure and API.
  */
 
-#ifndef USBHID_HID_H_
-#define USBHID_HID_H_
+#ifndef USBHID_KBDDEV_H_
+#define USBHID_KBDDEV_H_
 
 #include <stdint.h>
@@ -43 +43 @@
 #include <usb/pipes.h>
 
+#include "hiddev.h"
+
+/*----------------------------------------------------------------------------*/
+
 /**
  * @brief USB/HID keyboard device type.
- *
- * Quite dummy right now.
  */
 typedef struct {
-        ddf_dev_t *device;
-
-        usb_device_connection_t wire;
-        usb_endpoint_pipe_t ctrl_pipe;
-        usb_endpoint_pipe_t poll_pipe;
-        
-        uint16_t iface;
-        
-        uint8_t *report_desc;
-        usb_hid_report_parser_t *parser;
+        usbhid_dev_t *hid_dev;
         
         uint8_t *keycodes;
@@ -66 +59 @@
         unsigned mods;
         unsigned lock_keys;
-} usb_hid_dev_kbd_t;
+        
+        int console_phone;
+        
+        int initialized;
+} usbhid_kbd_t;
 
-#endif
+/*----------------------------------------------------------------------------*/
+
+int usbhid_kbd_try_add_device(ddf_dev_t *dev);
+
+#endif /* USBHID_KBDDEV_H_ */
+
+/**
+ * @}
+ */