move usart0_init to main

This commit is contained in:
acevest
2019-10-02 11:05:04 +08:00
parent bd407ece98
commit 3c88162700
2 changed files with 23 additions and 23 deletions

View File

@@ -6,6 +6,4 @@ void board_init() {
gpio_init(GPIOA, GPIO_MODE_OUT_PP, GPIO_OSPEED_50MHZ, GPIO_PIN_7); gpio_init(GPIOA, GPIO_MODE_OUT_PP, GPIO_OSPEED_50MHZ, GPIO_PIN_7);
gpio_bit_reset(GPIOA, GPIO_PIN_7); gpio_bit_reset(GPIOA, GPIO_PIN_7);
usart0_init(115200);
} }

View File

@@ -12,47 +12,49 @@ k_sem_t sem;
void task1(void *pdata) void task1(void *pdata)
{ {
int task_cnt1 = 0; int task_cnt1 = 0;
while (1) { while (1) {
printf("hello world from %s cnt: %d\n", __func__, task_cnt1++); printf("hello world from %s cnt: %d\n", __func__, task_cnt1++);
tos_sem_pend(&sem, ~0U); tos_sem_pend(&sem, ~0U);
gpio_bit_write(GPIOA, GPIO_PIN_7, share % 2); gpio_bit_write(GPIOA, GPIO_PIN_7, share % 2);
} }
} }
void task2(void *pdata) void task2(void *pdata)
{ {
int task_cnt2 = 0; int task_cnt2 = 0;
while (1) { while (1) {
share++; share++;
for(int i=0; i<5; i++) { for(int i=0; i<5; i++) {
printf("hello world from %s cnt: %08x\n", __func__, task_cnt2--); printf("hello world from %s cnt: %08x\n", __func__, task_cnt2--);
tos_task_delay(200); tos_task_delay(200);
} }
tos_sem_post(&sem); tos_sem_post(&sem);
} }
} }
void main(void) { void main(void) {
board_init(); board_init();
tos_knl_init(); usart0_init(115200);
tos_task_create(&k_task_task1, "task1", task1, NULL, 3, k_task1_stk, TASK_SIZE, 0); tos_knl_init();
tos_task_create(&k_task_task2, "task2", task2, NULL, 3, k_task2_stk, TASK_SIZE, 0);
k_err_t err = tos_sem_create(&sem, 1); tos_task_create(&k_task_task1, "task1", task1, NULL, 3, k_task1_stk, TASK_SIZE, 0);
if (err != K_ERR_NONE) { tos_task_create(&k_task_task2, "task2", task2, NULL, 3, k_task2_stk, TASK_SIZE, 0);
goto die;
}
tos_knl_start(); k_err_t err = tos_sem_create(&sem, 1);
if (err != K_ERR_NONE) {
goto die;
}
tos_knl_start();
die: die:
while (1) { while (1) {
asm("wfi;"); asm("wfi;");
} }
} }