Merge branch 'master' into next

lib/src/phy/phch/ra.c

@@ -627,7 +627,7 @@ uint32_t srslte_ra_type1_N_rb(uint32_t nof_prb) {
 /* Convert Type2 scheduling L_crb and RB_start to RIV value */
 uint32_t srslte_ra_type2_to_riv(uint32_t L_crb, uint32_t RB_start, uint32_t nof_prb) {
   uint32_t riv;
-  if (L_crb <= nof_prb / 2) {
+  if ((L_crb - 1) <= nof_prb / 2) {
     riv = nof_prb * (L_crb - 1) + RB_start;
   } else {
     riv = nof_prb * (nof_prb - L_crb + 1) + nof_prb - 1 - RB_start;

srsenb/hdr/upper/rrc.h

@@ -265,7 +265,7 @@ public:
     uint32_t cqi_idx; 
     bool cqi_allocated; 
     int cqi_sched_sf_idx; 
-    bool cqi_sched_prb_idx; 
+    int cqi_sched_prb_idx;
     int get_drbid_config(LIBLTE_RRC_DRB_TO_ADD_MOD_STRUCT *drb, int drbid);
   }; 
   

srsenb/src/upper/rrc.cc

@@ -699,10 +699,19 @@ rrc::ue::ue()
 {
   parent           = NULL; 
   set_activity();
-  sr_allocated     = false; 
   has_tmsi         = false;
   connect_notified = false; 
   transaction_id   = 0;
+  sr_allocated     = false;
+  sr_sched_sf_idx  = 0;
+  sr_sched_prb_idx = 0;
+  sr_N_pucch       = 0;
+  sr_I             = 0;
+  cqi_allocated    = false;
+  cqi_pucch        = 0;
+  cqi_idx          = 0;
+  cqi_sched_sf_idx = 0;
+  cqi_sched_prb_idx = 0;
   state            = RRC_STATE_IDLE;
 }