Skip to content

Commit 666af5e

Browse files
helloeagleyangmysterywolf
helloeagleyang
and
mysterywolf
authored
[DeviceDriver] Add CANFD support and correct typos (#5912)
* Add CANFD support and correct typos - Added CANFD required fields to can.h - Fixed typos in can.h and can.c - Corrected all the projects affected by the typo - Fixed wrong line-ending in some affected can driver files Signed-off-by: Fan YANG <[email protected]> * update Signed-off-by: Fan YANG <[email protected]> Co-authored-by: Meco Man <[email protected]>
1 parent 0189987 commit 666af5e

File tree

17 files changed

+141
-73
lines changed

17 files changed

+141
-73
lines changed

‎bsp/at32/libraries/rt_drivers/drv_can.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -192,13 +192,13 @@ static rt_err_t _can_config(struct rt_can_device *can, struct can_configure *cfg
192192
case RT_CAN_MODE_NORMAL:
193193
can_instance->config.base_init_struct.mode_selection = CAN_MODE_COMMUNICATE;
194194
break;
195-
case RT_CAN_MODE_LISEN:
195+
case RT_CAN_MODE_LISTEN:
196196
can_instance->config.base_init_struct.mode_selection = CAN_MODE_LISTENONLY;
197197
break;
198198
case RT_CAN_MODE_LOOPBACK:
199199
can_instance->config.base_init_struct.mode_selection = CAN_MODE_LOOPBACK;
200200
break;
201-
case RT_CAN_MODE_LOOPBACKANLISEN:
201+
case RT_CAN_MODE_LOOPBACKANLISTEN:
202202
can_instance->config.base_init_struct.mode_selection = CAN_MODE_LISTENONLY_LOOPBACK;
203203
break;
204204
}
@@ -432,9 +432,9 @@ static rt_err_t _can_control(struct rt_can_device *can, int cmd, void *arg)
432432
case RT_CAN_CMD_SET_MODE:
433433
argval = (rt_uint32_t) arg;
434434
if (argval != RT_CAN_MODE_NORMAL &&
435-
argval != RT_CAN_MODE_LISEN &&
435+
argval != RT_CAN_MODE_LISTEN &&
436436
argval != RT_CAN_MODE_LOOPBACK &&
437-
argval != RT_CAN_MODE_LOOPBACKANLISEN)
437+
argval != RT_CAN_MODE_LOOPBACKANLISTEN)
438438
{
439439
return -RT_ERROR;
440440
}

‎bsp/essemi/es32f0654/drivers/drv_can.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,13 +108,13 @@ static rt_err_t _can_config(struct rt_can_device *can_device, struct can_configu
108108
case RT_CAN_MODE_NORMAL:
109109
drv_can->CanHandle.init.mode = CAN_MODE_NORMAL;
110110
break;
111-
case RT_CAN_MODE_LISEN:
111+
case RT_CAN_MODE_LISTEN:
112112
drv_can->CanHandle.init.mode = CAN_MODE_SILENT;
113113
break;
114114
case RT_CAN_MODE_LOOPBACK:
115115
drv_can->CanHandle.init.mode = CAN_MODE_LOOPBACK;
116116
break;
117-
case RT_CAN_MODE_LOOPBACKANLISEN:
117+
case RT_CAN_MODE_LOOPBACKANLISTEN:
118118
drv_can->CanHandle.init.mode = CAN_MODE_SILENT_LOOPBACK;
119119
break;
120120
}
@@ -295,9 +295,9 @@ static rt_err_t _can_control(struct rt_can_device *can_device, int cmd, void *ar
295295
case RT_CAN_CMD_SET_MODE:
296296
argval = (rt_uint32_t) arg;
297297
if (argval != RT_CAN_MODE_NORMAL &&
298-
argval != RT_CAN_MODE_LISEN &&
298+
argval != RT_CAN_MODE_LISTEN &&
299299
argval != RT_CAN_MODE_LOOPBACK &&
300-
argval != RT_CAN_MODE_LOOPBACKANLISEN)
300+
argval != RT_CAN_MODE_LOOPBACKANLISTEN)
301301
{
302302
return -RT_ERROR;
303303
}

