From 4761cbdc3d5feafd25e7292d10f2a0bfba0a5d7d Mon Sep 17 00:00:00 2001
From: Raymond Knopp <raymond.knopp@eurecom.fr>
Date: Mon, 6 Jul 2020 10:48:41 +0200
Subject: [PATCH] Modifications wrt the NR LCIDs used for DTCH

---
 openair2/LAYER2/NR_MAC_COMMON/nr_mac.h             | 4 ++--
 openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/openair2/LAYER2/NR_MAC_COMMON/nr_mac.h b/openair2/LAYER2/NR_MAC_COMMON/nr_mac.h
index d8ba18e4bf..591c2448b8 100644
--- a/openair2/LAYER2/NR_MAC_COMMON/nr_mac.h
+++ b/openair2/LAYER2/NR_MAC_COMMON/nr_mac.h
@@ -320,8 +320,8 @@ typedef struct {
 #define UL_SCH_LCID_CCCH                           0x00
 #define UL_SCH_LCID_SRB1                           0x01
 #define UL_SCH_LCID_SRB2                           0x02
-#define UL_SCH_LCID_DTCH                           0x03
-#define UL_SCH_LCID_SRB3                           0x04
+#define UL_SCH_LCID_SRB3                           0x03
+#define UL_SCH_LCID_DTCH                           0x04
 #define UL_SCH_LCID_CCCH_MSG3                      0x21
 #define UL_SCH_LCID_RECOMMENDED_BITRATE_QUERY      0x35
 #define UL_SCH_LCID_MULTI_ENTRY_PHR_4_OCT          0x36
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
index 12b7f7bfcf..310a567492 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
@@ -585,7 +585,7 @@ void nr_schedule_uss_dlsch_phytest(module_id_t   module_idP,
   //at the upper layers
   if (IS_SOFTMODEM_NOS1 || get_softmodem_params()->phy_test == 0){
 
-    lcid = DTCH; 
+    lcid = DL_SCH_LCID_DTCH; 
 
     //for (lcid = NB_RB_MAX - 1; lcid >= DTCH; lcid--) {