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
Michael Black
OpenXG UE
Commits
b730c2ee
Commit
b730c2ee
authored
Oct 25, 2019
by
Francesco Mani
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'nr-tbs-fixes' of
https://gitlab.eurecom.fr/oai/openairinterface5g
into nr-tbs-fixes
parents
e009730b
3f139785
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
6 deletions
+5
-6
cmake_targets/autotests/test_case_list.xml
cmake_targets/autotests/test_case_list.xml
+3
-3
openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c
openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c
+1
-2
openair1/SIMULATION/NR_PHY/dlschsim.c
openair1/SIMULATION/NR_PHY/dlschsim.c
+1
-1
No files found.
cmake_targets/autotests/test_case_list.xml
View file @
b730c2ee
...
@@ -1119,14 +1119,14 @@
...
@@ -1119,14 +1119,14 @@
<nruns>
3
</nruns>
<nruns>
3
</nruns>
</testCase>
</testCase>
<
!--<
testCase id="015106">
<testCase
id=
"015106"
>
<class>
execution
</class>
<class>
execution
</class>
<desc>
nr_dlschsim Test cases. (Test1: 106 PRB),
<desc>
nr_dlschsim Test cases. (Test1: 106 PRB),
(Test2: 217 PRB),
(Test2: 217 PRB),
(Test3: 273 PRB)
</desc>
(Test3: 273 PRB)
</desc>
<pre_compile_prog></pre_compile_prog>
<pre_compile_prog></pre_compile_prog>
<compile_prog>
$OPENAIR_DIR/cmake_targets/build_oai
</compile_prog>
<compile_prog>
$OPENAIR_DIR/cmake_targets/build_oai
</compile_prog>
<compile_prog_args>
--><!
--phy_simulators -c </compile_prog_args>
<compile_prog_args>
--phy_simulators -c
</compile_prog_args>
<pre_exec>
$OPENAIR_DIR/cmake_targets/autotests/tools/free_mem.bash
</pre_exec>
<pre_exec>
$OPENAIR_DIR/cmake_targets/autotests/tools/free_mem.bash
</pre_exec>
<pre_exec_args></pre_exec_args>
<pre_exec_args></pre_exec_args>
<main_exec>
$OPENAIR_DIR/targets/bin/nr_dlschsim.Rel15
</main_exec>
<main_exec>
$OPENAIR_DIR/targets/bin/nr_dlschsim.Rel15
</main_exec>
...
@@ -1137,7 +1137,7 @@
...
@@ -1137,7 +1137,7 @@
<search_expr_true>
PDSCH test OK
</search_expr_true>
<search_expr_true>
PDSCH test OK
</search_expr_true>
<search_expr_false>
segmentation fault|assertion|exiting|fatal
</search_expr_false>
<search_expr_false>
segmentation fault|assertion|exiting|fatal
</search_expr_false>
<nruns>
3
</nruns>
<nruns>
3
</nruns>
</testCase>
-->
</testCase>
<testCase
id=
"015107"
>
<testCase
id=
"015107"
>
<class>
execution
</class>
<class>
execution
</class>
...
...
openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c
View file @
b730c2ee
...
@@ -200,7 +200,7 @@ int nr_ulsch_encoding(NR_UE_ULSCH_t *ulsch,
...
@@ -200,7 +200,7 @@ int nr_ulsch_encoding(NR_UE_ULSCH_t *ulsch,
uint32_t
A
,
Z
,
F
;
uint32_t
A
,
Z
,
F
;
uint32_t
*
pz
;
uint32_t
*
pz
;
uint8_t
mod_order
;
uint8_t
mod_order
;
uint16_t
Kr
,
r
,
r_offset
,
R
;
uint16_t
Kr
,
r
,
r_offset
;
uint8_t
BG
;
uint8_t
BG
;
uint32_t
E
,
Kb
;
uint32_t
E
,
Kb
;
uint8_t
Ilbrm
;
uint8_t
Ilbrm
;
...
@@ -223,7 +223,6 @@ int nr_ulsch_encoding(NR_UE_ULSCH_t *ulsch,
...
@@ -223,7 +223,6 @@ int nr_ulsch_encoding(NR_UE_ULSCH_t *ulsch,
A
=
harq_process
->
TBS
;
A
=
harq_process
->
TBS
;
pz
=
&
Z
;
pz
=
&
Z
;
mod_order
=
nr_get_Qm_ul
(
harq_process
->
mcs
,
0
);
mod_order
=
nr_get_Qm_ul
(
harq_process
->
mcs
,
0
);
R
=
nr_get_code_rate_ul
(
harq_process
->
mcs
,
0
);
Kr
=
0
;
Kr
=
0
;
r_offset
=
0
;
r_offset
=
0
;
BG
=
1
;
BG
=
1
;
...
...
openair1/SIMULATION/NR_PHY/dlschsim.c
View file @
b730c2ee
...
@@ -434,7 +434,6 @@ int main(int argc, char **argv)
...
@@ -434,7 +434,6 @@ int main(int argc, char **argv)
uint16_t
rate
;
uint16_t
rate
;
uint8_t
Nl
=
1
;
uint8_t
Nl
=
1
;
uint8_t
rvidx
=
0
;
uint8_t
rvidx
=
0
;
uint8_t
scale
;
dlsch
->
rnti
=
1
;
dlsch
->
rnti
=
1
;
/*dlsch->harq_processes[0]->mcs = Imcs;
/*dlsch->harq_processes[0]->mcs = Imcs;
dlsch->harq_processes[0]->rvidx = rvidx;*/
dlsch->harq_processes[0]->rvidx = rvidx;*/
...
@@ -452,6 +451,7 @@ int main(int argc, char **argv)
...
@@ -452,6 +451,7 @@ int main(int argc, char **argv)
rel15
->
nb_layers
=
Nl
;
rel15
->
nb_layers
=
Nl
;
rel15
->
nb_re_dmrs
=
nb_re_dmrs
;
rel15
->
nb_re_dmrs
=
nb_re_dmrs
;
rel15
->
transport_block_size
=
TBS
;
rel15
->
transport_block_size
=
TBS
;
rel15
->
coding_rate
=
rate
;
double
*
modulated_input
=
malloc16
(
sizeof
(
double
)
*
16
*
68
*
384
);
// [hna] 16 segments, 68*Zc
double
*
modulated_input
=
malloc16
(
sizeof
(
double
)
*
16
*
68
*
384
);
// [hna] 16 segments, 68*Zc
short
*
channel_output_fixed
=
malloc16
(
sizeof
(
short
)
*
16
*
68
*
384
);
short
*
channel_output_fixed
=
malloc16
(
sizeof
(
short
)
*
16
*
68
*
384
);
short
*
channel_output_uncoded
=
malloc16
(
sizeof
(
unsigned
short
)
*
16
*
68
*
384
);
short
*
channel_output_uncoded
=
malloc16
(
sizeof
(
unsigned
short
)
*
16
*
68
*
384
);
...
...
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