‎bsp/essemi/es32f369x/drivers/drv_can.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,13 +107,13 @@ static rt_err_t _can_config(struct rt_can_device *can_device, struct can_configu
107107
case RT_CAN_MODE_NORMAL:
108108
drv_can->CanHandle.init.mode = CAN_MODE_NORMAL;
109109
break;
110-
case RT_CAN_MODE_LISEN:
110+
case RT_CAN_MODE_LISTEN:
111111
drv_can->CanHandle.init.mode = CAN_MODE_SILENT;
112112
break;
113113
case RT_CAN_MODE_LOOPBACK:
114114
drv_can->CanHandle.init.mode = CAN_MODE_LOOPBACK;
115115
break;
116-
case RT_CAN_MODE_LOOPBACKANLISEN:
116+
case RT_CAN_MODE_LOOPBACKANLISTEN:
117117
drv_can->CanHandle.init.mode = CAN_MODE_SILENT_LOOPBACK;
118118
break;
119119
}
@@ -289,9 +289,9 @@ static rt_err_t _can_control(struct rt_can_device *can_device, int cmd, void *ar
289289
case RT_CAN_CMD_SET_MODE:
290290
argval = (rt_uint32_t) arg;
291291
if (argval != RT_CAN_MODE_NORMAL &&
292-
argval != RT_CAN_MODE_LISEN &&
292+
argval != RT_CAN_MODE_LISTEN &&
293293
argval != RT_CAN_MODE_LOOPBACK &&
294-
argval != RT_CAN_MODE_LOOPBACKANLISEN)
294+
argval != RT_CAN_MODE_LOOPBACKANLISTEN)
295295
{
296296
return -RT_ERROR;
297297
}

‎bsp/hc32/libraries/hc32_drivers/drv_can.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,13 +124,13 @@ static rt_uint32_t _get_can_work_mode(rt_uint32_t mode)
124124
case RT_CAN_MODE_NORMAL:
125125
work_mode = CAN_WORK_MD_NORMAL;
126126
break;
127-
case RT_CAN_MODE_LISEN:
127+
case RT_CAN_MODE_LISTEN:
128128
work_mode = CAN_WORK_MD_SILENT;
129129
break;
130130
case RT_CAN_MODE_LOOPBACK:
131131
work_mode = CAN_WORK_MD_ELB;
132132
break;
133-
case RT_CAN_MODE_LOOPBACKANLISEN:
133+
case RT_CAN_MODE_LOOPBACKANLISTEN:
134134
work_mode = CAN_WORK_MD_ELB_SILENT;
135135
break;
136136
default:
@@ -298,9 +298,9 @@ static rt_err_t _can_control(struct rt_can_device *can, int cmd, void *arg)
298298
case RT_CAN_CMD_SET_MODE:
299299
argval = (rt_uint32_t) arg;
300300
if (argval != RT_CAN_MODE_NORMAL &&
301-
argval != RT_CAN_MODE_LISEN &&
301+
argval != RT_CAN_MODE_LISTEN &&
302302
argval != RT_CAN_MODE_LOOPBACK &&
303-
argval != RT_CAN_MODE_LOOPBACKANLISEN)
303+
argval != RT_CAN_MODE_LOOPBACKANLISTEN)
304304
{
305305
return -RT_ERROR;
306306
}

‎bsp/imxrt/libraries/drivers/drv_can.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,12 +135,12 @@ static rt_err_t can_cfg(struct rt_can_device *can_dev, struct can_configure *cfg
135135
case RT_CAN_MODE_NORMAL:
136136
/* default mode */
137137
break;
138-
case RT_CAN_MODE_LISEN:
138+
case RT_CAN_MODE_LISTEN:
139139
break;
140140
case RT_CAN_MODE_LOOPBACK:
141141
config.enableLoopBack = true;
142142
break;
143-
case RT_CAN_MODE_LOOPBACKANLISEN:
143+
case RT_CAN_MODE_LOOPBACKANLISTEN:
144144
break;
145145
}
146146
FLEXCAN_Init(can->base, &config, GetCanSrcFreq());

