仅保留自己当前芯片内核的代码

This commit is contained in:
Stone 2016-07-02 08:09:27 +00:00
parent dee50c83de
commit 2d0e4def19
1 changed files with 0 additions and 58 deletions

View File

@ -1,29 +1,22 @@
#include "Sys.h"
#include "Interrupt.h"
//#include "SerialPort.h"
#include "..\stm32.h"
#define IS_IRQ(irq) (irq >= -16 && irq <= VectorySize - 16)
//#include "..\CMSIS\Interrupt.cpp"
void TInterrupt::OnInit() const
{
// 禁用所有中断
NVIC->ICER[0] = 0xFFFFFFFF;
#if defined(STM32F1) || defined(STM32F4)
NVIC->ICER[1] = 0xFFFFFFFF;
NVIC->ICER[2] = 0xFFFFFFFF;
#endif // defined(STM32F1) || defined(STM32F4)
// 清除所有中断位
NVIC->ICPR[0] = 0xFFFFFFFF;
#if defined(STM32F1) || defined(STM32F4)
NVIC->ICPR[1] = 0xFFFFFFFF;
NVIC->ICPR[2] = 0xFFFFFFFF;
#endif // defined(STM32F1) || defined(STM32F4)
#if defined(BOOT) || defined(APP)
StrBoot.pUserHandler = RealHandler;;
@ -33,43 +26,10 @@ void TInterrupt::OnInit() const
GlobalEnable();
#endif
#ifdef STM32F4
/*SCB->AIRCR = (0x5FA << SCB_AIRCR_VECTKEY_Pos) // 解锁
| (7 << SCB_AIRCR_PRIGROUP_Pos); // 没有优先组位*/
// 中断优先级分配方案4四位都是抢占优先级。其实上面的寄存器操作就是设置优先级方案为0
NVIC_PriorityGroupConfig(NVIC_PriorityGroup_4);
// 打开系统异常,否则这些异常都会跑到硬件中断里面
SCB->SHCSR |= SCB_SHCSR_USGFAULTENA_Msk
| SCB_SHCSR_BUSFAULTENA_Msk
| SCB_SHCSR_MEMFAULTENA_Msk;
#endif // STM32F4
#ifdef STM32F1
/*SCB->AIRCR = (0x5FA << SCB_AIRCR_VECTKEY_Pos) // 解锁
| (7 << SCB_AIRCR_PRIGROUP_Pos); // 没有优先组位*/
// 中断优先级分配方案4四位都是抢占优先级。其实上面的寄存器操作就是设置优先级方案为0
NVIC_PriorityGroupConfig(NVIC_PriorityGroup_4);
// 打开系统异常,否则这些异常都会跑到硬件中断里面
SCB->SHCSR |= SCB_SHCSR_USGFAULTENA
| SCB_SHCSR_BUSFAULTENA
| SCB_SHCSR_MEMFAULTENA;
#endif // STM32F1
// 初始化EXTI中断线为默认值
EXTI_DeInit();
}
#ifdef STM32F1
uint TInterrupt::EncodePriority (uint priorityGroup, uint preemptPriority, uint subPriority) const
{
return NVIC_EncodePriority(priorityGroup, preemptPriority, subPriority);
}
void TInterrupt::DecodePriority (uint priority, uint priorityGroup, uint* pPreemptPriority, uint* pSubPriority) const
{
NVIC_DecodePriority(priority, priorityGroup, (uint32_t*)pPreemptPriority, (uint32_t*)pSubPriority);
}
#endif
#if !defined(TINY)
#if defined(STM32F0)
#pragma arm section code = "SectionForSys"
@ -83,20 +43,11 @@ extern "C"
*/
void FAULT_SubHandler(uint* registers, uint exception)
{
#ifdef STM32F0
debug_printf("LR=0x%08x PC=0x%08x PSR=0x%08x\r\n", registers[5], registers[6], registers[7]);
for(int i=0; i<=7; i++)
{
debug_printf("R%d=0x%08x\r\n", i, registers[i]);
}
debug_printf("R12=0x%08x\r\n", registers[4]);
#else
debug_printf("LR=0x%08x PC=0x%08x PSR=0x%08x SP=0x%08x\r\n", registers[13], registers[14], registers[15], registers[16]);
for(int i=0; i<=12; i++)
{
debug_printf("R%d=0x%08x\r\n", i, registers[i]);
}
#endif
TInterrupt::Halt();
}
@ -116,13 +67,8 @@ extern "C"
//SP+24: PC
//SP+28: PSR
//R0-R12 are not overwritten yet
#if defined(STM32F0) || defined(GD32F150)
//add sp,sp,#16 // remove R0-R3
push {r4-r7} // store R0-R11
#else
add sp,sp,#16 // remove R0-R3
push {r0-r11} // store R0-R11
#endif
mov r0,sp
//R0+00: R0-R12
//R0+52: LR
@ -136,12 +82,8 @@ extern "C"
void FaultHandler()
{
__asm volatile (
#if defined(STM32F0) || defined(GD32F150)
"push {r4-r7} \n\t"
#else
"add sp,sp,#16 \n\t"
"push {r0-r11} \n\t"
#endif
"mov r0,sp \n\t"
"mrs r1,IPSR \n\t"
"b FAULT_SubHandler \n\t");