From a07a830a0fcabf08e4c831cb1a7f9ac6a7080022 Mon Sep 17 00:00:00 2001 From: Thomas Dreibholz Date: Tue, 3 Mar 2020 10:26:14 +0100 Subject: [PATCH 1/3] Check result of openair0_device_load() and exit when loading the device fails. --- targets/RT/USER/lte-ru.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/targets/RT/USER/lte-ru.c b/targets/RT/USER/lte-ru.c index f88d98536d..aa359b28a9 100644 --- a/targets/RT/USER/lte-ru.c +++ b/targets/RT/USER/lte-ru.c @@ -2342,7 +2342,11 @@ void init_RU_proc(RU_t *ru) { init_frame_parms(ru->frame_parms,1); ru->frame_parms->nb_antennas_rx = ru->nb_rx; phy_init_RU(ru); - openair0_device_load(&ru->rfdevice,&ru->openair0_cfg); + ret = openair0_device_load(&ru->rfdevice,&ru->openair0_cfg); + if (ret < 0) { + LOG_I(PHY,"Exiting, cannot load device\n"); + exit(1); + } if (setup_RU_buffers(ru)!=0) { printf("Exiting, cannot initialize RU Buffers\n"); From 04789ff9f50c2250707280bfa588b2360a082884 Mon Sep 17 00:00:00 2001 From: Thomas Dreibholz Date: Tue, 3 Mar 2020 10:37:38 +0100 Subject: [PATCH 2/3] Made error message more informative. --- targets/RT/USER/lte-ru.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/targets/RT/USER/lte-ru.c b/targets/RT/USER/lte-ru.c index aa359b28a9..43cb414bd3 100644 --- a/targets/RT/USER/lte-ru.c +++ b/targets/RT/USER/lte-ru.c @@ -2344,7 +2344,7 @@ void init_RU_proc(RU_t *ru) { phy_init_RU(ru); ret = openair0_device_load(&ru->rfdevice,&ru->openair0_cfg); if (ret < 0) { - LOG_I(PHY,"Exiting, cannot load device\n"); + LOG_I(PHY,"Exiting, cannot load device. Make sure that your SDR board is connected!\n"); exit(1); } From 34c118c03e75059b0c6fd5207c403eec708e63ec Mon Sep 17 00:00:00 2001 From: Thomas Dreibholz Date: Tue, 3 Mar 2020 10:29:29 +0100 Subject: [PATCH 3/3] Error should create a log entry, not use printf(). --- targets/RT/USER/lte-ru.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/targets/RT/USER/lte-ru.c b/targets/RT/USER/lte-ru.c index 43cb414bd3..fa08d96b5f 100644 --- a/targets/RT/USER/lte-ru.c +++ b/targets/RT/USER/lte-ru.c @@ -2349,8 +2349,8 @@ void init_RU_proc(RU_t *ru) { } if (setup_RU_buffers(ru)!=0) { - printf("Exiting, cannot initialize RU Buffers\n"); - exit(-1); + LOG_I(PHY,"Exiting, cannot initialize RU Buffers\n"); + exit(1); } }