Merge branch 'ue-tdd_fix_issueOai1B_45' into develop_integration_w50

2016-12-13 12:51:05 +01:00
parent 595db57af0 495e357a1e
commit 7a92f587e5
10 changed files with 92 additions and 44 deletions
@@ -786,11 +786,13 @@ static void *UE_thread_rxn_txnp4(void *arg)
    if (UE->mac_enabled==1) {

      ret = mac_xface->ue_scheduler(UE->Mod_id,
-				    proc->frame_tx,
-				    proc->subframe_rx,
-				    subframe_select(&UE->frame_parms,proc->subframe_tx),
-				    0,
-				    0/*FIXME CC_id*/);
+          proc->frame_rx,
+          proc->subframe_rx,
+          proc->frame_tx,
+          proc->subframe_tx,
+          subframe_select(&UE->frame_parms,proc->subframe_tx),
+          0,
+          0/*FIXME CC_id*/);
      
      if (ret == CONNECTION_LOST) {
 	LOG_E( PHY, "[UE %"PRIu8"] Frame %"PRIu32", subframe %u RRC Connection lost, returning to PRACH\n",