libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

更改了函数名

This commit is contained in:
linshire 2022-12-02 17:00:52 +08:00 committed by Man, Jianting (Meco)
parent 622062aaec
commit aaf5462c6d
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
bsp/wch/risc-v/Libraries/ch32_drivers/drv_spi.c
View File

@ -65,10 +65,10 @@ static struct ch32_spi spi_bus_obj[sizeof(spi_config) / sizeof(spi_config[0])] =
static rt_uint32_t ch32_spi_clock_get(SPI_TypeDef *spix); static rt_uint32_t ch32_spi_clock_get(SPI_TypeDef *spix);
static void ch32_spi_clock_and_io_init(SPI_TypeDef *spix); static void ch32_spi_clock_and_io_init(SPI_TypeDef *spix);
static rt_uint8_t spix_ReadWriteByte(SPI_TypeDef *Instance, rt_uint8_t TxData); static rt_uint8_t spix_readwritebyte(SPI_TypeDef *Instance, rt_uint8_t TxData);
static rt_err_t spi_TransmitReceive(SPI_TypeDef *Instance, uint8_t *send_buf, uint8_t *recv_buf, uint16_t send_length); static rt_err_t spi_transmitreceive(SPI_TypeDef *Instance, uint8_t *send_buf, uint8_t *recv_buf, uint16_t send_length);
static rt_err_t spi_Transmit(SPI_TypeDef *Instance, uint8_t *send_buf, uint16_t send_length); static rt_err_t spi_transmit(SPI_TypeDef *Instance, uint8_t *send_buf, uint16_t send_length);
static rt_err_t spi_Receive(SPI_TypeDef *Instance, uint8_t *recv_buf,uint16_t send_length); static rt_err_t spi_receive(SPI_TypeDef *Instance, uint8_t *recv_buf,uint16_t send_length);
static void ch32_spi_clock_and_io_init(SPI_TypeDef *spix) static void ch32_spi_clock_and_io_init(SPI_TypeDef *spix)
{ {
@ -166,7 +166,7 @@ static rt_uint32_t ch32_spi_clock_get(SPI_TypeDef *spix)
/* /*
*spix read write byte *spix read write byte
* */ * */
static rt_uint8_t spix_ReadWriteByte(SPI_TypeDef *Instance, rt_uint8_t TxData) static rt_uint8_t spix_readwritebyte(SPI_TypeDef *Instance, rt_uint8_t TxData)
{ {
uint8_t i=0; uint8_t i=0;
while (SPI_I2S_GetFlagStatus(Instance, SPI_I2S_FLAG_TXE) == RESET) while (SPI_I2S_GetFlagStatus(Instance, SPI_I2S_FLAG_TXE) == RESET)
@ -188,12 +188,12 @@ static rt_uint8_t spix_ReadWriteByte(SPI_TypeDef *Instance, rt_uint8_t TxData)
/* /*
*spi transmit and receive *spi transmit and receive
* */ * */
static rt_err_t spi_TransmitReceive(SPI_TypeDef *Instance, uint8_t *send_buf, uint8_t *recv_buf, uint16_t send_length) static rt_err_t spi_transmitreceive(SPI_TypeDef *Instance, uint8_t *send_buf, uint8_t *recv_buf, uint16_t send_length)
{ {
uint16_t i=0; uint16_t i=0;
for(i = 0; i < send_length; i++) for(i = 0; i < send_length; i++)
{ {
recv_buf[i] = spix_ReadWriteByte(Instance, send_buf[i]); recv_buf[i] = spix_readwritebyte(Instance, send_buf[i]);
} }
return RT_EOK; return RT_EOK;
} }
@ -201,12 +201,12 @@ static rt_err_t spi_TransmitReceive(SPI_TypeDef *Instance, uint8_t *send_buf, ui
/* /*
*spi transmit *spi transmit
* */ * */
static rt_err_t spi_Transmit(SPI_TypeDef *Instance, uint8_t *send_buf, uint16_t send_length) static rt_err_t spi_transmit(SPI_TypeDef *Instance, uint8_t *send_buf, uint16_t send_length)
{ {
uint16_t i=0; uint16_t i=0;
for(i = 0; i < send_length; i++) for(i = 0; i < send_length; i++)
{ {
spix_ReadWriteByte(Instance, send_buf[i]); spix_readwritebyte(Instance, send_buf[i]);
} }
return RT_EOK; return RT_EOK;
} }
@ -214,12 +214,12 @@ static rt_err_t spi_Transmit(SPI_TypeDef *Instance, uint8_t *send_buf, uint16_t
/* /*
*spi receive *spi receive
* */ * */
static rt_err_t spi_Receive(SPI_TypeDef *Instance, uint8_t *recv_buf,uint16_t send_length) static rt_err_t spi_receive(SPI_TypeDef *Instance, uint8_t *recv_buf,uint16_t send_length)
{ {
uint16_t i=0; uint16_t i=0;
for(i = 0; i < send_length; i++) for(i = 0; i < send_length; i++)
{ {
recv_buf[i] = spix_ReadWriteByte(Instance, 0xFF); /*发送数据为0xff 此时显示为不发送*/ recv_buf[i] = spix_readwritebyte(Instance, 0xFF); /*发送数据为0xff 此时显示为不发送*/
} }
return RT_EOK; return RT_EOK;
} }
@ -416,12 +416,12 @@ static rt_uint32_t spi_xfer(struct rt_spi_device *device, struct rt_spi_message
/* start once data exchange */ /* start once data exchange */
if (message->send_buf && message->recv_buf) if (message->send_buf && message->recv_buf)
{ {
state = spi_TransmitReceive(spi_handle->Instance, (uint8_t *)send_buf, (uint8_t *)recv_buf, send_length); state = spi_transmitreceive(spi_handle->Instance, (uint8_t *)send_buf, (uint8_t *)recv_buf, send_length);
} }
else if (message->send_buf) else if (message->send_buf)
{ {
state = spi_Transmit(spi_handle->Instance, (uint8_t *)send_buf, send_length); state = spi_transmit(spi_handle->Instance, (uint8_t *)send_buf, send_length);
if (message->cs_release && (device->config.mode & RT_SPI_3WIRE)) if (message->cs_release && (device->config.mode & RT_SPI_3WIRE))
{ {
/* release the CS by disable SPI when using 3 wires SPI */ /* release the CS by disable SPI when using 3 wires SPI */
@ -433,7 +433,7 @@ static rt_uint32_t spi_xfer(struct rt_spi_device *device, struct rt_spi_message
memset((uint8_t *)recv_buf, 0xff, send_length); memset((uint8_t *)recv_buf, 0xff, send_length);
/* clear the old error flag */ /* clear the old error flag */
SPI_I2S_ClearFlag(spi_handle->Instance, SPI_I2S_FLAG_OVR); SPI_I2S_ClearFlag(spi_handle->Instance, SPI_I2S_FLAG_OVR);
state = spi_Receive(spi_handle->Instance, (uint8_t *)recv_buf, send_length); state = spi_receive(spi_handle->Instance, (uint8_t *)recv_buf, send_length);
} }
if (state != RT_EOK) if (state != RT_EOK)