Skip to content

Commit ffd975d

Browse files
authored
Fix zephyr samples build issue caused by zephyr kernel API update (#232)
* Clean compiling warnings of zephyr samples * Support xtensa AOT and fix build issue of alios * Refine wgl native functions call * Fix zephyr samples build issue caused by zephyr kernel API update
1 parent 42d982e commit ffd975d

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

core/app-mgr/app-manager/platform/zephyr/app_mgr_zephyr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ void app_manager_timer_destroy(void *timer)
3838

3939
void app_manager_timer_start(void *timer, int timeout)
4040
{
41-
k_timer_start(timer, timeout, 0);
41+
k_timer_start(timer, Z_TIMEOUT_MS(timeout), Z_TIMEOUT_MS(0));
4242
}
4343

4444
void app_manager_timer_stop(void *timer)

samples/gui/wasm-runtime-wgl/src/platform/zephyr/display_ili9340.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ struct ili9340_data ili9340_data1;
3838
static void ili9340_exit_sleep(struct ili9340_data *data)
3939
{
4040
ili9340_transmit(data, ILI9340_CMD_EXIT_SLEEP, NULL, 0);
41-
//k_sleep(120);
41+
//k_sleep(Z_TIMEOUT_MS(120));
4242
}
4343

4444
int ili9340_init()
@@ -82,11 +82,11 @@ int ili9340_init()
8282

8383
LOG_DBG("Resetting display driver\n");
8484
gpio_pin_set(data->reset_gpio, DT_ILITEK_ILI9340_0_RESET_GPIOS_PIN, 1);
85-
k_sleep(1);
85+
k_sleep(Z_TIMEOUT_MS(1));
8686
gpio_pin_set(data->reset_gpio, DT_ILITEK_ILI9340_0_RESET_GPIOS_PIN, 0);
87-
k_sleep(1);
87+
k_sleep(Z_TIMEOUT_MS(1));
8888
gpio_pin_set(data->reset_gpio, DT_ILITEK_ILI9340_0_RESET_GPIOS_PIN, 1);
89-
k_sleep(5);
89+
k_sleep(Z_TIMEOUT_MS(5));
9090

9191
LOG_DBG("Initializing LCD\n");
9292
ili9340_lcd_init(data);

samples/gui/wasm-runtime-wgl/src/platform/zephyr/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ void main(void)
1616
{
1717
iwasm_main();
1818
for(;;){
19-
k_sleep(1000);
19+
k_sleep(Z_TIMEOUT_MS(1000));
2020
}
2121
}
2222

samples/littlevgl/vgl-wasm-runtime/src/platform/zephyr/display_ili9340.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ struct ili9340_data ili9340_data1;
3838
static void ili9340_exit_sleep(struct ili9340_data *data)
3939
{
4040
ili9340_transmit(data, ILI9340_CMD_EXIT_SLEEP, NULL, 0);
41-
//k_sleep(120);
41+
//k_sleep(Z_TIMEOUT_MS(120));
4242
}
4343

4444
int ili9340_init()
@@ -82,11 +82,11 @@ int ili9340_init()
8282

8383
LOG_DBG("Resetting display driver\n");
8484
gpio_pin_set(data->reset_gpio, DT_ILITEK_ILI9340_0_RESET_GPIOS_PIN, 1);
85-
k_sleep(1);
85+
k_sleep(Z_TIMEOUT_MS(1));
8686
gpio_pin_set(data->reset_gpio, DT_ILITEK_ILI9340_0_RESET_GPIOS_PIN, 0);
87-
k_sleep(1);
87+
k_sleep(Z_TIMEOUT_MS(1));
8888
gpio_pin_set(data->reset_gpio, DT_ILITEK_ILI9340_0_RESET_GPIOS_PIN, 1);
89-
k_sleep(5);
89+
k_sleep(Z_TIMEOUT_MS(5));
9090

9191
LOG_DBG("Initializing LCD\n");
9292
ili9340_lcd_init(data);

samples/littlevgl/vgl-wasm-runtime/src/platform/zephyr/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ void main(void)
1818
display_init();
1919
iwasm_main();
2020
for(;;){
21-
k_sleep(1000);
21+
k_sleep(Z_TIMEOUT_MS(1000));
2222
}
2323
}
2424

0 commit comments

Comments
 (0)