From e196f5fcfb631e8815df27b996924fe7eec00255 Mon Sep 17 00:00:00 2001 From: Xiwen JIANG Date: Mon, 21 Mar 2016 16:52:03 +0100 Subject: [PATCH] bug fixed in beamforming.c --- openair1/PHY/MODULATION/beamforming.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/openair1/PHY/MODULATION/beamforming.c b/openair1/PHY/MODULATION/beamforming.c index 867ba0d53d..157b8eb368 100644 --- a/openair1/PHY/MODULATION/beamforming.c +++ b/openair1/PHY/MODULATION/beamforming.c @@ -61,7 +61,7 @@ int ue_spec_beamforming(int32_t **txdataF, slot_offset_F = slot*(frame_parms->ofdm_symbol_size)*((frame_parms->Ncp==1) ? 6 : 7); - // clear txdata_BF[aa][re] for each call of spec_spec_beamforming + // clear txdata_BF[aa][re] for each call of ue_spec_beamforming for(aa=0;aanb_antennas_tx;aa++) memset(txdataF_BF[aa],0,4*(frame_parms->ofdm_symbol_size)); @@ -89,7 +89,7 @@ int ue_spec_beamforming(int32_t **txdataF, } } - if (txdataF[7][re+symbol*frame_parms->ofdm_symbol_size]!=0) { //that means this RE is actually using TM8-10 + if (txdataF[7][slot_offset_F+symbol*frame_parms->ofdm_symbol_size+re]!=0) { //that means this RE is actually using TM8-10 for (p=0;p<8;p++) { if (txdataF[p+7][slot_offset_F+symbol*frame_parms->ofdm_symbol_size+re]!=0) { //that means this RE is actually allocated for (aa=0;aanb_antennas_tx;aa++) { @@ -130,7 +130,6 @@ int cell_spec_beamforming(int32_t **txdataF, for (p=0;pnb_antenna_ports_eNB;p++) { if (txdataF[p][slot_offset_F+symbol*frame_parms->ofdm_symbol_size+re]!=0) { //that means this RE is actually allocated for (aa=0;aanb_antennas_tx;aa++) { - //printf("cell_spec_beamforming():txdata_BF[%d][%d]=%d+j%d\n",aa,re,((int16_t*)&txdataF_BF[aa][re])[0],((int16_t*)&txdataF_BF[aa][re])[1]); ((int16_t*)&txdataF_BF[aa][re])[0] = (int16_t)((((int16_t*)&txdataF[p][slot_offset_F+symbol*frame_parms->ofdm_symbol_size+re])[0] *((int16_t*)&cell_spec_bf_weights[p][aa][re])[0])>>15); @@ -154,6 +153,10 @@ int cell_spec_beamforming(int32_t **txdataF, } } } + + + + /* int ue_spec_beamforming(int32_t **txdataF, int32_t **txdataF_BF,