PentHertz
/
srsLTE
mirror of https://github.com/PentHertz/srsLTE.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing srsRAN references

This commit is contained in:
Sebastien Dudek 2021-05-21 11:50:49 +02:00
parent 53b07447a7
commit 7ee0725351
3 changed files with 90 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/examples/CMakeLists.txt
View File

@ -76,7 +76,7 @@ endif (ZEROMQ_FOUND)
if(RF_FOUND)
add_executable(cell_search_modmobmap cell_search_modmobmap.c)
target_link_libraries(cell_search_modmobmap srslte_phy srslte_common srslte_rf)
target_link_libraries(cell_search_modmobmap srsran_phy srsran_common srsran_rf)
add_executable(cell_search cell_search.c)
target_link_libraries(cell_search srsran_phy srsran_common srsran_rf)
@ -94,7 +94,7 @@ if(RF_FOUND)
target_link_libraries(cell_search_nbiot srsran_rf srsran_phy)
add_executable(cell_search_nbiot_modmobmap cell_search_nbiot_modmobmap.c)
target_link_libraries(cell_search_nbiot_modmobmap srslte_rf srslte_phy)
target_link_libraries(cell_search_nbiot_modmobmap srsran_rf srsran_phy)
add_executable(usrp_txrx usrp_txrx.c)
target_link_libraries(usrp_txrx srsran_phy srsran_rf)

86
lib/examples/cell_search_modmobmap.c
View File

