From ecf7eaec5c915647ae988ea2dbeaf17bc6b2fcd5 Mon Sep 17 00:00:00 2001
From: Andre Puschmann <andre@softwareradiosystems.com>
Date: Tue, 2 Feb 2021 15:01:28 +0100
Subject: [PATCH] ue_stack_lte: expose MAC NR interface for NSA configs

---
 srsue/hdr/stack/ue_stack_lte.h | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/srsue/hdr/stack/ue_stack_lte.h b/srsue/hdr/stack/ue_stack_lte.h
index 0c99a4e5a..0fe197f7b 100644
--- a/srsue/hdr/stack/ue_stack_lte.h
+++ b/srsue/hdr/stack/ue_stack_lte.h
@@ -46,6 +46,9 @@ namespace srsue {
 
 class ue_stack_lte final : public ue_stack_base,
                            public stack_interface_phy_lte,
+#ifdef HAVE_5GNR
+                           public stack_interface_phy_nr,
+#endif
                            public stack_interface_gw,
                            public stack_interface_rrc,
                            public srslte::thread
@@ -78,7 +81,7 @@ public:
   void set_config_complete(bool status) final;
   void set_scell_complete(bool status) final;
 
-  // MAC Interface for PHY
+  // MAC Interface for EUTRA PHY
   uint16_t get_dl_sched_rnti(uint32_t tti) final { return mac.get_dl_sched_rnti(tti); }
   uint16_t get_ul_sched_rnti(uint32_t tti) final { return mac.get_ul_sched_rnti(tti); }
 
@@ -113,6 +116,19 @@ public:
 
   void run_tti(uint32_t tti, uint32_t tti_jump) final;
 
+#ifdef HAVE_5GNR
+  // MAC Interface for NR PHY
+  int  sf_indication(const uint32_t tti) final { return SRSLTE_SUCCESS; }
+  void tb_decoded(const uint32_t cc_idx, mac_nr_grant_dl_t& grant) final { mac_nr.tb_decoded(cc_idx, grant); }
+
+  void new_grant_ul(const uint32_t cc_idx, const mac_nr_grant_ul_t& grant) final { mac_nr.new_grant_ul(cc_idx, grant); }
+
+  void run_tti(const uint32_t tti) final
+  {
+    // ignored, timing will be handled by EUTRA
+  }
+#endif
+
   // Interface for GW
   void write_sdu(uint32_t lcid, srslte::unique_byte_buffer_t sdu) final;