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
aa6bc904
Commit
aa6bc904
authored
Apr 05, 2018
by
Raymond Knopp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
removal of logging in UE
parent
4aa8ac6d
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
43 additions
and
45 deletions
+43
-45
openair1/PHY/LTE_TRANSPORT/dci_tools.c
openair1/PHY/LTE_TRANSPORT/dci_tools.c
+4
-3
openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
+3
-3
openair1/PHY/LTE_TRANSPORT/if4_tools.c
openair1/PHY/LTE_TRANSPORT/if4_tools.c
+1
-1
openair1/SCHED/phy_procedures_lte_ue.c
openair1/SCHED/phy_procedures_lte_ue.c
+2
-2
targets/RT/USER/lte-ru.c
targets/RT/USER/lte-ru.c
+1
-1
targets/SIMU/USER/channel_sim.c
targets/SIMU/USER/channel_sim.c
+10
-6
targets/SIMU/USER/oaisim.c
targets/SIMU/USER/oaisim.c
+5
-10
targets/SIMU/USER/oaisim_functions.c
targets/SIMU/USER/oaisim_functions.c
+17
-19
No files found.
openair1/PHY/LTE_TRANSPORT/dci_tools.c
View file @
aa6bc904
...
...
@@ -5027,7 +5027,7 @@ void compute_llr_offset(LTE_DL_FRAME_PARMS *frame_parms,
pdsch_vars
->
llr_offset
[
pdcch_vars
->
num_pdcch_symbols
]
=
0
;
LOG_I
(
PHY
,
"compute_llr_offset: nb RB %d - Qm %d
\n
"
,
nb_rb_alloc
,
dlsch0_harq
->
Qm
);
//
LOG_I(PHY,"compute_llr_offset: nb RB %d - Qm %d \n", nb_rb_alloc, dlsch0_harq->Qm);
//dlsch0_harq->rb_alloc_even;
//dlsch0_harq->rb_alloc_odd;
...
...
@@ -5056,16 +5056,17 @@ void compute_llr_offset(LTE_DL_FRAME_PARMS *frame_parms,
pdsch_vars
->
llr_length
[
symbol
]
=
data_re
;
if
(
symbol
<
(
frame_parms
->
symbols_per_tti
-
1
))
pdsch_vars
->
llr_offset
[
symbol
+
1
]
=
pdsch_vars
->
llr_offset
[
symbol
]
+
llr_offset
;
/*
LOG_I(PHY,"Granted Re subframe %d / symbol %d => %d (%d RBs)\n", subframe, symbol_mod, granted_re,dlsch0_harq->nb_rb);
LOG_I(PHY,"Pbch/PSS/SSS Re subframe %d / symbol %d => %d \n", subframe, symbol_mod, pbch_pss_sss_re);
LOG_I(PHY,"CRS Re Per PRB subframe %d / symbol %d => %d \n", subframe, symbol_mod, crs_re);
LOG_I(PHY,"Data Re subframe %d / symbol %d => %d \n", subframe, symbol_mod, data_re);
LOG_I(PHY,"Data Re subframe %d-symbol %d => llr length %d, llr offset %d \n", subframe, symbol,
pdsch_vars->llr_length[symbol], pdsch_vars->llr_offset[symbol]);
*/
}
}
void
prepare_dl_decoding_format1_1A
(
DCI_format_t
dci_format
,
...
...
openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
View file @
aa6bc904
...
...
@@ -48,7 +48,7 @@ int16_t interf_unaw_shift = 13;
//#define DEBUG_HARQ
#define DEBUG_PHY 1
//
#define DEBUG_PHY 1
//#define DEBUG_DLSCH_DEMOD 1
//#define DISABLE_LOG_X
...
...
@@ -842,7 +842,7 @@ int rx_pdsch(PHY_VARS_UE *ue,
pllr_symbol_cw1
=
(
int8_t
*
)
pdsch_vars
[
eNB_id
]
->
llr
[
1
];
pllr_symbol_cw0
+=
llr_offset_symbol
;
pllr_symbol_cw1
+=
llr_offset_symbol
;
/*
LOG_I(PHY,"compute LLRs [AbsSubframe %d.%d-%d] NbRB %d Qm %d LLRs-Length %d LLR-Offset %d @LLR Buff %p @LLR Buff(symb) %p\n",
frame, subframe,symbol,
nb_rb,dlsch0_harq->Qm,
...
...
@@ -850,7 +850,7 @@ int rx_pdsch(PHY_VARS_UE *ue,
pdsch_vars[eNB_id]->llr_offset[symbol],
(int16_t*)pdsch_vars[eNB_id]->llr[0],
pllr_symbol_cw0);
*/
switch
(
dlsch0_harq
->
Qm
)
{
case
2
:
if
((
rx_type
==
rx_standard
)
||
(
codeword_TB1
==
-
1
))
{
...
...
openair1/PHY/LTE_TRANSPORT/if4_tools.c
View file @
aa6bc904
...
...
@@ -381,7 +381,7 @@ void recv_IF4p5(RU_t *ru, int *frame, int *subframe, uint16_t *packet_type, uint
PRACH_BLOCK_SIZE_BYTES
);
}
LOG_
D
(
PHY
,
"PRACH_IF4p5: CC_id %d : frame %d, subframe %d => %d dB
\n
"
,
ru
->
idx
,
*
frame
,
*
subframe
,
LOG_
I
(
PHY
,
"PRACH_IF4p5: CC_id %d : frame %d, subframe %d => %d dB
\n
"
,
ru
->
idx
,
*
frame
,
*
subframe
,
dB_fixed
(
signal_energy
((
int
*
)
&
prach_rxsigF
[
0
][
0
],
839
)));
for
(
idx
=
0
;
idx
<
ru
->
num_eNB
;
idx
++
)
ru
->
wakeup_prach_eNB
(
ru
->
eNB_list
[
idx
],
ru
,
*
frame
,
*
subframe
);
...
...
openair1/SCHED/phy_procedures_lte_ue.c
View file @
aa6bc904
...
...
@@ -41,7 +41,7 @@
#include <sched.h>
#include "targets/RT/USER/lte-softmodem.h"
#define DEBUG_PHY_PROC
//
#define DEBUG_PHY_PROC
#ifndef PUCCH
#define PUCCH
...
...
@@ -81,7 +81,7 @@ extern uint32_t downlink_frequency[MAX_NUM_CCs][4];
#endif
#define UE_DEBUG_TRACE 1
//
#define UE_DEBUG_TRACE 1
void
dump_dlsch
(
PHY_VARS_UE
*
ue
,
UE_rxtx_proc_t
*
proc
,
uint8_t
eNB_id
,
uint8_t
subframe
,
uint8_t
harq_pid
)
{
...
...
targets/RT/USER/lte-ru.c
View file @
aa6bc904
...
...
@@ -1185,7 +1185,7 @@ static inline int wakeup_prach_ru(RU_t *ru) {
ru
->
eNB_list
[
0
]
->
proc
.
frame_prach
=
ru
->
proc
.
frame_rx
;
ru
->
eNB_list
[
0
]
->
proc
.
subframe_prach
=
ru
->
proc
.
subframe_rx
;
}
LOG_
I
(
PHY
,
"RU %d: waking up PRACH thread
\n
"
,
ru
->
idx
);
LOG_
D
(
PHY
,
"RU %d: waking up PRACH thread
\n
"
,
ru
->
idx
);
// the thread can now be woken up
AssertFatal
(
pthread_cond_signal
(
&
ru
->
proc
.
cond_prach
)
==
0
,
"ERROR pthread_cond_signal for RU prach thread
\n
"
);
}
...
...
targets/SIMU/USER/channel_sim.c
View file @
aa6bc904
...
...
@@ -60,7 +60,11 @@
#include "oaisim.h"
#define RF
//#define DEBUG_SIM
#define DEBUG_SIM
/*
#undef LOG_D
#define LOG_D(A,B,C...) printf(B,C)
*/
int
number_rb_ul
;
int
first_rbUL
;
...
...
@@ -232,7 +236,6 @@ void do_DL_sig(channel_desc_t *RU2UE[NUMBER_OF_RU_MAX][NUMBER_OF_UE_MAX][MAX_NUM
pthread_mutex_lock
(
&
RU_output_mutex
[
UE_id
]);
if
(
RU_output_mask
[
UE_id
]
==
0
)
{
// This is the first eNodeB for this UE, clear the buffer
for
(
aa
=
0
;
aa
<
nb_antennas_rx
;
aa
++
)
{
memset
((
void
*
)
r_re_DL
[
UE_id
][
aa
],
0
,(
RC
.
ru
[
0
]
->
frame_parms
.
samples_per_tti
)
*
sizeof
(
double
));
memset
((
void
*
)
r_im_DL
[
UE_id
][
aa
],
0
,(
RC
.
ru
[
0
]
->
frame_parms
.
samples_per_tti
)
*
sizeof
(
double
));
...
...
@@ -375,7 +378,8 @@ void do_DL_sig(channel_desc_t *RU2UE[NUMBER_OF_RU_MAX][NUMBER_OF_UE_MAX][MAX_NUM
UE_id
,
ru_id
,
10
*
log10
(
rx_pwr
),
subframe
);
#endif
pthread_mutex_lock
(
&
RU_output_mutex
[
UE_id
]);
for
(
i
=
0
;
i
<
frame_parms
->
samples_per_tti
;
i
++
)
{
for
(
aa
=
0
;
aa
<
nb_antennas_rx
;
aa
++
)
{
...
...
@@ -389,14 +393,14 @@ void do_DL_sig(channel_desc_t *RU2UE[NUMBER_OF_RU_MAX][NUMBER_OF_UE_MAX][MAX_NUM
double
*
r_re_p
[
2
]
=
{
r_re_DL
[
ru_id
][
0
],
r_re_DL
[
ru
_id
][
1
]};
double
*
r_im_p
[
2
]
=
{
r_im_DL
[
ru_id
][
0
],
r_im_DL
[
ru
_id
][
1
]};
double
*
r_re_p
[
2
]
=
{
r_re_DL
[
UE_id
][
0
],
r_re_DL
[
UE
_id
][
1
]};
double
*
r_im_p
[
2
]
=
{
r_im_DL
[
UE_id
][
0
],
r_im_DL
[
UE
_id
][
1
]};
#ifdef DEBUG_SIM
rx_pwr
=
signal_energy_fp
(
r_re_p
,
r_im_p
,
nb_antennas_rx
,
length
<
length_meas
?
length
:
length_meas
,
0
)
/
(
12
.
0
*
frame_parms
->
N_RB_DL
);
LOG_D
(
OCM
,
"[SIM][DL] UE %d : ADC in %f dBm/RE for subframe %d
\n
"
,
UE_id
,
10
*
log10
(
rx_pwr
),
subframe
);
#endif
rxdata
=
PHY_vars_UE_g
[
UE_id
][
CC_id
]
->
common_vars
.
rxdata
;
sf_offset
=
(
subframe
*
frame_parms
->
samples_per_tti
)
+
offset
;
...
...
targets/SIMU/USER/oaisim.c
View file @
aa6bc904
...
...
@@ -737,19 +737,16 @@ l2l1_task (void *args_p)
CC_id
=
0
;
int
all_done
=
0
;
while
(
all_done
==
0
)
{
pthread_mutex_lock
(
&
subframe_mutex
);
int
subframe_ru_mask_local
=
subframe_ru_mask
;
int
subframe_UE_mask_local
=
subframe_UE_mask
;
int
subframe_ru_mask_local
=
(
subframe_select
(
&
RC
.
ru
[
0
]
->
frame_parms
,(
sf
+
4
)
%
10
)
!=
SF_UL
)
?
subframe_ru_mask
:
((
1
<<
NB_RU
)
-
1
)
;
int
subframe_UE_mask_local
=
(
subframe_select
(
&
RC
.
ru
[
0
]
->
frame_parms
,(
sf
+
4
)
%
10
)
!=
SF_DL
)
?
subframe_UE_mask
:
((
1
<<
NB_UE_INST
)
-
1
)
;
pthread_mutex_unlock
(
&
subframe_mutex
);
LOG_D
(
EMU
,
"Frame %d, Subframe %d, NB_RU %d, NB_UE %d: Checking masks %x,%x
\n
"
,
frame
,
sf
,
NB_RU
,
NB_UE_INST
,
subframe_ru_mask_local
,
subframe_UE_mask_local
);
if
((
subframe_ru_mask_local
==
((
1
<<
NB_RU
)
-
1
))
&&
(
subframe_UE_mask_local
==
((
1
<<
NB_UE_INST
)
-
1
)))
all_done
=
1
;
else
usleep
(
1500
);
(
subframe_UE_mask_local
==
((
1
<<
NB_UE_INST
)
-
1
)))
all_done
=
1
;
else
usleep
(
1500
);
}
...
...
@@ -816,18 +813,16 @@ l2l1_task (void *args_p)
fwrite (stats_buffer, 1, len, eNB_stats[eNB_inst]);
fflush(eNB_stats[eNB_inst]);
}
*/
#ifdef OPENAIR2
/*
if (eNB_l2_stats) {
len = dump_eNB_l2_stats (stats_buffer, 0);
rewind (eNB_l2_stats);
fwrite (stats_buffer, 1, len, eNB_l2_stats);
fflush(eNB_l2_stats);
}
*/
#endif
*/
#endif
}
}
// eNB_inst loop
...
...
targets/SIMU/USER/oaisim_functions.c
View file @
aa6bc904
...
...
@@ -1087,20 +1087,21 @@ int ru_trx_read(openair0_device *device, openair0_timestamp *ptimestamp, void **
subframe
=
(
last_ru_rx_timestamp
[
ru_id
][
CC_id
]
/
RC
.
ru
[
ru_id
]
->
frame_parms
.
samples_per_tti
)
%
10
;
LOG_D
(
EMU
,
"RU_trx_read generating UL subframe %d (Ts %llu, current TS %llu)
\n
"
,
subframe
,(
unsigned
long
long
)
*
ptimestamp
,
(
unsigned
long
long
)
current_ru_rx_timestamp
[
ru_id
][
CC_id
]);
do_UL_sig
(
UE2RU
,
enb_data
,
ue_data
,
subframe
,
0
,
// abstraction_flag
&
RC
.
ru
[
ru_id
]
->
frame_parms
,
0
,
// frame is only used for abstraction
ru_id
,
CC_id
);
if
(
subframe_select
(
&
RC
.
ru
[
ru_id
]
->
frame_parms
,
subframe
)
!=
SF_DL
)
{
LOG_D
(
EMU
,
"RU_trx_read generating UL subframe %d (Ts %llu, current TS %llu)
\n
"
,
subframe
,(
unsigned
long
long
)
*
ptimestamp
,
(
unsigned
long
long
)
current_ru_rx_timestamp
[
ru_id
][
CC_id
]);
do_UL_sig
(
UE2RU
,
enb_data
,
ue_data
,
subframe
,
0
,
// abstraction_flag
&
RC
.
ru
[
ru_id
]
->
frame_parms
,
0
,
// frame is only used for abstraction
ru_id
,
CC_id
);
}
last_ru_rx_timestamp
[
ru_id
][
CC_id
]
+=
RC
.
ru
[
ru_id
]
->
frame_parms
.
samples_per_tti
;
sample_count
+=
RC
.
ru
[
ru_id
]
->
frame_parms
.
samples_per_tti
;
}
...
...
@@ -1352,9 +1353,6 @@ void init_devices(void){
PHY_vars_UE_g
[
UE_id
][
CC_id
]
->
rfdevice
.
trx_set_freq_func
=
UE_trx_set_freq
;
PHY_vars_UE_g
[
UE_id
][
CC_id
]
->
rfdevice
.
trx_set_gains_func
=
UE_trx_set_gains
;
last_UE_rx_timestamp
[
UE_id
][
CC_id
]
=
0
;
}
}
}
...
...
@@ -1529,11 +1527,11 @@ void update_ocm()
//LOG_D(OMG," extracting position of eNb...\n");
//display_node_list(enb_node_list);
// display_node_list(ue_node_list);
extract_position
(
enb_node_list
,
enb_data
,
RC
.
nb_RU
);
//
extract_position(enb_node_list, enb_data, RC.nb_RU);
//extract_position_fixed_enb(enb_data, NB_eNB_INST,frame);
//LOG_D(OMG," extracting position of UE...\n");
// if (oai_emulation.info.omg_model_ue == TRACE)
extract_position
(
ue_node_list
,
ue_data
,
NB_UE_INST
);
//
extract_position(ue_node_list, ue_data, NB_UE_INST);
/* if (frame % 50 == 0)
LOG_N(OCM,"Path loss for TTI %d : \n", frame);
...
...
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