Changeset b7b7898 in mainline for uspace/drv/bus/usb/usbdiag/device.h

Timestamp:

2017-12-22T12:03:16Z (6 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/device.h (modified) (3 diffs)

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

@@ -34 +34 @@
  */
 
-#ifndef USB_DIAG_DEVICE_H_
-#define USB_DIAG_DEVICE_H_
+#ifndef USBDIAG_DEVICE_H_
+#define USBDIAG_DEVICE_H_
 
 #include <usb/dev/device.h>
 
-#define USB_DIAG_EP_INTR_IN    1
-#define USB_DIAG_EP_INTR_OUT   2
-#define USB_DIAG_EP_BULK_IN    3
-#define USB_DIAG_EP_BULK_OUT   4
-#define USB_DIAG_EP_ISOCH_IN   5
-#define USB_DIAG_EP_ISOCH_OUT  6
+#define USBDIAG_EP_INTR_IN    1
+#define USBDIAG_EP_INTR_OUT   2
+#define USBDIAG_EP_BULK_IN    3
+#define USBDIAG_EP_BULK_OUT   4
+#define USBDIAG_EP_ISOCH_IN   5
+#define USBDIAG_EP_ISOCH_OUT  6
 
 /**
  * USB diagnostic device.
  */
-typedef struct usb_diag_dev {
+typedef struct usbdiag_dev {
         usb_device_t *usb_dev;
         ddf_fun_t *fun;
@@ -58 +58 @@
         usb_pipe_t *isoch_in;
         usb_pipe_t *isoch_out;
-} usb_diag_dev_t;
+} usbdiag_dev_t;
 
-int usb_diag_dev_create(usb_device_t *, usb_diag_dev_t **);
-void usb_diag_dev_destroy(usb_diag_dev_t *);
+int usbdiag_dev_create(usb_device_t *, usbdiag_dev_t **);
+void usbdiag_dev_destroy(usbdiag_dev_t *);
 
-static inline usb_diag_dev_t * usb_device_to_usb_diag_dev(usb_device_t *usb_dev)
+static inline usbdiag_dev_t * usb_device_to_usbdiag_dev(usb_device_t *usb_dev)
 {
         assert(usb_dev);
@@ -69 +69 @@
 }
 
-static inline usb_diag_dev_t * ddf_dev_to_usb_diag_dev(ddf_dev_t *ddf_dev)
+static inline usbdiag_dev_t * ddf_dev_to_usbdiag_dev(ddf_dev_t *ddf_dev)
 {
         assert(ddf_dev);
-        return usb_device_to_usb_diag_dev(usb_device_get(ddf_dev));
+        return usb_device_to_usbdiag_dev(usb_device_get(ddf_dev));
 }
 
-static inline usb_diag_dev_t * ddf_fun_to_usb_diag_dev(ddf_fun_t *ddf_fun)
+static inline usbdiag_dev_t * ddf_fun_to_usbdiag_dev(ddf_fun_t *ddf_fun)
 {
         assert(ddf_fun);
-        return ddf_dev_to_usb_diag_dev(ddf_fun_get_dev(ddf_fun));
+        return ddf_dev_to_usbdiag_dev(ddf_fun_get_dev(ddf_fun));
 }
 
-#endif /* USB_DIAG_USBDIAG_H_ */
+#endif /* USBDIAG_USBDIAG_H_ */
 
 /**