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

canfdtest: normalize_canid(): introduce and make use of it

Browse Source
This commit is contained in:
Marc Kleine-Budde
2024-01-14 14:51:27 +01:00
parent c35ed80b3d
commit 2b07d15264
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
canfdtest.c
+15 -10
View File
@@ -121,6 +121,18 @@ static void print_compare(canid_t exp_id, const uint8_t *exp_data, uint8_t exp_d
print_frame(rec_id, rec_data, rec_dlc, 0); print_frame(rec_id, rec_data, rec_dlc, 0);
} }
static canid_t normalize_canid(canid_t id)
{
if (is_extended_frame_format) {
id &= CAN_EFF_MASK;
id |= CAN_EFF_FLAG;
} else {
id &= CAN_SFF_MASK;
}
return id;
}
static int compare_frame(const struct canfd_frame *exp, const struct canfd_frame *rec, int inc) static int compare_frame(const struct canfd_frame *exp, const struct canfd_frame *rec, int inc)
{ {
int i, err = 0; int i, err = 0;
@@ -277,7 +289,7 @@ static void inc_frame(struct canfd_frame *frame)
if (has_pong_id) if (has_pong_id)
frame->can_id = can_id_pong; frame->can_id = can_id_pong;
else else
frame->can_id++; frame->can_id = normalize_canid(frame->can_id + 1);
for (i = 0; i < frame->len; i++) for (i = 0; i < frame->len; i++)
frame->data[i]++; frame->data[i]++;
@@ -504,15 +516,8 @@ int main(int argc, char *argv[])
} }
} }
if (is_extended_frame_format) { can_id_ping = normalize_canid(can_id_ping);
can_id_ping &= CAN_EFF_MASK; can_id_pong = normalize_canid(can_id_pong);
can_id_ping |= CAN_EFF_FLAG;
can_id_pong &= CAN_EFF_MASK;
can_id_pong |= CAN_EFF_FLAG;
} else {
can_id_ping &= CAN_SFF_MASK;
can_id_pong &= CAN_SFF_MASK;
}
if ((argc - optind) != 1) if ((argc - optind) != 1)
print_usage(basename(argv[0])); print_usage(basename(argv[0]));