From 8c2af057f4029539d9421ffa55bd589f3807d586 Mon Sep 17 00:00:00 2001 From: Jingru Date: Fri, 10 Apr 2020 12:43:46 +0800 Subject: [PATCH] arch: arc: remove unused codes and definition Signed-off-by: Jingru --- arch/arc/arcem/port_c.c | 6 +- arch/arc/arcem/port_config.h | 2 +- arch/arc/arcem/port_s.s | 13 ++-- arch/arc/common/tos_cpu.c | 6 +- board/ARC_NSIM_EM/hello_world/.project | 84 ------------------------- board/ARC_NSIM_EM/hello_world/Makefile | 8 +-- board/ARC_NSIM_EM/hello_world/mw.log | Bin 89000 -> 0 bytes 7 files changed, 13 insertions(+), 106 deletions(-) delete mode 100644 board/ARC_NSIM_EM/hello_world/.project delete mode 100644 board/ARC_NSIM_EM/hello_world/mw.log diff --git a/arch/arc/arcem/port_c.c b/arch/arc/arcem/port_c.c index ab27396b..ab52dc9e 100644 --- a/arch/arc/arcem/port_c.c +++ b/arch/arc/arcem/port_c.c @@ -57,7 +57,7 @@ __PORT__ void port_systick_config(uint32_t cycle_per_tick) // Configure SysTick } __PORT__ void port_systick_priority_set(uint32_t prio) // Sets the int priority { - int_pri_set(INTNO_TIMER0, prio); // get system tick from timer 0 arc_timer.h + int_pri_set(BOARD_OS_TIMER_INTNO, prio); // get system tick from timer 0 arc_timer.h } @@ -103,7 +103,6 @@ __PORT__ void port_systick_reload(uint32_t cycle_per_tick) __PORT__ void port_systick_pending_reset(void) { - // SCB->ICSR |= SCB_ICSR_PENDSTCLR_Msk; arc_aux_write(AUX_TIMER0_CTRL, TIMER_CTRL_IP); // interrupt pending } @@ -132,14 +131,11 @@ __PORT__ void port_standby_mode_enter(void) __STATIC__ void port_fault_do_diagnosis(port_fault_regs_t *regs) // 硬件错误诊断 { k_fault_log_writer("\n\n====================== Fault Diagnosis =====================\n"); - - } __PORT__ void port_fault_diagnosis(void) { k_fault_log_writer("\n\n====================== Fault Diagnosis .. =====================\n"); - } __PORT__ void __NAKED__ HardFault_Handler(void) diff --git a/arch/arc/arcem/port_config.h b/arch/arc/arcem/port_config.h index 6a15bfd4..845c2fc8 100644 --- a/arch/arc/arcem/port_config.h +++ b/arch/arc/arcem/port_config.h @@ -16,7 +16,7 @@ *---------------------------------------------------------------------------*/ #ifndef _PORT_CONFIG_H_ -#define _PORT_CONFIG_H_ +#define _PORT_CONFIG_H_ #define TOS_CFG_CPU_ADDR_SIZE CPU_WORD_SIZE_32 #define TOS_CFG_CPU_DATA_SIZE CPU_WORD_SIZE_32 diff --git a/arch/arc/arcem/port_s.s b/arch/arc/arcem/port_s.s index e6b284aa..23fd5c13 100644 --- a/arch/arc/arcem/port_s.s +++ b/arch/arc/arcem/port_s.s @@ -11,6 +11,7 @@ .global k_curr_task .global k_next_task +.global g_exc_nest_count .global g_context_switch_reqflg .global tos_knl_irq_enter @@ -145,9 +146,9 @@ exc_entry_cpu: mov blink, sp mov r3, sp /* as exception handler's para(p_excinfo) */ - ld r0, [k_irq_nest_cnt] + ld r0, [g_exc_nest_count] add r1, r0, 1 - st r1, [k_irq_nest_cnt] + st r1, [g_exc_nest_count] brne r0, 0, exc_handler_1 /* change to exception stack if interrupt happened in task context */ mov sp, _e_stack @@ -169,7 +170,7 @@ exc_handler_1: /* interrupts are not allowed */ ret_exc: POP sp - mov r1, k_irq_nest_cnt + mov r1, g_exc_nest_count ld r0, [r1] sub r0, r0, 1 st r0, [r1] @@ -236,9 +237,9 @@ exc_entry_int: mov blink, sp clri /* disable interrupt */ - ld r3, [k_irq_nest_cnt] + ld r3, [g_exc_nest_count] add r2, r3, 1 - st r2, [k_irq_nest_cnt] + st r2, [g_exc_nest_count] seti /* enable higher priority interrupt */ brne r3, 0, irq_handler_1 @@ -282,7 +283,7 @@ ret_int: clri /* disable interrupt */ POP r3 /* irq priority */ POP sp - mov r1, k_irq_nest_cnt + mov r1, g_exc_nest_count ld r0, [r1] sub r0, r0, 1 st r0, [r1] diff --git a/arch/arc/common/tos_cpu.c b/arch/arc/common/tos_cpu.c index 7b91d17f..11eb0838 100644 --- a/arch/arc/common/tos_cpu.c +++ b/arch/arc/common/tos_cpu.c @@ -18,7 +18,7 @@ #include #include "embARC.h" -void tos_cup_tick_handler(void) +void tos_cpu_tick_handler(void) { arc_timer_int_clear(BOARD_OS_TIMER_ID); tos_tick_handler(); @@ -115,7 +115,7 @@ __KNL__ void cpu_systick_init(k_cycle_t cycle_per_tick) arc_timer_stop(BOARD_OS_TIMER_ID); arc_timer_start(BOARD_OS_TIMER_ID, TIMER_CTRL_IE | TIMER_CTRL_NH, cycle_per_tick); - int_handler_install(BOARD_OS_TIMER_INTNO, (INT_HANDLER_T)tos_cup_tick_handler); + int_handler_install(BOARD_OS_TIMER_INTNO, (INT_HANDLER_T)tos_cpu_tick_handler); int_pri_set(BOARD_OS_TIMER_INTNO, INT_PRI_MIN + 1); int_enable(BOARD_OS_TIMER_INTNO); } @@ -200,7 +200,7 @@ __KNL__ void cpu_standby_mode_enter(void) #endif /* TOS_CFG_PWR_MGR_EN */ uint32_t g_context_switch_reqflg; - +uint32_t g_exc_nest_count; extern void start_r(void); #if ARC_FEATURE_STACK_CHECK diff --git a/board/ARC_NSIM_EM/hello_world/.project b/board/ARC_NSIM_EM/hello_world/.project deleted file mode 100644 index 4ab3d89a..00000000 --- a/board/ARC_NSIM_EM/hello_world/.project +++ /dev/null @@ -1,84 +0,0 @@ - - - blinky - - - - - - org.eclipse.cdt.managedbuilder.core.genmakebuilder - clean,full,incremental, - - - - - org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder - full,incremental, - - - - - - org.eclipse.cdt.core.cnature - org.eclipse.cdt.managedbuilder.core.managedBuildNature - org.eclipse.cdt.managedbuilder.core.ScannerConfigNature - - - - Makefile - 1 - C:/Users/jingru/Documents/git/embarc/TencentOS-tiny/board/ARC_NSIM_EM/GCC/hello_world/Makefile - - - tencentos - 2 - virtual:/virtual - - - tencentos/arch - 2 - C:/Users/jingru/Documents/git/embarc/TencentOS-tiny/arch - - - tencentos/board - 2 - C:/Users/jingru/Documents/git/embarc/TencentOS-tiny/board - - - tencentos/components - 2 - C:/Users/jingru/Documents/git/embarc/TencentOS-tiny/components - - - tencentos/devices - 2 - C:/Users/jingru/Documents/git/embarc/TencentOS-tiny/devices - - - tencentos/kernel - 2 - C:/Users/jingru/Documents/git/embarc/TencentOS-tiny/kernel - - - tencentos/net - 2 - C:/Users/jingru/Documents/git/embarc/TencentOS-tiny/net - - - tencentos/osal - 2 - C:/Users/jingru/Documents/git/embarc/TencentOS-tiny/osal - - - tencentos/platform - 2 - C:/Users/jingru/Documents/git/embarc/TencentOS-tiny/platform - - - - - TencentOS_ROOT - file:/C:/Users/jingru/Documents/git/tencentos/TencentOS-tiny - - - diff --git a/board/ARC_NSIM_EM/hello_world/Makefile b/board/ARC_NSIM_EM/hello_world/Makefile index f66ee1f0..1fc9980e 100644 --- a/board/ARC_NSIM_EM/hello_world/Makefile +++ b/board/ARC_NSIM_EM/hello_world/Makefile @@ -235,13 +235,7 @@ vpath %.S $(sort $(dir $(ASM_SOURCES_S))) # EMBARC_PREBUILT_LIBRARY = -Hldopt=-Bgrouplib EMBARC_PREBUILT_LIBRARY = $(EMBARC_OUT_DIR)/libembarc.a -# EMBARC_PREBUILT_LIBRARY += $(EMBARC_OUT_DIR)/board/board.o -# EMBARC_PREBUILT_LIBRARY += $(EMBARC_OUT_DIR)/arc/startup/arc_startup.o -# EMBARC_PREBUILT_LIBRARY += $(EMBARC_OUT_DIR)/arc/startup/arc_cxx_support.o -# EMBARC_PREBUILT_LIBRARY += $(EMBARC_OUT_DIR)/libboard_nsim.a -# EMBARC_PREBUILT_LIBRARY += $(EMBARC_OUT_DIR)/libcpuarc.a -# EMBARC_PREBUILT_LIBRARY += $(EMBARC_OUT_DIR)/libembarc_libc.a -# EMBARC_PREBUILT_LIBRARY += $(EMBARC_OUT_DIR)/libembarc_console.a + build_embarc_lib: | $(BUILD_DIR) make -f $(EMBARC_BSP_ROOT)/options/options.mk V=1 embarc_lib diff --git a/board/ARC_NSIM_EM/hello_world/mw.log b/board/ARC_NSIM_EM/hello_world/mw.log deleted file mode 100644 index 6a3d4eaf19ae82d904c694bbde69241b23bfa146..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 89000 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 Y1u|8xS90!HfyRL?fype~OWW@M2fADqL;wH)