- Remove duplicated line feeds and unnecessary annotations.

- Maintainers information is now corrected.
- Withdraw the modification on EXEC_PATH of the gcc toolchain.

Author: 0xcccccccccccc

bsp/ls2kdev/README.md

@@ -123,10 +123,9 @@ title   TFTPBOOT
 
 ## 6. 联系人信息
 
-维护人：[bernard][4],[0xcccccccccccc][5]
+维护人：[bernard][4]
 
 [1]: http://ftp.loongnix.org/loongsonpi/pi_2/doc
 [2]: https://pan.baidu.com/s/17dbdOE4NAJ-qEW7drVRq2w
 [3]: http://ftp.loongnix.org/embedd/ls2k/
-[4]: https://github.com/BernardXiong
-[5]: https://github.com/0xcccccccccccc
+[4]: https://github.com/BernardXiong

bsp/ls2kdev/drivers/drv_spi.c

@@ -1,20 +1,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
-
 #include <rtthread.h>
 #include <drivers/spi.h>
-
 #include "drv_spi.h"
 
 #ifdef RT_USING_SPI
-
-
-
 static void spi_init(uint8_t spre_spr, uint8_t copl, uint8_t cpha)
 {
-    //rt_kprintf("SPI initiating with spre_spr:%2X ,copl:%2X ,cpha:%2X\n",spre_spr,copl,cpha);
-    int d;
     SET_SPI(SPSR, 0xc0 | (spre_spr & 0b00000011));
     SET_SPI(PARAM, 0x40);
     SET_SPI(PARAM2, 0x01);
@@ -23,23 +16,19 @@ 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) //old method
+static void spi_set_csn(uint8_t val) 
 {
     SET_SPI(SOFTCS, val);
 }
-// #define RT_USING_SPI_GPIOCS
 
 #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
         if (new_status)         // cs = 1
@@ -51,20 +40,16 @@ static void spi_set_cs(unsigned char cs, int new_status)
             val &= ~(0x10 << cs);           // csn=0
         }
         SET_SPI(SOFTCS, val);
-
         return ;
     }
 #ifdef RT_USING_SPI_GPIOCS
     else
     {
-        //rt_kprintf("[Warnning] GPIOCS is an experimental feature: \n ");
-        //rt_kprintf("[Warnning] GPIO%d will be set to OUTPUT with value %d \n ",cs,new_status);
-        rt_pin_mode(cs, PIN_MODE_OUTPUT);
+        rt_pin_mode(cs, PIN_MODE_OUTPUT); // with RT_USING_SPI_GPIOCS feature enabled, gpio will be used as csn pin.
         rt_pin_write(cs, new_status);
     }
 #endif
 }
-
 static uint8_t spi_write_for_response(uint8_t data)
 {
     uint8_t val;
@@ -74,33 +59,27 @@ static uint8_t spi_write_for_response(uint8_t data)
     return val;
 }
 
-
-
 static int cmd_spi_init(int argc, char *argv[])
 {
     uint8_t spre_spr, cpol, cpha;
     switch (argc)
     {
     case 2:
-
         spre_spr = strtoul(argv[1], NULL, 0);
         spi_init(spre_spr, 0, 0);
         break;
     case 4:
-
         spre_spr = strtoul(argv[1], NULL, 0);
         cpol = strtoul(argv[2], NULL, 0);
         cpha = strtoul(argv[3], NULL, 0);
         spi_init(spre_spr, 0, 0);
         break;
-
     default:
         printf("\nusage : cmd_spi_init spre_spr <cpol> <cpha>\n(cmd_spi_init 0x4 0x0 0x0)\n0x4:div8 0xb:div4096\n");
         break;
     }
 }
 MSH_CMD_EXPORT(cmd_spi_init, cmd_spi_init);
-
 static int cmd_spi_set_csn(int argc, char *argv[])
 {
     uint8_t val, csn;
@@ -111,52 +90,43 @@ static int cmd_spi_set_csn(int argc, char *argv[])
         val = strtoul(argv[2], NULL, 0);
         spi_set_cs(csn, val);
         break;
-
     default:
         printf("usage:cmd_spi_set_csn csn val\n(0xbf for csn1 enable,0xff for csn1 disable)\n");
         break;
     }
 }
 MSH_CMD_EXPORT(cmd_spi_set_csn, cmd_spi_set_csn);
