Changeset a81a1d09 in mainline for uspace/lib/usbhost/src

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/usbhost/src

Files:

• addrkeep.c (moved) (moved from uspace/lib/usb/src/addrkeep.c )
• batch.c (moved) (moved from uspace/lib/usb/src/host/batch.c ) (2 diffs)
• device_keeper.c (moved) (moved from uspace/lib/usb/src/host/device_keeper.c ) (1 diff)
• endpoint.c (moved) (moved from uspace/lib/usb/src/host/endpoint.c )
• usb_endpoint_manager.c (moved) (moved from uspace/lib/usb/src/host/usb_endpoint_manager.c )

uspace/lib/usbhost/src/batch.c

@@ -128 +128 @@
         memcpy(instance->buffer, instance->data_buffer, instance->buffer_size);
 
-        usb_log_debug("Batch %p done (T%d.%d, %s %s in, %zuB): %s (%d).\n",
+        usb_log_debug("Batch(%p) done (T%d.%d, %s %s in, %zuB): %s (%d).\n",
             instance, instance->ep->address, instance->ep->endpoint,
             usb_str_speed(instance->ep->speed),
             usb_str_transfer_type_short(instance->ep->transfer_type),
-            instance->transfered_size, str_error(instance->error), instance->error);
+            instance->transfered_size, str_error(instance->error),
+            instance->error);
 
         instance->callback_in(instance->fun, instance->error,
@@ -147 +148 @@
         assert(instance->callback_out);
 
-        usb_log_debug("Batch %p done (T%d.%d, %s %s out): %s (%d).\n",
+        usb_log_debug("Batch(%p) done (T%d.%d, %s %s out): %s (%d).\n",
             instance, instance->ep->address, instance->ep->endpoint,
             usb_str_speed(instance->ep->speed),

uspace/lib/usbhost/src/device_keeper.c

@@ -157 +157 @@
         return ENOENT;
 }
+
+/** Find devman handled assigned to USB address.
+ *
+ * @param[in] instance Device keeper structure to use.
+ * @param[in] address Address the caller wants to find.
+ * @param[out] handle Where to store found handle.
+ * @return Whether such address is currently occupied.
+ */
+bool usb_device_keeper_find_by_address(usb_device_keeper_t *instance,
+    usb_address_t address, devman_handle_t *handle)
+{
+        assert(instance);
+        fibril_mutex_lock(&instance->guard);
+        if ((address < 0) || (address >= USB_ADDRESS_COUNT)) {
+                fibril_mutex_unlock(&instance->guard);
+                return false;
+        }
+        if (!instance->devices[address].occupied) {
+                fibril_mutex_unlock(&instance->guard);
+                return false;
+        }
+
+        if (handle != NULL) {
+                *handle = instance->devices[address].handle;
+        }
+
+        fibril_mutex_unlock(&instance->guard);
+        return true;
+}
+
 /*----------------------------------------------------------------------------*/
 /** Get speed associated with the address