diff options
| author | Michał Barnaś <mb@semihalf.com> | 2022-08-17 19:09:38 +0200 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-10-10 13:08:23 +0000 |
| commit | 63d448a1ac0d44eec4e1e6d7be9543deb14be0b2 (patch) | |
| tree | c1453e8f6a887a0a11bc360435dccf84c046d66d | |
| parent | 5ae2886e72af61c9ded8a544bdc420b68708ee49 (diff) | |
| download | chrome-ec-63d448a1ac0d44eec4e1e6d7be9543deb14be0b2.tar.gz | |
zephyr: remove the msg NULL parameter in ztest macros
This commit removes the last NULL parameter that was required by
the zassert_* and zassume_* macros.
BRANCH=main
BUG=b:242982518
TEST=run twister
Change-Id: I8970ee0a755e103367c5edcdf0fd469337c66721
Signed-off-by: Michał Barnaś <mb@semihalf.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3838329
Reviewed-by: Keith Short <keithshort@chromium.org>
Code-Coverage: Zoss <zoss-cl-coverage@prod.google.com>
Commit-Queue: Michał Barnaś <barnas@google.com>
Tested-by: Michał Barnaś <barnas@google.com>
64 files changed, 1334 insertions, 1361 deletions
diff --git a/docs/unit_tests.md b/docs/unit_tests.md index e24b6effdf..29311ac346 100644 --- a/docs/unit_tests.md +++ b/docs/unit_tests.md @@ -90,7 +90,7 @@ test_static EC_TEST_RETURN test_my_function(void) bool condition = some_function(); /* Check that the expected condition is correct. */ - zassert_true(condition, NULL); + zassert_true(condition); return EC_SUCCESS; } @@ -113,7 +113,7 @@ test_static EC_TEST_RETURN test_my_function(void) ``` The only difference between those two versions of `test/my_test.c` is the -assertion: `c zassert_true(condition, NULL);` versus `c TEST_EQ(condition, true, +assertion: `c zassert_true(condition);` versus `c TEST_EQ(condition, true, "%d");` ### Specify the test cases to run diff --git a/include/test_util.h b/include/test_util.h index 8a7f29643d..004e8aaf0d 100644 --- a/include/test_util.h +++ b/include/test_util.h @@ -474,19 +474,18 @@ void z_ztest_run_test_suite(const char *name, struct unit_test *suite); * can add the correct format (the zassert_equal_ptr), but others we just * don't know, so I'll just dump out the value in hex. */ -#define zassert(cond, msg, ...) TEST_ASSERT(cond) -#define zassert_unreachable(msg, ...) TEST_ASSERT(0) -#define zassert_true(cond, msg, ...) TEST_ASSERT(cond) -#define zassert_false(cond, msg, ...) TEST_ASSERT(!(cond)) -#define zassert_ok(cond, msg, ...) TEST_ASSERT(!(cond)) -#define zassert_is_null(ptr, msg, ...) TEST_ASSERT((ptr) == NULL) -#define zassert_not_null(ptr, msg, ...) TEST_ASSERT((ptr) != NULL) -#define zassert_equal(a, b, msg, ...) TEST_EQ((a), (b), "0x%x") -#define zassert_not_equal(a, b, msg, ...) TEST_NE((a), (b), "0x%x") -#define zassert_equal_ptr(a, b, msg, ...) \ - TEST_EQ((void *)(a), (void *)(b), "0x%x") -#define zassert_within(a, b, d, msg, ...) TEST_NEAR((a), (b), (d), msg) -#define zassert_mem_equal(buf, exp, size, msg, ...) \ +#define zassert(cond, ...) TEST_ASSERT(cond) +#define zassert_unreachable(...) TEST_ASSERT(0) +#define zassert_true(cond, ...) TEST_ASSERT(cond) +#define zassert_false(cond, ...) TEST_ASSERT(!(cond)) +#define zassert_ok(cond, ...) TEST_ASSERT(!(cond)) +#define zassert_is_null(ptr, ...) TEST_ASSERT((ptr) == NULL) +#define zassert_not_null(ptr, ...) TEST_ASSERT((ptr) != NULL) +#define zassert_equal(a, b, ...) TEST_EQ((a), (b), "0x%x") +#define zassert_not_equal(a, b, ...) TEST_NE((a), (b), "0x%x") +#define zassert_equal_ptr(a, b, ...) TEST_EQ((void *)(a), (void *)(b), "0x%x") +#define zassert_within(a, b, d, ...) TEST_NEAR((a), (b), (d), "%f") +#define zassert_mem_equal(buf, exp, size, ...) \ TEST_ASSERT_ARRAY_EQ(buf, exp, size) #endif /* CONFIG_ZEPHYR */ diff --git a/test/accel_cal.c b/test/accel_cal.c index 840bed00c6..481d0615f2 100644 --- a/test/accel_cal.c +++ b/test/accel_cal.c @@ -50,7 +50,7 @@ DECLARE_EC_TEST(test_calibrated_correctly_with_kasa) accumulate(0.7171f, 0.7171f, 0.7171f, 21.0f); has_bias = accumulate(-0.6971f, -0.6971f, -0.6971f, 21.0f); - zassert_true(has_bias, NULL); + zassert_true(has_bias); zassert_within(cal.bias[X], 0.01f, 0.0001f, "%f", cal.bias[X]); zassert_within(cal.bias[Y], 0.01f, 0.0001f, "%f", cal.bias[Y]); zassert_within(cal.bias[Z], 0.01f, 0.0001f, "%f", cal.bias[Z]); @@ -74,13 +74,13 @@ DECLARE_EC_TEST(test_calibrated_correctly_with_newton) kasa_reset(&kasa); for (i = 0; i < ARRAY_SIZE(data); i += 3) { - zassert_false(has_bias, NULL); + zassert_false(has_bias); kasa_accumulate(&kasa, data[i], data[i + 1], data[i + 2]); has_bias = accumulate(data[i], data[i + 1], data[i + 2], 21.0f); } kasa_compute(&kasa, kasa_bias, &kasa_radius); - zassert_true(has_bias, NULL); + zassert_true(has_bias); /* Check that the bias is right */ zassert_within(cal.bias[X], 0.01f, 0.001f, "%f", cal.bias[X]); zassert_within(cal.bias[Y], 0.01f, 0.001f, "%f", cal.bias[Y]); @@ -110,7 +110,7 @@ DECLARE_EC_TEST(test_temperature_gates) accumulate(0.7171f, 0.7171f, 0.7171f, 21.0f); has_bias = accumulate(-0.6971f, -0.6971f, -0.6971f, 31.0f); - zassert_false(has_bias, NULL); + zassert_false(has_bias); return EC_SUCCESS; } diff --git a/test/base32.c b/test/base32.c index 83a80c1d01..c1ec489ea0 100644 --- a/test/base32.c +++ b/test/base32.c @@ -25,7 +25,7 @@ DECLARE_EC_TEST(test_crc5) seen = 0; for (j = 0; j < 32; j++) seen |= 1 << crc5_sym(j, i); - zassert_equal(seen, 0xffffffff, NULL); + zassert_equal(seen, 0xffffffff); } /* @@ -36,7 +36,7 @@ DECLARE_EC_TEST(test_crc5) seen = 0; for (j = 0; j < 32; j++) seen |= 1 << crc5_sym(i, j); - zassert_equal(seen, 0xffffffff, NULL); + zassert_equal(seen, 0xffffffff); } /* Transposing different symbols generates distinct CRCs */ @@ -49,7 +49,7 @@ DECLARE_EC_TEST(test_crc5) } } } - zassert_equal(errors, 0, NULL); + zassert_equal(errors, 0); return EC_SUCCESS; } @@ -77,8 +77,8 @@ DECLARE_EC_TEST(test_encode) /* Test for enough space; error produces null string */ *enc = 1; - zassert_equal(base32_encode(enc, 3, src1, 15, 0), EC_ERROR_INVAL, NULL); - zassert_equal(*enc, 0, NULL); + zassert_equal(base32_encode(enc, 3, src1, 15, 0), EC_ERROR_INVAL); + zassert_equal(*enc, 0); /* Empty source */ ENCTEST("\x00", 0, 0, ""); @@ -138,7 +138,7 @@ static int dectest(const void *dec, int decbits, int crc_every, const char *enc) int wantbits = decbits > 0 ? decbits : 5 * strlen(enc); int gotbits = base32_decode(dest, destbits, enc, crc_every); - zassert_equal(gotbits, wantbits, NULL); + zassert_equal(gotbits, wantbits); if (gotbits != wantbits) return -1; return cmpbytes(dec, dest, (decbits + 7) / 8, "decode"); @@ -164,7 +164,7 @@ DECLARE_EC_TEST(test_decode) DECTEST("\xff\x00\xff\x00\xff", 40, 0, " 96\tA-R\r8A H9\n"); /* Invalid symbol fails */ - zassert_equal(base32_decode(dec, 16, "AI", 0), -1, NULL); + zassert_equal(base32_decode(dec, 16, "AI", 0), -1); /* If dest buffer is big, use all the source bits */ DECTEST("", 0, 0, ""); @@ -185,14 +185,14 @@ DECLARE_EC_TEST(test_decode) DECTEST("\xff\x00\xff\x00\xff", 40, 8, "96AR8AH9L"); /* CRC requires exact multiple of symbol count */ - zassert_equal(base32_decode(dec, 40, "96ARL8AH9", 4), -1, NULL); + zassert_equal(base32_decode(dec, 40, "96ARL8AH9", 4), -1); /* But what matters is symbol count, not bit count */ DECTEST("\xff\x00\xff\x00\xfe", 39, 4, "96ARU8AH8P"); /* Detect errors in data, CRC, and transposition */ - zassert_equal(base32_decode(dec, 40, "96AQL", 4), -1, NULL); - zassert_equal(base32_decode(dec, 40, "96ARM", 4), -1, NULL); - zassert_equal(base32_decode(dec, 40, "96RAL", 4), -1, NULL); + zassert_equal(base32_decode(dec, 40, "96AQL", 4), -1); + zassert_equal(base32_decode(dec, 40, "96ARM", 4), -1); + zassert_equal(base32_decode(dec, 40, "96RAL", 4), -1); /* Detect error when not enough data is given */ zassert_equal(base32_decode(dec, 40, "AA", 4), -1, NULL); diff --git a/test/cbi.c b/test/cbi.c index ce01545644..0d86965eab 100644 --- a/test/cbi.c +++ b/test/cbi.c @@ -40,7 +40,7 @@ DECLARE_EC_TEST(test_uint8) zassert_equal(cbi_set_board_info(tag, &d8, sizeof(d8)), EC_SUCCESS, NULL); size = 1; - zassert_equal(cbi_get_board_info(tag, &d8, &size), EC_SUCCESS, NULL); + zassert_equal(cbi_get_board_info(tag, &d8, &size), EC_SUCCESS); zassert_equal(d8, 0xa5, "0x%x, 0x%x", d8, 0xa5); zassert_equal(size, 1, "%x, %x", size, 1); @@ -79,7 +79,7 @@ DECLARE_EC_TEST(test_uint32) zassert_equal(cbi_set_board_info(tag, &d8, sizeof(d8)), EC_SUCCESS, NULL); size = 1; - zassert_equal(cbi_get_board_info(tag, &d8, &size), EC_SUCCESS, NULL); + zassert_equal(cbi_get_board_info(tag, &d8, &size), EC_SUCCESS); zassert_equal(d8, 0xa5, "0x%x, 0x%x", d8, 0xa5); zassert_equal(size, 1, "%u, %u", size, 1); @@ -97,8 +97,8 @@ DECLARE_EC_TEST(test_string) zassert_equal(cbi_set_board_info(tag, string, sizeof(string)), EC_SUCCESS, NULL); size = sizeof(buf); - zassert_equal(cbi_get_board_info(tag, buf, &size), EC_SUCCESS, NULL); - zassert_equal(strncmp(buf, string, sizeof(string)), 0, NULL); + zassert_equal(cbi_get_board_info(tag, buf, &size), EC_SUCCESS); + zassert_equal(strncmp(buf, string, sizeof(string)), 0); /* Size contains null byte */ /* This should be zassert_equal, but for EC test fmt is always "0x%x" * which will generate compilation error. @@ -191,16 +191,16 @@ DECLARE_EC_TEST(test_all_tags) count++; /* Read out all */ - zassert_equal(cbi_get_board_version(&d32), EC_SUCCESS, NULL); + zassert_equal(cbi_get_board_version(&d32), EC_SUCCESS); zassert_equal(d32, d8, "0x%x, 0x%x", d32, d8); - zassert_equal(cbi_get_oem_id(&d32), EC_SUCCESS, NULL); + zassert_equal(cbi_get_oem_id(&d32), EC_SUCCESS); zassert_equal(d32, d8, "0x%x, 0x%x", d32, d8); - zassert_equal(cbi_get_sku_id(&d32), EC_SUCCESS, NULL); + zassert_equal(cbi_get_sku_id(&d32), EC_SUCCESS); zassert_equal(d32, d8, "0x%x, 0x%x", d32, d8); size = sizeof(buf); zassert_equal(cbi_get_board_info(CBI_TAG_DRAM_PART_NUM, buf, &size), EC_SUCCESS, NULL); - zassert_equal(strncmp(buf, string, sizeof(string)), 0, NULL); + zassert_equal(strncmp(buf, string, sizeof(string)), 0); /* This should be zassert_equal, but for EC test fmt is always "0x%x" * which will generate compilation error. */ @@ -209,23 +209,23 @@ DECLARE_EC_TEST(test_all_tags) size = sizeof(buf); zassert_equal(cbi_get_board_info(CBI_TAG_OEM_NAME, buf, &size), EC_SUCCESS, NULL); - zassert_equal(strncmp(buf, string, sizeof(string)), 0, NULL); + zassert_equal(strncmp(buf, string, sizeof(string)), 0); /* This should be zassert_equal, but for EC test fmt is always "0x%x" * which will generate compilation error. */ zassert_true((size_t)size - 1 == strlen(buf), "%zu, %zu", (size_t)size - 1, strlen(buf)); - zassert_equal(cbi_get_model_id(&d32), EC_SUCCESS, NULL); + zassert_equal(cbi_get_model_id(&d32), EC_SUCCESS); zassert_equal(d32, d8, "0x%x, 0x%x", d32, d8); - zassert_equal(cbi_get_fw_config(&d32), EC_SUCCESS, NULL); + zassert_equal(cbi_get_fw_config(&d32), EC_SUCCESS); zassert_equal(d32, d8, "0x%x, 0x%x", d32, d8); - zassert_equal(cbi_get_pcb_supplier(&d32), EC_SUCCESS, NULL); + zassert_equal(cbi_get_pcb_supplier(&d32), EC_SUCCESS); zassert_equal(d32, d8, "0x%x, 0x%x", d32, d8); - zassert_equal(cbi_get_ssfc(&d32), EC_SUCCESS, NULL); + zassert_equal(cbi_get_ssfc(&d32), EC_SUCCESS); zassert_equal(d32, d8, "0x%x, 0x%x", d32, d8); - zassert_equal(cbi_get_factory_calibration_data(&d32), EC_SUCCESS, NULL); + zassert_equal(cbi_get_factory_calibration_data(&d32), EC_SUCCESS); zassert_equal(d32, d8, "0x%x, 0x%x", d32, d8); - zassert_equal(cbi_get_rework_id(&d64), EC_SUCCESS, NULL); + zassert_equal(cbi_get_rework_id(&d64), EC_SUCCESS); /* This should be zassert_equal, but for EC test fmt is always "0x%x" * which will generate compilation error. */ @@ -238,7 +238,7 @@ DECLARE_EC_TEST(test_all_tags) /* Write protect */ write_protect_set(1); - zassert_equal(cbi_write(), EC_ERROR_ACCESS_DENIED, NULL); + zassert_equal(cbi_write(), EC_ERROR_ACCESS_DENIED); return EC_SUCCESS; } diff --git a/test/cbi_wp.c b/test/cbi_wp.c index 625447dcb3..705d860eeb 100644 --- a/test/cbi_wp.c +++ b/test/cbi_wp.c @@ -37,11 +37,11 @@ DECLARE_EC_TEST(test_wp) int cbi_wp; cbi_wp = gpio_get_level(GPIO_EC_CBI_WP); - zassert_equal(cbi_wp, 0, NULL); + zassert_equal(cbi_wp, 0); cbi_latch_eeprom_wp(); cbi_wp = gpio_get_level(GPIO_EC_CBI_WP); - zassert_equal(cbi_wp, 1, NULL); + zassert_equal(cbi_wp, 1); return EC_SUCCESS; } diff --git a/zephyr/test/drivers/chargesplash/src/chargesplash.c b/zephyr/test/drivers/chargesplash/src/chargesplash.c index 1b89262ce4..9e5bf17019 100644 --- a/zephyr/test/drivers/chargesplash/src/chargesplash.c +++ b/zephyr/test/drivers/chargesplash/src/chargesplash.c @@ -102,7 +102,7 @@ static void set_lid(bool open, bool inhibit_boot) /* Simulate a regular power button press */ static void pulse_power_button(void) { - zassert_ok(shell_execute_cmd(get_ec_shell(), "powerbtn"), NULL); + zassert_ok(shell_execute_cmd(get_ec_shell(), "powerbtn")); } static void reset_state(void *unused) @@ -290,14 +290,14 @@ ZTEST_USER(chargesplash, test_display_loop) set_lid(true, true); set_ac_enabled(true); - zassert_true(is_chargesplash_requested(), NULL); + zassert_true(is_chargesplash_requested()); wait_for_chipset_startup(); zassert_ok(chargesplash_hostcmd(EC_CHARGESPLASH_DISPLAY_READY, &response), NULL); - zassert_true(is_chargesplash_requested(), NULL); + zassert_true(is_chargesplash_requested()); pulse_power_button(); - zassert_false(is_chargesplash_requested(), NULL); + zassert_false(is_chargesplash_requested()); } diff --git a/zephyr/test/drivers/common/src/utils.c b/zephyr/test/drivers/common/src/utils.c index 1d1ae735da..719a3fe589 100644 --- a/zephyr/test/drivers/common/src/utils.c +++ b/zephyr/test/drivers/common/src/utils.c @@ -134,7 +134,7 @@ void connect_source_to_port(struct tcpci_partner_data *partner, const struct emul *charger_emul) { set_ac_enabled(true); - zassert_ok(tcpci_partner_connect_to_tcpci(partner, tcpci_emul), NULL); + zassert_ok(tcpci_partner_connect_to_tcpci(partner, tcpci_emul)); isl923x_emul_set_adc_vbus(charger_emul, PDO_FIXED_GET_VOLT(src->pdo[pdo_index])); @@ -146,7 +146,7 @@ void disconnect_source_from_port(const struct emul *tcpci_emul, const struct emul *charger_emul) { set_ac_enabled(false); - zassert_ok(tcpci_emul_disconnect_partner(tcpci_emul), NULL); + zassert_ok(tcpci_emul_disconnect_partner(tcpci_emul)); isl923x_emul_set_adc_vbus(charger_emul, 0); k_sleep(K_SECONDS(1)); } @@ -172,7 +172,7 @@ void connect_sink_to_port(struct tcpci_partner_data *partner, tcpci_tcpc_alert(0); k_sleep(K_SECONDS(1)); - zassert_ok(tcpci_partner_connect_to_tcpci(partner, tcpci_emul), NULL); + zassert_ok(tcpci_partner_connect_to_tcpci(partner, tcpci_emul)); /* Wait for PD negotiation and current ramp. * TODO(b/213906889): Check message timing and contents. @@ -182,7 +182,7 @@ void connect_sink_to_port(struct tcpci_partner_data *partner, void disconnect_sink_from_port(const struct emul *tcpci_emul) { - zassert_ok(tcpci_emul_disconnect_partner(tcpci_emul), NULL); + zassert_ok(tcpci_emul_disconnect_partner(tcpci_emul)); k_sleep(K_SECONDS(1)); } diff --git a/zephyr/test/drivers/default/src/battery.c b/zephyr/test/drivers/default/src/battery.c index 6b01a5ca39..2e06725af5 100644 --- a/zephyr/test/drivers/default/src/battery.c +++ b/zephyr/test/drivers/default/src/battery.c @@ -30,11 +30,11 @@ ZTEST_USER(battery, test_battery_is_present_gpio) zassert_not_null(dev, NULL); /* ec_batt_pres_odl = 0 means battery present. */ - zassert_ok(gpio_emul_input_set(dev, GPIO_BATT_PRES_ODL_PORT, 0), NULL); - zassert_equal(BP_YES, battery_is_present(), NULL); + zassert_ok(gpio_emul_input_set(dev, GPIO_BATT_PRES_ODL_PORT, 0)); + zassert_equal(BP_YES, battery_is_present()); /* ec_batt_pres_odl = 1 means battery missing. */ - zassert_ok(gpio_emul_input_set(dev, GPIO_BATT_PRES_ODL_PORT, 1), NULL); - zassert_equal(BP_NO, battery_is_present(), NULL); + zassert_ok(gpio_emul_input_set(dev, GPIO_BATT_PRES_ODL_PORT, 1)); + zassert_equal(BP_NO, battery_is_present()); } ZTEST_SUITE(battery, drivers_predicate_post_main, NULL, NULL, battery_after, diff --git a/zephyr/test/drivers/default/src/bb_retimer.c b/zephyr/test/drivers/default/src/bb_retimer.c index 7d7930894f..1b1ec4bbbc 100644 --- a/zephyr/test/drivers/default/src/bb_retimer.c +++ b/zephyr/test/drivers/default/src/bb_retimer.c @@ -34,7 +34,7 @@ ZTEST_USER(bb_retimer, test_bb_is_fw_update_capable) { /* BB retimer is fw update capable */ - zassert_true(bb_usb_retimer.is_retimer_fw_update_capable(), NULL); + zassert_true(bb_usb_retimer.is_retimer_fw_update_capable()); } /** Test is retimer fw update capable function. */ @@ -66,7 +66,7 @@ ZTEST_USER(bb_retimer_no_tasks, test_bb_set_state) /* Set UFP role for whole test */ tc_set_data_role(USBC_PORT_C1, PD_ROLE_UFP); - zassume_equal(PD_ROLE_UFP, pd_get_data_role(USBC_PORT_C1), NULL); + zassume_equal(PD_ROLE_UFP, pd_get_data_role(USBC_PORT_C1)); /* Test none mode */ bb_emul_set_reg(emul, BB_RETIMER_REG_CONNECTION_STATE, 0x12144678); @@ -251,7 +251,7 @@ ZTEST_USER(bb_retimer_no_tasks, test_bb_set_dfp_state) set_test_runner_tid(); tc_set_data_role(USBC_PORT_C1, PD_ROLE_DFP); - zassume_equal(PD_ROLE_DFP, pd_get_data_role(USBC_PORT_C1), NULL); + zassume_equal(PD_ROLE_DFP, pd_get_data_role(USBC_PORT_C1)); /* Test PD mux none mode with DFP should clear all bits in state */ bb_emul_set_reg(emul, BB_RETIMER_REG_CONNECTION_STATE, 0x12144678); diff --git a/zephyr/test/drivers/default/src/bc12.c b/zephyr/test/drivers/default/src/bc12.c index a8d23e73ce..db1819ec4c 100644 --- a/zephyr/test/drivers/default/src/bc12.c +++ b/zephyr/test/drivers/default/src/bc12.c @@ -109,7 +109,7 @@ static void test_bc12_pi3usb9201_host_mode(void) */ pi3usb9201_emul_get_reg(emul, PI3USB9201_REG_CTRL_1, &a); b = PI3USB9201_CDP_HOST_MODE << PI3USB9201_REG_CTRL_1_MODE_SHIFT; - zassert_equal(a, b, NULL); + zassert_equal(a, b); /* Pretend that a device has been plugged in. */ msleep(500); @@ -120,7 +120,7 @@ static void test_bc12_pi3usb9201_host_mode(void) /* Expect the pi3usb9201 driver to configure SDP host mode. */ pi3usb9201_emul_get_reg(emul, PI3USB9201_REG_CTRL_1, &a); b = PI3USB9201_SDP_HOST_MODE << PI3USB9201_REG_CTRL_1_MODE_SHIFT; - zassert_equal(a, b, NULL); + zassert_equal(a, b); pi3usb9201_emul_set_reg(emul, PI3USB9201_REG_HOST_STS, 0); /* Pretend that a device has been unplugged. */ @@ -132,7 +132,7 @@ static void test_bc12_pi3usb9201_host_mode(void) /* Expect the pi3usb9201 driver to configure CDP host mode. */ pi3usb9201_emul_get_reg(emul, PI3USB9201_REG_CTRL_1, &a); b = PI3USB9201_CDP_HOST_MODE << PI3USB9201_REG_CTRL_1_MODE_SHIFT; - zassert_equal(a, b, NULL); + zassert_equal(a, b); pi3usb9201_emul_set_reg(emul, PI3USB9201_REG_HOST_STS, 0); } @@ -159,10 +159,10 @@ test_bc12_pi3usb9201_client_mode(enum pi3usb9201_client_sts detect_result, */ pi3usb9201_emul_get_reg(emul, PI3USB9201_REG_CTRL_1, &a); b = PI3USB9201_CLIENT_MODE << PI3USB9201_REG_CTRL_1_MODE_SHIFT; - zassert_equal(a, b, NULL); + zassert_equal(a, b); pi3usb9201_emul_get_reg(emul, PI3USB9201_REG_CTRL_2, &a); b = PI3USB9201_REG_CTRL_2_START_DET; - zassert_equal(a, b, NULL); + zassert_equal(a, b); /* Pretend that detection completed. */ msleep(500); @@ -172,7 +172,7 @@ test_bc12_pi3usb9201_client_mode(enum pi3usb9201_client_sts detect_result, msleep(1); /* Expect the pi3usb9201 driver to clear the start bit. */ pi3usb9201_emul_get_reg(emul, PI3USB9201_REG_CTRL_2, &a); - zassert_equal(a, 0, NULL); + zassert_equal(a, 0); pi3usb9201_emul_set_reg(emul, PI3USB9201_REG_CLIENT_STS, 0); /* * Expect the charge manager to select the detected BC1.2 supplier. @@ -185,11 +185,11 @@ test_bc12_pi3usb9201_client_mode(enum pi3usb9201_client_sts detect_result, } /* Wait for the charge port to update. */ msleep(500); - zassert_equal(charge_manager_get_active_charge_port(), port, NULL); - zassert_equal(charge_manager_get_supplier(), supplier, NULL); + zassert_equal(charge_manager_get_active_charge_port(), port); + zassert_equal(charge_manager_get_supplier(), supplier); zassert_equal(charge_manager_get_charger_current(), current_limit, NULL); - zassert_equal(charge_manager_get_charger_voltage(), voltage, NULL); + zassert_equal(charge_manager_get_charger_voltage(), voltage); /* * Pretend that the USB-C Port Manager (TCPMv2) has set the port data @@ -205,14 +205,14 @@ test_bc12_pi3usb9201_client_mode(enum pi3usb9201_client_sts detect_result, pi3usb9201_emul_get_reg(emul, PI3USB9201_REG_CTRL_1, &a); b = PI3USB9201_POWER_DOWN << PI3USB9201_REG_CTRL_1_MODE_SHIFT; b |= PI3USB9201_REG_CTRL_1_INT_MASK; - zassert_equal(a, b, NULL); + zassert_equal(a, b); /* Expect the charge manager to have no active supplier. */ zassert_equal(charge_manager_get_active_charge_port(), CHARGE_PORT_NONE, NULL); zassert_equal(charge_manager_get_supplier(), CHARGE_SUPPLIER_NONE, NULL); - zassert_equal(charge_manager_get_charger_current(), 0, NULL); - zassert_equal(charge_manager_get_charger_voltage(), 0, NULL); + zassert_equal(charge_manager_get_charger_current(), 0); + zassert_equal(charge_manager_get_charger_voltage(), 0); } /* @@ -235,7 +235,7 @@ ZTEST_USER(bc12, test_bc12_pi3usb9201) zassert_ok(gpio_emul_input_set(batt_pres_dev, GPIO_BATT_PRES_ODL_PORT, 0), NULL); - zassert_equal(BP_YES, battery_is_present(), NULL); + zassert_equal(BP_YES, battery_is_present()); set_ac_enabled(true); /* Wait long enough for TCPMv2 to be idle. */ @@ -255,7 +255,7 @@ ZTEST_USER(bc12, test_bc12_pi3usb9201) pi3usb9201_emul_get_reg(emul, PI3USB9201_REG_CTRL_1, &a); b = PI3USB9201_POWER_DOWN << PI3USB9201_REG_CTRL_1_MODE_SHIFT; b |= PI3USB9201_REG_CTRL_1_INT_MASK; - zassert_equal(a, b, NULL); + zassert_equal(a, b); test_bc12_pi3usb9201_host_mode(); diff --git a/zephyr/test/drivers/default/src/bma2x2.c b/zephyr/test/drivers/default/src/bma2x2.c index e848a265fd..ce6665790d 100644 --- a/zephyr/test/drivers/default/src/bma2x2.c +++ b/zephyr/test/drivers/default/src/bma2x2.c @@ -190,7 +190,7 @@ ZTEST_USER(bma2x2, test_bma_get_offset) /* Test get offset without rotation */ zassert_equal(EC_SUCCESS, ms.drv->get_offset(&ms, ret_offset, &temp), NULL); - zassert_equal(temp, (int16_t)EC_MOTION_SENSE_INVALID_CALIB_TEMP, NULL); + zassert_equal(temp, (int16_t)EC_MOTION_SENSE_INVALID_CALIB_TEMP); compare_int3v(exp_offset, ret_offset); /* Setup rotation and rotate expected offset */ @@ -200,7 +200,7 @@ ZTEST_USER(bma2x2, test_bma_get_offset) /* Test get offset with rotation */ zassert_equal(EC_SUCCESS, ms.drv->get_offset(&ms, ret_offset, &temp), NULL); - zassert_equal(temp, (int16_t)EC_MOTION_SENSE_INVALID_CALIB_TEMP, NULL); + zassert_equal(temp, (int16_t)EC_MOTION_SENSE_INVALID_CALIB_TEMP); compare_int3v(exp_offset, ret_offset); } @@ -324,12 +324,12 @@ ZTEST_USER(bma2x2, test_bma_set_range) BMA2x2_RANGE_SELECT_ADDR); /* Test fail on read */ - zassert_equal(EC_ERROR_INVAL, ms.drv->set_range(&ms, 12, 0), NULL); - zassert_equal(start_range, ms.current_range, NULL); + zassert_equal(EC_ERROR_INVAL, ms.drv->set_range(&ms, 12, 0)); + zassert_equal(start_range, ms.current_range); zassert_equal(BMA2x2_RANGE_2G, bma_emul_get_reg(emul, BMA2x2_RANGE_SELECT_ADDR), NULL); - zassert_equal(EC_ERROR_INVAL, ms.drv->set_range(&ms, 12, 1), NULL); - zassert_equal(start_range, ms.current_range, NULL); + zassert_equal(EC_ERROR_INVAL, ms.drv->set_range(&ms, 12, 1)); + zassert_equal(start_range, ms.current_range); zassert_equal(BMA2x2_RANGE_2G, bma_emul_get_reg(emul, BMA2x2_RANGE_SELECT_ADDR), NULL); @@ -342,12 +342,12 @@ ZTEST_USER(bma2x2, test_bma_set_range) BMA2x2_RANGE_SELECT_ADDR); /* Test fail on write */ - zassert_equal(EC_ERROR_INVAL, ms.drv->set_range(&ms, 12, 0), NULL); - zassert_equal(start_range, ms.current_range, NULL); + zassert_equal(EC_ERROR_INVAL, ms.drv->set_range(&ms, 12, 0)); + zassert_equal(start_range, ms.current_range); zassert_equal(BMA2x2_RANGE_2G, bma_emul_get_reg(emul, BMA2x2_RANGE_SELECT_ADDR), NULL); - zassert_equal(EC_ERROR_INVAL, ms.drv->set_range(&ms, 12, 1), NULL); - zassert_equal(start_range, ms.current_range, NULL); + zassert_equal(EC_ERROR_INVAL, ms.drv->set_range(&ms, 12, 1)); + zassert_equal(start_range, ms.current_range); zassert_equal(BMA2x2_RANGE_2G, bma_emul_get_reg(emul, BMA2x2_RANGE_SELECT_ADDR), NULL); @@ -396,7 +396,7 @@ ZTEST_USER(bma2x2, test_bma_init) i2c_common_emul_set_read_fail_reg(common_data, BMA2x2_CHIP_ID_ADDR); /* Test fail on chip id read */ - zassert_equal(EC_ERROR_UNKNOWN, ms.drv->init(&ms), NULL); + zassert_equal(EC_ERROR_UNKNOWN, ms.drv->init(&ms)); /* Disable failing on chip id read, but set wrong value */ i2c_common_emul_set_read_fail_reg(common_data, @@ -404,14 +404,14 @@ ZTEST_USER(bma2x2, test_bma_init) bma_emul_set_reg(emul, BMA2x2_CHIP_ID_ADDR, 23); /* Test wrong chip id */ - zassert_equal(EC_ERROR_ACCESS_DENIED, ms.drv->init(&ms), NULL); + zassert_equal(EC_ERROR_ACCESS_DENIED, ms.drv->init(&ms)); /* Set correct chip id, but fail on reset reg read */ i2c_common_emul_set_read_fail_reg(common_data, BMA2x2_RST_ADDR); bma_emul_set_reg(emul, BMA2x2_CHIP_ID_ADDR, BMA255_CHIP_ID_MAJOR); /* Test fail on reset register read */ - zassert_equal(EC_ERROR_INVAL, ms.drv->init(&ms), NULL); + zassert_equal(EC_ERROR_INVAL, ms.drv->init(&ms)); /* Do not fail on read */ i2c_common_emul_set_read_fail_reg(common_data, @@ -421,7 +421,7 @@ ZTEST_USER(bma2x2, test_bma_init) i2c_common_emul_set_write_fail_reg(common_data, BMA2x2_RST_ADDR); /* Test fail on reset register write */ - zassert_equal(EC_ERROR_INVAL, ms.drv->init(&ms), NULL); + zassert_equal(EC_ERROR_INVAL, ms.drv->init(&ms)); /* Do not fail on write */ i2c_common_emul_set_write_fail_reg(common_data, @@ -435,26 +435,26 @@ ZTEST_USER(bma2x2, test_bma_init) &reset_func_data); /* Test fail on too many reset read errors */ - zassert_equal(EC_ERROR_TIMEOUT, ms.drv->init(&ms), NULL); + zassert_equal(EC_ERROR_TIMEOUT, ms.drv->init(&ms)); /* Test success after reset read errors */ reset_func_data.ok_before_fail = 1; reset_func_data.fail_attempts = 3; - zassert_equal(EC_RES_SUCCESS, ms.drv->init(&ms), NULL); + zassert_equal(EC_RES_SUCCESS, ms.drv->init(&ms)); /* Test success without read errors */ reset_func_data.fail_attempts = 0; - zassert_equal(EC_RES_SUCCESS, ms.drv->init(&ms), NULL); + zassert_equal(EC_RES_SUCCESS, ms.drv->init(&ms)); /* Test fail on too many reset read wrong value */ reset_func_data.fail_attempts = 0; reset_func_data.reset_value = 100; - zassert_equal(EC_ERROR_TIMEOUT, ms.drv->init(&ms), NULL); + zassert_equal(EC_ERROR_TIMEOUT, ms.drv->init(&ms)); /* Test success on few reset read wrong value */ reset_func_data.fail_attempts = 0; reset_func_data.reset_value = 4; - zassert_equal(EC_RES_SUCCESS, ms.drv->init(&ms), NULL); + zassert_equal(EC_RES_SUCCESS, ms.drv->init(&ms)); /* Remove custom emulator read function */ i2c_common_emul_set_read_func(common_data, NULL, NULL); @@ -596,12 +596,12 @@ ZTEST_USER(bma2x2, test_bma_rate) /* Test fail on read */ zassert_equal(EC_ERROR_INVAL, ms.drv->set_data_rate(&ms, 15625, 0), NULL); - zassert_equal(drv_rate, ms.drv->get_data_rate(&ms), NULL); + zassert_equal(drv_rate, ms.drv->get_data_rate(&ms)); zassert_equal(reg_rate, bma_emul_get_reg(emul, BMA2x2_BW_SELECT_ADDR), NULL); zassert_equal(EC_ERROR_INVAL, ms.drv->set_data_rate(&ms, 15625, 1), NULL); - zassert_equal(drv_rate, ms.drv->get_data_rate(&ms), NULL); + zassert_equal(drv_rate, ms.drv->get_data_rate(&ms)); zassert_equal(reg_rate, bma_emul_get_reg(emul, BMA2x2_BW_SELECT_ADDR), NULL); @@ -615,12 +615,12 @@ ZTEST_USER(bma2x2, test_bma_rate) /* Test fail on write */ zassert_equal(EC_ERROR_INVAL, ms.drv->set_data_rate(&ms, 15625, 0), NULL); - zassert_equal(drv_rate, ms.drv->get_data_rate(&ms), NULL); + zassert_equal(drv_rate, ms.drv->get_data_rate(&ms)); zassert_equal(reg_rate, bma_emul_get_reg(emul, BMA2x2_BW_SELECT_ADDR), NULL); zassert_equal(EC_ERROR_INVAL, ms.drv->set_data_rate(&ms, 15625, 1), NULL); - zassert_equal(drv_rate, ms.drv->get_data_rate(&ms), NULL); + zassert_equal(drv_rate, ms.drv->get_data_rate(&ms)); zassert_equal(reg_rate, bma_emul_get_reg(emul, BMA2x2_BW_SELECT_ADDR), NULL); @@ -646,17 +646,17 @@ ZTEST_USER(bma2x2, test_bma_read) /* Test fail on each axis */ i2c_common_emul_set_read_fail_reg(common_data, BMA2x2_X_AXIS_LSB_ADDR); - zassert_equal(EC_ERROR_INVAL, ms.drv->read(&ms, ret_acc_v), NULL); + zassert_equal(EC_ERROR_INVAL, ms.drv->read(&ms, ret_acc_v)); i2c_common_emul_set_read_fail_reg(common_data, BMA2x2_X_AXIS_MSB_ADDR); - zassert_equal(EC_ERROR_INVAL, ms.drv->read(&ms, ret_acc_v), NULL); + zassert_equal(EC_ERROR_INVAL, ms.drv->read(&ms, ret_acc_v)); i2c_common_emul_set_read_fail_reg(common_data, BMA2x2_Y_AXIS_LSB_ADDR); - zassert_equal(EC_ERROR_INVAL, ms.drv->read(&ms, ret_acc_v), NULL); + zassert_equal(EC_ERROR_INVAL, ms.drv->read(&ms, ret_acc_v)); i2c_common_emul_set_read_fail_reg(common_data, BMA2x2_Y_AXIS_MSB_ADDR); - zassert_equal(EC_ERROR_INVAL, ms.drv->read(&ms, ret_acc_v), NULL); + zassert_equal(EC_ERROR_INVAL, ms.drv->read(&ms, ret_acc_v)); i2c_common_emul_set_read_fail_reg(common_data, BMA2x2_Z_AXIS_LSB_ADDR); - zassert_equal(EC_ERROR_INVAL, ms.drv->read(&ms, ret_acc_v), NULL); + zassert_equal(EC_ERROR_INVAL, ms.drv->read(&ms, ret_acc_v)); i2c_common_emul_set_read_fail_reg(common_data, BMA2x2_Z_AXIS_MSB_ADDR); - zassert_equal(EC_ERROR_INVAL, ms.drv->read(&ms, ret_acc_v), NULL); + zassert_equal(EC_ERROR_INVAL, ms.drv->read(&ms, ret_acc_v)); /* Do not fail on read */ i2c_common_emul_set_read_fail_reg(common_data, @@ -670,18 +670,18 @@ ZTEST_USER(bma2x2, test_bma_read) /* Disable rotation */ ms.rot_standard_ref = NULL; /* Set range to 2G */ - zassert_equal(EC_SUCCESS, ms.drv->set_range(&ms, 2, 0), NULL); + zassert_equal(EC_SUCCESS, ms.drv->set_range(&ms, 2, 0)); /* Test read without rotation */ - zassert_equal(EC_SUCCESS, ms.drv->read(&ms, ret_acc_v), NULL); + zassert_equal(EC_SUCCESS, ms.drv->read(&ms, ret_acc_v)); drv_acc_to_emul(ret_acc_v, 2, ret_acc); compare_int3v(exp_acc, ret_acc); /* Set range to 4G */ - zassert_equal(EC_SUCCESS, ms.drv->set_range(&ms, 4, 0), NULL); + zassert_equal(EC_SUCCESS, ms.drv->set_range(&ms, 4, 0)); /* Test read without rotation */ - zassert_equal(EC_SUCCESS, ms.drv->read(&ms, ret_acc_v), NULL); + zassert_equal(EC_SUCCESS, ms.drv->read(&ms, ret_acc_v)); drv_acc_to_emul(ret_acc_v, 4, ret_acc); compare_int3v(exp_acc, ret_acc); @@ -689,18 +689,18 @@ ZTEST_USER(bma2x2, test_bma_read) ms.rot_standard_ref = &test_rotation; rotate_int3v_by_test_rotation(exp_acc); /* Set range to 2G */ - zassert_equal(EC_SUCCESS, ms.drv->set_range(&ms, 2, 0), NULL); + zassert_equal(EC_SUCCESS, ms.drv->set_range(&ms, 2, 0)); /* Test read with rotation */ - zassert_equal(EC_SUCCESS, ms.drv->read(&ms, ret_acc_v), NULL); + zassert_equal(EC_SUCCESS, ms.drv->read(&ms, ret_acc_v)); drv_acc_to_emul(ret_acc_v, 2, ret_acc); compare_int3v(exp_acc, ret_acc); /* Set range to 4G */ - zassert_equal(EC_SUCCESS, ms.drv->set_range(&ms, 4, 0), NULL); + zassert_equal(EC_SUCCESS, ms.drv->set_range(&ms, 4, 0)); /* Test read with rotation */ - zassert_equal(EC_SUCCESS, ms.drv->read(&ms, ret_acc_v), NULL); + zassert_equal(EC_SUCCESS, ms.drv->read(&ms, ret_acc_v)); drv_acc_to_emul(ret_acc_v, 4, ret_acc); compare_int3v(exp_acc, ret_acc); } @@ -790,8 +790,8 @@ ZTEST_USER(bma2x2, test_bma_perform_calib) /* Range and rate cannot change after calibration */ range = 4; rate = 125000; - zassert_equal(EC_SUCCESS, ms.drv->set_range(&ms, range, 0), NULL); - zassert_equal(EC_SUCCESS, ms.drv->set_data_rate(&ms, rate, 0), NULL); + zassert_equal(EC_SUCCESS, ms.drv->set_range(&ms, range, 0)); + zassert_equal(EC_SUCCESS, ms.drv->set_data_rate(&ms, rate, 0)); /* Set offset 0 */ start_off[0] = 0; @@ -825,14 +825,14 @@ ZTEST_USER(bma2x2, test_bma_perform_calib) func_data.time = 1000000; /* Test success on disabling calibration */ - zassert_equal(EC_SUCCESS, ms.drv->perform_calib(&ms, 0), NULL); - zassert_equal(range, ms.current_range, NULL); - zassert_equal(rate, ms.drv->get_data_rate(&ms), NULL); + zassert_equal(EC_SUCCESS, ms.drv->perform_calib(&ms, 0)); + zassert_equal(range, ms.current_range); + zassert_equal(rate, ms.drv->get_data_rate(&ms)); /* Test fail on first access to offset control register */ - zassert_equal(EC_ERROR_INVAL, ms.drv->perform_calib(&ms, 1), NULL); - zassert_equal(range, ms.current_range, NULL); - zassert_equal(rate, ms.drv->get_data_rate(&ms), NULL); + zassert_equal(EC_ERROR_INVAL, ms.drv->perform_calib(&ms, 1)); + zassert_equal(range, ms.current_range); + zassert_equal(rate, ms.drv->get_data_rate(&ms)); /* Setup emulator to return cal not ready */ func_data.calib_start = k_uptime_get_32(); @@ -842,8 +842,8 @@ ZTEST_USER(bma2x2, test_bma_perform_calib) /* Test fail on cal not ready */ zassert_equal(EC_ERROR_ACCESS_DENIED, ms.drv->perform_calib(&ms, 1), NULL); - zassert_equal(range, ms.current_range, NULL); - zassert_equal(rate, ms.drv->get_data_rate(&ms), NULL); + zassert_equal(range, ms.current_range); + zassert_equal(rate, ms.drv->get_data_rate(&ms)); /* * Setup emulator to fail on access to offset control register after @@ -854,9 +854,9 @@ ZTEST_USER(bma2x2, test_bma_perform_calib) func_data.time = 160; /* Test fail on read during offset compensation */ - zassert_equal(EC_ERROR_INVAL, ms.drv->perform_calib(&ms, 1), NULL); - zassert_equal(range, ms.current_range, NULL); - zassert_equal(rate, ms.drv->get_data_rate(&ms), NULL); + zassert_equal(EC_ERROR_INVAL, ms.drv->perform_calib(&ms, 1)); + zassert_equal(range, ms.current_range); + zassert_equal(rate, ms.drv->get_data_rate(&ms)); /* * Setup emulator to return cal not ready for 1s after triggering @@ -866,9 +866,9 @@ ZTEST_USER(bma2x2, test_bma_perform_calib) func_data.read_fail = 0; func_data.time = 1000; - zassert_equal(EC_RES_TIMEOUT, ms.drv->perform_calib(&ms, 1), NULL); - zassert_equal(range, ms.current_range, NULL); - zassert_equal(rate, ms.drv->get_data_rate(&ms), NULL); + zassert_equal(EC_RES_TIMEOUT, ms.drv->perform_calib(&ms, 1)); + zassert_equal(range, ms.current_range); + zassert_equal(rate, ms.drv->get_data_rate(&ms)); /* * Setup emulator to return cal not ready for 160ms after triggering @@ -881,9 +881,9 @@ ZTEST_USER(bma2x2, test_bma_perform_calib) ms.rot_standard_ref = NULL; /* Test successful offset compenastion without rotation */ - zassert_equal(EC_SUCCESS, ms.drv->perform_calib(&ms, 1), NULL); - zassert_equal(range, ms.current_range, NULL); - zassert_equal(rate, ms.drv->get_data_rate(&ms), NULL); + zassert_equal(EC_SUCCESS, ms.drv->perform_calib(&ms, 1)); + zassert_equal(range, ms.current_range); + zassert_equal(rate, ms.drv->get_data_rate(&ms)); get_emul_offset(emul, ret_off); compare_int3v(exp_off, ret_off); @@ -895,9 +895,9 @@ ZTEST_USER(bma2x2, test_bma_perform_calib) -((int)BMA_EMUL_1G) - bma_emul_get_acc(emul, BMA_EMUL_AXIS_Z); /* Test successful offset compenastion with negative Z rotation */ - zassert_equal(EC_SUCCESS, ms.drv->perform_calib(&ms, 1), NULL); - zassert_equal(range, ms.current_range, NULL); - zassert_equal(rate, ms.drv->get_data_rate(&ms), NULL); + zassert_equal(EC_SUCCESS, ms.drv->perform_calib(&ms, 1)); + zassert_equal(range, ms.current_range); + zassert_equal(rate, ms.drv->get_data_rate(&ms)); get_emul_offset(emul, ret_off); compare_int3v(exp_off, ret_off); @@ -908,9 +908,9 @@ ZTEST_USER(bma2x2, test_bma_perform_calib) exp_off[2] = BMA_EMUL_1G - bma_emul_get_acc(emul, BMA_EMUL_AXIS_Z); /* Test successful offset compenastion with positive Z rotation */ - zassert_equal(EC_SUCCESS, ms.drv->perform_calib(&ms, 1), NULL); - zassert_equal(range, ms.current_range, NULL); - zassert_equal(rate, ms.drv->get_data_rate(&ms), NULL); + zassert_equal(EC_SUCCESS, ms.drv->perform_calib(&ms, 1)); + zassert_equal(range, ms.current_range); + zassert_equal(rate, ms.drv->get_data_rate(&ms)); get_emul_offset(emul, ret_off); compare_int3v(exp_off, ret_off); @@ -923,7 +923,7 @@ ZTEST_USER(bma2x2, test_bma_perform_calib) ZTEST_USER(bma2x2, test_bma_get_resolution) { /* Resolution should be always 12 bits */ - zassert_equal(12, ms.drv->get_resolution(&ms), NULL); + zassert_equal(12, ms.drv->get_resolution(&ms)); } static void *bma2x2_setup(void) diff --git a/zephyr/test/drivers/default/src/bmi160.c b/zephyr/test/drivers/default/src/bmi160.c index 3f06e7f0fd..01957672f7 100644 --- a/zephyr/test/drivers/default/src/bmi160.c +++ b/zephyr/test/drivers/default/src/bmi160.c @@ -174,8 +174,8 @@ ZTEST_USER(bmi160, test_bmi_acc_get_offset) ms->rot_standard_ref = NULL; /* Test get offset without rotation */ - zassert_equal(EC_SUCCESS, ms->drv->get_offset(ms, ret, &temp), NULL); - zassert_equal(temp, (int16_t)EC_MOTION_SENSE_INVALID_CALIB_TEMP, NULL); + zassert_equal(EC_SUCCESS, ms->drv->get_offset(ms, ret, &temp)); + zassert_equal(temp, (int16_t)EC_MOTION_SENSE_INVALID_CALIB_TEMP); convert_int3v_int16(ret, ret_v); compare_int3v(exp_v, ret_v); @@ -184,8 +184,8 @@ ZTEST_USER(bmi160, test_bmi_acc_get_offset) rotate_int3v_by_test_rotation(exp_v); /* Test get offset with rotation */ - zassert_equal(EC_SUCCESS, ms->drv->get_offset(ms, ret, &temp), NULL); - zassert_equal(temp, (int16_t)EC_MOTION_SENSE_INVALID_CALIB_TEMP, NULL); + zassert_equal(EC_SUCCESS, ms->drv->get_offset(ms, ret, &temp)); + zassert_equal(temp, (int16_t)EC_MOTION_SENSE_INVALID_CALIB_TEMP); convert_int3v_int16(ret, ret_v); compare_int3v(exp_v, ret_v); } @@ -238,8 +238,8 @@ ZTEST_USER(bmi160, test_bmi_gyr_get_offset) ms->rot_standard_ref = NULL; /* Test get offset without rotation */ - zassert_equal(EC_SUCCESS, ms->drv->get_offset(ms, ret, &temp), NULL); - zassert_equal(temp, (int16_t)EC_MOTION_SENSE_INVALID_CALIB_TEMP, NULL); + zassert_equal(EC_SUCCESS, ms->drv->get_offset(ms, ret, &temp)); + zassert_equal(temp, (int16_t)EC_MOTION_SENSE_INVALID_CALIB_TEMP); convert_int3v_int16(ret, ret_v); compare_int3v_eps(exp_v, ret_v, 64); @@ -248,8 +248,8 @@ ZTEST_USER(bmi160, test_bmi_gyr_get_offset) rotate_int3v_by_test_rotation(exp_v); /* Test get offset with rotation */ - zassert_equal(EC_SUCCESS, ms->drv->get_offset(ms, ret, &temp), NULL); - zassert_equal(temp, (int16_t)EC_MOTION_SENSE_INVALID_CALIB_TEMP, NULL); + zassert_equal(EC_SUCCESS, ms->drv->get_offset(ms, ret, &temp)); + zassert_equal(temp, (int16_t)EC_MOTION_SENSE_INVALID_CALIB_TEMP); convert_int3v_int16(ret, ret_v); compare_int3v_eps(exp_v, ret_v, 64); } @@ -310,7 +310,7 @@ ZTEST_USER(bmi160, test_bmi_acc_set_offset) ms->rot_standard_ref = NULL; /* Test set offset without rotation */ - zassert_equal(EC_SUCCESS, ms->drv->set_offset(ms, input_v, temp), NULL); + zassert_equal(EC_SUCCESS, ms->drv->set_offset(ms, input_v, temp)); get_emul_acc_offset(emul, ret_v); /* * Depending on used range, accelerometer values may be up to 6 bits @@ -329,7 +329,7 @@ ZTEST_USER(bmi160, test_bmi_acc_set_offset) convert_int3v_int16(ret_v, input_v); /* Test set offset with rotation */ - zassert_equal(EC_SUCCESS, ms->drv->set_offset(ms, input_v, temp), NULL); + zassert_equal(EC_SUCCESS, ms->drv->set_offset(ms, input_v, temp)); get_emul_acc_offset(emul, ret_v); compare_int3v_eps(exp_v, ret_v, 64); /* Accelerometer offset should be enabled */ @@ -394,7 +394,7 @@ ZTEST_USER(bmi160, test_bmi_gyr_set_offset) ms->rot_standard_ref = NULL; /* Test set offset without rotation */ - zassert_equal(EC_SUCCESS, ms->drv->set_offset(ms, input_v, temp), NULL); + zassert_equal(EC_SUCCESS, ms->drv->set_offset(ms, input_v, temp)); get_emul_gyr_offset(emul, ret_v); compare_int3v(exp_v, ret_v); /* Gyroscope offset should be enabled */ @@ -409,7 +409,7 @@ ZTEST_USER(bmi160, test_bmi_gyr_set_offset) convert_int3v_int16(ret_v, input_v); /* Test set offset with rotation */ - zassert_equal(EC_SUCCESS, ms->drv->set_offset(ms, input_v, temp), NULL); + zassert_equal(EC_SUCCESS, ms->drv->set_offset(ms, input_v, temp)); get_emul_gyr_offset(emul, ret_v); compare_int3v(exp_v, ret_v); zassert_true(bmi_emul_get_reg(emul, BMI160_OFFSET_EN_GYR98) & @@ -482,12 +482,12 @@ ZTEST_USER(bmi160, test_bmi_acc_set_range) i2c_common_emul_set_write_fail_reg(common_data, BMI160_ACC_RANGE); /* Test fail on write */ - zassert_equal(EC_ERROR_INVAL, ms->drv->set_range(ms, 12, 0), NULL); - zassert_equal(start_range, ms->current_range, NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->set_range(ms, 12, 0)); + zassert_equal(start_range, ms->current_range); zassert_equal(BMI160_GSEL_2G, bmi_emul_get_reg(emul, BMI160_ACC_RANGE), NULL); - zassert_equal(EC_ERROR_INVAL, ms->drv->set_range(ms, 12, 1), NULL); - zassert_equal(start_range, ms->current_range, NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->set_range(ms, 12, 1)); + zassert_equal(start_range, ms->current_range); zassert_equal(BMI160_GSEL_2G, bmi_emul_get_reg(emul, BMI160_ACC_RANGE), NULL); @@ -592,12 +592,12 @@ ZTEST_USER(bmi160, test_bmi_gyr_set_range) i2c_common_emul_set_write_fail_reg(common_data, BMI160_GYR_RANGE); /* Test fail on write */ - zassert_equal(EC_ERROR_INVAL, ms->drv->set_range(ms, 125, 0), NULL); - zassert_equal(start_range, ms->current_range, NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->set_range(ms, 125, 0)); + zassert_equal(start_range, ms->current_range); zassert_equal(BMI160_DPS_SEL_250, bmi_emul_get_reg(emul, BMI160_GYR_RANGE), NULL); - zassert_equal(EC_ERROR_INVAL, ms->drv->set_range(ms, 125, 1), NULL); - zassert_equal(start_range, ms->current_range, NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->set_range(ms, 125, 1)); + zassert_equal(start_range, ms->current_range); zassert_equal(BMI160_DPS_SEL_250, bmi_emul_get_reg(emul, BMI160_GYR_RANGE), NULL); @@ -651,13 +651,13 @@ ZTEST_USER(bmi160, test_bmi_get_resolution) ms = &motion_sensors[BMI_ACC_SENSOR_ID]; /* Resolution should be always 16 bits */ - zassert_equal(16, ms->drv->get_resolution(ms), NULL); + zassert_equal(16, ms->drv->get_resolution(ms)); /* Test gyroscope */ ms = &motion_sensors[BMI_GYR_SENSOR_ID]; /* Resolution should be always 16 bits */ - zassert_equal(16, ms->drv->get_resolution(ms), NULL); + zassert_equal(16, ms->drv->get_resolution(ms)); } /** @@ -803,12 +803,12 @@ ZTEST_USER(bmi160, test_bmi_acc_rate) /* Test fail on read */ zassert_equal(EC_ERROR_INVAL, ms->drv->set_data_rate(ms, 50000, 0), NULL); - zassert_equal(drv_rate, ms->drv->get_data_rate(ms), NULL); - zassert_equal(reg_rate, bmi_emul_get_reg(emul, BMI160_ACC_CONF), NULL); + zassert_equal(drv_rate, ms->drv->get_data_rate(ms)); + zassert_equal(reg_rate, bmi_emul_get_reg(emul, BMI160_ACC_CONF)); zassert_equal(EC_ERROR_INVAL, ms->drv->set_data_rate(ms, 50000, 1), NULL); - zassert_equal(drv_rate, ms->drv->get_data_rate(ms), NULL); - zassert_equal(reg_rate, bmi_emul_get_reg(emul, BMI160_ACC_CONF), NULL); + zassert_equal(drv_rate, ms->drv->get_data_rate(ms)); + zassert_equal(reg_rate, bmi_emul_get_reg(emul, BMI160_ACC_CONF)); /* Do not fail on read */ i2c_common_emul_set_read_fail_reg(common_data, @@ -820,12 +820,12 @@ ZTEST_USER(bmi160, test_bmi_acc_rate) /* Test fail on write */ zassert_equal(EC_ERROR_INVAL, ms->drv->set_data_rate(ms, 50000, 0), NULL); - zassert_equal(drv_rate, ms->drv->get_data_rate(ms), NULL); - zassert_equal(reg_rate, bmi_emul_get_reg(emul, BMI160_ACC_CONF), NULL); + zassert_equal(drv_rate, ms->drv->get_data_rate(ms)); + zassert_equal(reg_rate, bmi_emul_get_reg(emul, BMI160_ACC_CONF)); zassert_equal(EC_ERROR_INVAL, ms->drv->set_data_rate(ms, 50000, 1), NULL); - zassert_equal(drv_rate, ms->drv->get_data_rate(ms), NULL); - zassert_equal(reg_rate, bmi_emul_get_reg(emul, BMI160_ACC_CONF), NULL); + zassert_equal(drv_rate, ms->drv->get_data_rate(ms)); + zassert_equal(reg_rate, bmi_emul_get_reg(emul, BMI160_ACC_CONF)); /* Do not fail on write */ i2c_common_emul_set_write_fail_reg(common_data, @@ -835,7 +835,7 @@ ZTEST_USER(bmi160, test_bmi_acc_rate) pmu_status = BMI160_PMU_NORMAL << BMI160_PMU_ACC_OFFSET; pmu_status |= BMI160_PMU_NORMAL << BMI160_PMU_GYR_OFFSET; bmi_emul_set_reg(emul, BMI160_PMU_STATUS, pmu_status); - zassert_equal(EC_SUCCESS, ms->drv->set_data_rate(ms, 0, 0), NULL); + zassert_equal(EC_SUCCESS, ms->drv->set_data_rate(ms, 0, 0)); bmi_read8(ms->port, ms->i2c_spi_addr_flags, BMI160_PMU_STATUS, &pmu_status); @@ -844,7 +844,7 @@ ZTEST_USER(bmi160, test_bmi_acc_rate) /* Test enabling sensor */ bmi_emul_set_reg(emul, BMI160_PMU_STATUS, 0); - zassert_equal(EC_SUCCESS, ms->drv->set_data_rate(ms, 50000, 0), NULL); + zassert_equal(EC_SUCCESS, ms->drv->set_data_rate(ms, 50000, 0)); bmi_read8(ms->port, ms->i2c_spi_addr_flags, BMI160_PMU_STATUS, &pmu_status); @@ -989,12 +989,12 @@ ZTEST_USER(bmi160, test_bmi_gyr_rate) /* Test fail on read */ zassert_equal(EC_ERROR_INVAL, ms->drv->set_data_rate(ms, 50000, 0), NULL); - zassert_equal(drv_rate, ms->drv->get_data_rate(ms), NULL); - zassert_equal(reg_rate, bmi_emul_get_reg(emul, BMI160_GYR_CONF), NULL); + zassert_equal(drv_rate, ms->drv->get_data_rate(ms)); + zassert_equal(reg_rate, bmi_emul_get_reg(emul, BMI160_GYR_CONF)); zassert_equal(EC_ERROR_INVAL, ms->drv->set_data_rate(ms, 50000, 1), NULL); - zassert_equal(drv_rate, ms->drv->get_data_rate(ms), NULL); - zassert_equal(reg_rate, bmi_emul_get_reg(emul, BMI160_GYR_CONF), NULL); + zassert_equal(drv_rate, ms->drv->get_data_rate(ms)); + zassert_equal(reg_rate, bmi_emul_get_reg(emul, BMI160_GYR_CONF)); /* Do not fail on read */ i2c_common_emul_set_read_fail_reg(common_data, @@ -1006,12 +1006,12 @@ ZTEST_USER(bmi160, test_bmi_gyr_rate) /* Test fail on write */ zassert_equal(EC_ERROR_INVAL, ms->drv->set_data_rate(ms, 50000, 0), NULL); - zassert_equal(drv_rate, ms->drv->get_data_rate(ms), NULL); - zassert_equal(reg_rate, bmi_emul_get_reg(emul, BMI160_GYR_CONF), NULL); + zassert_equal(drv_rate, ms->drv->get_data_rate(ms)); + zassert_equal(reg_rate, bmi_emul_get_reg(emul, BMI160_GYR_CONF)); zassert_equal(EC_ERROR_INVAL, ms->drv->set_data_rate(ms, 50000, 1), NULL); - zassert_equal(drv_rate, ms->drv->get_data_rate(ms), NULL); - zassert_equal(reg_rate, bmi_emul_get_reg(emul, BMI160_GYR_CONF), NULL); + zassert_equal(drv_rate, ms->drv->get_data_rate(ms)); + zassert_equal(reg_rate, bmi_emul_get_reg(emul, BMI160_GYR_CONF)); /* Do not fail on write */ i2c_common_emul_set_write_fail_reg(common_data, @@ -1021,7 +1021,7 @@ ZTEST_USER(bmi160, test_bmi_gyr_rate) pmu_status = BMI160_PMU_NORMAL << BMI160_PMU_ACC_OFFSET; pmu_status |= BMI160_PMU_NORMAL << BMI160_PMU_GYR_OFFSET; bmi_emul_set_reg(emul, BMI160_PMU_STATUS, pmu_status); - zassert_equal(EC_SUCCESS, ms->drv->set_data_rate(ms, 0, 0), NULL); + zassert_equal(EC_SUCCESS, ms->drv->set_data_rate(ms, 0, 0)); bmi_read8(ms->port, ms->i2c_spi_addr_flags, BMI160_PMU_STATUS, &pmu_status); @@ -1030,7 +1030,7 @@ ZTEST_USER(bmi160, test_bmi_gyr_rate) /* Test enabling sensor */ bmi_emul_set_reg(emul, BMI160_PMU_STATUS, 0); - zassert_equal(EC_SUCCESS, ms->drv->set_data_rate(ms, 50000, 0), NULL); + zassert_equal(EC_SUCCESS, ms->drv->set_data_rate(ms, 50000, 0)); bmi_read8(ms->port, ms->i2c_spi_addr_flags, BMI160_PMU_STATUS, &pmu_status); @@ -1052,24 +1052,24 @@ ZTEST_USER(bmi160, test_bmi_scale) /* Test accelerometer */ ms = &motion_sensors[BMI_ACC_SENSOR_ID]; - zassert_equal(EC_SUCCESS, ms->drv->set_scale(ms, exp_scale, 0), NULL); - zassert_equal(EC_SUCCESS, ms->drv->get_scale(ms, ret_scale, &t), NULL); + zassert_equal(EC_SUCCESS, ms->drv->set_scale(ms, exp_scale, 0)); + zassert_equal(EC_SUCCESS, ms->drv->get_scale(ms, ret_scale, &t)); - zassert_equal(t, (int16_t)EC_MOTION_SENSE_INVALID_CALIB_TEMP, NULL); - zassert_equal(exp_scale[0], ret_scale[0], NULL); - zassert_equal(exp_scale[1], ret_scale[1], NULL); - zassert_equal(exp_scale[2], ret_scale[2], NULL); + zassert_equal(t, (int16_t)EC_MOTION_SENSE_INVALID_CALIB_TEMP); + zassert_equal(exp_scale[0], ret_scale[0]); + zassert_equal(exp_scale[1], ret_scale[1]); + zassert_equal(exp_scale[2], ret_scale[2]); /* Test gyroscope */ ms = &motion_sensors[BMI_GYR_SENSOR_ID]; - zassert_equal(EC_SUCCESS, ms->drv->set_scale(ms, exp_scale, 0), NULL); - zassert_equal(EC_SUCCESS, ms->drv->get_scale(ms, ret_scale, &t), NULL); + zassert_equal(EC_SUCCESS, ms->drv->set_scale(ms, exp_scale, 0)); + zassert_equal(EC_SUCCESS, ms->drv->get_scale(ms, ret_scale, &t)); - zassert_equal(t, (int16_t)EC_MOTION_SENSE_INVALID_CALIB_TEMP, NULL); - zassert_equal(exp_scale[0], ret_scale[0], NULL); - zassert_equal(exp_scale[1], ret_scale[1], NULL); - zassert_equal(exp_scale[2], ret_scale[2], NULL); + zassert_equal(t, (int16_t)EC_MOTION_SENSE_INVALID_CALIB_TEMP); + zassert_equal(exp_scale[0], ret_scale[0]); + zassert_equal(exp_scale[1], ret_scale[1]); + zassert_equal(exp_scale[2], ret_scale[2]); } /** Test reading temperature using accelerometer and gyroscope sensors */ @@ -1117,40 +1117,40 @@ ZTEST_USER(bmi160, test_bmi_read_temp) bmi_emul_set_reg(emul, BMI160_TEMPERATURE_1, 0x00); zassert_equal(EC_SUCCESS, ms_acc->drv->read_temp(ms_acc, &ret_temp), NULL); - zassert_equal(exp_temp, ret_temp, NULL); + zassert_equal(exp_temp, ret_temp); zassert_equal(EC_SUCCESS, ms_gyr->drv->read_temp(ms_gyr, &ret_temp), NULL); - zassert_equal(exp_temp, ret_temp, NULL); + zassert_equal(exp_temp, ret_temp); exp_temp = C_TO_K(87); bmi_emul_set_reg(emul, BMI160_TEMPERATURE_0, 0xff); bmi_emul_set_reg(emul, BMI160_TEMPERATURE_1, 0x7f); zassert_equal(EC_SUCCESS, ms_acc->drv->read_temp(ms_acc, &ret_temp), NULL); - zassert_equal(exp_temp, ret_temp, NULL); + zassert_equal(exp_temp, ret_temp); zassert_equal(EC_SUCCESS, ms_gyr->drv->read_temp(ms_gyr, &ret_temp), NULL); - zassert_equal(exp_temp, ret_temp, NULL); + zassert_equal(exp_temp, ret_temp); exp_temp = C_TO_K(-41); bmi_emul_set_reg(emul, BMI160_TEMPERATURE_0, 0x01); bmi_emul_set_reg(emul, BMI160_TEMPERATURE_1, 0x80); zassert_equal(EC_SUCCESS, ms_acc->drv->read_temp(ms_acc, &ret_temp), NULL); - zassert_equal(exp_temp, ret_temp, NULL); + zassert_equal(exp_temp, ret_temp); zassert_equal(EC_SUCCESS, ms_gyr->drv->read_temp(ms_gyr, &ret_temp), NULL); - zassert_equal(exp_temp, ret_temp, NULL); + zassert_equal(exp_temp, ret_temp); exp_temp = C_TO_K(47); bmi_emul_set_reg(emul, BMI160_TEMPERATURE_0, 0x00); bmi_emul_set_reg(emul, BMI160_TEMPERATURE_1, 0x30); zassert_equal(EC_SUCCESS, ms_acc->drv->read_temp(ms_acc, &ret_temp), NULL); - zassert_equal(exp_temp, ret_temp, NULL); + zassert_equal(exp_temp, ret_temp); zassert_equal(EC_SUCCESS, ms_gyr->drv->read_temp(ms_gyr, &ret_temp), NULL); - zassert_equal(exp_temp, ret_temp, NULL); + zassert_equal(exp_temp, ret_temp); } /** Test reading accelerometer sensor data */ @@ -1175,7 +1175,7 @@ ZTEST_USER(bmi160, test_bmi_acc_read) /* Fail on read status */ i2c_common_emul_set_read_fail_reg(common_data, BMI160_STATUS); - zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v), NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v)); i2c_common_emul_set_read_fail_reg(common_data, I2C_COMMON_EMUL_NO_FAIL_REG); @@ -1190,12 +1190,12 @@ ZTEST_USER(bmi160, test_bmi_acc_read) /* Status not ready */ bmi_emul_set_reg(emul, BMI160_STATUS, 0); - zassert_equal(EC_SUCCESS, ms->drv->read(ms, ret_v), NULL); + zassert_equal(EC_SUCCESS, ms->drv->read(ms, ret_v)); compare_int3v(exp_v, ret_v); /* Status only GYR ready */ bmi_emul_set_reg(emul, BMI160_STATUS, BMI160_DRDY_GYR); - zassert_equal(EC_SUCCESS, ms->drv->read(ms, ret_v), NULL); + zassert_equal(EC_SUCCESS, ms->drv->read(ms, ret_v)); compare_int3v(exp_v, ret_v); /* Status ACC ready */ @@ -1209,20 +1209,20 @@ ZTEST_USER(bmi160, test_bmi_acc_read) /* Disable rotation */ ms->rot_standard_ref = NULL; /* Set scale */ - zassert_equal(EC_SUCCESS, ms->drv->set_scale(ms, scale, 0), NULL); + zassert_equal(EC_SUCCESS, ms->drv->set_scale(ms, scale, 0)); /* Set range to 2G */ - zassert_equal(EC_SUCCESS, ms->drv->set_range(ms, 2, 0), NULL); + zassert_equal(EC_SUCCESS, ms->drv->set_range(ms, 2, 0)); /* Test read without rotation */ - zassert_equal(EC_SUCCESS, ms->drv->read(ms, ret_v), NULL); + zassert_equal(EC_SUCCESS, ms->drv->read(ms, ret_v)); drv_acc_to_emul(ret_v, 2, ret_v); compare_int3v(exp_v, ret_v); /* Set range to 4G */ - zassert_equal(EC_SUCCESS, ms->drv->set_range(ms, 4, 0), NULL); + zassert_equal(EC_SUCCESS, ms->drv->set_range(ms, 4, 0)); /* Test read without rotation */ - zassert_equal(EC_SUCCESS, ms->drv->read(ms, ret_v), NULL); + zassert_equal(EC_SUCCESS, ms->drv->read(ms, ret_v)); drv_acc_to_emul(ret_v, 4, ret_v); compare_int3v(exp_v, ret_v); @@ -1230,34 +1230,34 @@ ZTEST_USER(bmi160, test_bmi_acc_read) ms->rot_standard_ref = &test_rotation; rotate_int3v_by_test_rotation(exp_v); /* Set range to 2G */ - zassert_equal(EC_SUCCESS, ms->drv->set_range(ms, 2, 0), NULL); + zassert_equal(EC_SUCCESS, ms->drv->set_range(ms, 2, 0)); /* Test read with rotation */ - zassert_equal(EC_SUCCESS, ms->drv->read(ms, ret_v), NULL); + zassert_equal(EC_SUCCESS, ms->drv->read(ms, ret_v)); drv_acc_to_emul(ret_v, 2, ret_v); compare_int3v(exp_v, ret_v); /* Set range to 4G */ - zassert_equal(EC_SUCCESS, ms->drv->set_range(ms, 4, 0), NULL); + zassert_equal(EC_SUCCESS, ms->drv->set_range(ms, 4, 0)); /* Test read with rotation */ - zassert_equal(EC_SUCCESS, ms->drv->read(ms, ret_v), NULL); + zassert_equal(EC_SUCCESS, ms->drv->read(ms, ret_v)); drv_acc_to_emul(ret_v, 4, ret_v); compare_int3v(exp_v, ret_v); /* Fail on read of data registers */ i2c_common_emul_set_read_fail_reg(common_data, BMI160_ACC_X_L_G); - zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v), NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v)); i2c_common_emul_set_read_fail_reg(common_data, BMI160_ACC_X_H_G); - zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v), NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v)); i2c_common_emul_set_read_fail_reg(common_data, BMI160_ACC_Y_L_G); - zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v), NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v)); i2c_common_emul_set_read_fail_reg(common_data, BMI160_ACC_Y_H_G); - zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v), NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v)); i2c_common_emul_set_read_fail_reg(common_data, BMI160_ACC_Z_L_G); - zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v), NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v)); i2c_common_emul_set_read_fail_reg(common_data, BMI160_ACC_Z_H_G); - zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v), NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v)); i2c_common_emul_set_read_fail_reg(common_data, I2C_COMMON_EMUL_NO_FAIL_REG); @@ -1286,7 +1286,7 @@ ZTEST_USER(bmi160, test_bmi_gyr_read) /* Fail on read status */ i2c_common_emul_set_read_fail_reg(common_data, BMI160_STATUS); - zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v), NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v)); i2c_common_emul_set_read_fail_reg(common_data, I2C_COMMON_EMUL_NO_FAIL_REG); @@ -1301,12 +1301,12 @@ ZTEST_USER(bmi160, test_bmi_gyr_read) /* Status not ready */ bmi_emul_set_reg(emul, BMI160_STATUS, 0); - zassert_equal(EC_SUCCESS, ms->drv->read(ms, ret_v), NULL); + zassert_equal(EC_SUCCESS, ms->drv->read(ms, ret_v)); compare_int3v(exp_v, ret_v); /* Status only ACC ready */ bmi_emul_set_reg(emul, BMI160_STATUS, BMI160_DRDY_ACC); - zassert_equal(EC_SUCCESS, ms->drv->read(ms, ret_v), NULL); + zassert_equal(EC_SUCCESS, ms->drv->read(ms, ret_v)); compare_int3v(exp_v, ret_v); /* Status GYR ready */ @@ -1320,20 +1320,20 @@ ZTEST_USER(bmi160, test_bmi_gyr_read) /* Disable rotation */ ms->rot_standard_ref = NULL; /* Set scale */ - zassert_equal(EC_SUCCESS, ms->drv->set_scale(ms, scale, 0), NULL); + zassert_equal(EC_SUCCESS, ms->drv->set_scale(ms, scale, 0)); /* Set range to 125°/s */ - zassert_equal(EC_SUCCESS, ms->drv->set_range(ms, 125, 0), NULL); + zassert_equal(EC_SUCCESS, ms->drv->set_range(ms, 125, 0)); /* Test read without rotation */ - zassert_equal(EC_SUCCESS, ms->drv->read(ms, ret_v), NULL); + zassert_equal(EC_SUCCESS, ms->drv->read(ms, ret_v)); drv_gyr_to_emul(ret_v, 125, ret_v); compare_int3v(exp_v, ret_v); /* Set range to 1000°/s */ - zassert_equal(EC_SUCCESS, ms->drv->set_range(ms, 1000, 0), NULL); + zassert_equal(EC_SUCCESS, ms->drv->set_range(ms, 1000, 0)); /* Test read without rotation */ - zassert_equal(EC_SUCCESS, ms->drv->read(ms, ret_v), NULL); + zassert_equal(EC_SUCCESS, ms->drv->read(ms, ret_v)); drv_gyr_to_emul(ret_v, 1000, ret_v); compare_int3v(exp_v, ret_v); @@ -1341,34 +1341,34 @@ ZTEST_USER(bmi160, test_bmi_gyr_read) ms->rot_standard_ref = &test_rotation; rotate_int3v_by_test_rotation(exp_v); /* Set range to 125°/s */ - zassert_equal(EC_SUCCESS, ms->drv->set_range(ms, 125, 0), NULL); + zassert_equal(EC_SUCCESS, ms->drv->set_range(ms, 125, 0)); /* Test read with rotation */ - zassert_equal(EC_SUCCESS, ms->drv->read(ms, ret_v), NULL); + zassert_equal(EC_SUCCESS, ms->drv->read(ms, ret_v)); drv_gyr_to_emul(ret_v, 125, ret_v); compare_int3v(exp_v, ret_v); /* Set range to 1000°/s */ - zassert_equal(EC_SUCCESS, ms->drv->set_range(ms, 1000, 0), NULL); + zassert_equal(EC_SUCCESS, ms->drv->set_range(ms, 1000, 0)); /* Test read with rotation */ - zassert_equal(EC_SUCCESS, ms->drv->read(ms, ret_v), NULL); + zassert_equal(EC_SUCCESS, ms->drv->read(ms, ret_v)); drv_gyr_to_emul(ret_v, 1000, ret_v); compare_int3v(exp_v, ret_v); /* Fail on read of data registers */ i2c_common_emul_set_read_fail_reg(common_data, BMI160_GYR_X_L_G); - zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v), NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v)); i2c_common_emul_set_read_fail_reg(common_data, BMI160_GYR_X_H_G); - zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v), NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v)); i2c_common_emul_set_read_fail_reg(common_data, BMI160_GYR_Y_L_G); - zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v), NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v)); i2c_common_emul_set_read_fail_reg(common_data, BMI160_GYR_Y_H_G); - zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v), NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v)); i2c_common_emul_set_read_fail_reg(common_data, BMI160_GYR_Z_L_G); - zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v), NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v)); i2c_common_emul_set_read_fail_reg(common_data, BMI160_GYR_Z_H_G); - zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v), NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v)); i2c_common_emul_set_read_fail_reg(common_data, I2C_COMMON_EMUL_NO_FAIL_REG); @@ -1419,8 +1419,8 @@ ZTEST_USER(bmi160, test_bmi_acc_perform_calib) /* Range and rate cannot change after calibration */ range = 4; rate = 50000; - zassert_equal(EC_SUCCESS, ms->drv->set_range(ms, range, 0), NULL); - zassert_equal(EC_SUCCESS, ms->drv->set_data_rate(ms, rate, 0), NULL); + zassert_equal(EC_SUCCESS, ms->drv->set_range(ms, range, 0)); + zassert_equal(EC_SUCCESS, ms->drv->set_data_rate(ms, rate, 0)); /* Set offset 0 */ start_off[0] = 0; @@ -1444,15 +1444,15 @@ ZTEST_USER(bmi160, test_bmi_acc_perform_calib) /* Test fail on rate set */ i2c_common_emul_set_read_fail_reg(common_data, BMI160_ACC_CONF); - zassert_equal(EC_ERROR_INVAL, ms->drv->perform_calib(ms, 1), NULL); - zassert_equal(range, ms->current_range, NULL); - zassert_equal(rate, ms->drv->get_data_rate(ms), NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->perform_calib(ms, 1)); + zassert_equal(range, ms->current_range); + zassert_equal(rate, ms->drv->get_data_rate(ms)); /* Test fail on status read */ i2c_common_emul_set_read_fail_reg(common_data, BMI160_STATUS); - zassert_equal(EC_ERROR_INVAL, ms->drv->perform_calib(ms, 1), NULL); - zassert_equal(range, ms->current_range, NULL); - zassert_equal(rate, ms->drv->get_data_rate(ms), NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->perform_calib(ms, 1)); + zassert_equal(range, ms->current_range); + zassert_equal(rate, ms->drv->get_data_rate(ms)); /* Stop fast offset compensation before next test */ bmi_emul_set_reg(emul, BMI160_CMD_REG, BMI160_CMD_NOOP); @@ -1460,9 +1460,9 @@ ZTEST_USER(bmi160, test_bmi_acc_perform_calib) i2c_common_emul_set_read_fail_reg(common_data, I2C_COMMON_EMUL_NO_FAIL_REG); i2c_common_emul_set_read_func(common_data, emul_nrdy, NULL); - zassert_equal(EC_RES_TIMEOUT, ms->drv->perform_calib(ms, 1), NULL); - zassert_equal(range, ms->current_range, NULL); - zassert_equal(rate, ms->drv->get_data_rate(ms), NULL); + zassert_equal(EC_RES_TIMEOUT, ms->drv->perform_calib(ms, 1)); + zassert_equal(range, ms->current_range); + zassert_equal(rate, ms->drv->get_data_rate(ms)); /* Remove custom emulator read function */ i2c_common_emul_set_read_func(common_data, NULL, NULL); /* Stop fast offset compensation before next test */ @@ -1471,9 +1471,9 @@ ZTEST_USER(bmi160, test_bmi_acc_perform_calib) /* Disable rotation */ ms->rot_standard_ref = NULL; /* Test successful offset compenastion without rotation */ - zassert_equal(EC_SUCCESS, ms->drv->perform_calib(ms, 1), NULL); - zassert_equal(range, ms->current_range, NULL); - zassert_equal(rate, ms->drv->get_data_rate(ms), NULL); + zassert_equal(EC_SUCCESS, ms->drv->perform_calib(ms, 1)); + zassert_equal(range, ms->current_range); + zassert_equal(rate, ms->drv->get_data_rate(ms)); get_emul_acc_offset(emul, ret_off); /* * Depending on used range, accelerometer values may be up to 6 bits @@ -1492,9 +1492,9 @@ ZTEST_USER(bmi160, test_bmi_acc_perform_calib) exp_off[2] = 1234; /* Test successful offset compenastion with negative Z rotation */ - zassert_equal(EC_SUCCESS, ms->drv->perform_calib(ms, 1), NULL); - zassert_equal(range, ms->current_range, NULL); - zassert_equal(rate, ms->drv->get_data_rate(ms), NULL); + zassert_equal(EC_SUCCESS, ms->drv->perform_calib(ms, 1)); + zassert_equal(range, ms->current_range); + zassert_equal(rate, ms->drv->get_data_rate(ms)); get_emul_acc_offset(emul, ret_off); compare_int3v_eps(exp_off, ret_off, 64); /* Acelerometer offset should be enabled */ @@ -1509,9 +1509,9 @@ ZTEST_USER(bmi160, test_bmi_acc_perform_calib) exp_off[2] = 1234; /* Test successful offset compenastion with positive Z rotation */ - zassert_equal(EC_SUCCESS, ms->drv->perform_calib(ms, 1), NULL); - zassert_equal(range, ms->current_range, NULL); - zassert_equal(rate, ms->drv->get_data_rate(ms), NULL); + zassert_equal(EC_SUCCESS, ms->drv->perform_calib(ms, 1)); + zassert_equal(range, ms->current_range); + zassert_equal(rate, ms->drv->get_data_rate(ms)); get_emul_acc_offset(emul, ret_off); compare_int3v_eps(exp_off, ret_off, 64); /* Acelerometer offset should be enabled */ @@ -1546,8 +1546,8 @@ ZTEST_USER(bmi160, test_bmi_gyr_perform_calib) /* Range and rate cannot change after calibration */ range = 250; rate = 50000; - zassert_equal(EC_SUCCESS, ms->drv->set_range(ms, range, 0), NULL); - zassert_equal(EC_SUCCESS, ms->drv->set_data_rate(ms, rate, 0), NULL); + zassert_equal(EC_SUCCESS, ms->drv->set_range(ms, range, 0)); + zassert_equal(EC_SUCCESS, ms->drv->set_data_rate(ms, rate, 0)); /* Set offset 0 */ start_off[0] = 0; @@ -1567,21 +1567,21 @@ ZTEST_USER(bmi160, test_bmi_gyr_perform_calib) exp_off[2] = -exp_off[2]; /* Test success on disabling calibration */ - zassert_equal(EC_SUCCESS, ms->drv->perform_calib(ms, 0), NULL); - zassert_equal(range, ms->current_range, NULL); - zassert_equal(rate, ms->drv->get_data_rate(ms), NULL); + zassert_equal(EC_SUCCESS, ms->drv->perform_calib(ms, 0)); + zassert_equal(range, ms->current_range); + zassert_equal(rate, ms->drv->get_data_rate(ms)); /* Test fail on rate set */ i2c_common_emul_set_read_fail_reg(common_data, BMI160_GYR_CONF); - zassert_equal(EC_ERROR_INVAL, ms->drv->perform_calib(ms, 1), NULL); - zassert_equal(range, ms->current_range, NULL); - zassert_equal(rate, ms->drv->get_data_rate(ms), NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->perform_calib(ms, 1)); + zassert_equal(range, ms->current_range); + zassert_equal(rate, ms->drv->get_data_rate(ms)); /* Test fail on status read */ i2c_common_emul_set_read_fail_reg(common_data, BMI160_STATUS); - zassert_equal(EC_ERROR_INVAL, ms->drv->perform_calib(ms, 1), NULL); - zassert_equal(range, ms->current_range, NULL); - zassert_equal(rate, ms->drv->get_data_rate(ms), NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->perform_calib(ms, 1)); + zassert_equal(range, ms->current_range); + zassert_equal(rate, ms->drv->get_data_rate(ms)); /* Stop fast offset compensation before next test */ bmi_emul_set_reg(emul, BMI160_CMD_REG, BMI160_CMD_NOOP); @@ -1589,18 +1589,18 @@ ZTEST_USER(bmi160, test_bmi_gyr_perform_calib) i2c_common_emul_set_read_fail_reg(common_data, I2C_COMMON_EMUL_NO_FAIL_REG); i2c_common_emul_set_read_func(common_data, emul_nrdy, NULL); - zassert_equal(EC_RES_TIMEOUT, ms->drv->perform_calib(ms, 1), NULL); - zassert_equal(range, ms->current_range, NULL); - zassert_equal(rate, ms->drv->get_data_rate(ms), NULL); + zassert_equal(EC_RES_TIMEOUT, ms->drv->perform_calib(ms, 1)); + zassert_equal(range, ms->current_range); + zassert_equal(rate, ms->drv->get_data_rate(ms)); /* Remove custom emulator read function */ i2c_common_emul_set_read_func(common_data, NULL, NULL); /* Stop fast offset compensation before next test */ bmi_emul_set_reg(emul, BMI160_CMD_REG, BMI160_CMD_NOOP); /* Test successful offset compenastion */ - zassert_equal(EC_SUCCESS, ms->drv->perform_calib(ms, 1), NULL); - zassert_equal(range, ms->current_range, NULL); - zassert_equal(rate, ms->drv->get_data_rate(ms), NULL); + zassert_equal(EC_SUCCESS, ms->drv->perform_calib(ms, 1)); + zassert_equal(range, ms->current_range); + zassert_equal(rate, ms->drv->get_data_rate(ms)); get_emul_gyr_offset(emul, ret_off); /* * Depending on used range, gyroscope values may be up to 4 bits @@ -1622,9 +1622,9 @@ ZTEST_USER(bmi160, test_bmi_init) ms_gyr = &motion_sensors[BMI_GYR_SENSOR_ID]; /* Test successful init */ - zassert_equal(EC_RES_SUCCESS, ms_acc->drv->init(ms_acc), NULL); + zassert_equal(EC_RES_SUCCESS, ms_acc->drv->init(ms_acc)); - zassert_equal(EC_RES_SUCCESS, ms_gyr->drv->init(ms_gyr), NULL); + zassert_equal(EC_RES_SUCCESS, ms_gyr->drv->init(ms_gyr)); } /** Data for custom emulator read function used in FIFO test */ @@ -1763,8 +1763,8 @@ ZTEST_USER(bmi160, test_bmi_acc_fifo) ms_gyr = &motion_sensors[BMI_GYR_SENSOR_ID]; /* init bmi before test */ - zassert_equal(EC_RES_SUCCESS, ms->drv->init(ms), NULL); - zassert_equal(EC_RES_SUCCESS, ms_gyr->drv->init(ms_gyr), NULL); + zassert_equal(EC_RES_SUCCESS, ms->drv->init(ms)); + zassert_equal(EC_RES_SUCCESS, ms_gyr->drv->init(ms_gyr)); /* Need to be set to collect all data in FIFO */ ms->oversampling_ratio = 1; @@ -1778,9 +1778,9 @@ ZTEST_USER(bmi160, test_bmi_acc_fifo) /* Test fail to read interrupt status registers */ i2c_common_emul_set_read_fail_reg(common_data, BMI160_INT_STATUS_0); - zassert_equal(EC_ERROR_INVAL, ms->drv->irq_handler(ms, &event), NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->irq_handler(ms, &event)); i2c_common_emul_set_read_fail_reg(common_data, BMI160_INT_STATUS_1); - zassert_equal(EC_ERROR_INVAL, ms->drv->irq_handler(ms, &event), NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->irq_handler(ms, &event)); i2c_common_emul_set_read_fail_reg(common_data, I2C_COMMON_EMUL_NO_FAIL_REG); @@ -1789,7 +1789,7 @@ ZTEST_USER(bmi160, test_bmi_acc_fifo) bmi_emul_set_reg(emul, BMI160_INT_STATUS_1, 0); /* Enable sensor FIFO */ - zassert_equal(EC_SUCCESS, ms->drv->set_data_rate(ms, 50000, 0), NULL); + zassert_equal(EC_SUCCESS, ms->drv->set_data_rate(ms, 50000, 0)); /* Trigger irq handler and check results */ check_fifo(ms, ms_gyr, NULL, acc_range, gyr_range); @@ -1797,7 +1797,7 @@ ZTEST_USER(bmi160, test_bmi_acc_fifo) /* Set custom function for FIFO test */ i2c_common_emul_set_read_func(common_data, emul_fifo_func, &func_data); /* Set range */ - zassert_equal(EC_SUCCESS, ms->drv->set_range(ms, acc_range, 0), NULL); + zassert_equal(EC_SUCCESS, ms->drv->set_range(ms, acc_range, 0)); zassert_equal(EC_SUCCESS, ms_gyr->drv->set_range(ms_gyr, gyr_range, 0), NULL); /* Setup single accelerometer frame */ diff --git a/zephyr/test/drivers/default/src/bmi260.c b/zephyr/test/drivers/default/src/bmi260.c index 9295d631ca..5e44d1c499 100644 --- a/zephyr/test/drivers/default/src/bmi260.c +++ b/zephyr/test/drivers/default/src/bmi260.c @@ -217,8 +217,8 @@ ZTEST_USER(bmi260, test_bmi_acc_get_offset) ms->rot_standard_ref = NULL; /* Test get offset without rotation */ - zassert_equal(EC_SUCCESS, ms->drv->get_offset(ms, ret, &temp), NULL); - zassert_equal(temp, (int16_t)EC_MOTION_SENSE_INVALID_CALIB_TEMP, NULL); + zassert_equal(EC_SUCCESS, ms->drv->get_offset(ms, ret, &temp)); + zassert_equal(temp, (int16_t)EC_MOTION_SENSE_INVALID_CALIB_TEMP); convert_int3v_int16(ret, ret_v); compare_int3v(exp_v, ret_v); @@ -227,8 +227,8 @@ ZTEST_USER(bmi260, test_bmi_acc_get_offset) rotate_int3v_by_test_rotation(exp_v); /* Test get offset with rotation */ - zassert_equal(EC_SUCCESS, ms->drv->get_offset(ms, ret, &temp), NULL); - zassert_equal(temp, (int16_t)EC_MOTION_SENSE_INVALID_CALIB_TEMP, NULL); + zassert_equal(EC_SUCCESS, ms->drv->get_offset(ms, ret, &temp)); + zassert_equal(temp, (int16_t)EC_MOTION_SENSE_INVALID_CALIB_TEMP); convert_int3v_int16(ret, ret_v); compare_int3v(exp_v, ret_v); } @@ -281,8 +281,8 @@ ZTEST_USER(bmi260, test_bmi_gyr_get_offset) ms->rot_standard_ref = NULL; /* Test get offset without rotation */ - zassert_equal(EC_SUCCESS, ms->drv->get_offset(ms, ret, &temp), NULL); - zassert_equal(temp, (int16_t)EC_MOTION_SENSE_INVALID_CALIB_TEMP, NULL); + zassert_equal(EC_SUCCESS, ms->drv->get_offset(ms, ret, &temp)); + zassert_equal(temp, (int16_t)EC_MOTION_SENSE_INVALID_CALIB_TEMP); convert_int3v_int16(ret, ret_v); compare_int3v_eps(exp_v, ret_v, 64); @@ -291,8 +291,8 @@ ZTEST_USER(bmi260, test_bmi_gyr_get_offset) rotate_int3v_by_test_rotation(exp_v); /* Test get offset with rotation */ - zassert_equal(EC_SUCCESS, ms->drv->get_offset(ms, ret, &temp), NULL); - zassert_equal(temp, (int16_t)EC_MOTION_SENSE_INVALID_CALIB_TEMP, NULL); + zassert_equal(EC_SUCCESS, ms->drv->get_offset(ms, ret, &temp)); + zassert_equal(temp, (int16_t)EC_MOTION_SENSE_INVALID_CALIB_TEMP); convert_int3v_int16(ret, ret_v); compare_int3v_eps(exp_v, ret_v, 64); } @@ -356,7 +356,7 @@ ZTEST_USER(bmi260, test_bmi_acc_set_offset) ms->rot_standard_ref = NULL; /* Test set offset without rotation */ - zassert_equal(EC_SUCCESS, ms->drv->set_offset(ms, input_v, temp), NULL); + zassert_equal(EC_SUCCESS, ms->drv->set_offset(ms, input_v, temp)); get_emul_acc_offset(emul, ret_v); /* * Depending on used range, accelerometer values may be up to 6 bits @@ -378,7 +378,7 @@ ZTEST_USER(bmi260, test_bmi_acc_set_offset) convert_int3v_int16(ret_v, input_v); /* Test set offset with rotation */ - zassert_equal(EC_SUCCESS, ms->drv->set_offset(ms, input_v, temp), NULL); + zassert_equal(EC_SUCCESS, ms->drv->set_offset(ms, input_v, temp)); get_emul_acc_offset(emul, ret_v); compare_int3v_eps(exp_v, ret_v, 64); nv_c = bmi_emul_get_reg(emul, BMI260_NV_CONF); @@ -443,7 +443,7 @@ ZTEST_USER(bmi260, test_bmi_gyr_set_offset) ms->rot_standard_ref = NULL; /* Test set offset without rotation */ - zassert_equal(EC_SUCCESS, ms->drv->set_offset(ms, input_v, temp), NULL); + zassert_equal(EC_SUCCESS, ms->drv->set_offset(ms, input_v, temp)); get_emul_gyr_offset(emul, ret_v); /* * Depending on used range, gyroscope values may be up to 4 bits @@ -462,7 +462,7 @@ ZTEST_USER(bmi260, test_bmi_gyr_set_offset) convert_int3v_int16(ret_v, input_v); /* Test set offset with rotation */ - zassert_equal(EC_SUCCESS, ms->drv->set_offset(ms, input_v, temp), NULL); + zassert_equal(EC_SUCCESS, ms->drv->set_offset(ms, input_v, temp)); get_emul_gyr_offset(emul, ret_v); compare_int3v_eps(exp_v, ret_v, 32); zassert_true(bmi_emul_get_reg(emul, BMI260_OFFSET_EN_GYR98) & @@ -535,12 +535,12 @@ ZTEST_USER(bmi260, test_bmi_acc_set_range) i2c_common_emul_set_write_fail_reg(common_data, BMI260_ACC_RANGE); /* Test fail on write */ - zassert_equal(EC_ERROR_INVAL, ms->drv->set_range(ms, 12, 0), NULL); - zassert_equal(start_range, ms->current_range, NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->set_range(ms, 12, 0)); + zassert_equal(start_range, ms->current_range); zassert_equal(BMI260_GSEL_2G, bmi_emul_get_reg(emul, BMI260_ACC_RANGE), NULL); - zassert_equal(EC_ERROR_INVAL, ms->drv->set_range(ms, 12, 1), NULL); - zassert_equal(start_range, ms->current_range, NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->set_range(ms, 12, 1)); + zassert_equal(start_range, ms->current_range); zassert_equal(BMI260_GSEL_2G, bmi_emul_get_reg(emul, BMI260_ACC_RANGE), NULL); @@ -645,12 +645,12 @@ ZTEST_USER(bmi260, test_bmi_gyr_set_range) i2c_common_emul_set_write_fail_reg(common_data, BMI260_GYR_RANGE); /* Test fail on write */ - zassert_equal(EC_ERROR_INVAL, ms->drv->set_range(ms, 125, 0), NULL); - zassert_equal(start_range, ms->current_range, NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->set_range(ms, 125, 0)); + zassert_equal(start_range, ms->current_range); zassert_equal(BMI260_DPS_SEL_250, bmi_emul_get_reg(emul, BMI260_GYR_RANGE), NULL); - zassert_equal(EC_ERROR_INVAL, ms->drv->set_range(ms, 125, 1), NULL); - zassert_equal(start_range, ms->current_range, NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->set_range(ms, 125, 1)); + zassert_equal(start_range, ms->current_range); zassert_equal(BMI260_DPS_SEL_250, bmi_emul_get_reg(emul, BMI260_GYR_RANGE), NULL); @@ -704,13 +704,13 @@ ZTEST_USER(bmi260, test_bmi_get_resolution) ms = &motion_sensors[BMI_ACC_SENSOR_ID]; /* Resolution should be always 16 bits */ - zassert_equal(16, ms->drv->get_resolution(ms), NULL); + zassert_equal(16, ms->drv->get_resolution(ms)); /* Test gyroscope */ ms = &motion_sensors[BMI_GYR_SENSOR_ID]; /* Resolution should be always 16 bits */ - zassert_equal(16, ms->drv->get_resolution(ms), NULL); + zassert_equal(16, ms->drv->get_resolution(ms)); } /** @@ -856,12 +856,12 @@ ZTEST_USER(bmi260, test_bmi_acc_rate) /* Test fail on read */ zassert_equal(EC_ERROR_INVAL, ms->drv->set_data_rate(ms, 50000, 0), NULL); - zassert_equal(drv_rate, ms->drv->get_data_rate(ms), NULL); - zassert_equal(reg_rate, bmi_emul_get_reg(emul, BMI260_ACC_CONF), NULL); + zassert_equal(drv_rate, ms->drv->get_data_rate(ms)); + zassert_equal(reg_rate, bmi_emul_get_reg(emul, BMI260_ACC_CONF)); zassert_equal(EC_ERROR_INVAL, ms->drv->set_data_rate(ms, 50000, 1), NULL); - zassert_equal(drv_rate, ms->drv->get_data_rate(ms), NULL); - zassert_equal(reg_rate, bmi_emul_get_reg(emul, BMI260_ACC_CONF), NULL); + zassert_equal(drv_rate, ms->drv->get_data_rate(ms)); + zassert_equal(reg_rate, bmi_emul_get_reg(emul, BMI260_ACC_CONF)); /* Do not fail on read */ i2c_common_emul_set_read_fail_reg(common_data, @@ -873,12 +873,12 @@ ZTEST_USER(bmi260, test_bmi_acc_rate) /* Test fail on write */ zassert_equal(EC_ERROR_INVAL, ms->drv->set_data_rate(ms, 50000, 0), NULL); - zassert_equal(drv_rate, ms->drv->get_data_rate(ms), NULL); - zassert_equal(reg_rate, bmi_emul_get_reg(emul, BMI260_ACC_CONF), NULL); + zassert_equal(drv_rate, ms->drv->get_data_rate(ms)); + zassert_equal(reg_rate, bmi_emul_get_reg(emul, BMI260_ACC_CONF)); zassert_equal(EC_ERROR_INVAL, ms->drv->set_data_rate(ms, 50000, 1), NULL); - zassert_equal(drv_rate, ms->drv->get_data_rate(ms), NULL); - zassert_equal(reg_rate, bmi_emul_get_reg(emul, BMI260_ACC_CONF), NULL); + zassert_equal(drv_rate, ms->drv->get_data_rate(ms)); + zassert_equal(reg_rate, bmi_emul_get_reg(emul, BMI260_ACC_CONF)); /* Do not fail on write */ i2c_common_emul_set_write_fail_reg(common_data, @@ -888,22 +888,22 @@ ZTEST_USER(bmi260, test_bmi_acc_rate) bmi_emul_set_reg(emul, BMI260_PWR_CTRL, BMI260_AUX_EN | BMI260_GYR_EN | BMI260_ACC_EN); bmi_emul_set_reg(emul, BMI260_ACC_CONF, BMI260_FILTER_PERF); - zassert_equal(EC_SUCCESS, ms->drv->set_data_rate(ms, 0, 0), NULL); + zassert_equal(EC_SUCCESS, ms->drv->set_data_rate(ms, 0, 0)); pwr_ctrl = bmi_emul_get_reg(emul, BMI260_PWR_CTRL); reg_rate = bmi_emul_get_reg(emul, BMI260_ACC_CONF); - zassert_equal(BMI260_AUX_EN | BMI260_GYR_EN, pwr_ctrl, NULL); - zassert_true(!(reg_rate & BMI260_FILTER_PERF), NULL); + zassert_equal(BMI260_AUX_EN | BMI260_GYR_EN, pwr_ctrl); + zassert_true(!(reg_rate & BMI260_FILTER_PERF)); /* Test enabling sensor */ bmi_emul_set_reg(emul, BMI260_PWR_CTRL, 0); bmi_emul_set_reg(emul, BMI260_ACC_CONF, 0); - zassert_equal(EC_SUCCESS, ms->drv->set_data_rate(ms, 50000, 0), NULL); + zassert_equal(EC_SUCCESS, ms->drv->set_data_rate(ms, 50000, 0)); pwr_ctrl = bmi_emul_get_reg(emul, BMI260_PWR_CTRL); reg_rate = bmi_emul_get_reg(emul, BMI260_ACC_CONF); - zassert_equal(BMI260_ACC_EN, pwr_ctrl, NULL); - zassert_true(reg_rate & BMI260_FILTER_PERF, NULL); + zassert_equal(BMI260_ACC_EN, pwr_ctrl); + zassert_true(reg_rate & BMI260_FILTER_PERF); /* Test disabling sensor (by setting rate to 0) but failing. */ i2c_common_emul_set_write_fail_reg(common_data, BMI260_PWR_CTRL); @@ -1059,12 +1059,12 @@ ZTEST_USER(bmi260, test_bmi_gyr_rate) /* Test fail on read */ zassert_equal(EC_ERROR_INVAL, ms->drv->set_data_rate(ms, 50000, 0), NULL); - zassert_equal(drv_rate, ms->drv->get_data_rate(ms), NULL); - zassert_equal(reg_rate, bmi_emul_get_reg(emul, BMI260_GYR_CONF), NULL); + zassert_equal(drv_rate, ms->drv->get_data_rate(ms)); + zassert_equal(reg_rate, bmi_emul_get_reg(emul, BMI260_GYR_CONF)); zassert_equal(EC_ERROR_INVAL, ms->drv->set_data_rate(ms, 50000, 1), NULL); - zassert_equal(drv_rate, ms->drv->get_data_rate(ms), NULL); - zassert_equal(reg_rate, bmi_emul_get_reg(emul, BMI260_GYR_CONF), NULL); + zassert_equal(drv_rate, ms->drv->get_data_rate(ms)); + zassert_equal(reg_rate, bmi_emul_get_reg(emul, BMI260_GYR_CONF)); /* Do not fail on read */ i2c_common_emul_set_read_fail_reg(common_data, @@ -1076,12 +1076,12 @@ ZTEST_USER(bmi260, test_bmi_gyr_rate) /* Test fail on write */ zassert_equal(EC_ERROR_INVAL, ms->drv->set_data_rate(ms, 50000, 0), NULL); - zassert_equal(drv_rate, ms->drv->get_data_rate(ms), NULL); - zassert_equal(reg_rate, bmi_emul_get_reg(emul, BMI260_GYR_CONF), NULL); + zassert_equal(drv_rate, ms->drv->get_data_rate(ms)); + zassert_equal(reg_rate, bmi_emul_get_reg(emul, BMI260_GYR_CONF)); zassert_equal(EC_ERROR_INVAL, ms->drv->set_data_rate(ms, 50000, 1), NULL); - zassert_equal(drv_rate, ms->drv->get_data_rate(ms), NULL); - zassert_equal(reg_rate, bmi_emul_get_reg(emul, BMI260_GYR_CONF), NULL); + zassert_equal(drv_rate, ms->drv->get_data_rate(ms)); + zassert_equal(reg_rate, bmi_emul_get_reg(emul, BMI260_GYR_CONF)); /* Do not fail on write */ i2c_common_emul_set_write_fail_reg(common_data, @@ -1092,22 +1092,22 @@ ZTEST_USER(bmi260, test_bmi_gyr_rate) BMI260_AUX_EN | BMI260_GYR_EN | BMI260_ACC_EN); bmi_emul_set_reg(emul, BMI260_GYR_CONF, BMI260_FILTER_PERF | BMI260_GYR_NOISE_PERF); - zassert_equal(EC_SUCCESS, ms->drv->set_data_rate(ms, 0, 0), NULL); + zassert_equal(EC_SUCCESS, ms->drv->set_data_rate(ms, 0, 0)); pwr_ctrl = bmi_emul_get_reg(emul, BMI260_PWR_CTRL); reg_rate = bmi_emul_get_reg(emul, BMI260_GYR_CONF); - zassert_equal(BMI260_AUX_EN | BMI260_ACC_EN, pwr_ctrl, NULL); + zassert_equal(BMI260_AUX_EN | BMI260_ACC_EN, pwr_ctrl); zassert_true(!(reg_rate & (BMI260_FILTER_PERF | BMI260_GYR_NOISE_PERF)), NULL); /* Test enabling sensor */ bmi_emul_set_reg(emul, BMI260_PWR_CTRL, 0); bmi_emul_set_reg(emul, BMI260_GYR_CONF, 0); - zassert_equal(EC_SUCCESS, ms->drv->set_data_rate(ms, 50000, 0), NULL); + zassert_equal(EC_SUCCESS, ms->drv->set_data_rate(ms, 50000, 0)); pwr_ctrl = bmi_emul_get_reg(emul, BMI260_PWR_CTRL); reg_rate = bmi_emul_get_reg(emul, BMI260_GYR_CONF); - zassert_equal(BMI260_GYR_EN, pwr_ctrl, NULL); + zassert_equal(BMI260_GYR_EN, pwr_ctrl); zassert_true(reg_rate & (BMI260_FILTER_PERF | BMI260_GYR_NOISE_PERF), NULL); } @@ -1126,24 +1126,24 @@ ZTEST_USER(bmi260, test_bmi_scale) /* Test accelerometer */ ms = &motion_sensors[BMI_ACC_SENSOR_ID]; - zassert_equal(EC_SUCCESS, ms->drv->set_scale(ms, exp_scale, 0), NULL); - zassert_equal(EC_SUCCESS, ms->drv->get_scale(ms, ret_scale, &t), NULL); + zassert_equal(EC_SUCCESS, ms->drv->set_scale(ms, exp_scale, 0)); + zassert_equal(EC_SUCCESS, ms->drv->get_scale(ms, ret_scale, &t)); - zassert_equal(t, (int16_t)EC_MOTION_SENSE_INVALID_CALIB_TEMP, NULL); - zassert_equal(exp_scale[0], ret_scale[0], NULL); - zassert_equal(exp_scale[1], ret_scale[1], NULL); - zassert_equal(exp_scale[2], ret_scale[2], NULL); + zassert_equal(t, (int16_t)EC_MOTION_SENSE_INVALID_CALIB_TEMP); + zassert_equal(exp_scale[0], ret_scale[0]); + zassert_equal(exp_scale[1], ret_scale[1]); + zassert_equal(exp_scale[2], ret_scale[2]); /* Test gyroscope */ ms = &motion_sensors[BMI_GYR_SENSOR_ID]; - zassert_equal(EC_SUCCESS, ms->drv->set_scale(ms, exp_scale, 0), NULL); - zassert_equal(EC_SUCCESS, ms->drv->get_scale(ms, ret_scale, &t), NULL); + zassert_equal(EC_SUCCESS, ms->drv->set_scale(ms, exp_scale, 0)); + zassert_equal(EC_SUCCESS, ms->drv->get_scale(ms, ret_scale, &t)); - zassert_equal(t, (int16_t)EC_MOTION_SENSE_INVALID_CALIB_TEMP, NULL); - zassert_equal(exp_scale[0], ret_scale[0], NULL); - zassert_equal(exp_scale[1], ret_scale[1], NULL); - zassert_equal(exp_scale[2], ret_scale[2], NULL); + zassert_equal(t, (int16_t)EC_MOTION_SENSE_INVALID_CALIB_TEMP); + zassert_equal(exp_scale[0], ret_scale[0]); + zassert_equal(exp_scale[1], ret_scale[1]); + zassert_equal(exp_scale[2], ret_scale[2]); } /** Test reading temperature using accelerometer and gyroscope sensors */ @@ -1191,40 +1191,40 @@ ZTEST_USER(bmi260, test_bmi_read_temp) bmi_emul_set_reg(emul, BMI260_TEMPERATURE_1, 0x00); zassert_equal(EC_SUCCESS, ms_acc->drv->read_temp(ms_acc, &ret_temp), NULL); - zassert_equal(exp_temp, ret_temp, NULL); + zassert_equal(exp_temp, ret_temp); zassert_equal(EC_SUCCESS, ms_gyr->drv->read_temp(ms_gyr, &ret_temp), NULL); - zassert_equal(exp_temp, ret_temp, NULL); + zassert_equal(exp_temp, ret_temp); exp_temp = C_TO_K(87); bmi_emul_set_reg(emul, BMI260_TEMPERATURE_0, 0xff); bmi_emul_set_reg(emul, BMI260_TEMPERATURE_1, 0x7f); zassert_equal(EC_SUCCESS, ms_acc->drv->read_temp(ms_acc, &ret_temp), NULL); - zassert_equal(exp_temp, ret_temp, NULL); + zassert_equal(exp_temp, ret_temp); zassert_equal(EC_SUCCESS, ms_gyr->drv->read_temp(ms_gyr, &ret_temp), NULL); - zassert_equal(exp_temp, ret_temp, NULL); + zassert_equal(exp_temp, ret_temp); exp_temp = C_TO_K(-41); bmi_emul_set_reg(emul, BMI260_TEMPERATURE_0, 0x01); bmi_emul_set_reg(emul, BMI260_TEMPERATURE_1, 0x80); zassert_equal(EC_SUCCESS, ms_acc->drv->read_temp(ms_acc, &ret_temp), NULL); - zassert_equal(exp_temp, ret_temp, NULL); + zassert_equal(exp_temp, ret_temp); zassert_equal(EC_SUCCESS, ms_gyr->drv->read_temp(ms_gyr, &ret_temp), NULL); - zassert_equal(exp_temp, ret_temp, NULL); + zassert_equal(exp_temp, ret_temp); exp_temp = C_TO_K(47); bmi_emul_set_reg(emul, BMI260_TEMPERATURE_0, 0x00); bmi_emul_set_reg(emul, BMI260_TEMPERATURE_1, 0x30); zassert_equal(EC_SUCCESS, ms_acc->drv->read_temp(ms_acc, &ret_temp), NULL); - zassert_equal(exp_temp, ret_temp, NULL); + zassert_equal(exp_temp, ret_temp); zassert_equal(EC_SUCCESS, ms_gyr->drv->read_temp(ms_gyr, &ret_temp), NULL); - zassert_equal(exp_temp, ret_temp, NULL); + zassert_equal(exp_temp, ret_temp); } /** Test reading accelerometer sensor data */ @@ -1249,7 +1249,7 @@ ZTEST_USER(bmi260, test_bmi_acc_read) /* Fail on read status */ i2c_common_emul_set_read_fail_reg(common_data, BMI260_STATUS); - zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v), NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v)); i2c_common_emul_set_read_fail_reg(common_data, I2C_COMMON_EMUL_NO_FAIL_REG); @@ -1264,12 +1264,12 @@ ZTEST_USER(bmi260, test_bmi_acc_read) /* Status not ready */ bmi_emul_set_reg(emul, BMI260_STATUS, 0); - zassert_equal(EC_SUCCESS, ms->drv->read(ms, ret_v), NULL); + zassert_equal(EC_SUCCESS, ms->drv->read(ms, ret_v)); compare_int3v(exp_v, ret_v); /* Status only GYR ready */ bmi_emul_set_reg(emul, BMI260_STATUS, BMI260_DRDY_GYR); - zassert_equal(EC_SUCCESS, ms->drv->read(ms, ret_v), NULL); + zassert_equal(EC_SUCCESS, ms->drv->read(ms, ret_v)); compare_int3v(exp_v, ret_v); /* Status ACC ready */ @@ -1283,20 +1283,20 @@ ZTEST_USER(bmi260, test_bmi_acc_read) /* Disable rotation */ ms->rot_standard_ref = NULL; /* Set scale */ - zassert_equal(EC_SUCCESS, ms->drv->set_scale(ms, scale, 0), NULL); + zassert_equal(EC_SUCCESS, ms->drv->set_scale(ms, scale, 0)); /* Set range to 2G */ - zassert_equal(EC_SUCCESS, ms->drv->set_range(ms, 2, 0), NULL); + zassert_equal(EC_SUCCESS, ms->drv->set_range(ms, 2, 0)); /* Test read without rotation */ - zassert_equal(EC_SUCCESS, ms->drv->read(ms, ret_v), NULL); + zassert_equal(EC_SUCCESS, ms->drv->read(ms, ret_v)); drv_acc_to_emul(ret_v, 2, ret_v); compare_int3v(exp_v, ret_v); /* Set range to 4G */ - zassert_equal(EC_SUCCESS, ms->drv->set_range(ms, 4, 0), NULL); + zassert_equal(EC_SUCCESS, ms->drv->set_range(ms, 4, 0)); /* Test read without rotation */ - zassert_equal(EC_SUCCESS, ms->drv->read(ms, ret_v), NULL); + zassert_equal(EC_SUCCESS, ms->drv->read(ms, ret_v)); drv_acc_to_emul(ret_v, 4, ret_v); compare_int3v(exp_v, ret_v); @@ -1304,34 +1304,34 @@ ZTEST_USER(bmi260, test_bmi_acc_read) ms->rot_standard_ref = &test_rotation; rotate_int3v_by_test_rotation(exp_v); /* Set range to 2G */ - zassert_equal(EC_SUCCESS, ms->drv->set_range(ms, 2, 0), NULL); + zassert_equal(EC_SUCCESS, ms->drv->set_range(ms, 2, 0)); /* Test read with rotation */ - zassert_equal(EC_SUCCESS, ms->drv->read(ms, ret_v), NULL); + zassert_equal(EC_SUCCESS, ms->drv->read(ms, ret_v)); drv_acc_to_emul(ret_v, 2, ret_v); compare_int3v(exp_v, ret_v); /* Set range to 4G */ - zassert_equal(EC_SUCCESS, ms->drv->set_range(ms, 4, 0), NULL); + zassert_equal(EC_SUCCESS, ms->drv->set_range(ms, 4, 0)); /* Test read with rotation */ - zassert_equal(EC_SUCCESS, ms->drv->read(ms, ret_v), NULL); + zassert_equal(EC_SUCCESS, ms->drv->read(ms, ret_v)); drv_acc_to_emul(ret_v, 4, ret_v); compare_int3v(exp_v, ret_v); /* Fail on read of data registers */ i2c_common_emul_set_read_fail_reg(common_data, BMI260_ACC_X_L_G); - zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v), NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v)); i2c_common_emul_set_read_fail_reg(common_data, BMI260_ACC_X_H_G); - zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v), NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v)); i2c_common_emul_set_read_fail_reg(common_data, BMI260_ACC_Y_L_G); - zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v), NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v)); i2c_common_emul_set_read_fail_reg(common_data, BMI260_ACC_Y_H_G); - zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v), NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v)); i2c_common_emul_set_read_fail_reg(common_data, BMI260_ACC_Z_L_G); - zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v), NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v)); i2c_common_emul_set_read_fail_reg(common_data, BMI260_ACC_Z_H_G); - zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v), NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v)); i2c_common_emul_set_read_fail_reg(common_data, I2C_COMMON_EMUL_NO_FAIL_REG); @@ -1360,7 +1360,7 @@ ZTEST_USER(bmi260, test_bmi_gyr_read) /* Fail on read status */ i2c_common_emul_set_read_fail_reg(common_data, BMI260_STATUS); - zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v), NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v)); i2c_common_emul_set_read_fail_reg(common_data, I2C_COMMON_EMUL_NO_FAIL_REG); @@ -1375,12 +1375,12 @@ ZTEST_USER(bmi260, test_bmi_gyr_read) /* Status not ready */ bmi_emul_set_reg(emul, BMI260_STATUS, 0); - zassert_equal(EC_SUCCESS, ms->drv->read(ms, ret_v), NULL); + zassert_equal(EC_SUCCESS, ms->drv->read(ms, ret_v)); compare_int3v(exp_v, ret_v); /* Status only ACC ready */ bmi_emul_set_reg(emul, BMI260_STATUS, BMI260_DRDY_ACC); - zassert_equal(EC_SUCCESS, ms->drv->read(ms, ret_v), NULL); + zassert_equal(EC_SUCCESS, ms->drv->read(ms, ret_v)); compare_int3v(exp_v, ret_v); /* Status GYR ready */ @@ -1394,20 +1394,20 @@ ZTEST_USER(bmi260, test_bmi_gyr_read) /* Disable rotation */ ms->rot_standard_ref = NULL; /* Set scale */ - zassert_equal(EC_SUCCESS, ms->drv->set_scale(ms, scale, 0), NULL); + zassert_equal(EC_SUCCESS, ms->drv->set_scale(ms, scale, 0)); /* Set range to 125°/s */ - zassert_equal(EC_SUCCESS, ms->drv->set_range(ms, 125, 0), NULL); + zassert_equal(EC_SUCCESS, ms->drv->set_range(ms, 125, 0)); /* Test read without rotation */ - zassert_equal(EC_SUCCESS, ms->drv->read(ms, ret_v), NULL); + zassert_equal(EC_SUCCESS, ms->drv->read(ms, ret_v)); drv_gyr_to_emul(ret_v, 125, ret_v); compare_int3v(exp_v, ret_v); /* Set range to 1000°/s */ - zassert_equal(EC_SUCCESS, ms->drv->set_range(ms, 1000, 0), NULL); + zassert_equal(EC_SUCCESS, ms->drv->set_range(ms, 1000, 0)); /* Test read without rotation */ - zassert_equal(EC_SUCCESS, ms->drv->read(ms, ret_v), NULL); + zassert_equal(EC_SUCCESS, ms->drv->read(ms, ret_v)); drv_gyr_to_emul(ret_v, 1000, ret_v); compare_int3v(exp_v, ret_v); @@ -1415,34 +1415,34 @@ ZTEST_USER(bmi260, test_bmi_gyr_read) ms->rot_standard_ref = &test_rotation; rotate_int3v_by_test_rotation(exp_v); /* Set range to 125°/s */ - zassert_equal(EC_SUCCESS, ms->drv->set_range(ms, 125, 0), NULL); + zassert_equal(EC_SUCCESS, ms->drv->set_range(ms, 125, 0)); /* Test read with rotation */ - zassert_equal(EC_SUCCESS, ms->drv->read(ms, ret_v), NULL); + zassert_equal(EC_SUCCESS, ms->drv->read(ms, ret_v)); drv_gyr_to_emul(ret_v, 125, ret_v); compare_int3v(exp_v, ret_v); /* Set range to 1000°/s */ - zassert_equal(EC_SUCCESS, ms->drv->set_range(ms, 1000, 0), NULL); + zassert_equal(EC_SUCCESS, ms->drv->set_range(ms, 1000, 0)); /* Test read with rotation */ - zassert_equal(EC_SUCCESS, ms->drv->read(ms, ret_v), NULL); + zassert_equal(EC_SUCCESS, ms->drv->read(ms, ret_v)); drv_gyr_to_emul(ret_v, 1000, ret_v); compare_int3v(exp_v, ret_v); /* Fail on read of data registers */ i2c_common_emul_set_read_fail_reg(common_data, BMI260_GYR_X_L_G); - zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v), NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v)); i2c_common_emul_set_read_fail_reg(common_data, BMI260_GYR_X_H_G); - zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v), NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v)); i2c_common_emul_set_read_fail_reg(common_data, BMI260_GYR_Y_L_G); - zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v), NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v)); i2c_common_emul_set_read_fail_reg(common_data, BMI260_GYR_Y_H_G); - zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v), NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v)); i2c_common_emul_set_read_fail_reg(common_data, BMI260_GYR_Z_L_G); - zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v), NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v)); i2c_common_emul_set_read_fail_reg(common_data, BMI260_GYR_Z_H_G); - zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v), NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, ret_v)); i2c_common_emul_set_read_fail_reg(common_data, I2C_COMMON_EMUL_NO_FAIL_REG); @@ -1472,8 +1472,8 @@ ZTEST_USER(bmi260, test_bmi_acc_perform_calib) /* Range and rate cannot change after calibration */ range = 4; rate = 50000; - zassert_equal(EC_SUCCESS, ms->drv->set_range(ms, range, 0), NULL); - zassert_equal(EC_SUCCESS, ms->drv->set_data_rate(ms, rate, 0), NULL); + zassert_equal(EC_SUCCESS, ms->drv->set_range(ms, range, 0)); + zassert_equal(EC_SUCCESS, ms->drv->set_data_rate(ms, rate, 0)); /* Set offset 0 */ start_off[0] = 0; @@ -1493,54 +1493,54 @@ ZTEST_USER(bmi260, test_bmi_acc_perform_calib) exp_off[2] = BMI_EMUL_1G - exp_off[2]; /* Test success on disabling calibration */ - zassert_equal(EC_SUCCESS, ms->drv->perform_calib(ms, 0), NULL); - zassert_equal(range, ms->current_range, NULL); - zassert_equal(rate, ms->drv->get_data_rate(ms), NULL); + zassert_equal(EC_SUCCESS, ms->drv->perform_calib(ms, 0)); + zassert_equal(range, ms->current_range); + zassert_equal(rate, ms->drv->get_data_rate(ms)); /* Test fail on rate read */ i2c_common_emul_set_read_fail_reg(common_data, BMI260_ACC_CONF); - zassert_equal(EC_ERROR_INVAL, ms->drv->perform_calib(ms, 1), NULL); - zassert_equal(range, ms->current_range, NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->perform_calib(ms, 1)); + zassert_equal(range, ms->current_range); i2c_common_emul_set_read_fail_reg(common_data, I2C_COMMON_EMUL_NO_FAIL_REG); - zassert_equal(rate, ms->drv->get_data_rate(ms), NULL); + zassert_equal(rate, ms->drv->get_data_rate(ms)); /* Test fail on status read */ i2c_common_emul_set_read_fail_reg(common_data, BMI260_STATUS); - zassert_equal(EC_ERROR_INVAL, ms->drv->perform_calib(ms, 1), NULL); - zassert_equal(range, ms->current_range, NULL); - zassert_equal(rate, ms->drv->get_data_rate(ms), NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->perform_calib(ms, 1)); + zassert_equal(range, ms->current_range); + zassert_equal(rate, ms->drv->get_data_rate(ms)); /* Test fail on data not ready */ i2c_common_emul_set_read_fail_reg(common_data, I2C_COMMON_EMUL_NO_FAIL_REG); bmi_emul_set_reg(emul, BMI260_STATUS, 0); - zassert_equal(EC_ERROR_TIMEOUT, ms->drv->perform_calib(ms, 1), NULL); - zassert_equal(range, ms->current_range, NULL); - zassert_equal(rate, ms->drv->get_data_rate(ms), NULL); + zassert_equal(EC_ERROR_TIMEOUT, ms->drv->perform_calib(ms, 1)); + zassert_equal(range, ms->current_range); + zassert_equal(rate, ms->drv->get_data_rate(ms)); /* Setup data status ready for rest of the test */ bmi_emul_set_reg(emul, BMI260_STATUS, BMI260_DRDY_ACC); /* Test fail on data read */ i2c_common_emul_set_read_fail_reg(common_data, BMI260_ACC_X_L_G); - zassert_equal(EC_ERROR_INVAL, ms->drv->perform_calib(ms, 1), NULL); - zassert_equal(range, ms->current_range, NULL); - zassert_equal(rate, ms->drv->get_data_rate(ms), NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->perform_calib(ms, 1)); + zassert_equal(range, ms->current_range); + zassert_equal(rate, ms->drv->get_data_rate(ms)); /* Test fail on setting offset */ i2c_common_emul_set_read_fail_reg(common_data, BMI260_NV_CONF); - zassert_equal(EC_ERROR_INVAL, ms->drv->perform_calib(ms, 1), NULL); - zassert_equal(range, ms->current_range, NULL); - zassert_equal(rate, ms->drv->get_data_rate(ms), NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->perform_calib(ms, 1)); + zassert_equal(range, ms->current_range); + zassert_equal(rate, ms->drv->get_data_rate(ms)); i2c_common_emul_set_read_fail_reg(common_data, I2C_COMMON_EMUL_NO_FAIL_REG); /* Test successful offset compenastion */ - zassert_equal(EC_SUCCESS, ms->drv->perform_calib(ms, 1), NULL); - zassert_equal(range, ms->current_range, NULL); - zassert_equal(rate, ms->drv->get_data_rate(ms), NULL); + zassert_equal(EC_SUCCESS, ms->drv->perform_calib(ms, 1)); + zassert_equal(range, ms->current_range); + zassert_equal(rate, ms->drv->get_data_rate(ms)); get_emul_acc_offset(emul, ret_off); /* * Depending on used range, accelerometer values may be up to 6 bits @@ -1569,8 +1569,8 @@ ZTEST_USER(bmi260, test_bmi_gyr_perform_calib) /* Range and rate cannot change after calibration */ range = 125; rate = 50000; - zassert_equal(EC_SUCCESS, ms->drv->set_range(ms, range, 0), NULL); - zassert_equal(EC_SUCCESS, ms->drv->set_data_rate(ms, rate, 0), NULL); + zassert_equal(EC_SUCCESS, ms->drv->set_range(ms, range, 0)); + zassert_equal(EC_SUCCESS, ms->drv->set_data_rate(ms, rate, 0)); /* Set offset 0 */ start_off[0] = 0; @@ -1590,31 +1590,31 @@ ZTEST_USER(bmi260, test_bmi_gyr_perform_calib) exp_off[2] = -exp_off[2]; /* Test success on disabling calibration */ - zassert_equal(EC_SUCCESS, ms->drv->perform_calib(ms, 0), NULL); - zassert_equal(range, ms->current_range, NULL); - zassert_equal(rate, ms->drv->get_data_rate(ms), NULL); + zassert_equal(EC_SUCCESS, ms->drv->perform_calib(ms, 0)); + zassert_equal(range, ms->current_range); + zassert_equal(rate, ms->drv->get_data_rate(ms)); /* Test fail on rate read */ i2c_common_emul_set_read_fail_reg(common_data, BMI260_GYR_CONF); - zassert_equal(EC_ERROR_INVAL, ms->drv->perform_calib(ms, 1), NULL); - zassert_equal(range, ms->current_range, NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->perform_calib(ms, 1)); + zassert_equal(range, ms->current_range); i2c_common_emul_set_read_fail_reg(common_data, I2C_COMMON_EMUL_NO_FAIL_REG); - zassert_equal(rate, ms->drv->get_data_rate(ms), NULL); + zassert_equal(rate, ms->drv->get_data_rate(ms)); /* Test fail on status read */ i2c_common_emul_set_read_fail_reg(common_data, BMI260_STATUS); - zassert_equal(EC_ERROR_INVAL, ms->drv->perform_calib(ms, 1), NULL); - zassert_equal(range, ms->current_range, NULL); - zassert_equal(rate, ms->drv->get_data_rate(ms), NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->perform_calib(ms, 1)); + zassert_equal(range, ms->current_range); + zassert_equal(rate, ms->drv->get_data_rate(ms)); /* Test fail on data not ready */ i2c_common_emul_set_read_fail_reg(common_data, I2C_COMMON_EMUL_NO_FAIL_REG); bmi_emul_set_reg(emul, BMI260_STATUS, 0); - zassert_equal(EC_ERROR_TIMEOUT, ms->drv->perform_calib(ms, 1), NULL); - zassert_equal(range, ms->current_range, NULL); - zassert_equal(rate, ms->drv->get_data_rate(ms), NULL); + zassert_equal(EC_ERROR_TIMEOUT, ms->drv->perform_calib(ms, 1)); + zassert_equal(range, ms->current_range); + zassert_equal(rate, ms->drv->get_data_rate(ms)); /* * Setup data status ready for rest of the test. Gyroscope calibration @@ -1625,23 +1625,23 @@ ZTEST_USER(bmi260, test_bmi_gyr_perform_calib) /* Test fail on data read */ i2c_common_emul_set_read_fail_reg(common_data, BMI260_GYR_X_L_G); - zassert_equal(EC_ERROR_INVAL, ms->drv->perform_calib(ms, 1), NULL); - zassert_equal(range, ms->current_range, NULL); - zassert_equal(rate, ms->drv->get_data_rate(ms), NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->perform_calib(ms, 1)); + zassert_equal(range, ms->current_range); + zassert_equal(rate, ms->drv->get_data_rate(ms)); /* Test fail on setting offset */ i2c_common_emul_set_read_fail_reg(common_data, BMI260_OFFSET_EN_GYR98); - zassert_equal(EC_ERROR_INVAL, ms->drv->perform_calib(ms, 1), NULL); - zassert_equal(range, ms->current_range, NULL); - zassert_equal(rate, ms->drv->get_data_rate(ms), NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->perform_calib(ms, 1)); + zassert_equal(range, ms->current_range); + zassert_equal(rate, ms->drv->get_data_rate(ms)); i2c_common_emul_set_read_fail_reg(common_data, I2C_COMMON_EMUL_NO_FAIL_REG); /* Test successful offset compenastion */ - zassert_equal(EC_SUCCESS, ms->drv->perform_calib(ms, 1), NULL); - zassert_equal(range, ms->current_range, NULL); - zassert_equal(rate, ms->drv->get_data_rate(ms), NULL); + zassert_equal(EC_SUCCESS, ms->drv->perform_calib(ms, 1)); + zassert_equal(range, ms->current_range); + zassert_equal(rate, ms->drv->get_data_rate(ms)); get_emul_gyr_offset(emul, ret_off); /* * Depending on used range, gyroscope values may be up to 4 bits @@ -1826,9 +1826,9 @@ ZTEST_USER(bmi260, test_bmi_acc_fifo) /* Test fail to read interrupt status registers */ i2c_common_emul_set_read_fail_reg(common_data, BMI260_INT_STATUS_0); - zassert_equal(EC_ERROR_INVAL, ms->drv->irq_handler(ms, &event), NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->irq_handler(ms, &event)); i2c_common_emul_set_read_fail_reg(common_data, BMI260_INT_STATUS_1); - zassert_equal(EC_ERROR_INVAL, ms->drv->irq_handler(ms, &event), NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->irq_handler(ms, &event)); i2c_common_emul_set_read_fail_reg(common_data, I2C_COMMON_EMUL_NO_FAIL_REG); @@ -1837,7 +1837,7 @@ ZTEST_USER(bmi260, test_bmi_acc_fifo) bmi_emul_set_reg(emul, BMI260_INT_STATUS_1, 0); /* Enable sensor FIFO */ - zassert_equal(EC_SUCCESS, ms->drv->set_data_rate(ms, 50000, 0), NULL); + zassert_equal(EC_SUCCESS, ms->drv->set_data_rate(ms, 50000, 0)); /* Trigger irq handler and check results */ check_fifo(ms, ms_gyr, NULL, acc_range, gyr_range); @@ -1845,7 +1845,7 @@ ZTEST_USER(bmi260, test_bmi_acc_fifo) /* Set custom function for FIFO test */ i2c_common_emul_set_read_func(common_data, emul_fifo_func, &func_data); /* Set range */ - zassert_equal(EC_SUCCESS, ms->drv->set_range(ms, acc_range, 0), NULL); + zassert_equal(EC_SUCCESS, ms->drv->set_range(ms, acc_range, 0)); zassert_equal(EC_SUCCESS, ms_gyr->drv->set_range(ms_gyr, gyr_range, 0), NULL); /* Setup single accelerometer frame */ diff --git a/zephyr/test/drivers/default/src/charge_manager.c b/zephyr/test/drivers/default/src/charge_manager.c index 85048178ae..2729816a76 100644 --- a/zephyr/test/drivers/default/src/charge_manager.c +++ b/zephyr/test/drivers/default/src/charge_manager.c @@ -30,11 +30,11 @@ ZTEST_USER(charge_manager, test_default_fill_power_info) }; board_fill_source_power_info(0, &info); - zassert_equal(info.meas.voltage_now, 0, NULL); - zassert_equal(info.meas.voltage_max, 0, NULL); - zassert_equal(info.meas.current_max, 0, NULL); - zassert_equal(info.meas.current_lim, 0, NULL); - zassert_equal(info.max_power, 0, NULL); + zassert_equal(info.meas.voltage_now, 0); + zassert_equal(info.meas.voltage_max, 0); + zassert_equal(info.meas.current_max, 0); + zassert_equal(info.meas.current_lim, 0); + zassert_equal(info.max_power, 0); } /** @@ -43,16 +43,16 @@ ZTEST_USER(charge_manager, test_default_fill_power_info) */ ZTEST_USER(charge_manager, test_default_charge_port_is_connected) { - zassert_true(board_charge_port_is_connected(-1), NULL); - zassert_true(board_charge_port_is_connected(0), NULL); - zassert_true(board_charge_port_is_connected(1), NULL); - zassert_true(board_charge_port_is_connected(500), NULL); + zassert_true(board_charge_port_is_connected(-1)); + zassert_true(board_charge_port_is_connected(0)); + zassert_true(board_charge_port_is_connected(1)); + zassert_true(board_charge_port_is_connected(500)); } ZTEST_USER(charge_manager, test_default_charge_port_is_sink) { - zassert_true(board_charge_port_is_sink(-1), NULL); - zassert_true(board_charge_port_is_sink(0), NULL); - zassert_true(board_charge_port_is_sink(1), NULL); - zassert_true(board_charge_port_is_sink(500), NULL); + zassert_true(board_charge_port_is_sink(-1)); + zassert_true(board_charge_port_is_sink(0)); + zassert_true(board_charge_port_is_sink(1)); + zassert_true(board_charge_port_is_sink(500)); } diff --git a/zephyr/test/drivers/default/src/console_cmd/accelinfo.c b/zephyr/test/drivers/default/src/console_cmd/accelinfo.c index 11638fcc70..39556fab43 100644 --- a/zephyr/test/drivers/default/src/console_cmd/accelinfo.c +++ b/zephyr/test/drivers/default/src/console_cmd/accelinfo.c @@ -31,7 +31,7 @@ ZTEST_USER(console_cmd_accelinfo, test_too_many_args) ZTEST_USER(console_cmd_accelinfo, test_print_once) { - zassert_ok(shell_execute_cmd(get_ec_shell(), "accelinfo"), NULL); + zassert_ok(shell_execute_cmd(get_ec_shell(), "accelinfo")); } ZTEST_USER(console_cmd_accelinfo, test_invalid_arg) @@ -48,8 +48,8 @@ ZTEST_USER(console_cmd_accelinfo, test_enable_disable) * There's no way to verify what is being printed to the console yet, so * just assert that the command executed and returned 0. */ - zassert_ok(shell_execute_cmd(get_ec_shell(), "accelinfo on"), NULL); + zassert_ok(shell_execute_cmd(get_ec_shell(), "accelinfo on")); k_msleep(CONFIG_MOTION_MIN_SENSE_WAIT_TIME * MSEC * 2); - zassert_ok(shell_execute_cmd(get_ec_shell(), "accelinfo off"), NULL); + zassert_ok(shell_execute_cmd(get_ec_shell(), "accelinfo off")); } diff --git a/zephyr/test/drivers/default/src/console_cmd/accelinit.c b/zephyr/test/drivers/default/src/console_cmd/accelinit.c index c440faebba..e722409298 100644 --- a/zephyr/test/drivers/default/src/console_cmd/accelinit.c +++ b/zephyr/test/drivers/default/src/console_cmd/accelinit.c @@ -71,7 +71,7 @@ ZTEST_USER(console_cmd_accelinit, test_state_was_set) { motion_sensors[0].state = SENSOR_INIT_ERROR; - zassert_ok(shell_execute_cmd(get_ec_shell(), "accelinit 0"), NULL); + zassert_ok(shell_execute_cmd(get_ec_shell(), "accelinit 0")); zassert_equal(SENSOR_INITIALIZED, motion_sensors[0].state, "Expected %d, but got %d", SENSOR_INITIALIZED, motion_sensors[0].state); @@ -83,7 +83,7 @@ ZTEST_USER_F(console_cmd_accelinit, test_fail_3_times) motion_sensors[0].drv = &fixture->mock_drv; motion_sensors[0].state = SENSOR_INITIALIZED; - zassert_ok(shell_execute_cmd(get_ec_shell(), "accelinit 0"), NULL); + zassert_ok(shell_execute_cmd(get_ec_shell(), "accelinit 0")); zassert_equal(3, mock_init_fake.call_count, "Expected 3 calls, but got %d", mock_init_fake.call_count); diff --git a/zephyr/test/drivers/default/src/console_cmd/accelrange.c b/zephyr/test/drivers/default/src/console_cmd/accelrange.c index ff9d03bfe2..57e81eada4 100644 --- a/zephyr/test/drivers/default/src/console_cmd/accelrange.c +++ b/zephyr/test/drivers/default/src/console_cmd/accelrange.c @@ -67,7 +67,7 @@ ZTEST_USER(console_cmd_accelrange, test_bad_sensor_num) ZTEST_USER(console_cmd_accelrange, test_print_range) { - zassert_ok(shell_execute_cmd(get_ec_shell(), "accelrange 0"), NULL); + zassert_ok(shell_execute_cmd(get_ec_shell(), "accelrange 0")); } ZTEST_USER(console_cmd_accelrange, test_set_invalid_range) @@ -80,7 +80,7 @@ ZTEST_USER(console_cmd_accelrange, test_set_invalid_range) ZTEST_USER(console_cmd_accelrange, test_set_range_round_up_implicit) { - zassert_ok(shell_execute_cmd(get_ec_shell(), "accelrange 0 3"), NULL); + zassert_ok(shell_execute_cmd(get_ec_shell(), "accelrange 0 3")); zassert_equal(motion_sensors[0].current_range, 4, "Expected 4, but got %d", motion_sensors[0].current_range); @@ -88,7 +88,7 @@ ZTEST_USER(console_cmd_accelrange, test_set_range_round_up_implicit) ZTEST_USER(console_cmd_accelrange, test_set_range_round_up_explicit) { - zassert_ok(shell_execute_cmd(get_ec_shell(), "accelrange 0 3 1"), NULL); + zassert_ok(shell_execute_cmd(get_ec_shell(), "accelrange 0 3 1")); zassert_equal(motion_sensors[0].current_range, 4, "Expected 4, but got %d", motion_sensors[0].current_range); @@ -96,7 +96,7 @@ ZTEST_USER(console_cmd_accelrange, test_set_range_round_up_explicit) ZTEST_USER(console_cmd_accelrange, test_set_range_round_down) { - zassert_ok(shell_execute_cmd(get_ec_shell(), "accelrange 0 5 0"), NULL); + zassert_ok(shell_execute_cmd(get_ec_shell(), "accelrange 0 5 0")); zassert_equal(motion_sensors[0].current_range, 4, "Expected 4, but got %d", motion_sensors[0].current_range); diff --git a/zephyr/test/drivers/default/src/console_cmd/accelrate.c b/zephyr/test/drivers/default/src/console_cmd/accelrate.c index 59482ed866..ca5bcf338a 100644 --- a/zephyr/test/drivers/default/src/console_cmd/accelrate.c +++ b/zephyr/test/drivers/default/src/console_cmd/accelrate.c @@ -64,7 +64,7 @@ ZTEST_USER(console_cmd_accelrate, test_invalid_sensor_num) ZTEST_USER(console_cmd_accelrate, test_print_rate) { - zassert_ok(shell_execute_cmd(get_ec_shell(), "accelrate 0"), NULL); + zassert_ok(shell_execute_cmd(get_ec_shell(), "accelrate 0")); } ZTEST_USER(console_cmd_accelrate, test_bad_rate_value) @@ -80,7 +80,7 @@ ZTEST_USER(console_cmd_accelrate, test_set_ap_rate) test_set_chipset_to_s0(); motion_sensors[0].config[SENSOR_CONFIG_EC_S0].odr = 0; - zassert_ok(shell_execute_cmd(get_ec_shell(), "accelrate 0 100"), NULL); + zassert_ok(shell_execute_cmd(get_ec_shell(), "accelrate 0 100")); zassert_equal(100 | ROUND_UP_FLAG, motion_sensors[0].config[SENSOR_CONFIG_EC_S0].odr, "Expected %d, but got %d", 100 | ROUND_UP_FLAG, diff --git a/zephyr/test/drivers/default/src/console_cmd/accelread.c b/zephyr/test/drivers/default/src/console_cmd/accelread.c index 81ebf87e55..4a129badc1 100644 --- a/zephyr/test/drivers/default/src/console_cmd/accelread.c +++ b/zephyr/test/drivers/default/src/console_cmd/accelread.c @@ -101,12 +101,12 @@ ZTEST_USER_F(console_cmd_accelread, test_read) mock_get_data_rate_fake.return_val = 100; motion_sensors[0].drv = &fixture->mock_drv; - zassert_ok(shell_execute_cmd(get_ec_shell(), "accelread 0"), NULL); + zassert_ok(shell_execute_cmd(get_ec_shell(), "accelread 0")); zassert_equal(1, mock_read_fake.call_count, "Expected only 1 call to read, but got %d", mock_read_fake.call_count); - zassert_ok(shell_execute_cmd(get_ec_shell(), "accelread 0 2"), NULL); + zassert_ok(shell_execute_cmd(get_ec_shell(), "accelread 0 2")); zassert_equal(3, mock_read_fake.call_count, "Expected only 3 call to read, but got %d", mock_read_fake.call_count); @@ -117,7 +117,7 @@ ZTEST_USER_F(console_cmd_accelread, test_read_fail) mock_read_fake.return_val = 1; motion_sensors[0].drv = &fixture->mock_drv; - zassert_ok(shell_execute_cmd(get_ec_shell(), "accelread 0"), NULL); + zassert_ok(shell_execute_cmd(get_ec_shell(), "accelread 0")); zassert_equal(1, mock_read_fake.call_count, "Expected only 1 call to read, but got %d", mock_read_fake.call_count); diff --git a/zephyr/test/drivers/default/src/console_cmd/accelres.c b/zephyr/test/drivers/default/src/console_cmd/accelres.c index 5e29a0572d..38bd4ed697 100644 --- a/zephyr/test/drivers/default/src/console_cmd/accelres.c +++ b/zephyr/test/drivers/default/src/console_cmd/accelres.c @@ -86,7 +86,7 @@ ZTEST_USER(console_cmd_accelres, test_invalid_sensor_num) ZTEST_USER(console_cmd_accelres, test_print_res) { - zassert_ok(shell_execute_cmd(get_ec_shell(), "accelres 0"), NULL); + zassert_ok(shell_execute_cmd(get_ec_shell(), "accelres 0")); } ZTEST_USER(console_cmd_accelres, test_set_res__invalid_data) @@ -101,7 +101,7 @@ ZTEST_USER(console_cmd_accelres, test_set_res__no_setter) { int resolution; - zassert_ok(shell_execute_cmd(get_ec_shell(), "accelres 0 4"), NULL); + zassert_ok(shell_execute_cmd(get_ec_shell(), "accelres 0 4")); resolution = motion_sensors[0].drv->get_resolution(&motion_sensors[0]); zassert_equal(BMA2x2_RESOLUTION, resolution, "Expected %d, but got %d", BMA2x2_RESOLUTION, resolution); diff --git a/zephyr/test/drivers/default/src/console_cmd/accelspoof.c b/zephyr/test/drivers/default/src/console_cmd/accelspoof.c index 3e183ca296..50f8c1e650 100644 --- a/zephyr/test/drivers/default/src/console_cmd/accelspoof.c +++ b/zephyr/test/drivers/default/src/console_cmd/accelspoof.c @@ -46,7 +46,7 @@ ZTEST_USER(console_cmd_accelspoof, test_invalid_sensor_id) ZTEST_USER(console_cmd_accelspoof, test_print_mode) { - zassert_ok(shell_execute_cmd(get_ec_shell(), "accelspoof 0"), NULL); + zassert_ok(shell_execute_cmd(get_ec_shell(), "accelspoof 0")); } ZTEST_USER(console_cmd_accelspoof, test_invalid_boolean) @@ -59,11 +59,11 @@ ZTEST_USER(console_cmd_accelspoof, test_invalid_boolean) ZTEST_USER(console_cmd_accelspoof, test_enable_disable) { - zassert_ok(shell_execute_cmd(get_ec_shell(), "accelspoof 0 on"), NULL); + zassert_ok(shell_execute_cmd(get_ec_shell(), "accelspoof 0 on")); zassert_true(motion_sensors[0].flags & MOTIONSENSE_FLAG_IN_SPOOF_MODE, NULL); - zassert_ok(shell_execute_cmd(get_ec_shell(), "accelspoof 0 off"), NULL); + zassert_ok(shell_execute_cmd(get_ec_shell(), "accelspoof 0 off")); zassert_false(motion_sensors[0].flags & MOTIONSENSE_FLAG_IN_SPOOF_MODE, NULL); } @@ -80,9 +80,9 @@ ZTEST_USER(console_cmd_accelspoof, test_enable_explicit_values) { zassert_ok(shell_execute_cmd(get_ec_shell(), "accelspoof 0 on 1 2 3"), NULL); - zassert_equal(1, motion_sensors[0].spoof_xyz[0], NULL); - zassert_equal(2, motion_sensors[0].spoof_xyz[1], NULL); - zassert_equal(3, motion_sensors[0].spoof_xyz[2], NULL); + zassert_equal(1, motion_sensors[0].spoof_xyz[0]); + zassert_equal(2, motion_sensors[0].spoof_xyz[1]); + zassert_equal(3, motion_sensors[0].spoof_xyz[2]); } ZTEST_USER(console_cmd_accelspoof, test_enable_implicit_values) @@ -90,8 +90,8 @@ ZTEST_USER(console_cmd_accelspoof, test_enable_implicit_values) motion_sensors[0].raw_xyz[0] = 4; motion_sensors[0].raw_xyz[1] = 5; motion_sensors[0].raw_xyz[2] = 6; - zassert_ok(shell_execute_cmd(get_ec_shell(), "accelspoof 0 on"), NULL); - zassert_equal(4, motion_sensors[0].spoof_xyz[0], NULL); - zassert_equal(5, motion_sensors[0].spoof_xyz[1], NULL); - zassert_equal(6, motion_sensors[0].spoof_xyz[2], NULL); + zassert_ok(shell_execute_cmd(get_ec_shell(), "accelspoof 0 on")); + zassert_equal(4, motion_sensors[0].spoof_xyz[0]); + zassert_equal(5, motion_sensors[0].spoof_xyz[1]); + zassert_equal(6, motion_sensors[0].spoof_xyz[2]); } diff --git a/zephyr/test/drivers/default/src/console_cmd/charge_manager.c b/zephyr/test/drivers/default/src/console_cmd/charge_manager.c index f6ee049ea1..a4679ddd25 100644 --- a/zephyr/test/drivers/default/src/console_cmd/charge_manager.c +++ b/zephyr/test/drivers/default/src/console_cmd/charge_manager.c @@ -59,7 +59,7 @@ ZTEST_SUITE(console_cmd_charge_manager, drivers_predicate_post_main, */ ZTEST_USER(console_cmd_charge_manager, test_chgsup) { - zassert_ok(shell_execute_cmd(get_ec_shell(), "chgsup"), NULL); + zassert_ok(shell_execute_cmd(get_ec_shell(), "chgsup")); } /** @@ -68,26 +68,26 @@ ZTEST_USER(console_cmd_charge_manager, test_chgsup) */ ZTEST_USER(console_cmd_charge_manager, test_chgoverride_missing_port) { - zassert_ok(shell_execute_cmd(get_ec_shell(), "chgoverride"), NULL); + zassert_ok(shell_execute_cmd(get_ec_shell(), "chgoverride")); } ZTEST_USER(console_cmd_charge_manager, test_chgoverride_off_from_off) { - zassert_ok(shell_execute_cmd(get_ec_shell(), "chgoverride -1"), NULL); - zassert_equal(charge_manager_get_override(), OVERRIDE_OFF, NULL); + zassert_ok(shell_execute_cmd(get_ec_shell(), "chgoverride -1")); + zassert_equal(charge_manager_get_override(), OVERRIDE_OFF); } ZTEST_USER(console_cmd_charge_manager, test_chgoverride_disable_from_off) { - zassert_ok(shell_execute_cmd(get_ec_shell(), "chgoverride -2"), NULL); + zassert_ok(shell_execute_cmd(get_ec_shell(), "chgoverride -2")); zassert_equal(charge_manager_get_override(), OVERRIDE_DONT_CHARGE, NULL); } ZTEST_USER(console_cmd_charge_manager, test_chgoverride_0_from_off) { - zassert_ok(shell_execute_cmd(get_ec_shell(), "chgoverride 0"), NULL); - zassert_equal(charge_manager_get_override(), 0, NULL); + zassert_ok(shell_execute_cmd(get_ec_shell(), "chgoverride 0")); + zassert_equal(charge_manager_get_override(), 0); } ZTEST_USER_F(console_cmd_charge_manager, test_chgoverride_0_from_sink) diff --git a/zephyr/test/drivers/default/src/console_cmd/charge_state.c b/zephyr/test/drivers/default/src/console_cmd/charge_state.c index d5dc9fe415..7ee91049ae 100644 --- a/zephyr/test/drivers/default/src/console_cmd/charge_state.c +++ b/zephyr/test/drivers/default/src/console_cmd/charge_state.c @@ -122,7 +122,7 @@ ZTEST_USER(console_cmd_charge_state, test_debug_on_show_charging_progress) /* Sleep at least 1 full iteration of the charge state loop */ k_sleep(K_USEC(CHARGE_MAX_SLEEP_USEC + 1)); - zassert_true(charging_progress_displayed(), NULL); + zassert_true(charging_progress_displayed()); } ZTEST_USER(console_cmd_charge_state, test_sustain_too_few_args__2_args) @@ -206,11 +206,11 @@ ZTEST_USER_F(console_cmd_charge_state, test_idle_on_from_normal) fixture->tcpci_emul, fixture->charger_emul); /* Verify that we're in "normal" mode */ - zassume_equal(get_chg_ctrl_mode(), CHARGE_CONTROL_NORMAL, NULL); + zassume_equal(get_chg_ctrl_mode(), CHARGE_CONTROL_NORMAL); /* Move to idle */ - zassert_ok(shell_execute_cmd(get_ec_shell(), "chgstate idle on"), NULL); - zassert_equal(get_chg_ctrl_mode(), CHARGE_CONTROL_IDLE, NULL); + zassert_ok(shell_execute_cmd(get_ec_shell(), "chgstate idle on")); + zassert_equal(get_chg_ctrl_mode(), CHARGE_CONTROL_IDLE); } ZTEST_USER_F(console_cmd_charge_state, test_normal_from_idle) @@ -220,16 +220,16 @@ ZTEST_USER_F(console_cmd_charge_state, test_normal_from_idle) fixture->tcpci_emul, fixture->charger_emul); /* Verify that we're in "normal" mode */ - zassume_equal(get_chg_ctrl_mode(), CHARGE_CONTROL_NORMAL, NULL); + zassume_equal(get_chg_ctrl_mode(), CHARGE_CONTROL_NORMAL); /* Move to idle */ - zassume_ok(shell_execute_cmd(get_ec_shell(), "chgstate idle on"), NULL); - zassume_equal(get_chg_ctrl_mode(), CHARGE_CONTROL_IDLE, NULL); + zassume_ok(shell_execute_cmd(get_ec_shell(), "chgstate idle on")); + zassume_equal(get_chg_ctrl_mode(), CHARGE_CONTROL_IDLE); /* Move back to normal */ zassert_ok(shell_execute_cmd(get_ec_shell(), "chgstate idle off"), NULL); - zassert_equal(get_chg_ctrl_mode(), CHARGE_CONTROL_NORMAL, NULL); + zassert_equal(get_chg_ctrl_mode(), CHARGE_CONTROL_NORMAL); } ZTEST_USER_F(console_cmd_charge_state, test_discharge_on) @@ -239,12 +239,12 @@ ZTEST_USER_F(console_cmd_charge_state, test_discharge_on) fixture->tcpci_emul, fixture->charger_emul); /* Verify that we're in "normal" mode */ - zassume_equal(get_chg_ctrl_mode(), CHARGE_CONTROL_NORMAL, NULL); + zassume_equal(get_chg_ctrl_mode(), CHARGE_CONTROL_NORMAL); /* Enable discharge */ zassert_ok(shell_execute_cmd(get_ec_shell(), "chgstate discharge on"), NULL); - zassert_equal(get_chg_ctrl_mode(), CHARGE_CONTROL_DISCHARGE, NULL); + zassert_equal(get_chg_ctrl_mode(), CHARGE_CONTROL_DISCHARGE); } ZTEST_USER_F(console_cmd_charge_state, test_discharge_off) @@ -254,17 +254,17 @@ ZTEST_USER_F(console_cmd_charge_state, test_discharge_off) fixture->tcpci_emul, fixture->charger_emul); /* Verify that we're in "normal" mode */ - zassume_equal(get_chg_ctrl_mode(), CHARGE_CONTROL_NORMAL, NULL); + zassume_equal(get_chg_ctrl_mode(), CHARGE_CONTROL_NORMAL); /* Enable discharge */ zassume_ok(shell_execute_cmd(get_ec_shell(), "chgstate discharge on"), NULL); - zassume_equal(get_chg_ctrl_mode(), CHARGE_CONTROL_DISCHARGE, NULL); + zassume_equal(get_chg_ctrl_mode(), CHARGE_CONTROL_DISCHARGE); /* Disable discharge */ zassert_ok(shell_execute_cmd(get_ec_shell(), "chgstate discharge off"), NULL); - zassert_equal(get_chg_ctrl_mode(), CHARGE_CONTROL_NORMAL, NULL); + zassert_equal(get_chg_ctrl_mode(), CHARGE_CONTROL_NORMAL); } ZTEST_USER(console_cmd_charge_state, test_sustain) @@ -277,6 +277,6 @@ ZTEST_USER(console_cmd_charge_state, test_sustain) charge_control_values = host_cmd_charge_control( CHARGE_CONTROL_NORMAL, EC_CHARGE_CONTROL_CMD_GET); - zassert_equal(charge_control_values.sustain_soc.lower, 30, NULL); - zassert_equal(charge_control_values.sustain_soc.upper, 50, NULL); + zassert_equal(charge_control_values.sustain_soc.lower, 30); + zassert_equal(charge_control_values.sustain_soc.upper, 50); } diff --git a/zephyr/test/drivers/default/src/espi.c b/zephyr/test/drivers/default/src/espi.c index 9843471ae7..ac6c93f3fc 100644 --- a/zephyr/test/drivers/default/src/espi.c +++ b/zephyr/test/drivers/default/src/espi.c @@ -38,15 +38,15 @@ ZTEST_USER(espi, test_host_command_get_protocol_info) struct host_cmd_handler_args args = BUILD_HOST_COMMAND_RESPONSE( EC_CMD_GET_PROTOCOL_INFO, 0, response); - zassert_ok(host_command_process(&args), NULL); - zassert_ok(args.result, NULL); - zassert_equal(args.response_size, sizeof(response), NULL); - zassert_equal(response.protocol_versions, BIT(3), NULL); + zassert_ok(host_command_process(&args)); + zassert_ok(args.result); + zassert_equal(args.response_size, sizeof(response)); + zassert_equal(response.protocol_versions, BIT(3)); zassert_equal(response.max_request_packet_size, EC_LPC_HOST_PACKET_SIZE, NULL); zassert_equal(response.max_response_packet_size, EC_LPC_HOST_PACKET_SIZE, NULL); - zassert_equal(response.flags, 0, NULL); + zassert_equal(response.flags, 0); } ZTEST_USER(espi, test_host_command_usb_pd_power_info) @@ -58,9 +58,9 @@ ZTEST_USER(espi, test_host_command_usb_pd_power_info) EC_CMD_USB_PD_POWER_INFO, 0, response, params); args.params = ¶ms; - zassert_ok(host_command_process(&args), NULL); - zassert_ok(args.result, NULL); - zassert_equal(args.response_size, sizeof(response), NULL); + zassert_ok(host_command_process(&args)); + zassert_ok(args.result); + zassert_equal(args.response_size, sizeof(response)); } ZTEST_USER(espi, test_host_command_typec_status) @@ -71,9 +71,9 @@ ZTEST_USER(espi, test_host_command_typec_status) struct host_cmd_handler_args args = BUILD_HOST_COMMAND(EC_CMD_TYPEC_STATUS, 0, response, params); - zassert_ok(host_command_process(&args), NULL); - zassert_ok(args.result, NULL); - zassert_equal(args.response_size, sizeof(response), NULL); + zassert_ok(host_command_process(&args)); + zassert_ok(args.result); + zassert_equal(args.response_size, sizeof(response)); } ZTEST_USER(espi, test_host_command_usb_pd_get_amode) @@ -87,12 +87,12 @@ ZTEST_USER(espi, test_host_command_usb_pd_get_amode) struct host_cmd_handler_args args = BUILD_HOST_COMMAND( EC_CMD_USB_PD_GET_AMODE, 0, response, params); - zassert_ok(host_command_process(&args), NULL); - zassert_ok(args.result, NULL); + zassert_ok(host_command_process(&args)); + zassert_ok(args.result); /* Note: with no SVIDs the response size is the size of the svid field. * See the usb alt mode test for verifying larger struct sizes */ - zassert_equal(args.response_size, sizeof(response.svid), NULL); + zassert_equal(args.response_size, sizeof(response.svid)); } ZTEST_USER(espi, test_host_command_gpio_get_v0) @@ -108,17 +108,17 @@ ZTEST_USER(espi, test_host_command_gpio_get_v0) set_ac_enabled(true); - zassert_ok(host_command_process(&args), NULL); - zassert_ok(args.result, NULL); - zassert_equal(args.response_size, sizeof(response), NULL); - zassert_true(response.val, NULL); + zassert_ok(host_command_process(&args)); + zassert_ok(args.result); + zassert_equal(args.response_size, sizeof(response)); + zassert_true(response.val); set_ac_enabled(false); - zassert_ok(host_command_process(&args), NULL); - zassert_ok(args.result, NULL); - zassert_equal(args.response_size, sizeof(response), NULL); - zassert_false(response.val, NULL); + zassert_ok(host_command_process(&args)); + zassert_ok(args.result); + zassert_equal(args.response_size, sizeof(response)); + zassert_false(response.val); } ZTEST_USER(espi, test_host_command_gpio_get_v1_get_by_name) @@ -137,19 +137,19 @@ ZTEST_USER(espi, test_host_command_gpio_get_v1_get_by_name) set_ac_enabled(true); - zassert_ok(host_command_process(&args), NULL); - zassert_ok(args.result, NULL); + zassert_ok(host_command_process(&args)); + zassert_ok(args.result); zassert_equal(args.response_size, sizeof(response.get_value_by_name), NULL); - zassert_true(response.get_info.val, NULL); + zassert_true(response.get_info.val); set_ac_enabled(false); - zassert_ok(host_command_process(&args), NULL); - zassert_ok(args.result, NULL); + zassert_ok(host_command_process(&args)); + zassert_ok(args.result); zassert_equal(args.response_size, sizeof(response.get_value_by_name), NULL); - zassert_false(response.get_info.val, NULL); + zassert_false(response.get_info.val); } ZTEST_USER(espi, test_host_command_gpio_get_v1_get_count) diff --git a/zephyr/test/drivers/default/src/gpio.c b/zephyr/test/drivers/default/src/gpio.c index acfa0de26e..3dd62aaa05 100644 --- a/zephyr/test/drivers/default/src/gpio.c +++ b/zephyr/test/drivers/default/src/gpio.c @@ -168,21 +168,21 @@ ZTEST(gpio, test_legacy_gpio_enable_interrupt) /* Test invalid signal */ zassert_not_equal(EC_SUCCESS, gpio_disable_interrupt(GPIO_COUNT), NULL); zassert_not_equal(EC_SUCCESS, gpio_enable_interrupt(GPIO_COUNT), NULL); - zassert_false(gpio_test_interrupt_triggered, NULL); + zassert_false(gpio_test_interrupt_triggered); /* Test valid signal */ - zassert_ok(gpio_disable_interrupt(signal), NULL); + zassert_ok(gpio_disable_interrupt(signal)); gpio_set_level(signal, 0); - zassert_false(gpio_test_interrupt_triggered, NULL); + zassert_false(gpio_test_interrupt_triggered); gpio_set_level(signal, 1); - zassert_false(gpio_test_interrupt_triggered, NULL); + zassert_false(gpio_test_interrupt_triggered); - zassert_ok(gpio_enable_interrupt(signal), NULL); + zassert_ok(gpio_enable_interrupt(signal)); gpio_set_level(signal, 0); - zassert_true(gpio_test_interrupt_triggered, NULL); + zassert_true(gpio_test_interrupt_triggered); gpio_test_interrupt_triggered = false; gpio_set_level(signal, 1); - zassert_true(gpio_test_interrupt_triggered, NULL); + zassert_true(gpio_test_interrupt_triggered); } /** @@ -387,18 +387,18 @@ ZTEST(gpio, test_gpio_enable_dt_interrupt) gpio_test_interrupt_triggered = false; /* Test valid signal */ - zassert_ok(gpio_disable_dt_interrupt(intr), NULL); + zassert_ok(gpio_disable_dt_interrupt(intr)); gpio_pin_set_dt(gp, 0); - zassert_false(gpio_test_interrupt_triggered, NULL); + zassert_false(gpio_test_interrupt_triggered); gpio_pin_set_dt(gp, 1); - zassert_false(gpio_test_interrupt_triggered, NULL); + zassert_false(gpio_test_interrupt_triggered); - zassert_ok(gpio_enable_dt_interrupt(intr), NULL); + zassert_ok(gpio_enable_dt_interrupt(intr)); gpio_pin_set_dt(gp, 0); - zassert_true(gpio_test_interrupt_triggered, NULL); + zassert_true(gpio_test_interrupt_triggered); gpio_test_interrupt_triggered = false; gpio_pin_set_dt(gp, 1); - zassert_true(gpio_test_interrupt_triggered, NULL); + zassert_true(gpio_test_interrupt_triggered); } /** diff --git a/zephyr/test/drivers/default/src/i2c_passthru.c b/zephyr/test/drivers/default/src/i2c_passthru.c index aea81fc198..67e1317876 100644 --- a/zephyr/test/drivers/default/src/i2c_passthru.c +++ b/zephyr/test/drivers/default/src/i2c_passthru.c @@ -33,9 +33,9 @@ ZTEST_USER(i2c_passthru, test_read_without_write) args.response = &response_buf; args.response_max = sizeof(response_buf); - zassert_ok(host_command_process(&args), NULL); - zassert_ok(args.result, NULL); - zassert_equal(response->i2c_status, EC_I2C_STATUS_NAK, NULL); + zassert_ok(host_command_process(&args)); + zassert_ok(args.result); + zassert_equal(response->i2c_status, EC_I2C_STATUS_NAK); zassert_equal(args.response_size, sizeof(struct ec_response_i2c_passthru), NULL); } diff --git a/zephyr/test/drivers/default/src/integration/usbc/usb.c b/zephyr/test/drivers/default/src/integration/usbc/usb.c index 68c8a9fd2a..ea210db005 100644 --- a/zephyr/test/drivers/default/src/integration/usbc/usb.c +++ b/zephyr/test/drivers/default/src/integration/usbc/usb.c @@ -56,8 +56,8 @@ static void integration_usb_before(void *state) /* * TODO(b/217755888): Refactor to using assume API */ - zassert_ok(tcpc_config[0].drv->init(0), NULL); - zassert_ok(tcpc_config[1].drv->init(1), NULL); + zassert_ok(tcpc_config[0].drv->init(0)); + zassert_ok(tcpc_config[1].drv->init(1)); tcpc_config[USBC_PORT_C0].flags &= ~TCPC_FLAGS_TCPCI_REV2_0; tcpci_emul_set_rev(tcpci_emul, TCPCI_EMUL_REV1_0_VER1_0); pd_set_suspend(0, 0); @@ -66,8 +66,8 @@ static void integration_usb_before(void *state) /* * TODO(b/217755888): Refactor to using assume API */ - zassert_ok(tcpci_emul_disconnect_partner(tcpci_emul), NULL); - zassert_ok(tcpci_emul_disconnect_partner(tcpci_emul2), NULL); + zassert_ok(tcpci_emul_disconnect_partner(tcpci_emul)); + zassert_ok(tcpci_emul_disconnect_partner(tcpci_emul2)); /* Battery defaults to charging, so reset to not charging. */ bat = sbat_emul_get_bat_data(battery_emul); @@ -76,7 +76,7 @@ static void integration_usb_before(void *state) /* * TODO(b/217755888): Refactor to using assume API */ - zassert_ok(gpio_emul_input_set(gpio_dev, GPIO_AC_OK_PIN, 0), NULL); + zassert_ok(gpio_emul_input_set(gpio_dev, GPIO_AC_OK_PIN, 0)); } static void integration_usb_after(void *state) @@ -92,8 +92,8 @@ static void integration_usb_after(void *state) /* * TODO(b/217755888): Refactor to using assume API */ - zassert_ok(tcpci_emul_disconnect_partner(tcpci_emul), NULL); - zassert_ok(tcpci_emul_disconnect_partner(tcpci_emul2), NULL); + zassert_ok(tcpci_emul_disconnect_partner(tcpci_emul)); + zassert_ok(tcpci_emul_disconnect_partner(tcpci_emul2)); /* Give time to actually disconnect */ k_sleep(K_SECONDS(1)); @@ -122,7 +122,7 @@ ZTEST(integration_usb, test_attach_drp) tcpci_src_emul_init(&src_ext, &my_drp, NULL), tcpci_snk_emul_init(&snk_ext, &my_drp, NULL)); - zassert_ok(tcpci_partner_connect_to_tcpci(&my_drp, tcpci_emul), NULL); + zassert_ok(tcpci_partner_connect_to_tcpci(&my_drp, tcpci_emul)); /* Wait for PD negotiation */ k_sleep(K_SECONDS(10)); @@ -131,8 +131,8 @@ ZTEST(integration_usb, test_attach_drp) * Test that SRC ready is achieved * TODO: Change it to examining EC_CMD_TYPEC_STATUS */ - zassert_equal(PE_SNK_READY, get_state_pe(USBC_PORT_C0), NULL); - zassert_ok(tcpci_emul_disconnect_partner(tcpci_emul), NULL); + zassert_equal(PE_SNK_READY, get_state_pe(USBC_PORT_C0)); + zassert_ok(tcpci_emul_disconnect_partner(tcpci_emul)); } ZTEST(integration_usb, test_event_loop) diff --git a/zephyr/test/drivers/default/src/integration/usbc/usb_20v_3a_pd_charger.c b/zephyr/test/drivers/default/src/integration/usbc/usb_20v_3a_pd_charger.c index 3fc73337b9..07b1b5143e 100644 --- a/zephyr/test/drivers/default/src/integration/usbc/usb_20v_3a_pd_charger.c +++ b/zephyr/test/drivers/default/src/integration/usbc/usb_20v_3a_pd_charger.c @@ -43,7 +43,7 @@ static inline void disconnect_charger_from_port( struct usb_attach_20v_3a_pd_charger_fixture *fixture) { set_ac_enabled(false); - zassume_ok(tcpci_emul_disconnect_partner(fixture->tcpci_emul), NULL); + zassume_ok(tcpci_emul_disconnect_partner(fixture->tcpci_emul)); isl923x_emul_set_adc_vbus(fixture->charger_emul, 0); k_sleep(K_SECONDS(1)); } @@ -189,9 +189,9 @@ ZTEST_F(usb_attach_20v_3a_pd_charger, test_disconnect_typec_status) disconnect_charger_from_port(fixture); typec_status = host_cmd_typec_status(0); - zassert_false(typec_status.pd_enabled, NULL); - zassert_false(typec_status.dev_connected, NULL); - zassert_false(typec_status.sop_connected, NULL); + zassert_false(typec_status.pd_enabled); + zassert_false(typec_status.dev_connected); + zassert_false(typec_status.sop_connected); zassert_equal(typec_status.source_cap_count, 0, "Expected 0 source caps, but got %d", typec_status.source_cap_count); diff --git a/zephyr/test/drivers/default/src/integration/usbc/usb_5v_3a_pd_sink.c b/zephyr/test/drivers/default/src/integration/usbc/usb_5v_3a_pd_sink.c index 5654754838..e3584470a0 100644 --- a/zephyr/test/drivers/default/src/integration/usbc/usb_5v_3a_pd_sink.c +++ b/zephyr/test/drivers/default/src/integration/usbc/usb_5v_3a_pd_sink.c @@ -77,7 +77,7 @@ ZTEST_SUITE(usb_attach_5v_3a_pd_sink, drivers_predicate_post_main, ZTEST_F(usb_attach_5v_3a_pd_sink, test_partner_pd_completed) { - zassert_true(fixture->snk_ext.pd_completed, NULL); + zassert_true(fixture->snk_ext.pd_completed); } ZTEST(usb_attach_5v_3a_pd_sink, test_battery_is_discharging) @@ -86,8 +86,7 @@ ZTEST(usb_attach_5v_3a_pd_sink, test_battery_is_discharging) uint16_t battery_status; zassume_ok(sbat_emul_get_word_val(emul, SB_BATTERY_STATUS, - &battery_status), - NULL); + &battery_status)); zassert_equal(battery_status & STATUS_DISCHARGING, STATUS_DISCHARGING, "Battery is not discharging: %d", battery_status); } @@ -142,8 +141,7 @@ ZTEST_F(usb_attach_5v_3a_pd_sink, test_disconnect_battery_discharging) disconnect_sink_from_port(fixture->tcpci_emul); zassert_ok(sbat_emul_get_word_val(emul, SB_BATTERY_STATUS, - &battery_status), - NULL); + &battery_status)); zassert_equal(battery_status & STATUS_DISCHARGING, STATUS_DISCHARGING, "Battery is not discharging: %d", battery_status); } @@ -173,9 +171,9 @@ ZTEST_F(usb_attach_5v_3a_pd_sink, test_disconnect_typec_status) disconnect_sink_from_port(fixture->tcpci_emul); typec_status = host_cmd_typec_status(0); - zassert_false(typec_status.pd_enabled, NULL); - zassert_false(typec_status.dev_connected, NULL); - zassert_false(typec_status.sop_connected, NULL); + zassert_false(typec_status.pd_enabled); + zassert_false(typec_status.dev_connected); + zassert_false(typec_status.sop_connected); zassert_equal(typec_status.source_cap_count, 0, "Expected 0 source caps, but got %d", typec_status.source_cap_count); @@ -230,7 +228,7 @@ ZTEST_F(usb_attach_5v_3a_pd_sink, verify_goto_min) pd_dpm_request(0, DPM_REQUEST_GOTO_MIN); k_sleep(K_SECONDS(1)); - zassert_true(fixture->snk_ext.pd_completed, NULL); + zassert_true(fixture->snk_ext.pd_completed); } /** @@ -251,5 +249,5 @@ ZTEST_F(usb_attach_5v_3a_pd_sink, verify_ping_msg) pd_dpm_request(0, DPM_REQUEST_SEND_PING); k_sleep(K_USEC(PD_T_SOURCE_ACTIVITY)); - zassert_true(fixture->snk_ext.ping_received, NULL); + zassert_true(fixture->snk_ext.ping_received); } diff --git a/zephyr/test/drivers/default/src/integration/usbc/usb_5v_3a_pd_source.c b/zephyr/test/drivers/default/src/integration/usbc/usb_5v_3a_pd_source.c index 17b7f9dfac..fcc213d252 100644 --- a/zephyr/test/drivers/default/src/integration/usbc/usb_5v_3a_pd_source.c +++ b/zephyr/test/drivers/default/src/integration/usbc/usb_5v_3a_pd_source.c @@ -168,9 +168,9 @@ ZTEST_F(usb_attach_5v_3a_pd_source, test_disconnect_typec_status) disconnect_source_from_port(fixture->tcpci_emul, fixture->charger_emul); typec_status = host_cmd_typec_status(0); - zassert_false(typec_status.pd_enabled, NULL); - zassert_false(typec_status.dev_connected, NULL); - zassert_false(typec_status.sop_connected, NULL); + zassert_false(typec_status.pd_enabled); + zassert_false(typec_status.dev_connected); + zassert_false(typec_status.sop_connected); zassert_equal(typec_status.source_cap_count, 0, "Expected 0 source caps, but got %d", typec_status.source_cap_count); diff --git a/zephyr/test/drivers/default/src/integration/usbc/usb_attach_src_snk.c b/zephyr/test/drivers/default/src/integration/usbc/usb_attach_src_snk.c index 761bb9daf1..0b65f9b135 100644 --- a/zephyr/test/drivers/default/src/integration/usbc/usb_attach_src_snk.c +++ b/zephyr/test/drivers/default/src/integration/usbc/usb_attach_src_snk.c @@ -117,21 +117,21 @@ static void attach_src_snk_common_before(struct emul_state *my_emul_state) /* TODO(b/217737667): Remove driver specific code. */ isl923x_emul_set_adc_vbus(charger_emul, 0); - zassume_ok(tcpc_config[SNK_PORT].drv->init(SNK_PORT), NULL); + zassume_ok(tcpc_config[SNK_PORT].drv->init(SNK_PORT)); /* * Arbitrary FW ver. The emulator should really be setting this * during its init. */ tcpci_emul_set_reg(tcpci_emul_snk, PS8XXX_REG_FW_REV, 0x31); - zassume_ok(tcpc_config[SRC_PORT].drv->init(SRC_PORT), NULL); + zassume_ok(tcpc_config[SRC_PORT].drv->init(SRC_PORT)); pd_set_suspend(SNK_PORT, false); pd_set_suspend(SRC_PORT, false); /* Reset to disconnected state. */ - zassume_ok(tcpci_emul_disconnect_partner(tcpci_emul_src), NULL); - zassume_ok(tcpci_emul_disconnect_partner(tcpci_emul_snk), NULL); + zassume_ok(tcpci_emul_disconnect_partner(tcpci_emul_src)); + zassume_ok(tcpci_emul_disconnect_partner(tcpci_emul_snk)); /* Set chipset to ON, this will set TCPM to DRP */ test_set_chipset_to_s0(); @@ -542,7 +542,7 @@ struct usb_detach_test_fixture { static void integration_usb_test_detach(const struct emul *e) { - zassume_ok(tcpci_emul_disconnect_partner(e), NULL); + zassume_ok(tcpci_emul_disconnect_partner(e)); } static void integration_usb_test_sink_detach(struct emul_state *fixture) diff --git a/zephyr/test/drivers/default/src/integration/usbc/usb_pd_ctrl_msg.c b/zephyr/test/drivers/default/src/integration/usbc/usb_pd_ctrl_msg.c index 894deaed13..e35e2a7ec1 100644 --- a/zephyr/test/drivers/default/src/integration/usbc/usb_pd_ctrl_msg.c +++ b/zephyr/test/drivers/default/src/integration/usbc/usb_pd_ctrl_msg.c @@ -65,7 +65,7 @@ tcpci_drp_emul_connect_partner(struct tcpci_partner_data *partner_emul, static void disconnect_partner(struct usb_pd_ctrl_msg_test_fixture *fixture) { - zassume_ok(tcpci_emul_disconnect_partner(fixture->tcpci_emul), NULL); + zassume_ok(tcpci_emul_disconnect_partner(fixture->tcpci_emul)); k_sleep(K_SECONDS(1)); } @@ -315,8 +315,8 @@ ZTEST(usb_pd_ctrl_msg_test_source, verify_dpm_get_sink_cap) typec_status = host_cmd_typec_status(TEST_USB_PORT); - zassert_true(typec_status.sink_cap_count > 1, NULL); - zassert_equal(typec_status.sink_cap_pdos[1], TEST_ADDED_PDO, NULL); + zassert_true(typec_status.sink_cap_count > 1); + zassert_equal(typec_status.sink_cap_pdos[1], TEST_ADDED_PDO); } /** @@ -336,8 +336,8 @@ ZTEST(usb_pd_ctrl_msg_test_sink, verify_get_sink_cap) typec_status = host_cmd_typec_status(TEST_USB_PORT); - zassert_true(typec_status.sink_cap_count > 1, NULL); - zassert_equal(typec_status.sink_cap_pdos[1], TEST_ADDED_PDO, NULL); + zassert_true(typec_status.sink_cap_count > 1); + zassert_equal(typec_status.sink_cap_pdos[1], TEST_ADDED_PDO); } /** @@ -360,10 +360,10 @@ ZTEST_F(usb_pd_ctrl_msg_test_source, verify_bist_tx_mode2) pd_dpm_request(TEST_USB_PORT, DPM_REQUEST_BIST_TX); k_sleep(K_MSEC(10)); - zassert_equal(get_state_pe(TEST_USB_PORT), PE_BIST_TX, NULL); + zassert_equal(get_state_pe(TEST_USB_PORT), PE_BIST_TX); k_sleep(K_SECONDS(5)); - zassert_equal(get_state_pe(TEST_USB_PORT), PE_SNK_READY, NULL); + zassert_equal(get_state_pe(TEST_USB_PORT), PE_SNK_READY); } /** @@ -387,9 +387,9 @@ ZTEST_F(usb_pd_ctrl_msg_test_source, verify_bist_tx_test_data) pd_dpm_request(TEST_USB_PORT, DPM_REQUEST_BIST_TX); k_sleep(K_SECONDS(5)); - zassert_equal(get_state_pe(TEST_USB_PORT), PE_BIST_TX, NULL); + zassert_equal(get_state_pe(TEST_USB_PORT), PE_BIST_TX); tcpci_partner_common_send_hard_reset(&super_fixture->partner_emul); k_sleep(K_SECONDS(1)); - zassert_equal(get_state_pe(TEST_USB_PORT), PE_SNK_READY, NULL); + zassert_equal(get_state_pe(TEST_USB_PORT), PE_SNK_READY); } diff --git a/zephyr/test/drivers/default/src/integration/usbc/usb_pd_rev3.c b/zephyr/test/drivers/default/src/integration/usbc/usb_pd_rev3.c index 6d148f398c..d2c5f2a0dd 100644 --- a/zephyr/test/drivers/default/src/integration/usbc/usb_pd_rev3.c +++ b/zephyr/test/drivers/default/src/integration/usbc/usb_pd_rev3.c @@ -56,11 +56,11 @@ static void usb_attach_5v_3a_pd_source_before(void *data) /* Clear Alert and Status receive checks */ tcpci_src_emul_clear_alert_received(&fixture->src_ext); tcpci_src_emul_clear_status_received(&fixture->src_ext); - zassume_false(fixture->src_ext.alert_received, NULL); - zassume_false(fixture->src_ext.status_received, NULL); + zassume_false(fixture->src_ext.alert_received); + zassume_false(fixture->src_ext.status_received); /* Initial check on power state */ - zassume_true(chipset_in_state(CHIPSET_STATE_ON), NULL); + zassume_true(chipset_in_state(CHIPSET_STATE_ON)); } static void usb_attach_5v_3a_pd_source_after(void *data) @@ -165,10 +165,10 @@ ZTEST_F(usb_attach_5v_3a_pd_source_rev3, test_batt_cap_invalid) ZTEST_F(usb_attach_5v_3a_pd_source_rev3, verify_alert_msg) { - zassume_equal(pd_broadcast_alert_msg(ADO_OTP_EVENT), EC_SUCCESS, NULL); + zassume_equal(pd_broadcast_alert_msg(ADO_OTP_EVENT), EC_SUCCESS); k_sleep(K_SECONDS(2)); - zassert_true(fixture->src_ext.alert_received, NULL); + zassert_true(fixture->src_ext.alert_received); } ZTEST_F(usb_attach_5v_3a_pd_source_rev3, verify_alert_on_power_state_change) @@ -176,38 +176,38 @@ ZTEST_F(usb_attach_5v_3a_pd_source_rev3, verify_alert_on_power_state_change) /* Suspend and check partner received Alert and Status messages */ hook_notify(HOOK_CHIPSET_SUSPEND); k_sleep(K_SECONDS(2)); - zassert_true(fixture->src_ext.alert_received, NULL); - zassert_true(fixture->src_ext.status_received, NULL); + zassert_true(fixture->src_ext.alert_received); + zassert_true(fixture->src_ext.status_received); tcpci_src_emul_clear_alert_received(&fixture->src_ext); tcpci_src_emul_clear_status_received(&fixture->src_ext); - zassume_false(fixture->src_ext.alert_received, NULL); - zassume_false(fixture->src_ext.status_received, NULL); + zassume_false(fixture->src_ext.alert_received); + zassume_false(fixture->src_ext.status_received); /* Shutdown and check partner received Alert and Status messages */ hook_notify(HOOK_CHIPSET_SHUTDOWN); k_sleep(K_SECONDS(2)); - zassert_true(fixture->src_ext.alert_received, NULL); - zassert_true(fixture->src_ext.status_received, NULL); + zassert_true(fixture->src_ext.alert_received); + zassert_true(fixture->src_ext.status_received); tcpci_src_emul_clear_alert_received(&fixture->src_ext); tcpci_src_emul_clear_status_received(&fixture->src_ext); - zassume_false(fixture->src_ext.alert_received, NULL); - zassume_false(fixture->src_ext.status_received, NULL); + zassume_false(fixture->src_ext.alert_received); + zassume_false(fixture->src_ext.status_received); /* Startup and check partner received Alert and Status messages */ hook_notify(HOOK_CHIPSET_STARTUP); k_sleep(K_SECONDS(2)); - zassert_true(fixture->src_ext.alert_received, NULL); - zassert_true(fixture->src_ext.status_received, NULL); + zassert_true(fixture->src_ext.alert_received); + zassert_true(fixture->src_ext.status_received); tcpci_src_emul_clear_alert_received(&fixture->src_ext); tcpci_src_emul_clear_status_received(&fixture->src_ext); - zassume_false(fixture->src_ext.alert_received, NULL); - zassume_false(fixture->src_ext.status_received, NULL); + zassume_false(fixture->src_ext.alert_received); + zassume_false(fixture->src_ext.status_received); /* Resume and check partner received Alert and Status messages */ hook_notify(HOOK_CHIPSET_RESUME); k_sleep(K_SECONDS(2)); - zassert_true(fixture->src_ext.alert_received, NULL); - zassert_true(fixture->src_ext.status_received, NULL); + zassert_true(fixture->src_ext.alert_received); + zassert_true(fixture->src_ext.status_received); } ZTEST_F(usb_attach_5v_3a_pd_source_rev3, @@ -224,9 +224,9 @@ ZTEST_F(usb_attach_5v_3a_pd_source_rev3, tcpci_partner_send_data_msg(&fixture->source_5v_3a, PD_DATA_ALERT, &ado, 1, 0); k_sleep(K_SECONDS(2)); - zassert_false(fixture->src_ext.alert_received, NULL); - zassert_false(fixture->src_ext.status_received, NULL); - zassert_true(chipset_in_state(CHIPSET_STATE_ON), NULL); + zassert_false(fixture->src_ext.alert_received); + zassert_false(fixture->src_ext.status_received); + zassert_true(chipset_in_state(CHIPSET_STATE_ON)); } ZTEST_F(usb_attach_5v_3a_pd_source_rev3, @@ -241,9 +241,9 @@ ZTEST_F(usb_attach_5v_3a_pd_source_rev3, /* Clear alert and status flags set during shutdown */ tcpci_src_emul_clear_alert_received(&fixture->src_ext); tcpci_src_emul_clear_status_received(&fixture->src_ext); - zassume_false(fixture->src_ext.alert_received, NULL); - zassume_false(fixture->src_ext.status_received, NULL); - zassume_true(chipset_in_state(CHIPSET_STATE_ANY_OFF), NULL); + zassume_false(fixture->src_ext.alert_received); + zassume_false(fixture->src_ext.status_received); + zassume_true(chipset_in_state(CHIPSET_STATE_ANY_OFF)); /* While in S5/G3 expect nothing on invalid (too long) press */ ado = ADO_EXTENDED_ALERT_EVENT | ADO_POWER_BUTTON_PRESS; @@ -254,9 +254,9 @@ ZTEST_F(usb_attach_5v_3a_pd_source_rev3, tcpci_partner_send_data_msg(&fixture->source_5v_3a, PD_DATA_ALERT, &ado, 1, 0); k_sleep(K_SECONDS(2)); - zassert_false(fixture->src_ext.alert_received, NULL); - zassert_false(fixture->src_ext.status_received, NULL); - zassert_true(chipset_in_state(CHIPSET_STATE_ANY_OFF), NULL); + zassert_false(fixture->src_ext.alert_received); + zassert_false(fixture->src_ext.status_received); + zassert_true(chipset_in_state(CHIPSET_STATE_ANY_OFF)); /* Wake device to setup for subsequent tests */ chipset_power_on(); @@ -274,9 +274,9 @@ ZTEST_F(usb_attach_5v_3a_pd_source_rev3, verify_startup_on_pd_button_press) /* Clear alert and status flags set during shutdown */ tcpci_src_emul_clear_alert_received(&fixture->src_ext); tcpci_src_emul_clear_status_received(&fixture->src_ext); - zassume_false(fixture->src_ext.alert_received, NULL); - zassume_false(fixture->src_ext.status_received, NULL); - zassume_true(chipset_in_state(CHIPSET_STATE_ANY_OFF), NULL); + zassume_false(fixture->src_ext.alert_received); + zassume_false(fixture->src_ext.status_received); + zassume_true(chipset_in_state(CHIPSET_STATE_ANY_OFF)); /* While in S5/G3 expect Alert->Get_Status->Status on valid press */ ado = ADO_EXTENDED_ALERT_EVENT | ADO_POWER_BUTTON_PRESS; @@ -287,9 +287,9 @@ ZTEST_F(usb_attach_5v_3a_pd_source_rev3, verify_startup_on_pd_button_press) tcpci_partner_send_data_msg(&fixture->source_5v_3a, PD_DATA_ALERT, &ado, 1, 0); k_sleep(K_SECONDS(2)); - zassert_true(fixture->src_ext.alert_received, NULL); - zassert_true(fixture->src_ext.status_received, NULL); - zassert_true(chipset_in_state(CHIPSET_STATE_ON), NULL); + zassert_true(fixture->src_ext.alert_received); + zassert_true(fixture->src_ext.status_received); + zassert_true(chipset_in_state(CHIPSET_STATE_ON)); } ZTEST_F(usb_attach_5v_3a_pd_source_rev3, verify_chipset_on_pd_button_behavior) @@ -305,9 +305,9 @@ ZTEST_F(usb_attach_5v_3a_pd_source_rev3, verify_chipset_on_pd_button_behavior) tcpci_partner_send_data_msg(&fixture->source_5v_3a, PD_DATA_ALERT, &ado, 1, 0); k_sleep(K_SECONDS(2)); - zassert_false(fixture->src_ext.alert_received, NULL); - zassert_false(fixture->src_ext.status_received, NULL); - zassert_true(chipset_in_state(CHIPSET_STATE_ON), NULL); + zassert_false(fixture->src_ext.alert_received); + zassert_false(fixture->src_ext.status_received); + zassert_true(chipset_in_state(CHIPSET_STATE_ON)); /* Expect no change on invalid button press while chipset is on */ ado = ADO_EXTENDED_ALERT_EVENT | ADO_POWER_BUTTON_PRESS; @@ -318,9 +318,9 @@ ZTEST_F(usb_attach_5v_3a_pd_source_rev3, verify_chipset_on_pd_button_behavior) tcpci_partner_send_data_msg(&fixture->source_5v_3a, PD_DATA_ALERT, &ado, 1, 0); k_sleep(K_SECONDS(2)); - zassert_false(fixture->src_ext.alert_received, NULL); - zassert_false(fixture->src_ext.status_received, NULL); - zassert_true(chipset_in_state(CHIPSET_STATE_ON), NULL); + zassert_false(fixture->src_ext.alert_received); + zassert_false(fixture->src_ext.status_received); + zassert_true(chipset_in_state(CHIPSET_STATE_ON)); /* * Expect no power state change on 6 second press->press->release due @@ -337,9 +337,9 @@ ZTEST_F(usb_attach_5v_3a_pd_source_rev3, verify_chipset_on_pd_button_behavior) tcpci_partner_send_data_msg(&fixture->source_5v_3a, PD_DATA_ALERT, &ado, 1, 0); k_sleep(K_SECONDS(2)); - zassert_false(fixture->src_ext.alert_received, NULL); - zassert_false(fixture->src_ext.status_received, NULL); - zassert_true(chipset_in_state(CHIPSET_STATE_ON), NULL); + zassert_false(fixture->src_ext.alert_received); + zassert_false(fixture->src_ext.status_received); + zassert_true(chipset_in_state(CHIPSET_STATE_ON)); /* Expect power state change on long press */ ado = ADO_EXTENDED_ALERT_EVENT | ADO_POWER_BUTTON_PRESS; @@ -350,9 +350,9 @@ ZTEST_F(usb_attach_5v_3a_pd_source_rev3, verify_chipset_on_pd_button_behavior) tcpci_partner_send_data_msg(&fixture->source_5v_3a, PD_DATA_ALERT, &ado, 1, 0); k_sleep(K_SECONDS(2)); - zassert_true(fixture->src_ext.alert_received, NULL); - zassert_true(fixture->src_ext.status_received, NULL); - zassert_true(chipset_in_state(CHIPSET_STATE_ANY_OFF), NULL); + zassert_true(fixture->src_ext.alert_received); + zassert_true(fixture->src_ext.status_received); + zassert_true(chipset_in_state(CHIPSET_STATE_ANY_OFF)); /* Wake device to setup for subsequent tests */ chipset_power_on(); diff --git a/zephyr/test/drivers/default/src/isl923x.c b/zephyr/test/drivers/default/src/isl923x.c index 9144730887..e17dbbe797 100644 --- a/zephyr/test/drivers/default/src/isl923x.c +++ b/zephyr/test/drivers/default/src/isl923x.c @@ -191,7 +191,7 @@ ZTEST(isl923x, test_isl923x_set_input_current_limit) ZTEST(isl923x, test_isl923x_psys) { - zassert_ok(shell_execute_cmd(get_ec_shell(), "psys"), NULL); + zassert_ok(shell_execute_cmd(get_ec_shell(), "psys")); } ZTEST(isl923x, test_manufacturer_id) @@ -200,8 +200,8 @@ ZTEST(isl923x, test_manufacturer_id) int id; isl923x_emul_set_manufacturer_id(isl923x_emul, 0x1234); - zassert_ok(isl923x_drv.manufacturer_id(CHARGER_NUM, &id), NULL); - zassert_equal(0x1234, id, NULL); + zassert_ok(isl923x_drv.manufacturer_id(CHARGER_NUM, &id)); + zassert_equal(0x1234, id); /* Test read error */ i2c_common_emul_set_read_fail_reg(COMMON_DATA, @@ -220,8 +220,8 @@ ZTEST(isl923x, test_device_id) int id; isl923x_emul_set_device_id(isl923x_emul, 0x5678); - zassert_ok(isl923x_drv.device_id(CHARGER_NUM, &id), NULL); - zassert_equal(0x5678, id, NULL); + zassert_ok(isl923x_drv.device_id(CHARGER_NUM, &id)); + zassert_equal(0x5678, id); /* Test read error */ i2c_common_emul_set_read_fail_reg(COMMON_DATA, ISL923X_REG_DEVICE_ID); @@ -266,8 +266,8 @@ ZTEST(isl923x, test_options) I2C_COMMON_EMUL_NO_FAIL_REG); /* Test normal write/read, note that bits 23 and 0 are always 0 */ - zassert_ok(isl923x_drv.set_option(CHARGER_NUM, 0xffffffff), NULL); - zassert_ok(isl923x_drv.get_option(CHARGER_NUM, &option), NULL); + zassert_ok(isl923x_drv.set_option(CHARGER_NUM, 0xffffffff)); + zassert_ok(isl923x_drv.get_option(CHARGER_NUM, &option)); zassert_equal(0xff7ffffe, option, "Expected options 0xff7ffffe but got 0x%x", option); } @@ -276,13 +276,13 @@ ZTEST(isl923x, test_get_info) { const struct charger_info *info = isl923x_drv.get_info(CHARGER_NUM); - zassert_ok(strcmp("isl9238", info->name), NULL); - zassert_equal(ISL9238_SYS_VOLTAGE_REG_MAX, info->voltage_max, NULL); - zassert_equal(ISL923X_SYS_VOLTAGE_REG_MIN, info->voltage_min, NULL); - zassert_equal(8, info->voltage_step, NULL); - zassert_equal(EXPECTED_CURRENT_MA(6080), info->current_max, NULL); - zassert_equal(EXPECTED_CURRENT_MA(4), info->current_min, NULL); - zassert_equal(EXPECTED_CURRENT_MA(4), info->current_step, NULL); + zassert_ok(strcmp("isl9238", info->name)); + zassert_equal(ISL9238_SYS_VOLTAGE_REG_MAX, info->voltage_max); + zassert_equal(ISL923X_SYS_VOLTAGE_REG_MIN, info->voltage_min); + zassert_equal(8, info->voltage_step); + zassert_equal(EXPECTED_CURRENT_MA(6080), info->current_max); + zassert_equal(EXPECTED_CURRENT_MA(4), info->current_min); + zassert_equal(EXPECTED_CURRENT_MA(4), info->current_step); zassert_equal(EXPECTED_INPUT_CURRENT_MA(6080), info->input_current_max, NULL); zassert_equal(EXPECTED_INPUT_CURRENT_MA(4), info->input_current_min, @@ -295,8 +295,8 @@ ZTEST(isl923x, test_status) { int status; - zassert_ok(isl923x_drv.get_status(CHARGER_NUM, &status), NULL); - zassert_equal(CHARGER_LEVEL_2, status, NULL); + zassert_ok(isl923x_drv.get_status(CHARGER_NUM, &status)); + zassert_equal(CHARGER_LEVEL_2, status); } ZTEST(isl923x, test_set_mode) @@ -304,22 +304,22 @@ ZTEST(isl923x, test_set_mode) const struct emul *isl923x_emul = ISL923X_EMUL; /* Enable learn mode and set mode (actual value doesn't matter) */ - zassert_ok(isl923x_drv.discharge_on_ac(CHARGER_NUM, true), NULL); - zassert_ok(isl923x_drv.set_mode(CHARGER_NUM, 0), NULL); + zassert_ok(isl923x_drv.discharge_on_ac(CHARGER_NUM, true)); + zassert_ok(isl923x_drv.set_mode(CHARGER_NUM, 0)); /* Learn mode should still be set */ - zassert_true(isl923x_emul_is_learn_mode_enabled(isl923x_emul), NULL); + zassert_true(isl923x_emul_is_learn_mode_enabled(isl923x_emul)); /* Disable learn mode, but keep the bits */ - zassert_ok(isl923x_drv.discharge_on_ac(CHARGER_NUM, false), NULL); + zassert_ok(isl923x_drv.discharge_on_ac(CHARGER_NUM, false)); isl923x_emul_set_learn_mode_enabled(isl923x_emul, true); - zassert_ok(isl923x_drv.set_mode(CHARGER_NUM, 0), NULL); + zassert_ok(isl923x_drv.set_mode(CHARGER_NUM, 0)); /* Learn mode should still be off */ - zassert_true(!isl923x_emul_is_learn_mode_enabled(isl923x_emul), NULL); + zassert_true(!isl923x_emul_is_learn_mode_enabled(isl923x_emul)); } ZTEST(isl923x, test_post_init) { - zassert_ok(isl923x_drv.post_init(CHARGER_NUM), NULL); + zassert_ok(isl923x_drv.post_init(CHARGER_NUM)); } ZTEST(isl923x, test_set_ac_prochot) @@ -470,20 +470,20 @@ ZTEST(isl923x, test_comparator_inversion) I2C_COMMON_EMUL_NO_FAIL_REG); /* Test enable comparator inversion */ - zassert_ok(isl923x_set_comparator_inversion(CHARGER_NUM, true), NULL); + zassert_ok(isl923x_set_comparator_inversion(CHARGER_NUM, true)); zassert_ok(i2c_write_read(i2c_dev, isl923x_emul->bus.i2c->addr, ®_addr, sizeof(reg_addr), ®_value, sizeof(reg_value)), "Failed to read CTRL 2 register"); - zassert_true((reg_value & ISL923X_C2_INVERT_CMOUT) != 0, NULL); + zassert_true((reg_value & ISL923X_C2_INVERT_CMOUT) != 0); /* Test disable comparator inversion */ - zassert_ok(isl923x_set_comparator_inversion(CHARGER_NUM, false), NULL); + zassert_ok(isl923x_set_comparator_inversion(CHARGER_NUM, false)); zassert_ok(i2c_write_read(i2c_dev, isl923x_emul->bus.i2c->addr, ®_addr, sizeof(reg_addr), ®_value, sizeof(reg_value)), "Failed to read CTRL 2 register"); - zassert_true((reg_value & ISL923X_C2_INVERT_CMOUT) == 0, NULL); + zassert_true((reg_value & ISL923X_C2_INVERT_CMOUT) == 0); } ZTEST(isl923x, test_discharge_on_ac) @@ -504,7 +504,7 @@ ZTEST(isl923x, test_discharge_on_ac) I2C_COMMON_EMUL_NO_FAIL_REG); /* Set CTRL1 register to 0 */ - zassert_ok(i2c_write(i2c_dev, tx_buf, sizeof(tx_buf), cfg->addr), NULL); + zassert_ok(i2c_write(i2c_dev, tx_buf, sizeof(tx_buf), cfg->addr)); /* Test failure to write CTRL1 register */ i2c_common_emul_set_write_fail_reg(COMMON_DATA, ISL923X_REG_CONTROL1); @@ -514,27 +514,27 @@ ZTEST(isl923x, test_discharge_on_ac) ®_addr, sizeof(reg_addr), ®_value, sizeof(reg_value)), NULL); - zassert_equal(0, reg_value, NULL); + zassert_equal(0, reg_value); i2c_common_emul_set_write_fail_reg(COMMON_DATA, I2C_COMMON_EMUL_NO_FAIL_REG); /* Test enabling discharge on AC */ - zassert_ok(isl923x_drv.discharge_on_ac(CHARGER_NUM, true), NULL); + zassert_ok(isl923x_drv.discharge_on_ac(CHARGER_NUM, true)); zassert_ok(i2c_write_read(i2c_dev, isl923x_emul->bus.i2c->addr, ®_addr, sizeof(reg_addr), ®_value, sizeof(reg_value)), NULL); - zassert_true((reg_value & ISL923X_C1_LEARN_MODE_ENABLE) != 0, NULL); + zassert_true((reg_value & ISL923X_C1_LEARN_MODE_ENABLE) != 0); /* Test disabling discharge on AC */ - zassert_ok(isl923x_drv.discharge_on_ac(CHARGER_NUM, false), NULL); + zassert_ok(isl923x_drv.discharge_on_ac(CHARGER_NUM, false)); zassert_ok(i2c_write_read(i2c_dev, isl923x_emul->bus.i2c->addr, ®_addr, sizeof(reg_addr), ®_value, sizeof(reg_value)), NULL); - zassert_true((reg_value & ISL923X_C1_LEARN_MODE_ENABLE) == 0, NULL); + zassert_true((reg_value & ISL923X_C1_LEARN_MODE_ENABLE) == 0); } ZTEST(isl923x, test_get_vbus_voltage) diff --git a/zephyr/test/drivers/default/src/lid_switch.c b/zephyr/test/drivers/default/src/lid_switch.c index 0837613809..b5da1f6608 100644 --- a/zephyr/test/drivers/default/src/lid_switch.c +++ b/zephyr/test/drivers/default/src/lid_switch.c @@ -49,8 +49,8 @@ static void *lid_switch_setup(void) static void lid_switch_before(void *unused) { /* Make sure that interrupt fire at the next lid open/close */ - zassume_ok(emul_lid_close(), NULL); - zassume_ok(emul_lid_open(), NULL); + zassume_ok(emul_lid_close()); + zassume_ok(emul_lid_open()); k_sleep(K_MSEC(100)); } @@ -79,39 +79,39 @@ static void lid_switch_after(void *unused) ZTEST(lid_switch, test_lid_open) { /* Start closed. */ - zassert_ok(emul_lid_close(), NULL); + zassert_ok(emul_lid_close()); k_sleep(K_MSEC(100)); - zassert_equal(lid_is_open(), 0, NULL); + zassert_equal(lid_is_open(), 0); - zassert_ok(emul_lid_open(), NULL); + zassert_ok(emul_lid_open()); k_sleep(K_MSEC(100)); - zassert_equal(lid_is_open(), 1, NULL); + zassert_equal(lid_is_open(), 1); } ZTEST(lid_switch, test_lid_debounce) { /* Start closed. */ - zassert_ok(emul_lid_close(), NULL); + zassert_ok(emul_lid_close()); k_sleep(K_MSEC(100)); - zassert_equal(lid_is_open(), 0, NULL); + zassert_equal(lid_is_open(), 0); /* Create interrupts quickly before they can be handled. */ - zassert_ok(emul_lid_open(), NULL); - zassert_ok(emul_lid_close(), NULL); - zassert_ok(emul_lid_open(), NULL); + zassert_ok(emul_lid_open()); + zassert_ok(emul_lid_close()); + zassert_ok(emul_lid_open()); k_sleep(K_MSEC(100)); - zassert_equal(lid_is_open(), 1, NULL); + zassert_equal(lid_is_open(), 1); } ZTEST(lid_switch, test_lid_close) { /* Start open. */ - zassert_ok(emul_lid_open(), NULL); + zassert_ok(emul_lid_open()); k_sleep(K_MSEC(100)); - zassert_ok(emul_lid_close(), NULL); + zassert_ok(emul_lid_close()); k_sleep(K_MSEC(200)); - zassert_equal(lid_is_open(), 0, NULL); + zassert_equal(lid_is_open(), 0); } ZTEST(lid_switch, test_enable_lid_detect) @@ -144,99 +144,99 @@ ZTEST(lid_switch, test_enable_lid_detect) ZTEST(lid_switch, test_cmd_lidopen) { /* Start closed. */ - zassert_ok(emul_lid_close(), NULL); + zassert_ok(emul_lid_close()); k_sleep(K_MSEC(100)); - zassert_equal(lid_is_open(), 0, NULL); + zassert_equal(lid_is_open(), 0); /* Forced override lid open. */ zassert_equal(EC_SUCCESS, shell_execute_cmd(get_ec_shell(), "lidopen"), NULL); - zassert_equal(lid_is_open(), 1, NULL); + zassert_equal(lid_is_open(), 1); k_sleep(K_MSEC(100)); printk("GPIO lid open/close\n"); /* Open & close with gpio. */ - zassert_ok(emul_lid_open(), NULL); - zassert_ok(emul_lid_close(), NULL); + zassert_ok(emul_lid_open()); + zassert_ok(emul_lid_close()); k_sleep(K_MSEC(500)); - zassert_equal(lid_is_open(), 0, NULL); + zassert_equal(lid_is_open(), 0); } ZTEST(lid_switch, test_cmd_lidopen_bounce) { /* Start closed. */ - zassert_ok(emul_lid_close(), NULL); + zassert_ok(emul_lid_close()); k_sleep(K_MSEC(100)); - zassert_equal(lid_is_open(), 0, NULL); + zassert_equal(lid_is_open(), 0); printk("Console lid open\n"); /* Forced override lid open. */ zassert_equal(EC_SUCCESS, shell_execute_cmd(get_ec_shell(), "lidopen"), NULL); - zassert_equal(lid_is_open(), 1, NULL); + zassert_equal(lid_is_open(), 1); k_sleep(K_MSEC(100)); printk("Console lid open\n"); /* Forced override lid open. */ zassert_equal(EC_SUCCESS, shell_execute_cmd(get_ec_shell(), "lidopen"), NULL); - zassert_equal(lid_is_open(), 1, NULL); + zassert_equal(lid_is_open(), 1); k_sleep(K_MSEC(100)); printk("GPIO lid open/close\n"); /* Open & close with gpio. */ - zassert_ok(emul_lid_open(), NULL); - zassert_ok(emul_lid_close(), NULL); + zassert_ok(emul_lid_open()); + zassert_ok(emul_lid_close()); k_sleep(K_MSEC(500)); - zassert_equal(lid_is_open(), 0, NULL); + zassert_equal(lid_is_open(), 0); } ZTEST(lid_switch, test_cmd_lidclose) { /* Start open. */ - zassert_ok(emul_lid_open(), NULL); + zassert_ok(emul_lid_open()); k_sleep(K_MSEC(100)); - zassert_equal(lid_is_open(), 1, NULL); + zassert_equal(lid_is_open(), 1); /* Forced override lid close. */ zassert_equal(EC_SUCCESS, shell_execute_cmd(get_ec_shell(), "lidclose"), NULL); - zassert_equal(lid_is_open(), 0, NULL); + zassert_equal(lid_is_open(), 0); k_sleep(K_MSEC(100)); printk("GPIO lid close/open\n"); /* Close & open with gpio. */ - zassert_ok(emul_lid_close(), NULL); - zassert_ok(emul_lid_open(), NULL); + zassert_ok(emul_lid_close()); + zassert_ok(emul_lid_open()); k_sleep(K_MSEC(500)); - zassert_equal(lid_is_open(), 1, NULL); + zassert_equal(lid_is_open(), 1); } ZTEST(lid_switch, test_cmd_lidclose_bounce) { /* Start open. */ - zassert_ok(emul_lid_open(), NULL); + zassert_ok(emul_lid_open()); k_sleep(K_MSEC(100)); - zassert_equal(lid_is_open(), 1, NULL); + zassert_equal(lid_is_open(), 1); /* Forced override lid close. */ zassert_equal(EC_SUCCESS, shell_execute_cmd(get_ec_shell(), "lidclose"), NULL); - zassert_equal(lid_is_open(), 0, NULL); + zassert_equal(lid_is_open(), 0); k_sleep(K_MSEC(100)); /* Forced override lid close. */ zassert_equal(EC_SUCCESS, shell_execute_cmd(get_ec_shell(), "lidclose"), NULL); - zassert_equal(lid_is_open(), 0, NULL); + zassert_equal(lid_is_open(), 0); k_sleep(K_MSEC(100)); printk("GPIO lid close/open\n"); /* Close & open with gpio. */ - zassert_ok(emul_lid_close(), NULL); - zassert_ok(emul_lid_open(), NULL); + zassert_ok(emul_lid_close()); + zassert_ok(emul_lid_open()); k_sleep(K_MSEC(500)); - zassert_equal(lid_is_open(), 1, NULL); + zassert_equal(lid_is_open(), 1); } #if defined(CONFIG_SHELL_BACKEND_DUMMY) @@ -246,9 +246,9 @@ ZTEST(lid_switch, test_cmd_lidstate_open) size_t buffer_size; /* Start open. */ - zassert_ok(emul_lid_open(), NULL); + zassert_ok(emul_lid_open()); k_sleep(K_MSEC(100)); - zassert_equal(lid_is_open(), 1, NULL); + zassert_equal(lid_is_open(), 1); /* Read the state with console. */ shell_backend_dummy_clear_output(get_ec_shell()); @@ -265,9 +265,9 @@ ZTEST(lid_switch, test_cmd_lidstate_close) size_t buffer_size; /* Start closed. */ - zassert_ok(emul_lid_close(), NULL); + zassert_ok(emul_lid_close()); k_sleep(K_MSEC(100)); - zassert_equal(lid_is_open(), 0, NULL); + zassert_equal(lid_is_open(), 0); /* Read the state with console. */ shell_backend_dummy_clear_output(get_ec_shell()); @@ -290,14 +290,14 @@ ZTEST(lid_switch, test_hc_force_lid_open) BUILD_HOST_COMMAND_PARAMS(EC_CMD_FORCE_LID_OPEN, 0, params); /* Start closed. */ - zassert_ok(emul_lid_close(), NULL); + zassert_ok(emul_lid_close()); k_sleep(K_MSEC(100)); - zassert_equal(lid_is_open(), 0, NULL); + zassert_equal(lid_is_open(), 0); - zassert_ok(host_command_process(&args), NULL); - zassert_ok(args.result, NULL); + zassert_ok(host_command_process(&args)); + zassert_ok(args.result); k_sleep(K_MSEC(100)); - zassert_equal(lid_is_open(), 1, NULL); + zassert_equal(lid_is_open(), 1); } ZTEST_SUITE(lid_switch, drivers_predicate_post_main, lid_switch_setup, diff --git a/zephyr/test/drivers/default/src/lis2dw12.c b/zephyr/test/drivers/default/src/lis2dw12.c index 4cb29796f8..8f5e30e559 100644 --- a/zephyr/test/drivers/default/src/lis2dw12.c +++ b/zephyr/test/drivers/default/src/lis2dw12.c @@ -67,7 +67,7 @@ ZTEST(lis2dw12, test_lis2dw12_init__fail_read_who_am_i) i2c_common_emul_set_read_fail_reg(common_data, LIS2DW12_WHO_AM_I_REG); rv = ms->drv->init(ms); - zassert_equal(EC_ERROR_INVAL, rv, NULL); + zassert_equal(EC_ERROR_INVAL, rv); } ZTEST(lis2dw12, test_lis2dw12_init__fail_who_am_i) @@ -95,7 +95,7 @@ ZTEST(lis2dw12, test_lis2dw12_init__fail_write_soft_reset) i2c_common_emul_set_write_fail_reg(common_data, LIS2DW12_SOFT_RESET_ADDR); rv = ms->drv->init(ms); - zassert_equal(EC_ERROR_INVAL, rv, NULL); + zassert_equal(EC_ERROR_INVAL, rv); } ZTEST(lis2dw12, test_lis2dw12_init__timeout_read_soft_reset) diff --git a/zephyr/test/drivers/default/src/ln9310.c b/zephyr/test/drivers/default/src/ln9310.c index 326e8480ef..414c62287c 100644 --- a/zephyr/test/drivers/default/src/ln9310.c +++ b/zephyr/test/drivers/default/src/ln9310.c @@ -46,12 +46,12 @@ ZTEST(ln9310, test_ln9310_read_chip_fails) i2c_common_emul_set_read_fail_reg(common_data, LN9310_REG_BC_STS_C); - zassert_true(ln9310_init() != 0, NULL); - zassert_false(ln9310_emul_is_init(emulator), NULL); + zassert_true(ln9310_init() != 0); + zassert_false(ln9310_emul_is_init(emulator)); /* TODO(b/201420132) */ k_msleep(TEST_DELAY_MS); - zassert_false(ln9310_power_good(), NULL); + zassert_false(ln9310_power_good()); i2c_common_emul_set_read_fail_reg(common_data, I2C_COMMON_EMUL_NO_FAIL_REG); @@ -68,17 +68,17 @@ ZTEST(ln9310, test_ln9310_2s_powers_up) ln9310_emul_set_battery_cell_type(emulator, BATTERY_CELL_TYPE_2S); ln9310_emul_set_version(emulator, LN9310_BC_STS_C_CHIP_REV_FIXED); - zassert_ok(ln9310_init(), NULL); - zassert_true(ln9310_emul_is_init(emulator), NULL); + zassert_ok(ln9310_init()); + zassert_true(ln9310_emul_is_init(emulator)); /* TODO(b/201420132) */ k_msleep(TEST_DELAY_MS); - zassert_false(ln9310_power_good(), NULL); + zassert_false(ln9310_power_good()); ln9310_software_enable(true); k_msleep(TEST_DELAY_MS); - zassert_true(ln9310_power_good(), NULL); + zassert_true(ln9310_power_good()); } ZTEST(ln9310, test_ln9310_3s_powers_up) @@ -92,17 +92,17 @@ ZTEST(ln9310, test_ln9310_3s_powers_up) ln9310_emul_set_battery_cell_type(emulator, BATTERY_CELL_TYPE_3S); ln9310_emul_set_version(emulator, LN9310_BC_STS_C_CHIP_REV_FIXED); - zassert_ok(ln9310_init(), NULL); - zassert_true(ln9310_emul_is_init(emulator), NULL); + zassert_ok(ln9310_init()); + zassert_true(ln9310_emul_is_init(emulator)); /* TODO(b/201420132) */ k_msleep(TEST_DELAY_MS); - zassert_false(ln9310_power_good(), NULL); + zassert_false(ln9310_power_good()); ln9310_software_enable(true); k_msleep(TEST_DELAY_MS); - zassert_true(ln9310_power_good(), NULL); + zassert_true(ln9310_power_good()); } struct startup_workaround_data { @@ -150,29 +150,29 @@ ZTEST(ln9310, test_ln9310_2s_cfly_precharge_startup) ln9310_emul_set_version(emulator, REQUIRES_CFLY_PRECHARGE_STARTUP_CHIP_REV); - zassert_ok(ln9310_init(), NULL); - zassert_true(ln9310_emul_is_init(emulator), NULL); + zassert_ok(ln9310_init()); + zassert_true(ln9310_emul_is_init(emulator)); /* TODO(b/201420132) */ k_msleep(TEST_DELAY_MS); - zassert_false(ln9310_power_good(), NULL); + zassert_false(ln9310_power_good()); i2c_common_emul_set_write_func( common_data, mock_write_fn_intercept_startup_workaround, &test_data); ln9310_software_enable(true); - zassert_true(test_data.startup_workaround_attempted, NULL); + zassert_true(test_data.startup_workaround_attempted); /* TODO(b/201420132) */ k_msleep(TEST_DELAY_MS); - zassert_true(ln9310_power_good(), NULL); + zassert_true(ln9310_power_good()); ln9310_software_enable(false); /* TODO(b/201420132) */ k_msleep(TEST_DELAY_MS); - zassert_false(ln9310_power_good(), NULL); + zassert_false(ln9310_power_good()); i2c_common_emul_set_write_func(common_data, NULL, NULL); } @@ -196,29 +196,29 @@ ZTEST(ln9310, test_ln9310_3s_cfly_precharge_startup) ln9310_emul_set_version(emulator, REQUIRES_CFLY_PRECHARGE_STARTUP_CHIP_REV); - zassert_ok(ln9310_init(), NULL); - zassert_true(ln9310_emul_is_init(emulator), NULL); + zassert_ok(ln9310_init()); + zassert_true(ln9310_emul_is_init(emulator)); /* TODO(b/201420132) */ k_msleep(TEST_DELAY_MS); - zassert_false(ln9310_power_good(), NULL); + zassert_false(ln9310_power_good()); i2c_common_emul_set_write_func( common_data, mock_write_fn_intercept_startup_workaround, &test_data); ln9310_software_enable(true); - zassert_true(test_data.startup_workaround_attempted, NULL); + zassert_true(test_data.startup_workaround_attempted); /* TODO(b/201420132) */ k_msleep(TEST_DELAY_MS); - zassert_true(ln9310_power_good(), NULL); + zassert_true(ln9310_power_good()); ln9310_software_enable(false); /* TODO(b/201420132) */ k_msleep(TEST_DELAY_MS); - zassert_false(ln9310_power_good(), NULL); + zassert_false(ln9310_power_good()); i2c_common_emul_set_write_func(common_data, NULL, NULL); } @@ -246,23 +246,23 @@ ZTEST(ln9310, test_ln9310_cfly_precharge_exceeds_retries) ln9310_emul_set_version(emulator, REQUIRES_CFLY_PRECHARGE_STARTUP_CHIP_REV); - zassert_ok(ln9310_init(), NULL); - zassert_true(ln9310_emul_is_init(emulator), NULL); + zassert_ok(ln9310_init()); + zassert_true(ln9310_emul_is_init(emulator)); /* TODO(b/201420132) */ k_msleep(TEST_DELAY_MS); - zassert_false(ln9310_power_good(), NULL); + zassert_false(ln9310_power_good()); i2c_common_emul_set_write_func( common_data, mock_write_fn_intercept_startup_workaround, &test_data); ln9310_software_enable(true); - zassert_true(test_data.startup_workaround_attempted, NULL); + zassert_true(test_data.startup_workaround_attempted); /* TODO(b/201420132) */ k_msleep(TEST_DELAY_MS); - zassert_false(ln9310_power_good(), NULL); + zassert_false(ln9310_power_good()); i2c_common_emul_set_write_func(common_data, NULL, NULL); } @@ -282,18 +282,18 @@ ZTEST(ln9310, test_ln9310_battery_unknown) ln9310_emul_set_battery_cell_type(emulator, BATTERY_CELL_TYPE_UNKNOWN); ln9310_emul_set_version(emulator, LN9310_BC_STS_C_CHIP_REV_FIXED); - zassert_true(ln9310_init() != 0, NULL); - zassert_false(ln9310_emul_is_init(emulator), NULL); + zassert_true(ln9310_init() != 0); + zassert_false(ln9310_emul_is_init(emulator)); /* TODO(b/201420132) */ k_msleep(TEST_DELAY_MS); - zassert_false(ln9310_power_good(), NULL); + zassert_false(ln9310_power_good()); ln9310_software_enable(true); /* TODO(b/201420132) */ k_msleep(TEST_DELAY_MS); - zassert_false(ln9310_power_good(), NULL); + zassert_false(ln9310_power_good()); } ZTEST(ln9310, test_ln9310_2s_battery_read_fails) @@ -312,12 +312,12 @@ ZTEST(ln9310, test_ln9310_2s_battery_read_fails) i2c_common_emul_set_read_fail_reg(common_data, LN9310_REG_BC_STS_B); - zassert_true(ln9310_init() != 0, NULL); - zassert_false(ln9310_emul_is_init(emulator), NULL); + zassert_true(ln9310_init() != 0); + zassert_false(ln9310_emul_is_init(emulator)); /* TODO(b/201420132) */ k_msleep(TEST_DELAY_MS); - zassert_false(ln9310_power_good(), NULL); + zassert_false(ln9310_power_good()); /* For Battery 2S Versions: Test Read Battery Voltage Failure Too */ ln9310_emul_reset(emulator); @@ -326,7 +326,7 @@ ZTEST(ln9310, test_ln9310_2s_battery_read_fails) i2c_common_emul_set_read_fail_reg(common_data, LN9310_REG_TRACK_CTRL); - zassert_false(ln9310_init() == 0, NULL); + zassert_false(ln9310_init() == 0); i2c_common_emul_set_read_fail_reg(common_data, I2C_COMMON_EMUL_NO_FAIL_REG); } @@ -347,17 +347,17 @@ ZTEST(ln9310, test_ln9310_lion_ctrl_reg_fails) i2c_common_emul_set_read_fail_reg(common_data, LN9310_REG_LION_CTRL); - zassert_true(ln9310_init() != 0, NULL); - zassert_false(ln9310_emul_is_init(emulator), NULL); + zassert_true(ln9310_init() != 0); + zassert_false(ln9310_emul_is_init(emulator)); /* TODO(b/201420132) */ k_msleep(TEST_DELAY_MS); - zassert_false(ln9310_power_good(), NULL); + zassert_false(ln9310_power_good()); /* TODO(b/201420132) */ k_msleep(TEST_DELAY_MS); ln9310_software_enable(true); - zassert_false(ln9310_power_good(), NULL); + zassert_false(ln9310_power_good()); i2c_common_emul_set_read_fail_reg(common_data, I2C_COMMON_EMUL_NO_FAIL_REG); @@ -416,12 +416,12 @@ ZTEST(ln9310, test_ln9310_cfly_precharge_timesout) ln9310_emul_set_version(emulator, REQUIRES_CFLY_PRECHARGE_STARTUP_CHIP_REV); - zassert_ok(ln9310_init(), NULL); - zassert_true(ln9310_emul_is_init(emulator), NULL); + zassert_ok(ln9310_init()); + zassert_true(ln9310_emul_is_init(emulator)); /* TODO(b/201420132) */ k_msleep(TEST_DELAY_MS); - zassert_false(ln9310_power_good(), NULL); + zassert_false(ln9310_power_good()); i2c_common_emul_set_write_func( common_data, mock_intercept_startup_ctrl_reg, &test_data); @@ -429,9 +429,9 @@ ZTEST(ln9310, test_ln9310_cfly_precharge_timesout) ln9310_software_enable(true); /* TODO(b/201420132) */ k_msleep(TEST_DELAY_MS); - zassert_true(test_data.handled_clearing_standby_en_bit_timeout, NULL); + zassert_true(test_data.handled_clearing_standby_en_bit_timeout); /* It only times out on one attempt, it should subsequently startup */ - zassert_true(ln9310_power_good(), NULL); + zassert_true(ln9310_power_good()); i2c_common_emul_set_write_func(common_data, NULL, NULL); } @@ -472,8 +472,8 @@ ZTEST(ln9310, test_ln9310_interrupt_reg_fail) ln9310_emul_set_battery_cell_type(emulator, BATTERY_CELL_TYPE_2S); ln9310_emul_set_version(emulator, LN9310_BC_STS_C_CHIP_REV_FIXED); - zassert_ok(ln9310_init(), NULL); - zassert_true(ln9310_emul_is_init(emulator), NULL); + zassert_ok(ln9310_init()); + zassert_true(ln9310_emul_is_init(emulator)); i2c_common_emul_set_read_func( common_data, mock_read_intercept_reg_to_fail, &test_data); @@ -486,8 +486,8 @@ ZTEST(ln9310, test_ln9310_interrupt_reg_fail) /* TODO(b/201420132) */ k_msleep(TEST_DELAY_MS); - zassert_false(ln9310_power_good(), NULL); - zassert_true(test_data.reg_access_fail_countdown <= 0, NULL); + zassert_false(ln9310_power_good()); + zassert_true(test_data.reg_access_fail_countdown <= 0); /* Fail in irq interrupt handler */ test_data.reg_access_fail_countdown = 2; @@ -495,8 +495,8 @@ ZTEST(ln9310, test_ln9310_interrupt_reg_fail) ln9310_software_enable(true); /* TODO(b/201420132) */ k_msleep(TEST_DELAY_MS); - zassert_false(ln9310_power_good(), NULL); - zassert_true(test_data.reg_access_fail_countdown <= 0, NULL); + zassert_false(ln9310_power_good()); + zassert_true(test_data.reg_access_fail_countdown <= 0); i2c_common_emul_set_read_func(common_data, NULL, NULL); } @@ -519,8 +519,8 @@ ZTEST(ln9310, test_ln9310_sys_sts_reg_fail) ln9310_emul_set_battery_cell_type(emulator, BATTERY_CELL_TYPE_2S); ln9310_emul_set_version(emulator, LN9310_BC_STS_C_CHIP_REV_FIXED); - zassert_ok(ln9310_init(), NULL); - zassert_true(ln9310_emul_is_init(emulator), NULL); + zassert_ok(ln9310_init()); + zassert_true(ln9310_emul_is_init(emulator)); i2c_common_emul_set_read_func( common_data, &mock_read_intercept_reg_to_fail, &test_data); @@ -534,8 +534,8 @@ ZTEST(ln9310, test_ln9310_sys_sts_reg_fail) /* TODO(b/201420132) */ k_msleep(TEST_DELAY_MS); - zassert_false(ln9310_power_good(), NULL); - zassert_true(test_data.reg_access_fail_countdown <= 0, NULL); + zassert_false(ln9310_power_good()); + zassert_true(test_data.reg_access_fail_countdown <= 0); i2c_common_emul_set_read_func(common_data, NULL, NULL); } @@ -576,8 +576,8 @@ ZTEST(ln9310, test_ln9310_reset_explicit_detected_startup) ln9310_emul_set_battery_cell_type(emulator, BATTERY_CELL_TYPE_2S); ln9310_emul_set_version(emulator, LN9310_BC_STS_C_CHIP_REV_FIXED); - zassert_ok(ln9310_init(), NULL); - zassert_true(ln9310_emul_is_init(emulator), NULL); + zassert_ok(ln9310_init()); + zassert_true(ln9310_emul_is_init(emulator)); i2c_common_emul_set_read_func(common_data, &mock_read_interceptor, &test_data); @@ -587,7 +587,7 @@ ZTEST(ln9310, test_ln9310_reset_explicit_detected_startup) /* TODO(b/201420132) */ k_msleep(TEST_DELAY_MS); - zassert_true(ln9310_power_good(), NULL); + zassert_true(ln9310_power_good()); i2c_common_emul_set_read_func(common_data, NULL, NULL); } @@ -615,16 +615,16 @@ ZTEST(ln9310, test_ln9310_update_startup_seq_fails) i2c_common_emul_set_read_func( common_data, &mock_read_intercept_reg_to_fail, &test_data); - zassert_false(ln9310_init() == 0, NULL); - zassert_false(ln9310_emul_is_init(emulator), NULL); + zassert_false(ln9310_init() == 0); + zassert_false(ln9310_emul_is_init(emulator)); ln9310_software_enable(true); /* TODO(b/201420132) */ k_msleep(TEST_DELAY_MS); - zassert_false(ln9310_power_good(), NULL); - zassert_true(test_data.reg_access_fail_countdown <= 0, NULL); + zassert_false(ln9310_power_good()); + zassert_true(test_data.reg_access_fail_countdown <= 0); i2c_common_emul_set_read_func(common_data, NULL, NULL); } @@ -647,8 +647,8 @@ ZTEST(ln9310, test_ln9310_state_change_only_on_mode_change_interrupt) ln9310_emul_set_battery_cell_type(emulator, BATTERY_CELL_TYPE_2S); ln9310_emul_set_version(emulator, LN9310_BC_STS_C_CHIP_REV_FIXED); - zassert_ok(ln9310_init(), NULL); - zassert_true(ln9310_emul_is_init(emulator), NULL); + zassert_ok(ln9310_init()); + zassert_true(ln9310_emul_is_init(emulator)); i2c_common_emul_set_read_func(common_data, &mock_read_interceptor, &test_data); @@ -658,7 +658,7 @@ ZTEST(ln9310, test_ln9310_state_change_only_on_mode_change_interrupt) /* TODO(b/201420132) */ k_msleep(TEST_DELAY_MS); - zassert_false(ln9310_power_good(), NULL); + zassert_false(ln9310_power_good()); i2c_common_emul_set_read_func(common_data, NULL, NULL); } diff --git a/zephyr/test/drivers/default/src/motion_sense/motion_sense.c b/zephyr/test/drivers/default/src/motion_sense/motion_sense.c index d39c3ce335..42ee056874 100644 --- a/zephyr/test/drivers/default/src/motion_sense/motion_sense.c +++ b/zephyr/test/drivers/default/src/motion_sense/motion_sense.c @@ -18,16 +18,16 @@ ZTEST_USER(motion_sense, ec_motion_sensor_fill_values) const int32_t v[] = { 4, 5, 6 }; ec_motion_sensor_fill_values(&dst, v); - zassert_equal(dst.data[0], v[0], NULL); - zassert_equal(dst.data[1], v[1], NULL); - zassert_equal(dst.data[2], v[2], NULL); + zassert_equal(dst.data[0], v[0]); + zassert_equal(dst.data[1], v[1]); + zassert_equal(dst.data[2], v[2]); } ZTEST_USER(motion_sense, ec_motion_sensor_clamp_i16) { - zassert_equal(ec_motion_sensor_clamp_i16(0), 0, NULL); - zassert_equal(ec_motion_sensor_clamp_i16(200), 200, NULL); - zassert_equal(ec_motion_sensor_clamp_i16(-512), -512, NULL); + zassert_equal(ec_motion_sensor_clamp_i16(0), 0); + zassert_equal(ec_motion_sensor_clamp_i16(200), 200); + zassert_equal(ec_motion_sensor_clamp_i16(-512), -512); zassert_equal(ec_motion_sensor_clamp_i16(INT16_MAX + 1), INT16_MAX, NULL); zassert_equal(ec_motion_sensor_clamp_i16(INT16_MIN - 1), INT16_MIN, diff --git a/zephyr/test/drivers/default/src/panic.c b/zephyr/test/drivers/default/src/panic.c index 4b97ed63d9..7dcb18e4cf 100644 --- a/zephyr/test/drivers/default/src/panic.c +++ b/zephyr/test/drivers/default/src/panic.c @@ -78,15 +78,15 @@ ZTEST(panic, test_panic_reason) panic_get_reason(&reason, &info, &exception); - zassert_equal(PANIC_SW_WATCHDOG, reason, NULL); - zassert_equal(0, info, NULL); - zassert_equal(0, exception, NULL); + zassert_equal(PANIC_SW_WATCHDOG, reason); + zassert_equal(0, info); + zassert_equal(0, exception); pdata = panic_get_data(); zassert_not_null(pdata, NULL); - zassert_equal(pdata->struct_version, 2, NULL); - zassert_equal(pdata->magic, PANIC_DATA_MAGIC, NULL); - zassert_equal(pdata->struct_size, CONFIG_PANIC_DATA_SIZE, NULL); + zassert_equal(pdata->struct_version, 2); + zassert_equal(pdata->magic, PANIC_DATA_MAGIC); + zassert_equal(pdata->struct_size, CONFIG_PANIC_DATA_SIZE); panic_data_print(pdata); } diff --git a/zephyr/test/drivers/default/src/power_common.c b/zephyr/test/drivers/default/src/power_common.c index 3579cb7b3c..f96fed9f05 100644 --- a/zephyr/test/drivers/default/src/power_common.c +++ b/zephyr/test/drivers/default/src/power_common.c @@ -191,57 +191,57 @@ ZTEST(power_common_no_tasks, test_power_exit_hard_off) /* Force initial state */ power_set_state(POWER_G3); test_power_common_state(); - zassert_equal(POWER_G3, power_get_state(), NULL); + zassert_equal(POWER_G3, power_get_state()); /* Test after exit hard off, we reach G3S5 */ chipset_exit_hard_off(); test_power_common_state(); - zassert_equal(POWER_G3S5, power_get_state(), NULL); + zassert_equal(POWER_G3S5, power_get_state()); /* Go back to G3 and check we stay there */ power_set_state(POWER_G3); test_power_common_state(); - zassert_equal(POWER_G3, power_get_state(), NULL); + zassert_equal(POWER_G3, power_get_state()); /* Exit G3 again */ chipset_exit_hard_off(); test_power_common_state(); - zassert_equal(POWER_G3S5, power_get_state(), NULL); + zassert_equal(POWER_G3S5, power_get_state()); /* Go to S5G3 */ power_set_state(POWER_S5G3); test_power_common_state(); - zassert_equal(POWER_S5G3, power_get_state(), NULL); + zassert_equal(POWER_S5G3, power_get_state()); /* Test exit hard off in S5G3 -- should set want_g3_exit */ chipset_exit_hard_off(); /* Go back to G3 and check we exit it to G3S5 */ power_set_state(POWER_G3); test_power_common_state(); - zassert_equal(POWER_G3S5, power_get_state(), NULL); + zassert_equal(POWER_G3S5, power_get_state()); /* Test exit hard off is cleared on entering S5 */ chipset_exit_hard_off(); power_set_state(POWER_S5); test_power_common_state(); - zassert_equal(POWER_S5, power_get_state(), NULL); + zassert_equal(POWER_S5, power_get_state()); /* Go back to G3 and check we stay in G3 */ power_set_state(POWER_G3); test_power_common_state(); - zassert_equal(POWER_G3, power_get_state(), NULL); + zassert_equal(POWER_G3, power_get_state()); /* Test exit hard off doesn't work on other states */ power_set_state(POWER_S5S3); test_power_common_state(); - zassert_equal(POWER_S5S3, power_get_state(), NULL); + zassert_equal(POWER_S5S3, power_get_state()); chipset_exit_hard_off(); test_power_common_state(); /* Go back to G3 and check we stay in G3 */ power_set_state(POWER_G3); test_power_common_state(); - zassert_equal(POWER_G3, power_get_state(), NULL); + zassert_equal(POWER_G3, power_get_state()); } /* Test reboot ap on g3 host command is triggering reboot */ @@ -267,28 +267,28 @@ ZTEST(power_common_no_tasks, test_power_reboot_ap_at_g3) /* Force initial state S0 */ power_set_state(POWER_S0); test_power_common_state(); - zassert_equal(POWER_S0, power_get_state(), NULL); + zassert_equal(POWER_S0, power_get_state()); /* Test version 0 (no delay argument) */ - zassert_equal(EC_RES_SUCCESS, host_command_process(&args), NULL); + zassert_equal(EC_RES_SUCCESS, host_command_process(&args)); /* Go to G3 and check if reboot is triggered */ power_set_state(POWER_G3); test_power_common_state(); - zassert_equal(POWER_G3S5, power_get_state(), NULL); + zassert_equal(POWER_G3S5, power_get_state()); /* Test version 1 (with delay argument) */ args.version = 1; delay_ms = 3000; params.reboot_ap_at_g3_delay = delay_ms / 1000; /* in seconds */ - zassert_equal(EC_RES_SUCCESS, host_command_process(&args), NULL); + zassert_equal(EC_RES_SUCCESS, host_command_process(&args)); /* Go to G3 and check if reboot is triggered after delay */ power_set_state(POWER_G3); before_time = k_uptime_get(); test_power_common_state(); - zassert_true(k_uptime_delta(&before_time) >= 3000, NULL); - zassert_equal(POWER_G3S5, power_get_state(), NULL); + zassert_true(k_uptime_delta(&before_time) >= 3000); + zassert_equal(POWER_G3S5, power_get_state()); } /** Test setting cutoff and stay-up battery levels through host command */ @@ -312,7 +312,7 @@ ZTEST(power_common, test_power_hc_smart_discharge) /* Test fail when battery capacity is not available */ i2c_common_emul_set_read_fail_reg(common_data, SB_FULL_CHARGE_CAPACITY); - zassert_equal(EC_RES_UNAVAILABLE, host_command_process(&args), NULL); + zassert_equal(EC_RES_UNAVAILABLE, host_command_process(&args)); i2c_common_emul_set_read_fail_reg(common_data, I2C_COMMON_EMUL_NO_FAIL_REG); @@ -320,13 +320,13 @@ ZTEST(power_common, test_power_hc_smart_discharge) params.drate.hibern = 10; params.drate.cutoff = 100; /* Test fail on higher discahrge in hibernation than cutoff */ - zassert_equal(EC_RES_INVALID_PARAM, host_command_process(&args), NULL); + zassert_equal(EC_RES_INVALID_PARAM, host_command_process(&args)); /* Setup discharge rates */ params.drate.hibern = 10; params.drate.cutoff = 0; /* Test fail on only one discharge rate set to 0 */ - zassert_equal(EC_RES_INVALID_PARAM, host_command_process(&args), NULL); + zassert_equal(EC_RES_INVALID_PARAM, host_command_process(&args)); /* Setup correct parameters */ hours_to_zero = 1000; @@ -342,12 +342,12 @@ ZTEST(power_common, test_power_hc_smart_discharge) params.hours_to_zero = hours_to_zero; /* Test if correct values are set */ - zassert_equal(EC_RES_SUCCESS, host_command_process(&args), NULL); - zassert_equal(hibern_drate, response.drate.hibern, NULL); - zassert_equal(cutoff_drate, response.drate.cutoff, NULL); - zassert_equal(hours_to_zero, response.hours_to_zero, NULL); - zassert_equal(stayup_cap, response.dzone.stayup, NULL); - zassert_equal(cutoff_cap, response.dzone.cutoff, NULL); + zassert_equal(EC_RES_SUCCESS, host_command_process(&args)); + zassert_equal(hibern_drate, response.drate.hibern); + zassert_equal(cutoff_drate, response.drate.cutoff); + zassert_equal(hours_to_zero, response.hours_to_zero); + zassert_equal(stayup_cap, response.dzone.stayup); + zassert_equal(cutoff_cap, response.dzone.cutoff); /* Setup discharge rate to 0 */ params.drate.hibern = 0; @@ -361,12 +361,12 @@ ZTEST(power_common, test_power_hc_smart_discharge) cutoff_cap = cutoff_drate * hours_to_zero / 1000; /* Test that command doesn't change drate but apply new hours to zero */ - zassert_equal(EC_RES_SUCCESS, host_command_process(&args), NULL); - zassert_equal(hibern_drate, response.drate.hibern, NULL); - zassert_equal(cutoff_drate, response.drate.cutoff, NULL); - zassert_equal(hours_to_zero, response.hours_to_zero, NULL); - zassert_equal(stayup_cap, response.dzone.stayup, NULL); - zassert_equal(cutoff_cap, response.dzone.cutoff, NULL); + zassert_equal(EC_RES_SUCCESS, host_command_process(&args)); + zassert_equal(hibern_drate, response.drate.hibern); + zassert_equal(cutoff_drate, response.drate.cutoff); + zassert_equal(hours_to_zero, response.hours_to_zero); + zassert_equal(stayup_cap, response.dzone.stayup); + zassert_equal(cutoff_cap, response.dzone.cutoff); /* Setup any parameters != 0 */ params.drate.hibern = 1000; @@ -375,12 +375,12 @@ ZTEST(power_common, test_power_hc_smart_discharge) params.flags = 0; /* Test that command doesn't change drate and dzone */ - zassert_equal(EC_RES_SUCCESS, host_command_process(&args), NULL); - zassert_equal(hibern_drate, response.drate.hibern, NULL); - zassert_equal(cutoff_drate, response.drate.cutoff, NULL); - zassert_equal(hours_to_zero, response.hours_to_zero, NULL); - zassert_equal(stayup_cap, response.dzone.stayup, NULL); - zassert_equal(cutoff_cap, response.dzone.cutoff, NULL); + zassert_equal(EC_RES_SUCCESS, host_command_process(&args)); + zassert_equal(hibern_drate, response.drate.hibern); + zassert_equal(cutoff_drate, response.drate.cutoff); + zassert_equal(hours_to_zero, response.hours_to_zero); + zassert_equal(stayup_cap, response.dzone.stayup); + zassert_equal(cutoff_cap, response.dzone.cutoff); } /** @@ -409,7 +409,7 @@ ZTEST(power_common, test_power_board_system_is_idle) params.hours_to_zero = 1000; /* h */ params.flags = EC_SMART_DISCHARGE_FLAGS_SET; /* Set stay-up and cutoff zones */ - zassert_equal(EC_RES_SUCCESS, host_command_process(&args), NULL); + zassert_equal(EC_RES_SUCCESS, host_command_process(&args)); /* Test shutdown ignore is send when target time is in future */ target = 1125; @@ -509,7 +509,7 @@ static void setup_hibernation_delay(void *state) params.drate.cutoff = 10; /* uA */ params.hours_to_zero = 10000; /* h */ params.flags = EC_SMART_DISCHARGE_FLAGS_SET; - zassert_equal(EC_RES_SUCCESS, host_command_process(&args), NULL); + zassert_equal(EC_RES_SUCCESS, host_command_process(&args)); /* * Make sure that battery is in safe zone in good condition to * not trigger hibernate in charge_state_v2.c @@ -537,7 +537,7 @@ ZTEST(power_common_hibernation, test_power_hc_hibernation_delay) int sleep_time; /* Ensure the lid is closed so AC connect does not boot system */ - zassert_ok(shell_execute_cmd(get_ec_shell(), "lidclose"), NULL); + zassert_ok(shell_execute_cmd(get_ec_shell(), "lidclose")); zassert_equal(power_get_state(), POWER_G3, "Power state is %d, expected G3", power_get_state()); @@ -547,7 +547,7 @@ ZTEST(power_common_hibernation, test_power_hc_hibernation_delay) /* Set hibernate delay */ h_delay = 9; params.seconds = h_delay; - zassert_equal(EC_RES_SUCCESS, host_command_process(&args), NULL); + zassert_equal(EC_RES_SUCCESS, host_command_process(&args)); zassert_equal(0, response.time_g3, "Time from last G3 enter %d != 0", response.time_g3); @@ -566,7 +566,7 @@ ZTEST(power_common_hibernation, test_power_hc_hibernation_delay) /* Get hibernate delay */ params.seconds = 0; - zassert_equal(EC_RES_SUCCESS, host_command_process(&args), NULL); + zassert_equal(EC_RES_SUCCESS, host_command_process(&args)); zassert_equal(sleep_time, response.time_g3, "Time from last G3 enter %d != %d", response.time_g3, @@ -585,7 +585,7 @@ ZTEST(power_common_hibernation, test_power_hc_hibernation_delay) /* Get hibernate delay */ params.seconds = 0; - zassert_equal(EC_RES_SUCCESS, host_command_process(&args), NULL); + zassert_equal(EC_RES_SUCCESS, host_command_process(&args)); zassert_equal(h_delay, response.time_g3, "Time from last G3 enter %d != %d", response.time_g3, @@ -604,7 +604,7 @@ ZTEST(power_common_hibernation, test_power_hc_hibernation_delay) /* Get hibernate delay */ params.seconds = 0; - zassert_equal(EC_RES_SUCCESS, host_command_process(&args), NULL); + zassert_equal(EC_RES_SUCCESS, host_command_process(&args)); /* After hibernation, remaining time shouldn't be negative */ zassert_equal(0, response.time_remaining, "Time to hibernation %d != 0", @@ -621,7 +621,7 @@ ZTEST(power_common_hibernation, test_power_hc_hibernation_delay) /* Get hibernate delay */ params.seconds = 0; - zassert_equal(EC_RES_SUCCESS, host_command_process(&args), NULL); + zassert_equal(EC_RES_SUCCESS, host_command_process(&args)); zassert_equal(0, response.time_g3, "Time from last G3 enter %d should be 0 on AC", @@ -634,11 +634,11 @@ ZTEST(power_common_hibernation, test_power_hc_hibernation_delay) /* Go to different state */ power_set_state(POWER_G3S5); - zassert_equal(POWER_G3S5, power_get_state(), NULL); + zassert_equal(POWER_G3S5, power_get_state()); /* Get hibernate delay */ params.seconds = 0; - zassert_equal(EC_RES_SUCCESS, host_command_process(&args), NULL); + zassert_equal(EC_RES_SUCCESS, host_command_process(&args)); zassert_equal(0, response.time_g3, "Time from last G3 enter %d should be 0 on state != G3", diff --git a/zephyr/test/drivers/default/src/ppc_sn5s330.c b/zephyr/test/drivers/default/src/ppc_sn5s330.c index c9ba62cf20..eb595939fc 100644 --- a/zephyr/test/drivers/default/src/ppc_sn5s330.c +++ b/zephyr/test/drivers/default/src/ppc_sn5s330.c @@ -86,10 +86,10 @@ ZTEST(ppc_sn5s330, test_fail_once_func_set1) i2c_common_emul_set_write_func(COMMON_DATA, fail_until_write_func, &count); - zassert_ok(sn5s330_drv.init(SN5S330_PORT), NULL); - zassert_equal(count, 0, NULL); + zassert_ok(sn5s330_drv.init(SN5S330_PORT)); + zassert_equal(count, 0); sn5s330_emul_peek_reg(emul, SN5S330_FUNC_SET1, &func_set1_value); - zassert_true((func_set1_value & SN5S330_ILIM_1_62) != 0, NULL); + zassert_true((func_set1_value & SN5S330_ILIM_1_62) != 0); i2c_common_emul_set_write_func(COMMON_DATA, NULL, NULL); } @@ -110,7 +110,7 @@ ZTEST(ppc_sn5s330, test_dead_battery_boot_force_pp2_fets_set) i2c_common_emul_set_read_func(COMMON_DATA, intercept_read_func, &test_read_data); - zassert_ok(sn5s330_drv.init(SN5S330_PORT), NULL); + zassert_ok(sn5s330_drv.init(SN5S330_PORT)); /* * Although the device enables PP2_FET on dead battery boot by setting @@ -119,8 +119,8 @@ ZTEST(ppc_sn5s330, test_dead_battery_boot_force_pp2_fets_set) * * TODO(b/207034759): Verify need or remove redundant PP2 set. */ - zassert_true(test_write_data.val_intercepted & SN5S330_PP2_EN, NULL); - zassert_false(sn5s330_drv.is_sourcing_vbus(SN5S330_PORT), NULL); + zassert_true(test_write_data.val_intercepted & SN5S330_PP2_EN); + zassert_false(sn5s330_drv.is_sourcing_vbus(SN5S330_PORT)); } ZTEST(ppc_sn5s330, test_enter_low_power_mode) @@ -140,30 +140,30 @@ ZTEST(ppc_sn5s330, test_enter_low_power_mode) * For Reference: b/111006203#comment35 */ - zassert_ok(sn5s330_drv.init(SN5S330_PORT), NULL); - zassert_ok(sn5s330_drv.enter_low_power_mode(SN5S330_PORT), NULL); + zassert_ok(sn5s330_drv.init(SN5S330_PORT)); + zassert_ok(sn5s330_drv.enter_low_power_mode(SN5S330_PORT)); /* 1) Verify VBUS power paths are off */ sn5s330_emul_peek_reg(emul, SN5S330_FUNC_SET3, &func_set3_reg); - zassert_equal(func_set3_reg & SN5S330_PP1_EN, 0, NULL); - zassert_equal(func_set3_reg & SN5S330_PP2_EN, 0, NULL); + zassert_equal(func_set3_reg & SN5S330_PP1_EN, 0); + zassert_equal(func_set3_reg & SN5S330_PP2_EN, 0); /* 2) Verify VCONN power path is off */ sn5s330_emul_peek_reg(emul, SN5S330_FUNC_SET4, &func_set4_reg); zassert_not_equal(func_set4_reg & SN5S330_CC_EN, 0, NULL); - zassert_equal(func_set4_reg & SN5S330_VCONN_EN, 0, NULL); + zassert_equal(func_set4_reg & SN5S330_VCONN_EN, 0); /* 3) Verify SBU FET is off */ sn5s330_emul_peek_reg(emul, SN5S330_FUNC_SET2, &func_set2_reg); - zassert_equal(func_set2_reg & SN5S330_SBU_EN, 0, NULL); + zassert_equal(func_set2_reg & SN5S330_SBU_EN, 0); /* 4) Verify VBUS and SBU OVP comparators are off */ sn5s330_emul_peek_reg(emul, SN5S330_FUNC_SET9, &func_set9_reg); - zassert_equal(func_set9_reg & SN5S330_FORCE_OVP_EN_SBU, 0, NULL); - zassert_equal(func_set9_reg & SN5S330_PWR_OVR_VBUS, 0, NULL); + zassert_equal(func_set9_reg & SN5S330_FORCE_OVP_EN_SBU, 0); + zassert_equal(func_set9_reg & SN5S330_PWR_OVR_VBUS, 0); zassert_not_equal(func_set9_reg & SN5S330_OVP_EN_CC, 0, NULL); - zassert_equal(func_set9_reg & SN5S330_FORCE_ON_VBUS_OVP, 0, NULL); - zassert_equal(func_set9_reg & SN5S330_FORCE_ON_VBUS_UVP, 0, NULL); + zassert_equal(func_set9_reg & SN5S330_FORCE_ON_VBUS_OVP, 0); + zassert_equal(func_set9_reg & SN5S330_FORCE_ON_VBUS_UVP, 0); } ZTEST(ppc_sn5s330, test_vbus_source_sink_enable) @@ -171,25 +171,25 @@ ZTEST(ppc_sn5s330, test_vbus_source_sink_enable) const struct emul *emul = EMUL; uint8_t func_set3_reg; - zassert_ok(sn5s330_drv.init(SN5S330_PORT), NULL); + zassert_ok(sn5s330_drv.init(SN5S330_PORT)); /* Test enable/disable VBUS source FET */ - zassert_ok(sn5s330_drv.vbus_source_enable(SN5S330_PORT, true), NULL); + zassert_ok(sn5s330_drv.vbus_source_enable(SN5S330_PORT, true)); sn5s330_emul_peek_reg(emul, SN5S330_FUNC_SET3, &func_set3_reg); zassert_not_equal(func_set3_reg & SN5S330_PP1_EN, 0, NULL); - zassert_ok(sn5s330_drv.vbus_source_enable(SN5S330_PORT, false), NULL); + zassert_ok(sn5s330_drv.vbus_source_enable(SN5S330_PORT, false)); sn5s330_emul_peek_reg(emul, SN5S330_FUNC_SET3, &func_set3_reg); - zassert_equal(func_set3_reg & SN5S330_PP1_EN, 0, NULL); + zassert_equal(func_set3_reg & SN5S330_PP1_EN, 0); /* Test enable/disable VBUS sink FET */ - zassert_ok(sn5s330_drv.vbus_sink_enable(SN5S330_PORT, true), NULL); + zassert_ok(sn5s330_drv.vbus_sink_enable(SN5S330_PORT, true)); sn5s330_emul_peek_reg(emul, SN5S330_FUNC_SET3, &func_set3_reg); zassert_not_equal(func_set3_reg & SN5S330_PP2_EN, 0, NULL); - zassert_ok(sn5s330_drv.vbus_sink_enable(SN5S330_PORT, false), NULL); + zassert_ok(sn5s330_drv.vbus_sink_enable(SN5S330_PORT, false)); sn5s330_emul_peek_reg(emul, SN5S330_FUNC_SET3, &func_set3_reg); - zassert_equal(func_set3_reg & SN5S330_PP2_EN, 0, NULL); + zassert_equal(func_set3_reg & SN5S330_PP2_EN, 0); } /* This test depends on EC GIPO initialization happening before I2C */ @@ -200,16 +200,16 @@ ZTEST(ppc_sn5s330, test_vbus_discharge) const struct emul *emul = EMUL; uint8_t func_set3_reg; - zassert_ok(sn5s330_drv.init(SN5S330_PORT), NULL); + zassert_ok(sn5s330_drv.init(SN5S330_PORT)); /* Test enable/disable VBUS discharging */ - zassert_ok(sn5s330_drv.discharge_vbus(SN5S330_PORT, true), NULL); + zassert_ok(sn5s330_drv.discharge_vbus(SN5S330_PORT, true)); sn5s330_emul_peek_reg(emul, SN5S330_FUNC_SET3, &func_set3_reg); zassert_not_equal(func_set3_reg & SN5S330_VBUS_DISCH_EN, 0, NULL); - zassert_ok(sn5s330_drv.discharge_vbus(SN5S330_PORT, false), NULL); + zassert_ok(sn5s330_drv.discharge_vbus(SN5S330_PORT, false)); sn5s330_emul_peek_reg(emul, SN5S330_FUNC_SET3, &func_set3_reg); - zassert_equal(func_set3_reg & SN5S330_VBUS_DISCH_EN, 0, NULL); + zassert_equal(func_set3_reg & SN5S330_VBUS_DISCH_EN, 0); } ZTEST(ppc_sn5s330, test_set_vbus_source_current_limit) @@ -218,7 +218,7 @@ ZTEST(ppc_sn5s330, test_set_vbus_source_current_limit) uint8_t func_set1_reg; /* Test every TCPC Pull Resistance Value */ - zassert_ok(sn5s330_drv.init(SN5S330_PORT), NULL); + zassert_ok(sn5s330_drv.init(SN5S330_PORT)); /* USB */ zassert_ok(sn5s330_drv.set_vbus_source_current_limit(SN5S330_PORT, @@ -259,17 +259,17 @@ ZTEST(ppc_sn5s330, test_sn5s330_set_sbu) const struct emul *emul = EMUL; uint8_t func_set2_reg; - zassert_ok(sn5s330_drv.init(SN5S330_PORT), NULL); + zassert_ok(sn5s330_drv.init(SN5S330_PORT)); /* Verify driver enables SBU FET */ - zassert_ok(sn5s330_drv.set_sbu(SN5S330_PORT, true), NULL); + zassert_ok(sn5s330_drv.set_sbu(SN5S330_PORT, true)); sn5s330_emul_peek_reg(emul, SN5S330_FUNC_SET2, &func_set2_reg); zassert_not_equal(func_set2_reg & SN5S330_SBU_EN, 0, NULL); /* Verify driver disables SBU FET */ - zassert_ok(sn5s330_drv.set_sbu(SN5S330_PORT, false), NULL); + zassert_ok(sn5s330_drv.set_sbu(SN5S330_PORT, false)); sn5s330_emul_peek_reg(emul, SN5S330_FUNC_SET2, &func_set2_reg); - zassert_equal(func_set2_reg & SN5S330_SBU_EN, 0, NULL); + zassert_equal(func_set2_reg & SN5S330_SBU_EN, 0); } #else { @@ -282,7 +282,7 @@ ZTEST(ppc_sn5s330, test_sn5s330_vbus_overcurrent) const struct emul *emul = EMUL; uint8_t int_trip_rise_reg1; - zassert_ok(sn5s330_drv.init(SN5S330_PORT), NULL); + zassert_ok(sn5s330_drv.init(SN5S330_PORT)); sn5s330_emul_make_vbus_overcurrent(emul); /* @@ -290,7 +290,7 @@ ZTEST(ppc_sn5s330, test_sn5s330_vbus_overcurrent) */ /* Make sure interrupt happens first. */ k_msleep(SN5S330_INTERRUPT_DELAYMS); - zassert_true(sn5s330_emul_interrupt_set_stub_fake.call_count > 0, NULL); + zassert_true(sn5s330_emul_interrupt_set_stub_fake.call_count > 0); /* * Verify we cleared vbus overcurrent interrupt trip rise bit so the @@ -298,7 +298,7 @@ ZTEST(ppc_sn5s330, test_sn5s330_vbus_overcurrent) */ sn5s330_emul_peek_reg(emul, SN5S330_INT_TRIP_RISE_REG1, &int_trip_rise_reg1); - zassert_equal(int_trip_rise_reg1 & SN5S330_ILIM_PP1_MASK, 0, NULL); + zassert_equal(int_trip_rise_reg1 & SN5S330_ILIM_PP1_MASK, 0); } ZTEST(ppc_sn5s330, test_sn5s330_vbus_overcurrent_late_jump) @@ -311,9 +311,9 @@ ZTEST(ppc_sn5s330, test_sn5s330_vbus_overcurrent_late_jump) * to function. */ - zassert_ok(sn5s330_drv.init(SN5S330_PORT), NULL); + zassert_ok(sn5s330_drv.init(SN5S330_PORT)); system_jumped_late_fake.return_val = 1; - zassert_ok(sn5s330_drv.init(SN5S330_PORT), NULL); + zassert_ok(sn5s330_drv.init(SN5S330_PORT)); sn5s330_emul_make_vbus_overcurrent(emul); /* @@ -321,7 +321,7 @@ ZTEST(ppc_sn5s330, test_sn5s330_vbus_overcurrent_late_jump) */ /* Make sure interrupt happens first. */ k_msleep(SN5S330_INTERRUPT_DELAYMS); - zassert_true(sn5s330_emul_interrupt_set_stub_fake.call_count > 0, NULL); + zassert_true(sn5s330_emul_interrupt_set_stub_fake.call_count > 0); /* * Verify we cleared vbus overcurrent interrupt trip rise bit so the @@ -329,7 +329,7 @@ ZTEST(ppc_sn5s330, test_sn5s330_vbus_overcurrent_late_jump) */ sn5s330_emul_peek_reg(emul, SN5S330_INT_TRIP_RISE_REG1, &int_trip_rise_reg1); - zassert_equal(int_trip_rise_reg1 & SN5S330_ILIM_PP1_MASK, 0, NULL); + zassert_equal(int_trip_rise_reg1 & SN5S330_ILIM_PP1_MASK, 0); } ZTEST(ppc_sn5s330, test_sn5s330_disable_vbus_low_interrupt) @@ -337,10 +337,10 @@ ZTEST(ppc_sn5s330, test_sn5s330_disable_vbus_low_interrupt) const struct emul *emul = EMUL; /* Interrupt disabled here */ - zassert_ok(sn5s330_drv.init(SN5S330_PORT), NULL); + zassert_ok(sn5s330_drv.init(SN5S330_PORT)); /* Would normally cause a vbus low interrupt */ sn5s330_emul_lower_vbus_below_minv(emul); - zassert_equal(sn5s330_emul_interrupt_set_stub_fake.call_count, 0, NULL); + zassert_equal(sn5s330_emul_interrupt_set_stub_fake.call_count, 0); } ZTEST(ppc_sn5s330, test_sn5s330_disable_vbus_low_interrupt_late_jump) @@ -352,13 +352,13 @@ ZTEST(ppc_sn5s330, test_sn5s330_disable_vbus_low_interrupt_late_jump) * to function. */ - zassert_ok(sn5s330_drv.init(SN5S330_PORT), NULL); + zassert_ok(sn5s330_drv.init(SN5S330_PORT)); system_jumped_late_fake.return_val = 1; - zassert_ok(sn5s330_drv.init(SN5S330_PORT), NULL); + zassert_ok(sn5s330_drv.init(SN5S330_PORT)); /* Would normally cause a vbus low interrupt */ sn5s330_emul_lower_vbus_below_minv(emul); - zassert_equal(sn5s330_emul_interrupt_set_stub_fake.call_count, 0, NULL); + zassert_equal(sn5s330_emul_interrupt_set_stub_fake.call_count, 0); } ZTEST(ppc_sn5s330, test_sn5s330_set_vconn_fet) @@ -371,11 +371,11 @@ ZTEST(ppc_sn5s330, test_sn5s330_set_vconn_fet) const struct emul *emul = EMUL; uint8_t func_set4_reg; - zassert_ok(sn5s330_drv.init(SN5S330_PORT), NULL); + zassert_ok(sn5s330_drv.init(SN5S330_PORT)); sn5s330_drv.set_vconn(SN5S330_PORT, false); sn5s330_emul_peek_reg(emul, SN5S330_FUNC_SET4, &func_set4_reg); - zassert_equal(func_set4_reg & SN5S330_VCONN_EN, 0, NULL); + zassert_equal(func_set4_reg & SN5S330_VCONN_EN, 0); sn5s330_drv.set_vconn(SN5S330_PORT, true); sn5s330_emul_peek_reg(emul, SN5S330_FUNC_SET4, &func_set4_reg); diff --git a/zephyr/test/drivers/default/src/ppc_syv682x.c b/zephyr/test/drivers/default/src/ppc_syv682x.c index edfbd45171..ba2e68f2ff 100644 --- a/zephyr/test/drivers/default/src/ppc_syv682x.c +++ b/zephyr/test/drivers/default/src/ppc_syv682x.c @@ -88,7 +88,7 @@ ZTEST_F(ppc_syv682x, test_syv682x_board_is_syv682c) * The SYV682x driver should assume a version-C part in the absence of a * board override. */ - zassert_true(syv682x_board_is_syv682c(syv682x_port), NULL); + zassert_true(syv682x_board_is_syv682c(syv682x_port)); } static void check_control_1_default_init(uint8_t control_1) diff --git a/zephyr/test/drivers/default/src/ps8xxx.c b/zephyr/test/drivers/default/src/ps8xxx.c index 29d720a639..1e57f62957 100644 --- a/zephyr/test/drivers/default/src/ps8xxx.c +++ b/zephyr/test/drivers/default/src/ps8xxx.c @@ -82,19 +82,19 @@ ZTEST(ps8805, test_ps8805_init) /* Test fail on read I2C debug reg */ i2c_common_emul_set_read_fail_reg(common_data, PS8XXX_REG_I2C_DEBUGGING_ENABLE); - zassert_equal(EC_ERROR_INVAL, ps8xxx_tcpm_drv.init(USBC_PORT_C1), NULL); + zassert_equal(EC_ERROR_INVAL, ps8xxx_tcpm_drv.init(USBC_PORT_C1)); i2c_common_emul_set_read_fail_reg(common_data, I2C_COMMON_EMUL_NO_FAIL_REG); /* Test fail on read DCI reg */ i2c_common_emul_set_read_fail_reg(p1_i2c_common_data, PS8XXX_P1_REG_MUX_USB_DCI_CFG); - zassert_equal(EC_ERROR_INVAL, ps8xxx_tcpm_drv.init(USBC_PORT_C1), NULL); + zassert_equal(EC_ERROR_INVAL, ps8xxx_tcpm_drv.init(USBC_PORT_C1)); i2c_common_emul_set_read_fail_reg(p1_i2c_common_data, I2C_COMMON_EMUL_NO_FAIL_REG); /* Test successful init */ - zassert_equal(EC_SUCCESS, ps8xxx_tcpm_drv.init(USBC_PORT_C1), NULL); + zassert_equal(EC_SUCCESS, ps8xxx_tcpm_drv.init(USBC_PORT_C1)); check_tcpci_reg(ps8xxx_emul, PS8XXX_REG_I2C_DEBUGGING_ENABLE, PS8XXX_REG_I2C_DEBUGGING_ENABLE_ON); zassert_equal(PS8XXX_REG_MUX_USB_DCI_CFG_MODE_OFF, @@ -119,12 +119,12 @@ ZTEST(ps8815, test_ps8815_init) /* Test fail on reading HW revision register */ i2c_common_emul_set_read_fail_reg(p1_i2c_common_data, PS8815_P1_REG_HW_REVISION); - zassert_equal(EC_ERROR_INVAL, ps8xxx_tcpm_drv.init(USBC_PORT_C1), NULL); + zassert_equal(EC_ERROR_INVAL, ps8xxx_tcpm_drv.init(USBC_PORT_C1)); i2c_common_emul_set_read_fail_reg(p1_i2c_common_data, I2C_COMMON_EMUL_NO_FAIL_REG); /* Test successful init */ - zassert_equal(EC_SUCCESS, ps8xxx_tcpm_drv.init(USBC_PORT_C1), NULL); + zassert_equal(EC_SUCCESS, ps8xxx_tcpm_drv.init(USBC_PORT_C1)); } /** Test PS8xxx release */ @@ -138,14 +138,14 @@ static void test_ps8xxx_release(void) /* Test successful release with correct FW reg read */ start_ms = k_uptime_get(); - zassert_equal(EC_SUCCESS, ps8xxx_tcpm_drv.release(USBC_PORT_C1), NULL); + zassert_equal(EC_SUCCESS, ps8xxx_tcpm_drv.release(USBC_PORT_C1)); zassert_true(k_uptime_get() - start_ms < 10, "release on correct FW reg read shouldn't wait for chip"); /* Test delay on FW reg read fail */ i2c_common_emul_set_read_fail_reg(common_data, PS8XXX_REG_FW_REV); start_ms = k_uptime_get(); - zassert_equal(EC_SUCCESS, ps8xxx_tcpm_drv.release(USBC_PORT_C1), NULL); + zassert_equal(EC_SUCCESS, ps8xxx_tcpm_drv.release(USBC_PORT_C1)); zassert_true(k_uptime_get() - start_ms >= 10, "release on FW reg read fail should wait for chip"); } @@ -211,7 +211,7 @@ ZTEST(ps8815, test_ps8815_set_cc) /* Set firmware version <= 0x10 to set "disable rp detect" workaround */ tcpci_emul_set_reg(ps8xxx_emul, PS8XXX_REG_FW_REV, 0x8); - zassert_equal(EC_SUCCESS, ps8xxx_tcpm_drv.init(USBC_PORT_C1), NULL); + zassert_equal(EC_SUCCESS, ps8xxx_tcpm_drv.init(USBC_PORT_C1)); check_ps8815_set_cc(TYPEC_RP_1A5, TYPEC_CC_RP, RP_DETECT_DISABLE, "fw rev 0x8 \"disable rp detect\" workaround"); @@ -231,7 +231,7 @@ ZTEST(ps8815, test_ps8815_set_cc) * again */ tcpci_emul_set_reg(ps8xxx_emul, PS8XXX_REG_FW_REV, 0xa); - zassert_equal(EC_SUCCESS, ps8xxx_tcpm_drv.init(USBC_PORT_C1), NULL); + zassert_equal(EC_SUCCESS, ps8xxx_tcpm_drv.init(USBC_PORT_C1)); /* CC RD shouldn't trigger "disable rp detect" workaround */ check_ps8815_set_cc(TYPEC_RP_1A5, TYPEC_CC_RD, 0, @@ -242,7 +242,7 @@ ZTEST(ps8815, test_ps8815_set_cc) * workaround */ tcpci_emul_set_reg(ps8xxx_emul, PS8XXX_REG_FW_REV, 0x12); - zassert_equal(EC_SUCCESS, ps8xxx_tcpm_drv.init(USBC_PORT_C1), NULL); + zassert_equal(EC_SUCCESS, ps8xxx_tcpm_drv.init(USBC_PORT_C1)); /* Firmware > 0x10 shouldn't trigger "disable rp detect" workaround */ check_ps8815_set_cc(TYPEC_RP_1A5, TYPEC_CC_RP, 0, @@ -253,7 +253,7 @@ ZTEST(ps8815, test_ps8815_set_cc) * 1 ms on role control reg update) */ ps8xxx_emul_set_hw_rev(ps8xxx_emul, 0x0a00); - zassert_equal(EC_SUCCESS, ps8xxx_tcpm_drv.init(USBC_PORT_C1), NULL); + zassert_equal(EC_SUCCESS, ps8xxx_tcpm_drv.init(USBC_PORT_C1)); start_time = k_uptime_get(); check_ps8815_set_cc(TYPEC_RP_1A5, TYPEC_CC_RP, 0, @@ -267,7 +267,7 @@ ZTEST(ps8815, test_ps8815_set_cc) * 1 ms on role control reg update) */ ps8xxx_emul_set_hw_rev(ps8xxx_emul, 0x0a01); - zassert_equal(EC_SUCCESS, ps8xxx_tcpm_drv.init(USBC_PORT_C1), NULL); + zassert_equal(EC_SUCCESS, ps8xxx_tcpm_drv.init(USBC_PORT_C1)); start_time = k_uptime_get(); check_ps8815_set_cc(TYPEC_RP_1A5, TYPEC_CC_RP, 0, "delay on HW rev 0x0a01"); @@ -280,7 +280,7 @@ ZTEST(ps8815, test_ps8815_set_cc) * 1 ms on role control reg update) */ ps8xxx_emul_set_hw_rev(ps8xxx_emul, 0x0a02); - zassert_equal(EC_SUCCESS, ps8xxx_tcpm_drv.init(USBC_PORT_C1), NULL); + zassert_equal(EC_SUCCESS, ps8xxx_tcpm_drv.init(USBC_PORT_C1)); start_time = k_uptime_get(); check_ps8815_set_cc(TYPEC_RP_1A5, TYPEC_CC_RP, 0, "no delay on other HW rev"); @@ -349,7 +349,7 @@ static void test_ps8xxx_transmit(void) USBC_PORT_C1, TCPCI_MSG_TX_BIST_MODE_2, 0, NULL), NULL); check_tcpci_reg(ps8xxx_emul, PS8XXX_REG_BIST_CONT_MODE_CTR, 0); - zassert_equal(TCPCI_MSG_TX_BIST_MODE_2, msg->sop_type, NULL); + zassert_equal(TCPCI_MSG_TX_BIST_MODE_2, msg->sop_type); /* Check BIST counter value */ zassert_ok(tcpci_emul_get_reg(ps8xxx_emul, @@ -469,7 +469,7 @@ ZTEST(ps8815, test_ps8815_drp_toggle) * 1 ms on role control reg update) */ ps8xxx_emul_set_hw_rev(ps8xxx_emul, 0x0a00); - zassert_equal(EC_SUCCESS, ps8xxx_tcpm_drv.init(USBC_PORT_C1), NULL); + zassert_equal(EC_SUCCESS, ps8xxx_tcpm_drv.init(USBC_PORT_C1)); test_ps88x5_drp_toggle(true); /* @@ -477,7 +477,7 @@ ZTEST(ps8815, test_ps8815_drp_toggle) * 1 ms on role control reg update) */ ps8xxx_emul_set_hw_rev(ps8xxx_emul, 0x0a02); - zassert_equal(EC_SUCCESS, ps8xxx_tcpm_drv.init(USBC_PORT_C1), NULL); + zassert_equal(EC_SUCCESS, ps8xxx_tcpm_drv.init(USBC_PORT_C1)); test_ps88x5_drp_toggle(false); } @@ -522,10 +522,10 @@ static void test_ps8xxx_get_chip_info(uint16_t current_product_id) zassert_equal(EC_SUCCESS, ps8xxx_tcpm_drv.get_chip_info(USBC_PORT_C1, 1, &info), NULL); - zassert_equal(vendor, info.vendor_id, NULL); - zassert_equal(product, info.product_id, NULL); - zassert_equal(device_id, info.device_id, NULL); - zassert_equal(fw_rev, info.fw_version_number, NULL); + zassert_equal(vendor, info.vendor_id); + zassert_equal(product, info.product_id); + zassert_equal(device_id, info.device_id); + zassert_equal(fw_rev, info.fw_version_number); /* Test fail on wrong vendor id */ vendor = 0x0; @@ -557,10 +557,10 @@ static void test_ps8xxx_get_chip_info(uint16_t current_product_id) zassert_equal(EC_SUCCESS, ps8xxx_tcpm_drv.get_chip_info(USBC_PORT_C1, 0, &info), NULL); - zassert_equal(vendor, info.vendor_id, NULL); - zassert_equal(product, info.product_id, NULL); - zassert_equal(device_id, info.device_id, NULL); - zassert_equal(fw_rev, info.fw_version_number, NULL); + zassert_equal(vendor, info.vendor_id); + zassert_equal(product, info.product_id); + zassert_equal(device_id, info.device_id); + zassert_equal(fw_rev, info.fw_version_number); /* Set wrong vendor id */ vendor = 0; @@ -575,10 +575,10 @@ static void test_ps8xxx_get_chip_info(uint16_t current_product_id) zassert_equal(EC_SUCCESS, ps8xxx_tcpm_drv.get_chip_info(USBC_PORT_C1, 0, &info), NULL); - zassert_equal(PS8XXX_VENDOR_ID, info.vendor_id, NULL); - zassert_equal(product, info.product_id, NULL); - zassert_equal(device_id, info.device_id, NULL); - zassert_equal(fw_rev, info.fw_version_number, NULL); + zassert_equal(PS8XXX_VENDOR_ID, info.vendor_id); + zassert_equal(product, info.product_id); + zassert_equal(device_id, info.device_id); + zassert_equal(fw_rev, info.fw_version_number); /* Set correct vendor id */ vendor = PS8XXX_VENDOR_ID; @@ -597,13 +597,13 @@ static void test_ps8xxx_get_chip_info(uint16_t current_product_id) zassert_equal(EC_SUCCESS, ps8xxx_tcpm_drv.get_chip_info(USBC_PORT_C1, 0, &info), NULL); - zassert_equal(vendor, info.vendor_id, NULL); + zassert_equal(vendor, info.vendor_id); zassert_equal(board_get_ps8xxx_product_id(USBC_PORT_C1), info.product_id, NULL); - zassert_equal(device_id, info.device_id, NULL); - zassert_equal(fw_rev, info.fw_version_number, NULL); + zassert_equal(device_id, info.device_id); + zassert_equal(fw_rev, info.fw_version_number); - zassert_equal(false, check_ps8755_chip(USBC_PORT_C1), NULL); + zassert_equal(false, check_ps8755_chip(USBC_PORT_C1)); } ZTEST(ps8805, test_ps8805_get_chip_info) @@ -655,7 +655,7 @@ ZTEST(ps8805, test_ps8805_get_chip_info_fix_dev_id) /* Set correct power status for this test */ tcpci_emul_set_reg(ps8xxx_emul, TCPC_REG_POWER_STATUS, 0x0); /* Init to allow access to "hidden" I2C ports */ - zassert_equal(EC_SUCCESS, ps8xxx_tcpm_drv.init(USBC_PORT_C1), NULL); + zassert_equal(EC_SUCCESS, ps8xxx_tcpm_drv.init(USBC_PORT_C1)); /* Set device id which requires fixing */ device_id = 0x1; @@ -870,7 +870,7 @@ ZTEST(ps8805, test_ps8805_gpio) /* Set correct power status for this test */ tcpci_emul_set_reg(ps8xxx_emul, TCPC_REG_POWER_STATUS, 0x0); /* Init to allow access to "hidden" I2C ports */ - zassert_equal(EC_SUCCESS, ps8xxx_tcpm_drv.init(USBC_PORT_C1), NULL); + zassert_equal(EC_SUCCESS, ps8xxx_tcpm_drv.init(USBC_PORT_C1)); /* Test fail on invalid signal for gpio control reg */ zassert_equal(EC_ERROR_INVAL, @@ -1268,7 +1268,7 @@ static void ps8805_before(void *state) board_set_ps8xxx_product_id(PS8805_PRODUCT_ID); ps8xxx_emul_set_product_id(ps8xxx_emul, PS8805_PRODUCT_ID); setup_no_fail_all(); - zassume_equal(EC_SUCCESS, ps8xxx_tcpm_drv.init(USBC_PORT_C1), NULL); + zassume_equal(EC_SUCCESS, ps8xxx_tcpm_drv.init(USBC_PORT_C1)); } static void ps8805_after(void *state) @@ -1292,7 +1292,7 @@ static void ps8815_before(void *state) board_set_ps8xxx_product_id(PS8815_PRODUCT_ID); ps8xxx_emul_set_product_id(ps8xxx_emul, PS8815_PRODUCT_ID); setup_no_fail_all(); - zassume_equal(EC_SUCCESS, ps8xxx_tcpm_drv.init(USBC_PORT_C1), NULL); + zassume_equal(EC_SUCCESS, ps8xxx_tcpm_drv.init(USBC_PORT_C1)); } static void ps8815_after(void *state) diff --git a/zephyr/test/drivers/default/src/smart.c b/zephyr/test/drivers/default/src/smart.c index 96200f1b91..9db292ac96 100644 --- a/zephyr/test/drivers/default/src/smart.c +++ b/zephyr/test/drivers/default/src/smart.c @@ -31,28 +31,28 @@ ZTEST_USER(smart_battery, test_battery_getters) bat = sbat_emul_get_bat_data(emul); - zassert_equal(EC_SUCCESS, battery_get_mode(&word), NULL); + zassert_equal(EC_SUCCESS, battery_get_mode(&word)); zassert_equal(bat->mode, word, "%d != %d", bat->mode, word); expected = 100 * bat->cap / bat->design_cap; - zassert_equal(EC_SUCCESS, battery_state_of_charge_abs(&word), NULL); + zassert_equal(EC_SUCCESS, battery_state_of_charge_abs(&word)); zassert_equal(expected, word, "%d != %d", expected, word); - zassert_equal(EC_SUCCESS, battery_cycle_count(&word), NULL); + zassert_equal(EC_SUCCESS, battery_cycle_count(&word)); zassert_equal(bat->cycle_count, word, "%d != %d", bat->cycle_count, word); - zassert_equal(EC_SUCCESS, battery_design_voltage(&word), NULL); + zassert_equal(EC_SUCCESS, battery_design_voltage(&word)); zassert_equal(bat->design_mv, word, "%d != %d", bat->design_mv, word); - zassert_equal(EC_SUCCESS, battery_serial_number(&word), NULL); + zassert_equal(EC_SUCCESS, battery_serial_number(&word)); zassert_equal(bat->sn, word, "%d != %d", bat->sn, word); zassert_equal(EC_SUCCESS, get_battery_manufacturer_name(block, 32), NULL); zassert_mem_equal(block, bat->mf_name, bat->mf_name_len, "%s != %s", block, bat->mf_name); - zassert_equal(EC_SUCCESS, battery_device_name(block, 32), NULL); + zassert_equal(EC_SUCCESS, battery_device_name(block, 32)); zassert_mem_equal(block, bat->dev_name, bat->dev_name_len, "%s != %s", block, bat->dev_name); - zassert_equal(EC_SUCCESS, battery_device_chemistry(block, 32), NULL); + zassert_equal(EC_SUCCESS, battery_device_chemistry(block, 32)); zassert_mem_equal(block, bat->dev_chem, bat->dev_chem_len, "%s != %s", block, bat->dev_chem); word = battery_get_avg_current(); @@ -62,17 +62,17 @@ ZTEST_USER(smart_battery, test_battery_getters) bat->avg_cur = 200; expected = (bat->full_cap - bat->cap) * 60 / bat->avg_cur; - zassert_equal(EC_SUCCESS, battery_time_to_full(&word), NULL); + zassert_equal(EC_SUCCESS, battery_time_to_full(&word)); zassert_equal(expected, word, "%d != %d", expected, word); bat->cur = -200; expected = bat->cap * 60 / (-bat->cur); - zassert_equal(EC_SUCCESS, battery_run_time_to_empty(&word), NULL); + zassert_equal(EC_SUCCESS, battery_run_time_to_empty(&word)); zassert_equal(expected, word, "%d != %d", expected, word); bat->avg_cur = -200; expected = bat->cap * 60 / (-bat->avg_cur); - zassert_equal(EC_SUCCESS, battery_time_to_empty(&word), NULL); + zassert_equal(EC_SUCCESS, battery_time_to_empty(&word)); zassert_equal(expected, word, "%d != %d", expected, word); } @@ -89,28 +89,28 @@ ZTEST_USER(smart_battery, test_battery_get_capacity) /* Test fail when checking battery mode */ i2c_common_emul_set_read_fail_reg(common_data, SB_BATTERY_MODE); - zassert_equal(EC_ERROR_INVAL, battery_remaining_capacity(&word), NULL); + zassert_equal(EC_ERROR_INVAL, battery_remaining_capacity(&word)); zassert_equal(EC_ERROR_INVAL, battery_full_charge_capacity(&word), NULL); - zassert_equal(EC_ERROR_INVAL, battery_design_capacity(&word), NULL); + zassert_equal(EC_ERROR_INVAL, battery_design_capacity(&word)); i2c_common_emul_set_read_fail_reg(common_data, I2C_COMMON_EMUL_NO_FAIL_REG); /* Test getting remaining capacity and if mAh mode is forced */ bat->mode |= MODE_CAPACITY; - zassert_equal(EC_SUCCESS, battery_remaining_capacity(&word), NULL); + zassert_equal(EC_SUCCESS, battery_remaining_capacity(&word)); zassert_equal(bat->cap, word, "%d != %d", bat->cap, word); zassert_false(bat->mode & MODE_CAPACITY, "mAh mode not forced"); /* Test getting full charge capacity and if mAh mode is forced */ bat->mode |= MODE_CAPACITY; - zassert_equal(EC_SUCCESS, battery_full_charge_capacity(&word), NULL); + zassert_equal(EC_SUCCESS, battery_full_charge_capacity(&word)); zassert_equal(bat->full_cap, word, "%d != %d", bat->full_cap, word); zassert_false(bat->mode & MODE_CAPACITY, "mAh mode not forced"); /* Test getting design capacity and if mAh mode is forced */ bat->mode |= MODE_CAPACITY; - zassert_equal(EC_SUCCESS, battery_design_capacity(&word), NULL); + zassert_equal(EC_SUCCESS, battery_design_capacity(&word)); zassert_equal(bat->design_cap, word, "%d != %d", bat->design_cap, word); zassert_false(bat->mode & MODE_CAPACITY, "mAh mode not forced"); } @@ -136,7 +136,7 @@ ZTEST_USER(smart_battery, test_battery_status) expected |= STATUS_DISCHARGING; expected |= STATUS_CODE_OVERUNDERFLOW; - zassert_equal(EC_SUCCESS, battery_status(&status), NULL); + zassert_equal(EC_SUCCESS, battery_status(&status)); zassert_equal(expected, status, "%d != %d", expected, status); } @@ -150,12 +150,12 @@ ZTEST_USER(smart_battery, test_battery_wait_for_stable) /* Should fail when read function always fail */ i2c_common_emul_set_read_fail_reg(common_data, I2C_COMMON_EMUL_FAIL_ALL_REG); - zassert_equal(EC_ERROR_NOT_POWERED, battery_wait_for_stable(), NULL); + zassert_equal(EC_ERROR_NOT_POWERED, battery_wait_for_stable()); /* Should be ok with default handler */ i2c_common_emul_set_read_fail_reg(common_data, I2C_COMMON_EMUL_NO_FAIL_REG); - zassert_equal(EC_SUCCESS, battery_wait_for_stable(), NULL); + zassert_equal(EC_SUCCESS, battery_wait_for_stable()); } /** Test manufacture date */ @@ -229,7 +229,7 @@ ZTEST_USER(smart_battery, test_battery_time_at_rate) rate = -300; expect_time = 600; - zassert_equal(EC_SUCCESS, battery_time_at_rate(rate, &minutes), NULL); + zassert_equal(EC_SUCCESS, battery_time_at_rate(rate, &minutes)); zassert_equal(expect_time, minutes, "%d != %d", expect_time, minutes); /* 1000mAh at rate 1000mA will be charged in 1h */ @@ -238,7 +238,7 @@ ZTEST_USER(smart_battery, test_battery_time_at_rate) /* battery_time_at_rate report time to full as negative number */ expect_time = -60; - zassert_equal(EC_SUCCESS, battery_time_at_rate(rate, &minutes), NULL); + zassert_equal(EC_SUCCESS, battery_time_at_rate(rate, &minutes)); zassert_equal(expect_time, minutes, "%d != %d", expect_time, minutes); } diff --git a/zephyr/test/drivers/default/src/tcpci.c b/zephyr/test/drivers/default/src/tcpci.c index 0cb9070929..db0ad076ab 100644 --- a/zephyr/test/drivers/default/src/tcpci.c +++ b/zephyr/test/drivers/default/src/tcpci.c @@ -311,14 +311,14 @@ ZTEST(tcpci, test_generic_tcpci_mux_init) /* Make sure that TCPC is not accessed */ i2c_common_emul_set_read_fail_reg(common_data, I2C_COMMON_EMUL_FAIL_ALL_REG); - zassert_equal(EC_SUCCESS, tcpci_tcpm_mux_init(tcpci_usb_mux), NULL); + zassert_equal(EC_SUCCESS, tcpci_tcpm_mux_init(tcpci_usb_mux)); /* Set as only usb mux without TCPC for rest of the test */ set_usb_mux_not_tcpc(); /* Test fail on power status read */ i2c_common_emul_set_read_fail_reg(common_data, TCPC_REG_POWER_STATUS); - zassert_equal(EC_ERROR_INVAL, tcpci_tcpm_mux_init(tcpci_usb_mux), NULL); + zassert_equal(EC_ERROR_INVAL, tcpci_tcpm_mux_init(tcpci_usb_mux)); i2c_common_emul_set_read_fail_reg(common_data, I2C_COMMON_EMUL_NO_FAIL_REG); @@ -349,7 +349,7 @@ ZTEST(tcpci, test_generic_tcpci_mux_init) tcpci_emul_set_reg(emul, TCPC_REG_ALERT_MASK, 0xffff); /* Test success init */ - zassert_equal(EC_SUCCESS, tcpci_tcpm_mux_init(tcpci_usb_mux), NULL); + zassert_equal(EC_SUCCESS, tcpci_tcpm_mux_init(tcpci_usb_mux)); check_tcpci_reg(emul, TCPC_REG_ALERT_MASK, 0); check_tcpci_reg(emul, TCPC_REG_ALERT, 0); } diff --git a/zephyr/test/drivers/default/src/tcpci_test_common.c b/zephyr/test/drivers/default/src/tcpci_test_common.c index f2c0c58bf9..bbc1e3f8b0 100644 --- a/zephyr/test/drivers/default/src/tcpci_test_common.c +++ b/zephyr/test/drivers/default/src/tcpci_test_common.c @@ -50,14 +50,14 @@ void test_tcpci_init(const struct emul *emul, /* Test fail on power status read */ i2c_common_emul_set_read_fail_reg(common_data, TCPC_REG_POWER_STATUS); - zassert_equal(EC_ERROR_INVAL, drv->init(port), NULL); + zassert_equal(EC_ERROR_INVAL, drv->init(port)); i2c_common_emul_set_read_fail_reg(common_data, I2C_COMMON_EMUL_NO_FAIL_REG); /* Test fail on uninitialised bit set */ tcpci_emul_set_reg(emul, TCPC_REG_POWER_STATUS, TCPC_REG_POWER_STATUS_UNINIT); - zassert_equal(EC_ERROR_TIMEOUT, drv->init(port), NULL); + zassert_equal(EC_ERROR_TIMEOUT, drv->init(port)); /* * Set expected alert mask. It is used in test until vSafe0V tcpc @@ -73,9 +73,9 @@ void test_tcpci_init(const struct emul *emul, TCPC_REG_POWER_STATUS_VBUS_DET); /* Test init with VBUS safe0v without vSafe0V tcpc config flag */ - zassert_equal(EC_SUCCESS, drv->init(port), NULL); - zassert_true(drv->check_vbus_level(port, VBUS_SAFE0V), NULL); - zassert_false(drv->check_vbus_level(port, VBUS_PRESENT), NULL); + zassert_equal(EC_SUCCESS, drv->init(port)); + zassert_true(drv->check_vbus_level(port, VBUS_SAFE0V)); + zassert_false(drv->check_vbus_level(port, VBUS_PRESENT)); check_tcpci_reg(emul, TCPC_REG_POWER_STATUS_MASK, TCPC_REG_POWER_STATUS_VBUS_PRES); check_tcpci_reg(emul, TCPC_REG_ALERT_MASK, exp_mask); @@ -86,9 +86,9 @@ void test_tcpci_init(const struct emul *emul, TCPC_REG_POWER_STATUS_VBUS_DET); /* Test init with VBUS present without vSafe0V tcpc config flag */ - zassert_equal(EC_SUCCESS, drv->init(port), NULL); - zassert_false(drv->check_vbus_level(port, VBUS_SAFE0V), NULL); - zassert_true(drv->check_vbus_level(port, VBUS_PRESENT), NULL); + zassert_equal(EC_SUCCESS, drv->init(port)); + zassert_false(drv->check_vbus_level(port, VBUS_SAFE0V)); + zassert_true(drv->check_vbus_level(port, VBUS_PRESENT)); check_tcpci_reg(emul, TCPC_REG_POWER_STATUS_MASK, TCPC_REG_POWER_STATUS_VBUS_PRES); check_tcpci_reg(emul, TCPC_REG_ALERT_MASK, exp_mask); @@ -98,9 +98,9 @@ void test_tcpci_init(const struct emul *emul, tcpc_config[port].flags = TCPC_FLAGS_TCPCI_REV2_0; /* Test init with VBUS present with vSafe0V tcpc config flag */ - zassert_equal(EC_SUCCESS, drv->init(port), NULL); - zassert_false(drv->check_vbus_level(port, VBUS_SAFE0V), NULL); - zassert_true(drv->check_vbus_level(port, VBUS_PRESENT), NULL); + zassert_equal(EC_SUCCESS, drv->init(port)); + zassert_false(drv->check_vbus_level(port, VBUS_SAFE0V)); + zassert_true(drv->check_vbus_level(port, VBUS_PRESENT)); check_tcpci_reg(emul, TCPC_REG_POWER_STATUS_MASK, TCPC_REG_POWER_STATUS_VBUS_PRES); check_tcpci_reg(emul, TCPC_REG_ALERT_MASK, exp_mask); @@ -112,9 +112,9 @@ void test_tcpci_init(const struct emul *emul, TCPC_REG_EXT_STATUS_SAFE0V); /* Test init with VBUS safe0v with vSafe0V tcpc config flag */ - zassert_equal(EC_SUCCESS, drv->init(port), NULL); - zassert_true(drv->check_vbus_level(port, VBUS_SAFE0V), NULL); - zassert_false(drv->check_vbus_level(port, VBUS_PRESENT), NULL); + zassert_equal(EC_SUCCESS, drv->init(port)); + zassert_true(drv->check_vbus_level(port, VBUS_SAFE0V)); + zassert_false(drv->check_vbus_level(port, VBUS_PRESENT)); check_tcpci_reg(emul, TCPC_REG_POWER_STATUS_MASK, TCPC_REG_POWER_STATUS_VBUS_PRES); check_tcpci_reg(emul, TCPC_REG_ALERT_MASK, exp_mask); @@ -126,9 +126,9 @@ void test_tcpci_init(const struct emul *emul, tcpci_emul_set_reg(emul, TCPC_REG_EXT_STATUS, 0); /* Test init with VBUS not safe0v with vSafe0V tcpc config flag */ - zassert_equal(EC_SUCCESS, drv->init(port), NULL); - zassert_false(drv->check_vbus_level(port, VBUS_SAFE0V), NULL); - zassert_false(drv->check_vbus_level(port, VBUS_PRESENT), NULL); + zassert_equal(EC_SUCCESS, drv->init(port)); + zassert_false(drv->check_vbus_level(port, VBUS_SAFE0V)); + zassert_false(drv->check_vbus_level(port, VBUS_PRESENT)); check_tcpci_reg(emul, TCPC_REG_POWER_STATUS_MASK, TCPC_REG_POWER_STATUS_VBUS_PRES); check_tcpci_reg(emul, TCPC_REG_ALERT_MASK, exp_mask); @@ -143,7 +143,7 @@ void test_tcpci_release(const struct emul *emul, tcpci_emul_set_reg(emul, TCPC_REG_ALERT, 0xffff); - zassert_equal(EC_SUCCESS, drv->release(port), NULL); + zassert_equal(EC_SUCCESS, drv->release(port)); check_tcpci_reg(emul, TCPC_REG_POWER_STATUS_MASK, 0); check_tcpci_reg(emul, TCPC_REG_ALERT_MASK, 0); check_tcpci_reg(emul, TCPC_REG_ALERT, 0); @@ -263,30 +263,30 @@ void test_tcpci_set_cc(const struct emul *emul, /* Test setting default RP and cc open */ rp = TYPEC_RP_USB; cc = TYPEC_CC_OPEN; - zassert_equal(EC_SUCCESS, drv->select_rp_value(port, rp), NULL); - zassert_equal(EC_SUCCESS, drv->set_cc(port, cc), NULL); + zassert_equal(EC_SUCCESS, drv->select_rp_value(port, rp)); + zassert_equal(EC_SUCCESS, drv->set_cc(port, cc)); check_tcpci_reg(emul, TCPC_REG_ROLE_CTRL, TCPC_REG_ROLE_CTRL_SET(TYPEC_NO_DRP, rp, cc, cc)); /* Test error on failed role ctrl set */ i2c_common_emul_set_write_fail_reg(common_data, TCPC_REG_ROLE_CTRL); - zassert_equal(EC_ERROR_INVAL, drv->set_cc(port, TYPEC_CC_OPEN), NULL); + zassert_equal(EC_ERROR_INVAL, drv->set_cc(port, TYPEC_CC_OPEN)); i2c_common_emul_set_write_fail_reg(common_data, I2C_COMMON_EMUL_NO_FAIL_REG); /* Test setting 1.5 RP and cc RD */ rp = TYPEC_RP_1A5; cc = TYPEC_CC_RD; - zassert_equal(EC_SUCCESS, drv->select_rp_value(port, rp), NULL); - zassert_equal(EC_SUCCESS, drv->set_cc(port, cc), NULL); + zassert_equal(EC_SUCCESS, drv->select_rp_value(port, rp)); + zassert_equal(EC_SUCCESS, drv->set_cc(port, cc)); check_tcpci_reg(emul, TCPC_REG_ROLE_CTRL, TCPC_REG_ROLE_CTRL_SET(TYPEC_NO_DRP, rp, cc, cc)); /* Test setting 3.0 RP and cc RP */ rp = TYPEC_RP_3A0; cc = TYPEC_CC_RP; - zassert_equal(EC_SUCCESS, drv->select_rp_value(port, rp), NULL); - zassert_equal(EC_SUCCESS, drv->set_cc(port, cc), NULL); + zassert_equal(EC_SUCCESS, drv->select_rp_value(port, rp)); + zassert_equal(EC_SUCCESS, drv->set_cc(port, cc)); check_tcpci_reg(emul, TCPC_REG_ROLE_CTRL, TCPC_REG_ROLE_CTRL_SET(TYPEC_NO_DRP, rp, cc, cc)); @@ -295,7 +295,7 @@ void test_tcpci_set_cc(const struct emul *emul, * intentionally not called to check if selected rp is persistent. */ cc = TYPEC_CC_RA; - zassert_equal(EC_SUCCESS, drv->set_cc(port, cc), NULL); + zassert_equal(EC_SUCCESS, drv->set_cc(port, cc)); check_tcpci_reg(emul, TCPC_REG_ROLE_CTRL, TCPC_REG_ROLE_CTRL_SET(TYPEC_NO_DRP, rp, cc, cc)); } @@ -325,12 +325,12 @@ void test_tcpci_set_polarity(const struct emul *emul, /* Test setting polarity CC2 */ exp_ctrl = initial_ctrl | TCPC_REG_TCPC_CTRL_SET(1); - zassert_equal(EC_SUCCESS, drv->set_polarity(port, POLARITY_CC2), NULL); + zassert_equal(EC_SUCCESS, drv->set_polarity(port, POLARITY_CC2)); check_tcpci_reg(emul, TCPC_REG_TCPC_CTRL, exp_ctrl); /* Test setting polarity CC1 */ exp_ctrl = initial_ctrl & ~TCPC_REG_TCPC_CTRL_SET(1); - zassert_equal(EC_SUCCESS, drv->set_polarity(port, POLARITY_CC1), NULL); + zassert_equal(EC_SUCCESS, drv->set_polarity(port, POLARITY_CC1)); check_tcpci_reg(emul, TCPC_REG_TCPC_CTRL, exp_ctrl); /* Test setting polarity CC2 DTS */ @@ -363,19 +363,19 @@ void test_tcpci_set_vconn(const struct emul *emul, /* Test error on failed vconn set */ exp_ctrl = initial_ctrl; i2c_common_emul_set_write_fail_reg(common_data, TCPC_REG_POWER_CTRL); - zassert_equal(EC_ERROR_INVAL, drv->set_vconn(port, 1), NULL); + zassert_equal(EC_ERROR_INVAL, drv->set_vconn(port, 1)); i2c_common_emul_set_write_fail_reg(common_data, I2C_COMMON_EMUL_NO_FAIL_REG); check_tcpci_reg(emul, TCPC_REG_POWER_CTRL, exp_ctrl); /* Test vconn enable */ exp_ctrl = initial_ctrl | TCPC_REG_POWER_CTRL_SET(1); - zassert_equal(EC_SUCCESS, drv->set_vconn(port, 1), NULL); + zassert_equal(EC_SUCCESS, drv->set_vconn(port, 1)); check_tcpci_reg(emul, TCPC_REG_POWER_CTRL, exp_ctrl); /* Test vconn disable */ exp_ctrl = initial_ctrl & ~TCPC_REG_POWER_CTRL_SET(1); - zassert_equal(EC_SUCCESS, drv->set_vconn(port, 0), NULL); + zassert_equal(EC_SUCCESS, drv->set_vconn(port, 0)); check_tcpci_reg(emul, TCPC_REG_POWER_CTRL, exp_ctrl); } @@ -432,38 +432,38 @@ void test_tcpci_set_rx_detect(const struct emul *emul, /* Test error from rx_enable on rx detect set */ i2c_common_emul_set_write_fail_reg(common_data, TCPC_REG_RX_DETECT); - zassert_equal(EC_ERROR_INVAL, drv->set_rx_enable(port, 1), NULL); + zassert_equal(EC_ERROR_INVAL, drv->set_rx_enable(port, 1)); i2c_common_emul_set_write_fail_reg(common_data, I2C_COMMON_EMUL_NO_FAIL_REG); /* Test rx disable */ - zassert_equal(EC_SUCCESS, drv->set_rx_enable(port, 0), NULL); + zassert_equal(EC_SUCCESS, drv->set_rx_enable(port, 0)); check_tcpci_reg(emul, TCPC_REG_RX_DETECT, 0x0); /* Test setting sop prime with rx disable doesn't change RX_DETECT */ - zassert_equal(EC_SUCCESS, drv->sop_prime_enable(port, 1), NULL); + zassert_equal(EC_SUCCESS, drv->sop_prime_enable(port, 1)); check_tcpci_reg(emul, TCPC_REG_RX_DETECT, 0x0); /* Test that enabling rx after sop prime will set RX_DETECT properly */ - zassert_equal(EC_SUCCESS, drv->set_rx_enable(port, 1), NULL); + zassert_equal(EC_SUCCESS, drv->set_rx_enable(port, 1)); check_tcpci_reg(emul, TCPC_REG_RX_DETECT, TCPC_REG_RX_DETECT_SOP_SOPP_SOPPP_HRST_MASK); /* Test error from sop_prime on rx detect set */ i2c_common_emul_set_write_fail_reg(common_data, TCPC_REG_RX_DETECT); - zassert_equal(EC_ERROR_INVAL, drv->sop_prime_enable(port, 0), NULL); + zassert_equal(EC_ERROR_INVAL, drv->sop_prime_enable(port, 0)); i2c_common_emul_set_write_fail_reg(common_data, I2C_COMMON_EMUL_NO_FAIL_REG); /* Test disabling sop prime with rx enabled does change RX_DETECT */ - zassert_equal(EC_SUCCESS, drv->sop_prime_enable(port, 0), NULL); + zassert_equal(EC_SUCCESS, drv->sop_prime_enable(port, 0)); check_tcpci_reg(emul, TCPC_REG_RX_DETECT, TCPC_REG_RX_DETECT_SOP_HRST_MASK); /* Test that enabling rx after disabling sop prime set RX_DETECT */ - zassert_equal(EC_SUCCESS, drv->set_rx_enable(port, 0), NULL); + zassert_equal(EC_SUCCESS, drv->set_rx_enable(port, 0)); check_tcpci_reg(emul, TCPC_REG_RX_DETECT, 0x0); - zassert_equal(EC_SUCCESS, drv->set_rx_enable(port, 1), NULL); + zassert_equal(EC_SUCCESS, drv->set_rx_enable(port, 1)); check_tcpci_reg(emul, TCPC_REG_RX_DETECT, TCPC_REG_RX_DETECT_SOP_HRST_MASK); } @@ -577,13 +577,13 @@ void test_tcpci_transmit(const struct emul *emul, zassert_equal(EC_SUCCESS, drv->transmit(port, TCPCI_MSG_CABLE_RESET, 0, NULL), NULL); - zassert_equal(TCPCI_MSG_CABLE_RESET, msg->sop_type, NULL); + zassert_equal(TCPCI_MSG_CABLE_RESET, msg->sop_type); /* Test transmit hard reset */ zassert_equal(EC_SUCCESS, drv->transmit(port, TCPCI_MSG_TX_HARD_RESET, 0, NULL), NULL); - zassert_equal(TCPCI_MSG_TX_HARD_RESET, msg->sop_type, NULL); + zassert_equal(TCPCI_MSG_TX_HARD_RESET, msg->sop_type); /* Test transmit fail on rx buffer */ i2c_common_emul_set_write_fail_reg(common_data, TCPC_REG_TX_BUFFER); @@ -599,9 +599,9 @@ void test_tcpci_transmit(const struct emul *emul, zassert_equal(EC_SUCCESS, drv->transmit(port, TCPCI_MSG_SOP_PRIME, header, data), NULL); - zassert_equal(TCPCI_MSG_SOP_PRIME, msg->sop_type, NULL); + zassert_equal(TCPCI_MSG_SOP_PRIME, msg->sop_type); zassert_mem_equal(msg->buf, &header, 2, NULL); - zassert_equal(2, msg->cnt, NULL); + zassert_equal(2, msg->cnt); /* Test transmit message */ /* Build random header with count 6 */ @@ -610,10 +610,10 @@ void test_tcpci_transmit(const struct emul *emul, zassert_equal(EC_SUCCESS, drv->transmit(port, TCPCI_MSG_SOP_PRIME, header, data), NULL); - zassert_equal(TCPCI_MSG_SOP_PRIME, msg->sop_type, NULL); + zassert_equal(TCPCI_MSG_SOP_PRIME, msg->sop_type); zassert_mem_equal(msg->buf, &header, 2, NULL); zassert_mem_equal(msg->buf + 2, data, 6 * sizeof(uint32_t), NULL); - zassert_equal(2 + 6 * sizeof(uint32_t), msg->cnt, NULL); + zassert_equal(2 + 6 * sizeof(uint32_t), msg->cnt); } /** Test TCPCI alert */ @@ -700,7 +700,7 @@ void test_tcpci_alert_rx_message(const struct emul *emul, check_tcpci_reg(emul, TCPC_REG_ALERT, 0x0); /* Check if msg1 is in queue */ - zassert_true(tcpm_has_pending_message(port), NULL); + zassert_true(tcpm_has_pending_message(port)); zassert_equal(EC_SUCCESS, tcpm_dequeue_message(port, payload, &head), NULL); exp_head = (TCPCI_MSG_SOP << 28) | (buf1[1] << 8) | buf1[0]; @@ -708,7 +708,7 @@ void test_tcpci_alert_rx_message(const struct emul *emul, "Received header 0x%08lx, expected 0x%08lx", head, exp_head); zassert_mem_equal(payload, buf1 + 2, size, NULL); - zassert_false(tcpm_has_pending_message(port), NULL); + zassert_false(tcpm_has_pending_message(port)); /* Test receiving two messages */ zassert_equal(TCPCI_EMUL_TX_SUCCESS, @@ -721,7 +721,7 @@ void test_tcpci_alert_rx_message(const struct emul *emul, check_tcpci_reg(emul, TCPC_REG_ALERT, 0x0); /* Check if msg1 is in queue */ - zassert_true(tcpm_has_pending_message(port), NULL); + zassert_true(tcpm_has_pending_message(port)); zassert_equal(EC_SUCCESS, tcpm_dequeue_message(port, payload, &head), NULL); exp_head = (TCPCI_MSG_SOP << 28) | (buf1[1] << 8) | buf1[0]; @@ -730,7 +730,7 @@ void test_tcpci_alert_rx_message(const struct emul *emul, exp_head); zassert_mem_equal(payload, buf1 + 2, size, NULL); /* Check if msg2 is in queue */ - zassert_true(tcpm_has_pending_message(port), NULL); + zassert_true(tcpm_has_pending_message(port)); zassert_equal(EC_SUCCESS, tcpm_dequeue_message(port, payload, &head), NULL); exp_head = (TCPCI_MSG_SOP_PRIME << 28) | (buf2[1] << 8) | buf2[0]; @@ -738,7 +738,7 @@ void test_tcpci_alert_rx_message(const struct emul *emul, "Received header 0x%08lx, expected 0x%08lx", head, exp_head); zassert_mem_equal(payload, buf2 + 2, size, NULL); - zassert_false(tcpm_has_pending_message(port), NULL); + zassert_false(tcpm_has_pending_message(port)); /* Test with too long first message */ msg1.cnt = 32; @@ -754,7 +754,7 @@ void test_tcpci_alert_rx_message(const struct emul *emul, check_tcpci_reg(emul, TCPC_REG_ALERT, 0x0); /* Check if msg2 is in queue */ - zassert_true(tcpm_has_pending_message(port), NULL); + zassert_true(tcpm_has_pending_message(port)); zassert_equal(EC_SUCCESS, tcpm_dequeue_message(port, payload, &head), NULL); exp_head = (TCPCI_MSG_SOP_PRIME << 28) | (buf2[1] << 8) | buf2[0]; @@ -762,7 +762,7 @@ void test_tcpci_alert_rx_message(const struct emul *emul, "Received header 0x%08lx, expected 0x%08lx", head, exp_head); zassert_mem_equal(payload, buf2 + 2, size, NULL); - zassert_false(tcpm_has_pending_message(port), NULL); + zassert_false(tcpm_has_pending_message(port)); /* Test constant read message failure */ zassert_equal(TCPCI_EMUL_TX_SUCCESS, @@ -772,7 +772,7 @@ void test_tcpci_alert_rx_message(const struct emul *emul, msg1.next = &msg1; drv->tcpc_alert(port); /* Nothing should be in queue */ - zassert_false(tcpm_has_pending_message(port), NULL); + zassert_false(tcpm_has_pending_message(port)); /* Test constant correct messages stream */ msg1.cnt = size + 3; @@ -782,7 +782,7 @@ void test_tcpci_alert_rx_message(const struct emul *emul, /* msg1 should be at least twice in queue */ exp_head = (TCPCI_MSG_SOP << 28) | (buf1[1] << 8) | buf1[0]; for (i = 0; i < 2; i++) { - zassert_true(tcpm_has_pending_message(port), NULL); + zassert_true(tcpm_has_pending_message(port)); zassert_equal(EC_SUCCESS, tcpm_dequeue_message(port, payload, &head), NULL); zassert_equal(exp_head, head, @@ -791,14 +791,14 @@ void test_tcpci_alert_rx_message(const struct emul *emul, zassert_mem_equal(payload, buf1 + 2, size, NULL); } tcpm_clear_pending_messages(port); - zassert_false(tcpm_has_pending_message(port), NULL); + zassert_false(tcpm_has_pending_message(port)); /* Read message that is left in TCPC buffer */ drv->tcpc_alert(port); check_tcpci_reg(emul, TCPC_REG_ALERT, 0x0); /* Check if msg1 is in queue */ - zassert_true(tcpm_has_pending_message(port), NULL); + zassert_true(tcpm_has_pending_message(port)); zassert_equal(EC_SUCCESS, tcpm_dequeue_message(port, payload, &head), NULL); exp_head = (TCPCI_MSG_SOP << 28) | (buf1[1] << 8) | buf1[0]; @@ -806,7 +806,7 @@ void test_tcpci_alert_rx_message(const struct emul *emul, "Received header 0x%08lx, expected 0x%08lx", head, exp_head); zassert_mem_equal(payload, buf1 + 2, size, NULL); - zassert_false(tcpm_has_pending_message(port), NULL); + zassert_false(tcpm_has_pending_message(port)); } /** Test TCPCI auto discharge on disconnect */ @@ -845,15 +845,15 @@ void test_tcpci_drp_toggle(const struct emul *emul, /* Test error on failed role CTRL set */ i2c_common_emul_set_write_fail_reg(common_data, TCPC_REG_ROLE_CTRL); - zassert_equal(EC_ERROR_INVAL, drv->drp_toggle(port), NULL); + zassert_equal(EC_ERROR_INVAL, drv->drp_toggle(port)); /* Test error on failed TCPC CTRL set */ i2c_common_emul_set_write_fail_reg(common_data, TCPC_REG_TCPC_CTRL); - zassert_equal(EC_ERROR_INVAL, drv->drp_toggle(port), NULL); + zassert_equal(EC_ERROR_INVAL, drv->drp_toggle(port)); /* Test error on failed command set */ i2c_common_emul_set_write_fail_reg(common_data, TCPC_REG_COMMAND); - zassert_equal(EC_ERROR_INVAL, drv->drp_toggle(port), NULL); + zassert_equal(EC_ERROR_INVAL, drv->drp_toggle(port)); i2c_common_emul_set_write_fail_reg(common_data, I2C_COMMON_EMUL_NO_FAIL_REG); @@ -870,7 +870,7 @@ void test_tcpci_drp_toggle(const struct emul *emul, TCPC_REG_TCPC_CTRL_EN_LOOK4CONNECTION_ALERT; exp_role_ctrl = TCPC_REG_ROLE_CTRL_SET(TYPEC_DRP, TYPEC_RP_USB, TYPEC_CC_RP, TYPEC_CC_RP); - zassert_equal(EC_SUCCESS, drv->drp_toggle(port), NULL); + zassert_equal(EC_SUCCESS, drv->drp_toggle(port)); check_tcpci_reg(emul, TCPC_REG_TCPC_CTRL, exp_tcpc_ctrl); check_tcpci_reg(emul, TCPC_REG_ROLE_CTRL, exp_role_ctrl); check_tcpci_reg(emul, TCPC_REG_COMMAND, @@ -894,7 +894,7 @@ void test_tcpci_drp_toggle(const struct emul *emul, TCPC_REG_TCPC_CTRL_EN_LOOK4CONNECTION_ALERT; exp_role_ctrl = TCPC_REG_ROLE_CTRL_SET(TYPEC_DRP, TYPEC_RP_USB, TYPEC_CC_RD, TYPEC_CC_RD); - zassert_equal(EC_SUCCESS, drv->drp_toggle(port), NULL); + zassert_equal(EC_SUCCESS, drv->drp_toggle(port)); check_tcpci_reg(emul, TCPC_REG_TCPC_CTRL, exp_tcpc_ctrl); check_tcpci_reg(emul, TCPC_REG_ROLE_CTRL, exp_role_ctrl); check_tcpci_reg(emul, TCPC_REG_COMMAND, @@ -912,15 +912,15 @@ void test_tcpci_get_chip_info(const struct emul *emul, /* Test error on failed vendor id get */ i2c_common_emul_set_read_fail_reg(common_data, TCPC_REG_VENDOR_ID); - zassert_equal(EC_ERROR_INVAL, drv->get_chip_info(port, 1, &info), NULL); + zassert_equal(EC_ERROR_INVAL, drv->get_chip_info(port, 1, &info)); /* Test error on failed product id get */ i2c_common_emul_set_read_fail_reg(common_data, TCPC_REG_PRODUCT_ID); - zassert_equal(EC_ERROR_INVAL, drv->get_chip_info(port, 1, &info), NULL); + zassert_equal(EC_ERROR_INVAL, drv->get_chip_info(port, 1, &info)); /* Test error on failed BCD get */ i2c_common_emul_set_read_fail_reg(common_data, TCPC_REG_VENDOR_ID); - zassert_equal(EC_ERROR_INVAL, drv->get_chip_info(port, 1, &info), NULL); + zassert_equal(EC_ERROR_INVAL, drv->get_chip_info(port, 1, &info)); i2c_common_emul_set_read_fail_reg(common_data, I2C_COMMON_EMUL_NO_FAIL_REG); @@ -931,10 +931,10 @@ void test_tcpci_get_chip_info(const struct emul *emul, tcpci_emul_set_reg(emul, TCPC_REG_VENDOR_ID, vendor); tcpci_emul_set_reg(emul, TCPC_REG_PRODUCT_ID, product); tcpci_emul_set_reg(emul, TCPC_REG_BCD_DEV, bcd); - zassert_equal(EC_SUCCESS, drv->get_chip_info(port, 1, &info), NULL); - zassert_equal(vendor, info.vendor_id, NULL); - zassert_equal(product, info.product_id, NULL); - zassert_equal(bcd, info.device_id, NULL); + zassert_equal(EC_SUCCESS, drv->get_chip_info(port, 1, &info)); + zassert_equal(vendor, info.vendor_id); + zassert_equal(product, info.product_id); + zassert_equal(bcd, info.device_id); /* Test reading cached chip info */ info.vendor_id = 0; @@ -943,12 +943,12 @@ void test_tcpci_get_chip_info(const struct emul *emul, /* Make sure, that TCPC is not accessed */ i2c_common_emul_set_read_fail_reg(common_data, I2C_COMMON_EMUL_FAIL_ALL_REG); - zassert_equal(EC_SUCCESS, drv->get_chip_info(port, 0, &info), NULL); + zassert_equal(EC_SUCCESS, drv->get_chip_info(port, 0, &info)); i2c_common_emul_set_read_fail_reg(common_data, I2C_COMMON_EMUL_NO_FAIL_REG); - zassert_equal(vendor, info.vendor_id, NULL); - zassert_equal(product, info.product_id, NULL); - zassert_equal(bcd, info.device_id, NULL); + zassert_equal(vendor, info.vendor_id); + zassert_equal(product, info.product_id); + zassert_equal(bcd, info.device_id); } /** Test TCPCI enter low power mode */ @@ -960,12 +960,12 @@ void test_tcpci_low_power_mode(const struct emul *emul, /* Test error on failed command set */ i2c_common_emul_set_write_fail_reg(common_data, TCPC_REG_COMMAND); - zassert_equal(EC_ERROR_INVAL, drv->enter_low_power_mode(port), NULL); + zassert_equal(EC_ERROR_INVAL, drv->enter_low_power_mode(port)); i2c_common_emul_set_write_fail_reg(common_data, I2C_COMMON_EMUL_NO_FAIL_REG); /* Test correct command is issued */ - zassert_equal(EC_SUCCESS, drv->enter_low_power_mode(port), NULL); + zassert_equal(EC_SUCCESS, drv->enter_low_power_mode(port)); check_tcpci_reg(emul, TCPC_REG_COMMAND, TCPC_REG_COMMAND_I2CIDLE); } @@ -980,11 +980,11 @@ void test_tcpci_set_bist_mode(const struct emul *emul, /* Test error on TCPC CTRL set */ i2c_common_emul_set_write_fail_reg(common_data, TCPC_REG_TCPC_CTRL); - zassert_equal(EC_ERROR_INVAL, drv->set_bist_test_mode(port, 1), NULL); + zassert_equal(EC_ERROR_INVAL, drv->set_bist_test_mode(port, 1)); /* Test error on alert mask set */ i2c_common_emul_set_write_fail_reg(common_data, TCPC_REG_ALERT_MASK); - zassert_equal(EC_ERROR_INVAL, drv->set_bist_test_mode(port, 1), NULL); + zassert_equal(EC_ERROR_INVAL, drv->set_bist_test_mode(port, 1)); i2c_common_emul_set_write_fail_reg(common_data, I2C_COMMON_EMUL_NO_FAIL_REG); @@ -1000,14 +1000,14 @@ void test_tcpci_set_bist_mode(const struct emul *emul, /* Test enabling bist test mode */ exp_mask = initial_mask & ~TCPC_REG_ALERT_RX_STATUS; exp_ctrl = initial_ctrl | TCPC_REG_TCPC_CTRL_BIST_TEST_MODE; - zassert_equal(EC_SUCCESS, drv->set_bist_test_mode(port, 1), NULL); + zassert_equal(EC_SUCCESS, drv->set_bist_test_mode(port, 1)); check_tcpci_reg(emul, TCPC_REG_TCPC_CTRL, exp_ctrl); check_tcpci_reg(emul, TCPC_REG_ALERT_MASK, exp_mask); /* Test disabling bist test mode */ exp_mask = initial_mask | TCPC_REG_ALERT_RX_STATUS; exp_ctrl = initial_ctrl & ~TCPC_REG_TCPC_CTRL_BIST_TEST_MODE; - zassert_equal(EC_SUCCESS, drv->set_bist_test_mode(port, 0), NULL); + zassert_equal(EC_SUCCESS, drv->set_bist_test_mode(port, 0)); check_tcpci_reg(emul, TCPC_REG_TCPC_CTRL, exp_ctrl); check_tcpci_reg(emul, TCPC_REG_ALERT_MASK, exp_mask); } diff --git a/zephyr/test/drivers/default/src/tcs3400.c b/zephyr/test/drivers/default/src/tcs3400.c index 860b069532..94758a2bc4 100644 --- a/zephyr/test/drivers/default/src/tcs3400.c +++ b/zephyr/test/drivers/default/src/tcs3400.c @@ -37,24 +37,24 @@ ZTEST_USER(tcs3400, test_tcs_init) ms_rgb = &motion_sensors[TCS_RGB_SENSOR_ID]; /* RGB sensor initialization is always successful */ - zassert_equal(EC_SUCCESS, ms_rgb->drv->init(ms_rgb), NULL); + zassert_equal(EC_SUCCESS, ms_rgb->drv->init(ms_rgb)); /* Fail init on communication errors */ i2c_common_emul_set_read_fail_reg(common_data, I2C_COMMON_EMUL_FAIL_ALL_REG); - zassert_equal(EC_ERROR_INVAL, ms->drv->init(ms), NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->init(ms)); i2c_common_emul_set_read_fail_reg(common_data, I2C_COMMON_EMUL_NO_FAIL_REG); /* Fail on bad ID */ tcs_emul_set_reg(emul, TCS_I2C_ID, 0); - zassert_equal(EC_ERROR_ACCESS_DENIED, ms->drv->init(ms), NULL); + zassert_equal(EC_ERROR_ACCESS_DENIED, ms->drv->init(ms)); /* Restore ID */ tcs_emul_set_reg(emul, TCS_I2C_ID, DT_STRING_TOKEN(DT_NODELABEL(tcs_emul), device_id)); /* Test successful init. ATIME and AGAIN should be changed on init */ - zassert_equal(EC_SUCCESS, ms->drv->init(ms), NULL); + zassert_equal(EC_SUCCESS, ms->drv->init(ms)); zassert_equal(TCS_DEFAULT_ATIME, tcs_emul_get_reg(emul, TCS_I2C_ATIME), NULL); zassert_equal(TCS_DEFAULT_AGAIN, @@ -75,11 +75,11 @@ ZTEST_USER(tcs3400, test_tcs_read) /* Test error on writing registers */ i2c_common_emul_set_write_fail_reg(common_data, TCS_I2C_ATIME); - zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, v), NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, v)); i2c_common_emul_set_write_fail_reg(common_data, TCS_I2C_CONTROL); - zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, v), NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, v)); i2c_common_emul_set_write_fail_reg(common_data, TCS_I2C_ENABLE); - zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, v), NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->read(ms, v)); i2c_common_emul_set_write_fail_reg(common_data, I2C_COMMON_EMUL_NO_FAIL_REG); @@ -87,27 +87,27 @@ ZTEST_USER(tcs3400, test_tcs_read) tcs_emul_set_reg(emul, TCS_I2C_ATIME, 0); tcs_emul_set_reg(emul, TCS_I2C_CONTROL, 0); tcs_emul_set_reg(emul, TCS_I2C_ENABLE, 0); - zassert_equal(EC_SUCCESS, ms->drv->perform_calib(ms, 1), NULL); - zassert_equal(EC_RES_IN_PROGRESS, ms->drv->read(ms, v), NULL); + zassert_equal(EC_SUCCESS, ms->drv->perform_calib(ms, 1)); + zassert_equal(EC_RES_IN_PROGRESS, ms->drv->read(ms, v)); zassert_equal(TCS_CALIBRATION_ATIME, tcs_emul_get_reg(emul, TCS_I2C_ATIME), NULL); zassert_equal(TCS_CALIBRATION_AGAIN, tcs_emul_get_reg(emul, TCS_I2C_CONTROL), NULL); enable = tcs_emul_get_reg(emul, TCS_I2C_ENABLE); - zassert_true(enable & TCS_I2C_ENABLE_POWER_ON, NULL); - zassert_true(enable & TCS_I2C_ENABLE_ADC_ENABLE, NULL); - zassert_true(enable & TCS_I2C_ENABLE_INT_ENABLE, NULL); + zassert_true(enable & TCS_I2C_ENABLE_POWER_ON); + zassert_true(enable & TCS_I2C_ENABLE_ADC_ENABLE); + zassert_true(enable & TCS_I2C_ENABLE_INT_ENABLE); /* Test starting read without calibration */ tcs_emul_set_reg(emul, TCS_I2C_ATIME, 0); tcs_emul_set_reg(emul, TCS_I2C_CONTROL, 0); tcs_emul_set_reg(emul, TCS_I2C_ENABLE, 0); - zassert_equal(EC_SUCCESS, ms->drv->perform_calib(ms, 0), NULL); - zassert_equal(EC_RES_IN_PROGRESS, ms->drv->read(ms, v), NULL); + zassert_equal(EC_SUCCESS, ms->drv->perform_calib(ms, 0)); + zassert_equal(EC_RES_IN_PROGRESS, ms->drv->read(ms, v)); enable = tcs_emul_get_reg(emul, TCS_I2C_ENABLE); - zassert_true(enable & TCS_I2C_ENABLE_POWER_ON, NULL); - zassert_true(enable & TCS_I2C_ENABLE_ADC_ENABLE, NULL); - zassert_true(enable & TCS_I2C_ENABLE_INT_ENABLE, NULL); + zassert_true(enable & TCS_I2C_ENABLE_POWER_ON); + zassert_true(enable & TCS_I2C_ENABLE_ADC_ENABLE); + zassert_true(enable & TCS_I2C_ENABLE_INT_ENABLE); } /** Check if FIFO for RGB and clear sensor is empty */ @@ -163,21 +163,21 @@ ZTEST_USER(tcs3400, test_tcs_irq_handler_fail) event = TCS_INT_EVENT; /* Test error on reading status */ i2c_common_emul_set_read_fail_reg(common_data, TCS_I2C_STATUS); - zassert_equal(EC_ERROR_INVAL, ms->drv->irq_handler(ms, &event), NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->irq_handler(ms, &event)); i2c_common_emul_set_read_fail_reg(common_data, I2C_COMMON_EMUL_NO_FAIL_REG); check_fifo_empty(ms, ms_rgb); /* Test fail on changing device power state */ i2c_common_emul_set_write_fail_reg(common_data, TCS_I2C_ENABLE); - zassert_equal(EC_ERROR_INVAL, ms->drv->irq_handler(ms, &event), NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->irq_handler(ms, &event)); i2c_common_emul_set_write_fail_reg(common_data, I2C_COMMON_EMUL_NO_FAIL_REG); check_fifo_empty(ms, ms_rgb); /* Test that no data is committed when status is 0 */ tcs_emul_set_reg(emul, TCS_I2C_STATUS, 0); - zassert_equal(EC_SUCCESS, ms->drv->irq_handler(ms, &event), NULL); + zassert_equal(EC_SUCCESS, ms->drv->irq_handler(ms, &event)); check_fifo_empty(ms, ms_rgb); } @@ -251,9 +251,9 @@ ZTEST_USER(tcs3400, test_tcs_read_calibration) ms->oversampling_ratio = 1; ms_rgb->oversampling_ratio = 1; /* Enable calibration mode */ - zassert_equal(EC_SUCCESS, ms->drv->perform_calib(ms, 1), NULL); + zassert_equal(EC_SUCCESS, ms->drv->perform_calib(ms, 1)); /* Setup AGAIN and ATIME for calibration */ - zassert_equal(EC_RES_IN_PROGRESS, ms->drv->read(ms, v), NULL); + zassert_equal(EC_RES_IN_PROGRESS, ms->drv->read(ms, v)); /* Test data that are in calibration range */ exp_v[0] = 12; @@ -275,7 +275,7 @@ ZTEST_USER(tcs3400, test_tcs_read_calibration) /* Set status to show valid data */ tcs_emul_set_reg(emul, TCS_I2C_STATUS, TCS_I2C_STATUS_RGBC_VALID); - zassert_equal(EC_SUCCESS, ms->drv->irq_handler(ms, &event), NULL); + zassert_equal(EC_SUCCESS, ms->drv->irq_handler(ms, &event)); /* In calibration mode check for exact match */ check_fifo(ms, ms_rgb, exp_v, 1); @@ -299,7 +299,7 @@ ZTEST_USER(tcs3400, test_tcs_read_calibration) /* Set status to show valid data */ tcs_emul_set_reg(emul, TCS_I2C_STATUS, TCS_I2C_STATUS_RGBC_VALID); - zassert_equal(EC_SUCCESS, ms->drv->irq_handler(ms, &event), NULL); + zassert_equal(EC_SUCCESS, ms->drv->irq_handler(ms, &event)); /* In calibration mode check for exact match */ check_fifo(ms, ms_rgb, exp_v, 1); } @@ -374,9 +374,9 @@ ZTEST_USER(tcs3400, test_tcs_read_xyz) ms->oversampling_ratio = 1; ms_rgb->oversampling_ratio = 1; /* Disable calibration mode */ - zassert_equal(EC_SUCCESS, ms->drv->perform_calib(ms, 0), NULL); + zassert_equal(EC_SUCCESS, ms->drv->perform_calib(ms, 0)); /* Setup AGAIN and ATIME for normal mode */ - zassert_equal(EC_RES_IN_PROGRESS, ms->drv->read(ms, v), NULL); + zassert_equal(EC_RES_IN_PROGRESS, ms->drv->read(ms, v)); /* Test different data in supported range */ for (test = 0; test < ARRAY_SIZE(exp_v); test++) { @@ -463,9 +463,9 @@ ZTEST_USER(tcs3400, test_tcs_scale) ms->oversampling_ratio = 1; ms_rgb->oversampling_ratio = 1; /* Disable calibration mode */ - zassert_equal(EC_SUCCESS, ms->drv->perform_calib(ms, 0), NULL); + zassert_equal(EC_SUCCESS, ms->drv->perform_calib(ms, 0)); /* Setup AGAIN and ATIME for normal mode */ - zassert_equal(EC_RES_IN_PROGRESS, ms->drv->read(ms, v), NULL); + zassert_equal(EC_RES_IN_PROGRESS, ms->drv->read(ms, v)); /* Test different data in supported range */ for (test = 0; test < ARRAY_SIZE(exp_v); test++) { @@ -509,7 +509,7 @@ ZTEST_USER(tcs3400, test_tcs_scale) scale[0] = 0; scale[1] = MOTION_SENSE_DEFAULT_SCALE; scale[2] = MOTION_SENSE_DEFAULT_SCALE; - zassert_equal(EC_ERROR_INVAL, ms->drv->set_scale(ms, scale, 0), NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->set_scale(ms, scale, 0)); zassert_equal(EC_ERROR_INVAL, ms_rgb->drv->set_scale(ms_rgb, scale, 0), NULL); @@ -540,52 +540,52 @@ ZTEST_USER(tcs3400, test_tcs_data_rate) /* Test fail on reading device power state */ i2c_common_emul_set_read_fail_reg(common_data, TCS_I2C_ENABLE); - zassert_equal(EC_ERROR_INVAL, ms->drv->set_data_rate(ms, 0, 0), NULL); - zassert_equal(EC_ERROR_INVAL, ms->drv->set_data_rate(ms, 0, 1), NULL); - zassert_equal(EC_ERROR_INVAL, ms->drv->set_data_rate(ms, 100, 0), NULL); - zassert_equal(EC_ERROR_INVAL, ms->drv->set_data_rate(ms, 100, 1), NULL); + zassert_equal(EC_ERROR_INVAL, ms->drv->set_data_rate(ms, 0, 0)); + zassert_equal(EC_ERROR_INVAL, ms->drv->set_data_rate(ms, 0, 1)); + zassert_equal(EC_ERROR_INVAL, ms->drv->set_data_rate(ms, 100, 0)); + zassert_equal(EC_ERROR_INVAL, ms->drv->set_data_rate(ms, 100, 1)); i2c_common_emul_set_read_fail_reg(common_data, I2C_COMMON_EMUL_NO_FAIL_REG); /* Test setting 0 rate disables device */ - zassert_equal(EC_SUCCESS, ms->drv->set_data_rate(ms, 0, 0), NULL); - zassert_equal(0, tcs_emul_get_reg(emul, TCS_I2C_ENABLE), NULL); - zassert_equal(0, ms->drv->get_data_rate(ms), NULL); - zassert_equal(0, ms_rgb->drv->get_data_rate(ms_rgb), NULL); + zassert_equal(EC_SUCCESS, ms->drv->set_data_rate(ms, 0, 0)); + zassert_equal(0, tcs_emul_get_reg(emul, TCS_I2C_ENABLE)); + zassert_equal(0, ms->drv->get_data_rate(ms)); + zassert_equal(0, ms_rgb->drv->get_data_rate(ms_rgb)); - zassert_equal(EC_SUCCESS, ms->drv->set_data_rate(ms, 0, 1), NULL); - zassert_equal(0, tcs_emul_get_reg(emul, TCS_I2C_ENABLE), NULL); - zassert_equal(0, tcs_emul_get_reg(emul, TCS_I2C_ENABLE), NULL); - zassert_equal(0, ms->drv->get_data_rate(ms), NULL); - zassert_equal(0, ms_rgb->drv->get_data_rate(ms_rgb), NULL); + zassert_equal(EC_SUCCESS, ms->drv->set_data_rate(ms, 0, 1)); + zassert_equal(0, tcs_emul_get_reg(emul, TCS_I2C_ENABLE)); + zassert_equal(0, tcs_emul_get_reg(emul, TCS_I2C_ENABLE)); + zassert_equal(0, ms->drv->get_data_rate(ms)); + zassert_equal(0, ms_rgb->drv->get_data_rate(ms_rgb)); /* Test setting non-zero rate enables device */ - zassert_equal(EC_SUCCESS, ms->drv->set_data_rate(ms, 100, 0), NULL); + zassert_equal(EC_SUCCESS, ms->drv->set_data_rate(ms, 100, 0)); enable = tcs_emul_get_reg(emul, TCS_I2C_ENABLE); - zassert_true(enable & TCS_I2C_ENABLE_POWER_ON, NULL); - zassert_true(enable & TCS_I2C_ENABLE_ADC_ENABLE, NULL); - zassert_true(enable & TCS_I2C_ENABLE_INT_ENABLE, NULL); - zassert_equal(100, ms->drv->get_data_rate(ms), NULL); - zassert_equal(100, ms_rgb->drv->get_data_rate(ms_rgb), NULL); + zassert_true(enable & TCS_I2C_ENABLE_POWER_ON); + zassert_true(enable & TCS_I2C_ENABLE_ADC_ENABLE); + zassert_true(enable & TCS_I2C_ENABLE_INT_ENABLE); + zassert_equal(100, ms->drv->get_data_rate(ms)); + zassert_equal(100, ms_rgb->drv->get_data_rate(ms_rgb)); - zassert_equal(EC_SUCCESS, ms->drv->set_data_rate(ms, 100, 1), NULL); + zassert_equal(EC_SUCCESS, ms->drv->set_data_rate(ms, 100, 1)); enable = tcs_emul_get_reg(emul, TCS_I2C_ENABLE); - zassert_true(enable & TCS_I2C_ENABLE_POWER_ON, NULL); - zassert_true(enable & TCS_I2C_ENABLE_ADC_ENABLE, NULL); - zassert_true(enable & TCS_I2C_ENABLE_INT_ENABLE, NULL); - zassert_equal(100, ms->drv->get_data_rate(ms), NULL); - zassert_equal(100, ms_rgb->drv->get_data_rate(ms_rgb), NULL); + zassert_true(enable & TCS_I2C_ENABLE_POWER_ON); + zassert_true(enable & TCS_I2C_ENABLE_ADC_ENABLE); + zassert_true(enable & TCS_I2C_ENABLE_INT_ENABLE); + zassert_equal(100, ms->drv->get_data_rate(ms)); + zassert_equal(100, ms_rgb->drv->get_data_rate(ms_rgb)); /* Test RGB sensor doesn't change data rate */ zassert_equal(EC_SUCCESS, ms_rgb->drv->set_data_rate(ms_rgb, 300, 0), NULL); - zassert_equal(100, ms->drv->get_data_rate(ms), NULL); - zassert_equal(100, ms_rgb->drv->get_data_rate(ms_rgb), NULL); + zassert_equal(100, ms->drv->get_data_rate(ms)); + zassert_equal(100, ms_rgb->drv->get_data_rate(ms_rgb)); zassert_equal(EC_SUCCESS, ms_rgb->drv->set_data_rate(ms_rgb, 300, 1), NULL); - zassert_equal(100, ms->drv->get_data_rate(ms), NULL); - zassert_equal(100, ms_rgb->drv->get_data_rate(ms_rgb), NULL); + zassert_equal(100, ms->drv->get_data_rate(ms)); + zassert_equal(100, ms_rgb->drv->get_data_rate(ms_rgb)); } /** Test set range function of clear and RGB sensors */ @@ -597,14 +597,14 @@ ZTEST_USER(tcs3400, test_tcs_set_range) ms_rgb = &motion_sensors[TCS_RGB_SENSOR_ID]; /* RGB sensor doesn't set anything */ - zassert_equal(EC_SUCCESS, ms_rgb->drv->set_range(ms_rgb, 1, 0), NULL); + zassert_equal(EC_SUCCESS, ms_rgb->drv->set_range(ms_rgb, 1, 0)); /* Clear sensor doesn't change anything on device to set range */ - zassert_equal(EC_SUCCESS, ms->drv->set_range(ms, 0x12300, 1), NULL); - zassert_equal(0x12300, ms->current_range, NULL); + zassert_equal(EC_SUCCESS, ms->drv->set_range(ms, 0x12300, 1)); + zassert_equal(0x12300, ms->current_range); - zassert_equal(EC_SUCCESS, ms->drv->set_range(ms, 0x10000, 0), NULL); - zassert_equal(0x10000, ms->current_range, NULL); + zassert_equal(EC_SUCCESS, ms->drv->set_range(ms, 0x10000, 0)); + zassert_equal(0x10000, ms->current_range); } struct tcs3400_test_fixture { diff --git a/zephyr/test/drivers/default/src/temp_sensor.c b/zephyr/test/drivers/default/src/temp_sensor.c index 5caecc556c..61441a0229 100644 --- a/zephyr/test/drivers/default/src/temp_sensor.c +++ b/zephyr/test/drivers/default/src/temp_sensor.c @@ -136,7 +136,7 @@ static void check_valid_temperature(const struct device *adc_dev, int sensor) zassert_ok(adc_emul_const_value_set(adc_dev, temp_sensors[sensor].idx, 1000), "adc_emul_const_value_set() failed (sensor %d)", sensor); - zassert_equal(EC_SUCCESS, temp_sensor_read(sensor, &temp), NULL); + zassert_equal(EC_SUCCESS, temp_sensor_read(sensor, &temp)); zassert_within( temp, 273 + 50, 51, "Expected temperature in 0*C-100*C, got %d*C (sensor %d)", diff --git a/zephyr/test/drivers/default/src/uart_hostcmd.c b/zephyr/test/drivers/default/src/uart_hostcmd.c index 879e734837..5e1e200fa9 100644 --- a/zephyr/test/drivers/default/src/uart_hostcmd.c +++ b/zephyr/test/drivers/default/src/uart_hostcmd.c @@ -32,7 +32,7 @@ static void setup_snapshots_and_messages(void *unused) BUILD_HOST_COMMAND_SIMPLE(EC_CMD_CONSOLE_SNAPSHOT, 0); /* Set first snapshot before first message */ - zassert_equal(EC_RES_SUCCESS, host_command_process(&args), NULL); + zassert_equal(EC_RES_SUCCESS, host_command_process(&args)); cputs(CC_COMMAND, msg1); /* Read everything from buffer */ @@ -44,7 +44,7 @@ static void setup_snapshots_and_messages(void *unused) } while (read_args.response_size != 0); /* Set second snapshot after first message */ - zassert_equal(EC_RES_SUCCESS, host_command_process(&args), NULL); + zassert_equal(EC_RES_SUCCESS, host_command_process(&args)); cputs(CC_COMMAND, msg2); } @@ -74,7 +74,7 @@ static void test_uart_hc_read_next(int ver) } read_args.response_size = 0; - zassert_equal(EC_RES_SUCCESS, host_command_process(&read_args), NULL); + zassert_equal(EC_RES_SUCCESS, host_command_process(&read_args)); zassert_equal('\0', response[read_args.response_size], "Last byte of response is not '\\0' (got 0x%x)", response[read_args.response_size]); @@ -90,10 +90,10 @@ static void test_uart_hc_read_next(int ver) msg1_start); /* Set new snapshot which should include message 2 */ - zassert_equal(EC_RES_SUCCESS, host_command_process(&snap_args), NULL); + zassert_equal(EC_RES_SUCCESS, host_command_process(&snap_args)); read_args.response_size = 0; - zassert_equal(EC_RES_SUCCESS, host_command_process(&read_args), NULL); + zassert_equal(EC_RES_SUCCESS, host_command_process(&read_args)); zassert_equal('\0', response[read_args.response_size], "Last byte of response is not '\\0' (got 0x%x)", response[read_args.response_size]); @@ -117,16 +117,16 @@ static void test_uart_hc_read_next(int ver) /* Check read next without new snapshot, no data should be read */ read_args.response_size = 0; - zassert_equal(EC_RES_SUCCESS, host_command_process(&read_args), NULL); + zassert_equal(EC_RES_SUCCESS, host_command_process(&read_args)); zassert_equal(0, read_args.response_size, "expected message length 0, got %d", read_args.response_size); /* Set new snapshot which should include message 3 */ - zassert_equal(EC_RES_SUCCESS, host_command_process(&snap_args), NULL); + zassert_equal(EC_RES_SUCCESS, host_command_process(&snap_args)); read_args.response_size = 0; - zassert_equal(EC_RES_SUCCESS, host_command_process(&read_args), NULL); + zassert_equal(EC_RES_SUCCESS, host_command_process(&read_args)); zassert_equal('\0', response[read_args.response_size], "Last byte of response is not '\\0' (got 0x%x)", response[read_args.response_size]); @@ -170,7 +170,7 @@ ZTEST_USER(uart_hostcmd, test_uart_hc_read_recent_v1) /* Only message 1 which is between two last snapshots should be read */ read_args.response_size = 0; - zassert_equal(EC_RES_SUCCESS, host_command_process(&read_args), NULL); + zassert_equal(EC_RES_SUCCESS, host_command_process(&read_args)); zassert_equal('\0', response[read_args.response_size], "Last byte of response is not '\\0' (got 0x%x)", response[read_args.response_size]); @@ -183,11 +183,11 @@ ZTEST_USER(uart_hostcmd, test_uart_hc_read_recent_v1) response); /* Set new snapshot after second message */ - zassert_equal(EC_RES_SUCCESS, host_command_process(&snap_args), NULL); + zassert_equal(EC_RES_SUCCESS, host_command_process(&snap_args)); /* Only message between two last snapshots should be read */ read_args.response_size = 0; - zassert_equal(EC_RES_SUCCESS, host_command_process(&read_args), NULL); + zassert_equal(EC_RES_SUCCESS, host_command_process(&read_args)); zassert_equal('\0', response[read_args.response_size], "Last byte of response is not '\\0' (got 0x%x)", response[read_args.response_size]); @@ -204,17 +204,17 @@ ZTEST_USER(uart_hostcmd, test_uart_hc_read_recent_v1) /* Check that message is not read without setting snapshot */ read_args.response_size = 0; - zassert_equal(EC_RES_SUCCESS, host_command_process(&read_args), NULL); + zassert_equal(EC_RES_SUCCESS, host_command_process(&read_args)); zassert_equal(0, read_args.response_size, "expected message length 0, got %d", read_args.response_size); /* Set new snapshot */ - zassert_equal(EC_RES_SUCCESS, host_command_process(&snap_args), NULL); + zassert_equal(EC_RES_SUCCESS, host_command_process(&snap_args)); /* This time only third message should be read */ read_args.response_size = 0; - zassert_equal(EC_RES_SUCCESS, host_command_process(&read_args), NULL); + zassert_equal(EC_RES_SUCCESS, host_command_process(&read_args)); zassert_equal('\0', response[read_args.response_size], "Last byte of response is not '\\0' (got 0x%x)", response[read_args.response_size]); diff --git a/zephyr/test/drivers/default/src/usb_mux.c b/zephyr/test/drivers/default/src/usb_mux.c index abd27efbba..62d39e28d4 100644 --- a/zephyr/test/drivers/default/src/usb_mux.c +++ b/zephyr/test/drivers/default/src/usb_mux.c @@ -463,9 +463,8 @@ ZTEST(usb_uninit_mux, test_usb_mux_init) usb_mux_init(USBC_PORT_C1); CHECK_PROXY_FAKE_CALL_CNT(proxy_init, NUM_OF_PROXY); /* Check if board_init was called for proxy 1 */ - zassert_equal(1, mock_board_init_fake.call_count, NULL); - zassert_equal(proxy_chain_1.mux, mock_board_init_fake.arg0_history[0], - NULL); + zassert_equal(1, mock_board_init_fake.call_count); + zassert_equal(proxy_chain_1.mux, mock_board_init_fake.arg0_history[0]); proxy_mux_1.board_init = NULL; } @@ -498,7 +497,7 @@ ZTEST(usb_uninit_mux, test_usb_mux_set) /* usb mux 1 shouldn't be set with polarity mode, because of flag */ zassert_equal(exp_mode | USB_PD_MUX_POLARITY_INVERTED, proxy_set_fake.arg1_history[0], NULL); - zassert_equal(exp_mode, proxy_set_fake.arg1_history[1], NULL); + zassert_equal(exp_mode, proxy_set_fake.arg1_history[1]); zassert_equal(exp_mode | USB_PD_MUX_POLARITY_INVERTED, proxy_set_fake.arg1_history[2], NULL); @@ -510,10 +509,9 @@ ZTEST(usb_uninit_mux, test_usb_mux_set) CHECK_PROXY_FAKE_CALL_CNT(proxy_init, 0); CHECK_PROXY_FAKE_CALL_CNT_MUX_STATE(proxy_set, NUM_OF_PROXY, exp_mode); /* Check if board_set was called for proxy 1 */ - zassert_equal(1, mock_board_set_fake.call_count, NULL); - zassert_equal(proxy_chain_1.mux, mock_board_set_fake.arg0_history[0], - NULL); - zassert_equal(exp_mode, mock_board_set_fake.arg1_history[0], NULL); + zassert_equal(1, mock_board_set_fake.call_count); + zassert_equal(proxy_chain_1.mux, mock_board_set_fake.arg0_history[0]); + zassert_equal(exp_mode, mock_board_set_fake.arg1_history[0]); /* Test set function with error in usb_mux */ reset_proxy_fakes(); @@ -523,7 +521,7 @@ ZTEST(usb_uninit_mux, test_usb_mux_set) CHECK_PROXY_FAKE_CALL_CNT(proxy_init, 0); CHECK_PROXY_FAKE_CALL_CNT_MUX_STATE(proxy_set, 2, exp_mode); /* board_set shouldn't be called after fail */ - zassert_equal(0, mock_board_set_fake.call_count, NULL); + zassert_equal(0, mock_board_set_fake.call_count); proxy_mux_1.board_set = NULL; } @@ -673,7 +671,7 @@ ZTEST(usb_uninit_mux, test_usb_mux_flip) /* usb mux 1 shouldn't be set with polarity mode, because of flag */ zassert_equal(exp_mode | USB_PD_MUX_POLARITY_INVERTED, proxy_set_fake.arg1_history[0], NULL); - zassert_equal(exp_mode, proxy_set_fake.arg1_history[1], NULL); + zassert_equal(exp_mode, proxy_set_fake.arg1_history[1]); zassert_equal(exp_mode | USB_PD_MUX_POLARITY_INVERTED, proxy_set_fake.arg1_history[2], NULL); @@ -807,7 +805,7 @@ ZTEST(usb_init_mux, test_usb_mux_hc_mux_info) /* Test invalid port parameter */ params.port = 5; - zassert_equal(EC_RES_INVALID_PARAM, host_command_process(&args), NULL); + zassert_equal(EC_RES_INVALID_PARAM, host_command_process(&args)); /* Set correct port for rest of the test */ params.port = USBC_PORT_C1; @@ -815,14 +813,14 @@ ZTEST(usb_init_mux, test_usb_mux_hc_mux_info) /* Test error on getting mux mode */ set_proxy_get_mux_state_seq(USB_PD_MUX_USB_ENABLED); proxy_get_fake.return_val = EC_ERROR_UNKNOWN; - zassert_equal(EC_RES_ERROR, host_command_process(&args), NULL); + zassert_equal(EC_RES_ERROR, host_command_process(&args)); /* Test getting mux mode */ reset_proxy_fakes(); exp_mode = USB_PD_MUX_USB_ENABLED; set_proxy_get_mux_state_seq(exp_mode); - zassert_equal(EC_RES_SUCCESS, host_command_process(&args), NULL); - zassert_equal(args.response_size, sizeof(response), NULL); + zassert_equal(EC_RES_SUCCESS, host_command_process(&args)); + zassert_equal(args.response_size, sizeof(response)); zassert_equal(exp_mode, response.flags, "mode is 0x%x (!= 0x%x)", response.flags, exp_mode); CHECK_PROXY_FAKE_CALL_CNT(proxy_get, NUM_OF_PROXY); @@ -832,8 +830,8 @@ ZTEST(usb_init_mux, test_usb_mux_hc_mux_info) exp_mode = USB_PD_MUX_USB_ENABLED | USB_PD_MUX_HPD_LVL | USB_PD_MUX_HPD_IRQ; set_proxy_get_mux_state_seq(exp_mode); - zassert_equal(EC_RES_SUCCESS, host_command_process(&args), NULL); - zassert_equal(args.response_size, sizeof(response), NULL); + zassert_equal(EC_RES_SUCCESS, host_command_process(&args)); + zassert_equal(args.response_size, sizeof(response)); zassert_equal(exp_mode, response.flags, "mode is 0x%x (!= 0x%x)", response.flags, exp_mode); CHECK_PROXY_FAKE_CALL_CNT(proxy_get, NUM_OF_PROXY); diff --git a/zephyr/test/drivers/default/src/vboot_hash.c b/zephyr/test/drivers/default/src/vboot_hash.c index 546fc8135f..04f535a89c 100644 --- a/zephyr/test/drivers/default/src/vboot_hash.c +++ b/zephyr/test/drivers/default/src/vboot_hash.c @@ -34,23 +34,23 @@ ZTEST_USER(vboot_hash, test_hostcmd_abort) BUILD_HOST_COMMAND(EC_CMD_VBOOT_HASH, 0, response, get_params); /* Start hashing. The command doesn't wait to finish. */ - zassert_ok(host_command_process(&start_args), NULL); - zassert_ok(start_args.result, NULL); - zassert_equal(start_args.response_size, sizeof(response), NULL); + zassert_ok(host_command_process(&start_args)); + zassert_ok(start_args.result); + zassert_equal(start_args.response_size, sizeof(response)); zassert_equal(response.status, EC_VBOOT_HASH_STATUS_BUSY, "response.status = %d", response.status); /* Abort it immediately */ - zassert_ok(host_command_process(&abort_args), NULL); - zassert_ok(abort_args.result, NULL); + zassert_ok(host_command_process(&abort_args)); + zassert_ok(abort_args.result); /* Give it a bit time. The abort is being processed in the background */ k_msleep(20); /* Get the hash result. Should be NONE. */ - zassert_ok(host_command_process(&get_args), NULL); - zassert_ok(get_args.result, NULL); - zassert_equal(get_args.response_size, sizeof(response), NULL); + zassert_ok(host_command_process(&get_args)); + zassert_ok(get_args.result); + zassert_equal(get_args.response_size, sizeof(response)); zassert_equal(response.status, EC_VBOOT_HASH_STATUS_NONE, "response.status = %d", response.status); } @@ -68,9 +68,9 @@ ZTEST_USER(vboot_hash, test_hostcmd_recalc) EC_CMD_VBOOT_HASH, 0, response, recalc_params); /* Recalculate the hash. The command waits to finish. */ - zassert_ok(host_command_process(&recalc_args), NULL); - zassert_ok(recalc_args.result, NULL); - zassert_equal(recalc_args.response_size, sizeof(response), NULL); + zassert_ok(host_command_process(&recalc_args)); + zassert_ok(recalc_args.result); + zassert_equal(recalc_args.response_size, sizeof(response)); zassert_equal(response.status, EC_VBOOT_HASH_STATUS_DONE, "response.status = %d", response.status); zassert_equal(response.digest_size, SHA256_DIGEST_SIZE, diff --git a/zephyr/test/drivers/host_cmd/src/motion_sense.c b/zephyr/test/drivers/host_cmd/src/motion_sense.c index 2d20a2db96..5d2fc6aaae 100644 --- a/zephyr/test/drivers/host_cmd/src/motion_sense.c +++ b/zephyr/test/drivers/host_cmd/src/motion_sense.c @@ -72,7 +72,7 @@ static void host_cmd_motion_sense_before(void *fixture) RESET_FAKE(mock_perform_calib); FFF_RESET_HISTORY(); - zassume_ok(shell_execute_cmd(get_ec_shell(), "accelinit 0"), NULL); + zassume_ok(shell_execute_cmd(get_ec_shell(), "accelinit 0")); atomic_clear(&motion_sensors[0].flush_pending); motion_sensors[0].config[SENSOR_CONFIG_AP].odr = 0; @@ -119,8 +119,8 @@ ZTEST_USER(host_cmd_motion_sense, test_dump) /* Dump all the sensors info */ host_cmd_motion_sense_dump(ALL_MOTION_SENSORS, result); - zassert_equal(result->dump.module_flags, 0, NULL); - zassert_equal(result->dump.sensor_count, ALL_MOTION_SENSORS, NULL); + zassert_equal(result->dump.module_flags, 0); + zassert_equal(result->dump.sensor_count, ALL_MOTION_SENSORS); /* * Test the values returned in the dump. Normally we shouldn't be doing @@ -131,9 +131,9 @@ ZTEST_USER(host_cmd_motion_sense, test_dump) for (int i = 0; i < ALL_MOTION_SENSORS; ++i) { zassert_equal(result->dump.sensor[i].flags, MOTIONSENSE_SENSOR_FLAG_PRESENT, NULL); - zassert_equal(result->dump.sensor[i].data[0], i, NULL); - zassert_equal(result->dump.sensor[i].data[1], i + 1, NULL); - zassert_equal(result->dump.sensor[i].data[2], i + 2, NULL); + zassert_equal(result->dump.sensor[i].data[0], i); + zassert_equal(result->dump.sensor[i].data[1], i + 1); + zassert_equal(result->dump.sensor[i].data[2], i + 2); } /* Make sure that the accelerometer status presence bit is on */ @@ -156,7 +156,7 @@ ZTEST_USER(host_cmd_motion_sense, test_dump__large_max_sensor_count) host_cmd_motion_sense_dump(ALL_MOTION_SENSORS + 1, result); - zassert_equal(result->dump.sensor_count, ALL_MOTION_SENSORS, NULL); + zassert_equal(result->dump.sensor_count, ALL_MOTION_SENSORS); } ZTEST_USER(host_cmd_motion_sense, test_read_data__invalid_sensor_num) @@ -175,11 +175,11 @@ ZTEST_USER(host_cmd_motion_sense, test_read_data) motion_sensors[0].xyz[1] = 2; motion_sensors[0].xyz[2] = 3; - zassert_ok(host_cmd_motion_sense_data(0, &response), NULL); - zassert_equal(response.data.flags, 0, NULL); - zassert_equal(response.data.data[0], 1, NULL); - zassert_equal(response.data.data[1], 2, NULL); - zassert_equal(response.data.data[2], 3, NULL); + zassert_ok(host_cmd_motion_sense_data(0, &response)); + zassert_equal(response.data.flags, 0); + zassert_equal(response.data.data[0], 1); + zassert_equal(response.data.data[1], 2); + zassert_equal(response.data.data[2], 3); } ZTEST_USER(host_cmd_motion_sense, test_get_info__invalid_sensor_num) @@ -199,9 +199,9 @@ ZTEST_USER(host_cmd_motion_sense, test_get_info_v1) zassert_ok(host_cmd_motion_sense_info(/*cmd_version=*/1, /*sensor_num=*/0, &response), NULL); - zassert_equal(response.info.type, motion_sensors[0].type, NULL); - zassert_equal(response.info.location, motion_sensors[0].location, NULL); - zassert_equal(response.info.chip, motion_sensors[0].chip, NULL); + zassert_equal(response.info.type, motion_sensors[0].type); + zassert_equal(response.info.location, motion_sensors[0].location); + zassert_equal(response.info.chip, motion_sensors[0].chip); } ZTEST_USER(host_cmd_motion_sense, test_get_info_v3) @@ -211,9 +211,9 @@ ZTEST_USER(host_cmd_motion_sense, test_get_info_v3) zassert_ok(host_cmd_motion_sense_info(/*cmd_version=*/3, /*sensor_num=*/0, &response), NULL); - zassert_equal(response.info.type, motion_sensors[0].type, NULL); - zassert_equal(response.info.location, motion_sensors[0].location, NULL); - zassert_equal(response.info.chip, motion_sensors[0].chip, NULL); + zassert_equal(response.info.type, motion_sensors[0].type); + zassert_equal(response.info.location, motion_sensors[0].location); + zassert_equal(response.info.chip, motion_sensors[0].chip); zassert_equal(response.info_3.min_frequency, motion_sensors[0].min_frequency, NULL); zassert_equal(response.info_3.max_frequency, @@ -229,9 +229,9 @@ ZTEST_USER(host_cmd_motion_sense, test_get_info_v4__no_read_temp) zassert_ok(host_cmd_motion_sense_info(/*cmd_version=*/4, /*sensor_num=*/0, &response), NULL); - zassert_equal(response.info.type, motion_sensors[0].type, NULL); - zassert_equal(response.info.location, motion_sensors[0].location, NULL); - zassert_equal(response.info.chip, motion_sensors[0].chip, NULL); + zassert_equal(response.info.type, motion_sensors[0].type); + zassert_equal(response.info.location, motion_sensors[0].location); + zassert_equal(response.info.chip, motion_sensors[0].chip); if (IS_ENABLED(CONFIG_ONLINE_CALIB)) { zassert_true(response.info_4.flags & MOTION_SENSE_CMD_INFO_FLAG_ONLINE_CALIB, @@ -267,7 +267,7 @@ ZTEST_USER(host_cmd_motion_sense, test_get_ec_rate) /*data_rate_ms=*/EC_MOTION_SENSE_NO_VALUE, &response), NULL); - zassert_equal(response.ec_rate.ret, 1000, NULL); + zassert_equal(response.ec_rate.ret, 1000); } ZTEST_USER(host_cmd_motion_sense, test_set_ec_rate) @@ -392,7 +392,7 @@ ZTEST_USER_F(host_cmd_motion_sense, test_set_range_error) /*round_up=*/false, &response), NULL); - zassert_equal(1, mock_set_range_fake.call_count, NULL); + zassert_equal(1, mock_set_range_fake.call_count); } ZTEST_USER_F(host_cmd_motion_sense, test_set_range) @@ -405,9 +405,9 @@ ZTEST_USER_F(host_cmd_motion_sense, test_set_range) zassert_ok(host_cmd_motion_sense_range(/*sensor_num=*/0, /*range=*/4, /*round_up=*/false, &response), NULL); - zassert_equal(1, mock_set_range_fake.call_count, NULL); - zassert_equal(4, mock_set_range_fake.arg1_history[0], NULL); - zassert_equal(0, mock_set_range_fake.arg2_history[0], NULL); + zassert_equal(1, mock_set_range_fake.call_count); + zassert_equal(4, mock_set_range_fake.arg1_history[0]); + zassert_equal(0, mock_set_range_fake.arg2_history[0]); } ZTEST_USER(host_cmd_motion_sense, test_offset_invalid_sensor_num) @@ -467,7 +467,7 @@ ZTEST_USER_F(host_cmd_motion_sense, test_offset_fail_to_set) /*temperature=*/0, /*offset_x=*/0, /*offset_y=*/0, /*offset_z=*/0, &response), NULL); - zassert_equal(1, mock_set_offset_fake.call_count, NULL); + zassert_equal(1, mock_set_offset_fake.call_count); } ZTEST_USER_F(host_cmd_motion_sense, test_offset_fail_to_get) @@ -485,8 +485,8 @@ ZTEST_USER_F(host_cmd_motion_sense, test_offset_fail_to_get) /*temperature=*/0, /*offset_x=*/0, /*offset_y=*/0, /*offset_z=*/0, &response), NULL); - zassert_equal(1, mock_set_offset_fake.call_count, NULL); - zassert_equal(1, mock_get_offset_fake.call_count, NULL); + zassert_equal(1, mock_set_offset_fake.call_count); + zassert_equal(1, mock_get_offset_fake.call_count); zassert_equal((int16_t *)&response.sensor_offset.offset, mock_get_offset_fake.arg1_history[0], NULL); } @@ -505,11 +505,11 @@ ZTEST_USER_F(host_cmd_motion_sense, test_get_offset) /*temperature=*/1, /*offset_x=*/2, /*offset_y=*/3, /*offset_z=*/4, &response), NULL); - zassert_equal(1, mock_set_offset_fake.call_count, NULL); - zassert_equal(1, mock_get_offset_fake.call_count, NULL); + zassert_equal(1, mock_set_offset_fake.call_count); + zassert_equal(1, mock_get_offset_fake.call_count); zassert_equal((int16_t *)&response.sensor_offset.offset, mock_get_offset_fake.arg1_history[0], NULL); - zassert_equal(1, mock_set_offset_fake.arg2_history[0], NULL); + zassert_equal(1, mock_set_offset_fake.arg2_history[0]); } ZTEST_USER(host_cmd_motion_sense, test_scale_invalid_sensor_num) @@ -573,7 +573,7 @@ ZTEST_USER_F(host_cmd_motion_sense, test_get_scale_fail) /*temperature=*/1, /*scale_x=*/2, /*scale_y=*/3, /*scale_z=*/4, &response), NULL); - zassert_equal(1, mock_get_scale_fake.call_count, NULL); + zassert_equal(1, mock_get_scale_fake.call_count); } ZTEST_USER_F(host_cmd_motion_sense, test_set_scale_fail) @@ -590,7 +590,7 @@ ZTEST_USER_F(host_cmd_motion_sense, test_set_scale_fail) /*temperature=*/1, /*scale_x=*/2, /*scale_y=*/3, /*scale_z=*/4, &response), NULL); - zassert_equal(1, mock_set_scale_fake.call_count, NULL); + zassert_equal(1, mock_set_scale_fake.call_count); } ZTEST_USER_F(host_cmd_motion_sense, test_set_get_scale) @@ -607,9 +607,9 @@ ZTEST_USER_F(host_cmd_motion_sense, test_set_get_scale) /*temperature=*/1, /*scale_x=*/2, /*scale_y=*/3, /*scale_z=*/4, &response), NULL); - zassert_equal(1, mock_set_scale_fake.call_count, NULL); - zassert_equal(1, mock_get_scale_fake.call_count, NULL); - zassert_equal(1, mock_set_scale_fake.arg2_history[0], NULL); + zassert_equal(1, mock_set_scale_fake.call_count); + zassert_equal(1, mock_get_scale_fake.call_count); + zassert_equal(1, mock_set_scale_fake.arg2_history[0]); } ZTEST_USER(host_cmd_motion_sense, test_calib_invalid_sensor_num) @@ -645,8 +645,8 @@ ZTEST_USER_F(host_cmd_motion_sense, test_calib_fail) host_cmd_motion_sense_calib(/*sensor_num=*/0, /*enable=*/false, &response), NULL); - zassert_equal(1, mock_perform_calib_fake.call_count, NULL); - zassert_false(mock_perform_calib_fake.arg1_history[0], NULL); + zassert_equal(1, mock_perform_calib_fake.call_count); + zassert_false(mock_perform_calib_fake.arg1_history[0]); } ZTEST_USER_F(host_cmd_motion_sense, test_calib_success__fail_get_offset) @@ -661,9 +661,9 @@ ZTEST_USER_F(host_cmd_motion_sense, test_calib_success__fail_get_offset) host_cmd_motion_sense_calib(/*sensor_num=*/0, /*enable=*/false, &response), NULL); - zassert_equal(1, mock_perform_calib_fake.call_count, NULL); - zassert_equal(1, mock_get_offset_fake.call_count, NULL); - zassert_false(mock_perform_calib_fake.arg1_history[0], NULL); + zassert_equal(1, mock_perform_calib_fake.call_count); + zassert_equal(1, mock_get_offset_fake.call_count); + zassert_false(mock_perform_calib_fake.arg1_history[0]); } ZTEST_USER_F(host_cmd_motion_sense, test_calib) @@ -677,9 +677,9 @@ ZTEST_USER_F(host_cmd_motion_sense, test_calib) zassert_ok(host_cmd_motion_sense_calib(/*sensor_num=*/0, /*enable=*/true, &response), NULL); - zassert_equal(1, mock_perform_calib_fake.call_count, NULL); - zassert_equal(1, mock_get_offset_fake.call_count, NULL); - zassert_true(mock_perform_calib_fake.arg1_history[0], NULL); + zassert_equal(1, mock_perform_calib_fake.call_count); + zassert_equal(1, mock_get_offset_fake.call_count); + zassert_true(mock_perform_calib_fake.arg1_history[0]); } ZTEST(host_cmd_motion_sense, test_fifo_flush__invalid_sensor_num) @@ -688,7 +688,7 @@ ZTEST(host_cmd_motion_sense, test_fifo_flush__invalid_sensor_num) struct ec_response_motion_sense response; rv = host_cmd_motion_sense_fifo_flush(/*sensor_num=*/0xff, &response); - zassert_equal(rv, EC_RES_INVALID_PARAM, NULL); + zassert_equal(rv, EC_RES_INVALID_PARAM); } ZTEST(host_cmd_motion_sense, test_fifo_flush) @@ -699,7 +699,7 @@ ZTEST(host_cmd_motion_sense, test_fifo_flush) zassert_ok(host_cmd_motion_sense_fifo_flush(/*sensor_num=*/0, response), NULL); - zassert_equal(1, motion_sensors[0].flush_pending, NULL); + zassert_equal(1, motion_sensors[0].flush_pending); } ZTEST(host_cmd_motion_sense, test_fifo_info) @@ -708,7 +708,7 @@ ZTEST(host_cmd_motion_sense, test_fifo_info) struct ec_response_motion_sense *response = (struct ec_response_motion_sense *)response_buffer; - zassert_ok(host_cmd_motion_sense_fifo_info(response), NULL); + zassert_ok(host_cmd_motion_sense_fifo_info(response)); } ZTEST(host_cmd_motion_sense, test_fifo_read) @@ -737,33 +737,33 @@ ZTEST(host_cmd_motion_sense, test_fifo_read) motion_sense_fifo_commit_data(); /* Read 2 samples */ - zassert_ok(host_cmd_motion_sense_fifo_read(4, response), NULL); - zassert_equal(2, response->fifo_read.number_data, NULL); + zassert_ok(host_cmd_motion_sense_fifo_read(4, response)); + zassert_equal(2, response->fifo_read.number_data); zassert_equal(MOTIONSENSE_SENSOR_FLAG_TIMESTAMP, response->fifo_read.data[0].flags, NULL); - zassert_equal(0, response->fifo_read.data[0].sensor_num, NULL); - zassert_equal(0, response->fifo_read.data[0].timestamp, NULL); + zassert_equal(0, response->fifo_read.data[0].sensor_num); + zassert_equal(0, response->fifo_read.data[0].timestamp); - zassert_equal(0, response->fifo_read.data[1].flags, NULL); - zassert_equal(0, response->fifo_read.data[1].sensor_num, NULL); - zassert_equal(0, response->fifo_read.data[1].data[0], NULL); - zassert_equal(1, response->fifo_read.data[1].data[1], NULL); - zassert_equal(2, response->fifo_read.data[1].data[2], NULL); + zassert_equal(0, response->fifo_read.data[1].flags); + zassert_equal(0, response->fifo_read.data[1].sensor_num); + zassert_equal(0, response->fifo_read.data[1].data[0]); + zassert_equal(1, response->fifo_read.data[1].data[1]); + zassert_equal(2, response->fifo_read.data[1].data[2]); /* Read the next 2 samples */ - zassert_ok(host_cmd_motion_sense_fifo_read(4, response), NULL); - zassert_equal(2, response->fifo_read.number_data, NULL); + zassert_ok(host_cmd_motion_sense_fifo_read(4, response)); + zassert_equal(2, response->fifo_read.number_data); zassert_equal(MOTIONSENSE_SENSOR_FLAG_TIMESTAMP, response->fifo_read.data[0].flags, NULL); - zassert_equal(1, response->fifo_read.data[0].sensor_num, NULL); - zassert_equal(5, response->fifo_read.data[0].timestamp, NULL); + zassert_equal(1, response->fifo_read.data[0].sensor_num); + zassert_equal(5, response->fifo_read.data[0].timestamp); - zassert_equal(0, response->fifo_read.data[1].flags, NULL); - zassert_equal(1, response->fifo_read.data[1].sensor_num, NULL); - zassert_equal(3, response->fifo_read.data[1].data[0], NULL); - zassert_equal(4, response->fifo_read.data[1].data[1], NULL); - zassert_equal(5, response->fifo_read.data[1].data[2], NULL); + zassert_equal(0, response->fifo_read.data[1].flags); + zassert_equal(1, response->fifo_read.data[1].sensor_num); + zassert_equal(3, response->fifo_read.data[1].data[0]); + zassert_equal(4, response->fifo_read.data[1].data[1]); + zassert_equal(5, response->fifo_read.data[1].data[2]); } ZTEST(host_cmd_motion_sense, test_int_enable) @@ -774,21 +774,21 @@ ZTEST(host_cmd_motion_sense, test_int_enable) host_cmd_motion_sense_int_enable(2, &response), NULL); /* Make sure we start off disabled */ - zassume_ok(host_cmd_motion_sense_int_enable(0, &response), NULL); + zassume_ok(host_cmd_motion_sense_int_enable(0, &response)); /* Test enable */ - zassert_ok(host_cmd_motion_sense_int_enable(1, &response), NULL); + zassert_ok(host_cmd_motion_sense_int_enable(1, &response)); zassert_ok(host_cmd_motion_sense_int_enable(EC_MOTION_SENSE_NO_VALUE, &response), NULL); - zassert_equal(1, response.fifo_int_enable.ret, NULL); + zassert_equal(1, response.fifo_int_enable.ret); /* Test disable */ - zassert_ok(host_cmd_motion_sense_int_enable(0, &response), NULL); + zassert_ok(host_cmd_motion_sense_int_enable(0, &response)); zassert_ok(host_cmd_motion_sense_int_enable(EC_MOTION_SENSE_NO_VALUE, &response), NULL); - zassert_equal(0, response.fifo_int_enable.ret, NULL); + zassert_equal(0, response.fifo_int_enable.ret); } ZTEST(host_cmd_motion_sense, test_spoof_invalid_sensor_num) @@ -816,7 +816,7 @@ ZTEST(host_cmd_motion_sense, test_spoof_disable) zassert_ok(host_cmd_motion_sense_spoof(0, MOTIONSENSE_SPOOF_MODE_QUERY, 0, 0, 0, &response), NULL); - zassert_false(response.spoof.ret, NULL); + zassert_false(response.spoof.ret); } ZTEST(host_cmd_motion_sense, test_spoof_custom) @@ -829,14 +829,14 @@ ZTEST(host_cmd_motion_sense, test_spoof_custom) zassert_equal(MOTIONSENSE_FLAG_IN_SPOOF_MODE, motion_sensors[0].flags & MOTIONSENSE_FLAG_IN_SPOOF_MODE, NULL); - zassert_equal(-8, motion_sensors[0].spoof_xyz[0], NULL); - zassert_equal(16, motion_sensors[0].spoof_xyz[1], NULL); - zassert_equal(-32, motion_sensors[0].spoof_xyz[2], NULL); + zassert_equal(-8, motion_sensors[0].spoof_xyz[0]); + zassert_equal(16, motion_sensors[0].spoof_xyz[1]); + zassert_equal(-32, motion_sensors[0].spoof_xyz[2]); zassert_ok(host_cmd_motion_sense_spoof(0, MOTIONSENSE_SPOOF_MODE_QUERY, 0, 0, 0, &response), NULL); - zassert_true(response.spoof.ret, NULL); + zassert_true(response.spoof.ret); } ZTEST(host_cmd_motion_sense, test_spoof_lock_current) @@ -853,14 +853,14 @@ ZTEST(host_cmd_motion_sense, test_spoof_lock_current) zassert_equal(MOTIONSENSE_FLAG_IN_SPOOF_MODE, motion_sensors[0].flags & MOTIONSENSE_FLAG_IN_SPOOF_MODE, NULL); - zassert_equal(64, motion_sensors[0].spoof_xyz[0], NULL); - zassert_equal(48, motion_sensors[0].spoof_xyz[1], NULL); - zassert_equal(32, motion_sensors[0].spoof_xyz[2], NULL); + zassert_equal(64, motion_sensors[0].spoof_xyz[0]); + zassert_equal(48, motion_sensors[0].spoof_xyz[1]); + zassert_equal(32, motion_sensors[0].spoof_xyz[2]); zassert_ok(host_cmd_motion_sense_spoof(0, MOTIONSENSE_SPOOF_MODE_QUERY, 0, 0, 0, &response), NULL); - zassert_true(response.spoof.ret, NULL); + zassert_true(response.spoof.ret); } ZTEST(host_cmd_motion_sense, test_spoof_invalid_mode) diff --git a/zephyr/test/drivers/isl923x/src/charge_ramp_hw.c b/zephyr/test/drivers/isl923x/src/charge_ramp_hw.c index c814b75de9..f27791949e 100644 --- a/zephyr/test/drivers/isl923x/src/charge_ramp_hw.c +++ b/zephyr/test/drivers/isl923x/src/charge_ramp_hw.c @@ -20,12 +20,12 @@ ZTEST_SUITE(charge_ramp_hw, drivers_predicate_post_main, NULL, NULL, NULL, ZTEST(charge_ramp_hw, test_charge_ramp_hw_ramp) { - zassert_ok(isl923x_drv.set_hw_ramp(CHARGER_NUM, 1), NULL); + zassert_ok(isl923x_drv.set_hw_ramp(CHARGER_NUM, 1)); - zassert_ok(isl923x_drv.ramp_is_stable(CHARGER_NUM), NULL); - zassert_true(isl923x_drv.ramp_is_detected(CHARGER_NUM), NULL); + zassert_ok(isl923x_drv.ramp_is_stable(CHARGER_NUM)); + zassert_true(isl923x_drv.ramp_is_detected(CHARGER_NUM)); - zassert_ok(isl923x_drv.set_input_current_limit(CHARGER_NUM, 512), NULL); + zassert_ok(isl923x_drv.set_input_current_limit(CHARGER_NUM, 512)); zassert_equal(512, isl923x_drv.ramp_get_current_limit(CHARGER_NUM), NULL); } @@ -47,5 +47,5 @@ ZTEST(charge_ramp_hw, test_charge_ramp_hw_ramp_read_fail_acl1) i2c_common_emul_set_read_fail_reg(common_data, ISL923X_REG_ADAPTER_CURRENT_LIMIT1); - zassert_equal(0, isl923x_drv.ramp_get_current_limit(CHARGER_NUM), NULL); + zassert_equal(0, isl923x_drv.ramp_get_current_limit(CHARGER_NUM)); } diff --git a/zephyr/test/drivers/isl923x/src/console_cmd_amon_bmon.c b/zephyr/test/drivers/isl923x/src/console_cmd_amon_bmon.c index 9246bf5b6b..f8cd76d524 100644 --- a/zephyr/test/drivers/isl923x/src/console_cmd_amon_bmon.c +++ b/zephyr/test/drivers/isl923x/src/console_cmd_amon_bmon.c @@ -29,13 +29,13 @@ ZTEST_SUITE(console_cmd_amon_bmon, drivers_predicate_post_main, NULL, NULL, ZTEST(console_cmd_amon_bmon, test_isl923x_amonbmon_shell_cmd) { /* Validate combinations of well formed shell commands */ - zassert_ok(shell_execute_cmd(get_ec_shell(), "amonbmon a 0"), NULL); - zassert_ok(shell_execute_cmd(get_ec_shell(), "amonbmon ac 0"), NULL); - zassert_ok(shell_execute_cmd(get_ec_shell(), "amonbmon ad 0"), NULL); + zassert_ok(shell_execute_cmd(get_ec_shell(), "amonbmon a 0")); + zassert_ok(shell_execute_cmd(get_ec_shell(), "amonbmon ac 0")); + zassert_ok(shell_execute_cmd(get_ec_shell(), "amonbmon ad 0")); - zassert_ok(shell_execute_cmd(get_ec_shell(), "amonbmon b 0"), NULL); - zassert_ok(shell_execute_cmd(get_ec_shell(), "amonbmon bc 0"), NULL); - zassert_ok(shell_execute_cmd(get_ec_shell(), "amonbmon bd 0"), NULL); + zassert_ok(shell_execute_cmd(get_ec_shell(), "amonbmon b 0")); + zassert_ok(shell_execute_cmd(get_ec_shell(), "amonbmon bc 0")); + zassert_ok(shell_execute_cmd(get_ec_shell(), "amonbmon bd 0")); /* Check error returned for malformed shell command */ zassert_equal(EC_ERROR_PARAM2, diff --git a/zephyr/test/drivers/keyboard_scan/src/keyboard_scan.c b/zephyr/test/drivers/keyboard_scan/src/keyboard_scan.c index c7955ec655..03fb71f828 100644 --- a/zephyr/test/drivers/keyboard_scan/src/keyboard_scan.c +++ b/zephyr/test/drivers/keyboard_scan/src/keyboard_scan.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* Copyright 2022 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -29,12 +29,10 @@ ZTEST(keyboard_scan, test_boot_key) /* Case 1: refresh + esc -> BOOT_KEY_ESC */ emul_kb_raw_reset(dev); zassert_ok(emulate_keystate(KEYBOARD_ROW_REFRESH, KEYBOARD_COL_REFRESH, - true), - NULL); - zassert_ok(emulate_keystate(KEYBOARD_ROW_ESC, KEYBOARD_COL_ESC, true), - NULL); + true)); + zassert_ok(emulate_keystate(KEYBOARD_ROW_ESC, KEYBOARD_COL_ESC, true)); keyboard_scan_init(); - zassert_equal(keyboard_scan_get_boot_keys(), BOOT_KEY_ESC, NULL); + zassert_equal(keyboard_scan_get_boot_keys(), BOOT_KEY_ESC); /* * Case 1.5: @@ -43,72 +41,62 @@ ZTEST(keyboard_scan, test_boot_key) */ zassert_true(IS_ENABLED(CONFIG_KEYBOARD_PWRBTN_ASSERTS_KSI2), NULL); for (int i = 0; i < kb_cols; i++) { - zassert_ok(emulate_keystate(KEYBOARD_ROW_REFRESH, i, true), - NULL); + zassert_ok(emulate_keystate(KEYBOARD_ROW_REFRESH, i, true)); } keyboard_scan_init(); - zassert_equal(keyboard_scan_get_boot_keys(), BOOT_KEY_ESC, NULL); + zassert_equal(keyboard_scan_get_boot_keys(), BOOT_KEY_ESC); /* Case 2: esc only -> BOOT_KEY_NONE */ emul_kb_raw_reset(dev); - zassert_ok(emulate_keystate(KEYBOARD_ROW_ESC, KEYBOARD_COL_ESC, true), - NULL); + zassert_ok(emulate_keystate(KEYBOARD_ROW_ESC, KEYBOARD_COL_ESC, true)); keyboard_scan_init(); - zassert_equal(keyboard_scan_get_boot_keys(), BOOT_KEY_NONE, NULL); + zassert_equal(keyboard_scan_get_boot_keys(), BOOT_KEY_NONE); /* Case 3: refresh + arrow down -> BOOT_KEY_DOWN_ARROW */ emul_kb_raw_reset(dev); zassert_ok(emulate_keystate(KEYBOARD_ROW_REFRESH, KEYBOARD_COL_REFRESH, - true), - NULL); - zassert_ok(emulate_keystate(KEYBOARD_ROW_DOWN, KEYBOARD_COL_DOWN, true), - NULL); + true)); + zassert_ok( + emulate_keystate(KEYBOARD_ROW_DOWN, KEYBOARD_COL_DOWN, true)); keyboard_scan_init(); - zassert_equal(keyboard_scan_get_boot_keys(), BOOT_KEY_DOWN_ARROW, NULL); + zassert_equal(keyboard_scan_get_boot_keys(), BOOT_KEY_DOWN_ARROW); /* Case 4: refresh + L shift -> BOOT_KEY_LEFT_SHIFT */ emul_kb_raw_reset(dev); zassert_ok(emulate_keystate(KEYBOARD_ROW_REFRESH, KEYBOARD_COL_REFRESH, - true), - NULL); + true)); zassert_ok(emulate_keystate(KEYBOARD_ROW_LEFT_SHIFT, - KEYBOARD_COL_LEFT_SHIFT, true), - NULL); + KEYBOARD_COL_LEFT_SHIFT, true)); keyboard_scan_init(); - zassert_equal(keyboard_scan_get_boot_keys(), BOOT_KEY_LEFT_SHIFT, NULL); + zassert_equal(keyboard_scan_get_boot_keys(), BOOT_KEY_LEFT_SHIFT); /* Case 5: refresh + esc + other random key -> BOOT_KEY_NONE */ emul_kb_raw_reset(dev); zassert_ok(emulate_keystate(KEYBOARD_ROW_REFRESH, KEYBOARD_COL_REFRESH, - true), - NULL); - zassert_ok(emulate_keystate(KEYBOARD_ROW_ESC, KEYBOARD_COL_ESC, true), - NULL); - zassert_ok(emulate_keystate(KEYBOARD_ROW_KEY_0, KEYBOARD_COL_KEY_0, - true), - NULL); + true)); + zassert_ok(emulate_keystate(KEYBOARD_ROW_ESC, KEYBOARD_COL_ESC, true)); + zassert_ok( + emulate_keystate(KEYBOARD_ROW_KEY_0, KEYBOARD_COL_KEY_0, true)); keyboard_scan_init(); - zassert_equal(keyboard_scan_get_boot_keys(), BOOT_KEY_NONE, NULL); + zassert_equal(keyboard_scan_get_boot_keys(), BOOT_KEY_NONE); /* Case 6: BOOT_KEY_NONE after late sysjump */ system_jumped_late_fake.return_val = 1; emul_kb_raw_reset(dev); zassert_ok(emulate_keystate(KEYBOARD_ROW_REFRESH, KEYBOARD_COL_REFRESH, - true), - NULL); + true)); zassert_ok(emulate_keystate(KEYBOARD_ROW_LEFT_SHIFT, - KEYBOARD_COL_LEFT_SHIFT, true), - NULL); + KEYBOARD_COL_LEFT_SHIFT, true)); keyboard_scan_init(); - zassert_equal(keyboard_scan_get_boot_keys(), BOOT_KEY_NONE, NULL); + zassert_equal(keyboard_scan_get_boot_keys(), BOOT_KEY_NONE); } ZTEST(keyboard_scan, test_press_enter) { - zassert_ok(emulate_keystate(4, 11, true), NULL); + zassert_ok(emulate_keystate(4, 11, true)); k_sleep(K_MSEC(100)); /* TODO(jbettis): Check espi_emul to verify the AP was notified. */ - zassert_ok(emulate_keystate(4, 11, false), NULL); + zassert_ok(emulate_keystate(4, 11, false)); k_sleep(K_MSEC(100)); } @@ -119,19 +107,19 @@ ZTEST(keyboard_scan, console_command_ksstate__noargs) /* With no args, print current state */ shell_backend_dummy_clear_output(get_ec_shell()); - zassert_ok(shell_execute_cmd(get_ec_shell(), "ksstate"), NULL); + zassert_ok(shell_execute_cmd(get_ec_shell(), "ksstate")); outbuffer = shell_backend_dummy_get_output(get_ec_shell(), &buffer_size); /* Check for some expected lines */ - zassert_true(buffer_size > 0, NULL); + zassert_true(buffer_size > 0); zassert_ok(!strstr(outbuffer, "Keyboard scan disable mask: 0x00000000"), "Output was: `%s`", outbuffer); zassert_ok(!strstr(outbuffer, "Keyboard scan state printing off"), "Output was: `%s`", outbuffer); /* Ensure we are still scanning */ - zassert_true(keyboard_scan_is_enabled(), NULL); + zassert_true(keyboard_scan_is_enabled()); } ZTEST(keyboard_scan, console_command_ksstate__force) @@ -142,31 +130,31 @@ ZTEST(keyboard_scan, console_command_ksstate__force) */ keyboard_scan_enable(false, -1); - zassume_false(keyboard_scan_is_enabled(), NULL); + zassume_false(keyboard_scan_is_enabled()); - zassert_ok(shell_execute_cmd(get_ec_shell(), "ksstate force"), NULL); + zassert_ok(shell_execute_cmd(get_ec_shell(), "ksstate force")); - zassert_true(keyboard_scan_is_enabled(), NULL); - zassert_true(keyboard_scan_get_print_state_changes(), NULL); + zassert_true(keyboard_scan_is_enabled()); + zassert_true(keyboard_scan_get_print_state_changes()); } ZTEST(keyboard_scan, console_command_ksstate__on_off) { /* This command turns state change printing on/off */ - zassume_false(keyboard_scan_get_print_state_changes(), NULL); + zassume_false(keyboard_scan_get_print_state_changes()); - zassert_ok(shell_execute_cmd(get_ec_shell(), "ksstate on"), NULL); - zassert_true(keyboard_scan_get_print_state_changes(), NULL); + zassert_ok(shell_execute_cmd(get_ec_shell(), "ksstate on")); + zassert_true(keyboard_scan_get_print_state_changes()); - zassert_ok(shell_execute_cmd(get_ec_shell(), "ksstate off"), NULL); - zassert_false(keyboard_scan_get_print_state_changes(), NULL); + zassert_ok(shell_execute_cmd(get_ec_shell(), "ksstate off")); + zassert_false(keyboard_scan_get_print_state_changes()); } ZTEST(keyboard_scan, console_command_ksstate__invalid) { /* Pass a string that cannot be parsed as a bool */ - zassert_ok(!shell_execute_cmd(get_ec_shell(), "ksstate xyz"), NULL); + zassert_ok(!shell_execute_cmd(get_ec_shell(), "ksstate xyz")); } ZTEST(keyboard_scan, console_command_kbpress__noargs) @@ -176,12 +164,12 @@ ZTEST(keyboard_scan, console_command_kbpress__noargs) /* With no args, print list of simulated keys */ shell_backend_dummy_clear_output(get_ec_shell()); - zassert_ok(shell_execute_cmd(get_ec_shell(), "kbpress"), NULL); + zassert_ok(shell_execute_cmd(get_ec_shell(), "kbpress")); outbuffer = shell_backend_dummy_get_output(get_ec_shell(), &buffer_size); /* Check for an expected line */ - zassert_true(buffer_size > 0, NULL); + zassert_true(buffer_size > 0); zassert_ok(!strstr(outbuffer, "Simulated keys:"), "Output was: `%s`", outbuffer); } @@ -189,19 +177,15 @@ ZTEST(keyboard_scan, console_command_kbpress__noargs) ZTEST(keyboard_scan, console_command_kbpress__invalid) { /* Row or column number out of range, or wrong type */ - zassert_ok(!shell_execute_cmd(get_ec_shell(), "kbpress -1 0"), NULL); - zassert_ok(!shell_execute_cmd(get_ec_shell(), "kbpress foo 0"), NULL); + zassert_ok(!shell_execute_cmd(get_ec_shell(), "kbpress -1 0")); + zassert_ok(!shell_execute_cmd(get_ec_shell(), "kbpress foo 0")); zassert_ok(!shell_execute_cmd( - get_ec_shell(), - "kbpress " STRINGIFY(KEYBOARD_COLS_MAX) " 0"), - NULL); + get_ec_shell(), "kbpress " STRINGIFY(KEYBOARD_COLS_MAX) " 0")); - zassert_ok(!shell_execute_cmd(get_ec_shell(), "kbpress 0 -1"), NULL); - zassert_ok(!shell_execute_cmd(get_ec_shell(), "kbpress 0 foo"), NULL); - zassert_ok( - !shell_execute_cmd(get_ec_shell(), - "kbpress 0 " STRINGIFY(KEYBOARD_COLS_MAX)), - NULL); + zassert_ok(!shell_execute_cmd(get_ec_shell(), "kbpress 0 -1")); + zassert_ok(!shell_execute_cmd(get_ec_shell(), "kbpress 0 foo")); + zassert_ok(!shell_execute_cmd( + get_ec_shell(), "kbpress 0 " STRINGIFY(KEYBOARD_COLS_MAX))); } /* Mock the key_state_changed callback that the key scan task invokes whenever @@ -212,39 +196,39 @@ FAKE_VOID_FUNC(key_state_changed, int, int, uint8_t); ZTEST(keyboard_scan, console_command_kbpress__press_and_release) { /* Pres and release a key */ - zassert_ok(shell_execute_cmd(get_ec_shell(), "kbpress 1 2"), NULL); + zassert_ok(shell_execute_cmd(get_ec_shell(), "kbpress 1 2")); /* Hold a key down */ - zassert_ok(shell_execute_cmd(get_ec_shell(), "kbpress 3 4 1"), NULL); + zassert_ok(shell_execute_cmd(get_ec_shell(), "kbpress 3 4 1")); /* Release the key */ - zassert_ok(shell_execute_cmd(get_ec_shell(), "kbpress 3 4 0"), NULL); + zassert_ok(shell_execute_cmd(get_ec_shell(), "kbpress 3 4 0")); /* Pause a bit to allow the key scan task to process. */ k_sleep(K_MSEC(200)); /* Expect four key events */ - zassert_equal(4, key_state_changed_fake.call_count, NULL); + zassert_equal(4, key_state_changed_fake.call_count); /* Press col=1,row=2 (state==1) */ - zassert_equal(1, key_state_changed_fake.arg1_history[0], NULL); - zassert_equal(2, key_state_changed_fake.arg0_history[0], NULL); - zassert_true(key_state_changed_fake.arg2_history[0], NULL); + zassert_equal(1, key_state_changed_fake.arg1_history[0]); + zassert_equal(2, key_state_changed_fake.arg0_history[0]); + zassert_true(key_state_changed_fake.arg2_history[0]); /* Release col=1,row=2 (state==0) */ - zassert_equal(1, key_state_changed_fake.arg1_history[1], NULL); - zassert_equal(2, key_state_changed_fake.arg0_history[1], NULL); - zassert_false(key_state_changed_fake.arg2_history[1], NULL); + zassert_equal(1, key_state_changed_fake.arg1_history[1]); + zassert_equal(2, key_state_changed_fake.arg0_history[1]); + zassert_false(key_state_changed_fake.arg2_history[1]); /* Press col=3,row=4 (state==1) */ - zassert_equal(3, key_state_changed_fake.arg1_history[2], NULL); - zassert_equal(4, key_state_changed_fake.arg0_history[2], NULL); - zassert_true(key_state_changed_fake.arg2_history[2], NULL); + zassert_equal(3, key_state_changed_fake.arg1_history[2]); + zassert_equal(4, key_state_changed_fake.arg0_history[2]); + zassert_true(key_state_changed_fake.arg2_history[2]); /* Release col=3,row=4 (state==0) */ - zassert_equal(3, key_state_changed_fake.arg1_history[3], NULL); - zassert_equal(4, key_state_changed_fake.arg0_history[3], NULL); - zassert_false(key_state_changed_fake.arg2_history[3], NULL); + zassert_equal(3, key_state_changed_fake.arg1_history[3]); + zassert_equal(4, key_state_changed_fake.arg0_history[3]); + zassert_false(key_state_changed_fake.arg2_history[3]); } ZTEST(keyboard_scan, host_command_simulate_key__locked) @@ -320,17 +304,17 @@ ZTEST(keyboard_scan, host_command_simulate__key_press) /* Verify key events happened */ - zassert_equal(2, key_state_changed_fake.call_count, NULL); + zassert_equal(2, key_state_changed_fake.call_count); /* Press col=1,row=2 (state==1) */ - zassert_equal(1, key_state_changed_fake.arg1_history[0], NULL); - zassert_equal(2, key_state_changed_fake.arg0_history[0], NULL); - zassert_true(key_state_changed_fake.arg2_history[0], NULL); + zassert_equal(1, key_state_changed_fake.arg1_history[0]); + zassert_equal(2, key_state_changed_fake.arg0_history[0]); + zassert_true(key_state_changed_fake.arg2_history[0]); /* Release col=1,row=2 (state==0) */ - zassert_equal(1, key_state_changed_fake.arg1_history[1], NULL); - zassert_equal(2, key_state_changed_fake.arg0_history[1], NULL); - zassert_false(key_state_changed_fake.arg2_history[1], NULL); + zassert_equal(1, key_state_changed_fake.arg1_history[1]); + zassert_equal(2, key_state_changed_fake.arg0_history[1]); + zassert_false(key_state_changed_fake.arg2_history[1]); } FAKE_VOID_FUNC(system_enter_hibernate, uint32_t, uint32_t); @@ -351,40 +335,34 @@ ZTEST(keyboard_scan, special_key_combos) zassume_false(vol_up_col == KEYBOARD_COL_LEFT_ALT, NULL); /* Hold down volume up, left alt (either alt key works), and R */ - zassert_ok(send_keypress_host_command(vol_up_col, vol_up_row, 1), NULL); + zassert_ok(send_keypress_host_command(vol_up_col, vol_up_row, 1)); zassert_ok(send_keypress_host_command(KEYBOARD_COL_LEFT_ALT, - KEYBOARD_ROW_LEFT_ALT, 1), - NULL); + KEYBOARD_ROW_LEFT_ALT, 1)); zassert_ok(send_keypress_host_command(KEYBOARD_COL_KEY_R, - KEYBOARD_ROW_KEY_R, 1), - NULL); + KEYBOARD_ROW_KEY_R, 1)); k_sleep(K_MSEC(100)); /* Release R and the press H */ zassert_ok(send_keypress_host_command(KEYBOARD_COL_KEY_R, - KEYBOARD_ROW_KEY_R, 0), - NULL); + KEYBOARD_ROW_KEY_R, 0)); zassert_ok(send_keypress_host_command(KEYBOARD_COL_KEY_H, - KEYBOARD_ROW_KEY_H, 1), - NULL); + KEYBOARD_ROW_KEY_H, 1)); k_sleep(K_MSEC(100)); /* Release all */ - zassert_ok(send_keypress_host_command(vol_up_col, vol_up_row, 0), NULL); + zassert_ok(send_keypress_host_command(vol_up_col, vol_up_row, 0)); zassert_ok(send_keypress_host_command(KEYBOARD_COL_LEFT_ALT, - KEYBOARD_ROW_LEFT_ALT, 0), - NULL); + KEYBOARD_ROW_LEFT_ALT, 0)); zassert_ok(send_keypress_host_command(KEYBOARD_COL_KEY_H, - KEYBOARD_ROW_KEY_H, 0), - NULL); + KEYBOARD_ROW_KEY_H, 0)); /* Check that a reboot was requested (VOLUP + ALT + R) */ zassert_equal(1, chipset_reset_fake.call_count, "Did not try to reboot"); zassert_equal(CHIPSET_RESET_KB_WARM_REBOOT, - chipset_reset_fake.arg0_history[0], NULL); + chipset_reset_fake.arg0_history[0]); /* Check that we called system_enter_hibernate (VOLUP + ALT + H) */ zassert_equal(1, system_enter_hibernate_fake.call_count, diff --git a/zephyr/test/drivers/led_driver/src/led.c b/zephyr/test/drivers/led_driver/src/led.c index 7dfaa32bbb..4e4023beb4 100644 --- a/zephyr/test/drivers/led_driver/src/led.c +++ b/zephyr/test/drivers/led_driver/src/led.c @@ -64,8 +64,8 @@ ZTEST(led_driver, test_led_brightness) * brightness array. */ led_get_brightness_range(EC_LED_ID_SYSRQ_DEBUG_LED, brightness); - zassert_equal(brightness[EC_LED_COLOR_BLUE], 1, NULL); - zassert_equal(brightness[EC_LED_COLOR_WHITE], 1, NULL); + zassert_equal(brightness[EC_LED_COLOR_BLUE], 1); + zassert_equal(brightness[EC_LED_COLOR_WHITE], 1); /* Verify LED set to WHITE */ led_set_brightness(EC_LED_ID_SYSRQ_DEBUG_LED, brightness); diff --git a/zephyr/test/drivers/usb_malfunction_sink/src/usb_malfunction_sink.c b/zephyr/test/drivers/usb_malfunction_sink/src/usb_malfunction_sink.c index 977d8cceb2..1a78d73c7b 100644 --- a/zephyr/test/drivers/usb_malfunction_sink/src/usb_malfunction_sink.c +++ b/zephyr/test/drivers/usb_malfunction_sink/src/usb_malfunction_sink.c @@ -97,9 +97,9 @@ ZTEST_F(usb_malfunction_sink, test_fail_source_cap_and_pd_disable) typec_status = host_cmd_typec_status(0); /* Device is connected, but PD wasn't able to establish contract */ - zassert_true(typec_status.pd_enabled, NULL); - zassert_true(typec_status.dev_connected, NULL); - zassert_false(typec_status.sop_connected, NULL); + zassert_true(typec_status.pd_enabled); + zassert_true(typec_status.dev_connected); + zassert_false(typec_status.sop_connected); } ZTEST_F(usb_malfunction_sink, test_fail_source_cap_and_pd_connect) @@ -121,9 +121,9 @@ ZTEST_F(usb_malfunction_sink, test_fail_source_cap_and_pd_connect) typec_status = host_cmd_typec_status(0); - zassert_true(typec_status.pd_enabled, NULL); - zassert_true(typec_status.dev_connected, NULL); - zassert_true(typec_status.sop_connected, NULL); + zassert_true(typec_status.pd_enabled); + zassert_true(typec_status.dev_connected); + zassert_true(typec_status.sop_connected); info = host_cmd_power_info(0); @@ -265,7 +265,7 @@ ZTEST_F(usb_malfunction_sink, test_ignore_source_cap_and_pd_disable) typec_status = host_cmd_typec_status(0); /* Device is connected, but PD wasn't able to establish contract */ - zassert_true(typec_status.pd_enabled, NULL); - zassert_true(typec_status.dev_connected, NULL); - zassert_false(typec_status.sop_connected, NULL); + zassert_true(typec_status.pd_enabled); + zassert_true(typec_status.dev_connected); + zassert_false(typec_status.sop_connected); } diff --git a/zephyr/test/drivers/usbc_alt_mode/src/usbc_alt_mode.c b/zephyr/test/drivers/usbc_alt_mode/src/usbc_alt_mode.c index b4aad17c30..d255fe734c 100644 --- a/zephyr/test/drivers/usbc_alt_mode/src/usbc_alt_mode.c +++ b/zephyr/test/drivers/usbc_alt_mode/src/usbc_alt_mode.c @@ -54,7 +54,7 @@ static void connect_partner_to_port(const struct emul *tcpc_emul, static void disconnect_partner_from_port(const struct emul *tcpc_emul, const struct emul *charger_emul) { - zassume_ok(tcpci_emul_disconnect_partner(tcpc_emul), NULL); + zassume_ok(tcpci_emul_disconnect_partner(tcpc_emul)); isl923x_emul_set_adc_vbus(charger_emul, 0); k_sleep(K_SECONDS(1)); } @@ -216,14 +216,14 @@ ZTEST_F(usbc_alt_mode, verify_displayport_mode_entry) host_cmd_usb_pd_get_amode(TEST_PORT, 0, &response, &response_size); /* Response should be populated with a DisplayPort VDO */ - zassert_equal(response_size, sizeof(response), NULL); - zassert_equal(response.svid, USB_SID_DISPLAYPORT, NULL); + zassert_equal(response_size, sizeof(response)); + zassert_equal(response.svid, USB_SID_DISPLAYPORT); zassert_equal(response.vdo[0], fixture->partner.modes_vdm[response.opos], NULL); /* DPM configures the partner on DP mode entry */ /* Verify port partner thinks its configured for DisplayPort */ - zassert_true(fixture->partner.displayport_configured, NULL); + zassert_true(fixture->partner.displayport_configured); /* Verify we also set up DP on our mux */ status = host_cmd_typec_status(TEST_PORT); zassert_equal((status.mux_state & USB_PD_MUX_DP_ENABLED), @@ -267,7 +267,7 @@ ZTEST_F(usbc_alt_mode, verify_discovery_via_pd_host_cmd) EC_CMD_USB_PD_DISCOVERY, 0, response, params); zassert_ok(host_command_process(&args)); - zassert_equal(args.response_size, sizeof(response), NULL); + zassert_equal(args.response_size, sizeof(response)); zassert_equal(response.ptype, IDH_PTYPE_AMA); zassert_equal(response.vid, USB_VID_GOOGLE); zassert_equal(response.pid, PARTNER_PRODUCT_ID); @@ -371,7 +371,7 @@ ZTEST_F(usbc_alt_mode_dp_unsupported, verify_displayport_mode_nonentry) k_sleep(K_SECONDS(1)); } - zassert_false(fixture->partner.displayport_configured, NULL); + zassert_false(fixture->partner.displayport_configured); int dp_attempts = atomic_get(&fixture->partner.mode_enter_attempts); zassert_equal(dp_attempts, 1, "Expected 1 DP attempt, got %d", dp_attempts); diff --git a/zephyr/test/math/src/fixed_point_int_sqrtf.c b/zephyr/test/math/src/fixed_point_int_sqrtf.c index 163c36c26b..a76567b9d7 100644 --- a/zephyr/test/math/src/fixed_point_int_sqrtf.c +++ b/zephyr/test/math/src/fixed_point_int_sqrtf.c @@ -10,10 +10,10 @@ ZTEST_USER(math, int_sqrtf_negative) { - zassert_equal(int_sqrtf(-100), 0, NULL); + zassert_equal(int_sqrtf(-100), 0); } ZTEST_USER(math, int_sqrtf_overflow) { - zassert_equal(int_sqrtf(INT64_MAX), INT32_MAX, NULL); + zassert_equal(int_sqrtf(INT64_MAX), INT32_MAX); } diff --git a/zephyr/test/math/src/mask.c b/zephyr/test/math/src/mask.c index 5e690c9653..c38b756eda 100644 --- a/zephyr/test/math/src/mask.c +++ b/zephyr/test/math/src/mask.c @@ -11,10 +11,10 @@ ZTEST_USER(math, bitmask_uint64) { - zassert_equal(bitmask_uint64(-1), 0, NULL); - zassert_equal(bitmask_uint64(64), 0, NULL); - zassert_equal(bitmask_uint64(1), UINT64_C(1) << 1, NULL); - zassert_equal(bitmask_uint64(15), UINT64_C(1) << 15, NULL); - zassert_equal(bitmask_uint64(35), UINT64_C(1) << 35, NULL); - zassert_equal(bitmask_uint64(60), UINT64_C(1) << 60, NULL); + zassert_equal(bitmask_uint64(-1), 0); + zassert_equal(bitmask_uint64(64), 0); + zassert_equal(bitmask_uint64(1), UINT64_C(1) << 1); + zassert_equal(bitmask_uint64(15), UINT64_C(1) << 15); + zassert_equal(bitmask_uint64(35), UINT64_C(1) << 35); + zassert_equal(bitmask_uint64(60), UINT64_C(1) << 60); } diff --git a/zephyr/test/math/src/math_util.c b/zephyr/test/math/src/math_util.c index d3bd2c6fb6..a3f26d3fea 100644 --- a/zephyr/test/math/src/math_util.c +++ b/zephyr/test/math/src/math_util.c @@ -28,12 +28,12 @@ ZTEST_USER(math, arc_cos__x_above_range) ZTEST_USER(math, int_sqrtf) { - zassert_equal(int_sqrtf(0), 0, NULL); - zassert_equal(int_sqrtf(15), 3, NULL); - zassert_equal(int_sqrtf(25), 5, NULL); - zassert_equal(int_sqrtf(1111088889), 33333, NULL); - zassert_equal(int_sqrtf(123456789), 11111, NULL); - zassert_equal(int_sqrtf(1000000000000000005), 1000000000, NULL); + zassert_equal(int_sqrtf(0), 0); + zassert_equal(int_sqrtf(15), 3); + zassert_equal(int_sqrtf(25), 5); + zassert_equal(int_sqrtf(1111088889), 33333); + zassert_equal(int_sqrtf(123456789), 11111); + zassert_equal(int_sqrtf(1000000000000000005), 1000000000); } ZTEST_USER(math, fp_sqrtf) diff --git a/zephyr/test/math/src/vector.c b/zephyr/test/math/src/vector.c index e79a350a92..87dad3a78d 100644 --- a/zephyr/test/math/src/vector.c +++ b/zephyr/test/math/src/vector.c @@ -13,8 +13,8 @@ ZTEST_USER(math, cosine_of_angle_diff__zero_magnitude_vector) intv3_t v0 = { 0, 0, 0 }; intv3_t v1 = { 1, 1, 1 }; - zassert_equal(cosine_of_angle_diff(v0, v1), 0, NULL); - zassert_equal(cosine_of_angle_diff(v1, v0), 0, NULL); + zassert_equal(cosine_of_angle_diff(v0, v1), 0); + zassert_equal(cosine_of_angle_diff(v1, v0), 0); } ZTEST_USER(math, rotate_inv__null_matrix) @@ -23,7 +23,7 @@ ZTEST_USER(math, rotate_inv__null_matrix) intv3_t r = { 4, 5, 6 }; rotate_inv(v, NULL, r); - zassert_equal(v[0], r[0], NULL); - zassert_equal(v[1], r[1], NULL); - zassert_equal(v[2], r[2], NULL); + zassert_equal(v[0], r[0]); + zassert_equal(v[1], r[1]); + zassert_equal(v[2], r[2]); } diff --git a/zephyr/test/system_shim/test_system.c b/zephyr/test/system_shim/test_system.c index 88f39dacd3..de54fda1fb 100644 --- a/zephyr/test/system_shim/test_system.c +++ b/zephyr/test/system_shim/test_system.c @@ -52,25 +52,25 @@ ZTEST(system, test_bbram_get) /* Write expected data to read back */ rc = bbram_write(bbram_dev, 0, ARRAY_SIZE(mock_data), mock_data); - zassert_ok(rc, NULL); + zassert_ok(rc); rc = system_get_bbram(SYSTEM_BBRAM_IDX_PD0, output); - zassert_ok(rc, NULL); + zassert_ok(rc); zassert_mem_equal(output, mock_data + BBRAM_REGION_OFF(pd0), BBRAM_REGION_SIZE(pd0), NULL); rc = system_get_bbram(SYSTEM_BBRAM_IDX_PD1, output); - zassert_ok(rc, NULL); + zassert_ok(rc); zassert_mem_equal(output, mock_data + BBRAM_REGION_OFF(pd1), BBRAM_REGION_SIZE(pd1), NULL); rc = system_get_bbram(SYSTEM_BBRAM_IDX_PD2, output); - zassert_ok(rc, NULL); + zassert_ok(rc); zassert_mem_equal(output, mock_data + BBRAM_REGION_OFF(pd2), BBRAM_REGION_SIZE(pd2), NULL); rc = system_get_bbram(SYSTEM_BBRAM_IDX_TRY_SLOT, output); - zassert_ok(rc, NULL); + zassert_ok(rc); zassert_mem_equal(output, mock_data + BBRAM_REGION_OFF(try_slot), BBRAM_REGION_SIZE(try_slot), NULL); } |