Commit Graph
100 Commits
Author SHA1 Message Date
Marc Kleine-Budde 97bfb2960a build-systems: remove autotools and Android.mk
Remove autotools and Android.mk support. This clauses less friction
when adding new tools.

Link: https://github.com/linux-can/can-utils/issues/526
2024-05-29 21:03:17 +02:00
Marc Kleine-Budde 4597b054e2 github-actions: add cross-compiling 2024-05-29 21:03:16 +02:00
Marc Kleine-Budde bc88e89caf github-actions: replace autotools by cmake 2024-05-29 21:02:59 +02:00
Marc Kleine-Budde db2fe6a605 travis.yml: remove
Travis is not used anymore.
2024-05-29 14:38:19 +02:00
Marc Kleine-BuddeandGitHub bfcf548f97 Merge pull request #542 from marckleinebudde/fix-compiler-errors
Fix compiler errors
2024-05-29 14:37:21 +02:00
Marc Kleine-Budde 1405a90e8b j1939spy: main(): fix shift-count-overflow error
Fix the following error, by converting recvflags into a 64 bit type.

| /home/j1939spy.c: In function 'main':
| /home/j1939spy.c:248:36: error: left shift count >= width of type [-Werror=shift-count-overflow]
|   248 |                 if (recvflags & (1 << SCM_TIMESTAMP)) {
|       |                                    ^~
2024-05-29 14:30:05 +02:00
Marc Kleine-Budde e0bb44c908 isobusfs_cmn: isobusfs_print_timestamp(): always use 64-bit for time stamp formatting
Using C99 `unsigned long long` to format `struct timeval`'s `tv_sec`
and `tv_usec`, fix incorrect print under some 32bit platform which
using time64.
2024-05-29 14:27:34 +02:00
Marc Kleine-BuddeandGitHub c468568f1e Merge pull request #540 from olerem/isobusfs_cmn_warning
isobusfs: address snprintf truncation warning with explicit limits
2024-05-29 11:17:57 +02:00
Marc Kleine-BuddeandGitHub a7ff280c62 Merge pull request #537 from marckleinebudde/bcmserver-fix-warning-better
bcmserver: use pragma to silence unknown pragma option
2024-05-28 12:12:17 +02:00
Marc Kleine-Budde c98e25334b bcmserver: use pragma to silence unknown pragma option
Silence the following warning by switching it of via a pragma.

| bcmserver.c: In function 'main':
| bcmserver.c:159:32: warning: unknown option after '#pragma GCC diagnostic' kind [-Wpragmas]
|   159 | #pragma GCC diagnostic ignored "-Wgnu-variable-sized-type-not-at-end"
|       |                                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2024-05-28 12:03:15 +02:00
Marc Kleine-BuddeandGitHub c2e40edd24 Merge pull request #517 from marckleinebudde/bcmserver-fix-warning
bcmserver: use pragma to silence gnu-variable-sized-type-not-at-end warning
2024-05-28 11:39:43 +02:00
Marc Kleine-BuddeandGitHub f12a59d780 Merge pull request #534 from yegorich/cmake-format
CMake: resolve linting issues
2024-05-27 12:26:59 +02:00
Marc Kleine-BuddeandGitHub 465ee7c203 Merge pull request #533 from yegorich/editorconfig
Add configuration file for EditorConfig
2024-05-26 22:29:27 +02:00
Marc Kleine-Budde e865e54490 bcmserver: use pragma to silence gnu-variable-sized-type-not-at-end warning
Silence the following warning by switching it of via a pragma.

| bcmserver.c:159:23: warning: field 'msg_head' with variable sized
| type 'struct bcm_msg_head' not at the end of a struct or class is a
| GNU extension [-Wgnu-variable-sized-type-not-at-end]
|            struct bcm_msg_head msg_head;
|                                ^
2024-05-26 16:57:25 +02:00
Marc Kleine-Budde 4d16dc867d bcmserver: remove trailing whitespace 2024-05-26 16:57:25 +02:00
Marc Kleine-BuddeandGitHub 6c893e5c4f Merge pull request #531 from yegorich/ignore-tags
Ignore ctags generated tags file
2024-05-26 16:26:08 +02:00
Marc Kleine-BuddeandGitHub 7b6daa3aca Merge pull request #532 from yegorich/cmake-fixes
Cmake fixes
2024-05-26 16:23:31 +02:00
Marc Kleine-BuddeandGitHub b76bb3f66c Merge pull request #530 from olerem/isobusfs-fixes
Isobusfs fixes
2024-05-25 19:23:53 +02:00
Marc Kleine-BuddeandGitHub d05810f5fe Merge pull request #522 from SECloudUNIMORE/pr-usage
Refactor the help/usage message for canplayer
2024-05-15 15:26:36 +02:00
Marc Kleine-BuddeandGitHub 185c14f464 Merge pull request #519 from marckleinebudde/can-calc-bit-timing-fix-option-parsing
can-calc-bit-timing: in case of invalid option exit with error
2024-05-07 15:34:31 +02:00
Marc Kleine-Budde 4a9c00539b can-calc-bit-timing: in case of invalid option exit with error
Link: https://github.com/linux-can/can-utils/issues/518
Reported-by: https://github.com/EnricoMontecaggi
Fixes: f4a9e5b57d ("can-calc-bit-timing.c: Reformat help/usage output to be compatible with help2man.")
2024-05-07 15:21:39 +02:00
Marc Kleine-BuddeandGitHub 30a46d72bd Merge pull request #510 from olerem/clang-fixes
isobusfs: fix clang warnings
2024-03-22 11:09:11 +01:00
Marc Kleine-BuddeandGitHub bbd48cb150 Merge pull request #509 from marckleinebudde/mcp251xfd-regmap-fix-compiler-warning
mcp251xfd-regmap: do_mcp251xfd_regmap_read(): fix compiler warning in a more straight forward way
2024-03-19 13:05:06 +01:00
Marc Kleine-Budde 95f12594a6 mcp251xfd-regmap: do_mcp251xfd_regmap_read(): fix compiler warning in a more straight forward way
Link: https://github.com/linux-can/can-utils/commit/d294cd928c363965e989863be99d30b50bb07d9f#r139957294
Suggested-by: Oliver Hartkopp <socketcan@hartkopp.net>
2024-03-19 13:01:46 +01:00
Marc Kleine-BuddeandGitHub 8c94f3f72a Merge pull request #508 from marckleinebudde/mcp251xfd-regmap-fix-compiler-warning
mcp251xfd-regmap: fix compiler warning
2024-03-19 11:45:32 +01:00
Marc Kleine-Budde d294cd928c mcp251xfd-regmap: fix compiler warning
Fix the following compiler warning:

| mcp251xfd/mcp251xfd-regmap.c:38:4: warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result]
|                         fscanf(reg_file, "%*[^\n]\n");
|                         ^~~~~~ ~~~~~~~~~~~~~~~~~~~~~

