Changeset e0ba26b in mainline for uspace/lib/usb

Timestamp:

2011-01-25T19:20:26Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

192a0063

Parents:

a088d15 (diff), 68a68705 (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 vojtechhorky/ - various fixes

The merge includes following changes

• USB transaction outcome is propagated to clients
• virtual host controller handles device unplugging
• Doxygen documentation fixes

Location:

uspace/lib/usb

Files:

• include/usb/classes/classes.h (modified) (1 diff)
• include/usb/classes/hid.h (modified) (1 diff)
• include/usb/classes/hidparser.h (modified) (1 diff)
• include/usb/classes/hidut.h (modified) (1 diff)
• include/usb/classes/hidutkbd.h (modified) (1 diff)
• include/usb/classes/hub.h (modified) (2 diffs)
• include/usb/debug.h (modified) (2 diffs)
• include/usb/descriptor.h (modified) (1 diff)
• include/usb/devreq.h (modified) (1 diff)
• include/usb/hcd.h (modified) (2 diffs)
• include/usb/hcdhubd.h (modified) (1 diff)
• include/usb/usb.h (modified) (1 diff)
• include/usb/usbdrv.h (modified) (1 diff)
• src/addrkeep.c (modified) (1 diff)
• src/class.c (modified) (1 diff)
• src/debug.c (modified) (1 diff)
• src/dp.c (modified) (1 diff)
• src/drvpsync.c (modified) (1 diff)
• src/hcdhubd.c (modified) (1 diff)
• src/hcdhubd_private.h (modified) (1 diff)
• src/hcdrv.c (modified) (1 diff)
• src/hidparser.c (modified) (1 diff)
• src/localdrv.c (modified) (1 diff)
• src/recognise.c (modified) (4 diffs)
• src/remotedrv.c (modified) (1 diff)
• src/usb.c (modified) (1 diff)
• src/usbdrv.c (modified) (1 diff)
• src/usbdrvreq.c (modified) (2 diffs)

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

@@ -27 +27 @@
  */
 
-/** @addtogroup libusb usb
+/** @addtogroup libusb
  * @{
  */

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

@@ -27 +27 @@
  */
 
-/** @addtogroup libusb usb
+/** @addtogroup libusb
  * @{
  */

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

@@ -27 +27 @@
  */
 
-/** @addtogroup libusb usb
+/** @addtogroup libusb
  * @{
  */

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

@@ -27 +27 @@
  */
 
-/** @addtogroup libusb usb
+/** @addtogroup libusb
  * @{
  */

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

@@ -27 +27 @@
  */
 
-/** @addtogroup libusb usb
+/** @addtogroup libusb
  * @{
  */

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

@@ -27 +27 @@
  */
 
-/** @addtogroup libusb usb
+/** @addtogroup libusb
  * @{
  */
@@ -68 +68 @@
  *      For more information see Universal Serial Bus Specification Revision 1.1 chapter 11.16.2
  */
-typedef struct hub_descriptor_type{
+typedef struct usb_hub_descriptor_type {
     /** Number of bytes in this descriptor, including this byte */
     //uint8_t bDescLength;

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

@@ -27 +27 @@
  */
 
-/** @addtogroup libusb usb
+/** @addtogroup libusb
  * @{
  */
@@ -45 +45 @@
 
 #endif
+/**
+ * @}
+ */
+

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

@@ -27 +27 @@
  */
 
-/** @addtogroup libusb usb
+/** @addtogroup libusb
  * @{
  */

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

@@ -27 +27 @@
  */
 
-/** @addtogroup libusb usb
+/** @addtogroup libusb
  * @{
  */

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

@@ -27 +27 @@
  */
 
-/** @addtogroup libusb usb
+/** @addtogroup libusb
  * @{
  */
@@ -81 +81 @@
     devman_handle_t);
 
-
 #endif
+/**
+ * @}
+ */

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

@@ -27 +27 @@
  */
 
-/** @addtogroup libusb usb
+/** @addtogroup libusb
  * @{
  */

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

@@ -27 +27 @@
  */
 
-/** @addtogroup libusb usb
+/** @addtogroup libusb
  * @{
  */

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

@@ -27 +27 @@
  */
 
-/** @addtogroup libusb usb
+/** @addtogroup libusb
  * @{
  */

uspace/lib/usb/src/addrkeep.c

@@ -27 +27 @@
  */
 
-/** @addtogroup libusb usb
+/** @addtogroup libusb
  * @{
  */

uspace/lib/usb/src/class.c

@@ -27 +27 @@
  */
 
-/** @addtogroup libusb usb
+/** @addtogroup libusb
  * @{
  */

uspace/lib/usb/src/debug.c

@@ -27 +27 @@
  */
 
-/** @addtogroup libusb usb
+/** @addtogroup libusb
  * @{
  */

uspace/lib/usb/src/dp.c

@@ -45 +45 @@
  * @param data Parser data.
  * @param ptr Pointer to be verified.
- * @return Whether @ptr points inside <code>data->data</code> field.
+ * @return Whether @p ptr points inside <code>data->data</code> field.
  */
 static bool is_valid_descriptor_pointer(usb_dp_parser_data_t *data,

uspace/lib/usb/src/drvpsync.c

@@ -27 +27 @@
  */
 
-/** @addtogroup libusb usb
+/** @addtogroup libusb
  * @{
  */

uspace/lib/usb/src/hcdhubd.c

@@ -27 +27 @@
  */
 
-/** @addtogroup libusb usb
+/** @addtogroup libusb
  * @{
  */

uspace/lib/usb/src/hcdhubd_private.h

@@ -27 +27 @@
  */
 
-/** @addtogroup libusb usb
+/** @addtogroup libusb
  * @{
  */

uspace/lib/usb/src/hcdrv.c

@@ -27 +27 @@
  */
 
-/** @addtogroup libusb usb
+/** @addtogroup libusb
  * @{
  */

uspace/lib/usb/src/hidparser.c

@@ -27 +27 @@
  */
 
-/** @addtogroup libusb usb
+/** @addtogroup libusb
  * @{
  */

uspace/lib/usb/src/localdrv.c

@@ -27 +27 @@
  */
 
-/** @addtogroup libusb usb
+/** @addtogroup libusb
  * @{
  */

uspace/lib/usb/src/recognise.c

@@ -27 +27 @@
  */
 
-/** @addtogroup libusb usb
+/** @addtogroup libusb
  * @{
  */
@@ -39 +39 @@
 #include <errno.h>
 
+/** Callback for getting host controller handle.
+ *
+ * @param dev Device in question.
+ * @param[out] handle Devman handle of the host controller.
+ * @return Error code.
+ */
 static int usb_iface_get_hc_handle(device_t *dev, devman_handle_t *handle)
 {
@@ -237 +243 @@
  * @param matches Match ids list to add matches to.
  * @param address USB address of the attached device.
+ * @param config_count Number of configurations the device has.
  * @return Error code.
  */
@@ -342 +349 @@
 /** Probe for device kind and register it in devman.
  *
- * @param hc Open phone to the host controller.
- * @param parent Parent device.
- * @param address Address of the (unknown) attached device.
+ * @param[in] hc Open phone to the host controller.
+ * @param[in] parent Parent device.
+ * @param[in] address Address of the (unknown) attached device.
+ * @param[out] child_handle Handle of the child device.
  * @return Error code.
  */

uspace/lib/usb/src/remotedrv.c

@@ -27 +27 @@
  */
 
-/** @addtogroup libusb usb
+/** @addtogroup libusb
  * @{
  */

uspace/lib/usb/src/usb.c

@@ -27 +27 @@
  */
 
-/** @addtogroup libusb usb
+/** @addtogroup libusb
  * @{
  */

uspace/lib/usb/src/usbdrv.c

@@ -27 +27 @@
  */
 
-/** @addtogroup libusb usb
+/** @addtogroup libusb
  * @{
  */

uspace/lib/usb/src/usbdrvreq.c

@@ -27 +27 @@
  */
 
-/** @addtogroup libusb usb
+/** @addtogroup libusb
  * @{
  */
@@ -188 +188 @@
  * @param[in] phone Open phone to HC driver.
  * @param[in] old_address Current address.
- * @param[in] address Address to be set.
+ * @param[in] new_address Address to be set.
  * @return Error code.
  */