Changeset a43f1d18 in mainline for uspace/lib/drv/include/usbhc_iface.h

Timestamp:

2011-04-09T18:26:22Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

2ad98fd

Parents:

f35b294 (diff), 97e7e8a (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 with usb/development

File:

• uspace/lib/drv/include/usbhc_iface.h (modified) (6 diffs)

uspace/lib/drv/include/usbhc_iface.h

@@ -66 +66 @@
  *   - argument #1 is target address
  *   - argument #2 is target endpoint
- *   - argument #3 is max packet size of the endpoint
  * - this call is immediately followed by IPC data read (async version)
  * - the call is not answered until the device returns some data (or until
@@ -169 +168 @@
         /** Register endpoint attributes at host controller.
          * This is used to reserve portion of USB bandwidth.
+         * When speed is invalid, speed of the device is used.
          * Parameters:
-         * - USB address + endpoint number (ADDR * 256 + EP)
-         * - transfer type + direction (TYPE * 256 + DIR)
-         * - maximum packet size
-         * - interval (in milliseconds)
+         * - USB address + endpoint number
+         *   - packed as ADDR << 16 + EP
+         * - speed + transfer type + direction
+         *   - packed as ( SPEED << 8 + TYPE ) << 8 + DIR
+         * - maximum packet size + interval (in milliseconds)
+         *   - packed as MPS << 16 + INT
          * Answer:
          * - EOK - reservation successful
@@ -202 +204 @@
 
 /** Out transfer processing function prototype. */
-typedef int (*usbhc_iface_transfer_out_t)(ddf_fun_t *, usb_target_t, size_t,
+typedef int (*usbhc_iface_transfer_out_t)(ddf_fun_t *, usb_target_t,
     void *, size_t,
     usbhc_iface_transfer_out_callback_t, void *);
@@ -210 +212 @@
 
 /** In transfer processing function prototype. */
-typedef int (*usbhc_iface_transfer_in_t)(ddf_fun_t *, usb_target_t, size_t,
+typedef int (*usbhc_iface_transfer_in_t)(ddf_fun_t *, usb_target_t,
     void *, size_t,
     usbhc_iface_transfer_in_callback_t, void *);
@@ -222 +224 @@
         int (*release_address)(ddf_fun_t *, usb_address_t);
 
-        int (*register_endpoint)(ddf_fun_t *, usb_address_t, usb_endpoint_t,
+        int (*register_endpoint)(ddf_fun_t *,
+            usb_address_t, usb_speed_t, usb_endpoint_t,
             usb_transfer_type_t, usb_direction_t, size_t, unsigned int);
         int (*unregister_endpoint)(ddf_fun_t *, usb_address_t, usb_endpoint_t,
@@ -234 +237 @@
 
         int (*control_write)(ddf_fun_t *, usb_target_t,
-            size_t,
             void *, size_t, void *, size_t,
             usbhc_iface_transfer_out_callback_t, void *);
 
         int (*control_read)(ddf_fun_t *, usb_target_t,
-            size_t,
             void *, size_t, void *, size_t,
             usbhc_iface_transfer_in_callback_t, void *);