Merge branch 'develop' into L1_renaming

Conflicts:
	common/utils/LOG/log.c
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-softmodem.c

ci-scripts/main.py

@@ -436,7 +436,7 @@ class SSHConnection():
 					self.copyout(self.eNBIPAddress, self.eNBUserName, self.eNBPassword, pcap_log_file, self.eNBSourceCodePath + '/cmake_targets/.')
 				sys.exit(1)
 			else:
-				self.command('stdbuf -o0 cat enb_' + SSH.testCase_id + '.log | egrep --color=never -i "wait|sync"', '\$', 4)
+				self.command('stdbuf -o0 cat enb_' + SSH.testCase_id + '.log | egrep --text --color=never -i "wait|sync"', '\$', 4)
 				if rruCheck:
 					result = re.search('wait RUs', str(self.ssh.before))
 				else:
@@ -1573,6 +1573,8 @@ class SSHConnection():
 		rrcReestablishRequest = 0
 		rrcReestablishComplete = 0
 		rrcReestablishReject = 0
+		rlcDiscardBuffer = 0
+		rachCanceledProcedure = 0
 		uciStatMsgCount = 0
 		pdcpFailure = 0
 		ulschFailure = 0
@@ -1625,6 +1627,12 @@ class SSHConnection():
 			result = re.search('ULSCH in error in round', str(line))
 			if result is not None:
 				ulschFailure += 1
+			result = re.search('BAD all_segments_received', str(line))
+			if result is not None:
+				rlcDiscardBuffer += 1
+			result = re.search('Canceled RA procedure for UE rnti', str(line))
+			if result is not None:
+				rachCanceledProcedure += 1
 		enb_log_file.close()
 		self.htmleNBFailureMsg = ''
 		if uciStatMsgCount > 0:
@@ -1667,6 +1675,10 @@ class SSHConnection():
 			rrcMsg = ' -- ' + str(rrcReestablishReject) + ' were rejected'
 			logging.debug('\u001B[1;30;43m ' + rrcMsg + ' \u001B[0m')
 			self.htmleNBFailureMsg += rrcMsg + '\n'
+		if rachCanceledProcedure > 0:
+			rachMsg = 'eNB cancelled ' + str(rachCanceledProcedure) + ' RA procedure(s)'
+			logging.debug('\u001B[1;30;43m ' + rachMsg + ' \u001B[0m')
+			self.htmleNBFailureMsg += rachMsg + '\n'
 		if foundSegFault:
 			logging.debug('\u001B[1;37;41m eNB ended with a Segmentation Fault! \u001B[0m')
 			return ENB_PROCESS_SEG_FAULT
@@ -1677,6 +1689,11 @@ class SSHConnection():
 		if foundRealTimeIssue:
 			logging.debug('\u001B[1;37;41m eNB faced real time issues! \u001B[0m')
 			return ENB_PROCESS_REALTIME_ISSUE
+		if rlcDiscardBuffer > 0:
+			rlcMsg = 'eNB RLC discarded ' + str(rlcDiscardBuffer) + ' buffer(s)'
+			logging.debug('\u001B[1;37;41m ' + rlcMsg + ' \u001B[0m')
+			self.htmleNBFailureMsg += rlcMsg + '\n'
+			return ENB_PROCESS_REALTIME_ISSUE
 		return 0
 
 	def TerminateeNB(self):

ci-scripts/xml_files/if4p5_usrp210_band40.xml

@@ -21,17 +21,15 @@
 
 -->
 <testCaseList>
-	<!-- Only 5MHz is tested since neither 10MHz nor 20MHz work in this configuration -->
-	<!-- Also no UL iperf in 5MHz (040642) -->
+	<!-- Only 5MHz/10MHz is tested since 20MHz does not work as in monolithic -->
         <TestCaseRequestedList>
  010101
  050101 060101 070101 040101
- 030104 030105 040301 040501 040602 040401 040201 030201 030202
+ 030104 030105 040301 040501 040602 040642 040401 040201 030201 030202
+ 030114 030115 040301 040511 040612 040652 040401 040201 030201 030202
  050201 060201 070201
 	</TestCaseRequestedList>
 	<!--
- 030104 030105 040301 040501 040602 040642 040401 040201 030201 030202
- 030114 030115 040301 040511 040612 040652 040401 040201 030201 030202
  030124 030125 040301 040521 040622 040662 040401 040201 030201 030202
 	-->
 	<TestCaseExclusionList>

ci-scripts/xml_files/if4p5_usrp210_band7.xml

@@ -21,17 +21,14 @@
 
 -->
 <testCaseList>
-	<!-- Only 5MHz is tested since neither 10MHz nor 20MHz work in this configuration -->
 	<TestCaseRequestedList>
  010101
  050101 060101 070101 040101
  030101 030102 040301 040501 040604 040642 040401 040201 030201 030202
- 050201 060201 070201
-	</TestCaseRequestedList>
-	<!--
  030111 030112 040301 040511 040614 040652 040401 040201 030201 030202
  030121 030122 040301 040521 040624 040662 040401 040201 030201 030202
-	-->
+ 050201 060201 070201
+	</TestCaseRequestedList>
 	<TestCaseExclusionList>
 	</TestCaseExclusionList>
 

cmake_targets/CMakeLists.txt

@@ -232,7 +232,7 @@ add_definitions("-DPACKAGE_BUGREPORT=\"openair4g-devel@lists.eurecom.fr\"")
 # Debug related options
 #########################################
 add_boolean_option(ASN_DEBUG           False "ASN1 coder/decoder Debug")
-add_boolean_option(EMIT_ASN_DEBUG      False "ASN1 coder/decoder Debug")
+add_boolean_option(ASN_EMIT_DEBUG      False "ASN1 coder/decoder Debug")
 add_boolean_option(MSG_PRINT           False "print debug messages")
 add_boolean_option(DISABLE_XER_PRINT   False "print XER Format")
 add_boolean_option(XER_PRINT           False "print XER Format")

