NR_UE: fixes for no_harq mode

openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c

@@ -897,7 +897,10 @@ void nr_ra_succeeded(const module_id_t mod_id, const uint8_t gNB_index, const fr
     mac->crnti = ra->t_crnti;
     ra->t_crnti = 0;
     LOG_D(MAC, "In %s: [UE %d][%d.%d] CB-RA: cleared contention resolution timer...\n", __FUNCTION__, mod_id, frame, slot);
-    mac->state = UE_WAIT_TX_ACK_MSG4;
+    if(get_softmodem_params()->no_harq)
+      mac->state = UE_CONNECTED;
+    else
+      mac->state = UE_WAIT_TX_ACK_MSG4;
   }
 
   LOG_D(MAC, "In %s: [UE %d] clearing RA_active flag...\n", __FUNCTION__, mod_id);

openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c

@@ -2229,9 +2229,8 @@ bool get_downlink_ack(NR_UE_MAC_INST_t *mac, frame_t frame, int slot, PUCCH_sche
     }
   }
 
-  if(get_softmodem_params()->no_harq) {
-    number_harq_feedback = 0;
-  }
+  if(get_softmodem_params()->no_harq)
+    AssertFatal(number_harq_feedback == 0, "no HARQ feedback should be sent in no_harq mode");
 
   /* no any ack to transmit */
   if (number_harq_feedback == 0) {

openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c

@@ -1111,6 +1111,8 @@ void update_harq_status(module_id_t module_id, uint8_t harq_pid, uint8_t ack_nac
   NR_UE_HARQ_STATUS_t *current_harq = &mac->dl_harq_info[harq_pid];
 
   if (current_harq->active) {
+    if(get_softmodem_params()->no_harq)
+      current_harq->active = false;
     current_harq->ack = ack_nack;
     current_harq->ack_received = true;
     LOG_T(PHY,"Updating harq_status for harq_id %d,ack/nak %d\n",harq_pid,current_harq->ack);