From b5cf61ac95a5bc5a49fa8175c05bda56575a3741 Mon Sep 17 00:00:00 2001 From: sp-cai <70000077+sp-cai@users.noreply.github.com> Date: Mon, 10 Jul 2023 10:57:13 +0800 Subject: [PATCH 01/24] =?UTF-8?q?[components][i2c]=20Update=20i2c.h=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96=20controt=20=E6=8E=A5=E5=8F=A3=E4=B8=BA?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=A0=87=E5=87=86=E7=9A=84=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 由于 i2c_bus_control 的参数与系统标准的格式不同，不便于程序的扩展应用。 --- components/drivers/include/drivers/i2c.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/components/drivers/include/drivers/i2c.h b/components/drivers/include/drivers/i2c.h index 2a900536dfc..ed874252603 100644 --- a/components/drivers/include/drivers/i2c.h +++ b/components/drivers/include/drivers/i2c.h @@ -45,8 +45,8 @@ struct rt_i2c_bus_device_ops struct rt_i2c_msg msgs[], rt_uint32_t num); rt_err_t (*i2c_bus_control)(struct rt_i2c_bus_device *bus, - rt_uint32_t, - rt_uint32_t); + int cmd, + void *args); }; /*for i2c bus driver*/ @@ -74,8 +74,8 @@ rt_ssize_t rt_i2c_transfer(struct rt_i2c_bus_device *bus, struct rt_i2c_msg msgs[], rt_uint32_t num); rt_err_t rt_i2c_control(struct rt_i2c_bus_device *bus, - rt_uint32_t cmd, - rt_uint32_t arg); + int cmd, + void *args); rt_ssize_t rt_i2c_master_send(struct rt_i2c_bus_device *bus, rt_uint16_t addr, rt_uint16_t flags, From 659e9bdc6819339408ee0389317a0c90ea2f75f7 Mon Sep 17 00:00:00 2001 From: sp-cai <70000077+sp-cai@users.noreply.github.com> Date: Mon, 10 Jul 2023 11:22:51 +0800 Subject: [PATCH 02/24] =?UTF-8?q?[components][i2c]=20Update=20i2c=5Fdev.c?= =?UTF-8?q?=20=E6=9B=B4=E5=A5=BD=E7=9A=84=E5=8F=AF=E6=89=A9=E5=B1=95?= =?UTF-8?q?=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 原来 rt_i2c_control 只能执行 RT_I2C_DEV_CTRL_CLK 命令，为了与系统此类函数的参数格式一致且更好的可扩展性。 --- components/drivers/i2c/i2c_dev.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/components/drivers/i2c/i2c_dev.c b/components/drivers/i2c/i2c_dev.c index f492d470a5a..309de3cd559 100644 --- a/components/drivers/i2c/i2c_dev.c +++ b/components/drivers/i2c/i2c_dev.c @@ -88,16 +88,8 @@ static rt_err_t i2c_bus_device_control(rt_device_t dev, return -RT_EIO; } break; - case RT_I2C_DEV_CTRL_CLK: - bus_clock = *(rt_uint32_t *)args; - ret = rt_i2c_control(bus, cmd, bus_clock); - if (ret < 0) - { - return -RT_EIO; - } - break; default: - break; + return rt_i2c_control(bus, cmd, args); } return RT_EOK; From ecbe6ed184ac1164f8fd6c082a0832d46b02ca04 Mon Sep 17 00:00:00 2001 From: sp-cai <70000077+sp-cai@users.noreply.github.com> Date: Mon, 10 Jul 2023 11:43:33 +0800 Subject: [PATCH 03/24] =?UTF-8?q?[components][i2c]=20Update=20i2c=5Fcore.c?= =?UTF-8?q?=20=E6=9B=B4=E5=A5=BD=E7=9A=84=E5=8F=AF=E6=89=A9=E5=B1=95?= =?UTF-8?q?=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 原来 rt_i2c_control 只能执行 RT_I2C_DEV_CTRL_CLK 命令，为了与系统此类函数的参数格式一致且更好的可扩展性。 --- components/drivers/i2c/i2c_core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/drivers/i2c/i2c_core.c b/components/drivers/i2c/i2c_core.c index 17671ea2418..127fdd25a42 100644 --- a/components/drivers/i2c/i2c_core.c +++ b/components/drivers/i2c/i2c_core.c @@ -89,14 +89,14 @@ rt_ssize_t rt_i2c_transfer(struct rt_i2c_bus_device *bus, } rt_err_t rt_i2c_control(struct rt_i2c_bus_device *bus, - rt_uint32_t cmd, - rt_uint32_t arg) + int cmd, + void *args) { rt_err_t ret; if(bus->ops->i2c_bus_control) { - ret = bus->ops->i2c_bus_control(bus, cmd, arg); + ret = bus->ops->i2c_bus_control(bus, cmd, args); return ret; } else From 264ea9c393639831e66a72fe4457345a017a41ef Mon Sep 17 00:00:00 2001 From: sp-cai <70000077+sp-cai@users.noreply.github.com> Date: Mon, 10 Jul 2023 12:26:03 +0800 Subject: [PATCH 04/24] =?UTF-8?q?[components][i2c]=20Update=20i2c=5Fdev.h?= =?UTF-8?q?=20=E5=A2=9E=E5=8A=A0=E5=8F=AF=E7=94=A8=E5=91=BD=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 增加 I2C 可用操作命令。 --- components/drivers/include/drivers/i2c_dev.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/components/drivers/include/drivers/i2c_dev.h b/components/drivers/include/drivers/i2c_dev.h index 60bbad05079..6744fa142dc 100644 --- a/components/drivers/include/drivers/i2c_dev.h +++ b/components/drivers/include/drivers/i2c_dev.h @@ -23,6 +23,10 @@ extern "C" { #define RT_I2C_DEV_CTRL_TIMEOUT (RT_DEVICE_CTRL_BASE(I2CBUS) + 0x03) #define RT_I2C_DEV_CTRL_RW (RT_DEVICE_CTRL_BASE(I2CBUS) + 0x04) #define RT_I2C_DEV_CTRL_CLK (RT_DEVICE_CTRL_BASE(I2CBUS) + 0x05) +#define RT_I2C_DEV_CTRL_UNLOCK (RT_DEVICE_CTRL_BASE(I2CBUS) + 0x06) +#define RT_I2C_DEV_CTRL_GET_STATE (RT_DEVICE_CTRL_BASE(I2CBUS) + 0x07) +#define RT_I2C_DEV_CTRL_GET_MODE (RT_DEVICE_CTRL_BASE(I2CBUS) + 0x08) +#define RT_I2C_DEV_CTRL_GET_ERROR (RT_DEVICE_CTRL_BASE(I2CBUS) + 0x09) struct rt_i2c_priv_data { From 0d1ce9216e7668e65bd651d3100fb9adad7aa521 Mon Sep 17 00:00:00 2001 From: sp-cai <70000077+sp-cai@users.noreply.github.com> Date: Mon, 10 Jul 2023 17:09:48 +0800 Subject: [PATCH 05/24] Update i2c_dev.c --- components/drivers/i2c/i2c_dev.c | 1 - 1 file changed, 1 deletion(-) diff --git a/components/drivers/i2c/i2c_dev.c b/components/drivers/i2c/i2c_dev.c index 309de3cd559..96110b9e7dc 100644 --- a/components/drivers/i2c/i2c_dev.c +++ b/components/drivers/i2c/i2c_dev.c @@ -67,7 +67,6 @@ static rt_err_t i2c_bus_device_control(rt_device_t dev, rt_err_t ret; struct rt_i2c_priv_data *priv_data; struct rt_i2c_bus_device *bus = (struct rt_i2c_bus_device *)dev->user_data; - rt_uint32_t bus_clock; RT_ASSERT(bus != RT_NULL); From dd373dcedc6c7534886d84e4b345ec40367e5506 Mon Sep 17 00:00:00 2001 From: sp-cai <70000077+sp-cai@users.noreply.github.com> Date: Mon, 10 Jul 2023 21:09:04 +0800 Subject: [PATCH 06/24] =?UTF-8?q?i2c=5Fbus=5Fcontrol=20=E5=BD=A2=E5=8F=82?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bsp/airm2m/air105/libraries/rt_drivers/drv_i2c.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bsp/airm2m/air105/libraries/rt_drivers/drv_i2c.c b/bsp/airm2m/air105/libraries/rt_drivers/drv_i2c.c index eba4b3c8261..8f34c1856d8 100644 --- a/bsp/airm2m/air105/libraries/rt_drivers/drv_i2c.c +++ b/bsp/airm2m/air105/libraries/rt_drivers/drv_i2c.c @@ -21,8 +21,8 @@ static rt_ssize_t air105_i2c_slv_xfer(struct rt_i2c_bus_device *bus, struct rt_i2c_msg msgs[], rt_uint32_t num); static rt_err_t air105_i2c_bus_control(struct rt_i2c_bus_device *bus, - rt_uint32_t, - rt_uint32_t); + int cmd, + void *args); static const struct rt_i2c_bus_device_ops air105_i2c_ops = { @@ -88,8 +88,8 @@ static rt_ssize_t air105_i2c_slv_xfer(struct rt_i2c_bus_device *bus, return -RT_ENOSYS; } static rt_err_t air105_i2c_bus_control(struct rt_i2c_bus_device *bus, - rt_uint32_t cmd, - rt_uint32_t arg) + int cmd, + void *args) { RT_ASSERT(bus != RT_NULL); @@ -97,7 +97,7 @@ static rt_err_t air105_i2c_bus_control(struct rt_i2c_bus_device *bus, switch (cmd) { case RT_I2C_DEV_CTRL_CLK: - I2C_MasterSetup(i2c_id, arg); + I2C_MasterSetup(i2c_id, *(rt_uint32_t *)args); break; default: return -RT_EIO; From 94bf8dec6a9a53f1079b2b258c9377a72d47688b Mon Sep 17 00:00:00 2001 From: sp-cai <70000077+sp-cai@users.noreply.github.com> Date: Mon, 10 Jul 2023 21:14:07 +0800 Subject: [PATCH 07/24] =?UTF-8?q?i2c=5Fbus=5Fcontrol=20=E5=BD=A2=E5=8F=82?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bsp/apollo2/board/i2c.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bsp/apollo2/board/i2c.c b/bsp/apollo2/board/i2c.c index 0a1311d7e6e..09e6d4ed4e0 100644 --- a/bsp/apollo2/board/i2c.c +++ b/bsp/apollo2/board/i2c.c @@ -90,11 +90,11 @@ rt_size_t rt_i2c_master_xfer(struct rt_i2c_bus_device *bus, } rt_err_t rt_i2c_bus_control(struct rt_i2c_bus_device *bus, - rt_uint32_t cmd, - rt_uint32_t arg) + int cmd, + void *args) { struct am_i2c_bus * am_i2c_bus = (struct am_i2c_bus *)bus; - //rt_uint32_t ctrl_arg = (rt_uint32_t)(arg); + //rt_uint32_t ctrl_arg = *(rt_uint32_t *)args; RT_ASSERT(bus != RT_NULL); am_i2c_bus = (struct am_i2c_bus *)bus->parent.user_data; From 7e1dc4e13bb68a785a2c66e69980554a4407da2e Mon Sep 17 00:00:00 2001 From: sp-cai <70000077+sp-cai@users.noreply.github.com> Date: Mon, 10 Jul 2023 21:16:12 +0800 Subject: [PATCH 08/24] =?UTF-8?q?i2c=5Fbus=5Fcontrol=20=E5=BD=A2=E5=8F=82?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bsp/ESP32_C3/drivers/drv_hw_i2c.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bsp/ESP32_C3/drivers/drv_hw_i2c.c b/bsp/ESP32_C3/drivers/drv_hw_i2c.c index 031b8c11747..1597039eaa3 100644 --- a/bsp/ESP32_C3/drivers/drv_hw_i2c.c +++ b/bsp/ESP32_C3/drivers/drv_hw_i2c.c @@ -96,7 +96,7 @@ static rt_size_t _slave_xfer(struct rt_i2c_bus_device *bus, struct rt_i2c_msg ms return -RT_ENOSYS; } -static rt_err_t _i2c_bus_control(struct rt_i2c_bus_device *bus, rt_uint32_t cmd, rt_uint32_t arg) +static rt_err_t _i2c_bus_control(struct rt_i2c_bus_device *bus, int cmd, void *args) { return -RT_EINVAL; } @@ -130,4 +130,4 @@ int rt_hw_i2c_init(void) return RT_EOK; } INIT_BOARD_EXPORT(rt_hw_i2c_init); -#endif /* RT_USING_I2C */ \ No newline at end of file +#endif /* RT_USING_I2C */ From eb2a93c2594b9bda24f4dae37df6c0ecc4a65f16 Mon Sep 17 00:00:00 2001 From: sp-cai <70000077+sp-cai@users.noreply.github.com> Date: Mon, 10 Jul 2023 21:19:55 +0800 Subject: [PATCH 09/24] =?UTF-8?q?i2c=5Fbus=5Fcontrol=20=E5=BD=A2=E5=8F=82?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bsp/imxrt/libraries/drivers/drv_i2c.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bsp/imxrt/libraries/drivers/drv_i2c.c b/bsp/imxrt/libraries/drivers/drv_i2c.c index 40a3f624414..7210421c318 100644 --- a/bsp/imxrt/libraries/drivers/drv_i2c.c +++ b/bsp/imxrt/libraries/drivers/drv_i2c.c @@ -141,8 +141,8 @@ static rt_ssize_t imxrt_i2c_slv_xfer(struct rt_i2c_bus_device *bus, struct rt_i2c_msg msgs[], rt_uint32_t num); static rt_err_t imxrt_i2c_bus_control(struct rt_i2c_bus_device *bus, - rt_uint32_t, - rt_uint32_t); + int cmd, + void *args); static const struct rt_i2c_bus_device_ops imxrt_i2c_ops = { @@ -372,8 +372,8 @@ static rt_ssize_t imxrt_i2c_slv_xfer(struct rt_i2c_bus_device *bus, return 0; } static rt_err_t imxrt_i2c_bus_control(struct rt_i2c_bus_device *bus, - rt_uint32_t cmd, - rt_uint32_t arg) + int cmd, + void *args) { return -RT_ERROR; } From 1c07799595254daada504e2503666600bf2cbd45 Mon Sep 17 00:00:00 2001 From: sp-cai <70000077+sp-cai@users.noreply.github.com> Date: Mon, 10 Jul 2023 21:21:41 +0800 Subject: [PATCH 10/24] =?UTF-8?q?i2c=5Fbus=5Fcontrol=20=E5=BD=A2=E5=8F=82?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bsp/loongson/ls1cdev/drivers/hw_i2c.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bsp/loongson/ls1cdev/drivers/hw_i2c.c b/bsp/loongson/ls1cdev/drivers/hw_i2c.c index 2498bb53865..5f3143eabf6 100644 --- a/bsp/loongson/ls1cdev/drivers/hw_i2c.c +++ b/bsp/loongson/ls1cdev/drivers/hw_i2c.c @@ -57,8 +57,8 @@ rt_size_t rt_i2c_master_xfer(struct rt_i2c_bus_device *bus, } rt_err_t rt_i2c_bus_control(struct rt_i2c_bus_device *bus, - rt_uint32_t cmd, - rt_uint32_t arg) + int cmd, + void *args) { struct ls1c_i2c_bus * i2c_bus = (struct ls1c_i2c_bus *)bus; From 540c24ff81472e3ce3d60ae05df2caefd66c59d5 Mon Sep 17 00:00:00 2001 From: sp-cai <70000077+sp-cai@users.noreply.github.com> Date: Mon, 10 Jul 2023 21:23:45 +0800 Subject: [PATCH 11/24] =?UTF-8?q?i2c=5Fbus=5Fcontrol=20=E5=BD=A2=E5=8F=82?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bsp/lpc54114-lite/drivers/drv_i2c.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bsp/lpc54114-lite/drivers/drv_i2c.c b/bsp/lpc54114-lite/drivers/drv_i2c.c index 1291e3ab2d4..c98e3c9cc6c 100644 --- a/bsp/lpc54114-lite/drivers/drv_i2c.c +++ b/bsp/lpc54114-lite/drivers/drv_i2c.c @@ -87,7 +87,7 @@ static rt_ssize_t slave_xfer(struct rt_i2c_bus_device *bus, struct rt_i2c_msg ms return -RT_ENOSYS; } -static rt_err_t i2c_bus_control(struct rt_i2c_bus_device *bus, rt_uint32_t cmd, rt_uint32_t arg) +static rt_err_t i2c_bus_control(struct rt_i2c_bus_device *bus, int cmd, void *args) { return -RT_EINVAL; } From 4e57f9e564707c5764ac5a7a92836fa8d2f63364 Mon Sep 17 00:00:00 2001 From: sp-cai <70000077+sp-cai@users.noreply.github.com> Date: Mon, 10 Jul 2023 21:26:24 +0800 Subject: [PATCH 12/24] =?UTF-8?q?i2c=5Fbus=5Fcontrol=20=E5=BD=A2=E5=8F=82?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bsp/microchip/common/board/sam_i2c.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bsp/microchip/common/board/sam_i2c.c b/bsp/microchip/common/board/sam_i2c.c index 5620b0b04a1..671b16b5a26 100644 --- a/bsp/microchip/common/board/sam_i2c.c +++ b/bsp/microchip/common/board/sam_i2c.c @@ -37,7 +37,7 @@ static rt_ssize_t sam_i2c_slave_xfer(struct rt_i2c_bus_device *bus, struct rt_i2c_msg msgs[], rt_uint32_t num); static rt_err_t sam_i2c_bus_control(struct rt_i2c_bus_device *bus, - rt_uint32_t, rt_uint32_t); + int cmd, void *args); static const struct rt_i2c_bus_device_ops sam_i2c_ops = { @@ -90,8 +90,8 @@ static rt_ssize_t sam_i2c_slave_xfer(struct rt_i2c_bus_device *bus, } static rt_err_t sam_i2c_bus_control(struct rt_i2c_bus_device *bus, - rt_uint32_t cmd, - rt_uint32_t arg) + int cmd, + void *args) { return -RT_ERROR; struct sam_i2c_bus *sam_i2c = (struct sam_i2c_bus *)bus; @@ -101,7 +101,7 @@ static rt_err_t sam_i2c_bus_control(struct rt_i2c_bus_device *bus, switch (cmd) { case RT_I2C_DEV_CTRL_CLK: - i2c_m_sync_set_baudrate(sam_i2c->i2c_desc, 0, arg); + i2c_m_sync_set_baudrate(sam_i2c->i2c_desc, 0, *(rt_uint32_t *)args); break; default: return -RT_EIO; From 392249f7b0631d9d11e955a74d9aca1ea4ddbd76 Mon Sep 17 00:00:00 2001 From: sp-cai <70000077+sp-cai@users.noreply.github.com> Date: Mon, 10 Jul 2023 21:29:10 +0800 Subject: [PATCH 13/24] =?UTF-8?q?i2c=5Fbus=5Fcontrol=20=E5=BD=A2=E5=8F=82?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bsp/nuvoton/libraries/m031/rtt_port/drv_i2c.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bsp/nuvoton/libraries/m031/rtt_port/drv_i2c.c b/bsp/nuvoton/libraries/m031/rtt_port/drv_i2c.c index 35582a80f27..87a89b29ac4 100644 --- a/bsp/nuvoton/libraries/m031/rtt_port/drv_i2c.c +++ b/bsp/nuvoton/libraries/m031/rtt_port/drv_i2c.c @@ -73,8 +73,8 @@ static rt_ssize_t nu_i2c_mst_xfer(struct rt_i2c_bus_device *bus, struct rt_i2c_msg msgs[], rt_uint32_t num); static rt_err_t nu_i2c_bus_control(struct rt_i2c_bus_device *bus, - rt_uint32_t u32Cmd, - rt_uint32_t u32Value); + int cmd, + void *args); static const struct rt_i2c_bus_device_ops nu_i2c_ops = { @@ -83,17 +83,17 @@ static const struct rt_i2c_bus_device_ops nu_i2c_ops = .i2c_bus_control = nu_i2c_bus_control }; -static rt_err_t nu_i2c_bus_control(struct rt_i2c_bus_device *bus, rt_uint32_t u32Cmd, rt_uint32_t u32Value) +static rt_err_t nu_i2c_bus_control(struct rt_i2c_bus_device *bus, int cmd, void *args) { nu_i2c_bus_t *nu_i2c; RT_ASSERT(bus != RT_NULL); nu_i2c = (nu_i2c_bus_t *) bus; - switch (u32Cmd) + switch (cmd) { case RT_I2C_DEV_CTRL_CLK: - I2C_SetBusClockFreq(nu_i2c->I2C, u32Value); + I2C_SetBusClockFreq(nu_i2c->I2C, *(rt_uint32_t *)args); break; default: return -RT_EIO; From cc5f2987b3eb6d9a679d2b4735a843069b6af8b5 Mon Sep 17 00:00:00 2001 From: sp-cai <70000077+sp-cai@users.noreply.github.com> Date: Mon, 10 Jul 2023 21:33:15 +0800 Subject: [PATCH 14/24] =?UTF-8?q?i2c=5Fbus=5Fcontrol=20=E5=BD=A2=E5=8F=82?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bsp/nuvoton/libraries/m2354/rtt_port/drv_i2c.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bsp/nuvoton/libraries/m2354/rtt_port/drv_i2c.c b/bsp/nuvoton/libraries/m2354/rtt_port/drv_i2c.c index e1c15c32c7f..5df4279b95f 100644 --- a/bsp/nuvoton/libraries/m2354/rtt_port/drv_i2c.c +++ b/bsp/nuvoton/libraries/m2354/rtt_port/drv_i2c.c @@ -82,8 +82,8 @@ static rt_ssize_t nu_i2c_mst_xfer(struct rt_i2c_bus_device *bus, struct rt_i2c_msg msgs[], rt_uint32_t num); static rt_err_t nu_i2c_bus_control(struct rt_i2c_bus_device *bus, - rt_uint32_t u32Cmd, - rt_uint32_t u32Value); + int cmd, + void *args); static const struct rt_i2c_bus_device_ops nu_i2c_ops = { @@ -92,17 +92,17 @@ static const struct rt_i2c_bus_device_ops nu_i2c_ops = .i2c_bus_control = nu_i2c_bus_control }; -static rt_err_t nu_i2c_bus_control(struct rt_i2c_bus_device *bus, rt_uint32_t u32Cmd, rt_uint32_t u32Value) +static rt_err_t nu_i2c_bus_control(struct rt_i2c_bus_device *bus, int cmd, void *args) { nu_i2c_bus_t *nu_i2c; RT_ASSERT(bus != RT_NULL); nu_i2c = (nu_i2c_bus_t *) bus; - switch (u32Cmd) + switch (cmd) { case RT_I2C_DEV_CTRL_CLK: - I2C_SetBusClockFreq(nu_i2c->I2C, u32Value); + I2C_SetBusClockFreq(nu_i2c->I2C, *(rt_uint32_t *)args); break; default: return -RT_EIO; From 6a34b48d970d2c17a860d24c5e3195f3c25aed77 Mon Sep 17 00:00:00 2001 From: sp-cai <70000077+sp-cai@users.noreply.github.com> Date: Mon, 10 Jul 2023 21:35:39 +0800 Subject: [PATCH 15/24] =?UTF-8?q?i2c=5Fbus=5Fcontrol=20=E5=BD=A2=E5=8F=82?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bsp/nuvoton/libraries/m460/rtt_port/drv_i2c.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bsp/nuvoton/libraries/m460/rtt_port/drv_i2c.c b/bsp/nuvoton/libraries/m460/rtt_port/drv_i2c.c index c051fdfba14..ef9b6be0789 100644 --- a/bsp/nuvoton/libraries/m460/rtt_port/drv_i2c.c +++ b/bsp/nuvoton/libraries/m460/rtt_port/drv_i2c.c @@ -94,8 +94,8 @@ static rt_ssize_t nu_i2c_mst_xfer(struct rt_i2c_bus_device *bus, struct rt_i2c_msg msgs[], rt_uint32_t num); static rt_err_t nu_i2c_bus_control(struct rt_i2c_bus_device *bus, - rt_uint32_t u32Cmd, - rt_uint32_t u32Value); + int cmd, + void *args); static const struct rt_i2c_bus_device_ops nu_i2c_ops = { @@ -104,17 +104,17 @@ static const struct rt_i2c_bus_device_ops nu_i2c_ops = .i2c_bus_control = nu_i2c_bus_control }; -static rt_err_t nu_i2c_bus_control(struct rt_i2c_bus_device *bus, rt_uint32_t u32Cmd, rt_uint32_t u32Value) +static rt_err_t nu_i2c_bus_control(struct rt_i2c_bus_device *bus, int cmd, void *args) { nu_i2c_bus_t nu_i2c; RT_ASSERT(bus); nu_i2c = (nu_i2c_bus_t) bus; - switch (u32Cmd) + switch (cmd) { case RT_I2C_DEV_CTRL_CLK: - I2C_SetBusClockFreq(nu_i2c->I2C, u32Value); + I2C_SetBusClockFreq(nu_i2c->I2C, *(rt_uint32_t *)args); break; default: return -RT_EIO; From 1e5b40d8cc6edaf22a6c9545446766106baa4a71 Mon Sep 17 00:00:00 2001 From: sp-cai <70000077+sp-cai@users.noreply.github.com> Date: Mon, 10 Jul 2023 21:38:10 +0800 Subject: [PATCH 16/24] =?UTF-8?q?i2c=5Fbus=5Fcontrol=20=E5=BD=A2=E5=8F=82?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bsp/nuvoton/libraries/m460/rtt_port/drv_ui2c.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bsp/nuvoton/libraries/m460/rtt_port/drv_ui2c.c b/bsp/nuvoton/libraries/m460/rtt_port/drv_ui2c.c index 85783a53d3d..3822ca3e94e 100644 --- a/bsp/nuvoton/libraries/m460/rtt_port/drv_ui2c.c +++ b/bsp/nuvoton/libraries/m460/rtt_port/drv_ui2c.c @@ -61,8 +61,8 @@ static rt_ssize_t nu_ui2c_mst_xfer(struct rt_i2c_bus_device *bus, rt_uint32_t num); static rt_err_t nu_ui2c_bus_control(struct rt_i2c_bus_device *bus, - rt_uint32_t u32Cmd, - rt_uint32_t u32Value); + int cmd, + void *args); static const struct rt_i2c_bus_device_ops nu_ui2c_ops = { @@ -71,17 +71,17 @@ static const struct rt_i2c_bus_device_ops nu_ui2c_ops = .i2c_bus_control = nu_ui2c_bus_control, }; -static rt_err_t nu_ui2c_bus_control(struct rt_i2c_bus_device *bus, rt_uint32_t u32Cmd, rt_uint32_t u32Value) +static rt_err_t nu_ui2c_bus_control(struct rt_i2c_bus_device *bus, int cmd, void *args) { nu_ui2c_bus_t nu_ui2c; RT_ASSERT(bus); nu_ui2c = (nu_ui2c_bus_t) bus; - switch (u32Cmd) + switch (cmd) { case RT_I2C_DEV_CTRL_CLK: - UI2C_SetBusClockFreq(nu_ui2c->UI2C, u32Value); + UI2C_SetBusClockFreq(nu_ui2c->UI2C, *(rt_uint32_t *)args); break; default: return -RT_EIO; From 4ebc555e6fb0625c1a41488ff719f369e32e0ddb Mon Sep 17 00:00:00 2001 From: sp-cai <70000077+sp-cai@users.noreply.github.com> Date: Mon, 10 Jul 2023 21:40:03 +0800 Subject: [PATCH 17/24] =?UTF-8?q?i2c=5Fbus=5Fcontrol=20=E5=BD=A2=E5=8F=82?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bsp/nuvoton/libraries/m480/rtt_port/drv_i2c.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bsp/nuvoton/libraries/m480/rtt_port/drv_i2c.c b/bsp/nuvoton/libraries/m480/rtt_port/drv_i2c.c index 52b6baa02b3..770541c36b0 100644 --- a/bsp/nuvoton/libraries/m480/rtt_port/drv_i2c.c +++ b/bsp/nuvoton/libraries/m480/rtt_port/drv_i2c.c @@ -82,8 +82,8 @@ static rt_ssize_t nu_i2c_mst_xfer(struct rt_i2c_bus_device *bus, struct rt_i2c_msg msgs[], rt_uint32_t num); static rt_err_t nu_i2c_bus_control(struct rt_i2c_bus_device *bus, - rt_uint32_t u32Cmd, - rt_uint32_t u32Value); + int cmd, + void *args); static const struct rt_i2c_bus_device_ops nu_i2c_ops = { @@ -92,17 +92,17 @@ static const struct rt_i2c_bus_device_ops nu_i2c_ops = .i2c_bus_control = nu_i2c_bus_control }; -static rt_err_t nu_i2c_bus_control(struct rt_i2c_bus_device *bus, rt_uint32_t u32Cmd, rt_uint32_t u32Value) +static rt_err_t nu_i2c_bus_control(struct rt_i2c_bus_device *bus, int cmd, void *args) { nu_i2c_bus_t *nu_i2c; RT_ASSERT(bus != RT_NULL); nu_i2c = (nu_i2c_bus_t *) bus; - switch (u32Cmd) + switch (cmd) { case RT_I2C_DEV_CTRL_CLK: - I2C_SetBusClockFreq(nu_i2c->I2C, u32Value); + I2C_SetBusClockFreq(nu_i2c->I2C, *(rt_uint32_t *)args); break; default: return -RT_EIO; From 8b2ce78dc693d46a4a4cce0ffebb827e1b48e6f9 Mon Sep 17 00:00:00 2001 From: sp-cai <70000077+sp-cai@users.noreply.github.com> Date: Mon, 10 Jul 2023 21:42:43 +0800 Subject: [PATCH 18/24] =?UTF-8?q?i2c=5Fbus=5Fcontrol=20=E5=BD=A2=E5=8F=82?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bsp/nuvoton/libraries/ma35/rtt_port/drv_i2c.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bsp/nuvoton/libraries/ma35/rtt_port/drv_i2c.c b/bsp/nuvoton/libraries/ma35/rtt_port/drv_i2c.c index e6fdb4675a9..5c68651c347 100644 --- a/bsp/nuvoton/libraries/ma35/rtt_port/drv_i2c.c +++ b/bsp/nuvoton/libraries/ma35/rtt_port/drv_i2c.c @@ -103,8 +103,8 @@ static rt_ssize_t nu_i2c_mst_xfer(struct rt_i2c_bus_device *bus, struct rt_i2c_msg msgs[], rt_uint32_t num); static rt_err_t nu_i2c_bus_control(struct rt_i2c_bus_device *bus, - rt_uint32_t u32Cmd, - rt_uint32_t u32Value); + int cmd, + void *args); static const struct rt_i2c_bus_device_ops nu_i2c_ops = { @@ -113,17 +113,17 @@ static const struct rt_i2c_bus_device_ops nu_i2c_ops = .i2c_bus_control = nu_i2c_bus_control }; -static rt_err_t nu_i2c_bus_control(struct rt_i2c_bus_device *bus, rt_uint32_t u32Cmd, rt_uint32_t u32Value) +static rt_err_t nu_i2c_bus_control(struct rt_i2c_bus_device *bus, int u32Cmd, void *args) { nu_i2c_bus_t *nu_i2c; RT_ASSERT(bus != RT_NULL); nu_i2c = (nu_i2c_bus_t *) bus; - switch (u32Cmd) + switch (cmd) { case RT_I2C_DEV_CTRL_CLK: - I2C_SetBusClockFreq(nu_i2c->I2C, u32Value); + I2C_SetBusClockFreq(nu_i2c->I2C, *(rt_uint32_t *)args); break; default: return -RT_EIO; From 23d65680dfb02d975fb76da8e5476c85fff382c9 Mon Sep 17 00:00:00 2001 From: sp-cai <70000077+sp-cai@users.noreply.github.com> Date: Mon, 10 Jul 2023 21:47:24 +0800 Subject: [PATCH 19/24] =?UTF-8?q?i2c=5Fbus=5Fcontrol=20=E5=BD=A2=E5=8F=82?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bsp/nuvoton/libraries/n9h30/rtt_port/drv_i2c.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bsp/nuvoton/libraries/n9h30/rtt_port/drv_i2c.c b/bsp/nuvoton/libraries/n9h30/rtt_port/drv_i2c.c index 9196a6f5503..24ab78abccf 100644 --- a/bsp/nuvoton/libraries/n9h30/rtt_port/drv_i2c.c +++ b/bsp/nuvoton/libraries/n9h30/rtt_port/drv_i2c.c @@ -506,7 +506,7 @@ static rt_ssize_t nu_i2c_mst_xfer(struct rt_i2c_bus_device *bus, return i; } -static rt_err_t nu_i2c_bus_control(struct rt_i2c_bus_device *bus, rt_uint32_t u32Cmd, rt_uint32_t u32Value) +static rt_err_t nu_i2c_bus_control(struct rt_i2c_bus_device *bus, int cmd, void *args) { nu_i2c_bus_t psNuI2cBus; nu_i2c_dev_t psNuI2cDev; @@ -516,10 +516,10 @@ static rt_err_t nu_i2c_bus_control(struct rt_i2c_bus_device *bus, rt_uint32_t u3 psNuI2cBus = (nu_i2c_bus_t) bus; psNuI2cDev = &psNuI2cBus->dev; - switch (u32Cmd) + switch (cmd) { case RT_I2C_DEV_CTRL_CLK: - nu_i2c_set_speed(psNuI2cDev, (int32_t)u32Value); + nu_i2c_set_speed(psNuI2cDev, *(int32_t *)args); break; default: return -RT_EIO; From d7ffa2625ab19fda5bdb441236a98a609c8c8155 Mon Sep 17 00:00:00 2001 From: sp-cai <70000077+sp-cai@users.noreply.github.com> Date: Mon, 10 Jul 2023 21:49:56 +0800 Subject: [PATCH 20/24] =?UTF-8?q?i2c=5Fbus=5Fcontrol=20=E5=BD=A2=E5=8F=82?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bsp/nuvoton/libraries/nuc980/rtt_port/drv_i2c.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bsp/nuvoton/libraries/nuc980/rtt_port/drv_i2c.c b/bsp/nuvoton/libraries/nuc980/rtt_port/drv_i2c.c index 79249bedfc9..1753ce48490 100644 --- a/bsp/nuvoton/libraries/nuc980/rtt_port/drv_i2c.c +++ b/bsp/nuvoton/libraries/nuc980/rtt_port/drv_i2c.c @@ -101,8 +101,8 @@ static rt_ssize_t nu_i2c_mst_xfer(struct rt_i2c_bus_device *bus, struct rt_i2c_msg msgs[], rt_uint32_t num); static rt_err_t nu_i2c_bus_control(struct rt_i2c_bus_device *bus, - rt_uint32_t u32Cmd, - rt_uint32_t u32Value); + int cmd, + void *args); static const struct rt_i2c_bus_device_ops nu_i2c_ops = { @@ -111,17 +111,17 @@ static const struct rt_i2c_bus_device_ops nu_i2c_ops = .i2c_bus_control = nu_i2c_bus_control }; -static rt_err_t nu_i2c_bus_control(struct rt_i2c_bus_device *bus, rt_uint32_t u32Cmd, rt_uint32_t u32Value) +static rt_err_t nu_i2c_bus_control(struct rt_i2c_bus_device *bus, int cmd, void *args) { nu_i2c_bus_t *nu_i2c; RT_ASSERT(bus != RT_NULL); nu_i2c = (nu_i2c_bus_t *) bus; - switch (u32Cmd) + switch (cmd) { case RT_I2C_DEV_CTRL_CLK: - I2C_SetBusClockFreq(nu_i2c->I2C, u32Value); + I2C_SetBusClockFreq(nu_i2c->I2C, *(rt_uint32_t *)args); break; default: return -RT_EIO; From 33ccd8b5f93833a616d63ef451e7979c8333d177 Mon Sep 17 00:00:00 2001 From: sp-cai <70000077+sp-cai@users.noreply.github.com> Date: Mon, 10 Jul 2023 21:52:07 +0800 Subject: [PATCH 21/24] =?UTF-8?q?i2c=5Fbus=5Fcontrol=20=E5=BD=A2=E5=8F=82?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bsp/raspberry-pi/raspi3-32/driver/drv_i2c.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bsp/raspberry-pi/raspi3-32/driver/drv_i2c.c b/bsp/raspberry-pi/raspi3-32/driver/drv_i2c.c index 3cf4cd24024..2dc5db6a691 100644 --- a/bsp/raspberry-pi/raspi3-32/driver/drv_i2c.c +++ b/bsp/raspberry-pi/raspi3-32/driver/drv_i2c.c @@ -110,8 +110,8 @@ static rt_ssize_t raspi_i2c_slv_xfer(struct rt_i2c_bus_device *bus, struct rt_i2c_msg msgs[], rt_uint32_t num); static rt_err_t raspi_i2c_bus_control(struct rt_i2c_bus_device *bus, - rt_uint32_t, - rt_uint32_t); + int cmd, + void *args); static rt_uint32_t i2c_byte_wait_us = 0; static rt_ssize_t raspi_i2c_mst_xfer(struct rt_i2c_bus_device *bus, @@ -148,8 +148,8 @@ static rt_ssize_t raspi_i2c_slv_xfer(struct rt_i2c_bus_device *bus, return 0; } static rt_err_t raspi_i2c_bus_control(struct rt_i2c_bus_device *bus, - rt_uint32_t cmd, - rt_uint32_t arg) + int cmd, + void *args) { return RT_EOK; } From 067e74245c9f8ae2c509914459501fbba6ac1c5d Mon Sep 17 00:00:00 2001 From: sp-cai <70000077+sp-cai@users.noreply.github.com> Date: Mon, 10 Jul 2023 21:53:58 +0800 Subject: [PATCH 22/24] =?UTF-8?q?i2c=5Fbus=5Fcontrol=20=E5=BD=A2=E5=8F=82?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bsp/raspberry-pi/raspi3-64/driver/drv_i2c.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bsp/raspberry-pi/raspi3-64/driver/drv_i2c.c b/bsp/raspberry-pi/raspi3-64/driver/drv_i2c.c index 07ea8087e6a..4648f880e79 100644 --- a/bsp/raspberry-pi/raspi3-64/driver/drv_i2c.c +++ b/bsp/raspberry-pi/raspi3-64/driver/drv_i2c.c @@ -115,8 +115,8 @@ static rt_ssize_t raspi_i2c_slv_xfer(struct rt_i2c_bus_device *bus, struct rt_i2c_msg msgs[], rt_uint32_t num); static rt_err_t raspi_i2c_bus_control(struct rt_i2c_bus_device *bus, - rt_uint32_t, - rt_uint32_t); + int cmd, + void *args); static rt_uint32_t i2c_byte_wait_us = 0; static rt_ssize_t raspi_i2c_mst_xfer(struct rt_i2c_bus_device *bus, @@ -153,8 +153,8 @@ static rt_ssize_t raspi_i2c_slv_xfer(struct rt_i2c_bus_device *bus, return 0; } static rt_err_t raspi_i2c_bus_control(struct rt_i2c_bus_device *bus, - rt_uint32_t cmd, - rt_uint32_t arg) + int cmd, + void *args) { return RT_EOK; } From f11fb1e64996f87d7da5efd44522ca934ef54e1e Mon Sep 17 00:00:00 2001 From: sp-cai <70000077+sp-cai@users.noreply.github.com> Date: Mon, 10 Jul 2023 21:55:28 +0800 Subject: [PATCH 23/24] =?UTF-8?q?i2c=5Fbus=5Fcontrol=20=E5=BD=A2=E5=8F=82?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bsp/raspberry-pi/raspi4-32/driver/drv_i2c.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bsp/raspberry-pi/raspi4-32/driver/drv_i2c.c b/bsp/raspberry-pi/raspi4-32/driver/drv_i2c.c index 0a9b93b99f5..54d2d1950b6 100644 --- a/bsp/raspberry-pi/raspi4-32/driver/drv_i2c.c +++ b/bsp/raspberry-pi/raspi4-32/driver/drv_i2c.c @@ -162,8 +162,8 @@ static rt_ssize_t raspi_i2c_slv_xfer(struct rt_i2c_bus_device *bus, } static rt_err_t raspi_i2c_bus_control(struct rt_i2c_bus_device *bus, - rt_uint32_t cmd, - rt_uint32_t arg) + int cmd, + void *args) { return RT_EOK; } From 35bdaabd767ff7eebada883de8b13816156948fa Mon Sep 17 00:00:00 2001 From: sp-cai <70000077+sp-cai@users.noreply.github.com> Date: Mon, 10 Jul 2023 21:57:16 +0800 Subject: [PATCH 24/24] =?UTF-8?q?i2c=5Fbus=5Fcontrol=20=E5=BD=A2=E5=8F=82?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bsp/w60x/drivers/drv_i2c.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bsp/w60x/drivers/drv_i2c.c b/bsp/w60x/drivers/drv_i2c.c index aedc99af642..caf50ee9d3e 100644 --- a/bsp/w60x/drivers/drv_i2c.c +++ b/bsp/w60x/drivers/drv_i2c.c @@ -37,8 +37,8 @@ static rt_ssize_t wm_i2c_slv_xfer(struct rt_i2c_bus_device *bus, struct rt_i2c_msg msgs[], rt_uint32_t num); static rt_err_t wm_i2c_bus_control(struct rt_i2c_bus_device *bus, - rt_uint32_t, - rt_uint32_t); + int cmd, + void *args); static const struct rt_i2c_bus_device_ops wm_i2c_ops = { @@ -132,8 +132,8 @@ static rt_ssize_t wm_i2c_slv_xfer(struct rt_i2c_bus_device *bus, return 0; } static rt_err_t wm_i2c_bus_control(struct rt_i2c_bus_device *bus, - rt_uint32_t cmd, - rt_uint32_t arg) + int cmd, + void *args) { return -RT_ERROR; }