From dd53c8f4ccd360c23b860d98f95d9f659a7b090d Mon Sep 17 00:00:00 2001 From: Stefano Calabretti Date: Sun, 20 Feb 2022 12:49:00 +0100 Subject: [PATCH] Remove indents --- Src/mmr_can_header.c | 18 +++++++++--------- Src/mmr_can_receive.c | 9 +++++---- Src/mmr_can_scs_manager.c | 12 ++++++------ Src/mmr_can_send.c | 4 ++-- 4 files changed, 22 insertions(+), 21 deletions(-) diff --git a/Src/mmr_can_header.c b/Src/mmr_can_header.c index b47fc38..760f800 100644 --- a/Src/mmr_can_header.c +++ b/Src/mmr_can_header.c @@ -4,20 +4,20 @@ uint32_t MMR_CAN_HeaderToBits(MmrCanHeader header) { return 0 - | ((uint32_t)header.priority << 26) - | ((uint32_t)header.messageId << 23) - | ((uint32_t)header.senderId << 13) - | ((uint32_t)header.seqNumber << 3) - | ((uint32_t)header.messageType); + | ((uint32_t)header.priority << 26) + | ((uint32_t)header.messageId << 23) + | ((uint32_t)header.senderId << 13) + | ((uint32_t)header.seqNumber << 3) + | ((uint32_t)header.messageType); } MmrCanHeader MMR_CAN_HeaderFromBits(uint32_t bits) { return (MmrCanHeader) { - .priority = bits >> 26, + .priority = bits >> 26, .messageId = bits >> 23, - .senderId = bits >> 13, - .seqNumber = bits >> 3, - .messageType = bits, + .senderId = bits >> 13, + .seqNumber = bits >> 3, + .messageType = bits, }; } diff --git a/Src/mmr_can_receive.c b/Src/mmr_can_receive.c index a182662..7f774c8 100644 --- a/Src/mmr_can_receive.c +++ b/Src/mmr_can_receive.c @@ -55,7 +55,8 @@ static HalStatus receiveAll(ReceptionParams *rp) { do { rp->result += MMR_CAN_MAX_DATA_LENGTH; status |= receiveOne(rp); - } while ( + } + while ( headerIsMultiFrame(&rp->headers.mmr, targetId) && status == HAL_OK ); @@ -66,9 +67,9 @@ static HalStatus receiveAll(ReceptionParams *rp) { static HalStatus receiveOne(ReceptionParams *rp) { HalStatus status = HAL_CAN_GetRxMessage( rp->handle, - rp->fifo, - &rp->headers.rx, - rp->result + rp->fifo, + &rp->headers.rx, + rp->result ); rp->headers.mmr = MMR_CAN_HeaderFromBits(rp->headers.rx.ExtId); diff --git a/Src/mmr_can_scs_manager.c b/Src/mmr_can_scs_manager.c index 3f0970f..fd56bd5 100644 --- a/Src/mmr_can_scs_manager.c +++ b/Src/mmr_can_scs_manager.c @@ -47,11 +47,11 @@ HalStatus MMR_CAN_SendScs( .senderId = senderId, .messageId = scsId, .priority = MMR_CAN_MESSAGE_PRIORITY_HIGH, - .messageType = MMR_CAN_MESSAGE_TYPE_SCS, + .messageType = MMR_CAN_MESSAGE_TYPE_SCS, }; if (putEntry(header) == NULL) { - return HAL_ERROR; + return HAL_ERROR; } return sendScs(hcan, header); @@ -66,13 +66,13 @@ HalStatus MMR_CAN_HandleNextScs(CanHandle *hcan) { counter %= MMR_CAN_SCS_ENTRIES_COUNT; if (MMR_CAN_HeaderToBits(entry->header) == 0) { - return HAL_OK; + return HAL_OK; } switch (checkScs(entry)) { - case MMR_CAN_SCS_CHECK_ERROR: return HAL_ERROR; - case MMR_CAN_SCS_CHECK_OK: return HAL_OK; - default: break; + case MMR_CAN_SCS_CHECK_ERROR: return HAL_ERROR; + case MMR_CAN_SCS_CHECK_OK: return HAL_OK; + default: break; } entry->counter = getCurrentTime(); diff --git a/Src/mmr_can_send.c b/Src/mmr_can_send.c index f9a8b0f..5d00e7d 100644 --- a/Src/mmr_can_send.c +++ b/Src/mmr_can_send.c @@ -31,7 +31,7 @@ HalStatus MMR_CAN_Send(CanHandle *hcan, MmrCanPacket packet) { TransmissionParams tp = { .handle = hcan, .packet = &packet, - .headers.mmr = packet.header, + .headers.mmr = packet.header, .headers.tx = { .IDE = CAN_ID_EXT, .RTR = CAN_RTR_DATA, @@ -51,7 +51,7 @@ HalStatus MMR_CAN_SendNoTamper(CanHandle *hcan, MmrCanPacket packet) { TransmissionParams tp = { .handle = hcan, .packet = &packet, - .headers.mmr = packet.header, + .headers.mmr = packet.header, .headers.tx = { .IDE = CAN_ID_EXT, .RTR = CAN_RTR_DATA,