lby/mr-library
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.优化指针使用方式，修改为安全使用方式。

Browse Source
This commit is contained in:
MacRsh
2023-11-16 01:48:43 +08:00
parent 4a8da391af
commit bce78ee101
4 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
dev/i2c.c
View File

@@ -109,7 +109,7 @@ static int mr_i2c_bus_ioctl(struct mr_dev *dev, int off, int cmd, void *args)
{
if (args != MR_NULL)
{
struct mr_i2c_config *config = (struct mr_i2c_config *)args;
struct mr_i2c_config config = *(struct mr_i2c_config *)args;
/* The bus is held by another device */
if (i2c_bus->owner != MR_NULL)
@@ -118,15 +118,15 @@ static int mr_i2c_bus_ioctl(struct mr_dev *dev, int off, int cmd, void *args)
}
/* The bus requires a device to be mounted to be configured in slave mode */
if (config->host_slave == MR_I2C_SLAVE)
if (config.host_slave == MR_I2C_SLAVE)
{
return MR_EINVAL;
}
int ret = ops->configure(i2c_bus, config, 0x00, MR_I2C_ADDR_BITS_7);
int ret = ops->configure(i2c_bus, &config, 0x00, MR_I2C_ADDR_BITS_7);
if (ret == MR_EOK)
{
i2c_bus->config = *config;
i2c_bus->config = config;
}
return MR_EOK;
}
@@ -340,7 +340,7 @@ static int mr_i2c_dev_ioctl(struct mr_dev *dev, int off, int cmd, void *args)
if (args != MR_NULL)
{
struct mr_i2c_bus *i2c_bus = (struct mr_i2c_bus *)dev->link;
struct mr_i2c_config *config = (struct mr_i2c_config *)args;
struct mr_i2c_config config = *(struct mr_i2c_config *)args;
/* Release the bus */
if (i2c_dev == i2c_bus->owner)
@@ -348,8 +348,8 @@ static int mr_i2c_dev_ioctl(struct mr_dev *dev, int off, int cmd, void *args)
i2c_bus->owner = MR_NULL;
}
i2c_dev->config = *config;
if (config->host_slave == MR_I2C_SLAVE)
i2c_dev->config = config;
if (config.host_slave == MR_I2C_SLAVE)
{
/* Retry to take the bus */
int ret = i2c_dev_take_bus(i2c_dev);

38
dev/spi.c
View File

@@ -227,7 +227,7 @@ static int mr_spi_bus_ioctl(struct mr_dev *dev, int off, int cmd, void *args)
{
if (args != MR_NULL)
{
struct mr_spi_config *config = (struct mr_spi_config *)args;
struct mr_spi_config config = *(struct mr_spi_config *)args;
/* The bus is held by another device */
if (spi_bus->owner != MR_NULL)
@@ -236,15 +236,15 @@ static int mr_spi_bus_ioctl(struct mr_dev *dev, int off, int cmd, void *args)
}
/* The bus requires a device to be mounted to be configured in slave mode */
if (config->host_slave == MR_SPI_SLAVE)
if (config.host_slave == MR_SPI_SLAVE)
{
return MR_EINVAL;
}
int ret = ops->configure(spi_bus, config);
int ret = ops->configure(spi_bus, &config);
if (ret == MR_EOK)
{
spi_bus->config = *config;
spi_bus->config = config;
}
return MR_EOK;
}
@@ -267,10 +267,10 @@ static int mr_spi_bus_ioctl(struct mr_dev *dev, int off, int cmd, void *args)
{
if (args != MR_NULL)
{
struct mr_spi_transfer *transfer = (struct mr_spi_transfer *)args;
struct mr_spi_transfer transfer = *(struct mr_spi_transfer *)args;
int ret =
(int)spi_bus_transfer(spi_bus, transfer->rd_buf, transfer->wr_buf, transfer->size, MR_SPI_RDWR);
(int)spi_bus_transfer(spi_bus, transfer.rd_buf, transfer.wr_buf, transfer.size, MR_SPI_RDWR);
return ret;
}
@@ -388,11 +388,11 @@ static void spi_dev_cs_configure(struct mr_spi_dev *spi_dev, int state)
mode = MR_GPIO_MODE_INPUT_DOWN;
}
}
mr_dev_ioctl(desc, MR_CTRL_SET_MODE, &mode);
mr_dev_ioctl(desc, MR_CTRL_GPIO_SET_PIN_MODE, &mode);
mr_dev_write(desc, mr_make_local(uint8_t, !spi_dev->cs_active), sizeof(uint8_t));
} else
{
mr_dev_ioctl(desc, MR_CTRL_SET_MODE, mr_make_local(int, MR_GPIO_MODE_NONE));
mr_dev_ioctl(desc, MR_CTRL_GPIO_SET_PIN_MODE, mr_make_local(int, MR_GPIO_MODE_NONE));
}
}
}
@@ -555,11 +555,11 @@ static int mr_spi_dev_ioctl(struct mr_dev *dev, int off, int cmd, void *args)
if (args != MR_NULL)
{
struct mr_spi_bus *spi_bus = (struct mr_spi_bus *)dev->link;
struct mr_spi_config *config = (struct mr_spi_config *)args;
struct mr_spi_config config = *(struct mr_spi_config *)args;
#ifdef MR_USING_GPIO
/* Reconfigure CS */
if (config->host_slave != spi_dev->config.host_slave)
if (config.host_slave != spi_dev->config.host_slave)
{
spi_dev_cs_configure(spi_dev, MR_ENABLE);
}
@@ -570,8 +570,8 @@ static int mr_spi_dev_ioctl(struct mr_dev *dev, int off, int cmd, void *args)
spi_bus->owner = MR_NULL;
}
spi_dev->config = *config;
if (config->host_slave == MR_SPI_SLAVE)
spi_dev->config = config;
if (config.host_slave == MR_SPI_SLAVE)
{
/* Retry to take the bus */
int ret = spi_dev_take_bus(spi_dev);
@@ -626,7 +626,7 @@ static int mr_spi_dev_ioctl(struct mr_dev *dev, int off, int cmd, void *args)
{
if (args != MR_NULL)
{
struct mr_spi_transfer *transfer = (struct mr_spi_transfer *)args;
struct mr_spi_transfer transfer = *(struct mr_spi_transfer *)args;
int ret = spi_dev_take_bus(spi_dev);
if (ret != MR_EOK)
@@ -638,17 +638,17 @@ static int mr_spi_dev_ioctl(struct mr_dev *dev, int off, int cmd, void *args)
{
spi_dev_cs_set(spi_dev, MR_ENABLE);
ret = (int)spi_bus_transfer(dev->link,
transfer->rd_buf,
transfer->wr_buf,
transfer->size,
transfer.rd_buf,
transfer.wr_buf,
transfer.size,
MR_SPI_RDWR);
spi_dev_cs_set(spi_dev, MR_DISABLE);
} else
{
ret = (int)spi_bus_transfer(dev->link,
transfer->rd_buf,
transfer->wr_buf,
transfer->size,
transfer.rd_buf,
transfer.wr_buf,
transfer.size,
MR_SPI_RDWR);
}

4
dev/spi.h
View File

@@ -79,9 +79,9 @@ struct mr_spi_config
};
/**
* @brief SPI control command.
* @brief SPI transfer command.
*/
#define MR_CTRL_SPI_TRANSFER ((0x1|0x80) << 16) /**< Transfer */
#define MR_CTRL_SPI_TRANSFER ((0x01|0x80) << 16) /**< Transfer */
/**
* @brief SPI transfer structure.

6
dev/uart.c
View File

@@ -92,12 +92,12 @@ static int mr_uart_ioctl(struct mr_dev *dev, int off, int cmd, void *args)
{
if (args != MR_NULL)
{
struct mr_uart_config *config = (struct mr_uart_config *)args;
struct mr_uart_config config = *(struct mr_uart_config *)args;
int ret = ops->configure(uart, config);
int ret = ops->configure(uart, &config);
if (ret == MR_EOK)
{
uart->config = *config;
uart->config = config;
}
return ret;
}