Skip to content

Commit ed5c156

Browse files
OnlyoutzZOnlyoutzZ
committed
[bsp][n32] address review comments and code format
1 parent eea35bf commit ed5c156

52 files changed

Lines changed: 1800 additions & 1924 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎bsp/n32/n32hxxx/libraries/N32_Drivers/drivers/config/h47x_48x/dma_config.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
extern "C" {
1818
#endif
1919

20-
2120
/* DMA1 channel1 */
2221
#if defined(BSP_UART1_RX_USING_DMA) && !defined(UART1_RX_DMA)
2322
#define UART1_RX_DMA DMA1

‎bsp/n32/n32hxxx/libraries/N32_Drivers/drivers/config/h47x_48x/uart_config.h‎

Lines changed: 64 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,14 @@
1717
extern "C" {
1818
#endif
1919

20-
2120
#if defined(BSP_USING_UART1)
2221
#ifndef UART1_CONFIG
2322
#define UART1_CONFIG \
2423
{ \
25-
.name = "uart1", \
26-
.Instance = USART1, \
27-
.irq_type = USART1_IRQn, \
28-
.periph = RCC_APB2_PERIPH_USART1, \
24+
.name = "uart1", \
25+
.Instance = USART1, \
26+
.irq_type = USART1_IRQn, \
27+
.periph = RCC_APB2_PERIPH_USART1, \
2928
.EnablePeriphClk = RCC_EnableAPB2PeriphClk, \
3029
}
3130
#endif /* UART1_CONFIG */
@@ -35,8 +34,8 @@ extern "C" {
3534
#ifndef UART1_DMA_RX_CONFIG
3635
#define UART1_DMA_RX_CONFIG \
3736
{ \
38-
.DMAy = UART1_RX_DMA, \
39-
.DMAChx = UART1_RX_DMA_CHType, \
37+
.DMAy = UART1_RX_DMA, \
38+
.DMAChx = UART1_RX_DMA_CHType, \
4039
.dma_irq = UART1_RX_DMA_IRQ, \
4140
.dma_rcc = UART1_RX_DMA_RCC, \
4241
.request = UART1_RX_DMA_REQUEST, \
@@ -52,8 +51,8 @@ extern "C" {
5251
#ifndef UART1_DMA_TX_CONFIG
5352
#define UART1_DMA_TX_CONFIG \
5453
{ \
55-
.DMAy = UART1_TX_DMA, \
56-
.DMAChx = UART1_TX_DMA_CHType, \
54+
.DMAy = UART1_TX_DMA, \
55+
.DMAChx = UART1_TX_DMA_CHType, \
5756
.dma_irq = UART1_TX_DMA_IRQ, \
5857
.dma_rcc = UART1_TX_DMA_RCC, \
5958
.request = UART1_TX_DMA_REQUEST, \
@@ -65,15 +64,14 @@ extern "C" {
6564
#endif /* UART1_TX_DMA */
6665
#endif /* BSP_UART1_TX_USING_DMA */
6766

68-
6967
#if defined(BSP_USING_UART2)
7068
#ifndef UART2_CONFIG
7169
#define UART2_CONFIG \
7270
{ \
73-
.name = "uart2", \
74-
.Instance = USART2, \
75-
.irq_type = USART2_IRQn, \
76-
.periph = RCC_APB1_PERIPH_USART2, \
71+
.name = "uart2", \
72+
.Instance = USART2, \
73+
.irq_type = USART2_IRQn, \
74+
.periph = RCC_APB1_PERIPH_USART2, \
7775
.EnablePeriphClk = RCC_EnableAPB1PeriphClk, \
7876
}
7977
#endif /* UART2_CONFIG */
@@ -83,8 +81,8 @@ extern "C" {
8381
#ifndef UART2_DMA_RX_CONFIG
8482
#define UART2_DMA_RX_CONFIG \
8583
{ \
86-
.DMAy = UART2_RX_DMA, \
87-
.DMAChx = UART2_RX_DMA_CHType, \
84+
.DMAy = UART2_RX_DMA, \
85+
.DMAChx = UART2_RX_DMA_CHType, \
8886
.dma_irq = UART2_RX_DMA_IRQ, \
8987
.dma_rcc = UART2_RX_DMA_RCC, \
9088
.request = UART2_RX_DMA_REQUEST, \
@@ -100,8 +98,8 @@ extern "C" {
10098
#ifndef UART2_DMA_TX_CONFIG
10199
#define UART2_DMA_TX_CONFIG \
102100
{ \
103-
.DMAy = UART2_TX_DMA, \
104-
.DMAChx = UART2_TX_DMA_CHType, \
101+
.DMAy = UART2_TX_DMA, \
102+
.DMAChx = UART2_TX_DMA_CHType, \
105103
.dma_irq = UART2_TX_DMA_IRQ, \
106104
.dma_rcc = UART2_TX_DMA_RCC, \
107105
.request = UART2_TX_DMA_REQUEST, \
@@ -113,15 +111,14 @@ extern "C" {
113111
#endif /* UART2_TX_DMA */
114112
#endif /* BSP_UART2_TX_USING_DMA */
115113

116-
117114
#if defined(BSP_USING_UART3)
118115
#ifndef UART3_CONFIG
119116
#define UART3_CONFIG \
120117
{ \
121-
.name = "uart3", \
122-
.Instance = USART3, \
123-
.irq_type = USART3_IRQn, \
124-
.periph = RCC_APB1_PERIPH_USART3, \
118+
.name = "uart3", \
119+
.Instance = USART3, \
120+
.irq_type = USART3_IRQn, \
121+
.periph = RCC_APB1_PERIPH_USART3, \
125122
.EnablePeriphClk = RCC_EnableAPB1PeriphClk, \
126123
}
127124
#endif /* UART3_CONFIG */
@@ -131,8 +128,8 @@ extern "C" {
131128
#ifndef UART3_DMA_RX_CONFIG
132129
#define UART3_DMA_RX_CONFIG \
133130
{ \
134-
.DMAy = UART3_RX_DMA, \
135-
.DMAChx = UART3_RX_DMA_CHType, \
131+
.DMAy = UART3_RX_DMA, \
132+
.DMAChx = UART3_RX_DMA_CHType, \
136133
.dma_irq = UART3_RX_DMA_IRQ, \
137134
.dma_rcc = UART3_RX_DMA_RCC, \
138135
.request = UART3_RX_DMA_REQUEST, \
@@ -148,8 +145,8 @@ extern "C" {
148145
#ifndef UART3_DMA_TX_CONFIG
149146
#define UART3_DMA_TX_CONFIG \
150147
{ \
151-
.DMAy = UART3_TX_DMA, \
152-
.DMAChx = UART3_TX_DMA_CHType, \
148+
.DMAy = UART3_TX_DMA, \
149+
.DMAChx = UART3_TX_DMA_CHType, \
153150
.dma_irq = UART3_TX_DMA_IRQ, \
154151
.dma_rcc = UART3_TX_DMA_RCC, \
155152
.request = UART3_TX_DMA_REQUEST, \
@@ -161,15 +158,14 @@ extern "C" {
161158
#endif /* UART3_TX_DMA */
162159
#endif /* BSP_UART3_TX_USING_DMA */
163160

164-
165161
#if defined(BSP_USING_UART4)
166162
#ifndef UART4_CONFIG
167163
#define UART4_CONFIG \
168164
{ \
169-
.name = "uart4", \
170-
.Instance = USART4, \
171-
.irq_type = USART4_IRQn, \
172-
.periph = RCC_APB2_PERIPH_USART4, \
165+
.name = "uart4", \
166+
.Instance = USART4, \
167+
.irq_type = USART4_IRQn, \
168+
.periph = RCC_APB2_PERIPH_USART4, \
173169
.EnablePeriphClk = RCC_EnableAPB2PeriphClk, \
174170
}
175171
#endif /* UART4_CONFIG */
@@ -179,8 +175,8 @@ extern "C" {
179175
#ifndef UART4_DMA_RX_CONFIG
180176
#define UART4_DMA_RX_CONFIG \
181177
{ \
182-
.DMAy = UART4_RX_DMA, \
183-
.DMAChx = UART4_RX_DMA_CHType, \
178+
.DMAy = UART4_RX_DMA, \
179+
.DMAChx = UART4_RX_DMA_CHType, \
184180
.dma_irq = UART4_RX_DMA_IRQ, \
185181
.dma_rcc = UART4_RX_DMA_RCC, \
186182
.request = UART4_RX_DMA_REQUEST, \
@@ -196,8 +192,8 @@ extern "C" {
196192
#ifndef UART4_DMA_TX_CONFIG
197193
#define UART4_DMA_TX_CONFIG \
198194
{ \
199-
.DMAy = UART4_TX_DMA, \
200-
.DMAChx = UART4_TX_DMA_CHType, \
195+
.DMAy = UART4_TX_DMA, \
196+
.DMAChx = UART4_TX_DMA_CHType, \
201197
.dma_irq = UART4_TX_DMA_IRQ, \
202198
.dma_rcc = UART4_TX_DMA_RCC, \
203199
.request = UART4_TX_DMA_REQUEST, \
@@ -209,15 +205,14 @@ extern "C" {
209205
#endif /* UART4_TX_DMA */
210206
#endif /* BSP_UART4_TX_USING_DMA */
211207

212-
213208
#if defined(BSP_USING_UART5)
214209
#ifndef UART5_CONFIG
215210
#define UART5_CONFIG \
216211
{ \
217-
.name = "uart5", \
218-
.Instance = UART5, \
219-
.irq_type = UART5_IRQn, \
220-
.periph = RCC_APB1_PERIPH_UART5, \
212+
.name = "uart5", \
213+
.Instance = UART5, \
214+
.irq_type = UART5_IRQn, \
215+
.periph = RCC_APB1_PERIPH_UART5, \
221216
.EnablePeriphClk = RCC_EnableAPB1PeriphClk, \
222217
}
223218
#endif /* UART5_CONFIG */
@@ -227,8 +222,8 @@ extern "C" {
227222
#ifndef UART5_DMA_RX_CONFIG
228223
#define UART5_DMA_RX_CONFIG \
229224
{ \
230-
.DMAy = UART5_RX_DMA, \
231-
.DMAChx = UART5_RX_DMA_CHType, \
225+
.DMAy = UART5_RX_DMA, \
226+
.DMAChx = UART5_RX_DMA_CHType, \
232227
.dma_irq = UART5_RX_DMA_IRQ, \
233228
.dma_rcc = UART5_RX_DMA_RCC, \
234229
.request = UART5_RX_DMA_REQUEST, \
@@ -244,8 +239,8 @@ extern "C" {
244239
#ifndef UART5_DMA_TX_CONFIG
245240
#define UART5_DMA_TX_CONFIG \
246241
{ \
247-
.DMAy = UART5_TX_DMA, \
248-
.DMAChx = UART5_TX_DMA_CHType, \
242+
.DMAy = UART5_TX_DMA, \
243+
.DMAChx = UART5_TX_DMA_CHType, \
249244
.dma_irq = UART5_TX_DMA_IRQ, \
250245
.dma_rcc = UART5_TX_DMA_RCC, \
251246
.request = UART5_TX_DMA_REQUEST, \
@@ -257,15 +252,14 @@ extern "C" {
257252
#endif /* UART5_TX_DMA */
258253
#endif /* BSP_UART5_TX_USING_DMA */
259254

260-
261255
#if defined(BSP_USING_UART6)
262256
#ifndef UART6_CONFIG
263257
#define UART6_CONFIG \
264258
{ \
265-
.name = "uart6", \
266-
.Instance = UART6, \
267-
.irq_type = UART6_IRQn, \
268-
.periph = RCC_APB2_PERIPH_UART6, \
259+
.name = "uart6", \
260+
.Instance = UART6, \
261+
.irq_type = UART6_IRQn, \
262+
.periph = RCC_APB2_PERIPH_UART6, \
269263
.EnablePeriphClk = RCC_EnableAPB2PeriphClk, \
270264
}
271265
#endif /* UART6_CONFIG */
@@ -275,8 +269,8 @@ extern "C" {
275269
#ifndef UART6_DMA_RX_CONFIG
276270
#define UART6_DMA_RX_CONFIG \
277271
{ \
278-
.DMAy = UART6_RX_DMA, \
279-
.DMAChx = UART6_RX_DMA_CHType, \
272+
.DMAy = UART6_RX_DMA, \
273+
.DMAChx = UART6_RX_DMA_CHType, \
280274
.dma_irq = UART6_RX_DMA_IRQ, \
281275
.dma_rcc = UART6_RX_DMA_RCC, \
282276
.request = UART6_RX_DMA_REQUEST, \
@@ -292,8 +286,8 @@ extern "C" {
292286
#ifndef UART6_DMA_TX_CONFIG
293287
#define UART6_DMA_TX_CONFIG \
294288
{ \
295-
.DMAy = UART6_TX_DMA, \
296-
.DMAChx = UART6_TX_DMA_CHType, \
289+
.DMAy = UART6_TX_DMA, \
290+
.DMAChx = UART6_TX_DMA_CHType, \
297291
.dma_irq = UART6_TX_DMA_IRQ, \
298292
.dma_rcc = UART6_TX_DMA_RCC, \
299293
.request = UART6_TX_DMA_REQUEST, \
@@ -305,15 +299,14 @@ extern "C" {
305299
#endif /* UART6_TX_DMA */
306300
#endif /* BSP_UART6_TX_USING_DMA */
307301

308-
309302
#if defined(BSP_USING_UART7)
310303
#ifndef UART7_CONFIG
311304
#define UART7_CONFIG \
312305
{ \
313-
.name = "uart7", \
314-
.Instance = UART7, \
315-
.irq_type = UART7_IRQn, \
316-
.periph = RCC_APB2_PERIPH_UART7, \
306+
.name = "uart7", \
307+
.Instance = UART7, \
308+
.irq_type = UART7_IRQn, \
309+
.periph = RCC_APB2_PERIPH_UART7, \
317310
.EnablePeriphClk = RCC_EnableAPB2PeriphClk, \
318311
}
319312
#endif /* UART7_CONFIG */
@@ -323,8 +316,8 @@ extern "C" {
323316
#ifndef UART7_DMA_RX_CONFIG
324317
#define UART7_DMA_RX_CONFIG \
325318
{ \
326-
.DMAy = UART7_RX_DMA, \
327-
.DMAChx = UART7_RX_DMA_CHType, \
319+
.DMAy = UART7_RX_DMA, \
320+
.DMAChx = UART7_RX_DMA_CHType, \
328321
.dma_irq = UART7_RX_DMA_IRQ, \
329322
.dma_rcc = UART7_RX_DMA_RCC, \
330323
.request = UART7_RX_DMA_REQUEST, \
@@ -340,8 +333,8 @@ extern "C" {
340333
#ifndef UART7_DMA_TX_CONFIG
341334
#define UART7_DMA_TX_CONFIG \
342335
{ \
343-
.DMAy = UART7_TX_DMA, \
344-
.DMAChx = UART7_TX_DMA_CHType, \
336+
.DMAy = UART7_TX_DMA, \
337+
.DMAChx = UART7_TX_DMA_CHType, \
345338
.dma_irq = UART7_TX_DMA_IRQ, \
346339
.dma_rcc = UART7_TX_DMA_RCC, \
347340
.request = UART7_TX_DMA_REQUEST, \
@@ -353,15 +346,14 @@ extern "C" {
353346
#endif /* UART7_TX_DMA */
354347
#endif /* BSP_UART7_TX_USING_DMA */
355348

356-
357349
#if defined(BSP_USING_UART8)
358350
#ifndef UART8_CONFIG
359351
#define UART8_CONFIG \
360352
{ \
361-
.name = "uart8", \
362-
.Instance = UART8, \
363-
.irq_type = UART8_IRQn, \
364-
.periph = RCC_APB1_PERIPH_UART8, \
353+
.name = "uart8", \
354+
.Instance = UART8, \
355+
.irq_type = UART8_IRQn, \
356+
.periph = RCC_APB1_PERIPH_UART8, \
365357
.EnablePeriphClk = RCC_EnableAPB1PeriphClk, \
366358
}
367359
#endif /* UART8_CONFIG */
@@ -371,8 +363,8 @@ extern "C" {
371363
#ifndef UART8_DMA_RX_CONFIG
372364
#define UART8_DMA_RX_CONFIG \
373365
{ \
374-
.DMAy = UART8_RX_DMA, \
375-
.DMAChx = UART8_RX_DMA_CHType, \
366+
.DMAy = UART8_RX_DMA, \
367+
.DMAChx = UART8_RX_DMA_CHType, \
376368
.dma_irq = UART8_RX_DMA_IRQ, \
377369
.dma_rcc = UART8_RX_DMA_RCC, \
378370
.request = UART8_RX_DMA_REQUEST, \
@@ -388,8 +380,8 @@ extern "C" {
388380
#ifndef UART8_DMA_TX_CONFIG
389381
#define UART8_DMA_TX_CONFIG \
390382
{ \
391-
.DMAy = UART8_TX_DMA, \
392-
.DMAChx = UART8_TX_DMA_CHType, \
383+
.DMAy = UART8_TX_DMA, \
384+
.DMAChx = UART8_TX_DMA_CHType, \
393385
.dma_irq = UART8_TX_DMA_IRQ, \
394386
.dma_rcc = UART8_TX_DMA_RCC, \
395387
.request = UART8_TX_DMA_REQUEST, \

‎bsp/n32/n32hxxx/libraries/N32_Drivers/drivers/config/h49x/dma_config.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
extern "C" {
1818
#endif
1919

20-
2120
/* DMA1 channel1 */
2221
#if defined(BSP_UART1_RX_USING_DMA) && !defined(UART1_RX_DMA)
2322
#define UART1_RX_DMA DMA1
@@ -256,7 +255,6 @@ extern "C" {
256255
#define SDIO_RX_DMA_CHANNEL 2U
257256
#endif
258257

259-
260258
/* DMA2 channel3 */
261259
#if defined(BSP_UART1_TX_USING_DMA) && !defined(UART1_TX_DMA)
262260
#define UART1_TX_DMA DMA2
@@ -405,7 +403,6 @@ extern "C" {
405403
#define SPI1_TX_DMA_CHANNEL 8U
406404
#endif
407405

408-
409406
#ifdef __cplusplus
410407
}
411408
#endif

0 commit comments

Comments
 (0)