Changes in uspace/drv/nic/ar9271/ath_usb.c [fe97c5e:8a64320e] in mainline

File:

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

uspace/drv/nic/ar9271/ath_usb.c

@@ -36 +36 @@
 #include <usb/debug.h>
 #include <malloc.h>
-#include <errno.h>
 #include "ath_usb.h"
 
@@ -98 +97 @@
 {
         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;
-
+        usb_pipe_t *pipe =
+            &ath_usb->usb_device->pipes[ath_usb->output_ctrl_pipe_number].pipe;
+        
         return usb_pipe_write(pipe, buffer, buffer_size);
 }
@@ -118 +117 @@
 {
         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;
-
+        usb_pipe_t *pipe =
+            &ath_usb->usb_device->pipes[ath_usb->input_ctrl_pipe_number].pipe;
+        
         return usb_pipe_read(pipe, buffer, buffer_size, transferred_size);
 }
@@ -141 +140 @@
         memcpy(complete_buffer + sizeof(ath_usb_data_header_t),
             buffer, buffer_size);
-
+        
         ath_usb_data_header_t *data_header =
             (ath_usb_data_header_t *) complete_buffer;
         data_header->length = host2uint16_t_le(buffer_size);
         data_header->tag = host2uint16_t_le(TX_TAG);
-
+        
         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;
-
+        usb_pipe_t *pipe =
+            &ath_usb->usb_device->pipes[ath_usb->output_data_pipe_number].pipe;
+        
         int ret_val = usb_pipe_write(pipe, complete_buffer,
             complete_buffer_size);
-
+        
         free(complete_buffer);
-
+        
         return ret_val;
 }
@@ -173 +172 @@
 {
         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);
+        usb_pipe_t *pipe =
+            &ath_usb->usb_device->pipes[ath_usb->input_data_pipe_number].pipe;
+        
+        return usb_pipe_read(pipe, buffer, buffer_size,
+            transferred_size);
 }