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
OpenXG
OpenXG UE
Commits
4abdd2ff
Commit
4abdd2ff
authored
Aug 07, 2017
by
kogo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
activated SIB1 & SIB23 reading from config files and added BR parameters
parent
58ecadc5
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
993 additions
and
643 deletions
+993
-643
openair2/COMMON/rrc_messages_types.h
openair2/COMMON/rrc_messages_types.h
+66
-21
openair2/ENB_APP/enb_config.c
openair2/ENB_APP/enb_config.c
+585
-415
openair2/RRC/LITE/MESSAGES/asn1_msg.c
openair2/RRC/LITE/MESSAGES/asn1_msg.c
+337
-207
openair2/RRC/LITE/rrc_eNB.c
openair2/RRC/LITE/rrc_eNB.c
+5
-0
No files found.
openair2/COMMON/rrc_messages_types.h
View file @
4abdd2ff
...
...
@@ -190,29 +190,74 @@ typedef struct RrcConfigurationReq_s {
//SIB1 BR options
uint16_t
*
hyperSFN_r13
[
MAX_NUM_CCs
];
long
*
eDRX_Allowed_r13
[
MAX_NUM_CCs
];
BOOLEAN_t
cellSelectionInfoCE_r13
[
MAX_NUM_CCs
];
long
q_RxLevMinCE_r13
[
MAX_NUM_CCs
];
long
*
q_QualMinRSRQ_CE_r13
[
MAX_NUM_CCs
];
BOOLEAN_t
bandwidthReducedAccessRelatedInfo_r13
[
MAX_NUM_CCs
];
long
si_WindowLength_BR_r13
[
MAX_NUM_CCs
];
long
si_RepetitionPattern_r13
[
MAX_NUM_CCs
];
BOOLEAN_t
fdd_DownlinkOrTddSubframeBitmapBR_r13
[
MAX_NUM_CCs
];
uint64_t
fdd_DownlinkOrTddSubframeBitmapBR_val_r13
[
MAX_NUM_CCs
];
uint16_t
fdd_UplinkSubframeBitmapBR_r13
[
MAX_NUM_CCs
];
long
startSymbolBR_r13
[
MAX_NUM_CCs
];
long
si_HoppingConfigCommon_r13
[
MAX_NUM_CCs
];
long
*
si_ValidityTime_r13
[
MAX_NUM_CCs
];
BOOLEAN_t
freqHoppingParametersDL_r13
[
MAX_NUM_CCs
];
long
*
mpdcch_pdsch_HoppingNB_r13
[
MAX_NUM_CCs
];
BOOLEAN_t
interval_DLHoppingConfigCommonModeA_r13
[
MAX_NUM_CCs
];
long
interval_DLHoppingConfigCommonModeA_r13_val
[
MAX_NUM_CCs
];
BOOLEAN_t
interval_DLHoppingConfigCommonModeB_r13
[
MAX_NUM_CCs
];
long
interval_DLHoppingConfigCommonModeB_r13_val
[
MAX_NUM_CCs
];
long
*
mpdcch_pdsch_HoppingOffset_r13
[
MAX_NUM_CCs
];
uint16_t
*
hyperSFN_r13
[
MAX_NUM_CCs
];
long
*
eDRX_Allowed_r13
[
MAX_NUM_CCs
];
BOOLEAN_t
cellSelectionInfoCE_r13
[
MAX_NUM_CCs
];
long
q_RxLevMinCE_r13
[
MAX_NUM_CCs
];
long
*
q_QualMinRSRQ_CE_r13
[
MAX_NUM_CCs
];
BOOLEAN_t
bandwidthReducedAccessRelatedInfo_r13
[
MAX_NUM_CCs
];
// +kogo -- FIXME -- size 10 is temporary
long
si_Narrowband_r13
[
MAX_NUM_CCs
][
32
];
long
si_TBS_r13
[
MAX_NUM_CCs
][
32
];
int
scheduling_info_br_size
[
MAX_NUM_CCs
];
// end +kogo
long
si_WindowLength_BR_r13
[
MAX_NUM_CCs
];
long
si_RepetitionPattern_r13
[
MAX_NUM_CCs
];
BOOLEAN_t
fdd_DownlinkOrTddSubframeBitmapBR_r13
[
MAX_NUM_CCs
];
uint64_t
fdd_DownlinkOrTddSubframeBitmapBR_val_r13
[
MAX_NUM_CCs
];
uint16_t
fdd_UplinkSubframeBitmapBR_r13
[
MAX_NUM_CCs
];
long
startSymbolBR_r13
[
MAX_NUM_CCs
];
long
si_HoppingConfigCommon_r13
[
MAX_NUM_CCs
];
long
*
si_ValidityTime_r13
[
MAX_NUM_CCs
];
// +kogo
long
systemInfoValueTagSi_r13
[
MAX_NUM_CCs
][
10
];
int
system_info_value_tag_SI_size
[
MAX_NUM_CCs
];
// end +kogo
BOOLEAN_t
freqHoppingParametersDL_r13
[
MAX_NUM_CCs
];
long
*
mpdcch_pdsch_HoppingNB_r13
[
MAX_NUM_CCs
];
BOOLEAN_t
interval_DLHoppingConfigCommonModeA_r13
[
MAX_NUM_CCs
];
long
interval_DLHoppingConfigCommonModeA_r13_val
[
MAX_NUM_CCs
];
BOOLEAN_t
interval_DLHoppingConfigCommonModeB_r13
[
MAX_NUM_CCs
];
long
interval_DLHoppingConfigCommonModeB_r13_val
[
MAX_NUM_CCs
];
long
*
mpdcch_pdsch_HoppingOffset_r13
[
MAX_NUM_CCs
];
// +kogo -- rach_CE_LevelInfoList_r13
long
firstPreamble_r13
[
MAX_NUM_CCs
][
4
];
long
lastPreamble_r13
[
MAX_NUM_CCs
][
4
];
long
ra_ResponseWindowSize_r13
[
MAX_NUM_CCs
][
4
];
long
mac_ContentionResolutionTimer_r13
[
MAX_NUM_CCs
][
4
];
long
rar_HoppingConfig_r13
[
MAX_NUM_CCs
][
4
];
int
rach_CE_LevelInfoList_r13_size
[
MAX_NUM_CCs
];
// end kogo
// +kogo -- rsrp_range_list
long
rsrp_range
[
MAX_NUM_CCs
][
3
];
int
rsrp_range_list_size
[
MAX_NUM_CCs
];
// end kogo
// +kogo -- prach parameters ce list
long
prach_config_index
[
MAX_NUM_CCs
][
4
];
long
prach_freq_offset
[
MAX_NUM_CCs
][
4
];
long
*
prach_StartingSubframe_r13
[
MAX_NUM_CCs
][
4
];
long
*
maxNumPreambleAttemptCE_r13
[
MAX_NUM_CCs
][
4
];
long
numRepetitionPerPreambleAttempt_r13
[
MAX_NUM_CCs
][
4
];
long
mpdcch_NumRepetition_RA_r13
[
MAX_NUM_CCs
][
4
];
long
prach_HoppingConfig_r13
[
MAX_NUM_CCs
][
4
];
int
prach_parameters_list_size
[
MAX_NUM_CCs
];
long
max_available_narrow_band
[
MAX_NUM_CCs
][
4
][
2
];
int
max_available_narrow_band_size
[
MAX_NUM_CCs
];
// end kogo
// +kogo n1PUCCH_AN_InfoList_r13 list
long
pucch_info_value
[
MAX_NUM_CCs
][
4
];
int
pucch_info_value_size
[
MAX_NUM_CCs
];
// end kogo
#endif
}
RrcConfigurationReq
;
...
...
openair2/ENB_APP/enb_config.c
View file @
4abdd2ff
This diff is collapsed.
Click to expand it.
openair2/RRC/LITE/MESSAGES/asn1_msg.c
View file @
4abdd2ff
This diff is collapsed.
Click to expand it.
openair2/RRC/LITE/rrc_eNB.c
View file @
4abdd2ff
...
...
@@ -127,6 +127,7 @@ init_SI(
)
//-----------------------------------------------------------------------------
{
puts
(
"[DEBUGGING][KOGO] Inside init_SI function ..."
);
#if defined(Rel10) || defined(Rel14)
int
i
;
#endif
...
...
@@ -167,6 +168,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
"
,
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
#ifdef Rel14
,
FALSE
...
...
@@ -183,6 +185,7 @@ init_SI(
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
sizeof_SIB1_BR
=
0
;
if
(
configuration
->
schedulingInfoSIB1_BR_r13
[
CC_id
]
>
0
)
{
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
,
TRUE
#if defined(ENABLE_ITTI)
...
...
@@ -194,6 +197,7 @@ init_SI(
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"
);
puts
(
"[DEBUGGING][KOGO] ---> Calling SIB23 ---> first time"
);
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
sizeof_SIB23
=
do_SIB23
(
ctxt_pP
->
module_id
,
CC_id
...
...
@@ -212,6 +216,7 @@ init_SI(
if
(
configuration
->
schedulingInfoSIB1_BR_r13
[
CC_id
]
>
0
)
{
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"
);
puts
(
"[DEBUGGING][KOGO] ---> Calling SIB23 ---> second time"
);
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
sizeof_SIB23_BR
=
do_SIB23
(
ctxt_pP
->
module_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