Changeset 4fe3b6d in mainline for uspace/lib/usbhost/src

Timestamp:

2011-05-20T11:07:00Z (15 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

8bb61e6

Parents:

3476be8 (diff), 7941bd6 (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 with development

Location:

uspace/lib/usbhost/src

Files:

• addrkeep.c (deleted)
• batch.c (modified) (1 diff)
• device_keeper.c (modified) (3 diffs)
• endpoint.c (modified) (1 diff)

uspace/lib/usbhost/src/batch.c

@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup libusb
+/** @addtogroup libusbhost
  * @{
  */

uspace/lib/usbhost/src/device_keeper.c

@@ -27 +27 @@
  */
 
-/** @addtogroup libusb
+/** @addtogroup libusbhost
  * @{
  */
@@ -158 +158 @@
 }
 
-/** Find devman handled assigned to USB address.
+/** Find devman handle assigned to USB address.
+ * Intentionally refuse to find handle of default address.
  *
  * @param[in] instance Device keeper structure to use.
@@ -170 +171 @@
         assert(instance);
         fibril_mutex_lock(&instance->guard);
-        if ((address < 0) || (address >= USB_ADDRESS_COUNT)) {
+        if ((address <= 0) || (address >= USB_ADDRESS_COUNT)) {
                 fibril_mutex_unlock(&instance->guard);
                 return false;

uspace/lib/usbhost/src/endpoint.c

@@ -35 +35 @@
 
 #include <assert.h>
+#include <stdlib.h>
 #include <errno.h>
 #include <usb/host/endpoint.h>