Merge branch 'next' into enbmimo

lib/src/phy/phch/ra.c

@@ -590,11 +590,12 @@ int srslte_ra_dl_dci_to_grant(srslte_ra_dl_dci_t *dci,
     ret = dl_dci_to_grant_mcs(dci, grant, crc_is_crnti);
     if (ret == SRSLTE_SUCCESS) {
       // Apply Section 7.1.7.3. If RA-RNTI and Format1C rv_idx=0
-      if (msg_rnti >= SRSLTE_RARNTI_START && msg_rnti <= SRSLTE_RARNTI_END && 
+      if (dci->dci_is_1c) {
-        dci->dci_is_1c) 
+        if ((msg_rnti >= SRSLTE_RARNTI_START && msg_rnti <= SRSLTE_RARNTI_END) || msg_rnti == SRSLTE_PRNTI)
-      {
+        {
-        dci->rv_idx = 0; 
+          dci->rv_idx = 0;
-      }  
+        }
+      }
     } else {
       return SRSLTE_ERROR; 
     }

srsenb/src/mac/scheduler_ue.cc

@@ -25,9 +25,8 @@
  */
 
 #include <string.h>
-#include <boost/concept_check.hpp>
-#include <srslte/interfaces/sched_interface.h>
 
+#include "srslte/srslte.h"
 #include "srslte/common/pdu.h"
 #include "mac/scheduler_ue.h"
 #include "mac/scheduler.h"
@@ -411,31 +410,31 @@ int sched_ue::generate_format1(dl_harq_proc *h,
     }
 
     h->new_tx(0, tti, mcs, tbs, data->dci_location.ncce);
-    
+
+    // Allocate MAC ConRes CE
+    if (need_conres_ce) {
+      data->pdu[0][0].lcid = srslte::sch_subh::CON_RES_ID;
+      data->nof_pdu_elems[0]++;
+      Info("SCHED: Added MAC Contention Resolution CE for rnti=0x%x\n", rnti);
+    }
+
+    int rem_tbs = tbs;
+    int x = 0;
+    do {
+      x = alloc_pdu(rem_tbs, &data->pdu[0][data->nof_pdu_elems[0]]);
+      rem_tbs -= x;
+      if (x) {
+        data->nof_pdu_elems[0]++;
+      }
+    } while(rem_tbs > 0 && x > 0);
+
     Debug("SCHED: Alloc format1 new mcs=%d, tbs=%d, nof_prb=%d, req_bytes=%d\n", mcs, tbs, nof_prb, req_bytes);
   } else {
     h->new_retx(0, tti, &mcs, &tbs);
     Debug("SCHED: Alloc format1 previous mcs=%d, tbs=%d\n", mcs, tbs);
   }
- 
+
-  // Allocate MAC ConRes CE
+  data->rnti    = rnti;
-  if (need_conres_ce) {
-    data->pdu[0][0].lcid = srslte::sch_subh::CON_RES_ID;
-    data->nof_pdu_elems[0]++;
-    Info("SCHED: Added MAC Contention Resolution CE for rnti=0x%x\n", rnti);
-  }
-  
-  int rem_tbs = tbs; 
-  int x = 0; 
-  do {
-    x = alloc_pdu(rem_tbs, &data->pdu[0][data->nof_pdu_elems[0]]);
-    rem_tbs -= x; 
-    if (x) {
-      data->nof_pdu_elems[0]++;
-    }
-  } while(rem_tbs > 0 && x > 0);
-  
-  data->rnti    = rnti; 
 
   if (tbs > 0) {
     dci->harq_process = h->get_id(); 

srsue/src/phy/phch_worker.cc

@@ -540,7 +540,7 @@ int phch_worker::decode_pdsch(srslte_ra_dl_grant_t *grant, uint8_t *payload[SRSL
   for (uint32_t tb = 0; tb < SRSLTE_MAX_CODEWORDS; tb++) {
     if (grant->tb_en[tb] && (rv[tb] < 0 || rv[tb] > 3)) {
       valid_config = false;
-      Error("Wrong RV (%d) for TB index %d", rv[tb], tb);
+      Error("Wrong RV (%d) for TB index %d\n", rv[tb], tb);
     }
   }
 
@@ -656,6 +656,9 @@ int phch_worker::decode_pdsch(srslte_ra_dl_grant_t *grant, uint8_t *payload[SRSL
       Error("Error configuring DL grant\n");
       ret = SRSLTE_ERROR;
     }
+  } else {
+    Error("Error invalid DL config\n");
+    ret = SRSLTE_ERROR;
   }
   return ret;
 }