From 06fa1f8e0f99e9bb1a0c7402641022249d1b9858 Mon Sep 17 00:00:00 2001
From: "vr.devendra" <vr.devendra@globaledgesoft.com>
Date: Fri, 22 May 2020 20:15:12 +0530
Subject: [PATCH] GlobalEdge: CSI and TCI related MAC CE intial commit
---
cmake_targets/CMakeLists.txt | 1 +
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h | 5 ++---
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/cmake_targets/CMakeLists.txt b/cmake_targets/CMakeLists.txt
index 5ac50534124..15b94a10820 100644
--- a/cmake_targets/CMakeLists.txt
+++ b/cmake_targets/CMakeLists.txt
@@ -249,6 +249,7 @@ add_boolean_option(UE_AUTOTEST_TRACE False "Activate UE autotest specific logs
add_boolean_option(UE_DEBUG_TRACE False "Activate UE debug trace")
add_boolean_option(UE_TIMING_TRACE False "Activate UE timing trace")
add_boolean_option(DEBUG_CONSOLE False "makes debugging easier, disables stdout/stderr buffering")
+add_boolean_option(GES_SUPPORT True "To enable the GES Code")
set (OCP_ITTI ${OPENAIR_DIR}/common/utils/ocp_itti)
add_library(ITTI
diff --git a/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h b/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
index 32fd5d73546..23401eea584 100644
--- a/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
+++ b/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
@@ -254,6 +254,7 @@ typedef struct NR_sched_pucch {
struct NR_sched_pucch *next_sched_pucch;
} NR_sched_pucch;
+
/*! \brief scheduling control information set through an API */
typedef struct {
uint64_t dlsch_in_slot_bitmap; // static bitmap signaling which slot in a tdd period contains dlsch
@@ -267,8 +268,6 @@ typedef struct {
/*! \brief UE list used by gNB to order UEs/CC for scheduling*/
typedef struct {
-<<<<<<< 8533610e2abb78ee712ceed939c08b5d0b5e835a
-<<<<<<< 3bce9a7b85f6f8dff8ba2f98142451a90fd8f8bd
DLSCH_PDU DLSCH_pdu[4][MAX_MOBILES_PER_GNB];
/// scheduling control info
NR_UE_sched_ctrl_t UE_sched_ctrl[MAX_MOBILES_PER_GNB];
@@ -283,7 +282,7 @@ typedef struct {
NR_CellGroupConfig_t *secondaryCellGroup[MAX_MOBILES_PER_GNB];
} NR_UE_list_t;
-/*! \brief top level gNB MAC structure */
+/*! \brief top level eNB MAC structure */
typedef struct gNB_MAC_INST_s {
/// Ethernet parameters for northbound midhaul interface
eth_params_t eth_params_n;
--
GitLab