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

1.优化api。

Browse Source
This commit is contained in:
MacRsh
2023-12-03 02:17:04 +08:00
parent d7a781c1dd
commit 48e8317c66
7 changed files with 44 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
device/i2c.c
View File

@@ -50,10 +50,9 @@ static ssize_t mr_i2c_bus_isr(struct mr_dev *dev, int event, void *args)
case MR_ISR_I2C_RD_INT:
{
struct mr_i2c_dev *i2c_dev = (struct mr_i2c_dev *)i2c_bus->owner;
uint8_t data = 0;
uint8_t data = ops->read(i2c_bus);
/* Read data to FIFO. if callback is set, call it */
ops->read(i2c_bus, &data, sizeof(data));
mr_ringbuf_push_force(&i2c_dev->rd_fifo, data);
if (i2c_dev->dev.rd_call.call != MR_NULL)
{
@@ -192,16 +191,30 @@ 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.link;
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 = 0;
return ops->read(i2c_bus, buf, size);
for (rd_size = 0; rd_size < size; rd_size += sizeof(*rd_buf))
{
*rd_buf = ops->read(i2c_bus);
rd_buf++;
}
return rd_size;
}
MR_INLINE ssize_t i2c_dev_write(struct mr_i2c_dev *i2c_dev, const uint8_t *buf, size_t size)
{
struct mr_i2c_bus *i2c_bus = (struct mr_i2c_bus *)i2c_dev->dev.link;
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 = 0;
return ops->write(i2c_bus, buf, size);
for (wr_size = 0; wr_size < size; wr_size += sizeof(*wr_buf))
{
ops->write(i2c_bus, *wr_buf);
wr_buf++;
}
return wr_size;
}
static int mr_i2c_dev_open(struct mr_dev *dev)

34
device/serial.c
View File

@@ -47,38 +47,47 @@ static ssize_t mr_serial_read(struct mr_dev *dev, int off, void *buf, size_t siz
{
struct mr_serial *serial = (struct mr_serial *)dev;
struct mr_serial_ops *ops = (struct mr_serial_ops *)dev->drv->ops;
uint8_t *rd_buf = (uint8_t *)buf;
ssize_t rd_size = 0;
if (mr_ringbuf_get_bufsz(&serial->rd_fifo) == 0)
{
return ops->read(serial, buf, size);
for (rd_size = 0; rd_size < size; rd_size += sizeof(*rd_buf))
{
*rd_buf = ops->read(serial);
rd_buf++;
}
} else
{
return (ssize_t)mr_ringbuf_read(&serial->rd_fifo, buf, size);
rd_size = (ssize_t)mr_ringbuf_read(&serial->rd_fifo, buf, size);
}
return rd_size;
}
static ssize_t mr_serial_write(struct mr_dev *dev, int off, const void *buf, size_t size, int async)
{
struct mr_serial *serial = (struct mr_serial *)dev;
struct mr_serial_ops *ops = (struct mr_serial_ops *)dev->drv->ops;
uint8_t *wr_buf = (uint8_t *)buf;
ssize_t wr_size = 0;
if ((async == MR_SYNC) || (mr_ringbuf_get_bufsz(&serial->wr_fifo) == 0))
{
return ops->write(serial, buf, size);
for (wr_size = 0; wr_size < size; wr_size += sizeof(*wr_buf))
{
ops->write(serial, *wr_buf);
wr_buf++;
}
} else
{
if (mr_ringbuf_get_bufsz(&serial->wr_fifo) == 0)
wr_size = (ssize_t)mr_ringbuf_write(&serial->wr_fifo, buf, size);
if (wr_size > 0)
{
return ops->write(serial, buf, size);
} else
{
ssize_t ret = (ssize_t)mr_ringbuf_write(&serial->wr_fifo, buf, size);
/* Start interrupt sending */
ops->start_tx(serial);
return ret;
}
}
return wr_size;
}
static int mr_serial_ioctl(struct mr_dev *dev, int off, int cmd, void *args)
@@ -183,8 +192,7 @@ static ssize_t mr_serial_isr(struct mr_dev *dev, int event, void *args)
case MR_ISR_SERIAL_RD_INT:
{
/* Read data to FIFO */
uint8_t data = 0;
ops->read(serial, &data, sizeof(data));
uint8_t data = ops->read(serial);
mr_ringbuf_push_force(&serial->rd_fifo, data);
return (ssize_t)mr_ringbuf_get_data_size(&serial->rd_fifo);
@@ -195,7 +203,7 @@ static ssize_t mr_serial_isr(struct mr_dev *dev, int event, void *args)
uint8_t data = 0;
if (mr_ringbuf_pop(&serial->wr_fifo, &data) == sizeof(data))
{
ops->write(serial, &data, sizeof(data));
ops->write(serial, data);
} else
{
ops->stop_tx(serial);