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-27 23:14:40 +08:00
parent f33a3356dc
commit 3c308b7454
13 changed files with 97 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
device/adc.c
View File

@@ -6,7 +6,7 @@
* @date 2023-11-06 MacRsh First version
*/
#include "include/device/adc.h"
#include "adc.h"
#ifdef MR_USING_ADC
@@ -66,7 +66,7 @@ static int mr_adc_ioctl(struct mr_dev *dev, int off, int cmd, void *args)
switch (cmd)
{
case MR_CTRL_ADC_SET_CHANNEL_STATE:
case MR_CTL_ADC_SET_CHANNEL_STATE:
{
if (args != MR_NULL)
{
@@ -99,7 +99,7 @@ static int mr_adc_ioctl(struct mr_dev *dev, int off, int cmd, void *args)
return MR_EINVAL;
}
case MR_CTRL_ADC_GET_CHANNEL_STATE:
case MR_CTL_ADC_GET_CHANNEL_STATE:
{
if (args != MR_NULL)
{
@@ -154,7 +154,7 @@ int mr_adc_register(struct mr_adc *adc, const char *name, struct mr_drv *drv)
adc->channel = 0;
/* Register the adc */
return mr_dev_register(&adc->dev, name, Mr_Dev_Type_Adc, MR_SFLAG_RDONLY, &ops, drv);
return mr_dev_register(&adc->dev, name, Mr_Dev_Type_ADC, MR_SFLAG_RDONLY, &ops, drv);
}
#endif /* MR_USING_ADC */

8
include/device/adc.h → device/adc.h
View File

@@ -26,14 +26,14 @@ extern "C" {
/**
* @brief ADC channel state command.
*/
#define MR_CTRL_ADC_SET_CHANNEL_STATE ((0x01|0x80) << 16) /**< Set channel state */
#define MR_CTRL_ADC_GET_CHANNEL_STATE ((0x01|0x00) << 16) /**< Get channel state */
#define MR_CTL_ADC_SET_CHANNEL_STATE ((0x01|0x80) << 16) /**< Set channel state */
#define MR_CTL_ADC_GET_CHANNEL_STATE ((0x01|0x00) << 16) /**< Get channel state */
/**
* @brief ADC channel command.
*/
#define MR_CTRL_ADC_SET_CHANNEL MR_CTRL_SET_OFFSET /**< Set channel */
#define MR_CTRL_ADC_GET_CHANNEL MR_CTRL_GET_OFFSET /**< Get channel */
#define MR_CTL_ADC_SET_CHANNEL MR_CTL_SET_OFFSET /**< Set channel */
#define MR_CTL_ADC_GET_CHANNEL MR_CTL_GET_OFFSET /**< Get channel */
/**
* @brief ADC data type.

14
device/can.c
View File

@@ -6,7 +6,7 @@
* @date 2023-11-22 MacRsh First version
*/
#include "include/device/can.h"
#include "can.h"
#ifdef MR_USING_CAN
@@ -114,7 +114,7 @@ int mr_can_bus_register(struct mr_can_bus *can_bus, const char *name, struct mr_
can_bus->owner = MR_NULL;
/* Register the can-bus */
return mr_dev_register(&can_bus->dev, name, Mr_Dev_Type_Can, MR_SFLAG_RDWR, &ops, drv);
return mr_dev_register(&can_bus->dev, name, Mr_Dev_Type_CAN, MR_SFLAG_RDWR, &ops, drv);
}
static int can_dev_filter_configure(struct mr_can_dev *can_dev, int id, int ide, int state)
@@ -276,7 +276,7 @@ static int mr_can_dev_ioctl(struct mr_dev *dev, int off, int cmd, void *args)
switch (cmd)
{
case MR_CTRL_SET_CONFIG:
case MR_CTL_SET_CONFIG:
{
if (args != MR_NULL)
{
@@ -295,7 +295,7 @@ static int mr_can_dev_ioctl(struct mr_dev *dev, int off, int cmd, void *args)
}
return MR_EINVAL;
}
case MR_CTRL_SET_RD_BUFSZ:
case MR_CTL_SET_RD_BUFSZ:
{
if (args != MR_NULL)
{
@@ -312,7 +312,7 @@ static int mr_can_dev_ioctl(struct mr_dev *dev, int off, int cmd, void *args)
return MR_EINVAL;
}
case MR_CTRL_GET_CONFIG:
case MR_CTL_GET_CONFIG:
{
if (args != MR_NULL)
{
@@ -323,7 +323,7 @@ static int mr_can_dev_ioctl(struct mr_dev *dev, int off, int cmd, void *args)
}
return MR_EINVAL;
}
case MR_CTRL_GET_RD_BUFSZ:
case MR_CTL_GET_RD_BUFSZ:
{
if (args != MR_NULL)
{
@@ -377,7 +377,7 @@ int mr_can_dev_register(struct mr_can_dev *can_dev, const char *name, int id, in
can_dev->ide = ide;
/* Register the can-dev */
return mr_dev_register(&can_dev->dev, name, Mr_Dev_Type_Can, MR_SFLAG_RDWR | MR_SFLAG_NONDRV, &ops, MR_NULL);
return mr_dev_register(&can_dev->dev, name, Mr_Dev_Type_CAN, MR_SFLAG_RDWR | MR_SFLAG_NONDRV, &ops, MR_NULL);
}
#endif /* MR_USING_CAN */

6
include/device/can.h → device/can.h
View File

@@ -53,8 +53,8 @@ struct mr_can_config
/**
* @brief CAN id command.
*/
#define MR_CTRL_CAN_SET_ID MR_CTRL_SET_OFFSET /**< Set id */
#define MR_CTRL_CAN_GET_ID MR_CTRL_GET_OFFSET /**< Get id */
#define MR_CTL_CAN_SET_ID MR_CTL_SET_OFFSET /**< Set id */
#define MR_CTL_CAN_GET_ID MR_CTL_GET_OFFSET /**< Get id */
/**
* @brief CAN data type.
@@ -64,7 +64,7 @@ typedef uint8_t mr_can_data_t; /**< CAN rea
/**
* @brief CAN ISR events.
*/
#define MR_ISR_CAN_RD_INT (MR_ISR_RD | (0x01 << 16)) /**< Read interrupt */
#define MR_ISR_CAN_RD_INT (MR_ISR_RD | (0x01 << 16)) /**< Read interrupt */
/**
* @brief CAN bus structure.

8
device/dac.c
View File

@@ -6,7 +6,7 @@
* @date 2023-11-08 MacRsh First version
*/
#include "include/device/dac.h"
#include "dac.h"
#ifdef MR_USING_DAC
@@ -66,7 +66,7 @@ static int mr_dac_ioctl(struct mr_dev *dev, int off, int cmd, void *args)
switch (cmd)
{
case MR_CTRL_DAC_SET_CHANNEL_STATE:
case MR_CTL_DAC_SET_CHANNEL_STATE:
{
if (args != MR_NULL)
{
@@ -94,7 +94,7 @@ static int mr_dac_ioctl(struct mr_dev *dev, int off, int cmd, void *args)
return MR_EINVAL;
}
case MR_CTRL_DAC_GET_CHANNEL_STATE:
case MR_CTL_DAC_GET_CHANNEL_STATE:
{
if (args != MR_NULL)
{
@@ -149,7 +149,7 @@ int mr_dac_register(struct mr_dac *dac, const char *name, struct mr_drv *drv)
dac->channel = 0;
/* Register the dac */
return mr_dev_register(&dac->dev, name, Mr_Dev_Type_Dac, MR_SFLAG_WRONLY, &ops, drv);
return mr_dev_register(&dac->dev, name, Mr_Dev_Type_DAC, MR_SFLAG_WRONLY, &ops, drv);
}
#endif /* MR_USING_DAC */

8
include/device/dac.h → device/dac.h
View File

@@ -26,14 +26,14 @@ extern "C" {
/**
* @brief DAC channel state command.
*/
#define MR_CTRL_DAC_SET_CHANNEL_STATE ((0x01|0x80) << 16) /**< Set channel state */
#define MR_CTRL_DAC_GET_CHANNEL_STATE ((0x01|0x00) << 16) /**< Get channel state */
#define MR_CTL_DAC_SET_CHANNEL_STATE ((0x01|0x80) << 16) /**< Set channel state */
#define MR_CTL_DAC_GET_CHANNEL_STATE ((0x01|0x00) << 16) /**< Get channel state */
/**
* @brief DAC channel command.
*/
#define MR_CTRL_DAC_SET_CHANNEL MR_CTRL_SET_OFFSET /**< Set channel */
#define MR_CTRL_DAC_GET_CHANNEL MR_CTRL_GET_OFFSET /**< Get channel */
#define MR_CTL_DAC_SET_CHANNEL MR_CTL_SET_OFFSET /**< Set channel */
#define MR_CTL_DAC_GET_CHANNEL MR_CTL_GET_OFFSET /**< Get channel */
/**
* @brief DAC data type.

14
device/i2c.c
View File

@@ -6,7 +6,7 @@
* @date 2023-11-09 MacRsh First version
*/
#include "include/device/i2c.h"
#include "i2c.h"
#ifdef MR_USING_I2C
@@ -103,7 +103,7 @@ int mr_i2c_bus_register(struct mr_i2c_bus *i2c_bus, const char *name, struct mr_
i2c_bus->hold = MR_FALSE;
/* Register the i2c-bus */
return mr_dev_register(&i2c_bus->dev, name, Mr_Dev_Type_I2c, MR_SFLAG_RDWR, &ops, drv);
return mr_dev_register(&i2c_bus->dev, name, Mr_Dev_Type_I2C, MR_SFLAG_RDWR, &ops, drv);
}
MR_INLINE int i2c_dev_take_bus(struct mr_i2c_dev *i2c_dev)
@@ -294,7 +294,7 @@ static int mr_i2c_dev_ioctl(struct mr_dev *dev, int off, int cmd, void *args)
switch (cmd)
{
case MR_CTRL_SET_CONFIG:
case MR_CTL_SET_CONFIG:
{
if (args != MR_NULL)
{
@@ -322,7 +322,7 @@ static int mr_i2c_dev_ioctl(struct mr_dev *dev, int off, int cmd, void *args)
}
return MR_EINVAL;
}
case MR_CTRL_SET_RD_BUFSZ:
case MR_CTL_SET_RD_BUFSZ:
{
if (args != MR_NULL)
{
@@ -339,7 +339,7 @@ static int mr_i2c_dev_ioctl(struct mr_dev *dev, int off, int cmd, void *args)
return MR_EINVAL;
}
case MR_CTRL_GET_CONFIG:
case MR_CTL_GET_CONFIG:
{
if (args != MR_NULL)
{
@@ -350,7 +350,7 @@ static int mr_i2c_dev_ioctl(struct mr_dev *dev, int off, int cmd, void *args)
}
return MR_EINVAL;
}
case MR_CTRL_GET_RD_BUFSZ:
case MR_CTL_GET_RD_BUFSZ:
{
if (args != MR_NULL)
{
@@ -405,7 +405,7 @@ int mr_i2c_dev_register(struct mr_i2c_dev *i2c_dev, const char *name, int addr,
i2c_dev->addr_bits = addr_bits;
/* Register the i2c-device */
return mr_dev_register(&i2c_dev->dev, name, Mr_Dev_Type_I2c, MR_SFLAG_RDWR | MR_SFLAG_NONDRV, &ops, MR_NULL);
return mr_dev_register(&i2c_dev->dev, name, Mr_Dev_Type_I2C, MR_SFLAG_RDWR | MR_SFLAG_NONDRV, &ops, MR_NULL);
}
#endif /* MR_USING_I2C */

4
include/device/i2c.h → device/i2c.h
View File

@@ -54,8 +54,8 @@ struct mr_i2c_config
/**
* @brief I2C register command.
*/
#define MR_CTRL_I2C_SET_REG MR_CTRL_SET_OFFSET /**< Set register */
#define MR_CTRL_I2C_GET_REG MR_CTRL_GET_OFFSET /**< Get register */
#define MR_CTL_I2C_SET_REG MR_CTL_SET_OFFSET /**< Set register */
#define MR_CTL_I2C_GET_REG MR_CTL_GET_OFFSET /**< Get register */
/**
* @brief I2C data type.

34
module/hx711/hx711.c
View File

@@ -14,11 +14,11 @@
#error "Please define MR_USING_PIN. Otherwise HX711 will not work."
#else
#include "include/device/pin.h"
#include "device/pin.h"
static void hx711_set_sck(struct mr_hx711 *hx711, uint8_t value)
{
mr_dev_ioctl(hx711->desc, MR_CTRL_SET_OFFSET, &hx711->sck_pin);
mr_dev_ioctl(hx711->desc, MR_CTL_SET_OFFSET, &hx711->sck_pin);
mr_dev_write(hx711->desc, &value, sizeof(value));
}
@@ -26,7 +26,7 @@ static uint8_t hx711_get_dout(struct mr_hx711 *hx711)
{
uint8_t value = 0;
mr_dev_ioctl(hx711->desc, MR_CTRL_SET_OFFSET, &hx711->dout_pin);
mr_dev_ioctl(hx711->desc, MR_CTL_SET_OFFSET, &hx711->dout_pin);
mr_dev_read(hx711->desc, &value, sizeof(value));
return value;
}
@@ -75,19 +75,19 @@ static int mr_hx711_open(struct mr_dev *dev)
{
struct mr_hx711 *hx711 = (struct mr_hx711 *)dev;
hx711->desc = mr_dev_open("gpio", MR_OFLAG_RDWR);
hx711->desc = mr_dev_open("pin", MR_OFLAG_RDWR);
if (hx711->desc < 0)
{
return hx711->desc;
}
/* Set the sck pin mode */
mr_dev_ioctl(hx711->desc, MR_CTRL_PIN_SET_NUMBER, &hx711->sck_pin);
mr_dev_ioctl(hx711->desc, MR_CTRL_PIN_SET_MODE, mr_make_local(int, MR_PIN_MODE_OUTPUT));
mr_dev_ioctl(hx711->desc, MR_CTL_PIN_SET_NUMBER, &hx711->sck_pin);
mr_dev_ioctl(hx711->desc, MR_CTL_PIN_SET_MODE, mr_make_local(int, MR_PIN_MODE_OUTPUT));
/* Set the dout pin mode */
mr_dev_ioctl(hx711->desc, MR_CTRL_PIN_SET_NUMBER, &hx711->dout_pin);
mr_dev_ioctl(hx711->desc, MR_CTRL_PIN_SET_MODE, mr_make_local(int, MR_PIN_MODE_INPUT_UP));
mr_dev_ioctl(hx711->desc, MR_CTL_PIN_SET_NUMBER, &hx711->dout_pin);
mr_dev_ioctl(hx711->desc, MR_CTL_PIN_SET_MODE, mr_make_local(int, MR_PIN_MODE_INPUT_UP));
return MR_EOK;
}
@@ -96,12 +96,12 @@ static int mr_hx711_close(struct mr_dev *dev)
struct mr_hx711 *hx711 = (struct mr_hx711 *)dev;
/* Reset the sck pin mode */
mr_dev_ioctl(hx711->desc, MR_CTRL_PIN_SET_NUMBER, &hx711->sck_pin);
mr_dev_ioctl(hx711->desc, MR_CTRL_PIN_SET_MODE, mr_make_local(int, MR_PIN_MODE_NONE));
mr_dev_ioctl(hx711->desc, MR_CTL_PIN_SET_NUMBER, &hx711->sck_pin);
mr_dev_ioctl(hx711->desc, MR_CTL_PIN_SET_MODE, mr_make_local(int, MR_PIN_MODE_NONE));
/* Reset the dout pin mode */
mr_dev_ioctl(hx711->desc, MR_CTRL_PIN_SET_NUMBER, &hx711->dout_pin);
mr_dev_ioctl(hx711->desc, MR_CTRL_PIN_SET_MODE, mr_make_local(int, MR_PIN_MODE_NONE));
mr_dev_ioctl(hx711->desc, MR_CTL_PIN_SET_NUMBER, &hx711->dout_pin);
mr_dev_ioctl(hx711->desc, MR_CTL_PIN_SET_MODE, mr_make_local(int, MR_PIN_MODE_NONE));
mr_dev_close(hx711->desc);
hx711->desc = -1;
@@ -130,7 +130,7 @@ static int mr_hx711_ioctl(struct mr_dev *dev, int off, int cmd, void *args)
switch (cmd)
{
case MR_CTRL_HX711_SET_FILTER_BITS:
case MR_CTL_HX711_SET_FILTER_BITS:
{
if (args != MR_NULL)
{
@@ -140,13 +140,13 @@ static int mr_hx711_ioctl(struct mr_dev *dev, int off, int cmd, void *args)
}
return MR_EINVAL;
}
case MR_CTRL_HX711_SET_SELF_CAL:
case MR_CTL_HX711_SET_SELF_CAL:
{
hx711->self_cal = hx711_get_value(hx711);
return MR_EOK;
}
case MR_CTRL_HX711_GET_FILTER_BITS:
case MR_CTL_HX711_GET_FILTER_BITS:
{
if (args != MR_NULL)
{
@@ -155,7 +155,7 @@ static int mr_hx711_ioctl(struct mr_dev *dev, int off, int cmd, void *args)
}
return MR_EINVAL;
}
case MR_CTRL_HX711_GET_SELF_CAL:
case MR_CTL_HX711_GET_SELF_CAL:
{
if (args != MR_NULL)
{
@@ -207,7 +207,7 @@ int mr_hx711_register(struct mr_hx711 *hx711, const char *name, int sck_pin, int
hx711->desc = -1;
/* Register the hx711 */
return mr_dev_register(&hx711->dev, name, Mr_Dev_Type_Adc, MR_SFLAG_RDONLY | MR_SFLAG_NONDRV, &ops, MR_NULL);
return mr_dev_register(&hx711->dev, name, Mr_Dev_Type_ADC, MR_SFLAG_RDONLY | MR_SFLAG_NONDRV, &ops, MR_NULL);
}
#endif /* MR_USING_PIN */

8
module/hx711/hx711.h
View File

@@ -20,10 +20,10 @@ extern "C" {
/**
* @brief HX711 command.
*/
#define MR_CTRL_HX711_SET_FILTER_BITS ((0x01|0x80) << 16) /**< Set filter bits */
#define MR_CTRL_HX711_SET_SELF_CAL ((0x02|0x80) << 16) /**< Set self calibration */
#define MR_CTRL_HX711_GET_FILTER_BITS ((0x01|0x00) << 16) /**< Get filter bits */
#define MR_CTRL_HX711_GET_SELF_CAL ((0x02|0x00) << 16) /**< Get self calibration */
#define MR_CTL_HX711_SET_FILTER_BITS ((0x01|0x80) << 16) /**< Set filter bits */
#define MR_CTL_HX711_SET_SELF_CAL ((0x02|0x80) << 16) /**< Set self calibration */
#define MR_CTL_HX711_GET_FILTER_BITS ((0x01|0x00) << 16) /**< Get filter bits */
#define MR_CTL_HX711_GET_SELF_CAL ((0x02|0x00) << 16) /**< Get self calibration */
/**
* @brief HX711 data type.

12
module/icm20602/icm20602.c
View File

@@ -23,7 +23,7 @@
static void icm20602_write_reg(struct mr_icm20602 *icm20602, uint8_t reg, uint8_t data)
{
mr_dev_ioctl(icm20602->desc, MR_CTRL_SET_OFFSET, mr_make_local(int, reg));
mr_dev_ioctl(icm20602->desc, MR_CTL_SET_OFFSET, mr_make_local(int, reg));
mr_dev_write(icm20602->desc, &data, sizeof(data));
}
@@ -31,14 +31,14 @@ static uint8_t icm20602_read_reg(struct mr_icm20602 *icm20602, uint8_t reg)
{
uint8_t data = 0;
mr_dev_ioctl(icm20602->desc, MR_CTRL_SET_OFFSET, mr_make_local(int, reg | 0x80));
mr_dev_ioctl(icm20602->desc, MR_CTL_SET_OFFSET, mr_make_local(int, reg | 0x80));
mr_dev_read(icm20602->desc, &data, sizeof(data));
return data;
}
static ssize_t icm20602_read_regs(struct mr_icm20602 *icm20602, uint8_t reg, uint8_t *buf, size_t size)
{
mr_dev_ioctl(icm20602->desc, MR_CTRL_SET_OFFSET, mr_make_local(int, reg | 0x80));
mr_dev_ioctl(icm20602->desc, MR_CTL_SET_OFFSET, mr_make_local(int, reg | 0x80));
return mr_dev_read(icm20602->desc, buf, size);
}
@@ -138,7 +138,7 @@ static int mr_icm20602_open(struct mr_dev *dev)
return icm20602->desc;
}
config.baud_rate = 10 * 1000 * 1000;
mr_dev_ioctl(icm20602->desc, MR_CTRL_SET_CONFIG, &config);
mr_dev_ioctl(icm20602->desc, MR_CTL_SET_CONFIG, &config);
/* Self check */
if (icm20602_self_check(icm20602) == MR_FALSE)
@@ -221,7 +221,7 @@ static int mr_icm20602_ioctl(struct mr_dev *dev, int off, int cmd, void *args)
switch (cmd)
{
case MR_CTRL_SET_CONFIG:
case MR_CTL_SET_CONFIG:
{
if (args != MR_NULL)
{
@@ -232,7 +232,7 @@ static int mr_icm20602_ioctl(struct mr_dev *dev, int off, int cmd, void *args)
return MR_EINVAL;
}
case MR_CTRL_GET_CONFIG:
case MR_CTL_GET_CONFIG:
{
if (args != MR_NULL)
{

2
module/icm20602/icm20602.h
View File

@@ -22,7 +22,7 @@ extern "C" {
#error "Please define MR_USING_SPI. Otherwise ICM20602 will not work."
#else
#include "include/device/spi.h"
#include "device/spi.h"
/**
* @brief ICM20602 acc Range.

68
source/device.c
View File

@@ -138,7 +138,7 @@ static struct mr_dev *dev_find_or_register(const char *name, struct mr_dev *dev,
return MR_NULL;
}
#ifdef MR_USING_RDWR_CTRL
#ifdef MR_USING_RDWR_CTL
MR_INLINE int dev_lock_take(struct mr_dev *dev, int take, int set)
{
if (dev->link != MR_NULL)
@@ -166,7 +166,7 @@ MR_INLINE void dev_lock_release(struct mr_dev *dev, int release)
}
mr_bits_clr(dev->lflags, release);
}
#endif /* MR_USING_RDWR_CTRL */
#endif /* MR_USING_RDWR_CTL */
MR_INLINE int dev_register(struct mr_dev *dev, const char *name)
{
@@ -179,12 +179,12 @@ MR_INLINE int dev_register(struct mr_dev *dev, const char *name)
MR_INLINE int dev_open(struct mr_dev *dev, uint32_t oflags)
{
#ifdef MR_USING_RDWR_CTRL
#ifdef MR_USING_RDWR_CTL
if (mr_bits_is_set(dev->sflags, oflags) != MR_ENABLE)
{
return MR_ENOTSUP;
}
#endif /* MR_USING_RDWR_CTRL */
#endif /* MR_USING_RDWR_CTL */
if (dev->ref_count == 0)
{
@@ -206,12 +206,12 @@ MR_INLINE int dev_open(struct mr_dev *dev, uint32_t oflags)
}
}
}
#ifdef MR_USING_RDWR_CTRL
#ifdef MR_USING_RDWR_CTL
else if (mr_bits_is_set(dev->sflags, MR_SFLAG_ONLY) == MR_ENABLE)
{
return MR_EBUSY;
}
#endif /* MR_USING_RDWR_CTRL */
#endif /* MR_USING_RDWR_CTL */
dev->ref_count++;
return MR_EOK;
@@ -241,7 +241,7 @@ MR_INLINE int dev_close(struct mr_dev *dev)
MR_INLINE ssize_t dev_read(struct mr_dev *dev, int off, void *buf, size_t size, int async)
{
#ifdef MR_USING_RDWR_CTRL
#ifdef MR_USING_RDWR_CTL
do
{
/* Disable interrupt */
@@ -256,20 +256,20 @@ MR_INLINE ssize_t dev_read(struct mr_dev *dev, int off, void *buf, size_t size,
/* Enable interrupt */
mr_interrupt_enable();
} while (0);
#endif /* MR_USING_RDWR_CTRL */
#endif /* MR_USING_RDWR_CTL */
/* Read buffer from the device */
ssize_t ret = dev->ops->read(dev, off, buf, size, async);
#ifdef MR_USING_RDWR_CTRL
#ifdef MR_USING_RDWR_CTL
dev_lock_release(dev, MR_LFLAG_RD);
#endif /* MR_USING_RDWR_CTRL */
#endif /* MR_USING_RDWR_CTL */
return ret;
}
MR_INLINE ssize_t dev_write(struct mr_dev *dev, int offset, const void *buf, size_t size, int async)
{
#ifdef MR_USING_RDWR_CTRL
#ifdef MR_USING_RDWR_CTL
do
{
/* Disable interrupt */
@@ -286,12 +286,12 @@ MR_INLINE ssize_t dev_write(struct mr_dev *dev, int offset, const void *buf, siz
/* Enable interrupt */
mr_interrupt_enable();
} while (0);
#endif /* MR_USING_RDWR_CTRL */
#endif /* MR_USING_RDWR_CTL */
/* Write buffer to the device */
ssize_t ret = dev->ops->write(dev, offset, buf, size, async);
#ifdef MR_USING_RDWR_CTRL
#ifdef MR_USING_RDWR_CTL
dev_lock_release(dev, MR_LFLAG_WR);
if ((async == MR_ASYNC) && (ret != 0))
{
@@ -301,7 +301,7 @@ MR_INLINE ssize_t dev_write(struct mr_dev *dev, int offset, const void *buf, siz
/* Enable interrupt */
mr_interrupt_enable();
}
#endif /* MR_USING_RDWR_CTRL */
#endif /* MR_USING_RDWR_CTL */
return ret;
}
@@ -314,20 +314,20 @@ static int dev_ioctl(struct mr_dev *dev, int desc, int off, int cmd, void *args)
switch (cmd)
{
case MR_CTRL_SET_RD_CALL:
case MR_CTL_SET_RD_CALL:
{
dev->rd_call.desc = desc;
dev->rd_call.call = (int (*)(int desc, void *args))args;
return MR_EOK;
}
case MR_CTRL_SET_WR_CALL:
case MR_CTL_SET_WR_CALL:
{
dev->wr_call.desc = desc;
dev->wr_call.call = (int (*)(int desc, void *args))args;
return MR_EOK;
}
case MR_CTRL_GET_RD_CALL:
case MR_CTL_GET_RD_CALL:
{
if (args != MR_NULL)
{
@@ -336,7 +336,7 @@ static int dev_ioctl(struct mr_dev *dev, int desc, int off, int cmd, void *args)
}
return MR_EINVAL;
}
case MR_CTRL_GET_WR_CALL:
case MR_CTL_GET_WR_CALL:
{
if (args != MR_NULL)
{
@@ -348,7 +348,7 @@ static int dev_ioctl(struct mr_dev *dev, int desc, int off, int cmd, void *args)
default:
{
#ifdef MR_USING_RDWR_CTRL
#ifdef MR_USING_RDWR_CTL
do
{
/* Disable interrupt */
@@ -363,14 +363,14 @@ static int dev_ioctl(struct mr_dev *dev, int desc, int off, int cmd, void *args)
/* Enable interrupt */
mr_interrupt_enable();
} while (0);
#endif /* MR_USING_RDWR_CTRL */
#endif /* MR_USING_RDWR_CTL */
/* I/O control to the device */
int ret = dev->ops->ioctl(dev, off, cmd, args);
#ifdef MR_USING_RDWR_CTRL
#ifdef MR_USING_RDWR_CTL
dev_lock_release(dev, MR_LFLAG_RDWR);
#endif /* MR_USING_RDWR_CTRL */
#endif /* MR_USING_RDWR_CTL */
return ret;
}
}
@@ -411,13 +411,13 @@ int mr_dev_register(struct mr_dev *dev,
mr_list_init(&dev->slist);
dev->link = MR_NULL;
dev->type = type;
#ifdef MR_USING_RDWR_CTRL
#ifdef MR_USING_RDWR_CTL
dev->sflags = sflags;
#endif /* MR_USING_RDWR_CTRL */
#endif /* MR_USING_RDWR_CTL */
dev->ref_count = 0;
#ifdef MR_USING_RDWR_CTRL
#ifdef MR_USING_RDWR_CTL
dev->lflags = 0;
#endif /* MR_USING_RDWR_CTRL */
#endif /* MR_USING_RDWR_CTL */
dev->rd_call.desc = -1;
dev->rd_call.call = MR_NULL;
dev->wr_call.desc = -1;
@@ -461,9 +461,9 @@ void mr_dev_isr(struct mr_dev *dev, int event, void *args)
{
if (ret == 0)
{
#ifdef MR_USING_RDWR_CTRL
#ifdef MR_USING_RDWR_CTL
dev_lock_release(dev, MR_LFLAG_NONBLOCK);
#endif /* MR_USING_RDWR_CTRL */
#endif /* MR_USING_RDWR_CTL */
if (dev->wr_call.call != MR_NULL)
{
dev->wr_call.call(dev->wr_call.desc, &ret);
@@ -644,12 +644,12 @@ ssize_t mr_dev_read(int desc, void *buf, size_t size)
mr_assert(desc_is_valid(desc));
mr_assert(buf != MR_NULL || size == 0);
#ifdef MR_USING_RDWR_CTRL
#ifdef MR_USING_RDWR_CTL
if (mr_bits_is_set(desc_of(desc).oflags, MR_OFLAG_RDONLY) == MR_DISABLE)
{
return MR_ENOTSUP;
}
#endif /* MR_USING_RDWR_CTRL */
#endif /* MR_USING_RDWR_CTL */
/* Read buffer from the device */
return dev_read(desc_of(desc).dev,
@@ -673,12 +673,12 @@ ssize_t mr_dev_write(int desc, const void *buf, size_t size)
mr_assert(desc_is_valid(desc));
mr_assert(buf != MR_NULL || size == 0);
#ifdef MR_USING_RDWR_CTRL
#ifdef MR_USING_RDWR_CTL
if (mr_bits_is_set(desc_of(desc).oflags, MR_OFLAG_WRONLY) == MR_DISABLE)
{
return MR_ENOTSUP;
}
#endif /* MR_USING_RDWR_CTRL */
#endif /* MR_USING_RDWR_CTL */
/* Write buffer to the device */
return dev_write(desc_of(desc).dev,
@@ -703,7 +703,7 @@ int mr_dev_ioctl(int desc, int cmd, void *args)
switch (cmd)
{
case MR_CTRL_SET_OFFSET:
case MR_CTL_SET_OFFSET:
{
if (args != MR_NULL)
{
@@ -713,7 +713,7 @@ int mr_dev_ioctl(int desc, int cmd, void *args)
return MR_EINVAL;
}
case MR_CTRL_GET_OFFSET:
case MR_CTL_GET_OFFSET:
{
if (args != MR_NULL)
{