From 4b94546cf9f248a60f75e2a9fd7899a6048ffa3d Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Tue, 4 May 2021 11:57:25 +0200 Subject: [PATCH 1/4] canfdtest: print_usage(): sort options alphabetically Signed-off-by: Marc Kleine-Budde --- canfdtest.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/canfdtest.c b/canfdtest.c index 9ee0d3c..2d6a4d1 100644 --- a/canfdtest.c +++ b/canfdtest.c @@ -58,11 +58,11 @@ static void print_usage(char *prg) "Usage: %s [options] \n" "\n" "Options:\n" - " -v (low verbosity)\n" - " -vv (high verbosity)\n" + " -f COUNT (number of frames in flight, default: %d)\n" " -g (generate messages)\n" " -l COUNT (test loop count)\n" - " -f COUNT (number of frames in flight, default: %d)\n" + " -v (low verbosity)\n" + " -vv (high verbosity)\n" "\n" "With the option '-g' CAN messages are generated and checked\n" "on , otherwise all messages received on the\n" From fd6829eb4fc9759d7ce42758854dc5f067d99089 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Tue, 4 May 2021 12:00:39 +0200 Subject: [PATCH 2/4] canfdtest: main(): sort switch/case in cmd line parser alphabetically Signed-off-by: Marc Kleine-Budde --- canfdtest.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/canfdtest.c b/canfdtest.c index 2d6a4d1..e57a975 100644 --- a/canfdtest.c +++ b/canfdtest.c @@ -376,21 +376,22 @@ int main(int argc, char *argv[]) while ((opt = getopt(argc, argv, "f:gl:v?")) != -1) { switch (opt) { - case 'v': - verbose++; - break; case 'f': inflight_count = atoi(optarg); break; - case 'l': - test_loops = atoi(optarg); - break; - case 'g': echo_gen = 1; break; + case 'l': + test_loops = atoi(optarg); + break; + + case 'v': + verbose++; + break; + case '?': default: print_usage(basename(argv[0])); From 70eda640d592be7beb5a1e054630a53b78331ebf Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Thu, 6 May 2021 15:54:39 +0200 Subject: [PATCH 3/4] slcan_attach: remove trailing whitespace Signed-off-by: Marc Kleine-Budde --- slcan_attach.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/slcan_attach.c b/slcan_attach.c index a022252..4e1ce13 100644 --- a/slcan_attach.c +++ b/slcan_attach.c @@ -213,7 +213,7 @@ int main(int argc, char **argv) /* try to rename the created device if requested */ if (name) { int s = socket(PF_INET, SOCK_DGRAM, 0); - + printf("rename netdevice %s to %s ... ", buf, name); if (s < 0) @@ -222,12 +222,12 @@ int main(int argc, char **argv) /* current slcan%d name is still in ifr.ifr_name */ memset (ifr.ifr_newname, 0, sizeof(ifr.ifr_newname)); strncpy (ifr.ifr_newname, name, sizeof(ifr.ifr_newname) - 1); - + if (ioctl(s, SIOCSIFNAME, &ifr) < 0) printf("failed!\n"); else printf("ok.\n"); - + close(s); } } From b88a64e9fc413cf346c5c3e3b93f1a1867453906 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Thu, 6 May 2021 15:54:50 +0200 Subject: [PATCH 4/4] slcan_attach: add bit rate table for -s parameter Reported-by: Chris Fiege Signed-off-by: Marc Kleine-Budde --- slcan_attach.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/slcan_attach.c b/slcan_attach.c index 4e1ce13..dc8e9f2 100644 --- a/slcan_attach.c +++ b/slcan_attach.c @@ -69,6 +69,18 @@ void print_usage(char *prg) fprintf(stderr, " -d (only detach line discipline)\n"); fprintf(stderr, " -w (attach - wait for keypess - detach)\n"); fprintf(stderr, " -n (assign created netdevice name)\n"); + fprintf(stderr, "\n" + " Bitrate\n" + " 0 10 Kbit/s\n" + " 1 20 Kbit/s\n" + " 2 50 Kbit/s\n" + " 3 100 Kbit/s\n" + " 4 125 Kbit/s\n" + " 5 250 Kbit/s\n" + " 6 500 Kbit/s\n" + " 7 800 Kbit/s\n" + " 8 1000 Kbit/s\n" + "\n"); fprintf(stderr, "\nExamples:\n"); fprintf(stderr, "slcan_attach -w -o -f -s6 -c /dev/ttyS1\n\n"); fprintf(stderr, "slcan_attach /dev/ttyS1\n\n");