michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: can: mcp2515: rename internal funtions to not use zcan

Browse source 
Rename the mcp2515 driver internal functions to not use "zcan" to avoid
confusion after "struct can_frame" renaming.

Signed-off-by: Henrik Brix Andersen <hebad@vestas.com>
This commit is contained in:
Henrik Brix Andersen 2022-08-11 20:46:03 +02:00 • committed by Carles Cufí
commit bcd936b3b1
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
drivers/can/can_mcp2515.c
View file

@ -209,8 +209,8 @@ static int mcp2515_cmd_read_rx_buffer(const struct device *dev, uint8_t nm,
return spi_transceive_dt(&dev_cfg->bus, &tx, &rx); return spi_transceive_dt(&dev_cfg->bus, &tx, &rx);
} }
static void mcp2515_convert_zcanframe_to_mcp2515frame(const struct can_frame static void mcp2515_convert_canframe_to_mcp2515frame(const struct can_frame
*source, uint8_t *target) *source, uint8_t *target)
{ {
uint8_t rtr; uint8_t rtr;
uint8_t dlc; uint8_t dlc;
@ -240,8 +240,8 @@ static void mcp2515_convert_zcanframe_to_mcp2515frame(const struct can_frame
} }
} }
static void mcp2515_convert_mcp2515frame_to_zcanframe(const uint8_t *source, static void mcp2515_convert_mcp2515frame_to_canframe(const uint8_t *source,
struct can_frame *target) struct can_frame *target)
{ {
uint8_t data_idx = 0U; uint8_t data_idx = 0U;
@ -540,7 +540,7 @@ static int mcp2515_send(const struct device *dev,
dev_data->tx_cb[tx_idx].cb = callback; dev_data->tx_cb[tx_idx].cb = callback;
dev_data->tx_cb[tx_idx].cb_arg = user_data; dev_data->tx_cb[tx_idx].cb_arg = user_data;
mcp2515_convert_zcanframe_to_mcp2515frame(frame, tx_frame); mcp2515_convert_canframe_to_mcp2515frame(frame, tx_frame);
/* Address Pointer selection */ /* Address Pointer selection */
abc = 2 * tx_idx; abc = 2 * tx_idx;
@ -658,7 +658,7 @@ static void mcp2515_rx(const struct device *dev, uint8_t rx_idx)
/* Fetch rx buffer */ /* Fetch rx buffer */
mcp2515_cmd_read_rx_buffer(dev, nm, rx_frame, sizeof(rx_frame)); mcp2515_cmd_read_rx_buffer(dev, nm, rx_frame, sizeof(rx_frame));
mcp2515_convert_mcp2515frame_to_zcanframe(rx_frame, &frame); mcp2515_convert_mcp2515frame_to_canframe(rx_frame, &frame);
mcp2515_rx_filter(dev, &frame); mcp2515_rx_filter(dev, &frame);
} }