compilation error fix and some more cppcheck work

openair2/COMMON/mac_rrc_primitives.h

@@ -20,15 +20,14 @@
  */
 
 #ifndef __MAC_RRC_PRIMITIVES_H__
-#    define __MAC_RRC_PRIMITIVES_H__
-
-
+#define __MAC_RRC_PRIMITIVES_H__
 
 #ifndef OPENAIR2_IN
   #include "LAYER2/RLC/rlc.h"
 #endif
 #include "COMMON/platform_types.h"
 #include "COMMON/platform_constants.h"
+#include "openair2/RRC/LTE/rrc_defs.h"
 
 #include "LTE_RadioResourceConfigCommonSIB.h"
 #include "LTE_RadioResourceConfigDedicated.h"
@@ -398,5 +397,3 @@ typedef struct {
 #define REMOVE_LC 1
 
 #endif
-
-

openair2/COMMON/rrc_messages_types.h

@@ -429,9 +429,9 @@ typedef struct NRRrcConfigurationReq_s {
   long                    DL_absoluteFrequencyPointA[MAX_NUM_CCs];
 
   //NR DL SCS-SpecificCarrier
-  uint32_t                DL_offsetToCarrier[MAX_NUM_CCs];
+  long                    DL_offsetToCarrier[MAX_NUM_CCs];
   long                    DL_SCS_SubcarrierSpacing[MAX_NUM_CCs];
-  uint32_t                DL_carrierBandwidth[MAX_NUM_CCs];
+  long                    DL_carrierBandwidth[MAX_NUM_CCs];
 
   //NR BWP-DownlinkCommon
   uint32_t                DL_locationAndBandwidth[MAX_NUM_CCs];