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

Timestamp:

2017-12-21T14:37:30Z (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:

119a794

Parents:

74c0de0

git-author:

Petr Mánek <petr.manek@…> (2017-12-21 14:37:23)

git-committer:

Petr Mánek <petr.manek@…> (2017-12-21 14:37:30)

Message:

usbdiag: added isochronous test

Location:

uspace/drv/bus/usb/usbdiag

Files:

• device.c (modified) (1 diff)
• tests.c (modified) (1 diff)
• tests.h (modified) (1 diff)

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

@@ -53 +53 @@
         }
 
+TRANSLATE_FUNC(usb_diag_stress_intr_out)
+TRANSLATE_FUNC(usb_diag_stress_intr_in)
 TRANSLATE_FUNC(usb_diag_stress_bulk_out)
 TRANSLATE_FUNC(usb_diag_stress_bulk_in)
-TRANSLATE_FUNC(usb_diag_stress_intr_out)
-TRANSLATE_FUNC(usb_diag_stress_intr_in)
+TRANSLATE_FUNC(usb_diag_stress_isoch_out)
+TRANSLATE_FUNC(usb_diag_stress_isoch_in)
 
 static usbdiag_iface_t diag_interface = {
+        .stress_intr_out = TRANSLATE_FUNC_NAME(usb_diag_stress_intr_out),
+        .stress_intr_in = TRANSLATE_FUNC_NAME(usb_diag_stress_intr_in),
         .stress_bulk_out = TRANSLATE_FUNC_NAME(usb_diag_stress_bulk_out),
         .stress_bulk_in = TRANSLATE_FUNC_NAME(usb_diag_stress_bulk_in),
-        .stress_intr_out = TRANSLATE_FUNC_NAME(usb_diag_stress_intr_out),
-        .stress_intr_in = TRANSLATE_FUNC_NAME(usb_diag_stress_intr_in)
+        .stress_isoch_out = TRANSLATE_FUNC_NAME(usb_diag_stress_isoch_out),
+        .stress_isoch_in = TRANSLATE_FUNC_NAME(usb_diag_stress_isoch_in)
 };
 

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

@@ -178 +178 @@
 }
 
+int usb_diag_stress_isoch_out(usb_diag_dev_t *dev, int cycles, size_t size)
+{
+        if (!dev)
+                return EBADMEM;
+
+        char *buffer = (char *) malloc(size);
+        if (!buffer)
+                return ENOMEM;
+
+        memset(buffer, 42, size);
+
+        // TODO: Are we sure that no other test is running on this endpoint?
+
+        usb_log_info("Performing isochronous out stress test on device %s.", ddf_fun_get_name(dev->fun));
+        int rc = EOK;
+        for (int i = 0; i < cycles; ++i) {
+                // Write buffer to device.
+                if ((rc = usb_pipe_write(dev->isoch_out, buffer, size))) {
+                        usb_log_error("Isochronous OUT write failed. %s\n", str_error(rc));
+                        break;
+                }
+        }
+
+        free(buffer);
+        return rc;
+}
+
+int usb_diag_stress_isoch_in(usb_diag_dev_t *dev, int cycles, size_t size)
+{
+        if (!dev)
+                return EBADMEM;
+
+        char *buffer = (char *) malloc(size);
+        if (!buffer)
+                return ENOMEM;
+
+        // TODO: Are we sure that no other test is running on this endpoint?
+
+        usb_log_info("Performing isochronous in stress test on device %s.", ddf_fun_get_name(dev->fun));
+        int rc = EOK;
+        for (int i = 0; i < cycles; ++i) {
+                // Read device's response.
+                size_t remaining = size;
+                size_t transferred;
+
+                while (remaining > 0) {
+                        if ((rc = usb_pipe_read(dev->isoch_in, buffer + size - remaining, remaining, &transferred))) {
+                                usb_log_error("Isochronous IN read failed. %s\n", str_error(rc));
+                                break;
+                        }
+
+                        if (transferred > remaining) {
+                                usb_log_error("Isochronous IN read more than expected.\n");
+                                rc = EINVAL;
+                                break;
+                        }
+
+                        remaining -= transferred;
+                }
+
+                if (rc)
+                        break;
+        }
+
+        free(buffer);
+        return rc;
+}
+
 /**
  * @}

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

@@ -43 +43 @@
 int usb_diag_stress_bulk_out(usb_diag_dev_t *, int, size_t);
 int usb_diag_stress_bulk_in(usb_diag_dev_t *, int, size_t);
+int usb_diag_stress_isoch_out(usb_diag_dev_t *, int, size_t);
+int usb_diag_stress_isoch_in(usb_diag_dev_t *, int, size_t);
 
 #endif /* USB_DIAG_TESTS_H_ */