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
zzha zzha
OpenXG-RAN
Commits
72d9c941
Commit
72d9c941
authored
Jan 16, 2018
by
Hongzhi Wang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
reduce logs
parent
4608b8e8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
29 additions
and
17 deletions
+29
-17
openair1/PHY/LTE_TRANSPORT/dlsch_coding.c
openair1/PHY/LTE_TRANSPORT/dlsch_coding.c
+13
-9
openair1/PHY/LTE_TRANSPORT/dlsch_decoding.c
openair1/PHY/LTE_TRANSPORT/dlsch_decoding.c
+16
-8
No files found.
openair1/PHY/LTE_TRANSPORT/dlsch_coding.c
View file @
72d9c941
...
...
@@ -649,10 +649,14 @@ int dlsch_encoding(PHY_VARS_eNB *eNB,
printf
(
"Encoder: B %d F %d
\n
"
,
dlsch
->
harq_processes
[
harq_pid
]
->
B
,
dlsch
->
harq_processes
[
harq_pid
]
->
F
);
for
(
r
=
0
;
r
<
dlsch
->
harq_processes
[
harq_pid
]
->
C
;
r
++
)
{
//if (r<dlsch->harq_processes[harq_pid]->Cminus)
// Kr = dlsch->harq_processes[harq_pid]->Kminus;
//else
#ifdef TD_DECODING
if
(
r
<
dlsch
->
harq_processes
[
harq_pid
]
->
Cminus
)
Kr
=
dlsch
->
harq_processes
[
harq_pid
]
->
Kminus
;
else
Kr
=
dlsch
->
harq_processes
[
harq_pid
]
->
Kplus
;
#else
Kr
=
dlsch
->
harq_processes
[
harq_pid
]
->
Kplus
;
#endif
Kr_bytes
=
Kr
>>
3
;
...
...
@@ -681,23 +685,23 @@ int dlsch_encoding(PHY_VARS_eNB *eNB,
printf
(
"mod_order %d
\n
"
,
mod_order
);
#endif
double
rate
=
0
.
33
;
//
double rate = 0.33;
#ifdef DEBUG_DLSCH_CODING
printf
(
"Encoding ... iind %d f1 %d, f2 %d
\n
"
,
iind
,
f1f2mat_old
[
iind
*
2
],
f1f2mat_old
[(
iind
*
2
)
+
1
]);
#endif
start_meas
(
te_stats
);
printf
(
"start turbo encoder kr %d kr>>3 %d
\n
"
,
Kr
,
Kr
>>
3
);
for
(
int
tbc_counter
=
0
;
tbc_counter
<
Kr
;
tbc_counter
++
){
for
(
int
tbc_counter
=
0
;
tbc_counter
<
8
;
tbc_counter
++
){
printf
(
"turbo tbc number %d input %d
\n
"
,
tbc_counter
,
dlsch
->
harq_processes
[
harq_pid
]
->
c
[
r
][
tbc_counter
]);
}
printf
(
"start encoder kr %d kr>>3 %d
\n
"
,
Kr
,
Kr
>>
3
);
/*
printf("start encoder kr %d kr>>3 %d\n", Kr, Kr>>3);
for (int tbs_counter = 0; tbs_counter< Kr>>3; tbs_counter++){
printf("%d\n", dlsch->harq_processes[harq_pid]->c[r][tbs_counter]);
}
printf
(
"end encoder
\n
"
);
printf("end encoder \n");
*/
#ifdef TD_DECODING
threegpplte_turbo_encoder
(
dlsch
->
harq_processes
[
harq_pid
]
->
c
[
r
],
...
...
@@ -717,14 +721,14 @@ int dlsch_encoding(PHY_VARS_eNB *eNB,
ldpc_encoder
((
unsigned
char
*
)
dlsch
->
harq_processes
[
harq_pid
]
->
c
[
r
],
&
dlsch
->
harq_processes
[
harq_pid
]
->
d
[
r
][
96
],
dlsch
->
harq_processes
[
harq_pid
]
->
B
,
rate
);
#endif
printf
(
"end ldpc encoder -- output
\n
"
);
/*
printf("end ldpc encoder -- output\n");
//printf("output %d %d %d %d %d \n", dlsch->harq_processes[harq_pid]->d[r][96], dlsch->harq_processes[harq_pid]->d[r][96+1], dlsch->harq_processes[harq_pid]->d[r][96+2],dlsch->harq_processes[harq_pid]->d[r][96+3], dlsch->harq_processes[harq_pid]->d[r][96+4]);
for (int cnt =0 ; cnt < 66*128; cnt ++){
printf("%d \n", dlsch->harq_processes[harq_pid]->d[r][96+cnt]);
}
printf
(
"
\n
"
);
printf("\n");
*/
stop_meas
(
te_stats
);
#ifdef DEBUG_DLSCH_CODING
...
...
openair1/PHY/LTE_TRANSPORT/dlsch_decoding.c
View file @
72d9c941
...
...
@@ -396,10 +396,14 @@ uint32_t dlsch_decoding(PHY_VARS_UE *phy_vars_ue,
// Get Turbo interleaver parameters
//if (r<harq_process->Cminus)
// Kr = harq_process->Kminus;
//else
#ifdef TD_DECODING
if
(
r
<
harq_process
->
Cminus
)
Kr
=
harq_process
->
Kminus
;
else
Kr
=
harq_process
->
Kplus
;
#else
Kr
=
harq_process
->
Kplus
;
#endif
Kr_bytes
=
Kr
>>
3
;
...
...
@@ -537,8 +541,8 @@ uint32_t dlsch_decoding(PHY_VARS_UE *phy_vars_ue,
LOG_D
(
PHY
,
"AbsSubframe %d.%d Start turbo segment %d/%d
\n
"
,
frame
%
1024
,
nr_tti_rx
,
r
,
harq_process
->
C
-
1
);
printf
(
"harq process dr
\n
"
);
for
(
int
cnt
=
0
;
cnt
<
66
*
p_decParams
->
Z
;
cnt
++
){
//66*p_decParams->Z
for
(
int
cnt
=
0
;
cnt
<
8
;
cnt
++
){
printf
(
"%d
\n
"
,
harq_process
->
d
[
r
][
96
+
cnt
]);
}
...
...
@@ -593,6 +597,7 @@ uint32_t dlsch_decoding(PHY_VARS_UE *phy_vars_ue,
llrProcBuf
,
p_procTime
);
#endif
printf
(
"output channel decoder %d %d %d %d %d
\n
"
,
harq_process
->
c
[
r
][
0
],
harq_process
->
c
[
r
][
1
],
harq_process
->
c
[
r
][
2
],
harq_process
->
c
[
r
][
3
],
harq_process
->
c
[
r
][
4
]);
#if UE_TIMING_TRACE
...
...
@@ -1272,7 +1277,7 @@ if (harq_process->C>1) { // wakeup worker if more than 1 segment
#if UE_TIMING_TRACE
start_meas
(
dlsch_turbo_decoding_stats
);
#endif
LOG_
D
(
PHY
,
"AbsSubframe %d.%d Start turbo segment %d/%d
\n
"
,
frame
%
1024
,
nr_tti_rx
,
r
,
harq_process
->
C
-
1
);
LOG_
I
(
PHY
,
"AbsSubframe %d.%d Start turbo segment %d/%d
\n
"
,
frame
%
1024
,
nr_tti_rx
,
r
,
harq_process
->
C
-
1
);
ret
=
tc
(
&
harq_process
->
d
[
r
][
96
],
harq_process
->
c
[
r
],
...
...
@@ -1290,6 +1295,9 @@ if (harq_process->C>1) { // wakeup worker if more than 1 segment
&
phy_vars_ue
->
dlsch_tc_intl1_stats
,
&
phy_vars_ue
->
dlsch_tc_intl2_stats
);
//(is_crnti==0)?harq_pid:harq_pid+1);
printf
(
"main thread output channel decoder %d %d %d %d %d
\n
"
,
harq_process
->
c
[
r
][
0
],
harq_process
->
c
[
r
][
1
],
harq_process
->
c
[
r
][
2
],
harq_process
->
c
[
r
][
3
],
harq_process
->
c
[
r
][
4
]);
#if UE_TIMING_TRACE
stop_meas
(
dlsch_turbo_decoding_stats
);
#endif
...
...
@@ -2355,7 +2363,7 @@ int dlsch_abstraction_MIESM(double* sinr_dB,uint8_t TM, uint32_t rb_alloc[4], ui
}
uint32_t
dlsch_decoding_emul
(
PHY_VARS_UE
*
phy_vars_ue
,
uint8_t
nr_tti_rx
,
uint8_t
subframe
,
PDSCH_t
dlsch_id
,
uint8_t
eNB_id
)
{
...
...
@@ -2381,7 +2389,7 @@ uint32_t dlsch_decoding_emul(PHY_VARS_UE *phy_vars_ue,
mac_xface
->
macphy_exit
(
"Could not find attached eNB for DLSCH emulation"
);
}
LOG_
D
(
PHY
,
"[UE] dlsch_decoding_emul : nr_tti_rx %d, eNB_id %d, dlsch_id %d
\n
"
,
nr_tti_rx
,
eNB_id2
,
dlsch_id
);
LOG_
I
(
PHY
,
"[UE] dlsch_decoding_emul : subframe %d, eNB_id %d, dlsch_id %d
\n
"
,
subframe
,
eNB_id2
,
dlsch_id
);
// printf("dlsch_eNB_ra->harq_processes[0] %p\n",PHY_vars_eNB_g[eNB_id]->dlsch_eNB_ra->harq_processes[0]);
...
...
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