git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7546 818b1a75-f10b-46b9-bf7c-635c3b92a50f

openair1/PHY/INIT/lte_parms.c

@@ -117,6 +117,8 @@ int init_frame_parms(LTE_DL_FRAME_PARMS *frame_parms,uint8_t osf)
     frame_parms->nb_prefix_samples0>>=(2-log2_osf);
     frame_parms->N_RBGS = 2;
     frame_parms->N_RBG = 13;
+
+
     break;
 
   case 15:
@@ -147,6 +149,8 @@ int init_frame_parms(LTE_DL_FRAME_PARMS *frame_parms,uint8_t osf)
     break;
   }
 
+  printf("lte_parms.c: Setting N_RB_DL to %d, ofdm_symbol_size %d\n",frame_parms->N_RB_DL, frame_parms->ofdm_symbol_size);
+
   //  frame_parms->tdd_config=3;
   return(0);
 }

openair1/PHY/LTE_TRANSPORT/dci_tools.c

@@ -4143,8 +4143,8 @@ int generate_ue_dlsch_params_from_dci(uint8_t subframe,
     dlsch1_harq->rb_alloc[0]                         = dlsch0_harq->rb_alloc[0];
 
     dlsch0_harq->nb_rb                               = conv_nprb(rah,
-        rballoc,
-        frame_parms->N_RB_DL);
+								 rballoc,
+								 frame_parms->N_RB_DL);
     dlsch1_harq->nb_rb                               = dlsch0_harq->nb_rb;
 
     dlsch0_harq->mcs       = mcs1;
@@ -4262,8 +4262,8 @@ int generate_ue_dlsch_params_from_dci(uint8_t subframe,
     dlsch0->rnti = rnti;
     dlsch1->rnti = rnti;
 
-    dlsch0_harq->dl_power_off = 1; //no power offset
-    dlsch1_harq->dl_power_off = 1; //no power offset
+    dlsch0_harq->dl_power_off = 0; //no power offset
+    dlsch1_harq->dl_power_off = 0; //no power offset
 
     dlsch0->active = 1;
     dlsch1->active = 1;

openair1/PHY/LTE_TRANSPORT/dlsch_coding.c

@@ -242,7 +242,8 @@ void clean_eNb_dlsch(LTE_eNB_DLSCH_t *dlsch, uint8_t abstraction_flag)
         if (abstraction_flag==0) {
           for (j=0; j<96; j++)
             for (r=0; r<MAX_NUM_DLSCH_SEGMENTS; r++)
-              dlsch->harq_processes[i]->d[r][j] = LTE_NULL;
+	      if (dlsch->harq_processes[i]->d[r])
+		dlsch->harq_processes[i]->d[r][j] = LTE_NULL;
         }
       }
     }

openair1/PHY/TOOLS/lte_phy_scope.c

@@ -469,6 +469,7 @@ void phy_scope_UE(FD_lte_phy_scope_ue *form,
   int mcs = 0;
   unsigned char harq_pid = 0;
 
+
   if (phy_vars_ue->dlsch_ue[eNB_id][0]!=NULL) {
     harq_pid = phy_vars_ue->dlsch_ue[eNB_id][0]->current_harq_pid;
 

openair1/SCHED/phy_procedures_lte_eNb.c

@@ -3126,7 +3126,8 @@ void prach_procedures(PHY_VARS_eNB *phy_vars_eNB,uint8_t sched_subframe,uint8_t
                                   frame,
                                   preamble_max,
                                   preamble_delay_list[preamble_max],
-                                  0,subframe,0);
+				  0,subframe,0);
+      
 #endif
     } else {
       MSC_LOG_EVENT(MSC_PHY_ENB, "0 RA Failed add user, too many");

openair1/SIMULATION/LTE_PHY/dlsim.c

@@ -536,6 +536,7 @@ int main(int argc, char **argv)
       if ((transmission_mode!=1) &&
           (transmission_mode!=2) &&
           (transmission_mode!=3) &&
+          (transmission_mode!=4) &&
           (transmission_mode!=5) &&
           (transmission_mode!=6)) {
         msg("Unsupported transmission mode %d\n",transmission_mode);