Merge branch 'NR_RRC_harq_hacks' of...

Merge branch 'NR_RRC_harq_hacks' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRC_harq_hacks

common/config/libconfig/config_libconfig.c

@@ -179,8 +179,8 @@ int config_libconfig_get(paramdef_t *cfgoptions,int numoptions, char *prefix ) {
             *(cfgoptions[i].u64ptr) = (uint64_t)llu;
             printf_params("[LIBCONFIG] %s: %llu\n", cfgpath,(long long unsigned)(*(cfgoptions[i].u64ptr)) );
           } else {
-            *(cfgoptions[i].iptr) = llu;
-            printf_params("[LIBCONFIG] %s: %llu\n", cfgpath,(long long unsigned)(*(cfgoptions[i].i64ptr)) );
+            *(cfgoptions[i].i64ptr) = llu;
+            printf_params("[LIBCONFIG] %s: %llu\n", cfgpath,(long long)(*(cfgoptions[i].i64ptr)) );
           }
         } else {
           defval=config_setdefault_int64(&(cfgoptions[i]),prefix);

openair2/GNB_APP/gnb_config.c

@@ -259,11 +259,6 @@ void fix_scc(NR_ServingCellConfigCommon_t *scc,uint64_t ssbmap) {
   if (*scc->uplinkConfigCommon->initialUplinkBWP->rach_ConfigCommon->choice.setup->msg3_transformPrecoder!=0)
     scc->uplinkConfigCommon->initialUplinkBWP->rach_ConfigCommon->choice.setup->msg3_transformPrecoder = NULL;
 
-  // fix libconfig (asn1c uses long) 
-  scc->uplinkConfigCommon->initialUplinkBWP->rach_ConfigCommon->choice.setup->rach_ConfigGeneric.preambleReceivedTargetPower-=((long)1<<32); 
-  *scc->uplinkConfigCommon->initialUplinkBWP->pusch_ConfigCommon->choice.setup->p0_NominalWithGrant-=((long)1<<32);
-  *scc->uplinkConfigCommon->initialUplinkBWP->pucch_ConfigCommon->choice.setup->p0_nominal-=((long)1<<32);
-
   // fix DL and UL Allocation lists
   
   for (int i=scc->downlinkConfigCommon->initialDownlinkBWP->pdsch_ConfigCommon->choice.setup->pdsch_TimeDomainAllocationList->list.count-1;i>=0;i--) {

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c

@@ -653,7 +653,7 @@ void nr_schedule_uss_dlsch_phytest(module_id_t   module_idP,
     }
     //Sending SDUs with size 1
     //Initialize elements of sdu_lcids and sdu_lengths
-    sdu_lcids[0] = 0x05; // DRB
+    sdu_lcids[0] = 0x3f; // DRB
     sdu_lengths[0] = TBS_bytes - ta_len - 3;
     header_length_total += 2 + (sdu_lengths[0] >= 128);
     sdu_length_total += sdu_lengths[0];

targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_enb.conf

@@ -258,7 +258,7 @@ RUs = (
          max_pdschReferenceSignalPower = -27;
          max_rxgain                    = 118;
          eNB_instances  = [0];
-
+         clock_src = "external";
     }
 );  
 

targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb.conf

@@ -100,7 +100,7 @@ gNBs =
           prach_msg1_FDM                                            = 0;
           prach_msg1_FrequencyStart                                 = 0;
           zeroCorrelationZoneConfig                                 = 13;
-          preambleReceivedTargetPower                               = -118;
+          preambleReceivedTargetPower                               = -100;
 #preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
           preambleTransMax                                          = 6;
 #powerRampingStep
@@ -185,7 +185,7 @@ gNBs =
       nrofUplinkSlots                                               = 2;
       nrofUplinkSymbols                                             = 4; //0; //4;
 
-  ssPBCH_BlockPower                                             = 10;
+  ssPBCH_BlockPower                                             = -25;
   }
 
   );
@@ -259,7 +259,7 @@ RUs = (
          max_pdschReferenceSignalPower = -27;
          max_rxgain                    = 114;
          eNB_instances  = [0];
-         clock_src = "internal";
+         clock_src = "external";
     }
 );