michael/zephyr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drivers: can: loopback: use proper namespace for Kconfig symbols

Browse Source 
Use proper namespace for the CAN loopback driver Kconfig symbols, renaming
CONFIG_CAN_MAX_FILTER to CONFIG_CAN_LOOPBACK_MAX_FILTERS.

This prevents Kconfig symbol clashes between different CAN controller
drivers.

Signed-off-by: Henrik Brix Andersen <henrik@brixandersen.dk>
This commit is contained in:
Henrik Brix Andersen
2025-12-05 15:05:25 +00:00
committed by Anas Nashif
parent 7c87f23c9b
commit 4333f98b2c
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/can/Kconfig.loopback
View File

@@ -12,7 +12,7 @@ config CAN_LOOPBACK
if CAN_LOOPBACK
config CAN_MAX_FILTER
config CAN_LOOPBACK_MAX_FILTERS
int "Maximum number of concurrent active filters"
default 16
range 1 1024

10
drivers/can/can_loopback.c
View File

@@ -35,7 +35,7 @@ struct can_loopback_config {
struct can_loopback_data {
struct can_driver_data common;
struct can_loopback_filter filters[CONFIG_CAN_MAX_FILTER];
struct can_loopback_filter filters[CONFIG_CAN_LOOPBACK_MAX_FILTERS];
struct k_mutex mtx;
struct k_msgq tx_msgq;
char msgq_buffer[CONFIG_CAN_LOOPBACK_TX_MSGQ_SIZE * sizeof(struct can_loopback_frame)];
@@ -90,7 +90,7 @@ static void tx_thread(void *arg1, void *arg2, void *arg3)
k_mutex_lock(&data->mtx, K_FOREVER);
for (int i = 0; i < CONFIG_CAN_MAX_FILTER; i++) {
for (int i = 0; i < CONFIG_CAN_LOOPBACK_MAX_FILTERS; i++) {
filter = &data->filters[i];
if (filter->rx_cb != NULL &&
can_frame_matches_filter(&frame.frame, &filter->filter)) {
@@ -163,7 +163,7 @@ static int can_loopback_send(const struct device *dev,
static inline int get_free_filter(struct can_loopback_filter *filters)
{
for (int i = 0; i < CONFIG_CAN_MAX_FILTER; i++) {
for (int i = 0; i < CONFIG_CAN_LOOPBACK_MAX_FILTERS; i++) {
if (filters[i].rx_cb == NULL) {
return i;
}
@@ -362,7 +362,7 @@ static int can_loopback_get_max_filters(const struct device *dev, bool ide)
{
ARG_UNUSED(ide);
return CONFIG_CAN_MAX_FILTER;
return CONFIG_CAN_LOOPBACK_MAX_FILTERS;
}
static DEVICE_API(can, can_loopback_driver_api) = {
@@ -420,7 +420,7 @@ static int can_loopback_init(const struct device *dev)
k_mutex_init(&data->mtx);
for (int i = 0; i < CONFIG_CAN_MAX_FILTER; i++) {
for (int i = 0; i < CONFIG_CAN_LOOPBACK_MAX_FILTERS; i++) {
data->filters[i].rx_cb = NULL;
}