Changeset 3bacee1 in mainline for uspace/drv/bus/usb/xhci/streams.c

Timestamp:

2018-04-12T16:27:17Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

3cf22f9

Parents:

76d0981d

git-author:

Jiri Svoboda <jiri@…> (2018-04-11 19:25:33)

git-committer:

Jiri Svoboda <jiri@…> (2018-04-12 16:27:17)

Message:

Make ccheck-fix again and commit more good files.

File:

• uspace/drv/bus/usb/xhci/streams.c (modified) (15 diffs)

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

@@ -88 +88 @@
 {
         usb_log_debug("Allocating primary stream context array of size %u "
-                "for endpoint " XHCI_EP_FMT, count, XHCI_EP_ARGS(*xhci_ep));
+            "for endpoint " XHCI_EP_FMT, count, XHCI_EP_ARGS(*xhci_ep));
 
         if ((dma_buffer_alloc(&xhci_ep->primary_stream_ctx_dma,
-                count * sizeof(xhci_stream_ctx_t)))) {
+            count * sizeof(xhci_stream_ctx_t)))) {
                 return ENOMEM;
         }
@@ -110 +110 @@
 {
         usb_log_debug("Deallocating primary stream structures for "
-                "endpoint " XHCI_EP_FMT, XHCI_EP_ARGS(*xhci_ep));
+            "endpoint " XHCI_EP_FMT, XHCI_EP_ARGS(*xhci_ep));
 
         dma_buffer_free(&xhci_ep->primary_stream_ctx_dma);
@@ -138 +138 @@
 {
         usb_log_debug("Freeing stream rings and context arrays of endpoint "
-                XHCI_EP_FMT, XHCI_EP_ARGS(*xhci_ep));
+            XHCI_EP_FMT, XHCI_EP_ARGS(*xhci_ep));
 
         for (size_t index = 0; index < xhci_ep->primary_stream_data_size; ++index) {
@@ -153 +153 @@
  */
 static errno_t initialize_primary_stream(xhci_hc_t *hc, xhci_endpoint_t *xhci_ep,
-        unsigned index)
+    unsigned index)
 {
         xhci_stream_ctx_t *ctx = &xhci_ep->primary_stream_ctx_array[index];
@@ -206 +206 @@
  */
 static errno_t initialize_secondary_streams(xhci_hc_t *hc, xhci_endpoint_t *xhci_ep,
-        unsigned idx, unsigned count)
+    unsigned idx, unsigned count)
 {
         if (count == 0) {
@@ -218 +218 @@
         if ((count & (count - 1)) != 0 || count < 8 || count > 256) {
                 usb_log_error("The secondary stream array size must be a power of 2 "
-                        "between 8 and 256.");
+                    "between 8 and 256.");
                 return EINVAL;
         }
@@ -233 +233 @@
 
         if ((dma_buffer_alloc(&data->secondary_stream_ctx_dma,
-                count * sizeof(xhci_stream_ctx_t)))) {
+            count * sizeof(xhci_stream_ctx_t)))) {
                 free(data->secondary_data);
                 return ENOMEM;
@@ -275 +275 @@
  */
 static void setup_stream_context(xhci_endpoint_t *xhci_ep, xhci_ep_ctx_t *ctx,
-        unsigned pstreams, unsigned lsa)
+    unsigned pstreams, unsigned lsa)
 {
         XHCI_EP_TYPE_SET(*ctx, xhci_endpoint_type(xhci_ep));
@@ -295 +295 @@
  */
 static errno_t verify_stream_conditions(xhci_hc_t *hc, xhci_device_t *dev,
-        xhci_endpoint_t *xhci_ep, unsigned count)
-{
-        if (xhci_ep->base.transfer_type != USB_TRANSFER_BULK
-                || dev->base.speed != USB_SPEED_SUPER) {
+    xhci_endpoint_t *xhci_ep, unsigned count)
+{
+        if (xhci_ep->base.transfer_type != USB_TRANSFER_BULK ||
+            dev->base.speed != USB_SPEED_SUPER) {
                 usb_log_error("Streams are only supported by superspeed bulk endpoints.");
                 return EINVAL;
@@ -321 +321 @@
         if (count > max_psa_size) {
                 usb_log_error("Host controller only supports "
-                        "%u primary streams.", max_psa_size);
+                    "%u primary streams.", max_psa_size);
                 return EINVAL;
         }
@@ -327 +327 @@
         if (count > xhci_ep->max_streams) {
                 usb_log_error("Endpoint " XHCI_EP_FMT " supports only %" PRIu32 " streams.",
-                        XHCI_EP_ARGS(*xhci_ep), xhci_ep->max_streams);
+                    XHCI_EP_ARGS(*xhci_ep), xhci_ep->max_streams);
                 return EINVAL;
         }
@@ -346 +346 @@
  */
 errno_t xhci_endpoint_remove_streams(xhci_hc_t *hc, xhci_device_t *dev,
-        xhci_endpoint_t *xhci_ep)
+    xhci_endpoint_t *xhci_ep)
 {
         if (!xhci_ep->primary_stream_data_size) {
@@ -374 +374 @@
  */
 errno_t xhci_endpoint_request_primary_streams(xhci_hc_t *hc, xhci_device_t *dev,
-        xhci_endpoint_t *xhci_ep, unsigned count)
+    xhci_endpoint_t *xhci_ep, unsigned count)
 {
         errno_t err = verify_stream_conditions(hc, dev, xhci_ep, count);
@@ -422 +422 @@
  */
 errno_t xhci_endpoint_request_secondary_streams(xhci_hc_t *hc, xhci_device_t *dev,
-        xhci_endpoint_t *xhci_ep, unsigned *sizes, unsigned count)
+    xhci_endpoint_t *xhci_ep, unsigned *sizes, unsigned count)
 {
         /* Check if HC supports secondary indexing */
@@ -454 +454 @@
         if (max * count > xhci_ep->max_streams) {
                 usb_log_error("Endpoint " XHCI_EP_FMT " supports only %" PRIu32 " streams.",
-                        XHCI_EP_ARGS(*xhci_ep), xhci_ep->max_streams);
+                    XHCI_EP_ARGS(*xhci_ep), xhci_ep->max_streams);
                 return EINVAL;
         }