Skip to content

O
OpenXG-RAN
Commit 05573ced authored by Raymond Knopp's avatar Raymond Knopp
Browse files
Options

Merge branch 'RU-RAU-split' of... 

Merge branch 'RU-RAU-split' of https://gitlab.eurecom.fr/raymond.knopp/openairinterface5g into RU-RAU-split

Conflicts:
	openair2/ENB_APP/enb_config.c
	openair2/RRC/LITE/MESSAGES/asn1_msg.c
	openair2/RRC/LITE/MESSAGES/asn1_msg.h
parents 64ee1506 1d8833c7
Show whitespace changes
Inline Side-by-side
Showing with 3989 additions and 40 deletions
oai5g_development.config 0 → 100644
View file @ 05573ced
// Add predefined macros for your project here. For example:
// #define THE_ANSWER 42
oai5g_development.files 0 → 100644
View file @ 05573ced
This source diff could not be displayed because it is too large. You can view the blob instead.
oai5g_development.includes 0 → 100644
View file @ 05573ced
common/utils
common/utils/collection
common/utils/collection/hashtable
common/utils/itti
common/utils/itti_analyzer/common
common/utils/itti_analyzer/libbuffers
common/utils/itti_analyzer/libparser
common/utils/itti_analyzer/libresolver
common/utils/itti_analyzer/libui
common/utils/msc
openair-cn/COMMON
openair-cn/GTPV1-U
openair-cn/GTPV1-U/GTPUAH
openair-cn/GTPV1-U/nw-gtpv1u/include
openair-cn/GTPV1-U/nw-gtpv1u/shared
openair-cn/GTPV1-U/nw-gtpv1u/test-app/nw-helloworld
openair-cn/GTPV2-C/nwgtpv2c-0.11/include
openair-cn/GTPV2-C/nwgtpv2c-0.11/shared
openair-cn/GTPV2-C/nwgtpv2c-0.11/test-app/nw-egtping
openair-cn/GTPV2-C/nwgtpv2c-0.11/test-app/nw-helloworld
openair-cn/INTERTASK_INTERFACE
openair-cn/MME_APP
openair-cn/NAS
openair-cn/NAS/EURECOM-NAS/src
openair-cn/NAS/EURECOM-NAS/src/api/mme
openair-cn/NAS/EURECOM-NAS/src/api/network
openair-cn/NAS/EURECOM-NAS/src/api/user
openair-cn/NAS/EURECOM-NAS/src/api/usim
openair-cn/NAS/EURECOM-NAS/src/emm
openair-cn/NAS/EURECOM-NAS/src/emm/msg
openair-cn/NAS/EURECOM-NAS/src/emm/sap
openair-cn/NAS/EURECOM-NAS/src/esm
openair-cn/NAS/EURECOM-NAS/src/esm/msg
openair-cn/NAS/EURECOM-NAS/src/esm/sap
openair-cn/NAS/EURECOM-NAS/src/ies
openair-cn/NAS/EURECOM-NAS/src/include
openair-cn/NAS/EURECOM-NAS/src/util
openair-cn/NAS/EURECOM-NAS/tools
openair-cn/NAS/EURECOM-NAS/tst/as_simulator
openair-cn/NAS/EURECOM-NAS/tst/network
openair-cn/NAS/EURECOM-NAS/tst/user
openair-cn/OAI_EPC
openair-cn/OAI_SGW
openair-cn/OAISIM_MME
openair-cn/OPENAIRHSS/access_restriction
openair-cn/OPENAIRHSS/auc
openair-cn/OPENAIRHSS/db
openair-cn/OPENAIRHSS/s6a
openair-cn/OPENAIRHSS/tests
openair-cn/OPENAIRHSS/utils
openair-cn/S11
openair-cn/S1AP
openair-cn/S6A
openair-cn/SCTP
openair-cn/SECU
openair-cn/SGW-LITE
openair-cn/TEST
openair-cn/UDP
openair-cn/UTILS
openair-cn/UTILS/HASHTABLE
openair1/MAC_INTERFACE
openair1/PHY
openair1/PHY/CODING
openair1/PHY/INIT
openair1/PHY/LTE_ESTIMATION
openair1/PHY/LTE_REFSIG
openair1/PHY/LTE_TRANSPORT
openair1/PHY/MODULATION
openair1/PHY/TOOLS
openair1/SCHED
openair1/SIMULATION/ETH_TRANSPORT
openair1/SIMULATION/LTE_PHY
openair1/SIMULATION/RF
openair1/SIMULATION/TOOLS
openair2/COMMON
openair2/DOCS/TEMPLATES/CODE
openair2/ENB_APP
openair2/LAYER2
openair2/LAYER2/MAC
openair2/LAYER2/PDCP_v10.1.0
openair2/LAYER2/RLC
openair2/LAYER2/RLC/AM_v9.3.0
openair2/LAYER2/RLC/TM_v9.3.0
openair2/LAYER2/RLC/UM_v9.3.0
openair2/NAS
openair2/NAS/DRIVER/CELLULAR/CTL_TOOL
openair2/NAS/DRIVER/CELLULAR/NASMT
openair2/NAS/DRIVER/CELLULAR/NASRG
openair2/NAS/SIMU_CELLULAR
openair2/NETWORK_DRIVER/LITE
openair2/NETWORK_DRIVER/MESH
openair2/NETWORK_DRIVER/UE_IP
openair2/PHY_INTERFACE
openair2/RRC/L2_INTERFACE
openair2/RRC/LITE
openair2/RRC/LITE/MESSAGES
openair2/RRC/NAS
openair2/RRM_4_RRC_LITE/src
openair2/RRM_4_RRC_LITE/src/com
openair2/RRM_4_RRC_LITE/src/com/rrc
openair2/RRM_4_RRC_LITE/src/com/rrm
openair2/RRM_4_RRC_LITE/src/foreign/sockets-2.3.9.4
openair2/RRM_4_RRC_LITE/src/foreign/sql
openair2/RRM_4_RRC_LITE/src/foreign/tcpip
openair2/RRM_4_RRC_LITE/src/radio_resources
openair2/RRM_4_RRC_LITE/src/test
openair2/UTIL
openair2/UTIL/AT_COMMANDS
openair2/UTIL/BIGPHYS
openair2/UTIL/CLI
openair2/UTIL/FIFO
openair2/UTIL/LFDS/liblfds6.1.1/liblfds611/inc
openair2/UTIL/LFDS/liblfds6.1.1/liblfds611/src
openair2/UTIL/LFDS/liblfds6.1.1/liblfds611/src/lfds611_abstraction
openair2/UTIL/LFDS/liblfds6.1.1/liblfds611/src/lfds611_freelist
openair2/UTIL/LFDS/liblfds6.1.1/liblfds611/src/lfds611_liblfds
openair2/UTIL/LFDS/liblfds6.1.1/liblfds611/src/lfds611_queue
openair2/UTIL/LFDS/liblfds6.1.1/liblfds611/src/lfds611_ringbuffer
openair2/UTIL/LFDS/liblfds6.1.1/liblfds611/src/lfds611_slist
openair2/UTIL/LFDS/liblfds6.1.1/liblfds611/src/lfds611_stack
openair2/UTIL/LFDS/liblfds6.1.1/test/src
openair2/UTIL/LISTS
openair2/UTIL/LOG
openair2/UTIL/MATH
openair2/UTIL/MEM
openair2/UTIL/OCG
openair2/UTIL/OMG
openair2/UTIL/OMV
openair2/UTIL/OPT
openair2/UTIL/OSA
openair2/UTIL/OTG
openair2/UTIL/TIMER
openair2/UTIL/TRACE
openair2/X2AP
openair3/DOCS/TEMPLATES/CODE
openair3/MESH
openair3/MESH/RRM
openair3/MESH/RRM/EMUL
openair3/MESH/RRM/GRAPH
openair3/PMIPv6/freeradius-client-1.1.6
openair3/PMIPv6/freeradius-client-1.1.6/include
openair3/PMIPv6/freeradius-client-1.1.6/lib
openair3/PMIPv6/freeradius-client-1.1.6/src
openair3/PMIPv6/pmipv6-daemon-umip/include
openair3/PMIPv6/pmipv6-daemon-umip/include/linux
openair3/PMIPv6/pmipv6-daemon-umip/include/netinet
openair3/PMIPv6/pmipv6-daemon-umip/src
openair3/PMIPv6/pmipv6-daemon-umip/src/pmip
openair3/RAL-LTE/INTERFACE-802.21/INCLUDE
openair3/RAL-LTE/LTE_RAL_ENB/INCLUDE
openair3/RAL-LTE/LTE_RAL_UE/INCLUDE
openair3/RAL-LTE/RAL-DUMMY/INCLUDE
openairITS/mac/DOT11/include/crypto
openairITS/mac/DOT11/include/linux
openairITS/mac/DOT11/include/linux/bcma
openairITS/mac/DOT11/include/linux/spi
openairITS/mac/DOT11/include/linux/ssb
openairITS/mac/DOT11/include/linux/unaligned
openairITS/mac/DOT11/include/linux/usb
openairITS/mac/DOT11/include/N/pcmcia
openairITS/mac/DOT11/include/N/trace
openairITS/mac/DOT11/include/net
openairITS/mac/DOT11/net/mac80211
openairITS/mac/DOT11/net/wireless
openairITS/phy/DOT11
openairITS/phy/DRIVERS
targets/ARCH/BLADERF/USERSPACE/LIB
targets/ARCH/COMMON
targets/ARCH/ETHERNET/USERSPACE/LIB
targets/ARCH/EXMIMO/DEFS
targets/ARCH/EXMIMO/DRIVER/eurecom
targets/ARCH/EXMIMO/DRIVER/exmimo3
targets/ARCH/EXMIMO/DRIVER/telecomparistech
targets/ARCH/EXMIMO/USERSPACE/LIB
targets/ARCH/EXMIMO/USERSPACE/OAI_FW_INIT
targets/COMMON
targets/RT/USER
targets/RT/USER/TOOLS
targets/SIMU/PROC
targets/SIMU/USER
targets/TEST/PDCP
targets/TEST/ROHDE_SCHWARZ
\ No newline at end of file
openair2/ENB_APP/enb_config.c
View file @ 05573ced
......@@ -3773,6 +3773,7 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc) {
#endif
}
setting_srb1 = config_setting_get_member (setting_enb, ENB_CONFIG_STRING_SRB1);
if (setting_srb1 != NULL) {
......
openair2/RRC/LITE/MESSAGES/asn1_msg.c
View file @ 05573ced
......@@ -289,11 +289,11 @@ uint8_t do_MIB(rrc_eNB_carrier_data_t *carrier, uint32_t N_RB_DL, uint32_t phich
uint8_t do_SIB1(rrc_eNB_carrier_data_t *carrier,
int Mod_id,int CC_id
#ifdef Rel14
, BOOLEAN_t brOption
#endif
#if defined(ENABLE_ITTI)
, RrcConfigurationReq *configuration
#endif
#ifdef Rel14
, int br_flag
#endif
)
{
......@@ -304,26 +304,26 @@ uint8_t do_SIB1(rrc_eNB_carrier_data_t *carrier,
asn_enc_rval_t enc_rval;
SchedulingInfo_t schedulingInfo;
SIB_Type_t sib_type;
uint8_t *buffer;
BCCH_DL_SCH_Message_t *bcch_message;
SystemInformationBlockType1_t **sib1;
SystemInformationBlockType1_BR_r13_t **sib1_br;
#ifdef Rel14
if (br_flag==0) {
buffer = carrier->SIB1;
bcch_message = &carrier->siblock1;
sib1 = &carrier->sib1;
}
else {
if (brOption) {
buffer = carrier->SIB1_BR;
bcch_message = &carrier->siblock1_BR;
sib1 = &carrier->sib1_BR;
}
#else
else
#endif
{
buffer = carrier->SIB1;
bcch_message = &carrier->siblock1;
sib1 = &carrier->sib1;
#endif
}
memset(bcch_message,0,sizeof(BCCH_DL_SCH_Message_t));
bcch_message->message.present = BCCH_DL_SCH_MessageType_PR_c1;
bcch_message->message.choice.c1.present = BCCH_DL_SCH_MessageType__c1_PR_systemInformationBlockType1;
......@@ -473,6 +473,7 @@ uint8_t do_SIB1(rrc_eNB_carrier_data_t *carrier,
(*sib1)->si_WindowLength = SystemInformationBlockType1__si_WindowLength_ms20;
(*sib1)->systemInfoValueTag = 0;
#ifdef Rel14
(*sib1)->nonCriticalExtension = calloc(1, sizeof(SystemInformationBlockType1_v890_IEs_t));
......@@ -495,7 +496,6 @@ uint8_t do_SIB1(rrc_eNB_carrier_data_t *carrier,
sib1_1130->nonCriticalExtension = calloc(1, sizeof(SystemInformationBlockType1_v1250_IEs_t));
memset(sib1_1130->nonCriticalExtension, 0, sizeof(SystemInformationBlockType1_v1250_IEs_t));
///Rel12
SystemInformationBlockType1_v1250_IEs_t *sib1_1250 = sib1_1130->nonCriticalExtension;
sib1_1250->cellAccessRelatedInfo_v1250.category0Allowed_r12 = NULL; // long*
......@@ -503,9 +503,6 @@ uint8_t do_SIB1(rrc_eNB_carrier_data_t *carrier,
sib1_1250->freqBandIndicatorPriority_r12 = 0; // long* // FIXME
sib1_1250->nonCriticalExtension = NULL;
////Rel1310
#if defined(ENABLE_ITTI)
if (configuration->schedulingInfoSIB1_BR_r13[CC_id] != 0)
......@@ -789,6 +786,7 @@ uint8_t do_SIB1(rrc_eNB_carrier_data_t *carrier,
#endif
#endif
#ifdef XER_PRINT
xer_fprint(stdout, &asn_DEF_BCCH_DL_SCH_Message, (void*)bcch_message);
#endif
......@@ -831,12 +829,13 @@ uint8_t do_SIB1(rrc_eNB_carrier_data_t *carrier,
uint8_t do_SIB23(uint8_t Mod_id,
int CC_id
#ifdef Rel14
, BOOLEAN_t brOption
#endif
#if defined(ENABLE_ITTI)
, RrcConfigurationReq *configuration
#endif
#ifdef Rel14
, int br_flag
#endif
)
{
struct SystemInformation_r8_IEs__sib_TypeAndInfo__Member *sib2_part,*sib3_part;
......@@ -854,21 +853,19 @@ uint8_t do_SIB23(uint8_t Mod_id,
SystemInformationBlockType2_t **sib2;
RadioResourceConfig *rrconfig;
#ifdef Rel14
if (br_flag == 0) {
buffer = RC.rrc[Mod_id]->carrier[CC_id].SIB23;
sib2 = &RC.rrc[Mod_id]->carrier[CC_id].sib2;
rrconfig = &configuration->radioresourceconfig[CC_id];
}
else {
if (brOption) {
buffer = RC.rrc[Mod_id]->carrier[CC_id].SIB23_BR;
sib2 = &RC.rrc[Mod_id]->carrier[CC_id].sib2_BR;
rrconfig = &configuration->radioresourceconfig_BR[CC_id];
}
#else
else
#endif
{
buffer = RC.rrc[Mod_id]->carrier[CC_id].SIB23;
sib2 = &RC.rrc[Mod_id]->carrier[CC_id].sib2;
rrconfig = &configuration->radioresourceconfig[CC_id];
#endif
}
SystemInformationBlockType3_t **sib3 = &RC.rrc[Mod_id]->carrier[CC_id].sib3;
#if defined(Rel10) || defined(Rel14)
SystemInformationBlockType13_r9_t **sib13 = &RC.rrc[Mod_id]->carrier[CC_id].sib13;
......@@ -959,6 +956,7 @@ uint8_t do_SIB23(uint8_t Mod_id,
(*sib2)->radioResourceConfigCommon.rach_ConfigCommon.ext1 = calloc(1, sizeof(struct RACH_ConfigCommon__ext1));
memset((*sib2)->radioResourceConfigCommon.rach_ConfigCommon.ext1, 0, sizeof(struct RACH_ConfigCommon__ext1));
if (rrconfig->rach_maxHARQ_Msg3Tx)
{
(*sib2)->radioResourceConfigCommon.rach_ConfigCommon.ext1->preambleTransMax_CE_r13 = calloc(1, sizeof(PreambleTransMax_t));
......@@ -1109,6 +1107,7 @@ uint8_t do_SIB23(uint8_t Mod_id,
(*sib2)->radioResourceConfigCommon.ext4->prach_ConfigCommon_v1310->mpdcch_startSF_CSS_RA_r13 = NULL;
if (rrconfig->mpdcch_startSF_CSS_RA_r13)
{
(*sib2)->radioResourceConfigCommon.ext4->prach_ConfigCommon_v1310->mpdcch_startSF_CSS_RA_r13 = calloc(1, sizeof(struct PRACH_ConfigSIB_v1310__mpdcch_startSF_CSS_RA_r13));
......
openair2/RRC/LITE/MESSAGES/asn1_msg.h
View file @ 05573ced
......@@ -79,14 +79,15 @@ uint8_t do_MIB(rrc_eNB_carrier_data_t *carrier, uint32_t N_RB_DL, uint32_t phich
@return size of encoded bit stream in bytes*/
uint8_t do_SIB1(rrc_eNB_carrier_data_t *carrier,int Mod_id,int CC_id
#ifdef Rel14
, BOOLEAN_t brOption
#endif
#if defined(ENABLE_ITTI)
,RrcConfigurationReq *configuration
#endif
#ifdef Rel14
,int br_flag
#endif
);
/**
\brief Generate a default configuration for SIB2/SIB3 in one System Information PDU (eNB).
@param Mod_id Index of eNB (used to derive some parameters)
......@@ -100,11 +101,11 @@ uint8_t do_SIB1(rrc_eNB_carrier_data_t *carrier,int Mod_id,int CC_id
uint8_t do_SIB23(uint8_t Mod_id,
int CC_id
#ifdef Rel14
, BOOLEAN_t brOption
#endif
#if defined(ENABLE_ITTI)
, RrcConfigurationReq *configuration
#endif
#ifdef Rel14
, int br_flag
#endif
);
......
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