Changes in uspace/drv/nic/ar9271/ath_usb.c [b7fd2a0:5a6cc679] in mainline

File:

• uspace/drv/nic/ar9271/ath_usb.c (modified) (7 diffs)

uspace/drv/nic/ar9271/ath_usb.c

@@ -59 +59 @@
  *
  */
-errno_t ath_usb_init(ath_t *ath, usb_device_t *usb_device)
+errno_t ath_usb_init(ath_t *ath, usb_device_t *usb_device, const usb_endpoint_description_t **endpoints)
 {
         ath_usb_t *ath_usb = malloc(sizeof(ath_usb_t));
@@ -70 +70 @@
         ath_usb->usb_device = usb_device;
         
-        /* TODO: Assign by iterating over pipes. */
-        ath_usb->output_data_pipe_number = 0;
-        ath_usb->input_data_pipe_number = 1;
-        ath_usb->input_ctrl_pipe_number = 2;
-        ath_usb->output_ctrl_pipe_number = 3;
+        int rc;
+
+#define _MAP_EP(target, ep_no) do {\
+        usb_endpoint_mapping_t *epm = usb_device_get_mapped_ep_desc(usb_device, endpoints[ep_no]);\
+        if (!epm || !epm->present) {\
+                usb_log_error("Failed to map endpoint: " #ep_no ".");\
+                rc = ENOENT;\
+                goto err_ath_usb;\
+        }\
+        target = &epm->pipe;\
+        } while (0);
+
+        _MAP_EP(ath_usb->output_data_pipe, 0);
+        _MAP_EP(ath_usb->input_data_pipe, 1);
+        _MAP_EP(ath_usb->input_ctrl_pipe, 2);
+        _MAP_EP(ath_usb->output_ctrl_pipe, 3);
+
+#undef _MAP_EP
         
         ath->ctrl_response_length = 64;
@@ -83 +96 @@
         
         return EOK;
+err_ath_usb:
+        free(ath_usb);
+        return rc;
 }
 
@@ -98 +114 @@
 {
         ath_usb_t *ath_usb = (ath_usb_t *) ath->specific_data;
-        usb_pipe_t *pipe = &usb_device_get_mapped_ep(
-            ath_usb->usb_device, ath_usb->output_ctrl_pipe_number)->pipe;
-        
-        return usb_pipe_write(pipe, buffer, buffer_size);
+        return usb_pipe_write(ath_usb->output_ctrl_pipe, buffer, buffer_size);
 }
 
@@ -118 +131 @@
 {
         ath_usb_t *ath_usb = (ath_usb_t *) ath->specific_data;
-        usb_pipe_t *pipe = &usb_device_get_mapped_ep(
-            ath_usb->usb_device, ath_usb->input_ctrl_pipe_number)->pipe;
-        
-        return usb_pipe_read(pipe, buffer, buffer_size, transferred_size);
+        return usb_pipe_read(ath_usb->input_ctrl_pipe, buffer, buffer_size, transferred_size);
 }
 
@@ -148 +158 @@
         
         ath_usb_t *ath_usb = (ath_usb_t *) ath->specific_data;
-        usb_pipe_t *pipe = &usb_device_get_mapped_ep(
-            ath_usb->usb_device, ath_usb->output_data_pipe_number)->pipe;
-        
-        errno_t ret_val = usb_pipe_write(pipe, complete_buffer,
-            complete_buffer_size);
+        const errno_t ret_val = usb_pipe_write(ath_usb->output_data_pipe,
+            complete_buffer, complete_buffer_size);
         
         free(complete_buffer);
@@ -173 +180 @@
 {
         ath_usb_t *ath_usb = (ath_usb_t *) ath->specific_data;
-        usb_pipe_t *pipe = &usb_device_get_mapped_ep(
-            ath_usb->usb_device, ath_usb->input_data_pipe_number)->pipe;
-        
-        return usb_pipe_read(pipe, buffer, buffer_size, transferred_size);
+        return usb_pipe_read(ath_usb->input_data_pipe, buffer, buffer_size, transferred_size);
 }