Changeset e76c0ea in mainline for uspace/drv/bus/usb/xhci/hc.c

Timestamp:

2017-11-18T22:27:12Z (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:

306a36d

Parents:

b80c1ab

git-author:

Petr Mánek <petr.manek@…> (2017-11-18 22:26:12)

git-committer:

Petr Mánek <petr.manek@…> (2017-11-18 22:27:12)

Message:

Renamed and simplified static method for input context allocation.

File:

• uspace/drv/bus/usb/xhci/hc.c (modified) (6 diffs)

uspace/drv/bus/usb/xhci/hc.c

@@ -636 +636 @@
 }
 
-static int create_valid_input_ctx(dma_buffer_t *dma_buf)
+static int create_configure_ep_input_ctx(dma_buffer_t *dma_buf)
 {
         const int err = dma_buffer_alloc(dma_buf, sizeof(xhci_input_ctx_t));
@@ -645 +645 @@
         memset(ictx, 0, sizeof(xhci_input_ctx_t));
 
-        // Quoting sec. 4.6.6: A1, D0, D1 are down, A0 is up.
-        XHCI_INPUT_CTRL_CTX_ADD_CLEAR(ictx->ctrl_ctx, 1);
-        XHCI_INPUT_CTRL_CTX_DROP_CLEAR(ictx->ctrl_ctx, 0);
-        XHCI_INPUT_CTRL_CTX_DROP_CLEAR(ictx->ctrl_ctx, 1);
+        // Quoting sec. 4.6.5 and 4.6.6: A1, D0, D1 are down (already zeroed), A0 is up.
         XHCI_INPUT_CTRL_CTX_ADD_SET(ictx->ctrl_ctx, 0);
 
@@ -676 +673 @@
         /* Issue configure endpoint command (sec 4.3.5). */
         dma_buffer_t ictx_dma_buf;
-        if ((err = create_valid_input_ctx(&ictx_dma_buf))) {
+        if ((err = create_configure_ep_input_ctx(&ictx_dma_buf))) {
                 goto err_dev_ctx;
         }
@@ -724 +721 @@
         /* Issue configure endpoint command (sec 4.3.5). */
         dma_buffer_t ictx_dma_buf;
-        const int err = create_valid_input_ctx(&ictx_dma_buf);
+        const int err = create_configure_ep_input_ctx(&ictx_dma_buf);
         if (err)
                 return err;
@@ -743 +740 @@
         /* Issue configure endpoint command (sec 4.3.5). */
         dma_buffer_t ictx_dma_buf;
-        const int err = create_valid_input_ctx(&ictx_dma_buf);
+        const int err = create_configure_ep_input_ctx(&ictx_dma_buf);
         if (err)
                 return err;
@@ -759 +756 @@
         /* Issue configure endpoint command (sec 4.3.5). */
         dma_buffer_t ictx_dma_buf;
-        const int err = create_valid_input_ctx(&ictx_dma_buf);
+        const int err = create_configure_ep_input_ctx(&ictx_dma_buf);
         if (err)
                 return err;