michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: can: catch up on API naming changes

Browse source 
Catch up on the CAN driver API argument naming changes:
- Unify naming of callback function pointers as "callback".
- Unify naming of user-specified callback function arguments as
  "user_data".
- Instances and pointers to struct zcan_frame are named "frame",
  not "msg", to avoid confusion with the CAN message queue support.

Signed-off-by: Henrik Brix Andersen <hebad@vestas.com>
This commit is contained in:
Henrik Brix Andersen 2021-12-04 15:21:32 +01:00 • committed by Christopher Friedt
commit b21a91e468
12 changed files with 125 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

82
drivers/can/can_rcar.c
View file

@ -364,9 +364,9 @@ static void can_rcar_error(const struct device *dev)
}
static void can_rcar_rx_filter_isr(struct can_rcar_data *data,
const struct zcan_frame *msg)
const struct zcan_frame *frame)
{
struct zcan_frame tmp_msg;
struct zcan_frame tmp_frame;
uint8_t i;
for (i = 0; i < CONFIG_CAN_RCAR_MAX_FILTER; i++) {
@ -374,15 +374,15 @@ static void can_rcar_rx_filter_isr(struct can_rcar_data *data,
continue;
}
if (!can_utils_filter_match(msg,
if (!can_utils_filter_match(frame,
&data->filter[i])) {
continue; /* filter did not match */
}
/* Make a temporary copy in case the user
* modifies the message.
*/
tmp_msg = *msg;
data->rx_callback[i](&tmp_msg, data->rx_callback_arg[i]);
tmp_frame = *frame;
data->rx_callback[i](&tmp_frame, data->rx_callback_arg[i]);
}
}
@ -390,51 +390,51 @@ static void can_rcar_rx_isr(const struct device *dev)
{
struct can_rcar_data *data = DEV_CAN_DATA(dev);
const struct can_rcar_cfg *config = DEV_CAN_CFG(dev);
struct zcan_frame msg;
struct zcan_frame frame;
uint32_t val;
int i;
val = sys_read32(config->reg_addr + RCAR_CAN_MB_60);
if (val & RCAR_CAN_MB_IDE) {
msg.id_type = CAN_EXTENDED_IDENTIFIER;
msg.id = val & RCAR_CAN_MB_EID_MASK;
frame.id_type = CAN_EXTENDED_IDENTIFIER;
frame.id = val & RCAR_CAN_MB_EID_MASK;
} else {
msg.id_type = CAN_STANDARD_IDENTIFIER;
msg.id = (val & RCAR_CAN_MB_SID_MASK) >> RCAR_CAN_MB_SID_SHIFT;
frame.id_type = CAN_STANDARD_IDENTIFIER;
frame.id = (val & RCAR_CAN_MB_SID_MASK) >> RCAR_CAN_MB_SID_SHIFT;
}
if (val & RCAR_CAN_MB_RTR) {
msg.rtr = CAN_REMOTEREQUEST;
frame.rtr = CAN_REMOTEREQUEST;
} else {
msg.rtr = CAN_DATAFRAME;
frame.rtr = CAN_DATAFRAME;
}
msg.dlc = sys_read16(config->reg_addr
+ RCAR_CAN_MB_60 + RCAR_CAN_MB_DLC_OFFSET) & 0xF;
frame.dlc = sys_read16(config->reg_addr +
RCAR_CAN_MB_60 + RCAR_CAN_MB_DLC_OFFSET) & 0xF;
/* Be paranoid doc states that any value greater than 8
* should be considered as 8 bytes.
*/
if (msg.dlc > CAN_MAX_DLC) {
msg.dlc = CAN_MAX_DLC;
if (frame.dlc > CAN_MAX_DLC) {
frame.dlc = CAN_MAX_DLC;
}
for (i = 0; i < msg.dlc; i++) {
msg.data[i] = sys_read8(config->reg_addr
+ RCAR_CAN_MB_60 + RCAR_CAN_MB_DATA_OFFSET + i);
for (i = 0; i < frame.dlc; i++) {
frame.data[i] = sys_read8(config->reg_addr +
RCAR_CAN_MB_60 + RCAR_CAN_MB_DATA_OFFSET + i);
}
#if defined(CONFIG_CAN_RX_TIMESTAMP)
/* read upper byte */
msg.timestamp = sys_read8(config->reg_addr +
RCAR_CAN_MB_60 + RCAR_CAN_MB_TSH_OFFSET) << 8;
frame.timestamp = sys_read8(config->reg_addr +
RCAR_CAN_MB_60 + RCAR_CAN_MB_TSH_OFFSET) << 8;
/* and then read lower byte */
msg.timestamp |= sys_read8(config->reg_addr +
RCAR_CAN_MB_60 + RCAR_CAN_MB_TSL_OFFSET);
frame.timestamp |= sys_read8(config->reg_addr +
RCAR_CAN_MB_60 + RCAR_CAN_MB_TSL_OFFSET);
#endif
/* Increment CPU side pointer */
sys_write8(0xff, config->reg_addr + RCAR_CAN_RFPCR);
can_rcar_rx_filter_isr(data, &msg);
can_rcar_rx_filter_isr(data, &frame);
}
static void can_rcar_isr(const struct device *dev)
@ -711,9 +711,9 @@ done:
}
#endif /* CONFIG_CAN_AUTO_BUS_OFF_RECOVERY */
int can_rcar_send(const struct device *dev, const struct zcan_frame *msg,
int can_rcar_send(const struct device *dev, const struct zcan_frame *frame,
k_timeout_t timeout, can_tx_callback_t callback,
void *callback_arg)
void *user_data)
{
const struct can_rcar_cfg *config = DEV_CAN_CFG(dev);
struct can_rcar_data *data = DEV_CAN_DATA(dev);
@ -725,17 +725,17 @@ int can_rcar_send(const struct device *dev, const struct zcan_frame *msg,
"Id: 0x%x, "
"ID type: %s, "
"Remote Frame: %s"
, msg->dlc, dev->name
, msg->id
, msg->id_type == CAN_STANDARD_IDENTIFIER ?
, frame->dlc, dev->name
, frame->id
, frame->id_type == CAN_STANDARD_IDENTIFIER ?
"standard" : "extended"
, msg->rtr == CAN_DATAFRAME ? "no" : "yes");
, frame->rtr == CAN_DATAFRAME ? "no" : "yes");
__ASSERT(msg->dlc == 0U || msg->data != NULL, "Dataptr is null");
__ASSERT(frame->dlc == 0U || frame->data != NULL, "Dataptr is null");
if (msg->dlc > CAN_MAX_DLC) {
if (frame->dlc > CAN_MAX_DLC) {
LOG_ERR("DLC of %d exceeds maximum (%d)",
msg->dlc, CAN_MAX_DLC);
frame->dlc, CAN_MAX_DLC);
return CAN_TX_EINVAL;
}
@ -747,7 +747,7 @@ int can_rcar_send(const struct device *dev, const struct zcan_frame *msg,
k_mutex_lock(&data->inst_mutex, K_FOREVER);
tx_cb = &data->tx_cb[data->tx_head];
tx_cb->cb = callback;
tx_cb->cb_arg = callback_arg;
tx_cb->cb_arg = user_data;
k_sem_reset(&tx_cb->sem);
@ -756,23 +756,23 @@ int can_rcar_send(const struct device *dev, const struct zcan_frame *msg,
data->tx_head = 0;
}
if (msg->id_type == CAN_STANDARD_IDENTIFIER) {
identifier = msg->id << RCAR_CAN_MB_SID_SHIFT;
if (frame->id_type == CAN_STANDARD_IDENTIFIER) {
identifier = frame->id << RCAR_CAN_MB_SID_SHIFT;
} else {
identifier = msg->id | RCAR_CAN_MB_IDE;
identifier = frame->id | RCAR_CAN_MB_IDE;
}
if (msg->rtr == CAN_REMOTEREQUEST) {
if (frame->rtr == CAN_REMOTEREQUEST) {
identifier |= RCAR_CAN_MB_RTR;
}
sys_write32(identifier, config->reg_addr + RCAR_CAN_MB_56);
sys_write16(msg->dlc, config->reg_addr
sys_write16(frame->dlc, config->reg_addr
+ RCAR_CAN_MB_56 + RCAR_CAN_MB_DLC_OFFSET);
for (i = 0; i < msg->dlc; i++) {
sys_write8(msg->data[i], config->reg_addr
for (i = 0; i < frame->dlc; i++) {
sys_write8(frame->data[i], config->reg_addr
+ RCAR_CAN_MB_56 + RCAR_CAN_MB_DATA_OFFSET + i);
}