Now virtualization should be OK.

TO DO :test RF and ethernet emulation.

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5086 818b1a75-f10b-46b9-bf7c-635c3b92a50f

openair1/PHY/defs.h

@@ -144,6 +144,7 @@
 #include "PHY/TOOLS/time_meas.h"
 #include "PHY/CODING/defs.h"
 #include "PHY/TOOLS/defs.h"
+#include "platform_types.h"
 
 #ifdef OPENAIR_LTE
 
@@ -180,10 +181,10 @@ enum transmission_access_mode{
 /// Top-level PHY Data Structure for eNB 
 typedef struct {
   /// Module ID indicator for this instance
-  u8 Mod_id;
+  module_id_t               Mod_id;
   u8                   local_flag;
   unsigned int         rx_total_gain_eNB_dB;
-  u32 frame;
+  frame_t              frame;
   LTE_DL_FRAME_PARMS   lte_frame_parms;
   PHY_MEASUREMENTS_eNB PHY_measurements_eNB[NUMBER_OF_eNB_SECTORS_MAX]; /// Measurement variables 
   LTE_eNB_COMMON       lte_eNB_common_vars;

openair1/SCHED/phy_procedures_lte_ue.c

@@ -1010,7 +1010,7 @@ void phy_procedures_UE_TX(u8 next_slot,PHY_VARS_UE *phy_vars_ue,u8 eNB_id,u8 abs
 	
 	// Check for SR and do ACK/NACK accordingly
 	if (is_SR_TXOp(phy_vars_ue,eNB_id,next_slot>>1)==1) {
-	  LOG_I(PHY,"[UE %d][SR %x] Frame %d subframe %d: got SR_TXOp, Checking for SR for PUSCH from MAC\n",
+	  LOG_D(PHY,"[UE %d][SR %x] Frame %d subframe %d: got SR_TXOp, Checking for SR for PUSCH from MAC\n",
 	 	phy_vars_ue->Mod_id,phy_vars_ue->lte_ue_pdcch_vars[eNB_id]->crnti,phy_vars_ue->frame,next_slot>>1);
 #ifdef OPENAIR2
 	  SR_payload = mac_xface->ue_get_SR(phy_vars_ue->Mod_id,
@@ -1024,7 +1024,7 @@ void phy_procedures_UE_TX(u8 next_slot,PHY_VARS_UE *phy_vars_ue,u8 eNB_id,u8 abs
 	 
 	  if (SR_payload>0) {
 	    generate_ul_signal = 1;
-	    LOG_I(PHY,"[UE %d][SR %x] Frame %d subframe %d got the SR for PUSCH is %d\n",
+	    LOG_D(PHY,"[UE %d][SR %x] Frame %d subframe %d got the SR for PUSCH is %d\n",
 		  phy_vars_ue->Mod_id,phy_vars_ue->lte_ue_pdcch_vars[eNB_id]->crnti,phy_vars_ue->frame,next_slot>>1,SR_payload);
 	  }
 	  else {

openair2/COMMON/mac_rrc_primitives.h

@@ -333,8 +333,8 @@ typedef struct{   //RRC_INTERFACE_FUNCTIONS
   char (*openair_rrc_eNB_init)(u8 ); 
   char (*openair_rrc_UE_init)(u8, u8); 
   RRC_status_t (*rrc_rx_tx)(u8,u32,u8,u8); 
-  u8 (*mac_rrc_data_ind)(u8,u32,u16,u8 *,u16,u8 eNB_flag, u8 eNB_index);
-  u8 (*mac_rrc_data_req)(u8,u32,u16,u8,u8 *,u8 eNB_flag, u8 eNB_index);
+  u8 (*mac_rrc_data_ind)(u8,u32,u16,u8 *,u16,eNB_flag_t eNB_flag, u8 eNB_index);
+  u8 (*mac_rrc_data_req)(u8,u32,u16,u8,u8 *,eNB_flag_t eNB_flag, u8 eNB_index);
   void (*mac_rrc_meas_ind)(u8,MAC_MEAS_REQ_ENTRY*);
   void  (*def_meas_ind)(u8, u8);
   void (*rrc_data_indP)  (module_id_t , rb_id_t , sdu_size_t , char*);
@@ -352,12 +352,7 @@ typedef struct{
   unsigned short (*mac_config_req)(u8,u8,MAC_CONFIG_REQ*);
   MAC_MEAS_REQ_ENTRY* (*mac_meas_req)(u8 ,  MAC_MEAS_REQ*);
   void (*mac_out_of_sync_ind)(u8,u32,unsigned short);
-  //u8 (*mac_rrc_data_ind)(u8,unsigned short,char *,u8);
-  //u8 (*mac_rrc_data_req)( u8, unsigned short, u8,char *);
-  //void (*mac_switch_node_function)(u8);
-  //  void (*mac_rlc_exit)(void);
   //RLC_INTERFACE_FUNCTIONS
-  //  void (*pdcp_run)(unsigned int);
   void (*pdcp_run)(void);
   void (*pdcp_data_req)(module_id_t, rb_id_t, sdu_size_t, char*);	
   signed int (*rrc_rlc_config_req)(unsigned int, unsigned int, unsigned int, unsigned int, rlc_info_t );
@@ -373,21 +368,18 @@ typedef struct{
 			    u16 *SIperiod
  #ifdef Rel10
 			    ,
-			    u8 MBMS_Flag,
+			    MBMS_flag_t MBMS_Flag,
 			    struct MBSFN_SubframeConfigList *mbsfn_SubframeConfigList,
 			    MBSFN_AreaInfoList_r9_t *mbsfn_AreaInfoList,
 			    struct PMCH_InfoList_r9 *pmch_InfoList
 #endif
 			    );
   unsigned int (*mac_rlc_data_req)(module_id_t, unsigned int, char*);
-  void (*mac_rlc_data_ind)(module_id_t, chan_id_t, char*, tb_size_t, num_tb_t, crc_t* );
-  mac_rlc_status_resp_t (*mac_rlc_status_ind)   (module_id_t, chan_id_t, tb_size_t, num_tb_t);
+  void (*mac_rlc_data_ind)(module_id_t, logical_chan_id_t, char*, tb_size_t, num_tb_t, crc_t* );
+  mac_rlc_status_resp_t (*mac_rlc_status_ind)   (module_id_t, logical_chan_id_t, tb_size_t, num_tb_t);
   signed int (*rrc_rlc_data_req)(module_id_t, rb_id_t, mui_t, confirm_t, sdu_size_t, char *);
   void (*rrc_rlc_register_rrc) (void (*rrc_data_indP)(module_id_t , rb_id_t , sdu_size_t , char* ),
 				void  (*rrc_data_confP) (module_id_t , rb_id_t , mui_t ) ) ;
-  //rlc_op_status_t rrc_rlc_config_req   (module_id_t, rb_id_t, rb_type_t, rlc_info_t );
-  //rlc_op_status_t rrc_rlc_data_req     (module_id_t, rb_id_t, mui_t, confirm_t, sdu_size_t, mem_block_t*);
-  //void   rrc_rlc_register_rrc ( void(*rrc_data_indP)  (module_id_t , rb_id_t , sdu_size_t , mem_block_t*),void(*rrc_data_conf) (module_id_t , rb_id_t , mui_t) );
   void (*mrbch_phy_sync_failure) (u8 Mod_id, u32 frame, u8 Free_ch_index);
   void (*dl_phy_sync_success) (u8 Mod_id, u32 frame, u8 eNB_index);
 }MAC_RLC_XFACE;

openair2/COMMON/platform_constants.h

@@ -55,8 +55,8 @@
 #define MAX_MANAGED_RG_PER_MOBILE  2
 
 #define DEFAULT_RAB_ID 3
-#define NB_RB_MAX      11
-#define NB_RAB_MAX     8
+#define NB_RB_MAX      (maxDRB + 3) /* was 11, now 14, maxDRB comes from asn1_constants.h, + 3 because of 3 SRB, one invisible id 0, then id 1 and 2 */
+#define NB_RAB_MAX     maxDRB       /* was 8, now 11 */
 #define RAB_SHIFT1     9
 #define RAB_SHIFT2     3
 #define RAB_OFFSET     0x0007
@@ -69,36 +69,36 @@
 
 #ifdef MESH
 
-#    define MAX_RB_MOBILE              NB_RB_MAX  * ( MAX_MANAGED_RG_PER_MOBILE + MAX_MOBILES_PER_RG - 1 )
-#    define MAX_RAB_MOBILE             NB_RAB_MAX * ( MAX_MANAGED_RG_PER_MOBILE + MAX_MOBILES_PER_RG - 1 )
-#    define MAX_RB_RG                  MAX_RB_MOBILE //NB_RB_MAX  *  MAX_MOBILES_PER_RG
-#    define MAX_RAB_RG                 (NB_RB_MAX+1) * (MAX_MOBILES_PER_RG + 1)
-#    define MAX_RAB                    MAX_RAB_RG
-#    define MAX_RB                     MAX_RB_RG
+//#    define MAX_RB_MOBILE              NB_RB_MAX  * ( MAX_MANAGED_RG_PER_MOBILE + MAX_MOBILES_PER_RG - 1 )
+//#    define MAX_RAB_MOBILE             NB_RAB_MAX * ( MAX_MANAGED_RG_PER_MOBILE + MAX_MOBILES_PER_RG - 1 )
+//#    define MAX_RB_RG                  MAX_RB_MOBILE //NB_RB_MAX  *  MAX_MOBILES_PER_RG
+//#    define MAX_RAB_RG                 (NB_RB_MAX+1) * (MAX_MOBILES_PER_RG + 1)
+//#    define MAX_RAB                    MAX_RAB_RG
+//#    define MAX_RB                     MAX_RB_RG
 #else
 
-#    define MAX_RB_MOBILE              NB_RB_MAX * MAX_MANAGED_RG_PER_MOBILE
-#    define MAX_RAB_MOBILE             NB_RAB_MAX * MAX_MANAGED_RG_PER_MOBILE
-#    define MAX_RB_RG                  NB_RB_MAX * MAX_MOBILES_PER_RG
-#    define MAX_RAB_RG                 NB_RB_MAX * MAX_MOBILES_PER_RG
-#    //ifdef NODE_RG
-#        define MAX_RAB                MAX_RAB_RG
-#        define MAX_RB                 MAX_RB_RG
-#    //else
-#      //  ifdef NODE_MT
-#        //    define MAX_RAB            MAX_RAB_MOBILE
-#          //  define MAX_RB             MAX_RB_MOBILE
-#        //else
-#          //error NODE_RG or NODE_MT must be defined
-#        //endif
+//#    define MAX_RB_MOBILE              NB_RB_MAX * MAX_MANAGED_RG_PER_MOBILE
+//#    define MAX_RAB_MOBILE             NB_RAB_MAX * MAX_MANAGED_RG_PER_MOBILE
+//#    define MAX_RB_RG                  NB_RB_MAX * MAX_MOBILES_PER_RG
+//#    define MAX_RAB_RG                 NB_RB_MAX * MAX_MOBILES_PER_RG
+//#    ifdef NODE_RG
+//#        define MAX_RAB                MAX_RAB_RG
+//#        define MAX_RB                 MAX_RB_RG
+//#    else
+//#      //  ifdef NODE_MT
+//#        //    define MAX_RAB            MAX_RAB_MOBILE
+//#          //  define MAX_RB             MAX_RB_MOBILE
+//#        //else
+//#          //error NODE_RG or NODE_MT must be defined
+//#        //endif
 //#    endif
 #endif //MESH
 
 // RLC_MODE
-#        define RLC_NONE     0
-#        define RLC_MODE_AM  1
-#        define RLC_MODE_TM  2
-#        define RLC_MODE_UM  3
+#        define RLC_NONE     (rlc_mode_t)0
+#        define RLC_MODE_AM  (rlc_mode_t)1
+#        define RLC_MODE_TM  (rlc_mode_t)2
+#        define RLC_MODE_UM  (rlc_mode_t)3
 
 //E_R
 #        define E_R_RLC_ER_RELEASE          1

openair2/COMMON/platform_types.h

@@ -25,19 +25,29 @@ typedef signed long  int   s64_t;
 
 typedef unsigned int       config_action_t;
 
-typedef unsigned int       sdu_size_t;
+typedef u16_t              sdu_size_t;
+typedef s16_t              sdu_ssize_t;
 typedef unsigned int       tbs_size_t;
 typedef unsigned int       tb_size_t;
-typedef unsigned int       rb_id_t;
-typedef unsigned int       module_id_t;
+typedef u16_t              rb_id_t;
+typedef u16_t              srb_id_t;
+typedef u32_t              frame_t;
+typedef u32_t              sub_frame_t;
+typedef u8_t               module_id_t;
 typedef unsigned int       mui_t;
 typedef unsigned int       confirm_t;
 typedef unsigned int       rb_type_t;
-typedef rb_id_t            chan_id_t;
+typedef unsigned int       logical_chan_id_t;
 typedef unsigned int       num_tb_t;
 typedef unsigned int       crc_t;
 typedef unsigned int       rlc_tx_status_t;
 typedef unsigned int       rlc_mode_t;
+typedef s16_t              rlc_sn_t;
+typedef u16_t              rlc_usn_t;
+typedef int                traffic_type_t;
+typedef u32_t              mbms_session_id_t;
+typedef u16_t              mbms_service_id_t;
+typedef u16_t              rnti_t;
 
 typedef signed int         rlc_op_status_t;
 
@@ -47,8 +57,17 @@ typedef unsigned int       crc32_t;
 
 typedef signed char        boolean_t;
 
+typedef enum MBMS_flag_e {
+    MBMS_FLAG_NO       = 0,
+    MBMS_FLAG_YES      = 1,
+} MBMS_flag_t;
+
+typedef enum eNB_flag_e {
+    ENB_FLAG_NO       = 0,
+    ENB_FLAG_YES      = 1,
+} eNB_flag_t;
 
 // just for integration
-extern unsigned int    frame;
+extern frame_t    frame;
 
 #endif

openair2/COMMON/rrm_config_structs.h

@@ -10,7 +10,7 @@
 
 
  ***************************************************************************/
-
+#ifdef OLD_RRC_CELLULAR
 #    ifndef __RRM_CONFIG_STRUCTS_H__
 #        define __RRM_CONFIG_STRUCTS_H__
 
@@ -171,4 +171,4 @@ typedef volatile struct {
 //typedef   RG_CONFIG MAIN_RADIO_GATEWAY;
 
 #    endif
-
+#endif

openair2/LAYER2/MAC/config.c

@@ -25,16 +25,16 @@
   Forums       : http://forums.eurecom.fsr/openairinterface
   Address      : Eurecom, 2229, route des crêtes, 06560 Valbonne Sophia Antipolis, France
 
-*******************************************************************************/
+ *******************************************************************************/
 /*! \file config.c
-* \brief UE and eNB configuration
-* \author Raymond Knopp, Navid Nikaein
-* \date 2013
-* \version 0.1
-* \email: navid.nikaein@eurecom.fr
-* @ingroup _mac
+ * \brief UE and eNB configuration
+ * \author Raymond Knopp, Navid Nikaein
+ * \date 2013
+ * \version 0.1
+ * \email: navid.nikaein@eurecom.fr
+ * @ingroup _mac
 
-*/
+ */
 
 #include "COMMON/platform_types.h"
 #include "COMMON/platform_constants.h"
@@ -56,35 +56,35 @@
 #endif
 
 /* sec 5.9, 36.321: MAC Reset Procedure */
-void ue_mac_reset(u8 Mod_id,u8 eNB_index) {
+void ue_mac_reset(module_id_t module_idP,u8 eNB_index) {
 
   //Resetting Bj
-  UE_mac_inst[Mod_id].scheduling_info.Bj[0] = 0;
-  UE_mac_inst[Mod_id].scheduling_info.Bj[1] = 0;
-  UE_mac_inst[Mod_id].scheduling_info.Bj[2] = 0;
+  UE_mac_inst[module_idP].scheduling_info.Bj[0] = 0;
+  UE_mac_inst[module_idP].scheduling_info.Bj[1] = 0;
+  UE_mac_inst[module_idP].scheduling_info.Bj[2] = 0;
   //Stopping all timers
 
   //timeAlignmentTimer expires
 
   // PHY changes for UE MAC reset
-  mac_xface->phy_reset_ue(Mod_id,eNB_index);
+  mac_xface->phy_reset_ue(module_idP,eNB_index);
 
   // notify RRC to relase PUCCH/SRS
   // cancel all pending SRs
-  UE_mac_inst[Mod_id].scheduling_info.SR_pending=0;
-  UE_mac_inst[Mod_id].scheduling_info.SR_COUNTER=0;
+  UE_mac_inst[module_idP].scheduling_info.SR_pending=0;
+  UE_mac_inst[module_idP].scheduling_info.SR_COUNTER=0;
 
   // stop ongoing RACH procedure
 
   // discard explicitly signaled ra_PreambleIndex and ra_RACH_MaskIndex, if any
-  UE_mac_inst[Mod_id].RA_prach_resources.ra_PreambleIndex  = 0; // check!
-  UE_mac_inst[Mod_id].RA_prach_resources.ra_RACH_MaskIndex = 0;
+  UE_mac_inst[module_idP].RA_prach_resources.ra_PreambleIndex  = 0; // check!
+  UE_mac_inst[module_idP].RA_prach_resources.ra_RACH_MaskIndex = 0;
 
-  ue_init_mac(Mod_id); //This will hopefully do the rest of the MAC reset procedure
+  ue_init_mac(module_idP); //This will hopefully do the rest of the MAC reset procedure
 
 }
 
-int rrc_mac_config_req(u8 Mod_id,u8 eNB_flag,u8 UE_id,u8 eNB_index, 
+int rrc_mac_config_req(module_id_t Mod_id, eNB_flag_t eNB_flagP,u8 UE_id,u8 eNB_index,
     RadioResourceConfigCommonSIB_t  *radioResourceConfigCommon,
     struct PhysicalConfigDedicated  *physicalConfigDedicated,
     MeasObjectToAddMod_t           **measObj,
@@ -109,13 +109,13 @@ int rrc_mac_config_req(u8 Mod_id,u8 eNB_flag,u8 UE_id,u8 eNB_index,
     ,u8                              num_active_cba_groups,
     u16                              cba_rnti
 #endif
-		       ) {
+) {
 
   int i;
 
   vcd_signal_dumper_dump_function_by_name(VCD_SIGNAL_DUMPER_FUNCTIONS_RRC_MAC_CONFIG, VCD_FUNCTION_IN);
 
-  if (eNB_flag==0) {
+  if (eNB_flagP==0) {
       LOG_I(MAC,"[CONFIG][UE %d] Configuring MAC/PHY from eNB %d\n",Mod_id,eNB_index);
       if (tdd_Config != NULL)
         UE_mac_inst[Mod_id].tdd_Config = tdd_Config;
@@ -128,14 +128,14 @@ int rrc_mac_config_req(u8 Mod_id,u8 eNB_flag,u8 UE_id,u8 eNB_index,
   }
 
   if ((tdd_Config!=NULL)||(SIwindowsize!=NULL)||(SIperiod!=NULL)){
-    if (eNB_flag==1)
+      if (eNB_flagP==1)
         mac_xface->phy_config_sib1_eNB(Mod_id,tdd_Config,*SIwindowsize,*SIperiod);
       else
         mac_xface->phy_config_sib1_ue(Mod_id,eNB_index,tdd_Config,*SIwindowsize,*SIperiod);
   } 
 
   if (radioResourceConfigCommon!=NULL) {
-    if (eNB_flag==1) {
+      if (eNB_flagP==1) {
           LOG_I(MAC,"[CONFIG]SIB2/3 Contents (partial)\n");
           LOG_I(MAC,"[CONFIG]pusch_config_common.n_SB = %ld\n",radioResourceConfigCommon->pusch_ConfigCommon.pusch_ConfigBasic.n_SB);
           LOG_I(MAC,"[CONFIG]pusch_config_common.hoppingMode = %ld\n",radioResourceConfigCommon->pusch_ConfigCommon.pusch_ConfigBasic.hoppingMode);
@@ -154,7 +154,7 @@ int rrc_mac_config_req(u8 Mod_id,u8 eNB_flag,u8 UE_id,u8 eNB_index,
   }
   // SRB2_lchan_config->choice.explicitValue.ul_SpecificParameters->logicalChannelGroup
   if (logicalChannelConfig!= NULL) {
-    if (eNB_flag==0){
+      if (eNB_flagP==0){
           LOG_I(MAC,"[CONFIG][UE %d] Applying RRC logicalChannelConfig from eNB%d\n",Mod_id,eNB_index);
           UE_mac_inst[Mod_id].logicalChannelConfig[logicalChannelIdentity]=logicalChannelConfig;
           UE_mac_inst[Mod_id].scheduling_info.Bj[logicalChannelIdentity]=0; // initilize the bucket for this lcid
@@ -171,7 +171,7 @@ int rrc_mac_config_req(u8 Mod_id,u8 eNB_flag,u8 UE_id,u8 eNB_index,
   }
 
   if (mac_MainConfig != NULL){
-    if (eNB_flag==0){
+      if (eNB_flagP==0){
           LOG_I(MAC,"[CONFIG][UE%d] Applying RRC macMainConfig from eNB%d\n",Mod_id,eNB_index);
           UE_mac_inst[Mod_id].macConfig=mac_MainConfig;
           UE_mac_inst[Mod_id].measGapConfig=measGapConfig;
@@ -227,7 +227,7 @@ int rrc_mac_config_req(u8 Mod_id,u8 eNB_flag,u8 UE_id,u8 eNB_index,
   }
 
   if (physicalConfigDedicated != NULL) {
-    if (eNB_flag==1){
+      if (eNB_flagP==1){
           mac_xface->phy_config_dedicated_eNB(Mod_id,find_UE_RNTI(Mod_id,UE_id),physicalConfigDedicated);
       }else{
           mac_xface->phy_config_dedicated_ue(Mod_id,eNB_index,physicalConfigDedicated);
@@ -235,7 +235,7 @@ int rrc_mac_config_req(u8 Mod_id,u8 eNB_flag,u8 UE_id,u8 eNB_index,
       }
   }
 
-  if (eNB_flag == 0) {
+  if (eNB_flagP == 0) {
       if (measObj!= NULL) {
           if (measObj[0]!= NULL){
               UE_mac_inst[Mod_id].n_adj_cells = measObj[0]->measObject.choice.measObjectEUTRA.cellsToAddModList->list.count;
@@ -257,7 +257,7 @@ int rrc_mac_config_req(u8 Mod_id,u8 eNB_flag,u8 UE_id,u8 eNB_index,
            */
       }
   }
-  if (eNB_flag==0) {
+  if (eNB_flagP==0) {
       if(mobilityControlInfo != NULL) {
 
           LOG_D(MAC,"[UE%d] MAC Reset procedure triggered by RRC eNB %d \n",Mod_id,eNB_index);
@@ -331,7 +331,7 @@ int rrc_mac_config_req(u8 Mod_id,u8 eNB_flag,u8 UE_id,u8 eNB_index,
   }
 
   if (mbsfn_SubframeConfigList != NULL) {
-    if (eNB_flag == 1) {
+      if (eNB_flagP == 1) {
           LOG_I(MAC,"[eNB %d][CONFIG] Received %d subframe allocation pattern for MBSFN\n", Mod_id, mbsfn_SubframeConfigList->list.count);
           eNB_mac_inst[Mod_id].num_sf_allocation_pattern= mbsfn_SubframeConfigList->list.count;
           for (i=0; i<mbsfn_SubframeConfigList->list.count; i++) {
@@ -357,7 +357,7 @@ int rrc_mac_config_req(u8 Mod_id,u8 eNB_flag,u8 UE_id,u8 eNB_index,
 
 #ifdef Rel10
   if (mbsfn_AreaInfoList != NULL) {
-    if (eNB_flag == 1) {
+      if (eNB_flagP == 1) {
           // One eNB could be part of multiple mbsfn syc area, this could change over time so reset each time
           LOG_I(MAC,"[eNB %d][CONFIG] Received %d MBSFN Area Info\n", Mod_id, mbsfn_AreaInfoList->list.count);
           eNB_mac_inst[Mod_id].num_active_mbsfn_area = mbsfn_AreaInfoList->list.count;
@@ -385,7 +385,7 @@ int rrc_mac_config_req(u8 Mod_id,u8 eNB_flag,u8 UE_id,u8 eNB_index,
 
       //    LOG_I(MAC,"DUY: lcid when entering rrc_mac config_req is %02d\n",(pmch_InfoList->list.array[0]->mbms_SessionInfoList_r9.list.array[0]->logicalChannelIdentity_r9));
 
-    if (eNB_flag == 1) {
+      if (eNB_flagP == 1) {
 
           LOG_I(MAC, "[CONFIG] Number of PMCH in this MBSFN Area %d\n", pmch_InfoList->list.count);
 
@@ -417,12 +417,12 @@ int rrc_mac_config_req(u8 Mod_id,u8 eNB_flag,u8 UE_id,u8 eNB_index,
 
 #endif
 #ifdef CBA
-  if (eNB_flag == 0){
+  if (eNB_flagP == 0){
       if (cba_rnti) {
           UE_mac_inst[Mod_id].cba_rnti[num_active_cba_groups-1] = cba_rnti;
           LOG_D(MAC,"[UE %d] configure CBA group %d RNTI %x for eNB %d (total active cba group %d)\n",
               Mod_id,Mod_id%num_active_cba_groups, cba_rnti,eNB_index,num_active_cba_groups);
-      mac_xface->phy_config_cba_rnti(Mod_id,eNB_flag,eNB_index,cba_rnti,num_active_cba_groups-1, num_active_cba_groups);
+          mac_xface->phy_config_cba_rnti(Mod_id,eNB_flagP,eNB_index,cba_rnti,num_active_cba_groups-1, num_active_cba_groups);
       }
   }else {
       if (cba_rnti) {
@@ -435,7 +435,7 @@ int rrc_mac_config_req(u8 Mod_id,u8 eNB_flag,u8 UE_id,u8 eNB_index,
               //only configure UE ids up to num_active_cba_groups
               //we use them as candidates for the transmission of dci format0)
               if (UE_id%num_active_cba_groups == i){
-	  mac_xface->phy_config_cba_rnti(Mod_id,eNB_flag,UE_id,cba_rnti + i,i,num_active_cba_groups );
+                  mac_xface->phy_config_cba_rnti(Mod_id,eNB_flagP,UE_id,cba_rnti + i,i,num_active_cba_groups );
                   LOG_D(MAC,"[eNB %d] configure CBA groups %d with RNTI %x for UE  %d (total active cba groups %d)\n",
                       Mod_id, i, eNB_mac_inst[Mod_id].cba_rnti[i],UE_id, num_active_cba_groups);
               }

openair2/LAYER2/MAC/l1_helpers.c

@@ -39,23 +39,23 @@
 #include "extern.h"
 #include "UTIL/LOG/log.h"
 
-s8 get_Po_NOMINAL_PUSCH(u8 Mod_id) {
+s8 get_Po_NOMINAL_PUSCH(module_id_t module_idP) {
   RACH_ConfigCommon_t *rach_ConfigCommon = NULL;
 
-  if (UE_mac_inst[Mod_id].radioResourceConfigCommon)
-    rach_ConfigCommon = &UE_mac_inst[Mod_id].radioResourceConfigCommon->rach_ConfigCommon;
+  if (UE_mac_inst[module_idP].radioResourceConfigCommon)
+    rach_ConfigCommon = &UE_mac_inst[module_idP].radioResourceConfigCommon->rach_ConfigCommon;
   else {
-    LOG_E(MAC,"[UE %d] FATAL radioResourceConfigCommon is NULL !!!\n",Mod_id);
+    LOG_E(MAC,"[UE %d] FATAL radioResourceConfigCommon is NULL !!!\n",module_idP);
     mac_xface->macphy_exit("");
   }
 
   return(-120 + (rach_ConfigCommon->powerRampingParameters.preambleInitialReceivedTargetPower<<1) + 
-	 get_DELTA_PREAMBLE(Mod_id));
+	 get_DELTA_PREAMBLE(module_idP));
 }
 
-s8 get_deltaP_rampup(u8 Mod_id) {
+s8 get_deltaP_rampup(module_id_t module_idP) {
 
-  LOG_D(MAC,"[PUSCH]%d dB\n",UE_mac_inst[Mod_id].RA_PREAMBLE_TRANSMISSION_COUNTER<<1);
-  return((s8)(UE_mac_inst[Mod_id].RA_PREAMBLE_TRANSMISSION_COUNTER<<1));
+  LOG_D(MAC,"[PUSCH]%d dB\n",UE_mac_inst[module_idP].RA_PREAMBLE_TRANSMISSION_COUNTER<<1);
+  return((s8)(UE_mac_inst[module_idP].RA_PREAMBLE_TRANSMISSION_COUNTER<<1));
  
 }

openair2/LAYER2/MAC/main.c

@@ -25,16 +25,16 @@
   Forums       : http://forums.eurecom.fsr/openairinterface
   Address      : Eurecom, 2229, route des crêtes, 06560 Valbonne Sophia Antipolis, France
 
-*******************************************************************************/
+ *******************************************************************************/
 /*! \file main.c
-* \brief top init of Layer 2
-* \author Raymond Knopp and Navid Nikaein
-* \date 2011
-* \version 0.5
-* \email: navid.nikaein@eurecom.fr
-* @ingroup _mac
+ * \brief top init of Layer 2
+ * \author Raymond Knopp and Navid Nikaein
+ * \date 2011
+ * \version 0.5
+ * \email: navid.nikaein@eurecom.fr
+ * @ingroup _mac
 
-*/
+ */
 
 #ifdef USER_MODE
 #include "LAYER2/register.h"
@@ -74,58 +74,54 @@
 
 
 /***********************************************************************/
-void dl_phy_sync_success(unsigned char Mod_id,
-			 u32 frame,
+void dl_phy_sync_success(module_id_t   module_idP,
+    frame_t       frameP,
     unsigned char eNB_index,
     u8            first_sync){  //init as MR
-/***********************************************************************/
-  LOG_D(MAC,"[UE %d] Frame %d: PHY Sync to eNB_index %d successful \n", Mod_id, frame, eNB_index);
+  /***********************************************************************/
+  LOG_D(MAC,"[UE %d] Frame %d: PHY Sync to eNB_index %d successful \n", module_idP, frameP, eNB_index);
   if (first_sync==1) {
-    layer2_init_UE(Mod_id);
-    openair_rrc_ue_init(Mod_id,eNB_index);
+      layer2_init_UE(module_idP);
+      openair_rrc_ue_init(module_idP,eNB_index);
   }
   else {
-    mac_in_sync_ind(Mod_id,frame,eNB_index);
+      mac_in_sync_ind(module_idP,frameP,eNB_index);
   }
 
 }
 
 /***********************************************************************/
-void mrbch_phy_sync_failure(u8 Mod_id, u32 frame, u8 free_eNB_index){//init as CH
+void mrbch_phy_sync_failure(module_id_t module_idP, frame_t frameP, u8 free_eNB_index){//init as CH
   /***********************************************************************/
-  LOG_I(MAC,"[eNB %d] Frame %d: PHY Sync failure \n",Mod_id,frame);
-  layer2_init_eNB(Mod_id, free_eNB_index);
-  openair_rrc_eNB_init(Mod_id);
-
-
-
-
+  LOG_I(MAC,"[eNB %d] Frame %d: PHY Sync failure \n",module_idP,frameP);
+  layer2_init_eNB(module_idP, free_eNB_index);
+  openair_rrc_eNB_init(module_idP);
 }
 
-char layer2_init_eNB(unsigned char Mod_id, unsigned char eNB_index){
+char layer2_init_eNB(module_id_t module_idP, unsigned char eNB_index){
 
   return 0;
 
 }
 
 /***********************************************************************/
-char layer2_init_UE(unsigned char Mod_id){
+char layer2_init_UE(module_id_t module_idP){
 
   return 0;
 }
 
 /***********************************************************************/
-void mac_UE_out_of_sync_ind(u8 Mod_id, u32 frame, u16 eNB_index){
-/***********************************************************************/
+void mac_UE_out_of_sync_ind(module_id_t module_idP, frame_t frameP, u16 eNB_index){
+  /***********************************************************************/
 
-//  Mac_rlc_xface->mac_out_of_sync_ind(Mod_id, frame, eNB_index);
+  //  Mac_rlc_xface->mac_out_of_sync_ind(Mod_id, frameP, eNB_index);
 }
 
 
 /***********************************************************************/
 int mac_top_init(int eMBMS_active, u8 cba_group_active, u8 HO_active){
-/***********************************************************************/
-  unsigned char  Mod_id,i,j;
+  /***********************************************************************/
+  module_id_t    Mod_id,i,j;
   RA_TEMPLATE *RA_template;
   UE_TEMPLATE *UE_template;
   int size_bytes1,size_bytes2,size_bits1,size_bits2;
@@ -187,7 +183,7 @@ int mac_top_init(int eMBMS_active, u8 cba_group_active, u8 HO_active){
 #ifndef USER_MODE
 #ifndef PHY_EMUL
   LOG_I(MAC,"[MAIN] add openair2 proc\n");
-////  add_openair2_stats();
+  ////  add_openair2_stats();
 #endif
 #endif
 
@@ -310,7 +306,7 @@ int mac_top_init(int eMBMS_active, u8 cba_group_active, u8 HO_active){
 
   }
 #endif
-//end ALU's algo
+  //end ALU's algo
 
   LOG_I(MAC,"[MAIN][INIT] Init function finished\n");
 
@@ -384,7 +380,7 @@ int mac_init_global_param(void){
 
 /***********************************************************************/
 void mac_top_cleanup(void){
-/***********************************************************************/
+  /***********************************************************************/
 #ifndef USER_MODE
   pdcp_module_cleanup ();
 #endif

openair2/LAYER2/MAC/rar_tools.c

@@ -25,15 +25,15 @@
   Forums       : http://forums.eurecom.fsr/openairinterface
   Address      : Eurecom, 2229, route des crêtes, 06560 Valbonne Sophia Antipolis, France
 
-*******************************************************************************/
+ *******************************************************************************/
 /*! \file rar_tools.c
-* \brief random access tools
-* \author Raymond Knopp
-* \date 2011
-* \version 0.5
-* @ingroup _mac
+ * \brief random access tools
+ * \author Raymond Knopp
+ * \date 2011
+ * \version 0.5
+ * @ingroup _mac
 
-*/
+ */
 
 #include "defs.h"
 #include "extern.h"
@@ -54,8 +54,8 @@ extern unsigned short RIV2first_rb_LUT25[512];
 
 extern inline unsigned int taus(void);
 
-unsigned short fill_rar(u8 Mod_id,
-			u32 frame,
+unsigned short fill_rar(module_id_t module_idP,
+                        frame_t frameP,
                         u8 *dlsch_buffer,
                         u16 N_RB_UL,
                         u8 input_buffer_length) {
@@ -68,9 +68,9 @@ unsigned short fill_rar(u8 Mod_id,
   uint8_t mcs,TPC,ULdelay,cqireq;
 
   for (i=0;i<NB_RA_PROC_MAX;i++) {
-    if (eNB_mac_inst[Mod_id].RA_template[i].generate_rar == 1) {
+      if (eNB_mac_inst[module_idP].RA_template[i].generate_rar == 1) {
           ra_idx=i;
-      eNB_mac_inst[Mod_id].RA_template[i].generate_rar = 0;
+          eNB_mac_inst[module_idP].RA_template[i].generate_rar = 0;
           break;
       }
   }
@@ -78,24 +78,24 @@ unsigned short fill_rar(u8 Mod_id,
   // subheader fixed 
   rarh->E                     = 0; // First and last RAR
   rarh->T                     = 1; // 0 for E/T/R/R/BI subheader, 1 for E/T/RAPID subheader
-  rarh->RAPID                 = eNB_mac_inst[Mod_id].RA_template[ra_idx].preamble_index; // Respond to Preamble 0 only for the moment
+  rarh->RAPID                 = eNB_mac_inst[module_idP].RA_template[ra_idx].preamble_index; // Respond to Preamble 0 only for the moment
   /*
   rar->R                      = 0;
-  rar->Timing_Advance_Command = eNB_mac_inst[Mod_id].RA_template[ra_idx].timing_offset/4;
+  rar->Timing_Advance_Command = eNB_mac_inst[module_idP].RA_template[ra_idx].timing_offset/4;
   rar->hopping_flag           = 0;
   rar->rb_alloc               = mac_xface->computeRIV(N_RB_UL,12,2);  // 2 RB
   rar->mcs                    = 2;                                   // mcs 2
   rar->TPC                    = 4;   // 2 dB power adjustment
   rar->UL_delay               = 0;
   rar->cqi_req                = 1;
-  rar->t_crnti                = eNB_mac_inst[Mod_id].RA_template[ra_idx].rnti;
+  rar->t_crnti                = eNB_mac_inst[module_idP].RA_template[ra_idx].rnti;
    */
-  rar[4] = (uint8_t)(eNB_mac_inst[Mod_id].RA_template[ra_idx].rnti>>8); 
-  rar[5] = (uint8_t)(eNB_mac_inst[Mod_id].RA_template[ra_idx].rnti&0xff);
-  eNB_mac_inst[Mod_id].RA_template[ra_idx].timing_offset = 0;
-  //eNB_mac_inst[Mod_id].RA_template[ra_idx].timing_offset /= 16;
-  rar[0] = (uint8_t)(eNB_mac_inst[Mod_id].RA_template[ra_idx].timing_offset>>(2+4)); // 7 MSBs of timing advance + divide by 4
-  rar[1] = (uint8_t)(eNB_mac_inst[Mod_id].RA_template[ra_idx].timing_offset<<(4-2))&0xf0; // 4 LSBs of timing advance + divide by 4
+  rar[4] = (uint8_t)(eNB_mac_inst[module_idP].RA_template[ra_idx].rnti>>8);
+  rar[5] = (uint8_t)(eNB_mac_inst[module_idP].RA_template[ra_idx].rnti&0xff);
+  eNB_mac_inst[module_idP].RA_template[ra_idx].timing_offset = 0;
+  //eNB_mac_inst[module_idP].RA_template[ra_idx].timing_offset /= 16;
+  rar[0] = (uint8_t)(eNB_mac_inst[module_idP].RA_template[ra_idx].timing_offset>>(2+4)); // 7 MSBs of timing advance + divide by 4
+  rar[1] = (uint8_t)(eNB_mac_inst[module_idP].RA_template[ra_idx].timing_offset<<(4-2))&0xf0; // 4 LSBs of timing advance + divide by 4
   rballoc = mac_xface->computeRIV(N_RB_UL,1,1); // first PRB only for UL Grant
   rar[1] |= (rballoc>>7)&7; // Hopping = 0 (bit 3), 3 MSBs of rballoc
   rar[2] = ((uint8_t)(rballoc&0xff))<<1; // 7 LSBs of rballoc
@@ -106,59 +106,59 @@ unsigned short fill_rar(u8 Mod_id,
   rar[2] |= ((mcs&0x8)>>3);  // mcs 10
   rar[3] = (((mcs&0x7)<<5)) | ((TPC&7)<<2) | ((ULdelay&1)<<1) | (cqireq&1); 
 
-  LOG_I(MAC,"[eNB %d][RAPROC] Frame %d Generating RAR (%02x|%02x.%02x.%02x.%02x.%02x.%02x) for ra_idx %d, CRNTI %x,preamble %d/%d,TIMING OFFSET %d\n",Mod_id,frame,
+  LOG_I(MAC,"[eNB %d][RAPROC] Frame %d Generating RAR (%02x|%02x.%02x.%02x.%02x.%02x.%02x) for ra_idx %d, CRNTI %x,preamble %d/%d,TIMING OFFSET %d\n",module_idP,frame,
       *(uint8_t*)rarh,rar[0],rar[1],rar[2],rar[3],rar[4],rar[5],
       ra_idx,
-	eNB_mac_inst[Mod_id].RA_template[ra_idx].rnti,
-	rarh->RAPID,eNB_mac_inst[Mod_id].RA_template[0].preamble_index,
-	eNB_mac_inst[Mod_id].RA_template[ra_idx].timing_offset);
+      eNB_mac_inst[module_idP].RA_template[ra_idx].rnti,
+      rarh->RAPID,eNB_mac_inst[module_idP].RA_template[0].preamble_index,
+      eNB_mac_inst[module_idP].RA_template[ra_idx].timing_offset);
 
 #if defined(USER_MODE) && defined(OAI_EMU)
   if (oai_emulation.info.opt_enabled){
-    trace_pdu(1, dlsch_buffer, input_buffer_length, Mod_id, 2, 1,
-              eNB_mac_inst[Mod_id].subframe, 0, 0);
+      trace_pdu(1, dlsch_buffer, input_buffer_length, module_idP, 2, 1,
+          eNB_mac_inst[module_idP].subframe, 0, 0);
       LOG_I(OPT,"[eNB %d][RAPROC] RAR Frame %d trace pdu for rnti %x and  rapid %d size %d\n",
-          Mod_id, frame, eNB_mac_inst[Mod_id].RA_template[ra_idx].rnti,
+          module_idP, frame, eNB_mac_inst[module_idP].RA_template[ra_idx].rnti,
           rarh->RAPID, input_buffer_length);
   } 
 #endif 
-  return(eNB_mac_inst[Mod_id].RA_template[ra_idx].rnti);
+  return(eNB_mac_inst[module_idP].RA_template[ra_idx].rnti);
 }
 
-uint16_t ue_process_rar(u8 Mod_id, u32 frame, u8 *dlsch_buffer,u16 *t_crnti,u8 preamble_index) {
+uint16_t ue_process_rar(module_id_t module_idP, frame_t frameP, u8 *dlsch_buffer,rnti_t *t_crnti,u8 preamble_index) {
 
   RA_HEADER_RAPID *rarh = (RA_HEADER_RAPID *)dlsch_buffer;
   //  RAR_PDU *rar = (RAR_PDU *)(dlsch_buffer+1);
   uint8_t *rar = (uint8_t *)(dlsch_buffer+1);
 
-  LOG_I(MAC,"[eNB %d][RAPROC] Frame %d Received RAR (%02x|%02x.%02x.%02x.%02x.%02x.%02x) for preamble %d/%d\n",Mod_id,frame,
+  LOG_I(MAC,"[eNB %d][RAPROC] Frame %d Received RAR (%02x|%02x.%02x.%02x.%02x.%02x.%02x) for preamble %d/%d\n",module_idP,frame,
       *(uint8_t*)rarh,rar[0],rar[1],rar[2],rar[3],rar[4],rar[5],
       rarh->RAPID,preamble_index);
 #ifdef DEBUG_RAR
-  LOG_D(MAC,"[UE %d][RAPROC] rarh->E %d\n",Mod_id,rarh->E);
-  LOG_D(MAC,"[UE %d][RAPROC] rarh->T %d\n",Mod_id,rarh->T);
-  LOG_D(MAC,"[UE %d][RAPROC] rarh->RAPID %d\n",Mod_id,rarh->RAPID);
-
-  //  LOG_I(MAC,"[UE %d][RAPROC] rar->R %d\n",Mod_id,rar->R);
-  LOG_I(MAC,"[UE %d][RAPROC] rar->Timing_Advance_Command %d\n",Mod_id,(((uint16_t)(rar[0]&0x7f))<<4) + (rar[1]>>4));
-  //  LOG_I(MAC,"[UE %d][RAPROC] rar->hopping_flag %d\n",Mod_id,rar->hopping_flag);
-  //  LOG_I(MAC,"[UE %d][RAPROC] rar->rb_alloc %d\n",Mod_id,rar->rb_alloc);
-  //  LOG_I(MAC,"[UE %d][RAPROC] rar->mcs %d\n",Mod_id,rar->mcs);
-  //  LOG_I(MAC,"[UE %d][RAPROC] rar->TPC %d\n",Mod_id,rar->TPC);
-  //  LOG_I(MAC,"[UE %d][RAPROC] rar->UL_delay %d\n",Mod_id,rar->UL_delay);
-  //  LOG_I(MAC,"[UE %d][RAPROC] rar->cqi_req %d\n",Mod_id,rar->cqi_req);
-  LOG_I(MAC,"[UE %d][RAPROC] rar->t_crnti %x\n",Mod_id,(uint16_t)rar[5]+(rar[4]<<8)); 
+  LOG_D(MAC,"[UE %d][RAPROC] rarh->E %d\n",module_idP,rarh->E);
+  LOG_D(MAC,"[UE %d][RAPROC] rarh->T %d\n",module_idP,rarh->T);
+  LOG_D(MAC,"[UE %d][RAPROC] rarh->RAPID %d\n",module_idP,rarh->RAPID);
+
+  //  LOG_I(MAC,"[UE %d][RAPROC] rar->R %d\n",module_idP,rar->R);
+  LOG_I(MAC,"[UE %d][RAPROC] rar->Timing_Advance_Command %d\n",module_idP,(((uint16_t)(rar[0]&0x7f))<<4) + (rar[1]>>4));
+  //  LOG_I(MAC,"[UE %d][RAPROC] rar->hopping_flag %d\n",module_idP,rar->hopping_flag);
+  //  LOG_I(MAC,"[UE %d][RAPROC] rar->rb_alloc %d\n",module_idP,rar->rb_alloc);
+  //  LOG_I(MAC,"[UE %d][RAPROC] rar->mcs %d\n",module_idP,rar->mcs);
+  //  LOG_I(MAC,"[UE %d][RAPROC] rar->TPC %d\n",module_idP,rar->TPC);
+  //  LOG_I(MAC,"[UE %d][RAPROC] rar->UL_delay %d\n",module_idP,rar->UL_delay);
+  //  LOG_I(MAC,"[UE %d][RAPROC] rar->cqi_req %d\n",module_idP,rar->cqi_req);
+  LOG_I(MAC,"[UE %d][RAPROC] rar->t_crnti %x\n",module_idP,(uint16_t)rar[5]+(rar[4]<<8));
 #endif
 
 
   if (preamble_index == rarh->RAPID) {
       *t_crnti = (uint16_t)rar[5]+(rar[4]<<8);//rar->t_crnti;
-    UE_mac_inst[Mod_id].crnti = *t_crnti;//rar->t_crnti;
+      UE_mac_inst[module_idP].crnti = *t_crnti;//rar->t_crnti;
       //return(rar->Timing_Advance_Command);
       return((((uint16_t)(rar[0]&0x7f))<<4) + (rar[1]>>4));
   }
   else {
-    UE_mac_inst[Mod_id].crnti=0;
+      UE_mac_inst[module_idP].crnti=0;
       return(0xffff);
   }
 }

openair2/LAYER2/PDCP/pdcp_fifo.c

@@ -259,9 +259,6 @@ pdcp_fifo_read_input_sdus_remaining_bytes ()
 {
 //-----------------------------------------------------------------------------
   sdu_size_t             bytes_read=0;
-  // if remaining bytes to read
-
-
 
   if (pdcp_input_sdu_remaining_size_to_read > 0) {
 

openair2/LAYER2/PDCP_v10.1.0/pdcp_primitives.h

@@ -153,11 +153,11 @@ BOOL pdcp_serialize_user_plane_data_pdu_with_long_sn_buffer(unsigned char* pdu_b
 BOOL pdcp_serialize_control_pdu_for_pdcp_status_report(unsigned char* pdu_buffer, \
      u8 bitmap[512], pdcp_control_pdu_for_pdcp_status_report* pdu);
 
-int pdcp_netlink_dequeue_element(uint8_t eNB_flag, uint8_t UE_index, uint8_t eNB_index,
-                                 struct pdcp_netlink_element_s **data);
+int pdcp_netlink_dequeue_element(module_id_t enb_mod_idP, module_id_t ue_mod_idP, eNB_flag_t eNB_flagP,
+                                 struct pdcp_netlink_element_s **data_ppP);
 
-void pdcp_config_set_security(pdcp_t *pdcp, u8 eNB_id, u8 UE_id, u32 frame, u8 eNB_flag, rb_id_t rb_id,
-                              u16 lc_id, u8 security_mode, u8 *kRRCenc, u8 *kRRCint, u8 *kUPenc);
+void pdcp_config_set_security(pdcp_t *pdcp_pP, module_id_t enb_mod_idP, module_id_t ue_mod_idP, frame_t frameP, eNB_flag_t eNB_flagP, rb_id_t rb_idP,
+                              u16 lc_idP, u8 security_modeP, u8 *kRRCenc_pP, u8 *kRRCint_pP, u8 *kUPenc_pP);
 
 #if defined(ENABLE_SECURITY)
 int pdcp_apply_security(pdcp_t *pdcp_entity, rb_id_t rb_id,

openair2/LAYER2/PDCP_v10.1.0/pdcp_util.c

@@ -87,12 +87,15 @@ void util_flush_hex_octets(comp_name_t component, unsigned char* data, unsigned
     LOG_W(component, "Incoming buffer is NULL! Ignoring...\n");
     return;
   }
+  printf("[PDCP]");
 
   unsigned long octet_index = 0;
   for (octet_index = 0; octet_index < size; ++octet_index) {
-    LOG_T(component, "%02x.", data[octet_index]);
+      //LOG_T(component, "%02x.", data[octet_index]);
+      printf("%02x.", data[octet_index]);
   }
-  LOG_T(component, " \n");
+  //LOG_T(component, " \n");
+  printf(" \n");
 }
 
 /*

openair2/LAYER2/RLC/AM_v9.3.0/rlc_am.h

@@ -96,29 +96,29 @@ public_rlc_am(void     rlc_am_release (rlc_am_entity_t *rlcP);)
 * @{
 */
 
-/*! \fn void config_req_rlc_am (rlc_am_entity_t *rlcP, u32_t frame, u8_t eNB_flagP, module_id_t module_idP, rlc_am_info_t * config_amP, rb_id_t rb_idP, rb_type_t rb_typeP)
+/*! \fn void config_req_rlc_am (u32_t frame, u8_t eNB_flagP, module_id_t enb_module_idP, module_id_t ue_module_idP, rlc_am_info_t * config_amP, rb_id_t rb_idP, rb_type_t rb_typeP)
 * \brief    Configure the UL and DL parameters of the RLC AM
-* \param[in]  rlcP                      RLC AM protocol instance pointer.
 * \param[in]  frame                     Frame index.
 * \param[in]  eNB_flag                  Flag to indicate eNB (1) or UE (0)
-* \param[in]  module_idP                Virtualized module identifier.
+* \param[in]  enb_module_idP            eNB Virtualized module identifier.
+* \param[in]  ue_module_idP             UE Virtualized module identifier.
 * \param[in]  config_amP                Configuration parameters for RLC AM instance.
 * \param[in]  rb_idP                    Radio bearer identifier.
 * \param[in]  rb_typeP                  Radio bearer type (Signalling or Data).
 */
-public_rlc_am(void     config_req_rlc_am (rlc_am_entity_t *rlcP, u32_t frame, u8_t eNB_flagP, module_id_t module_idP, rlc_am_info_t * config_amP, rb_id_t rb_idP, rb_type_t rb_typeP);)
+public_rlc_am(void     config_req_rlc_am (u32_t frame, u8_t eNB_flagP, module_id_t enb_module_idP, module_id_t ue_module_idP, rlc_am_info_t * config_amP, rb_id_t rb_idP, rb_type_t rb_typeP);)
 
-/*! \fn void config_req_rlc_am_asn1 (rlc_am_entity_t *rlcP, u32_t frame, u8_t eNB_flagP, module_id_t module_idP, struct RLC_Config__am * config_amP, rb_id_t rb_idP, rb_type_t rb_typeP)
+/*! \fn void config_req_rlc_am_asn1 (u32_t frame, u8_t eNB_flagP, module_id_t enb_module_idP, module_id_t ue_module_idP, struct RLC_Config__am * config_amP, rb_id_t rb_idP, rb_type_t rb_typeP)
 * \brief    Configure the UL and DL parameters of the RLC AM with the asn1c autogenerated pameters structs
-* \param[in]  rlcP                      RLC AM protocol instance pointer.
 * \param[in]  frame                     Frame index.
 * \param[in]  eNB_flag                  Flag to indicate eNB (1) or UE (0)
-* \param[in]  module_idP                Virtualized module identifier.
+* \param[in]  enb_module_idP            eNB Virtualized module identifier.
+* \param[in]  ue_module_idP             UE Virtualized module identifier.
 * \param[in]  config_amP                Configuration parameters for RLC AM instance.
 * \param[in]  rb_idP                    Radio bearer identifier.
 * \param[in]  rb_typeP                  Radio bearer type (Signalling or Data).
 */
-public_rlc_am(void config_req_rlc_am_asn1 (rlc_am_entity_t *rlcP, u32_t frame, u8_t eNB_flagP, module_id_t module_idP, struct RLC_Config__am * config_amP, rb_id_t rb_idP, rb_type_t rb_typeP);)
+public_rlc_am(void config_req_rlc_am_asn1 (u32_t frame, u8_t eNB_flagP, module_id_t enb_module_idP, module_id_t ue_module_idP, struct RLC_Config__am * config_amP, rb_id_t rb_idP, rb_type_t rb_typeP);)
 
 /** @} */
 

openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_in_sdu.c

@@ -42,7 +42,7 @@ Address      : Eurecom, 2229, route des crêtes, 06560 Valbonne Sophia Antipolis
 
 #define TRACE_RLC_AM_FREE_SDU
 //-----------------------------------------------------------------------------
-void rlc_am_free_in_sdu(rlc_am_entity_t *rlcP, u32_t frame, unsigned int index_in_bufferP)
+void rlc_am_free_in_sdu(rlc_am_entity_t *rlcP, frame_t frameP, unsigned int index_in_bufferP)
 //-----------------------------------------------------------------------------
 {
     if (index_in_bufferP <= RLC_AM_SDU_CONTROL_BUFFER_SIZE) {
@@ -65,7 +65,16 @@ void rlc_am_free_in_sdu(rlc_am_entity_t *rlcP, u32_t frame, unsigned int index_i
         }
     }
 #ifdef TRACE_RLC_AM_FREE_SDU
-    LOG_D(RLC, "[FRAME %05d][RLC_AM][MOD %02d][RB %02d][FREE SDU] SDU INDEX %03d current_sdu_index=%d next_sdu_index=%d nb_sdu_no_segmented=%d\n", frame, rlcP->module_id, rlcP->rb_id, index_in_bufferP, rlcP->current_sdu_index, rlcP->next_sdu_index, rlcP->nb_sdu_no_segmented);
+    LOG_D(RLC, "[FRAME %05d][%s][RLC_AM][MOD %u/%u][RB %u][FREE SDU] SDU INDEX %03d current_sdu_index=%d next_sdu_index=%d nb_sdu_no_segmented=%d\n",
+          frameP,
+          (rlcP->is_enb) ? "eNB" : "UE",
+          rlcP->enb_module_id,
+          rlcP->ue_module_id,
+          rlcP->rb_id,
+          index_in_bufferP,
+          rlcP->current_sdu_index,
+          rlcP->next_sdu_index,
+          rlcP->nb_sdu_no_segmented);
 #endif
 }
 // called when segmentation is done