Changeset ad2a8b1 in mainline

Timestamp:

2017-12-21T09:24:17Z (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:

d37dd3b9

Parents:

e9d600c2

Message:

tmon: refactoring, moved device resolving functions into a separate file

Location:

uspace/app/tmon

Files:

• Makefile (modified) (1 diff)
• test.c (modified) (2 diffs)

uspace/app/tmon/Makefile

@@ -35 +35 @@
         main.c\
         list.c\
-        test.c
+        test.c\
+        resolve.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/app/tmon/test.c

@@ -37 +37 @@
 #include <stdio.h>
 #include <devman.h>
-#include <loc.h>
-#include <errno.h>
 #include <str_error.h>
 #include <usbdiag_iface.h>
 #include "commands.h"
+#include "resolve.h"
 
 #define NAME "tmon"
@@ -49 +48 @@
 #define DEFAULT_SIZE    65432
 
-static int resolve_default_fun(devman_handle_t *fun)
-{
-        category_id_t diag_cat;
-        service_id_t *svcs;
-        size_t count;
-        int rc;
-
-        if ((rc = loc_category_get_id(USBDIAG_CATEGORY, &diag_cat, 0))) {
-                printf(NAME ": Error resolving category '%s'", USBDIAG_CATEGORY);
-                return rc;
-        }
-
-        if ((rc = loc_category_get_svcs(diag_cat, &svcs, &count))) {
-                printf(NAME ": Error getting list of diagnostic devices.\n");
-                return rc;
-        }
-
-        // There must be exactly one diagnostic device for this to work.
-        if (count != 1) {
-                if (count) {
-                        printf(NAME ": Found %ld devices. Please specify which to use.\n", count);
-                } else {
-                        printf(NAME ": No diagnostic devices found.\n");
-                }
-                return ENOENT;
-        }
-
-        if ((rc = devman_fun_sid_to_handle(svcs[0], fun))) {
-                printf(NAME ": Error resolving handle of device with SID %ld.\n", svcs[0]);
-                return rc;
-        }
-
-        return EOK;
-}
-
-static int resolve_named_fun(const char *dev_path, devman_handle_t *fun)
-{
-        int rc;
-        service_id_t svc;
-        if ((rc = loc_service_get_id(dev_path, &svc, IPC_FLAG_BLOCKING))) {
-                printf(NAME ": Error resolving device. %s\n", str_error(rc));
-                return rc;
-        }
-
-        if ((rc = devman_fun_sid_to_handle(svc, fun))) {
-                printf(NAME ": Error resolving handle of device with SID %ld.\n", svc);
-                return rc;
-        }
-
-        return EOK;
-}
-
 static int resolve_and_test(int argc, char *argv[], int (*test)(devman_handle_t, int, size_t)) {
         devman_handle_t fun = -1;
 
         if (argc == 0) {
-                if (resolve_default_fun(&fun))
+                if (tmon_resolve_default(&fun))
                         return 1;
         } else if (argc == 1) {
-                if (resolve_named_fun(argv[0], &fun))
+                if (tmon_resolve_named(argv[0], &fun))
                         return 1;
         } else {