Commit Graph

980 Commits (ac0059db128ace46e74629d15100ea8519c0f080)

Author SHA1 Message Date
Oliver Hartkopp 84d3294132 isotp: support Linux 5.18 features
- update isotp.h include file
- update maximum PDU (buffer) size to 64kByte buffer
- support setting of N_As (frame_txtime) to zero

Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
2022-03-12 18:09:48 +01:00
Oliver Hartkopp 5e0895981b candump: fix accidentally disabled traffic timeout feature
With the option '-T <msecs>' candump terminates after getting no CAN traffic
for a specific time. With the introduction of epoll_wait() this feature
has been accidentally disabled.

This patch adds an extra check to detect the timeout again.

Fixes: 639498bc80 ("candump: use epoll_wait() instead of select()")
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
2022-03-07 10:32:41 +01:00
Oliver Hartkopp ad250a68dc candump: add option to define individual filename for logfile
Link: https://github.com/linux-can/can-utils/pull/345
Suggested-by: https://github.com/xR3b0rn
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
2022-02-16 11:46:46 +01:00
Marc Kleine-Budde ec6a573de1
Merge pull request #342 from hartkopp/isotpsend
isotpsend: add new options to generate PDU traffic load
2022-02-10 09:29:19 +01:00
Oliver Hartkopp acec220189 isotpsend: add new options to generate PDU traffic load
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
2022-02-09 18:34:09 +01:00
Marc Kleine-Budde b38d2639ba
Merge pull request #341 from marckleinebudde/mcp251xfd-dump
mcp251xfd-dump: add dump for IOCON register
2022-02-09 08:36:25 +01:00
Marc Kleine-Budde 0ccc3fed91 mcp251xfd-dump: add dump for IOCON register 2022-02-09 08:29:53 +01:00
Marc Kleine-Budde 9f9f2ff721
Merge pull request #340 from marckleinebudde/fix-typo
cansniffer: main(): fix typo comand -> command
2022-02-01 16:14:22 +01:00
Marc Kleine-Budde 00fbc5d536 cansniffer: main(): fix typo comand -> command
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2022-02-01 16:13:20 +01:00
Marc Kleine-Budde 2758f8eb62
Merge pull request #339 from jaiqc/master
closes #master: Fixed typo error in isodump
2022-02-01 16:07:52 +01:00
Jayachandran Dharuman 2ac24b86fd closes #master: Fixed typo erros in slcan and testj1939 2022-02-01 19:55:27 +05:30
Jayachandran Dharuman a4d2ee75bc closes #master: Fixed typo error in isodump 2022-02-01 19:38:41 +05:30
Marc Kleine-Budde 4984eb702e
Merge pull request #333 from marckleinebudde/bittiming-canfd-support
can-calc-bit-timing: add CAN-FD support
2022-01-27 16:06:40 +01:00
Marc Kleine-Budde 4bd649d73a
Merge pull request #336 from weidmueller/feature/fix-poll-function-calls
Fix error detection of poll function calls
2022-01-27 16:05:50 +01:00
Stefan Herbrechtsmeier 25de6276e8 j1939cat: fix error detection of poll function call
The poll function return -1 on error and set errno to indicate the
error.

Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>
2022-01-27 15:53:10 +01:00
Stefan Herbrechtsmeier 7af4264a13 cansequence: exit program with failure in case of poll timeout
The poll function returns 0 to indicate a call timed out.

Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>
2022-01-27 15:53:10 +01:00
Stefan Herbrechtsmeier 3342eb42e7 cangen: Do not treat -EINTR as error 2022-01-27 15:53:10 +01:00
Stefan Herbrechtsmeier c142ca63c9 cangen: exit program with failure in case of poll timeout
The poll function returns 0 to indicate a call timed out.

Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>
2022-01-27 14:31:37 +01:00
Marc Kleine-Budde 4858b2b307
Merge pull request #334 from hartkopp/cansniffer-fd
cansniffer: add CAN FD support
2022-01-22 17:11:08 +01:00
Oliver Hartkopp 8ffcc187e9 cansniffer: make ASCII output switchable in CAN FD mode
In CAN FD mode the length of the output line becomes very long.
Therefore disable the ASCII output in CAN FD mode by default but
make it switchable with a new '@' command in interactive input mode.

Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
2022-01-22 14:51:20 +01:00
Oliver Hartkopp c3129b678a cansniffer: add CAN FD support
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
2022-01-22 14:48:14 +01:00
Oliver Hartkopp 540dcaa821 cansniffer: convert to struct canfd_frame for FD support
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
2022-01-22 13:50:03 +01:00
Oliver Hartkopp fb186ed6c8 cansniffer: add error handling for read/write of sniffsets
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
2022-01-22 13:49:23 +01:00
Marc Kleine-Budde 66631a3e23 can-calc-bit-timing: add more bittiming constants and sort them
Import all bit timing constants from the kernel (v5.16-rc1) and sort
them by the occurrence in drivers/net/can/Makefile.

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2022-01-19 21:59:58 +01:00
Marc Kleine-Budde e7b5920b10 can-calc-bit-timing: beautify btr register printing
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2022-01-19 21:39:30 +01:00
Marc Kleine-Budde 2636640aa7 can-calc-bit-timing: import bit timing calculation algorithm from v3.18
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2022-01-19 21:39:30 +01:00
Marc Kleine-Budde f42e968bcf can-calc-bit-timing: add support for additional bit timing calculation algorithms
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2022-01-19 21:39:30 +01:00
Marc Kleine-Budde f9c9f6841b can-calc-bit-timing: document kernel commit of current bit timing calculation algorithm
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2022-01-19 07:21:38 +01:00
Marc Kleine-Budde 8d01589500 can-calc-bit-timing: move struct definitions
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2022-01-19 07:21:38 +01:00
Marc Kleine-Budde 046d9f88ee can-calc-bit-timing: add option to specify explicit data bit timing 2022-01-19 07:21:38 +01:00
Marc Kleine-Budde 36d76ba07a can-calc-bit-timing: add support for calculation of CAN-FD bit timings
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2022-01-19 07:21:38 +01:00
Marc Kleine-Budde 04123b3b36 can-calc-bit-timing: print_bittiming(): skip bit timing without ref clock
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2022-01-19 07:21:38 +01:00
Marc Kleine-Budde 2829512f9b can-calc-bit-timing: add nop printf_btr
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2022-01-16 12:25:01 +01:00
Marc Kleine-Budde 7ec433f6a6 can-calc-bit-timing: prepare for different can_bittiming (i.e. CAN-FD)
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2022-01-16 12:24:42 +01:00
Marc Kleine-Budde 7bc81678bb can-calc-bit-timing: rename rate -> bitrate
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2022-01-16 12:24:42 +01:00
Marc Kleine-Budde 927f70e588 can-calc-bit-timing: rename spt -> sample_point
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2022-01-16 12:24:42 +01:00
Marc Kleine-Budde 9b63929974 can-calc-bit-timing: mark several structs and members as const
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2022-01-16 12:24:04 +01:00
Marc Kleine-Budde 258ea5a9ba can-calc-bit-timing: fix whitespace
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2022-01-15 15:10:19 +01:00
Marc Kleine-Budde 4c07a11f81
Merge pull request #331 from marckleinebudde/fix-typo
libj1939.h: fix typo
2022-01-03 10:58:52 +01:00
Marc Kleine-Budde 3394e1fa18 libj1939.h: fix typo
Fixes: e370ad5256 ("testj1939: fix 64-bit types for some platforms")
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2022-01-03 10:58:05 +01:00
Marc Kleine-Budde 9e5b6266b1
Merge pull request #330 from marckleinebudde/fix-types
testj1939: fix 64-bit types for some platforms
2022-01-03 10:47:39 +01:00
Rosen Penev e370ad5256 testj1939: fix 64-bit types for some platforms
Revert commit that introduced PRIx64 to print an __u64, and added
define to get the same types on all platforms.

