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

Merge pull request #3492 from Nodraak/fix/3463/can_read_return_value 

Fix #3463 CAN read() return value
pull/3547/head
Sam Grove 2017-01-09 10:17:27 -06:00 committed by GitHub
parent ddcd3ad711 885b018f77
commit cefae22703
7 changed files with 56 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
targets/TARGET_STM/TARGET_STM32F0/can_api.c
View File

@ -235,6 +235,12 @@ int can_read(can_t *obj, CAN_Message *msg, int handle)
CAN_TypeDef *can = (CAN_TypeDef *)(obj->can);
// check FPM0 which holds the pending message count in FIFO 0
// if no message is pending, return 0
if ((can->RF0R & CAN_RF0R_FMP0) == 0) {
return 0;
}
/* Get the Id */
msg->format = (CANFormat)((uint8_t)0x04 & can->sFIFOMailBox[handle].RIR);
if (!msg->format) {
@ -261,10 +267,10 @@ int can_read(can_t *obj, CAN_Message *msg, int handle)
/* Release the FIFO */
if (handle == CAN_FIFO0) {
/* Release FIFO0 */
can->RF0R = CAN_RF0R_RFOM0;
can->RF0R |= CAN_RF0R_RFOM0;
} else { /* FIFONumber == CAN_FIFO1 */
/* Release FIFO1 */
can->RF1R = CAN_RF1R_RFOM1;
can->RF1R |= CAN_RF1R_RFOM1;
}
return 1;

10
targets/TARGET_STM/TARGET_STM32F1/can_api.c
View File

@ -238,6 +238,12 @@ int can_read(can_t *obj, CAN_Message *msg, int handle)
CAN_TypeDef *can = (CAN_TypeDef *)(obj->can);
// check FPM0 which holds the pending message count in FIFO 0
// if no message is pending, return 0
if ((can->RF0R & CAN_RF0R_FMP0) == 0) {
return 0;
}
/* Get the Id */
msg->format = (CANFormat)((uint8_t)0x04 & can->sFIFOMailBox[handle].RIR);
if (!msg->format) {
@ -264,10 +270,10 @@ int can_read(can_t *obj, CAN_Message *msg, int handle)
/* Release the FIFO */
if(handle == CAN_FIFO0) {
/* Release FIFO0 */
can->RF0R = CAN_RF0R_RFOM0;
can->RF0R |= CAN_RF0R_RFOM0;
} else { /* FIFONumber == CAN_FIFO1 */
/* Release FIFO1 */
can->RF1R = CAN_RF1R_RFOM1;
can->RF1R |= CAN_RF1R_RFOM1;
}
return 1;

10
targets/TARGET_STM/TARGET_STM32F2/can_api.c
View File

@ -248,6 +248,12 @@ int can_read(can_t *obj, CAN_Message *msg, int handle)
CAN_TypeDef *can = (CAN_TypeDef *)(obj->can);
// check FPM0 which holds the pending message count in FIFO 0
// if no message is pending, return 0
if ((can->RF0R & CAN_RF0R_FMP0) == 0) {
return 0;
}
/* Get the Id */
msg->format = (CANFormat)((uint8_t)0x04 & can->sFIFOMailBox[handle].RIR);
if (!msg->format) {
@ -274,10 +280,10 @@ int can_read(can_t *obj, CAN_Message *msg, int handle)
/* Release the FIFO */
if (handle == CAN_FIFO0) {
/* Release FIFO0 */
can->RF0R = CAN_RF0R_RFOM0;
can->RF0R |= CAN_RF0R_RFOM0;
} else { /* FIFONumber == CAN_FIFO1 */
/* Release FIFO1 */
can->RF1R = CAN_RF1R_RFOM1;
can->RF1R |= CAN_RF1R_RFOM1;
}
return 1;

10
targets/TARGET_STM/TARGET_STM32F3/can_api.c
View File

@ -238,6 +238,12 @@ int can_read(can_t *obj, CAN_Message *msg, int handle)
CAN_TypeDef *can = (CAN_TypeDef *)(obj->can);
// check FPM0 which holds the pending message count in FIFO 0
// if no message is pending, return 0
if ((can->RF0R & CAN_RF0R_FMP0) == 0) {
return 0;
}
/* Get the Id */
msg->format = (CANFormat)((uint8_t)0x04 & can->sFIFOMailBox[handle].RIR);
if (!msg->format) {
@ -264,10 +270,10 @@ int can_read(can_t *obj, CAN_Message *msg, int handle)
/* Release the FIFO */
if(handle == CAN_FIFO0) {
/* Release FIFO0 */
can->RF0R = CAN_RF0R_RFOM0;
can->RF0R |= CAN_RF0R_RFOM0;
} else { /* FIFONumber == CAN_FIFO1 */
/* Release FIFO1 */
can->RF1R = CAN_RF1R_RFOM1;
can->RF1R |= CAN_RF1R_RFOM1;
}
return 1;

10
targets/TARGET_STM/TARGET_STM32F4/can_api.c
View File

@ -251,6 +251,12 @@ int can_read(can_t *obj, CAN_Message *msg, int handle)
CAN_TypeDef *can = (CAN_TypeDef *)(obj->can);
// check FPM0 which holds the pending message count in FIFO 0
// if no message is pending, return 0
if ((can->RF0R & CAN_RF0R_FMP0) == 0) {
return 0;
}
/* Get the Id */
msg->format = (CANFormat)((uint8_t)0x04 & can->sFIFOMailBox[handle].RIR);
if (!msg->format) {
@ -277,10 +283,10 @@ int can_read(can_t *obj, CAN_Message *msg, int handle)
/* Release the FIFO */
if(handle == CAN_FIFO0) {
/* Release FIFO0 */
can->RF0R = CAN_RF0R_RFOM0;
can->RF0R |= CAN_RF0R_RFOM0;
} else { /* FIFONumber == CAN_FIFO1 */
/* Release FIFO1 */
can->RF1R = CAN_RF1R_RFOM1;
can->RF1R |= CAN_RF1R_RFOM1;
}
return 1;

10
targets/TARGET_STM/TARGET_STM32F7/can_api.c
View File

@ -251,6 +251,12 @@ int can_read(can_t *obj, CAN_Message *msg, int handle)
CAN_TypeDef *can = (CAN_TypeDef *)(obj->can);
// check FPM0 which holds the pending message count in FIFO 0
// if no message is pending, return 0
if ((can->RF0R & CAN_RF0R_FMP0) == 0) {
return 0;
}
/* Get the Id */
msg->format = (CANFormat)((uint8_t)0x04 & can->sFIFOMailBox[handle].RIR);
if (!msg->format) {
@ -277,10 +283,10 @@ int can_read(can_t *obj, CAN_Message *msg, int handle)
/* Release the FIFO */
if(handle == CAN_FIFO0) {
/* Release FIFO0 */
can->RF0R = CAN_RF0R_RFOM0;
can->RF0R |= CAN_RF0R_RFOM0;
} else { /* FIFONumber == CAN_FIFO1 */
/* Release FIFO1 */
can->RF1R = CAN_RF1R_RFOM1;
can->RF1R |= CAN_RF1R_RFOM1;
}
return 1;

10
targets/TARGET_STM/TARGET_STM32L4/can_api.c
View File

@ -238,6 +238,12 @@ int can_read(can_t *obj, CAN_Message *msg, int handle)
CAN_TypeDef *can = (CAN_TypeDef *)(obj->can);
// check FPM0 which holds the pending message count in FIFO 0
// if no message is pending, return 0
if ((can->RF0R & CAN_RF0R_FMP0) == 0) {
return 0;
}
/* Get the Id */
msg->format = (CANFormat)((uint8_t)0x04 & can->sFIFOMailBox[handle].RIR);
if (!msg->format) {
@ -264,10 +270,10 @@ int can_read(can_t *obj, CAN_Message *msg, int handle)
/* Release the FIFO */
if(handle == CAN_FIFO0) {
/* Release FIFO0 */
can->RF0R = CAN_RF0R_RFOM0;
can->RF0R |= CAN_RF0R_RFOM0;
} else { /* FIFONumber == CAN_FIFO1 */
/* Release FIFO1 */
can->RF1R = CAN_RF1R_RFOM1;
can->RF1R |= CAN_RF1R_RFOM1;
}
return 1;