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
lizhongxiao
OpenXG-RAN
Commits
61d95c73
Commit
61d95c73
authored
Dec 27, 2023
by
francescomani
Committed by
Laurent THOMAS
Jan 10, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
adding assertion for cset0 start prb
parent
458b4a62
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
2 deletions
+8
-2
common/utils/nr/nr_common.c
common/utils/nr/nr_common.c
+5
-1
openair2/LAYER2/NR_MAC_COMMON/nr_mac.h
openair2/LAYER2/NR_MAC_COMMON/nr_mac.h
+1
-1
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
+2
-0
No files found.
common/utils/nr/nr_common.c
View file @
61d95c73
...
@@ -757,7 +757,11 @@ void SLIV2SL(int SLIV,int *S,int *L) {
...
@@ -757,7 +757,11 @@ void SLIV2SL(int SLIV,int *S,int *L) {
nr_sco_info_t
get_ssb_subcarrier_offset
(
int
scs
,
uint32_t
absoluteFrequencySSB
,
uint32_t
absoluteFrequencyPointA
)
nr_sco_info_t
get_ssb_subcarrier_offset
(
int
scs
,
uint32_t
absoluteFrequencySSB
,
uint32_t
absoluteFrequencyPointA
)
{
{
nr_sco_info_t
sco
;
nr_sco_info_t
sco
=
{
.
absolute_diff
=
absoluteFrequencySSB
-
absoluteFrequencyPointA
,
.
scaling
=
1
,
.
subcarrier_offset
=
0
};
// for FR1 k_SSB expressed in terms of 15kHz SCS
// for FR1 k_SSB expressed in terms of 15kHz SCS
// for FR2 k_SSB expressed in terms of the subcarrier spacing provided by the higher-layer parameter subCarrierSpacingCommon
// for FR2 k_SSB expressed in terms of the subcarrier spacing provided by the higher-layer parameter subCarrierSpacingCommon
sco
.
absolute_diff
=
(
absoluteFrequencySSB
-
absoluteFrequencyPointA
);
sco
.
absolute_diff
=
(
absoluteFrequencySSB
-
absoluteFrequencyPointA
);
...
...
openair2/LAYER2/NR_MAC_COMMON/nr_mac.h
View file @
61d95c73
...
@@ -480,7 +480,7 @@ typedef struct Type0_PDCCH_CSS_config_s {
...
@@ -480,7 +480,7 @@ typedef struct Type0_PDCCH_CSS_config_s {
uint32_t
search_space_frame_period
;
// in slots
uint32_t
search_space_frame_period
;
// in slots
uint32_t
ssb_length
;
uint32_t
ssb_length
;
uint32_t
ssb_index
;
uint32_t
ssb_index
;
u
int32_t
cset_start_rb
;
int32_t
cset_start_rb
;
NR_SubcarrierSpacing_t
scs_pdcch
;
NR_SubcarrierSpacing_t
scs_pdcch
;
bool
active
;
bool
active
;
}
NR_Type0_PDCCH_CSS_config_t
;
}
NR_Type0_PDCCH_CSS_config_t
;
...
...
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
View file @
61d95c73
...
@@ -4442,6 +4442,8 @@ void get_type0_PDCCH_CSS_config_parameters(NR_Type0_PDCCH_CSS_config_t *type0_PD
...
@@ -4442,6 +4442,8 @@ void get_type0_PDCCH_CSS_config_parameters(NR_Type0_PDCCH_CSS_config_t *type0_PD
type0_PDCCH_CSS_config
->
n_0
=
((
uint32_t
)(
big_o
*
(
1
<<
scs_pdcch
))
+
(
uint32_t
)(
type0_PDCCH_CSS_config
->
ssb_index
*
big_m
))
%
num_slot_per_frame
;
type0_PDCCH_CSS_config
->
n_0
=
((
uint32_t
)(
big_o
*
(
1
<<
scs_pdcch
))
+
(
uint32_t
)(
type0_PDCCH_CSS_config
->
ssb_index
*
big_m
))
%
num_slot_per_frame
;
type0_PDCCH_CSS_config
->
cset_start_rb
=
ssb_offset_point_a
-
type0_PDCCH_CSS_config
->
rb_offset
;
type0_PDCCH_CSS_config
->
cset_start_rb
=
ssb_offset_point_a
-
type0_PDCCH_CSS_config
->
rb_offset
;
AssertFatal
(
type0_PDCCH_CSS_config
->
cset_start_rb
>=
0
,
"Invalid CSET0 start PRB %d SSB offset point A %d RB offset %d
\n
"
,
type0_PDCCH_CSS_config
->
cset_start_rb
,
ssb_offset_point_a
,
type0_PDCCH_CSS_config
->
rb_offset
);
}
}
void
fill_coresetZero
(
NR_ControlResourceSet_t
*
coreset0
,
NR_Type0_PDCCH_CSS_config_t
*
type0_PDCCH_CSS_config
)
void
fill_coresetZero
(
NR_ControlResourceSet_t
*
coreset0
,
NR_Type0_PDCCH_CSS_config_t
*
type0_PDCCH_CSS_config
)
...
...
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