Changeset 7d20461 in mainline

Timestamp:

2013-01-27T12:05:00Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

25effe2

Parents:

7363fc1

Message:

usbinfo: style

File:

• uspace/app/usbinfo/info.c (modified) (1 diff)

uspace/app/usbinfo/info.c

@@ -354 +354 @@
 {
         int rc;
-        uint16_t device_status = 0;
-        uint16_t ctrl_pipe_status = 0;
+        uint16_t status = 0;
 
         /* Device status first. */
         rc = usb_request_get_status(&dev->ctrl_pipe,
-            USB_REQUEST_RECIPIENT_DEVICE, 0,
-            &device_status);
+            USB_REQUEST_RECIPIENT_DEVICE, 0, &status);
         if (rc != EOK) {
                 printf("%sFailed to get device status: %s.\n",
                     get_indent(0), str_error(rc));
-                goto try_ctrl_pipe_status;
-        }
-
-        printf("%sDevice status 0x%04x: power=%s, remote-wakeup=%s.\n",
-            get_indent(0),
-            device_status,
-            device_status & USB_DEVICE_STATUS_SELF_POWERED ? "self" : "bus",
-            device_status & USB_DEVICE_STATUS_REMOTE_WAKEUP ? "yes" : "no");
+        } else {
+                printf("%sDevice status 0x%04x: power=%s, remote-wakeup=%s.\n",
+                    get_indent(0), status,
+                    status & USB_DEVICE_STATUS_SELF_POWERED ? "self" : "bus",
+                    status & USB_DEVICE_STATUS_REMOTE_WAKEUP ? "yes" : "no");
+        }
 
         /* Interface is not interesting, skipping ;-). */
 
         /* Control endpoint zero. */
-try_ctrl_pipe_status:
+        status = 0;
         rc = usb_request_get_status(&dev->ctrl_pipe,
-            USB_REQUEST_RECIPIENT_ENDPOINT, 0,
-            &ctrl_pipe_status);
+            USB_REQUEST_RECIPIENT_ENDPOINT, 0, &status);
         if (rc != EOK) {
                 printf("%sFailed to get control endpoint status: %s.\n",
                     get_indent(0), str_error(rc));
-                goto leave;
-        }
-
-        printf("%sControl endpoint zero status %04X: halted=%s.\n",
-            get_indent(0),
-            ctrl_pipe_status,
-            ctrl_pipe_status & USB_ENDPOINT_STATUS_HALTED ? "yes" : "no");
-
-leave:
-        return;
+        } else {
+                printf("%sControl endpoint zero status %04X: halted=%s.\n",
+                    get_indent(0), status,
+                    status & USB_ENDPOINT_STATUS_HALTED ? "yes" : "no");
+        }
 }