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
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
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
OpenXG
OpenXG-RAN
Commits
b144ca70
Commit
b144ca70
authored
7 months ago
by
Sakthivel Velumani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix delta_preamble for long format
parent
4bfc0147
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
45 deletions
+17
-45
openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
+16
-44
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
+1
-1
No files found.
openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
View file @
b144ca70
...
...
@@ -221,57 +221,16 @@ void init_RA(NR_UE_MAC_INST_t *mac,
}
/* TS 38.321 subclause 7.3 - return DELTA_PREAMBLE values in dB */
static
int8_t
nr_get_DELTA_PREAMBLE
(
NR_UE_MAC_INST_t
*
mac
,
int
CC_id
,
uint16_t
prach_format
)
static
int8_t
nr_get_DELTA_PREAMBLE
(
const
NR_UE_MAC_INST_t
*
mac
,
int
CC_id
,
uint16_t
prach_format
)
{
NR_RACH_ConfigCommon_t
*
nr_rach_ConfigCommon
=
mac
->
current_UL_BWP
->
rach_ConfigCommon
;
NR_SubcarrierSpacing_t
scs
=
*
nr_rach_ConfigCommon
->
msg1_SubcarrierSpacing
;
const
NR_RACH_ConfigCommon_t
*
nr_rach_ConfigCommon
=
mac
->
current_UL_BWP
->
rach_ConfigCommon
;
int
prach_sequence_length
=
nr_rach_ConfigCommon
->
prach_RootSequenceIndex
.
present
-
1
;
uint8_t
prachConfigIndex
,
mu
;
AssertFatal
(
CC_id
==
0
,
"Transmission on secondary CCs is not supported yet
\n
"
);
// SCS configuration from msg1_SubcarrierSpacing and table 4.2-1 in TS 38.211
switch
(
scs
){
case
NR_SubcarrierSpacing_kHz15
:
mu
=
0
;
break
;
case
NR_SubcarrierSpacing_kHz30
:
mu
=
1
;
break
;
case
NR_SubcarrierSpacing_kHz60
:
mu
=
2
;
break
;
case
NR_SubcarrierSpacing_kHz120
:
mu
=
3
;
break
;
case
NR_SubcarrierSpacing_kHz240
:
mu
=
4
;
break
;
case
NR_SubcarrierSpacing_kHz480_v1700
:
mu
=
5
;
break
;
case
NR_SubcarrierSpacing_kHz960_v1700
:
mu
=
6
;
break
;
case
NR_SubcarrierSpacing_spare1
:
mu
=
7
;
break
;
default:
AssertFatal
(
1
==
0
,
"Unknown msg1_SubcarrierSpacing %lu
\n
"
,
scs
);
}
// Preamble formats given by prach_ConfigurationIndex and tables 6.3.3.2-2 and 6.3.3.2-2 in TS 38.211
prachConfigIndex
=
nr_rach_ConfigCommon
->
rach_ConfigGeneric
.
prach_ConfigurationIndex
;
unsigned
int
prachConfigIndex
=
nr_rach_ConfigCommon
->
rach_ConfigGeneric
.
prach_ConfigurationIndex
;
if
(
prach_sequence_length
==
0
)
{
AssertFatal
(
prach_format
<
4
,
"Illegal PRACH format %d for sequence length 839
\n
"
,
prach_format
);
...
...
@@ -287,8 +246,21 @@ static int8_t nr_get_DELTA_PREAMBLE(NR_UE_MAC_INST_t *mac, int CC_id, uint16_t p
case
2
:
return
-
6
;
default:
AssertFatal
(
1
==
0
,
"[UE %d] ue_procedures.c: FATAL, Illegal preambleFormat %d, prachConfigIndex %d
\n
"
,
mac
->
ue_id
,
prach_format
,
prachConfigIndex
);
}
}
else
{
// SCS configuration from msg1_SubcarrierSpacing and table 4.2-1 in TS 38.211
AssertFatal
(
nr_rach_ConfigCommon
->
msg1_SubcarrierSpacing
,
"msg1_SubcarrierSpacing required but missing
\n
"
);
NR_SubcarrierSpacing_t
scs
=
*
nr_rach_ConfigCommon
->
msg1_SubcarrierSpacing
;
AssertFatal
(
scs
>=
NR_SubcarrierSpacing_kHz15
&&
scs
<=
NR_SubcarrierSpacing_spare1
,
"Unknown msg1_SubcarrierSpacing %lu
\n
"
,
scs
);
const
unsigned
int
mu
=
scs
;
switch
(
prach_format
)
{
// short preamble formats
case
0
:
case
3
:
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
View file @
b144ca70
...
...
@@ -1892,7 +1892,7 @@ static void build_ro_list(NR_UE_MAC_INST_t *mac)
format
=
((
uint8_t
)
prach_config_info_p
[
0
])
|
(
format2
<<
8
);
slot_shift_for_map
=
mu
;
if
(
(
mu
==
1
)
&&
(
prach_config_info_p
[
6
]
<=
1
)
)
if
(
(
mu
==
1
)
&&
(
prach_config_info_p
[
6
]
==
1
)
&&
((
format
&
0xff
)
>
3
)
)
// no prach in even slots @ 30kHz for 1 prach per subframe
even_slot_invalid
=
true
;
else
...
...
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