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
zzha zzha
OpenXG-RAN
Commits
21f71282
Commit
21f71282
authored
Aug 24, 2023
by
Robert Schmidt
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/NR_UE_cell_barred' into integration_2023_w34
parents
464a62dd
24dd439a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
12 deletions
+21
-12
executables/nr-ue.c
executables/nr-ue.c
+4
-0
openair2/LAYER2/NR_MAC_UE/mac_proto.h
openair2/LAYER2/NR_MAC_UE/mac_proto.h
+1
-1
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
+10
-6
openair2/RRC/NR_UE/rrc_UE.c
openair2/RRC/NR_UE/rrc_UE.c
+6
-5
No files found.
executables/nr-ue.c
View file @
21f71282
...
...
@@ -465,6 +465,10 @@ static void UE_synch(void *arg) {
}
else
{
UE
->
is_synchronized
=
1
;
}
if
(
UE
->
synch_request
.
received_synch_request
==
1
)
{
UE
->
is_synchronized
=
0
;
UE
->
synch_request
.
received_synch_request
=
0
;
}
}
else
{
if
(
UE
->
UE_scan_carrier
==
1
)
{
...
...
openair2/LAYER2/NR_MAC_UE/mac_proto.h
View file @
21f71282
...
...
@@ -47,7 +47,7 @@ void nr_ue_init_mac(module_id_t module_idP);
\param mac mac instance */
void
nr_ue_mac_default_configs
(
NR_UE_MAC_INST_t
*
mac
);
int8_t
nr_ue_decode_mib
(
module_id_t
module_id
,
int
cc_id
);
void
nr_ue_decode_mib
(
module_id_t
module_id
,
int
cc_id
);
/**\brief decode SIB1 and other SIs pdus in NR_UE, from if_module dl_ind
\param module_id module id
...
...
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
View file @
21f71282
...
...
@@ -232,14 +232,20 @@ int get_rnti_type(NR_UE_MAC_INST_t *mac, uint16_t rnti)
return
rnti_type
;
}
int8_t
nr_ue_decode_mib
(
module_id_t
module_id
,
int
cc_id
)
void
nr_ue_decode_mib
(
module_id_t
module_id
,
int
cc_id
)
{
LOG_D
(
MAC
,
"[L2][MAC] decode mib
\n
"
);
NR_UE_MAC_INST_t
*
mac
=
get_mac_inst
(
module_id
);
if
(
mac
->
mib
->
cellBarred
==
NR_MIB__cellBarred_barred
)
{
LOG_W
(
MAC
,
"Cell is barred. Going back to sync mode.
\n
"
);
mac
->
synch_request
.
Mod_id
=
module_id
;
mac
->
synch_request
.
CC_id
=
cc_id
;
mac
->
synch_request
.
synch_req
.
target_Nid_cell
=
-
1
;
mac
->
if_module
->
synch_request
(
&
mac
->
synch_request
);
return
;
}
uint16_t
frame
=
(
mac
->
mib
->
systemFrameNumber
.
buf
[
0
]
>>
mac
->
mib
->
systemFrameNumber
.
bits_unused
);
uint16_t
frame_number_4lsb
=
0
;
...
...
@@ -285,8 +291,6 @@ int8_t nr_ue_decode_mib(module_id_t module_id,
mac
->
state
=
UE_CONNECTED
;
else
if
(
mac
->
state
==
UE_NOT_SYNC
)
mac
->
state
=
UE_SYNC
;
return
0
;
}
int8_t
nr_ue_decode_BCCH_DL_SCH
(
module_id_t
module_id
,
...
...
openair2/RRC/NR_UE/rrc_UE.c
View file @
21f71282
...
...
@@ -490,8 +490,6 @@ bool check_si_validity(NR_UE_RRC_SI_INFO *SI_info, int si_type)
int
check_si_status
(
NR_UE_RRC_SI_INFO
*
SI_info
)
{
if
(
!
get_softmodem_params
()
->
sa
)
return
0
;
// schedule reception of SIB1 if RRC doesn't have it
if
(
!
SI_info
->
sib1
)
return
1
;
...
...
@@ -534,9 +532,12 @@ int8_t nr_rrc_ue_decode_NR_BCCH_BCH_Message(const module_id_t module_id, const u
NR_UE_rrc_inst
[
module_id
].
mib
=
bcch_message
->
message
.
choice
.
mib
;
bcch_message
->
message
.
choice
.
mib
=
NULL
;
NR_UE_RRC_SI_INFO
*
SI_info
=
&
NR_UE_rrc_inst
[
module_id
].
SInfo
[
gNB_index
];
// to schedule MAC to get SI if required
int
get_sib
=
check_si_status
(
SI_info
);
int
get_sib
=
0
;
if
(
get_softmodem_params
()
->
sa
&&
NR_UE_rrc_inst
[
module_id
].
mib
->
cellBarred
==
NR_MIB__cellBarred_notBarred
)
{
NR_UE_RRC_SI_INFO
*
SI_info
=
&
NR_UE_rrc_inst
[
module_id
].
SInfo
[
gNB_index
];
// to schedule MAC to get SI if required
get_sib
=
check_si_status
(
SI_info
);
}
nr_rrc_mac_config_req_mib
(
module_id
,
0
,
NR_UE_rrc_inst
[
module_id
].
mib
,
get_sib
);
ret
=
0
;
}
...
...
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