Skip to content

[components][i2c] 优化 controt 接口格式，增加可用命令 #7806

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mysterywolf merged 24 commits into from
Jul 14, 2023
Merged

[components][i2c] 优化 controt 接口格式，增加可用命令 #7806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
b5cf61a
[components][i2c] Update i2c.h 优化 controt 接口为系统标准的格式
sp-cai Jul 10, 2023
659e9bd
[components][i2c] Update i2c_dev.c 更好的可扩展性
sp-cai Jul 10, 2023
ecbe6ed
[components][i2c] Update i2c_core.c 更好的可扩展性
sp-cai Jul 10, 2023
264ea9c
[components][i2c] Update i2c_dev.h 增加可用命令
sp-cai Jul 10, 2023
0d1ce92
Update i2c_dev.c
sp-cai Jul 10, 2023
dd373dc
i2c_bus_control 形参修改
sp-cai Jul 10, 2023
94bf8de
i2c_bus_control 形参修改
sp-cai Jul 10, 2023
7e1dc4e
i2c_bus_control 形参修改
sp-cai Jul 10, 2023
eb2a93c
i2c_bus_control 形参修改
sp-cai Jul 10, 2023
1c07799
i2c_bus_control 形参修改
sp-cai Jul 10, 2023
540c24f
i2c_bus_control 形参修改
sp-cai Jul 10, 2023
4e57f9e
i2c_bus_control 形参修改
sp-cai Jul 10, 2023
392249f
i2c_bus_control 形参修改
sp-cai Jul 10, 2023
cc5f298
i2c_bus_control 形参修改
sp-cai Jul 10, 2023
6a34b48
i2c_bus_control 形参修改
sp-cai Jul 10, 2023
1e5b40d
i2c_bus_control 形参修改
sp-cai Jul 10, 2023
4ebc555
i2c_bus_control 形参修改
sp-cai Jul 10, 2023
8b2ce78
i2c_bus_control 形参修改
sp-cai Jul 10, 2023
23d6568
i2c_bus_control 形参修改
sp-cai Jul 10, 2023
d7ffa26
i2c_bus_control 形参修改
sp-cai Jul 10, 2023
33ccd8b
i2c_bus_control 形参修改
sp-cai Jul 10, 2023
067e742
i2c_bus_control 形参修改
sp-cai Jul 10, 2023
f11fb1e
i2c_bus_control 形参修改
sp-cai Jul 10, 2023
35bdaab
i2c_bus_control 形参修改
sp-cai Jul 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bsp/ESP32_C3/drivers/drv_hw_i2c.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -130,4 +130,4 @@ int rt_hw_i2c_init(void)
return RT_EOK;
}
INIT_BOARD_EXPORT(rt_hw_i2c_init);
#endif /* RT_USING_I2C */
#endif /* RT_USING_I2C */
10 changes: 5 additions & 5 deletions bsp/airm2m/air105/libraries/rt_drivers/drv_i2c.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
{
Expand Down Expand Up @@ -88,16 +88,16 @@ 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);
rt_uint32_t i2c_id = (rt_uint32_t)bus->priv;
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;
Expand Down
6 changes: 3 additions & 3 deletions bsp/apollo2/board/i2c.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions bsp/imxrt/libraries/drivers/drv_i2c.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
{
Expand Down Expand Up @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions bsp/loongson/ls1cdev/drivers/hw_i2c.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion bsp/lpc54114-lite/drivers/drv_i2c.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
8 changes: 4 additions & 4 deletions bsp/microchip/common/board/sam_i2c.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
{
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions bsp/nuvoton/libraries/m031/rtt_port/drv_i2c.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
{
Expand All @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions bsp/nuvoton/libraries/m2354/rtt_port/drv_i2c.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
{
Expand All @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions bsp/nuvoton/libraries/m460/rtt_port/drv_i2c.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
{
Expand All @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions bsp/nuvoton/libraries/m460/rtt_port/drv_ui2c.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
{
Expand All @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions bsp/nuvoton/libraries/m480/rtt_port/drv_i2c.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
{
Expand All @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions bsp/nuvoton/libraries/ma35/rtt_port/drv_i2c.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
{
Expand All @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions bsp/nuvoton/libraries/n9h30/rtt_port/drv_i2c.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions bsp/nuvoton/libraries/nuc980/rtt_port/drv_i2c.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
{
Expand All @@ -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;
Expand Down
Loading