Changeset 72cf064 in mainline for uspace/app/sportdmp/sportdmp.c

Timestamp:

2012-08-13T17:17:04Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

33fee91

Parents:

f4a8734 (diff), 4820360 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/app/sportdmp/sportdmp.c (modified) (2 diffs)

uspace/app/sportdmp/sportdmp.c

@@ -37 +37 @@
 static void syntax_print(void)
 {
-        fprintf(stderr, "Usage: sportdmp <baud> <device_service>\n");
+        fprintf(stderr, "Usage: sportdmp [--baud=<baud>] [device_service]\n");
 }
 
 int main(int argc, char **argv)
 {
-        const char* svc_path = "devices/\\hw\\pci0\\00:01.0\\com1\\a";
         sysarg_t baud = 9600;
+        service_id_t svc_id;
         
-        if (argc > 1) {
+        int arg = 1;
+        int rc;
+                
+        if (argc > arg && str_test_prefix(argv[arg], "--baud=")) {
+                size_t arg_offset = str_lsize(argv[arg], 7);
+                char* arg_str = argv[arg] + arg_offset;
+                if (str_length(arg_str) == 0) {
+                        fprintf(stderr, "--baud requires an argument\n");
+                        syntax_print();
+                        return 1;
+                }
                 char *endptr;
-                baud = strtol(argv[1], &endptr, 10);
+                baud = strtol(arg_str, &endptr, 10);
                 if (*endptr != '\0') {
                         fprintf(stderr, "Invalid value for baud\n");
@@ -53 +63 @@
                         return 1;
                 }
+                arg++;
         }
         
-        if (argc > 2) {
-                svc_path = argv[2];
+        if (argc > arg) {
+                rc = loc_service_get_id(argv[arg], &svc_id, 0);
+                if (rc != EOK) {
+                        fprintf(stderr, "Cannot find device service %s\n",
+                            argv[arg]);
+                        return 1;
+                }
+                arg++;
+        }
+        else {
+                category_id_t serial_cat_id;
+                
+                rc = loc_category_get_id("serial", &serial_cat_id, 0);
+                if (rc != EOK) {
+                        fprintf(stderr, "Failed getting id of category "
+                            "'serial'\n");
+                        return 1;
+                }
+                
+                service_id_t *svc_ids;
+                size_t svc_count;
+                
+                rc = loc_category_get_svcs(serial_cat_id, &svc_ids, &svc_count);                if (rc != EOK) {
+                        fprintf(stderr, "Failed getting list of services\n");
+                        return 1;
+                }
+                
+                if (svc_count == 0) {
+                        fprintf(stderr, "No service in category 'serial'\n");
+                        free(svc_ids);
+                        return 1;
+                }
+                
+                svc_id = svc_ids[0];
+                free(svc_ids);
         }
         
-        if (argc > 3) {
+        if (argc > arg) {
+                fprintf(stderr, "Too many arguments\n");
                 syntax_print();
                 return 1;
         }
         
-        service_id_t svc_id;
-        int rc = loc_service_get_id(svc_path, &svc_id, IPC_FLAG_BLOCKING);
-        if (rc != EOK) {
-                fprintf(stderr, "Cannot find device service %s\n", svc_path);
-                return 1;
-        }
         
         async_sess_t *sess = loc_service_connect(EXCHANGE_SERIALIZE, svc_id,
             IPC_FLAG_BLOCKING);
         if (!sess) {
-                fprintf(stderr, "Failed connecting to service %s\n", svc_path);
+                fprintf(stderr, "Failed connecting to service\n");
         }