Skip to content

Commit 77ccb89

Browse files
OuxiaolongOuxiaolong
committed
Modify format
1 parent eeae3f7 commit 77ccb89

File tree

6 files changed

+61
-46
lines changed

6 files changed

+61
-46
lines changed

‎bsp/gd32/libraries/Kconfig‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,21 @@
11
config SOC_FAMILY_GD32
22
bool
33

4+
config SOC_SERIES_GD32F1
5+
bool
6+
select ARCH_ARM_CORTEX_M3
7+
select SOC_FAMILY_GD32
8+
9+
config SOC_SERIES_GD32F2
10+
bool
11+
select ARCH_ARM_CORTEX_M3
12+
select SOC_FAMILY_GD32
13+
14+
config SOC_SERIES_GD32F3
15+
bool
16+
select ARCH_ARM_CORTEX_M4
17+
select SOC_FAMILY_GD32
18+
419
config SOC_SERIES_GD32F4
520
bool
621
select ARCH_ARM_CORTEX_M4

‎bsp/gd32/libraries/gd32_drivers/drv_gpio.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ static void gd32_pin_mode(rt_device_t dev, rt_base_t pin, rt_base_t mode)
200200
pin_pupd = GPIO_PUPD_NONE;
201201
pin_odpp = GPIO_OTYPE_PP;
202202
#else
203-
pin_mode = GPIO_MODE_OUT_PP;
203+
pin_mode = GPIO_MODE_OUT_PP;
204204
#endif
205205
break;
206206
case PIN_MODE_OUTPUT_OD:
@@ -210,7 +210,7 @@ static void gd32_pin_mode(rt_device_t dev, rt_base_t pin, rt_base_t mode)
210210
pin_pupd = GPIO_PUPD_NONE;
211211
pin_odpp = GPIO_OTYPE_OD;
212212
#else
213-
pin_mode = GPIO_MODE_OUT_OD;
213+
pin_mode = GPIO_MODE_OUT_OD;
214214
#endif
215215
break;
216216
case PIN_MODE_INPUT:
@@ -219,7 +219,7 @@ static void gd32_pin_mode(rt_device_t dev, rt_base_t pin, rt_base_t mode)
219219
pin_mode = GPIO_MODE_INPUT;
220220
pin_pupd = GPIO_PUPD_PULLUP | GPIO_PUPD_PULLDOWN;
221221
#else
222-
pin_mode = GPIO_MODE_IN_FLOATING;
222+
pin_mode = GPIO_MODE_IN_FLOATING;
223223
#endif
224224
break;
225225
case PIN_MODE_INPUT_PULLUP:
@@ -228,7 +228,7 @@ static void gd32_pin_mode(rt_device_t dev, rt_base_t pin, rt_base_t mode)
228228
pin_mode = GPIO_MODE_INPUT;
229229
pin_pupd = GPIO_PUPD_PULLUP;
230230
#else
231-
pin_mode = GPIO_MODE_IPU;
231+
pin_mode = GPIO_MODE_IPU;
232232
#endif
233233
break;
234234
case PIN_MODE_INPUT_PULLDOWN:
@@ -237,7 +237,7 @@ static void gd32_pin_mode(rt_device_t dev, rt_base_t pin, rt_base_t mode)
237237
pin_mode = GPIO_MODE_INPUT;
238238
pin_pupd = GPIO_PUPD_PULLDOWN;
239239
#else
240-
pin_mode = GPIO_MODE_IPD;
240+
pin_mode = GPIO_MODE_IPD;
241241
#endif
242242
break;
243243
default:
@@ -476,7 +476,7 @@ static rt_err_t gd32_pin_irq_enable(struct rt_device *device, rt_base_t pin, rt_
476476
#if defined SOC_SERIES_GD32F4xx
477477
syscfg_exti_line_config(index->port_src, index->pin_src);
478478
#else
479-
gpio_exti_source_select(index->port_src, index->pin_src);
479+
gpio_exti_source_select(index->port_src, index->pin_src);
480480
#endif
481481

482482
/* configure EXTI line */

‎bsp/gd32/libraries/gd32_drivers/drv_soft_i2c.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,11 +182,11 @@ int rt_hw_i2c_init(void)
182182
i2c_obj[i].i2c2_bus.priv = &i2c_obj[i].ops;
183183
gd32_i2c_gpio_init(&i2c_obj[i]);
184184

185-
result = rt_i2c_bit_add_bus(&i2c_obj[i].i2c2_bus, soft_i2c_config[i].bus_name);
185+
result = rt_i2c_bit_add_bus(&i2c_obj[i].i2c2_bus, soft_i2c_config[i].bus_name);
186186

187-
RT_ASSERT(result == RT_EOK);
187+
RT_ASSERT(result == RT_EOK);
188188

189-
gd32_i2c_bus_unlock(&soft_i2c_config[i]);
189+
gd32_i2c_bus_unlock(&soft_i2c_config[i]);
190190

191191
LOG_D("software simulation %s init done, pin scl: %d, pin sda %d",
192192
soft_i2c_config[i].bus_name,

‎bsp/gd32/libraries/gd32_drivers/drv_spi.c‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -32,41 +32,41 @@ static const struct gd32_spi spi_bus_obj[] = {
3232
{
3333
SPI0,
3434
"spi0",
35-
RCU_SPI0,
36-
RCU_GPIOA,
37-
&spi_bus0,
38-
GPIOA,
39-
GPIO_PIN_5,
40-
GPIO_PIN_6,
41-
GPIO_PIN_7,
35+
RCU_SPI0,
36+
RCU_GPIOA,
37+
&spi_bus0,
38+
GPIOA,
39+
GPIO_PIN_5,
40+
GPIO_PIN_6,
41+
GPIO_PIN_7,
4242
}
4343
#endif /* BSP_USING_SPI0 */
4444

4545
#ifdef BSP_USING_SPI1
4646
{
4747
SPI1,
4848
"spi1",
49-
RCU_SPI1,
50-
RCU_GPIOB,
51-
&spi_bus1,
52-
GPIOB,
49+
RCU_SPI1,
50+
RCU_GPIOB,
51+
&spi_bus1,
52+
GPIOB,
5353
GPIO_PIN_12,
54-
GPIO_PIN_14,
55-
GPIO_PIN_15,
54+
GPIO_PIN_14,
55+
GPIO_PIN_15,
5656
}
5757
#endif /* BSP_USING_SPI1 */
5858

5959
#ifdef BSP_USING_SPI2
6060
{
6161
SPI2,
6262
"spi2",
63-
RCU_SPI2,
64-
RCU_GPIOB,
65-
&spi_bus2,
66-
GPIOB,
67-
GPIO_PIN_3,
68-
GPIO_PIN_4,
69-
GPIO_PIN_5,
63+
RCU_SPI2,
64+
RCU_GPIOB,
65+
&spi_bus2,
66+
GPIOB,
67+
GPIO_PIN_3,
68+
GPIO_PIN_4,
69+
GPIO_PIN_5,
7070
}
7171
#endif /* BSP_USING_SPI2 */
7272
};
@@ -93,10 +93,10 @@ static void gd32_spi_init(struct gd32_spi *gd32_spi)
9393
rcu_periph_clock_enable(gd32_spi->gpio_clk);
9494

9595
#if defined SOC_SERIES_GD32F4xx
96-
/*GPIO pin configuration*/
96+
/*GPIO pin configuration*/
9797
gpio_af_set(gd32_spi->spi_port, GPIO_AF_5, gd32_spi->sck_pin | gd32_spi->mosi_pin | gd32_spi->miso_pin);
9898

99-
gpio_mode_set(gd32_spi->spi_port, GPIO_MODE_AF, GPIO_PUPD_NONE, gd32_spi->miso_pin| gd32_spi->miso_pin);
99+
gpio_mode_set(gd32_spi->spi_port, GPIO_MODE_AF, GPIO_PUPD_NONE, gd32_spi->miso_pin| gd32_spi->miso_pin);
100100
gpio_output_options_set(gd32_spi->spi_port, GPIO_OTYPE_PP, GPIO_OSPEED_200MHZ,gd32_spi->miso_pin| gd32_spi->miso_pin);
101101

102102
#else
@@ -120,8 +120,8 @@ static rt_err_t spi_configure(struct rt_spi_device* device,
120120
RT_ASSERT(device != RT_NULL);
121121
RT_ASSERT(configuration != RT_NULL);
122122

123-
//Init SPI
124-
gd32_spi_init(spi_device);
123+
//Init SPI
124+
gd32_spi_init(spi_device);
125125

126126
/* data_width */
127127
if(configuration->data_width <= 8)

‎bsp/gd32/libraries/gd32_drivers/drv_spi_flash.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,22 +29,22 @@ static int rt_hw_spi_flash_init(void)
2929
{
3030
rt_err_t res;
3131
static struct rt_spi_device spi_dev_gd25q; /* SPI device */
32-
static struct gd32_spi_cs spi_cs;
33-
spi_cs.GPIOx = GD25Q_SPI_CS_GPIOX;
32+
static struct gd32_spi_cs spi_cs;
33+
spi_cs.GPIOx = GD25Q_SPI_CS_GPIOX;
3434
spi_cs.GPIO_Pin = GD25Q_SPI_CS_GPIOX_PIN_X;
3535

3636
#if defined SOC_SERIES_GD32F4xx
37-
gpio_mode_set(spi_cs.GPIOx, GPIO_MODE_OUTPUT, GPIO_PUPD_NONE, spi_cs.GPIO_Pin);
37+
gpio_mode_set(spi_cs.GPIOx, GPIO_MODE_OUTPUT, GPIO_PUPD_NONE, spi_cs.GPIO_Pin);
3838
gpio_output_options_set(spi_cs.GPIOx, GPIO_OTYPE_PP, GPIO_OSPEED_50MHZ, spi_cs.GPIO_Pin);
3939

4040
gpio_bit_set(spi_cs.GPIOx, spi_cs.GPIO_Pin);
4141
#else
42-
gpio_init(spi_cs.GPIOx, GPIO_MODE_AF_PP, GPIO_OSPEED_50MHZ, spi_cs.GPIO_Pin);
42+
gpio_init(spi_cs.GPIOx, GPIO_MODE_AF_PP, GPIO_OSPEED_50MHZ, spi_cs.GPIO_Pin);
4343

4444
#endif
45-
res = rt_spi_bus_attach_device(&spi_dev_gd25q, SPI_FLASH_DEVICE_NAME, SPI_BUS_NAME, (void*)&spi_cs);
45+
res = rt_spi_bus_attach_device(&spi_dev_gd25q, SPI_FLASH_DEVICE_NAME, SPI_BUS_NAME, (void*)&spi_cs);
4646

47-
if (res != RT_EOK)
47+
if (res != RT_EOK)
4848
{
4949
rt_kprintf("rt_spi_bus_attach_device() run failed!\n");
5050
return res;

‎bsp/gd32/libraries/gd32_drivers/drv_usart.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ static const struct gd32_uart uart_obj[] = {
178178
GPIOA, GPIO_AF_7, GPIO_PIN_2, // tx port, tx alternate, tx pin
179179
GPIOA, GPIO_AF_7, GPIO_PIN_3, // rx port, rx alternate, rx pin
180180
#else
181-
GPIOA, GPIO_PIN_2, // tx port, tx pin
181+
GPIOA, GPIO_PIN_2, // tx port, tx pin
182182
GPIOA, GPIO_PIN_3, // rx port, rx pin
183183
#endif
184184
&serial1,
@@ -229,7 +229,7 @@ static const struct gd32_uart uart_obj[] = {
229229
GPIOC, GPIO_AF_8, GPIO_PIN_12, // tx port, tx alternate, tx pin
230230
GPIOD, GPIO_AF_8, GPIO_PIN_2, // rx port, rx alternate, rx pin
231231
#else
232-
GPIOC, GPIO_PIN_12, // tx port, tx pin
232+
GPIOC, GPIO_PIN_12, // tx port, tx pin
233233
GPIOD, GPIO_PIN_2, // rx port, rx pin
234234
#endif
235235
&serial4,
@@ -246,7 +246,7 @@ static const struct gd32_uart uart_obj[] = {
246246
GPIOC, GPIO_AF_8, GPIO_PIN_6, // tx port, tx alternate, tx pin
247247
GPIOC, GPIO_AF_8, GPIO_PIN_7, // rx port, rx alternate, rx pin
248248
#else
249-
GPIOC, GPIO_PIN_6, // tx port, tx pin
249+
GPIOC, GPIO_PIN_6, // tx port, tx pin
250250
GPIOC, GPIO_PIN_7, // rx port, rx pin
251251
#endif
252252
&serial5,
@@ -280,7 +280,7 @@ static const struct gd32_uart uart_obj[] = {
280280
GPIOE, GPIO_AF_8, GPIO_PIN_0, // tx port, tx alternate, tx pin
281281
GPIOE, GPIO_AF_8, GPIO_PIN_1, // rx port, rx alternate, rx pin
282282
#else
283-
GPIOE, GPIO_PIN_0, // tx port, tx pin
283+
GPIOE, GPIO_PIN_0, // tx port, tx pin
284284
GPIOE, GPIO_PIN_1, // rx port, rx pin
285285
#endif
286286
&serial7,
@@ -488,7 +488,7 @@ static const struct rt_uart_ops gd32_uart_ops =
488488
.control = gd32_uart_control,
489489
.putc = gd32_uart_putc,
490490
.getc = gd32_uart_getc,
491-
RT_NULL,
491+
RT_NULL,
492492
};
493493

494494
/**
@@ -501,7 +501,7 @@ int gd32_hw_usart_init(void)
501501
struct serial_configure config = RT_SERIAL_CONFIG_DEFAULT;
502502
int i;
503503

504-
int result;
504+
int result;
505505

506506
for (i = 0; i < sizeof(uart_obj) / sizeof(uart_obj[0]); i++)
507507
{
@@ -513,7 +513,7 @@ int gd32_hw_usart_init(void)
513513
uart_obj[i].device_name,
514514
RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_INT_RX,
515515
(void *)&uart_obj[i]);
516-
RT_ASSERT(result == RT_EOK);
516+
RT_ASSERT(result == RT_EOK);
517517
}
518518

519519
return result;

0 commit comments

Comments
 (0)