Changeset 8a951ca in mainline for uspace/lib/usb/src/host/device_keeper.c

Timestamp:

2011-03-21T13:47:30Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a372663

Parents:

f8e1a2c (diff), 48fe0c9 (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

File:

• uspace/lib/usb/src/host/device_keeper.c (modified) (8 diffs)

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

@@ -55 +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;
         }
 }
@@ -118 +119 @@
                 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]);
                 }
@@ -127 +130 @@
                 /* 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;
@@ -140 +144 @@
  * @return Error code
  */
-int device_keeper_get_toggle(device_keeper_t *instance, usb_target_t target)
-{
-        assert(instance);
+int device_keeper_get_toggle(
+    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);
@@ -151 +159 @@
                 ret = EINVAL;
         } else {
-                ret = (instance->devices[target.address].toggle_status
+                ret = (instance->devices[target.address].toggle_status[direction]
                         >> target.endpoint) & 1;
         }
@@ -165 +173 @@
  * @return Error code.
  */
-int device_keeper_set_toggle(
-    device_keeper_t *instance, usb_target_t target, bool toggle)
-{
-        assert(instance);
+int device_keeper_set_toggle(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);
@@ -178 +189 @@
         } 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;
@@ -215 +228 @@
         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);