From 87598c7b43e41f9550da361e37085c5d1ad150f8 Mon Sep 17 00:00:00 2001
From: Huang bo <hb265419@126.com>
Date: Wed, 17 Nov 2021 18:44:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bsp/ti-tms320c6678/applications/board.c | 4 ++--
 bsp/ti-tms320c6678/driver/drv_timer.c   | 4 ++--
 bsp/ti-tms320c6678/driver/drv_timer.h   | 4 ++--
 libcpu/ti-dsp/c6x/c66xx.h               | 7 -------
 libcpu/ti-dsp/c6x/context.asm           | 2 +-
 5 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/bsp/ti-tms320c6678/applications/board.c b/bsp/ti-tms320c6678/applications/board.c
index 0a96a82ff8..b6a4105599 100644
--- a/bsp/ti-tms320c6678/applications/board.c
+++ b/bsp/ti-tms320c6678/applications/board.c
@@ -27,11 +27,11 @@ void rt_hw_board_init(void)
 	rt_hw_interrupt_init();
 
 	// initial system timer
-    hw_system_timer_init();
+    rt_hw_system_timer_init();
 
     /* initialize memory system */
     rt_kprintf("heap: 0x%08x - 0x%08x\n", RT_HW_HEAP_BEGIN, RT_HW_HEAP_END);
     rt_system_heap_init(RT_HW_HEAP_BEGIN, RT_HW_HEAP_END);
 
-    hw_system_timer_start();
+    rt_hw_system_timer_start();
 }
diff --git a/bsp/ti-tms320c6678/driver/drv_timer.c b/bsp/ti-tms320c6678/driver/drv_timer.c
index 163d802aca..330e04dcde 100644
--- a/bsp/ti-tms320c6678/driver/drv_timer.c
+++ b/bsp/ti-tms320c6678/driver/drv_timer.c
@@ -32,7 +32,7 @@ void rt_hw_systick_isr(void)
 /**
  * The function initial system timer interrupt.
  */
-void hw_system_timer_init(void)
+void rt_hw_system_timer_init(void)
 {
 	// initial system timer interrupt, map local timer interrupt to INT14
     gpCGEM_regs->INTMUX3 = (CSL_GEM_TINTLN<<CSL_CGEM_INTMUX3_INTSEL14_SHIFT);
@@ -47,7 +47,7 @@ void hw_system_timer_init(void)
  * Use local timer (==DNUM of a core) to generate a clock on TIMO0,interrupts are generated as well
  *
  */
-void hw_system_timer_start(void)
+void rt_hw_system_timer_start(void)
 {
     Timer64_Config tmrCfg;
 
diff --git a/bsp/ti-tms320c6678/driver/drv_timer.h b/bsp/ti-tms320c6678/driver/drv_timer.h
index 36361906d1..f30dd940da 100644
--- a/bsp/ti-tms320c6678/driver/drv_timer.h
+++ b/bsp/ti-tms320c6678/driver/drv_timer.h
@@ -11,9 +11,9 @@
 #ifndef __SYS_TIMER_H__
 #define __SYS_TIMER_H__
 
-void hw_system_timer_init(void);
+void rt_hw_system_timer_init(void);
 
-void hw_system_timer_start(void);
+void rt_hw_system_timer_start(void);
 
 #endif	/* __SYS_TIMER_H__ */
 
diff --git a/libcpu/ti-dsp/c6x/c66xx.h b/libcpu/ti-dsp/c6x/c66xx.h
index 4d00ece2bf..a8b08438ee 100644
--- a/libcpu/ti-dsp/c6x/c66xx.h
+++ b/libcpu/ti-dsp/c6x/c66xx.h
@@ -19,13 +19,6 @@
 #define REG_PAIR(odd, even) unsigned long even; unsigned long odd
 #endif
 
-/*
- * this struct defines the way the registers are stored on the
- * stack during a system call. fields defined with REG_PAIR
- * are saved and restored using double-word memory operations
- * which means the word ordering of the pair depends on endianess.
- */
-
 struct rt_hw_register
 {
 	REG_PAIR(b17, b16);
diff --git a/libcpu/ti-dsp/c6x/context.asm b/libcpu/ti-dsp/c6x/context.asm
index 3f317583a4..2bbe0477f5 100644
--- a/libcpu/ti-dsp/c6x/context.asm
+++ b/libcpu/ti-dsp/c6x/context.asm
@@ -45,7 +45,7 @@ rt_hw_enable_exception:
 	DINT
 	MVC	.S2	TSR,B0
 	MVC	.S2	B3,NRP
-	MVK	.L2	0xc,B1
+	MVK	.L2	0xC,B1
 	OR	.D2	B0,B1,B0
 	MVC	.S2	B0,TSR			;  Set GEE and XEN in TSR
 	B	.S2	NRP