mostly debug messages

openair1/PHY/LTE_TRANSPORT/dci_tools.c

@@ -5534,16 +5534,10 @@ switch (tpmi) {
             case 5:
               dlsch_harq->mimo_mode   = PUSCH_PRECODING0;
               dlsch_harq->pmi_alloc   = pmi_alloc;;//pmi_convert(frame_parms,dlsch0->pmi_alloc,0);
-  #ifdef DEBUG_HARQ
-              printf ("[DCI UE] I am calling from the UE side pmi_alloc_new = %d\n", dlsch0->pmi_alloc);
-  #endif
             break;
             case 6:
               dlsch_harq->mimo_mode   = PUSCH_PRECODING1;
               dlsch_harq->pmi_alloc   = pmi_alloc;;//pmi_convert(frame_parms,dlsch0->pmi_alloc,1);
-  #ifdef DEBUG_HARQ
-              printf ("[DCI UE] I am calling from the UE side pmi_alloc_new = %d\n", dlsch0->pmi_alloc);
-  #endif
             break;
             }
 }
@@ -5817,8 +5811,8 @@ void prepare_dl_decoding_format2_2A(DCI_format_t dci_format,
         if ((ndi1!=dlsch0_harq->DCINdi) || (dlsch0_harq->first_tx==1))  {
           dlsch0_harq->round = 0;
 
-          //LOG_I(PHY,"[UE] DLSCH: New Data Indicator CW0 subframe %d (pid %d, round %d)\n",
-          //           subframe,harq_pid,dlsch0_harq->round);
+          LOG_I(PHY,"[UE] DLSCH: New Data Indicator CW0 subframe %d (pid %d, round %d)\n",
+                     subframe,harq_pid,dlsch0_harq->round);
           if ( dlsch0_harq->first_tx==1) {
             LOG_D(PHY,"Format 2 DCI First TX0: Clearing flag\n");
             dlsch0_harq->first_tx = 0;
@@ -5828,7 +5822,7 @@ void prepare_dl_decoding_format2_2A(DCI_format_t dci_format,
 	  //NDI has not been toggled but rv was increased by eNB: retransmission
 	  {
 	    if(dlsch0_harq->status == SCH_IDLE) {
-	      // skip pdsch decoding and report ack
+	      LOG_I(PHY,"[UE] DLSCH CW0: skip pdsch decoding and report ack\n");
 	      //dlsch0_harq->status   = SCH_IDLE;
 	      pdlsch0->active       = 0;
 	      pdlsch0->harq_ack[subframe].ack = 1;
@@ -5862,8 +5856,8 @@ void prepare_dl_decoding_format2_2A(DCI_format_t dci_format,
       if (TB1_active) {
         if ((ndi2!=dlsch1_harq->DCINdi) || (dlsch1_harq->first_tx==1)) {
           dlsch1_harq->round = 0;
-          //LOG_I(PHY,"[UE] DLSCH: New Data Indicator CW1 subframe %d (pid %d, round %d)\n",
-          //           subframe,harq_pid,dlsch0_harq->round);
+          LOG_I(PHY,"[UE] DLSCH: New Data Indicator CW1 subframe %d (pid %d, round %d)\n",
+                     subframe,harq_pid,dlsch0_harq->round);
           if (dlsch1_harq->first_tx==1) {
             LOG_D(PHY,"Format 2 DCI First TX1: Clearing flag\n");
             dlsch1_harq->first_tx = 0;
@@ -5873,7 +5867,7 @@ void prepare_dl_decoding_format2_2A(DCI_format_t dci_format,
 	//NDI has not been toggled but rv was increased by eNB: retransmission
 	  {
 	    if(dlsch1_harq->status == SCH_IDLE) {
-	      // skip pdsch decoding and report ack
+	      LOG_I(PHY,"[UE] DLSCH CW1: skip pdsch decoding and report ack\n");
 	      //dlsch1_harq->status   = SCH_IDLE;
 	      pdlsch1->active       = 0;
 	      pdlsch1->harq_ack[subframe].ack = 1;
@@ -5905,14 +5899,6 @@ void prepare_dl_decoding_format2_2A(DCI_format_t dci_format,
       printf("[DCI UE]: dlsch0_harq status %d , dlsch1_harq status %d\n", dlsch0_harq->status, dlsch1_harq->status);
 #endif
 
-  #ifdef DEBUG_HARQ
-      if (dlsch0 != NULL && dlsch1 != NULL)
-        printf("[DCI UE] dlsch0_harq status = %d, dlsch1_harq status = %d\n", dlsch0_harq->status, dlsch1_harq->status);
-      else if (dlsch0 == NULL && dlsch1 != NULL)
-        printf("[DCI UE] dlsch0_harq NULL dlsch1_harq status = %d\n", dlsch1_harq->status);
-      else if (dlsch0 != NULL && dlsch1 == NULL)
-        printf("[DCI UE] dlsch1_harq NULL dlsch0_harq status = %d\n", dlsch0_harq->status);
-  #endif
 }
 
 int generate_ue_dlsch_params_from_dci(int frame,

openair1/PHY/TOOLS/lte_phy_scope.c

@@ -755,8 +755,8 @@ void phy_scope_UE(FD_lte_phy_scope_ue *form,
     for (k=0; k<frame_parms->symbols_per_tti; k++) {
       for (i=0; i<12*frame_parms->N_RB_DL/2; i++) {
     	int j = (2*frame_parms->N_RB_DL*12*k)+4*i;
-        I[ind] = (pdsch_mag[j  ]!=0? 1.0/pdsch_mag[j  ]: 0.0) * pdsch_comp[j  ]*1.0;
-        Q[ind] = (pdsch_mag[j+1]!=0? 1.0/pdsch_mag[j+1]: 0.0) * pdsch_comp[j+1]*1.0;
+        I[ind] = /*(pdsch_mag[j  ]!=0? 1.0/pdsch_mag[j  ]: 0.0) */ pdsch_comp[j  ]*1.0;
+        Q[ind] = /*(pdsch_mag[j+1]!=0? 1.0/pdsch_mag[j+1]: 0.0) */ pdsch_comp[j+1]*1.0;
         ind++;
       }
     }

openair1/SCHED/phy_procedures_lte_ue.c

@@ -3987,13 +3987,18 @@ void ue_dlsch_procedures(PHY_VARS_UE *ue,
   
       
 #ifdef DEBUG_PHY_PROC
-    LOG_D(PHY,"[UE  %d][PDSCH %x/%d] Frame %d subframe %d: PDSCH/DLSCH decoding iter %d (mcs %d, rv %d, TBS %d)\n",
+    LOG_D(PHY,"[UE  %d][PDSCH %x/%d] Frame %d subframe %d: PDSCH/DLSCH decoding iter CW0 (mcs %d, rv %d, TBS %d): %d, CW1 (mcs %d, rv %d, TBS %d): %d\n",
 	  ue->Mod_id,
 	  dlsch0->rnti,harq_pid,
-	  frame_rx,subframe_rx,ret,
+	  frame_rx,subframe_rx,
 	  dlsch0->harq_processes[harq_pid]->mcs,
 	  dlsch0->harq_processes[harq_pid]->rvidx,
-	  dlsch0->harq_processes[harq_pid]->TBS);
+	  dlsch0->harq_processes[harq_pid]->TBS,
+	  ret,
+	  dlsch1->harq_processes[harq_pid]->mcs,
+	  dlsch1->harq_processes[harq_pid]->rvidx,
+	  dlsch1->harq_processes[harq_pid]->TBS,
+	  ret1);
     
     if (frame_rx%100==0) {
       LOG_D(PHY,"[UE  %d][PDSCH %x] Frame %d subframe %d dlsch_errors %d, dlsch_received %d, dlsch_fer %d, current_dlsch_cqi %d\n",

openair1/SIMULATION/LTE_PHY/dlsim.c

@@ -1610,6 +1610,33 @@ int main(int argc, char **argv)
       case 'N':
         channel_model=AWGN;
         break;
+      case 'P':
+        channel_model=Rayleigh1_orthogonal;
+        break;
+      case 'Q':
+        channel_model=Rayleigh1_orth_eff_ch_TM4_prec_real; // for DUALSTREAM_UNIFORM_PRECODING1 when interf is precancelled
+        break;
+      case 'R':
+        channel_model=Rayleigh1_orth_eff_ch_TM4_prec_imag; // for DUALSTREAM_UNIFORM_PRECODINGj when interf is precancelled
+        break;
+      case 'S':
+        channel_model=Rayleigh8_orth_eff_ch_TM4_prec_real;//when interf is precancelled
+        break;
+      case 'T':
+        channel_model=Rayleigh8_orth_eff_ch_TM4_prec_imag;//when interf is precancelled
+        break;
+      case 'U':
+        channel_model = TS_SHIFT;
+        break;
+      case 'V':
+        channel_model=EPA_low;
+        break;
+      case 'W':
+        channel_model=EPA_medium;
+        break;
+      case 'X':
+        channel_model=EPA_high;
+        break;
       default:
         msg("Unsupported channel model!\n");
         exit(-1);