Changeset 8a951ca in mainline for uspace/lib/usb/include

Timestamp:

2011-03-21T13:47:30Z (15 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

Location:

uspace/lib/usb/include/usb/host

Files:

• batch.h (modified) (1 diff)
• device_keeper.h (modified) (2 diffs)

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

@@ -46 +46 @@
         usb_transfer_type_t transfer_type;
         usb_speed_t speed;
+        usb_direction_t direction;
         usbhc_iface_transfer_in_callback_t callback_in;
         usbhc_iface_transfer_out_callback_t callback_out;

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

@@ -44 +44 @@
         usb_speed_t speed;
         bool occupied;
-        uint16_t toggle_status;
+        uint16_t toggle_status[2];
         devman_handle_t handle;
 };
@@ -63 +63 @@
 
 void device_keeper_reset_if_need(
-    device_keeper_t *instance, usb_target_t target, const unsigned char *setup_data);
+    device_keeper_t *instance, usb_target_t target,
+    const unsigned char *setup_data);
 
-int device_keeper_get_toggle(device_keeper_t *instance, usb_target_t target);
+int device_keeper_get_toggle(
+    device_keeper_t *instance, usb_target_t target, usb_direction_t direction);
 
-int device_keeper_set_toggle(
-    device_keeper_t *instance, usb_target_t target, bool toggle);
+int device_keeper_set_toggle(device_keeper_t *instance,
+    usb_target_t target, usb_direction_t direction, bool toggle);
 
 usb_address_t device_keeper_request(