Merge branch 'next' of github.com:softwareradiosystems/srsLTE into next

7 years ago · 2047f9b9fc
parent 321a750f56 622b3221d7
commit 2047f9b9fc
2 changed files with 3 additions and 3 deletions
--- a/lib/src/radio/radio.cc
+++ b/lib/src/radio/radio.cc
@ -301,9 +301,7 @@ void radio::set_master_clock_rate(double rate)

 void radio::set_rx_srate(double srate)
 {
-  srslte_rf_stop_rx_stream(&rf_device);
  srslte_rf_set_rx_srate(&rf_device, srate);
-  srslte_rf_start_rx_stream(&rf_device, false);
 }

 void radio::set_tx_freq(double freq)
--- a/srsue/src/phy/phch_worker.cc
+++ b/srsue/src/phy/phch_worker.cc
@ -418,7 +418,9 @@ void phch_worker::compute_ri(uint8_t *ri, uint8_t *pmi, float *sinr) {
      /* If 2 ort more receiving antennas, select RI */
      float cn = 0.0f;
      srslte_ue_dl_ri_select(&ue_dl, ri, &cn);
-      Debug("TM3 RI select %d layers, κ=%fdB\n", (*ri) + 1, cn);
+      if (ri) {
+        Debug("TM3 RI select %d layers, κ=%fdB\n", (*ri) + 1, cn);
+      }
    } else {
      /* If only one receiving antenna, force RI for 1 layer */
      if (ri) {