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-25 23:39:33 +08:00
parent 674b663b39
commit d5d8897e53
10 changed files with 78 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
device/adc.c
View File

@@ -37,7 +37,7 @@ static int mr_adc_close(struct mr_dev *dev)
return ops->configure(adc, MR_DISABLE);
}
static ssize_t mr_adc_read(struct mr_dev *dev, int off, void *buf, size_t size, int sync_or_async)
static ssize_t mr_adc_read(struct mr_dev *dev, int off, void *buf, size_t size, int async)
{
struct mr_adc *adc = (struct mr_adc *)dev;
struct mr_adc_ops *ops = (struct mr_adc_ops *)dev->drv->ops;

2
device/dac.c
View File

@@ -37,7 +37,7 @@ static int mr_dac_close(struct mr_dev *dev)
return ops->configure(dac, MR_DISABLE);
}
static ssize_t mr_dac_write(struct mr_dev *dev, int off, const void *buf, size_t size, int sync_or_async)
static ssize_t mr_dac_write(struct mr_dev *dev, int off, const void *buf, size_t size, int async)
{
struct mr_dac *dac = (struct mr_dac *)dev;
struct mr_dac_ops *ops = (struct mr_dac_ops *)dev->drv->ops;

8
device/pin.c
View File

@@ -10,7 +10,7 @@
#ifdef MR_USING_PIN
static ssize_t mr_pin_read(struct mr_dev *dev, int off, void *buf, size_t size, int sync_or_async)
static ssize_t mr_pin_read(struct mr_dev *dev, int off, void *buf, size_t size, int async)
{
struct mr_pin *pin = (struct mr_pin *)dev;
struct mr_pin_ops *ops = (struct mr_pin_ops *)dev->drv->ops;
@@ -31,7 +31,7 @@ static ssize_t mr_pin_read(struct mr_dev *dev, int off, void *buf, size_t size,
return rd_size;
}
static ssize_t mr_pin_write(struct mr_dev *dev, int off, const void *buf, size_t size, int sync_or_async)
static ssize_t mr_pin_write(struct mr_dev *dev, int off, const void *buf, size_t size, int async)
{
struct mr_pin *pin = (struct mr_pin *)dev;
struct mr_pin_ops *ops = (struct mr_pin_ops *)dev->drv->ops;
@@ -59,7 +59,7 @@ static int mr_pin_ioctl(struct mr_dev *dev, int off, int cmd, void *args)
switch (cmd)
{
case MR_CTRL_PIN_SET_PIN_MODE:
case MR_CTRL_PIN_SET_MODE:
{
if (args != MR_NULL)
{
@@ -87,7 +87,7 @@ static ssize_t mr_pin_isr(struct mr_dev *dev, int event, void *args)
{
switch (event)
{
case MR_ISR_EVENT_RD_INTER:
case MR_ISR_PIN_RD_INT:
{
return (ssize_t)*(int *)args;
}

16
device/serial.c
View File

@@ -43,7 +43,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 sync_or_async)
static ssize_t mr_serial_read(struct mr_dev *dev, int off, 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;
@@ -57,12 +57,12 @@ static ssize_t mr_serial_read(struct mr_dev *dev, int off, void *buf, size_t siz
}
}
static ssize_t mr_serial_write(struct mr_dev *dev, int off, const void *buf, size_t size, int sync_or_async)
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;
if (sync_or_async == MR_SYNC)
if ((async == MR_SYNC) || (mr_ringbuf_get_bufsz(&serial->wr_fifo) == 0))
{
return ops->write(serial, buf, size);
} else
@@ -180,21 +180,19 @@ static ssize_t mr_serial_isr(struct mr_dev *dev, int event, void *args)
switch (event)
{
case MR_ISR_EVENT_RD_INTER:
case MR_ISR_SERIAL_RD_INT:
{
uint8_t data = 0;
/* Read data to FIFO */
uint8_t data = 0;
ops->read(serial, &data, sizeof(data));
mr_ringbuf_push_force(&serial->rd_fifo, data);
return (ssize_t)mr_ringbuf_get_data_size(&serial->rd_fifo);
}
case MR_ISR_EVENT_WR_INTER:
case MR_ISR_SERIAL_WR_INT:
{
uint8_t data = 0;
/* Write data from FIFO */
uint8_t data = 0;
if (mr_ringbuf_pop(&serial->wr_fifo, &data) == sizeof(data))
{
ops->write(serial, &data, sizeof(data));