PowLu/TencentOS-tiny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix code style

Browse Source
This commit is contained in:
acevest
2019-09-20 16:38:34 +08:00
parent 72b4656c2a
commit 1d56297a85
2 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
arch/risc-v/common/tos_cpu.c
View File

@@ -93,13 +93,11 @@ __KERNEL__ k_stack_t *cpu_task_stk_init(void *entry,
regs = (cpu_context_t*) sp; regs = (cpu_context_t*) sp;
#if 1
for(int i=0; i<(sizeof(cpu_context_t)/sizeof(cpu_data_t)); i++) { for(int i=0; i<(sizeof(cpu_context_t)/sizeof(cpu_data_t)); i++) {
#define _V(v) ((unsigned int)((v/10) << 4 | (v % 10))) #define _V(v) ((unsigned int)((v/10) << 4 | (v % 10)))
*(sp + i) = (_V(i) << 24) | (_V(i) << 16) | (_V(i) << 8) | _V(i); *(sp + i) = (_V(i) << 24) | (_V(i) << 16) | (_V(i) << 8) | _V(i);
#undef _V #undef _V
} }
#endif
regs->a0 = (cpu_data_t)arg; // a0: argument regs->a0 = (cpu_data_t)arg; // a0: argument
regs->ra = (cpu_data_t)0xACE00ACE; // ra: return address regs->ra = (cpu_data_t)0xACE00ACE; // ra: return address
@@ -112,14 +110,14 @@ __KERNEL__ k_stack_t *cpu_task_stk_init(void *entry,
void cpu_trap_entry(cpu_data_t cause, cpu_context_t *regs) void cpu_trap_entry(cpu_data_t cause, cpu_context_t *regs)
{ {
while(1) { while (1) {
// TODO // TODO
} }
} }
void SysTick_IRQHandler() { void SysTick_IRQHandler() {
port_systick_config(k_cpu_cycle_per_tick); port_systick_config(k_cpu_cycle_per_tick);
if(tos_knl_is_running()) { if (tos_knl_is_running()) {
tos_knl_irq_enter(); tos_knl_irq_enter();
tos_tick_handler(); tos_tick_handler();
tos_knl_irq_leave(); tos_knl_irq_leave();
@@ -128,23 +126,11 @@ void SysTick_IRQHandler() {
void cpu_irq_entry(cpu_data_t irq, cpu_context_t *regs) void cpu_irq_entry(cpu_data_t irq, cpu_context_t *regs)
{ {
#if 1 if (irq != 7) {
if(irq != 7) {
return; return;
} }
SysTick_IRQHandler(); SysTick_IRQHandler();
#else
void (*irq_handler)();
extern void (*handler_vector_table[])();
irq_handler = handler_vector_table[irq];
if((*irq_handler) == 0) {
return;
}
(*irq_handler)();
#endif
} }
__API__ uint32_t tos_cpu_clz(uint32_t val) __API__ uint32_t tos_cpu_clz(uint32_t val)

2
arch/risc-v/rv32i/gcc/port_c.c
View File

@@ -14,7 +14,7 @@ __PORT__ void port_systick_config(uint32_t cycle_per_tick)
// then mtime_lo == 0 and mtime_hi = 1 at next read // then mtime_lo == 0 and mtime_hi = 1 at next read
// the result will be 0x1FFFFFFFF, not 0x100000000 // the result will be 0x1FFFFFFFF, not 0x100000000
uint64_t mtime = 0; uint64_t mtime = 0;
while(1) { while (1) {
uint32_t mtime_hi = *(volatile uint32_t *)(CLINT_CTRL_ADDR + CLINT_MTIME + 4); uint32_t mtime_hi = *(volatile uint32_t *)(CLINT_CTRL_ADDR + CLINT_MTIME + 4);
uint32_t mtime_lo = *(volatile uint32_t *)(CLINT_CTRL_ADDR + CLINT_MTIME + 0); uint32_t mtime_lo = *(volatile uint32_t *)(CLINT_CTRL_ADDR + CLINT_MTIME + 0);
uint32_t mtime_hn = *(volatile uint32_t *)(CLINT_CTRL_ADDR + CLINT_MTIME + 4); uint32_t mtime_hn = *(volatile uint32_t *)(CLINT_CTRL_ADDR + CLINT_MTIME + 4);