Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
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 UE
Commits
04334c26
Commit
04334c26
authored
Jan 24, 2022
by
francescomani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
addressing review comments
parent
23b4824f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
9 deletions
+8
-9
openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
+6
-7
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
+1
-1
openair2/RRC/NR/nr_rrc_config.c
openair2/RRC/NR/nr_rrc_config.c
+1
-1
No files found.
openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
View file @
04334c26
...
...
@@ -180,17 +180,16 @@ void nr_pdcch_demapping_deinterleaving(uint32_t *llr,
}
int
rb_count
=
0
;
int
data_sc
=
9
;
// 9 sub-carriers with data per PRB
for
(
int
c_id
=
0
;
c_id
<
number_of_candidates
;
c_id
++
)
{
for
(
int
symbol_idx
=
start_symbol
;
symbol_idx
<
start_symbol
+
coreset_time_dur
;
symbol_idx
++
)
{
for
(
int
cce_count
=
0
;
cce_count
<
L
[
c_id
];
cce_count
++
)
{
for
(
int
k
=
0
;
k
<
6
/
reg_bundle_size_L
;
k
++
)
{
// loop over REG bundles
int
f
=
f_bundle_j_list_ord
[
c_id
][
k
+
6
*
cce_count
/
reg_bundle_size_L
];
for
(
int
k
=
0
;
k
<
NR_NB_REG_PER_CCE
/
reg_bundle_size_L
;
k
++
)
{
// loop over REG bundles
int
f
=
f_bundle_j_list_ord
[
c_id
][
k
+
NR_NB_REG_PER_CCE
*
cce_count
/
reg_bundle_size_L
];
for
(
int
rb
=
0
;
rb
<
B_rb
;
rb
++
)
{
// loop over the RBs of the bundle
// 9 sub-carriers with data per PRB
index_z
=
9
*
rb_count
;
index_llr
=
(
uint16_t
)
(
f
*
B_rb
+
rb
+
symbol_idx
*
coreset_nbr_rb
)
*
9
;
for
(
int
i
=
0
;
i
<
9
;
i
++
)
{
index_z
=
data_sc
*
rb_count
;
index_llr
=
(
uint16_t
)
(
f
*
B_rb
+
rb
+
symbol_idx
*
coreset_nbr_rb
)
*
data_sc
;
for
(
int
i
=
0
;
i
<
data_sc
;
i
++
)
{
z
[
index_z
+
i
]
=
llr
[
index_llr
+
i
];
#ifdef NR_PDCCH_DCI_DEBUG
LOG_I
(
PHY
,
"[candidate=%d,symbol_idx=%d,cce=%d,REG bundle=%d,PRB=%d] z[%d]=(%d,%d) <->
\t
llr[%d]=(%d,%d)
\n
"
,
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
View file @
04334c26
...
...
@@ -1612,7 +1612,7 @@ void nr_generate_Msg4(module_id_t module_idP, int CC_id, frame_t frameP, sub_fra
harq
->
tb_size
=
nr_compute_tbs
(
nr_get_Qm_dl
(
mcsIndex
,
mcsTableIdx
),
nr_get_code_rate_dl
(
mcsIndex
,
mcsTableIdx
),
rbSize
,
nrOfSymbols
,
N_PRB_DMRS
*
N_DMRS_SLOT
,
0
,
tb_scaling
,
1
)
>>
3
;
}
while
(
harq
->
tb_size
<
ra
->
mac_pdu_length
);
}
while
(
harq
->
tb_size
<
ra
->
mac_pdu_length
&&
mcsIndex
<=
28
);
int
i
=
0
;
while
((
i
<
rbSize
)
&&
(
rbStart
+
rbSize
<=
BWPSize
))
{
...
...
openair2/RRC/NR/nr_rrc_config.c
View file @
04334c26
...
...
@@ -35,10 +35,10 @@ void nr_rrc_config_dl_tda(NR_ServingCellConfigCommon_t *scc){
lte_frame_type_t
frame_type
=
get_frame_type
(
*
scc
->
downlinkConfigCommon
->
frequencyInfoDL
->
frequencyBandList
.
list
.
array
[
0
],
*
scc
->
ssbSubcarrierSpacing
);
int
curr_bwp
=
scc
->
downlinkConfigCommon
->
frequencyInfoDL
->
scs_SpecificCarrierList
.
list
.
array
[
0
]
->
carrierBandwidth
;
// coreset duration setting to be improved in the framework of RRC harmonization, potentially using a common function
int
len_coreset
=
1
;
if
(
curr_bwp
<
48
)
len_coreset
=
2
;
// setting default TDA for DL with
struct
NR_PDSCH_TimeDomainResourceAllocation
*
timedomainresourceallocation
=
CALLOC
(
1
,
sizeof
(
NR_PDSCH_TimeDomainResourceAllocation_t
));
timedomainresourceallocation
->
mappingType
=
NR_PDSCH_TimeDomainResourceAllocation__mappingType_typeA
;
...
...
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