Skip to content

bsp: cvitek: fix build warnings for spi #10140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Rbb666 merged 1 commit into from
Mar 24, 2025
Merged

bsp: cvitek: fix build warnings for spi #10140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions bsp/cvitek/drivers/drv_spi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ static rt_err_t spi_configure(struct rt_spi_device *device, struct rt_spi_config
RT_ASSERT(device->bus->parent.user_data != RT_NULL);
RT_ASSERT(cfg != RT_NULL);

rt_err_t ret = RT_EOK;
struct _device_spi *spi = (struct _device_spi *)device->bus->parent.user_data;
struct dw_spi *dws = &spi->dws;

Expand Down Expand Up @@ -139,9 +138,6 @@ static rt_err_t spi_configure(struct rt_spi_device *device, struct rt_spi_config

static rt_err_t dw_spi_transfer_one(struct dw_spi *dws, const void *tx_buf, void *rx_buf, uint32_t len, enum transfer_type tran_type)
{
uint8_t imask = 0;
uint16_t txlevel = 0;

dws->tx = NULL;
dws->tx_end = NULL;
dws->rx = NULL;
Expand Down Expand Up @@ -198,7 +194,7 @@ static rt_ssize_t spi_xfer(struct rt_spi_device *device, struct rt_spi_message *

struct _device_spi *spi = (struct _device_spi *)device->bus->parent.user_data;
struct dw_spi *dws = &spi->dws;
int32_t ret = 0;
int32_t ret = RT_EOK;

if (message->send_buf && message->recv_buf)
{
Expand All @@ -214,6 +210,14 @@ static rt_ssize_t spi_xfer(struct rt_spi_device *device, struct rt_spi_message *
{
ret = dw_spi_transfer_one(dws, RT_NULL, message->recv_buf, message->length, POLL_TRAN);

} else {
return 0;
}

if (ret != RT_EOK)
{
LOG_E("spi transfer error : %d", ret);
return 0;
}

return message->length;
Expand Down Expand Up @@ -329,13 +333,12 @@ static void rt_hw_spi_pinmux_config()
int rt_hw_spi_init(void)
{
rt_err_t ret = RT_EOK;
struct dw_spi *dws;

rt_hw_spi_pinmux_config();

for (rt_size_t i = 0; i < sizeof(_spi_obj) / sizeof(struct _device_spi); i++)
{
_spi_obj[i].dws.regs = (rt_ubase_t)DRV_IOREMAP((void *)_spi_obj[i].dws.regs, 0x1000);
_spi_obj[i].dws.regs = (void *)DRV_IOREMAP((void *)_spi_obj[i].dws.regs, 0x1000);

_spi_obj[i].spi_bus.parent.user_data = (void *)&_spi_obj[i];
ret = rt_spi_bus_register(&_spi_obj[i].spi_bus, _spi_obj[i].device_name, &_spi_ops);
Expand Down
8 changes: 6 additions & 2 deletions bsp/cvitek/drivers/libraries/spi/dw_spi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
* limitations under the License.
*/
#include <errno.h>
#include <rtthread.h>
#include <string.h>
#include <stdio.h>

Expand All @@ -23,9 +24,12 @@
#include <rthw.h>

#ifdef SPI_DEBUG
#define SP_DEBUG_LOG printf
#define SP_DEBUG_LOG(fmt, ...) \
do { \
rt_kprintf(fmt, ##__VA_ARGS__); \
} while(0)
#else
#define SP_DEBUG_LOG
#define SP_DEBUG_LOG(fmt, ...)
#endif

/* Restart the controller, disable all interrupts, clean rx fifo */
Expand Down