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

Timestamp:

2011-04-09T23:30:55Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

46e078a

Parents:

77223f8 (diff), f11c288 (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

Location:

uspace/lib/usb/include/usb

Files:

• classes/hub.h (modified) (2 diffs)
• host/device_keeper.h (modified) (1 diff)
• host/endpoint.h (modified) (2 diffs)
• host/usb_endpoint_manager.h (modified) (1 diff)

uspace/lib/usb/include/usb/classes/hub.h

@@ -43 +43 @@
  */
 typedef enum {
+        USB_HUB_FEATURE_HUB_LOCAL_POWER = 0,
+        USB_HUB_FEATURE_HUB_OVER_CURRENT = 1,
         USB_HUB_FEATURE_C_HUB_LOCAL_POWER = 0,
         USB_HUB_FEATURE_C_HUB_OVER_CURRENT = 1,
@@ -59 +61 @@
         /* USB_HUB_FEATURE_ = , */
 } usb_hub_class_feature_t;
+
 
 /** Header of standard hub descriptor without the "variadic" part. */

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

@@ -71 +71 @@
 void usb_device_keeper_init(usb_device_keeper_t *instance);
 
-void usb_device_keeper_add_ep(
-    usb_device_keeper_t *instance, usb_address_t address, endpoint_t *ep);
-void usb_device_keeper_del_ep(
-    usb_device_keeper_t *instance, usb_address_t address, endpoint_t *ep);
-
 void usb_device_keeper_reserve_default_address(
     usb_device_keeper_t *instance, usb_speed_t speed);

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

@@ -54 +54 @@
         fibril_condvar_t avail;
         volatile bool active;
-        link_t same_device_eps;
 } endpoint_t;
 
@@ -71 +70 @@
 void endpoint_toggle_set(endpoint_t *instance, int toggle);
 
-void endpoint_toggle_reset(link_t *ep);
-
-void endpoint_toggle_reset_filtered(link_t *ep, usb_endpoint_t epn);
-
+void endpoint_toggle_reset_filtered(endpoint_t *instance, usb_target_t target);
 #endif
 /**

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

@@ -78 +78 @@
     size_t *bw);
 
+void usb_endpoint_manager_reset_if_need(
+    usb_endpoint_manager_t *instance, usb_target_t target, const uint8_t *data);
 #endif
 /**