michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: can: add struct device argument to callback functions

Browse source 
Include a pointer to the CAN controller device for the CAN
transmit, receive, and state change callback functions.

Signed-off-by: Henrik Brix Andersen <hebad@vestas.com>
This commit is contained in:
Henrik Brix Andersen 2022-03-17 22:06:51 +01:00 • committed by Anas Nashif
commit 67ba9900f0
16 changed files with 137 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

36
tests/drivers/can/api/src/main.c
View file

@ -174,94 +174,106 @@ static inline void check_msg(const struct zcan_frame *msg1,
zassert_equal(cmp_res, 0, "Received data differ");
}
static void tx_std_isr_1(int error, void *arg)
static void tx_std_isr_1(const struct device *dev, int error, void *arg)
{
const struct zcan_frame *msg = (const struct zcan_frame *)arg;
k_sem_give(&tx_cb_sem);
zassert_equal(dev, can_dev, "CAN device does not match");
zassert_equal(msg->id, TEST_CAN_STD_ID_1, "Arg does not match");
}
static void tx_std_isr_2(int error, void *arg)
static void tx_std_isr_2(const struct device *dev, int error, void *arg)
{
const struct zcan_frame *msg = (const struct zcan_frame *)arg;
k_sem_give(&tx_cb_sem);
zassert_equal(dev, can_dev, "CAN device does not match");
zassert_equal(msg->id, TEST_CAN_STD_ID_2, "Arg does not match");
}
static void tx_ext_isr_1(int error, void *arg)
static void tx_ext_isr_1(const struct device *dev, int error, void *arg)
{
const struct zcan_frame *msg = (const struct zcan_frame *)arg;
k_sem_give(&tx_cb_sem);
zassert_equal(dev, can_dev, "CAN device does not match");
zassert_equal(msg->id, TEST_CAN_EXT_ID_1, "Arg does not match");
}
static void tx_ext_isr_2(int error, void *arg)
static void tx_ext_isr_2(const struct device *dev, int error, void *arg)
{
const struct zcan_frame *msg = (const struct zcan_frame *)arg;
k_sem_give(&tx_cb_sem);
zassert_equal(dev, can_dev, "CAN device does not match");
zassert_equal(msg->id, TEST_CAN_EXT_ID_2, "Arg does not match");
}
static void rx_std_isr_1(struct zcan_frame *msg, void *arg)
static void rx_std_isr_1(const struct device *dev, struct zcan_frame *msg, void *arg)
{
check_msg(msg, &test_std_msg_1, 0);
zassert_equal(dev, can_dev, "CAN device does not match");
zassert_equal_ptr(arg, &test_std_filter_1, "arg does not match");
k_sem_give(&rx_isr_sem);
}
static void rx_std_isr_2(struct zcan_frame *msg, void *arg)
static void rx_std_isr_2(const struct device *dev, struct zcan_frame *msg, void *arg)
{
check_msg(msg, &test_std_msg_2, 0);
zassert_equal(dev, can_dev, "CAN device does not match");
zassert_equal_ptr(arg, &test_std_filter_2, "arg does not match");
k_sem_give(&rx_isr_sem);
}
static void rx_std_mask_isr_1(struct zcan_frame *msg, void *arg)
static void rx_std_mask_isr_1(const struct device *dev, struct zcan_frame *msg, void *arg)
{
check_msg(msg, &test_std_msg_1, 0x0F);
zassert_equal(dev, can_dev, "CAN device does not match");
zassert_equal_ptr(arg, &test_std_masked_filter_1, "arg does not match");
k_sem_give(&rx_isr_sem);
}
static void rx_std_mask_isr_2(struct zcan_frame *msg, void *arg)
static void rx_std_mask_isr_2(const struct device *dev, struct zcan_frame *msg, void *arg)
{
check_msg(msg, &test_std_msg_2, 0x0F);
zassert_equal(dev, can_dev, "CAN device does not match");
zassert_equal_ptr(arg, &test_std_masked_filter_2, "arg does not match");
k_sem_give(&rx_isr_sem);
}
static void rx_ext_isr_1(struct zcan_frame *msg, void *arg)
static void rx_ext_isr_1(const struct device *dev, struct zcan_frame *msg, void *arg)
{
check_msg(msg, &test_ext_msg_1, 0);
zassert_equal(dev, can_dev, "CAN device does not match");
zassert_equal_ptr(arg, &test_ext_filter_1, "arg does not match");
k_sem_give(&rx_isr_sem);
}
static void rx_ext_isr_2(struct zcan_frame *msg, void *arg)
static void rx_ext_isr_2(const struct device *dev, struct zcan_frame *msg, void *arg)
{
check_msg(msg, &test_ext_msg_2, 0);
zassert_equal(dev, can_dev, "CAN device does not match");
zassert_equal_ptr(arg, &test_ext_filter_2, "arg does not match");
k_sem_give(&rx_isr_sem);
}
static void rx_ext_mask_isr_1(struct zcan_frame *msg, void *arg)
static void rx_ext_mask_isr_1(const struct device *dev, struct zcan_frame *msg, void *arg)
{
check_msg(msg, &test_ext_msg_1, 0x0F);
zassert_equal(dev, can_dev, "CAN device does not match");
zassert_equal_ptr(arg, &test_ext_masked_filter_1, "arg does not match");
k_sem_give(&rx_isr_sem);
}
static void rx_ext_mask_isr_2(struct zcan_frame *msg, void *arg)
static void rx_ext_mask_isr_2(const struct device *dev, struct zcan_frame *msg, void *arg)
{
check_msg(msg, &test_ext_msg_2, 0x0F);
zassert_equal(dev, can_dev, "CAN device does not match");
zassert_equal_ptr(arg, &test_ext_masked_filter_2, "arg does not match");
k_sem_give(&rx_isr_sem);
}

