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
wangwenhui
OpenXG-RAN
Commits
90dc9e95
Commit
90dc9e95
authored
4 years ago
by
cig
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Set RA succeeded and UE mode to PUSCH after correct decoding of Msg2
parent
457c1b72
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
7 deletions
+10
-7
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
+3
-1
openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
+4
-4
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
+3
-2
No files found.
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
View file @
90dc9e95
...
...
@@ -2269,7 +2269,7 @@ void phy_procedures_nrUE_TX(PHY_VARS_NR_UE *ue,
/* RACH */
if
(
get_softmodem_params
()
->
do_ra
==
1
)
{
if
((
ue
->
UE_mode
[
gNB_id
]
==
PRA
CH
)
&&
(
ue
->
prach_vars
[
gNB_id
]
->
prach_Config_enabled
==
1
))
{
if
((
ue
->
UE_mode
[
gNB_id
]
<
PUS
CH
)
&&
(
ue
->
prach_vars
[
gNB_id
]
->
prach_Config_enabled
==
1
))
{
nr_ue_prach_procedures
(
ue
,
proc
,
gNB_id
,
mode
);
}
}
...
...
@@ -4609,6 +4609,8 @@ void nr_ue_prach_procedures(PHY_VARS_NR_UE *ue, UE_nr_rxtx_proc_t *proc, uint8_t
if
(
ue
->
prach_cnt
==
3
)
ue
->
prach_cnt
=
0
;
}
else
if
(
nr_prach
==
2
)
{
nr_ra_succeeded
(
mod_id
,
ue
->
CC_id
,
gNB_id
);
}
// if we're calibrating the PRACH kill the pointer to its resources so that the RA protocol doesn't continue
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
View file @
90dc9e95
...
...
@@ -448,7 +448,7 @@ uint8_t nr_ue_get_rach(NR_PRACH_RESOURCES_t *prach_resources,
nr_get_RA_window
(
mac
);
// Fill in preamble and PRACH resources
if
(
mac
->
generate_nr_prach
)
if
(
mac
->
generate_nr_prach
==
1
)
nr_get_prach_resources
(
mod_id
,
CC_id
,
gNB_id
,
nr_tti_tx
,
1
,
prach_resources
,
rach_ConfigDedicated
);
offset
=
nr_generate_ulsch_pdu
((
uint8_t
*
)
mac_sdus
,
// sdus buffer
...
...
@@ -493,8 +493,8 @@ uint8_t nr_ue_get_rach(NR_PRACH_RESOURCES_t *prach_resources,
if
(
mac
->
RA_window_cnt
>=
0
&&
mac
->
RA_RAPID_found
==
1
)
{
mac
->
ra_state
=
WAIT_CONTENTION_RESOLUTION
;
mac
->
RA_window_cnt
=
-
1
;
mac
->
ra_state
=
RA_SUCCEEDED
;
LOG_I
(
MAC
,
"[MAC][UE %d][RAPROC] Frame %d: nr_tti_tx %d: RAR successfully received
\n
"
,
mod_id
,
frame
,
nr_tti_tx
);
}
else
if
(
mac
->
RA_window_cnt
==
0
&&
!
mac
->
RA_RAPID_found
)
{
...
...
@@ -571,7 +571,7 @@ uint8_t nr_ue_get_rach(NR_PRACH_RESOURCES_t *prach_resources,
// mac->RA_tx_subframe = nr_tti_tx;
// Fill in preamble and PRACH resources
if
(
mac
->
generate_nr_prach
)
if
(
mac
->
generate_nr_prach
==
1
)
nr_get_prach_resources
(
mod_id
,
CC_id
,
gNB_id
,
nr_tti_tx
,
0
,
prach_resources
,
rach_ConfigDedicated
);
}
else
{
...
...
@@ -585,7 +585,7 @@ uint8_t nr_ue_get_rach(NR_PRACH_RESOURCES_t *prach_resources,
mac
->
RA_window_cnt
);
// Fill in preamble and PRACH resources
if
(
mac
->
generate_nr_prach
)
if
(
mac
->
generate_nr_prach
==
1
)
nr_get_prach_resources
(
mod_id
,
CC_id
,
gNB_id
,
nr_tti_tx
,
0
,
prach_resources
,
rach_ConfigDedicated
);
}
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
View file @
90dc9e95
...
...
@@ -959,6 +959,7 @@ void nr_ue_prach_scheduler(module_id_t module_idP, frame_t frameP, sub_frame_t s
config_index
=
rach_ConfigGeneric
->
prach_ConfigurationIndex
;
mac
->
RA_offset
=
2
;
// to compensate the rx frame offset at the gNB
mac
->
generate_nr_prach
=
0
;
// Reset flag for PRACH generation
if
(
is_nr_UL_slot
(
scc
,
slotP
))
{
...
...
@@ -1080,8 +1081,8 @@ void nr_ue_prach_scheduler(module_id_t module_idP, frame_t frameP, sub_frame_t s
}
}
}
}
else
{
mac
->
generate_nr_prach
=
0
;
}
else
if
(
mac
->
ra_state
==
RA_SUCCEEDED
)
{
mac
->
generate_nr_prach
=
2
;
}
mac
->
scheduled_response
.
ul_config
=
ul_config
;
}
...
...
This diff is collapsed.
Click to expand it.
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