From 6894b544bc789c04a82638190b483a7d15457cb8 Mon Sep 17 00:00:00 2001 From: MacRsh Date: Fri, 19 Jan 2024 20:42:34 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9ioctl=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=80=BC=E4=B8=BAint=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/msh/msh_device.c | 14 +++++++------- device/adc.c | 2 +- device/can.c | 2 +- device/dac.c | 2 +- device/i2c.c | 2 +- device/pin.c | 2 +- device/pwm.c | 2 +- device/serial.c | 2 +- device/spi.c | 2 +- device/timer.c | 2 +- include/mr_api.h | 2 +- source/device.c | 6 +++--- source/service.c | 6 +++--- 13 files changed, 23 insertions(+), 23 deletions(-) diff --git a/components/msh/msh_device.c b/components/msh/msh_device.c index 0e2ecd8..3b5013a 100644 --- a/components/msh/msh_device.c +++ b/components/msh/msh_device.c @@ -26,7 +26,7 @@ static int msh_update_path(int desc) int offset; /* Update the path */ - int ret = (int)mr_dev_ioctl(desc, MR_CTL_GET_PATH, &path); + int ret = mr_dev_ioctl(desc, MR_CTL_GET_PATH, &path); if (ret < 0) { return ret; @@ -242,7 +242,7 @@ static int msh_dioctl_bufsz(int argc, void *argv) } /* Set/get the buffer size */ - ret = (int)mr_dev_ioctl(MSH_GET_DESC(), cmd, &bufsz); + ret = mr_dev_ioctl(MSH_GET_DESC(), cmd, &bufsz); if (ret < 0) { mr_msh_printf("error: %s\r\n", mr_strerror(ret)); @@ -295,7 +295,7 @@ static int msh_dioctl_datasz(int argc, void *argv) } /* Set/get the buffer size */ - ret = (int)mr_dev_ioctl(MSH_GET_DESC(), cmd, &datasz); + ret = mr_dev_ioctl(MSH_GET_DESC(), cmd, &datasz); if (ret < 0) { mr_msh_printf("error: %s\r\n", mr_strerror(ret)); @@ -330,7 +330,7 @@ static int msh_cmd_dioctl_cfg(int argc, void *argv) if (strncmp(MR_MSH_GET_ARG(2), "-g", 2) == 0) { /* Get the config */ - ret = (int)mr_dev_ioctl(MSH_GET_DESC(), MR_CTL_GET_CONFIG, cfg); + ret = mr_dev_ioctl(MSH_GET_DESC(), MR_CTL_GET_CONFIG, cfg); if (ret < 0) { mr_msh_printf("error: %s\r\n", mr_strerror(ret)); @@ -355,7 +355,7 @@ static int msh_cmd_dioctl_cfg(int argc, void *argv) } /* Set the config */ - ret = (int)mr_dev_ioctl(MSH_GET_DESC(), MR_CTL_SET_CONFIG, cfg); + ret = mr_dev_ioctl(MSH_GET_DESC(), MR_CTL_SET_CONFIG, cfg); if (ret < 0) { mr_msh_printf("error: %s\r\n", mr_strerror(ret)); @@ -458,7 +458,7 @@ static int msh_dioctl_cmd(int argc, void *argv) if (cmd < 0) { /* Get the arguments */ - ret = (int)mr_dev_ioctl(MSH_GET_DESC(), cmd, args); + ret = mr_dev_ioctl(MSH_GET_DESC(), cmd, args); if (ret < 0) { mr_msh_printf("error: %s\r\n", mr_strerror(ret)); @@ -481,7 +481,7 @@ static int msh_dioctl_cmd(int argc, void *argv) goto usage; } } - ret = (int)mr_dev_ioctl(MSH_GET_DESC(), cmd, args); + ret = mr_dev_ioctl(MSH_GET_DESC(), cmd, args); if (ret < 0) { mr_msh_printf("error: %s\r\n", mr_strerror(ret)); diff --git a/device/adc.c b/device/adc.c index e2573be..054098c 100644 --- a/device/adc.c +++ b/device/adc.c @@ -103,7 +103,7 @@ static ssize_t mr_adc_read(struct mr_dev *dev, int off, void *buf, size_t size, return rd_size; } -static ssize_t mr_adc_ioctl(struct mr_dev *dev, int off, int cmd, void *args) +static int mr_adc_ioctl(struct mr_dev *dev, int off, int cmd, void *args) { struct mr_adc *adc = (struct mr_adc *)dev; diff --git a/device/can.c b/device/can.c index b460b53..3264aa4 100644 --- a/device/can.c +++ b/device/can.c @@ -269,7 +269,7 @@ static ssize_t mr_can_dev_write(struct mr_dev *dev, int off, const void *buf, si return ret; } -static ssize_t mr_can_dev_ioctl(struct mr_dev *dev, int off, int cmd, void *args) +static int mr_can_dev_ioctl(struct mr_dev *dev, int off, int cmd, void *args) { struct mr_can_dev *can_dev = (struct mr_can_dev *)dev; diff --git a/device/dac.c b/device/dac.c index 0cd8c57..1300982 100644 --- a/device/dac.c +++ b/device/dac.c @@ -103,7 +103,7 @@ static ssize_t mr_dac_write(struct mr_dev *dev, int off, const void *buf, size_t return wr_size; } -static ssize_t mr_dac_ioctl(struct mr_dev *dev, int off, int cmd, void *args) +static int mr_dac_ioctl(struct mr_dev *dev, int off, int cmd, void *args) { struct mr_dac *dac = (struct mr_dac *)dev; diff --git a/device/i2c.c b/device/i2c.c index 0dda032..d5f9826 100644 --- a/device/i2c.c +++ b/device/i2c.c @@ -298,7 +298,7 @@ static ssize_t mr_i2c_dev_write(struct mr_dev *dev, int off, const void *buf, si return ret; } -static ssize_t mr_i2c_dev_ioctl(struct mr_dev *dev, int off, int cmd, void *args) +static int mr_i2c_dev_ioctl(struct mr_dev *dev, int off, int cmd, void *args) { struct mr_i2c_dev *i2c_dev = (struct mr_i2c_dev *)dev; diff --git a/device/pin.c b/device/pin.c index f1e7fb8..5c9113a 100644 --- a/device/pin.c +++ b/device/pin.c @@ -137,7 +137,7 @@ static ssize_t mr_pin_write(struct mr_dev *dev, int off, const void *buf, size_t return wr_size; } -static ssize_t mr_pin_ioctl(struct mr_dev *dev, int off, int cmd, void *args) +static int mr_pin_ioctl(struct mr_dev *dev, int off, int cmd, void *args) { struct mr_pin *pin = (struct mr_pin *)dev; diff --git a/device/pwm.c b/device/pwm.c index 8bae2c2..bebcf84 100644 --- a/device/pwm.c +++ b/device/pwm.c @@ -218,7 +218,7 @@ static ssize_t mr_pwm_write(struct mr_dev *dev, int off, const void *buf, size_t return wr_size; } -static ssize_t mr_pwm_ioctl(struct mr_dev *dev, int off, int cmd, void *args) +static int mr_pwm_ioctl(struct mr_dev *dev, int off, int cmd, void *args) { struct mr_pwm *pwm = (struct mr_pwm *)dev; struct mr_pwm_ops *ops = (struct mr_pwm_ops *)dev->drv->ops; diff --git a/device/serial.c b/device/serial.c index e386d69..ebc0d17 100644 --- a/device/serial.c +++ b/device/serial.c @@ -88,7 +88,7 @@ static ssize_t mr_serial_write(struct mr_dev *dev, int off, const void *buf, siz return wr_size; } -static ssize_t mr_serial_ioctl(struct mr_dev *dev, int off, int cmd, void *args) +static int mr_serial_ioctl(struct mr_dev *dev, int off, int cmd, void *args) { struct mr_serial *serial = (struct mr_serial *)dev; struct mr_serial_ops *ops = (struct mr_serial_ops *)dev->drv->ops; diff --git a/device/spi.c b/device/spi.c index 39a9ffe..c53029e 100644 --- a/device/spi.c +++ b/device/spi.c @@ -498,7 +498,7 @@ static ssize_t mr_spi_dev_write(struct mr_dev *dev, int off, const void *buf, si return ret; } -static ssize_t mr_spi_dev_ioctl(struct mr_dev *dev, int off, int cmd, void *args) +static int mr_spi_dev_ioctl(struct mr_dev *dev, int off, int cmd, void *args) { struct mr_spi_dev *spi_dev = (struct mr_spi_dev *)dev; diff --git a/device/timer.c b/device/timer.c index f2afafc..85852e6 100644 --- a/device/timer.c +++ b/device/timer.c @@ -177,7 +177,7 @@ static ssize_t mr_timer_write(struct mr_dev *dev, int off, const void *buf, size return wr_size; } -static ssize_t mr_timer_ioctl(struct mr_dev *dev, int off, int cmd, void *args) +static int mr_timer_ioctl(struct mr_dev *dev, int off, int cmd, void *args) { struct mr_timer *timer = (struct mr_timer *)dev; diff --git a/include/mr_api.h b/include/mr_api.h index affa64b..da7db72 100644 --- a/include/mr_api.h +++ b/include/mr_api.h @@ -107,7 +107,7 @@ int mr_dev_open(const char *path, int oflags); int mr_dev_close(int desc); ssize_t mr_dev_read(int desc, void *buf, size_t size); ssize_t mr_dev_write(int desc, const void *buf, size_t size); -ssize_t mr_dev_ioctl(int desc, int cmd, void *args); +int mr_dev_ioctl(int desc, int cmd, void *args); int mr_dev_is_valid(int desc); /** @} */ diff --git a/source/device.c b/source/device.c index a4e5d25..b7b1c38 100644 --- a/source/device.c +++ b/source/device.c @@ -351,7 +351,7 @@ MR_INLINE ssize_t dev_write(struct mr_dev *dev, int offset, const void *buf, siz return ret; } -MR_INLINE ssize_t dev_ioctl(struct mr_dev *dev, int desc, int off, int cmd, void *args) +MR_INLINE int dev_ioctl(struct mr_dev *dev, int desc, int off, int cmd, void *args) { /* Check whether the device has an ioctl function */ if (dev->ops->ioctl == MR_NULL) @@ -447,7 +447,7 @@ MR_INLINE ssize_t dev_ioctl(struct mr_dev *dev, int desc, int off, int cmd, void #endif /* MR_USING_RDWR_CTL */ /* I/O control to the device */ - ssize_t ret = dev->ops->ioctl(dev, off, cmd, args); + int ret = dev->ops->ioctl(dev, off, cmd, args); #ifdef MR_USING_RDWR_CTL dev_lock_release(dev, MR_LFLAG_RDWR); @@ -759,7 +759,7 @@ ssize_t mr_dev_write(int desc, const void *buf, size_t size) * * @return The arguments of the device, otherwise an error code. */ -ssize_t mr_dev_ioctl(int desc, int cmd, void *args) +int mr_dev_ioctl(int desc, int cmd, void *args) { MR_DESC_CHECK(desc); diff --git a/source/service.c b/source/service.c index 3998eb2..0aa474a 100644 --- a/source/service.c +++ b/source/service.c @@ -12,13 +12,13 @@ static int start(void) { return 0; } -MR_INIT_EXPORT(start, "0"); +_MR_INIT_EXPORT(start, "0"); static int end(void) { return 0; } -MR_INIT_EXPORT(end, "5.end"); +_MR_INIT_EXPORT(end, "5.end"); /** * @brief This function is auto initialized. @@ -106,7 +106,7 @@ MR_WEAK int mr_printf_output(const char *buf, size_t size) #ifndef MR_USING_PRINTF_NONBLOCKING desc = mr_dev_open(MR_CFG_PRINTF_DEV_NAME, MR_OFLAG_RDWR); #else - console = mr_dev_open(MR_CFG_PRINTF_DEV_NAME, MR_OFLAG_RDWR | MR_OFLAG_NONBLOCK); + desc = mr_dev_open(MR_CFG_PRINTF_DEV_NAME, MR_OFLAG_RDWR | MR_OFLAG_NONBLOCK); #endif /* MR_USING_PRINTF_NONBLOCKING */ if (mr_dev_is_valid(desc) == MR_FALSE) {