Merge pull request #63 from jorisa/master

bogdanm · bogdanm · commit 171dda705c94 · 2013-09-10T03:22:55.000-07:00
Fix hardfault when attaching callback to CAN2 when CAN1 is not defined
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/can_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/can_api.c
@@ -164,7 +164,7 @@ void can_irq_set(can_t *obj, CanIrqType type, uint32_t enable) {
     obj->dev->MOD &= ~(1);
     
     // Enable NVIC if at least 1 interrupt is active
-    if(LPC_CAN1->IER | LPC_CAN2->IER) {
+    if(((LPC_SC->PCONP & (1 << 13)) && LPC_CAN1->IER) || ((LPC_SC->PCONP & (1 << 14)) && LPC_CAN2->IER)) {
         NVIC_SetVector(CAN_IRQn, (uint32_t) &can_irq_n);
         NVIC_EnableIRQ(CAN_IRQn);
     }

Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ void can_irq_set(can_t *obj, CanIrqType type, uint32_t enable) {`
`164`	`164`	`obj->dev->MOD &= ~(1);`
`165`	`165`
`166`	`166`	`// Enable NVIC if at least 1 interrupt is active`
`167`		`- if(LPC_CAN1->IER \| LPC_CAN2->IER) {`
	`167`	`+ if(((LPC_SC->PCONP & (1 << 13)) && LPC_CAN1->IER) \|\| ((LPC_SC->PCONP & (1 << 14)) && LPC_CAN2->IER)) {`
`168`	`168`	`NVIC_SetVector(CAN_IRQn, (uint32_t) &can_irq_n);`
`169`	`169`	`NVIC_EnableIRQ(CAN_IRQn);`
`170`	`170`	`}`