aboutsummaryrefslogtreecommitdiff
path: root/ports/stm32/fdcan.c
diff options
context:
space:
mode:
authorDamien George2020-02-27 15:36:53 +1100
committerDamien George2020-02-28 10:33:03 +1100
commit69661f3343bedf86e514337cff63d96cc42f8859 (patch)
treeaf5dfb380ffdb75dda84828f63cf9d840d992f0f /ports/stm32/fdcan.c
parent3f39d18c2b884d32f0443e2e8114ff9d7a14d718 (diff)
all: Reformat C and Python source code with tools/codeformat.py.
This is run with uncrustify 0.70.1, and black 19.10b0.
Diffstat (limited to 'ports/stm32/fdcan.c')
-rw-r--r--ports/stm32/fdcan.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/ports/stm32/fdcan.c b/ports/stm32/fdcan.c
index 611ebe1aa..b3b1da998 100644
--- a/ports/stm32/fdcan.c
+++ b/ports/stm32/fdcan.c
@@ -65,13 +65,13 @@ bool can_init(pyb_can_obj_t *can_obj, uint32_t mode, uint32_t prescaler, uint32_
if (can_obj->can_id == PYB_CAN_1) {
init->MessageRAMOffset = 0;
} else {
- init->MessageRAMOffset = 2560/2;
+ init->MessageRAMOffset = 2560 / 2;
}
init->StdFiltersNbr = 64; // 128 / 2
init->ExtFiltersNbr = 0; // Not used
- init->TxEventsNbr = 16; // 32 / 2
+ init->TxEventsNbr = 16; // 32 / 2
init->RxBuffersNbr = 32; // 64 / 2
init->TxBuffersNbr = 16; // 32 / 2
@@ -219,14 +219,14 @@ int can_receive(FDCAN_HandleTypeDef *can, int fifo, FDCAN_RxHeaderTypeDef *hdr,
// Get pointer to incoming message
uint32_t index = (can->Instance->RXF0S & FDCAN_RXF0S_F0GI) >> 8;
- uint32_t *address = (uint32_t*)(can->msgRam.RxFIFO0SA + (index * can->Init.RxFifo0ElmtSize * 4));
+ uint32_t *address = (uint32_t *)(can->msgRam.RxFIFO0SA + (index * can->Init.RxFifo0ElmtSize * 4));
// Parse header of message
hdr->IdType = *address & FDCAN_ELEMENT_MASK_XTD;
- if(hdr->IdType == FDCAN_STANDARD_ID) {
- hdr->Identifier = (*address & FDCAN_ELEMENT_MASK_STDID) >> 18;
+ if (hdr->IdType == FDCAN_STANDARD_ID) {
+ hdr->Identifier = (*address & FDCAN_ELEMENT_MASK_STDID) >> 18;
} else {
- hdr->Identifier = *address & FDCAN_ELEMENT_MASK_EXTID;
+ hdr->Identifier = *address & FDCAN_ELEMENT_MASK_EXTID;
}
hdr->RxFrameType = *address & FDCAN_ELEMENT_MASK_RTR;
hdr->ErrorStateIndicator = *address++ & FDCAN_ELEMENT_MASK_ESI;
@@ -238,9 +238,9 @@ int can_receive(FDCAN_HandleTypeDef *can, int fifo, FDCAN_RxHeaderTypeDef *hdr,
hdr->IsFilterMatchingFrame = (*address++ & FDCAN_ELEMENT_MASK_ANMF) >> 31;
// Copy data
- uint8_t *pdata = (uint8_t*)address;
- for(uint32_t i = 0; i < 8; ++i) { // TODO use DLCtoBytes[hdr->DataLength] for length > 8
- *data++ = *pdata++;
+ uint8_t *pdata = (uint8_t *)address;
+ for (uint32_t i = 0; i < 8; ++i) { // TODO use DLCtoBytes[hdr->DataLength] for length > 8
+ *data++ = *pdata++;
}
// Release (free) message from FIFO
@@ -268,7 +268,7 @@ STATIC void can_rx_irq_handler(uint can_id, uint fifo_id) {
switch (*state) {
case RX_STATE_FIFO_EMPTY:
__HAL_FDCAN_DISABLE_IT(&self->can, (fifo_id == FDCAN_RX_FIFO0) ?
- FDCAN_IT_RX_FIFO0_NEW_MESSAGE : FDCAN_IT_RX_FIFO1_NEW_MESSAGE);
+ FDCAN_IT_RX_FIFO0_NEW_MESSAGE : FDCAN_IT_RX_FIFO1_NEW_MESSAGE);
irq_reason = MP_OBJ_NEW_SMALL_INT(0);
*state = RX_STATE_MESSAGE_PENDING;
break;
@@ -280,9 +280,9 @@ STATIC void can_rx_irq_handler(uint can_id, uint fifo_id) {
break;
case RX_STATE_FIFO_FULL:
__HAL_FDCAN_DISABLE_IT(&self->can, (fifo_id == FDCAN_RX_FIFO0) ?
- FDCAN_IT_RX_FIFO0_MESSAGE_LOST : FDCAN_IT_RX_FIFO1_MESSAGE_LOST);
+ FDCAN_IT_RX_FIFO0_MESSAGE_LOST : FDCAN_IT_RX_FIFO1_MESSAGE_LOST);
__HAL_FDCAN_CLEAR_FLAG(&self->can, (fifo_id == FDCAN_RX_FIFO0) ?
- FDCAN_FLAG_RX_FIFO0_MESSAGE_LOST : FDCAN_FLAG_RX_FIFO1_MESSAGE_LOST);
+ FDCAN_FLAG_RX_FIFO0_MESSAGE_LOST : FDCAN_FLAG_RX_FIFO1_MESSAGE_LOST);
irq_reason = MP_OBJ_NEW_SMALL_INT(2);
*state = RX_STATE_FIFO_OVERFLOW;
break;