Setting ue_sched_mode after filling RACH_IND

Also, removed the check before calling the
nr_uescheduler that was associated with the
ra.state. Lastly, removed the DL_HARQ_PID
position change as that was incorrect.

executables/nr-ue.c

@@ -320,6 +320,7 @@ static void *NRUE_phy_stub_standalone_pnf_task(void *arg)
         {
           L1_nsa_prach_procedures(ul_info.frame_tx, ul_info.slot_tx, prach_pdu);
           ul_config->number_pdus = 0;
+          ul_info.ue_sched_mode = SCHED_ALL;
         }
         else if (nr_prach == 2)
         {

openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c

@@ -2820,7 +2820,7 @@ uint8_t nr_extract_dci_info(NR_UE_MAC_INST_t *mac,
 	LOG_D(MAC,"RV %d (%d bits)=> %d (0x%lx)\n",dci_pdu_rel15->rv,2,dci_size-pos,*dci_pdu);
 #endif
 	// HARQ process number  4bit
-	pos+=2;
+	pos+=4;
 	dci_pdu_rel15->harq_pid = (*dci_pdu>>(dci_size-pos))&0xf;
 #ifdef DEBUG_EXTRACT_DCI
 	LOG_D(MAC,"HARQ_PID %d (%d bits)=> %d (0x%lx)\n",dci_pdu_rel15->harq_pid,4,dci_size-pos,*dci_pdu);

openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c

@@ -772,7 +772,7 @@ int nr_ue_ul_indication(nr_uplink_indication_t *ul_info){
     ret = nr_ue_scheduler(NULL, ul_info);
     return 0;
   }
-  else if (ul_info->ue_sched_mode == SCHED_ALL || mac->ra.ra_state == RA_SUCCEEDED)
+  else if (ul_info->ue_sched_mode == SCHED_ALL)
     ret = nr_ue_scheduler(NULL, ul_info);
 
   NR_TDD_UL_DL_ConfigCommon_t *tdd_UL_DL_ConfigurationCommon = mac->scc != NULL ? mac->scc->tdd_UL_DL_ConfigurationCommon : mac->scc_SIB->tdd_UL_DL_ConfigurationCommon;