Changeset 62f4212 in mainline for uspace/lib/usb/src/host/device_keeper.c

Timestamp:

2011-03-22T10:07:53Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

f8e4cb6

Parents:

18b3cfd (diff), b01995b (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 changes from development

File:

• uspace/lib/usb/src/host/device_keeper.c (moved) (moved from uspace/drv/uhci-hcd/utils/device_keeper.c ) (19 diffs)

uspace/lib/usb/src/host/device_keeper.c

@@ -27 +27 @@
  */
 
-/** @addtogroup drvusbuhcihc
+/** @addtogroup libusb
  * @{
  */
 /** @file
- * @brief UHCI driver
+ * Device keeper structure and functions (implementation).
  */
 #include <assert.h>
 #include <errno.h>
 #include <usb/debug.h>
-
-#include "device_keeper.h"
+#include <usb/host/device_keeper.h>
 
 /*----------------------------------------------------------------------------*/
@@ -46 +45 @@
  * Set all values to false/0.
  */
-void device_keeper_init(device_keeper_t *instance)
+void usb_device_keeper_init(usb_device_keeper_t *instance)
 {
         assert(instance);
@@ -56 +55 @@
                 instance->devices[i].occupied = false;
                 instance->devices[i].handle = 0;
-                instance->devices[i].toggle_status = 0;
+                instance->devices[i].toggle_status[0] = 0;
+                instance->devices[i].toggle_status[1] = 0;
         }
 }
@@ -65 +65 @@
  * @param[in] speed Speed of the device requesting default address.
  */
