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
Michael Black
OpenXG-RAN
Commits
96629102
Commit
96629102
authored
May 03, 2017
by
gabrielC
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Clean and remove a problematic memcpy
parent
3fcdec1a
Changes
13
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
113 additions
and
222 deletions
+113
-222
openair1/PHY/LTE_ESTIMATION/lte_dl_channel_estimation.c
openair1/PHY/LTE_ESTIMATION/lte_dl_channel_estimation.c
+4
-11
openair1/PHY/LTE_ESTIMATION/lte_ue_measurements.c
openair1/PHY/LTE_ESTIMATION/lte_ue_measurements.c
+16
-117
openair1/PHY/LTE_TRANSPORT/dci_tools.c
openair1/PHY/LTE_TRANSPORT/dci_tools.c
+12
-12
openair1/PHY/LTE_TRANSPORT/dlsch_decoding.c
openair1/PHY/LTE_TRANSPORT/dlsch_decoding.c
+2
-25
openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
+3
-3
openair1/PHY/LTE_TRANSPORT/dlsch_llr_computation.c
openair1/PHY/LTE_TRANSPORT/dlsch_llr_computation.c
+0
-2
openair1/PHY/LTE_TRANSPORT/lte_mcs.c
openair1/PHY/LTE_TRANSPORT/lte_mcs.c
+2
-2
openair1/PHY/LTE_TRANSPORT/sss.c
openair1/PHY/LTE_TRANSPORT/sss.c
+1
-1
openair1/PHY/LTE_TRANSPORT/ulsch_coding.c
openair1/PHY/LTE_TRANSPORT/ulsch_coding.c
+3
-5
openair1/PHY/MODULATION/slot_fep.c
openair1/PHY/MODULATION/slot_fep.c
+0
-2
openair1/SCHED/phy_procedures_lte_common.c
openair1/SCHED/phy_procedures_lte_common.c
+4
-4
openair1/SCHED/phy_procedures_lte_ue.c
openair1/SCHED/phy_procedures_lte_ue.c
+65
-36
targets/RT/USER/lte-ue.c
targets/RT/USER/lte-ue.c
+1
-2
No files found.
openair1/PHY/LTE_ESTIMATION/lte_dl_channel_estimation.c
View file @
96629102
...
...
@@ -23,6 +23,7 @@
#include <string.h>
#endif
#include "defs.h"
#include "SCHED/defs.h"
#include "PHY/defs.h"
#include "filt96_32.h"
#include "T.h"
...
...
@@ -642,7 +643,7 @@ int lte_dl_channel_estimation(PHY_VARS_UE *ue,
// dl_ch_prev = (int16_t *)&dl_ch_estimates[(p<<1)+aarx][(4-ue->frame_parms.Ncp)*(ue->frame_parms.ofdm_symbol_size)];
if
(((
Ns
>>
1
)
!=
0
)
||
(
((
Ns
>>
1
)
==
0
)
&&
interpolateS11S12
))
{
LOG_I
(
PHY
,
"Interpolate s11-->s0 to get s12 and s13 Ns %d
\n
"
,
Ns
);
//
LOG_I(PHY,"Interpolate s11-->s0 to get s12 and s13 Ns %d \n", Ns);
dl_ch_prev
=
(
int16_t
*
)
&
dl_ch_estimates_previous
[(
p
<<
1
)
+
aarx
][
pilot3
*
(
ue
->
frame_parms
.
ofdm_symbol_size
)];
multadd_complex_vector_real_scalar
(
dl_ch_prev
,
21845
,
dl_ch_prev
+
(
2
*
(
ue
->
frame_parms
.
ofdm_symbol_size
)),
1
,
ue
->
frame_parms
.
ofdm_symbol_size
);
...
...
@@ -657,15 +658,9 @@ int lte_dl_channel_estimation(PHY_VARS_UE *ue,
else
if
(
symbol
==
pilot1
)
{
dl_ch_prev
=
(
int16_t
*
)
&
dl_ch_estimates
[(
p
<<
1
)
+
aarx
][
0
];
LOG_I
(
PHY
,
"Interpolate s0-->s4 to get s1 s2 and s3 Ns %d
\n
"
,
Ns
);
//
LOG_I(PHY,"Interpolate s0-->s4 to get s1 s2 and s3 Ns %d \n", Ns);
if
(
ue
->
frame_parms
.
Ncp
==
0
)
{
// pilot spacing 4 symbols (1/4,1/2,3/4 combination)
//subframe_select(ue->frame_parms,((Ns>>1)-1)) == SF_UL
//if((Ns>>1) != 5)
uint8_t
previous_subframe
;
if
(
Ns
>>
1
==
0
)
previous_subframe
=
9
;
...
...
@@ -734,7 +729,7 @@ int lte_dl_channel_estimation(PHY_VARS_UE *ue,
if
((
ue
->
rx_offset_diff
!=
0
)
&&
((
Ns
>>
1
)
==
9
))
{
LOG_I
(
PHY
,
"Extrapolate s7-->s11 to get s12 and s13 Ns %d
\n
"
,
Ns
);
//
LOG_I(PHY,"Extrapolate s7-->s11 to get s12 and s13 Ns %d\n", Ns);
interpolateS11S12
=
0
;
//LOG_E(PHY,"Interpolate s7--s11 s12 s13 pilot 3 Ns %d l %d symbol %d \n", Ns, l, symbol);
int16_t
*
dlChEst_ofdm11
=
(
int16_t
*
)
&
dl_ch_estimates
[(
p
<<
1
)
+
aarx
][
pilot3
*
(
ue
->
frame_parms
.
ofdm_symbol_size
)];
...
...
@@ -766,8 +761,6 @@ int lte_dl_channel_estimation(PHY_VARS_UE *ue,
}
}
// }
}
}
...
...
openair1/PHY/LTE_ESTIMATION/lte_ue_measurements.c
View file @
96629102
This diff is collapsed.
Click to expand it.
openair1/PHY/LTE_TRANSPORT/dci_tools.c
View file @
96629102
...
...
@@ -2982,7 +2982,7 @@ int dump_dci(LTE_DL_FRAME_PARMS *frame_parms, DCI_ALLOC_t *dci)
break
;
case
25
:
LOG_
I
(
PHY
,
"DCI format1 (TDD 5 MHz), rnti %x (%x): rah %d, rb_alloc %x, mcs %d, harq_pid %d, ndi %d, RV %d, TPC %d, dai %d
\n
"
,
LOG_
D
(
PHY
,
"DCI format1 (TDD 5 MHz), rnti %x (%x): rah %d, rb_alloc %x, mcs %d, harq_pid %d, ndi %d, RV %d, TPC %d, dai %d
\n
"
,
dci
->
rnti
,
((
uint32_t
*
)
&
dci
->
dci_pdu
)[
0
],
((
DCI1_5MHz_TDD_t
*
)
&
dci
->
dci_pdu
[
0
])
->
rah
,
...
...
@@ -6386,7 +6386,7 @@ int generate_ue_dlsch_params_from_dci(int frame,
}
//
#ifdef DEBUG_DCI
#ifdef DEBUG_DCI
if
(
dlsch
[
0
]
&&
(
dlsch
[
0
]
->
rnti
!=
0xffff
))
{
printf
(
"dci_format:%d Abssubframe: %d.%d
\n
"
,
dci_format
,
frame
%
1024
,
subframe
);
...
...
@@ -6395,15 +6395,15 @@ int generate_ue_dlsch_params_from_dci(int frame,
printf
(
"PDSCH dlsch0 UE: rballoc %x
\n
"
,
dlsch0_harq
->
rb_alloc_even
[
0
]);
printf
(
"PDSCH dlsch0 UE: harq_pid %d
\n
"
,
harq_pid
);
//printf("PDSCH dlsch0 UE: tpc %d\n",TPC);
//
printf("PDSCH dlsch0 UE: g %d\n",dlsch[0]->g_pucch);
printf
(
"PDSCH dlsch0 UE: g %d
\n
"
,
dlsch
[
0
]
->
g_pucch
);
printf
(
"PDSCH dlsch0 UE: round %d
\n
"
,
dlsch0_harq
->
round
);
printf
(
"PDSCH dlsch0 UE: DCINdi %d
\n
"
,
dlsch0_harq
->
DCINdi
);
printf
(
"PDSCH dlsch0 UE: rvidx %d
\n
"
,
dlsch0_harq
->
rvidx
);
printf
(
"PDSCH dlsch0 UE: TBS %d
\n
"
,
dlsch0_harq
->
TBS
);
printf
(
"PDSCH dlsch0 UE: mcs %d
\n
"
,
dlsch0_harq
->
mcs
);
//
printf("PDSCH dlsch0 UE: pwr_off %d\n",dlsch0_harq->dl_power_off);
printf
(
"PDSCH dlsch0 UE: pwr_off %d
\n
"
,
dlsch0_harq
->
dl_power_off
);
}
//
#endif
#endif
#if T_TRACER
if
(
(
dlsch
[
0
]
->
rnti
!=
si_rnti
)
&&
(
dlsch
[
0
]
->
rnti
!=
ra_rnti
)
&&
(
dlsch
[
0
]
->
rnti
!=
p_rnti
))
...
...
@@ -8021,11 +8021,11 @@ int generate_ue_ulsch_params_from_dci(void *dci_pdu,
}
else
{
ulsch
->
harq_processes
[
harq_pid
]
->
O_ACK
=
0
;
}
LOG_I
(
PHY
,
"DCI 0 Processing: dl_subframe %d send_harq_status Odd %d send_harq_status Even %d harq_pid %d O_ACK %d
\n
"
,
dl_subframe
,
/*
LOG_I(PHY,"DCI 0 Processing: dl_subframe %d send_harq_status Odd %d send_harq_status Even %d harq_pid %d O_ACK %d\n", dl_subframe,
ue->dlsch[0][eNB_id][0]->harq_ack[dl_subframe].send_harq_status,
ue->dlsch[1][eNB_id][0]->harq_ack[dl_subframe].send_harq_status,
harq_pid,
ulsch
->
harq_processes
[
harq_pid
]
->
O_ACK
);
ulsch->harq_processes[harq_pid]->O_ACK);
*/
}
else
{
if
(
ulsch
->
bundling
)
...
...
@@ -8039,7 +8039,7 @@ int generate_ue_ulsch_params_from_dci(void *dci_pdu,
dlsch
[
0
]
->
harq_ack
[
subframe
].
vDAI_UL
=
dai
+
1
;
LOG_I
(
PHY
,
"[PUSCH %d] Format0 DCI %s, CQI_req=%d, cshift=%d, TPC=%d, DAI=%d, vDAI_UL[sf#%d]=%d, NDI=%d, MCS=%d, RBalloc=%d, first_rb=%d, harq_pid=%d, nb_rb=%d, subframe_scheduling_flag=%d"
/*
LOG_I(PHY, "[PUSCH %d] Format0 DCI %s, CQI_req=%d, cshift=%d, TPC=%d, DAI=%d, vDAI_UL[sf#%d]=%d, NDI=%d, MCS=%d, RBalloc=%d, first_rb=%d, harq_pid=%d, nb_rb=%d, subframe_scheduling_flag=%d"
" ulsch->bundling %d, O_ACK %d \n",
harq_pid,
(frame_parms->frame_type == TDD? "TDD" : "FDD"),
...
...
@@ -8047,7 +8047,7 @@ int generate_ue_ulsch_params_from_dci(void *dci_pdu,
ulsch->harq_processes[harq_pid]->first_rb, harq_pid, ulsch->harq_processes[harq_pid]->nb_rb,
ulsch->harq_processes[harq_pid]->subframe_scheduling_flag,
ulsch->bundling,
ulsch
->
harq_processes
[
harq_pid
]
->
O_ACK
);
ulsch->harq_processes[harq_pid]->O_ACK);
*/
ulsch
->
beta_offset_cqi_times8
=
beta_cqi
[
ue
->
pusch_config_dedicated
[
eNB_id
].
betaOffset_CQI_Index
];
//18;
ulsch
->
beta_offset_ri_times8
=
beta_ri
[
ue
->
pusch_config_dedicated
[
eNB_id
].
betaOffset_RI_Index
];
//10;
...
...
@@ -8099,7 +8099,7 @@ int generate_ue_ulsch_params_from_dci(void *dci_pdu,
// ulsch->n_DMRS2 = ((DCI0_5MHz_TDD_1_6_t *)dci_pdu)->cshift;
//
#ifdef DEBUG_DCI
#ifdef DEBUG_DCI
printf
(
"Format 0 DCI : ulsch (ue): AbsSubframe %d.%d
\n
"
,
proc
->
frame_rx
%
1024
,
subframe
);
printf
(
"Format 0 DCI : ulsch (ue): NBRB %d
\n
"
,
ulsch
->
harq_processes
[
harq_pid
]
->
nb_rb
);
...
...
@@ -8121,9 +8121,9 @@ int generate_ue_ulsch_params_from_dci(void *dci_pdu,
printf
(
"Format 0 DCI :ulsch (ue): Nsymb_pusch %d
\n
"
,
ulsch
->
Nsymb_pusch
);
printf
(
"Format 0 DCI :ulsch (ue): cshift %d
\n
"
,
ulsch
->
harq_processes
[
harq_pid
]
->
n_DMRS2
);
printf
(
"Format 0 DCI :ulsch (ue): phich status %d
\n
"
,
ulsch
->
harq_processes
[
harq_pid
]
->
status
);
//
#else
#else
UNUSED_VARIABLE
(
dai
);
//
#endif
#endif
return
(
0
);
}
else
{
LOG_E
(
PHY
,
"frame %d, subframe %d: FATAL ERROR, generate_ue_ulsch_params_from_dci, Illegal dci_format %d
\n
"
,
...
...
openair1/PHY/LTE_TRANSPORT/dlsch_decoding.c
View file @
96629102
...
...
@@ -644,19 +644,6 @@ uint32_t dlsch_decoding(PHY_VARS_UE *phy_vars_ue,
//LOG_I(PHY,"[UE %d] DLSCH: Setting NAK for SFN/SF %d/%d (pid %d, status %d, round %d, TBS %d, mcs %d) Kr %d r %d harq_process->round %d\n",
// phy_vars_ue->Mod_id, frame, subframe, harq_pid,harq_process->status, harq_process->round,harq_process->TBS,harq_process->mcs,Kr,r,harq_process->round);
if
(
0
){
// (harq_process->nb_rb==25 && r==3 && harq_process->round==0 ) {
write_output
(
"decoder_llr.m"
,
"decllr"
,
dlsch_llr
,
G
,
1
,
0
);
write_output
(
"rxdataF0.m"
,
"rxdataF0"
,
&
phy_vars_ue
->
common_vars
.
common_vars_rx_data_per_thread
[
subframe
&
0x1
].
rxdataF
[
0
][
0
],
14
*
frame_parms
->
ofdm_symbol_size
,
1
,
1
);
write_output
(
"dl_ch_estimates_ext00.m"
,
"dl_ch_estimates_ext00"
,
&
phy_vars_ue
->
pdsch_vars
[
subframe
&
0x1
][
0
]
->
dl_ch_estimates_ext
[
0
][
0
],
14
*
frame_parms
->
N_RB_DL
*
12
,
1
,
1
);
write_output
(
"rxdataF_comp00.m"
,
"rxdataF_comp00"
,
&
phy_vars_ue
->
pdsch_vars
[
subframe
&
0x1
][
0
]
->
rxdataF_comp0
[
0
][
0
],
14
*
frame_parms
->
N_RB_DL
*
12
,
1
,
1
);
write_output
(
"magDLFirst.m"
,
"magDLFirst"
,
&
phy_vars_ue
->
pdsch_vars
[
subframe
&
0x1
][
0
]
->
dl_ch_mag0
[
0
][
0
],
14
*
frame_parms
->
N_RB_DL
*
12
,
1
,
1
);
write_output
(
"magDLSecond.m"
,
"magDLSecond"
,
&
phy_vars_ue
->
pdsch_vars
[
subframe
&
0x1
][
0
]
->
dl_ch_magb0
[
0
][
0
],
14
*
frame_parms
->
N_RB_DL
*
12
,
1
,
1
);
AssertFatal
(
0
,
"number of soft bits %d nb_rb %d"
,
G
,
frame_parms
->
N_RB_DL
);
}
dlsch
->
harq_ack
[
subframe
].
ack
=
0
;
dlsch
->
harq_ack
[
subframe
].
harq_id
=
harq_pid
;
dlsch
->
harq_ack
[
subframe
].
send_harq_status
=
1
;
...
...
@@ -671,7 +658,7 @@ uint32_t dlsch_decoding(PHY_VARS_UE *phy_vars_ue,
}
if
(
is_crnti
)
{
LOG_
I
(
PHY
,
"[UE %d] DLSCH: Setting NACK for subframe %d (pid %d, pid status %d, round %d/Max %d, TBS %d)
\n
"
,
LOG_
D
(
PHY
,
"[UE %d] DLSCH: Setting NACK for subframe %d (pid %d, pid status %d, round %d/Max %d, TBS %d)
\n
"
,
phy_vars_ue
->
Mod_id
,
subframe
,
harq_pid
,
harq_process
->
status
,
harq_process
->
round
,
dlsch
->
Mdlharq
,
harq_process
->
TBS
);
}
...
...
@@ -681,16 +668,6 @@ uint32_t dlsch_decoding(PHY_VARS_UE *phy_vars_ue,
//LOG_I(PHY,"[UE %d] DLSCH: Setting ACK for subframe %d TBS %d harq_process->mcs %d harq_process->nb_rb %d\n",
//phy_vars_ue->Mod_id,subframe,harq_process->TBS,harq_process->mcs,harq_process->nb_rb);
if
(
0
){
// (harq_process->mcs==28 && (subframe ==5 || subframe==0)) {
write_output
(
"decoder_llr_ok.m"
,
"decllr_ok"
,
dlsch_llr
,
G
,
1
,
0
);
write_output
(
"rxdataF0_ok.m"
,
"rxdataF0_ok"
,
&
phy_vars_ue
->
common_vars
.
common_vars_rx_data_per_thread
[
subframe
&
0x1
].
rxdataF
[
0
][
0
],
14
*
frame_parms
->
ofdm_symbol_size
,
1
,
1
);
write_output
(
"dl_ch_estimates_ext00.m"
,
"dl_ch_estimates_ext00_ok"
,
&
phy_vars_ue
->
pdsch_vars
[
subframe
&
0x1
][
0
]
->
dl_ch_estimates_ext
[
0
][
0
],
14
*
frame_parms
->
N_RB_DL
*
12
,
1
,
1
);
write_output
(
"rxdataF_comp00_ok.m"
,
"rxdataF_comp00_ok"
,
&
phy_vars_ue
->
pdsch_vars
[
subframe
&
0x1
][
0
]
->
rxdataF_comp0
[
0
][
0
],
14
*
frame_parms
->
N_RB_DL
*
12
,
1
,
1
);
write_output
(
"magDLFirst_ok.m"
,
"magDLFirst_ok"
,
&
phy_vars_ue
->
pdsch_vars
[
subframe
&
0x1
][
0
]
->
dl_ch_mag0
[
0
][
0
],
14
*
frame_parms
->
N_RB_DL
*
12
,
1
,
1
);
write_output
(
"magDLSecond_ok.m"
,
"magDLSecond_ok"
,
&
phy_vars_ue
->
pdsch_vars
[
subframe
&
0x1
][
0
]
->
dl_ch_magb0
[
0
][
0
],
14
*
frame_parms
->
N_RB_DL
*
12
,
1
,
1
);
AssertFatal
(
0
,
"number of soft bits %d"
,
G
);
}
harq_process
->
status
=
SCH_IDLE
;
harq_process
->
round
=
0
;
dlsch
->
harq_ack
[
subframe
].
ack
=
1
;
...
...
@@ -701,7 +678,7 @@ uint32_t dlsch_decoding(PHY_VARS_UE *phy_vars_ue,
if
(
is_crnti
)
{
LOG_
I
(
PHY
,
"[UE %d] DLSCH: Setting ACK for subframe %d (pid %d, round %d, TBS %d)
\n
"
,
phy_vars_ue
->
Mod_id
,
subframe
,
harq_pid
,
harq_process
->
round
,
harq_process
->
TBS
);
LOG_
D
(
PHY
,
"[UE %d] DLSCH: Setting ACK for subframe %d (pid %d, round %d, TBS %d)
\n
"
,
phy_vars_ue
->
Mod_id
,
subframe
,
harq_pid
,
harq_process
->
round
,
harq_process
->
TBS
);
}
//LOG_D(PHY,"[UE %d] DLSCH: Setting ACK for subframe %d (pid %d, round %d)\n",phy_vars_ue->Mod_id,subframe,harq_pid,harq_process->round);
...
...
openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
View file @
96629102
...
...
@@ -354,7 +354,7 @@ int rx_pdsch(PHY_VARS_UE *ue,
#ifdef DEBUG_PHY
LOG_
I
(
PHY
,
"[DLSCH] nb_rb %d log2_maxh = %d (%d,%d)
\n
"
,
nb_rb
,
pdsch_vars
[
eNB_id
]
->
log2_maxh
,
avg
[
0
],
avgs
);
LOG_
D
(
PHY
,
"[DLSCH] nb_rb %d log2_maxh = %d (%d,%d)
\n
"
,
nb_rb
,
pdsch_vars
[
eNB_id
]
->
log2_maxh
,
avg
[
0
],
avgs
);
LOG_D
(
PHY
,
"[DLSCH] mimo_mode = %d
\n
"
,
dlsch0_harq
->
mimo_mode
);
#endif
...
...
@@ -465,14 +465,14 @@ int rx_pdsch(PHY_VARS_UE *ue,
avg
,
symbol
,
nb_rb
);
//
#ifdef DEBUG_PHY
#ifdef DEBUG_PHY
LOG_I
(
PHY
,
"[DLSCH] AbsSubframe %d.%d log2_maxh = %d [log2_maxh0 %d log2_maxh1 %d] (%d,%d)
\n
"
,
frame
%
1024
,
subframe
,
pdsch_vars
[
eNB_id
]
->
log2_maxh
,
pdsch_vars
[
eNB_id
]
->
log2_maxh0
,
pdsch_vars
[
eNB_id
]
->
log2_maxh1
,
avg
[
0
],
avgs
);
LOG_D
(
PHY
,
"[DLSCH] mimo_mode = %d
\n
"
,
dlsch0_harq
->
mimo_mode
);
//
#endif
#endif
}
#if T_TRACER
...
...
openair1/PHY/LTE_TRANSPORT/dlsch_llr_computation.c
View file @
96629102
...
...
@@ -1092,8 +1092,6 @@ void dlsch_64qam_llr(LTE_DL_FRAME_PARMS *frame_parms,
len2
=
len
>>
2
;
// length in quad words (4 REs)
len2
+=
((
len_mod4
==
0
)
?
0
:
1
);
//printf("Sym %d llr Length %d %d\n", symbol,len,len2);
for
(
i
=
0
;
i
<
len2
;
i
++
)
{
#if defined(__x86_64__) || defined(__i386__)
...
...
openair1/PHY/LTE_TRANSPORT/lte_mcs.c
View file @
96629102
...
...
@@ -154,7 +154,7 @@ int adjust_G2(LTE_DL_FRAME_PARMS *frame_parms,uint32_t *rb_alloc,uint8_t mod_ord
nsymb
=
(
frame_parms
->
Ncp
==
NORMAL
)
?
14
:
12
;
//printf("adjust_G2 : symbol %d, subframe %d\n",symbol,subframe);
//
printf("adjust_G2 : symbol %d, subframe %d\n",symbol,subframe);
if
((
subframe
!=
0
)
&&
(
subframe
!=
5
)
&&
(
subframe
!=
6
))
// if not PBCH/SSS or SSS
return
(
0
);
...
...
@@ -234,7 +234,7 @@ int adjust_G2(LTE_DL_FRAME_PARMS *frame_parms,uint32_t *rb_alloc,uint8_t mod_ord
}
}
//printf("re_pbch_sss %d\n",re_pbch_sss);
//
printf("re_pbch_sss %d\n",re_pbch_sss);
return
(
re_pbch_sss
);
}
...
...
openair1/PHY/LTE_TRANSPORT/sss.c
View file @
96629102
...
...
@@ -166,7 +166,7 @@ int _do_pss_sss_extract(PHY_VARS_UE *ue,
int32_t
**
rxdataF
;
LOG_I
(
PHY
,
"do_pss_sss_extract subframe %d
\n
"
,
subframe
);
//
LOG_I(PHY,"do_pss_sss_extract subframe %d \n",subframe);
for
(
aarx
=
0
;
aarx
<
frame_parms
->
nb_antennas_rx
;
aarx
++
)
{
if
(
frame_parms
->
frame_type
==
FDD
)
{
...
...
openair1/PHY/LTE_TRANSPORT/ulsch_coding.c
View file @
96629102
...
...
@@ -515,10 +515,8 @@ uint32_t ulsch_encoding(uint8_t *a,
G
=
G
-
Q_RI
-
Q_CQI
;
ulsch
->
harq_processes
[
harq_pid
]
->
G
=
G
;
LOG_I
(
PHY
,
"ULSCH Encoding G %d, Q_RI %d (O_RI%d, Msc_initial %d, Nsymb_initial%d, beta_offset_ri_times8 %d), "
"Q_CQI %d, Q_ACK %d
\n
"
,
G
,
Q_RI
,
ulsch
->
O_RI
,
ulsch
->
harq_processes
[
harq_pid
]
->
Msc_initial
,
ulsch
->
harq_processes
[
harq_pid
]
->
Nsymb_initial
,
ulsch
->
beta_offset_ri_times8
,
Q_CQI
,
Q_ACK
);
/*
LOG_I(PHY,"ULSCH Encoding G %d, Q_RI %d (O_RI%d, Msc_initial %d, Nsymb_initial%d, beta_offset_ri_times8 %d), Q_CQI %d, Q_ACK %d \n",G,Q_RI,ulsch->O_RI,ulsch->harq_processes[harq_pid]->Msc_initial,ulsch->harq_processes[harq_pid]->Nsymb_initial,ulsch->beta_offset_ri_times8,Q_CQI,Q_ACK);
LOG_I(PHY,"ULSCH Encoding (Nid_cell %d, rnti %x): harq_pid %d round %d, RV %d, mcs %d, O_RI %d, O_ACK %d, G %d\n",
frame_parms->Nid_cell,ulsch->rnti,
...
...
@@ -529,7 +527,7 @@ uint32_t ulsch_encoding(uint8_t *a,
ulsch->O_RI,
ulsch->harq_processes[harq_pid]->O_ACK,
G);
*/
if
((
int
)
G
<
0
)
{
LOG_E
(
PHY
,
"FATAL: ulsch_coding.c G < 0 (%d) : Q_RI %d, Q_CQI %d, O %d, betaCQI_times8 %d)
\n
"
,
G
,
Q_RI
,
Q_CQI
,
ulsch
->
O
,
ulsch
->
beta_offset_cqi_times8
);
...
...
openair1/PHY/MODULATION/slot_fep.c
View file @
96629102
...
...
@@ -117,8 +117,6 @@ int slot_fep(PHY_VARS_UE *ue,
if
(
l
==
0
)
{
LOG_I
(
PHY
,
"FFT odfm symbol %d Slot %d
\n
"
,
symbol
,
Ns
);
if
(
rx_offset
>
(
frame_length_samples
-
frame_parms
->
ofdm_symbol_size
))
memcpy
((
short
*
)
&
common_vars
->
rxdata
[
aa
][
frame_length_samples
],
(
short
*
)
&
common_vars
->
rxdata
[
aa
][
0
],
...
...
openair1/SCHED/phy_procedures_lte_common.c
View file @
96629102
...
...
@@ -343,7 +343,7 @@ uint8_t get_reset_ack(LTE_DL_FRAME_PARMS *frame_parms,
o_ACK
[
cw_idx
]
=
harq_ack
[
subframe_dl0
].
ack
;
status
=
harq_ack
[
subframe_dl0
].
send_harq_status
;
LOG_I
(
PHY
,
"dl subframe %d send_harq_status %d cw_idx %d, reset %d
\n
"
,
subframe_dl0
,
status
,
cw_idx
,
do_reset
);
//
LOG_I(PHY,"dl subframe %d send_harq_status %d cw_idx %d, reset %d\n",subframe_dl0, status, cw_idx, do_reset);
if
(
do_reset
)
harq_ack
[
subframe_dl0
].
send_harq_status
=
0
;
//printf("get_ack: Getting ACK/NAK for PDSCH (subframe %d) => %d\n",subframe_dl,o_ACK[0]);
...
...
@@ -472,9 +472,9 @@ uint8_t get_reset_ack(LTE_DL_FRAME_PARMS *frame_parms,
pN_bundled
[
0
]
=
harq_ack
[
subframe_rx
].
vDAI_UL
;
status
=
harq_ack
[
subframe_dl0
].
send_harq_status
+
harq_ack
[
subframe_dl1
].
send_harq_status
;
LOG_I
(
PHY
,
"TDD Config3 UL Sfn %d, dl Sfn0 %d status %d o_Ack %d, dl Sfn1 %d status %d o_Ack %d subframe_rx %d N_bundled %d
\n
"
,
subframe_tx
,
subframe_dl0
,
harq_ack
[
subframe_dl0
].
send_harq_status
,
harq_ack
[
subframe_dl0
].
ack
,
subframe_dl1
,
harq_ack
[
subframe_dl1
].
send_harq_status
,
harq_ack
[
subframe_dl1
].
ack
,
subframe_rx
,
pN_bundled
[
0
]);
//LOG_D
(PHY,"TDD Config3 UL Sfn %d, dl Sfn0 %d status %d o_Ack %d, dl Sfn1 %d status %d o_Ack %d subframe_rx %d N_bundled %d \n",
//
subframe_tx, subframe_dl0, harq_ack[subframe_dl0].send_harq_status,harq_ack[subframe_dl0].ack,
//
subframe_dl1, harq_ack[subframe_dl1].send_harq_status,harq_ack[subframe_dl1].ack, subframe_rx, pN_bundled[0]);
if
(
do_reset
)
{
// reset ACK/NACK status
harq_ack
[
subframe_dl0
].
ack
=
2
;
...
...
openair1/SCHED/phy_procedures_lte_ue.c
View file @
96629102
This diff is collapsed.
Click to expand it.
targets/RT/USER/lte-ue.c
View file @
96629102
...
...
@@ -754,8 +754,7 @@ void *UE_thread(void *arg) {
UE
->
rx_offset
<
10
*
UE
->
frame_parms
.
samples_per_tti
)
UE
->
rx_offset_diff
=
1
;
LOG_I
(
PHY
,
"AbsSubframe %d.%d SET rx_off_diff to %d rx_offset %d
\n
"
,
proc
->
frame_rx
,
sub_frame
,
UE
->
rx_offset_diff
,
UE
->
rx_offset
);
LOG_D
(
PHY
,
"AbsSubframe %d.%d SET rx_off_diff to %d rx_offset %d
\n
"
,
proc
->
frame_rx
,
sub_frame
,
UE
->
rx_offset_diff
,
UE
->
rx_offset
);
readBlockSize
=
UE
->
frame_parms
.
samples_per_tti
-
UE
->
frame_parms
.
ofdm_symbol_size
-
UE
->
frame_parms
.
nb_prefix_samples0
-
...
...
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