some fixes to previous commit + dci format2b handling

openair1/PHY/INIT/lte_init.c

@@ -1644,7 +1644,7 @@ int phy_init_lte_eNB(PHY_VARS_eNB *eNB,
   } // node_function != NGFI_RRU_IF4p5
 
   /*init the ue spec reference sequence for TM8/9*/
-  lte_gold_ue_spec(fp, eNB->lte_gold_uespec_table,eNB->frame_parms.Nid_cell, NULL);
+  lte_gold_ue_spec(eNB->lte_gold_uespec_table,eNB->frame_parms.Nid_cell, NULL);
 
   return (0);
 

openair1/PHY/LTE_TRANSPORT/dci_tools.c

@@ -2257,30 +2257,40 @@ int generate_eNB_dlsch_params_from_dci(int frame,
 
     // check if either TB is disabled (see 36-213 V8.6 p. 26)
 
+    dlsch0_harq->Nl        = 1;
+    dlsch1_harq->Nl        = 1;
 
     if ((dlsch0_harq->rvidx == 1) && (dlsch0_harq->mcs == 0))
       dlsch0_harq->status = DISABLED;
+    else {
+      if (dlsch0_harq->round == 0) {
+        dlsch0_harq->status = ACTIVE;
+        dlsch0->active = 1;
+        //      printf("Setting DLSCH process %d to ACTIVE\n",harq_pid);
+      }
+    }
 
     if ((dlsch1_harq->rvidx == 1) && (dlsch1_harq->mcs == 0))
       dlsch1_harq->status = DISABLED;
-
-    dlsch0_harq->Nl        = 1;
-
-
-    if (dlsch0_harq->round == 0) {
-      dlsch0_harq->status = ACTIVE;
-      //      printf("Setting DLSCH process %d to ACTIVE\n",harq_pid);
+    else {
+      if (dlsch1_harq->round == 0) {
+        dlsch1_harq->status = ACTIVE;
+        dlsch1->active = 1;
+        //      printf("Setting DLSCH process %d to ACTIVE\n",harq_pid);
+      }
     }
 
-    dlsch0_harq->mcs         = mcs1;
-
     if (dlsch0_harq->nb_rb > 0) {
       dlsch0_harq->TBS         = TBStable[get_I_TBS(dlsch0_harq->mcs)][dlsch0_harq->nb_rb-1];
     } else {
       dlsch0_harq->TBS = 0;
     }
 
-    dlsch0->active = 1;
+    if (dlsch1_harq->nb_rb > 0) {
+      dlsch1_harq->TBS         = TBStable[get_I_TBS(dlsch1_harq->mcs)][dlsch1_harq->nb_rb-1];
+    } else {
+      dlsch1_harq->TBS = 0;
+    }
 
     dlsch0->rnti = rnti;
     dlsch1->rnti = rnti;
@@ -2289,6 +2299,12 @@ int generate_eNB_dlsch_params_from_dci(int frame,
     dlsch1_harq->dl_power_off = 1;
 
     dlsch0_harq->mimo_mode = TM8; //this DCI can only be used in TM8
+    dlsch1_harq->mimo_mode = TM8; //this DCI can only be used in TM8
+
+    dlsch0_harq->first_layer = 7;
+    dlsch1_harq->first_layer = 8;
+    dlsch0_harq->Nlayers = 1;
+    dlsch1_harq->Nlayers = 1;
 
     break;
 

openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c

@@ -2311,7 +2311,7 @@ int dlsch_modulation(PHY_VARS_eNB* phy_vars_eNB,
           lprime=-1;
       }
 
-      /*NOTE: the antenna port 7 and 8 should be replaced with 7+dlsch0_harq_first_layer and dlsch1_harq->first_layer below*/
+      /*NOTE: the antenna port 7 and 8 should be replaced with dlsch0_harq->first_layer and dlsch1_harq->first_layer below (when first_layer is actually initialized)*/
       if (dlsch0 != NULL) {
       for (aa=0;aa<frame_parms->nb_antennas_tx;aa++){
         for (i=0;i<frame_parms->N_RB_DL*12/2;i++){

openair1/SIMULATION/LTE_PHY/dlsim.c

@@ -1846,6 +1846,7 @@ int main(int argc, char **argv)
 
     case 'L':
       log_level=atoi(optarg);
+      set_glog(log_level,LOG_HIGH);
       break;
 
     case 'h':