With __SANE_USERSPACE_TYPES__ the Linux headers use an unsigned long
long for __u64 on all platforms, especially MIPS64.

Fixes: eb9cfac954 ("use PRIx64")
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2022-01-03 10:44:29 +01:00
Marc Kleine-Budde fd1d61490c
Merge pull request #328 from marckleinebudde/fix-musl
CMakeLists: unconditionally define _GNU_SOURCE
2021-12-30 13:00:59 +01:00
Marc Kleine-Budde da642181a9 CMakeLists: unconditionally define _GNU_SOURCE
This fixes compilation on musl libc.

Link: https://github.com/linux-can/can-utils/pull/326
Reported-by: Rosen Penev <rosenp@gmail.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2021-12-30 12:57:12 +01:00
Marc Kleine-Budde 6bd7ced052
Merge pull request #325 from neheb/patch-1
mcp251xfd: add missing libgen.h header
2021-12-16 10:05:09 +01:00
Marc Kleine-Budde 9ca68a12c7
Merge pull request #327 from neheb/patch-3
use PRIx64
2021-12-16 10:04:04 +01:00
Rosen Penev eb9cfac954
use PRIx64
This is the proper specifier for uint64_t.
2021-12-15 18:08:13 -08:00
Rosen Penev 7dd714907b
mcp251xfd: add missing libgen.h header
Needed for the basename() function under musl.
2021-12-15 18:00:39 -08:00
Oliver Hartkopp a705182b28 candump: trivial typo exchange sentence point with closing bracket
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
2021-11-28 20:14:43 +01:00
Oliver Hartkopp 0d84033fa4 canplayer: introduce option to limit the number of processed frames
Analogue to the '-n <count>' option to limit the number of processed CAN
frames in candump and cangen this option makes sense in canplayer too.

Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
2021-10-30 13:02:42 +02:00