Changeset b7b7898 in mainline for uspace/drv/bus/usb/usbdiag/main.c

Timestamp:

2017-12-22T12:03:16Z (8 years ago)

Author:

Petr Mánek <petr.manek@…>

Branches:

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

Children:

96c416a

Parents:

2986763

git-author:

Petr Mánek <petr.manek@…> (2017-12-22 12:02:50)

git-committer:

Petr Mánek <petr.manek@…> (2017-12-22 12:03:16)

Message:

usbdiag: refactoring

Reconciliated the usb_diag and usbdiag prefix in favor of the latter. Removed a ton of copy-pasta code for the burst tests in favor of single generic static burst test for every direction, which is then called by individual functions for different endpoint type. This also allowed to get rid of the ugly translation macros in device.c. Deleted unused usbdiag.h header file. Refactored the remote interface to comply with all aforementioned modifications.

File:

• uspace/drv/bus/usb/usbdiag/main.c (modified) (8 diffs)

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

@@ -41 +41 @@
 #include <str_error.h>
 
-#include "usbdiag.h"
 #include "device.h"
 
@@ -51 +50 @@
         usb_log_info("Adding device '%s'", usb_device_get_name(dev));
 
-        usb_diag_dev_t *diag_dev;
-        if ((rc = usb_diag_dev_create(dev, &diag_dev))) {
+        usbdiag_dev_t *diag_dev;
+        if ((rc = usbdiag_dev_create(dev, &diag_dev))) {
                 usb_log_error("Failed create device: %s.\n", str_error(rc));
                 goto err;
@@ -73 +72 @@
         ddf_fun_unbind(diag_dev->fun);
 err_create:
-        usb_diag_dev_destroy(diag_dev);
+        usbdiag_dev_destroy(diag_dev);
 err:
         return rc;
@@ -83 +82 @@
         usb_log_info("Removing device '%s'", usb_device_get_name(dev));
 
-        usb_diag_dev_t *diag_dev = usb_device_to_usb_diag_dev(dev);
+        usbdiag_dev_t *diag_dev = usb_device_to_usbdiag_dev(dev);
 
         /* TODO: Make sure nothing is going on with the device. */
@@ -92 +91 @@
         }
 
-        usb_diag_dev_destroy(diag_dev);
+        usbdiag_dev_destroy(diag_dev);
 
         return EOK;
@@ -104 +103 @@
         usb_log_info("Device '%s' gone.", usb_device_get_name(dev));
 
-        usb_diag_dev_t *diag_dev = usb_device_to_usb_diag_dev(dev);
+        usbdiag_dev_t *diag_dev = usb_device_to_usbdiag_dev(dev);
 
         /* TODO: Make sure nothing is going on with the device. */
@@ -110 +109 @@
         /* TODO: Remove device from list */
 
-        usb_diag_dev_destroy(diag_dev);
+        usbdiag_dev_destroy(diag_dev);
 
         return EOK;
@@ -175 +174 @@
 
 static const usb_endpoint_description_t *diag_endpoints[] = {
-        [USB_DIAG_EP_INTR_IN] = &intr_in_ep,
-        [USB_DIAG_EP_INTR_OUT] = &intr_out_ep,
-        [USB_DIAG_EP_BULK_IN] = &bulk_in_ep,
-        [USB_DIAG_EP_BULK_OUT] = &bulk_out_ep,
-        [USB_DIAG_EP_ISOCH_IN] = &isoch_in_ep,
-        [USB_DIAG_EP_ISOCH_OUT] = &isoch_out_ep,
+        [USBDIAG_EP_INTR_IN] = &intr_in_ep,
+        [USBDIAG_EP_INTR_OUT] = &intr_out_ep,
+        [USBDIAG_EP_BULK_IN] = &bulk_in_ep,
+        [USBDIAG_EP_BULK_OUT] = &bulk_out_ep,
+        [USBDIAG_EP_ISOCH_IN] = &isoch_in_ep,
+        [USBDIAG_EP_ISOCH_OUT] = &isoch_out_ep,
         NULL
 };