Changeset b3c39690 in mainline for uspace/drv/bus/usb/usbdiag

Timestamp:

2018-01-21T23:19:20Z (8 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/drv/bus/usb/usbdiag

Files:

• device.c (modified) (4 diffs)
• device.h (modified) (2 diffs)
• main.c (modified) (2 diffs)

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;