Skip to content

Commit c3bab4c

Browse files
committed
cleanup drivers/can_common
1 parent 8a14579 commit c3bab4c

File tree

5 files changed

+5
-24
lines changed

5 files changed

+5
-24
lines changed
Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#include "can_common_declarations.h"
1+
#include "can_common_panda_declarations.h"
2+
#include "safety/board/drivers/can_common.h"
23

34
uint32_t safety_tx_blocked = 0;
45
uint32_t safety_rx_invalid = 0;
@@ -219,23 +220,6 @@ bool can_tx_check_min_slots_free(uint32_t min) {
219220
(can_slots_empty(&can_tx3_q) >= min);
220221
}
221222

222-
uint8_t calculate_checksum(const uint8_t *dat, uint32_t len) {
223-
uint8_t checksum = 0U;
224-
for (uint32_t i = 0U; i < len; i++) {
225-
checksum ^= dat[i];
226-
}
227-
return checksum;
228-
}
229-
230-
void can_set_checksum(CANPacket_t *packet) {
231-
packet->checksum = 0U;
232-
packet->checksum = calculate_checksum((uint8_t *) packet, CANPACKET_HEAD_SIZE + GET_LEN(packet));
233-
}
234-
235-
bool can_check_checksum(CANPacket_t *packet) {
236-
return (calculate_checksum((uint8_t *) packet, CANPACKET_HEAD_SIZE + GET_LEN(packet)) == 0U);
237-
}
238-
239223
void can_send(CANPacket_t *to_push, uint8_t bus_number, bool skip_tx_hook) {
240224
if (skip_tx_hook || safety_tx_hook(to_push) != 0) {
241225
if (bus_number < PANDA_BUS_CNT) {

board/drivers/can_common_declarations.h renamed to board/drivers/can_common_panda_declarations.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,5 @@ void can_set_forwarding(uint8_t from, uint8_t to);
8181
#endif
8282
void ignition_can_hook(CANPacket_t *to_push);
8383
bool can_tx_check_min_slots_free(uint32_t min);
84-
uint8_t calculate_checksum(const uint8_t *dat, uint32_t len);
85-
void can_set_checksum(CANPacket_t *packet);
86-
bool can_check_checksum(CANPacket_t *packet);
8784
void can_send(CANPacket_t *to_push, uint8_t bus_number, bool skip_tx_hook);
8885
bool is_speed_valid(uint32_t speed, const uint32_t *all_speeds, uint8_t len);

board/jungle/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include "board/health.h"
1414
#include "jungle_health.h"
1515

16-
#include "board/drivers/can_common.h"
16+
#include "board/drivers/can_common_panda.h"
1717

1818
#ifdef STM32H7
1919
#include "board/drivers/fdcan.h"

board/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
#include "health.h"
1616

17-
#include "drivers/can_common.h"
17+
#include "drivers/can_common_panda.h"
1818

1919
#ifdef STM32H7
2020
#include "drivers/fdcan.h"

tests/libpanda/panda.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ void can_tx_comms_resume_spi(void) { };
1717
#include "boards/board_declarations.h"
1818
#include "safety/safety.h"
1919
#include "main_definitions.h"
20-
#include "drivers/can_common.h"
20+
#include "drivers/can_common_panda.h"
2121

2222
can_ring *rx_q = &can_rx_q;
2323
can_ring *tx1_q = &can_tx1_q;

0 commit comments

Comments
 (0)