debug openair1/openair2 error

openair1/PHY/LTE_TRANSPORT/proto_NB_IoT.h

@@ -125,7 +125,7 @@ int generate_NDLSCH_NB_IoT(PHY_VARS_eNB               *eNB,
                            int                        RB_IoT_ID,
                            uint8_t                    release_v13_5_0);
 
-int generate_NPDCCH_NB_IoT(NB_IoT_eNB_NPDCCH_t    *DCI,
+int generate_NPDCCH_NB_IoT(NB_IoT_eNB_NPDCCH_t    *DCI_pdu,
                            int32_t                **txdataF,
                            int16_t                amp,
                            LTE_DL_FRAME_PARMS     *frame_parms,

openair1/PHY/NBIoT_TRANSPORT/SIB_NB_IoT.c

@@ -348,7 +348,7 @@ int generate_NDLSCH_NB_IoT(PHY_VARS_eNB           *eNB,
 
 /////////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////
-int generate_NPDCCH_NB_IoT(NB_IoT_eNB_NPDCCH_t 	  *DCI,
+int generate_NPDCCH_NB_IoT(NB_IoT_eNB_NPDCCH_t 	  *DCI_pdu,
 		                   int32_t 				  **txdataF,
 		                   int16_t                amp,
 		                   LTE_DL_FRAME_PARMS 	  *frame_parms,

openair2/LAYER2/MAC/defs_NB_IoT.h

@@ -371,35 +371,6 @@ typedef struct{
 
 }scheduling_flag_t;
 
-typedef struct available_resource_UL_s{
-
-    ///Resource start subframe
-    uint32_t start_subframe;
-    ///Resource end subframe
-    uint32_t end_subframe;
-    // pointer to next node
-    struct available_resource_UL_s *next, *prev;
-
-}available_resource_UL_t;
-
-typedef struct available_resource_DL_s{
-  uint32_t start_subframe;
-  uint32_t end_subframe;
-
-  struct available_resource_DL_s *next, *prev;
-}available_resource_DL_t;
-
-/*Structure used for scheduling*/
-typedef struct{
-  //resource position info.
-  uint32_t sf_end,sf_start;
-  //resource position info. separate by HyperSF, Frame, Subframe
-  uint32_t start_h, end_h;
-  uint32_t start_f, end_f;
-  uint32_t start_sf, end_sf;
-  //whcih available resource node is used
-  available_resource_DL_t *node;
-}sched_temp_DL_NB_IoT_t;
 
 /*!\brief  MAC subheader short with 7bit Length field */
 typedef struct {
@@ -453,21 +424,6 @@ typedef struct {
   uint8_t E:1;
 } __attribute__((__packed__))RA_HEADER_RAPID_NB_IoT;
 
-/*Structure used for UL scheduling*/
-typedef struct{
-  //resource position info.
-  uint32_t sf_end, sf_start;
-  //resource position info. separate by HyperSF, Frame, Subframe
-  //uint32_t start_h, end_h;
-  //uint32_t start_f, end_f;
-  //uint32_t start_sf, end_sf;
-  // information for allocating the resource
-  int tone;
-  int scheduling_delay;
-  int subcarrier_indication;
-  int ACK_NACK_resource_field;
-  available_resource_UL_t *node;
-}sched_temp_UL_NB_IoT_t;
 
 typedef struct Available_available_resource_DL{