Stable version of configuration

openair2/COMMON/rrc_messages_types.h

@@ -197,7 +197,6 @@ typedef struct RrcConfigurationReq_s {
   long*			  q_QualMinRSRQ_CE_r13                   [MAX_NUM_CCs];
   BOOLEAN_t		  bandwidthReducedAccessRelatedInfo_r13  [MAX_NUM_CCs];
 
-//  +kogo -- FIXME -- size 10 is temporary
   long            si_Narrowband_r13         [MAX_NUM_CCs][32];
   long            si_TBS_r13                [MAX_NUM_CCs][32];
   int             scheduling_info_br_size   [MAX_NUM_CCs];

openair2/RRC/LITE/MESSAGES/asn1_msg.c

@@ -558,6 +558,7 @@ uint8_t do_SIB1(rrc_eNB_carrier_data_t *carrier,
 
       if (configuration->bandwidthReducedAccessRelatedInfo_r13[CC_id])
       {
+          printf("[DEBUGGING][KOGO][TANY2]: bandwidthReducedAccessRelatedInfo_r13 = %d\n", configuration->bandwidthReducedAccessRelatedInfo_r13[CC_id]);
 
           sib1_1310->bandwidthReducedAccessRelatedInfo_r13
                   = calloc(1, sizeof(struct SystemInformationBlockType1_v1310_IEs__bandwidthReducedAccessRelatedInfo_r13));
@@ -572,6 +573,8 @@ uint8_t do_SIB1(rrc_eNB_carrier_data_t *carrier,
           sib1_1310->bandwidthReducedAccessRelatedInfo_r13->si_RepetitionPattern_r13
                   = configuration->si_RepetitionPattern_r13[CC_id]; // 0
 
+          printf("[DEBUGGING][KOGO][ASN1]: si_RepetitionPattern_r13 = %d\n", configuration->si_RepetitionPattern_r13[CC_id]);
+
           sib1_1310->bandwidthReducedAccessRelatedInfo_r13->schedulingInfoList_BR_r13 = calloc(1, sizeof(SchedulingInfoList_BR_r13_t));
 
           SchedulingInfo_BR_r13_t *schedulinginfo_br_13 = calloc(1, sizeof(SchedulingInfo_BR_r13_t));
@@ -584,6 +587,8 @@ uint8_t do_SIB1(rrc_eNB_carrier_data_t *carrier,
 
               schedulinginfo_br_13->si_Narrowband_r13 = configuration->si_Narrowband_r13[CC_id][index];
               schedulinginfo_br_13->si_TBS_r13 = configuration->si_TBS_r13[CC_id][index];
+              printf("[DEBUGGING][ASN1]: si_NarrowBand_r13: %d\n", configuration->si_Narrowband_r13[CC_id][index]);
+              printf("[DEBUGGING][ASN1]: si_TBS_r13: %d\n", configuration->si_TBS_r13[CC_id][index]);
               LOG_I(RRC,"Adding (%d,%d) to scheduling_info_br_13\n",schedulinginfo_br_13->si_Narrowband_r13,schedulinginfo_br_13->si_TBS_r13);
               ASN_SEQUENCE_ADD(&sib1_1310->bandwidthReducedAccessRelatedInfo_r13->schedulingInfoList_BR_r13->list, schedulinginfo_br_13);
           }
@@ -1276,14 +1281,18 @@ uint8_t do_SIB23(uint8_t Mod_id,
 
       if (configuration->sib2_interval_ULHoppingConfigCommonModeA_r13[CC_id])
       {
+          puts("[DEBUGGING][KOGO][ASN]: SIB2 Interval UL HOPPING CONFIG COMMON MODE A\n");
           (*sib2)->radioResourceConfigCommon.ext4->freqHoppingParameters_r13->interval_ULHoppingConfigCommonModeA_r13
                   = CALLOC(1, sizeof(struct FreqHoppingParameters_r13__interval_ULHoppingConfigCommonModeA_r13));
           if (*configuration->sib2_interval_ULHoppingConfigCommonModeA_r13[CC_id] == 0)
           {
+              printf("[DEBUGGING][KOGO][ASN]: FDD UL HOPPING CONFIG COMMON MODE A\n");
+              printf("[DEBUGGING][KOGO][ASN]: interval UL hopping config common:  %d\n", configuration->sib2_interval_ULHoppingConfigCommonModeA_r13_val[CC_id]);
               (*sib2)->radioResourceConfigCommon.ext4->freqHoppingParameters_r13->interval_ULHoppingConfigCommonModeA_r13->present
                       = FreqHoppingParameters_r13__interval_ULHoppingConfigCommonModeA_r13_PR_interval_FDD_r13;
               (*sib2)->radioResourceConfigCommon.ext4->freqHoppingParameters_r13->interval_ULHoppingConfigCommonModeA_r13->choice.interval_FDD_r13
                       = configuration->sib2_interval_ULHoppingConfigCommonModeA_r13_val[CC_id];
+
           }
           else
           {
@@ -1296,6 +1305,7 @@ uint8_t do_SIB23(uint8_t Mod_id,
       }
       else
       {
+          printf("[DEBUGGING][KOGO][ALLOC ERROR] interval ul hopping: %d\n", configuration->sib2_interval_ULHoppingConfigCommonModeA_r13[CC_id]);
           (*sib2)->radioResourceConfigCommon.ext4->freqHoppingParameters_r13->interval_ULHoppingConfigCommonModeA_r13 = NULL;
       }
 
@@ -1419,7 +1429,6 @@ uint8_t do_SIB23(uint8_t Mod_id,
           ASN_SEQUENCE_ADD(&(*sib2)->radioResourceConfigCommon.ext4->prach_ConfigCommon_v1310->rsrp_ThresholdsPrachInfoList_r13.list, rsrp_range);
       }
 
-
       (*sib2)->radioResourceConfigCommon.ext4->prach_ConfigCommon_v1310->mpdcch_startSF_CSS_RA_r13 = NULL;
 
       if (rrconfig->mpdcch_startSF_CSS_RA_r13)
@@ -1437,6 +1446,8 @@ uint8_t do_SIB23(uint8_t Mod_id,
               (*sib2)->radioResourceConfigCommon.ext4->prach_ConfigCommon_v1310->mpdcch_startSF_CSS_RA_r13->present = PRACH_ConfigSIB_v1310__mpdcch_startSF_CSS_RA_r13_PR_tdd_r13;
               (*sib2)->radioResourceConfigCommon.ext4->prach_ConfigCommon_v1310->mpdcch_startSF_CSS_RA_r13->choice.tdd_r13 = rrconfig->mpdcch_startSF_CSS_RA_r13_val;
           }
+          printf("[DEBUGGING][KOGO][SIB23]: mpdcch_startSF_CSS_RA_r13->choice.fdd_r13 = %d\n",
+                 (*sib2)->radioResourceConfigCommon.ext4->prach_ConfigCommon_v1310->mpdcch_startSF_CSS_RA_r13->choice.fdd_r13);
       }
 
       if (rrconfig->prach_HoppingOffset_r13)
@@ -1448,6 +1459,8 @@ uint8_t do_SIB23(uint8_t Mod_id,
       {
           (*sib2)->radioResourceConfigCommon.ext4->prach_ConfigCommon_v1310->prach_HoppingOffset_r13 = NULL;
       }
+      printf("[DEBUGGING][KOGO][SIB23]: prach_HoppingOffset_r13 = %d\n",
+             *(*sib2)->radioResourceConfigCommon.ext4->prach_ConfigCommon_v1310->prach_HoppingOffset_r13);
 
       PRACH_ParametersCE_r13_t *prach_parametersce_r13;
 
@@ -1458,7 +1471,6 @@ uint8_t do_SIB23(uint8_t Mod_id,
       for (prach_parameters_index = 0; prach_parameters_index < num_prach_parameters_ce; ++prach_parameters_index)
       {
           prach_parametersce_r13 = CALLOC(1, sizeof(PRACH_ParametersCE_r13_t));
-        
           prach_parametersce_r13->prach_ConfigIndex_r13 = configuration->prach_config_index[CC_id][prach_parameters_index];
           prach_parametersce_r13->prach_FreqOffset_r13 = configuration->prach_freq_offset[CC_id][prach_parameters_index];
 
@@ -1488,9 +1500,16 @@ uint8_t do_SIB23(uint8_t Mod_id,
           prach_parametersce_r13->numRepetitionPerPreambleAttempt_r13 = configuration->numRepetitionPerPreambleAttempt_r13[CC_id][prach_parameters_index];
           prach_parametersce_r13->mpdcch_NumRepetition_RA_r13 = configuration->mpdcch_NumRepetition_RA_r13[CC_id][prach_parameters_index];
           prach_parametersce_r13->prach_HoppingConfig_r13 = configuration->prach_HoppingConfig_r13[CC_id][prach_parameters_index];
-    printf("[DEBUGGING][KOGO][SIB23] : prach hopping config = %d\n", prach_parametersce_r13->prach_HoppingConfig_r13);
 
 
+          printf("[DEBUGGING][KOGO][SIB23][WTF] : prach_ConfigIndex_r13 = %d\n", prach_parametersce_r13->prach_ConfigIndex_r13);
+          printf("[DEBUGGING][KOGO][SIB23][WTF] : prach_FreqOffset_r13 = %d\n", prach_parametersce_r13->prach_FreqOffset_r13);
+          printf("[DEBUGGING][KOGO][SIB23][WTF] : prach_StartingSubframe_r13 = %d\n", *prach_parametersce_r13->prach_StartingSubframe_r13);
+          printf("[DEBUGGING][KOGO][SIB23][WTF] : maxNumPreambleAttemptCE_r13 = %d\n", *prach_parametersce_r13->maxNumPreambleAttemptCE_r13);
+          printf("[DEBUGGING][KOGO][SIB23][WTF] : numRepetitionPerPreambleAttempt_r13 = %d\n", prach_parametersce_r13->numRepetitionPerPreambleAttempt_r13);
+          printf("[DEBUGGING][KOGO][SIB23][WTF] : mpdcch_NumRepetition_RA_r13 = %d\n", prach_parametersce_r13->mpdcch_NumRepetition_RA_r13);
+          printf("[DEBUGGING][KOGO][SIB23][WTF] : prach_HoppingConfig_r13 = %d\n", prach_parametersce_r13->prach_HoppingConfig_r13);
+
           long *maxavailablenarrowband;
           int num_narrow_bands = configuration->max_available_narrow_band_size[CC_id][prach_parameters_index];
           int narrow_band_index;
@@ -1501,8 +1520,17 @@ uint8_t do_SIB23(uint8_t Mod_id,
               ASN_SEQUENCE_ADD(&prach_parametersce_r13->mpdcch_NarrowbandsToMonitor_r13.list, maxavailablenarrowband);
           }
 
+
+          printf("[DEBUGGING][KOGO][SIB23][WTF] : maxavailablenarrowband = %d\n", *maxavailablenarrowband);
+
+
           prach_parametersce_r13->mpdcch_NumRepetition_RA_r13 = PRACH_ParametersCE_r13__mpdcch_NumRepetition_RA_r13_r1;
           prach_parametersce_r13->prach_HoppingConfig_r13 = PRACH_ParametersCE_r13__prach_HoppingConfig_r13_off;
+
+          printf("[DEBUGGING][KOGO][SIB23][WTF] : mpdcch_NumRepetition_RA_r13 = %d\n", prach_parametersce_r13->mpdcch_NumRepetition_RA_r13);
+          printf("[DEBUGGING][KOGO][SIB23][WTF] : prach_HoppingConfig_r13 = %d\n", prach_parametersce_r13->prach_HoppingConfig_r13);
+
+
           ASN_SEQUENCE_ADD(&(*sib2)->radioResourceConfigCommon.ext4->prach_ConfigCommon_v1310->prach_ParametersListCE_r13.list, prach_parametersce_r13);
       }
   }

targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band13.tm1.50PRB.emtc.conf

@@ -133,14 +133,14 @@ eNBs =
           scheduling_info_br =
           (
               {
-                  si_Narrowband_r13 = 5;
+                  si_Narrowband_r13 = 8;
                   si_TBS_r13        = 5;
               }
          );
 
           fdd_DownlinkOrTddSubframeBitmapBR_r13     = "subframePattern40-r13"; 
           fdd_DownlinkOrTddSubframeBitmapBR_val_r13 = 0xFFFFFFFFFF;
-          startSymbolBR_r13                           = 3;
+          startSymbolBR_r13                           = 2;
           si_HoppingConfigCommon_r13                  = "off"; #1; # Note: 1==OFF !
           si_ValidityTime_r13                         = "true"; #0
 
@@ -159,10 +159,10 @@ eNBs =
 
           rach_numberOfRA_Preambles                 = "n60"; #14
           rach_powerRampingStep                     = 4;
-          rach_preambleInitialReceivedTargetPower   = -108;           
+          rach_preambleInitialReceivedTargetPower   = -110;           
           rach_preambleTransMax                     = 10;
           rach_raResponseWindowSize                 = 10;
-          rach_macContentionResolutionTimer         = 48;
+          rach_macContentionResolutionTimer         = 64;
           rach_maxHARQ_Msg3Tx                       = 4;
 
           # max size for this array is 4
@@ -188,11 +188,11 @@ eNBs =
           prach_root                                = 89;
           prach_config_index                        = 3;
           prach_high_speed                          = "DISABLE";
-          prach_zero_correlation                    = 1;
-          prach_freq_offset                         = 1;
+          prach_zero_correlation                    = 12;
+          prach_freq_offset                         = 2;
 
           #PDSCH Config Common          
-          pdsch_referenceSignalPower                = -27;
+          pdsch_referenceSignalPower                = 12; # was -27
           pdsch_p_b                                 = 0;
 
 
@@ -214,7 +214,7 @@ eNBs =
           pusch_p0_Nominal                          = -96;
           pusch_alpha                               = "AL1";
           pucch_p0_Nominal                          = -104;
-          pucch_deltaF_Format1                      = "deltaF2";             
+          pucch_deltaF_Format1                      = "deltaF0"; 
           pucch_deltaF_Format1b                     = "deltaF3";            
           pucch_deltaF_Format2                      = "deltaF0";           
           pucch_deltaF_Format2a                     = "deltaF0";            
@@ -225,6 +225,11 @@ eNBs =
 
           prach_ConfigCommon_v1310                  = "ENABLE";
  
+          mpdcch_startSF_CSS_RA_r13                 = "fdd-r13";
+          mpdcch_startSF_CSS_RA_r13_val             = "v1"; #0
+          prach_HoppingOffset_r13                   = 0;
+
+         
           pdsch_maxNumRepetitionCEmodeA_r13         = "r16"; #0
           #pdsch_maxNumRepetitionCEmodeB_r13         = "r384"; # NULL - 2
 
@@ -240,16 +245,12 @@ eNBs =
               }
           );
 
-          mpdcch_startSF_CSS_RA_r13                 = "fdd-r13";
-          mpdcch_startSF_CSS_RA_r13_val             = "v1"; #0
-          prach_HoppingOffset_r13                   = 0;
-
           # max size for this array is 4
           prach_parameters_ce_r13 = 
           (
               {
                   prach_config_index_br                     = 3;
-                  prach_freq_offset_br                      = 1;
+                  prach_freq_offset_br                      = 2;
                   prach_StartingSubframe_r13                = 0;
                   maxNumPreambleAttemptCE_r13               = "n10"; #6
                   numRepetitionPerPreambleAttempt_r13       = "n1";  #0