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
wangjie
OpenXG-RAN
Commits
219334c8
Commit
219334c8
authored
Jun 09, 2021
by
rmagueta
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix build after merge
parent
d6a8da7a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
4 deletions
+11
-4
openair1/PHY/INIT/nr_init_ru.c
openair1/PHY/INIT/nr_init_ru.c
+1
-1
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
+1
-1
openair2/RRC/NR/nr_rrc_proto.h
openair2/RRC/NR/nr_rrc_proto.h
+6
-0
openair2/RRC/NR/rrc_gNB.c
openair2/RRC/NR/rrc_gNB.c
+3
-2
No files found.
openair1/PHY/INIT/nr_init_ru.c
View file @
219334c8
...
...
@@ -121,7 +121,7 @@ int nr_phy_init_RU(RU_t *ru) {
AssertFatal
(
ru
->
num_gNB
<=
NUMBER_OF_gNB_MAX
,
"gNB instances %d > %d
\n
"
,
ru
->
num_gNB
,
NUMBER_OF_gNB_MAX
);
LOG_I
(
PHY
,
"[INIT] %s()
RC.nb_nr_L1_inst:%d
\n
"
,
__FUNCTION__
,
RC
.
nb_nr_L1_inst
);
LOG_I
(
PHY
,
"[INIT] %s()
ru->num_gNB:%d
\n
"
,
__FUNCTION__
,
ru
->
num_gNB
);
if
(
ru
->
do_precoding
==
1
)
{
int
beam_count
=
0
;
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
View file @
219334c8
...
...
@@ -662,7 +662,7 @@ void nr_rx_sdu(const module_id_t gnb_mod_idP,
if
(
UE_info
->
UE_sched_ctrl
[
UE_id
].
pusch_consecutive_dtx_cnt
>=
pusch_failure_thres
)
{
LOG_D
(
NR_MAC
,
"Detected UL Failure on PUSCH, stopping scheduling
\n
"
);
UE_info
->
UE_sched_ctrl
[
UE_id
].
ul_failure
=
1
;
nr_mac_eNB_rrc_ul_failure
(
gnb_mod_idP
,
CC_idP
,
frameP
,
slotP
,
rntiP
);
nr_mac_eNB_rrc_ul_failure
(
gnb_mod_idP
,
CC_idP
,
frameP
,
slotP
,
rntiP
);
}
}
}
else
if
(
sduP
)
{
...
...
openair2/RRC/NR/nr_rrc_proto.h
View file @
219334c8
...
...
@@ -189,6 +189,12 @@ int8_t nr_mac_rrc_data_ind(
const
boolean_t
brOption
);
void
nr_mac_eNB_rrc_ul_failure
(
const
module_id_t
Mod_instP
,
const
int
CC_idP
,
const
frame_t
frameP
,
const
sub_frame_t
subframeP
,
const
rnti_t
rntiP
);
int
nr_rrc_gNB_decode_ccch
(
protocol_ctxt_t
*
const
ctxt_pP
,
const
uint8_t
*
buffer
,
int
buffer_length
,
...
...
openair2/RRC/NR/rrc_gNB.c
View file @
219334c8
...
...
@@ -3028,10 +3028,11 @@ int get_dl_mimo_layers(gNB_RRC_INST *rrc,NR_UE_NR_Capability_t *cap) {
return
(
1
);
}
void
nr_rrc_subframe_process
(
protocol_ctxt_t
*
const
ctxt_pP
,
const
int
CC_id
)
{
MessageDef
*
msg
;
int
id
;
rrc_gNB_ue_context_t
*
ue_context_p
=
NULL
;
FILE
*
fd
=
fopen
(
"nrRRCstats.log"
,
"w"
);
RB_FOREACH
(
ue_context_p
,
rrc_nr_ue_tree_s
,
&
(
RC
.
nrrrc
[
ctxt_pP
->
module_id
]
->
rrc_ue_head
))
{
ctxt_pP
->
rnti
=
ue_context_p
->
ue_id_rnti
;
...
...
@@ -3065,7 +3066,7 @@ void nr_rrc_subframe_process(protocol_ctxt_t *const ctxt_pP, const int CC_id) {
// remove UE after 20 seconds after MAC (or else) has indicated UL failure
LOG_I
(
RRC
,
"Removing UE %x instance, because of uplink failure timer timeout
\n
"
,
ue_context_p
->
ue_context
.
rnti
);
if
(
ue_context_p
->
ue_context
.
Status
>=
NR_RRC_CONNECTED
){
if
(
ue_context_p
->
ue_context
.
Status
Rrc
>=
NR_RRC_CONNECTED
){
rrc_gNB_send_NGAP_UE_CONTEXT_RELEASE_REQ
(
ctxt_pP
->
module_id
,
ue_context_p
,
...
...
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