libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #693 from AubrCool/fix-can.irq.enter.exit.irq 

[BSP] Fix can.irq.enter.exit.irq
This commit is contained in:
Bernard Xiong 2017-01-18 16:46:00 +08:00 committed by GitHub
parent 475a3b8b85 d671e7546c
commit ea8a622aaf
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bsp/lpc408x/drivers/drv_lpccan.c
View File

@ -825,6 +825,7 @@ static struct rt_can_device lpccan2;
void CAN_IRQHandler(void) void CAN_IRQHandler(void)
{ {
rt_uint32_t IntStatus; rt_uint32_t IntStatus;
rt_interrupt_enter();
#ifdef RT_USING_LPCCAN1 #ifdef RT_USING_LPCCAN1
IntStatus = CAN_IntGetStatus(CAN_1); IntStatus = CAN_IntGetStatus(CAN_1);
//check receive interrupt //check receive interrupt
@ -1036,6 +1037,7 @@ void CAN_IRQHandler(void)
} }
} }
#endif /*RT_USING_LPCCAN2*/ #endif /*RT_USING_LPCCAN2*/
rt_interrupt_leave();
} }
int lpc_can_init(void) int lpc_can_init(void)

16
bsp/stm32f10x/drivers/bxcan.c
View File

@ -1347,6 +1347,7 @@ static struct stm_bxcan bxcan1data =
struct rt_can_device bxcan1; struct rt_can_device bxcan1;
void CAN1_RX0_IRQHandler(void) void CAN1_RX0_IRQHandler(void)
{ {
rt_interrupt_enter();
if (CAN1->RF0R & 0x03) if (CAN1->RF0R & 0x03)
{ {
if ((CAN1->RF0R & CAN_RF0R_FOVR0) != 0) if ((CAN1->RF0R & CAN_RF0R_FOVR0) != 0)
@ -1360,9 +1361,11 @@ void CAN1_RX0_IRQHandler(void)
} }
CAN1->RF0R |= CAN_RF0R_RFOM0; CAN1->RF0R |= CAN_RF0R_RFOM0;
} }
rt_interrupt_leave();
} }
void CAN1_RX1_IRQHandler(void) void CAN1_RX1_IRQHandler(void)
{ {
rt_interrupt_enter();
if (CAN1->RF1R & 0x03) if (CAN1->RF1R & 0x03)
{ {
if ((CAN1->RF1R & CAN_RF1R_FOVR1) != 0) if ((CAN1->RF1R & CAN_RF1R_FOVR1) != 0)
@ -1376,10 +1379,12 @@ void CAN1_RX1_IRQHandler(void)
} }
CAN1->RF1R |= CAN_RF1R_RFOM1; CAN1->RF1R |= CAN_RF1R_RFOM1;
} }
rt_interrupt_leave();
} }
void CAN1_TX_IRQHandler(void) void CAN1_TX_IRQHandler(void)
{ {
rt_uint32_t state; rt_uint32_t state;
rt_interrupt_enter();
if (CAN1->TSR & (CAN_TSR_RQCP0)) if (CAN1->TSR & (CAN_TSR_RQCP0))
{ {
state = CAN1->TSR & (CAN_TSR_RQCP0 | CAN_TSR_TXOK0 | CAN_TSR_TME0); state = CAN1->TSR & (CAN_TSR_RQCP0 | CAN_TSR_TXOK0 | CAN_TSR_TME0);
@ -1419,11 +1424,13 @@ void CAN1_TX_IRQHandler(void)
rt_hw_can_isr(&bxcan1, RT_CAN_EVENT_TX_FAIL | 2 << 8); rt_hw_can_isr(&bxcan1, RT_CAN_EVENT_TX_FAIL | 2 << 8);
} }
} }
rt_interrupt_leave();
} }
void CAN1_SCE_IRQHandler(void) void CAN1_SCE_IRQHandler(void)
{ {
rt_uint32_t errtype; rt_uint32_t errtype;
errtype = CAN1->ESR; errtype = CAN1->ESR;
rt_interrupt_enter();
if (errtype & 0x70 && bxcan1.status.lasterrtype == (errtype & 0x70)) if (errtype & 0x70 && bxcan1.status.lasterrtype == (errtype & 0x70))
{ {
switch ((errtype & 0x70) >> 4) switch ((errtype & 0x70) >> 4)
@ -1452,6 +1459,7 @@ void CAN1_SCE_IRQHandler(void)
bxcan1.status.snderrcnt = (errtype >> 16 & 0xFF); bxcan1.status.snderrcnt = (errtype >> 16 & 0xFF);
bxcan1.status.errcode = errtype & 0x07; bxcan1.status.errcode = errtype & 0x07;
CAN1->MSR |= CAN_MSR_ERRI; CAN1->MSR |= CAN_MSR_ERRI;
rt_interrupt_leave();
} }
#endif /*USING_BXCAN1*/ #endif /*USING_BXCAN1*/
@ -1489,6 +1497,7 @@ static struct stm_bxcan bxcan2data =
struct rt_can_device bxcan2; struct rt_can_device bxcan2;
void CAN2_RX0_IRQHandler(void) void CAN2_RX0_IRQHandler(void)
{ {
rt_interrupt_enter();
if (CAN2->RF0R & 0x03) if (CAN2->RF0R & 0x03)
{ {
if ((CAN2->RF0R & CAN_RF0R_FOVR0) != 0) if ((CAN2->RF0R & CAN_RF0R_FOVR0) != 0)
@ -1502,9 +1511,11 @@ void CAN2_RX0_IRQHandler(void)
} }
CAN2->RF0R |= CAN_RF0R_RFOM0; CAN2->RF0R |= CAN_RF0R_RFOM0;
} }
rt_interrupt_leave();
} }
void CAN2_RX1_IRQHandler(void) void CAN2_RX1_IRQHandler(void)
{ {
rt_interrupt_enter();
if (CAN2->RF1R & 0x03) if (CAN2->RF1R & 0x03)
{ {
if ((CAN2->RF1R & CAN_RF1R_FOVR1) != 0) if ((CAN2->RF1R & CAN_RF1R_FOVR1) != 0)
@ -1518,10 +1529,12 @@ void CAN2_RX1_IRQHandler(void)
} }
CAN2->RF1R |= CAN_RF1R_RFOM1; CAN2->RF1R |= CAN_RF1R_RFOM1;
} }
rt_interrupt_leave();
} }
void CAN2_TX_IRQHandler(void) void CAN2_TX_IRQHandler(void)
{ {
rt_uint32_t state; rt_uint32_t state;
rt_interrupt_enter();
if (CAN2->TSR & (CAN_TSR_RQCP0)) if (CAN2->TSR & (CAN_TSR_RQCP0))
{ {
state = CAN2->TSR & (CAN_TSR_RQCP0 | CAN_TSR_TXOK0 | CAN_TSR_TME0); state = CAN2->TSR & (CAN_TSR_RQCP0 | CAN_TSR_TXOK0 | CAN_TSR_TME0);
@ -1561,11 +1574,13 @@ void CAN2_TX_IRQHandler(void)
rt_hw_can_isr(&bxcan2, RT_CAN_EVENT_TX_FAIL | 2 << 8); rt_hw_can_isr(&bxcan2, RT_CAN_EVENT_TX_FAIL | 2 << 8);
} }
} }
rt_interrupt_leave();
} }
void CAN2_SCE_IRQHandler(void) void CAN2_SCE_IRQHandler(void)
{ {
rt_uint32_t errtype; rt_uint32_t errtype;
errtype = CAN2->ESR; errtype = CAN2->ESR;
rt_interrupt_enter();
if (errtype & 0x70 && bxcan2.status.lasterrtype == (errtype & 0x70)) if (errtype & 0x70 && bxcan2.status.lasterrtype == (errtype & 0x70))
{ {
switch ((errtype & 0x70) >> 4) switch ((errtype & 0x70) >> 4)
@ -1594,6 +1609,7 @@ void CAN2_SCE_IRQHandler(void)
bxcan2.status.snderrcnt = (errtype >> 16 & 0xFF); bxcan2.status.snderrcnt = (errtype >> 16 & 0xFF);
bxcan2.status.errcode = errtype & 0x07; bxcan2.status.errcode = errtype & 0x07;
CAN2->MSR |= CAN_MSR_ERRI; CAN2->MSR |= CAN_MSR_ERRI;
rt_interrupt_leave();
} }
#endif /*USING_BXCAN2*/ #endif /*USING_BXCAN2*/