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

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/include/usb/host

Files:

• batch.h (modified) (3 diffs)
• device_keeper.h (modified) (4 diffs)
• endpoint.h (modified) (2 diffs)

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

@@ -39 +39 @@
 #include <usbhc_iface.h>
 #include <usb/usb.h>
+#include <usb/host/endpoint.h>
 
 typedef struct usb_transfer_batch usb_transfer_batch_t;
@@ -60 +61 @@
         ddf_fun_t *fun;
         void *arg;
+        endpoint_t *ep;
         void *private_data;
 };
@@ -78 +80 @@
     void *arg,
     ddf_fun_t *fun,
+                endpoint_t *ep,
     void *private_data
 );

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

@@ -45 +45 @@
 #include <fibril_synch.h>
 #include <usb/usb.h>
+#include <usb/host/endpoint.h>
 
 /** Number of USB address for array dimensions. */
@@ -72 +73 @@
 
 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);
 
 void usb_device_keeper_reserve_default_address(
@@ -82 +83 @@
     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);
@@ -88 +89 @@
 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/include/usb/host/endpoint.h

@@ -47 +47 @@
         size_t max_packet_size;
         bool active;
-        int toggle:1;
+        unsigned toggle:1;
 } endpoint_t;
 
@@ -55 +55 @@
 void endpoint_destroy(endpoint_t *instance);
 
+int endpoint_toggle_get(endpoint_t *instance);
+
+void endpoint_toggle_set(endpoint_t *instance, int toggle);
+
 void endpoint_toggle_reset(link_t *ep);
+
 
 #endif