Restored SR-transMax to MAC.

srsapps/common/src/threads.c

@@ -26,6 +26,7 @@
  */
 
 
+#include <errno.h>
 #include <pthread.h>
 #include <stdio.h>
 #include <stdbool.h>
@@ -70,7 +71,7 @@ bool threads_new_rt_cpu(pthread_t *thread, void *(*start_routine) (void*), void
   } 
   int err = pthread_create(thread, &attr, start_routine, arg);
   if (err) {
-    if (1 == err) {
+    if (EPERM == err) {
       perror("Failed to create thread - permission error. Running with root permissions?");
     }
     perror("pthread_create");

srsapps/ue/mac/include/srsapps/ue/mac/mac.h

@@ -81,6 +81,7 @@ public:
   void setup_lcid(uint32_t lcid, uint32_t lcg, uint32_t priority, int PBR_x_tti, uint32_t BSD);
   
   void set_param(mac_params::mac_param_t param, int64_t value); 
+  int64_t get_param(mac_params::mac_param_t param);
   
   void reconfiguration(); 
   void reset(); 
@@ -159,4 +160,4 @@ private:
 
 } 
 }
-#endif
+#endif

srsapps/ue/mac/src/demux.cc

@@ -148,8 +148,14 @@ void demux::process_pdu(sch_pdu *pdu_msg)
         qbuff *dest_lch = mac_io_h->get(pdu_msg->get()->get_sdu_lcid());
         if (dest_lch) {
           dest_lch->send(pdu_msg->get()->get_sdu_ptr(), pdu_msg->get()->get_sdu_nbytes()*8);
-          Info("Sent MAC SDU len=%d bytes to lchid=%d\n",  
+          Info("Sent MAC SDU len=%d bytes to lchid=%d\n",
                 pdu_msg->get()->get_sdu_nbytes(), pdu_msg->get()->get_sdu_lcid());
+          if (sdu_handler_) {
+            sdu_handler_->notify_new_sdu(pdu_msg->get()->get_sdu_lcid());
+            Info("Notified SDU handler len=%d bytes to lchid=%d\n",
+                  pdu_msg->get()->get_sdu_nbytes(), pdu_msg->get()->get_sdu_lcid());
+          }
+
         } else {
           Error("Getting destination channel LCID=%d\n", pdu_msg->get()->get_sdu_lcid());
         }
@@ -163,15 +169,6 @@ void demux::process_pdu(sch_pdu *pdu_msg)
       }
     }
   }      
-  /* notify handler if registred */
-  if (sdu_handler_) {
-    pdu_msg->reset();
-    while(pdu_msg->next()) {
-      if (pdu_msg->get()->is_sdu()) {
-        sdu_handler_->notify_new_sdu(pdu_msg->get()->get_sdu_lcid());
-      }
-    }
-  }
 }
 
 

srsapps/ue/mac/src/mac.cc

@@ -544,6 +544,11 @@ void mac::set_param(mac_params::mac_param_t param, int64_t value)
   params_db.set_param((uint32_t) param, value);
 }
 
+int64_t mac::get_param(mac_params::mac_param_t param)
+{
+  return params_db.get_param((uint32_t) param);
+}
+
 void mac::setup_lcid(uint32_t lcid, uint32_t lcg, uint32_t priority, int PBR_x_tti, uint32_t BSD)
 {
   mux_unit.set_priority(mac_io::MAC_LCH_CCCH_UL+lcid, priority, PBR_x_tti, BSD);

srsapps/ue/mac/src/proc_sr.cc

@@ -54,7 +54,7 @@ void sr_proc::reset()
 void sr_proc::step(uint32_t tti)
 {
   if (initiated) {
-    if (is_pending_sr) {    
+    if (is_pending_sr) {
       if (params_db->get_param(mac_params::SR_PUCCH_CONFIGURED)) {
         if (sr_counter < dsr_transmax) {
           int last_tx_tti = phy_h->sr_last_tx_tti(); 

srsapps/ue/phy/include/srsapps/ue/phy/phy.h

@@ -112,6 +112,7 @@ public:
   bool status_is_rxtx();
   
   void set_param(phy_params::phy_param_t param, int64_t value); 
+  int64_t get_param(phy_params::phy_param_t param);
 
   uint32_t        get_current_tti(); 
   static uint32_t tti_to_SFN(uint32_t tti);
@@ -179,4 +180,4 @@ private:
 
 } 
 }
-#endif
+#endif

srsapps/ue/phy/src/phy.cc

@@ -155,6 +155,10 @@ void phy::set_param(phy_params::phy_param_t param, int64_t value) {
   params_db.set_param((uint32_t) param, value);
 }
 
+int64_t phy::get_param(phy_params::phy_param_t param) {
+  return params_db.get_param((uint32_t) param);
+}
+
 // FIXME: Add PRACH power control
 bool phy::send_prach(uint32_t preamble_idx) {
   return send_prach(preamble_idx, -1, 0);
@@ -571,4 +575,4 @@ void phy::main_radio_loop() {
 
   
 }
-}
+}