Changeset 2e5aea1 in mainline

Timestamp:

2017-10-22T09:30:38Z (7 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

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

Children:

2c091a6

Parents:

2b61945

Message:

Moved around a declaration. The OS builds again.

File:

• uspace/drv/bus/usb/xhci/endpoint.c (modified) (3 diffs)

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

@@ -183 +183 @@
 
         int err = ENOMEM;
-        usb_endpoint_t ep_num = ep->base.target.endpoint;
+        const usb_endpoint_t ep_num = ep->base.target.endpoint;
 
         assert(&dev->base == ep->base.device);
@@ -203 +203 @@
         // Prepare input context.
         xhci_input_ctx_t *ictx = malloc32(sizeof(xhci_input_ctx_t));
+        const unsigned ep_idx = xhci_endpoint_index(ep);
         if (!ictx)
                 goto err;
@@ -213 +214 @@
         XHCI_INPUT_CTRL_CTX_DROP_CLEAR(ictx->ctrl_ctx, 1);
         XHCI_INPUT_CTRL_CTX_ADD_SET(ictx->ctrl_ctx, 0);
-
-        unsigned ep_idx = xhci_endpoint_index(ep);
         XHCI_INPUT_CTRL_CTX_ADD_SET(ictx->ctrl_ctx, ep_idx + 1); /* Preceded by slot ctx */