Skip to content

Commit a044a65

Browse files
committed
fixed misaligned lines in can_api.c of NUC472 & M453
1 parent da8fd8b commit a044a65

File tree

2 files changed

+63
-63
lines changed

2 files changed

+63
-63
lines changed

targets/TARGET_NUVOTON/TARGET_M451/can_api.c

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include "critical.h"
3030

3131
#define NU_CAN_DEBUG 0
32-
#define CAN_NUM 1
32+
#define CAN_NUM 1
3333

3434
static uint32_t can_irq_ids[CAN_NUM] = {0};
3535
static can_irq_handler can0_irq_handler;
@@ -44,7 +44,7 @@
4444

4545
void can_init(can_t *obj, PinName rd, PinName td)
4646
{
47-
uint32_t can_td = (CANName)pinmap_peripheral(td, PinMap_CAN_TD);
47+
uint32_t can_td = (CANName)pinmap_peripheral(td, PinMap_CAN_TD);
4848
uint32_t can_rd = (CANName)pinmap_peripheral(rd, PinMap_CAN_RD);
4949
obj->can = (CANName)pinmap_merge(can_td, can_rd);
5050
MBED_ASSERT((int)obj->can != NC);
@@ -58,18 +58,18 @@
5858

5959
// Enable IP clock
6060
CLK_EnableModuleClock(modinit->clkidx);
61-
62-
obj->index = 0;
63-
61+
62+
obj->index = 0;
63+
6464
pinmap_pinout(td, PinMap_CAN_TD);
6565
pinmap_pinout(rd, PinMap_CAN_RD);
6666

67-
/* For M453 mbed Board Transmitter Setting (RS Pin) */
67+
/* For M453 mbed Board Transmitter Setting (RS Pin) */
6868
GPIO_SetMode(PA, BIT0| BIT1, GPIO_MODE_OUTPUT);
6969
PA0 = 0x00;
7070
PA1 = 0x00;
7171

72-
CAN_Open((CAN_T *)obj->can, 500000, CAN_NORMAL_MODE);
72+
CAN_Open((CAN_T *)obj->can, 500000, CAN_NORMAL_MODE);
7373

7474
can_filter(obj, 0, 0, CANStandard, 0);
7575
}
@@ -78,29 +78,29 @@
7878
void can_free(can_t *obj)
7979
{
8080

81-
const struct nu_modinit_s *modinit = get_modinit(obj->can, can_modinit_tab);
82-
83-
MBED_ASSERT(modinit != NULL);
81+
const struct nu_modinit_s *modinit = get_modinit(obj->can, can_modinit_tab);
82+
83+
MBED_ASSERT(modinit != NULL);
8484
MBED_ASSERT(modinit->modname == obj->can);
8585

8686
// Reset this module
8787
SYS_ResetModule(modinit->rsetidx);
88-
89-
CLK_DisableModuleClock(modinit->clkidx);
88+
89+
CLK_DisableModuleClock(modinit->clkidx);
9090
}
9191

9292
int can_frequency(can_t *obj, int hz)
9393
{
94-
CAN_SetBaudRate((CAN_T *)obj->can, hz);
95-
96-
return CAN_GetCANBitRate((CAN_T *)obj->can);
94+
CAN_SetBaudRate((CAN_T *)obj->can, hz);
95+
96+
return CAN_GetCANBitRate((CAN_T *)obj->can);
9797
}
9898

9999
static void can_irq(CANName name, int id)
100100
{
101-
102-
CAN_T *can = (CAN_T *)NU_MODBASE(name);
103-
uint32_t u8IIDRstatus;
101+
102+
CAN_T *can = (CAN_T *)NU_MODBASE(name);
103+
uint32_t u8IIDRstatus;
104104

105105
u8IIDRstatus = can->IIDR;
106106

@@ -110,12 +110,12 @@ static void can_irq(CANName name, int id)
110110
/**************************/
111111
if(can->STATUS & CAN_STATUS_RXOK_Msk) {
112112
can->STATUS &= ~CAN_STATUS_RXOK_Msk; /* Clear Rx Ok status*/
113-
can0_irq_handler(can_irq_ids[id], IRQ_RX);
113+
can0_irq_handler(can_irq_ids[id], IRQ_RX);
114114
}
115115

116116
if(can->STATUS & CAN_STATUS_TXOK_Msk) {
117117
can->STATUS &= ~CAN_STATUS_TXOK_Msk; /* Clear Tx Ok status*/
118-
can0_irq_handler(can_irq_ids[id], IRQ_TX);
118+
can0_irq_handler(can_irq_ids[id], IRQ_TX);
119119
}
120120

121121
/**************************/

targets/TARGET_NUVOTON/TARGET_NUC472/can_api.c

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -248,58 +248,58 @@ int can_write(can_t *obj, CAN_Message msg, int cc)
248248
STR_CANMSG_T CMsg;
249249

250250
CMsg.IdType = (uint32_t)msg.format;
251-
CMsg.FrameType = (uint32_t)!msg.type;
252-
CMsg.Id = msg.id;
253-
CMsg.DLC = msg.len;
254-
memcpy((void *)&CMsg.Data[0],(const void *)&msg.data[0], (unsigned int)8);
251+
CMsg.FrameType = (uint32_t)!msg.type;
252+
CMsg.Id = msg.id;
253+
CMsg.DLC = msg.len;
254+
memcpy((void *)&CMsg.Data[0],(const void *)&msg.data[0], (unsigned int)8);
255255

256-
return CAN_Transmit((CAN_T *)(obj->can), cc, &CMsg);
256+
return CAN_Transmit((CAN_T *)(obj->can), cc, &CMsg);
257257
}
258258

