Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Michael Black
OpenXG UE
Commits
89d7742d
Commit
89d7742d
authored
Nov 04, 2018
by
Raymond Knopp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
removal of warnings during configuration
parent
a6871b98
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
126 additions
and
208 deletions
+126
-208
openair2/ENB_APP/enb_config.c
openair2/ENB_APP/enb_config.c
+7
-8
openair2/RRC/LTE/MESSAGES/asn1_msg.c
openair2/RRC/LTE/MESSAGES/asn1_msg.c
+118
-196
openair2/RRC/LTE/rrc_eNB.c
openair2/RRC/LTE/rrc_eNB.c
+1
-4
No files found.
openair2/ENB_APP/enb_config.c
View file @
89d7742d
...
@@ -757,7 +757,7 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc) {
...
@@ -757,7 +757,7 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc) {
int
si_Narrowband_r13
=
0
;
int
si_Narrowband_r13
=
0
;
int
si_TBS_r13
=
0
;
int
si_TBS_r13
=
0
;
int
systemInfoValueTagSi_r13
=
0
;
//
int systemInfoValueTagSi_r13 = 0;
int
firstPreamble_r13
=
0
;
int
firstPreamble_r13
=
0
;
int
lastPreamble_r13
=
0
;
int
lastPreamble_r13
=
0
;
...
@@ -773,7 +773,7 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc) {
...
@@ -773,7 +773,7 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc) {
int
numRepetitionPerPreambleAttempt_r13
=
0
;
int
numRepetitionPerPreambleAttempt_r13
=
0
;
int
mpdcch_NumRepetition_RA_r13
=
0
;
int
mpdcch_NumRepetition_RA_r13
=
0
;
int
prach_HoppingConfig_r13
=
0
;
int
prach_HoppingConfig_r13
=
0
;
int
*
maxavailablenarrowband
=
NULL
;
//
int *maxavailablenarrowband = NULL;
int
pucch_info_value
=
0
;
int
pucch_info_value
=
0
;
int
paging_narrowbands_r13
=
0
;
int
paging_narrowbands_r13
=
0
;
...
@@ -799,12 +799,12 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc) {
...
@@ -799,12 +799,12 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc) {
int
sib2_mpdcch_pdsch_hoppingOffset_r13
=
0
;
int
sib2_mpdcch_pdsch_hoppingOffset_r13
=
0
;
int
pusch_HoppingOffset_v1310
=
0
;
//
int pusch_HoppingOffset_v1310 = 0;
int
hyperSFN_r13
=
0
;
//
int hyperSFN_r13 = 0;
int
eDRX_Allowed_r13
=
0
;
//
int eDRX_Allowed_r13 = 0;
int
q_RxLevMinCE_r13
=
0
;
int
q_RxLevMinCE_r13
=
0
;
int
q_QualMinRSRQ_CE_r13
=
0
;
//
int q_QualMinRSRQ_CE_r13 = 0;
char
*
si_WindowLength_BR_r13
=
NULL
;
char
*
si_WindowLength_BR_r13
=
NULL
;
char
*
si_RepetitionPattern_r13
=
NULL
;
char
*
si_RepetitionPattern_r13
=
NULL
;
int
startSymbolBR_r13
=
0
;
int
startSymbolBR_r13
=
0
;
...
@@ -3654,8 +3654,7 @@ int RCconfig_X2(MessageDef *msg_p, uint32_t i) {
...
@@ -3654,8 +3654,7 @@ int RCconfig_X2(MessageDef *msg_p, uint32_t i) {
pucch_nRB_CQI
,
pucch_nCS_AN
,
pucch_n1_AN
,
pdsch_referenceSignalPower
,
pucch_nRB_CQI
,
pucch_nCS_AN
,
pucch_n1_AN
,
pdsch_referenceSignalPower
,
pdsch_p_b
,
pusch_n_SB
,
pusch_hoppingOffset
,
pusch_groupAssignment
,
pdsch_p_b
,
pusch_n_SB
,
pusch_hoppingOffset
,
pusch_groupAssignment
,
pusch_nDMRS1
,
srs_BandwidthConfig
,
srs_SubframeConfig
,
pusch_p0_Nominal
,
pusch_nDMRS1
,
srs_BandwidthConfig
,
srs_SubframeConfig
,
pusch_p0_Nominal
,
pucch_p0_Nominal
,
msg3_delta_Preamble
;
pucch_p0_Nominal
,
msg3_delta_Preamble
,
rach_numberOfRA_Preambles
;
char
*
rach_numberOfRA_Preambles
;
int32_t
rach_sizeOfRA_PreamblesGroupA
,
rach_messageSizeGroupA
,
int32_t
rach_sizeOfRA_PreamblesGroupA
,
rach_messageSizeGroupA
,
rach_powerRampingStep
,
rach_preambleInitialReceivedTargetPower
,
rach_powerRampingStep
,
rach_preambleInitialReceivedTargetPower
,
rach_preambleTransMax
,
rach_raResponseWindowSize
,
rach_preambleTransMax
,
rach_raResponseWindowSize
,
...
...
openair2/RRC/LTE/MESSAGES/asn1_msg.c
View file @
89d7742d
This diff is collapsed.
Click to expand it.
openair2/RRC/LTE/rrc_eNB.c
View file @
89d7742d
...
@@ -200,7 +200,7 @@ init_SI(
...
@@ -200,7 +200,7 @@ init_SI(
AssertFatal
(
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
SIB1
!=
NULL
,
PROTOCOL_RRC_CTXT_FMT
" init_SI: FATAL, no memory for SIB1 allocated
\n
"
,
AssertFatal
(
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
SIB1
!=
NULL
,
PROTOCOL_RRC_CTXT_FMT
" init_SI: FATAL, no memory for SIB1 allocated
\n
"
,
PROTOCOL_RRC_CTXT_ARGS
(
ctxt_pP
));
PROTOCOL_RRC_CTXT_ARGS
(
ctxt_pP
));
puts
(
"[DEBUGGING][KOGO] --- Calling SIB1"
);
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
sizeof_SIB1
=
do_SIB1
(
&
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
],
ctxt_pP
->
module_id
,
CC_id
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
sizeof_SIB1
=
do_SIB1
(
&
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
],
ctxt_pP
->
module_id
,
CC_id
#if (RRC_VERSION >= MAKE_VERSION(14, 0, 0))
#if (RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
FALSE
,
FALSE
...
@@ -217,7 +217,6 @@ init_SI(
...
@@ -217,7 +217,6 @@ init_SI(
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
sizeof_SIB1_BR
=
0
;
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
sizeof_SIB1_BR
=
0
;
if
(
configuration
->
schedulingInfoSIB1_BR_r13
[
CC_id
]
>
0
)
{
if
(
configuration
->
schedulingInfoSIB1_BR_r13
[
CC_id
]
>
0
)
{
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
SIB1_BR
=
(
uint8_t
*
)
malloc16
(
32
);
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
SIB1_BR
=
(
uint8_t
*
)
malloc16
(
32
);
puts
(
"[DEBUGGING][KOGO] --- Calling SIB1 -- second time"
);
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
sizeof_SIB1_BR
=
do_SIB1
(
&
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
],
ctxt_pP
->
module_id
,
CC_id
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
sizeof_SIB1_BR
=
do_SIB1
(
&
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
],
ctxt_pP
->
module_id
,
CC_id
,
TRUE
,
TRUE
#if defined(ENABLE_ITTI)
#if defined(ENABLE_ITTI)
...
@@ -229,7 +228,6 @@ init_SI(
...
@@ -229,7 +228,6 @@ init_SI(
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
SIB23
=
(
uint8_t
*
)
malloc16
(
64
);
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
SIB23
=
(
uint8_t
*
)
malloc16
(
64
);
AssertFatal
(
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
SIB23
!=
NULL
,
"cannot allocate memory for SIB"
);
AssertFatal
(
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
SIB23
!=
NULL
,
"cannot allocate memory for SIB"
);
puts
(
"[DEBUGGING][KOGO] ---> Calling SIB23 ---> first time"
);
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
sizeof_SIB23
=
do_SIB23
(
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
sizeof_SIB23
=
do_SIB23
(
ctxt_pP
->
module_id
,
ctxt_pP
->
module_id
,
CC_id
CC_id
...
@@ -248,7 +246,6 @@ init_SI(
...
@@ -248,7 +246,6 @@ init_SI(
if
(
configuration
->
schedulingInfoSIB1_BR_r13
[
CC_id
]
>
0
)
{
if
(
configuration
->
schedulingInfoSIB1_BR_r13
[
CC_id
]
>
0
)
{
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
SIB23_BR
=
(
uint8_t
*
)
malloc16
(
64
);
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
SIB23_BR
=
(
uint8_t
*
)
malloc16
(
64
);
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"
);
puts
(
"[DEBUGGING][KOGO] ---> Calling SIB23 ---> second time"
);
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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment