Changeset 3bacee1 in mainline for uspace/drv/bus/usb/uhci

Timestamp:

2018-04-12T16:27:17Z (8 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.

Location:

uspace/drv/bus/usb/uhci

Files:

• hc.c (modified) (15 diffs)
• hw_struct/transfer_descriptor.c (modified) (3 diffs)
• hw_struct/transfer_descriptor.h (modified) (1 diff)
• transfer_list.c (modified) (3 diffs)
• uhci_rh.c (modified) (7 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);

uspace/drv/bus/usb/uhci/hw_struct/transfer_descriptor.c

@@ -72 +72 @@
         assert(instance);
         assert(size < 1024);
-        assert((pid == USB_PID_SETUP) || (pid == USB_PID_IN)
-            || (pid == USB_PID_OUT));
+        assert((pid == USB_PID_SETUP) || (pid == USB_PID_IN) ||
+            (pid == USB_PID_OUT));
 
         const uint32_t next_pa = addr_to_phys(next);
         assert((next_pa & LINK_POINTER_ADDRESS_MASK) == next_pa);
 
-        instance->next = 0
-            | LINK_POINTER_VERTICAL_FLAG
-            | (next_pa ? next_pa : LINK_POINTER_TERMINATE_FLAG);
+        instance->next = 0 |
+            LINK_POINTER_VERTICAL_FLAG |
+            (next_pa ? next_pa : LINK_POINTER_TERMINATE_FLAG);
 
-        instance->status = 0
-            | ((err_count & TD_STATUS_ERROR_COUNT_MASK)
-                << TD_STATUS_ERROR_COUNT_POS)
-            | (low_speed ? TD_STATUS_LOW_SPEED_FLAG : 0)
-            | (iso ? TD_STATUS_ISOCHRONOUS_FLAG : 0)
-            | TD_STATUS_ERROR_ACTIVE;
+        instance->status = 0 |
+            ((err_count & TD_STATUS_ERROR_COUNT_MASK) <<
+            TD_STATUS_ERROR_COUNT_POS) |
+            (low_speed ? TD_STATUS_LOW_SPEED_FLAG : 0) |
+            (iso ? TD_STATUS_ISOCHRONOUS_FLAG : 0) |
+            TD_STATUS_ERROR_ACTIVE;
 
         if (pid == USB_PID_IN && !iso) {
@@ -93 +93 @@
         }
 
-        instance->device = 0
-            | (((size - 1) & TD_DEVICE_MAXLEN_MASK) << TD_DEVICE_MAXLEN_POS)
-            | (toggle ? TD_DEVICE_DATA_TOGGLE_ONE_FLAG : 0)
-            | ((target.address & TD_DEVICE_ADDRESS_MASK)
-                << TD_DEVICE_ADDRESS_POS)
-            | ((target.endpoint & TD_DEVICE_ENDPOINT_MASK)
-                << TD_DEVICE_ENDPOINT_POS)
-            | ((pid & TD_DEVICE_PID_MASK) << TD_DEVICE_PID_POS);
+        instance->device = 0 |
+            (((size - 1) & TD_DEVICE_MAXLEN_MASK) << TD_DEVICE_MAXLEN_POS) |
+            (toggle ? TD_DEVICE_DATA_TOGGLE_ONE_FLAG : 0) |
+            ((target.address & TD_DEVICE_ADDRESS_MASK) <<
+            TD_DEVICE_ADDRESS_POS) |
+            ((target.endpoint & TD_DEVICE_ENDPOINT_MASK) <<
+            TD_DEVICE_ENDPOINT_POS) |
+            ((pid & TD_DEVICE_PID_MASK) << TD_DEVICE_PID_POS);
 
         instance->buffer_ptr = addr_to_phys(buffer);
@@ -175 +175 @@
             (s & TD_STATUS_ERROR_BIT_STUFF) ? " BIT_STUFF," : "",
             (s & TD_STATUS_ERROR_RESERVED) ? " RESERVED," : "",
-            td_act_size(instance)
-        );
+            td_act_size(instance));
 }
 /**

uspace/drv/bus/usb/uhci/hw_struct/transfer_descriptor.h

@@ -129 +129 @@
         const size_t act_size = td_act_size(instance);
         const size_t max_size =
-            ((instance->device >> TD_DEVICE_MAXLEN_POS) + 1)
-            & TD_DEVICE_MAXLEN_MASK;
+            ((instance->device >> TD_DEVICE_MAXLEN_POS) + 1) &
+            TD_DEVICE_MAXLEN_MASK;
         return
             (instance->status | TD_STATUS_SPD_FLAG) && act_size < max_size;

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

@@ -66 +66 @@
         }
         const uint32_t queue_head_pa = addr_to_phys(instance->queue_head);
-        usb_log_debug2("Transfer list %s setup with QH: %p (%#" PRIx32" ).",
+        usb_log_debug2("Transfer list %s setup with QH: %p (%#" PRIx32 " ).",
             name, instance->queue_head, queue_head_pa);
 
@@ -203 +203 @@
         fibril_mutex_lock(&instance->guard);
         while (!list_empty(&instance->batch_list)) {
-                link_t * const current = list_first(&instance->batch_list);
+                link_t *const current = list_first(&instance->batch_list);
                 uhci_transfer_batch_t *batch = uhci_transfer_batch_from_link(current);
                 transfer_list_remove_batch(instance, batch);
@@ -240 +240 @@
                 qpos = "NOT FIRST";
         }
-        assert((prev_qh->next & LINK_POINTER_ADDRESS_MASK)
-            == addr_to_phys(uhci_batch->qh));
+        assert((prev_qh->next & LINK_POINTER_ADDRESS_MASK) ==
+            addr_to_phys(uhci_batch->qh));
         prev_qh->next = uhci_batch->qh->next;
 

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

@@ -107 +107 @@
         do {
                 batch->error = virthub_base_request(&instance->base, batch->target,
-                    batch->dir, (void*) batch->setup.buffer,
+                    batch->dir, (void *) batch->setup.buffer,
                     batch->dma_buffer.virt, batch->size, &batch->transferred_size);
                 if (batch->error == ENAK)
@@ -151 +151 @@
         port_status &= ~STATUS_IN_RESET;
         pio_write_16(port, port_status);
-        while ((port_status = pio_read_16(port)) & STATUS_IN_RESET);
+        while ((port_status = pio_read_16(port)) & STATUS_IN_RESET)
+                ;
         /* PIO delay, should not be longer than 3ms as the device might
          * enter suspend state. */
