Merge branch 'next' into agpl_next

Author: srs-codebot

CHANGELOG

@@ -1,6 +1,14 @@
 Change Log for Releases
 =======================
 
+## 21.10
+  * Add initial 5G NSA support to srsENB (tested with OnePlus 5G Nord)
+  * Improved interoperability of srsUE in NSA mode
+  * Added enhanced instrumentation to file using JSON format
+  * Fixed stability issues with Ettus N310
+  * Added BLER-adaptive MCS scheduling to srsENB
+  * Other bug-fixes and improved stability and performance in all parts
+
 ## 21.04
   * Rename project from srsLTE to srsRAN
   * Add initial 5G NSA support to srsUE (including x86-optimized FEC and PHY layer)

cmake/modules/SRSRANVersion.cmake

@@ -19,7 +19,7 @@
 #
 
 SET(SRSRAN_VERSION_MAJOR 21)
-SET(SRSRAN_VERSION_MINOR 04)
+SET(SRSRAN_VERSION_MINOR 10)
 SET(SRSRAN_VERSION_PATCH 0)
 SET(SRSRAN_VERSION_STRING "${SRSRAN_VERSION_MAJOR}.${SRSRAN_VERSION_MINOR}.${SRSRAN_VERSION_PATCH}")
 SET(SRSRAN_SOVERSION 0)

lib/examples/cell_search.c

@@ -106,7 +106,7 @@ void parse_args(int argc, char** argv)
         rf_gain = strtof(argv[optind], NULL);
         break;
       case 'v':
-        srsran_verbose++;
+        increase_srsran_verbose_level();
         break;
       default:
         usage(argv[0]);

lib/examples/cell_search_nbiot.c

@@ -106,7 +106,7 @@ void parse_args(int argc, char** argv)
         scan_raster_offset = true;
         break;
       case 'v':
-        srsran_verbose++;
+        increase_srsran_verbose_level();
         break;
       default:
         usage(argv[0]);

lib/examples/npdsch_enodeb.c

@@ -170,7 +170,7 @@ void parse_args(int argc, char** argv)
         cell.nbiot_prb = (uint32_t)strtol(argv[optind], NULL, 10);
         break;
       case 'v':
-        srsran_verbose++;
+        increase_srsran_verbose_level();
         break;
       default:
         usage(argv[0]);

lib/examples/npdsch_ue.c

@@ -228,7 +228,7 @@ void parse_args(prog_args_t* args, int argc, char** argv)
         args->disable_plots_except_constellation = true;
         break;
       case 'v':
-        srsran_verbose++;
+        increase_srsran_verbose_level();
         break;
       default:
         usage(args, argv[0]);

lib/examples/pdsch_enodeb.c

@@ -66,7 +66,7 @@ static int      net_port = -1; // -1 generates random dataThat means there is so
 static uint32_t cfi      = 2;
 static uint32_t mcs_idx = 1, last_mcs_idx = 1;
 static int      nof_frames              = -1;
-static srsran_tm_t transmission_mode       = SRSRAN_TM1;
+static srsran_tm_t transmission_mode    = SRSRAN_TM1;
 static uint32_t    nof_tb               = 1;
 static uint32_t    multiplex_pmi        = 0;
 static uint32_t    multiplex_nof_layers = 1;
@@ -198,7 +198,7 @@ static void parse_args(int argc, char** argv)
         mbsfn_area_id = (int)strtol(argv[optind], NULL, 10);
         break;
       case 'v':
-        srsran_verbose++;
+        increase_srsran_verbose_level();
         break;
       case 's':
         output_file_snr = strtof(argv[optind], NULL);

lib/examples/pdsch_ue.c

@@ -286,8 +286,8 @@ void parse_args(prog_args_t* args, int argc, char** argv)
         args->disable_plots_except_constellation = true;
         break;
       case 'v':
-        srsran_verbose++;
-        args->verbose = srsran_verbose;
+        increase_srsran_verbose_level();
+        args->verbose = get_srsran_verbose_level();
         break;
       case 'Z':
         args->decimate = (int)strtol(argv[optind], NULL, 10);
@@ -699,16 +699,16 @@ int main(int argc, char** argv)
     to.tv_usec = 0;
 
     /* Set default verbose level */
-    srsran_verbose = prog_args.verbose;
-    int n          = select(1, &set, NULL, NULL, &to);
+    set_srsran_verbose_level(prog_args.verbose);
+    int n = select(1, &set, NULL, NULL, &to);
     if (n == 1) {
       /* If a new line is detected set verbose level to Debug */
       if (fgets(input, sizeof(input), stdin)) {
-        srsran_verbose = SRSRAN_VERBOSE_DEBUG;
-        pkt_errors     = 0;
-        pkt_total      = 0;
-        nof_detected   = 0;
-        nof_trials     = 0;
+        set_srsran_verbose_level(SRSRAN_VERBOSE_DEBUG);
+        pkt_errors   = 0;
+        pkt_total    = 0;
+        nof_detected = 0;
+        nof_trials   = 0;
       }
     }
 

lib/examples/pssch_ue.c

@@ -188,7 +188,7 @@ void parse_args(prog_args_t* args, int argc, char** argv)
         args->nof_rx_antennas = (int32_t)strtol(argv[optind], NULL, 10);
         break;
       case 'v':
-        srsran_verbose++;
+        increase_srsran_verbose_level();
         break;
       case 'w':
         args->disable_plots = true;
@@ -341,7 +341,7 @@ int main(int argc, char** argv)
   // PSCCH Channel estimation
   srsran_chest_sl_cfg_t pscch_chest_sl_cfg = {};
   srsran_chest_sl_t     pscch_chest        = {};
-  if (srsran_chest_sl_init(&pscch_chest, SRSRAN_SIDELINK_PSCCH, cell_sl, sl_comm_resource_pool) != SRSRAN_SUCCESS) {
+  if (srsran_chest_sl_init(&pscch_chest, SRSRAN_SIDELINK_PSCCH, cell_sl, &sl_comm_resource_pool) != SRSRAN_SUCCESS) {
     ERROR("Error in chest PSCCH init");
     return SRSRAN_ERROR;
   }
@@ -353,7 +353,7 @@ int main(int argc, char** argv)
 
   srsran_chest_sl_cfg_t pssch_chest_sl_cfg = {};
   srsran_chest_sl_t     pssch_chest        = {};
-  if (srsran_chest_sl_init(&pssch_chest, SRSRAN_SIDELINK_PSSCH, cell_sl, sl_comm_resource_pool) != SRSRAN_SUCCESS) {
+  if (srsran_chest_sl_init(&pssch_chest, SRSRAN_SIDELINK_PSSCH, cell_sl, &sl_comm_resource_pool) != SRSRAN_SUCCESS) {
     ERROR("Error in chest PSSCH init");
     return SRSRAN_ERROR;
   }

lib/examples/synch_file.c

@@ -83,7 +83,7 @@ void parse_args(int argc, char** argv)
         force_cfo = strtof(argv[optind], NULL);
         break;
       case 'v':
-        srsran_verbose++;
+        increase_srsran_verbose_level();
         break;
       default:
         usage(argv[0]);