michaelh/zephyr
1
0
Fork 0
Code Releases Activity

tests: kernel: device: drop APPLICATION level

Browse source 
Level is about to be removed, so stop testing it.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
This commit is contained in:
Gerard Marull-Paretas 2023-09-13 14:54:25 +02:00 • committed by Carles Cufí
commit 3ff5222a6f
2 changed files with 6 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -284,9 +284,9 @@ ZTEST(device, test_device_init_level)
bool seq_correct = true; bool seq_correct = true;
/* we check if the stored executing sequence for different level is /* we check if the stored executing sequence for different level is
* correct, and it should be 1, 2, 3, 4 * correct, and it should be 1, 2, 3
*/ */
for (int i = 0; i < 4; i++) { for (int i = 0; i < 3; i++) {
if (init_level_sequence[i] != (i + 1)) { if (init_level_sequence[i] != (i + 1)) {
seq_correct = false; seq_correct = false;
} }

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

@ -19,7 +19,6 @@
#define MY_DRIVER_LV_1 "my_driver_level_1" #define MY_DRIVER_LV_1 "my_driver_level_1"
#define MY_DRIVER_LV_2 "my_driver_level_2" #define MY_DRIVER_LV_2 "my_driver_level_2"
#define MY_DRIVER_LV_3 "my_driver_level_3" #define MY_DRIVER_LV_3 "my_driver_level_3"
#define MY_DRIVER_LV_4 "my_driver_level_4"
#define MY_DRIVER_PRI_1 "my_driver_priority_1" #define MY_DRIVER_PRI_1 "my_driver_priority_1"
#define MY_DRIVER_PRI_2 "my_driver_priority_2" #define MY_DRIVER_PRI_2 "my_driver_priority_2"
#define MY_DRIVER_PRI_3 "my_driver_priority_3" #define MY_DRIVER_PRI_3 "my_driver_priority_3"
@ -28,7 +27,6 @@
#define LEVEL_PRE_KERNEL_1 1 #define LEVEL_PRE_KERNEL_1 1
#define LEVEL_PRE_KERNEL_2 2 #define LEVEL_PRE_KERNEL_2 2
#define LEVEL_POST_KERNEL 3 #define LEVEL_POST_KERNEL 3
#define LEVEL_APPLICATION 4
#define PRIORITY_1 1 #define PRIORITY_1 1
#define PRIORITY_2 2 #define PRIORITY_2 2
@ -37,7 +35,7 @@
/* this is for storing sequence during initialization */ /* this is for storing sequence during initialization */
__pinned_bss int init_level_sequence[4] = {0}; __pinned_bss int init_level_sequence[3] = {0};
__pinned_bss int init_priority_sequence[4] = {0}; __pinned_bss int init_priority_sequence[4] = {0};
__pinned_bss int init_sub_priority_sequence[3] = {0}; __pinned_bss int init_sub_priority_sequence[3] = {0};
__pinned_bss unsigned int seq_level_cnt; __pinned_bss unsigned int seq_level_cnt;
@ -87,14 +85,6 @@ static int my_driver_lv_3_init(const struct device *dev)
return 0; return 0;
} }
static int my_driver_lv_4_init(const struct device *dev)
{
init_level_sequence[seq_level_cnt] = LEVEL_APPLICATION;
seq_level_cnt++;
return 0;
}
/* driver init function of testing priority */ /* driver init function of testing priority */
static int my_driver_pri_1_init(const struct device *dev) static int my_driver_pri_1_init(const struct device *dev)
{ {
@ -173,10 +163,6 @@ DEVICE_DEFINE(my_driver_level_3, MY_DRIVER_LV_3, &my_driver_lv_3_init,
NULL, NULL, NULL, POST_KERNEL, NULL, NULL, NULL, POST_KERNEL,
CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &funcs_my_drivers); CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &funcs_my_drivers);
DEVICE_DEFINE(my_driver_level_4, MY_DRIVER_LV_4, &my_driver_lv_4_init,
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 /* We use priority value of 20 to create a possible sorting conflict with
* priority value of 2. So if the linker sorting isn't working correctly * priority value of 2. So if the linker sorting isn't working correctly
* we'll find out. * we'll find out.
@ -201,8 +187,8 @@ DEVICE_DEFINE(my_driver_priority_3, MY_DRIVER_PRI_3,
* other in devicetree so that we can validate linker sorting. * other in devicetree so that we can validate linker sorting.
*/ */
DEVICE_DT_DEFINE(DT_NODELABEL(fakedomain_0), my_driver_sub_pri_0_init, DEVICE_DT_DEFINE(DT_NODELABEL(fakedomain_0), my_driver_sub_pri_0_init,
NULL, NULL, NULL, APPLICATION, 33, NULL); NULL, NULL, NULL, POST_KERNEL, 33, NULL);
DEVICE_DT_DEFINE(DT_NODELABEL(fakedomain_1), my_driver_sub_pri_1_init, DEVICE_DT_DEFINE(DT_NODELABEL(fakedomain_1), my_driver_sub_pri_1_init,
NULL, NULL, NULL, APPLICATION, 33, NULL); NULL, NULL, NULL, POST_KERNEL, 33, NULL);
DEVICE_DT_DEFINE(DT_NODELABEL(fakedomain_2), my_driver_sub_pri_2_init, DEVICE_DT_DEFINE(DT_NODELABEL(fakedomain_2), my_driver_sub_pri_2_init,
NULL, NULL, NULL, APPLICATION, 33, NULL); NULL, NULL, NULL, POST_KERNEL, 33, NULL);