Reported-by: https://github.com/Chaitanya84
Link: https://github.com/linux-can/can-utils/pull/506
2024-03-19 09:30:59 +01:00
Marc Kleine-BuddeandGitHub c6f4cbcaa7 Merge pull request #501 from gyatskov/master
Fix musl armv7 build: Include time.h in isobusfs_{cmn_dh,srv_cm}
2024-02-20 11:29:34 +01:00
Marc Kleine-BuddeandGitHub 68e0827fad Merge pull request #500 from marckleinebudde/isobus
isobus: clean up build system integration, fix cmake
2024-02-19 10:17:52 +01:00
Marc Kleine-Budde 50e3d46b8b cmake: fix build of isobusfs tools
Reported-by: https://github.com/pschichtel
Link: https://github.com/linux-can/can-utils/issues/497
Fixes: 42edaeaf52 ("Implement ISOBUS File Server (FS) Interface as a Personal Project")
2024-02-19 09:45:30 +01:00
Marc Kleine-BuddeandGitHub 53ea0d0218 Merge pull request #499 from marckleinebudde/cleanups
Cleanups
2024-02-19 09:44:58 +01:00
Marc Kleine-Budde d4712c6c55 GNUmakefile: isobus: include scripts in tarball
Fixes: 42edaeaf52 ("Implement ISOBUS File Server (FS) Interface as a Personal Project")
2024-02-19 09:44:32 +01:00
Marc Kleine-Budde 8bdcccf1a1 GNumakefile: isobus: don't link against libj1939
Fixes: 42edaeaf52 ("Implement ISOBUS File Server (FS) Interface as a Personal Project")
2024-02-19 09:44:32 +01:00
Marc Kleine-Budde eb0e0a30d4 makefile: isobus: remove dependencies to libj1939.h
Fixes: 42edaeaf52 ("Implement ISOBUS File Server (FS) Interface as a Personal Project")
2024-02-19 09:44:32 +01:00
Marc Kleine-Budde f5670b41d9 makefile: isobus: don't link against libj1939 2024-02-19 09:44:32 +01:00
Marc Kleine-Budde 9e57777ecd gitignore: ignore isobusfs dirstamp
Fixes: 42edaeaf52 ("Implement ISOBUS File Server (FS) Interface as a Personal Project")
2024-02-19 09:39:39 +01:00
Marc Kleine-Budde f5ba001bc9 gitignore: sort alphabetically
Fixes: 9c38c16437 ("can-calc-bit-timing: move into subdir")
2024-02-19 09:39:21 +01:00
Marc Kleine-Budde e4ba924b21 slcanpty: print_usage(): factor out help text into separate function
...and use single fprintf() call only.
2024-02-19 08:46:31 +01:00
Marc Kleine-Budde 7683efab41 slcanpty: convert towards kernel coding style 2024-02-19 08:45:55 +01:00
Marc Kleine-Budde 4c2f81f790 Makefile: sort alphabetically
Fixes: a9260eab76 ("Makefile: fix isobusfs tools build")
2024-02-19 08:43:36 +01:00
Marc Kleine-BuddeandGitHub 1a2992e15c Merge pull request #496 from marckleinebudde/isobus
isobusfs_cmn: isobusfs_get_timeout_ms(): fix print on 32 bit archs
2024-02-13 16:15:38 +01:00
Marc Kleine-Budde 7c56863047 isobusfs_cmn: isobusfs_get_timeout_ms(): fix print on 32 bit archs
Fixes the following warning:

