ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add can_t->index to struct and set it during can_init

pull/20/head
Joris Aerts 2013-07-30 15:17:40 -07:00
parent a9f0d9a3f7
commit 51bfe267f4
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/can_api.c
View File

@ -22,6 +22,8 @@
#include <math.h> #include <math.h>
#include <string.h> #include <string.h>
#define CAN_NUM 2
/* Acceptance filter mode in AFMR register */ /* Acceptance filter mode in AFMR register */
#define ACCF_OFF 0x01 #define ACCF_OFF 0x01
#define ACCF_BYPASS 0x02 #define ACCF_BYPASS 0x02
@ -166,7 +168,12 @@ void can_init(can_t *obj, PinName rd, PinName td) {
pinmap_pinout(rd, PinMap_CAN_RD); pinmap_pinout(rd, PinMap_CAN_RD);
pinmap_pinout(td, PinMap_CAN_TD); pinmap_pinout(td, PinMap_CAN_TD);
switch ((int)obj->dev) {
case CAN_1: obj->index = 0; break;
case CAN_2: obj->index = 1; break;
}
can_reset(obj); can_reset(obj);
obj->dev->IER = 0; // Disable Interrupts obj->dev->IER = 0; // Disable Interrupts
can_frequency(obj, 100000); can_frequency(obj, 100000);

1
libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/objects.h
View File

@ -59,6 +59,7 @@ struct dac_s {
struct can_s { struct can_s {
LPC_CAN_TypeDef *dev; LPC_CAN_TypeDef *dev;
int index;
}; };
struct i2c_s { struct i2c_s {