Merge branch 'master' into next

master
Ismael Gomez 8 years ago
commit 7bc53c14b6

@ -32,6 +32,9 @@ endif(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
######################################################################## ########################################################################
CMAKE_MINIMUM_REQUIRED (VERSION 2.6) CMAKE_MINIMUM_REQUIRED (VERSION 2.6)
PROJECT (SRSLTE) PROJECT (SRSLTE)
MESSAGE( STATUS "CMAKE_SYSTEM: " ${CMAKE_SYSTEM} )
MESSAGE( STATUS "CMAKE_SYSTEM_PROCESSOR: " ${CMAKE_SYSTEM_PROCESSOR} )
MESSAGE( STATUS "CMAKE_CXX_COMPILER: " ${CMAKE_CXX_COMPILER} )
list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/modules") list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/modules")
include(SRSLTEVersion) #sets version information include(SRSLTEVersion) #sets version information
@ -156,9 +159,7 @@ add_custom_target(uninstall
# Macro to add -fPIC property to static libs # Macro to add -fPIC property to static libs
######################################################################## ########################################################################
macro(SRSLTE_SET_PIC) macro(SRSLTE_SET_PIC)
if( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" )
set_target_properties(${ARGV} PROPERTIES COMPILE_FLAGS -fPIC) set_target_properties(${ARGV} PROPERTIES COMPILE_FLAGS -fPIC)
endif( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" )
endmacro(SRSLTE_SET_PIC) endmacro(SRSLTE_SET_PIC)
######################################################################## ########################################################################

@ -218,6 +218,7 @@ int main(int argc, char **argv) {
srslte_rf_start_rx_stream(&rf); srslte_rf_start_rx_stream(&rf);
n = srslte_ue_cellsearch_scan(&cs, found_cells, NULL); n = srslte_ue_cellsearch_scan(&cs, found_cells, NULL);
srslte_ue_cellsearch_free(&cs);
if (n < 0) { if (n < 0) {
fprintf(stderr, "Error searching cell\n"); fprintf(stderr, "Error searching cell\n");
exit(-1); exit(-1);

@ -264,7 +264,7 @@ int rf_uhd_open(char *args, void **h)
if (args[0]=='\0') { if (args[0]=='\0') {
if (find_string(devices_str, "type=b200") && !strstr(args, "recv_frame_size")) { if (find_string(devices_str, "type=b200") && !strstr(args, "recv_frame_size")) {
// If B200 is available, use it // If B200 is available, use it
args = "type=b200,recv_frame_size=9232,send_frame_size=9232"; args = "type=b200";
handler->devname = DEVNAME_B200; handler->devname = DEVNAME_B200;
} else if (find_string(devices_str, "type=x300")) { } else if (find_string(devices_str, "type=x300")) {
// Else if X300 is available, set master clock rate now (can't be changed later) // Else if X300 is available, set master clock rate now (can't be changed later)

@ -203,6 +203,8 @@ void srslte_pss_synch_free(srslte_pss_synch_t *q) {
free(q->conv_output_avg); free(q->conv_output_avg);
} }
srslte_dft_plan_free(&q->dftp_input);
bzero(q, sizeof(srslte_pss_synch_t)); bzero(q, sizeof(srslte_pss_synch_t));
} }
} }

Loading…
Cancel
Save