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

Timestamp:

2018-02-02T10:13:55Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

961a5ee

Parents:

e67c50a (diff), 290338b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '290338bf7224f502808b23e82d98306208962b97' into forwardport

File:

• uspace/drv/bus/usb/usbdiag/device.h (modified) (2 diffs)

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

@@ -40 +40 @@
 #include <usb/dev/driver.h>
 
-#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
+#define USBDIAG_EP_BURST_INTR_IN    1
+#define USBDIAG_EP_BURST_INTR_OUT   2
+#define USBDIAG_EP_BURST_BULK_IN    3
+#define USBDIAG_EP_BURST_BULK_OUT   4
+#define USBDIAG_EP_BURST_ISOCH_IN   5
+#define USBDIAG_EP_BURST_ISOCH_OUT  6
+
+#define USBDIAG_EP_DATA_INTR_IN     7
+#define USBDIAG_EP_DATA_INTR_OUT    8
+#define USBDIAG_EP_DATA_BULK_IN     9
+#define USBDIAG_EP_DATA_BULK_OUT   10
+#define USBDIAG_EP_DATA_ISOCH_IN   11
+#define USBDIAG_EP_DATA_ISOCH_OUT  12
 
 /**
@@ -53 +60 @@
         usb_device_t *usb_dev;
         ddf_fun_t *fun;
-        usb_pipe_t *intr_in;
-        usb_pipe_t *intr_out;
-        usb_pipe_t *bulk_in;
-        usb_pipe_t *bulk_out;
-        usb_pipe_t *isoch_in;
-        usb_pipe_t *isoch_out;
+
+        usb_pipe_t *burst_intr_in;
+        usb_pipe_t *burst_intr_out;
+        usb_pipe_t *burst_bulk_in;
+        usb_pipe_t *burst_bulk_out;
+        usb_pipe_t *burst_isoch_in;
+        usb_pipe_t *burst_isoch_out;
+
+        usb_pipe_t *data_intr_in;
+        usb_pipe_t *data_intr_out;
+        usb_pipe_t *data_bulk_in;
+        usb_pipe_t *data_bulk_out;
+        usb_pipe_t *data_isoch_in;
+        usb_pipe_t *data_isoch_out;
+
 } usbdiag_dev_t;