‎bsp/loongson/ls1cdev/drivers/drv_can.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,14 +156,14 @@ static void bxcan_init(CAN_TypeDef *pcan, rt_uint32_t baud, rt_uint32_t mode)
156156
case RT_CAN_MODE_NORMAL:
157157
CAN_InitStructure.CAN_Mode = 0x00;
158158
break;
159-
case RT_CAN_MODE_LISEN:
159+
case RT_CAN_MODE_LISTEN:
160160
CAN_InitStructure.CAN_Mode = CAN_Mode_LOM;
161161
break;
162162
case RT_CAN_MODE_LOOPBACK:
163163
CAN_InitStructure.CAN_Mode = CAN_Mode_STM;
164164

165165
break;
166-
case RT_CAN_MODE_LOOPBACKANLISEN:
166+
case RT_CAN_MODE_LOOPBACKANLISTEN:
167167
CAN_InitStructure.CAN_Mode = CAN_Mode_STM|CAN_Mode_LOM;
168168
break;
169169
}
@@ -272,9 +272,9 @@ static rt_err_t control(struct rt_can_device *can, int cmd, void *arg)
272272
case RT_CAN_CMD_SET_MODE:
273273
argval = (rt_uint32_t) arg;
274274
if (argval != RT_CAN_MODE_NORMAL ||
275-
argval != RT_CAN_MODE_LISEN ||
275+
argval != RT_CAN_MODE_LISTEN ||
276276
argval != RT_CAN_MODE_LOOPBACK ||
277-
argval != RT_CAN_MODE_LOOPBACKANLISEN)
277+
argval != RT_CAN_MODE_LOOPBACKANLISTEN)
278278
{
279279
return RT_ERROR;
280280
}

‎bsp/loongson/ls1cdev/libraries/ls1c_can.h‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/*
2-
* Copyright (c) 2006-2018, RT-Thread Development Team
2+
* Copyright (c) 2006-2022, RT-Thread Development Team
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*
6-
* Change Logs: (Pelican Mode)
6+
* Change Logs: (Pelican Mode)
77
* Date Author Notes
88
* 2018-01-06 sundm75 first version
99
*/
@@ -54,9 +54,9 @@
5454
#define CAN_RTR_Remote 1
5555

5656
#define CAN_MODE_NORMAL 0
57-
#define CAN_MODE_LISEN 1
57+
#define CAN_MODE_LISTEN 1
5858
#define CAN_MODE_LOOPBACK 2
59-
#define CAN_MODE_LOOPBACKANLISEN 3
59+
#define CAN_MODE_LOOPBACKANLISTEN 3
6060

