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

Timestamp:

2018-04-12T16:27:17Z (6 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/hc.c (modified) (26 diffs)

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

@@ -87 +87 @@
         xhci_port_speed_t *speeds = hc->speeds;
 
-        for (xhci_extcap_t *ec = hc->xecp; ec; ec = xhci_extcap_next(ec)) {
+        for (xhci_extcap_t * ec = hc->xecp; ec; ec = xhci_extcap_next(ec)) {
                 xhci_dump_extcap(ec);
                 switch (XHCI_REG_RD(ec, XHCI_EC_CAP_ID)) {
@@ -151 +151 @@
                                          * mapping also for devices connected to hubs.
                                          */
-                                        if (psiv < ARRAY_SIZE(default_psiv_to_port_speed)
-                                           && default_psiv_to_port_speed[psiv].major == major
-                                           && default_psiv_to_port_speed[psiv].minor == minor
-                                           && default_psiv_to_port_speed[psiv].rx_bps == bps
-                                           && default_psiv_to_port_speed[psiv].tx_bps == bps) {
+                                        if (psiv < ARRAY_SIZE(default_psiv_to_port_speed) &&
+                                            default_psiv_to_port_speed[psiv].major == major &&
+                                            default_psiv_to_port_speed[psiv].minor == minor &&
+                                            default_psiv_to_port_speed[psiv].rx_bps == bps &&
+                                            default_psiv_to_port_speed[psiv].tx_bps == bps) {
                                                 speeds[psiv] = default_psiv_to_port_speed[psiv];
                                                 usb_log_debug("Assumed default %s speed of USB %u.",
-                                                        usb_str_speed(speeds[psiv].usb_speed), major);
+                                                    usb_str_speed(speeds[psiv].usb_speed), major);
                                                 continue;
                                         }
@@ -173 +173 @@
                                                 speeds[psiv].tx_bps = bps;
                                                 usb_log_debug("Speed %u set up for bps %" PRIu64
-                                                        " / %" PRIu64 ".", psiv, speeds[psiv].rx_bps,
-                                                        speeds[psiv].tx_bps);
+                                                    " / %" PRIu64 ".", psiv, speeds[psiv].rx_bps,
+                                                    speeds[psiv].tx_bps);
                                         }
                                 }
@@ -384 +384 @@
         code->rangecount = 1;
         code->ranges[0] = (irq_pio_range_t) {
-            .base = RNGABS(hc->mmio_range),
-            .size = RNGSZ(hc->mmio_range),
+                .base = RNGABS(hc->mmio_range),
+                .size = RNGSZ(hc->mmio_range),
         };
 
@@ -391 +391 @@
         memcpy(code->cmds, irq_commands, sizeof(irq_commands));
 
-        void *intr0_iman = RNGABSPTR(hc->mmio_range)
-            + XHCI_REG_RD(hc->cap_regs, XHCI_CAP_RTSOFF)
-            + offsetof(xhci_rt_regs_t, ir[0]);
-        void *usbsts = RNGABSPTR(hc->mmio_range)
-            + XHCI_REG_RD(hc->cap_regs, XHCI_CAP_LENGTH)
-            + offsetof(xhci_op_regs_t, usbsts);
+        void *intr0_iman = RNGABSPTR(hc->mmio_range) +
+            XHCI_REG_RD(hc->cap_regs, XHCI_CAP_RTSOFF) +
+            offsetof(xhci_rt_regs_t, ir[0]);
+        void *usbsts = RNGABSPTR(hc->mmio_range) +
+            XHCI_REG_RD(hc->cap_regs, XHCI_CAP_LENGTH) +
+            offsetof(xhci_op_regs_t, usbsts);
 
         code->cmds[0].addr = intr0_iman;
@@ -425 +425 @@
         for (int i = 0; i <= (XHCI_LEGSUP_BIOS_TIMEOUT_US / XHCI_LEGSUP_POLLING_DELAY_1MS); i++) {
                 usb_log_debug("LEGSUP: elapsed: %i ms, bios: %x, os: %x", i,
-                        XHCI_REG_RD(hc->legsup, XHCI_LEGSUP_SEM_BIOS),
-                        XHCI_REG_RD(hc->legsup, XHCI_LEGSUP_SEM_OS));
+                    XHCI_REG_RD(hc->legsup, XHCI_LEGSUP_SEM_BIOS),
+                    XHCI_REG_RD(hc->legsup, XHCI_LEGSUP_SEM_OS));
                 if (XHCI_REG_RD(hc->legsup, XHCI_LEGSUP_SEM_BIOS) == 0) {
                         return XHCI_REG_RD(hc->legsup, XHCI_LEGSUP_SEM_OS) == 1 ? EOK : EIO;
@@ -559 +559 @@
         const uint32_t usbsts = XHCI_REG_RD_FIELD(&hc->op_regs->usbsts, 32);
 
-        return !(usbcmd & XHCI_REG_MASK(XHCI_OP_RS))
-            ||  (usbsts & XHCI_REG_MASK(XHCI_OP_HCE))
-            ||  (usbsts & XHCI_REG_MASK(XHCI_OP_HSE));
+        return !(usbcmd & XHCI_REG_MASK(XHCI_OP_RS)) ||
+            (usbsts & XHCI_REG_MASK(XHCI_OP_HCE)) ||
+            (usbsts & XHCI_REG_MASK(XHCI_OP_HSE));
 }
 
@@ -589 +589 @@
         struct timeval tv;
         getuptime(&tv);
-        usb_log_debug("Microframe index wrapped (@%lu.%li, %"PRIu64" total).",
+        usb_log_debug("Microframe index wrapped (@%lu.%li, %" PRIu64 " total).",
             tv.tv_sec, tv.tv_usec, hc->wrap_count);
         hc->wrap_time = ((uint64_t) tv.tv_sec) * 1000000 + ((uint64_t) tv.tv_usec);
@@ -634 +634 @@
         errno_t err;
         xhci_trb_t trb;
-        xhci_hc_t * const hc = arg;
+        xhci_hc_t *const hc = arg;
         assert(hc);
 
@@ -654 +654 @@
  */
 static void hc_run_event_ring(xhci_hc_t *hc, xhci_event_ring_t *event_ring,
-        xhci_interrupter_regs_t *intr)
+    xhci_interrupter_regs_t *intr)
 {
         errno_t err;
@@ -720 +720 @@
         if (status) {
                 usb_log_error("Non-zero status after interrupt handling (%08x) "
-                        " - missing something?", status);
+                    " - missing something?", status);
         }
 }
