Changeset 27736cf in mainline

Timestamp:

2011-10-31T16:50:31Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

07a7a97d

Parents:

f37eb84

Message:

usb: Don't pass speed info when registering endpoint.

Location:

uspace

Files:

• drv/bus/usb/ehci/hc_iface.c (modified) (1 diff)
• drv/bus/usb/vhc/connhost.c (modified) (1 diff)
• lib/drv/generic/remote_usbhc.c (modified) (3 diffs)
• lib/drv/include/usbhc_iface.h (modified) (1 diff)
• lib/usbdev/include/usb/dev/pipes.h (modified) (1 diff)
• lib/usbdev/src/pipesinit.c (modified) (1 diff)
• lib/usbhost/src/iface.c (modified) (1 diff)

uspace/drv/bus/usb/ehci/hc_iface.c

@@ -120 +120 @@
  */
 static int register_endpoint(ddf_fun_t *fun,
-    usb_address_t address, usb_speed_t speed, usb_endpoint_t endpoint,
+    usb_address_t address, usb_endpoint_t endpoint,
     usb_transfer_type_t transfer_type, usb_direction_t direction,
     size_t max_packet_size, unsigned int interval)

uspace/drv/bus/usb/vhc/connhost.c

@@ -128 +128 @@
  */
 static int register_endpoint(ddf_fun_t *fun,
-    usb_address_t address, usb_speed_t speed, usb_endpoint_t endpoint,
+    usb_address_t address, usb_endpoint_t endpoint,
     usb_transfer_type_t transfer_type, usb_direction_t direction,
     size_t max_packet_size, unsigned int interval)

uspace/lib/drv/generic/remote_usbhc.c

