candump: Enable HW timestamping before using it

[can-utils.git] / slcan_attach.c

diff --git a/slcan_attach.c b/slcan_attach.c
index 147ec6b0b795b54d4fc17e47c47c3d2e040fc36b..40bddc8c290be1b6c84dd3a995b20f8fe232a266 100644 (file)
--- a/slcan_attach.c
+++ b/slcan_attach.c
@@ -1,7 +1,3 @@
-/*
- *  $Id$
- */
-
 /*
  * slcan_attach.c - userspace tool for serial line CAN interface driver SLCAN
  *
@@ -41,7 +37,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
  *
- * Send feedback to <socketcan-users@lists.berlios.de>
+ * Send feedback to <linux-can@vger.kernel.org>
  *
  */
 
@@ -51,23 +47,27 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <getopt.h>
+#include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <net/if.h>
-
-#define LDISC_N_SLCAN 17 /* default slcan line discipline since Kernel 2.6.25 */
+#include <termios.h>
+#include <linux/tty.h>
+#include <linux/sockios.h>
 
 void print_usage(char *prg)
 {
        fprintf(stderr, "\nUsage: %s [options] tty\n\n", prg);
        fprintf(stderr, "Options: -o         (send open command 'O\\r')\n");
+       fprintf(stderr, "         -l         (send listen only command 'L\\r', overrides -o)\n");
        fprintf(stderr, "         -c         (send close command 'C\\r')\n");
+       fprintf(stderr, "         -f         (read status flags with 'F\\r' to reset error states)\n");
        fprintf(stderr, "         -s <speed> (set CAN speed 0..8)\n");
        fprintf(stderr, "         -b <btr>   (set bit time register value)\n");
        fprintf(stderr, "         -d         (only detach line discipline)\n");
        fprintf(stderr, "         -w         (attach - wait for keypess - detach)\n");
        fprintf(stderr, "         -n <name>  (assign created netdevice name)\n");
        fprintf(stderr, "\nExamples:\n");
-       fprintf(stderr, "slcan_attach -w -o -s6 -c /dev/ttyS1\n");
+       fprintf(stderr, "slcan_attach -w -o -f -s6 -c /dev/ttyS1\n");
        fprintf(stderr, "slcan_attach /dev/ttyS1\n");
        fprintf(stderr, "slcan_attach -d /dev/ttyS1\n");
        fprintf(stderr, "slcan_attach -w -n can15 /dev/ttyS1\n");
@@ -78,11 +78,13 @@ void print_usage(char *prg)
 int main(int argc, char **argv)
 {
        int fd;
-       int ldisc = LDISC_N_SLCAN;
+       int ldisc = N_SLCAN;
        int detach = 0;
        int waitkey = 0;
        int send_open = 0;
+       int send_listen = 0;
        int send_close = 0;
+       int send_read_status_flags = 0;
        char *speed = NULL;
        char *btr = NULL;
        char buf[IFNAMSIZ+1];
@@ -90,12 +92,8 @@ int main(int argc, char **argv)
        char *name = NULL;
        int opt;
 
-       while ((opt = getopt(argc, argv, "l:dwocs:b:n:?")) != -1) {
+       while ((opt = getopt(argc, argv, "ldwocfs:b:n:?")) != -1) {
                switch (opt) {
-               case 'l':
-                       fprintf(stderr, "Ignored option '-l'\n");
-                       break;
-
                case 'd':
                        detach = 1;
                        break;
@@ -108,10 +106,18 @@ int main(int argc, char **argv)
                        send_open = 1;
                        break;
 
+               case 'l':
+                       send_listen = 1;
+                       break;
+
                case 'c':
                        send_close = 1;
                        break;
 
+               case 'f':
+                       send_read_status_flags = 1;
+                       break;
+
                case 's':
                        speed = optarg;
                        if (strlen(speed) > 1)
@@ -159,7 +165,15 @@ int main(int argc, char **argv)
                        write(fd, buf, strlen(buf));
                }
 
-               if (send_open) {
+               if (send_read_status_flags) {
+                       sprintf(buf, "F\r");
+                       write(fd, buf, strlen(buf));
+               }
+
+               if (send_listen) {
+                       sprintf(buf, "L\r");
+                       write(fd, buf, strlen(buf));
+               } else if (send_open) {
                        sprintf(buf, "O\r");
                        write(fd, buf, strlen(buf));
                }