Changeset cddcc4a3 in mainline for uspace/app

Timestamp:

2012-08-14T18:16:39Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

669f5cae

Parents:

76d92db1 (diff), 4802dd7 (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

Location:

uspace/app

Files:

• bdsh/cmds/modules/cat/cat.c (modified) (4 diffs)
• sportdmp/sportdmp.c (modified) (2 diffs)
• testwrit/Makefile (moved) (moved from uspace/app/lsusb/Makefile ) (2 diffs)
• testwrit/testwrit.c (added)
• trace/syscalls.c (modified) (1 diff)
• trace/trace.c (modified) (3 diffs)
• usbinfo/Makefile (modified) (1 diff)
• usbinfo/list.c (moved) (moved from uspace/app/lsusb/main.c ) (5 diffs)
• usbinfo/main.c (modified) (7 diffs)
• usbinfo/usbinfo.h (modified) (1 diff)

uspace/app/bdsh/cmds/modules/cat/cat.c

@@ -176 +176 @@
 
         bool reading_stdin = dash_represents_stdin && (str_cmp(fname, "-") == 0);
-
+        
         if (reading_stdin) {
                 fd = fileno(stdin);
                 /* Allow storing the whole UTF-8 character. */
                 blen = STR_BOUNDS(1);
-        } else {
+        } else
                 fd = open(fname, O_RDONLY);
-        }
+        
         if (fd < 0) {
                 printf("Unable to open %s\n", fname);
@@ -222 +222 @@
                         bytes_to_read = 1;
                 } else {
-                        if ((length != CAT_FULL_FILE)
-                            && (length - (off64_t)count <= (off64_t)(blen - copied_bytes))) {
+                        if ((length != CAT_FULL_FILE) &&
+                            (length - (off64_t)count <= (off64_t)(blen - copied_bytes))) {
                                 bytes_to_read = (size_t) (length - count);
                         } else {
@@ -229 +229 @@
                         }
                 }
+                
                 bytes = read(fd, buff + copied_bytes, bytes_to_read);
                 bytes += copied_bytes;
@@ -261 +262 @@
                         reads++;
                 }
-
-                if (reading_stdin) {
+                
+                if (reading_stdin)
                         fflush(stdout);
-                }
         } while (bytes > 0 && !should_quit && (count < length || length == CAT_FULL_FILE));
 

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");
         }
         

uspace/app/testwrit/Makefile

@@ -1 +1 @@
 #
-# Copyright (c) 2011 Vojtech Horky
+# Copyright (c) 2011 Frantisek Princ
 # All rights reserved.
 #
@@ -28 +28 @@
 
 USPACE_PREFIX = ../..
-BINARY = lsusb
-
-LIBS = \
-        $(LIBUSBDEV_PREFIX)/libusbdev.a \
-        $(LIBUSB_PREFIX)/libusb.a \
-        $(LIBDRV_PREFIX)/libdrv.a
-EXTRA_CFLAGS = \
-        -I$(LIBUSB_PREFIX)/include \
-        -I$(LIBUSBDEV_PREFIX)/include \
-        -I$(LIBDRV_PREFIX)/include
+BINARY = testwrit
 
 SOURCES = \
-        main.c
+        testwrit.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/app/trace/syscalls.c

@@ -53 +53 @@
     [SYS_AS_AREA_DESTROY] = { "as_area_destroy",        1,      V_ERRNO },
 
-    [SYS_IPC_CALL_SYNC_FAST] = { "ipc_call_sync_fast",  6,      V_ERRNO },
-    [SYS_IPC_CALL_SYNC_SLOW] = { "ipc_call_sync_slow",  3,      V_ERRNO },
     [SYS_IPC_CALL_ASYNC_FAST] = { "ipc_call_async_fast", 6,     V_HASH },
     [SYS_IPC_CALL_ASYNC_SLOW] = { "ipc_call_async_slow", 2,     V_HASH },

uspace/app/trace/trace.c

@@ -318 +318 @@
 }
 
