Changeset fa8f1f7 in mainline for uspace/lib

Timestamp:

2011-03-20T23:00:30Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

2c1f24c

Parents:

8373f53 (diff), 33577f81 (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

Files:

• include/usb/devdrv.h (modified) (1 diff)
• src/devdrv.c (modified) (2 diffs)

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

@@ -79 +79 @@
          */
         const char *name;
-        /** Expected endpoints description. */
+        /** Expected endpoints description, excluding default control endpoint.
+         *
+         * It MUST be of size expected_enpoints_count(excluding default ctrl) + 1
+         * where the last record MUST BE NULL, otherwise catastrophic things may
+         * happen.
+         */
         usb_endpoint_description_t **endpoints;
         /** Driver ops. */

uspace/lib/usb/src/devdrv.c

@@ -206 +206 @@
  * @return Error code.
  */
-static int initialize_pipes(usb_driver_t *drv, usb_device_t *dev)
+static int initialize_pipes(usb_device_t *dev)
 {
         int rc;
@@ -284 +284 @@
         dev->driver_data = NULL;
 
-        rc = initialize_pipes(driver, dev);
+        rc = initialize_pipes(dev);
         if (rc != EOK) {
                 free(dev);