Commit 7955cb4f authored by Raymond Knopp's avatar Raymond Knopp

tested IF4p5 on asterix/obelix (100 PRB via 1 Gbit/s)

parent f0320ea0
...@@ -90,9 +90,8 @@ void PHY_ofdm_mod(int *input, /// pointer to complex input ...@@ -90,9 +90,8 @@ void PHY_ofdm_mod(int *input, /// pointer to complex input
if(nb_symbols == 0) return; if(nb_symbols == 0) return;
short temp[2*2*6144*4] __attribute__((aligned(32))); int16_t temp[2*2*6144*4] __attribute__((aligned(32)));
unsigned short i,j; int i,j;
short k;
volatile int *output_ptr=(int*)0; volatile int *output_ptr=(int*)0;
...@@ -190,18 +189,9 @@ void PHY_ofdm_mod(int *input, /// pointer to complex input ...@@ -190,18 +189,9 @@ void PHY_ofdm_mod(int *input, /// pointer to complex input
if (fftsize==128) if (fftsize==128)
#endif #endif
{ {
/*for (j=0; j<fftsize ; j++) { memcpy((void*)output_ptr,(void*)temp_ptr,fftsize<<2);
output_ptr[j] = temp_ptr[j];
}*/
memcpy1((void*)output_ptr,(void*)temp_ptr,fftsize<<2);
} }
memcpy((void*)&output_ptr[-nb_prefix_samples],(void*)&output_ptr[fftsize-nb_prefix_samples],nb_prefix_samples<<2);
j=fftsize;
for (k=-1; k>=-nb_prefix_samples; k--) {
output_ptr[k] = output_ptr[--j];
}
break; break;
case CYCLIC_SUFFIX: case CYCLIC_SUFFIX:
......
...@@ -487,7 +487,7 @@ int n_ch_rlz = 1; ...@@ -487,7 +487,7 @@ int n_ch_rlz = 1;
int rx_sample_offset = 0; int rx_sample_offset = 0;
int xforms=0; int xforms=0;
int dump_table=0; int dump_table=0;
int loglvl=OAILOG_WARNING; int loglvl=OAILOG_INFO;
int mcs1=0,mcs2=0,mcs_i=0,dual_stream_UE = 0,awgn_flag=0; int mcs1=0,mcs2=0,mcs_i=0,dual_stream_UE = 0,awgn_flag=0;
int two_thread_flag=0; int two_thread_flag=0;
int num_rounds = 4;//,fix_rounds=0; int num_rounds = 4;//,fix_rounds=0;
...@@ -670,7 +670,7 @@ int main(int argc, char **argv) { ...@@ -670,7 +670,7 @@ int main(int argc, char **argv) {
{ "XForms", "Display the soft scope", PARAMFLAG_BOOL, iptr:&xforms, defintval:0, TYPE_INT, 0 }, { "XForms", "Display the soft scope", PARAMFLAG_BOOL, iptr:&xforms, defintval:0, TYPE_INT, 0 },
{ "Yperfect_ce","Perfect CE", PARAMFLAG_BOOL, iptr:&perfect_ce, defintval:0, TYPE_INT, 0 }, { "Yperfect_ce","Perfect CE", PARAMFLAG_BOOL, iptr:&perfect_ce, defintval:0, TYPE_INT, 0 },
{ "Zdump", "dump table",PARAMFLAG_BOOL, iptr:&dump_table, defintval:0, TYPE_INT, 0 }, { "Zdump", "dump table",PARAMFLAG_BOOL, iptr:&dump_table, defintval:0, TYPE_INT, 0 },
{ "Loglvl", "log level",0, iptr:&loglvl, defintval:OAILOG_DEBUG, TYPE_INT, 0 }, { "Loglvl", "log level",0, iptr:&loglvl, defintval:OAILOG_INFO, TYPE_INT, 0 },
{ "zn_rx", "Number of RX antennas used in UE",0, iptr:NULL, defintval:2, TYPE_INT, 0 }, { "zn_rx", "Number of RX antennas used in UE",0, iptr:NULL, defintval:2, TYPE_INT, 0 },
{ "gchannel", "[A:M] Use 3GPP 25.814 SCM-A/B/C/D('A','B','C','D') or 36-101 EPA('E'), EVA ('F'),ETU('G') models (ignores delay spread and Ricean factor), Rayghleigh8 ('H'), Rayleigh1('I'), Rayleigh1_corr('J'), Rayleigh1_anticorr ('K'), Rice8('L'), Rice1('M')",0, strptr:NULL, defstrval:NULL, TYPE_STRING, 0 }, { "gchannel", "[A:M] Use 3GPP 25.814 SCM-A/B/C/D('A','B','C','D') or 36-101 EPA('E'), EVA ('F'),ETU('G') models (ignores delay spread and Ricean factor), Rayghleigh8 ('H'), Rayleigh1('I'), Rayleigh1_corr('J'), Rayleigh1_anticorr ('K'), Rice8('L'), Rice1('M')",0, strptr:NULL, defstrval:NULL, TYPE_STRING, 0 },
{ "verbose", "display debug text", PARAMFLAG_BOOL, iptr:&verbose, defintval:0, TYPE_INT, 0 }, { "verbose", "display debug text", PARAMFLAG_BOOL, iptr:&verbose, defintval:0, TYPE_INT, 0 },
......
...@@ -202,8 +202,9 @@ int trx_eth_read_udp_IF4p5(openair0_device *device, openair0_timestamp *timestam ...@@ -202,8 +202,9 @@ int trx_eth_read_udp_IF4p5(openair0_device *device, openair0_timestamp *timestam
goto again; goto again;
} }
} else { } else {
perror("ETHERNET IF4p5 READ"); return(-1);
printf("(%s):\n", strerror(errno)); //perror("ETHERNET IF4p5 READ");
//printf("(%s):\n", strerror(errno));
} }
} else { } else {
*timestamp = test_header->sub_type; *timestamp = test_header->sub_type;
......
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