6161
/*!< CAN 控制状态寄存器 */
6262
/************************** CAN_MOD 寄存器位定义*******************************/
@@ -84,7 +84,7 @@
8484
#define CAN_SR_TS ((unsigned char)0x20) /*!< 发送状态1: 发送 0: 空闲*/
8585
#define CAN_SR_ES ((unsigned char)0x40) /*!< 出错状态1:出错 0: 正常 */
8686
#define CAN_SR_BS ((unsigned char)0x80) /*!< 总线状态1: 关闭 0: 开启 */
87-
87+
8888
/************************** CAN_IR 中断寄存器位定义****************************/
8989
#define CAN_IR_RI ((unsigned char)0x01) /*!< 接收中断 */
9090
#define CAN_IR_TI ((unsigned char)0x02) /*!< 发送中断 */
@@ -94,7 +94,7 @@
9494
#define CAN_IR_EPI ((unsigned char)0x20) /*!< 错误消极中断 */
9595
#define CAN_IR_ALI ((unsigned char)0x40) /*!< 仲裁丢失中断 */
9696
#define CAN_IR_BEI ((unsigned char)0x80) /*!< 总线错误中断 */
97-
97+
9898
/************************* CAN_IER 中断使能寄存器位定义************************/
9999
#define CAN_IER_RIE ((unsigned char)0x01) /*!< 接收中断使能 */
100100
#define CAN_IER_TIE ((unsigned char)0x02) /*!< 发送中断使能 */
@@ -104,17 +104,17 @@
104104
#define CAN_IER_EPIE ((unsigned char)0x20) /*!< 错误消极中断使能 */
105105
#define CAN_IER_ALIE ((unsigned char)0x40) /*!< 仲裁丢失中断使能 */
106106
#define CAN_IER_BEIE ((unsigned char)0x80) /*!< 总线错误中断使能 */
107-
108-
typedef enum
107+
108+
typedef enum
109109
{
110-
LS1C_CAN1MBaud=0, // 1 MBit/sec
111-
LS1C_CAN800kBaud, // 800 kBit/sec
112-
LS1C_CAN500kBaud, // 500 kBit/sec
113-
LS1C_CAN250kBaud, // 250 kBit/sec
114-
LS1C_CAN125kBaud, // 125 kBit/sec
115-
LS1C_CAN100kBaud, // 100 kBit/sec
116-
LS1C_CAN50kBaud, // 50 kBit/sec
117-
LS1C_CAN40kBaud, // 40 kBit/sec
110+
LS1C_CAN1MBaud=0, // 1 MBit/sec
111+
LS1C_CAN800kBaud, // 800 kBit/sec
112+
LS1C_CAN500kBaud, // 500 kBit/sec
113+
LS1C_CAN250kBaud, // 250 kBit/sec
114+
LS1C_CAN125kBaud, // 125 kBit/sec
115+
LS1C_CAN100kBaud, // 100 kBit/sec
116+
LS1C_CAN50kBaud, // 50 kBit/sec
117+
LS1C_CAN40kBaud, // 40 kBit/sec
118118
}Ls1c_CanBPS_t;
119119

120120
typedef struct
@@ -143,12 +143,12 @@ typedef struct
143143

144144
typedef struct
145145
{
146-
unsigned char CAN_Prescaler; /* 波特率分频系数1 to 31. */
146+
unsigned char CAN_Prescaler; /* 波特率分频系数1 to 31. */
147147
unsigned char CAN_Mode; /*0x10:睡眠0x08:单,双滤波 0x40:正常工作0x20:只听 0x01:复位*/
148148
unsigned char CAN_SJW; /*同步跳转宽度 */
149149
unsigned char CAN_BS1; /*时间段1计数值*/
150-
unsigned char CAN_BS2; /*时间段2计数值*/
151-
150+
unsigned char CAN_BS2; /*时间段2计数值*/
151+
152152
} CAN_InitTypeDef;
153153

154154
typedef struct

‎bsp/n32g452xx/Libraries/rt_drivers/drv_can.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,13 +104,13 @@ static uint8_t get_can_mode_rtt2n32(uint8_t rtt_can_mode)
104104
case RT_CAN_MODE_NORMAL:
105105
mode = CAN_Normal_Mode;
106106
break;
107-
case RT_CAN_MODE_LISEN:
107+
case RT_CAN_MODE_LISTEN:
108108
mode = CAN_Silent_Mode;
109109
break;
110110
case RT_CAN_MODE_LOOPBACK:
111111
mode = CAN_LoopBack_Mode;
112112
break;
113-
case RT_CAN_MODE_LOOPBACKANLISEN:
113+
case RT_CAN_MODE_LOOPBACKANLISTEN:
114114
mode = CAN_Silent_LoopBack_Mode;
115115
break;
116116
}
@@ -413,9 +413,9 @@ static rt_err_t _can_control(struct rt_can_device *can, int cmd, void *arg)
413413
case RT_CAN_CMD_SET_MODE:
414414
argval = (rt_uint32_t)arg;
415415
if (argval != RT_CAN_MODE_NORMAL &&
416-
argval != RT_CAN_MODE_LISEN &&
416+
argval != RT_CAN_MODE_LISTEN &&
417417
argval != RT_CAN_MODE_LOOPBACK &&
418-
argval != RT_CAN_MODE_LOOPBACKANLISEN)
418+
argval != RT_CAN_MODE_LOOPBACKANLISTEN)
419419
{
420420
return -RT_ERROR;
421421
}

