michaelh/zephyr
1
0
Fork 0
Code Releases Activity

tests: kernel: device: adjust for device pm changes

Browse source 
- If device PM is not supported -ENOSYS is returned, update test case to
  account for that
- Remove usage of device_pm_control_nop

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
This commit is contained in:
Gerard Marull-Paretas 2021-04-26 15:34:44 +02:00 • committed by Anas Nashif
commit e25dc6ff80
2 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/kernel/device/src/main.c
View file

@ -256,7 +256,7 @@ static void test_enable_and_disable_automatic_idle_pm(void)
/* check its status at first */
/* for cases that cannot run IDLE power, we skip it now */
ret = device_get_power_state(dev, &device_power_state);
if (ret == -ENOTSUP) {
if (ret == -ENOSYS) {
TC_PRINT("Power management not supported on device");
ztest_test_skip();
return;
@ -317,7 +317,7 @@ void test_dummy_device_pm(void)
/* Set device state to DEVICE_PM_ACTIVE_STATE */
ret = device_set_power_state(dev, DEVICE_PM_ACTIVE_STATE, NULL, NULL);
if (ret == -ENOTSUP) {
if (ret == -ENOSYS) {
TC_PRINT("Power management not supported on device");
ztest_test_skip();
return;

24
tests/kernel/device/src/test_driver_init.c
View file

@ -135,19 +135,19 @@ static int my_driver_pri_4_init(const struct device *dev)
* @ingroup kernel_device_tests
*/
DEVICE_DEFINE(my_driver_level_1, MY_DRIVER_LV_1, &my_driver_lv_1_init,
device_pm_control_nop, NULL, NULL, PRE_KERNEL_1,
NULL, NULL, NULL, PRE_KERNEL_1,
CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &funcs_my_drivers);
DEVICE_DEFINE(my_driver_level_2, MY_DRIVER_LV_2, &my_driver_lv_2_init,
device_pm_control_nop, NULL, NULL, PRE_KERNEL_2,
NULL, NULL, NULL, PRE_KERNEL_2,
CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &funcs_my_drivers);
DEVICE_DEFINE(my_driver_level_3, MY_DRIVER_LV_3, &my_driver_lv_3_init,
device_pm_control_nop, NULL, NULL, POST_KERNEL,
NULL, NULL, NULL, POST_KERNEL,
CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &funcs_my_drivers);
DEVICE_DEFINE(my_driver_level_4, MY_DRIVER_LV_4, &my_driver_lv_4_init,
device_pm_control_nop, NULL, NULL, APPLICATION,
NULL, NULL, NULL, APPLICATION,
CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &funcs_my_drivers);
/* We use priority value of 20 to create a possible sorting conflict with
@ -155,17 +155,17 @@ DEVICE_DEFINE(my_driver_level_4, MY_DRIVER_LV_4, &my_driver_lv_4_init,
* we'll find out.
*/
DEVICE_DEFINE(my_driver_priority_4, MY_DRIVER_PRI_4,
&my_driver_pri_4_init, device_pm_control_nop,
NULL, NULL, POST_KERNEL, 20, &funcs_my_drivers);
&my_driver_pri_4_init, NULL, NULL, NULL, POST_KERNEL, 20,
&funcs_my_drivers);
DEVICE_DEFINE(my_driver_priority_1, MY_DRIVER_PRI_1,
&my_driver_pri_1_init, device_pm_control_nop,
NULL, NULL, POST_KERNEL, 1, &funcs_my_drivers);
&my_driver_pri_1_init, NULL, NULL, NULL, POST_KERNEL, 1,
&funcs_my_drivers);
DEVICE_DEFINE(my_driver_priority_2, MY_DRIVER_PRI_2,
&my_driver_pri_2_init, device_pm_control_nop,
NULL, NULL, POST_KERNEL, 2, &funcs_my_drivers);
&my_driver_pri_2_init, NULL, NULL, NULL, POST_KERNEL, 2,
&funcs_my_drivers);
DEVICE_DEFINE(my_driver_priority_3, MY_DRIVER_PRI_3,
&my_driver_pri_3_init, device_pm_control_nop,
NULL, NULL, POST_KERNEL, 3, &funcs_my_drivers);
&my_driver_pri_3_init, NULL, NULL, NULL, POST_KERNEL, 3,
&funcs_my_drivers);