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
ff287470
Commit
ff287470
authored
Nov 02, 2022
by
Vaibhav Shrivastava
Committed by
jperaldi
Nov 17, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changes for SIB3 & SIB1 param fix
parent
4deef348
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
46 additions
and
8 deletions
+46
-8
openair2/COMMON/rrc_messages_types.h
openair2/COMMON/rrc_messages_types.h
+9
-0
openair2/RRC/LTE/MESSAGES/asn1_msg.c
openair2/RRC/LTE/MESSAGES/asn1_msg.c
+27
-8
openair3/SS/ss_eNB_sys_task.c
openair3/SS/ss_eNB_sys_task.c
+10
-0
No files found.
openair2/COMMON/rrc_messages_types.h
View file @
ff287470
...
...
@@ -325,6 +325,8 @@ typedef struct RrcConfigurationReq_s {
int
eMTC_configured
;
int
SL_configured
;
uint8_t
systemInfoValueTag
;
long
cellBarred
;
long
intraFreqReselection
;
RadioResourceConfig
radioresourceconfig
[
MAX_NUM_CCs
];
RadioResourceConfig
radioresourceconfig_BR
[
MAX_NUM_CCs
];
...
...
@@ -406,6 +408,13 @@ typedef struct RrcConfigurationReq_s {
long
*
pusch_repetitionLevelCEmodeA_r13
[
MAX_NUM_CCs
];
long
*
pusch_HoppingOffset_v1310
[
MAX_NUM_CCs
];
//SIB3
long
q_Hyst
;
long
threshServingLow
;
long
cellReselectionPriority
;
long
sib3_q_RxLevMin
;
long
t_ReselectionEUTRA
;
//SIB18
e_LTE_SL_CP_Len_r12
rxPool_sc_CP_Len
[
MAX_NUM_CCs
];
e_LTE_SL_PeriodComm_r12
rxPool_sc_Period
[
MAX_NUM_CCs
];
...
...
openair2/RRC/LTE/MESSAGES/asn1_msg.c
View file @
ff287470
...
...
@@ -935,9 +935,14 @@ uint8_t do_SIB1(rrc_eNB_carrier_data_t *carrier,
(
*
sib1
)
->
cellAccessRelatedInfo
.
cellIdentity
.
size
=
4
;
(
*
sib1
)
->
cellAccessRelatedInfo
.
cellIdentity
.
bits_unused
=
4
;
// assign_enum(&(*sib1)->cellAccessRelatedInfo.cellBarred,SystemInformationBlockType1__cellAccessRelatedInfo__cellBarred_notBarred);
(
*
sib1
)
->
cellAccessRelatedInfo
.
cellBarred
=
LTE_SystemInformationBlockType1__cellAccessRelatedInfo__cellBarred_notBarred
;
// assign_enum(&(*sib1)->cellAccessRelatedInfo.intraFreqReselection,SystemInformationBlockType1__cellAccessRelatedInfo__intraFreqReselection_allowed);
(
*
sib1
)
->
cellAccessRelatedInfo
.
intraFreqReselection
=
LTE_SystemInformationBlockType1__cellAccessRelatedInfo__intraFreqReselection_notAllowed
;
if
(
RC
.
ss
.
mode
==
SS_SOFTMODEM
)
{
(
*
sib1
)
->
cellAccessRelatedInfo
.
cellBarred
=
configuration
->
cellBarred
;
(
*
sib1
)
->
cellAccessRelatedInfo
.
intraFreqReselection
=
configuration
->
intraFreqReselection
;
}
else
{
(
*
sib1
)
->
cellAccessRelatedInfo
.
cellBarred
=
LTE_SystemInformationBlockType1__cellAccessRelatedInfo__cellBarred_notBarred
;
// assign_enum(&(*sib1)->cellAccessRelatedInfo.intraFreqReselection,SystemInformationBlockType1__cellAccessRelatedInfo__intraFreqReselection_allowed);
(
*
sib1
)
->
cellAccessRelatedInfo
.
intraFreqReselection
=
LTE_SystemInformationBlockType1__cellAccessRelatedInfo__intraFreqReselection_notAllowed
;
}
(
*
sib1
)
->
cellAccessRelatedInfo
.
csg_Indication
=
0
;
if
(
RC
.
ss
.
mode
==
SS_SOFTMODEM
)
...
...
@@ -1768,12 +1773,22 @@ uint8_t do_SIB23(uint8_t Mod_id,
(
*
sib2
)
->
timeAlignmentTimerCommon
=
LTE_TimeAlignmentTimer_infinity
;
//TimeAlignmentTimer_sf5120;
/// (*SIB3)
(
*
sib3
)
->
ext1
=
NULL
;
(
*
sib3
)
->
cellReselectionInfoCommon
.
q_Hyst
=
LTE_SystemInformationBlockType3__cellReselectionInfoCommon__q_Hyst_dB4
;
if
(
RC
.
ss
.
mode
==
SS_SOFTMODEM
)
{
(
*
sib3
)
->
cellReselectionInfoCommon
.
q_Hyst
=
configuration
->
q_Hyst
;
}
else
{
(
*
sib3
)
->
cellReselectionInfoCommon
.
q_Hyst
=
LTE_SystemInformationBlockType3__cellReselectionInfoCommon__q_Hyst_dB4
;
}
(
*
sib3
)
->
cellReselectionInfoCommon
.
speedStateReselectionPars
=
NULL
;
(
*
sib3
)
->
cellReselectionServingFreqInfo
.
s_NonIntraSearch
=
NULL
;
(
*
sib3
)
->
cellReselectionServingFreqInfo
.
threshServingLow
=
31
;
(
*
sib3
)
->
cellReselectionServingFreqInfo
.
cellReselectionPriority
=
7
;
(
*
sib3
)
->
intraFreqCellReselectionInfo
.
q_RxLevMin
=
-
70
;
if
(
RC
.
ss
.
mode
==
SS_SOFTMODEM
)
{
(
*
sib3
)
->
cellReselectionServingFreqInfo
.
threshServingLow
=
configuration
->
threshServingLow
;
(
*
sib3
)
->
cellReselectionServingFreqInfo
.
cellReselectionPriority
=
configuration
->
cellReselectionPriority
;
(
*
sib3
)
->
intraFreqCellReselectionInfo
.
q_RxLevMin
=
configuration
->
sib3_q_RxLevMin
;
}
else
{
(
*
sib3
)
->
cellReselectionServingFreqInfo
.
threshServingLow
=
31
;
(
*
sib3
)
->
cellReselectionServingFreqInfo
.
cellReselectionPriority
=
7
;
(
*
sib3
)
->
intraFreqCellReselectionInfo
.
q_RxLevMin
=
-
70
;
}
(
*
sib3
)
->
intraFreqCellReselectionInfo
.
p_Max
=
NULL
;
(
*
sib3
)
->
intraFreqCellReselectionInfo
.
s_IntraSearch
=
CALLOC
(
1
,
sizeof
(
*
(
*
sib3
)
->
intraFreqCellReselectionInfo
.
s_IntraSearch
));
*
(
*
sib3
)
->
intraFreqCellReselectionInfo
.
s_IntraSearch
=
31
;
...
...
@@ -1784,7 +1799,11 @@ uint8_t do_SIB23(uint8_t Mod_id,
(
*
sib3
)
->
intraFreqCellReselectionInfo
.
neighCellConfig
.
size
=
1
;
(
*
sib3
)
->
intraFreqCellReselectionInfo
.
neighCellConfig
.
buf
[
0
]
=
1
<<
6
;
(
*
sib3
)
->
intraFreqCellReselectionInfo
.
neighCellConfig
.
bits_unused
=
6
;
(
*
sib3
)
->
intraFreqCellReselectionInfo
.
t_ReselectionEUTRA
=
1
;
if
(
RC
.
ss
.
mode
==
SS_SOFTMODEM
)
{
(
*
sib3
)
->
intraFreqCellReselectionInfo
.
t_ReselectionEUTRA
=
configuration
->
t_ReselectionEUTRA
;
}
else
{
(
*
sib3
)
->
intraFreqCellReselectionInfo
.
t_ReselectionEUTRA
=
1
;
}
(
*
sib3
)
->
intraFreqCellReselectionInfo
.
t_ReselectionEUTRA_SF
=
(
struct
LTE_SpeedStateScaleFactors
*
)
NULL
;
(
*
sib3
)
->
ext1
=
CALLOC
(
1
,
sizeof
(
struct
LTE_SystemInformationBlockType3__ext1
));
(
*
sib3
)
->
ext1
->
s_IntraSearch_v920
=
CALLOC
(
1
,
sizeof
(
struct
LTE_SystemInformationBlockType3__ext1__s_IntraSearch_v920
));
...
...
openair3/SS/ss_eNB_sys_task.c
View file @
ff287470
...
...
@@ -428,6 +428,8 @@ int sys_add_reconfig_cell(struct CellConfigInfo_Type *AddOrReconfigure)
RRC_CONFIGURATION_REQ
(
msg_p
).
num_plmn
=
SIB1_CELL_ACCESS_REL_INFO
.
plmn_IdentityList
.
d
;
RRC_CONFIGURATION_REQ
(
msg_p
).
systemInfoValueTag
=
SIDL_SIB1_VAL
.
c1
.
v
.
systemInformationBlockType1
.
systemInfoValueTag
;
RRC_CONFIGURATION_REQ
(
msg_p
).
cellBarred
=
SIB1_CELL_ACCESS_REL_INFO
.
cellBarred
;
RRC_CONFIGURATION_REQ
(
msg_p
).
intraFreqReselection
=
SIB1_CELL_ACCESS_REL_INFO
.
intraFreqReselection
;
for
(
int
i
=
0
;
i
<
RRC_CONFIGURATION_REQ
(
msg_p
).
num_plmn
;
++
i
)
{
if
(
SIB1_CELL_ACCESS_REL_INFO
.
plmn_IdentityList
.
v
->
plmn_Identity
.
mcc
.
d
==
TRUE
)
...
...
@@ -460,6 +462,14 @@ int sys_add_reconfig_cell(struct CellConfigInfo_Type *AddOrReconfigure)
RRC_CONFIGURATION_REQ
(
msg_p
).
radioresourceconfig
[
cell_index
].
prach_zero_correlation
=
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
.
sib2
.
radioResourceConfigCommon
.
prach_Config
.
prach_ConfigInfo
.
zeroCorrelationZoneConfig
;
RRC_CONFIGURATION_REQ
(
msg_p
).
radioresourceconfig
[
cell_index
].
prach_freq_offset
=
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
.
sib2
.
radioResourceConfigCommon
.
prach_Config
.
prach_ConfigInfo
.
prach_FreqOffset
;
}
if
(
SQN_SystemInformation_r8_IEs_sib_TypeAndInfo_s_sib3
==
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
).
q_Hyst
=
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
.
sib3
.
cellReselectionInfoCommon
.
q_Hyst
;
RRC_CONFIGURATION_REQ
(
msg_p
).
threshServingLow
=
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
.
sib3
.
cellReselectionServingFreqInfo
.
threshServingLow
;
RRC_CONFIGURATION_REQ
(
msg_p
).
cellReselectionPriority
=
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
.
sib3
.
cellReselectionServingFreqInfo
.
cellReselectionPriority
;
RRC_CONFIGURATION_REQ
(
msg_p
).
sib3_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
.
sib3
.
intraFreqCellReselectionInfo
.
q_RxLevMin
;
RRC_CONFIGURATION_REQ
(
msg_p
).
t_ReselectionEUTRA
=
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
.
sib3
.
intraFreqCellReselectionInfo
.
t_ReselectionEUTRA
;
}
}
}
}
...
...
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