Merge remote-tracking branch 'upstream/master'

This commit is contained in:
IllusionLee
2019-10-08 20:53:58 +08:00
11380 changed files with 343 additions and 162 deletions

View File

@@ -104,6 +104,8 @@
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/hello_world/Application}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/hello_world/GD32VF103_Firmware_Library/RISCV/drivers}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/hello_world/TencentOS_tiny/arch/risc-v/bumblebee}&quot;"/>
</option>

View File

@@ -27,7 +27,7 @@ void task2(void *pdata)
share++;
for(int i=0; i<5; i++) {
printf("hello world from %s cnt: %08x\n", __func__, task_cnt2--);
tos_task_delay(200);
tos_task_delay(50);
}
tos_sem_post(&sem);
}

View File

@@ -53,7 +53,7 @@ HAL_DRIVER_SRC = \
ASM_SOURCES =
ASM_SOURCES_S = \
$(TOP_DIR)/arch/risc-v/rv32i/gcc/port_s.S \
$(TOP_DIR)/arch/risc-v/rv32i/gcc/port_s.S \
start.S

View File

@@ -1,15 +1,13 @@
// See LICENSE for license details.
#include "riscv_encoding.h"
.extern rv32_exception_entry
.align 2
.section .text.entry
.globl _start
.type _start,@function
_start:
csrc mstatus, MSTATUS_MIE
csrc mstatus, 0x00000008
csrw mie, 0
la t0, trap_entry
la t0, rv32_exception_entry
csrw mtvec, t0
la sp, _stack_top

View File

@@ -14,11 +14,8 @@ void task1(void *pdata)
{
t1++;
share++;
//k_tick_t delay = tos_millisec2tick(10);
//tos_task_delay(delay);
tos_task_yield();
//osDelay(10);
//asm("wfi;");
tos_task_delay(2);
//tos_task_yield();
}
}
@@ -29,9 +26,9 @@ void task2(void *pdata)
{
t2--;
share--;
//tos_task_delay(10);
tos_task_yield();
asm("wfi;");
tos_task_delay(3);
//tos_task_yield();
//asm("wfi;");
}
}

View File

@@ -111,7 +111,7 @@
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/demo/Inc}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/demo/TencentOS_tiny/arch/risc-v/rv32i}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/demo/TencentOS_tiny/arch/risc-v/spike}&quot;"/>
</option>

View File

@@ -1,15 +1,14 @@
// See LICENSE for license details.
#include "riscv_encoding.h"
.extern rv32_exception_entry
.align 2
.section .text.entry
.globl _start
.type _start,@function
_start:
csrc mstatus, MSTATUS_MIE
csrc mstatus, 0x00000008
csrw mie, 0
la t0, trap_entry
la t0, rv32_exception_entry
csrw mtvec, t0
la sp, _stack_top