!349 [BSP] fix foramtting issue in BSP

BernardXiong · gitee-org · commit ceba6ce49d6d · 2021-09-25T04:11:49.000Z
Merge pull request !349 from bernard/gitee_master
diff --git a/bsp/apm32/libraries/APM32F10x_Library/APM32F10x_StdPeriphDriver/src/apm32f10x_fmc.c b/bsp/apm32/libraries/APM32F10x_Library/APM32F10x_StdPeriphDriver/src/apm32f10x_fmc.c
@@ -347,11 +347,11 @@ FMC_STATUS_T FMC_ProgramOptionByteData(uint32_t address, uint8_t data)
  *
  * @param     page:the address of the pages to be write protection
  *                This parameter can be any combination of the following values:
- *                 for APM32F10X_LD ��
+ *                 for APM32F10X_LD
  *                    @arg FLASH_WRP_PAGE_0_3 to FLASH_WRP_PAGE_28_31
- *                 for APM32F10X_MD ��
+ *                 for APM32F10X_MD
  *                    @arg FLASH_WRP_PAGE_0_3 to FLASH_WRP_PAGE_124_127
- *                 for APM32F10X_HD ��
+ *                 for APM32F10X_HD
  *                    @arg FLASH_WRP_PAGE_0_1 to FLASH_WRP_PAGE_60_61 or FLASH_WRP_PAGE_62_127
  *                 @arg FMC_WRP_PAGE_ALL
  *
diff --git a/bsp/apm32/libraries/APM32F10x_Library/APM32F10x_StdPeriphDriver/src/apm32f10x_gpio.c b/bsp/apm32/libraries/APM32F10x_Library/APM32F10x_StdPeriphDriver/src/apm32f10x_gpio.c
@@ -466,7 +466,7 @@ void GPIO_ConfigPinRemap(GPIO_REMAP_T remap)
     {
         regVal |= 0x0F000000;
     }
-    
+
     mask <<= bitOffset;
     regVal &= (uint32_t)~mask;
     val <<= bitOffset;
diff --git a/bsp/apm32/libraries/APM32F10x_Library/APM32F10x_StdPeriphDriver/src/apm32f10x_pmu.c b/bsp/apm32/libraries/APM32F10x_Library/APM32F10x_StdPeriphDriver/src/apm32f10x_pmu.c
@@ -88,7 +88,7 @@ void PMU_DisablePVD(void)
 /*!
  * @brief     Configure a voltage threshold detected by a power supply voltage detector (PVD).
  *
- * @param     level��specifies the PVD detection level
+ * @param     level : specifies the PVD detection level
  *                   This parameter can be one of the following values:
  *                   @arg PMU_PVD_LEVEL_2V2 : Config PVD detection level to 2.2V
  *                   @arg PMU_PVD_LEVEL_2V3 : Config PVD detection level to 2.3V
@@ -198,7 +198,7 @@ void PMU_EnterSTANDBYMode(void)
 /*!
  * @brief     Read the specified PWR flag is set or not.
  *
- * @param     flag��Reads the status of specifies the flag.
+ * @param     flag : Reads the status of specifies the flag.
  *                  This parameter can be one of the following values:
  *                    @arg PMU_FLAG_WUE : Wake Up flag
  *                    @arg PMU_FLAG_SB  : StandBy flag
@@ -226,7 +226,7 @@ uint8_t PMU_ReadStatusFlag(PMU_FLAG_T flag)
 /*!
  * @brief     Clears the PWR's pending flags.
  *
- * @param     flag��Clears the status of specifies the flag.
+ * @param     flag : Clears the status of specifies the flag.
  *                  This parameter can be one of the following values:
  *                    @arg PMU_FLAG_WUE : Wake Up flag
  *                    @arg PMU_FLAG_SB  : StandBy flag
diff --git a/bsp/apm32/libraries/APM32F10x_Library/APM32F10x_StdPeriphDriver/src/apm32f10x_rcm.c b/bsp/apm32/libraries/APM32F10x_Library/APM32F10x_StdPeriphDriver/src/apm32f10x_rcm.c
@@ -1032,7 +1032,7 @@ void RCM_ClearStatusFlag(void)
 /*!
  * @brief     Reads the specified RCM interrupt Flag
  *
- * @param     flag ��Reads specifies RCM interrupt flag.
+ * @param     flag : Reads specifies RCM interrupt flag.
  *                   This parameter can be one of the following values:
  *                   @arg RCM_INT_LSIRDY : LSI ready interrupt flag
  *                   @arg RCM_INT_LSERDY : LSE ready interrupt flag
diff --git a/bsp/apm32/libraries/APM32F10x_Library/APM32F10x_StdPeriphDriver/src/apm32f10x_sdio.c b/bsp/apm32/libraries/APM32F10x_Library/APM32F10x_StdPeriphDriver/src/apm32f10x_sdio.c
@@ -289,7 +289,7 @@ uint32_t SDIO_ReadDataCounter(void)
 /*!
  * @brief       Write the SDIO Data
  *
- * @param       Data��Write 32-bit data
+ * @param       Data : Write 32-bit data
  *
  * @retval      None
  */
