include: import kernel header files into tree

[sojka/can-utils.git] / candump.c

diff --git a/candump.c b/candump.c
index 7aeeef576837fe57275f5e4da54e93b78b07c81c..985463bc917b98a046fafdb33822a0c45dbe923e 100644 (file)
--- a/candump.c
+++ b/candump.c
@@ -115,11 +115,13 @@ void print_usage(char *prg)
        fprintf(stderr, "         -s <level>  (silent mode - %d: off (default) %d: animation %d: silent)\n", SILENT_OFF, SILENT_ANI, SILENT_ON);
        fprintf(stderr, "         -b <can>    (bridge mode - send received frames to <can>)\n");
        fprintf(stderr, "         -B <can>    (bridge mode - like '-b' with disabled loopback)\n");
+       fprintf(stderr, "         -u <usecs>  (delay bridge forwarding by <usecs> microseconds)\n");
        fprintf(stderr, "         -l          (log CAN-frames into file. Sets '-s %d' by default)\n", SILENT_ON);
        fprintf(stderr, "         -L          (use log file format on stdout)\n");
        fprintf(stderr, "         -n <count>  (terminate after receiption of <count> CAN frames)\n");
        fprintf(stderr, "         -r <size>   (set socket receive buffer to <size>)\n");
        fprintf(stderr, "         -d          (monitor dropped CAN frames)\n");
+       fprintf(stderr, "         -e          (dump CAN error frames in human-readable format)\n");
        fprintf(stderr, "\n");
        fprintf(stderr, "Up to %d CAN interfaces with optional filter sets can be specified\n", MAXSOCK);
        fprintf(stderr, "on the commandline in the form: <ifname>[,filter]*\n");
@@ -200,6 +202,7 @@ int main(int argc, char **argv)
        fd_set rdfs;
        int s[MAXSOCK];
        int bridge = 0;
+       useconds_t bridge_delay = 0;
        unsigned char timestamp = 0;
        unsigned char dropmonitor = 0;
        unsigned char silent = SILENT_INI;
@@ -233,7 +236,7 @@ int main(int argc, char **argv)
        last_tv.tv_sec  = 0;
        last_tv.tv_usec = 0;
 
-       while ((opt = getopt(argc, argv, "t:ciaSs:b:B:ldLn:r:h?")) != -1) {
+       while ((opt = getopt(argc, argv, "t:ciaSs:b:B:u:ldLn:r:he?")) != -1) {
                switch (opt) {
                case 't':
                        timestamp = optarg[0];
@@ -261,6 +264,10 @@ int main(int argc, char **argv)
                        view |= CANLIB_VIEW_SWAP;
                        break;
 
+               case 'e':
+                       view |= CANLIB_VIEW_ERROR;
+                       break;
+
                case 's':
                        silent = atoi(optarg);
                        if (silent > SILENT_ON) {
@@ -308,6 +315,10 @@ int main(int argc, char **argv)
                        }
                        break;
            
+               case 'u':
+                       bridge_delay = (useconds_t)strtoul(optarg, (char **)NULL, 10);
+                       break;
+
                case 'l':
                        log = 1;
                        break;
@@ -609,6 +620,9 @@ int main(int argc, char **argv)
                                        running = 0;
 
                                if (bridge) {
+                                       if (bridge_delay)
+                                               usleep(bridge_delay);
+
                                        nbytes = write(bridge, &frame, sizeof(struct can_frame));
                                        if (nbytes < 0) {
                                                perror("bridge write");
@@ -707,7 +721,7 @@ int main(int argc, char **argv)
                                                diff.tv_sec--, diff.tv_usec += 1000000;
                                        if (diff.tv_sec < 0)
                                                diff.tv_sec = diff.tv_usec = 0;
-                                       printf("(%ld.%06ld) ", diff.tv_sec, diff.tv_usec);
+                                       printf("(%03ld.%06ld) ", diff.tv_sec, diff.tv_usec);
                                
                                        if (timestamp == 'd')
                                                last_tv = tv; /* update for delta calculation */