From ff508a2c6bcb119d7489bf28cfda8986ad3ae890 Mon Sep 17 00:00:00 2001
From: Andre Puschmann <andre@softwareradiosystems.com>
Date: Fri, 15 May 2020 16:40:33 +0200
Subject: [PATCH] npdsch_ue: add rf_dev param and make remove samp rate check

the remove of the samp rate check was needed on the PlutoSDR
because the result would not be the exact value that was
asked for
---
 lib/examples/npdsch_ue.c               | 21 +++++++++++++--------
 lib/examples/usrp_capture_sync_nbiot.c | 10 ++++------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/lib/examples/npdsch_ue.c b/lib/examples/npdsch_ue.c
index c01c536df..52bd7a274 100644
--- a/lib/examples/npdsch_ue.c
+++ b/lib/examples/npdsch_ue.c
@@ -99,6 +99,7 @@ typedef struct {
   uint32_t file_nof_prb;
   uint32_t file_nof_ports;
   uint32_t file_cell_id;
+  char*    rf_dev;
   char*    rf_args;
   double   rf_freq;
   float    rf_gain;
@@ -120,6 +121,7 @@ void args_default(prog_args_t* args)
   args->file_cell_id                       = 0;
   args->file_offset_time                   = 0;
   args->file_offset_freq                   = 0;
+  args->rf_dev                             = "";
   args->rf_args                            = "";
   args->rf_freq                            = -1.0;
 #ifdef ENABLE_AGC_DEFAULT
@@ -133,7 +135,9 @@ void usage(prog_args_t* args, char* prog)
 {
   printf("Usage: %s [agpRPoOildtDnrBuHvqwzxc] -f rx_frequency (in Hz) | -i input_file\n", prog);
 #ifndef DISABLE_RF
+  printf("\t-I RF dev [Default %s]\n", args->rf_dev);
   printf("\t-a RF args [Default %s]\n", args->rf_args);
+
 #ifdef ENABLE_AGC_DEFAULT
   printf("\t-g RF fix RX gain [Default AGC]\n");
 #else
@@ -167,7 +171,7 @@ void parse_args(prog_args_t* args, int argc, char** argv)
 {
   int opt;
   args_default(args);
-  while ((opt = getopt(argc, argv, "aogRBlipHPOCtdDsnvrfqwzxc")) != -1) {
+  while ((opt = getopt(argc, argv, "aogRBliIpHPOCtdDsnvrfqwzxc")) != -1) {
     switch (opt) {
       case 'i':
         args->input_file_name = argv[optind];
@@ -184,6 +188,9 @@ void parse_args(prog_args_t* args, int argc, char** argv)
       case 'O':
         args->file_offset_time = (uint32_t)strtol(argv[optind], NULL, 10);
         break;
+      case 'I':
+        args->rf_dev = argv[optind];
+        break;
       case 'a':
         args->rf_args = argv[optind];
         break;
@@ -350,7 +357,7 @@ int main(int argc, char** argv)
   if (!prog_args.input_file_name) {
 
     printf("Opening RF device...\n");
-    if (srslte_rf_open(&rf, prog_args.rf_args)) {
+    if (srslte_rf_open_devname(&rf, prog_args.rf_dev, prog_args.rf_args, 1)) {
       fprintf(stderr, "Error opening rf\n");
       exit(-1);
     }
@@ -373,12 +380,10 @@ int main(int argc, char** argv)
     // set sampling frequency
     int srate = srslte_sampling_freq_hz(cell.base.nof_prb);
     if (srate != -1) {
-      printf("Setting sampling rate %.2f MHz\n", (float)srate / 1000000);
-      float srate_rf = srslte_rf_set_rx_srate(&rf, (double)srate);
-      if (srate_rf != srate) {
-        fprintf(stderr, "Could not set sampling rate\n");
-        exit(-1);
-      }
+      printf("Setting sampling rate %.2f MHz\n", (float)srate / 1e6);
+      double srate_rf = srslte_rf_set_rx_srate(&rf, srate);
+      printf("Actual sampling rate %.2f MHz\n", srate_rf / 1e6);
+      // We don't check the result rate with requested rate
     } else {
       fprintf(stderr, "Invalid number of PRB %d\n", cell.base.nof_prb);
       exit(-1);
diff --git a/lib/examples/usrp_capture_sync_nbiot.c b/lib/examples/usrp_capture_sync_nbiot.c
index 0e7d11d60..e5906095a 100644
--- a/lib/examples/usrp_capture_sync_nbiot.c
+++ b/lib/examples/usrp_capture_sync_nbiot.c
@@ -121,12 +121,10 @@ int main(int argc, char** argv)
   printf("Set RX gain: %.1f dB\n", srslte_rf_set_rx_gain(&rf, rf_gain));
   int srate = srslte_sampling_freq_hz(nof_prb);
   if (srate != -1) {
-    printf("Setting sampling rate %.2f MHz\n", (float)srate / 1000000);
-    float srate_rf = srslte_rf_set_rx_srate(&rf, (double)srate);
-    if (srate_rf != srate) {
-      fprintf(stderr, "Could not set sampling rate\n");
-      exit(-1);
-    }
+    printf("Setting sampling rate %.2f MHz\n", (float)srate / 1e6);
+    double srate_rf = srslte_rf_set_rx_srate(&rf, srate);
+    printf("Actual sampling rate %.2f MHz\n", srate_rf / 1e6);
+    // We don't check the result rate with requested rate
   } else {
     fprintf(stderr, "Invalid number of PRB %d\n", nof_prb);
     exit(-1);