-
 static int cmd_spi_write(int argc, char *argv[])
 {
     uint8_t data, resp;
     switch (argc)
     {
     case 2:
-
         data = strtoul(argv[1], NULL, 0);
         resp = spi_write_for_response(data);
         printf("resp:%2X\n", resp);
         break;
-
     default:
         printf("usage:cmd_spi_write data\n");
         break;
     }
 }
 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,
                           struct rt_spi_configuration *configuration)
 {
 
-
     unsigned char cpol = 0;
     unsigned char cpha = 0;
 
-
     RT_ASSERT(NULL != device);
     RT_ASSERT(NULL != configuration);
 
-
     // baudrate
     if (configuration->mode & RT_SPI_CPOL)      // cpol
     {
@@ -174,54 +144,36 @@ static rt_err_t configure(struct rt_spi_device *device,
     {
         cpha = 0;
     }
-    //rt_kprintf("configure: cpol:%d cpha:%d\n",cpol,cpha);
-
 
     float spi_max_speed = ((float)APB_MAX_SPEED) / (8.0 / (float)APB_FREQSCALE);
-    //rt_kprintf("spi max speed: %ld\n",(unsigned long)spi_max_speed);
-
-
     uint64_t div = (uint64_t)(spi_max_speed / (float)configuration->max_hz);
-    //rt_kprintf("require speed: %ld\n",configuration->max_hz);
     int ctr = 0;
     while (div != 1 && ctr < 12)
     {
         ctr++;
         div = div >> 1;
     }
-    //rt_kprintf("spi speed set to: %ld\n",(unsigned long)((spi_max_speed)/(float)(1<<ctr)));
     spi_init(SPI_DIV_TABLE[ctr], cpol, cpha);
 
-
     return RT_EOK;
 }
-
 static rt_uint32_t xfer(struct rt_spi_device *device,
                         struct rt_spi_message *message)
 {
 
-
-    //rt_kprintf("xfer:\n");
     unsigned char cs = 0;
     rt_uint32_t size = 0;
     const rt_uint8_t *send_ptr = NULL;
     rt_uint8_t *recv_ptr = NULL;
     rt_uint8_t data = 0;
-
     RT_ASSERT(NULL != device);
     RT_ASSERT(NULL != message);
-
     cs = (unsigned char)(device->parent.user_data);
     size = message->length;
-
-    //rt_kprintf("[%s] cs=%d\n", __FUNCTION__,  cs);
-
-    // take cs
     if (message->cs_take)
     {
         spi_set_cs(cs, 0);
     }
-
     // send data
     send_ptr = message->send_buf;
     recv_ptr = message->recv_buf;
@@ -232,7 +184,6 @@ static rt_uint32_t xfer(struct rt_spi_device *device,
         {
             data = *send_ptr++;
         }
-
         if (NULL != recv_ptr)
         {
             *recv_ptr++ = spi_write_for_response(data);
@@ -242,31 +193,24 @@ static rt_uint32_t xfer(struct rt_spi_device *device,
             spi_write_for_response(data);
         }
     }
-
     // release cs
     if (message->cs_release)
     {
         spi_set_cs(cs, 1);
     }
-
     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

bsp/ls2kdev/drivers/drv_spi.h

@@ -1,22 +1,20 @@
-#ifndef DRV_SPI_H
-#define DRV_SPI_H
+#ifndef LS2K_DRV_SPI_H
+#define LS2K_DRV_SPI_H
 
 #include <rtthread.h>
 #include <rthw.h>
 
-
-
-#define RFEMPTY 1
+// kseg1 byte operation
 #define KSEG1_STORE8(addr,val)	 *(volatile char *)(0xffffffffa0000000 | addr) = val
 #define KSEG1_LOAD8(addr)	 *(volatile char *)(0xffffffffa0000000 | addr) 
-
+// clock configurations
 #define APB_MAX_SPEED 125000000U
 #define APB_FREQSCALE (((KSEG1_LOAD8(0xffffffffbfe104d2)>>4)&0x7)+1)
-
+// base addrs
 #define SPI_BASE  0x1fff0220
 #define PMON_ADDR 0xa1000000
 #define FLASH_ADDR 0x000000
-
+// bit bias
 #define SPCR      0x0
 #define SPSR      0x1
 #define FIFO	  0x2
@@ -26,18 +24,9 @@
 #define PARAM     0x4
 #define SOFTCS    0x5
 #define PARAM2    0x6
-
-
-
-
+#define RFEMPTY 1
+// SPI controller operaion macros
 #define SET_SPI(addr,val)        KSEG1_STORE8(SPI_BASE+addr,val)
 #define GET_SPI(addr)            KSEG1_LOAD8(SPI_BASE+addr)
 
-
-
-//void spi_init(uint8_t ,uint8_t,uint8_t);
-//void spi_set_csn(uint8_t);
-//uint8_t spi_write_for_response(uint8_t);
-
-
 #endif