Changeset 73b0773 in mainline

Timestamp:

2017-12-15T23:12:44Z (6 years ago)

Author:

Petr Mánek <petr.manek@…>

Branches:

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

Children:

2bd04b2

Parents:

64d138b

git-author:

Petr Mánek <petr.manek@…> (2017-12-15 23:11:44)

git-committer:

Petr Mánek <petr.manek@…> (2017-12-15 23:12:44)

Message:

usbdiag: simple tmon command matching framework

Location:

uspace/app/tmon

Files:

• Makefile (modified) (1 diff)
• commands.h (added)
• list.c (added)
• main.c (modified) (2 diffs)

uspace/app/tmon/Makefile

@@ -33 +33 @@
 
 SOURCES = \
-        main.c
+        main.c\
+        list.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/app/tmon/main.c

@@ -36 +36 @@
 
 #include <stdio.h>
-#include <loc.h>
-#include <usb/diag/diag.h>
-#include <usb/diag/iface.h>
-#include <devman.h>
-#include <errno.h>
+#include "commands.h"
 
 #define NAME "tmon"
@@ -49 +45 @@
 }
 
-static void print_list_item(service_id_t svc)
-{
-        int rc;
-        devman_handle_t diag_handle = 0;
+typedef struct {
+        const char *name;
+        int (*action)(int, char **);
+} usb_diag_cmd_t;
 
-        if ((rc = devman_fun_sid_to_handle(svc, &diag_handle))) {
-                printf(NAME ": Error resolving handle of device with SID %ld, skipping.\n", svc);
-                return;
+static usb_diag_cmd_t commands[] = {
+        {
+                .name = "list",
+                .action = tmon_list,
+        },
+        {
+                .name = NULL
         }
-}
-
-static int print_list()
-{
-        category_id_t diag_cat;
-        service_id_t *svcs;
-        size_t count;
-        int rc;
-
-        if ((rc = loc_category_get_id(USB_DIAG_CATEGORY, &diag_cat, 0))) {
-                printf(NAME ": Error resolving category '%s'", USB_DIAG_CATEGORY);
-                return 1;
-        }
-
-        if ((rc = loc_category_get_svcs(diag_cat, &svcs, &count))) {
-                printf(NAME ": Error getting list of host controllers.\n");
-                return 1;
-        }
-
-        for (unsigned i = 0; i < count; ++i) {
-                print_list_item(svcs[i]);
-        }
-
-        free(svcs);
-        return 0;
-}
+};
 
 int main(int argc, char *argv[])
 {
-        if (argc <= 1) {
+        // Find a command to execute.
+        usb_diag_cmd_t *cmd = NULL;
+        for (int i = 0; argc > 1 && commands[i].name; ++i) {
+                if (str_cmp(argv[1], commands[i].name) == 0) {
+                        cmd = commands + i;
+                        break;
+                }
+        }
+
+        if (!cmd) {
                 print_usage(argv[0]);
                 return -1;
         }
 
-        return print_list();
+        return cmd->action(argc - 2, argv + 2);
 }