enable misra-c2012-2.2

commaai · Jan 10, 2024 · f64ba24 · f64ba24
1 parent 734bf09
commit f64ba24
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/board/drivers/usb.h b/board/drivers/usb.h
@@ -563,7 +563,7 @@ void usb_setup(void) {
                 // 96 bits = 12 bytes
                 for (int i = 0; i < 12; i++){
                   uint8_t cc = ((uint8_t *)UID_BASE)[i];
-                  resp[2 + (i * 4) + 0] = to_hex_char((cc >> 4) & 0xFU);
+                  resp[2 + (i * 4)] = to_hex_char((cc >> 4) & 0xFU);
                   resp[2 + (i * 4) + 1] = '\0';
                   resp[2 + (i * 4) + 2] = to_hex_char((cc >> 0) & 0xFU);
                   resp[2 + (i * 4) + 3] = '\0';

diff --git a/tests/misra/suppressions.txt b/tests/misra/suppressions.txt
@@ -22,8 +22,7 @@ constParameterCallback
 knownConditionTrueFalse
 
 misra-config
-misra-c2012-1.2
-misra-c2012-2.2
+misra-c2012-1.2  # this is from the extensions (e.g. __typeof__) used in the MIN, MAX, ABS, and CLAMP macros
 misra-c2012-2.3
 misra-c2012-2.4
 misra-c2012-2.5