| isobusfs/isobusfs_cmn.c: In function 'isobusfs_get_timeout_ms':
| isobusfs/isobusfs_cmn.c:140:51: warning: format '%ld' expects argument of type 'long int', but argument 2 has type 'int64_t' {aka 'long long int'} [-Wformat=]
|   140 |                         warn("timeout too long: %ld ms", time_diff);
|       |                                                 ~~^      ~~~~~~~~~
|       |                                                   |      |
|       |                                                   |      int64_t {aka long long int}
|       |                                                   long int
|       |                                                 %lld
2024-02-13 14:08:27 +01:00
Marc Kleine-BuddeandGitHub e547c3241e Merge pull request #495 from olerem/isobusfs-license
isobusfs: change license to LGPL-2.0-or-later
2024-02-09 11:25:24 +01:00
Marc Kleine-BuddeandGitHub 8a2619c68d Merge pull request #487 from olerem/isobusfs
Implement ISOBUS File Server (FS) Interface as a Personal Project
2024-02-02 16:04:03 +01:00
Marc Kleine-BuddeandGitHub 186bd96717 Merge pull request #493 from marckleinebudde/canfdtest
canfdtest: with -vvv verbosity also print the MSG_DONTROUTE and MSG_CONFIRM flags
2024-01-17 11:16:27 +01:00
Marc Kleine-Budde 18f710efb9 canfdtest: with -vvv verbosity also print the MSG_DONTROUTE and MSG_CONFIRM flags 2024-01-17 10:13:32 +01:00
Marc Kleine-BuddeandGitHub 3f78f77e60 Merge pull request #492 from marckleinebudde/canfdtest
canfdtest: add support for loopback testing
2024-01-17 09:37:42 +01:00
Marc Kleine-Budde fc2aad8704 canfdtest: add support for loopback testing 2024-01-17 09:31:40 +01:00
Marc Kleine-BuddeandGitHub 78aeedf5fe Merge pull request #491 from marckleinebudde/canfdtest
canfdtest: fix detection of own frames
2024-01-17 09:00:12 +01:00
Marc Kleine-Budde 655b0633e5 canfdtest: fix detection of own frames
Use the correct flag MSG_CONFIRM to detect frames generated on this
socket.