@ -31,13 +31,13 @@
#include <sys/stat.h>
#include <fcntl.h>
#include "srslte/srslte.h"
#include "srsran/srsran.h"
#include "srslte/common/crash_handler.h"
#include "srslte/phy/rf/rf_utils.h"
#include "srsran/common/crash_handler.h"
#include "srsran/phy/rf/rf_utils.h"
#ifndef DISABLE_RF
#include "srslte/phy/rf/rf.h"
#include "srsran/phy/rf/rf.h"
#endif
#define MHZ 1000000
@ -50,14 +50,14 @@
int band = -1;
int earfcn_start = -1, earfcn_end = -1;
cell_search_cfg_t cell_detect_config = {.max_frames_pbch = SRSLTE_DEFAULT_MAX_FRAMES_PBCH,
.max_frames_pss = SRSLTE_DEFAULT_MAX_FRAMES_PSS,
.nof_valid_pss_frames = SRSLTE_DEFAULT_NOF_VALID_PSS_FRAMES,
cell_search_cfg_t cell_detect_config = {.max_frames_pbch = SRSRAN_DEFAULT_MAX_FRAMES_PBCH,
.max_frames_pss = SRSRAN_DEFAULT_MAX_FRAMES_PSS,
.nof_valid_pss_frames = SRSRAN_DEFAULT_NOF_VALID_PSS_FRAMES,
.init_agc = 0,
.force_tdd = false};
struct cells {
srslte_cell_t cell;
srsran_cell_t cell;
float freq;
int dl_earfcn;
float power;
@ -75,7 +75,7 @@ void usage(char* prog)
printf("\t-s earfcn_start [Default All]\n");
printf("\t-e earfcn_end [Default All]\n");
printf("\t-n nof_frames_total [Default 100]\n");
printf("\t-v [set srslte_verbose to debug, default none]\n");
printf("\t-v [set srsran_verbose to debug, default none]\n");
}
void parse_args(int argc, char** argv)
@ -102,7 +102,7 @@ void parse_args(int argc, char** argv)
rf_gain = strtof(argv[optind], NULL);
break;
case 'v':
srslte_verbose++;
srsran_verbose++;
break;
default:
usage(argv[0]);
@ -115,10 +115,10 @@ void parse_args(int argc, char** argv)
}
}
int srslte_rf_recv_wrapper(void* h, void* data, uint32_t nsamples, srslte_timestamp_t* t)
int srsran_rf_recv_wrapper(void* h, void* data, uint32_t nsamples, srsran_timestamp_t* t)
{
DEBUG(" ---- Receive %d samples ---- \n", nsamples);
return srslte_rf_recv_with_time((srslte_rf_t*)h, data, nsamples, 1, NULL, NULL);
return srsran_rf_recv_with_time((srsran_rf_t*)h, data, nsamples, 1, NULL, NULL);
}
bool go_exit = false;
@ -131,19 +131,19 @@ void sig_int_handler(int signo)
}
}
static SRSLTE_AGC_CALLBACK(srslte_rf_set_rx_gain_wrapper)
static SRSRAN_AGC_CALLBACK(srsran_rf_set_rx_gain_wrapper)
{
srslte_rf_set_rx_gain((srslte_rf_t*)h, gain_db);
srsran_rf_set_rx_gain((srsran_rf_t*)h, gain_db);
}
int main(int argc, char** argv)
{
int n;
srslte_rf_t rf;
srslte_ue_cellsearch_t cs;
srslte_ue_cellsearch_result_t found_cells[3];
srsran_rf_t rf;
srsran_ue_cellsearch_t cs;
srsran_ue_cellsearch_result_t found_cells[3];
int nof_freqs;
srslte_earfcn_t channels[MAX_EARFCN];
srsran_earfcn_t channels[MAX_EARFCN];
uint32_t freq;
uint32_t n_found_cells = 0;
char fifo_file[] = "celllog.fifo";
@ -155,30 +155,30 @@ int main(int argc, char** argv)
mkfifo(fifo_file, 0666);
}
srslte_debug_handle_crash(argc, argv);
srsran_debug_handle_crash(argc, argv);
parse_args(argc, argv);
printf("Opening RF device...\n");
if (srslte_rf_open(&rf, rf_args)) {
if (srsran_rf_open(&rf, rf_args)) {
ERROR("Error opening rf\n");
exit(-1);
}
if (!cell_detect_config.init_agc) {
srslte_rf_set_rx_gain(&rf, rf_gain);
srsran_rf_set_rx_gain(&rf, rf_gain);
} else {
printf("Starting AGC thread...\n");
if (srslte_rf_start_gain_thread(&rf, false)) {
if (srsran_rf_start_gain_thread(&rf, false)) {
ERROR("Error opening rf\n");
exit(-1);
}
srslte_rf_set_rx_gain(&rf, 50);
srsran_rf_set_rx_gain(&rf, 50);
}
// Supress RF messages
srslte_rf_suppress_stdout(&rf);
srsran_rf_suppress_stdout(&rf);
nof_freqs = srslte_band_get_fd_band(band, channels, earfcn_start, earfcn_end, MAX_EARFCN);
nof_freqs = srsran_band_get_fd_band(band, channels, earfcn_start, earfcn_end, MAX_EARFCN);
if (nof_freqs < 0) {
ERROR("Error getting EARFCN list\n");
exit(-1);
@ -190,18 +190,18 @@ int main(int argc, char** argv)
sigprocmask(SIG_UNBLOCK, &sigset, NULL);
signal(SIGINT, sig_int_handler);
if (srslte_ue_cellsearch_init(&cs, cell_detect_config.max_frames_pss, srslte_rf_recv_wrapper, (void*)&rf)) {
if (srsran_ue_cellsearch_init(&cs, cell_detect_config.max_frames_pss, srsran_rf_recv_wrapper, (void*)&rf)) {
ERROR("Error initiating UE cell detect\n");
exit(-1);
}
if (cell_detect_config.max_frames_pss) {
srslte_ue_cellsearch_set_nof_valid_frames(&cs, cell_detect_config.nof_valid_pss_frames);
srsran_ue_cellsearch_set_nof_valid_frames(&cs, cell_detect_config.nof_valid_pss_frames);
}
if (cell_detect_config.init_agc) {
srslte_rf_info_t* rf_info = srslte_rf_get_info(&rf);
srslte_ue_sync_start_agc(&cs.ue_sync,
srslte_rf_set_rx_gain_wrapper,
srsran_rf_info_t* rf_info = srsran_rf_get_info(&rf);
srsran_ue_sync_start_agc(&cs.ue_sync,
srsran_rf_set_rx_gain_wrapper,
rf_info->min_rx_gain,
rf_info->max_rx_gain,
cell_detect_config.init_agc);
@ -210,32 +210,32 @@ int main(int argc, char** argv)
for (freq = 0; freq < nof_freqs && !go_exit; freq++) {
/* set rf_freq */
srslte_rf_set_rx_freq(&rf, 0, (double)channels[freq].fd * MHZ);
srsran_rf_set_rx_freq(&rf, 0, (double)channels[freq].fd * MHZ);
INFO("Set rf_freq to %.3f MHz\n", (double)channels[freq].fd * MHZ / 1000000);
printf(
"[%3d/%d]: EARFCN %d Freq. %.2f MHz looking for PSS.\n", freq, nof_freqs, channels[freq].id, channels[freq].fd);
fflush(stdout);
if (SRSLTE_VERBOSE_ISINFO()) {
if (SRSRAN_VERBOSE_ISINFO()) {
printf("\n");
}
bzero(found_cells, 3 * sizeof(srslte_ue_cellsearch_result_t));
bzero(found_cells, 3 * sizeof(srsran_ue_cellsearch_result_t));
INFO("Setting sampling frequency %.2f MHz for PSS search\n", SRSLTE_CS_SAMP_FREQ / 1000000);
srslte_rf_set_rx_srate(&rf, SRSLTE_CS_SAMP_FREQ);
INFO("Setting sampling frequency %.2f MHz for PSS search\n", SRSRAN_CS_SAMP_FREQ / 1000000);
srsran_rf_set_rx_srate(&rf, SRSRAN_CS_SAMP_FREQ);
INFO("Starting receiver...\n");
srslte_rf_start_rx_stream(&rf, false);
srsran_rf_start_rx_stream(&rf, false);
n = srslte_ue_cellsearch_scan(&cs, found_cells, NULL);
n = srsran_ue_cellsearch_scan(&cs, found_cells, NULL);
if (n < 0) {
ERROR("Error searching cell\n");
exit(-1);
} else if (n > 0) {
for (int i = 0; i < 3; i++) {
if (found_cells[i].psr > 2.0) {
srslte_cell_t cell;
srsran_cell_t cell;
cell.id = found_cells[i].cell_id;
cell.cp = found_cells[i].cp;
int ret = rf_mib_decoder(&rf, 1, &cell_detect_config, &cell, NULL);
@ -243,10 +243,10 @@ int main(int argc, char** argv)
ERROR("Error decoding MIB\n");
exit(-1);
}
if (ret == SRSLTE_UE_MIB_FOUND) {
if (ret == SRSRAN_UE_MIB_FOUND) {
cellog_fifo = open(fifo_file, O_WRONLY);
printf("Found CELL ID %d. %d PRB, %d ports\n", cell.id, cell.nof_prb, cell.nof_ports);
sprintf(logstr, "[CellInfo]:CID=%d;DL_EARFCN=%d;FREQ=%.1f MHz;POWER=%.1f dBm\n", cell.id, channels[freq].id, channels[freq].fd, srslte_convert_power_to_dB(found_cells[i].peak));
sprintf(logstr, "[CellInfo]:CID=%d;DL_EARFCN=%d;FREQ=%.1f MHz;POWER=%.1f dBm\n", cell.id, channels[freq].id, channels[freq].fd, srsran_convert_power_to_dB(found_cells[i].peak));
write(cellog_fifo, logstr, strlen(logstr)+1);
close(cellog_fifo);
if (cell.nof_ports > 0) {
@ -270,12 +270,12 @@ int main(int argc, char** argv)
results[i].cell.id,
results[i].cell.nof_prb,
results[i].cell.nof_ports,
srslte_convert_power_to_dB(results[i].power));
srsran_convert_power_to_dB(results[i].power));
}
printf("\nBye\n");
srslte_ue_cellsearch_free(&cs);
srslte_rf_close(&rf);
srsran_ue_cellsearch_free(&cs);
srsran_rf_close(&rf);
exit(0);
}

90
lib/examples/cell_search_nbiot_modmobmap.c
View File

@ -31,11 +31,11 @@
#include <sys/stat.h>
#include <fcntl.h>
#include "srslte/phy/rf/rf_utils.h"
#include "srslte/phy/ue/ue_cell_search_nbiot.h"
#include "srsran/phy/rf/rf_utils.h"
#include "srsran/phy/ue/ue_cell_search_nbiot.h"
#ifndef DISABLE_RF
#include "srslte/phy/rf/rf.h"
#include "srsran/phy/rf/rf.h"
#endif
#define MHZ 1000000
@ -52,14 +52,14 @@ double raster_offset[NUM_RASTER_OFFSET] = {0.0, 2500.0, -2500.0, 7500.0, -7500.0
int band = -1;
int earfcn_start = -1, earfcn_end = -1;
cell_search_cfg_t cell_detect_config = {.max_frames_pbch = SRSLTE_DEFAULT_MAX_FRAMES_NPBCH,
.max_frames_pss = SRSLTE_DEFAULT_MAX_FRAMES_NPSS,
.nof_valid_pss_frames = SRSLTE_DEFAULT_NOF_VALID_NPSS_FRAMES,
cell_search_cfg_t cell_detect_config = {.max_frames_pbch = SRSRAN_DEFAULT_MAX_FRAMES_NPBCH,
.max_frames_pss = SRSRAN_DEFAULT_MAX_FRAMES_NPSS,
.nof_valid_pss_frames = SRSRAN_DEFAULT_NOF_VALID_NPSS_FRAMES,
.init_agc = 0.0,
.force_tdd = false};
struct cells {
srslte_nbiot_cell_t cell;
srsran_nbiot_cell_t cell;
float freq;
int dl_earfcn;
float power;
@ -79,7 +79,7 @@ void usage(char* prog)
printf("\t-e earfcn_end [Default All]\n");
printf("\t-r Also scan frequencies with raster offset [Default %s]\n", scan_raster_offset ? "Yes" : "No");
printf("\t-n nof_frames_total [Default 100]\n");
printf("\t-v [set srslte_verbose to debug, default none]\n");
printf("\t-v [set srsran_verbose to debug, default none]\n");
}
void parse_args(int argc, char** argv)
@ -109,7 +109,7 @@ void parse_args(int argc, char** argv)
scan_raster_offset = true;
break;
case 'v':
srslte_verbose++;
srsran_verbose++;
break;
default:
usage(argv[0]);
@ -122,14 +122,14 @@ void parse_args(int argc, char** argv)
}
}
int srslte_rf_recv_wrapper(void* h, cf_t* data[SRSLTE_MAX_PORTS], uint32_t nsamples, srslte_timestamp_t* t)
int srsran_rf_recv_wrapper(void* h, cf_t* data[SRSRAN_MAX_PORTS], uint32_t nsamples, srsran_timestamp_t* t)
{
DEBUG(" ---- Receive %d samples ---- \n", nsamples);
void* ptr[SRSLTE_MAX_PORTS];
for (int i = 0; i < SRSLTE_MAX_PORTS; i++) {
void* ptr[SRSRAN_MAX_PORTS];
for (int i = 0; i < SRSRAN_MAX_PORTS; i++) {
ptr[i] = data[i];
}
return srslte_rf_recv_with_time_multi(h, ptr, nsamples, true, NULL, NULL);
return srsran_rf_recv_with_time_multi(h, ptr, nsamples, true, NULL, NULL);
}
bool go_exit = false;
@ -142,19 +142,19 @@ void sig_int_handler(int signo)
}
}
static SRSLTE_AGC_CALLBACK(srslte_rf_set_rx_gain_wrapper)
static SRSRAN_AGC_CALLBACK(srsran_rf_set_rx_gain_wrapper)
{
srslte_rf_set_rx_gain((srslte_rf_t*)h, gain_db);
srsran_rf_set_rx_gain((srsran_rf_t*)h, gain_db);
}
int main(int argc, char** argv)
{
int n;
srslte_rf_t rf;
srslte_ue_cellsearch_nbiot_t cs;
srslte_nbiot_ue_cellsearch_result_t found_cells[3];
srsran_rf_t rf;
srsran_ue_cellsearch_nbiot_t cs;
srsran_nbiot_ue_cellsearch_result_t found_cells[3];
int nof_freqs;
srslte_earfcn_t channels[MAX_EARFCN];
srsran_earfcn_t channels[MAX_EARFCN];
uint32_t freq;
uint32_t n_found_cells = 0;
char fifo_file[] = "celllog.fifo";
@ -169,25 +169,25 @@ int main(int argc, char** argv)
parse_args(argc, argv);
printf("Opening RF device...\n");
if (srslte_rf_open(&rf, rf_args)) {
if (srsran_rf_open(&rf, rf_args)) {
fprintf(stderr, "Error opening rf\n");
exit(-1);
}
if (!cell_detect_config.init_agc) {
srslte_rf_set_rx_gain(&rf, rf_gain);
srsran_rf_set_rx_gain(&rf, rf_gain);
} else {
printf("Starting AGC thread...\n");
if (srslte_rf_start_gain_thread(&rf, false)) {
if (srsran_rf_start_gain_thread(&rf, false)) {
fprintf(stderr, "Error opening rf\n");
exit(-1);
}
srslte_rf_set_rx_gain(&rf, 50);
srsran_rf_set_rx_gain(&rf, 50);
}
// Supress RF messages
srslte_rf_suppress_stdout(&rf);
srsran_rf_suppress_stdout(&rf);
nof_freqs = srslte_band_get_fd_band(band, channels, earfcn_start, earfcn_end, MAX_EARFCN);
nof_freqs = srsran_band_get_fd_band(band, channels, earfcn_start, earfcn_end, MAX_EARFCN);
if (nof_freqs < 0) {
fprintf(stderr, "Error getting EARFCN list\n");
exit(-1);
@ -203,52 +203,52 @@ int main(int argc, char** argv)
for (int i = 0; i < (scan_raster_offset ? NUM_RASTER_OFFSET : 1); i++) {
// set rf_freq
double rf_freq = channels[freq].fd * MHZ + raster_offset[i];
srslte_rf_set_rx_freq(&rf, 0, rf_freq);
srsran_rf_set_rx_freq(&rf, 0, rf_freq);
INFO("Set rf_freq to %.3f Hz\n", rf_freq);
printf("[%3d/%d]: EARFCN %d, %.2f MHz looking for NPSS.\n", freq, nof_freqs, channels[freq].id, rf_freq / 1e6);
fflush(stdout);
if (SRSLTE_VERBOSE_ISINFO()) {
if (SRSRAN_VERBOSE_ISINFO()) {
printf("\n");
}
bzero(found_cells, 3 * sizeof(srslte_nbiot_ue_cellsearch_result_t));
bzero(found_cells, 3 * sizeof(srsran_nbiot_ue_cellsearch_result_t));
if (srslte_ue_cellsearch_nbiot_init(&cs, cell_detect_config.max_frames_pss, srslte_rf_recv_wrapper, (void*)&rf)) {
if (srsran_ue_cellsearch_nbiot_init(&cs, cell_detect_config.max_frames_pss, srsran_rf_recv_wrapper, (void*)&rf)) {
fprintf(stderr, "Error initiating UE cell detect\n");
exit(-1);
}
if (cell_detect_config.max_frames_pss) {
srslte_ue_cellsearch_nbiot_set_nof_valid_frames(&cs, cell_detect_config.nof_valid_pss_frames);
srsran_ue_cellsearch_nbiot_set_nof_valid_frames(&cs, cell_detect_config.nof_valid_pss_frames);
}
if (cell_detect_config.init_agc) {
srslte_ue_sync_nbiot_start_agc(&cs.ue_sync, srslte_rf_set_rx_gain_wrapper, cell_detect_config.init_agc);
srsran_ue_sync_nbiot_start_agc(&cs.ue_sync, srsran_rf_set_rx_gain_wrapper, cell_detect_config.init_agc);
}
INFO("Setting sampling frequency %.2f MHz for NPSS search\n", SRSLTE_CS_SAMP_FREQ / 1000000);
srslte_rf_set_rx_srate(&rf, SRSLTE_CS_SAMP_FREQ);
INFO("Setting sampling frequency %.2f MHz for NPSS search\n", SRSRAN_CS_SAMP_FREQ / 1000000);
srsran_rf_set_rx_srate(&rf, SRSRAN_CS_SAMP_FREQ);
INFO("Starting receiver...\n");
srslte_rf_start_rx_stream(&rf, false);
srsran_rf_start_rx_stream(&rf, false);
n = srslte_ue_cellsearch_nbiot_scan(&cs);
if (n == SRSLTE_SUCCESS) {
srslte_rf_stop_rx_stream(&rf);
n = srslte_ue_cellsearch_nbiot_detect(&cs, found_cells);
if (n == SRSLTE_SUCCESS) {
srslte_nbiot_cell_t cell;
n = srsran_ue_cellsearch_nbiot_scan(&cs);
if (n == SRSRAN_SUCCESS) {
srsran_rf_stop_rx_stream(&rf);
n = srsran_ue_cellsearch_nbiot_detect(&cs, found_cells);
if (n == SRSRAN_SUCCESS) {
srsran_nbiot_cell_t cell;
cell.n_id_ncell = found_cells[0].n_id_ncell;
cell.base.cp = SRSLTE_CP_NORM;
cell.base.cp = SRSRAN_CP_NORM;
cellog_fifo = open(fifo_file, O_WRONLY);
sprintf(logstr, "[CellInfo]:CID=%d;DL_EARFCN=%d;FREQ=%.1f MHz;POWER=%.1f dBm\n", cell.n_id_ncell, channels[freq].id, channels[freq].fd, srslte_convert_power_to_dB(found_cells[i].peak));
sprintf(logstr, "[CellInfo]:CID=%d;DL_EARFCN=%d;FREQ=%.1f MHz;POWER=%.1f dBm\n", cell.n_id_ncell, channels[freq].id, channels[freq].fd, srsran_convert_power_to_dB(found_cells[i].peak));
write(cellog_fifo, logstr, strlen(logstr)+1);
close(cellog_fifo);
// TODO: add MIB decoding
printf("Found CELL ID %d.\n", cell.n_id_ncell);
memcpy(&results[n_found_cells].cell, &cell, sizeof(srslte_nbiot_cell_t));
memcpy(&results[n_found_cells].cell, &cell, sizeof(srsran_nbiot_cell_t));
results[n_found_cells].freq = channels[freq].fd;
results[n_found_cells].dl_earfcn = channels[freq].id;
results[n_found_cells].power = found_cells[0].peak;
@ -257,7 +257,7 @@ int main(int argc, char** argv)
printf("Cell found but couldn't detect ID.\n");
}
}
srslte_ue_cellsearch_nbiot_free(&cs);
srsran_ue_cellsearch_nbiot_free(&cs);
}
}
@ -272,6 +272,6 @@ int main(int argc, char** argv)
printf("\nBye\n");
srslte_rf_close(&rf);
srsran_rf_close(&rf);
exit(0);
}