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

uspace/drv/bus/usb/ohci/ohci_rh.c

@@ -94 +94 @@
         } else {
                 instance->hub_descriptor.rempow[1] =
-                     ((port_desc >> RHDB_DR_SHIFT) >> 8) & 0xff;
+                    ((port_desc >> RHDB_DR_SHIFT) >> 8) & 0xff;
         }
 
@@ -224 +224 @@
         }
 
-        usb_transfer_batch_t * const batch = ep->active_batch;
+        usb_transfer_batch_t *const batch = ep->active_batch;
         endpoint_deactivate_locked(ep);
         instance->status_change_endpoint = NULL;
@@ -347 +347 @@
         const unsigned feature = uint16_usb2host(setup_packet->value);
         /* Enabled features to clear: see page 269 of USB specs */
-        switch (feature)
-        {
+        switch (feature) {
         case USB_HUB_FEATURE_PORT_POWER:          /*8*/
                 rhda = OHCI_RD(hub->registers->rh_desc_a);
@@ -418 +417 @@
                 /* Ganged power switching, one port powers all */
                 if (!(rhda & RHDA_PSM_FLAG)) {
-                        OHCI_WR(hub->registers->rh_status,RHS_SET_GLOBAL_POWER);
+                        OHCI_WR(hub->registers->rh_status, RHS_SET_GLOBAL_POWER);
                         return EOK;
                 }
@@ -467 +466 @@
         for (unsigned port = 1; port <= hub->port_count; ++port) {
                 /* Write-clean bits are those that indicate change */
-                if (OHCI_RD(hub->registers->rh_port_status[port - 1])
-                    & RHPS_CHANGE_WC_MASK) {
+                if (OHCI_RD(hub->registers->rh_port_status[port - 1]) &
+                    RHPS_CHANGE_WC_MASK) {
                         mask |= (1 << port);
                 }
@@ -542 +541 @@
 /** Virtual OHCI root hub ops */
 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,
 };