Changeset b3c39690 in mainline

Timestamp:

2018-01-21T23:19:20Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

db51a6a6

Parents:

09187c6e

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-21 23:19:14)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-01-21 23:19:20)

Message:

usb: remove misleading usb_device_get_mapped_ep

Even though this method may seem very convenient to use, it's actually
wrong. The devices are usually not required to have strict endpoint
numbers. That's why the mapping mechanism exists. Therefore, it's just
not possible to rely on fixed endpoint mapping.

There could be similar method, that would take the transfer type and
direction, but it's much better to ask for the complete mapping then.

Location:

uspace

Files:

• drv/bus/usb/usbdiag/device.c (modified) (4 diffs)
• drv/bus/usb/usbdiag/device.h (modified) (2 diffs)
• drv/bus/usb/usbdiag/main.c (modified) (2 diffs)
• drv/nic/ar9271/ar9271.c (modified) (3 diffs)
• drv/nic/ar9271/ath_usb.c (modified) (7 diffs)
• drv/nic/ar9271/ath_usb.h (modified) (2 diffs)
• lib/usbdev/include/usb/dev/device.h (modified) (1 diff)
• lib/usbdev/src/devdrv.c (modified) (1 diff)

uspace/drv/bus/usb/usbdiag/device.c

@@ -64 +64 @@
 };
 
-static int device_init(usbdiag_dev_t *dev)
+static int device_init(usbdiag_dev_t *dev, const usb_endpoint_description_t **endpoints)
 {
         int rc;
@@ -77 +77 @@
 
 #define _MAP_EP(target, ep_no) do {\
-        usb_endpoint_mapping_t *epm = usb_device_get_mapped_ep(dev->usb_dev, USBDIAG_EP_##ep_no);\
+        usb_endpoint_mapping_t *epm = usb_device_get_mapped_ep_desc(dev->usb_dev, endpoints[USBDIAG_EP_##ep_no]);\
         if (!epm || !epm->present) {\
                 usb_log_error("Failed to map endpoint: " #ep_no ".");\
@@ -108 +108 @@
 }
 
-int usbdiag_dev_create(usb_device_t *dev, usbdiag_dev_t **out_diag_dev)
+int usbdiag_dev_create(usb_device_t *dev, usbdiag_dev_t **out_diag_dev, const usb_endpoint_description_t **endpoints)
 {
         assert(dev);
@@ -120 +120 @@
 
         int err;
-        if ((err = device_init(diag_dev)))
+        if ((err = device_init(diag_dev, endpoints)))
                 goto err_init;
 

uspace/drv/bus/usb/usbdiag/device.h

@@ -38 +38 @@
 
 #include <usb/dev/device.h>
+#include <usb/dev/driver.h>
 
 #define USBDIAG_EP_INTR_IN    1
@@ -60 +61 @@
 } usbdiag_dev_t;
 
-int usbdiag_dev_create(usb_device_t *, usbdiag_dev_t **);
+int usbdiag_dev_create(usb_device_t *, usbdiag_dev_t **, const usb_endpoint_description_t **);
 void usbdiag_dev_destroy(usbdiag_dev_t *);
 

uspace/drv/bus/usb/usbdiag/main.c

@@ -45 +45 @@
 #define NAME "usbdiag"
 
+static const usb_endpoint_description_t *diag_endpoints[];
+
 static int device_add(usb_device_t *dev)
 {
@@ -51 +53 @@
 
         usbdiag_dev_t *diag_dev;
-        if ((rc = usbdiag_dev_create(dev, &diag_dev))) {
+        if ((rc = usbdiag_dev_create(dev, &diag_dev, diag_endpoints))) {
                 usb_log_error("Failed create device: %s.", str_error(rc));
                 goto err;

uspace/drv/nic/ar9271/ar9271.c

@@ -665 +665 @@
 }
 
-static int ar9271_init(ar9271_t *ar9271, usb_device_t *usb_device)
+static int ar9271_init(ar9271_t *ar9271, usb_device_t *usb_device, const usb_endpoint_description_t **endpoints)
 {
         ar9271->starting_up = true;
@@ -679 +679 @@
         }
         
-        int rc = ath_usb_init(ar9271->ath_device, usb_device);
+        int rc = ath_usb_init(ar9271->ath_device, usb_device, endpoints);
         if (rc != EOK) {
                 free(ar9271->ath_device);
@@ -850 +850 @@
         ar9271->ddf_dev = dev;
         
-        rc = ar9271_init(ar9271, usb_device_get(dev));
+        rc = ar9271_init(ar9271, usb_device_get(dev), endpoints);
         if (rc != EOK) {
                 free(ar9271);

uspace/drv/nic/ar9271/ath_usb.c

@@ -59 +59 @@
  *
  */
-int ath_usb_init(ath_t *ath, usb_device_t *usb_device)
+int 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;
-        
-        int ret_val = usb_pipe_write(pipe, complete_buffer,
+        int ret_val = usb_pipe_write(ath_usb->output_data_pipe, complete_buffer,
             complete_buffer_size);
         
@@ -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);
 }

uspace/drv/nic/ar9271/ath_usb.h

@@ -45 +45 @@
 typedef struct {
         /** USB pipes indexes */
-        int input_ctrl_pipe_number;
-        int output_ctrl_pipe_number;
-        int input_data_pipe_number;
-        int output_data_pipe_number;
+        usb_pipe_t *input_ctrl_pipe;
+        usb_pipe_t *output_ctrl_pipe;
+        usb_pipe_t *input_data_pipe;
+        usb_pipe_t *output_data_pipe;
         
         /** Pointer to connected USB device. */
@@ -59 +59 @@
 } ath_usb_data_header_t;
 
-extern int ath_usb_init(ath_t *, usb_device_t *);
+extern int ath_usb_init(ath_t *, usb_device_t *, const usb_endpoint_description_t **endpoints);
 
 #endif  /* ATHEROS_ATH_USB_H */

uspace/lib/usbdev/include/usb/dev/device.h

@@ -87 +87 @@
 usb_endpoint_mapping_t * usb_device_get_mapped_ep_desc(usb_device_t *,
     const usb_endpoint_description_t *);
-usb_endpoint_mapping_t * usb_device_get_mapped_ep(usb_device_t *,
-    usb_endpoint_t);
 int usb_device_unmap_ep(usb_endpoint_mapping_t *);
 

uspace/lib/usbdev/src/devdrv.c

@@ -341 +341 @@
 }
 
-usb_endpoint_mapping_t * usb_device_get_mapped_ep(
-    usb_device_t *usb_dev, usb_endpoint_t ep)
-{
-        assert(usb_dev);
-        for (unsigned i = 0; i < usb_dev->pipes_count; ++i) {
-                if (usb_dev->pipes[i].pipe.desc.endpoint_no == ep)
-                        return &usb_dev->pipes[i];
-        }
-        return NULL;
-}
-
 int usb_device_unmap_ep(usb_endpoint_mapping_t *epm)
 {