‎bsp/nuvoton/libraries/m2354/rtt_port/drv_can.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -256,13 +256,13 @@ static rt_err_t nu_can_configure(struct rt_can_device *can, struct can_configure
256256
CAN_EnterTestMode(base, CAN_TEST_BASIC_Msk);
257257
#endif
258258
break;
259-
case RT_CAN_MODE_LISEN:
259+
case RT_CAN_MODE_LISTEN:
260260
CAN_EnterTestMode(base, CAN_TEST_BASIC_Msk | CAN_TEST_SILENT_Msk);
261261
break;
262262
case RT_CAN_MODE_LOOPBACK:
263263
CAN_EnterTestMode(base, CAN_TEST_BASIC_Msk | CAN_TEST_LBACK_Msk);
264264
break;
265-
case RT_CAN_MODE_LOOPBACKANLISEN:
265+
case RT_CAN_MODE_LOOPBACKANLISTEN:
266266
CAN_EnterTestMode(base, CAN_TEST_BASIC_Msk | CAN_TEST_SILENT_Msk | CAN_TEST_LBACK_Msk);
267267
break;
268268
default:
@@ -328,9 +328,9 @@ static rt_err_t nu_can_control(struct rt_can_device *can, int cmd, void *arg)
328328

329329
case RT_CAN_CMD_SET_MODE:
330330
if ((argval == RT_CAN_MODE_NORMAL) ||
331-
(argval == RT_CAN_MODE_LISEN) ||
331+
(argval == RT_CAN_MODE_LISTEN) ||
332332
(argval == RT_CAN_MODE_LOOPBACK) ||
333-
(argval == RT_CAN_MODE_LOOPBACKANLISEN))
333+
(argval == RT_CAN_MODE_LOOPBACKANLISTEN))
334334
{
335335
if (argval != can->config.mode)
336336
{

‎bsp/nuvoton/libraries/m480/rtt_port/drv_can.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -307,13 +307,13 @@ static rt_err_t nu_can_configure(struct rt_can_device *can, struct can_configure
307307
CAN_EnterTestMode(base, CAN_TEST_BASIC_Msk);
308308
#endif
309309
break;
310-
case RT_CAN_MODE_LISEN:
310+
case RT_CAN_MODE_LISTEN:
311311
CAN_EnterTestMode(base, CAN_TEST_BASIC_Msk | CAN_TEST_SILENT_Msk);
312312
break;
313313
case RT_CAN_MODE_LOOPBACK:
314314
CAN_EnterTestMode(base, CAN_TEST_BASIC_Msk | CAN_TEST_LBACK_Msk);
315315
break;
316-
case RT_CAN_MODE_LOOPBACKANLISEN:
316+
case RT_CAN_MODE_LOOPBACKANLISTEN:
317317
CAN_EnterTestMode(base, CAN_TEST_BASIC_Msk | CAN_TEST_SILENT_Msk | CAN_TEST_LBACK_Msk);
318318
break;
319319
default:
@@ -379,9 +379,9 @@ static rt_err_t nu_can_control(struct rt_can_device *can, int cmd, void *arg)
379379

380380
case RT_CAN_CMD_SET_MODE:
381381
if ((argval == RT_CAN_MODE_NORMAL) ||
382-
(argval == RT_CAN_MODE_LISEN) ||
382+
(argval == RT_CAN_MODE_LISTEN) ||
383383
(argval == RT_CAN_MODE_LOOPBACK) ||
384-
(argval == RT_CAN_MODE_LOOPBACKANLISEN))
384+
(argval == RT_CAN_MODE_LOOPBACKANLISTEN))
385385
{
386386
if (argval != can->config.mode)
387387
{

0 commit comments

Comments
 (0)