summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Schwebel <r.schwebel@pengutronix.de>2005-03-16 15:30:02 +0000
committerRobert Schwebel <r.schwebel@pengutronix.de>2005-03-16 15:30:02 +0000
commit3d84d6d6313abd8ff0e6b047497f154640d25534 (patch)
treeb16553411b1617bf778029546e17fb0532375882
parent498067014b3aa5b2eb0f2824a0da2d191c3eb19f (diff)
downloadcanutils-3d84d6d6313abd8ff0e6b047497f154640d25534.tar.gz
update
git-svn-id: https://iocaste.extern.pengutronix.de/svn/canutils/trunks/canutils-1.0-trunks@9 5fd5a299-6ef2-0310-aa18-8b01d7c39d8c
-rw-r--r--canconfig.814
-rw-r--r--candump.c2
2 files changed, 2 insertions, 14 deletions
diff --git a/canconfig.8 b/canconfig.8
index df6765a..c02247a 100644
--- a/canconfig.8
+++ b/canconfig.8
@@ -10,22 +10,10 @@ canconfig \- configure a CAN bus interface
.br
.B "canconfig <interface> state"
.SH DESCRIPTION
-.B canconfig
-
-is used to configure the kernel-resident CAN (Controller Area Network)
+canconfig is used to configure the kernel-resident CAN (Controller Area Network)
interfaces. As CAN cards are network devices the basic configuration
options can be done with ifconfig.
-
-usage:
- canconfig <dev> baudrate { BR | BTR }
- BR := { 10 | 20 | 50 | 100 | 125 | 250 | 500 | 800 | 1000 }
- BTR := btr <btr0> [ <btr1> [ <btr2> ] ]
- canconfig <dev> mode MODE
- MODE := { start }
- canconfig <dev> state
-r
-
.SH ARGUMENTS
.TP
.B interface
diff --git a/candump.c b/candump.c
index d159ee8..7547207 100644
--- a/candump.c
+++ b/candump.c
@@ -20,7 +20,7 @@ static int running = 1;
void print_usage(char *prg)
{
- fprintf(stderr, "Usage: %s [can-interface]\n", prg);
+ fprintf(stderr, "Usage: %s [can-interface] [Options]\n", prg);
fprintf(stderr, "Options: -f <family> (default PF_CAN = %d)\n", PF_CAN);
fprintf(stderr, " -t <type> (default SOCK_RAW = %d)\n", SOCK_RAW);
fprintf(stderr, " -p <proto> (default CAN_PROTO_RAW = %d)\n", CAN_PROTO_RAW);