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

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

Browse Source 
Use proper namespace for the CAN mcp2515 Kconfig symbols, renaming
CONFIG_CAN_MAX_FILTER to CONFIG_CAN_MCP2515_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:19:48 +00:00
committed by Anas Nashif
parent 8b52241c06
commit 6234480a57
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/can/Kconfig.mcp2515
View File

@@ -27,7 +27,7 @@ config CAN_MCP2515_INT_THREAD_PRIO
Priority level of the internal thread which is ran for
interrupt handling and incoming packets.
config CAN_MAX_FILTER
config CAN_MCP2515_MAX_FILTERS
int "Maximum number of concurrent active filters"
default 5
range 1 32

11
drivers/can/can_mcp2515.c
View File

@@ -338,7 +338,7 @@ static int mcp2515_get_max_filters(const struct device *dev, bool ide)
{
ARG_UNUSED(ide);
return CONFIG_CAN_MAX_FILTER;
return CONFIG_CAN_MCP2515_MAX_FILTERS;
}
static int mcp2515_set_timing(const struct device *dev, const struct can_timing *timing)
@@ -622,12 +622,13 @@ static int mcp2515_add_rx_filter(const struct device *dev, can_rx_callback_t rx_
k_mutex_lock(&dev_data->mutex, K_FOREVER);
/* find free filter */
while ((BIT(filter_id) & dev_data->filter_usage) && (filter_id < CONFIG_CAN_MAX_FILTER)) {
while ((BIT(filter_id) & dev_data->filter_usage) &&
(filter_id < CONFIG_CAN_MCP2515_MAX_FILTERS)) {
filter_id++;
}
/* setup filter */
if (filter_id < CONFIG_CAN_MAX_FILTER) {
if (filter_id < CONFIG_CAN_MCP2515_MAX_FILTERS) {
dev_data->filter_usage |= BIT(filter_id);
dev_data->filter[filter_id] = *filter;
@@ -647,7 +648,7 @@ static void mcp2515_remove_rx_filter(const struct device *dev, int filter_id)
{
struct mcp2515_data *dev_data = dev->data;
if (filter_id < 0 || filter_id >= CONFIG_CAN_MAX_FILTER) {
if (filter_id < 0 || filter_id >= CONFIG_CAN_MCP2515_MAX_FILTERS) {
LOG_ERR("filter ID %d out of bounds", filter_id);
return;
}
@@ -681,7 +682,7 @@ static void mcp2515_rx_filter(const struct device *dev, struct can_frame *frame)
k_mutex_lock(&dev_data->mutex, K_FOREVER);
for (; filter_id < CONFIG_CAN_MAX_FILTER; filter_id++) {
for (; filter_id < CONFIG_CAN_MCP2515_MAX_FILTERS; filter_id++) {
if (!(BIT(filter_id) & dev_data->filter_usage)) {
continue; /* filter slot empty */
}

6
drivers/can/can_mcp2515.h
View File

@@ -37,9 +37,9 @@ struct mcp2515_data {
/* filter data */
uint32_t filter_usage;
can_rx_callback_t rx_cb[CONFIG_CAN_MAX_FILTER];
void *cb_arg[CONFIG_CAN_MAX_FILTER];
struct can_filter filter[CONFIG_CAN_MAX_FILTER];
can_rx_callback_t rx_cb[CONFIG_CAN_MCP2515_MAX_FILTERS];
void *cb_arg[CONFIG_CAN_MCP2515_MAX_FILTERS];
struct can_filter filter[CONFIG_CAN_MCP2515_MAX_FILTERS];
/* general data */
struct k_mutex mutex;