Changeset 9c0f158 in mainline for uspace/lib/usb/include

Timestamp:

2011-03-25T15:21:01Z (14 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

57d9c05e

Parents:

96bfe76 (diff), f08c560 (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:

development merge

Location:

uspace/lib/usb/include/usb

Files:

• classes/hidreport.h (moved) (moved from uspace/drv/usbhid/descdump.h ) (2 diffs)
• classes/hidreq.h (moved) (moved from uspace/drv/usbhid/hidreq.h ) (2 diffs)
• request.h (modified) (1 diff)

uspace/lib/usb/include/usb/classes/hidreport.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2010 Lubos Slovak
+ * Copyright (c) 2011 Lubos Slovak
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup drvusbhid
+/** @addtogroup libusb
  * @{
  */
 /** @file
- * Descriptor dumping.
+ * USB HID report parser initialization from descriptors.
  */
 
-#ifndef USBHID_DESCDUMP_H_
-#define USBHID_DESCDUMP_H_
+#ifndef LIBUSB_HIDREPORT_H_
+#define LIBUSB_HIDREPORT_H_
 
-#include <usb/descriptor.h>
-#include <usb/classes/hid.h>
+#include <usb/devdrv.h>
+#include <usb/classes/hidparser.h>
 
-void dump_standard_configuration_descriptor(
-    int index, const usb_standard_configuration_descriptor_t *d);
+/**
+ * Retrieves the Report descriptor from the USB device and initializes the
+ * report parser.
+ *
+ * \param dev USB device representing a HID device.
+ * \param parser HID Report parser.
+ *
+ * \retval EOK if successful.
+ * \retval EINVAL if one of the parameters is not given (is NULL).
+ * \retval ENOENT if there are some descriptors missing.
+ * \retval ENOMEM if an error with allocation occured.
+ * \retval EINVAL if the Report descriptor's size does not match the size 
+ *         from the interface descriptor.
+ * \return Other value inherited from function usb_pipe_start_session(),
+ *         usb_pipe_end_session() or usb_request_get_descriptor().
+ */
+int usb_hid_process_report_descriptor(usb_device_t *dev, 
+    usb_hid_report_parser_t *parser);
 
-void dump_standard_interface_descriptor(
-    const usb_standard_interface_descriptor_t *d);
-
-void dump_standard_endpoint_descriptor(
-    const usb_standard_endpoint_descriptor_t *d);
-
-void dump_standard_hid_descriptor_header(
-    const usb_standard_hid_descriptor_t *d);
-
-void dump_standard_hid_class_descriptor_info(
-    const usb_standard_hid_class_descriptor_info_t *d);
-
-void dump_hid_class_descriptor(int index, uint8_t type, 
-    const uint8_t *d, size_t size);
-
-#endif /* USBHID_DESCDUMP_H_ */
+#endif /* LIBUSB_HIDREPORT_H_ */
 
 /**

uspace/lib/usb/include/usb/classes/hidreq.h

@@ -27 +27 @@
  */
 
-/** @addtogroup drvusbhid
+/** @addtogroup libusb
  * @{
  */
@@ -34 +34 @@
  */
 
-#ifndef USBHID_HIDREQ_H_
-#define USBHID_HIDREQ_H_
+#ifndef USB_KBD_HIDREQ_H_
+#define USB_KBD_HIDREQ_H_
 
 #include <stdint.h>
 
 #include <usb/classes/hid.h>
-
-#include "hiddev.h"
+#include <usb/pipes.h>
 
 /*----------------------------------------------------------------------------*/
 
-int usbhid_req_set_report(usbhid_dev_t *hid_dev,
+int usbhid_req_set_report(usb_pipe_t *ctrl_pipe, int iface_no,
     usb_hid_report_type_t type, uint8_t *buffer, size_t buf_size);
 
-int usbhid_req_set_protocol(usbhid_dev_t *hid_dev, usb_hid_protocol_t protocol);
+int usbhid_req_set_protocol(usb_pipe_t *ctrl_pipe, int iface_no, 
+    usb_hid_protocol_t protocol);
 
-int usbhid_req_set_idle(usbhid_dev_t *hid_dev, uint8_t duration);
+int usbhid_req_set_idle(usb_pipe_t *ctrl_pipe, int iface_no, uint8_t duration);
 
-int usbhid_req_get_report(usbhid_dev_t *hid_dev, usb_hid_report_type_t type, 
-    uint8_t *buffer, size_t buf_size, size_t *actual_size);
+int usbhid_req_get_report(usb_pipe_t *ctrl_pipe, int iface_no, 
+    usb_hid_report_type_t type, uint8_t *buffer, size_t buf_size, 
+    size_t *actual_size);
 
-int usbhid_req_get_protocol(usbhid_dev_t *hid_dev, usb_hid_protocol_t *protocol);
+int usbhid_req_get_protocol(usb_pipe_t *ctrl_pipe, int iface_no, 
+    usb_hid_protocol_t *protocol);
 
-int usbhid_req_get_idle(usbhid_dev_t *hid_dev, uint8_t *duration);
+int usbhid_req_get_idle(usb_pipe_t *ctrl_pipe, int iface_no, uint8_t *duration);
 
 /*----------------------------------------------------------------------------*/
 
-#endif /* USBHID_HIDREQ_H_ */
+#endif /* USB_KBD_HIDREQ_H_ */
 
 /**

uspace/lib/usb/include/usb/request.h

@@ -41 +41 @@
 #include <usb/pipes.h>
 #include <usb/descriptor.h>
+
+/** USB device status - device is self powered (opposed to bus powered). */
+#define USB_DEVICE_STATUS_SELF_POWERED ((uint16_t)(1 << 0))
+
+/** USB device status - remote wake-up signaling is enabled. */
+#define USB_DEVICE_STATUS_REMOTE_WAKEUP ((uint16_t)(1 << 1))
+
+/** USB endpoint status - endpoint is halted (stalled). */
+#define USB_ENDPOINT_STATUS_HALTED ((uint16_t)(1 << 0))
 
 /** Standard device request. */