Changeset 54464f6a in mainline for uspace/lib/usbdev/src/pipesinit.c

Timestamp:

2011-11-11T19:48:33Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

50a01a9

Parents:

c2e50d7 (diff), 747ef72 (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 mainline changes

File:

• uspace/lib/usbdev/src/pipesinit.c (modified) (5 diffs)

uspace/lib/usbdev/src/pipesinit.c

@@ -192 +192 @@
         }
 
-        if (ep_mapping->pipe == NULL) {
-                return EBADMEM;
-        }
         if (ep_mapping->present) {
                 return EEXISTS;
         }
 
-        int rc = usb_pipe_initialize(ep_mapping->pipe, wire,
+        int rc = usb_pipe_initialize(&ep_mapping->pipe, wire,
             ep_no, description.transfer_type, endpoint->max_packet_size,
             description.direction);
@@ -254 +251 @@
  *
  * The mapping array is expected to conform to following rules:
- * - @c pipe must point to already allocated structure with uninitialized pipe
+ * - @c pipe must be uninitialized pipe
  * - @c description must point to prepared endpoint description
  * - @c descriptor does not need to be initialized (will be overwritten)
@@ -297 +294 @@
         }
 
-        /*
-         * Go through the mapping and set all endpoints to not present.
-         */
-        size_t i;
-        for (i = 0; i < mapping_count; i++) {
+        /* Go through the mapping and set all endpoints to not present. */
+        for (size_t i = 0; i < mapping_count; i++) {
                 mapping[i].present = false;
                 mapping[i].descriptor = NULL;
@@ -307 +301 @@
         }
 
-        /*
-         * Prepare the descriptor parser.
-         */
+        /* Prepare the descriptor parser. */
         const usb_dp_parser_t dp_parser = {
                 .nesting = descriptor_nesting
@@ -454 +446 @@
  * @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;
 }