some fixes

openair1/PHY/LTE_TRANSPORT/initial_sync.c

@@ -903,7 +903,7 @@ int initial_sync_freq(PHY_VARS_UE *ue, runmode_t mode)
   init_frame_parms(frame_parms,1);
 
 // cellid
-  frame_parms->Nid_cell=PHY_vars_eNB_g[0][0]->frame_parms.Nid_cell;
+  frame_parms->Nid_cell=PHY_vars_eNB_g[ue->common_vars.eNb_id][0]->frame_parms.Nid_cell;
 // nushift
   //rx_sss(ue,&metric_fdd_ncp,&flip_fdd_ncp,&phase_fdd_ncp);
   frame_parms->nushift  = frame_parms->Nid_cell%6;

openair1/PHY/TOOLS/lte_phy_scope.c

@@ -150,9 +150,11 @@ FD_lte_phy_scope_enb *create_lte_phy_scope_enb( void )
 
 void phy_scope_eNB(FD_lte_phy_scope_enb *form,
                    PHY_VARS_eNB *phy_vars_enb,
+                   PHY_VARS_UE *phy_vars_ue,
+                   int eNB_id,
                    int UE_id)
 {
-  int eNB_id = 0;
+  //int eNB_id = 0;
   int i,i2,arx,atx,ind,k;
   LTE_DL_FRAME_PARMS *frame_parms = &phy_vars_enb->frame_parms;
   int nsymb_ce = 12*frame_parms->N_RB_UL*frame_parms->symbols_per_tti;

openair1/PHY/TOOLS/lte_phy_scope.h

@@ -68,6 +68,8 @@ FD_lte_phy_scope_ue * create_lte_phy_scope_ue( void );
 
 void phy_scope_eNB(FD_lte_phy_scope_enb *form,
                    PHY_VARS_eNB *phy_vars_enb,
+                   PHY_VARS_UE *phy_vars_ue,
+                   int eNB_id,
                    int UE_id);
 
 void phy_scope_UE(FD_lte_phy_scope_ue *form,

targets/SIMU/USER/init_lte.c

@@ -173,9 +173,6 @@ PHY_VARS_UE* init_lte_UE(LTE_DL_FRAME_PARMS *frame_parms,
                   LOG_D(PHY,"dlsch[%d][%d] => %p\n",UE_id,i,PHY_vars_UE->dlsch[l][i][j]);
           }
       }
-
-
-
       PHY_vars_UE->ulsch[i]  = new_ue_ulsch(frame_parms->N_RB_UL, abstraction_flag);
 
       if (!PHY_vars_UE->ulsch[i]) {
@@ -187,12 +184,11 @@ PHY_VARS_UE* init_lte_UE(LTE_DL_FRAME_PARMS *frame_parms,
       PHY_vars_UE->dlsch_ra[i]  = new_ue_dlsch(1,1,NSOFT,MAX_TURBO_ITERATIONS,frame_parms->N_RB_DL, abstraction_flag);
 
       PHY_vars_UE->transmission_mode[i] = frame_parms->nb_antenna_ports_eNB==1 ? 1 : 2;
+      PHY_vars_UE->dlsch_MCH[i]  = new_ue_dlsch(1,NUMBER_OF_HARQ_PID_MAX,NSOFT,MAX_TURBO_ITERATIONS_MBSFN,frame_parms->N_RB_DL,0);
   }
 
   PHY_vars_UE->frame_parms.pucch_config_common.deltaPUCCH_Shift = 1;
 
-  PHY_vars_UE->dlsch_MCH[0]  = new_ue_dlsch(1,NUMBER_OF_HARQ_PID_MAX,NSOFT,MAX_TURBO_ITERATIONS_MBSFN,frame_parms->N_RB_DL,0);
-
   return (PHY_vars_UE);
 }
 PHY_VARS_RN* init_lte_RN(LTE_DL_FRAME_PARMS *frame_parms,

targets/SIMU/USER/oaisim.c

@@ -1142,6 +1142,8 @@ l2l1_task (void *args_p)
 
 	phy_scope_eNB(form_enb[UE_inst],
 		      PHY_vars_eNB_g[eNB_inst][0],
+		      PHY_vars_UE_g[0][0],
+		      0,
 		      UE_inst);
 	
       }