Changes in uspace/lib/usbdev/src/pipesinit.c [3ddbd38:7c95d6f5] in mainline

File:

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

uspace/lib/usbdev/src/pipesinit.c

@@ -54 +54 @@
 
 /** Nesting pairs of standard descriptors. */
-static const usb_dp_descriptor_nesting_t descriptor_nesting[] = {
+static usb_dp_descriptor_nesting_t descriptor_nesting[] = {
         NESTING(CONFIGURATION, INTERFACE),
         NESTING(INTERFACE, ENDPOINT),
@@ -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);
@@ -251 +254 @@
  *
  * The mapping array is expected to conform to following rules:
- * - @c pipe must be uninitialized pipe
+ * - @c pipe must point to already allocated structure with uninitialized pipe
  * - @c description must point to prepared endpoint description
  * - @c descriptor does not need to be initialized (will be overwritten)
@@ -294 +297 @@
         }
 
-        /* Go through the mapping and set all endpoints to not present. */
-        for (size_t i = 0; i < mapping_count; i++) {
+        /*
+         * Go through the mapping and set all endpoints to not present.
+         */
+        size_t i;
+        for (i = 0; i < mapping_count; i++) {
                 mapping[i].present = false;
                 mapping[i].descriptor = NULL;
@@ -301 +307 @@
         }
 
-        /* Prepare the descriptor parser. */
+        /*
+         * Prepare the descriptor parser.
+         */
         const usb_dp_parser_t dp_parser = {
                 .nesting = descriptor_nesting
@@ -405 +413 @@
         }
 
+#define TRY_LOOP(attempt_var) \
+        for (attempt_var = 0; attempt_var < 3; attempt_var++)
+
+        size_t failed_attempts;
+        int rc;
 
         usb_pipe_start_long_transfer(pipe);
@@ -410 +423 @@
         uint8_t dev_descr_start[CTRL_PIPE_MIN_PACKET_SIZE];
         size_t transferred_size;
-        int rc;
-        for (size_t attempt_var = 0; attempt_var < 3; ++attempt_var) {
+        TRY_LOOP(failed_attempts) {
                 rc = usb_request_get_descriptor(pipe, USB_REQUEST_TYPE_STANDARD,
                     USB_REQUEST_RECIPIENT_DEVICE, USB_DESCTYPE_DEVICE,
@@ -442 +454 @@
  * @return Error code.
  */
-int usb_pipe_register(usb_pipe_t *pipe, unsigned interval,
+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,
+    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))
+        
+        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->max_packet_size, interval));
+        async_exchange_end(exch);
+        
+#undef _PACK2
+#undef _PACK3
+        
+        return rc;
+}
+
+/** Revert endpoint registration with the host controller.
+ *
+ * @param pipe Pipe to be unregistered.
+ * @param hc_connection Connection to the host controller (must be opened).
+ * @return Error code.
+ */
+int usb_pipe_unregister(usb_pipe_t *pipe,
     usb_hc_connection_t *hc_connection)
 {
@@ -448 +515 @@
         assert(pipe->wire);
         assert(hc_connection);
-
+        
         if (!usb_hc_connection_is_opened(hc_connection))
                 return EBADF;
+        
         async_exch_t *exch = async_exchange_begin(hc_connection->hc_sess);
-        if (!exch)
-                return ENOMEM;
-        const int ret = usbhc_register_endpoint(exch,
-            pipe->wire->address, pipe->endpoint_no, pipe->transfer_type,
-            pipe->direction, pipe->max_packet_size, interval);
-
-        async_exchange_end(exch);
-        return ret;
-}
-
-/** Revert endpoint registration with the host controller.
- *
- * @param pipe Pipe to be unregistered.
- * @param hc_connection Connection to the host controller (must be opened).
- * @return Error code.
- */
-int usb_pipe_unregister(usb_pipe_t *pipe,
-    usb_hc_connection_t *hc_connection)
-{
-        assert(pipe);
-        assert(pipe->wire);
-        assert(hc_connection);
-
-        if (!usb_hc_connection_is_opened(hc_connection))
-                return EBADF;
-
-        async_exch_t *exch = async_exchange_begin(hc_connection->hc_sess);
-        if (!exch)
-                return ENOMEM;
-        const int ret = usbhc_unregister_endpoint(exch,
+        int rc = async_req_4_0(exch, DEV_IFACE_ID(USBHC_DEV_IFACE),
+            IPC_M_USBHC_UNREGISTER_ENDPOINT,
             pipe->wire->address, pipe->endpoint_no, pipe->direction);
         async_exchange_end(exch);
-
-        return ret;
+        
+        return rc;
 }