Fixes: c35ed80b3d ("canfdtest: use struct msghdr::msg_flags to detect own frames")
2024-01-17 08:51:22 +01:00
Marc Kleine-BuddeandGitHub 8ab42e4309 Merge pull request #488 from marckleinebudde/canfdtest
canfdtest: fix filter for extended frames and some cleanups
2024-01-16 17:25:21 +01:00
Marc Kleine-Budde 046b9d3b8f canfdtest: use can0 per default 2024-01-14 15:16:16 +01:00
Marc Kleine-BuddeandGitHub 5ba9daf7ed Merge pull request #489 from marckleinebudde/cansend
cansend: coding style cleanups
2024-01-14 15:08:42 +01:00
Marc Kleine-Budde 50b66ca403 cansend: usage(): use a single call to fprintf()
This makes the printed text in the code easier to read.
2024-01-14 15:00:18 +01:00
Marc Kleine-Budde 82be1b348b cansend: convert towards kernel coding style 2024-01-14 15:00:18 +01:00
Marc Kleine-Budde 2b07d15264 canfdtest: normalize_canid(): introduce and make use of it 2024-01-14 14:51:27 +01:00
Marc Kleine-Budde c35ed80b3d canfdtest: use struct msghdr::msg_flags to detect own frames
...instead of relying on the can_id_ping.
2024-01-14 14:50:52 +01:00
Marc Kleine-Budde f110bf4cde canfdtest: can_echo_gen(): use modulo instead of if to handle wrap arounds 2023-12-24 13:44:13 +01:00
Marc Kleine-Budde 7bb00837d0 canfdtest: can_echo_gen(): introduce struct canfd_frame *tx_frame; 2023-12-24 13:44:13 +01:00
Marc Kleine-Budde 874b0d9fae canfdtest: can_echo_gen(): decrease scope of struct canfd_frame rx_frame 2023-12-24 13:44:13 +01:00
Marc Kleine-Budde 104072f038 canfdtest: make use of bool 2023-12-24 13:44:13 +01:00
Marc Kleine-Budde 146fd949c9 canfdtest: don't initialize global variables to 0 2023-12-24 13:44:13 +01:00
Marc Kleine-Budde 0be95b5318 canfdtest: fix filter for extended CAN frames
Fixes: 8e66a0bae3 ("canfdtest: Add extended frame format support")
Cc: RICCIARDI-Adrien <adrien.ricciardi@hotmail.fr>
2023-12-24 13:44:13 +01:00
Marc Kleine-BuddeandGitHub c41f9cb21b Merge pull request #486 from taotieren/cmake
update CMakeLists.txt
2023-12-24 12:49:02 +01:00
Marc Kleine-BuddeandGitHub 31432ae9ce Merge pull request #480 from marckleinebudde/cansequence
cansequence: add missing "--strict" to long_options
2023-12-11 09:42:50 +01:00
Marc Kleine-BuddeandGitHub 04f1514810 Merge pull request #481 from marckleinebudde/can-calc-bittiming
can-calc-bit-timing: add rockchip_canfd
2023-12-11 09:42:36 +01:00
Marc Kleine-BuddeandGitHub 76002c0892 Merge pull request #482 from marckleinebudde/codingstyle
Codingstyle
2023-12-11 09:41:45 +01:00
Marc Kleine-Budde d1e9d9765a can-calc-bit-timing: add rockchip_canfd 2023-12-11 09:37:33 +01:00
Marc Kleine-Budde f73ad6a613 cangen: convert towards kernel coding style 2023-12-11 09:37:09 +01:00
Marc Kleine-Budde 697901f9ef candump: convert towards kernel coding style 2023-12-11 09:37:09 +01:00
Marc Kleine-Budde fe6ee6d33f cansend: convert towards kernel coding style 2023-12-11 09:37:09 +01:00
Marc Kleine-Budde 493c74815f canfdtest: convert towards kernel coding style 2023-12-11 09:37:09 +01:00
Marc Kleine-Budde ef6c39ebd6 cansequence: add missing "--strict" to long_options
Fixes: 642190647e ("cansequence: add option to ignore classical CAN frames")
2023-12-05 10:38:23 +01:00
Marc Kleine-BuddeandGitHub 88f0c75334 Merge pull request #476 from marckleinebudde/cansequence
cansequence: cleanups and add support for CAN-FD
2023-11-29 18:35:43 +01:00
Marc Kleine-Budde 642190647e cansequence: add option to ignore classical CAN frames 2023-11-29 18:28:32 +01:00
Marc Kleine-Budde bd835f2ca2 cansequence: add support to send and receive CAN-FD 2023-11-29 18:24:19 +01:00
Marc Kleine-Budde 6695f6f557 cansequence: print_usage(): clarify help for -e, --extended option 2023-11-29 18:24:19 +01:00
Marc Kleine-Budde 92a99c33ad cansequence: print_usage(): convert tabs to spaces in help text 2023-11-29 18:24:19 +01:00
Marc Kleine-Budde 0b0bce87c4 cansequence: also show help for option "-?"
This avoids the "invalid option" error message in the auto generated
man pages.

