From 40c7db7009e734bc4831a9cb7fc3acfd3e3536ad Mon Sep 17 00:00:00 2001 From: ismagom Date: Mon, 12 Jan 2015 20:36:47 -0800 Subject: [PATCH] Added nof_frames to pbch_file_test --- lte/phy/lib/phch/test/pbch_file_test.c | 121 +++++++++++++------------ lte/phy/lib/phch/test/pbch_test_mex.c | 5 - matlab/tests/pbch_bler.m | 12 +-- 3 files changed, 67 insertions(+), 71 deletions(-) diff --git a/lte/phy/lib/phch/test/pbch_file_test.c b/lte/phy/lib/phch/test/pbch_file_test.c index 3dd3c5954..9e661cf4f 100644 --- a/lte/phy/lib/phch/test/pbch_file_test.c +++ b/lte/phy/lib/phch/test/pbch_file_test.c @@ -34,9 +34,6 @@ #include "liblte/phy/phy.h" char *input_file_name = NULL; -char *matlab_file_name = NULL; - -FILE *fmatlab = NULL; lte_cell_t cell = { 6, // nof_prb @@ -47,9 +44,11 @@ lte_cell_t cell = { PHICH_NORM // PHICH length }; +int nof_frames = 1; + uint8_t bch_payload_file[BCH_PAYLOAD_LEN] = {0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; -#define FLEN 9600 +#define FLEN (10*SF_LEN(lte_symbol_sz(cell.nof_prb))) filesource_t fsrc; cf_t *input_buffer, *fft_buffer, *ce[MAX_PORTS]; @@ -59,17 +58,17 @@ chest_dl_t chest; void usage(char *prog) { printf("Usage: %s [vcoe] -i input_file\n", prog); - printf("\t-o output matlab file name [Default Disabled]\n"); printf("\t-c cell_id [Default %d]\n", cell.id); - printf("\t-n nof_prb [Default %d]\n", cell.nof_prb); + printf("\t-p nof_prb [Default %d]\n", cell.nof_prb); printf("\t-e Set extended prefix [Default Normal]\n"); + printf("\t-n nof_frames [Default %d]\n", nof_frames); printf("\t-v [set verbose to debug, default none]\n"); } void parse_args(int argc, char **argv) { int opt; - while ((opt = getopt(argc, argv, "iovce")) != -1) { + while ((opt = getopt(argc, argv, "ivcpne")) != -1) { switch(opt) { case 'i': input_file_name = argv[optind]; @@ -77,8 +76,11 @@ void parse_args(int argc, char **argv) { case 'c': cell.id = atoi(argv[optind]); break; - case 'o': - matlab_file_name = argv[optind]; + case 'p': + cell.nof_prb = atoi(argv[optind]); + break; + case 'n': + nof_frames = atoi(argv[optind]); break; case 'v': verbose++; @@ -105,16 +107,6 @@ int base_init() { exit(-1); } - if (matlab_file_name) { - fmatlab = fopen(matlab_file_name, "w"); - if (!fmatlab) { - perror("fopen"); - return -1; - } - } else { - fmatlab = NULL; - } - input_buffer = malloc(FLEN * sizeof(cf_t)); if (!input_buffer) { perror("malloc"); @@ -163,9 +155,6 @@ void base_free() { int i; filesource_free(&fsrc); - if (fmatlab) { - fclose(fmatlab); - } free(input_buffer); free(fft_buffer); @@ -198,47 +187,59 @@ int main(int argc, char **argv) { exit(-1); } - n = filesource_read(&fsrc, input_buffer, FLEN); - - lte_fft_run_sf(&fft, input_buffer, fft_buffer); - - if (fmatlab) { - fprintf(fmatlab, "outfft="); - vec_sc_prod_cfc(fft_buffer, 1000.0, fft_buffer, CP_NSYMB(cell.cp) * cell.nof_prb * RE_X_RB); - vec_fprint_c(fmatlab, fft_buffer, CP_NSYMB(cell.cp) * cell.nof_prb * RE_X_RB); - fprintf(fmatlab, ";\n"); - vec_sc_prod_cfc(fft_buffer, 0.001, fft_buffer, CP_NSYMB(cell.cp) * cell.nof_prb * RE_X_RB); - } - - /* Get channel estimates for each port */ - chest_dl_estimate(&chest, fft_buffer, ce, 0); - - INFO("Decoding PBCH\n", 0); - - for (int i=0;i 0) { + // process 1st subframe only + lte_fft_run_sf(&fft, input_buffer, fft_buffer); + + /* Get channel estimates for each port */ + chest_dl_estimate(&chest, fft_buffer, ce, 0); + + INFO("Decoding PBCH\n", 0); + + for (int i=0;i 0 && frame_cnt < nof_frames); base_free(); - if (n < 0) { - fprintf(stderr, "Error decoding PBCH\n"); - exit(-1); - } else if (n == 0) { - printf("Could not decode PBCH\n"); - exit(-1); - } else { - printf("MIB decoded OK. Nof ports: %d. SFN offset: %d Payload: ", nof_tx_ports, sfn_offset); - vec_fprint_hex(stdout, bch_payload, BCH_PAYLOAD_LEN); - if (nof_tx_ports == 2 && sfn_offset == 0 && !memcmp(bch_payload, bch_payload_file, BCH_PAYLOAD_LEN)) { - printf("This is the signal.1.92M.dat file\n"); - exit(0); - } else { - printf("This is an unknown file\n"); + if (frame_cnt == 1) { + if (n == 0) { + printf("Could not decode PBCH\n"); exit(-1); + } else { + printf("MIB decoded OK. Nof ports: %d. SFN offset: %d Payload: ", nof_tx_ports, sfn_offset); + vec_fprint_hex(stdout, bch_payload, BCH_PAYLOAD_LEN); + if (nof_tx_ports == 2 && sfn_offset == 0 && !memcmp(bch_payload, bch_payload_file, BCH_PAYLOAD_LEN)) { + printf("This is the signal.1.92M.dat file\n"); + exit(0); + } else { + printf("This is an unknown file\n"); + exit(-1); + } } + } else { + printf("Decoded %d/%d MIBs\n", nof_decoded_mibs, frame_cnt); } } diff --git a/lte/phy/lib/phch/test/pbch_test_mex.c b/lte/phy/lib/phch/test/pbch_test_mex.c index 88620d7e8..c64604c37 100644 --- a/lte/phy/lib/phch/test/pbch_test_mex.c +++ b/lte/phy/lib/phch/test/pbch_test_mex.c @@ -36,8 +36,6 @@ #define INPUT prhs[1] #define NOF_INPUTS 2 -extern int indices[2048]; - void help() { mexErrMsgTxt @@ -148,9 +146,6 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[]) if (nlhs >= 7) { mexutils_write_cf(pbch.ce[0], &plhs[6], pbch.nof_symbols, 1); } - if (nlhs >= 7) { - mexutils_write_int(indices, &plhs[7], 2048, 1); - } chest_dl_free(&chest); lte_fft_free(&fft); diff --git a/matlab/tests/pbch_bler.m b/matlab/tests/pbch_bler.m index 1802dbb83..9926f4987 100644 --- a/matlab/tests/pbch_bler.m +++ b/matlab/tests/pbch_bler.m @@ -5,11 +5,11 @@ % R.11-2 5 MHz 2 ports rmc = lteRMCDL('R.10'); -NofPortsTx=2; +NofPortsTx=1; -SNR_values_db=linspace(-8,-2,4); -Nrealizations=200; -enb = struct('NCellID',0,'NDLRB',50,'CellRefP',NofPortsTx,'CyclicPrefix','Normal','DuplexMode','FDD','NSubframe',0); +SNR_values_db=1;%linspace(-8,-2,4); +Nrealizations=5; +enb = struct('NCellID',1,'NDLRB',25,'CellRefP',NofPortsTx,'CyclicPrefix','Normal','DuplexMode','FDD','NSubframe',0); griddims = lteResourceGridSize(enb); % Resource grid dimensions L = griddims(2); @@ -59,7 +59,7 @@ for snr_idx=1:length(SNR_values_db) rxWaveform = noise + rxWaveform; - % rxWaveform = downsampled; + rxWaveform = x((i-1)*76800+1:i*76800); % Number of OFDM symbols in a subframe % OFDM demodulate signal @@ -79,7 +79,7 @@ for snr_idx=1:length(SNR_values_db) errorReal(i,1)=1; end - [nof_ports2, pbchSymbols2, pbchBits, ce, ce2, pbchRx2, pbchHest2,indices]= liblte_pbch(enb, rxWaveform, hest, nest); + [nof_ports2, pbchSymbols2, pbchBits, ce, ce2, pbchRx2, pbchHest2]= liblte_pbch(enb, rxWaveform, hest, nest); if (nof_ports2 ~= NofPortsTx) errorReal(i,2)=1; end