Adding some basic prototypes

openair1/PHY/INIT/lte_parms.c

@@ -149,6 +149,13 @@ int init_frame_parms(LTE_DL_FRAME_PARMS *frame_parms,uint8_t osf)
     frame_parms->N_RBGS = 2;
     frame_parms->N_RBG = 13;
 
+#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
+    frame_parms->ofdm_symbol_size_khz_1dot25     = 6144*osf;
+    frame_parms->first_carrier_offset_khz_1dot25 = frame_parms->ofdm_symbol_size_khz_1dot25 - 1800; //4344
+    frame_parms->nb_prefix_samples_khz_1dot25>>=(2-log2_osf);
+    frame_parms->nb_prefix_samples0_khz_1dot25>>=(2-log2_osf);
+#endif	
+
     break;
 
   case 15:

openair1/PHY/defs_UE.h

@@ -703,6 +703,10 @@ typedef struct {
 
   /// mbsfn reference symbols
   uint32_t lte_gold_mbsfn_table[10][3][42];
+#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
+  /// mbsfn reference symbols
+  uint32_t         lte_gold_mbsfn_khz_1dot25_table[10][150];
+#endif
 
   uint32_t X_u[64][839];
 

openair1/PHY/defs_common.h

@@ -632,12 +632,26 @@ typedef struct {
   uint8_t threequarter_fs;
   /// Size of FFT
   uint16_t ofdm_symbol_size;
+#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
+  /// Size of FFT
+  uint16_t ofdm_symbol_size_khz_1dot25;
+#endif
   /// Number of prefix samples in all but first symbol of slot
   uint16_t nb_prefix_samples;
   /// Number of prefix samples in first symbol of slot
   uint16_t nb_prefix_samples0;
+#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
+ /// Number of prefix samples in all but first symbol of slot
+  uint16_t nb_prefix_samples_khz_1dot25;
+  /// Number of prefix samples in first symbol of slot
+  uint16_t nb_prefix_samples0_khz_1dot25;
+#endif
   /// Carrier offset in FFT buffer for first RE in PRB0
   uint16_t first_carrier_offset;
+#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
+  /// Carrier offset in FFT buffer for first RE in PRB0 (FeMBMS
+  uint16_t first_carrier_offset_khz_1dot25;
+#endif
   /// Number of samples in a subframe
   uint32_t samples_per_tti;
   /// Number of OFDM/SC-FDMA symbols in one subframe (to be modified to account for potential different in UL/DL)

openair1/PHY/defs_eNB.h

@@ -966,6 +966,10 @@ typedef struct PHY_VARS_eNB_s {
 
   /// mbsfn reference symbols
   uint32_t         lte_gold_mbsfn_table[10][3][42];
+#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
+  /// mbsfn reference symbols
+  uint32_t         lte_gold_mbsfn_khz_1dot25_table[10][150];
+#endif
 
   uint32_t X_u[64][839];
 #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))

openair2/LAYER2/MAC/defs_NB_IoT.h

@@ -63,7 +63,8 @@
 /*!\brief DTCH DRB1  logical channel */
 #define DTCH 3 // LCID
 /*!\brief MCCH logical channel */
-#define MCCH 4 
+//#define MCCH 4 
+#define MCCH 62
 /*!\brief MTCH logical channel */
 #define MTCH 1 
 // DLSCH LCHAN ID