Changes in / [538bb6b:e18e0d6] in mainline

Location:

uspace

Files:

• app/usbinfo/info.c (modified) (1 diff)
• app/usbinfo/main.c (modified) (3 diffs)
• app/usbinfo/usbinfo.h (modified) (1 diff)
• lib/usb/include/usb/request.h (modified) (1 diff)

uspace/app/usbinfo/info.c

@@ -294 +294 @@
 }
 
-
-void dump_status(usbinfo_device_t *dev)
-{
-        int rc;
-        uint16_t device_status = 0;
-        uint16_t ctrl_pipe_status = 0;
-
-        /* Device status first. */
-        rc = usb_request_get_status(&dev->ctrl_pipe,
-            USB_REQUEST_RECIPIENT_DEVICE, 0,
-            &device_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");
-
-        /* Interface is not interesting, skipping ;-). */
-
-        /* Control endpoint zero. */
-try_ctrl_pipe_status:
-        rc = usb_request_get_status(&dev->ctrl_pipe,
-            USB_REQUEST_RECIPIENT_ENDPOINT, 0,
-            &ctrl_pipe_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;
-}
-
 /** @}
  */

uspace/app/usbinfo/main.c

@@ -136 +136 @@
         _OPTION("-T --descriptor-tree-full", "Print detailed descriptor tree");
         _OPTION("-s --strings", "Try to print all string descriptors.");
-        _OPTION("-S --status", "Get status of the device.");
 
         printf("\n");
@@ -153 +152 @@
         {"descriptor-tree-full", no_argument, NULL, 'T'},
         {"strings", no_argument, NULL, 's'},
-        {"status", no_argument, NULL, 'S'},
         {0, 0, NULL, 0}
 };
-static const char *short_options = "himtTsS";
+static const char *short_options = "himtTs";
 
 static usbinfo_action_t actions[] = {
@@ -182 +180 @@
                 .opt = 's',
                 .action = dump_strings,
-                .active = false
-        },
-        {
-                .opt = 'S',
-                .action = dump_status,
                 .active = false
         },

uspace/app/usbinfo/usbinfo.h

@@ -84 +84 @@
 void dump_descriptor_tree_full(usbinfo_device_t *);
 void dump_strings(usbinfo_device_t *);
-void dump_status(usbinfo_device_t *);
 
 

uspace/lib/usb/include/usb/request.h

@@ -41 +41 @@
 #include <usb/pipes.h>
 #include <usb/descriptor.h>
-
-/** USB device status - device is self powered (opposed to bus powered). */
-#define USB_DEVICE_STATUS_SELF_POWERED ((uint16_t)(1 << 0))
-
-/** USB device status - remote wake-up signaling is enabled. */
-#define USB_DEVICE_STATUS_REMOTE_WAKEUP ((uint16_t)(1 << 1))
-
-/** USB endpoint status - endpoint is halted (stalled). */
-#define USB_ENDPOINT_STATUS_HALTED ((uint16_t)(1 << 0))
 
 /** Standard device request. */