At this point we are successfully able to build. Additionally, we can run the scenario, however, it does not pass. It seems that the gNB is not connecting to the proxy correctly. Just wanted to push the progress so far. FYI, the items that had to be changed to correct the linking issues were the following: - mac_rrc_data_ind_ue vs. nr_mac_rrc_data_ind_ue - rrc_data_req vs. nr_rrc_data_req - mac_rrc_data_req_ue vs. nr_mac_rrc_data_req_ue - rrc_data_req_ue vs. rrc_data_req_nr_ue - rrc_data_req vs. nr_rrc_data_req The listed functions should be declard in the LTE/NR UE directory depending on the functionality. Several were mixed. i.e.: LTE functions being called in NR UE. Also, removing siWindowLength, siWindowLength_int, SIBType, SIBPeriod, and siPeriod_int from the NR UE RRC. These variable were not used in the NR UE and are defined for LTE only. Lastly, in the NR_IF_Module.c of the NR UE, the global variable def_dci_pdu_rel15 is not accessible. Need to revisit this. For not it is commented out.
246 lines
5.5 KiB
C
246 lines
5.5 KiB
C
/*
|
|
* 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
|
|
*/
|
|
|
|
/*! \file rrc_vars.h
|
|
* \brief rrc variables
|
|
* \author Raymond Knopp and Navid Nikaein
|
|
* \date 2013
|
|
* \version 1.0
|
|
* \company Eurecom
|
|
* \email: navid.nikaein@eurecom.fr
|
|
*/
|
|
|
|
|
|
#ifndef __OPENAIR_RRC_VARS_H__
|
|
#define __OPENAIR_RRC_VARS_H__
|
|
#include "rrc_defs.h"
|
|
#include "LAYER2/RLC/rlc.h"
|
|
#include "COMMON/mac_rrc_primitives.h"
|
|
#include "LAYER2/MAC/mac.h"
|
|
|
|
UE_PF_PO_t UE_PF_PO[NFAPI_CC_MAX][MAX_MOBILES_PER_ENB];
|
|
pthread_mutex_t ue_pf_po_mutex;
|
|
UE_RRC_INST *UE_rrc_inst = NULL;
|
|
#include "LAYER2/MAC/mac_extern.h"
|
|
#define MAX_U32 0xFFFFFFFF
|
|
|
|
extern uint16_t ue_id_g;
|
|
|
|
uint8_t DRB2LCHAN[8];
|
|
|
|
long logicalChannelGroup0 = 0;
|
|
long logicalChannelSR_Mask_r9=0;
|
|
|
|
struct LTE_LogicalChannelConfig__ul_SpecificParameters LCSRB1 = {1,
|
|
LTE_LogicalChannelConfig__ul_SpecificParameters__prioritisedBitRate_infinity,
|
|
0,
|
|
&logicalChannelGroup0
|
|
};
|
|
struct LTE_LogicalChannelConfig__ul_SpecificParameters LCSRB2 = {3,
|
|
LTE_LogicalChannelConfig__ul_SpecificParameters__prioritisedBitRate_infinity,
|
|
0,
|
|
&logicalChannelGroup0
|
|
};
|
|
|
|
struct LTE_LogicalChannelConfig__ext1 logicalChannelSR_Mask_r9_ext1 = {
|
|
logicalChannelSR_Mask_r9:
|
|
&logicalChannelSR_Mask_r9
|
|
};
|
|
|
|
// These are the default SRB configurations from 36.331 (Chapter 9, p. 176-179 in v8.6)
|
|
LTE_LogicalChannelConfig_t SRB1_logicalChannelConfig_defaultValue = {ul_SpecificParameters:
|
|
&LCSRB1,
|
|
ext1:
|
|
&logicalChannelSR_Mask_r9_ext1
|
|
};
|
|
|
|
LTE_LogicalChannelConfig_t SRB2_logicalChannelConfig_defaultValue = {ul_SpecificParameters:
|
|
&LCSRB2,
|
|
ext1:
|
|
&logicalChannelSR_Mask_r9_ext1
|
|
};
|
|
|
|
//CONSTANTS
|
|
rlc_info_t Rlc_info_um,Rlc_info_am_config;
|
|
uint16_t RACH_FREQ_ALLOC;
|
|
//uint8_t NB_RACH;
|
|
LCHAN_DESC BCCH_LCHAN_DESC,CCCH_LCHAN_DESC,DCCH_LCHAN_DESC,DTCH_DL_LCHAN_DESC,DTCH_UL_LCHAN_DESC;
|
|
MAC_MEAS_T BCCH_MEAS_TRIGGER,CCCH_MEAS_TRIGGER,DCCH_MEAS_TRIGGER,DTCH_MEAS_TRIGGER;
|
|
MAC_AVG_T BCCH_MEAS_AVG, CCCH_MEAS_AVG,DCCH_MEAS_AVG, DTCH_MEAS_AVG;
|
|
|
|
// timers
|
|
uint16_t T300[8] = {100,200,300,400,600,1000,1500,2000};
|
|
uint16_t T310[8] = {0,50,100,200,500,1000,2000};
|
|
uint16_t N310[8] = {1,2,3,4,6,8,10,20};
|
|
uint16_t N311[8] = {1,2,3,4,6,8,10,20};
|
|
uint32_t T304[8] = {50,100,150,200,500,1000,2000,MAX_U32};
|
|
|
|
// TimeToTrigger enum mapping table (36.331 TimeToTrigger IE)
|
|
uint32_t timeToTrigger_ms[16] = {0,40,64,80,100,128,160,256,320,480,512,640,1024,1280,2560,5120};
|
|
|
|
/* 36.133 Section 9.1.4 RSRP Measurement Report Mapping, Table: 9.1.4-1 */
|
|
float RSRP_meas_mapping[98] = {
|
|
-140,
|
|
-139,
|
|
-138,
|
|
-137,
|
|
-136,
|
|
-135,
|
|
-134,
|
|
-133,
|
|
-132,
|
|
-131,
|
|
-130,
|
|
-129,
|
|
-128,
|
|
-127,
|
|
-126,
|
|
-125,
|
|
-124,
|
|
-123,
|
|
-122,
|
|
-121,
|
|
-120,
|
|
-119,
|
|
-118,
|
|
-117,
|
|
-116,
|
|
-115,
|
|
-114,
|
|
-113,
|
|
-112,
|
|
-111,
|
|
-110,
|
|
-109,
|
|
-108,
|
|
-107,
|
|
-106,
|
|
-105,
|
|
-104,
|
|
-103,
|
|
-102,
|
|
-101,
|
|
-100,
|
|
-99,
|
|
-98,
|
|
-97,
|
|
-96,
|
|
-95,
|
|
-94,
|
|
-93,
|
|
-92,
|
|
-91,
|
|
-90,
|
|
-89,
|
|
-88,
|
|
-87,
|
|
-86,
|
|
-85,
|
|
-84,
|
|
-83,
|
|
-82,
|
|
-81,
|
|
-80,
|
|
-79,
|
|
-78,
|
|
-77,
|
|
-76,
|
|
-75,
|
|
-74,
|
|
-73,
|
|
-72,
|
|
-71,
|
|
-70,
|
|
-69,
|
|
-68,
|
|
-67,
|
|
-66,
|
|
-65,
|
|
-64,
|
|
-63,
|
|
-62,
|
|
-61,
|
|
-60,
|
|
-59,
|
|
-58,
|
|
-57,
|
|
-56,
|
|
-55,
|
|
-54,
|
|
-53,
|
|
-52,
|
|
-51,
|
|
-50,
|
|
-49,
|
|
-48,
|
|
-47,
|
|
-46,
|
|
-45,
|
|
-44,
|
|
-43
|
|
};
|
|
|
|
float RSRQ_meas_mapping[35] = {
|
|
-19,
|
|
-18.5,
|
|
-18,
|
|
-17.5,
|
|
-17,
|
|
-16.5,
|
|
-16,
|
|
-15.5,
|
|
-15,
|
|
-14.5,
|
|
-14,
|
|
-13.5,
|
|
-13,
|
|
-12.5,
|
|
-12,
|
|
-11.5,
|
|
-11,
|
|
-10.5,
|
|
-10,
|
|
-9.5,
|
|
-9,
|
|
-8.5,
|
|
-8,
|
|
-7.5,
|
|
-7,
|
|
-6.5,
|
|
-6,
|
|
-5.5,
|
|
-5,
|
|
-4.5,
|
|
-4,
|
|
-3.5,
|
|
-3,
|
|
-2.5,
|
|
-2
|
|
};
|
|
|
|
// only used for RRC connection re-establishment procedure TS36.331 5.3.7
|
|
// [0]: current C-RNTI, [1]: prior C-RNTI
|
|
// insert one when eNB received RRCConnectionReestablishmentRequest message
|
|
// delete one when eNB received RRCConnectionReestablishmentComplete message
|
|
uint16_t reestablish_rnti_map[MAX_MOBILES_PER_ENB][2] = {{0}};
|
|
|
|
#endif
|