@@ -766 +766 @@
 {
         return (2 * ep->base.endpoint) +
-                (ep->base.transfer_type == USB_TRANSFER_CONTROL
-                 || ep->base.direction == USB_DIRECTION_IN);
+            (ep->base.transfer_type == USB_TRANSFER_CONTROL ||
+            ep->base.direction == USB_DIRECTION_IN);
 }
 
 void hc_ring_ep_doorbell(xhci_endpoint_t *ep, uint32_t stream_id)
 {
-        xhci_device_t * const dev = xhci_ep_to_dev(ep);
-        xhci_hc_t * const hc = bus_to_hc(dev->base.bus);
+        xhci_device_t *const dev = xhci_ep_to_dev(ep);
+        xhci_hc_t *const hc = bus_to_hc(dev->base.bus);
         const uint8_t dci = endpoint_dci(ep);
         const uint32_t target = (stream_id << 16) | (dci & 0x1ff);
@@ -786 +786 @@
 {
         errno_t err;
-        xhci_hc_t * const hc = bus_to_hc(dev->base.bus);
+        xhci_hc_t *const hc = bus_to_hc(dev->base.bus);
 
         /* Prepare memory for the context */
@@ -821 +821 @@
 {
         errno_t err;
-        xhci_hc_t * const hc = bus_to_hc(dev->base.bus);
+        xhci_hc_t *const hc = bus_to_hc(dev->base.bus);
         xhci_cmd_t cmd;
 
@@ -846 +846 @@
 static errno_t create_configure_ep_input_ctx(xhci_device_t *dev, dma_buffer_t *dma_buf)
 {
-        const xhci_hc_t * hc = bus_to_hc(dev->base.bus);
+        const xhci_hc_t *hc = bus_to_hc(dev->base.bus);
         const errno_t err = dma_buffer_alloc(dma_buf, XHCI_INPUT_CTX_SIZE(hc));
         if (err)
@@ -870 +870 @@
 {
         errno_t err = ENOMEM;
-        xhci_hc_t * const hc = bus_to_hc(dev->base.bus);
+        xhci_hc_t *const hc = bus_to_hc(dev->base.bus);
         xhci_endpoint_t *ep0 = xhci_endpoint_get(dev->base.endpoints[0]);
 
@@ -920 +920 @@
 errno_t hc_configure_device(xhci_device_t *dev)
 {
-        xhci_hc_t * const hc = bus_to_hc(dev->base.bus);
+        xhci_hc_t *const hc = bus_to_hc(dev->base.bus);
         xhci_cmd_t cmd;
 
@@ -945 +945 @@
 errno_t hc_deconfigure_device(xhci_device_t *dev)
 {
-        xhci_hc_t * const hc = bus_to_hc(dev->base.bus);
+        xhci_hc_t *const hc = bus_to_hc(dev->base.bus);
         xhci_cmd_t cmd;
         errno_t err;
@@ -972 +972 @@
 errno_t hc_add_endpoint(xhci_endpoint_t *ep)
 {
-        xhci_device_t * const dev = xhci_ep_to_dev(ep);
+        xhci_device_t *const dev = xhci_ep_to_dev(ep);
         const unsigned dci = endpoint_dci(ep);
         xhci_cmd_t cmd;
@@ -984 +984 @@
         xhci_input_ctx_t *ictx = ictx_dma_buf.virt;
 
-        xhci_hc_t * const hc = bus_to_hc(dev->base.bus);
+        xhci_hc_t *const hc = bus_to_hc(dev->base.bus);
         XHCI_INPUT_CTRL_CTX_ADD_SET(*XHCI_GET_CTRL_CTX(ictx, hc), dci);
 
@@ -1007 +1007 @@
 errno_t hc_drop_endpoint(xhci_endpoint_t *ep)
 {
-        xhci_device_t * const dev = xhci_ep_to_dev(ep);
-        xhci_hc_t * const hc = bus_to_hc(dev->base.bus);
+        xhci_device_t *const dev = xhci_ep_to_dev(ep);
+        xhci_hc_t *const hc = bus_to_hc(dev->base.bus);
         const unsigned dci = endpoint_dci(ep);
         xhci_cmd_t cmd;
@@ -1043 +1043 @@
 errno_t hc_update_endpoint(xhci_endpoint_t *ep)
 {
-        xhci_device_t * const dev = xhci_ep_to_dev(ep);
+        xhci_device_t *const dev = xhci_ep_to_dev(ep);
         const unsigned dci = endpoint_dci(ep);
         xhci_cmd_t cmd;
 
         dma_buffer_t ictx_dma_buf;
-        xhci_hc_t * const hc = bus_to_hc(dev->base.bus);
+        xhci_hc_t *const hc = bus_to_hc(dev->base.bus);
 
         errno_t err = dma_buffer_alloc(&ictx_dma_buf, XHCI_INPUT_CTX_SIZE(hc));
@@ -1078 +1078 @@
 errno_t hc_stop_endpoint(xhci_endpoint_t *ep)
 {
-        xhci_device_t * const dev = xhci_ep_to_dev(ep);
+        xhci_device_t *const dev = xhci_ep_to_dev(ep);
         const unsigned dci = endpoint_dci(ep);
-        xhci_hc_t * const hc = bus_to_hc(dev->base.bus);
+        xhci_hc_t *const hc = bus_to_hc(dev->base.bus);
         xhci_cmd_t cmd;
         errno_t err;
@@ -1104 +1104 @@
 errno_t hc_reset_endpoint(xhci_endpoint_t *ep)
 {
-        xhci_device_t * const dev = xhci_ep_to_dev(ep);
+        xhci_device_t *const dev = xhci_ep_to_dev(ep);
         const unsigned dci = endpoint_dci(ep);
-        xhci_hc_t * const hc = bus_to_hc(dev->base.bus);
+        xhci_hc_t *const hc = bus_to_hc(dev->base.bus);
         xhci_cmd_t cmd;
         errno_t err;
@@ -1126 +1126 @@
 errno_t hc_reset_ring(xhci_endpoint_t *ep, uint32_t stream_id)
 {
-        xhci_device_t * const dev = xhci_ep_to_dev(ep);
+        xhci_device_t *const dev = xhci_ep_to_dev(ep);
         const unsigned dci = endpoint_dci(ep);
         uintptr_t addr;
@@ -1135 +1135 @@
         xhci_trb_ring_reset_dequeue_state(ring, &addr);
 
-        xhci_hc_t * const hc = bus_to_hc(endpoint_get_bus(&ep->base));
+        xhci_hc_t *const hc = bus_to_hc(endpoint_get_bus(&ep->base));
 
         xhci_cmd_init(&cmd, XHCI_CMD_SET_TR_DEQUEUE_POINTER);