-static void sc_ipc_call_sync_fast(sysarg_t *sc_args)
-{
-        ipc_call_t question, reply;
-        int rc;
-        int phoneid;
-
-        phoneid = sc_args[0];
-
-        IPC_SET_IMETHOD(question, sc_args[1]);
-        IPC_SET_ARG1(question, sc_args[2]);
-        IPC_SET_ARG2(question, sc_args[3]);
-        IPC_SET_ARG3(question, sc_args[4]);
-        IPC_SET_ARG4(question, 0);
-        IPC_SET_ARG5(question, 0);
-
-        memset(&reply, 0, sizeof(reply));
-        rc = udebug_mem_read(sess, &reply.args, sc_args[5], sizeof(reply.args));
-        if (rc < 0)
-                return;
-        
-        ipcp_call_sync(phoneid, &question, &reply);
-}
-
-static void sc_ipc_call_sync_slow_b(unsigned thread_id, sysarg_t *sc_args)
-{
-        ipc_call_t question;
-        int rc;
-
-        memset(&question, 0, sizeof(question));
-        rc = udebug_mem_read(sess, &question.args, sc_args[1],
-            sizeof(question.args));
-
-        if (rc < 0) {
-                printf("Error: mem_read->%d\n", rc);
-                return;
-        }
-
-        thread_ipc_req[thread_id] = question;
-}
-
-static void sc_ipc_call_sync_slow_e(unsigned thread_id, sysarg_t *sc_args)
-{
-        ipc_call_t reply;
-        int rc;
-
-        memset(&reply, 0, sizeof(reply));
-        rc = udebug_mem_read(sess, &reply.args, sc_args[2],
-            sizeof(reply.args));
-
-        if (rc < 0) {
-                printf("Error: mem_read->%d\n", rc);
-                return;
-        }
-
-        ipcp_call_sync(sc_args[0], &thread_ipc_req[thread_id], &reply);
-}
-
 static void sc_ipc_wait(sysarg_t *sc_args, int sc_rc)
 {
@@ -408 +351 @@
                 print_sc_args(sc_args, syscall_desc[sc_id].n_args);
         }
-
-        switch (sc_id) {
-        case SYS_IPC_CALL_SYNC_SLOW:
-                sc_ipc_call_sync_slow_b(thread_id, sc_args);
-                break;
-        default:
-                break;
-        }
 }
 
@@ -447 +382 @@
         case SYS_IPC_CALL_ASYNC_SLOW:
                 sc_ipc_call_async_slow(sc_args, sc_rc);
-                break;
-        case SYS_IPC_CALL_SYNC_FAST:
-                sc_ipc_call_sync_fast(sc_args);
-                break;
-        case SYS_IPC_CALL_SYNC_SLOW:
-                sc_ipc_call_sync_slow_e(thread_id, sc_args);
                 break;
         case SYS_IPC_WAIT:

uspace/app/usbinfo/Makefile

@@ -47 +47 @@
         hid.c \
         info.c \
+        list.c \
         main.c
 

uspace/app/usbinfo/list.c

@@ -47 +47 @@
 #include <usb/hc.h>
 
-#define NAME "lsusb"
+#include "usbinfo.h"
 
 #define MAX_USB_ADDRESS USB11_ADDRESS_MAX
@@ -90 +90 @@
 }
 
-int main(int argc, char *argv[])
+void list(void)
 {
         category_id_t usbhc_cat;
@@ -102 +102 @@
                 printf(NAME ": Error resolving category '%s'",
                     USB_HC_CATEGORY);
-                return 1;
+                return;
         }
 
@@ -108 +108 @@
         if (rc != EOK) {
                 printf(NAME ": Error getting list of host controllers.\n");
-                return 1;
+                return;
         }
 
@@ -131 +131 @@
 
         free(svcs);
-
-        return 0;
 }
 

uspace/app/usbinfo/main.c

@@ -62 +62 @@
 
         _OPTION("-h --help", "Print this help and exit.");
+        _OPTION("-l --list", "Print a list of host controllers and devices.");
         _OPTION("-i --identification", "Brief device identification.");
         _OPTION("-m --match-ids", "Print match ids generated for the device.");
@@ -82 +83 @@
         {"help", no_argument, NULL, 'h'},
         {"identification", no_argument, NULL, 'i'},
+        {"list", no_argument, NULL, 'l'},
         {"match-ids", no_argument, NULL, 'm'},
         {"descriptor-tree", no_argument, NULL, 't'},
@@ -91 +93 @@
         {0, 0, NULL, 0}
 };
-static const char *short_options = "himtTsSrR";
+static const char *short_options = "hilmtTsSrR";
 
 static usbinfo_action_t actions[] = {
@@ -146 +148 @@
         }
 
+        bool something_active = false;
         /*
          * Process command-line options. They determine what shall be
@@ -156 +159 @@
                 switch (opt) {
                         case -1:
+                                break;
+                        case 'l':
+                                list();
                                 break;
                         case '?':
@@ -168 +174 @@
                                         if (actions[idx].opt == opt) {
                                                 actions[idx].active = true;
+                                                something_active = true;
                                                 break;
                                         }
@@ -178 +185 @@
 
         /* Set the default action. */
-        int idx = 0;
-        bool something_active = false;
-        while (actions[idx].opt != 0) {
-                if (actions[idx].active) {
-                        something_active = true;
-                        break;
-                }
-                idx++;
-        }
         if (!something_active) {
                 actions[0].active = true;

uspace/app/usbinfo/usbinfo.h

@@ -79 +79 @@
     dump_descriptor_in_tree_t, size_t, void *);
 
+void list(void);
 
 void dump_short_device_identification(usbinfo_device_t *);