259259
int can_read(can_t *obj, CAN_Message *msg, int handle)
260260
{
261-
STR_CANMSG_T CMsg;
262-
263-
if(!CAN_Receive((CAN_T *)(obj->can), handle, &CMsg))
264-
return 0;
265-
266-
msg->format = (CANFormat)CMsg.IdType;
267-
msg->type = (CANType)!CMsg.FrameType;
268-
msg->id = CMsg.Id;
269-
msg->len = CMsg.DLC;
270-
memcpy(&msg->data[0], &CMsg.Data[0], 8);
271-
272-
return 1;
261+
STR_CANMSG_T CMsg;
262+
263+
if(!CAN_Receive((CAN_T *)(obj->can), handle, &CMsg))
264+
return 0;
265+
266+
msg->format = (CANFormat)CMsg.IdType;
267+
msg->type = (CANType)!CMsg.FrameType;
268+
msg->id = CMsg.Id;
269+
msg->len = CMsg.DLC;
270+
memcpy(&msg->data[0], &CMsg.Data[0], 8);
271+
272+
return 1;
273273
}
274274

275275
int can_mode(can_t *obj, CanMode mode)
276276
{
277-
int success = 0;
278-
switch (mode)
279-
{
280-
case MODE_RESET:
281-
CAN_LeaveTestMode((CAN_T*)obj->can);
282-
success = 1;
283-
break;
284-
285-
case MODE_NORMAL:
286-
CAN_EnterTestMode((CAN_T*)(obj->can), CAN_TEST_BASIC_Msk);
287-
success = 1;
288-
break;
289-
290-
case MODE_SILENT:
291-
CAN_EnterTestMode((CAN_T*)(obj->can), CAN_TEST_SILENT_Msk);
292-
success = 1;
293-
break;
294-
295-
case MODE_TEST_LOCAL:
296-
case MODE_TEST_GLOBAL:
297-
CAN_EnterTestMode((CAN_T*)(obj->can), CAN_TEST_LBACK_Msk);
298-
success = 1;
299-
break;
300-
301-
case MODE_TEST_SILENT:
302-
CAN_EnterTestMode((CAN_T*)(obj->can), CAN_TEST_SILENT_Msk | CAN_TEST_LBACK_Msk);
277+
int success = 0;
278+
switch (mode)
279+
{
280+
case MODE_RESET:
281+
CAN_LeaveTestMode((CAN_T*)obj->can);
282+
success = 1;
283+
break;
284+
285+
case MODE_NORMAL:
286+
CAN_EnterTestMode((CAN_T*)(obj->can), CAN_TEST_BASIC_Msk);
287+
success = 1;
288+
break;
289+
290+
case MODE_SILENT:
291+
CAN_EnterTestMode((CAN_T*)(obj->can), CAN_TEST_SILENT_Msk);
292+
success = 1;
293+
break;
294+
295+
case MODE_TEST_LOCAL:
296+
case MODE_TEST_GLOBAL:
297+
CAN_EnterTestMode((CAN_T*)(obj->can), CAN_TEST_LBACK_Msk);
298+
success = 1;
299+
break;
300+
301+
case MODE_TEST_SILENT:
302+
CAN_EnterTestMode((CAN_T*)(obj->can), CAN_TEST_SILENT_Msk | CAN_TEST_LBACK_Msk);
303303
success = 1;
304304
break;
305305

0 commit comments

Comments
 (0)