sven/can-utils
1
0
Fork 0
mirror of https://github.com/linux-can/can-utils.git synced 2026-09-22 16:09:52 +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
canlogserver.c
+5 -4
View File
@@ -192,7 +192,7 @@ int main(int argc, char **argv)
struct can_filter rfilter;
struct canfd_frame frame;
const int canfd_on = 1;
int nbytes, i, j, maxdlen;
int nbytes, i, j;
struct ifreq ifr;
struct timeval tv;
int port = DEFPORT;
@@ -400,10 +400,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;
@@ -417,7 +418,7 @@ int main(int argc, char **argv)
sprintf(temp, "(%llu.%06llu) %*s ",
(unsigned long long)tv.tv_sec, (unsigned long long)tv.tv_usec, max_devname_len, devname[idx]);
sprint_canframe(temp+strlen(temp), &frame, 0, maxdlen);
sprint_canframe(temp+strlen(temp), &frame, 0);
strcat(temp, "\n");
if (write(accsocket, temp, strlen(temp)) < 0) {