maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added config file + bug fixing

Browse Source
This commit is contained in:
kogo
2017-07-27 19:53:39 +02:00
parent 9a8d277b68
commit 99dcb4ceb4
4 changed files with 3560 additions and 3499 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/COMMON/rrc_messages_types.h
+2 -2
View File
@@ -180,11 +180,11 @@ typedef struct RrcConfigurationReq_s {
RadioResourceConfig radioresourceconfig[MAX_NUM_CCs]; RadioResourceConfig radioresourceconfig[MAX_NUM_CCs];
RadioResourceConfig radioresourceconfig_BR[MAX_NUM_CCs];
#ifdef Rel14 #ifdef Rel14
RadioResourceConfig radioresourceconfig_BR[MAX_NUM_CCs];
//MIB //MIB
long schedulingInfoSIB1_BR_r13[MAX_NUM_CCs]; long schedulingInfoSIB1_BR_r13[MAX_NUM_CCs];
//SIB1 BR options //SIB1 BR options
openair2/ENB_APP/enb_config.c
+3550 -3493
View File
File diff suppressed because it is too large Load Diff
openair2/RRC/LITE/MESSAGES/asn1_msg.c
+2 -1
View File
@@ -852,11 +852,13 @@ uint8_t do_SIB23(uint8_t Mod_id,
uint8_t *buffer; uint8_t *buffer;
SystemInformationBlockType2_t **sib2; SystemInformationBlockType2_t **sib2;
RadioResourceConfig *rrconfig; RadioResourceConfig *rrconfig;
#ifdef Rel14 #ifdef Rel14
if (brOption) { if (brOption) {
buffer = RC.rrc[Mod_id]->carrier[CC_id].SIB23_BR; buffer = RC.rrc[Mod_id]->carrier[CC_id].SIB23_BR;
sib2 = &RC.rrc[Mod_id]->carrier[CC_id].sib2_BR; sib2 = &RC.rrc[Mod_id]->carrier[CC_id].sib2_BR;
rrconfig = &configuration->radioresourceconfig_BR[CC_id]; rrconfig = &configuration->radioresourceconfig_BR[CC_id];
} }
else else
#endif #endif
@@ -956,7 +958,6 @@ uint8_t do_SIB23(uint8_t Mod_id,
(*sib2)->radioResourceConfigCommon.rach_ConfigCommon.ext1 = calloc(1, sizeof(struct RACH_ConfigCommon__ext1)); (*sib2)->radioResourceConfigCommon.rach_ConfigCommon.ext1 = calloc(1, sizeof(struct RACH_ConfigCommon__ext1));
memset((*sib2)->radioResourceConfigCommon.rach_ConfigCommon.ext1, 0, sizeof(struct RACH_ConfigCommon__ext1)); memset((*sib2)->radioResourceConfigCommon.rach_ConfigCommon.ext1, 0, sizeof(struct RACH_ConfigCommon__ext1));
if (rrconfig->rach_maxHARQ_Msg3Tx) if (rrconfig->rach_maxHARQ_Msg3Tx)
{ {
(*sib2)->radioResourceConfigCommon.rach_ConfigCommon.ext1->preambleTransMax_CE_r13 = calloc(1, sizeof(PreambleTransMax_t)); (*sib2)->radioResourceConfigCommon.rach_ConfigCommon.ext1->preambleTransMax_CE_r13 = calloc(1, sizeof(PreambleTransMax_t));
openair2/RRC/LITE/rrc_eNB.c
+6 -3
View File
@@ -214,11 +214,14 @@ init_SI(
AssertFatal(RC.rrc[ctxt_pP->module_id]->carrier[CC_id].SIB23_BR!=NULL,"cannot allocate memory for SIB"); AssertFatal(RC.rrc[ctxt_pP->module_id]->carrier[CC_id].SIB23_BR!=NULL,"cannot allocate memory for SIB");
RC.rrc[ctxt_pP->module_id]->carrier[CC_id].sizeof_SIB23_BR = do_SIB23( RC.rrc[ctxt_pP->module_id]->carrier[CC_id].sizeof_SIB23_BR = do_SIB23(
ctxt_pP->module_id, ctxt_pP->module_id,
CC_id, CC_id
#ifdef Rel14
,TRUE
#endif
#if defined(ENABLE_ITTI) #if defined(ENABLE_ITTI)
configuration, ,configuration
);
#endif #endif
0);
} }
#endif #endif