maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Raymond Knopp
2014-08-21 11:51:01 +00:00
parent b1e97ab181
commit d2bf4ddcd4
21 changed files with 168 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/SIMULATION/RF/dac.c
+5 -5
View File
@@ -87,17 +87,18 @@ double dac_fixed_gain(double **s_re,
uint32_t input_offset_meas,
uint32_t length_meas,
uint8_t B,
double txpwr_dBm) {
double txpwr_dBm,
int NB_RE) {
int i;
int aa;
double amp,amp1;
amp = pow(10.0,.05*txpwr_dBm)/sqrt(nb_tx_antennas); //this is amp per tx antenna
amp = sqrt(NB_RE)*pow(10.0,.05*txpwr_dBm)/sqrt(nb_tx_antennas); //this is amp per tx antenna
amp1 = 0;
for (aa=0;aa<nb_tx_antennas;aa++) {
amp1 += sqrt((double)signal_energy((int32_t*)&input[aa][input_offset_meas],length_meas) * (512.0/300.0));
amp1 += sqrt((double)signal_energy((int32_t*)&input[aa][input_offset_meas],length_meas));
}
amp1/=nb_tx_antennas;
@@ -118,11 +119,10 @@ double dac_fixed_gain(double **s_re,
for (aa=0;aa<nb_tx_antennas;aa++) {
s_re[aa][i] = amp*((double)(((short *)input[aa]))[((i+input_offset)<<1)])/amp1; ///(1<<(B-1));
s_im[aa][i] = amp*((double)(((short *)input[aa]))[((i+input_offset)<<1)+1])/amp1; ///(1<<(B-1));
}
}
// printf("ener %e\n",signal_energy_fp(s_re,s_im,nb_tx_antennas,length,0));
return(signal_energy_fp(s_re,s_im,nb_tx_antennas,512,0));
return(signal_energy_fp(s_re,s_im,nb_tx_antennas,length_meas,0));
}
openair1/SIMULATION/RF/defs.h
+2 -1
View File
@@ -101,4 +101,5 @@ double dac_fixed_gain(double **s_re,
unsigned int input_offset_meas,
unsigned int length_meas,
unsigned char B,
double gain);
double gain,
int NB_RE);
openair1/SIMULATION/RF/rf.c
+1 -1
View File
@@ -46,7 +46,7 @@ extern int write_output(const char *,const char *,void *,int,int,char);
//double pn[1024];
//#define DEBUG_RF 1
#define DEBUG_RF 1
//free(input_data);
void rf_rx(double **r_re,