@@ -55 +55 @@
 static remote_iface_func_ptr_t remote_usbhc_iface_ops[] = {
         [IPC_M_USBHC_REQUEST_ADDRESS] = remote_usbhc_request_address,
+        [IPC_M_USBHC_RELEASE_ADDRESS] = remote_usbhc_release_address,
         [IPC_M_USBHC_BIND_ADDRESS] = remote_usbhc_bind_address,
         [IPC_M_USBHC_GET_HANDLE_BY_ADDRESS] = remote_usbhc_find_by_address,
-        [IPC_M_USBHC_RELEASE_ADDRESS] = remote_usbhc_release_address,
 
         [IPC_M_USBHC_REGISTER_ENDPOINT] = remote_usbhc_register_endpoint,
@@ -234 +234 @@
 
 #define _INIT_FROM_HIGH_DATA2(type, var, arg_no) \
-        type var = (type) DEV_IPC_GET_ARG##arg_no(*call) / (1 << 16)
+        type var = (type) (DEV_IPC_GET_ARG##arg_no(*call) >> 16)
 #define _INIT_FROM_LOW_DATA2(type, var, arg_no) \
-        type var = (type) DEV_IPC_GET_ARG##arg_no(*call) % (1 << 16)
-#define _INIT_FROM_HIGH_DATA3(type, var, arg_no) \
-        type var = (type) DEV_IPC_GET_ARG##arg_no(*call) / (1 << 16)
-#define _INIT_FROM_MIDDLE_DATA3(type, var, arg_no) \
-        type var = (type) (DEV_IPC_GET_ARG##arg_no(*call) / (1 << 8)) % (1 << 8)
-#define _INIT_FROM_LOW_DATA3(type, var, arg_no) \
-        type var = (type) DEV_IPC_GET_ARG##arg_no(*call) % (1 << 8)
+        type var = (type) (DEV_IPC_GET_ARG##arg_no(*call) & 0xffff)
 
         const usb_target_t target = { .packed = DEV_IPC_GET_ARG1(*call) };
 
-        _INIT_FROM_HIGH_DATA3(usb_speed_t, speed, 2);
-        _INIT_FROM_MIDDLE_DATA3(usb_transfer_type_t, transfer_type, 2);
-        _INIT_FROM_LOW_DATA3(usb_direction_t, direction, 2);
+        _INIT_FROM_HIGH_DATA2(usb_transfer_type_t, transfer_type, 2);
+        _INIT_FROM_LOW_DATA2(usb_direction_t, direction, 2);
 
         _INIT_FROM_HIGH_DATA2(size_t, max_packet_size, 3);
@@ -255 +248 @@
 #undef _INIT_FROM_HIGH_DATA2
 #undef _INIT_FROM_LOW_DATA2
-#undef _INIT_FROM_HIGH_DATA3
-#undef _INIT_FROM_MIDDLE_DATA3
-#undef _INIT_FROM_LOW_DATA3
-
-        int rc = usb_iface->register_endpoint(fun, target.address, speed,
+
+        int rc = usb_iface->register_endpoint(fun, target.address,
             target.endpoint, transfer_type, direction, max_packet_size, interval);
 

uspace/lib/drv/include/usbhc_iface.h

@@ -176 +176 @@
 
         int (*register_endpoint)(ddf_fun_t *,
-            usb_address_t, usb_speed_t, usb_endpoint_t,
+            usb_address_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,

uspace/lib/usbdev/include/usb/dev/pipes.h

@@ -172 +172 @@
 int usb_pipe_initialize_from_configuration(usb_endpoint_mapping_t *,
     size_t, const uint8_t *, size_t, usb_device_connection_t *);
-int usb_pipe_register_with_speed(usb_pipe_t *, usb_speed_t,
-    unsigned int, usb_hc_connection_t *);
 int usb_pipe_register(usb_pipe_t *, unsigned int, usb_hc_connection_t *);
 int usb_pipe_unregister(usb_pipe_t *, usb_hc_connection_t *);

uspace/lib/usbdev/src/pipesinit.c

@@ -454 +454 @@
  * @return Error code.
  */
-int usb_pipe_register(usb_pipe_t *pipe,
-    unsigned int interval,
-    usb_hc_connection_t *hc_connection)
-{
-        return usb_pipe_register_with_speed(pipe, USB_SPEED_MAX + 1,
-            interval, hc_connection);
-}
-
-/** Register endpoint with a speed at the host controller.
- *
- * You will rarely need to use this function because it is needed only
- * if the registered endpoint is of address 0 and there is no other way
- * to tell speed of the device at address 0.
- *
- * @param pipe Pipe to be registered.
- * @param speed Speed of the device
- *      (invalid speed means use previously specified one).
- * @param interval Polling interval.
- * @param hc_connection Connection to the host controller (must be opened).
- * @return Error code.
- */
-int usb_pipe_register_with_speed(usb_pipe_t *pipe, usb_speed_t speed,
-    unsigned int interval,
+int usb_pipe_register(usb_pipe_t *pipe, unsigned interval,
     usb_hc_connection_t *hc_connection)
 {
         assert(pipe);
         assert(hc_connection);
-        
+
         if (!usb_hc_connection_is_opened(hc_connection))
                 return EBADF;
-        
+
         const usb_target_t target =
             {{ .address = pipe->wire->address, .endpoint = pipe->endpoint_no }};
-#define _PACK2(high, low) (((high) << 16) + (low))
-#define _PACK3(high, middle, low) (((((high) << 8) + (middle)) << 8) + (low))
-        
+#define _PACK2(high, low) (((high & 0xffff) << 16) | (low & 0xffff))
+
         async_exch_t *exch = async_exchange_begin(hc_connection->hc_sess);
         int rc = async_req_4_0(exch, DEV_IFACE_ID(USBHC_DEV_IFACE),
             IPC_M_USBHC_REGISTER_ENDPOINT, target.packed,
-            _PACK3(speed, pipe->transfer_type, pipe->direction),
+            _PACK2(pipe->transfer_type, pipe->direction),
             _PACK2(pipe->max_packet_size, interval));
         async_exchange_end(exch);
-        
+
 #undef _PACK2
-#undef _PACK3
-        
         return rc;
 }

uspace/lib/usbhost/src/iface.c

@@ -182 +182 @@
 /*----------------------------------------------------------------------------*/
 static int register_endpoint(
-    ddf_fun_t *fun, usb_address_t address, usb_speed_t ep_speed,
-    usb_endpoint_t endpoint,
+    ddf_fun_t *fun, usb_address_t address, usb_endpoint_t endpoint,
     usb_transfer_type_t transfer_type, usb_direction_t direction,
     size_t max_packet_size, unsigned int interval)