| DESCRIPTION
|       ./cansequence: invalid option -- '?'
2023-11-29 18:24:19 +01:00
Marc Kleine-Budde e8a808e2ab cansequence: convert extended, receive from int -> bool 2023-11-29 18:24:19 +01:00
Marc Kleine-Budde 5c433340c3 cansequence: convert towards kernel coding style 2023-11-29 17:23:00 +01:00
Marc Kleine-BuddeandGitHub 39f6d37e47 Merge pull request #475 from marckleinebudde/can-calc-bit-timing
can-calc-bit-timing: add verbose mode to print bit timing limits
2023-11-29 12:02:42 +01:00
Marc Kleine-Budde 85da9de8d8 can-calc-bit-timing: add verbose mode to print bit timing limits
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2023-11-29 11:39:56 +01:00
Marc Kleine-BuddeandGitHub 2abf88cee4 Merge pull request #473 from tisyang/master
timestamp formatting: always use 64-bit for timesstamp formatting.
2023-11-28 08:47:45 +01:00
Marc Kleine-BuddeandGitHub 97c8ccdbbf Merge pull request #472 from marckleinebudde/cansequence
cansequence: print counter received data as hex
2023-11-24 08:17:49 +01:00
Marc Kleine-Budde 5e3397ee71 cansequence: print counter received data as hex
In the CAN universe, most data is displayed in hex. Change the verbose
output to hex, to ease debugging.
2023-11-24 08:04:55 +01:00
Marc Kleine-BuddeandGitHub 41ea759237 Merge pull request #468 from marckleinebudde/j1939spy
J1939spy: remove verbose option
2023-10-17 10:13:34 +02:00
Marc Kleine-Budde 574df84a5d j1939spy: remove verbose option
If j1939spy is started with the verbose option "-v" or "--verbose", it
will print the error "j1939spy: listening: Success" and exit. Remove
this option altogether.

