Changes in uspace/app/vuhid/main.c [eb34d8e:920d0fc] in mainline

File:

• uspace/app/vuhid/main.c (modified) (6 diffs)

uspace/app/vuhid/main.c

@@ -40 +40 @@
 #include <errno.h>
 #include <str_error.h>
-#include <getopt.h>
 
 #include <usb/usb.h>
@@ -53 +52 @@
 #include "stdreq.h"
 
-#define DEFAULT_CONTROLLER   "/virt/usbhc/virtual"
-
 static usbvirt_control_request_handler_t endpoint_zero_handlers[] = {
         {
-                STD_REQ_IN(USB_REQUEST_RECIPIENT_INTERFACE, USB_DEVREQ_GET_DESCRIPTOR),
+                .req_direction = USB_DIRECTION_IN,
+                .req_type = USB_REQUEST_TYPE_STANDARD,
+                .req_recipient = USB_REQUEST_RECIPIENT_INTERFACE,
+                .request = USB_DEVREQ_GET_DESCRIPTOR,
                 .name = "Get_Descriptor",
                 .callback = req_get_descriptor
         },
         {
-                CLASS_REQ_OUT(USB_REQUEST_RECIPIENT_INTERFACE, USB_HIDREQ_SET_PROTOCOL),
+                .req_direction = USB_DIRECTION_OUT,
+                .req_recipient = USB_REQUEST_RECIPIENT_INTERFACE,
+                .req_type = USB_REQUEST_TYPE_CLASS,
+                .request = USB_HIDREQ_SET_PROTOCOL,
                 .name = "Set_Protocol",
                 .callback = req_set_protocol
         },
         {
-                CLASS_REQ_OUT(USB_REQUEST_RECIPIENT_INTERFACE, USB_HIDREQ_SET_REPORT),
+                .req_direction = USB_DIRECTION_OUT,
+                .req_recipient = USB_REQUEST_RECIPIENT_INTERFACE,
+                .req_type = USB_REQUEST_TYPE_CLASS,
+                .request = USB_HIDREQ_SET_REPORT,
                 .name = "Set_Report",
                 .callback = req_set_report
@@ -145 +151 @@
 
 
-static struct option long_options[] = {
-        {"help", optional_argument, NULL, 'h'},
-        {"controller", required_argument, NULL, 'c' },
-        {"list", no_argument, NULL, 'l' },
-        {0, 0, NULL, 0}
-};
-static const char *short_options = "hc:l";
-
-static void print_help(const char* name, const char* module)
-{
-        if (module == NULL) {
-                /* Default help */
-                printf("Usage: %s [options] device.\n", name);
-                printf("\t-h, --help [device]\n");
-                printf("\t\to With no argument print this help and exit.\n");
-                printf("\t\to With argument print device specific help and exit.\n");
-                printf("\t-l, --list \n\t\tPrint list of available devices.\n");
-                printf("\t-c, --controller \n\t\t"
-                    "Use provided virtual hc instead of default (%s)\n",
-                    DEFAULT_CONTROLLER);
-                return;
-        }
-        printf("HELP for module %s\n", module);
-}
-
-static void print_list(void)
-{
-        printf("Available devices:\n");
-        for (vuhid_interface_t **i = available_hid_interfaces; *i != NULL; ++i)
-        {
-                printf("\t`%s'\t%s\n", (*i)->id, (*i)->name);
-        }
-
-}
-
-static const char *controller = DEFAULT_CONTROLLER;
-
 int main(int argc, char * argv[])
 {
-
-        if (argc == 1) {
-                print_help(*argv, NULL);
-                return 0;
-        }
-
-        int opt = 0;
-        while ((opt = getopt_long(argc, argv, short_options, long_options, NULL)) > 0) {
-                switch (opt)
-                {
-                case 'h':
-                        print_help(*argv, optarg);
-                        return 0;
-                case 'c':
-                        controller = optarg;
-                        break;
-                case 'l':
-                        print_list();
-                        return 0;
-                case -1:
-                default:
-                        break;
-                }
-        }
-
+        int rc;
 
         log_init("vuhid");
@@ -216 +161 @@
 
         /* Determine which interfaces to initialize. */
-        for (int i = optind; i < argc; i++) {
-                int rc = add_interface_by_id(available_hid_interfaces, argv[i],
+        int i;
+        for (i = 1; i < argc; i++) {
+                rc = add_interface_by_id(available_hid_interfaces, argv[i],
                     &hid_dev);
                 if (rc != EOK) {
@@ -227 +173 @@
         }
 
-        for (int i = 0; i < (int) hid_dev.descriptors->configuration->extra_count; i++) {
+        for (i = 0; i < (int) hid_dev.descriptors->configuration->extra_count; i++) {
                 usb_log_debug("Found extra descriptor: %s.\n",
                     usb_debug_str_buffer(
@@ -235 +181 @@
         }
 
-        const int rc = usbvirt_device_plug(&hid_dev, controller);
+        rc = usbvirt_device_plug(&hid_dev, "/virt/usbhc/hc");
         if (rc != EOK) {
-                printf("Unable to start communication with VHCD `%s': %s.\n",
-                    controller, str_error(rc));
+                printf("Unable to start communication with VHCD: %s.\n",
+                    str_error(rc));
                 return rc;
         }
         
-        printf("Connected to VHCD `%s'...\n", controller);
+        printf("Connected to VHCD...\n");
 
         wait_for_interfaces_death(&hid_dev);