Merge branch 'develop' into L1_renaming

Conflicts: targets/RT/USER/lte-enb.c
2018-11-08 12:16:13 +01:00
parent 045f2bfd31 2a48796406
commit bc1abcd86f
124 changed files with 5476 additions and 5058 deletions
@@ -127,7 +127,7 @@ void phy_procedures_eNB_S_RX(PHY_VARS_eNB *phy_vars_eNB,L1_rxtx_proc_t *proc);
  @param phy_vars_eNB Pointer to eNB variables on which to act
  @param br_flag indicator for eMTC PRACH
 */
-#if (RRC_VERSION >= MAKE_VERSION(14, 0, 0))
+#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
 void prach_procedures(PHY_VARS_eNB *eNB,
 		      int br_flag);
 #else