Merge pull request #5177 from Guozhanxin/gitee_master

同步 Gitee master

1 files changed, 14 insertions, 9 deletions

diff --git a/bsp/ls2kdev/drivers/drv_spi.c b/bsp/ls2kdev/drivers/drv_spi.c
index 71583eb206..daf069412b 100644
--- a/bsp/ls2kdev/drivers/drv_spi.c
+++ b/bsp/ls2kdev/drivers/drv_spi.c
@@ -15,7 +15,6 @@
 /*@{*/
 
 #include <stdlib.h>
-#include <stdint.h>
 #include <ctype.h>
 #include <stdint.h>
 #include <rtthread.h>
@@ -23,6 +22,10 @@
 #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);
@@ -33,21 +36,18 @@ static void spi_init(uint8_t spre_spr, uint8_t copl, uint8_t cpha)
     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)
 {
     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
@@ -67,6 +67,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;
@@ -97,6 +98,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;
@@ -113,6 +115,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;
@@ -132,6 +135,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,
@@ -174,8 +178,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;
@@ -217,18 +221,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
 /*@}*/