remove srslte.h includes from upper layers

lib/src/mac/pdu.cc

@@ -16,7 +16,11 @@
 #include <strings.h>
 
 #include "srslte/mac/pdu.h"
-#include "srslte/srslte.h"
+
+extern "C" {
+#include "srslte/phy/utils/bit.h"
+#include "srslte/phy/utils/vector.h"
+}
 
 // Table 6.1.3.1-1 Buffer size levels for BSR
 static uint32_t btable[64] = {
@@ -466,7 +470,7 @@ int sch_pdu::get_sdu_space()
   } else {
     ret = rem_len - (size_header_sdu(subheaders[last_sdu_idx].get_payload_size()) - 1) - 1;
   }
-  ret = SRSLTE_MIN(ret >= 0 ? ret : 0, buffer_tx->get_tailroom());
+  ret = std::min(ret >= 0 ? ret : 0u, buffer_tx->get_tailroom());
   return ret;
 }
 

lib/test/mac/pdu_test.cc

@@ -16,7 +16,11 @@
 #include "srslte/common/mac_pcap.h"
 #include "srslte/common/test_common.h"
 #include "srslte/mac/pdu.h"
-#include "srslte/srslte.h"
+
+extern "C" {
+#include "srslte/phy/phch/dci.h"
+}
+
 #include <bitset>
 #include <iostream>
 #include <map>
