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
spbro
OpenXG-RAN
Commits
f902e27c
Commit
f902e27c
authored
Apr 27, 2022
by
francescomani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
updates on coreset harmonization
parent
a71552d5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
5 deletions
+8
-5
openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c
openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c
+1
-1
openair2/RRC/NR/nr_rrc_config.c
openair2/RRC/NR/nr_rrc_config.c
+7
-4
No files found.
openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c
View file @
f902e27c
...
@@ -682,7 +682,7 @@ int nr_pdsch_channel_estimation(PHY_VARS_NR_UE *ue,
...
@@ -682,7 +682,7 @@ int nr_pdsch_channel_estimation(PHY_VARS_NR_UE *ue,
int
ch_offset
,
symbol_offset
;
int
ch_offset
,
symbol_offset
;
uint8_t
nushift
;
uint8_t
nushift
;
int
**
dl_ch_estimates
=
ue
->
pdsch_vars
[
proc
->
thread_id
][
gNB_id
]
->
dl_ch_estimates
;
int
**
dl_ch_estimates
=
ue
->
pdsch_vars
[
proc
->
thread_id
][
gNB_id
]
->
dl_ch_estimates
;
int
**
rxdataF
=
ue
->
common_vars
.
common_vars_rx_data_per_thread
[
proc
->
thread_id
].
rxdataF
;
int
**
rxdataF
=
ue
->
common_vars
.
common_vars_rx_data_per_thread
[
proc
->
thread_id
].
rxdataF
;
ch_offset
=
ue
->
frame_parms
.
ofdm_symbol_size
*
symbol
;
ch_offset
=
ue
->
frame_parms
.
ofdm_symbol_size
*
symbol
;
...
...
openair2/RRC/NR/nr_rrc_config.c
View file @
f902e27c
...
@@ -38,14 +38,15 @@ void rrc_coreset_config(NR_ControlResourceSet_t *coreset,
...
@@ -38,14 +38,15 @@ void rrc_coreset_config(NR_ControlResourceSet_t *coreset,
int
curr_bwp
,
int
curr_bwp
,
uint64_t
ssb_bitmap
)
{
uint64_t
ssb_bitmap
)
{
// frequency domain resources depends on BWP size
// frequency domain resources depending on BWP size
coreset
->
frequencyDomainResources
.
buf
=
calloc
(
1
,
6
);
coreset
->
frequencyDomainResources
.
buf
=
calloc
(
1
,
6
);
coreset
->
frequencyDomainResources
.
buf
[
0
]
=
(
curr_bwp
<
48
)
?
0xf0
:
0xff
;
coreset
->
frequencyDomainResources
.
buf
[
0
]
=
(
curr_bwp
<
48
)
?
0xf0
:
0xff
;
coreset
->
frequencyDomainResources
.
buf
[
1
]
=
(
curr_bwp
<
96
)
?
0x00
:
0xff
;
coreset
->
frequencyDomainResources
.
buf
[
1
]
=
(
curr_bwp
<
96
)
?
0x00
:
0xff
;
coreset
->
frequencyDomainResources
.
buf
[
2
]
=
(
curr_bwp
<
144
)
?
0x00
:
0xff
;
coreset
->
frequencyDomainResources
.
buf
[
2
]
=
(
curr_bwp
<
144
)
?
0x00
:
0xff
;
coreset
->
frequencyDomainResources
.
buf
[
3
]
=
(
curr_bwp
<
192
)
?
0x00
:
0xff
;
coreset
->
frequencyDomainResources
.
buf
[
3
]
=
(
curr_bwp
<
192
)
?
0x00
:
0xff
;
coreset
->
frequencyDomainResources
.
buf
[
4
]
=
0
;
coreset
->
frequencyDomainResources
.
buf
[
4
]
=
(
curr_bwp
<
240
)
?
0x00
:
0xff
;
coreset
->
frequencyDomainResources
.
buf
[
5
]
=
0
;
coreset
->
frequencyDomainResources
.
buf
[
5
]
=
0
x00
;
coreset
->
frequencyDomainResources
.
size
=
6
;
coreset
->
frequencyDomainResources
.
size
=
6
;
coreset
->
frequencyDomainResources
.
bits_unused
=
3
;
coreset
->
frequencyDomainResources
.
bits_unused
=
3
;
coreset
->
duration
=
(
curr_bwp
<
48
)
?
2
:
1
;
coreset
->
duration
=
(
curr_bwp
<
48
)
?
2
:
1
;
...
@@ -53,10 +54,12 @@ void rrc_coreset_config(NR_ControlResourceSet_t *coreset,
...
@@ -53,10 +54,12 @@ void rrc_coreset_config(NR_ControlResourceSet_t *coreset,
coreset
->
precoderGranularity
=
NR_ControlResourceSet__precoderGranularity_sameAsREG_bundle
;
coreset
->
precoderGranularity
=
NR_ControlResourceSet__precoderGranularity_sameAsREG_bundle
;
// The ID space is used across the BWPs of a Serving Cell as per 38.331
// The ID space is used across the BWPs of a Serving Cell as per 38.331
// Unique ID depending on BWP size
coreset
->
controlResourceSetId
=
(
coreset
->
frequencyDomainResources
.
buf
[
0
]
>
0
)
+
coreset
->
controlResourceSetId
=
(
coreset
->
frequencyDomainResources
.
buf
[
0
]
>
0
)
+
(
coreset
->
frequencyDomainResources
.
buf
[
1
]
>
0
)
+
(
coreset
->
frequencyDomainResources
.
buf
[
1
]
>
0
)
+
(
coreset
->
frequencyDomainResources
.
buf
[
2
]
>
0
)
+
(
coreset
->
frequencyDomainResources
.
buf
[
2
]
>
0
)
+
(
coreset
->
frequencyDomainResources
.
buf
[
3
]
>
0
);
(
coreset
->
frequencyDomainResources
.
buf
[
3
]
>
0
)
+
(
coreset
->
frequencyDomainResources
.
buf
[
4
]
>
0
);
coreset
->
tci_StatesPDCCH_ToAddList
=
calloc
(
1
,
sizeof
(
*
coreset
->
tci_StatesPDCCH_ToAddList
));
coreset
->
tci_StatesPDCCH_ToAddList
=
calloc
(
1
,
sizeof
(
*
coreset
->
tci_StatesPDCCH_ToAddList
));
NR_TCI_StateId_t
*
tci
[
64
];
NR_TCI_StateId_t
*
tci
[
64
];
...
...
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