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
d56f2c8e
Commit
d56f2c8e
authored
May 18, 2022
by
francescomani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
addressing review comments
parent
1f49b73e
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
13 additions
and
13 deletions
+13
-13
openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
+2
-2
openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
+2
-2
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
+2
-2
openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c
openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c
+2
-2
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
+2
-2
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
+3
-3
No files found.
openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
View file @
d56f2c8e
...
@@ -368,8 +368,8 @@ int nr_dlsch_encoding(PHY_VARS_gNB *gNB,
...
@@ -368,8 +368,8 @@ int nr_dlsch_encoding(PHY_VARS_gNB *gNB,
memcpy
(
harq
->
b
,
a
,
(
A
/
8
)
+
3
);
// using 3 bytes to mimic the case of 24 bit crc
memcpy
(
harq
->
b
,
a
,
(
A
/
8
)
+
3
);
// using 3 bytes to mimic the case of 24 bit crc
}
}
// target_code_rate i
n terms of 0.1 b
its
// target_code_rate i
s in 0.1 un
its
float
Coderate
=
(
float
)
rel15
->
targetCodeRate
[
0
]
/
(
float
)
10240
;
float
Coderate
=
(
float
)
rel15
->
targetCodeRate
[
0
]
/
10240
.
0
f
;
LOG_D
(
PHY
,
"DLSCH Coderate %f
\n
"
,
Coderate
);
LOG_D
(
PHY
,
"DLSCH Coderate %f
\n
"
,
Coderate
);
if
((
A
<=
292
)
||
((
A
<=
3824
)
&&
(
Coderate
<=
0
.
6667
))
||
Coderate
<=
0
.
25
)
if
((
A
<=
292
)
||
((
A
<=
3824
)
&&
(
Coderate
<=
0
.
6667
))
||
Coderate
<=
0
.
25
)
...
...
openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
View file @
d56f2c8e
...
@@ -439,8 +439,8 @@ uint32_t nr_ulsch_decoding(PHY_VARS_gNB *phy_vars_gNB,
...
@@ -439,8 +439,8 @@ uint32_t nr_ulsch_decoding(PHY_VARS_gNB *phy_vars_gNB,
A
=
(
harq_process
->
TBS
)
<<
3
;
A
=
(
harq_process
->
TBS
)
<<
3
;
// target_code_rate i
n terms of 0.1 b
its
// target_code_rate i
s in 0.1 un
its
float
Coderate
=
(
float
)
pusch_pdu
->
target_code_rate
/
(
float
)
10240
;
float
Coderate
=
(
float
)
pusch_pdu
->
target_code_rate
/
10240
.
0
f
;
LOG_D
(
PHY
,
"ULSCH Decoding, harq_pid %d TBS %d G %d mcs %d Nl %d nb_rb %d, Qm %d, Coderate %f RV %d round %d
\n
"
,
LOG_D
(
PHY
,
"ULSCH Decoding, harq_pid %d TBS %d G %d mcs %d Nl %d nb_rb %d, Qm %d, Coderate %f RV %d round %d
\n
"
,
harq_pid
,
A
,
G
,
mcs
,
n_layers
,
nb_rb
,
Qm
,
Coderate
,
pusch_pdu
->
pusch_data
.
rv_index
,
harq_process
->
round
);
harq_pid
,
A
,
G
,
mcs
,
n_layers
,
nb_rb
,
Qm
,
Coderate
,
pusch_pdu
->
pusch_data
.
rv_index
,
harq_process
->
round
);
...
...
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
View file @
d56f2c8e
...
@@ -504,8 +504,8 @@ uint32_t nr_dlsch_decoding(PHY_VARS_NR_UE *phy_vars_ue,
...
@@ -504,8 +504,8 @@ uint32_t nr_dlsch_decoding(PHY_VARS_NR_UE *phy_vars_ue,
harq_process
->
G
=
nr_get_G
(
nb_rb
,
nb_symb_sch
,
nb_re_dmrs
,
dmrs_length
,
harq_process
->
Qm
,
harq_process
->
Nl
);
harq_process
->
G
=
nr_get_G
(
nb_rb
,
nb_symb_sch
,
nb_re_dmrs
,
dmrs_length
,
harq_process
->
Qm
,
harq_process
->
Nl
);
G
=
harq_process
->
G
;
G
=
harq_process
->
G
;
// target_code_rate i
n terms of 0.1 b
its
// target_code_rate i
s in 0.1 un
its
float
Coderate
=
(
float
)
harq_process
->
R
/
(
float
)
10240
;
float
Coderate
=
(
float
)
harq_process
->
R
/
10240
.
0
f
;
LOG_D
(
PHY
,
"%d.%d DLSCH Decoding, harq_pid %d TBS %d (%d) G %d nb_re_dmrs %d length dmrs %d mcs %d Nl %d nb_symb_sch %d nb_rb %d Qm %d Coderate %f
\n
"
,
LOG_D
(
PHY
,
"%d.%d DLSCH Decoding, harq_pid %d TBS %d (%d) G %d nb_re_dmrs %d length dmrs %d mcs %d Nl %d nb_symb_sch %d nb_rb %d Qm %d Coderate %f
\n
"
,
frame
,
nr_slot_rx
,
harq_pid
,
A
,
A
/
8
,
G
,
nb_re_dmrs
,
dmrs_length
,
harq_process
->
mcs
,
harq_process
->
Nl
,
nb_symb_sch
,
nb_rb
,
harq_process
->
Qm
,
Coderate
);
frame
,
nr_slot_rx
,
harq_pid
,
A
,
A
/
8
,
G
,
nb_re_dmrs
,
dmrs_length
,
harq_process
->
mcs
,
harq_process
->
Nl
,
nb_symb_sch
,
nb_rb
,
harq_process
->
Qm
,
Coderate
);
...
...
openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c
View file @
d56f2c8e
...
@@ -198,8 +198,8 @@ int nr_ulsch_encoding(PHY_VARS_NR_UE *ue,
...
@@ -198,8 +198,8 @@ int nr_ulsch_encoding(PHY_VARS_NR_UE *ue,
uint16_t
Kr
=
0
;
uint16_t
Kr
=
0
;
uint32_t
r_offset
=
0
;
uint32_t
r_offset
=
0
;
uint32_t
F
=
0
;
uint32_t
F
=
0
;
// target_code_rate i
n terms of 0.1 b
its
// target_code_rate i
s in 0.1 un
its
float
Coderate
=
(
float
)
harq_process
->
pusch_pdu
.
target_code_rate
/
(
float
)
10240
;
float
Coderate
=
(
float
)
harq_process
->
pusch_pdu
.
target_code_rate
/
10240
.
0
f
;
///////////
///////////
/////////////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////////
...
...
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
View file @
d56f2c8e
...
@@ -802,7 +802,7 @@ bool nr_ue_dlsch_procedures(PHY_VARS_NR_UE *ue,
...
@@ -802,7 +802,7 @@ bool nr_ue_dlsch_procedures(PHY_VARS_NR_UE *ue,
nb_symb_sch
,
nb_symb_sch
,
nr_slot_rx
,
nr_slot_rx
,
harq_pid
,
harq_pid
,
pdsch
==
PDSCH
?
1
:
0
);
pdsch
==
PDSCH
);
LOG_T
(
PHY
,
"dlsch decoding, ret = %d
\n
"
,
ret
);
LOG_T
(
PHY
,
"dlsch decoding, ret = %d
\n
"
,
ret
);
...
@@ -878,7 +878,7 @@ bool nr_ue_dlsch_procedures(PHY_VARS_NR_UE *ue,
...
@@ -878,7 +878,7 @@ bool nr_ue_dlsch_procedures(PHY_VARS_NR_UE *ue,
nb_symb_sch
,
nb_symb_sch
,
nr_slot_rx
,
nr_slot_rx
,
harq_pid
,
harq_pid
,
pdsch
==
PDSCH
?
1
:
0
);
//proc->decoder_switch
pdsch
==
PDSCH
);
//proc->decoder_switch
LOG_T
(
PHY
,
"CW dlsch decoding, ret1 = %d
\n
"
,
ret1
);
LOG_T
(
PHY
,
"CW dlsch decoding, ret1 = %d
\n
"
,
ret1
);
stop_meas
(
&
ue
->
dlsch_decoding_stats
[
proc
->
thread_id
]);
stop_meas
(
&
ue
->
dlsch_decoding_stats
[
proc
->
thread_id
]);
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
View file @
d56f2c8e
...
@@ -1106,11 +1106,11 @@ void fill_msg3_pusch_pdu(nfapi_nr_pusch_pdu_t *pusch_pdu,
...
@@ -1106,11 +1106,11 @@ void fill_msg3_pusch_pdu(nfapi_nr_pusch_pdu_t *pusch_pdu,
for
(
int
i
=
start_symbol_index
;
i
<
start_symbol_index
+
nr_of_symbols
;
i
++
)
for
(
int
i
=
start_symbol_index
;
i
<
start_symbol_index
+
nr_of_symbols
;
i
++
)
num_dmrs_symb
+=
(
pusch_pdu
->
ul_dmrs_symb_pos
>>
i
)
&
1
;
num_dmrs_symb
+=
(
pusch_pdu
->
ul_dmrs_symb_pos
>>
i
)
&
1
;
int
R
,
TBS
=
0
;
int
TBS
=
0
;
while
(
TBS
<
7
)
{
// TBS for msg3 is 7 bytes (except for RRCResumeRequest1 currently not implemented)
while
(
TBS
<
7
)
{
// TBS for msg3 is 7 bytes (except for RRCResumeRequest1 currently not implemented)
mcsindex
++
;
mcsindex
++
;
R
=
nr_get_code_rate_ul
(
mcsindex
,
pusch_pdu
->
mcs_table
);
int
R
=
nr_get_code_rate_ul
(
mcsindex
,
pusch_pdu
->
mcs_table
);
pusch_pdu
->
target_code_rate
=
(
R
>
1024
)
?
R
*
5
:
R
*
10
;
pusch_pdu
->
target_code_rate
=
R
;
pusch_pdu
->
qam_mod_order
=
nr_get_Qm_ul
(
mcsindex
,
pusch_pdu
->
mcs_table
);
pusch_pdu
->
qam_mod_order
=
nr_get_Qm_ul
(
mcsindex
,
pusch_pdu
->
mcs_table
);
TBS
=
nr_compute_tbs
(
pusch_pdu
->
qam_mod_order
,
TBS
=
nr_compute_tbs
(
pusch_pdu
->
qam_mod_order
,
R
,
R
,
...
...
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