Changeset a81a1d09 in mainline for uspace/lib/usbhid/include/usb/classes/hid.h

Timestamp:

2011-05-11T16:49:28Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

19387b61

Parents:

e1dbcbc (diff), 9212f8a (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 development/ changes

File:

• uspace/lib/usbhid/include/usb/classes/hid.h (moved) (moved from uspace/app/virtusbkbd/kbdconfig.h ) (1 diff)

uspace/lib/usbhid/include/usb/classes/hid.h

@@ -27 +27 @@
  */
 
-/** @addtogroup usbvirtkbd
+/** @addtogroup libusb
  * @{
  */
 /** @file
- * @brief USB keyboard configuration.
+ * @brief USB HID device related types.
  */
-#ifndef VUK_KBDCONFIG_H_
-#define VUK_KBDCONFIG_H_
+#ifndef LIBUSB_HID_H_
+#define LIBUSB_HID_H_
 
+#include <usb/usb.h>
+#include <usb/classes/hidparser.h>
 #include <usb/descriptor.h>
-#include "report.h"
-#include "descriptor.h"
 
-extern usb_standard_device_descriptor_t std_device_descriptor;
+/** USB/HID device requests. */
+typedef enum {
+        USB_HIDREQ_GET_REPORT = 1,
+        USB_HIDREQ_GET_IDLE = 2,
+        USB_HIDREQ_GET_PROTOCOL = 3,
+        /* Values 4 to 8 are reserved. */
+        USB_HIDREQ_SET_REPORT = 9,
+        USB_HIDREQ_SET_IDLE = 10,
+        USB_HIDREQ_SET_PROTOCOL = 11
+} usb_hid_request_t;
 
-extern usb_standard_configuration_descriptor_t std_configuration_descriptor;
+typedef enum {
+        USB_HID_PROTOCOL_BOOT = 0,
+        USB_HID_PROTOCOL_REPORT = 1
+} usb_hid_protocol_t;
 
-extern usb_standard_interface_descriptor_t std_interface_descriptor;
+/** USB/HID subclass constants. */
+typedef enum {
+        USB_HID_SUBCLASS_NONE = 0,
+        USB_HID_SUBCLASS_BOOT = 1
+} usb_hid_subclass_t;
 
-extern usb_standard_endpoint_descriptor_t endpoint_descriptor;
-
-
-extern hid_descriptor_t hid_descriptor;
-
-extern report_descriptor_data_t report_descriptor;
-extern size_t report_descriptor_size;
+/** USB/HID interface protocols. */
+typedef enum {
+        USB_HID_PROTOCOL_NONE = 0,
+        USB_HID_PROTOCOL_KEYBOARD = 1,
+        USB_HID_PROTOCOL_MOUSE = 2
+} usb_hid_iface_protocol_t;