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

1.修复i2c应答错误。2.修复msh文档获取参数索引错误。

Browse Source
This commit is contained in:
MacRsh
2024-02-04 17:50:09 +08:00
parent 7ab4df6582
commit 85360e3470
5 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
device/i2c.c
View File

@@ -44,7 +44,7 @@ static ssize_t mr_i2c_bus_write(struct mr_dev *dev, const void *buf, size_t coun
static ssize_t mr_i2c_bus_isr(struct mr_dev *dev, int event, void *args)
{
struct mr_i2c_bus *i2c_bus = (struct mr_i2c_bus *)dev;
struct mr_i2c_bus_ops *ops = (struct mr_i2c_bus_ops *)i2c_bus->dev.drv->ops;
struct mr_i2c_bus_ops *ops = (struct mr_i2c_bus_ops *)dev->drv->ops;
switch (event)
{
@@ -123,7 +123,8 @@ MR_INLINE int i2c_dev_take_bus(struct mr_i2c_dev *i2c_dev)
if (i2c_dev->config.baud_rate != i2c_bus->config.baud_rate
|| i2c_dev->config.host_slave != i2c_bus->config.host_slave)
{
int addr = (i2c_dev->config.host_slave == MR_I2C_SLAVE) ? i2c_dev->addr : 0x00;
int addr = (i2c_dev->config.host_slave == MR_I2C_HOST) ? 0x00 : i2c_dev->addr;
int ret = ops->configure(i2c_bus, &i2c_dev->config, addr, i2c_dev->addr_bits);
if (ret < 0)
{
@@ -195,19 +196,18 @@ MR_INLINE ssize_t i2c_dev_read(struct mr_i2c_dev *i2c_dev, uint8_t *buf, size_t
{
struct mr_i2c_bus *i2c_bus = (struct mr_i2c_bus *)i2c_dev->dev.parent;
struct mr_i2c_bus_ops *ops = (struct mr_i2c_bus_ops *)i2c_bus->dev.drv->ops;
uint8_t *rd_buf = (uint8_t *)buf;
ssize_t rd_size;
for (rd_size = 0; rd_size < count; rd_size += sizeof(*rd_buf))
for (rd_size = 0; rd_size < count; rd_size += sizeof(*buf))
{
int ack = ((count - rd_size) == sizeof(*rd_buf));
int ack = ((count - rd_size) != sizeof(*buf));
int ret = ops->read(i2c_bus, rd_buf, ack);
int ret = ops->read(i2c_bus, buf, ack);
if (ret < 0)
{
return (rd_size == 0) ? ret : rd_size;
}
rd_buf++;
buf++;
}
return rd_size;
}
@@ -216,17 +216,16 @@ MR_INLINE ssize_t i2c_dev_write(struct mr_i2c_dev *i2c_dev, const uint8_t *buf,
{
struct mr_i2c_bus *i2c_bus = (struct mr_i2c_bus *)i2c_dev->dev.parent;
struct mr_i2c_bus_ops *ops = (struct mr_i2c_bus_ops *)i2c_bus->dev.drv->ops;
uint8_t *wr_buf = (uint8_t *)buf;
ssize_t wr_size;
for (wr_size = 0; wr_size < count; wr_size += sizeof(*wr_buf))
for (wr_size = 0; wr_size < count; wr_size += sizeof(*buf))
{
int ret = ops->write(i2c_bus, *wr_buf);
int ret = ops->write(i2c_bus, *buf);
if (ret < 0)
{
return (wr_size == 0) ? ret : wr_size;
}
wr_buf++;
buf++;
}
return wr_size;
}

2
device/spi.c
View File

@@ -58,7 +58,7 @@ static ssize_t mr_spi_bus_write(struct mr_dev *dev, const void *buf, size_t coun
static ssize_t mr_spi_bus_isr(struct mr_dev *dev, int event, void *args)
{
struct mr_spi_bus *spi_bus = (struct mr_spi_bus *)dev;
struct mr_spi_bus_ops *ops = (struct mr_spi_bus_ops *)spi_bus->dev.drv->ops;
struct mr_spi_bus_ops *ops = (struct mr_spi_bus_ops *)dev->drv->ops;
switch (event)
{

4
document/components/msh/msh.md
View File

@@ -85,9 +85,9 @@ char *p = MR_MSH_GET_ARG(index);
## 使用示例：
```c
int hello_fn(int argc, void *argv)
void hello_fn(int argc, void *argv)
{
for (size_t i = 0; i < argc; i++)
for (size_t i = 1; i <= argc; i++)
{
mr_msh_printf("hello %s\r\n", MR_MSH_GET_ARG(i));
}

4
document/components/msh/msh_EN.md
View File

@@ -87,9 +87,9 @@ char *p = MR_MSH_GET_ARG(index);
## Usage Example:
```c
int hello_fn(int argc, void *argv)
void hello_fn(int argc, void *argv)
{
for (size_t i = 0; i < argc; i++)
for (size_t i = 1; i <= argc; i++)
{
mr_msh_printf("hello %s\r\n", MR_MSH_GET_ARG(i));
}

4
include/device/mr_i2c.h
View File

@@ -121,8 +121,8 @@ struct mr_i2c_dev
struct mr_i2c_config config; /**< Configuration */
struct mr_ringbuf rd_fifo; /**< Read FIFO */
size_t rd_bufsz; /**< Read buffer size */
uint32_t addr: 16; /**< Address */
uint32_t addr_bits: 16; /**< Address bits */
int addr; /**< Address */
int addr_bits; /**< Address bits */
};
int mr_i2c_bus_register(struct mr_i2c_bus *i2c_bus, const char *path, struct mr_drv *drv);