Commit 1c0f241b authored by Henrik Brix Andersen's avatar Henrik Brix Andersen Committed by Anas Nashif
Browse files

tests: drivers: can: api: restore default bitrates 

Restore the default CAN bitrates after having tested setting bitrate and
timing. This ensures the arbitration phase bitrate is proportional to the
data phase bitrate, allowing CAN FD transmission tests to complete.

Fixes: #73723

Signed-off-by: default avatarHenrik Brix Andersen <hebad@vestas.com>
parent 88f30f3f

tests/drivers/can/api/src/canfd.c

+6 −0
Changes for tests/drivers/can/api/src/canfd.c: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -388,6 +388,9 @@ ZTEST_USER(canfd, test_set_timing_data_min) 
	err = can_set_timing_data(can_dev, can_get_timing_data_min(can_dev));

	zassert_equal(err, 0, "failed to set minimum timing data parameters (err %d)", err);



	err = can_set_bitrate_data(can_dev, CONFIG_CAN_DEFAULT_BITRATE_DATA);

	zassert_equal(err, 0, "failed to restore default data bitrate");



	err = can_start(can_dev);

	zassert_equal(err, 0, "failed to start CAN controller (err %d)", err);

}
@@ -435,6 +438,9 @@ ZTEST_USER(canfd, test_set_timing_data_max) 
	err = can_set_timing_data(can_dev, can_get_timing_data_max(can_dev));

	zassert_equal(err, 0, "failed to set maximum timing data parameters (err %d)", err);



	err = can_set_bitrate_data(can_dev, CONFIG_CAN_DEFAULT_BITRATE_DATA);

	zassert_equal(err, 0, "failed to restore default data bitrate");



	err = can_start(can_dev);

	zassert_equal(err, 0, "failed to start CAN controller (err %d)", err);

}

tests/drivers/can/api/src/classic.c

+14 −2
Changes for tests/drivers/can/api/src/classic.c: 14 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -529,6 +529,9 @@ ZTEST_USER(can_classic, test_set_bitrate) 
	err = can_set_bitrate(can_dev, TEST_BITRATE_1);

	zassert_equal(err, 0, "failed to set bitrate");



	err = can_set_bitrate(can_dev, CONFIG_CAN_DEFAULT_BITRATE);

	zassert_equal(err, 0, "failed to restore default bitrate");



	err = can_start(can_dev);

	zassert_equal(err, 0, "failed to start CAN controller (err %d)", err);

}
@@ -546,6 +549,9 @@ ZTEST_USER(can_classic, test_set_timing_min) 
	err = can_set_timing(can_dev, can_get_timing_min(can_dev));

	zassert_equal(err, 0, "failed to set minimum timing parameters (err %d)", err);



	err = can_set_bitrate(can_dev, CONFIG_CAN_DEFAULT_BITRATE);

	zassert_equal(err, 0, "failed to restore default bitrate");



	err = can_start(can_dev);

	zassert_equal(err, 0, "failed to start CAN controller (err %d)", err);

}
@@ -563,6 +569,9 @@ ZTEST_USER(can_classic, test_set_timing_max) 
	err = can_set_timing(can_dev, can_get_timing_max(can_dev));

	zassert_equal(err, 0, "failed to set maximum timing parameters (err %d)", err);



	err = can_set_bitrate(can_dev, CONFIG_CAN_DEFAULT_BITRATE);

	zassert_equal(err, 0, "failed to restore default bitrate");



	err = can_start(can_dev);

	zassert_equal(err, 0, "failed to start CAN controller (err %d)", err);

}
@@ -1180,10 +1189,13 @@ ZTEST_USER(can_classic, test_filters_preserved_through_bitrate_change) 
	zassert_equal(state, CAN_STATE_STOPPED, "CAN controller not stopped");



	err = can_set_bitrate(can_dev, TEST_BITRATE_2);

	zassert_equal(err, 0, "failed to set bitrate");

	zassert_equal(err, 0, "failed to set bitrate 2");



	err = can_set_bitrate(can_dev, TEST_BITRATE_1);

	zassert_equal(err, 0, "failed to set bitrate");

	zassert_equal(err, 0, "failed to set bitrate 1");



	err = can_set_bitrate(can_dev, CONFIG_CAN_DEFAULT_BITRATE);

	zassert_equal(err, 0, "failed to restore default bitrate");



	err = can_start(can_dev);

	zassert_equal(err, 0, "failed to start CAN controller (err %d)", err);

CRA Git | Maintained and supported by SUSTech CRA and CCSE