Skip to content

Commit da8fd8b

Browse files
committed
remove dead code in can_api.c of NUC472 & M453
1 parent 33cfe1f commit da8fd8b

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

targets/TARGET_NUVOTON/TARGET_M451/can_api.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,6 @@ static void can_irq(CANName name, int id)
130130
}
131131
} else if (u8IIDRstatus!=0) {
132132

133-
//CAN_MsgInterrupt(can, u8IIDRstatus);
134-
135133
can0_irq_handler(can_irq_ids[id], IRQ_OVERRUN);
136134

137135
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)
168166

169167
CAN_EnterInitMode((CAN_T*)obj->can, ((enable != 0 )? CAN_CON_IE_Msk :0) );
170168

171-
// ((CAN_T *)(obj->can))->CON = (((CAN_T *)(obj->can))->CON ) | ((enable != 0 )? CAN_CON_IE_Msk :0);
172169

173170
switch (irq)
174171
{
175172
case IRQ_ERROR:
176-
//case IRQ_PASSIVE:
177-
//case IRQ_ARB:
173+
case IRQ_BUS:
174+
case IRQ_PASSIVE:
178175
((CAN_T *)(obj->can))->CON = (((CAN_T *)(obj->can))->CON) |CAN_CON_EIE_Msk;
176+
((CAN_T *)(obj->can))->CON = (((CAN_T *)(obj->can))->CON) |CAN_CON_SIE_Msk;
179177
break;
180178

181179
case IRQ_RX:
182180
case IRQ_TX:
183-
case IRQ_BUS:
184181
case IRQ_OVERRUN:
185182
case IRQ_WAKEUP:
186183
((CAN_T *)(obj->can))->CON = (((CAN_T *)(obj->can))->CON) |CAN_CON_SIE_Msk;

targets/TARGET_NUVOTON/TARGET_NUC472/can_api.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ static void can_irq(CANName name, int id)
149149
}
150150
} else if (u8IIDRstatus!=0) {
151151

152-
//CAN_MsgInterrupt(can, u8IIDRstatus);
153152
if(id)
154153
can1_irq_handler(can_irq_ids[id] , IRQ_OVERRUN);
155154
else
@@ -211,14 +210,14 @@ void can_irq_set(can_t *obj, CanIrqType irq, uint32_t enable)
211210
switch (irq)
212211
{
213212
case IRQ_ERROR:
214-
//case IRQ_PASSIVE:
215-
//case IRQ_ARB:
213+
case IRQ_BUS:
214+
case IRQ_PASSIVE:
216215
((CAN_T *)(obj->can))->CON = (((CAN_T *)(obj->can))->CON) |CAN_CON_EIE_Msk;
216+
((CAN_T *)(obj->can))->CON = (((CAN_T *)(obj->can))->CON) |CAN_CON_SIE_Msk;
217217
break;
218218

219219
case IRQ_RX:
220220
case IRQ_TX:
221-
case IRQ_BUS:
222221
case IRQ_OVERRUN:
223222
case IRQ_WAKEUP:
224223
((CAN_T *)(obj->can))->CON = (((CAN_T *)(obj->can))->CON) |CAN_CON_SIE_Msk;

0 commit comments

Comments
 (0)