mmr/can
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

Remove pointer

Browse Source
This commit is contained in:
Stefano Calabretti
2022-02-23 18:53:57 +01:00
parent 86475b1153
commit a0e9e902eb
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Inc/mmr_can_header.h
+2 -2
View File
@@ -79,7 +79,7 @@ MmrCanHeader MMR_CAN_HeaderFromBits(uint32_t bits);
* Tells wether the given header represents an SCS. * Tells wether the given header represents an SCS.
*/ */
bool MMR_CAN_IsHeaderScs(MmrCanHeader header); bool MMR_CAN_IsHeaderScs(MmrCanHeader header);
bool MMR_CAN_IsMultiFrame(MmrCanHeader *header); bool MMR_CAN_IsMultiFrame(MmrCanHeader header);
bool MMR_CAN_IsMultiFrameEnd(MmrCanHeader *header); bool MMR_CAN_IsMultiFrameEnd(MmrCanHeader header);
#endif /* INC_MMR_CAN_HEADER_H_ */ #endif /* INC_MMR_CAN_HEADER_H_ */
Src/mmr_can_header.c
+4 -4
View File
@@ -26,10 +26,10 @@ bool MMR_CAN_IsHeaderScs(MmrCanHeader header) {
return header.messageType == MMR_CAN_MESSAGE_TYPE_SCS; return header.messageType == MMR_CAN_MESSAGE_TYPE_SCS;
} }
bool MMR_CAN_IsMultiFrame(MmrCanHeader *header) { bool MMR_CAN_IsMultiFrame(MmrCanHeader header) {
return header->messageType == MMR_CAN_MESSAGE_TYPE_MULTI_FRAME; return header.messageType == MMR_CAN_MESSAGE_TYPE_MULTI_FRAME;
} }
bool MMR_CAN_IsMultiFrameEnd(MmrCanHeader *header) { bool MMR_CAN_IsMultiFrameEnd(MmrCanHeader header) {
return header->messageType == MMR_CAN_MESSAGE_TYPE_MULTI_FRAME_END; return header.messageType == MMR_CAN_MESSAGE_TYPE_MULTI_FRAME_END;
} }
Src/mmr_can_receive.c
+4 -4
View File
@@ -41,7 +41,7 @@ HalStatus MMR_CAN_Receive(CanHandle *hcan, MmrCanMessage *result) {
} }
result->header = rp.headers.mmr; result->header = rp.headers.mmr;
if (MMR_CAN_IsMultiFrame(&rp.headers.mmr)) { if (MMR_CAN_IsMultiFrame(rp.headers.mmr)) {
status |= receiveAll(&rp); status |= receiveAll(&rp);
} }
@@ -57,7 +57,7 @@ static HalStatus receiveAll(ReceptionParams *rp) {
status |= receiveOne(rp); status |= receiveOne(rp);
} }
while ( while (
headerIsMultiFrame(&rp->headers.mmr, targetId) && status == HAL_OK headerIsMultiFrame(rp->headers.mmr, targetId) && status == HAL_OK
); );
return status; return status;
@@ -77,9 +77,9 @@ static HalStatus receiveOne(ReceptionParams *rp) {
} }
static always_inline bool headerIsMultiFrame(MmrCanHeader *header, CanId targetId) { static always_inline bool headerIsMultiFrame(MmrCanHeader header, CanId targetId) {
return return
MMR_CAN_IsMultiFrame(header) && MMR_CAN_IsMultiFrame(header) &&
!MMR_CAN_IsMultiFrameEnd(header) && !MMR_CAN_IsMultiFrameEnd(header) &&
header->senderId == targetId; header.senderId == targetId;
} }