Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
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
lizhongxiao
OpenXG-RAN
Commits
41181936
Commit
41181936
authored
Mar 13, 2023
by
Petro Shevchenko
Committed by
jperaldi
Apr 03, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bugz #125674: fixed fault in do_SIB5() in case of several cells.
InterFreqCarrierFreqInfoCount became an array
parent
414ae195
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
openair2/COMMON/rrc_messages_types.h
openair2/COMMON/rrc_messages_types.h
+1
-1
openair2/RRC/LTE/MESSAGES/asn1_msg.c
openair2/RRC/LTE/MESSAGES/asn1_msg.c
+1
-1
openair3/SS/ss_eNB_sys_task.c
openair3/SS/ss_eNB_sys_task.c
+2
-2
No files found.
openair2/COMMON/rrc_messages_types.h
View file @
41181936
...
...
@@ -498,7 +498,7 @@ typedef struct RrcConfigurationReq_s {
//SIB5
bool
sib5_Present
[
MAX_NUM_CCs
];
int
InterFreqCarrierFreqInfoCount
;
int
InterFreqCarrierFreqInfoCount
[
MAX_NUM_CCs
]
;
InterFreqCarrierFreqInfo_t
*
InterFreqCarrierFreqInfo
[
MAX_NUM_CCs
];
//SIB18
...
...
openair2/RRC/LTE/MESSAGES/asn1_msg.c
View file @
41181936
...
...
@@ -2452,7 +2452,7 @@ uint8_t do_SIB5(uint8_t Mod_id,
LTE_InterFreqCarrierFreqInfo_t
*
InterFreqCarrierInfo
;
/* Handling multiple entities in InterFrequencyList for SIB5 message */
for
(
int
i
=
0
;
i
<
configuration
->
InterFreqCarrierFreqInfoCount
;
i
++
)
{
for
(
int
i
=
0
;
i
<
configuration
->
InterFreqCarrierFreqInfoCount
[
CC_id
]
;
i
++
)
{
InterFreqCarrierInfo
=
CALLOC
(
1
,
sizeof
(
struct
LTE_InterFreqCarrierFreqInfo
));
InterFreqCarrierInfo
->
dl_CarrierFreq
=
configuration
->
InterFreqCarrierFreqInfo
[
CC_id
][
i
].
dl_CarrierFreq
;
InterFreqCarrierInfo
->
q_RxLevMin
=
configuration
->
InterFreqCarrierFreqInfo
[
CC_id
][
i
].
q_RxLevMin
;
...
...
openair3/SS/ss_eNB_sys_task.c
View file @
41181936
...
...
@@ -546,8 +546,8 @@ int sys_add_reconfig_cell(struct SYSTEM_CTRL_REQ *req)
/* SIB5: Received SIB5 from TTCN */
if
(
SQN_SystemInformation_r8_IEs_sib_TypeAndInfo_s_sib5
==
AddOrReconfigure
->
Basic
.
v
.
BcchConfig
.
v
.
BcchInfo
.
v
.
SIs
.
v
.
v
[
i
].
message
.
v
.
c1
.
v
.
systemInformation
.
criticalExtensions
.
v
.
systemInformation_r8
.
sib_TypeAndInfo
.
v
[
j
].
d
)
{
RRC_CONFIGURATION_REQ
(
msg_p
).
sib5_Present
[
cell_index
]
=
true
;
RRC_CONFIGURATION_REQ
(
msg_p
).
InterFreqCarrierFreqInfoCount
=
AddOrReconfigure
->
Basic
.
v
.
BcchConfig
.
v
.
BcchInfo
.
v
.
SIs
.
v
.
v
[
i
].
message
.
v
.
c1
.
v
.
systemInformation
.
criticalExtensions
.
v
.
systemInformation_r8
.
sib_TypeAndInfo
.
v
[
j
].
v
.
sib5
.
interFreqCarrierFreqList
.
d
;
RRC_CONFIGURATION_REQ
(
msg_p
).
InterFreqCarrierFreqInfo
[
cell_index
]
=
CALLOC
(
RRC_CONFIGURATION_REQ
(
msg_p
).
InterFreqCarrierFreqInfoCount
,
sizeof
(
struct
InterFreqCarrierFreqInfo_s
));
RRC_CONFIGURATION_REQ
(
msg_p
).
InterFreqCarrierFreqInfoCount
[
cell_index
]
=
AddOrReconfigure
->
Basic
.
v
.
BcchConfig
.
v
.
BcchInfo
.
v
.
SIs
.
v
.
v
[
i
].
message
.
v
.
c1
.
v
.
systemInformation
.
criticalExtensions
.
v
.
systemInformation_r8
.
sib_TypeAndInfo
.
v
[
j
].
v
.
sib5
.
interFreqCarrierFreqList
.
d
;
RRC_CONFIGURATION_REQ
(
msg_p
).
InterFreqCarrierFreqInfo
[
cell_index
]
=
CALLOC
(
RRC_CONFIGURATION_REQ
(
msg_p
).
InterFreqCarrierFreqInfoCount
[
cell_index
]
,
sizeof
(
struct
InterFreqCarrierFreqInfo_s
));
for
(
int
k
=
0
;
k
<
AddOrReconfigure
->
Basic
.
v
.
BcchConfig
.
v
.
BcchInfo
.
v
.
SIs
.
v
.
v
[
i
].
message
.
v
.
c1
.
v
.
systemInformation
.
criticalExtensions
.
v
.
systemInformation_r8
.
sib_TypeAndInfo
.
v
[
j
].
v
.
sib5
.
interFreqCarrierFreqList
.
d
;
k
++
)
{
RRC_CONFIGURATION_REQ
(
msg_p
).
InterFreqCarrierFreqInfo
[
cell_index
][
k
].
dl_CarrierFreq
=
AddOrReconfigure
->
Basic
.
v
.
BcchConfig
.
v
.
BcchInfo
.
v
.
SIs
.
v
.
v
[
i
].
message
.
v
.
c1
.
v
.
systemInformation
.
criticalExtensions
.
v
.
systemInformation_r8
.
sib_TypeAndInfo
.
v
[
j
].
v
.
sib5
.
interFreqCarrierFreqList
.
v
[
k
].
dl_CarrierFreq
;
RRC_CONFIGURATION_REQ
(
msg_p
).
InterFreqCarrierFreqInfo
[
cell_index
][
k
].
q_RxLevMin
=
AddOrReconfigure
->
Basic
.
v
.
BcchConfig
.
v
.
BcchInfo
.
v
.
SIs
.
v
.
v
[
i
].
message
.
v
.
c1
.
v
.
systemInformation
.
criticalExtensions
.
v
.
systemInformation_r8
.
sib_TypeAndInfo
.
v
[
j
].
v
.
sib5
.
interFreqCarrierFreqList
.
v
[
k
].
q_RxLevMin
;
...
...
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