diff --git a/cmake/modules/BuildMex.cmake b/cmake/modules/BuildMex.cmake index 7973a18c7..b84a2e3e7 100644 --- a/cmake/modules/BuildMex.cmake +++ b/cmake/modules/BuildMex.cmake @@ -40,7 +40,7 @@ FUNCTION(BuildMex) SUFFIX "${MATLAB_MEX_EXTENSION}" PREFIX "srslte_" OUTPUT_NAME "${BuildMex_MEXNAME}" - COMPILE_FLAGS "-fvisibility=default ${MATLAB_MEX_CFLAGS} -I${MATLAB_INCLUDE_DIR}" + COMPILE_FLAGS "-fvisibility=default ${MATLAB_MEX_CFLAGS} -DFORCE_STANDARD_RATE -I${MATLAB_INCLUDE_DIR}" ) target_link_libraries(${BuildMex_MEXNAME}-mat ${BuildMex_LIBRARIES} ${MATLAB_MEX_LIBRARY}) install(TARGETS ${BuildMex_MEXNAME}-mat DESTINATION "${MEX_DIR}/srslte/") @@ -52,7 +52,7 @@ FUNCTION(BuildMex) SUFFIX ".${OCTAVE_MEXFILE_EXT}" PREFIX "srslte_" OUTPUT_NAME "${BuildMex_MEXNAME}" - COMPILE_FLAGS "-fvisibility=default ${OCTAVE_MEX_CFLAGS} -DUNDEF_BOOL -I${OCTAVE_INCLUDE_DIR}" + COMPILE_FLAGS "-fvisibility=default ${OCTAVE_MEX_CFLAGS} -DFORCE_STANDARD_RATE -DUNDEF_BOOL -I${OCTAVE_INCLUDE_DIR}" ) target_link_libraries(${BuildMex_MEXNAME}-oct ${BuildMex_LIBRARIES} ${OCTAVE_LIBRARIES}) install(TARGETS ${BuildMex_MEXNAME}-oct DESTINATION "${MEX_DIR}/srslte/") diff --git a/matlab/tests/pusch_test.m b/matlab/tests/pusch_test.m index ed74ae8e6..9bfac1dfb 100644 --- a/matlab/tests/pusch_test.m +++ b/matlab/tests/pusch_test.m @@ -1,10 +1,10 @@ -ueConfig=struct('NCellID',1,'NULRB',25,'CyclicPrefixUL','Normal','NTxAnts',1,'RNTI',64); +ueConfig=struct('NCellID',1,'NULRB',50,'CyclicPrefixUL','Normal','NTxAnts',1,'RNTI',64); puschConfig=struct('NLayers',1,'OrthCover','Off','Shortened',0,'NBundled',0); addpath('/home/ismael/work/srsLTE/debug/srslte/lib/phch/test') cqilen=[0 20]; -mods={'QPSK','16QAM', '64QAM'}; +mods={'64QAM'}; rvs=0; betas=[0 2.0 2.5 5.0, 20.0]; for p=1:ueConfig.NULRB diff --git a/srslte/examples/pdsch_enodeb.c b/srslte/examples/pdsch_enodeb.c index ab6621beb..f215a3284 100644 --- a/srslte/examples/pdsch_enodeb.c +++ b/srslte/examples/pdsch_enodeb.c @@ -522,7 +522,7 @@ int main(int argc, char **argv) { cuhd_set_master_clock_rate(uhd, srate); } printf("Setting sampling rate %.2f MHz\n", (float) srate/1000000); - float srate_uhd = cuhd_set_rx_srate(uhd, (double) srate); + float srate_uhd = cuhd_set_tx_srate(uhd, (double) srate); if (srate_uhd != srate) { fprintf(stderr, "Could not set sampling rate\n"); exit(-1); @@ -531,7 +531,6 @@ int main(int argc, char **argv) { fprintf(stderr, "Invalid number of PRB %d\n", cell.nof_prb); exit(-1); } - printf("Set TX gain: %.1f dB\n", cuhd_set_tx_gain(uhd, uhd_gain)); printf("Set TX freq: %.2f MHz\n", cuhd_set_tx_freq(uhd, uhd_freq) / 1000000); diff --git a/srslte/lib/common/src/phy_common.c b/srslte/lib/common/src/phy_common.c index 407936279..866fb7c1a 100644 --- a/srslte/lib/common/src/phy_common.c +++ b/srslte/lib/common/src/phy_common.c @@ -35,8 +35,9 @@ #include "srslte/common/phy_common.h" #include "srslte/common/sequence.h" +#ifndef FORCE_STANDARD_RATE #define USE_REDUCED_SAMPLING_RATES - +#endif /* Returns true if the structure pointed by cell has valid parameters */