diff --git a/bsp/ls2kdev/drivers/drv_spi.c b/bsp/ls2kdev/drivers/drv_spi.c
@@ -15,36 +15,38 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
+
 #include <rtthread.h>
 #include <drivers/spi.h>
 #include "drv_spi.h"
 
 #ifdef RT_USING_SPI
+#ifdef RT_USING_SPI_GPIOCS
+#include <drivers/pin.h>
+#endif
+
 static void spi_init(uint8_t spre_spr, uint8_t copl, uint8_t cpha)
 {
-    SET_SPI(SPSR, 0xc0); 
+    SET_SPI(SPSR, 0xc0);
     SET_SPI(PARAM, 0x40);
     SET_SPI(PARAM2, 0x01);
     SET_SPI(SPER, (spre_spr & 0b00001100) >> 2);
-    SET_SPI(SPCR, 0x50 | copl << 3 | cpha << 2 | (spre_spr & 0b00000011)); 
+    SET_SPI(SPCR, 0x50 | copl << 3 | cpha << 2 | (spre_spr & 0b00000011));
     SET_SPI(SOFTCS, 0xff);
 }
 
-static void spi_set_csn(uint8_t val) 
+rt_inline void spi_set_csn(uint8_t val)
 {
     SET_SPI(SOFTCS, val);
 }
 
-#ifdef RT_USING_SPI_GPIOCS
-    #include <drivers/pin.h>
-#endif
-static void spi_set_cs(unsigned char cs, int new_status) 
+static void spi_set_cs(unsigned char cs, int new_status)
 {
     if (cs < 4)
     {
         unsigned char val = 0;
         val = GET_SPI(SOFTCS);
-        val |= 0x01 << cs ; // csen=1
+        val |= 0x01 << cs ;     // csen=1
         if (new_status)         // cs = 1
         {
             val |= (0x10 << cs);            // csn=1
@@ -64,6 +66,7 @@ static void spi_set_cs(unsigned char cs, int new_status)
     }
 #endif
 }
+
 static uint8_t spi_write_for_response(uint8_t data)
 {
     uint8_t val;
@@ -94,6 +97,7 @@ static int cmd_spi_init(int argc, char *argv[])
     }
 }
 MSH_CMD_EXPORT(cmd_spi_init, cmd_spi_init);
+
 static int cmd_spi_set_csn(int argc, char *argv[])
 {
     uint8_t val, csn;
@@ -110,6 +114,7 @@ static int cmd_spi_set_csn(int argc, char *argv[])
     }
 }
 MSH_CMD_EXPORT(cmd_spi_set_csn, cmd_spi_set_csn);
