Changeset f567bcf in mainline for uspace/lib/usb/src

Timestamp:

2011-04-06T22:02:17Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

4ca18ae

Parents:

8dc762e0

Message:

Switch to new endpoint toggle control.

Location:

uspace/lib/usb/src/host

Files:

• batch.c (modified) (2 diffs)
• device_keeper.c (modified) (6 diffs)
• endpoint.c (modified) (2 diffs)

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

@@ -54 +54 @@
     void *arg,
     ddf_fun_t *fun,
+                endpoint_t *ep,
     void *private_data
     )
@@ -77 +78 @@
         instance->next_step = NULL;
         instance->error = EOK;
-
+        instance->ep = ep;
 }
 /*----------------------------------------------------------------------------*/

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;
+//              instance->devices[i].toggle_status[0] = 0;
+//              instance->devices[i].toggle_status[1] = 0;
                 list_initialize(&instance->devices[i].endpoints);
         }
@@ -63 +63 @@
 /*----------------------------------------------------------------------------*/
 void usb_device_keeper_add_ep(
-    usb_device_keeper_t *instance, usb_address_t address, link_t *ep)
+    usb_device_keeper_t *instance, usb_address_t address, endpoint_t *ep)
 {
         assert(instance);
         fibril_mutex_lock(&instance->guard);
         assert(instance->devices[address].occupied);
-        list_append(ep, &instance->devices[address].endpoints);
+        list_append(&ep->same_device_eps, &instance->devices[address].endpoints);
         fibril_mutex_unlock(&instance->guard);
 }
@@ -131 +131 @@
                 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[0] &=
-                            ~(1 << data[4]);
-                        instance->devices[target.address].toggle_status[1] &=
-                            ~(1 << data[4]);
+                        assert(!"NOT IMPLEMENTED!");
+//                      instance->devices[target.address].toggle_status[0] &=
+//                          ~(1 << data[4]);
+//                      instance->devices[target.address].toggle_status[1] &=
+//                          ~(1 << data[4]);
                 }
         break;
@@ -142 +143 @@
                 /* target must be device */
                 if ((data[0] & 0xf) == 0) {
-                        instance->devices[target.address].toggle_status[0] = 0;
-                        instance->devices[target.address].toggle_status[1] = 0;
+                        link_t *current =
+                            instance->devices[target.address].endpoints.next;
+                        while (current !=
+                           instance->devices[target.address].endpoints.prev)
+                        {
+                                endpoint_toggle_reset(current);
+                                current = current->next;
+                        }
+//                      instance->devices[target.address].toggle_status[0] = 0;
+//                      instance->devices[target.address].toggle_status[1] = 0;
                 }
         break;
@@ -150 +159 @@
 }
 /*----------------------------------------------------------------------------*/
+#if 0
 /** Get current value of endpoint toggle.
  *
@@ -212 +222 @@
         return ret;
 }
+#endif
 /*----------------------------------------------------------------------------*/
 /** Get a free USB address

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

@@ -35 +35 @@
 
 #include <errno.h>
-
 #include <usb/host/endpoint.h>
 
@@ -57 +56 @@
 }
 /*----------------------------------------------------------------------------*/
+int endpoint_toggle_get(endpoint_t *instance)
+{
+        assert(instance);
+        return (int)instance->toggle;
+}
+/*----------------------------------------------------------------------------*/
+void endpoint_toggle_set(endpoint_t *instance, int toggle)
+{
+        assert(instance);
+        assert(toggle == 0 || toggle == 1);
+        instance->toggle = toggle;
+}
+/*----------------------------------------------------------------------------*/
 void endpoint_toggle_reset(link_t *ep)
 {