common/utils/LOG/log.c

@@ -39,10 +39,9 @@
 #include "vcd_signal_dumper.h"
 #include "assertions.h"
 
-
-# include <pthread.h>
-# include <string.h>
-#include  <linux/prctl.h>
+#include <pthread.h>
+#include <string.h>
+#include <linux/prctl.h>
 #include "common/config/config_userapi.h"
 // main log variables
 

openair1/PHY/INIT/init_top.c

@@ -59,14 +59,11 @@ void generate_qpsk_table(void) {
   }
 }
 
-void init_7_5KHz(void);
 void init_lte_top(LTE_DL_FRAME_PARMS *frame_parms) {
   ccodelte_init();
   ccodelte_init_inv();
-  init_dfts();
   phy_generate_viterbi_tables_lte();
   load_codinglib();
-  lte_sync_time_init(frame_parms);
   generate_ul_ref_sigs();
   generate_ul_ref_sigs_rx();
   generate_64qam_table();
@@ -76,13 +73,11 @@ void init_lte_top(LTE_DL_FRAME_PARMS *frame_parms) {
   init_unscrambling_lut();
   init_scrambling_lut();
   //set_taus_seed(1328);
-//  init_7_5KHz();
   init_sss();
 }
 
 void free_lte_top(void) {
   free_codinglib();
-  lte_sync_time_free();
   /* free_ul_ref_sigs() is called in phy_free_lte_eNB() */
 }
 

openair1/PHY/INIT/lte_init_ru.c

@@ -67,6 +67,7 @@ int phy_init_RU(RU_t *ru) {
 
   }
   if (ru->function != NGFI_RRU_IF5) { // we need to do RX/TX RU processing
+    init_dfts();
     init_7_5KHz();
     LOG_I(PHY,"nb_tx %d\n",ru->nb_tx);
     ru->common.rxdata_7_5kHz = (int32_t**)malloc16(ru->nb_rx*sizeof(int32_t*) );

openair1/PHY/INIT/lte_init_ue.c

@@ -30,6 +30,7 @@
 #include "common/utils/LOG/vcd_signal_dumper.h"
 #include "assertions.h"
 #include <math.h>
+#include "PHY/LTE_ESTIMATION/lte_estimation.h"
 #include "PHY/LTE_TRANSPORT/transport_common_proto.h"
 #include "PHY/LTE_UE_TRANSPORT/transport_proto_ue.h"
 #include "PHY/LTE_REFSIG/lte_refsig.h"
@@ -661,8 +662,9 @@ int init_lte_ue_signal(PHY_VARS_UE *ue,
 
 
 
-
+  init_dfts();
   init_frame_parms(&ue->frame_parms,1);
+  lte_sync_time_init(&ue->frame_parms);
   init_lte_top(&ue->frame_parms);
   init_7_5KHz();
   init_ul_hopping(&ue->frame_parms);

openair1/PHY/phy_vars_ue.h

@@ -28,9 +28,9 @@
 
 #include "common/ran_context.h"
 
-char* namepointer_chMag ;
+char *namepointer_chMag ;
 char fmageren_name2[512];
-char* namepointer_log2;
+char *namepointer_log2;
 
 
 #include "PHY/LTE_REFSIG/primary_synch.h"
@@ -45,7 +45,7 @@ int16_t *primary_synch2_time;
 PHY_VARS_UE ***PHY_vars_UE_g;
 LTE_DL_FRAME_PARMS *lte_frame_parms_g;
 #else
-PHY_VARS_UE * PHY_vars_UE_g[MAX_UE][MAX_NUM_CCs]={NULL};
+PHY_VARS_UE *PHY_vars_UE_g[MAX_UE][MAX_NUM_CCs]= {NULL};
 
 #endif
 
@@ -62,10 +62,10 @@ char mode_string[4][20] = {"NOT SYNCHED","PRACH","RAR","PUSCH"};
 
 
 #ifndef OPENAIR2
-unsigned char NB_eNB_INST=0;
-unsigned char NB_UE_INST=0;
-unsigned char NB_RN_INST=0;
-unsigned char NB_INST=0;
+  unsigned char NB_eNB_INST=0;
+  unsigned char NB_UE_INST=0;
+  unsigned char NB_RN_INST=0;
+  unsigned char NB_INST=0;
 #endif
 
 unsigned int ULSCH_max_consecutive_errors = 20;
@@ -134,9 +134,9 @@ double beta2_dlsch[6][MCS_COUNT] = { {2.52163, 0.83231, 0.77472, 1.36536, 1.1682
 #ifdef OCP_FRAMEWORK
 #include <enums.h>
 #else
-char eNB_functions[6][20]={"eNodeB_3GPP","eNodeB_3GPP_BBU","NGFI_RAU_IF4p5","NGFI_RRU_IF5","NGFI_RRU_IF4p5",};
-char eNB_timing[2][20]={"synch_to_ext_device","synch_to_other"};
-char ru_if_types[MAX_RU_IF_TYPES][20]={"local RF","IF5 RRU","IF5 Mobipass","IF4p5 RRU","IF1pp RRU"};
+char eNB_functions[6][20]= {"eNodeB_3GPP","eNodeB_3GPP_BBU","NGFI_RAU_IF4p5","NGFI_RRU_IF5","NGFI_RRU_IF4p5",};
+char eNB_timing[2][20]= {"synch_to_ext_device","synch_to_other"};
+char ru_if_types[MAX_RU_IF_TYPES][20]= {"local RF","IF5 RRU","IF5 Mobipass","IF4p5 RRU","IF1pp RRU"};
 #endif
 
 /// lookup table for unscrambling in RX

openair2/COMMON/platform_types.h

@@ -31,7 +31,7 @@
 #    define __PLATFORM_TYPES_H__
 
 #if !defined(NAS_NETLINK)
-#include <stdint.h>
+  #include <stdint.h>
 #endif
 
 //-----------------------------------------------------------------------------
@@ -42,19 +42,19 @@
  * let's protect potential redefinition
  */
 #ifndef _BOOLEAN_T_DEFINED_
-#define _BOOLEAN_T_DEFINED_
+  #define _BOOLEAN_T_DEFINED_
 
-typedef signed char        boolean_t;
+  typedef signed char        boolean_t;
 
-#if !defined(TRUE)
-#define TRUE               (boolean_t)0x01
-#endif
+  #if !defined(TRUE)
+    #define TRUE               (boolean_t)0x01
+  #endif
 
-#if !defined(FALSE)
-#define FALSE              (boolean_t)0x00
-#endif
+  #if !defined(FALSE)
+    #define FALSE              (boolean_t)0x00
+  #endif
 
-#define BOOL_NOT(b) (b^TRUE)
+  #define BOOL_NOT(b) (b^TRUE)
 
 #endif /* _BOOLEAN_T_DEFINED_ */
 
@@ -65,7 +65,7 @@ typedef int32_t               sdu_size_t;
 typedef uint32_t              frame_t;
 typedef int32_t               sframe_t;
 typedef uint32_t              sub_frame_t;
-typedef uint16_t               module_id_t;
+typedef uint16_t              module_id_t;
 typedef uint8_t               slice_id_t;
 typedef uint8_t               eNB_index_t;
 typedef uint16_t              ue_id_t;
@@ -102,19 +102,19 @@ typedef enum rb_type_e {
 } rb_type_t;
 
 typedef enum {
-    CR_ROUND = 0,
-    CR_SRB12 = 1,
-    CR_HOL   = 2,
-    CR_LC    = 3,
-    CR_CQI   = 4,
-    CR_LCP   = 5,
-    CR_NUM   = 6
+  CR_ROUND = 0,
+  CR_SRB12 = 1,
+  CR_HOL   = 2,
+  CR_LC    = 3,
+  CR_CQI   = 4,
+  CR_LCP   = 5,
+  CR_NUM   = 6
 } sorting_criterion_t;
 
 typedef enum {
-    POL_FAIR   = 0,
-    POL_GREEDY = 1,
-    POL_NUM    = 2
+  POL_FAIR   = 0,
+  POL_GREEDY = 1,
+  POL_NUM    = 2
 } accounting_policy_t;
 //-----------------------------------------------------------------------------
 // PHY TYPES
@@ -188,19 +188,19 @@ typedef uint32_t           m_tmsi_t;
 
 //Random UE identity length = 40 bits
 #if ! defined(NOT_A_RANDOM_UE_IDENTITY)
-#define NOT_A_RANDOM_UE_IDENTITY (uint64_t)0xFFFFFFFF
+  #define NOT_A_RANDOM_UE_IDENTITY (uint64_t)0xFFFFFFFF
 #endif
 #if ! defined(NOT_A_RNTI)
-#define NOT_A_RNTI (rnti_t)0
+  #define NOT_A_RNTI (rnti_t)0
 #endif
 #if ! defined(M_RNTI)
-#define M_RNTI     (rnti_t)0xFFFD
+  #define M_RNTI     (rnti_t)0xFFFD
 #endif
 #if ! defined(P_RNTI)
-#define P_RNTI     (rnti_t)0xFFFE
+  #define P_RNTI     (rnti_t)0xFFFE
 #endif
 #if ! defined(SI_RNTI)
-#define SI_RNTI    (rnti_t)0xFFFF
+  #define SI_RNTI    (rnti_t)0xFFFF
 #endif
 typedef enum config_action_e {
   CONFIG_ACTION_NULL              = 0,
@@ -225,7 +225,7 @@ typedef uint8_t            ebi_t;  // eps bearer id
 //-----------------------------------------------------------------------------
 // may be ITTI not enabled, but type instance is useful also for OTG,
 #if !defined(instance_t)
-typedef uint16_t instance_t;
+  typedef uint16_t instance_t;
 #endif
 typedef struct protocol_ctxt_s {
   module_id_t module_id;     /*!< \brief  Virtualized module identifier      */
@@ -247,51 +247,51 @@ typedef struct protocol_ctxt_s {
 
 
 #define MODULE_ID_TO_INSTANCE(mODULE_iD, iNSTANCE, eNB_fLAG) \
-    if(eNB_fLAG == ENB_FLAG_YES) \
-        iNSTANCE = ENB_MODULE_ID_TO_INSTANCE(mODULE_iD); \
-    else \
-        iNSTANCE = UE_MODULE_ID_TO_INSTANCE(mODULE_iD)
+  if(eNB_fLAG == ENB_FLAG_YES) \
+    iNSTANCE = ENB_MODULE_ID_TO_INSTANCE(mODULE_iD); \
+  else \
+    iNSTANCE = UE_MODULE_ID_TO_INSTANCE(mODULE_iD)
 
 #define INSTANCE_TO_MODULE_ID(iNSTANCE, mODULE_iD, eNB_fLAG) \
-    if(eNB_fLAG == ENB_FLAG_YES) \
-        mODULE_iD = ENB_INSTANCE_TO_MODULE_ID(iNSTANCE); \
-    else \
-        mODULE_iD = UE_INSTANCE_TO_MODULE_ID(iNSTANCE)
+  if(eNB_fLAG == ENB_FLAG_YES) \
+    mODULE_iD = ENB_INSTANCE_TO_MODULE_ID(iNSTANCE); \
+  else \
+    mODULE_iD = UE_INSTANCE_TO_MODULE_ID(iNSTANCE)
 
 #define PROTOCOL_CTXT_COMPUTE_MODULE_ID(CtXt_h) \
-    INSTANCE_TO_MODULE_ID( (CtXt_h)->instance , (CtXt_h)->module_id , (CtXt_h)->enb_flag )
+  INSTANCE_TO_MODULE_ID( (CtXt_h)->instance , (CtXt_h)->module_id , (CtXt_h)->enb_flag )
 
 
 #define PROTOCOL_CTXT_COMPUTE_INSTANCE(CtXt_h) \
-    MODULE_ID_TO_INSTANCE( (CtXt_h)->module_id , (CtXt_h)->instance , (CtXt_h)->enb_flag )
+  MODULE_ID_TO_INSTANCE( (CtXt_h)->module_id , (CtXt_h)->instance , (CtXt_h)->enb_flag )
 
 
 #define PROTOCOL_CTXT_SET_BY_MODULE_ID(Ctxt_Pp, mODULE_iD, eNB_fLAG, rNTI, fRAME, sUBfRAME, eNB_iNDEX) \
-    (Ctxt_Pp)->module_id = mODULE_iD; \
-    (Ctxt_Pp)->enb_flag  = eNB_fLAG; \
-    (Ctxt_Pp)->rnti      = rNTI; \
-    (Ctxt_Pp)->frame     = fRAME; \
-    (Ctxt_Pp)->subframe  = sUBfRAME; \
-    (Ctxt_Pp)->eNB_index  = eNB_iNDEX; \
-    PROTOCOL_CTXT_COMPUTE_INSTANCE(Ctxt_Pp)
+  (Ctxt_Pp)->module_id = mODULE_iD; \
+  (Ctxt_Pp)->enb_flag  = eNB_fLAG; \
+  (Ctxt_Pp)->rnti      = rNTI; \
+  (Ctxt_Pp)->frame     = fRAME; \
+  (Ctxt_Pp)->subframe  = sUBfRAME; \
+  (Ctxt_Pp)->eNB_index  = eNB_iNDEX; \
+  PROTOCOL_CTXT_COMPUTE_INSTANCE(Ctxt_Pp)
 
 #define PROTOCOL_CTXT_SET_BY_INSTANCE(Ctxt_Pp, iNSTANCE, eNB_fLAG, rNTI, fRAME, sUBfRAME) \
-    (Ctxt_Pp)->instance  = iNSTANCE; \
-    (Ctxt_Pp)->enb_flag  = eNB_fLAG; \
-    (Ctxt_Pp)->rnti      = rNTI; \
-    (Ctxt_Pp)->frame     = fRAME; \
-    (Ctxt_Pp)->subframe  = sUBfRAME; \
-    PROTOCOL_CTXT_COMPUTE_MODULE_ID(Ctxt_Pp)
+  (Ctxt_Pp)->instance  = iNSTANCE; \
+  (Ctxt_Pp)->enb_flag  = eNB_fLAG; \
+  (Ctxt_Pp)->rnti      = rNTI; \
+  (Ctxt_Pp)->frame     = fRAME; \
+  (Ctxt_Pp)->subframe  = sUBfRAME; \
+  PROTOCOL_CTXT_COMPUTE_MODULE_ID(Ctxt_Pp)
 
 #define PROTOCOL_CTXT_FMT "[FRAME %05u][%s][MOD %02u][RNTI %" PRIx16 "]"
 #define PROTOCOL_CTXT_ARGS(CTXT_Pp) \
-    (CTXT_Pp)->frame, \
-    ((CTXT_Pp)->enb_flag == ENB_FLAG_YES) ? "eNB":" UE", \
-    (CTXT_Pp)->module_id, \
-    (CTXT_Pp)->rnti
+  (CTXT_Pp)->frame, \
+  ((CTXT_Pp)->enb_flag == ENB_FLAG_YES) ? "eNB":" UE", \
+  (CTXT_Pp)->module_id, \
+  (CTXT_Pp)->rnti
 
 #define CHECK_CTXT_ARGS(CTXT_Pp)
 
 #define exit_fun(msg) exit_function(__FILE__,__FUNCTION__,__LINE__,msg)
-void exit_function(const char* file, const char* function, const int line, const char* s);
+void exit_function(const char *file, const char *function, const int line, const char *s);
 #endif

openair2/COMMON/rrc_messages_types.h

@@ -33,9 +33,9 @@
 #include "rrc_types.h"
 #include "s1ap_messages_types.h"
 #ifdef CMAKER
-#include "LTE_SystemInformationBlockType2.h"
+  #include "LTE_SystemInformationBlockType2.h"
 #else
-#include "RRC/LTE/MESSAGES/LTE_SystemInformationBlockType2.h"
+  #include "RRC/LTE/MESSAGES/LTE_SystemInformationBlockType2.h"
 #endif
 #include "LTE_SL-OffsetIndicator-r12.h"
 #include "LTE_SubframeBitmapSL-r12.h"
@@ -47,19 +47,19 @@
 //-------------------------------------------------------------------------------------------//
 // Messages for RRC logging
 #if defined(DISABLE_ITTI_XER_PRINT)
-#include "LTE_BCCH-DL-SCH-Message.h"
-#include "LTE_DL-CCCH-Message.h"
-#include "LTE_DL-DCCH-Message.h"
-#include "LTE_UE-EUTRA-Capability.h"
-#include "LTE_UL-CCCH-Message.h"
-#include "LTE_UL-DCCH-Message.h"
+  #include "LTE_BCCH-DL-SCH-Message.h"
+  #include "LTE_DL-CCCH-Message.h"
+  #include "LTE_DL-DCCH-Message.h"
+  #include "LTE_UE-EUTRA-Capability.h"
+  #include "LTE_UL-CCCH-Message.h"
+  #include "LTE_UL-DCCH-Message.h"
 
-typedef BCCH_DL_SCH_Message_t   RrcDlBcchMessage;
-typedef DL_CCCH_Message_t       RrcDlCcchMessage;
-typedef DL_DCCH_Message_t       RrcDlDcchMessage;
-typedef UE_EUTRA_Capability_t   RrcUeEutraCapability;
-typedef UL_CCCH_Message_t       RrcUlCcchMessage;
-typedef UL_DCCH_Message_t       RrcUlDcchMessage;
+  typedef BCCH_DL_SCH_Message_t   RrcDlBcchMessage;
+  typedef DL_CCCH_Message_t       RrcDlCcchMessage;
+  typedef DL_DCCH_Message_t       RrcDlDcchMessage;
+  typedef UE_EUTRA_Capability_t   RrcUeEutraCapability;
+  typedef UL_CCCH_Message_t       RrcUlCcchMessage;
+  typedef UL_DCCH_Message_t       RrcUlDcchMessage;
 #endif
 
 //-------------------------------------------------------------------------------------------//
@@ -102,7 +102,8 @@ typedef struct RrcConfigurationReq_s {
   uint8_t             mnc_digit_length[PLMN_LIST_MAX_SIZE];
   uint8_t             num_plmn;
 
-  
+  uint32_t            rrc_inactivity_timer_thres; // for testing, maybe change later
+
   paging_drx_t            default_drx;
   int16_t                 nb_cc;
   lte_frame_type_t        frame_type[MAX_NUM_CCs];
@@ -124,9 +125,9 @@ typedef struct RrcConfigurationReq_s {
   long                    pucch_delta_shift[MAX_NUM_CCs];
   long                    pucch_nRB_CQI[MAX_NUM_CCs];
   long                    pucch_nCS_AN[MAX_NUM_CCs];
-//#if (LTE_RRC_VERSION < MAKE_VERSION(10, 0, 0))
+  //#if (LTE_RRC_VERSION < MAKE_VERSION(10, 0, 0))
   long                    pucch_n1_AN[MAX_NUM_CCs];
-//#endif
+  //#endif
   long                    pdsch_referenceSignalPower[MAX_NUM_CCs];
   long                    pdsch_p_b[MAX_NUM_CCs];
   long                    pusch_n_SB[MAX_NUM_CCs];
@@ -188,7 +189,7 @@ typedef struct RrcConfigurationReq_s {
   LTE_SL_OffsetIndicator_r12_PR  rxPool_ResourceConfig_offsetIndicator_present[MAX_NUM_CCs];
   long                           rxPool_ResourceConfig_offsetIndicator_choice[MAX_NUM_CCs];
   LTE_SubframeBitmapSL_r12_PR    rxPool_ResourceConfig_subframeBitmap_present[MAX_NUM_CCs];
-  char*                          rxPool_ResourceConfig_subframeBitmap_choice_bs_buf[MAX_NUM_CCs];
+  char                          *rxPool_ResourceConfig_subframeBitmap_choice_bs_buf[MAX_NUM_CCs];
   long                           rxPool_ResourceConfig_subframeBitmap_choice_bs_size[MAX_NUM_CCs];
   long                           rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused[MAX_NUM_CCs];
 
@@ -204,7 +205,7 @@ typedef struct RrcConfigurationReq_s {
   LTE_SL_OffsetIndicator_r12_PR  discRxPool_ResourceConfig_offsetIndicator_present[MAX_NUM_CCs];
   long                           discRxPool_ResourceConfig_offsetIndicator_choice[MAX_NUM_CCs];
   LTE_SubframeBitmapSL_r12_PR    discRxPool_ResourceConfig_subframeBitmap_present[MAX_NUM_CCs];
-  char*                          discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf[MAX_NUM_CCs];
+  char                          *discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf[MAX_NUM_CCs];
   long                           discRxPool_ResourceConfig_subframeBitmap_choice_bs_size[MAX_NUM_CCs];
   long                           discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused[MAX_NUM_CCs];
   //for discRxPoolPS
@@ -218,7 +219,7 @@ typedef struct RrcConfigurationReq_s {
   LTE_SL_OffsetIndicator_r12_PR  discRxPoolPS_ResourceConfig_offsetIndicator_present[MAX_NUM_CCs];
   long                           discRxPoolPS_ResourceConfig_offsetIndicator_choice[MAX_NUM_CCs];
   LTE_SubframeBitmapSL_r12_PR    discRxPoolPS_ResourceConfig_subframeBitmap_present[MAX_NUM_CCs];
-  char*                          discRxPoolPS_ResourceConfig_subframeBitmap_choice_bs_buf[MAX_NUM_CCs];
+  char                          *discRxPoolPS_ResourceConfig_subframeBitmap_choice_bs_buf[MAX_NUM_CCs];
   long                           discRxPoolPS_ResourceConfig_subframeBitmap_choice_bs_size[MAX_NUM_CCs];
   long                           discRxPoolPS_ResourceConfig_subframeBitmap_choice_bs_bits_unused[MAX_NUM_CCs];
 } RrcConfigurationReq;
@@ -230,69 +231,69 @@ typedef struct NbIoTRrcConfigurationReq_s {
 
   uint16_t            tac;
 
-  uint16_t	      mcc;
-  uint16_t	      mnc;
-  uint8_t	      mnc_digit_length;
-  lte_frame_type_t	  frame_type;
+  uint16_t        mcc;
+  uint16_t        mnc;
+  uint8_t       mnc_digit_length;
+  lte_frame_type_t    frame_type;
   uint8_t                 tdd_config;
   uint8_t                 tdd_config_s;
   lte_prefix_type_t       prefix_type;
-  lte_prefix_type_t	  prefix_type_UL;
+  lte_prefix_type_t   prefix_type_UL;
   int16_t                 eutra_band;
   uint32_t                downlink_frequency;
   int32_t                 uplink_frequency_offset;
   int16_t                 Nid_cell;// for testing, change later
   int16_t                 N_RB_DL;// for testing, change later
   //RACH
-  long					  rach_raResponseWindowSize_NB;
-  long					  rach_macContentionResolutionTimer_NB;
-  long					  rach_powerRampingStep_NB;
-  long					  rach_preambleInitialReceivedTargetPower_NB;
-  long					  rach_preambleTransMax_CE_NB;
+  long            rach_raResponseWindowSize_NB;
+  long            rach_macContentionResolutionTimer_NB;
+  long            rach_powerRampingStep_NB;
+  long            rach_preambleInitialReceivedTargetPower_NB;
+  long            rach_preambleTransMax_CE_NB;
   //BCCH
-  long					  bcch_modificationPeriodCoeff_NB;
+  long            bcch_modificationPeriodCoeff_NB;
   //PCCH
-  long					  pcch_defaultPagingCycle_NB;
-  long					  pcch_nB_NB;
-  long					  pcch_npdcch_NumRepetitionPaging_NB;
+  long            pcch_defaultPagingCycle_NB;
+  long            pcch_nB_NB;
+  long            pcch_npdcch_NumRepetitionPaging_NB;
   //NPRACH
-  long					  nprach_CP_Length;
-  long					  nprach_rsrp_range;
-  long					  nprach_Periodicity[MAX_NUM_NBIOT_CELEVELS];
-  long					  nprach_StartTime[MAX_NUM_NBIOT_CELEVELS];
-  long					  nprach_SubcarrierOffset[MAX_NUM_NBIOT_CELEVELS];
-  long					  nprach_NumSubcarriers[MAX_NUM_NBIOT_CELEVELS];
-  long					  numRepetitionsPerPreambleAttempt_NB[MAX_NUM_NBIOT_CELEVELS];
-  long					  nprach_SubcarrierMSG3_RangeStart;
-  long					  maxNumPreambleAttemptCE_NB;
-  long					  npdcch_NumRepetitions_RA[MAX_NUM_NBIOT_CELEVELS];
-  long					  npdcch_StartSF_CSS_RA[MAX_NUM_NBIOT_CELEVELS];
-  long					  npdcch_Offset_RA[MAX_NUM_NBIOT_CELEVELS];
+  long            nprach_CP_Length;
+  long            nprach_rsrp_range;
+  long            nprach_Periodicity[MAX_NUM_NBIOT_CELEVELS];
+  long            nprach_StartTime[MAX_NUM_NBIOT_CELEVELS];
+  long            nprach_SubcarrierOffset[MAX_NUM_NBIOT_CELEVELS];
+  long            nprach_NumSubcarriers[MAX_NUM_NBIOT_CELEVELS];
+  long            numRepetitionsPerPreambleAttempt_NB[MAX_NUM_NBIOT_CELEVELS];
+  long            nprach_SubcarrierMSG3_RangeStart;
+  long            maxNumPreambleAttemptCE_NB;
+  long            npdcch_NumRepetitions_RA[MAX_NUM_NBIOT_CELEVELS];
+  long            npdcch_StartSF_CSS_RA[MAX_NUM_NBIOT_CELEVELS];
+  long            npdcch_Offset_RA[MAX_NUM_NBIOT_CELEVELS];
   //NPDSCH
-  long					  npdsch_nrs_Power;
+  long            npdsch_nrs_Power;
   //NPUSCH
-  long					  npusch_ack_nack_numRepetitions_NB;
-  long					  npusch_srs_SubframeConfig_NB;
-  long					  npusch_threeTone_CyclicShift_r13;
-  long					  npusch_sixTone_CyclicShift_r13;
-  BOOLEAN_t				  npusch_groupHoppingEnabled;
-  long					  npusch_groupAssignmentNPUSCH_r13;
+  long            npusch_ack_nack_numRepetitions_NB;
+  long            npusch_srs_SubframeConfig_NB;
+  long            npusch_threeTone_CyclicShift_r13;
+  long            npusch_sixTone_CyclicShift_r13;
+  BOOLEAN_t         npusch_groupHoppingEnabled;
+  long            npusch_groupAssignmentNPUSCH_r13;
 
   //DL_GapConfig
-  long					  dl_GapThreshold_NB;
-  long	 				  dl_GapPeriodicity_NB;
-  long	 				  dl_GapDurationCoeff_NB;
+  long            dl_GapThreshold_NB;
+  long            dl_GapPeriodicity_NB;
+  long            dl_GapDurationCoeff_NB;
   //Uplink power control Common
-  long					  npusch_p0_NominalNPUSCH;
-  long					  npusch_alpha;
-  long					  deltaPreambleMsg3;
+  long            npusch_p0_NominalNPUSCH;
+  long            npusch_alpha;
+  long            deltaPreambleMsg3;
   //UE timers and constants
-  long					  ue_TimersAndConstants_t300_NB;
-  long					  ue_TimersAndConstants_t301_NB;
-  long					  ue_TimersAndConstants_t310_NB;
-  long					  ue_TimersAndConstants_t311_NB;
-  long					  ue_TimersAndConstants_n310_NB;
-  long					  ue_TimersAndConstants_n311_NB;
+  long            ue_TimersAndConstants_t300_NB;
+  long            ue_TimersAndConstants_t301_NB;
+  long            ue_TimersAndConstants_t310_NB;
+  long            ue_TimersAndConstants_t311_NB;
+  long            ue_TimersAndConstants_n310_NB;
+  long            ue_TimersAndConstants_n311_NB;
 } NbIoTRrcConfigurationReq;
 
 

openair2/LAYER2/MAC/eNB_scheduler_primitives.c

@@ -2272,8 +2272,7 @@ uint8_t get_tmode(module_id_t module_idP, int CC_idP, int UE_idP)
   eNB_MAC_INST *eNB = RC.mac[module_idP];
   COMMON_channels_t *cc = &eNB->common_channels[CC_idP];
 
-  struct LTE_PhysicalConfigDedicated *physicalConfigDedicated =
-    eNB->UE_list.physicalConfigDedicated[CC_idP][UE_idP];
+  LTE_PhysicalConfigDedicated_t *physicalConfigDedicated = eNB->UE_list.physicalConfigDedicated[CC_idP][UE_idP];
 
   if (physicalConfigDedicated == NULL) {	// RRCConnectionSetup not received by UE yet
     AssertFatal(cc->p_eNB <= 2, "p_eNB is %d, should be <2\n",

openair2/LAYER2/MAC/mac.h

-/*
+ /*
  * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
@@ -1070,8 +1070,7 @@ typedef struct {
 /*! \brief UE list used by eNB to order UEs/CC for scheduling*/
 typedef struct {
     /// Dedicated information for UEs
-    struct PhysicalConfigDedicated
-	*physicalConfigDedicated[NFAPI_CC_MAX][MAX_MOBILES_PER_ENB];
+    LTE_PhysicalConfigDedicated_t *physicalConfigDedicated[NFAPI_CC_MAX][MAX_MOBILES_PER_ENB];
     /// DLSCH pdu
     DLSCH_PDU DLSCH_pdu[NFAPI_CC_MAX][2][MAX_MOBILES_PER_ENB];
     /// DCI template and MAC connection parameters for UEs

openair2/RRC/LTE/MESSAGES/asn1_msg.h

@@ -57,7 +57,7 @@ uint16_t get_adjacent_cell_id(uint8_t Mod_id,uint8_t index);
 uint8_t get_adjacent_cell_mod_id(uint16_t phyCellId);
 
 /**
-\brief Generate configuration for SIB1 (eNB).
+\brief Generate configuration for MIB (eNB).
 @param carrier pointer to Carrier information
 @param N_RB_DL Number of downlink PRBs
 @param phich_Resource PHICH resoure parameter
@@ -71,7 +71,7 @@ uint8_t do_MIB(rrc_eNB_carrier_data_t *carrier, uint32_t N_RB_DL, uint32_t phich
 @param carrier pointer to Carrier information
 @param Mod_id Instance of eNB
 @param Component carrier Component carrier to configure
-@param configuration Pointer Configuration Request structure  
+@param configuration Pointer Configuration Request structure
 @return size of encoded bit stream in bytes*/
 
 uint8_t do_SIB1(rrc_eNB_carrier_data_t *carrier,int Mod_id,int CC_id, RrcConfigurationReq *configuration
@@ -91,7 +91,7 @@ uint8_t do_SIB1(rrc_eNB_carrier_data_t *carrier,int Mod_id,int CC_id, RrcConfigu
 uint8_t do_SIB23(uint8_t Mod_id,
                  int CC_id
 #if defined(ENABLE_ITTI)
-                 , RrcConfigurationReq *configuration
+  , RrcConfigurationReq *configuration
 #endif
                 );
 
@@ -115,16 +115,16 @@ uint8_t do_SidelinkUEInformation(uint8_t Mod_id, uint8_t *buffer, LTE_SL_Destina
 /** \brief Generate an RRCConnectionSetupComplete UL-DCCH-Message (UE)
 @param buffer Pointer to PER-encoded ASN.1 description of UL-DCCH-Message PDU
 @returns Size of encoded bit stream in bytes*/
-uint8_t do_RRCConnectionSetupComplete(uint8_t Mod_id, uint8_t* buffer, const uint8_t Transaction_id, const int dedicatedInfoNASLength,
-                                      const char* dedicatedInfoNAS);
+uint8_t do_RRCConnectionSetupComplete(uint8_t Mod_id, uint8_t *buffer, const uint8_t Transaction_id, const int dedicatedInfoNASLength,
+                                      const char *dedicatedInfoNAS);
 
 /** \brief Generate an RRCConnectionReconfigurationComplete UL-DCCH-Message (UE)
 @param buffer Pointer to PER-encoded ASN.1 description of UL-DCCH-Message PDU
 @returns Size of encoded bit stream in bytes*/
 uint8_t
 do_RRCConnectionReconfigurationComplete(
-  const protocol_ctxt_t* const ctxt_pP,
-  uint8_t* buffer,
+  const protocol_ctxt_t *const ctxt_pP,
+  uint8_t *buffer,
   const uint8_t Transaction_id
 );
 
@@ -143,14 +143,14 @@ PhysicalConfigDedicated IEs.  The latter does not enable periodic CQI reporting
 @returns Size of encoded bit stream in bytes*/
 uint8_t
 do_RRCConnectionSetup(
-  const protocol_ctxt_t*     const ctxt_pP,
-  rrc_eNB_ue_context_t*      const ue_context_pP,
+  const protocol_ctxt_t     *const ctxt_pP,
+  rrc_eNB_ue_context_t      *const ue_context_pP,
   int                              CC_id,
-  uint8_t*                   const buffer,
+  uint8_t                   *const buffer,
   const uint8_t                    transmission_mode,
   const uint8_t                    Transaction_id,
-  LTE_SRB_ToAddModList_t**             SRB_configList,
-  struct LTE_PhysicalConfigDedicated** physicalConfigDedicated
+  LTE_SRB_ToAddModList_t             **SRB_configList,
+  struct LTE_PhysicalConfigDedicated **physicalConfigDedicated
 );
 
 /**
@@ -177,31 +177,31 @@ do_RRCConnectionSetup(
 
 uint16_t
 do_RRCConnectionReconfiguration(
-  const protocol_ctxt_t*        const ctxt_pP,
-    uint8_t                            *buffer,
-    uint8_t                             Transaction_id,
-    LTE_SRB_ToAddModList_t                 *SRB_list,
-    LTE_DRB_ToAddModList_t                 *DRB_list,
-    LTE_DRB_ToReleaseList_t                *DRB_list2,
-    struct LTE_SPS_Config                  *sps_Config,
-    struct LTE_PhysicalConfigDedicated     *physicalConfigDedicated,
-    LTE_MeasObjectToAddModList_t           *MeasObj_list,
-    LTE_ReportConfigToAddModList_t         *ReportConfig_list,
-    LTE_QuantityConfig_t                   *quantityConfig,
-    LTE_MeasIdToAddModList_t               *MeasId_list,
-    LTE_MAC_MainConfig_t                   *mac_MainConfig,
-    LTE_MeasGapConfig_t                    *measGapConfig,
-    LTE_MobilityControlInfo_t              *mobilityInfo,
-    struct LTE_MeasConfig__speedStatePars  *speedStatePars,
-    LTE_RSRP_Range_t                       *rsrp,
-    LTE_C_RNTI_t                           *cba_rnti,
-  struct LTE_RRCConnectionReconfiguration_r8_IEs__dedicatedInfoNASList* dedicatedInfoNASList,
+  const protocol_ctxt_t        *const ctxt_pP,
+  uint8_t                            *buffer,
+  uint8_t                             Transaction_id,
+  LTE_SRB_ToAddModList_t                 *SRB_list,
+  LTE_DRB_ToAddModList_t                 *DRB_list,
+  LTE_DRB_ToReleaseList_t                *DRB_list2,
+  struct LTE_SPS_Config                  *sps_Config,
+  struct LTE_PhysicalConfigDedicated     *physicalConfigDedicated,
+  LTE_MeasObjectToAddModList_t           *MeasObj_list,
+  LTE_ReportConfigToAddModList_t         *ReportConfig_list,
+  LTE_QuantityConfig_t                   *quantityConfig,
+  LTE_MeasIdToAddModList_t               *MeasId_list,
+  LTE_MAC_MainConfig_t                   *mac_MainConfig,
+  LTE_MeasGapConfig_t                    *measGapConfig,
+  LTE_MobilityControlInfo_t              *mobilityInfo,
+  struct LTE_MeasConfig__speedStatePars  *speedStatePars,
+  LTE_RSRP_Range_t                       *rsrp,
+  LTE_C_RNTI_t                           *cba_rnti,
+  struct LTE_RRCConnectionReconfiguration_r8_IEs__dedicatedInfoNASList *dedicatedInfoNASList,
   LTE_SL_CommConfig_r12_t                *sl_CommConfig,
   LTE_SL_DiscConfig_r12_t                *sl_DiscConfig
 #if (LTE_RRC_VERSION >= MAKE_VERSION(10, 0, 0))
-    , LTE_SCellToAddMod_r10_t  *SCell_config
+  , LTE_SCellToAddMod_r10_t  *SCell_config
 #endif
-                                        );
+);
 /**
 \brief Generate an RRCConnectionReestablishment DL-CCCH-Message (eNB).  This routine configures SRB_ToAddMod (SRB1/SRB2) and
 PhysicalConfigDedicated IEs.  The latter does not enable periodic CQI reporting (PUCCH format 2/2a/2b) or SRS.
@@ -216,10 +216,10 @@ PhysicalConfigDedicated IEs.  The latter does not enable periodic CQI reporting
 @returns Size of encoded bit stream in bytes*/
 uint8_t
 do_RRCConnectionReestablishment(
-  const protocol_ctxt_t*     const ctxt_pP,
-  rrc_eNB_ue_context_t*      const ue_context_pP,
+  const protocol_ctxt_t     *const ctxt_pP,
+  rrc_eNB_ue_context_t      *const ue_context_pP,
   int                              CC_id,
-  uint8_t*                   const buffer,
+  uint8_t                   *const buffer,
   const uint8_t                    transmission_mode,
   const uint8_t                    Transaction_id,
   LTE_SRB_ToAddModList_t               **SRB_configList,
@@ -232,8 +232,8 @@ do_RRCConnectionReestablishment(
 @returns Size of encoded bit stream in bytes*/
 uint8_t
 do_RRCConnectionReestablishmentReject(
-    uint8_t                    Mod_id,
-    uint8_t*                   const buffer);
+  uint8_t                    Mod_id,
+  uint8_t                   *const buffer);
 
 /**
 \brief Generate an RRCConnectionReject DL-CCCH-Message (eNB).
@@ -242,8 +242,8 @@ do_RRCConnectionReestablishmentReject(
 @returns Size of encoded bit stream in bytes*/
 uint8_t
 do_RRCConnectionReject(
-    uint8_t                    Mod_id,
-    uint8_t*                   const buffer);
+  uint8_t                    Mod_id,
+  uint8_t                   *const buffer);
 
 /**
 \brief Generate an RRCConnectionRequest UL-CCCH-Message (UE) based on random string or S-TMSI.  This
@@ -286,14 +286,14 @@ OAI_UECapability_t *fill_ue_capability(char *LTE_UE_EUTRA_Capability_xer);
 
 uint8_t
 do_UECapabilityEnquiry(
-  const protocol_ctxt_t* const ctxt_pP,
-  uint8_t*               const buffer,
+  const protocol_ctxt_t *const ctxt_pP,
+  uint8_t               *const buffer,
   const uint8_t                Transaction_id
 );
 
 uint8_t do_SecurityModeCommand(
-  const protocol_ctxt_t* const ctxt_pP,
-  uint8_t* const buffer,
+  const protocol_ctxt_t *const ctxt_pP,
+  uint8_t *const buffer,
   const uint8_t Transaction_id,
   const uint8_t cipheringAlgorithm,
   const uint8_t integrityProtAlgorithm);

openair2/RRC/LTE/MESSAGES/asn1c/ASN1_files/lte-rrc-13.9.1.asn1

@@ -735,7 +735,7 @@ Paging-v1130-IEs ::=			SEQUENCE {
 }
 
 Paging-v1310-IEs ::=			SEQUENCE {
-	redistributionIndication-r13	ENUMERATED {true}					OPTIONAL,	--Need ON
+	redistributionIndication-r13	ENUMERATED {true}					OPTIONAL,	-- Need ON
 	systemInfoModification-eDRX-r13	ENUMERATED {true}					OPTIONAL,	-- Need ON
 	nonCriticalExtension			SEQUENCE {}							OPTIONAL
 }

targets/PROJECTS/GENERIC-LTE-EPC/CONF/rru.oaisim.conf

@@ -31,9 +31,9 @@ log_config = {
       global_log_verbosity                  ="medium";
       hw_log_level                          ="info";
       hw_log_verbosity                      ="medium";
-      phy_log_level                         ="debug";
+      phy_log_level                         ="info";
       phy_log_verbosity                     ="medium";
-      mac_log_level                         ="debug";
+      mac_log_level                         ="info";
       mac_log_verbosity                     ="high";
       rlc_log_level                         ="info";
       rlc_log_verbosity                     ="medium";