-void device_keeper_reserve_default(device_keeper_t *instance, usb_speed_t speed)
+void usb_device_keeper_reserve_default_address(usb_device_keeper_t *instance,
+    usb_speed_t speed)
 {
         assert(instance);
@@ -83 +84 @@
  * @param[in] speed Speed of the device requesting default address.
  */
-void device_keeper_release_default(device_keeper_t *instance)
+void usb_device_keeper_release_default_address(usb_device_keeper_t *instance)
 {
         assert(instance);
@@ -100 +101 @@
  * Really ugly one.
  */
-void device_keeper_reset_if_need(
-    device_keeper_t *instance, usb_target_t target, const unsigned char *data)
+void usb_device_keeper_reset_if_need(usb_device_keeper_t *instance,
+    usb_target_t target, const uint8_t *data)
 {
         assert(instance);
@@ -119 +120 @@
                 if (((data[0] & 0xf) == 1) && ((data[2] | data[3]) == 0)) {
                         /* endpoint number is < 16, thus first byte is enough */
-                        instance->devices[target.address].toggle_status &=
+                        instance->devices[target.address].toggle_status[0] &=
+                            ~(1 << data[4]);
+                        instance->devices[target.address].toggle_status[1] &=
                             ~(1 << data[4]);
                 }
@@ -128 +131 @@
                 /* target must be device */
                 if ((data[0] & 0xf) == 0) {
-                        instance->devices[target.address].toggle_status = 0;
+                        instance->devices[target.address].toggle_status[0] = 0;
+                        instance->devices[target.address].toggle_status[1] = 0;
                 }
         break;
@@ -141 +145 @@
  * @return Error code
  */
-int device_keeper_get_toggle(device_keeper_t *instance, usb_target_t target)
-{
-        assert(instance);
+int usb_device_keeper_get_toggle(usb_device_keeper_t *instance,
+    usb_target_t target, usb_direction_t direction)
+{
+        assert(instance);
+        /* only control pipes are bi-directional and those do not need toggle */
+        if (direction == USB_DIRECTION_BOTH)
+                return ENOENT;
         int ret;
         fibril_mutex_lock(&instance->guard);
@@ -152 +160 @@
                 ret = EINVAL;
         } else {
-                ret = (instance->devices[target.address].toggle_status
+                ret = (instance->devices[target.address].toggle_status[direction]
                         >> target.endpoint) & 1;
         }
@@ -166 +174 @@
  * @return Error code.
  */
-int device_keeper_set_toggle(
-    device_keeper_t *instance, usb_target_t target, bool toggle)
-{
-        assert(instance);
+int usb_device_keeper_set_toggle(usb_device_keeper_t *instance,
+    usb_target_t target, usb_direction_t direction, bool toggle)
+{
+        assert(instance);
+        /* only control pipes are bi-directional and those do not need toggle */
+        if (direction == USB_DIRECTION_BOTH)
+                return ENOENT;
         int ret;
         fibril_mutex_lock(&instance->guard);
@@ -179 +190 @@
         } else {
                 if (toggle) {
-                        instance->devices[target.address].toggle_status |= (1 << target.endpoint);
+                        instance->devices[target.address].toggle_status[direction]
+                            |= (1 << target.endpoint);
                 } else {
-                        instance->devices[target.address].toggle_status &= ~(1 << target.endpoint);
+                        instance->devices[target.address].toggle_status[direction]
+                            &= ~(1 << target.endpoint);
                 }
                 ret = EOK;
@@ -195 +208 @@
  * @return Free address, or error code.
  */
-usb_address_t device_keeper_request(
-    device_keeper_t *instance, usb_speed_t speed)
-{
-        assert(instance);
-        fibril_mutex_lock(&instance->guard);
-
-        usb_address_t new_address = instance->last_address + 1;
-        while (instance->devices[new_address].occupied) {
+usb_address_t device_keeper_get_free_address(usb_device_keeper_t *instance,
+    usb_speed_t speed)
+{
+        assert(instance);
+        fibril_mutex_lock(&instance->guard);
+
+        usb_address_t new_address = instance->last_address;
+        do {
+                ++new_address;
+                if (new_address > USB11_ADDRESS_MAX)
+                        new_address = 1;
                 if (new_address == instance->last_address) {
                         fibril_mutex_unlock(&instance->guard);
                         return ENOSPC;
                 }
-                if (new_address == USB11_ADDRESS_MAX)
-                        new_address = 1;
-                ++new_address;
-        }
+        } while (instance->devices[new_address].occupied);
 
         assert(new_address != USB_ADDRESS_DEFAULT);
@@ -216 +229 @@
         instance->devices[new_address].occupied = true;
         instance->devices[new_address].speed = speed;
-        instance->devices[new_address].toggle_status = 0;
+        instance->devices[new_address].toggle_status[0] = 0;
+        instance->devices[new_address].toggle_status[1] = 0;
         instance->last_address = new_address;
         fibril_mutex_unlock(&instance->guard);
@@ -228 +242 @@
  * @param[in] handle Devman handle of the device.
  */
-void device_keeper_bind(
-    device_keeper_t *instance, usb_address_t address, devman_handle_t handle)
+void usb_device_keeper_bind(usb_device_keeper_t *instance,
+    usb_address_t address, devman_handle_t handle)
 {
         assert(instance);
@@ -245 +259 @@
  * @param[in] address Device address
  */
-void device_keeper_release(device_keeper_t *instance, usb_address_t address)
+void usb_device_keeper_release(usb_device_keeper_t *instance,
+    usb_address_t address)
 {
         assert(instance);
@@ -263 +278 @@
  * @return USB Address, or error code.
  */
-usb_address_t device_keeper_find(
-    device_keeper_t *instance, devman_handle_t handle)
+usb_address_t usb_device_keeper_find(usb_device_keeper_t *instance,
+    devman_handle_t handle)
 {
         assert(instance);
@@ -286 +301 @@
  * @return USB speed.
  */
-usb_speed_t device_keeper_speed(
-    device_keeper_t *instance, usb_address_t address)
+usb_speed_t usb_device_keeper_get_speed(usb_device_keeper_t *instance,
+    usb_address_t address)
 {
         assert(instance);
@@ -294 +309 @@
         return instance->devices[address].speed;
 }
+
 /**
  * @}