cleaning only

common/platform_constants.h

@@ -0,0 +1,155 @@
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      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
+#define NB_NODE_MAX 128
+#else
+#define NB_MODULES_MAX 32
+#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
+
+#ifndef UE_EXPANSION
+#ifdef LARGE_SCALE
+#define MAX_MOBILES_PER_ENB 128
+#define MAX_MOBILES_PER_ENB_NB_IoT 128
+#define MAX_MOBILES_PER_GNB 128
+#define MAX_eNB 2
+#define MAX_gNB 2
+#else
+#define MAX_MOBILES_PER_ENB 40
+#define MAX_MOBILES_PER_ENB_NB_IoT 40
+#define MAX_MOBILES_PER_GNB 16
+#define MAX_eNB 2
+#define MAX_gNB 2
+#endif
+#else
+#define MAX_MOBILES_PER_ENB 256
+#define MAX_MOBILES_PER_ENB_NB_IoT 256
+#define MAX_MOBILES_PER_GNB 256
+#define MAX_eNB 2
+#define MAX_gNB 2
+#endif
+
+#define NUMBER_OF_NR_UCI_STATS_MAX 16
+#define MAX_MANAGED_ENB_PER_MOBILE 2
+#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 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 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_RAB_MAX LTE_maxDRB /* was 8, now 11 */
+#define RAB_SHIFT1 9
+#define RAB_SHIFT2 3
+//#define RAB_OFFSET     0x0007
+#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
+
+#ifndef __cplusplus
+#ifndef NULL
+#define NULL 0
+#endif
+#ifndef null
+#define null 0
+#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)
+
+#endif /* __PLATFORM_CONSTANTS_H__ */

common/ran_context.h

@@ -34,7 +34,7 @@
 #define __RAN_CONTEXT_H__
 
 #include <pthread.h>
-#include "COMMON/platform_constants.h"
+#include "common/platform_constants.h"
 #include "PHY/defs_eNB.h"
 #include "PHY/types.h"
 #include "PHY/impl_defs_top.h"
@@ -111,4 +111,5 @@ typedef struct {
 
 extern RAN_CONTEXT_t RC;
 
+#define NB_eNB_INST RC.nb_inst
 #endif

common/utils/telnetsrv/telnetsrv_enb_measurements.c

@@ -165,8 +165,7 @@ void measurcmd_display_rlcstats(telnet_printfunc_t prnt) {
     statsptr[i].vptr = rlcstats + i;
   }
 
-  for (int UE_id=UE_info->list.head; UE_id>=0; UE_id=UE_info->list.next[UE_id]) {
-#define NB_eNB_INST 1
+  for (int UE_id = UE_info->list.head; UE_id >= 0; UE_id = UE_info->list.next[UE_id]) {
     PROTOCOL_CTXT_SET_BY_MODULE_ID(&ctxt,eNB_id, ENB_FLAG_YES,UE_info->eNB_UE_stats[0][UE_id].crnti,
                                    eNB->frame,eNB->subframe,eNB_id);
     measurcmd_display_one_rlcstat(prnt, UE_id, statsptr, num_rlcmeasure, rlcstats, "DCCH", &ctxt, SRB_FLAG_YES, DCCH);