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

Conflicts:
	openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c

openair1/PHY/NR_TRANSPORT/nr_prach.c

@@ -150,6 +150,7 @@ void rx_nr_prach_ru(RU_t *ru,
 
   int16_t            **rxsigF=NULL;
   NR_DL_FRAME_PARMS *fp=ru->nr_frame_parms;
+  int slot2=slot;
 
   int16_t *prach[ru->nb_rx];
   int prach_sequence_length = ru->config.prach_config.prach_sequence_length.value;
@@ -159,9 +160,10 @@ void rx_nr_prach_ru(RU_t *ru,
   rxsigF            = ru->prach_rxsigF;
 
   AssertFatal(ru->if_south == LOCAL_RF,"we shouldn't call this if if_south != LOCAL_RF\n");
-  for (int aa=0; aa<ru->nb_rx; aa++) 
-    prach[aa] = (int16_t*)&ru->common.rxdata[aa][(slot*fp->get_samples_per_slot(slot,fp))-ru->N_TA_offset];
-  
+  for (int aa=0; aa<ru->nb_rx; aa++){ 
+    if (prach_sequence_length == 0) slot2=(slot/fp->slots_per_subframe)*fp->slots_per_subframe; 
+    prach[aa] = (int16_t*)&ru->common.rxdata[aa][(slot2*fp->get_samples_per_slot(slot,fp))-ru->N_TA_offset];
+  } 
 
 
   int mu = fp->numerology_index;
@@ -170,7 +172,7 @@ void rx_nr_prach_ru(RU_t *ru,
 
   if (prach_sequence_length == 0) {
     LOG_D(PHY,"PRACH (ru %d) in %d.%d, format %d, msg1_frequencyStart %d\n",
-	  ru->idx,frame,slot,prachFormat,msg1_frequencystart);
+	  ru->idx,frame,slot2,prachFormat,msg1_frequencystart);
     AssertFatal(prachFormat<4,"Illegal prach format %d for length 839\n",prachFormat);
     switch (prachFormat) {
     case 0:

openair1/SIMULATION/NR_PHY/prachsim.c

@@ -89,7 +89,7 @@ int main(int argc, char **argv){
   int i, aa, aarx, **txdata, trial, n_frames = 1, prach_start, rx_prach_start; //, ntrials=1;
   int N_RB_UL = 106, delay = 0, NCS_config = 13, rootSequenceIndex = 1, threequarter_fs = 0, mu = 1, fd_occasion = 0, loglvl = OAILOG_INFO, numRA = 0, prachStartSymbol = 0;
   uint8_t snr1set = 0, ue_speed1set = 0, transmission_mode = 1, n_tx = 1, n_rx = 1, awgn_flag = 0, msg1_frequencystart = 0, num_prach_fd_occasions = 1, prach_format;
-  uint8_t frame = 1, subframe = 9, slot=19, config_index = 98, prach_sequence_length = 1, num_root_sequences = 16, restrictedSetConfig = 0, N_dur, N_t_slot, start_symbol;
+  uint8_t frame = 1, subframe = 9, slot=19, slot_gNB=19, config_index = 98, prach_sequence_length = 1, num_root_sequences = 16, restrictedSetConfig = 0, N_dur, N_t_slot, start_symbol;
   uint16_t Nid_cell = 0, preamble_tx = 0, preamble_delay, format, format0, format1;
   uint32_t tx_lev = 10000, prach_errors = 0, samp_count; //,tx_lev_dB;
   uint64_t SSB_positions = 0x01, absoluteFrequencyPointA = 640000;
@@ -318,7 +318,7 @@ int main(int argc, char **argv){
   }
 
   
-  if (config_index<67)  { prach_sequence_length=0; slot = subframe*2; }
+  if (config_index<67)  { prach_sequence_length=0; slot = subframe*2; slot_gNB = 1+(subframe*2); }
 
   printf("Config_index %d, prach_sequence_length %d\n",config_index,prach_sequence_length);
 
@@ -384,9 +384,9 @@ int main(int argc, char **argv){
 
   gNB->proc.slot_rx       = slot;
 
-  get_nr_prach_info_from_index(config_index,
+  int ret = get_nr_prach_info_from_index(config_index,
                                (int)frame,
-                               (int)slot,
+                               (int)slot_gNB,
                                absoluteFrequencyPointA,
                                mu,
                                frame_parms->frame_type,
@@ -395,6 +395,7 @@ int main(int argc, char **argv){
                                &N_t_slot,
                                &N_dur);
 
+  if (ret == 0) {printf("No prach in %d.%d, mu %d, config_index %d\n",frame,slot,mu,config_index); exit(-1);}
   format0 = format&0xff;      // first column of format from table
   format1 = (format>>8)&0xff; // second column of format from table
 

openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c

@@ -954,9 +954,9 @@ int get_nr_prach_info_from_index(uint8_t index,
             if (table_6_3_3_2_3_prachConfig_Index[index][1] != -1)
               format2 = (uint8_t) table_6_3_3_2_3_prachConfig_Index[index][1];
             *format = ((uint8_t) table_6_3_3_2_3_prachConfig_Index[index][0]) | (format2<<8);
-            LOG_I(MAC,"Frame %d slot %d: Getting PRACH info from index %d absoluteFrequencyPointA %u mu %u frame_type %u start_symbol %u N_t_slot %u N_dur %u \n", frame,
+            LOG_D(MAC,"Frame %d slot %d: Getting PRACH info from index %d (col 6 %d) absoluteFrequencyPointA %u mu %u frame_type %u start_symbol %u N_t_slot %u N_dur %u \n", frame,
               slot,
-              index,
+              index, table_6_3_3_2_3_prachConfig_Index[index][6],
               pointa,
               mu,
               unpaired,
@@ -980,7 +980,7 @@ int get_nr_prach_info_from_index(uint8_t index,
         s_map = table_6_3_3_2_2_prachConfig_Index[index][4];
         if ( (s_map>>subframe)&0x01 ) {
           if (mu == 1) {
-            if ( (table_6_3_3_2_2_prachConfig_Index[index][6] == 1) && (slot%2 == 0) )
+            if ( (table_6_3_3_2_2_prachConfig_Index[index][6] <= 1) && (slot%2 == 0) )
               return 0; // no prach in even slots @ 30kHz for 1 prach per subframe
           }
           if (start_symbol != NULL && N_t_slot != NULL && N_dur != NULL && format != NULL){

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c

@@ -378,6 +378,7 @@ int configure_fapi_dl_pdu(int Mod_idP,
   // PDSCH to HARQ TI
   dci_pdu_rel15[0].pdsch_to_harq_feedback_timing_indicator.val = pucch_sched->timing_indicator;
   UE_list->UE_sched_ctrl[UE_id].harq_processes[current_harq_pid].feedback_slot = pucch_sched->ul_slot;
+  UE_list->UE_sched_ctrl[UE_id].harq_processes[current_harq_pid].is_waiting = 1;
   // antenna ports
   dci_pdu_rel15[0].antenna_ports.val = 0;  // nb of cdm groups w/o data 1 and dmrs port 0
 

openair2/LAYER2/NR_MAC_gNB/main.c

@@ -116,6 +116,7 @@ void mac_top_init_gNB(void)
       for (int list_harq = 0; list_harq < NR_MAX_NB_HARQ_PROCESSES; list_harq++) {
         UE_list->UE_sched_ctrl[list_el].harq_processes[list_harq].round = 0;
         UE_list->UE_sched_ctrl[list_el].harq_processes[list_harq].ndi = 0;
+        UE_list->UE_sched_ctrl[list_el].harq_processes[list_harq].is_waiting = 0;
       }
     }
 

openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h

@@ -188,6 +188,7 @@ typedef struct NR_sched_pucch {
 } NR_sched_pucch;
 
 typedef struct NR_UE_harq {
+  uint8_t is_waiting;
   uint8_t ndi;
   uint8_t round;
   uint16_t feedback_slot;

openair2/NR_PHY_INTERFACE/NR_IF_Module.c

@@ -102,9 +102,20 @@ void handle_nr_uci(NR_UL_IND_t *UL_info, NR_UE_sched_ctrl_t *sched_ctrl) {
                 sched_ctrl->harq_processes[harq_idx].ndi ^= 1;
                 sched_ctrl->harq_processes[harq_idx].round = 0;
               }
+              sched_ctrl->harq_processes[harq_idx].is_waiting = 0;
               harq_idx_s = harq_idx + 1;
               break;
             }
+            // if gNB fails to receive a ACK/NACK
+            else if (((UL_info->slot-1) > sched_ctrl->harq_processes[harq_idx].feedback_slot) &&
+                    (sched_ctrl->harq_processes[harq_idx].is_waiting)) {
+              sched_ctrl->harq_processes[harq_idx].round++;
+              if (sched_ctrl->harq_processes[harq_idx].round == max_harq_rounds) {
+                sched_ctrl->harq_processes[harq_idx].ndi ^= 1;
+                sched_ctrl->harq_processes[harq_idx].round = 0;
+              }
+              sched_ctrl->harq_processes[harq_idx].is_waiting = 0;
+            }
           }
         }
         break;