Fixes: c50b5a39de ("can-j1939: add jspy 'sniffer' program")
2023-10-17 09:51:27 +02:00
Marc Kleine-Budde 51ee436e75 j1939spy: convert towards kernel coding style 2023-10-17 09:50:26 +02:00
Marc Kleine-BuddeandGitHub 46fae98b76 Merge pull request #466 from marckleinebudde/fix-canbusload
canbusload: main(): switch from pselect() to select()
2023-10-06 14:23:27 +02:00
Marc Kleine-Budde 8e2caa8f8a canbusload: main(): switch from pselect() to select()
We don't need to block any signals, so a select() is sufficient. This
also fixes the problem that sigmask is uninitialized and may block the
sig ARLM, which make canbusload hang until a CAN frame is recieved.

Closes: https://github.com/linux-can/can-utils/issues/465
2023-10-06 12:32:42 +02:00
Marc Kleine-BuddeandGitHub c5b64802a1 Merge pull request #464 from marckleinebudde/can-calc-bittiming
can-calc-bit-timing: at91_can: add 66 MHz CAN clock for sama5d3
2023-10-05 12:58:34 +02:00
Marc Kleine-Budde 0e428e36a5 can-calc-bit-timing: at91_can: add 66 MHz CAN clock for sama5d3 2023-10-05 12:52:57 +02:00
Marc Kleine-BuddeandGitHub 4b5b524256 Merge pull request #462 from marckleinebudde/lib
lib: coding style cleanups + fix printing of CAN_ERR_CNT
2023-09-27 16:30:18 +02:00
Marc Kleine-Budde 7d59157d4d lib: snprintf_can_error_frame(): don't bail out if CAN_ERR_CNT is set
If CAN_ERR_CNT is set, the snprintf_can_error_frame() bails out, as it
cannot decode CAN_ERR_CNT.

Fixes: 21fb43532e ("lib: snprintf_can_error_frame: print counter errors if CAN_ERR_CNT is set")
2023-09-27 16:26:50 +02:00
Marc Kleine-Budde 0a43e84bcd lib: convert towards kernel coding style 2023-09-27 16:26:50 +02:00
Marc Kleine-BuddeandGitHub 1be7e0e51d Merge pull request #461 from marckleinebudde/canbusload
canbusload: coding style cleanups + use less screen estate in redraw mode
2023-09-27 12:46:15 +02:00
Marc Kleine-Budde 84919edbaa canbusload: redraw mode: use less screen estate
Use less screen estate by not printing unneeded newlines in redraw
mode.
2023-09-27 12:40:38 +02:00
Marc Kleine-Budde 92adbda471 canbusload: convert towards kernel coding style 2023-09-27 12:38:48 +02:00
Marc Kleine-BuddeandGitHub 3490282fc7 Merge pull request #460 from marckleinebudde/can-calc-bittiming-add-tq-help-text
can-calc-bit-timing: print_usage(): add --tq parameter to help text
2023-09-19 11:23:41 +02:00
Marc Kleine-Budde 47472cabc3 can-calc-bit-timing: print_usage(): add --tq parameter to help text
In 913311fc15 ("can-calc-bit-timing: add support to decode user
supplied bit timing parameters") support to decide user supplied bit
timing parameters was added. However, it was forgotten to add --tq to
the help text.

Add help text for the --tq paramter.

Reported-by: https://github.com/EnricoMontecaggi
Closes: https://github.com/linux-can/can-utils/issues/459
Fixes: 913311fc15 ("can-calc-bit-timing: add support to decode user supplied bit timing parameters")
2023-09-19 11:18:16 +02:00