Changeset a81a1d09 in mainline for uspace/lib/usb/include

Timestamp:

2011-05-11T16:49:28Z (15 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

Location:

uspace/lib/usb/include/usb

Files:

• classes/hid.h (deleted)
• ddfiface.h (modified) (1 diff)
• descriptor.h (modified) (1 diff)
• driver.h (moved) (moved from uspace/app/virtusbkbd/stdreq.h ) (2 diffs)
• host.h (moved) (moved from uspace/app/virtusbkbd/descriptor.h ) (2 diffs)
• usb.h (modified) (1 diff)

uspace/lib/usb/include/usb/ddfiface.h

@@ -37 +37 @@
 
 #include <sys/types.h>
-#include <usb/usbdevice.h>
 #include <usb_iface.h>
 

uspace/lib/usb/include/usb/descriptor.h

@@ -167 +167 @@
 } __attribute__ ((packed)) usb_standard_endpoint_descriptor_t;
 
+/** Part of standard USB HID descriptor specifying one class descriptor.
+ *
+ * (See HID Specification, p.22)
+ */
+typedef struct {
+        /** Type of class-specific descriptor (Report or Physical). */
+        uint8_t type;
+        /** Length of class-specific descriptor in bytes. */
+        uint16_t length;
+} __attribute__ ((packed)) usb_standard_hid_class_descriptor_info_t;
+
+/** Standard USB HID descriptor.
+ *
+ * (See HID Specification, p.22)
+ *
+ * It is actually only the "header" of the descriptor, it does not contain
+ * the last two mandatory fields (type and length of the first class-specific
+ * descriptor).
+ */
+typedef struct {
+        /** Total size of this descriptor in bytes.
+         *
+         * This includes all class-specific descriptor info - type + length
+         * for each descriptor.
+         */
+        uint8_t length;
+        /** Descriptor type (USB_DESCTYPE_HID). */
+        uint8_t descriptor_type;
+        /** HID Class Specification release. */
+        uint16_t spec_release;
+        /** Country code of localized hardware. */
+        uint8_t country_code;
+        /** Total number of class-specific (i.e. Report and Physical)
+         * descriptors.
+         *
+         * @note There is always only one Report descriptor.
+         */
+        uint8_t class_desc_count;
+        /** First mandatory class descriptor (Report) info. */
+        usb_standard_hid_class_descriptor_info_t report_desc_info;
+} __attribute__ ((packed)) usb_standard_hid_descriptor_t;
+
 #endif
 /**

uspace/lib/usb/include/usb/driver.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2010 Vojtech Horky
+ * Copyright (c) 2011 Vojtech Horky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup usbvirtkbd
+/** @addtogroup libusb
  * @{
  */
 /** @file
- * @brief Standard device request handlers.
+ * Common definitions for USB drivers.
  */
-#ifndef VUK_STDREQ_H_
-#define VUK_STDREQ_H_
+#ifndef LIBUSB_DRIVER_H_
+#define LIBUSB_DRIVER_H_
 
-#include <usbvirt/device.h>
+#include <sys/types.h>
+#include <ipc/devman.h>
 
-int req_get_descriptor(usbvirt_device_t *device,
-    const usb_device_request_setup_packet_t *setup_packet,
-    uint8_t *data, size_t *act_size);
+int usb_hc_find(devman_handle_t, devman_handle_t *);
 
 #endif

uspace/lib/usb/include/usb/host.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2010 Vojtech Horky
+ * Copyright (c) 2011 Vojtech Horky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup usbvirtkbd
+/** @addtogroup libusb
  * @{
  */
 /** @file
- * @brief USB keyboard descriptors.
+ * Host controller common functions.
  */
-#ifndef VUK_DESCRIPTOR_H_
-#define VUK_DESCRIPTOR_H_
+#ifndef LIBUSB_HOST_H_
+#define LIBUSB_HOST_H_
 
-typedef struct {
-        uint8_t length;
-        uint8_t type;
-        uint16_t hid_spec_release;
-        uint8_t country_code;
-        uint8_t descriptor_count;
-        uint8_t descriptor1_type;
-        uint16_t descriptor1_length;
-} __attribute__ ((packed)) hid_descriptor_t;
+#include <sys/types.h>
+#include <ipc/devman.h>
+
+int usb_ddf_get_hc_handle_by_class(size_t, devman_handle_t *);
 
 #endif

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

@@ -172 +172 @@
 } usb_packet_id;
 
+/** Class name for USB host controllers. */
+#define USB_HC_DDF_CLASS_NAME "usbhc"
+
 #endif
 /**