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

1.修复非阻塞模式下写入缓冲区为0时的非阻塞发送锁持续上锁，导致无法继续写入的问题。

Browse Source
This commit is contained in:
MacRsh
2024-01-31 22:41:48 +08:00
parent de64eb3ead
commit 7d5d7f2d3d
3 changed files with 148 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
device/serial.c
View File

@@ -41,7 +41,7 @@ static int mr_serial_close(struct mr_dev *dev)
return ops->configure(serial, &close_config);
}
static ssize_t mr_serial_read(struct mr_dev *dev, int off, void *buf, size_t size, int async)
static ssize_t mr_serial_read(struct mr_dev *dev, void *buf, size_t count)
{
struct mr_serial *serial = (struct mr_serial *)dev;
struct mr_serial_ops *ops = (struct mr_serial_ops *)dev->drv->ops;
@@ -50,35 +50,35 @@ static ssize_t mr_serial_read(struct mr_dev *dev, int off, void *buf, size_t siz
if (mr_ringbuf_get_bufsz(&serial->rd_fifo) == 0)
{
for (rd_size = 0; rd_size < size; rd_size += sizeof(*rd_buf))
for (rd_size = 0; rd_size < count; rd_size += sizeof(*rd_buf))
{
*rd_buf = ops->read(serial);
rd_buf++;
}
} else
{
rd_size = (ssize_t)mr_ringbuf_read(&serial->rd_fifo, buf, size);
rd_size = (ssize_t)mr_ringbuf_read(&serial->rd_fifo, buf, count);
}
return rd_size;
}
static ssize_t mr_serial_write(struct mr_dev *dev, int off, const void *buf, size_t size, int async)
static ssize_t mr_serial_write(struct mr_dev *dev, const void *buf, size_t count)
{
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;
if ((async == MR_SYNC) || (mr_ringbuf_get_bufsz(&serial->wr_fifo) == 0))
if (dev->sync == MR_SYNC)
{
for (wr_size = 0; wr_size < size; wr_size += sizeof(*wr_buf))
for (wr_size = 0; wr_size < count; wr_size += sizeof(*wr_buf))
{
ops->write(serial, *wr_buf);
wr_buf++;
}
} else
{
wr_size = (ssize_t)mr_ringbuf_write(&serial->wr_fifo, buf, size);
wr_size = (ssize_t)mr_ringbuf_write(&serial->wr_fifo, buf, count);
if (wr_size > 0)
{
/* Start interrupt sending */
@@ -88,14 +88,14 @@ static ssize_t mr_serial_write(struct mr_dev *dev, int off, const void *buf, siz
return wr_size;
}
static int mr_serial_ioctl(struct mr_dev *dev, int off, int cmd, void *args)
static int mr_serial_ioctl(struct mr_dev *dev, int cmd, void *args)
{
struct mr_serial *serial = (struct mr_serial *)dev;
struct mr_serial_ops *ops = (struct mr_serial_ops *)dev->drv->ops;
switch (cmd)
{
case MR_CTL_SERIAL_SET_CONFIG:
case MR_IOC_SERIAL_SET_CONFIG:
{
if (args != MR_NULL)
{
@@ -111,7 +111,7 @@ static int mr_serial_ioctl(struct mr_dev *dev, int off, int cmd, void *args)
}
return MR_EINVAL;
}
case MR_CTL_SERIAL_SET_RD_BUFSZ:
case MR_IOC_SERIAL_SET_RD_BUFSZ:
{
if (args != MR_NULL)
{
@@ -128,7 +128,7 @@ static int mr_serial_ioctl(struct mr_dev *dev, int off, int cmd, void *args)
}
return MR_EINVAL;
}
case MR_CTL_SERIAL_SET_WR_BUFSZ:
case MR_IOC_SERIAL_SET_WR_BUFSZ:
{
if (args != MR_NULL)
{
@@ -145,17 +145,17 @@ static int mr_serial_ioctl(struct mr_dev *dev, int off, int cmd, void *args)
}
return MR_EINVAL;
}
case MR_CTL_SERIAL_CLR_RD_BUF:
case MR_IOC_SERIAL_CLR_RD_BUF:
{
mr_ringbuf_reset(&serial->rd_fifo);
return MR_EOK;
}
case MR_CTL_SERIAL_CLR_WR_BUF:
case MR_IOC_SERIAL_CLR_WR_BUF:
{
mr_ringbuf_reset(&serial->wr_fifo);
return MR_EOK;
}
case MR_CTL_SERIAL_GET_CONFIG:
case MR_IOC_SERIAL_GET_CONFIG:
{
if (args != MR_NULL)
{
@@ -166,7 +166,7 @@ static int mr_serial_ioctl(struct mr_dev *dev, int off, int cmd, void *args)
}
return MR_EINVAL;
}
case MR_CTL_SERIAL_GET_RD_BUFSZ:
case MR_IOC_SERIAL_GET_RD_BUFSZ:
{
if (args != MR_NULL)
{
@@ -177,7 +177,7 @@ static int mr_serial_ioctl(struct mr_dev *dev, int off, int cmd, void *args)
}
return MR_EINVAL;
}
case MR_CTL_SERIAL_GET_WR_BUFSZ:
case MR_IOC_SERIAL_GET_WR_BUFSZ:
{
if (args != MR_NULL)
{
@@ -188,7 +188,7 @@ static int mr_serial_ioctl(struct mr_dev *dev, int off, int cmd, void *args)
}
return MR_EINVAL;
}
case MR_CTL_SERIAL_GET_RD_DATASZ:
case MR_IOC_SERIAL_GET_RD_DATASZ:
{
if (args != MR_NULL)
{
@@ -199,7 +199,7 @@ static int mr_serial_ioctl(struct mr_dev *dev, int off, int cmd, void *args)
}
return MR_EINVAL;
}
case MR_CTL_SERIAL_GET_WR_DATASZ:
case MR_IOC_SERIAL_GET_WR_DATASZ:
{
if (args != MR_NULL)
{
@@ -239,12 +239,12 @@ static ssize_t mr_serial_isr(struct mr_dev *dev, int event, void *args)
if (mr_ringbuf_pop(&serial->wr_fifo, &data) == sizeof(data))
{
ops->write(serial, data);
return MR_EBUSY;
} else
{
ops->stop_tx(serial);
return MR_EOK;
}
return (ssize_t)mr_ringbuf_get_data_size(&serial->wr_fifo);
}
default:
{
@@ -257,12 +257,12 @@ static ssize_t mr_serial_isr(struct mr_dev *dev, int event, void *args)
* @brief This function register a serial.
*
* @param serial The serial.
* @param name The name of the serial.
* @param path The path of the serial.
* @param drv The driver of the serial.
*
* @return MR_EOK on success, otherwise an error code.
* @return 0 on success, otherwise an error code.
*/
int mr_serial_register(struct mr_serial *serial, const char *name, struct mr_drv *drv)
int mr_serial_register(struct mr_serial *serial, const char *path, struct mr_drv *drv)
{
static struct mr_dev_ops ops =
{
@@ -276,7 +276,7 @@ int mr_serial_register(struct mr_serial *serial, const char *name, struct mr_drv
struct mr_serial_config default_config = MR_SERIAL_CONFIG_DEFAULT;
MR_ASSERT(serial != MR_NULL);
MR_ASSERT(name != MR_NULL);
MR_ASSERT(path != MR_NULL);
MR_ASSERT(drv != MR_NULL);
MR_ASSERT(drv->ops != MR_NULL);
@@ -294,7 +294,7 @@ int mr_serial_register(struct mr_serial *serial, const char *name, struct mr_drv
serial->wr_bufsz = MR_CFG_SERIAL_WR_BUFSZ;
/* Register the serial */
return mr_dev_register(&serial->dev, name, Mr_Dev_Type_Serial, MR_SFLAG_RDWR | MR_SFLAG_NONBLOCK, &ops, drv);
return mr_dev_register(&serial->dev, path, MR_DEV_TYPE_SERIAL, MR_O_RDWR | MR_O_NONBLOCK, &ops, drv);
}
#endif /* MR_USING_SERIAL */