remove dead code in can_api.c of NUC472 & M453

pull/3104/head
cyliangtw 2016-11-01 11:29:09 +08:00
parent 33cfe1f599
commit da8fd8b5b7
2 changed files with 6 additions and 10 deletions

View File

@ -130,8 +130,6 @@ static void can_irq(CANName name, int id)
}
} else if (u8IIDRstatus!=0) {
//CAN_MsgInterrupt(can, u8IIDRstatus);
can0_irq_handler(can_irq_ids[id], IRQ_OVERRUN);
CAN_CLR_INT_PENDING_BIT(can, ((can->IIDR) -1)); /* Clear Interrupt Pending */
@ -168,19 +166,18 @@ void can_irq_set(can_t *obj, CanIrqType irq, uint32_t enable)
CAN_EnterInitMode((CAN_T*)obj->can, ((enable != 0 )? CAN_CON_IE_Msk :0) );
// ((CAN_T *)(obj->can))->CON = (((CAN_T *)(obj->can))->CON ) | ((enable != 0 )? CAN_CON_IE_Msk :0);
switch (irq)
{
case IRQ_ERROR:
//case IRQ_PASSIVE:
//case IRQ_ARB:
case IRQ_BUS:
case IRQ_PASSIVE:
((CAN_T *)(obj->can))->CON = (((CAN_T *)(obj->can))->CON) |CAN_CON_EIE_Msk;
((CAN_T *)(obj->can))->CON = (((CAN_T *)(obj->can))->CON) |CAN_CON_SIE_Msk;
break;
case IRQ_RX:
case IRQ_TX:
case IRQ_BUS:
case IRQ_OVERRUN:
case IRQ_WAKEUP:
((CAN_T *)(obj->can))->CON = (((CAN_T *)(obj->can))->CON) |CAN_CON_SIE_Msk;

View File

@ -149,7 +149,6 @@ static void can_irq(CANName name, int id)
}
} else if (u8IIDRstatus!=0) {
//CAN_MsgInterrupt(can, u8IIDRstatus);
if(id)
can1_irq_handler(can_irq_ids[id] , IRQ_OVERRUN);
else
@ -211,14 +210,14 @@ void can_irq_set(can_t *obj, CanIrqType irq, uint32_t enable)
switch (irq)
{
case IRQ_ERROR:
//case IRQ_PASSIVE:
//case IRQ_ARB:
case IRQ_BUS:
case IRQ_PASSIVE:
((CAN_T *)(obj->can))->CON = (((CAN_T *)(obj->can))->CON) |CAN_CON_EIE_Msk;
((CAN_T *)(obj->can))->CON = (((CAN_T *)(obj->can))->CON) |CAN_CON_SIE_Msk;
break;
case IRQ_RX:
case IRQ_TX:
case IRQ_BUS:
case IRQ_OVERRUN:
case IRQ_WAKEUP:
((CAN_T *)(obj->can))->CON = (((CAN_T *)(obj->can))->CON) |CAN_CON_SIE_Msk;