mac_nr: move UE MAC class into own subfolder

this should simplify further MAC NR extensions and lead
to a more organized folder structure

srsue/hdr/stack/ue_stack_lte.h

@@ -23,7 +23,7 @@
 #include <string>
 
 #include "mac/mac.h"
-#include "mac/mac_nr.h"
+#include "mac_nr/mac_nr.h"
 #include "rrc/rrc.h"
 #include "srslte/radio/radio.h"
 #include "srslte/upper/pdcp.h"

srsue/hdr/stack/ue_stack_nr.h

@@ -18,7 +18,7 @@
 #include <stdarg.h>
 #include <string>
 
-#include "mac/mac_nr.h"
+#include "mac_nr/mac_nr.h"
 #include "rrc/rrc_nr.h"
 #include "srslte/radio/radio.h"
 #include "srslte/upper/pdcp.h"

srsue/src/stack/CMakeLists.txt

@@ -14,6 +14,7 @@ set(SOURCES ue_stack_lte.cc)
 add_library(srsue_stack STATIC ${SOURCES})
 
 if(ENABLE_5GNR)
+    add_subdirectory(mac_nr)
     set(SOURCES ue_stack_nr.cc)
     add_library(srsue_nr_stack STATIC ${SOURCES})
-endif()
+endif()

srsue/src/stack/mac/CMakeLists.txt

@@ -7,9 +7,4 @@
 #
 
 set(SOURCES demux.cc dl_harq.cc mac.cc mux.cc proc_bsr.cc proc_phr.cc proc_ra.cc proc_sr.cc ul_harq.cc)
-add_library(srsue_mac STATIC ${SOURCES})
-
-if(ENABLE_5GNR)
-    set(SOURCES mac_nr.cc)
-    add_library(srsue_mac_nr STATIC ${SOURCES})
-endif()
+add_library(srsue_mac STATIC ${SOURCES})

srsue/src/stack/mac_nr/CMakeLists.txt

@@ -0,0 +1,10 @@
+#
+# Copyright 2013-2020 Software Radio Systems Limited
+#
+# By using this file, you agree to the terms and conditions set
+# forth in the LICENSE file which can be found at the top level of
+# the distribution.
+#
+
+set(SOURCES mac_nr.cc)
+add_library(srsue_mac_nr STATIC ${SOURCES})

srsue/src/stack/mac_nr/mac_nr.cc

@@ -10,7 +10,7 @@
  *
  */
 
-#include "srsue/hdr/stack/mac/mac_nr.h"
+#include "srsue/hdr/stack/mac_nr/mac_nr.h"
 #include "srslte/common/log_helper.h"
 
 using namespace asn1::rrc;