Do not spill LTE/NR ASN.1 RRC all over: clean up platform_constants.h

CMakeLists.txt

@@ -655,11 +655,6 @@ add_boolean_option(NAS_BUILT_IN_UE         True  "UE NAS layer present in this e
 add_boolean_option(NAS_UE                  True  "NAS UE INSTANCE (<> NAS_MME)" ON)
 
 
-##########################
-# ACCESS STRATUM LAYER2 OPTIONS
-##########################
-add_boolean_option(JUMBO_FRAME             True  "ENABLE LARGE SDU in ACCESS STRATUM (larger than common MTU)" ON)
-
 ##########################
 # PDCP LAYER OPTIONS
 ##########################

common/platform_constants.h

@@ -19,26 +19,11 @@
  *      contact@openairinterface.org
  */
 
-/*
-                                 platform_constants.h
-                             -------------------
-  AUTHOR  : Lionel GAUTHIER and Navid Nikaein
-  COMPANY : EURECOM
-  EMAIL   : Lionel.Gauthier@eurecom.fr
-
- ***************************************************************************/
 
 #ifndef __PLATFORM_CONSTANTS_H__
 #define __PLATFORM_CONSTANTS_H__
-#include "LTE_asn_constant.h"
-#include "NR_asn_constant.h"
-#define NR_MAXDRB 14
 
-#ifdef JUMBO_FRAME
 #define NL_MAX_PAYLOAD 18000 /* this should cover the max mtu size*/
-#else
-#define NL_MAX_PAYLOAD 9000 /* this should cover the max mtu size*/
-#endif
 
 #ifdef LARGE_SCALE
 #define NB_MODULES_MAX 128
@@ -48,19 +33,7 @@
 #define NB_NODE_MAX 32
 #endif
 
-#ifdef JUMBO_FRAME
 #define MAX_IP_PACKET_SIZE 10000 // 9000
-#else
-#if defined(OAI_NW_DRIVER_TYPE_ETHERNET)
-/* SR: When using ethernet network driver the packet size is 1512 :
- * 1500 bytes IP packet + 14 bytes ethernet header
- */
-#define MAX_IP_PACKET_SIZE 1514
-#else
-#define MAX_IP_PACKET_SIZE 1500 // 3000
-#endif
-#endif
-// overwrite the previous deinitions
 
 #define MAX_MODULES NB_MODULES_MAX
 #define MAX_NR_RRC_UE_CONTEXTS 64
@@ -89,47 +62,26 @@
 #define MAX_MANAGED_GNB_PER_MOBILE 2
 
 /// NB-IOT
-#define NB_RB_MAX_NB_IOT (LTE_maxDRB_NB_r13 + 3) // MP: NB_IoT --> 2(DRB)+3(SRBs - 2 is not used) = 5
+#define NB_RB_MAX_NB_IOT (2 + 3) /* 2 from LTE_maxDRB_NB_r13 in LTE_asn_constant.h + 3 SRBs */
 
 #define DEFAULT_RAB_ID 1
 
-#define NB_RB_MAX (LTE_maxDRB + 3) /* was 11, now 14, maxDRB comes from asn1_constants.h, + 3 because of 3 SRB, one invisible id 0, then id 1 and 2 */
-#define NR_NB_RB_MAX (NR_maxDRB + 3)
+#define NB_RB_MAX (11 + 3) /* LTE_maxDRB from LTE_asn_constant.h + 3 SRBs */
+#define NR_NB_RB_MAX (29 + 3) /* NR_maxDRB from NR_asn_constant.hm + 3 SRBs */
 
 #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 NB_RB_MBMS_MAX (LTE_maxSessionPerPMCH * LTE_maxServiceCount)
+#define NB_RB_MBMS_MAX (29 * 16) /* 29 = LTE_maxSessionPerPMCH + 16 = LTE_maxServiceCount from LTE_asn_constant.h */
 
-#define NB_RAB_MAX LTE_maxDRB /* was 8, now 11 */
-#define RAB_SHIFT1 9
-#define RAB_SHIFT2 3
-//#define RAB_OFFSET     0x0007
+#define NB_RAB_MAX 11 /* from LTE_maxDRB in LTE_asn_constant.h */
 #define RAB_OFFSET 0x000F
-#define RAB_OFFSET1 0x7E00
-#define RAB_OFFSET2 0x01F8
-#define DIR_OFFSET 0x8000
-#define DIR_SHIFT 15
-#define CH_OFFSET 0x0004
-#define CH_SHIFT 2
 
 // RLC Entity
 #define RLC_TX_MAXSIZE       10000000
 #define RLC_RX_MAXSIZE       10000000
-
-// RLC_AM_SEND_MRW
-#define SEND_MRW_OFF 15
 #define SEND_MRW_ON 240
 
-// RLC_SEGMENTATION_INDICATION
-#define SEGMENTATION_NOT_ALLOWED 0
-#define SEGMENTATION_ALLOWED 1
-
-// RLC_DELIVERY_OF_ERRONEOUS_SDU
-#define DELIVERY_OF_ERRONEOUS_SDU_NO 0
-#define DELIVERY_OF_ERRONEOUS_SDU_YES 1
-#define DELIVERY_OF_ERRONEOUS_SDU_NO_DETECT 2
-
 // CBA constant
 #define NUM_MAX_CBA_GROUP 4
 
@@ -142,9 +94,6 @@
 #endif
 #endif
 
-#define UNUSED_PARAM_MBMS_SESSION_ID 0
-#define UNUSED_PARAM_MBMS_SERVICE_ID 0
-
 #define printk printf
 
 #define UNUSED_VARIABLE(vARIABLE) (void)(vARIABLE)