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
d5abf5b6
Commit
d5abf5b6
authored
Dec 29, 2022
by
Vaibhav Shrivastava
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
adding required Comments
parent
c39c64cb
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
2 deletions
+11
-2
openair2/RRC/LTE/L2_interface.c
openair2/RRC/LTE/L2_interface.c
+2
-0
openair2/RRC/LTE/MESSAGES/asn1_msg.c
openair2/RRC/LTE/MESSAGES/asn1_msg.c
+5
-0
openair2/RRC/LTE/rrc_eNB.c
openair2/RRC/LTE/rrc_eNB.c
+2
-0
openair3/SS/ss_eNB_sys_task.c
openair3/SS/ss_eNB_sys_task.c
+2
-2
No files found.
openair2/RRC/LTE/L2_interface.c
View file @
d5abf5b6
...
@@ -160,6 +160,8 @@ mac_rrc_data_req(
...
@@ -160,6 +160,8 @@ mac_rrc_data_req(
return
(
RC
.
rrc
[
Mod_idP
]
->
carrier
[
CC_id
].
sizeof_SIB23
);
return
(
RC
.
rrc
[
Mod_idP
]
->
carrier
[
CC_id
].
sizeof_SIB23
);
}
}
/* Schedule SIB5 when sib5_Scheduled is TRUE and SI periodicity(T) is taking 16 by deafult
so SIB5 Scheduled in every (frameP%16) == 3) Radio frame */
else
if
((
true
==
RC
.
rrc
[
Mod_idP
]
->
carrier
[
CC_id
].
sib5_Scheduled
)
&&
((
frameP
%
16
)
==
3
))
{
else
if
((
true
==
RC
.
rrc
[
Mod_idP
]
->
carrier
[
CC_id
].
sib5_Scheduled
)
&&
((
frameP
%
16
)
==
3
))
{
memcpy
(
&
buffer_pP
[
0
],
memcpy
(
&
buffer_pP
[
0
],
RC
.
rrc
[
Mod_idP
]
->
carrier
[
CC_id
].
SIB5
,
RC
.
rrc
[
Mod_idP
]
->
carrier
[
CC_id
].
SIB5
,
...
...
openair2/RRC/LTE/MESSAGES/asn1_msg.c
View file @
d5abf5b6
...
@@ -2327,6 +2327,7 @@ uint8_t do_SIB23(uint8_t Mod_id,
...
@@ -2327,6 +2327,7 @@ uint8_t do_SIB23(uint8_t Mod_id,
return
((
enc_rval
.
encoded
+
7
)
/
8
);
return
((
enc_rval
.
encoded
+
7
)
/
8
);
}
}
/* do_SIB4 Function for Creating SIB4 Payload */
uint8_t
do_SIB4
(
uint8_t
Mod_id
,
uint8_t
do_SIB4
(
uint8_t
Mod_id
,
int
CC_id
,
BOOLEAN_t
brOption
,
int
CC_id
,
BOOLEAN_t
brOption
,
RrcConfigurationReq
*
configuration
RrcConfigurationReq
*
configuration
...
@@ -2377,6 +2378,7 @@ uint8_t do_SIB4(uint8_t Mod_id,
...
@@ -2377,6 +2378,7 @@ uint8_t do_SIB4(uint8_t Mod_id,
return
((
enc_rval
.
encoded
+
7
)
/
8
);
return
((
enc_rval
.
encoded
+
7
)
/
8
);
}
}
/* do_SIB5 Function for Creating SIB5 Payload */
uint8_t
do_SIB5
(
uint8_t
Mod_id
,
uint8_t
do_SIB5
(
uint8_t
Mod_id
,
int
CC_id
,
BOOLEAN_t
brOption
,
int
CC_id
,
BOOLEAN_t
brOption
,
RrcConfigurationReq
*
configuration
RrcConfigurationReq
*
configuration
...
@@ -2409,6 +2411,7 @@ uint8_t do_SIB5(uint8_t Mod_id,
...
@@ -2409,6 +2411,7 @@ uint8_t do_SIB5(uint8_t Mod_id,
LTE_InterFreqCarrierFreqInfo_t
*
InterFreqCarrierInfo
;
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
;
i
++
)
{
InterFreqCarrierInfo
=
CALLOC
(
1
,
sizeof
(
struct
LTE_InterFreqCarrierFreqInfo
));
InterFreqCarrierInfo
=
CALLOC
(
1
,
sizeof
(
struct
LTE_InterFreqCarrierFreqInfo
));
InterFreqCarrierInfo
->
dl_CarrierFreq
=
configuration
->
InterFreqCarrierFreqInfo
[
CC_id
][
i
].
dl_CarrierFreq
;
InterFreqCarrierInfo
->
dl_CarrierFreq
=
configuration
->
InterFreqCarrierFreqInfo
[
CC_id
][
i
].
dl_CarrierFreq
;
...
@@ -2427,6 +2430,7 @@ uint8_t do_SIB5(uint8_t Mod_id,
...
@@ -2427,6 +2430,7 @@ uint8_t do_SIB5(uint8_t Mod_id,
if
(
true
==
configuration
->
InterFreqCarrierFreqInfo
[
CC_id
][
i
].
cellReselectionPriority_Present
)
{
if
(
true
==
configuration
->
InterFreqCarrierFreqInfo
[
CC_id
][
i
].
cellReselectionPriority_Present
)
{
InterFreqCarrierInfo
->
cellReselectionPriority
=
configuration
->
InterFreqCarrierFreqInfo
[
CC_id
][
i
].
cellReselectionPriority
;
InterFreqCarrierInfo
->
cellReselectionPriority
=
configuration
->
InterFreqCarrierFreqInfo
[
CC_id
][
i
].
cellReselectionPriority
;
}
}
// TODO: Need to handle neighCellConfig IE properly
InterFreqCarrierInfo
->
neighCellConfig
.
size
=
0
;
//1;
InterFreqCarrierInfo
->
neighCellConfig
.
size
=
0
;
//1;
//InterFreqCarrierInfo->neighCellConfig.buf = CALLOC(1,1);
//InterFreqCarrierInfo->neighCellConfig.buf = CALLOC(1,1);
InterFreqCarrierInfo
->
neighCellConfig
.
bits_unused
=
0
;
InterFreqCarrierInfo
->
neighCellConfig
.
bits_unused
=
0
;
...
@@ -2467,6 +2471,7 @@ uint8_t do_SIB5(uint8_t Mod_id,
...
@@ -2467,6 +2471,7 @@ uint8_t do_SIB5(uint8_t Mod_id,
ASN_SEQUENCE_ADD
(
&
(
*
sib5
)
->
interFreqCarrierFreqList
,
InterFreqCarrierInfo
);
ASN_SEQUENCE_ADD
(
&
(
*
sib5
)
->
interFreqCarrierFreqList
,
InterFreqCarrierInfo
);
}
}
// TODO: Need to handle all remaining ext and lateNonCriticalExtension IE properly
(
*
sib5
)
->
lateNonCriticalExtension
=
NULL
;
(
*
sib5
)
->
lateNonCriticalExtension
=
NULL
;
(
*
sib5
)
->
ext1
=
NULL
;
(
*
sib5
)
->
ext1
=
NULL
;
(
*
sib5
)
->
ext2
=
NULL
;
(
*
sib5
)
->
ext2
=
NULL
;
...
...
openair2/RRC/LTE/rrc_eNB.c
View file @
d5abf5b6
...
@@ -338,6 +338,7 @@ init_SI(
...
@@ -338,6 +338,7 @@ init_SI(
PROTOCOL_RRC_CTXT_ARGS
(
ctxt_pP
),
PROTOCOL_RRC_CTXT_ARGS
(
ctxt_pP
),
carrier
->
sib2
->
radioResourceConfigCommon
.
pusch_ConfigCommon
.
ul_ReferenceSignalsPUSCH
.
cyclicShift
);
carrier
->
sib2
->
radioResourceConfigCommon
.
pusch_ConfigCommon
.
ul_ReferenceSignalsPUSCH
.
cyclicShift
);
/* Check if SIB4 present for particular CC Then only proceed for creating SIB4 payload */
if
(
true
==
configuration
->
sib4_Present
[
CC_id
])
{
if
(
true
==
configuration
->
sib4_Present
[
CC_id
])
{
if
(
NULL
==
carrier
->
SIB4
)
{
if
(
NULL
==
carrier
->
SIB4
)
{
carrier
->
SIB4
=
(
uint8_t
*
)
malloc16
(
64
);
carrier
->
SIB4
=
(
uint8_t
*
)
malloc16
(
64
);
...
@@ -352,6 +353,7 @@ init_SI(
...
@@ -352,6 +353,7 @@ init_SI(
AssertFatal
(
carrier
->
sizeof_SIB4
!=
255
,
"FATAL, RC.rrc[mod].carrier[CC_id].sizeof_SIB4 == 255"
);
AssertFatal
(
carrier
->
sizeof_SIB4
!=
255
,
"FATAL, RC.rrc[mod].carrier[CC_id].sizeof_SIB4 == 255"
);
}
}
/* Check if SIB5 present for particular CC Then only proceed for creating SIB5 payload */
if
(
true
==
configuration
->
sib5_Present
[
CC_id
])
{
if
(
true
==
configuration
->
sib5_Present
[
CC_id
])
{
if
(
NULL
==
carrier
->
SIB5
)
{
if
(
NULL
==
carrier
->
SIB5
)
{
carrier
->
SIB5
=
(
uint8_t
*
)
malloc16
(
64
);
carrier
->
SIB5
=
(
uint8_t
*
)
malloc16
(
64
);
...
...
openair3/SS/ss_eNB_sys_task.c
View file @
d5abf5b6
...
@@ -488,7 +488,7 @@ int sys_add_reconfig_cell(struct CellConfigInfo_Type *AddOrReconfigure)
...
@@ -488,7 +488,7 @@ int sys_add_reconfig_cell(struct CellConfigInfo_Type *AddOrReconfigure)
RRC_CONFIGURATION_REQ
(
msg_p
).
sib3_q_RxLevMin
[
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
.
sib3
.
intraFreqCellReselectionInfo
.
q_RxLevMin
;
RRC_CONFIGURATION_REQ
(
msg_p
).
sib3_q_RxLevMin
[
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
.
sib3
.
intraFreqCellReselectionInfo
.
q_RxLevMin
;
RRC_CONFIGURATION_REQ
(
msg_p
).
t_ReselectionEUTRA
[
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
.
sib3
.
intraFreqCellReselectionInfo
.
t_ReselectionEUTRA
;
RRC_CONFIGURATION_REQ
(
msg_p
).
t_ReselectionEUTRA
[
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
.
sib3
.
intraFreqCellReselectionInfo
.
t_ReselectionEUTRA
;
}
}
/* SIB4 */
/* SIB4
: Received SIB4 from TTCN
*/
if
(
SQN_SystemInformation_r8_IEs_sib_TypeAndInfo_s_sib4
==
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
)
{
if
(
SQN_SystemInformation_r8_IEs_sib_TypeAndInfo_s_sib4
==
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
).
sib4_Present
[
cell_index
]
=
true
;
RRC_CONFIGURATION_REQ
(
msg_p
).
sib4_Present
[
cell_index
]
=
true
;
if
(
true
==
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
.
sib4
.
intraFreqNeighCellList
.
d
)
{
if
(
true
==
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
.
sib4
.
intraFreqNeighCellList
.
d
)
{
...
@@ -501,7 +501,7 @@ int sys_add_reconfig_cell(struct CellConfigInfo_Type *AddOrReconfigure)
...
@@ -501,7 +501,7 @@ int sys_add_reconfig_cell(struct CellConfigInfo_Type *AddOrReconfigure)
}
}
}
}
}
}
/* SIB5 */
/* 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
)
{
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
).
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
).
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
;
...
...
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