18
tests/drivers/can/canfd/src/main.c
View file

@ -112,48 +112,54 @@ static inline void check_msg(const struct zcan_frame *msg1,
zassert_equal(cmp_res, 0, "Received data differ");
}
static void tx_std_isr_1(int error, void *arg)
static void tx_std_isr_1(const struct device *dev, int error, void *arg)
{
const struct zcan_frame *msg = (const struct zcan_frame *)arg;
k_sem_give(&tx_cb_sem);
zassert_equal(dev, can_dev, "CAN device does not match");
zassert_equal(msg->id, TEST_CAN_STD_ID_1, "Arg does not match");
}
static void tx_std_isr_2(int error, void *arg)
static void tx_std_isr_2(const struct device *dev, int error, void *arg)
{
const struct zcan_frame *msg = (const struct zcan_frame *)arg;
k_sem_give(&tx_cb_sem);
zassert_equal(dev, can_dev, "CAN device does not match");
zassert_equal(msg->id, TEST_CAN_STD_ID_2, "Arg does not match");
}
static void rx_std_isr_1(struct zcan_frame *msg, void *arg)
static void rx_std_isr_1(const struct device *dev, struct zcan_frame *msg, void *arg)
{
check_msg(msg, &test_std_msg_1);
zassert_equal(dev, can_dev, "CAN device does not match");
zassert_equal_ptr(arg, &test_std_filter_1, "arg does not match");
k_sem_give(&rx_isr_sem);
}
static void rx_std_isr_2(struct zcan_frame *msg, void *arg)
static void rx_std_isr_2(const struct device *dev, struct zcan_frame *msg, void *arg)
{
check_msg(msg, &test_std_msg_2);
zassert_equal(dev, can_dev, "CAN device does not match");
zassert_equal_ptr(arg, &test_std_filter_2, "arg does not match");
k_sem_give(&rx_isr_sem);
}
static void rx_std_isr_fd_1(struct zcan_frame *msg, void *arg)
static void rx_std_isr_fd_1(const struct device *dev, struct zcan_frame *msg, void *arg)
{
check_msg(msg, &test_std_msg_fd_1);
zassert_equal(dev, can_dev, "CAN device does not match");
zassert_equal_ptr(arg, &test_std_filter_1, "arg does not match");
k_sem_give(&rx_isr_sem);
}
static void rx_std_isr_fd_2(struct zcan_frame *msg, void *arg)
static void rx_std_isr_fd_2(const struct device *dev, struct zcan_frame *msg, void *arg)
{
check_msg(msg, &test_std_msg_fd_2);
zassert_equal(dev, can_dev, "CAN device does not match");
zassert_equal_ptr(arg, &test_std_filter_2, "arg does not match");
k_sem_give(&rx_isr_sem);
}