Skip to content

Commit eb95c14

Browse files
authored
Fixing some typos
1 parent bc589db commit eb95c14

File tree

1 file changed

+19
-25
lines changed

1 file changed

+19
-25
lines changed

targets/TARGET_STM/TARGET_STM32F0/can_api.c

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ void can_init(can_t *obj, PinName rd, PinName td)
3636
obj->can = (CANName)pinmap_merge(can_rd, can_td);
3737
MBED_ASSERT((int)obj->can != NC);
3838

39-
if(obj->can == CAN_1) {
39+
if (obj->can == CAN_1) {
4040
__HAL_RCC_CAN1_CLK_ENABLE();
4141
obj->index = 0;
4242
}
@@ -173,11 +173,11 @@ int can_frequency(can_t *obj, int f)
173173

174174
if (btr > 0) {
175175
can->MCR |= CAN_MCR_INRQ ;
176-
while((can->MSR & CAN_MSR_INAK) != CAN_MSR_INAK) {
176+
while ((can->MSR & CAN_MSR_INAK) != CAN_MSR_INAK) {
177177
}
178178
can->BTR = btr;
179179
can->MCR &= ~(uint32_t)CAN_MCR_INRQ;
180-
while((can->MSR & CAN_MSR_INAK) == CAN_MSR_INAK) {
180+
while ((can->MSR & CAN_MSR_INAK) == CAN_MSR_INAK) {
181181
}
182182
return 1;
183183
} else {
@@ -203,12 +203,9 @@ int can_write(can_t *obj, CAN_Message msg, int cc)
203203

204204
if (transmitmailbox != CAN_TXSTATUS_NOMAILBOX) {
205205
can->sTxMailBox[transmitmailbox].TIR &= CAN_TI0R_TXRQ;
206-
if (!(msg.format))
207-
{
206+
if (!(msg.format)) {
208207
can->sTxMailBox[transmitmailbox].TIR |= ((msg.id << 21) | msg.type);
209-
}
210-
else
211-
{
208+
} else {
212209
can->sTxMailBox[transmitmailbox].TIR |= ((msg.id << 3) | CAN_ID_EXT | msg.type);
213210
}
214211

@@ -262,7 +259,7 @@ int can_read(can_t *obj, CAN_Message *msg, int handle)
262259
msg->data[7] = (uint8_t)0xFF & (can->sFIFOMailBox[handle].RDHR >> 24);
263260

264261
/* Release the FIFO */
265-
if(handle == CAN_FIFO0) {
262+
if (handle == CAN_FIFO0) {
266263
/* Release FIFO0 */
267264
can->RF0R = CAN_RF0R_RFOM0;
268265
} else { /* FIFONumber == CAN_FIFO1 */
@@ -315,7 +312,7 @@ int can_mode(can_t *obj, CanMode mode)
315312
int success = 0;
316313
CAN_TypeDef *can = (CAN_TypeDef *)(obj->can);
317314
can->MCR |= CAN_MCR_INRQ ;
318-
while((can->MSR & CAN_MSR_INAK) != CAN_MSR_INAK) {
315+
while ((can->MSR & CAN_MSR_INAK) != CAN_MSR_INAK) {
319316
}
320317
switch (mode) {
321318
case MODE_NORMAL:
@@ -342,7 +339,7 @@ int can_mode(can_t *obj, CanMode mode)
342339
break;
343340
}
344341
can->MCR &= ~(uint32_t)CAN_MCR_INRQ;
345-
while((can->MSR & CAN_MSR_INAK) == CAN_MSR_INAK) {
342+
while ((can->MSR & CAN_MSR_INAK) == CAN_MSR_INAK) {
346343
}
347344
return success;
348345
}
@@ -352,27 +349,24 @@ int can_filter(can_t *obj, uint32_t id, uint32_t mask, CANFormat format, int32_t
352349
int retval = 0;
353350

354351
// filter for CANAny format cannot be configured for STM32
355-
if((format == CANStandard) || (format == CANExtended)) {
356-
352+
if ((format == CANStandard) || (format == CANExtended)) {
357353
CanHandle.Instance = (CAN_TypeDef *)(obj->can);
358354
CAN_FilterConfTypeDef sFilterConfig;
359-
360355
sFilterConfig.FilterNumber = handle;
361356
sFilterConfig.FilterMode = CAN_FILTERMODE_IDMASK;
362357
sFilterConfig.FilterScale = CAN_FILTERSCALE_32BIT;
363358

364-
if(format == CANStandard) {
359+
if (format == CANStandard) {
365360
sFilterConfig.FilterIdHigh = id << 5;
366361
sFilterConfig.FilterIdLow = 0x0;
367362
sFilterConfig.FilterMaskIdHigh = mask << 5;
368363
sFilterConfig.FilterMaskIdLow = 0x0; // allows both remote and data frames
369-
}
370-
else if(format == CANExtended){
364+
} else if (format == CANExtended) {
371365
sFilterConfig.FilterIdHigh = id >> 13; // EXTID[28:13]
372366
sFilterConfig.FilterIdLow = (0x00FF & (id << 3)) | (1 << 2); // EXTID[12:0]
373367
sFilterConfig.FilterMaskIdHigh = mask >> 13;
374368
sFilterConfig.FilterMaskIdLow = (0x00FF & (mask << 3)) | (1 << 2);
375-
}
369+
}
376370

377371
sFilterConfig.FilterFIFOAssignment = 0;
378372
sFilterConfig.FilterActivation = ENABLE;
@@ -389,7 +383,7 @@ static void can_irq(CANName name, int id)
389383
uint32_t tmp1 = 0, tmp2 = 0, tmp3 = 0;
390384
CanHandle.Instance = (CAN_TypeDef *)name;
391385

392-
if(__HAL_CAN_GET_IT_SOURCE(&CanHandle, CAN_IT_TME)) {
386+
if (__HAL_CAN_GET_IT_SOURCE(&CanHandle, CAN_IT_TME)) {
393387
tmp1 = __HAL_CAN_TRANSMIT_STATUS(&CanHandle, CAN_TXMAILBOX_0);
394388
tmp2 = __HAL_CAN_TRANSMIT_STATUS(&CanHandle, CAN_TXMAILBOX_1);
395389
tmp3 = __HAL_CAN_TRANSMIT_STATUS(&CanHandle, CAN_TXMAILBOX_2);
@@ -402,27 +396,27 @@ static void can_irq(CANName name, int id)
402396
tmp1 = __HAL_CAN_MSG_PENDING(&CanHandle, CAN_FIFO0);
403397
tmp2 = __HAL_CAN_GET_IT_SOURCE(&CanHandle, CAN_IT_FMP0);
404398

405-
if((tmp1 != 0) && tmp2) {
399+
if ((tmp1 != 0) && tmp2) {
406400
irq_handler(can_irq_ids[id], IRQ_RX);
407401
}
408402

409403
tmp1 = __HAL_CAN_GET_FLAG(&CanHandle, CAN_FLAG_EPV);
410404
tmp2 = __HAL_CAN_GET_IT_SOURCE(&CanHandle, CAN_IT_EPV);
411405
tmp3 = __HAL_CAN_GET_IT_SOURCE(&CanHandle, CAN_IT_ERR);
412406

413-
if(tmp1 && tmp2 && tmp3) {
407+
if (tmp1 && tmp2 && tmp3) {
414408
irq_handler(can_irq_ids[id], IRQ_PASSIVE);
415409
}
416410

417411
tmp1 = __HAL_CAN_GET_FLAG(&CanHandle, CAN_FLAG_BOF);
418412
tmp2 = __HAL_CAN_GET_IT_SOURCE(&CanHandle, CAN_IT_BOF);
419413
tmp3 = __HAL_CAN_GET_IT_SOURCE(&CanHandle, CAN_IT_ERR);
420-
if(tmp1 && tmp2 && tmp3) {
414+
if (tmp1 && tmp2 && tmp3) {
421415
irq_handler(can_irq_ids[id], IRQ_BUS);
422416
}
423417

424418
tmp3 = __HAL_CAN_GET_IT_SOURCE(&CanHandle, CAN_IT_ERR);
425-
if(tmp1 && tmp2 && tmp3) {
419+
if (tmp1 && tmp2 && tmp3) {
426420
irq_handler(can_irq_ids[id], IRQ_ERROR);
427421
}
428422
}
@@ -440,7 +434,7 @@ void can_irq_set(can_t *obj, CanIrqType type, uint32_t enable)
440434
uint32_t vector = 0;
441435
uint32_t ier;
442436

443-
if(obj->can == CAN_1) {
437+
if (obj->can == CAN_1) {
444438
switch (type) {
445439
case IRQ_RX:
446440
ier = CAN_IT_FMP0;
@@ -463,7 +457,7 @@ void can_irq_set(can_t *obj, CanIrqType type, uint32_t enable)
463457
vector = (uint32_t)&CAN_IRQHandler;
464458
}
465459

466-
if(enable) {
460+
if (enable) {
467461
can->IER |= ier;
468462
} else {
469463
can->IER &= ~ier;

0 commit comments

Comments
 (0)