Changeset b4b534ac in mainline for uspace/drv/nic/ar9271/ath_usb.c

Timestamp:

2016-07-22T08:24:47Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f76d2c2

Parents:

5b18137 (diff), 8351f9a4 (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 from lp:~jan.vesely/helenos/usb

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"
 
@@ -97 +98 @@
 {
         ath_usb_t *ath_usb = (ath_usb_t *) ath->specific_data;
-        usb_pipe_t *pipe =
-            &ath_usb->usb_device->pipes[ath_usb->output_ctrl_pipe_number].pipe;
-        
+        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);
 }
@@ -117 +118 @@
 {
         ath_usb_t *ath_usb = (ath_usb_t *) ath->specific_data;
-        usb_pipe_t *pipe =
-            &ath_usb->usb_device->pipes[ath_usb->input_ctrl_pipe_number].pipe;
-        
+        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);
 }
@@ -140 +141 @@
         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 =
-            &ath_usb->usb_device->pipes[ath_usb->output_data_pipe_number].pipe;
-        
+        usb_pipe_t *pipe = &usb_device_get_mapped_ep(
+            ath_usb->usb_device, 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;
 }
@@ -172 +173 @@
 {
         ath_usb_t *ath_usb = (ath_usb_t *) ath->specific_data;
-        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);
+        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);
 }