@@ -201 +202 @@
 
         const uint16_t value = pio_read_16(hub->ports[port]);
-        data[0] = ((value & STATUS_LINE_D_MINUS) ? 1 : 0)
-            | ((value & STATUS_LINE_D_PLUS) ? 2 : 0);
-        RH_DEBUG(hub, port, "Bus state %" PRIx8 "(source %" PRIx16")",
+        data[0] = ((value & STATUS_LINE_D_MINUS) ? 1 : 0) |
+            ((value & STATUS_LINE_D_PLUS) ? 2 : 0);
+        RH_DEBUG(hub, port, "Bus state %" PRIx8 "(source %" PRIx16 ")",
             data[0], value);
         *act_size = 1;
@@ -246 +247 @@
             UHCI2USB(val, STATUS_ENABLED_CHANGED, USB2_HUB_PORT_STATUS_C_ENABLE) |
 //          UHCI2USB(val, STATUS_SUSPEND, USB2_HUB_PORT_STATUS_C_SUSPEND) |
-            (hub->reset_changed[port] ?  USB_HUB_PORT_STATUS_C_RESET : 0)
-        );
+            (hub->reset_changed[port] ?  USB_HUB_PORT_STATUS_C_RESET : 0));
         RH_DEBUG(hub, port, "Port status %" PRIx32 " (source %" PRIx16
             "%s)", uint32_usb2host(status), val,
@@ -413 +413 @@
         const uint8_t status =
             ((((status_a & STATUS_CHANGE_BITS) != 0) || hub->reset_changed[0]) ?
-                0x2 : 0) |
+            0x2 : 0) |
             ((((status_b & STATUS_CHANGE_BITS) != 0) || hub->reset_changed[1]) ?
-                0x4 : 0);
+            0x4 : 0);
         if (status)
                 RH_DEBUG(hub, -1, "Event mask %" PRIx8
@@ -421 +421 @@
                     " (status_b %" PRIx16 "%s)", status,
                     status_a, hub->reset_changed[0] ? "-reset" : "",
-                    status_b, hub->reset_changed[1] ? "-reset" : "" );
+                    status_b, hub->reset_changed[1] ? "-reset" : "");
         ((uint8_t *)buffer)[0] = status;
         *actual_size = 1;
@@ -496 +496 @@
 
 static usbvirt_device_ops_t ops = {
-        .control = control_transfer_handlers,
-        .data_in[HUB_STATUS_CHANGE_PIPE] = req_status_change_handler,
+        .control = control_transfer_handlers,
+        .data_in[HUB_STATUS_CHANGE_PIPE] = req_status_change_handler,
 };