Commit f10e3f77 authored by knopp's avatar knopp

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7554 818b1a75-f10b-46b9-bf7c-635c3b92a50f
parent 6548841d
......@@ -494,11 +494,7 @@ void phy_procedures_emos_eNB_RX(unsigned char subframe,PHY_VARS_eNB *phy_vars_eN
last_subframe_emos=0;
#ifdef OAI_USRP
for (aa=0;i<phy_vars_eNB->lte_frame_parms.nb_antennas_rx;i++)
rescale(&phy_vars_eNB->lte_eNB_common_vars.rxdata[0][i][subframe*phy_vars_eNB->lte_frame_parms.samples_per_tti],
phy_vars_eNB->lte_frame_parms.samples_per_tti);
#endif
#ifdef EMOS_CHANNEL
......@@ -3159,7 +3155,7 @@ void phy_procedures_eNB_RX(const unsigned char sched_subframe,PHY_VARS_eNB *phy_
{
//RX processing
UNUSED(r_type);
uint32_t l, ret=0,i,j,k;
uint32_t l, ret=0,i,j,k,aa;
uint32_t sect_id=0;
uint32_t harq_pid, harq_idx, round;
uint8_t SR_payload = 0,*pucch_payload=NULL,pucch_payload0[2]= {0,0},pucch_payload1[2]= {0,0};
......@@ -3188,6 +3184,12 @@ void phy_procedures_eNB_RX(const unsigned char sched_subframe,PHY_VARS_eNB *phy_
LOG_D(PHY,"[eNB %d] Frame %d: Doing phy_procedures_eNB_RX(%d)\n",phy_vars_eNB->Mod_id,frame, subframe);
#endif
#ifdef OAI_USRP
for (aa=0;aa<phy_vars_eNB->lte_frame_parms.nb_antennas_rx;aa++)
rescale(&phy_vars_eNB->lte_eNB_common_vars.rxdata[0][aa][subframe*phy_vars_eNB->lte_frame_parms.samples_per_tti],
phy_vars_eNB->lte_frame_parms.samples_per_tti);
#endif
if (abstraction_flag == 0) {
remove_7_5_kHz(phy_vars_eNB,subframe<<1);
remove_7_5_kHz(phy_vars_eNB,(subframe<<1)+1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment