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
Michael Black
OpenXG-RAN
Commits
7b619c54
Commit
7b619c54
authored
Nov 01, 2021
by
David Kim
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
updated for CI debug from crash.
parent
d62599b3
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
5 deletions
+8
-5
openair1/PHY/NR_UE_TRANSPORT/nr_prach.c
openair1/PHY/NR_UE_TRANSPORT/nr_prach.c
+4
-1
openair2/LAYER2/NR_MAC_UE/config_ue.c
openair2/LAYER2/NR_MAC_UE/config_ue.c
+0
-1
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
+3
-3
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
+1
-0
No files found.
openair1/PHY/NR_UE_TRANSPORT/nr_prach.c
View file @
7b619c54
...
...
@@ -221,8 +221,11 @@ int32_t generate_nr_prach(PHY_VARS_NR_UE *ue, uint8_t gNB_id, uint8_t slot){
k
+=
kbar
;
k
*=
2
;
LOG_I
(
PHY
,
"PRACH [UE %d] in slot %d, placing PRACH in position %d, msg1 frequency start %d (k1 %d), preamble_offset %d, first_nonzero_root_idx %d
\n
"
,
Mod_id
,
LOG_I
(
PHY
,
"PRACH [UE %d] in slot %d,
mu %d, fp->samples_per_subframe %d, prach_sequence_length %d,
placing PRACH in position %d, msg1 frequency start %d (k1 %d), preamble_offset %d, first_nonzero_root_idx %d
\n
"
,
Mod_id
,
slot
,
mu
,
fp
->
samples_per_subframe
,
prach_sequence_length
,
k
,
n_ra_prb
,
nrUE_config
->
prach_config
.
num_prach_fd_occasions_list
[
fd_occasion
].
k1
,
...
...
openair2/LAYER2/NR_MAC_UE/config_ue.c
View file @
7b619c54
...
...
@@ -707,7 +707,6 @@ int nr_rrc_mac_config_req_ue(
// Setup the SSB to Rach Occasions mapping according to the config
build_ssb_to_ro_map
(
mac
);
}
/*
if(mac_cell_group_configP != NULL){
if(mac_cell_group_configP->drx_Config != NULL ){
...
...
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
View file @
7b619c54
...
...
@@ -2440,7 +2440,7 @@ void nr_ue_send_sdu(nr_downlink_indication_t *dl_info, NR_UL_TIME_ALIGNMENT_t *u
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_UE_SEND_SDU
,
VCD_FUNCTION_IN
);
LOG_
D
(
MAC
,
"In %s [%d.%d] Handling DLSCH PDU...
\n
"
,
__FUNCTION__
,
dl_info
->
frame
,
dl_info
->
slot
);
LOG_
I
(
MAC
,
"In %s [%d.%d] Handling DLSCH PDU...
\n
"
,
__FUNCTION__
,
dl_info
->
frame
,
dl_info
->
slot
);
// Processing MAC PDU
// it parses MAC CEs subheaders, MAC CEs, SDU subheaderds and SDUs
...
...
@@ -3645,9 +3645,9 @@ int nr_ue_process_rar(nr_downlink_indication_t *dl_info, NR_UL_TIME_ALIGNMENT_t
LOG_D
(
NR_MAC
,
"In %s:[%d.%d]: [UE %d][RAPROC] invoking MAC for received RAR (current preamble %d)
\n
"
,
__FUNCTION__
,
frame
,
slot
,
mod_id
,
preamble_index
);
if
(
mac
->
crnti
==
ra
->
t_crnti
)
if
((
mac
->
crnti
==
ra
->
t_crnti
)
&&
(
get_softmodem_params
()
->
nsa
)
)
{
LOG_
D
(
MAC
,
"Discarding the received RAR.
\n
"
);
LOG_
I
(
MAC
,
"Discarding the received RAR.
\n
"
);
return
-
1
;
}
while
(
1
)
{
...
...
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
View file @
7b619c54
...
...
@@ -1895,6 +1895,7 @@ void nr_ue_prach_scheduler(module_id_t module_idP, frame_t frameP, sub_frame_t s
format
=
prach_occasion_info_p
->
format
;
format0
=
format
&
0xff
;
// single PRACH format
format1
=
(
format
>>
8
)
&
0xff
;
// dual PRACH format
LOG_D
(
NR_MAC
,
"We are here with format %u, %s %d
\n
"
,
format
,
__FUNCTION__
,
__LINE__
);
AssertFatal
(
ul_config
->
number_pdus
<
sizeof
(
ul_config
->
ul_config_list
)
/
sizeof
(
ul_config
->
ul_config_list
[
0
]),
"Number of PDUS in ul_config = %d > ul_config_list num elements"
,
ul_config
->
number_pdus
);
...
...
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