Update defs.h

openair2/LAYER2/MAC/defs.h

@@ -340,9 +340,9 @@ typedef struct {
 
 /// num active users
   uint16_t num_dlactive_UEs;
-  ///  available number of PRBs for a give SF fix to 1 in NB-IoT
+  ///  available number of PRBs for a give SF fixed in 1 in NB-IoT
   uint16_t available_prbs;
-  /// total number of PRB available for the user plane in NB-IoT
+  /// total number of PRB available for the user plane fixed in 1 in NB-IoT
   uint32_t total_available_prbs;
   /// aggregation
   /// total avilable nccc : num control channel element
@@ -390,15 +390,15 @@ typedef struct {
   rnti_t crnti; ///user id (rnti) of connected UEs
   // rrc status
   uint8_t rrc_status;
-  /// harq pid set to 1 in NB-IoT
+  /// harq pid
   uint8_t harq_pid;
   /// harq rounf
   uint8_t harq_round;
-  /// DL Wideband CQI index (2 TBs) 
-  //uint8_t dl_cqi;
-  /// total available number of PRBs for a new transmission fix to 1 in NB-IoT
+  /// DL Wideband CQI index (2 TBs)
+  uint8_t dl_cqi;
+  /// total available number of PRBs for a new transmission
   uint16_t rbs_used;
-  /// total available number of PRBs for a retransmission fix to 1 in NB-IoT
+  /// total available number of PRBs for a retransmission
   uint16_t rbs_used_retx;
   /// total nccc used for a new transmission: num control channel element
   uint16_t ncce_used;
@@ -729,9 +729,9 @@ typedef struct {
 /*! \brief UE list used by eNB to order UEs/CC for scheduling*/
 typedef struct {
   /// DLSCH pdu
-  DLSCH_PDU DLSCH_pdu[MAX_NUM_CCs][2][NUMBER_OF_UE_MAX];
+  DLSCH_PDU_NB DLSCH_pdu[MAX_NUM_CCs][2][NUMBER_OF_UE_MAX];
   /// DCI template and MAC connection parameters for UEs
-  UE_TEMPLATE UE_template[MAX_NUM_CCs][NUMBER_OF_UE_MAX];
+  UE_TEMPLATE_NB UE_template[MAX_NUM_CCs][NUMBER_OF_UE_MAX];
   /// DCI template and MAC connection for RA processes
   int pCC_id[NUMBER_OF_UE_MAX];
   /// Delete sorted downlink component carrier for the scheduler
@@ -760,15 +760,26 @@ typedef struct {
 
 /*! \brief eNB common channels */
 typedef struct {
+  int                              physCellId;
+  int                              p_eNB;
+  int                              Ncp;
+  int                              eutra_band;
+  uint32_t                         dl_CarrierFreq;
+  BCCH_BCH_Message_NB_t               *mib;
+  RadioResourceConfigCommonSIB_NB_r13   *radioResourceConfigCommon;  
+  ARFCN_ValueEUTRA_r9_t               ul_CarrierFreq;
+  struct MasterInformationBlock_NB__operationModeInfo_r13_u operationModeInfo;
+  
+  
   /// Outgoing DCI for PHY generated by eNB scheduler
-  DCI_PDU DCI_pdu;
+  DCI_PDU_NB DCI_pdu;
   /// Outgoing BCCH pdu for PHY
-  BCCH_PDU BCCH_pdu;
+  BCCH_PDU_NB BCCH_pdu;
   /// Outgoing BCCH DCI allocation
   uint32_t BCCH_alloc_pdu;
   /// Outgoing CCCH pdu for PHY
   CCCH_PDU CCCH_pdu;
-  RA_TEMPLATE RA_template[NB_RA_PROC_MAX];
+  RA_TEMPLATE_NB RA_template[NB_RA_PROC_MAX];
   /// Delete VRB map for common channels
 
   /// Delete MBSFN SubframeConfig
@@ -815,8 +826,8 @@ typedef struct {
   /// subframe counter
   sub_frame_t subframe;
   /// Common cell resources
-  COMMON_channels_t common_channels[MAX_NUM_CCs];
-  UE_list_t UE_list;
+  COMMON_channels_t_NB common_channels[MAX_NUM_CCs];
+  UE_list_t_NB UE_list;
 
   ///Delete subband bitmap configuration, no related CQI report
 
@@ -941,11 +952,11 @@ typedef struct {
   /// uplink active flag
   uint8_t ul_active;
   /// pointer to RRC PHY configuration
-  RadioResourceConfigCommonSIB_t *radioResourceConfigCommon;
+  RadioResourceConfigCommonSIB_NB_r13 *radioResourceConfigCommon;
   /// pointer to RACH_ConfigDedicated (NULL when not active, i.e. upon HO completion or T304 expiry)
   struct RACH_ConfigDedicated *rach_ConfigDedicated;
   /// pointer to RRC PHY configuration
-  struct PhysicalConfigDedicated *physicalConfigDedicated;
+  struct PhysicalConfigDedicated_NB_r13 *physicalConfigDedicated;
 #if defined(Rel10) || defined(Rel14)
   /// Delete pointer to RRC PHY configuration SCEll
 
@@ -957,15 +968,15 @@ typedef struct {
   /// Delete Array of adjacent physical cell ids
 
   /// Pointer to RRC MAC configuration
-  MAC_MainConfig_t *macConfig;
+  MAC_MainConfig_NB_r13 *macConfig;
   /// Delete Pointer to RRC Measurement gap configuration
 
   /// Pointers to LogicalChannelConfig indexed by LogicalChannelIdentity. Note NULL means LCHAN is inactive.
-  LogicalChannelConfig_t *logicalChannelConfig[MAX_NUM_LCID];
+  LogicalChannelConfig_NB_r13 *logicalChannelConfig[MAX_NUM_LCID];
   /// Scheduling Information
-  UE_SCHEDULING_INFO scheduling_info;
+  UE_SCHEDULING_INFO_NB scheduling_info;
   /// Outgoing CCCH pdu for PHY
-  CCCH_PDU CCCH_pdu;
+  CCCH_PDU_NB CCCH_pdu;
   /// Incoming DLSCH pdu for PHY
   //DLSCH_PDU DLSCH_pdu[NUMBER_OF_UE_MAX][2];
   /// number of attempt for rach