summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhselasky <hselasky@FreeBSD.org>2011-11-28 09:54:41 +0000
committerhselasky <hselasky@FreeBSD.org>2011-11-28 09:54:41 +0000
commitdd693bfcaed8c654c26edc8588d427dad2e4da5e (patch)
treee54b4eec6d87a5831af04ad118b6e64fa1b66ada
parentdb9c9e87f192a70c1e62673c9ce1378a75f3eaff (diff)
downloadFreeBSD-src-dd693bfcaed8c654c26edc8588d427dad2e4da5e.zip
FreeBSD-src-dd693bfcaed8c654c26edc8588d427dad2e4da5e.tar.gz
This commit marks the beginning of a new internal USB
transfer statemachine. This work is about using a single state variable instead of multiple state bits as input for the USB statemachine to determine what to do in the various parts of the code. No APIs towards USB device drivers or USB host controller drivers will be changed. MFC after: 1 month
-rw-r--r--sys/dev/usb/usb_transfer.h114
1 files changed, 114 insertions, 0 deletions
diff --git a/sys/dev/usb/usb_transfer.h b/sys/dev/usb/usb_transfer.h
index 71157ca..f035240 100644
--- a/sys/dev/usb/usb_transfer.h
+++ b/sys/dev/usb/usb_transfer.h
@@ -28,6 +28,120 @@
#define _USB_TRANSFER_H_
/*
+ * Definition of internal USB transfer states:
+ * ===========================================
+ *
+ * The main reason there are many USB states is that we are allowed to
+ * cancel USB transfers, then start the USB transfer again and that
+ * this state transaction cannot always be done in a single atomic
+ * operation without blocking the calling thread. One reason for this
+ * is that the USB hardware sometimes needs to wait for DMA
+ * controllers to finish which is done asynchronously and grows the
+ * statemachine.
+ *
+ * When extending the following statemachine there are basically two
+ * things you should think about: Which states should be executed or
+ * modified in case of USB transfer stop and which states should be
+ * executed or modified in case of USB transfer start. Also respect
+ * the "can_cancel_immed" flag which basically tells if you can go
+ * directly from a wait state to the cancelling states.
+ */
+
+enum {
+ /* XFER start execute state */
+
+ /* USB_ST_SETUP = 0 (already defined) */
+
+ /* XFER transferred execute state */
+
+ /* USB_ST_TRANSFERRED = 1 (already defined) */
+
+ /* XFER error execute state */
+
+ /* USB_ST_ERROR = 2 (already defined) */
+
+ /* XFER restart after error execute state */
+
+ USB_ST_RESTART = 8,
+
+ /* XFER transfer idle state */
+
+ USB_ST_WAIT_SETUP,
+
+ /* Other XFER execute states */
+
+ USB_ST_PIPE_OPEN = 16,
+ USB_ST_PIPE_OPEN_ERROR,
+ USB_ST_PIPE_OPEN_RESTART,
+
+ USB_ST_BDMA_LOAD,
+ USB_ST_BDMA_LOAD_ERROR,
+ USB_ST_BDMA_LOAD_RESTART,
+
+ USB_ST_IVAL_DLY,
+ USB_ST_IVAL_DLY_ERROR,
+ USB_ST_IVAL_DLY_RESTART,
+
+ USB_ST_PIPE_STALL,
+ USB_ST_PIPE_STALL_ERROR,
+ USB_ST_PIPE_STALL_RESTART,
+
+ USB_ST_ENTER,
+ USB_ST_ENTER_ERROR,
+ USB_ST_ENTER_RESTART,
+
+ USB_ST_START,
+ USB_ST_START_ERROR,
+ USB_ST_START_RESTART,
+
+ USB_ST_PIPE_CLOSE,
+ USB_ST_PIPE_CLOSE_ERROR,
+ USB_ST_PIPE_CLOSE_RESTART,
+
+ USB_ST_BDMA_DLY,
+ USB_ST_BDMA_DLY_ERROR,
+ USB_ST_BDMA_DLY_RESTART,
+
+ /* XFER transfer wait states */
+
+ USB_ST_WAIT_PIPE_OPEN = 64,
+ USB_ST_WAIT_PIPE_OPEN_ERROR,
+ USB_ST_WAIT_PIPE_OPEN_RESTART,
+
+ USB_ST_WAIT_BDMA_LOAD,
+ USB_ST_WAIT_BDMA_LOAD_ERROR,
+ USB_ST_WAIT_BDMA_LOAD_RESTART,
+
+ USB_ST_WAIT_IVAL_DLY,
+ USB_ST_WAIT_IVAL_DLY_ERROR,
+ USB_ST_WAIT_IVAL_DLY_RESTART,
+
+ USB_ST_WAIT_PIPE_STALL,
+ USB_ST_WAIT_PIPE_STALL_ERROR,
+ USB_ST_WAIT_PIPE_STALL_RESTART,
+
+ USB_ST_WAIT_ENTER,
+ USB_ST_WAIT_ENTER_ERROR,
+ USB_ST_WAIT_ENTER_RESTART,
+
+ USB_ST_WAIT_START,
+ USB_ST_WAIT_START_ERROR,
+ USB_ST_WAIT_START_RESTART,
+
+ USB_ST_WAIT_PIPE_CLOSE,
+ USB_ST_WAIT_PIPE_CLOSE_ERROR,
+ USB_ST_WAIT_PIPE_CLOSE_RESTART,
+
+ USB_ST_WAIT_BDMA_DLY,
+ USB_ST_WAIT_BDMA_DLY_ERROR,
+ USB_ST_WAIT_BDMA_DLY_RESTART,
+
+ USB_ST_WAIT_TRANSFERRED,
+ USB_ST_WAIT_TRANSFERRED_ERROR,
+ USB_ST_WAIT_TRANSFERRED_RESTART,
+};
+
+/*
* The following structure defines the messages that is used to signal
* the "done_p" USB process.
*/
OpenPOWER on IntegriCloud