Skip to content

Fix zephyr samples build issue caused by zephyr kernel API update #232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Apr 12, 2020
Merged

Fix zephyr samples build issue caused by zephyr kernel API update #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
03f2e5c
Clean compiling warnings of zephyr samples
Weining2019 Mar 17, 2020
93670b3
Merge pull request #1 from bytecodealliance/master
Weining2019 Mar 26, 2020
a034460
Merge pull request #2 from bytecodealliance/master
Weining2019 Apr 1, 2020
fa6b20b
Support xtensa AOT and fix build issue of alios
Weining2019 Apr 1, 2020
ee9eb73
Merge pull request #3 from bytecodealliance/master
Weining2019 Apr 2, 2020
69ebde0
Refine wgl native functions call
Weining2019 Apr 2, 2020
865e18e
Merge pull request #4 from bytecodealliance/master
Weining2019 Apr 12, 2020
f9df608
Fix zephyr samples build issue caused by zephyr kernel API update
Weining2019 Apr 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/app-mgr/app-manager/platform/zephyr/app_mgr_zephyr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ void app_manager_timer_destroy(void *timer)

void app_manager_timer_start(void *timer, int timeout)
{
k_timer_start(timer, timeout, 0);
k_timer_start(timer, Z_TIMEOUT_MS(timeout), Z_TIMEOUT_MS(0));
}

void app_manager_timer_stop(void *timer)
Expand Down
8 changes: 4 additions & 4 deletions samples/gui/wasm-runtime-wgl/src/platform/zephyr/display_ili9340.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ struct ili9340_data ili9340_data1;
static void ili9340_exit_sleep(struct ili9340_data *data)
{
ili9340_transmit(data, ILI9340_CMD_EXIT_SLEEP, NULL, 0);
//k_sleep(120);
//k_sleep(Z_TIMEOUT_MS(120));
}

int ili9340_init()
Expand Down Expand Up @@ -82,11 +82,11 @@ int ili9340_init()

LOG_DBG("Resetting display driver\n");
gpio_pin_set(data->reset_gpio, DT_ILITEK_ILI9340_0_RESET_GPIOS_PIN, 1);
k_sleep(1);
k_sleep(Z_TIMEOUT_MS(1));
gpio_pin_set(data->reset_gpio, DT_ILITEK_ILI9340_0_RESET_GPIOS_PIN, 0);
k_sleep(1);
k_sleep(Z_TIMEOUT_MS(1));
gpio_pin_set(data->reset_gpio, DT_ILITEK_ILI9340_0_RESET_GPIOS_PIN, 1);
k_sleep(5);
k_sleep(Z_TIMEOUT_MS(5));

LOG_DBG("Initializing LCD\n");
ili9340_lcd_init(data);
Expand Down
2 changes: 1 addition & 1 deletion samples/gui/wasm-runtime-wgl/src/platform/zephyr/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ void main(void)
{
iwasm_main();
for(;;){
k_sleep(1000);
k_sleep(Z_TIMEOUT_MS(1000));
}
}

Expand Down
8 changes: 4 additions & 4 deletions samples/littlevgl/vgl-wasm-runtime/src/platform/zephyr/display_ili9340.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ struct ili9340_data ili9340_data1;
static void ili9340_exit_sleep(struct ili9340_data *data)
{
ili9340_transmit(data, ILI9340_CMD_EXIT_SLEEP, NULL, 0);
//k_sleep(120);
//k_sleep(Z_TIMEOUT_MS(120));
}

int ili9340_init()
Expand Down Expand Up @@ -82,11 +82,11 @@ int ili9340_init()

LOG_DBG("Resetting display driver\n");
gpio_pin_set(data->reset_gpio, DT_ILITEK_ILI9340_0_RESET_GPIOS_PIN, 1);
k_sleep(1);
k_sleep(Z_TIMEOUT_MS(1));
gpio_pin_set(data->reset_gpio, DT_ILITEK_ILI9340_0_RESET_GPIOS_PIN, 0);
k_sleep(1);
k_sleep(Z_TIMEOUT_MS(1));
gpio_pin_set(data->reset_gpio, DT_ILITEK_ILI9340_0_RESET_GPIOS_PIN, 1);
k_sleep(5);
k_sleep(Z_TIMEOUT_MS(5));

LOG_DBG("Initializing LCD\n");
ili9340_lcd_init(data);
Expand Down
2 changes: 1 addition & 1 deletion samples/littlevgl/vgl-wasm-runtime/src/platform/zephyr/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ void main(void)
display_init();
iwasm_main();
for(;;){
k_sleep(1000);
k_sleep(Z_TIMEOUT_MS(1000));
}
}