Commit 284b57ac authored by Cedric Roux's avatar Cedric Roux

bugfix: put constants in correct file

The RLC tests were not compiling because of the include of

    openair2/RRC/NR/rrc_gNB_radio_bearers.h

by

    openair2/LAYER2/nr_rlc/nr_rlc_entity.h

which does not seem correct/necessary to start with.

The only thing needed by nr_rlc_entity.h from rrc_gNB_radio_bearers.h
is MAX_DRBS_PER_UE which can be defined in common/platform_constants.h
like NGAP_MAX_PDU_SESSION.
parent 1cbd6c71
...@@ -72,6 +72,9 @@ ...@@ -72,6 +72,9 @@
#define NGAP_MAX_PDU_SESSION (256) /* As defined in TS 38.413 9.2.1.1 Range Bound for PDU Sessions. */ #define NGAP_MAX_PDU_SESSION (256) /* As defined in TS 38.413 9.2.1.1 Range Bound for PDU Sessions. */
#define NGAP_MAX_DRBS_PER_UE (32) /* As defined in TS 38.413 9.2.1.1 - maxnoofDRBs */ #define NGAP_MAX_DRBS_PER_UE (32) /* As defined in TS 38.413 9.2.1.1 - maxnoofDRBs */
#define MAX_DRBS_PER_UE (32) /* Maximum number of Data Radio Bearers per UE */
#define MAX_PDUS_PER_UE (8) /* Maximum number of PDU Sessions per UE */
#define NB_RB_MBMS_MAX (29 * 16) /* 29 = LTE_maxSessionPerPMCH + 16 = LTE_maxServiceCount from LTE_asn_constant.h */ #define NB_RB_MBMS_MAX (29 * 16) /* 29 = LTE_maxSessionPerPMCH + 16 = LTE_maxServiceCount from LTE_asn_constant.h */
#define NB_RAB_MAX 11 /* from LTE_maxDRB in LTE_asn_constant.h */ #define NB_RAB_MAX 11 /* from LTE_maxDRB in LTE_asn_constant.h */
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
#define _NR_RLC_ENTITY_H_ #define _NR_RLC_ENTITY_H_
#include <stdint.h> #include <stdint.h>
#include "openair2/RRC/NR/rrc_gNB_radio_bearers.h"
#include "common/utils/time_stat.h" #include "common/utils/time_stat.h"
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#define _NR_RLC_UE_MANAGER_H_ #define _NR_RLC_UE_MANAGER_H_
#include "openair2/COMMON/platform_types.h" #include "openair2/COMMON/platform_types.h"
#include "nr_rlc_entity.h" #include "nr_rlc_entity.h"
#include "common/platform_constants.h"
typedef void nr_rlc_ue_manager_t; typedef void nr_rlc_ue_manager_t;
......
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
#include "NR_DRB-ToAddMod.h" #include "NR_DRB-ToAddMod.h"
#include "NR_SRB-ToAddMod.h" #include "NR_SRB-ToAddMod.h"
#define MAX_DRBS_PER_UE (32) /* Maximum number of Data Radio Bearers per UE */ #include "common/platform_constants.h"
#define MAX_PDUS_PER_UE (8) /* Maximum number of PDU Sessions per UE */
#define DRB_ACTIVE_NONGBR (2) /* DRB is used for Non-GBR Flows */ #define DRB_ACTIVE_NONGBR (2) /* DRB is used for Non-GBR Flows */
#define DRB_ACTIVE (1) #define DRB_ACTIVE (1)
#define DRB_INACTIVE (0) #define DRB_INACTIVE (0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment