Changeset 338d54a7 in mainline for uspace/drv/bus

Timestamp:

2018-03-10T22:55:07Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

850fd32

Parents:

5ef16903

Message:

Gratuitous nested block makes ccheck sad.

Location:

uspace/drv/bus/usb

Files:

• ohci/ohci_rh.c (modified) (4 diffs)
• xhci/isoch.c (modified) (6 diffs)

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

@@ -343 +343 @@
         ohci_rh_t *hub;
         unsigned port;
+        uint32_t rhda;
         TEST_SIZE_INIT(0, port, hub);
         const unsigned feature = uint16_usb2host(setup_packet->value);
@@ -349 +350 @@
         {
         case USB_HUB_FEATURE_PORT_POWER:          /*8*/
-                {
-                        const uint32_t rhda =
-                            OHCI_RD(hub->registers->rh_desc_a);
-                        /* No power switching */
-                        if (rhda & RHDA_NPS_FLAG)
-                                return ENOTSUP;
-                        /* Ganged power switching, one port powers all */
-                        if (!(rhda & RHDA_PSM_FLAG)) {
-                                OHCI_WR(hub->registers->rh_status,
-                                    RHS_CLEAR_GLOBAL_POWER);
-                                return EOK;
-                        }
-                        OHCI_WR(hub->registers->rh_port_status[port],
-                            RHPS_CLEAR_PORT_POWER);
+                rhda = OHCI_RD(hub->registers->rh_desc_a);
+                /* No power switching */
+                if (rhda & RHDA_NPS_FLAG)
+                        return ENOTSUP;
+                /* Ganged power switching, one port powers all */
+                if (!(rhda & RHDA_PSM_FLAG)) {
+                        OHCI_WR(hub->registers->rh_status,
+                            RHS_CLEAR_GLOBAL_POWER);
                         return EOK;
                 }
-
+                OHCI_WR(hub->registers->rh_port_status[port],
+                    RHPS_CLEAR_PORT_POWER);
+                return EOK;
         case USB2_HUB_FEATURE_PORT_ENABLE:         /*1*/
                 OHCI_WR(hub->registers->rh_port_status[port],
@@ -407 +404 @@
         ohci_rh_t *hub;
         unsigned port;
+        uint32_t rhda;
         TEST_SIZE_INIT(0, port, hub);
         const unsigned feature = uint16_usb2host(setup_packet->value);
@@ -412 +410 @@
         switch (feature) {
         case USB_HUB_FEATURE_PORT_POWER:   /*8*/
-                {
-                        const uint32_t rhda = OHCI_RD(hub->registers->rh_desc_a);
-
-                        /* No power switching */
-                        if (rhda & RHDA_NPS_FLAG)
-                                return EOK;
-
-                        /* Ganged power switching, one port powers all */
-                        if (!(rhda & RHDA_PSM_FLAG)) {
-                                OHCI_WR(hub->registers->rh_status,RHS_SET_GLOBAL_POWER);
-                                return EOK;
-                        }
+                rhda = OHCI_RD(hub->registers->rh_desc_a);
+
+                /* No power switching */
+                if (rhda & RHDA_NPS_FLAG)
+                        return EOK;
+
+                /* Ganged power switching, one port powers all */
+                if (!(rhda & RHDA_PSM_FLAG)) {
+                        OHCI_WR(hub->registers->rh_status,RHS_SET_GLOBAL_POWER);
+                        return EOK;
                 }
                 /* Fall through, for per port power */

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

@@ -310 +310 @@
         while (isoch->transfers[isoch->hw_enqueue].state == ISOCH_FILLED) {
                 xhci_isoch_transfer_t * const it = &isoch->transfers[isoch->hw_enqueue];
+                suseconds_t delay;
 
                 assert(it->state == ISOCH_FILLED);
@@ -317 +318 @@
 
                 switch (wd.position) {
-                case WINDOW_TOO_SOON: {
-                        const suseconds_t delay = wd.offset * 125;
+                case WINDOW_TOO_SOON:
+                        delay = wd.offset * 125;
                         usb_log_debug("[isoch] delaying feeding buffer %zu for %ldus",
                                 it - isoch->transfers, delay);
@@ -324 +325 @@
                             isoch_feed_out_timer, ep);
                         goto out;
-                }
 
                 case WINDOW_INSIDE:
@@ -396 +396 @@
         while (isoch->transfers[isoch->enqueue].state <= ISOCH_FILLED) {
                 xhci_isoch_transfer_t * const it = &isoch->transfers[isoch->enqueue];
+                suseconds_t delay;
 
                 /* IN buffers are "filled" with free space */
@@ -408 +409 @@
 
                 switch (wd.position) {
-                case WINDOW_TOO_SOON: {
+                case WINDOW_TOO_SOON:
                         /* Not allowed to feed yet. Defer to later. */
-                        const suseconds_t delay = wd.offset * 125;
+                        delay = wd.offset * 125;
                         usb_log_debug("[isoch] delaying feeding buffer %zu for %ldus",
                             it - isoch->transfers, delay);
@@ -416 +417 @@
                             isoch_feed_in_timer, ep);
                         goto out;
-                }
-
                 case WINDOW_TOO_LATE:
                         usb_log_debug("[isoch] missed feeding buffer %zu at 0x%llx by"