Removing warnings related to NB_IoT_eNB_NULSCH_t (118 remaining)

cmake_targets/CMakeLists.txt

@@ -984,13 +984,12 @@ set(PHY_SRC
   # depend on code generation from asn1c
   ${RRC_FULL_DIR}/asn1_constants.h
   # actual source
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/npss_NB_IoT.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/nsss_NB_IoT.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pilots_NB_IoT.c
-  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/npbch_NB_IoT.c
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pss.c
+  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/npss_NB_IoT.c
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/sss.c
+  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/nsss_NB_IoT.c
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pilots.c
+  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pilots_NB_IoT.c
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pilots_mbsfn.c
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dlsch_coding.c
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dlsch_coding_NB_IoT.c
@@ -1009,6 +1008,7 @@ set(PHY_SRC
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/lte_mcs.c
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/lte_mcs_NB_IoT.c
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pbch.c
+  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/npbch_NB_IoT.c
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dci.c
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dci_NB_IoT.c
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/phich.c

openair1/PHY/LTE_TRANSPORT/defs_NB_IoT.h

@@ -663,7 +663,7 @@ typedef struct {
   /// Temporary h sequence to flag PUSCH_x/PUSCH_y symbols which are not scrambled
   //uint8_t h[MAX_NUM_CHANNEL_BITS];
   /// SRS active flag
-  uint8_t srs_active;
+  uint8_t               srs_active;
   /// Pointer to the payload
   uint8_t               *b;
   /// Current Number of Symbols
@@ -695,7 +695,7 @@ typedef struct {
 
 
 typedef struct {
-  /// Pointers to 8 HARQ processes for the ULSCH
+  /// Pointers to the HARQ processes for the NULSCH
   NB_IoT_UL_eNB_HARQ_t    *harq_process;
   /// Maximum number of HARQ rounds
   uint8_t                 Mlimit;
@@ -728,13 +728,8 @@ typedef struct {
   /// Determined the ACK/NACK delay and the subcarrier allocation TS 36.213 Table 16.4.2
   uint8_t                 HARQ_ACK_resource;
 
-} NB_IoT_eNB_NULSCH_t;
+  ///////////// kept from LTE ///////////////////////////////////////////////////
 
-typedef struct {
-  /// Pointers to 8 HARQ processes for the ULSCH
-  NB_IoT_UL_eNB_HARQ_t    *harq_process;
-  /// Maximum number of HARQ rounds
-  uint8_t                 Mlimit;
   /// Maximum number of iterations used in eNB turbo decoder
   uint8_t                 max_turbo_iterations;
   /// ACK/NAK Bundling flag
@@ -745,25 +740,11 @@ typedef struct {
   uint16_t                beta_offset_ri_times8;
   /// beta_offset_harqack times 8
   uint16_t                beta_offset_harqack_times8;
-  /// Flag to indicate that eNB awaits UE Msg3
-  uint8_t                 Msg3_active;
-  /// Flag to indicate that eNB should decode UE Msg3
-  uint8_t                 Msg3_flag;
-  /// Subframe for Msg3
-  uint8_t                 Msg3_subframe;
-  /// Frame for Msg3
-  uint32_t                Msg3_frame;
-  /// RNTI attributed to this ULSCH
-  uint16_t                rnti;
-  /// cyclic shift for DM RS
-  uint8_t                 cyclicShift;
-  /// cooperation flag
-  uint8_t                 cooperation_flag;
   /// num active cba group
   uint8_t                 num_active_cba_groups;
   /// allocated CBA RNTI for this ulsch
   uint16_t                cba_rnti[4];//NUM_MAX_CBA_GROUP];
-#ifdef LOCALIZATION
+  #ifdef LOCALIZATION
   /// epoch timestamp in millisecond
   int32_t                 reference_timestamp_ms;
   /// aggregate physical states every n millisecond
@@ -771,10 +752,9 @@ typedef struct {
   /// a set of lists used for localization
   struct                  list loc_rss_list[10], loc_rssi_list[10], loc_subcarrier_rss_list[10], loc_timing_advance_list[10], loc_timing_update_list[10];
   struct                  list tot_loc_rss_list, tot_loc_rssi_list, tot_loc_subcarrier_rss_list, tot_loc_timing_advance_list, tot_loc_timing_update_list;
-#endif
-
-} NB_IoT_eNB_ULSCH_t;
+  #endif
 
+} NB_IoT_eNB_NULSCH_t;
 
 #define NPBCH_A 34
 

openair1/PHY/LTE_TRANSPORT/proto_NB_IoT.h

@@ -164,16 +164,8 @@ NB_IoT_eNB_NDLSCH_t *new_eNB_dlsch_NB_IoT(//unsigned char Kmimo,
                                           NB_IoT_DL_FRAME_PARMS* frame_parms);
 
 
-NB_IoT_eNB_NULSCH_t *new_eNB_ulsch_NB(uint8_t abstraction_flag);
-
-//5555
-/*void rx_ulsch_NB_IoT(PHY_VARS_eNB *phy_vars_eNB,
-                     eNB_rxtx_proc_t *proc,
-                     uint8_t eNB_id,  // this is the effective sector id
-                     uint8_t UE_id,
-                     LTE_eNB_ULSCH_t **ulsch,
-                     uint8_t cooperation_flag);
-*/
+NB_IoT_eNB_NULSCH_t *new_eNB_ulsch_NB_IoT(uint8_t abstraction_flag);
+
 
 uint8_t subframe2harq_pid_NB_IoT(NB_IoT_DL_FRAME_PARMS *frame_parms,uint32_t frame,uint8_t subframe);
 
@@ -221,7 +213,7 @@ void rx_ulsch_NB_IoT(PHY_VARS_eNB_NB_IoT      *phy_vars_eNB,
                      eNB_rxtx_proc_NB_IoT_t   *proc,
                      uint8_t                  eNB_id,               // this is the effective sector id
                      uint8_t                  UE_id,
-                     NB_IoT_eNB_ULSCH_t       **ulsch,
+                     NB_IoT_eNB_NULSCH_t      **ulsch,
                      uint8_t                  cooperation_flag);
 
 void ulsch_extract_rbs_single_NB_IoT(int32_t                **rxdataF,

openair1/PHY/LTE_TRANSPORT/ulsch_decoding_NB_IoT.c

@@ -937,7 +937,7 @@ unsigned int  ulsch_decoding_NB_IoT(PHY_VARS_eNB_NB_IoT     *eNB,
 
   int16_t                 *ulsch_llr    = eNB->pusch_vars[UE_id]->llr;
   NB_IoT_DL_FRAME_PARMS   *frame_parms  = &eNB->frame_parms;
-  NB_IoT_eNB_ULSCH_t      *ulsch        = eNB->ulsch[UE_id];
+  NB_IoT_eNB_NULSCH_t     *ulsch        = eNB->ulsch[UE_id];
   NB_IoT_UL_eNB_HARQ_t    *ulsch_harq;
 
   uint8_t         harq_pid;

openair1/PHY/LTE_TRANSPORT/ulsch_demodulation_NB_IoT.c

@@ -1398,7 +1398,7 @@ void rx_ulsch_NB_IoT(PHY_VARS_eNB_NB_IoT     *eNB,
 	                   eNB_rxtx_proc_NB_IoT_t  *proc,
                      uint8_t                 eNB_id,  // this is the effective sector id
                      uint8_t                 UE_id,
-                     NB_IoT_eNB_ULSCH_t      **ulsch,
+                     NB_IoT_eNB_NULSCH_t     **ulsch,
                      uint8_t                 cooperation_flag)
 {
   // flagMag = 0;

openair1/PHY/defs_NB_IoT.h

@@ -544,7 +544,7 @@ typedef struct PHY_VARS_eNB_NB_IoT_s {
   NB_IoT_eNB_PUSCH              *pusch_vars[NUMBER_OF_UE_MAX_NB_IoT];
   NB_IoT_eNB_PRACH              prach_vars;
   //LTE_eNB_DLSCH_t             *dlsch[NUMBER_OF_UE_MAX_NB_IoT][2];             // Nusers times two spatial streams
-  NB_IoT_eNB_ULSCH_t            *ulsch[NUMBER_OF_UE_MAX_NB_IoT+1];              // Nusers + number of RA (the ulsch[0] contains RAR)
+  NB_IoT_eNB_NULSCH_t            *ulsch[NUMBER_OF_UE_MAX_NB_IoT+1];              // Nusers + number of RA (the ulsch[0] contains RAR)
   //LTE_eNB_DLSCH_t             *dlsch_SI,*dlsch_ra;
   //LTE_eNB_DLSCH_t             *dlsch_MCH;
   NB_IoT_eNB_UE_stats           UE_stats[NUMBER_OF_UE_MAX_NB_IoT];