+
 static int cmd_spi_write(int argc, char *argv[])
 {
     uint8_t data, resp;
@@ -129,6 +134,7 @@ MSH_CMD_EXPORT(cmd_spi_write, cmd_spi_write);
 
 static rt_err_t configure(struct rt_spi_device *device, struct rt_spi_configuration *configuration);
 static rt_uint32_t xfer(struct rt_spi_device *device, struct rt_spi_message *message);
+
 const static unsigned char SPI_DIV_TABLE[] = {0b0000, 0b0001, 0b0100, 0b0010, 0b0011, 0b0101, 0b0110, 0b0111, 0b1000, 0b1001, 0b1010, 0b1011};
 // 2      4      8      16     32     64      128   256    512    1024   2048   4096
 static rt_err_t configure(struct rt_spi_device *device,
@@ -171,8 +177,8 @@ static rt_err_t configure(struct rt_spi_device *device,
 
     return RT_EOK;
 }
-static rt_uint32_t xfer(struct rt_spi_device *device,
-                        struct rt_spi_message *message)
+
+static rt_uint32_t xfer(struct rt_spi_device *device, struct rt_spi_message *message)
 {
 
     unsigned char cs = 0;
@@ -214,18 +220,19 @@ static rt_uint32_t xfer(struct rt_spi_device *device,
     }
     return message->length;
 }
+
 static struct rt_spi_ops loongson_spi_ops =
 {
     .configure  = configure,
     .xfer       = xfer
 };
 static struct rt_spi_bus loongson_spi;
+
 static int loongson_spi_init()
 {
     //rt_kprintf("spi_init\n");
     return rt_spi_bus_register(&loongson_spi, "spi", &loongson_spi_ops);
 }
 INIT_BOARD_EXPORT(loongson_spi_init);
-
 #endif
 /*@}*/

Original file line number	Diff line number	Diff line change
`@@ -466,7 +466,7 @@ void GPIO_ConfigPinRemap(GPIO_REMAP_T remap)`
`466`	`466`	`{`
`467`	`467`	`regVal \|= 0x0F000000;`
`468`	`468`	`}`
`469`		`-`
	`469`	`+`
`470`	`470`	`mask <<= bitOffset;`
`471`	`471`	`regVal &= (uint32_t)~mask;`
`472`	`472`	`val <<= bitOffset;`
Original file line number	Diff line number	Diff line change
`@@ -1032,7 +1032,7 @@ void RCM_ClearStatusFlag(void)`
`1032`	`1032`	`/*!`
`1033`	`1033`	`* @brief Reads the specified RCM interrupt Flag`
`1034`	`1034`	`*`
`1035`		`- * @param flag £ºReads specifies RCM interrupt flag.`
	`1035`	`+ * @param flag : Reads specifies RCM interrupt flag.`
`1036`	`1036`	`* This parameter can be one of the following values:`
`1037`	`1037`	`* @arg RCM_INT_LSIRDY : LSI ready interrupt flag`
`1038`	`1038`	`* @arg RCM_INT_LSERDY : LSE ready interrupt flag`
Original file line number	Diff line number	Diff line change
`@@ -289,7 +289,7 @@ uint32_t SDIO_ReadDataCounter(void)`
`289`	`289`	`/*!`
`290`	`290`	`* @brief Write the SDIO Data`
`291`	`291`	`*`
`292`		`- * @param Data£ºWrite 32-bit data`
	`292`	`+ * @param Data : Write 32-bit data`
`293`	`293`	`*`
`294`	`294`	`* @retval None`
`295`	`295`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -15,36 +15,38 @@`
`15`	`15`	`#include <stdio.h>`
`16`	`16`	`#include <stdlib.h>`
`17`	`17`	`#include <ctype.h>`
	`18`	`+`
`18`	`19`	`#include <rtthread.h>`
`19`	`20`	`#include <drivers/spi.h>`
`20`	`21`	`#include "drv_spi.h"`
`21`	`22`
`22`	`23`	`#ifdef RT_USING_SPI`
	`24`	`+#ifdef RT_USING_SPI_GPIOCS`
	`25`	`+#include <drivers/pin.h>`
	`26`	`+#endif`
	`27`	`+`
`23`	`28`	`static void spi_init(uint8_t spre_spr, uint8_t copl, uint8_t cpha)`
`24`	`29`	`{`
`25`		`- SET_SPI(SPSR, 0xc0);`
	`30`	`+ SET_SPI(SPSR, 0xc0);`
`26`	`31`	`SET_SPI(PARAM, 0x40);`
`27`	`32`	`SET_SPI(PARAM2, 0x01);`
`28`	`33`	`SET_SPI(SPER, (spre_spr & 0b00001100) >> 2);`
`29`		`- SET_SPI(SPCR, 0x50 \| copl << 3 \| cpha << 2 \| (spre_spr & 0b00000011));`
	`34`	`+ SET_SPI(SPCR, 0x50 \| copl << 3 \| cpha << 2 \| (spre_spr & 0b00000011));`
`30`	`35`	`SET_SPI(SOFTCS, 0xff);`
`31`	`36`	`}`
`32`	`37`
`33`		`-static void spi_set_csn(uint8_t val)`
	`38`	`+rt_inline void spi_set_csn(uint8_t val)`
`34`	`39`	`{`
`35`	`40`	`SET_SPI(SOFTCS, val);`
`36`	`41`	`}`
`37`	`42`
`38`		`-#ifdef RT_USING_SPI_GPIOCS`
`39`		`- #include <drivers/pin.h>`
`40`		`-#endif`
`41`		`-static void spi_set_cs(unsigned char cs, int new_status)`
	`43`	`+static void spi_set_cs(unsigned char cs, int new_status)`
`42`	`44`	`{`
`43`	`45`	`if (cs < 4)`
`44`	`46`	`{`
`45`	`47`	`unsigned char val = 0;`
`46`	`48`	`val = GET_SPI(SOFTCS);`
`47`		`- val \|= 0x01 << cs ; // csen=1`
	`49`	`+ val \|= 0x01 << cs ; // csen=1`
`48`	`50`	`if (new_status) // cs = 1`
`49`	`51`	`{`
`50`	`52`	`val \|= (0x10 << cs); // csn=1`
`@@ -64,6 +66,7 @@ static void spi_set_cs(unsigned char cs, int new_status)`
`64`	`66`	`}`
`65`	`67`	`#endif`
`66`	`68`	`}`
	`69`	`+`
`67`	`70`	`static uint8_t spi_write_for_response(uint8_t data)`
`68`	`71`	`{`
`69`	`72`	`uint8_t val;`
`@@ -94,6 +97,7 @@ static int cmd_spi_init(int argc, char *argv[])`
`94`	`97`	`}`
`95`	`98`	`}`
`96`	`99`	`MSH_CMD_EXPORT(cmd_spi_init, cmd_spi_init);`
	`100`	`+`
`97`	`101`	`static int cmd_spi_set_csn(int argc, char *argv[])`
`98`	`102`	`{`
`99`	`103`	`uint8_t val, csn;`
`@@ -110,6 +114,7 @@ static int cmd_spi_set_csn(int argc, char *argv[])`
`110`	`114`	`}`
`111`	`115`	`}`
`112`	`116`	`MSH_CMD_EXPORT(cmd_spi_set_csn, cmd_spi_set_csn);`
	`117`	`+`
`113`	`118`	`static int cmd_spi_write(int argc, char *argv[])`
`114`	`119`	`{`
`115`	`120`	`uint8_t data, resp;`
`@@ -129,6 +134,7 @@ MSH_CMD_EXPORT(cmd_spi_write, cmd_spi_write);`
`129`	`134`
`130`	`135`	`static rt_err_t configure(struct rt_spi_device device, struct rt_spi_configuration configuration);`
`131`	`136`	`static rt_uint32_t xfer(struct rt_spi_device device, struct rt_spi_message message);`
	`137`	`+`
`132`	`138`	`const static unsigned char SPI_DIV_TABLE[] = {0b0000, 0b0001, 0b0100, 0b0010, 0b0011, 0b0101, 0b0110, 0b0111, 0b1000, 0b1001, 0b1010, 0b1011};`
`133`	`139`	`// 2 4 8 16 32 64 128 256 512 1024 2048 4096`
`134`	`140`	`static rt_err_t configure(struct rt_spi_device *device,`
`@@ -171,8 +177,8 @@ static rt_err_t configure(struct rt_spi_device *device,`
`171`	`177`
`172`	`178`	`return RT_EOK;`
`173`	`179`	`}`
`174`		`-static rt_uint32_t xfer(struct rt_spi_device *device,`
`175`		`- struct rt_spi_message *message)`
	`180`	`+`
	`181`	`+static rt_uint32_t xfer(struct rt_spi_device device, struct rt_spi_message message)`
`176`	`182`	`{`
`177`	`183`
`178`	`184`	`unsigned char cs = 0;`
`@@ -214,18 +220,19 @@ static rt_uint32_t xfer(struct rt_spi_device *device,`
`214`	`220`	`}`
`215`	`221`	`return message->length;`
`216`	`222`	`}`
	`223`	`+`
`217`	`224`	`static struct rt_spi_ops loongson_spi_ops =`
`218`	`225`	`{`
`219`	`226`	`.configure = configure,`
`220`	`227`	`.xfer = xfer`
`221`	`228`	`};`
`222`	`229`	`static struct rt_spi_bus loongson_spi;`
	`230`	`+`
`223`	`231`	`static int loongson_spi_init()`
`224`	`232`	`{`
`225`	`233`	`//rt_kprintf("spi_init\n");`
`226`	`234`	`return rt_spi_bus_register(&loongson_spi, "spi", &loongson_spi_ops);`
`227`	`235`	`}`
`228`	`236`	`INIT_BOARD_EXPORT(loongson_spi_init);`
`229`		`-`
`230`	`237`	`#endif`
`231`	`238`	`/@}/`