copying RA_Template BR parameters to UE_template

openair2/LAYER2/MAC/defs.h

@@ -752,6 +752,13 @@ typedef struct {
 #ifdef LOCALIZATION
   eNB_UE_estimated_distances distance;
 #endif
+
+#ifdef Rel14
+  uint8_t rach_resource_type;
+
+
+#endif
+
 } UE_TEMPLATE;
 
 /*! \brief scheduling control information set through an API (not used)*/

openair2/LAYER2/MAC/eNB_scheduler_primitives.c

@@ -647,7 +647,11 @@ void dump_ue_list(UE_list_t *listP, int ul_flag)
   }
 }
 
-int add_new_ue(module_id_t mod_idP, int cc_idP, rnti_t rntiP,int harq_pidP)
+int add_new_ue(module_id_t mod_idP, int cc_idP, rnti_t rntiP,int harq_pidP
+               #ifdef Rel14
+                 ,uint8_t rach_resource_type
+               #endif
+               )
 {
   int UE_id;
   int i, j;
@@ -669,6 +673,11 @@ int add_new_ue(module_id_t mod_idP, int cc_idP, rnti_t rntiP,int harq_pidP)
     UE_list->ordered_ULCCids[0][UE_id]             = cc_idP;
     UE_list->num_UEs++;
     UE_list->active[UE_id]                         = TRUE;
+
+#ifdef Rel14
+    UE_list->UE_template[cc_idP][UE_id].rach_resource_type = rach_resource_type ;
+#endif
+
     memset((void*)&UE_list->UE_sched_ctrl[UE_id],0,sizeof(UE_sched_ctrl));
     memset((void*)&UE_list->eNB_UE_stats[cc_idP][UE_id],0,sizeof(eNB_UE_STATS));
 

openair2/LAYER2/MAC/eNB_scheduler_ulsch.c

@@ -368,7 +368,11 @@ void rx_sdu(const module_id_t enb_mod_idP,
             LOG_I(MAC,"[eNB %d][RAPROC] CC_id %d Frame %d CCCH: Received Msg3: length %d, offset %ld\n",
                   enb_mod_idP,CC_idP,frameP,rx_lengths[i],payload_ptr-sduP);
 
-            if ((UE_id=add_new_ue(enb_mod_idP,CC_idP,eNB->common_channels[CC_idP].RA_template[ii].rnti,harq_pid)) == -1 ) {
+            if ((UE_id=add_new_ue(enb_mod_idP,CC_idP,eNB->common_channels[CC_idP].RA_template[ii].rnti,harq_pid
+                      #ifdef Rel14
+                        ,eNB->common_channels[CC_idP].RA_template[ii].rach_resource_type
+                      #endif
+                      )) == -1 ) {
               AssertFatal(1==0,"[MAC][eNB] Max user count reached\n");
 	      // kill RA procedure
             } else

openair2/LAYER2/MAC/proto.h

@@ -521,7 +521,11 @@ int to_prb(int);
 int to_rbg(int);
 int l2_init(LTE_DL_FRAME_PARMS *frame_parms,int eMBMS_active, char *uecap_xer, uint8_t cba_group_active, uint8_t HO_active);
 int mac_init(void);
-int add_new_ue(module_id_t Mod_id, int CC_id, rnti_t rnti,int harq_pid);
+int add_new_ue(module_id_t Mod_id, int CC_id, rnti_t rnti,int harq_pid
+               #ifdef Rel14
+                 ,uint8_t rach_resource_type
+               #endif
+               );
 int rrc_mac_remove_ue(module_id_t Mod_id, rnti_t rntiP);
 
 

ray_enb_dev.config

+// Add predefined macros for your project here. For example:
+// #define THE_ANSWER 42

ray_enb_dev.creator

+[General]

ray_enb_dev.includes

+cmake_targets/lte_build_oai/build/CMakeFiles
+cmake_targets/lte_build_oai/build/CMakeFiles/R10.5
+cmake_targets/lte_build_oai/build/CMakeFiles/R11.2
+cmake_targets/lte_build_oai/build/CMakeFiles/Rel14
+common
+common/utils
+common/utils/collection
+common/utils/hashtable
+common/utils/itti
+common/utils/itti_analyzer/common
+common/utils/itti_analyzer/libbuffers
+common/utils/itti_analyzer/libparser
+common/utils/itti_analyzer/libresolver
+common/utils/itti_analyzer/libui
+common/utils/msc
+common/utils/T
+common/utils/T/tracer
+common/utils/T/tracer/filter
+common/utils/T/tracer/gui
+common/utils/T/tracer/logger
+common/utils/T/tracer/view
+openair1/PHY
+openair1/PHY/CODING
+openair1/PHY/INIT
+openair1/PHY/LTE_ESTIMATION
+openair1/PHY/LTE_REFSIG
+openair1/PHY/LTE_TRANSPORT
+openair1/PHY/MODULATION
+openair1/PHY/TOOLS
+openair1/SCHED
+openair1/SIMULATION/ETH_TRANSPORT
+openair1/SIMULATION/LTE_PHY
+openair1/SIMULATION/RF
+openair1/SIMULATION/TOOLS
+openair2/COMMON
+openair2/DOCS/TEMPLATES/CODE
+openair2/ENB_APP
+openair2/ENB_APP/CONTROL_MODULES/MAC
+openair2/LAYER2
+openair2/LAYER2/MAC
+openair2/LAYER2/PDCP_v10.1.0
+openair2/LAYER2/RLC
+openair2/LAYER2/RLC/AM_v9.3.0
+openair2/LAYER2/RLC/TM_v9.3.0
+openair2/LAYER2/RLC/UM_v9.3.0
+openair2/NAS/DRIVER/CELLULAR/CTL_TOOL
+openair2/NAS/DRIVER/CELLULAR/NASMT
+openair2/NAS/DRIVER/CELLULAR/NASRG
+openair2/NAS/SIMU_CELLULAR
+openair2/NETWORK_DRIVER/LITE
+openair2/NETWORK_DRIVER/MESH
+openair2/NETWORK_DRIVER/UE_IP
+openair2/PHY_INTERFACE
+openair2/RRC/L2_INTERFACE
+openair2/RRC/LITE
+openair2/RRC/LITE/MESSAGES
+openair2/RRC/NAS
+openair2/UTIL/ASYNC_IF
+openair2/UTIL/BIGPHYS
+openair2/UTIL/CLI
+openair2/UTIL/FIFO
+openair2/UTIL/LFDS/liblfds6.1.1/liblfds611/inc
+openair2/UTIL/LFDS/liblfds6.1.1/liblfds611/src
+openair2/UTIL/LFDS/liblfds6.1.1/liblfds611/src/lfds611_abstraction
+openair2/UTIL/LFDS/liblfds6.1.1/liblfds611/src/lfds611_freelist
+openair2/UTIL/LFDS/liblfds6.1.1/liblfds611/src/lfds611_liblfds
+openair2/UTIL/LFDS/liblfds6.1.1/liblfds611/src/lfds611_queue
+openair2/UTIL/LFDS/liblfds6.1.1/liblfds611/src/lfds611_ringbuffer
+openair2/UTIL/LFDS/liblfds6.1.1/liblfds611/src/lfds611_slist
+openair2/UTIL/LFDS/liblfds6.1.1/liblfds611/src/lfds611_stack
+openair2/UTIL/LFDS/liblfds6.1.1/test/src
+openair2/UTIL/LFDS/liblfds7.0.0/liblfds700/inc
+openair2/UTIL/LFDS/liblfds7.0.0/liblfds700/inc/liblfds700
+openair2/UTIL/LFDS/liblfds7.0.0/liblfds700/src
+openair2/UTIL/LFDS/liblfds7.0.0/liblfds700/src/lfds700_btree_addonly_unbalanced
+openair2/UTIL/LFDS/liblfds7.0.0/liblfds700/src/lfds700_freelist
+openair2/UTIL/LFDS/liblfds7.0.0/liblfds700/src/lfds700_hash_addonly
+openair2/UTIL/LFDS/liblfds7.0.0/liblfds700/src/lfds700_list_addonly_ordered_singlylinked
+openair2/UTIL/LFDS/liblfds7.0.0/liblfds700/src/lfds700_list_addonly_singlylinked_unordered
+openair2/UTIL/LFDS/liblfds7.0.0/liblfds700/src/lfds700_misc
+openair2/UTIL/LFDS/liblfds7.0.0/liblfds700/src/lfds700_queue
+openair2/UTIL/LFDS/liblfds7.0.0/liblfds700/src/lfds700_queue_bounded_singleconsumer_singleproducer
+openair2/UTIL/LFDS/liblfds7.0.0/liblfds700/src/lfds700_ringbuffer
+openair2/UTIL/LFDS/liblfds7.0.0/liblfds700/src/lfds700_stack
+openair2/UTIL/LFDS/liblfds7.0.0/test/src
+openair2/UTIL/LISTS
+openair2/UTIL/LOG
+openair2/UTIL/MATH
+openair2/UTIL/MEM
+openair2/UTIL/OCG
+openair2/UTIL/OMG
+openair2/UTIL/OMV
+openair2/UTIL/OPT
+openair2/UTIL/OSA
+openair2/UTIL/OTG
+openair2/UTIL/TIMER
+openair2/UTIL/TRACE
+openair2/X2AP
+openair3/COMMON
+openair3/GTPV1-U
+openair3/GTPV1-U/nw-gtpv1u/include
+openair3/GTPV1-U/nw-gtpv1u/shared
+openair3/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld
+openair3/NAS/COMMON
+openair3/NAS/COMMON/API/NETWORK
+openair3/NAS/COMMON/EMM/MSG
+openair3/NAS/COMMON/ESM/MSG
+openair3/NAS/COMMON/IES
+openair3/NAS/COMMON/UTIL
+openair3/NAS/TEST/AS_SIMULATOR
+openair3/NAS/TEST/NETWORK
+openair3/NAS/TEST/USER
+openair3/NAS/TOOLS
+openair3/NAS/UE
+openair3/NAS/UE/API/USER
+openair3/NAS/UE/API/USIM
+openair3/NAS/UE/EMM
+openair3/NAS/UE/EMM/SAP
+openair3/NAS/UE/ESM
+openair3/NAS/UE/ESM/SAP
+openair3/S1AP
+openair3/SCTP
+openair3/SECU
+openair3/TEST
+openair3/TEST/EPC_TEST
+openair3/UDP
+openair3/UTILS
+targets/ARCH/BLADERF/USERSPACE/LIB
+targets/ARCH/COMMON
+targets/ARCH/ETHERNET/USERSPACE/LIB
+targets/ARCH/EXMIMO/DEFS
+targets/ARCH/EXMIMO/DRIVER/eurecom
+targets/ARCH/EXMIMO/DRIVER/exmimo3
+targets/ARCH/EXMIMO/DRIVER/telecomparistech
+targets/ARCH/EXMIMO/USERSPACE/LIB
+targets/ARCH/EXMIMO/USERSPACE/OAI_FW_INIT
+targets/ARCH/EXMIMO/USERSPACE/OCTAVE
+targets/COMMON
+targets/RT/USER
+targets/RT/USER/TOOLS
+targets/SIMU/PROC
+targets/SIMU/USER
+targets/TEST/PDCP
+targets/TEST/ROHDE_SCHWARZ
\ No newline at end of file