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

File:

• uspace/lib/usbdev/src/pipesinit.c (modified) (5 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),
@@ -405 +405 @@
         }
 
+#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 +415 @@
         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,
@@ -446 +450 @@
 {
         assert(pipe);
-        assert(pipe->wire);
         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 & 0xffff) << 16) | (low & 0xffff))
+
         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);
-
+        int rc = async_req_4_0(exch, DEV_IFACE_ID(USBHC_DEV_IFACE),
+            IPC_M_USBHC_REGISTER_ENDPOINT, target.packed,
+            _PACK2(pipe->transfer_type, pipe->direction),
+            _PACK2(pipe->max_packet_size, interval));
         async_exchange_end(exch);
-        return ret;
+
+#undef _PACK2
+        return rc;
 }
 
@@ -474 +482 @@
         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;
 }