Changeset 3bacee1 in mainline for uspace/drv/bus/usb/uhci/hc.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/uhci/hc.c (modified) (15 diffs)

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

@@ -142 +142 @@
         memcpy(code->cmds, uhci_irq_commands, sizeof(uhci_irq_commands));
         uhci_regs_t *registers = (uhci_regs_t *) RNGABSPTR(regs);
-        code->cmds[0].addr = (void*)&registers->usbsts;
-        code->cmds[3].addr = (void*)&registers->usbsts;
+        code->cmds[0].addr = (void *)&registers->usbsts;
+        code->cmds[3].addr = (void *)&registers->usbsts;
 
         usb_log_debug("I/O regs at %p (size %zu), IRQ %d.",
@@ -215 +215 @@
         if (hw_res->io_ranges.count != 1 ||
             hw_res->io_ranges.ranges[0].size < sizeof(uhci_regs_t))
-            return EINVAL;
+                return EINVAL;
 
         instance->hw_failures = 0;
@@ -224 +224 @@
         if (ret != EOK) {
                 usb_log_error("Failed to gain access to registers: %s.",
-                    str_error(ret));
+                    str_error(ret));
                 return ret;
         }
@@ -285 +285 @@
         /* Reset hc, all states and counters. Hope that hw is not broken */
         pio_write_16(&registers->usbcmd, UHCI_CMD_HCRESET);
-        do { async_usleep(10); }
-        while ((pio_read_16(&registers->usbcmd) & UHCI_CMD_HCRESET) != 0);
+        do {
+                async_usleep(10);
+        } while ((pio_read_16(&registers->usbcmd) & UHCI_CMD_HCRESET) != 0);
 
         /* Set frame to exactly 1ms */
@@ -331 +332 @@
 static errno_t endpoint_register(endpoint_t *ep)
 {
-        hc_t * const hc = bus_to_hc(endpoint_get_bus(ep));
+        hc_t *const hc = bus_to_hc(endpoint_get_bus(ep));
 
         const errno_t err = usb2_bus_endpoint_register(&hc->bus_helper, ep);
@@ -353 +354 @@
 static void endpoint_unregister(endpoint_t *ep)
 {
-        hc_t * const hc = bus_to_hc(endpoint_get_bus(ep));
+        hc_t *const hc = bus_to_hc(endpoint_get_bus(ep));
         usb2_bus_endpoint_unregister(&hc->bus_helper, ep);
 
@@ -390 +391 @@
         }
 
-        uhci_transfer_batch_t * const batch =
-                uhci_transfer_batch_get(ep->active_batch);
+        uhci_transfer_batch_t *const batch =
+            uhci_transfer_batch_get(ep->active_batch);
 
         /* Remove the batch from the schedule to stop it from being finished. */
@@ -412 +413 @@
 static int device_enumerate(device_t *dev)
 {
-        hc_t * const hc = bus_to_hc(dev->bus);
+        hc_t *const hc = bus_to_hc(dev->bus);
         return usb2_bus_device_enumerate(&hc->bus_helper, dev);
 }
@@ -418 +419 @@
 static void device_gone(device_t *dev)
 {
-        hc_t * const hc = bus_to_hc(dev->bus);
+        hc_t *const hc = bus_to_hc(dev->bus);
         usb2_bus_device_gone(&hc->bus_helper, dev);
 }
@@ -482 +483 @@
         /* Set all frames to point to the first queue head */
         const uint32_t queue = LINK_POINTER_QH(
-                addr_to_phys(instance->transfers_interrupt.queue_head));
+            addr_to_phys(instance->transfers_interrupt.queue_head));
 
         for (unsigned i = 0; i < UHCI_FRAME_LIST_COUNT; ++i) {
@@ -524 +525 @@
         /* Connect lists into one schedule */
         transfer_list_set_next(&instance->transfers_control_full,
-                &instance->transfers_bulk_full);
+            &instance->transfers_bulk_full);
         transfer_list_set_next(&instance->transfers_control_slow,
-                &instance->transfers_control_full);
+            &instance->transfers_control_full);
         transfer_list_set_next(&instance->transfers_interrupt,
-                &instance->transfers_control_slow);
+            &instance->transfers_control_slow);
 
         /*FSBR, This feature is not needed (adds no benefit) and is supposedly
@@ -539 +540 @@
         /* Assign pointers to be used during scheduling */
         instance->transfers[USB_SPEED_FULL][USB_TRANSFER_INTERRUPT] =
-          &instance->transfers_interrupt;
+            &instance->transfers_interrupt;
         instance->transfers[USB_SPEED_LOW][USB_TRANSFER_INTERRUPT] =
-          &instance->transfers_interrupt;
+            &instance->transfers_interrupt;
         instance->transfers[USB_SPEED_FULL][USB_TRANSFER_CONTROL] =
-          &instance->transfers_control_full;
+            &instance->transfers_control_full;
         instance->transfers[USB_SPEED_LOW][USB_TRANSFER_CONTROL] =
-          &instance->transfers_control_slow;
+            &instance->transfers_control_slow;
         instance->transfers[USB_SPEED_FULL][USB_TRANSFER_BULK] =
-          &instance->transfers_bulk_full;
+            &instance->transfers_bulk_full;
 
         return EOK;
@@ -582 +583 @@
                 return uhci_rh_schedule(&hc->rh, batch);
 
-        transfer_list_t * const list =
+        transfer_list_t *const list =
             hc->transfers[ep->device->speed][ep->transfer_type];
 
@@ -629 +630 @@
                 int frnum = pio_read_16(&instance->registers->frnum) & 0x3ff;
 
-                uintptr_t expected_pa = instance->frame_list[frnum]
-                    & LINK_POINTER_ADDRESS_MASK;
+                uintptr_t expected_pa = instance->frame_list[frnum] &
+                    LINK_POINTER_ADDRESS_MASK;
                 uintptr_t real_pa = addr_to_phys(QH(interrupt));
                 if (expected_pa != real_pa) {
@@ -653 +654 @@
                 expected_pa = QH(control_full)->next & LINK_POINTER_ADDRESS_MASK;
                 real_pa = addr_to_phys(QH(bulk_full));
-                if (expected_pa != real_pa ) {
+                if (expected_pa != real_pa) {
                         usb_log_debug("Bulk QH: %p vs. %p.",
                             (void *) expected_pa, (void *) real_pa);