Merge remote-tracking branch 'origin/fix_do_ra_data' into integration_2020_wk51

2020-12-14 13:33:38 +01:00
parent 4e0e95aa49 ac73df698d
commit 02bb4ac913
19 changed files with 225 additions and 209 deletions
@@ -416,12 +416,10 @@ void processSlotRX( PHY_VARS_NR_UE *UE, UE_nr_rxtx_proc_t *proc) {
    //printf(">>> nr_ue_pdcch_procedures ended\n");
 #endif

-    if(IS_SOFTMODEM_NOS1){ //&& proc->nr_slot_rx==1
-      //Hardcoded rnti value
+    if(IS_SOFTMODEM_NOS1){
+      NR_UE_MAC_INST_t *mac = get_mac_inst(0);
      protocol_ctxt_t ctxt;
-      PROTOCOL_CTXT_SET_BY_MODULE_ID(&ctxt, UE->Mod_id, ENB_FLAG_NO,
-				     0x1234, proc->frame_rx,
-				     proc->nr_slot_rx, 0);
+      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);
    }
  }