sven/can-utils
1
0
Fork 0
mirror of https://github.com/linux-can/can-utils.git synced 2026-09-22 08:06:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

lib: integrate CAN FD indicator into dual-use struct canfd_frame

Browse Source 
Replace maxdlen parameter and use CANFD_FDF flags instead.

Since the CANFD_FDF flag has been introduced in can.h the struct canfd_frame
can be used for CAN CC and CAN FD frames as a dual-use data structure.

Remove the extra maxdlen parameter in library calls and only use the
CANFD_FDF flag to differentiate the two CAN CC/FD frames.

Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
This commit is contained in:
Oliver Hartkopp
2024-02-24 11:28:35 +01:00
parent c6f4cbcaa7
commit 2522ec127b
8 changed files with 78 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
candump.c
+7 -6
View File
@@ -310,7 +310,7 @@ int main(int argc, char **argv)
struct can_filter *rfilter;
can_err_mask_t err_mask;
struct canfd_frame frame;
int nbytes, i, maxdlen;
int nbytes, i;
struct ifreq ifr;
struct timeval tv, last_tv;
int timeout_ms = -1; /* default to no timeout */
@@ -736,10 +736,11 @@ int main(int argc, char **argv)
return 1;
}
/* mark dual-use struct canfd_frame */
if ((size_t)nbytes == CAN_MTU)
maxdlen = CAN_MAX_DLEN;
frame.flags = 0;
else if ((size_t)nbytes == CANFD_MTU)
maxdlen = CANFD_MAX_DLEN;
frame.flags |= CANFD_FDF;
else {
fprintf(stderr, "read: incomplete CAN frame\n");
return 1;
@@ -803,7 +804,7 @@ int main(int argc, char **argv)
sprint_timestamp(logtimestamp, &tv, &last_tv, ts_buf);
/* log CAN frame with absolute timestamp & device */
sprint_canframe(buf, &frame, 0, maxdlen);
sprint_canframe(buf, &frame, 0);
fprintf(logfile, "%s%*s %s%s\n", ts_buf,
max_devname_len, devname[idx], buf,
extra_info);
@@ -813,7 +814,7 @@ int main(int argc, char **argv)
char buf[CL_CFSZ]; /* max length */
/* print CAN frame in log file style to stdout */
sprint_canframe(buf, &frame, 0, maxdlen);
sprint_canframe(buf, &frame, 0);
print_timestamp(logtimestamp, &tv, &last_tv);
printf("%*s %s%s\n",
@@ -844,7 +845,7 @@ int main(int argc, char **argv)
printf("%s ", (color == 1) ? col_off : "");
fprint_long_canframe(stdout, &frame, NULL, view, maxdlen);
fprint_long_canframe(stdout, &frame, NULL, view);
printf("%s", (color > 1) ? col_off : "");
printf("\n");