diff options
Diffstat (limited to 'src/generic')
-rw-r--r-- | src/generic/canbus.c | 6 | ||||
-rw-r--r-- | src/generic/canbus.h | 4 | ||||
-rw-r--r-- | src/generic/usb_canbus.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/generic/canbus.c b/src/generic/canbus.c index 941ccd00..0c7fc82d 100644 --- a/src/generic/canbus.c +++ b/src/generic/canbus.c @@ -5,7 +5,7 @@ // This file may be distributed under the terms of the GNU GPLv3 license. #include "autoconf.h" // CONFIG_CANBUS_FREQUENCY -#include "canbus.h" // canbus_send +#include "canbus.h" // canhw_send #include "canserial.h" // canserial_send #include "command.h" // DECL_CONSTANT @@ -14,13 +14,13 @@ DECL_CONSTANT("CANBUS_FREQUENCY", CONFIG_CANBUS_FREQUENCY); int canserial_send(struct canbus_msg *msg) { - return canbus_send(msg); + return canhw_send(msg); } void canserial_set_filter(uint32_t id) { - canbus_set_filter(id); + canhw_set_filter(id); } void diff --git a/src/generic/canbus.h b/src/generic/canbus.h index 8032611a..cd592b74 100644 --- a/src/generic/canbus.h +++ b/src/generic/canbus.h @@ -18,8 +18,8 @@ struct canbus_msg { #define CANMSG_DATA_LEN(msg) ((msg)->dlc > 8 ? 8 : (msg)->dlc) // callbacks provided by board specific code -int canbus_send(struct canbus_msg *msg); -void canbus_set_filter(uint32_t id); +int canhw_send(struct canbus_msg *msg); +void canhw_set_filter(uint32_t id); // canbus.c void canbus_notify_tx(void); diff --git a/src/generic/usb_canbus.c b/src/generic/usb_canbus.c index 1a4ac869..10f23ab9 100644 --- a/src/generic/usb_canbus.c +++ b/src/generic/usb_canbus.c @@ -205,7 +205,7 @@ usbcan_task(void) msg.data32[0] = gs->data32[0]; msg.data32[1] = gs->data32[1]; if (host_status & HS_TX_HW) { - ret = canbus_send(&msg); + ret = canhw_send(&msg); if (ret < 0) return; UsbCan.host_status = host_status = host_status & ~HS_TX_HW; |