fixed some bugs from previous commit (targets/SIMU/USER/oaisim_functions.c and...

fixed some bugs from previous commit (targets/SIMU/USER/oaisim_functions.c and openair2/LAYER2/MAC/preprocessor.c)

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

openair2/LAYER2/MAC/pre_processor.c

@@ -156,7 +156,7 @@ void assign_rbs_required (module_id_t Mod_id,
   // clear rb allocations across all CC_ids
   for (UE_id=UE_list->head;UE_id>=0;UE_id=UE_list->next[UE_id]){
     pCCid = UE_PCCID(Mod_id,UE_id);
-
+    rnti = UE_list->UE_template[pCCid][UE_id].rnti;
     //update CQI information across component carriers
     for (n=0;n<UE_list->numactiveCCs[UE_id];n++) {
 

targets/SIMU/USER/oaisim_functions.c

@@ -817,11 +817,12 @@ void init_openair1(void) {
           PHY_vars_eNB_g[eNB_id][CC_id]->pusch_config_dedicated[UE_id].betaOffset_RI_Index  = beta_RI;
           PHY_vars_eNB_g[eNB_id][CC_id]->pusch_config_dedicated[UE_id].betaOffset_CQI_Index = beta_CQI;
           ((PHY_vars_eNB_g[eNB_id][CC_id]->lte_frame_parms).pdsch_config_common).p_b = (frame_parms->nb_antennas_tx_eNB>1) ? 1 : 0; // rho_a = rhob
+	
+	  PHY_vars_UE_g[UE_id][CC_id]->pusch_config_dedicated[eNB_id].betaOffset_ACK_Index = beta_ACK;
+	  PHY_vars_UE_g[UE_id][CC_id]->pusch_config_dedicated[eNB_id].betaOffset_RI_Index  = beta_RI;
+	  PHY_vars_UE_g[UE_id][CC_id]->pusch_config_dedicated[eNB_id].betaOffset_CQI_Index = beta_CQI;
+	  ((PHY_vars_UE_g[UE_id][CC_id]->lte_frame_parms).pdsch_config_common).p_b = (frame_parms->nb_antennas_tx_eNB>1) ? 1 : 0; // rho_a = rhob
 	}
-	PHY_vars_UE_g[UE_id][CC_id]->pusch_config_dedicated[eNB_id].betaOffset_ACK_Index = beta_ACK;
-	PHY_vars_UE_g[UE_id][CC_id]->pusch_config_dedicated[eNB_id].betaOffset_RI_Index  = beta_RI;
-	PHY_vars_UE_g[UE_id][CC_id]->pusch_config_dedicated[eNB_id].betaOffset_CQI_Index = beta_CQI;
-	((PHY_vars_UE_g[UE_id][CC_id]->lte_frame_parms).pdsch_config_common).p_b = (frame_parms->nb_antennas_tx_eNB>1) ? 1 : 0; // rho_a = rhob
       }
   }