Changeset 87305bb in mainline

Timestamp:

2011-04-06T22:32:06Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

dcaf819, fc9f88d

Parents:

4ca18ae

Message:

Final cleanup, fix reseting toggle of the last ep in list

Location:

uspace/lib/usb

Files:

• include/usb/host/device_keeper.h (modified) (2 diffs)
• src/host/device_keeper.c (modified) (5 diffs)

uspace/lib/usb/include/usb/host/device_keeper.h

@@ -56 +56 @@
         link_t endpoints;
         uint16_t control_used;
-        uint16_t toggle_status[2];
         devman_handle_t handle;
 };
@@ -81 +80 @@
 
 void usb_device_keeper_reset_if_need(usb_device_keeper_t *instance,
-    usb_target_t target,
-    const uint8_t *setup_data);
-/*
-int usb_device_keeper_get_toggle(usb_device_keeper_t *instance,
-    usb_target_t target, usb_direction_t direction);
+    usb_target_t target, const uint8_t *setup_data);
 
-int usb_device_keeper_set_toggle(usb_device_keeper_t *instance,
-    usb_target_t target, usb_direction_t direction, bool toggle);
-*/
 usb_address_t device_keeper_get_free_address(usb_device_keeper_t *instance,
     usb_speed_t speed);

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

@@ -56 +56 @@
                 instance->devices[i].control_used = 0;
                 instance->devices[i].handle = 0;
-//              instance->devices[i].toggle_status[0] = 0;
-//              instance->devices[i].toggle_status[1] = 0;
                 list_initialize(&instance->devices[i].endpoints);
         }
@@ -132 +130 @@
                         /* endpoint number is < 16, thus first byte is enough */
                         assert(!"NOT IMPLEMENTED!");
-//                      instance->devices[target.address].toggle_status[0] &=
-//                          ~(1 << data[4]);
-//                      instance->devices[target.address].toggle_status[1] &=
-//                          ~(1 << data[4]);
                 }
         break;
@@ -146 +140 @@
                             instance->devices[target.address].endpoints.next;
                         while (current !=
-                           instance->devices[target.address].endpoints.prev)
+                           &instance->devices[target.address].endpoints)
                         {
                                 endpoint_toggle_reset(current);
                                 current = current->next;
                         }
-//                      instance->devices[target.address].toggle_status[0] = 0;
-//                      instance->devices[target.address].toggle_status[1] = 0;
                 }
         break;
@@ -158 +150 @@
         fibril_mutex_unlock(&instance->guard);
 }
-/*----------------------------------------------------------------------------*/
-#if 0
-/** Get current value of endpoint toggle.
- *
- * @param[in] instance Device keeper structure to use.
- * @param[in] target Device and endpoint used.
- * @return Error code
- */
-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);
-        if (target.endpoint > 15 || target.endpoint < 0
-            || target.address >= USB_ADDRESS_COUNT || target.address < 0
-            || !instance->devices[target.address].occupied) {
-                usb_log_error("Invalid data when asking for toggle value.\n");
-                ret = EINVAL;
-        } else {
-                ret = (instance->devices[target.address].toggle_status[direction]
-                        >> target.endpoint) & 1;
-        }
-        fibril_mutex_unlock(&instance->guard);
-        return ret;
-}
-/*----------------------------------------------------------------------------*/
-/** Set current value of endpoint toggle.
- *
- * @param[in] instance Device keeper structure to use.
- * @param[in] target Device and endpoint used.
- * @param[in] toggle Toggle value.
- * @return Error code.
- */
-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);
-        if (target.endpoint > 15 || target.endpoint < 0
-            || target.address >= USB_ADDRESS_COUNT || target.address < 0
-            || !instance->devices[target.address].occupied) {
-                usb_log_error("Invalid data when setting toggle value.\n");
-                ret = EINVAL;
-        } else {
-                if (toggle) {
-                        instance->devices[target.address].toggle_status[direction]
-                            |= (1 << target.endpoint);
-                } else {
-                        instance->devices[target.address].toggle_status[direction]
-                            &= ~(1 << target.endpoint);
-                }
-                ret = EOK;
-        }
-        fibril_mutex_unlock(&instance->guard);
-        return ret;
-}
-#endif
 /*----------------------------------------------------------------------------*/
 /** Get a free USB address
@@ -251 +178 @@
         instance->devices[new_address].occupied = true;
         instance->devices[new_address].speed = speed;
-        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);