diff options
| -rw-r--r-- | bsp/ls1cdev/libraries/ls1c_pin.c | 9 | ||||
| -rw-r--r-- | bsp/ls1cdev/libraries/ls1c_pin.h | 1 | ||||
| -rw-r--r-- | bsp/ls1cdev/libraries/ls1c_spi.c | 115 |
3 files changed, 68 insertions, 57 deletions
diff --git a/bsp/ls1cdev/libraries/ls1c_pin.c b/bsp/ls1cdev/libraries/ls1c_pin.c index 2dd71d79b1..15b4157b15 100644 --- a/bsp/ls1cdev/libraries/ls1c_pin.c +++ b/bsp/ls1cdev/libraries/ls1c_pin.c @@ -42,6 +42,15 @@ void pin_set_remap(unsigned int gpio, pin_remap_t remap) volatile unsigned int *reg = NULL; // ���üĴ��� unsigned int port = GPIO_GET_PORT(gpio); unsigned int pin = GPIO_GET_PIN(gpio); + int i; + + /*ָ��ȫ��pin����Ϊ0*/ + for(i =0; i <=4; i++) + { + reg = (volatile unsigned int *)((LS1C_CBUS_FIRST0)+((port)*0x04)+((i)*0x10)); + // ��0 + reg_clr_one_bit(reg, pin); + } switch (port) { diff --git a/bsp/ls1cdev/libraries/ls1c_pin.h b/bsp/ls1cdev/libraries/ls1c_pin.h index ca8ef31585..c483f5659a 100644 --- a/bsp/ls1cdev/libraries/ls1c_pin.h +++ b/bsp/ls1cdev/libraries/ls1c_pin.h @@ -20,6 +20,7 @@ typedef enum PIN_REMAP_THIRD, // �������� PIN_REMAP_FOURTH, // ���ĸ��� PIN_REMAP_FIFTH, // ���帴�� + PIN_REMAP_DEFAULT, //ȱʡ���� }pin_remap_t; diff --git a/bsp/ls1cdev/libraries/ls1c_spi.c b/bsp/ls1cdev/libraries/ls1c_spi.c index 7da50e1c37..e3df729064 100644 --- a/bsp/ls1cdev/libraries/ls1c_spi.c +++ b/bsp/ls1cdev/libraries/ls1c_spi.c @@ -19,10 +19,10 @@ * * Change Logs: * Date Author Notes - * 2017-10-23 ��Ϊ�� first version + * 2017-10-23 勤为本 first version */ -// Ӳ��spi�ӿ�Դ�ļ� +// 硬件spi接口源文件 #include <string.h> @@ -35,8 +35,8 @@ /* - * ��ȡָ��SPIģ��Ļ���ַ - * @SPIx SPIģ��ı�� + * 获取指定SPI模块的基地址 + * @SPIx SPI模块的编号 */ inline void *ls1c_spi_get_base(unsigned char SPIx) { @@ -62,8 +62,8 @@ inline void *ls1c_spi_get_base(unsigned char SPIx) /* - * ��ӡָ��SPIģ������мĴ�����ֵ - * @spi_base ����ַ + * 打印指定SPI模块的所有寄存器的值 + * @spi_base 基地址 */ void ls1c_spi_print_all_regs_info(void *spi_base) { @@ -81,9 +81,9 @@ void ls1c_spi_print_all_regs_info(void *spi_base) /* - * ����SPIʱ��Ƶ�ʼ����Ƶϵ�� - * @max_speed_hz SPI���ͨ���ٶ� - * @ret ��Ƶϵ�� + * 根据SPI时钟频率计算分频系数 + * @max_speed_hz SPI最大通信速度 + * @ret 分频系数 */ unsigned int ls1c_spi_get_div(unsigned int max_speed_hz) { @@ -145,28 +145,28 @@ unsigned int ls1c_spi_get_div(unsigned int max_speed_hz) /* - * ����ʱ�� - * @spi_base ����ַ - * @max_hz ���Ƶ�ʣ���λhz + * 设置时钟 + * @spi_base 基地址 + * @max_hz 最大频率，单位hz */ void ls1c_spi_set_clock(void *spi_base, unsigned long max_hz) { unsigned int div = 0; unsigned char val = 0; - // ��ȡ��Ƶϵ�� + // 获取分频系数 div = ls1c_spi_get_div(max_hz); - // ����spr + // 设置spr val = reg_read_8(spi_base + LS1C_SPI_SPCR_OFFSET); - val &= (~LS1C_SPI_SPCR_SPR_MASK); // spr���� - val |= (div & LS1C_SPI_SPCR_SPR_MASK); // �����µ�spr + val &= (~LS1C_SPI_SPCR_SPR_MASK); // spr清零 + val |= (div & LS1C_SPI_SPCR_SPR_MASK); // 设置新的spr reg_write_8(val, spi_base + LS1C_SPI_SPCR_OFFSET); - // ����spre + // 设置spre val = reg_read_8(spi_base + LS1C_SPI_SPER_OFFSET); - val &= (~LS1C_SPI_SPER_SPRE_MASK); // spre���� - val |= ((div >> 2) & LS1C_SPI_SPER_SPRE_MASK); // �����µ�spre + val &= (~LS1C_SPI_SPER_SPRE_MASK); // spre清零 + val |= ((div >> 2) & LS1C_SPI_SPER_SPRE_MASK); // 设置新的spre reg_write_8(val, spi_base + LS1C_SPI_SPER_OFFSET); return ; @@ -174,10 +174,10 @@ void ls1c_spi_set_clock(void *spi_base, unsigned long max_hz) /* - * ����ͨ��ģʽ(ʱ�Ӽ��Ժ���λ) - * @spi_base ����ַ - * @cpol ʱ�Ӽ��� - * @cpha ʱ����λ + * 设置通信模式(时钟极性和相位) + * @spi_base 基地址 + * @cpol 时钟极性 + * @cpha 时钟相位 */ void ls1c_spi_set_mode(void *spi_base, unsigned char cpol, unsigned char cpha) { @@ -185,13 +185,13 @@ void ls1c_spi_set_mode(void *spi_base, unsigned char cpol, unsigned char cpha) val = reg_read_8(spi_base + LS1C_SPI_SPCR_OFFSET); - // ����ʱ�Ӽ���--cpol - val &= (~LS1C_SPI_SPCR_CPOL_MASK); // cpol��0 - val |= (cpol << LS1C_SPI_SPCR_CPOL_BIT); // д���µ�cpol + // 设置时钟极性--cpol + val &= (~LS1C_SPI_SPCR_CPOL_MASK); // cpol清0 + val |= (cpol << LS1C_SPI_SPCR_CPOL_BIT); // 写入新的cpol - // ����ʱ����λ--cpha - val &= (~LS1C_SPI_SPCR_CPHA_MASK); // cpha��0 - val |= (cpha << LS1C_SPI_SPCR_CPHA_BIT); // д���µ�cpha + // 设置时钟相位--cpha + val &= (~LS1C_SPI_SPCR_CPHA_MASK); // cpha清0 + val |= (cpha << LS1C_SPI_SPCR_CPHA_BIT); // 写入新的cpha reg_write_8(val, spi_base + LS1C_SPI_SPCR_OFFSET); @@ -200,23 +200,24 @@ void ls1c_spi_set_mode(void *spi_base, unsigned char cpol, unsigned char cpha) /* - * ����ָ��ƬѡΪָ��״̬ - * @spi_base ����ַ - * @cs Ƭѡ - * @new_status Ƭѡ���ŵ���״̬��ȡֵΪ0��1�����ߵ�ƽ��͵�ƽ + * 设置指定片选为指定状态 + * @spi_base 基地址 + * @cs 片选 + * @new_status 片选引脚的新状态，取值为0或1，即高电平或低电平 */ void ls1c_spi_set_cs(void *spi_base, unsigned char cs, int new_status) { unsigned char val = 0; - val = 0xf0 | (0x01 << cs); // ȫ��csn=1��ָ����csen=1 + val = reg_read_8(spi_base + LS1C_SPI_SFC_SOFTCS_OFFSET); + val |= 0x01 << cs ; //对应的csen=1 if (new_status) // cs = 1 { - val |= (0x10 << cs); // ָ��csn=1 + val |= (0x10 << cs); // 指定csn=1 } else // cs = 0 { - val &= ~(0x10 << cs); // ָ��csn=0 + val &= ~(0x10 << cs); // 指定csn=0 } reg_write_8(val, spi_base + LS1C_SPI_SFC_SOFTCS_OFFSET); @@ -225,8 +226,8 @@ void ls1c_spi_set_cs(void *spi_base, unsigned char cs, int new_status) /* - * �ȴ��շ���� - * @spi_base ����ַ + * 等待收发完成 + * @spi_base 基地址 */ inline void ls1c_spi_wait_txrx_done(void *spi_base) { @@ -243,25 +244,25 @@ inline void ls1c_spi_wait_txrx_done(void *spi_base) /* - * ���жϺͱ�־λ - * @spi_base ����ַ + * 清中断和标志位 + * @spi_base 基地址 */ inline void ls1c_spi_clear(void *spi_base) { unsigned char val = 0; - // ���ж� + // 清中断 val = reg_read_8(spi_base + LS1C_SPI_SPSR_OFFSET); val |= LS1C_SPI_SPSR_SPIF_MASK; reg_write_8(val, spi_base + LS1C_SPI_SPSR_OFFSET); - // �������־λ(Write-Collision Clear) + // 清溢出标志位(Write-Collision Clear) val = reg_read_8(spi_base + LS1C_SPI_SPSR_OFFSET); if (LS1C_SPI_SPSR_WCOL_MASK & val) { - rt_kprintf("[%s] clear register SPSR's wcol!\r\n"); // �ֲ��linuxԴ���в�һ�����Ӹ���ӡ���� - reg_write_8(val & ~LS1C_SPI_SPSR_WCOL_MASK, spi_base + LS1C_SPI_SPSR_OFFSET); // д0��linuxԴ������д0 -// reg_write_8(val | LS1C_SPI_SPSR_WCOL_MASK, spi_base + LS1C_SPI_SPSR_OFFSET); // д1������1c�ֲᣬӦ��д1 + rt_kprintf("[%s] clear register SPSR's wcol!\r\n"); // 手册和linux源码中不一样，加个打印看看 + reg_write_8(val & ~LS1C_SPI_SPSR_WCOL_MASK, spi_base + LS1C_SPI_SPSR_OFFSET); // 写0，linux源码中是写0 +// reg_write_8(val | LS1C_SPI_SPSR_WCOL_MASK, spi_base + LS1C_SPI_SPSR_OFFSET); // 写1，按照1c手册，应该写1 } return ; @@ -270,23 +271,23 @@ inline void ls1c_spi_clear(void *spi_base) /* - * ͨ��ָ��SPI���ͽ���һ���ֽ� - * ע�⣬�ڶ������ϵͳ�У��˺�����Ҫ���⡣ - * ����֤�ں�ij�����豸�շ�ij���ֽڵĹ����У����ܱ��л�����������ͬʱ���������ͬһ��SPI�����ϵĴ��豸ͨ�� - * ��Ϊ��о1c��ÿ·SPI�Ͽ��ܽ��в�ͬ�Ĵ��豸��ͨ��Ƶ�ʡ�ģʽ�ȿ��ܲ�ͬ - * @spi_base ����ַ - * @tx_ch �����͵����� - * @ret �յ������� + * 通过指定SPI发送接收一个字节 + * 注意，在多任务的系统中，此函数需要互斥。 + * 即保证在和某个从设备收发某个字节的过程中，不能被切换到其它任务同时与另外的在同一个SPI总线上的从设备通信 + * 因为龙芯1c的每路SPI上可能接有不同的从设备，通信频率、模式等可能不同 + * @spi_base 基地址 + * @tx_ch 待发送的数据 + * @ret 收到的数据 */ unsigned char ls1c_spi_txrx_byte(void *spi_base, unsigned char tx_ch) { unsigned char rx_ch = 0; - // �շ����� - reg_write_8(tx_ch, spi_base + LS1C_SPI_TxFIFO_OFFSET); // ��ʼ���� - ls1c_spi_wait_txrx_done(spi_base); // �ȴ��շ���� - rx_ch = reg_read_8(spi_base + LS1C_SPI_RxFIFO_OFFSET); // ��ȡ�յ������� - ls1c_spi_clear(spi_base); // ���жϺͱ�־λ + // 收发数据 + reg_write_8(tx_ch, spi_base + LS1C_SPI_TxFIFO_OFFSET); // 开始发送 + ls1c_spi_wait_txrx_done(spi_base); // 等待收发完成 + rx_ch = reg_read_8(spi_base + LS1C_SPI_RxFIFO_OFFSET); // 读取收到的数据 + ls1c_spi_clear(spi_base); // 清中断和标志位 return rx_ch; } |