@@ -162,7 +166,7 @@ class rlc_dummy : public srslte::read_pdu_interface
 public:
   int read_pdu(uint32_t lcid, uint8_t* payload, uint32_t nof_bytes)
   {
-    uint32_t len = SRSLTE_MIN(ul_queues[lcid], nof_bytes);
+    uint32_t len = std::min(ul_queues[lcid], nof_bytes);
 
     // set payload bytes to LCID so we can check later if the scheduling was correct
     memset(payload, lcid, len);

srsenb/hdr/phy/phy_ue_db.h

@@ -19,7 +19,6 @@
 #include <map>
 #include <mutex>
 #include <srslte/adt/circular_array.h>
-#include <srslte/srslte.h>
 
 namespace srsenb {
 

srsenb/hdr/stack/upper/gtpu.h

@@ -18,8 +18,10 @@
 #include "srslte/common/logmap.h"
 #include "srslte/common/threads.h"
 #include "srslte/interfaces/enb_gtpu_interfaces.h"
+#include "srslte/phy/common/phy_common.h"
 #include "srslte/srslog/srslog.h"
-#include "srslte/srslte.h"
+
+#include <netinet/in.h>
 
 #ifndef SRSENB_GTPU_H
 #define SRSENB_GTPU_H

srsenb/src/enb_cfg_parser.cc

@@ -11,12 +11,10 @@
  */
 
 #include "enb_cfg_parser.h"
-#include "srsenb/hdr/cfg_parser.h"
 #include "srsenb/hdr/enb.h"
 #include "srslte/asn1/rrc_utils.h"
 #include "srslte/common/multiqueue.h"
 #include "srslte/phy/common/phy_common.h"
-#include "srslte/srslte.h"
 #include <boost/algorithm/string.hpp>
 
 #define HANDLEPARSERCODE(cond)                                                                                         \

srsenb/src/stack/enb_stack_lte.cc

@@ -13,8 +13,7 @@
 #include "srsenb/hdr/stack/enb_stack_lte.h"
 #include "srsenb/hdr/enb.h"
 #include "srslte/common/network_utils.h"
-#include "srslte/srslte.h"
-#include <srslte/interfaces/enb_metrics_interface.h>
+#include "srslte/interfaces/enb_metrics_interface.h"
 
 using namespace srslte;
 

srsenb/src/stack/mac/sched.cc

@@ -18,7 +18,6 @@
 #include "srsenb/hdr/stack/mac/sched_helpers.h"
 #include "srslte/common/logmap.h"
 #include "srslte/srslog/srslog.h"
-#include "srslte/srslte.h"
 
 #define Console(fmt, ...) srslte::console(fmt, ##__VA_ARGS__)
 #define Error(fmt, ...) srslog::fetch_basic_logger("MAC").error(fmt, ##__VA_ARGS__)

srsenb/src/stack/mac/sched_ue.cc

@@ -17,7 +17,6 @@
 #include "srsenb/hdr/stack/mac/sched_ue.h"
 #include "srslte/common/log_helper.h"
 #include "srslte/common/logmap.h"
-#include "srslte/srslte.h"
 
 using srslte::tti_interval;
 

srsenb/src/stack/mac/sched_ue_ctrl/sched_harq.cc

@@ -15,7 +15,6 @@
 #include "srsenb/hdr/stack/mac/sched.h"
 #include "srslte/common/log_helper.h"
 #include "srslte/mac/pdu.h"
-#include "srslte/srslte.h"
 
 using srslte::tti_point;
 

srsenb/src/stack/rrc/rrc.cc

@@ -21,7 +21,6 @@
 #include "srslte/interfaces/enb_pdcp_interfaces.h"
 #include "srslte/interfaces/enb_rlc_interfaces.h"
 #include "srslte/interfaces/sched_interface.h"
-#include "srslte/srslte.h"
 
 using srslte::byte_buffer_t;
 using srslte::uint32_to_uint8;

srsenb/test/mac/sched_test_rand.cc

@@ -17,7 +17,6 @@
 #include <chrono>
 #include <random>
 #include <set>
-#include <srslte/srslte.h>
 #include <unistd.h>
 
 #include "srslte/common/log_filter.h"

srsenb/test/phy/enb_phy_test.cc

@@ -10,6 +10,10 @@
  *
  */
 
+#include "srslte/common/threads.h"
+#include "srslte/phy/common/phy_common.h"
+#include "srslte/phy/utils/random.h"
+#include "srslte/srslog/srslog.h"
 #include <boost/program_options.hpp>
 #include <boost/program_options/options_description.hpp>
 #include <boost/program_options/parsers.hpp>
@@ -19,12 +23,7 @@
 #include <srslte/common/logger_srslog_wrapper.h>
 #include <srslte/common/string_helpers.h>
 #include <srslte/common/test_common.h>
-#include <srslte/common/threads.h>
-#include <srslte/phy/common/phy_common.h>
 #include <srslte/phy/phch/pusch_cfg.h>
-#include <srslte/phy/utils/random.h>
-#include <srslte/srslog/srslog.h>
-#include <srslte/srslte.h>
 
 static inline bool dl_ack_value(uint32_t ue_cc_idx, uint32_t tti)
 {

srsenb/test/upper/rrc_mobility_test.cc

@@ -17,7 +17,6 @@
 #include "srslte/common/test_common.h"
 #include "test_helpers.h"
 #include <iostream>
-#include <srslte/common/log_filter.h>
 
 using namespace asn1::rrc;
 

srsue/src/stack/ue_stack_lte.cc

@@ -13,7 +13,6 @@
 #include "srsue/hdr/stack/ue_stack_lte.h"
 #include "srslte/common/logmap.h"
 #include "srslte/interfaces/ue_phy_interfaces.h"
-#include "srslte/srslte.h"
 
 #include <algorithm>
 #include <chrono>

srsue/test/upper/gw_test.cc

@@ -10,14 +10,14 @@
  *
  */
 
-#include "srslte/common/log.h"
 #include "srslte/common/logger_srslog_wrapper.h"
 #include "srslte/common/test_common.h"
 #include "srslte/interfaces/ue_pdcp_interfaces.h"
 #include "srslte/srslog/srslog.h"
-#include "srslte/srslte.h"
 #include "srsue/hdr/stack/upper/gw.h"
 
+#include <arpa/inet.h>
+
 class test_stack_dummy : public srsue::stack_interface_gw
 {
 public: