- Amend P5 interface structure to more like FAPI style in LTE

- Create PDCCH structre in FAPI, it will be one of P7 structure
- Maintain Configuration Module

openair2/GNB_APP/gnb_app.c

@@ -58,30 +58,6 @@ extern RAN_CONTEXT_t RC;
 #   define GNB_REGISTER_RETRY_DELAY 10
 # endif
 
-/*------------------------------------------------------------------------------*/
-
-/*
-static void configure_phy(module_id_t enb_id, const Enb_properties_array_t* enb_properties)
-{
-  MessageDef *msg_p;
-  int CC_id;
-
-  msg_p = itti_alloc_new_message (TASK_ENB_APP, PHY_CONFIGURATION_REQ);
-
-  for (CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) {
-    PHY_CONFIGURATION_REQ (msg_p).frame_type[CC_id]              = enb_properties->properties[enb_id]->frame_type[CC_id];
-    PHY_CONFIGURATION_REQ (msg_p).prefix_type[CC_id]             = enb_properties->properties[enb_id]->prefix_type[CC_id];
-    PHY_CONFIGURATION_REQ (msg_p).downlink_frequency[CC_id]      = enb_properties->properties[enb_id]->downlink_frequency[CC_id];
-    PHY_CONFIGURATION_REQ (msg_p).uplink_frequency_offset[CC_id] = enb_properties->properties[enb_id]->uplink_frequency_offset[CC_id];
-    PHY_CONFIGURATION_REQ (msg_p).nb_antennas_tx[CC_id]          = enb_properties->properties[enb_id]->nb_antennas_tx[CC_id];
-    PHY_CONFIGURATION_REQ (msg_p).nb_antennas_rx[CC_id]          = enb_properties->properties[enb_id]->nb_antennas_rx[CC_id];
-    PHY_CONFIGURATION_REQ (msg_p).tx_gain[CC_id]                 = enb_properties->properties[enb_id]->tx_gain[CC_id];
-    PHY_CONFIGURATION_REQ (msg_p).rx_gain[CC_id]                 = enb_properties->properties[enb_id]->rx_gain[CC_id];
-  }
-
-  itti_send_msg_to_task (TASK_PHY_ENB, ENB_MODULE_ID_TO_INSTANCE(enb_id), msg_p);
-}
-*/
 
 /*------------------------------------------------------------------------------*/
 static void configure_nr_rrc(uint32_t gnb_id)

openair2/GNB_APP/gnb_config.h

@@ -92,7 +92,7 @@ typedef struct ru_config_s {
 } ru_config_t;
 */
 extern void RCconfig_RU(void);
-extern void RCconfig_flexran(void);
+extern void RCconfig_NR_flexran(void);
 extern void RCconfig_NR_L1(void);
 extern void RCconfig_nr_macrlc(void);
 extern int  RCconfig_gtpu(void );

openair2/GNB_APP/gnb_paramdef.h

@@ -31,7 +31,7 @@
  */
 
 #include "common/config/config_paramdesc.h"
-#include "NR_RRC_paramsvalues.h"
+#include "RRC_nr_paramsvalues.h"
 
 
 #define GNB_CONFIG_STRING_CC_NODE_FUNCTION        "node_function"
@@ -666,7 +666,7 @@ typedef enum {
 {GNB_CONFIG_STRING_RACH_RA_CONTROLRESOURCESET,                                       NULL,        0,        iptr:&rach_ra_ControlResourceSet,                                       defintval:10,                   TYPE_UINT,       0},  \
 {GNB_CONFIG_STRING_PDCCH_COMMON_CONTROLRESOURCESETID,                                NULL,        0,        iptr:&PDCCH_common_controlResourceSetId,                                defintval:5,                    TYPE_UINT,       0},  \
 {GNB_CONFIG_STRING_PDCCH_COMMON_CONTROLRESOURCESET_DURATION,                         NULL,        0,        iptr:&PDCCH_common_ControlResourceSet_duration,                         defintval:2,                    TYPE_UINT,       0},  \
-{GNB_CONFIG_STRING_PDCCH_CCE_REG_MAPPINGTYPE,                                        NULL,        0,        strptr:&PDCCH_cce_REG_MappingType,                                      defstrval:"interleaved",        TYPE_STRING,     0},  \
+{GNB_CONFIG_STRING_PDCCH_CCE_REG_MAPPINGTYPE,                                        NULL,        0,        strptr:&PDCCH_cce_REG_MappingType,                                      defstrval:"nonInterleaved",     TYPE_STRING,     0},  \
 {GNB_CONFIG_STRING_PDCCH_REG_BUNDLESIZE,                                             NULL,        0,        iptr:&PDCCH_reg_BundleSize,                                             defintval:3,                    TYPE_UINT,       0},  \
 {GNB_CONFIG_STRING_PDCCH_INTERLEAVERSIZE,                                            NULL,        0,        iptr:&PDCCH_interleaverSize,                                            defintval:3,                    TYPE_UINT,       0},  \
 {GNB_CONFIG_STRING_PDCCH_SHIFTINDEX,                                                 NULL,        0,        iptr:&PDCCH_shiftIndex,                                                 defintval:10,                   TYPE_UINT,       0},  \

openair2/LAYER2/NR_MAC_gNB/config.c

@@ -162,13 +162,13 @@ void config_common(int Mod_idP,
   //cfg->subframe_config.tl.tag = 
   //cfg->num_tlv++;
 
-  cfg->dl_frequencyinfo.DL_carrierBandwidth.value    = dl_BandwidthP;
-  cfg->dl_frequencyinfo.DL_carrierBandwidth.tl.tag = NFAPI_RF_CONFIG_DL_CHANNEL_BANDWIDTH_TAG; //temporary
+  cfg->rf_config.dl_carrierBandwidth.value    = dl_BandwidthP;
+  cfg->rf_config.dl_carrierBandwidth.tl.tag   = NFAPI_RF_CONFIG_DL_CHANNEL_BANDWIDTH_TAG; //temporary
   cfg->num_tlv++;
   LOG_E(PHY,"%s() dl_BandwidthP:%d\n", __FUNCTION__, dl_BandwidthP);
 
-  cfg->ul_frequencyinfo.UL_carrierBandwidth.value    = dl_BandwidthP;
-  cfg->ul_frequencyinfo.UL_carrierBandwidth.tl.tag = NFAPI_RF_CONFIG_UL_CHANNEL_BANDWIDTH_TAG;  //temporary
+  cfg->rf_config.ul_carrierBandwidth.value    = dl_BandwidthP;
+  cfg->rf_config.ul_carrierBandwidth.tl.tag   = NFAPI_RF_CONFIG_UL_CHANNEL_BANDWIDTH_TAG;  //temporary
   cfg->num_tlv++;
 
   //cfg->sch_config.half_frame_index.value = 0; Fix in PHY

targets/RT/USER/nr-softmodem.c

@@ -1061,7 +1061,7 @@ int main( int argc, char **argv )
 #endif
 
   /* Start the agent. If it is turned off in the configuration, it won't start */
-  RCconfig_flexran();
+  RCconfig_NR_flexran();
   for (i = 0; i < RC.nb_L1_inst; i++) {
     flexran_agent_start(i);
   }