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

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

@@ -133 +133 @@
 
         ehci_regs_t *registers =
-                (ehci_regs_t *)(RNGABSPTR(regs) + EHCI_RD8(instance->caps->caplength));
+            (ehci_regs_t *)(RNGABSPTR(regs) + EHCI_RD8(instance->caps->caplength));
         code->cmds[0].addr = (void *) &registers->usbsts;
         code->cmds[3].addr = (void *) &registers->usbsts;
@@ -158 +158 @@
         if (hw_res->mem_ranges.count != 1 ||
             hw_res->mem_ranges.ranges[0].size <
-                (sizeof(ehci_caps_regs_t) + sizeof(ehci_regs_t)))
-            return EINVAL;
+            (sizeof(ehci_caps_regs_t) + sizeof(ehci_regs_t)))
+                return EINVAL;
 
         errno_t ret = pio_enable_range(&hw_res->mem_ranges.ranges[0],
@@ -169 +169 @@
         }
 
-        usb_log_info("HC(%p): Device registers at %"PRIx64" (%zuB) accessible.",
+        usb_log_info("HC(%p): Device registers at %" PRIx64 " (%zuB) accessible.",
             instance, hw_res->mem_ranges.ranges[0].address.absolute,
             hw_res->mem_ranges.ranges[0].size);
         instance->registers =
-            (void*)instance->caps + EHCI_RD8(instance->caps->caplength);
+            (void *)instance->caps + EHCI_RD8(instance->caps->caplength);
         usb_log_info("HC(%p): Device control registers at %" PRIx64, instance,
-            hw_res->mem_ranges.ranges[0].address.absolute
-            + EHCI_RD8(instance->caps->caplength));
+            hw_res->mem_ranges.ranges[0].address.absolute +
+            EHCI_RD8(instance->caps->caplength));
 
         list_initialize(&instance->pending_endpoints);
@@ -221 +221 @@
             usb_str_transfer_type_short(ep->transfer_type),
             usb_str_direction(ep->direction));
-        switch (ep->transfer_type)
-        {
+        switch (ep->transfer_type) {
         case USB_TRANSFER_CONTROL:
         case USB_TRANSFER_BULK:
@@ -245 +244 @@
             usb_str_transfer_type_short(ep->transfer_type),
             usb_str_direction(ep->direction));
-        switch (ep->transfer_type)
-        {
+        switch (ep->transfer_type) {
         case USB_TRANSFER_INTERRUPT:
                 endpoint_list_remove_ep(&instance->int_list, ehci_ep);
@@ -305 +303 @@
         }
 
-        endpoint_t * const ep = batch->ep;
-        ehci_endpoint_t * const ehci_ep = ehci_endpoint_get(ep);
+        endpoint_t *const ep = batch->ep;
+        ehci_endpoint_t *const ehci_ep = ehci_endpoint_get(ep);
         ehci_transfer_batch_t *ehci_batch = ehci_transfer_batch_get(batch);
 
@@ -345 +343 @@
         assert(hc);
 
-        usb_log_debug2("HC(%p): Interrupt: %"PRIx32, hc, status);
+        usb_log_debug2("HC(%p): Interrupt: %" PRIx32, hc, status);
         if (status & USB_STS_PORT_CHANGE_FLAG) {
                 ehci_rh_interrupt(&hc->rh);
@@ -361 +359 @@
 
                 usb_log_debug2("HC(%p): Scanning %lu pending endpoints", hc,
-                        list_count(&hc->pending_endpoints));
+                    list_count(&hc->pending_endpoints));
                 list_foreach_safe(hc->pending_endpoints, current, next) {
-                        ehci_endpoint_t *ep
-                                = list_get_instance(current, ehci_endpoint_t, pending_link);
-
-                        ehci_transfer_batch_t *batch
-                                = ehci_transfer_batch_get(ep->base.active_batch);
+                        ehci_endpoint_t *ep =
+                            list_get_instance(current, ehci_endpoint_t, pending_link);
+
+                        ehci_transfer_batch_t *batch =
+                            ehci_transfer_batch_get(ep->base.active_batch);
                         assert(batch);
 
@@ -429 +427 @@
         assert(instance->periodic_list);
         uintptr_t phys_base =
-            addr_to_phys((void*)instance->periodic_list);
+            addr_to_phys((void *)instance->periodic_list);
         assert((phys_base & USB_PERIODIC_LIST_BASE_MASK) == phys_base);
         EHCI_WR(instance->registers->periodiclistbase, phys_base);
@@ -437 +435 @@
 
         /* Enable Async schedule */
-        phys_base = addr_to_phys((void*)instance->async_list.list_head);
+        phys_base = addr_to_phys((void *)instance->async_list.list_head);
         assert((phys_base & USB_ASYNCLIST_MASK) == phys_base);
         EHCI_WR(instance->registers->asynclistaddr, phys_base);
@@ -516 +514 @@
 
         usb_log_debug2("HC(%p): Initializing Periodic list.", instance);
-        for (unsigned i = 0; i < PAGE_SIZE/sizeof(link_pointer_t); ++i)
-        {
+        for (unsigned i = 0; i < PAGE_SIZE / sizeof(link_pointer_t); ++i) {
                 /* Disable everything for now */
                 instance->periodic_list[i] =