cppcheck mods for safety.c

Author: aubsw

board/drivers/can_common_declarations.h

@@ -86,6 +86,3 @@ void can_set_checksum(CANPacket_t *packet);
 bool can_check_checksum(CANPacket_t *packet);
 void can_send(CANPacket_t *to_push, uint8_t bus_number, bool skip_tx_hook);
 bool is_speed_valid(uint32_t speed, const uint32_t *all_speeds, uint8_t len);
-
-// From opendbc/safety
-extern bool safety_tx_hook(CANPacket_t *to_send);

board/drivers/registers.h

@@ -1,4 +1,5 @@
 #include "registers_declarations.h"
+#include "safety/board/faults_declarations.h"
 
 static reg register_map[REGISTER_MAP_SIZE];
 

board/faults.h

@@ -36,9 +36,3 @@
 
 // Permanent faults
 #define PERMANENT_FAULTS 0U
-
-extern uint8_t fault_status;
-extern uint32_t faults;
-
-extern void fault_occurred(uint32_t fault);
-extern void fault_recovered(uint32_t fault);

board/libc.h

@@ -15,7 +15,7 @@ void assert_fatal(bool condition, const char *msg) {
   }
 }
 
-// cppcheck-suppress misra-c2012-21.2
+// cppcheck-suppress [misra-c2012-21.2,unusedFunction]
 void *memset(void *str, int c, unsigned int n) {
   uint8_t *s = str;
   for (unsigned int i = 0; i < n; i++) {

board/safety.c

@@ -1,12 +1,19 @@
+// Until opendbc is properly converted to source/header format, we compile our
+// own bespoke safety object file so that we can link opendbc implementations
+// into panda.
 #include <stdint.h>
 #include <stdbool.h>
 
 extern void print(const char *a);
 extern void puth(unsigned int i);
 extern uint32_t microsecond_timer_get(void);
 
+// Suppress funky header inclusion ordering. We need the forward declarations
+// above. This will all eventually be deleted when opendbc is fixed.
+// cppcheck-suppress-begin misra-c2012-20.1 -
 #include "safety/board/utils.h"
-#include "safety/board/faults_declarations.h"
+#include "safety/board/faults.h"
 #include "safety/board/can.h"
 #include "safety/board/drivers/can_common.h"
 #include "safety/safety.h"
+// cppcheck-suppress-end misra-c2012-20.1

tests/libpanda/SConscript

@@ -20,6 +20,8 @@ env = Environment(
     ".",
     "../../board/",
     "../../../opendbc/",
+    "../../../opendbc/safety/",
+    "../../../opendbc/safety/board/",
   ],
 )
 if system == "Darwin":

tests/libpanda/panda.c

@@ -1,11 +1,10 @@
 #include "fake_stm.h"
 #include "config.h"
-#include "safety/board/can.h"
-#include "safety/board/drivers/can_common.h"
+#include "can.h"
 
 bool can_init(uint8_t can_number) { return true; }
 void process_can(uint8_t can_number) { }
-bool safety_tx_hook(CANPacket_t *to_send) { return 1; }
+//int safety_tx_hook(CANPacket_t *to_send) { return 1; }
 
 typedef struct harness_configuration harness_configuration;
 void refresh_can_tx_slots_available(void);
@@ -16,6 +15,9 @@ void can_tx_comms_resume_spi(void) { };
 #include "faults.h"
 #include "libc.h"
 #include "boards/board_declarations.h"
+#include "safety/board/drivers/can_common.h"
+#include "safety/board/faults.h"
+#include "safety/safety.h"
 #include "main_definitions.h"
 #include "drivers/can_common.h"
 

tests/misra/suppressions.txt

@@ -15,6 +15,14 @@ unmatchedSuppression
 # All interrupt handlers are defined, including ones we don't use
 unusedFunction:*/interrupt_handlers*.h
 
+# This header is generated by the SConscript, is working as intended.
+misra-c2012-8.9:*/gitversion.h
+
+# dlc_to_len is statically defined in opendbc repo, thus the dlc_to_len definitions is
+# duplicated whenever the header is included. This will fixed when opendbc is converted
+# to source/header-style
+misra-c2012-5.9:*/safety/board/can.h
+
 # all of the below suppressions are from new checks introduced after updating
 # cppcheck from 2.5 -> 2.13. they are listed here to separate the update from
 # fixing the violations and all are intended to be removed soon after

tests/misra/test_misra.sh

@@ -44,12 +44,15 @@ cppcheck() {
   echo -e "\n\n\n\n\nTEST variant options:" >> $CHECKLIST
   echo -e ""${@//$PANDA_DIR/}"\n\n" >> $CHECKLIST # (absolute path removed)
 
-  $CPPCHECK_DIR/cppcheck --inline-suppr \
+  $CPPCHECK_DIR/cppcheck \
+          --inline-suppr \
           -I "$(arm-none-eabi-gcc -print-file-name=include)" \
           -I $PANDA_DIR/board/ \
           -I $PANDA_DIR/board/stm32f4/inc/ \
           -I $PANDA_DIR/board/stm32h7/inc/ \
           -I $PANDA_DIR/../opendbc/ \
+          -I $PANDA_DIR/../opendbc/safety/ \
+          -I $PANDA_DIR/../opendbc/safety/board/ \
           --suppressions-list=$DIR/suppressions.txt \
           --suppress=*:*inc/* \
           --suppress=*:*include/* \
@@ -68,12 +71,16 @@ cppcheck() {
 }
 
 PANDA_OPTS="--enable=all --disable=unusedFunction -DPANDA --addon=misra"
+# TODO: Make jungle/main.c and bootstub.c MISRA-compliant.
+PANDA_SOURCES="$PANDA_DIR/board/ --file-filter=*.c \
+         -i $PANDA_DIR/board/jungle/main.c \
+         -i $PANDA_DIR/board/bootstub.c"
 
 printf "\n${GREEN}** PANDA F4 CODE **${NC}\n"
-cppcheck $PANDA_OPTS -DSTM32F4 -DSTM32F413xx $PANDA_DIR/board/main.c
+cppcheck $PANDA_OPTS -DSTM32F4 -DSTM32F413xx $PANDA_SOURCES
 
 printf "\n${GREEN}** PANDA H7 CODE **${NC}\n"
-cppcheck $PANDA_OPTS -DSTM32H7 -DSTM32H725xx $PANDA_DIR/board/main.c
+cppcheck $PANDA_OPTS -DSTM32H7 -DSTM32H725xx $PANDA_SOURCES
 
 # unused needs to run globally
 #printf "\n${GREEN}** UNUSED ALL CODE **${NC}\n"