enable misra-c2012-2.3 & misra-c2012-2.4 (#1801)

* enable misra-c2012-2.3 * enable misrac 2.4 * delete * revert --------- Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
commaai · Jan 16, 2024 · 7e8b829 · 7e8b829
1 parent 369fd8c
commit 7e8b829
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 16 deletions.
diff --git a/board/stm32fx/llusb.h b/board/stm32fx/llusb.h
@@ -1,13 +1,6 @@
-typedef struct
-{
-  __IO uint32_t HPRT;
-}
-USB_OTG_HostPortTypeDef;
-
 USB_OTG_GlobalTypeDef *USBx = USB_OTG_FS;
 
 #define USBx_HOST       ((USB_OTG_HostTypeDef *)((uint32_t)USBx + USB_OTG_HOST_BASE))
-#define USBx_HOST_PORT  ((USB_OTG_HostPortTypeDef *)((uint32_t)USBx + USB_OTG_HOST_PORT_BASE))
 #define USBx_DEVICE     ((USB_OTG_DeviceTypeDef *)((uint32_t)USBx + USB_OTG_DEVICE_BASE))
 #define USBx_INEP(i)    ((USB_OTG_INEndpointTypeDef *)((uint32_t)USBx + USB_OTG_IN_ENDPOINT_BASE + ((i) * USB_OTG_EP_REG_SIZE)))
 #define USBx_OUTEP(i)   ((USB_OTG_OUTEndpointTypeDef *)((uint32_t)USBx + USB_OTG_OUT_ENDPOINT_BASE + ((i) * USB_OTG_EP_REG_SIZE)))

diff --git a/board/stm32h7/llusb.h b/board/stm32h7/llusb.h
@@ -1,13 +1,6 @@
-typedef struct
-{
-  __IO uint32_t HPRT;
-}
-USB_OTG_HostPortTypeDef;
-
 USB_OTG_GlobalTypeDef *USBx = USB_OTG_HS;
 
 #define USBx_HOST       ((USB_OTG_HostTypeDef *)((uint32_t)USBx + USB_OTG_HOST_BASE))
-#define USBx_HOST_PORT  ((USB_OTG_HostPortTypeDef *)((uint32_t)USBx + USB_OTG_HOST_PORT_BASE))
 #define USBx_DEVICE     ((USB_OTG_DeviceTypeDef *)((uint32_t)USBx + USB_OTG_DEVICE_BASE))
 #define USBx_INEP(i)    ((USB_OTG_INEndpointTypeDef *)((uint32_t)USBx + USB_OTG_IN_ENDPOINT_BASE + ((i) * USB_OTG_EP_REG_SIZE)))
 #define USBx_OUTEP(i)   ((USB_OTG_OUTEndpointTypeDef *)((uint32_t)USBx + USB_OTG_OUT_ENDPOINT_BASE + ((i) * USB_OTG_EP_REG_SIZE)))

diff --git a/tests/misra/suppressions.txt b/tests/misra/suppressions.txt
@@ -23,8 +23,6 @@ knownConditionTrueFalse
 
 misra-config
 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
 misra-c2012-2.7
 misra-c2012-8.7