Changeset d2fc1c2 in mainline for uspace/drv/uhci-hcd/utils/device_keeper.c

Timestamp:

2011-03-08T18:18:05Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

48d2765, 8e9becf6

Parents:

d477734 (diff), a8e98498 (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/drv/uhci-hcd/utils/device_keeper.c (modified) (9 diffs)

uspace/drv/uhci-hcd/utils/device_keeper.c

@@ -39 +39 @@
 
 /*----------------------------------------------------------------------------*/
+/** Initializes device keeper structure.
+ *
+ * @param[in] instance Memory place to initialize.
+ */
 void device_keeper_init(device_keeper_t *instance)
 {
@@ -49 +53 @@
                 instance->devices[i].occupied = false;
                 instance->devices[i].handle = 0;
-        }
-}
-/*----------------------------------------------------------------------------*/
-void device_keeper_reserve_default(
-    device_keeper_t *instance, usb_speed_t speed)
+                instance->devices[i].toggle_status = 0;
+        }
+}
+/*----------------------------------------------------------------------------*/
+/** Attempts to obtain address 0, blocks.
+ *
+ * @param[in] instance Device keeper structure to use.
+ * @param[in] speed Speed of the device requesting default address.
+ */
+void device_keeper_reserve_default(device_keeper_t *instance, usb_speed_t speed)
 {
         assert(instance);
@@ -66 +75 @@
 }
 /*----------------------------------------------------------------------------*/
+/** Attempts to obtain address 0, blocks.
+ *
+ * @param[in] instance Device keeper structure to use.
+ * @param[in] speed Speed of the device requesting default address.
+ */
 void device_keeper_release_default(device_keeper_t *instance)
 {
@@ -75 +89 @@
 }
 /*----------------------------------------------------------------------------*/
+/** Checks setup data for signs of toggle reset.
+ *
+ * @param[in] instance Device keeper structure to use.
+ * @param[in] target Device to receive setup packet.
+ * @param[in] data Setup packet data.
+ */
+void device_keeper_reset_if_need(
+    device_keeper_t *instance, usb_target_t target, const unsigned char *data)
+{
+        assert(instance);
+        fibril_mutex_lock(&instance->guard);
+        if (target.endpoint > 15 || target.endpoint < 0
+            || target.address >= USB_ADDRESS_COUNT || target.address < 0
+            || !instance->devices[target.address].occupied) {
+                fibril_mutex_unlock(&instance->guard);
+                return;
+        }
+
+        switch (data[1])
+        {
+        case 0x01: /*clear feature*/
+                /* recipient is endpoint, value is zero (ENDPOINT_STALL) */
+                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 &=
+                            ~(1 << data[4]);
+                }
+        break;
+
+        case 0x9: /* set configuration */
+        case 0x11: /* set interface */
+                instance->devices[target.address].toggle_status = 0;
+        break;
+        }
+        fibril_mutex_unlock(&instance->guard);
+}
+/*----------------------------------------------------------------------------*/
+/** Gets current value of endpoint toggle.
+ *
+ * @param[in] instance Device keeper structure to use.
+ * @param[in] target Device and endpoint used.
+ * @return Error code
+ */
+int device_keeper_get_toggle(device_keeper_t *instance, usb_target_t target)
+{
+        assert(instance);
+        int ret;
+        fibril_mutex_lock(&instance->guard);
+        if (target.endpoint > 15 || target.endpoint < 0
+            || target.address >= USB_ADDRESS_COUNT || target.address < 0
+            || !instance->devices[target.address].occupied) {
+                ret = EINVAL;
+        } else {
+                ret =
+                    (instance->devices[target.address].toggle_status
+                        >> target.endpoint) & 1;
+        }
+        fibril_mutex_unlock(&instance->guard);
+        return ret;
+}
+/*----------------------------------------------------------------------------*/
+/** Sets current value of endpoint toggle.
+ *
+ * @param[in] instance Device keeper structure to use.
+ * @param[in] target Device and endpoint used.
+ * @param[in] toggle Current toggle value.
+ * @return Error code.
+ */
+int device_keeper_set_toggle(
+    device_keeper_t *instance, usb_target_t target, bool toggle)
+{
+        assert(instance);
+        int ret;
+        fibril_mutex_lock(&instance->guard);
+        if (target.endpoint > 15 || target.endpoint < 0
+            || target.address >= USB_ADDRESS_COUNT || target.address < 0
+            || !instance->devices[target.address].occupied) {
+                ret = EINVAL;
+        } else {
+                if (toggle) {
+                        instance->devices[target.address].toggle_status |= (1 << target.endpoint);
+                } else {
+                        instance->devices[target.address].toggle_status &= ~(1 << target.endpoint);
+                }
+                ret = EOK;
+        }
+        fibril_mutex_unlock(&instance->guard);
+        return ret;
+}
+/*----------------------------------------------------------------------------*/
+/** Gets a free USB address
+ *
+ * @param[in] instance Device keeper structure to use.
+ * @param[in] speed Speed of the device requiring address.
+ * @return Free address, or error code.
+ */
 usb_address_t device_keeper_request(
     device_keeper_t *instance, usb_speed_t speed)
@@ -96 +206 @@
         instance->devices[new_address].occupied = true;
         instance->devices[new_address].speed = speed;
+        instance->devices[new_address].toggle_status = 0;
         instance->last_address = new_address;
         fibril_mutex_unlock(&instance->guard);
@@ -101 +212 @@
 }
 /*----------------------------------------------------------------------------*/
+/** Binds USB address to devman handle.
+ *
+ * @param[in] instance Device keeper structure to use.
+ * @param[in] address Device address
+ * @param[in] handle Devman handle of the device.
+ */
 void device_keeper_bind(
     device_keeper_t *instance, usb_address_t address, devman_handle_t handle)
@@ -113 +230 @@
 }
 /*----------------------------------------------------------------------------*/
+/** Releases used USB address.
+ *
+ * @param[in] instance Device keeper structure to use.
+ * @param[in] address Device address
+ */
 void device_keeper_release(device_keeper_t *instance, usb_address_t address)
 {
@@ -125 +247 @@
 }
 /*----------------------------------------------------------------------------*/
+/** Finds USB address associated with the device
+ *
+ * @param[in] instance Device keeper structure to use.
+ * @param[in] handle Devman handle of the device seeking its address.
+ * @return USB Address, or error code.
+ */
 usb_address_t device_keeper_find(
     device_keeper_t *instance, devman_handle_t handle)
@@ -142 +270 @@
 }
 /*----------------------------------------------------------------------------*/
+/** Gets speed associated with the address
+ *
+ * @param[in] instance Device keeper structure to use.
+ * @param[in] address Address of the device.
+ * @return USB speed.
+ */
 usb_speed_t device_keeper_speed(
     device_keeper_t *instance, usb_address_t address)