Merge remote-tracking branch 'origin/ue-rfsim-fix' into integration_2022_wk07_b

2022-02-15 09:26:01 +01:00
parent d4ce61c595 9934aed3cf
commit 71c33bec45
1 changed files with 4 additions and 3 deletions
@@ -776,15 +776,16 @@ void processSlotRX(void *arg) {
      PROTOCOL_CTXT_SET_BY_MODULE_ID(&ctxt, UE->Mod_id, ENB_FLAG_NO, mac->crnti, proc->frame_rx, proc->nr_slot_rx, 0);
      pdcp_run(&ctxt);
    }
-    // calling UL_indication to schedule things other than PUSCH (eg, PUCCH)
-    rxtxD->ue_sched_mode = NOT_PUSCH;
-    processSlotTX(rxtxD);

    // Wait for PUSCH processing to finish
    notifiedFIFO_elt_t *res;
    res = pullTpool(&rxtxD->txFifo,&(get_nrUE_params()->Tpool));
    delNotifiedFIFO_elt(res);

+    // calling UL_indication to schedule things other than PUSCH (eg, PUCCH)
+    rxtxD->ue_sched_mode = NOT_PUSCH;
+    processSlotTX(rxtxD);
+
  } else {
    rxtxD->ue_sched_mode = SCHED_ALL;
    processSlotTX(rxtxD);