Changeset 2fd1f0c6 in mainline

Timestamp:

2011-10-29T11:36:54Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

5400606

Parents:

57e06ef

Message:

libusbhost: Make usb_device_manager more robust.

Return error on incorrect input values.

Location:

uspace/lib/usbhost

Files:

• include/usb/host/usb_device_manager.h (modified) (1 diff)
• src/iface.c (modified) (1 diff)
• src/usb_device_manager.c (modified) (5 diffs)

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

@@ -69 +69 @@
     usb_device_manager_t *instance, usb_speed_t speed);
 
-void usb_device_manager_bind(usb_device_manager_t *instance,
+int usb_device_manager_bind(usb_device_manager_t *instance,
     usb_address_t address, devman_handle_t handle);
 
-void usb_device_manager_release(usb_device_manager_t *instance,
+int usb_device_manager_release(usb_device_manager_t *instance,
     usb_address_t address);
 

uspace/lib/usbhost/src/iface.c

@@ -128 +128 @@
 
         usb_log_debug("Address bind %d-%" PRIun ".\n", address, handle);
-        usb_device_manager_bind(&hcd->dev_manager, address, handle);
-        return EOK;
+        return usb_device_manager_bind(&hcd->dev_manager, address, handle);
 }
 /*----------------------------------------------------------------------------*/

uspace/lib/usbhost/src/usb_device_manager.c

@@ -47 +47 @@
 {
         assert(instance);
-        unsigned i = 0;
-        for (; i < USB_ADDRESS_COUNT; ++i) {
+        for (unsigned i = 0; i < USB_ADDRESS_COUNT; ++i) {
                 instance->devices[i].occupied = false;
                 instance->devices[i].handle = 0;
@@ -101 +100 @@
  * @param[in] address Device address
  * @param[in] handle Devman handle of the device.
- */
-void usb_device_manager_bind(usb_device_manager_t *instance,
+ * @return Error code.
+ */
+int usb_device_manager_bind(usb_device_manager_t *instance,
     usb_address_t address, devman_handle_t handle)
 {
-        assert(instance);
-        fibril_mutex_lock(&instance->guard);
-
-        assert(address > 0);
-        assert(address <= USB11_ADDRESS_MAX);
-        assert(instance->devices[address].occupied);
-
+        if ((address <= 0) || (address >= USB_ADDRESS_COUNT)) {
+                return EINVAL;
+        }
+        assert(instance);
+
+        fibril_mutex_lock(&instance->guard);
+        /* Not reserved */
+        if (!instance->devices[address].occupied) {
+                fibril_mutex_unlock(&instance->guard);
+                return ENOENT;
+        }
+        /* Already bound */
+        if (instance->devices[address].handle != 0) {
+                fibril_mutex_unlock(&instance->guard);
+                return EEXISTS;
+        }
         instance->devices[address].handle = handle;
         fibril_mutex_unlock(&instance->guard);
+        return EOK;
 }
 /*----------------------------------------------------------------------------*/
@@ -120 +130 @@
  * @param[in] instance Device manager structure to use.
  * @param[in] address Device address
- */
-void usb_device_manager_release(
+ * @return Error code.
+ */
+int usb_device_manager_release(
     usb_device_manager_t *instance, usb_address_t address)
 {
-        assert(instance);
-        assert(address > 0);
-        assert(address <= USB11_ADDRESS_MAX);
-
-        fibril_mutex_lock(&instance->guard);
-        assert(instance->devices[address].occupied);
+        if ((address <= 0) || (address >= USB_ADDRESS_COUNT)) {
+                return EINVAL;
+        }
+        assert(instance);
+
+        fibril_mutex_lock(&instance->guard);
+        if (!instance->devices[address].occupied) {
+                fibril_mutex_unlock(&instance->guard);
+                return ENOENT;
+        }
 
         instance->devices[address].occupied = false;
         instance->devices[address].handle = 0;
         fibril_mutex_unlock(&instance->guard);
+        return EOK;
 }
 /*----------------------------------------------------------------------------*/
@@ -147 +163 @@
         assert(instance);
         fibril_mutex_lock(&instance->guard);
-        usb_address_t address = 1;
-        while (address <= USB11_ADDRESS_MAX) {
+        for (usb_address_t address = 1; address <= USB11_ADDRESS_MAX; ++address)
+        {
                 if (instance->devices[address].handle == handle) {
                         assert(instance->devices[address].occupied);
@@ -154 +170 @@
                         return address;
                 }
-                ++address;
         }
         fibril_mutex_unlock(&instance->guard);