From 1bbe09df9492378fe2f8d71271f33d721c6eee9d Mon Sep 17 00:00:00 2001 From: 勤为本 <1207280597@qq.com> Date: Tue, 7 Nov 2017 16:47:39 +0800 Subject: 把龙芯1cçš„SPI接å�£æ”¹ä¸ºRTT统一的SPI接å�£ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bsp/ls1cdev/drivers/drv_spi.c | 229 +++++++++++++++++++++++++++++++++++++++ bsp/ls1cdev/drivers/drv_spi.h | 55 ++++++++++ bsp/ls1cdev/drivers/led.c | 40 ------- bsp/ls1cdev/drivers/led.h | 27 ----- bsp/ls1cdev/libraries/ls1c_spi.c | 141 +++++------------------- bsp/ls1cdev/libraries/ls1c_spi.h | 96 +++++++++++----- bsp/ls1cdev/rtconfig.h | 5 + 7 files changed, 389 insertions(+), 204 deletions(-) create mode 100644 bsp/ls1cdev/drivers/drv_spi.c create mode 100644 bsp/ls1cdev/drivers/drv_spi.h delete mode 100644 bsp/ls1cdev/drivers/led.c delete mode 100644 bsp/ls1cdev/drivers/led.h diff --git a/bsp/ls1cdev/drivers/drv_spi.c b/bsp/ls1cdev/drivers/drv_spi.c new file mode 100644 index 0000000000..b26de557db --- /dev/null +++ b/bsp/ls1cdev/drivers/drv_spi.c @@ -0,0 +1,229 @@ +/* + * File : drv_spi.c + * This file is part of RT-Thread RTOS + * COPYRIGHT (C) 2006 - 2012, RT-Thread Development Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Change Logs: + * Date Author Notes + * 2017-11-02 ÇÚΪ±¾ first version + */ + +#include +#include +#include "drv_spi.h" + + +//#define DEBUG + +#ifdef DEBUG +#define DEBUG_PRINTF(...) rt_kprintf(__VA_ARGS__) +#else +#define DEBUG_PRINTF(...) +#endif + + +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); + + +static struct rt_spi_ops ls1c_spi_ops = +{ + .configure = configure, + .xfer = xfer +}; + + +static rt_err_t configure(struct rt_spi_device *device, + struct rt_spi_configuration *configuration) +{ + struct rt_spi_bus *spi_bus = NULL; + struct ls1c_spi *ls1c_spi = NULL; + unsigned char SPIx = 0; + void *spi_base = NULL; + unsigned char cpol = 0; + unsigned char cpha = 0; + unsigned char val = 0; + + RT_ASSERT(NULL != device); + RT_ASSERT(NULL != configuration); + + spi_bus = device->bus; + ls1c_spi = (struct ls1c_spi *)spi_bus->parent.user_data; + SPIx = ls1c_spi->SPIx; + spi_base = ls1c_spi_get_base(SPIx); + + { + // ʹÄÜSPI¿ØÖÆÆ÷£¬masterģʽ£¬¹Ø±ÕÖÐ¶Ï + reg_write_8(0x53, spi_base + LS1C_SPI_SPCR_OFFSET); + + // Çå¿Õ״̬¼Ä´æÆ÷ + reg_write_8(0xc0, spi_base + LS1C_SPI_SPSR_OFFSET); + + // 1×Ö½Ú²úÉúÖжϣ¬²ÉÑù(¶Á)Óë·¢ËÍ(д)ʱ»úͬʱ + reg_write_8(0x03, spi_base + LS1C_SPI_SPER_OFFSET); + + // ¹Ø±ÕSPI flash + val = reg_read_8(spi_base + LS1C_SPI_SFC_PARAM_OFFSET); + val &= 0xfe; + reg_write_8(val, spi_base + LS1C_SPI_SFC_PARAM_OFFSET); + + // spi flashʱÐò¿ØÖƼĴæÆ÷ + reg_write_8(0x05, spi_base + LS1C_SPI_SFC_TIMING_OFFSET); + } + + // baudrate + ls1c_spi_set_clock(spi_base, configuration->max_hz); + + // ÉèÖÃͨÐÅģʽ(ʱÖÓ¼«ÐÔºÍÏàλ) + if (configuration->mode & RT_SPI_CPOL) // cpol + { + cpol = SPI_CPOL_1; + } + else + { + cpol = SPI_CPOL_0; + } + if (configuration->mode & RT_SPI_CPHA) // cpha + { + cpha = SPI_CPHA_1; + } + else + { + cpha = SPI_CPHA_0; + } + ls1c_spi_set_mode(spi_base, cpol, cpha); + + DEBUG_PRINTF("ls1c spi%d configuration\n", SPIx); + + return RT_EOK; +} + + +static rt_uint32_t xfer(struct rt_spi_device *device, + struct rt_spi_message *message) +{ + struct rt_spi_bus *spi_bus = NULL; + struct ls1c_spi *ls1c_spi = NULL; + void *spi_base = NULL; + unsigned char SPIx = 0; + struct ls1c_spi_cs *ls1c_spi_cs = NULL; + 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); + + spi_bus = device->bus; + ls1c_spi = spi_bus->parent.user_data; + SPIx = ls1c_spi->SPIx; + spi_base = ls1c_spi_get_base(SPIx); + ls1c_spi_cs = device->parent.user_data; + cs = ls1c_spi_cs->cs; + size = message->length; + + DEBUG_PRINTF("[%s] SPIx=%d, cs=%d\n", __FUNCTION__, SPIx, cs); + + // take cs + if (message->cs_take) + { + ls1c_spi_set_cs(spi_base, cs, 0); + } + + // ÊÕ·¢Êý¾Ý + send_ptr = message->send_buf; + recv_ptr = message->recv_buf; + while (size--) + { + data = 0xFF; + if (NULL != send_ptr) + { + data = *send_ptr++; + } + + if (NULL != recv_ptr) + { + *recv_ptr++ = ls1c_spi_txrx_byte(spi_base, data); + } + else + { + ls1c_spi_txrx_byte(spi_base, data); + } + } + + // release cs + if (message->cs_release) + { + ls1c_spi_set_cs(spi_base, cs, 1); + } + + return message->length; +} + + +#ifdef RT_USING_SPI0 +struct ls1c_spi ls1c_spi0 = +{ + .SPIx = LS1C_SPI_0, +}; + +static struct rt_spi_bus spi0_bus; +#endif + + +#ifdef RT_USING_SPI1 +struct ls1c_spi ls1c_spi1 = +{ + .SPIx = LS1C_SPI_1, +}; + +static struct rt_spi_bus spi1_bus; +#endif + + +/* + * ³õʼ»¯²¢×¢²áÁúо1cµÄspi×ÜÏß + * @SPI SPI×ÜÏߣ¬±ÈÈçLS1C_SPI_0£¬ LS1C_SPI_1 + * @spi_bus_name ×ÜÏßÃû×Ö + * @ret + */ +rt_err_t ls1c_spi_bus_register(rt_uint8_t SPI, const char *spi_bus_name) +{ + struct rt_spi_bus *spi_bus = NULL; + +#ifdef RT_USING_SPI0 + if (LS1C_SPI_0 == SPI) + { + spi_bus = &spi0_bus; + spi_bus->parent.user_data = &ls1c_spi0; + } +#endif + +#ifdef RT_USING_SPI1 + if (LS1C_SPI_1 == SPI) + { + spi_bus = &spi1_bus; + spi_bus->parent.user_data = &ls1c_spi1; + } +#endif + + return rt_spi_bus_register(spi_bus, spi_bus_name, &ls1c_spi_ops); +} + + diff --git a/bsp/ls1cdev/drivers/drv_spi.h b/bsp/ls1cdev/drivers/drv_spi.h new file mode 100644 index 0000000000..94fbb58097 --- /dev/null +++ b/bsp/ls1cdev/drivers/drv_spi.h @@ -0,0 +1,55 @@ +/* + * File : drv_spi.h + * This file is part of RT-Thread RTOS + * COPYRIGHT (C) 2006 - 2012, RT-Thread Development Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Change Logs: + * Date Author Notes + * 2017-11-02 ÇÚΪ±¾ first version + */ + +#ifndef LS1C_DRV_SPI_H +#define LS1C_DRV_SPI_H + + +#include "../libraries/ls1c_spi.h" + + +struct ls1c_spi +{ + unsigned char SPIx; // LS1C_SPI_0 or LS1C_SPI_1 +}; + + +struct ls1c_spi_cs +{ + unsigned char cs; // LS1C_SPI_CS_0, LS1C_SPI_CS_1, LS1C_SPI_CS_2 or LS1C_SPI_CS_3 +}; + + + +/* + * ³õʼ»¯²¢×¢²áÁúо1cµÄspi×ÜÏß + * @SPI SPI×ÜÏߣ¬±ÈÈçLS1C_SPI_0£¬ LS1C_SPI_1 + * @spi_bus_name ×ÜÏßÃû×Ö + * @ret + */ +rt_err_t ls1c_spi_bus_register(rt_uint8_t SPI, const char *spi_bus_name); + + +#endif + diff --git a/bsp/ls1cdev/drivers/led.c b/bsp/ls1cdev/drivers/led.c deleted file mode 100644 index 6f73ac9892..0000000000 --- a/bsp/ls1cdev/drivers/led.c +++ /dev/null @@ -1,40 +0,0 @@ -// led½Ó¿Ú -// ʹÓÃµÍµçÆ½µãÁÁled£¬¸ßµçƽϨÃðled - - -#include "ls1c_gpio.h" - - -// ³õʼ»¯led -// @led_gpio ledËùÔÚgpioÒý½Å -void led_init(unsigned int led_gpio) -{ - gpio_init(led_gpio, gpio_mode_output); - gpio_set(led_gpio, gpio_level_high); // ָʾµÆÄ¬ÈÏϨÃð - - return ; -} - - -// µãÁÁled -// @led_gpio ledËùÔÚgpioÒý½Å -void led_on(unsigned int led_gpio) -{ - gpio_set(led_gpio, gpio_level_low); - - return ; -} - - -// ϨÃðled -// @led_gpio -void led_off(unsigned int led_gpio) -{ - gpio_set(led_gpio, gpio_level_high); - - return ; -} - - - - diff --git a/bsp/ls1cdev/drivers/led.h b/bsp/ls1cdev/drivers/led.h deleted file mode 100644 index 76ea905371..0000000000 --- a/bsp/ls1cdev/drivers/led.h +++ /dev/null @@ -1,27 +0,0 @@ -// led½Ó¿Ú -// ʹÓÃµÍµçÆ½µãÁÁled£¬¸ßµçƽϨÃðled - -#ifndef __OPENLOONGSON_LED_H -#define __OPENLOONGSON_LED_H - - -// ³õʼ»¯led -// @led_gpio ledËùÔÚgpioÒý½Å -void led_init(unsigned int led_gpio); - - -// µãÁÁled -// @led_gpio ledËùÔÚgpioÒý½Å -void led_on(unsigned int led_gpio); - - -// ϨÃðled -// @led_gpio -void led_off(unsigned int led_gpio); - - - - - -#endif - diff --git a/bsp/ls1cdev/libraries/ls1c_spi.c b/bsp/ls1cdev/libraries/ls1c_spi.c index 8547626c30..7da50e1c37 100644 --- a/bsp/ls1cdev/libraries/ls1c_spi.c +++ b/bsp/ls1cdev/libraries/ls1c_spi.c @@ -32,53 +32,13 @@ #include "ls1c_spi.h" -// ¼Ä´æÆ÷Æ«ÒÆ -#define LS1C_SPI_SPCR_OFFSET (0) // ¿ØÖƼĴæÆ÷ -#define LS1C_SPI_SPSR_OFFSET (1) // ״̬¼Ä´æÆ÷ -#define LS1C_SPI_TxFIFO_OFFSET (2) // ·¢Ë͵ÄÊý¾Ý¼Ä´æÆ÷£¬Óë½ÓÊÕÊý¾Ý¼Ä´æÆ÷µÄÆ«ÒÆÏàͬ -#define LS1C_SPI_RxFIFO_OFFSET (2) // ½ÓÊÕµÄÊý¾Ý¼Ä´æÆ÷£¬Óë·¢ËÍÊý¾Ý¼Ä´æÆ÷µÄÆ«ÒÆÏàͬ -#define LS1C_SPI_SPER_OFFSET (3) // Íⲿ¼Ä´æÆ÷ -#define LS1C_SPI_SFC_PARAM_OFFSET (4) // ²ÎÊý¿ØÖƼĴæÆ÷ -#define LS1C_SPI_SFC_SOFTCS_OFFSET (5) // Ƭѡ¿ØÖƼĴæÆ÷ -#define LS1C_SPI_SFC_TIMING_OFFSET (6) // ʱÐò¿ØÖƼĴæÆ÷ - -// ¼Ä´æÆ÷SPCRÖеÄλÓò -#define LS1C_SPI_SPCR_SPIE_BIT (7) -#define LS1C_SPI_SPCR_SPIE_MASK (0x01 << LS1C_SPI_SPCR_SPIE_BIT) -#define LS1C_SPI_SPCR_SPE_BIT (6) -#define LS1C_SPI_SPCR_SPE_MASK (0x01 << LS1C_SPI_SPCR_SPE_BIT) -#define LS1C_SPI_SPCR_CPOL_BIT (3) -#define LS1C_SPI_SPCR_CPOL_MASK (0x01 << LS1C_SPI_SPCR_CPOL_BIT) -#define LS1C_SPI_SPCR_CPHA_BIT (2) -#define LS1C_SPI_SPCR_CPHA_MASK (0x01 << LS1C_SPI_SPCR_CPHA_BIT) -#define LS1C_SPI_SPCR_SPR_BIT (0) -#define LS1C_SPI_SPCR_SPR_MASK (0x03 << LS1C_SPI_SPCR_SPR_BIT) - -// ¼Ä´æÆ÷SPSRÖеÄλÓò -#define LS1C_SPI_SPSR_SPIF_BIT (7) -#define LS1C_SPI_SPSR_SPIF_MASK (0x01 << LS1C_SPI_SPSR_SPIF_BIT) -#define LS1C_SPI_SPSR_WCOL_BIT (6) -#define LS1C_SPI_SPSR_WCOL_MASK (0x01 << LS1C_SPI_SPSR_WCOL_BIT) - -// ¼Ä´æÆ÷SPERÖеÄλÓò -#define LS1C_SPI_SPER_SPRE_BIT (0) -#define LS1C_SPI_SPER_SPRE_MASK (0x3 << LS1C_SPI_SPER_SPRE_BIT) - -// ¼Ä´æÆ÷SFC_SOFTCSµÄλÓò -#define LS1C_SPI_SFC_SOFTCS_CSN_BIT (4) -#define LS1C_SPI_SFC_SOFTCS_CSN_MASK (0x0f << LS1C_SPI_SFC_SOFTCS_CSN_BIT) -#define LS1C_SPI_SFC_SOFTCS_CSEN_BIT (0) -#define LS1C_SPI_SFC_SOFTCS_CSEN_MASK (0x0f << LS1C_SPI_SFC_SOFTCS_CSEN_BIT) - -// ·¢Ëͳ¬Ê±µÄÃÅÏÞÖµ -#define LS1C_SPI_TX_TIMEOUT (20000) /* * »ñȡָ¶¨SPIÄ£¿éµÄ»ùµØÖ· * @SPIx SPIÄ£¿éµÄ±àºÅ */ -inline void *spi_get_base(ls1c_spi_t SPIx) +inline void *ls1c_spi_get_base(unsigned char SPIx) { void *base = NULL; @@ -103,15 +63,12 @@ inline void *spi_get_base(ls1c_spi_t SPIx) /* * ´òÓ¡Ö¸¶¨SPIÄ£¿éµÄËùÓмĴæÆ÷µÄÖµ - * @spi_info_p SPIÄ£¿éÐÅÏ¢ + * @spi_base »ùµØÖ· */ -void spi_print_all_regs_info(ls1c_spi_info_t *spi_info_p) +void ls1c_spi_print_all_regs_info(void *spi_base) { - void *spi_base = spi_get_base(spi_info_p->SPIx); - - rt_kprintf("[%s] SPI%d's info:\r\n\ - SPCR=0x%x, SPSR=0x%x, SPER=0x%x, SFC_PARAM=0x%x, SFC_SOFTCS=0x%x, SFC_TIMING=0x%x\r\n", - __FUNCTION__, spi_info_p->SPIx, + rt_kprintf("[%s] SPCR=0x%x, SPSR=0x%x, SPER=0x%x, SFC_PARAM=0x%x, SFC_SOFTCS=0x%x, SFC_TIMING=0x%x\r\n", + __FUNCTION__, reg_read_8(spi_base + LS1C_SPI_SPCR_OFFSET), reg_read_8(spi_base + LS1C_SPI_SPSR_OFFSET), reg_read_8(spi_base + LS1C_SPI_SPER_OFFSET), @@ -128,7 +85,7 @@ void spi_print_all_regs_info(ls1c_spi_info_t *spi_info_p) * @max_speed_hz SPI×î´óͨÐÅËÙ¶È * @ret ·ÖƵϵÊý */ -unsigned int spi_get_div(unsigned int max_speed_hz) +unsigned int ls1c_spi_get_div(unsigned int max_speed_hz) { unsigned long clk = 0; unsigned int div = 0; @@ -189,16 +146,16 @@ unsigned int spi_get_div(unsigned int max_speed_hz) /* * ÉèÖÃʱÖÓ - * @spi_info_p SPIÄ£¿éÐÅÏ¢ + * @spi_base »ùµØÖ· + * @max_hz ×î´óƵÂÊ£¬µ¥Î»hz */ -void spi_set_clock(ls1c_spi_info_t *spi_info_p) +void ls1c_spi_set_clock(void *spi_base, unsigned long max_hz) { - void *spi_base = spi_get_base(spi_info_p->SPIx); unsigned int div = 0; unsigned char val = 0; // »ñÈ¡·ÖƵϵÊý - div = spi_get_div(spi_info_p->max_speed_hz); + div = ls1c_spi_get_div(max_hz); // ÉèÖÃspr val = reg_read_8(spi_base + LS1C_SPI_SPCR_OFFSET); @@ -218,22 +175,23 @@ void spi_set_clock(ls1c_spi_info_t *spi_info_p) /* * ÉèÖÃͨÐÅģʽ(ʱÖÓ¼«ÐÔºÍÏàλ) - * @spi_info_p SPIÄ£¿éÐÅÏ¢ + * @spi_base »ùµØÖ· + * @cpol ʱÖÓ¼«ÐÔ + * @cpha ʱÖÓÏàλ */ -void spi_set_mode(ls1c_spi_info_t *spi_info_p) +void ls1c_spi_set_mode(void *spi_base, unsigned char cpol, unsigned char cpha) { - void *spi_base = spi_get_base(spi_info_p->SPIx); unsigned char val = 0; val = reg_read_8(spi_base + LS1C_SPI_SPCR_OFFSET); // ÉèÖÃʱÖÓ¼«ÐÔ--cpol - val &= (~LS1C_SPI_SPCR_CPOL_MASK); // cpolÇå0 - val |= (spi_info_p->cpol << LS1C_SPI_SPCR_CPOL_BIT); // дÈëеÄ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 |= (spi_info_p->cpha << LS1C_SPI_SPCR_CPHA_BIT); // дÈëеÄ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); @@ -243,13 +201,12 @@ void spi_set_mode(ls1c_spi_info_t *spi_info_p) /* * ÉèÖÃÖ¸¶¨Æ¬Ñ¡ÎªÖ¸¶¨×´Ì¬ - * @spi_info_p SPIÄ£¿éÐÅÏ¢ + * @spi_base »ùµØÖ· + * @cs Ƭѡ * @new_status ƬѡÒý½ÅµÄÐÂ״̬£¬È¡ÖµÎª0»ò1£¬¼´¸ßµçƽ»òµÍµçƽ */ -void spi_set_cs(ls1c_spi_info_t *spi_info_p, int new_status) +void ls1c_spi_set_cs(void *spi_base, unsigned char cs, int new_status) { - void *spi_base = spi_get_base(spi_info_p->SPIx); - unsigned char cs = spi_info_p->cs; unsigned char val = 0; val = 0xf0 | (0x01 << cs); // È«²¿csn=1£¬Ö¸¶¨µÄcsen=1 @@ -267,51 +224,12 @@ void spi_set_cs(ls1c_spi_info_t *spi_info_p, int new_status) } -/* - * ³õʼ»¯Ö¸¶¨SPIÄ£¿é - * @spi_info_p SPIÄ£¿éÐÅÏ¢ - */ -void spi_init(ls1c_spi_info_t *spi_info_p) -{ - void *spi_base = spi_get_base(spi_info_p->SPIx); - unsigned char val = 0; - - // ʹÄÜSPI¿ØÖÆÆ÷£¬masterģʽ£¬¹Ø±ÕÖÐ¶Ï - reg_write_8(0x53, spi_base + LS1C_SPI_SPCR_OFFSET); - - // Çå¿Õ״̬¼Ä´æÆ÷ - reg_write_8(0xc0, spi_base + LS1C_SPI_SPSR_OFFSET); - - // 1×Ö½Ú²úÉúÖжϣ¬²ÉÑù(¶Á)Óë·¢ËÍ(д)ʱ»úͬʱ - reg_write_8(0x03, spi_base + LS1C_SPI_SPER_OFFSET); - - // ¹Ø±ÕSPI flash - val = reg_read_8(spi_base + LS1C_SPI_SFC_PARAM_OFFSET); - val &= 0xfe; - reg_write_8(val, spi_base + LS1C_SPI_SFC_PARAM_OFFSET); - - // spi flashʱÐò¿ØÖƼĴæÆ÷ - reg_write_8(0x05, spi_base + LS1C_SPI_SFC_TIMING_OFFSET); - - // ÉèÖÃʱÖÓ - spi_set_clock(spi_info_p); - - // ÉèÖÃͨÐÅģʽ(ʱÖÓ¼«ÐÔºÍÏàλ) - spi_set_mode(spi_info_p); - - // ´òÓ¡¼Ä´æÆ÷ÐÅÏ¢(ÓÃÓÚµ÷ÊÔ) -// spi_print_all_regs_info(spi_info_p); - - return ; -} - - /* * µÈ´ýÊÕ·¢Íê³É + * @spi_base »ùµØÖ· */ -inline void spi_wait_txrx_done(ls1c_spi_info_t *spi_info_p) +inline void ls1c_spi_wait_txrx_done(void *spi_base) { - void *spi_base = spi_get_base(spi_info_p->SPIx); int timeout = LS1C_SPI_TX_TIMEOUT; while (timeout--) @@ -326,10 +244,10 @@ inline void spi_wait_txrx_done(ls1c_spi_info_t *spi_info_p) /* * ÇåÖжϺͱê־λ + * @spi_base »ùµØÖ· */ -inline void spi_clear(ls1c_spi_info_t *spi_info_p) +inline void ls1c_spi_clear(void *spi_base) { - void *spi_base = spi_get_base(spi_info_p->SPIx); unsigned char val = 0; // ÇåÖÐ¶Ï @@ -356,20 +274,19 @@ inline void spi_clear(ls1c_spi_info_t *spi_info_p) * ×¢Ò⣬ÔÚ¶àÈÎÎñµÄϵͳÖУ¬´Ëº¯ÊýÐèÒª»¥³â¡£ * ¼´±£Ö¤ÔÚºÍij¸ö´ÓÉ豸ÊÕ·¢Ä³¸ö×ֽڵĹý³ÌÖУ¬²»Äܱ»Çл»µ½ÆäËüÈÎÎñͬʱÓëÁíÍâµÄÔÚͬһ¸öSPI×ÜÏßÉϵĴÓÉ豸ͨÐÅ * ÒòΪÁúо1cµÄÿ·SPIÉÏ¿ÉÄܽÓÓв»Í¬µÄ´ÓÉ豸£¬Í¨ÐÅÆµÂÊ¡¢Ä£Ê½µÈ¿ÉÄܲ»Í¬ - * @spi_info_p SPI½Ó¿Ú + * @spi_base »ùµØÖ· * @tx_ch ´ý·¢Ë͵ÄÊý¾Ý * @ret ÊÕµ½µÄÊý¾Ý */ -unsigned char spi_txrx_byte(ls1c_spi_info_t *spi_info_p, unsigned char tx_ch) +unsigned char ls1c_spi_txrx_byte(void *spi_base, unsigned char tx_ch) { - void *spi_base = spi_get_base(spi_info_p->SPIx); unsigned char rx_ch = 0; // ÊÕ·¢Êý¾Ý reg_write_8(tx_ch, spi_base + LS1C_SPI_TxFIFO_OFFSET); // ¿ªÊ¼·¢ËÍ - spi_wait_txrx_done(spi_info_p); // µÈ´ýÊÕ·¢Íê³É + ls1c_spi_wait_txrx_done(spi_base); // µÈ´ýÊÕ·¢Íê³É rx_ch = reg_read_8(spi_base + LS1C_SPI_RxFIFO_OFFSET); // ¶ÁÈ¡ÊÕµ½µÄÊý¾Ý - spi_clear(spi_info_p); // ÇåÖжϺͱê־λ + ls1c_spi_clear(spi_base); // ÇåÖжϺͱê־λ return rx_ch; } diff --git a/bsp/ls1cdev/libraries/ls1c_spi.h b/bsp/ls1cdev/libraries/ls1c_spi.h index 6b041b19c1..8046127de7 100644 --- a/bsp/ls1cdev/libraries/ls1c_spi.h +++ b/bsp/ls1cdev/libraries/ls1c_spi.h @@ -29,15 +29,10 @@ // SPIÄ£¿é±àºÅ -typedef enum -{ - LS1C_SPI_0 = 0, - LS1C_SPI_1, -}ls1c_spi_t; - +#define LS1C_SPI_0 (0) +#define LS1C_SPI_1 (1) // Ƭѡ -#define LS1C_SPI_INVALID_CS (-1) #define LS1C_SPI_CS_0 (0) #define LS1C_SPI_CS_1 (1) #define LS1C_SPI_CS_2 (2) @@ -50,31 +45,80 @@ typedef enum #define SPI_CPHA_0 (0) -// Ó²¼þSPIÐÅÏ¢ -typedef struct -{ - ls1c_spi_t SPIx; // SPIÄ£¿é±àºÅ - unsigned long max_speed_hz; // ×î´óͨÐÅËÙ¶È£¬µ¥Î»hz - unsigned char cs; // Ƭѡ - unsigned char cpol; // ʱÖÓ¼«ÐÔ - unsigned char cpha; // ʱÖÓÏàλ -}ls1c_spi_info_t; +// ¼Ä´æÆ÷Æ«ÒÆ +#define LS1C_SPI_SPCR_OFFSET (0) // ¿ØÖƼĴæÆ÷ +#define LS1C_SPI_SPSR_OFFSET (1) // ״̬¼Ä´æÆ÷ +#define LS1C_SPI_TxFIFO_OFFSET (2) // ·¢Ë͵ÄÊý¾Ý¼Ä´æÆ÷£¬Óë½ÓÊÕÊý¾Ý¼Ä´æÆ÷µÄÆ«ÒÆÏàͬ +#define LS1C_SPI_RxFIFO_OFFSET (2) // ½ÓÊÕµÄÊý¾Ý¼Ä´æÆ÷£¬Óë·¢ËÍÊý¾Ý¼Ä´æÆ÷µÄÆ«ÒÆÏàͬ +#define LS1C_SPI_SPER_OFFSET (3) // Íⲿ¼Ä´æÆ÷ +#define LS1C_SPI_SFC_PARAM_OFFSET (4) // ²ÎÊý¿ØÖƼĴæÆ÷ +#define LS1C_SPI_SFC_SOFTCS_OFFSET (5) // Ƭѡ¿ØÖƼĴæÆ÷ +#define LS1C_SPI_SFC_TIMING_OFFSET (6) // ʱÐò¿ØÖƼĴæÆ÷ + +// ¼Ä´æÆ÷SPCRÖеÄλÓò +#define LS1C_SPI_SPCR_SPIE_BIT (7) +#define LS1C_SPI_SPCR_SPIE_MASK (0x01 << LS1C_SPI_SPCR_SPIE_BIT) +#define LS1C_SPI_SPCR_SPE_BIT (6) +#define LS1C_SPI_SPCR_SPE_MASK (0x01 << LS1C_SPI_SPCR_SPE_BIT) +#define LS1C_SPI_SPCR_CPOL_BIT (3) +#define LS1C_SPI_SPCR_CPOL_MASK (0x01 << LS1C_SPI_SPCR_CPOL_BIT) +#define LS1C_SPI_SPCR_CPHA_BIT (2) +#define LS1C_SPI_SPCR_CPHA_MASK (0x01 << LS1C_SPI_SPCR_CPHA_BIT) +#define LS1C_SPI_SPCR_SPR_BIT (0) +#define LS1C_SPI_SPCR_SPR_MASK (0x03 << LS1C_SPI_SPCR_SPR_BIT) + +// ¼Ä´æÆ÷SPSRÖеÄλÓò +#define LS1C_SPI_SPSR_SPIF_BIT (7) +#define LS1C_SPI_SPSR_SPIF_MASK (0x01 << LS1C_SPI_SPSR_SPIF_BIT) +#define LS1C_SPI_SPSR_WCOL_BIT (6) +#define LS1C_SPI_SPSR_WCOL_MASK (0x01 << LS1C_SPI_SPSR_WCOL_BIT) + +// ¼Ä´æÆ÷SPERÖеÄλÓò +#define LS1C_SPI_SPER_SPRE_BIT (0) +#define LS1C_SPI_SPER_SPRE_MASK (0x3 << LS1C_SPI_SPER_SPRE_BIT) + +// ¼Ä´æÆ÷SFC_SOFTCSµÄλÓò +#define LS1C_SPI_SFC_SOFTCS_CSN_BIT (4) +#define LS1C_SPI_SFC_SOFTCS_CSN_MASK (0x0f << LS1C_SPI_SFC_SOFTCS_CSN_BIT) +#define LS1C_SPI_SFC_SOFTCS_CSEN_BIT (0) +#define LS1C_SPI_SFC_SOFTCS_CSEN_MASK (0x0f << LS1C_SPI_SFC_SOFTCS_CSEN_BIT) + +// ·¢Ëͳ¬Ê±µÄÃÅÏÞÖµ +#define LS1C_SPI_TX_TIMEOUT (20000) + + +/* + * »ñȡָ¶¨SPIÄ£¿éµÄ»ùµØÖ· + * @SPIx SPIÄ£¿éµÄ±àºÅ + */ +inline void *ls1c_spi_get_base(unsigned char SPIx); /* - * ³õʼ»¯Ö¸¶¨SPIÄ£¿é - * @spi_info_p SPIÄ£¿éÐÅÏ¢ + * ÉèÖÃʱÖÓ + * @spi_base »ùµØÖ· + * @max_hz ×î´óƵÂÊ£¬µ¥Î»hz */ -void spi_init(ls1c_spi_info_t *spi_info_p); +void ls1c_spi_set_clock(void *spi_base, unsigned long max_hz); + + +/* + * ÉèÖÃͨÐÅģʽ(ʱÖÓ¼«ÐÔºÍÏàλ) + * @spi_base »ùµØÖ· + * @cpol ʱÖÓ¼«ÐÔ + * @cpha ʱÖÓÏàλ + */ +void ls1c_spi_set_mode(void *spi_base, unsigned char cpol, unsigned char cpha); /* * ÉèÖÃÖ¸¶¨Æ¬Ñ¡ÎªÖ¸¶¨×´Ì¬ - * @spi_info_p SPIÄ£¿éÐÅÏ¢ + * @spi_base »ùµØÖ· + * @cs Ƭѡ * @new_status ƬѡÒý½ÅµÄÐÂ״̬£¬È¡ÖµÎª0»ò1£¬¼´¸ßµçƽ»òµÍµçƽ */ -void spi_set_cs(ls1c_spi_info_t *spi_info_p, int new_status); +void ls1c_spi_set_cs(void *spi_base, unsigned char cs, int new_status); /* @@ -82,18 +126,20 @@ void spi_set_cs(ls1c_spi_info_t *spi_info_p, int new_status); * ×¢Ò⣬ÔÚ¶àÈÎÎñµÄϵͳÖУ¬´Ëº¯ÊýÐèÒª»¥³â¡£ * ¼´±£Ö¤ÔÚºÍij¸ö´ÓÉ豸ÊÕ·¢Ä³¸ö×ֽڵĹý³ÌÖУ¬²»Äܱ»Çл»µ½ÆäËüÈÎÎñͬʱÓëÁíÍâµÄÔÚͬһ¸öSPI×ÜÏßÉϵĴÓÉ豸ͨÐÅ * ÒòΪÁúо1cµÄÿ·SPIÉÏ¿ÉÄܽÓÓв»Í¬µÄ´ÓÉ豸£¬Í¨ÐÅÆµÂÊ¡¢Ä£Ê½µÈ¿ÉÄܲ»Í¬ - * @spi_info_p SPI½Ó¿Ú + * @spi_base »ùµØÖ· * @tx_ch ´ý·¢Ë͵ÄÊý¾Ý * @ret ÊÕµ½µÄÊý¾Ý */ -unsigned char spi_txrx_byte(ls1c_spi_info_t *spi_info_p, unsigned char tx_ch); +unsigned char ls1c_spi_txrx_byte(void *spi_base, unsigned char tx_ch); /* * ´òÓ¡Ö¸¶¨SPIÄ£¿éµÄËùÓмĴæÆ÷µÄÖµ - * @spi_info_p SPIÄ£¿éÐÅÏ¢ + * @spi_base »ùµØÖ· */ -void spi_print_all_regs_info(ls1c_spi_info_t *spi_info_p); +void ls1c_spi_print_all_regs_info(void *spi_base); + + #endif diff --git a/bsp/ls1cdev/rtconfig.h b/bsp/ls1cdev/rtconfig.h index 168d3a7fda..ae208a485e 100644 --- a/bsp/ls1cdev/rtconfig.h +++ b/bsp/ls1cdev/rtconfig.h @@ -227,6 +227,11 @@ #define RTGUI_IMAGE_BMP // +#define RT_USING_SPI +#define RT_USING_SPI0 +#define RT_USING_SPI1 + + // #endif -- cgit v1.3.1