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
bb0dab22
Commit
bb0dab22
authored
Dec 14, 2020
by
Thomas Schlichter
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
NR UE: decrease number of LOG_I() logging messages
parent
32fc0db9
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
27 additions
and
18 deletions
+27
-18
openair1/PHY/NR_UE_ESTIMATION/nr_adjust_gain.c
openair1/PHY/NR_UE_ESTIMATION/nr_adjust_gain.c
+2
-2
openair1/PHY/NR_UE_ESTIMATION/nr_ue_measurements.c
openair1/PHY/NR_UE_ESTIMATION/nr_ue_measurements.c
+2
-2
openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
+2
-0
openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
+7
-3
openair1/SCHED_NR_UE/harq_nr.c
openair1/SCHED_NR_UE/harq_nr.c
+6
-6
openair1/SCHED_NR_UE/pucch_power_control_ue_nr.c
openair1/SCHED_NR_UE/pucch_power_control_ue_nr.c
+1
-1
openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
+2
-0
openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
+3
-3
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
+2
-1
No files found.
openair1/PHY/NR_UE_ESTIMATION/nr_adjust_gain.c
View file @
bb0dab22
...
...
@@ -27,7 +27,7 @@ void
phy_adjust_gain_nr
(
PHY_VARS_NR_UE
*
ue
,
uint32_t
rx_power_fil_dB
,
uint8_t
eNB_id
)
{
LOG_
I
(
PHY
,
"Gain control: rssi %d (%d,%d)
\n
"
,
LOG_
D
(
PHY
,
"Gain control: rssi %d (%d,%d)
\n
"
,
rx_power_fil_dB
,
ue
->
measurements
.
rssi
,
ue
->
measurements
.
rx_power_avg_dB
[
eNB_id
]
...
...
@@ -61,7 +61,7 @@ phy_adjust_gain_nr (PHY_VARS_NR_UE *ue, uint32_t rx_power_fil_dB, uint8_t eNB_id
ue
->
rx_total_gain_dB
=
MIN_RF_GAIN
;
}
LOG_
I
(
PHY
,
"Gain control: rx_total_gain_dB = %d TARGET_RX_POWER %d (max %d,rxpf %d)
\n
"
,
ue
->
rx_total_gain_dB
,
TARGET_RX_POWER
,
MAX_RF_GAIN
,
rx_power_fil_dB
);
LOG_
D
(
PHY
,
"Gain control: rx_total_gain_dB = %d TARGET_RX_POWER %d (max %d,rxpf %d)
\n
"
,
ue
->
rx_total_gain_dB
,
TARGET_RX_POWER
,
MAX_RF_GAIN
,
rx_power_fil_dB
);
#ifdef DEBUG_PHY
/* if ((ue->frame%100==0) || (ue->frame < 10))
...
...
openair1/PHY/NR_UE_ESTIMATION/nr_ue_measurements.c
View file @
bb0dab22
...
...
@@ -242,7 +242,7 @@ void nr_ue_rsrp_measurements(PHY_VARS_NR_UE *ue,
if
(
eNB_offset
==
0
)
LOG_
I
(
PHY
,
"[UE %d] slot %d RSRP Measurements (idx %d, Cell id %d) => rsrp: %3.1f dBm/RE (%d)
\n
"
,
LOG_
D
(
PHY
,
"[UE %d] slot %d RSRP Measurements (idx %d, Cell id %d) => rsrp: %3.1f dBm/RE (%d)
\n
"
,
ue
->
Mod_id
,
slot
,
eNB_offset
,
(
eNB_offset
>
0
)
?
ue
->
measurements
.
adj_cell_id
[
eNB_offset
-
1
]
:
ue
->
frame_parms
.
Nid_cell
,
...
...
@@ -310,6 +310,6 @@ void nr_ue_rrc_measurements(PHY_VARS_NR_UE *ue,
LOG_D
(
PHY
,
"In %s slot %d NF USRP %d dBm
\n
"
,
__FUNCTION__
,
nf_usrp
);
#endif
LOG_
I
(
PHY
,
"In %s slot %d Noise Level %d ue->measurements.n0_power_tot_dB %d
\n
"
,
__FUNCTION__
,
slot
,
ue
->
measurements
.
n0_power_tot
,
ue
->
measurements
.
n0_power_tot_dB
);
LOG_
D
(
PHY
,
"In %s slot %d Noise Level %d ue->measurements.n0_power_tot_dB %d
\n
"
,
__FUNCTION__
,
slot
,
ue
->
measurements
.
n0_power_tot
,
ue
->
measurements
.
n0_power_tot_dB
);
}
openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
View file @
bb0dab22
...
...
@@ -154,9 +154,11 @@ void nr_pdcch_demapping_deinterleaving(uint32_t *llr,
for
(
int
i
=
0
;
i
<
9
;
i
++
)
{
z
[
index_z
+
i
]
=
llr
[
index_llr
+
i
];
#ifdef NR_PDCCH_DCI_DEBUG
LOG_D
(
PHY
,
"[reg=%d,bundle_j=%d] z[%d]=(%d,%d) <->
\t
[f_reg=%d,fbundle_j=%d] llr[%d]=(%d,%d)
\n
"
,
reg
,
bundle_j
,(
index_z
+
i
),
*
(
int16_t
*
)
&
z
[
index_z
+
i
],
*
(
1
+
(
int16_t
*
)
&
z
[
index_z
+
i
]),
f_reg
,
f_bundle_j
,(
index_llr
+
i
),
*
(
int16_t
*
)
&
llr
[
index_llr
+
i
],
*
(
1
+
(
int16_t
*
)
&
llr
[
index_llr
+
i
]));
#endif
}
if
((
reg
%
reg_bundle_size_L
)
==
0
)
r
++
;
...
...
openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
View file @
bb0dab22
...
...
@@ -61,13 +61,14 @@ int8_t nr_ue_scheduled_response(nr_scheduled_response_t *scheduled_response){
if
(
scheduled_response
->
dl_config
!=
NULL
){
fapi_nr_dl_config_request_t
*
dl_config
=
scheduled_response
->
dl_config
;
LOG_D
(
PHY
,
"Received %d DL pdus
\n
"
,
dl_config
->
number_pdus
);
LOG_D
(
PHY
,
"Received %d DL pdus
:
\n
"
,
dl_config
->
number_pdus
);
pdcch_vars
->
nb_search_space
=
0
;
for
(
i
=
0
;
i
<
dl_config
->
number_pdus
;
++
i
){
if
(
dl_config
->
dl_config_list
[
i
].
pdu_type
==
FAPI_NR_DL_CONFIG_TYPE_DCI
)
{
LOG_D
(
PHY
,
"FAPI_NR_DL_CONFIG_TYPE_DCI
\n
"
);
fapi_nr_dl_config_dci_dl_pdu_rel15_t
*
pdcch_config
=
&
dl_config
->
dl_config_list
[
i
].
dci_config_pdu
.
dci_config_rel15
;
memcpy
((
void
*
)
&
pdcch_vars
->
pdcch_config
[
pdcch_vars
->
nb_search_space
],(
void
*
)
pdcch_config
,
sizeof
(
*
pdcch_config
));
pdcch_vars
->
nb_search_space
=
pdcch_vars
->
nb_search_space
+
1
;
...
...
@@ -76,9 +77,11 @@ int8_t nr_ue_scheduled_response(nr_scheduled_response_t *scheduled_response){
}
else
{
if
(
dl_config
->
dl_config_list
[
i
].
pdu_type
==
FAPI_NR_DL_CONFIG_TYPE_DLSCH
){
LOG_D
(
PHY
,
"FAPI_NR_DL_CONFIG_TYPE_DLSCH
\n
"
);
dlsch0
=
PHY_vars_UE_g
[
module_id
][
cc_id
]
->
dlsch
[
thread_id
][
0
][
0
];
}
else
if
(
dl_config
->
dl_config_list
[
i
].
pdu_type
==
FAPI_NR_DL_CONFIG_TYPE_RA_DLSCH
){
LOG_D
(
PHY
,
"FAPI_NR_DL_CONFIG_TYPE_RA_DLSCH
\n
"
);
dlsch0
=
PHY_vars_UE_g
[
module_id
][
cc_id
]
->
dlsch_ra
[
0
];
}
...
...
@@ -91,6 +94,8 @@ int8_t nr_ue_scheduled_response(nr_scheduled_response_t *scheduled_response){
dlsch0
->
rnti
=
dl_config
->
dl_config_list
[
i
].
dlsch_config_pdu
.
rnti
;
dlsch0_harq
=
dlsch0
->
harq_processes
[
current_harq_pid
];
LOG_D
(
PHY
,
"current_harq_pid = %d
\n
"
,
current_harq_pid
);
if
(
dlsch0_harq
){
dlsch0_harq
->
BWPStart
=
dlsch_config_pdu
->
BWPStart
;
...
...
@@ -118,8 +123,7 @@ int8_t nr_ue_scheduled_response(nr_scheduled_response_t *scheduled_response){
dlsch0_harq
->
nEpreRatioOfPDSCHToPTRS
=
dlsch_config_pdu
->
nEpreRatioOfPDSCHToPTRS
;
dlsch0_harq
->
PTRSReOffset
=
dlsch_config_pdu
->
PTRSReOffset
;
dlsch0_harq
->
pduBitmap
=
dlsch_config_pdu
->
pduBitmap
;
LOG_D
(
MAC
,
">>>>
\t
dlsch0->g_pucch = %d
\t
dlsch0_harq.mcs = %d
\n
"
,
dlsch0
->
g_pucch
,
dlsch0_harq
->
mcs
);
LOG_D
(
MAC
,
">>>>
\t
dlsch0->g_pucch = %d
\t
dlsch0_harq.mcs = %d
\t
pdsch_to_harq_feedback_time_ind = %d
\t
slot_for_feedback_ack = %d
\n
"
,
dlsch0
->
g_pucch
,
dlsch0_harq
->
mcs
,
dlsch_config_pdu
->
pdsch_to_harq_feedback_time_ind
,
dlsch0_harq
->
harq_ack
.
slot_for_feedback_ack
);
}
}
}
...
...
openair1/SCHED_NR_UE/harq_nr.c
View file @
bb0dab22
...
...
@@ -302,7 +302,7 @@ harq_result_t uplink_harq_process(NR_UE_ULSCH_t *ulsch, int harq_pid, int ndi, u
result_harq
=
NEW_TRANSMISSION_HARQ
;
NR_TST_PHY_PRINTF
(
"[HARQ-UL-PUSCH harqId : %d] first new transmission
\n
"
,
harq_pid
);
LOG_D
(
PHY
,
"[HARQ-UL-PUSCH harqId : %d] first new transmission
\n
"
,
harq_pid
);
}
/* 38.321 5.4.2.1 2> if the received grant was not addressed to a Temporary C-RNTI on PDCCH, and the NDI provided in the associated HARQ */
/* information has been toggled compared to the value in the previous transmission of this TB of this HARQ process */
...
...
@@ -313,7 +313,7 @@ harq_result_t uplink_harq_process(NR_UE_ULSCH_t *ulsch, int harq_pid, int ndi, u
result_harq
=
NEW_TRANSMISSION_HARQ
;
NR_TST_PHY_PRINTF
(
"[HARQ-UL-PUSCH harqId : %d] new transmission due to toogle of ndi
\n
"
,
harq_pid
);
LOG_D
(
PHY
,
"[HARQ-UL-PUSCH harqId : %d] new transmission due to toogle of ndi
\n
"
,
harq_pid
);
}
/* 38.321 5.4.2.1 2> else (i.e. retransmission): */
else
{
...
...
@@ -322,7 +322,7 @@ harq_result_t uplink_harq_process(NR_UE_ULSCH_t *ulsch, int harq_pid, int ndi, u
result_harq
=
RETRANSMISSION_HARQ
;
NR_TST_PHY_PRINTF
(
"[HARQ-UL-PUSCH harqId : %d] retransmission
\n
"
,
harq_pid
);
LOG_D
(
PHY
,
"[HARQ-UL-PUSCH harqId : %d] retransmission
\n
"
,
harq_pid
);
}
return
(
result_harq
);
...
...
@@ -476,7 +476,7 @@ harq_result_t downlink_harq_process(NR_DL_UE_HARQ_t *dl_harq, int harq_pid, int
result_harq
=
NEW_TRANSMISSION_HARQ
;
NR_TST_PHY_PRINTF
(
"[HARQ-DL-PDSCH harqId : %d] first new reception
\n
"
,
harq_pid
);
LOG_D
(
PHY
,
"[HARQ-DL-PDSCH harqId : %d] first new reception
\n
"
,
harq_pid
);
}
else
if
(
dl_harq
->
DCINdi
!=
ndi
)
{
dl_harq
->
round
=
0
;
...
...
@@ -485,7 +485,7 @@ harq_result_t downlink_harq_process(NR_DL_UE_HARQ_t *dl_harq, int harq_pid, int
result_harq
=
NEW_TRANSMISSION_HARQ
;
NR_TST_PHY_PRINTF
(
"[HARQ-DL-PDSCH harqId : %d] new reception due to toogle of ndi
\n
"
,
harq_pid
);
LOG_D
(
PHY
,
"[HARQ-DL-PDSCH harqId : %d] new reception due to toogle of ndi
\n
"
,
harq_pid
);
}
else
{
...
...
@@ -495,7 +495,7 @@ harq_result_t downlink_harq_process(NR_DL_UE_HARQ_t *dl_harq, int harq_pid, int
result_harq
=
RETRANSMISSION_HARQ
;
NR_TST_PHY_PRINTF
(
"[HARQ-DL-PDSCH harqId : %d] reception of a retransmission
\n
"
,
harq_pid
);
LOG_D
(
PHY
,
"[HARQ-DL-PDSCH harqId : %d] reception of a retransmission
\n
"
,
harq_pid
);
}
return
(
result_harq
);
...
...
openair1/SCHED_NR_UE/pucch_power_control_ue_nr.c
View file @
bb0dab22
...
...
@@ -98,7 +98,7 @@ int16_t get_pucch_tx_power_ue(PHY_VARS_NR_UE *ue,
}
else
{
G_b_f_c
=
ue
->
dlsch
[
proc
->
thread_id
][
gNB_id
][
0
]
->
g_pucch
;
LOG_
W
(
PHY
,
"PUCCH Transmit power control command not yet implemented for NR : at line %d in function %s of file %s
\n
"
,
LINE_FILE
,
__func__
,
__FILE__
);
LOG_
D
(
PHY
,
"PUCCH Transmit power control command not yet implemented for NR : at line %d in function %s of file %s
\n
"
,
LINE_FILE
,
__func__
,
__FILE__
);
return
(
PUCCH_POWER_DEFAULT
);
}
...
...
openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
View file @
bb0dab22
...
...
@@ -248,6 +248,8 @@ bool pucch_procedures_ue_nr(PHY_VARS_NR_UE *ue, uint8_t gNB_id, UE_nr_rxtx_proc_
pucch_resource_indicator
=
ue
->
dlsch
[
proc
->
thread_id
][
gNB_id
][
0
]
->
harq_processes
[
dl_harq_pid
]
->
harq_ack
.
pucch_resource_indicator
;
}
LOG_D
(
PHY
,
"PUCCH: %d.%d dl_harq_pid = %d, pucch_resource_indicator = %d
\n
"
,
frame_tx
,
nr_slot_tx
,
dl_harq_pid
,
pucch_resource_indicator
);
/* Part - I
* Collect feedback that should be transmitted at this nr_slot_tx :
* - ACK/NACK, SR, CSI (CQI, RI, ...)
...
...
openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
View file @
bb0dab22
...
...
@@ -171,8 +171,8 @@ void config_dci_pdu(NR_UE_MAC_INST_t *mac, fapi_nr_dl_config_dci_dl_pdu_rel15_t
rel15
->
BWPSize
,
rel15
->
BWPStart
,
rel15
->
SubcarrierSpacing
,
rel15
->
dci_format
,
rel15
->
dci_length
,
rel15
->
dci_format
_options
[
0
]
,
rel15
->
dci_length
_options
[
0
]
,
sps
,
monitoringSymbolsWithinSlot
);
#endif
...
...
@@ -213,9 +213,9 @@ void ue_dci_configuration(NR_UE_MAC_INST_t *mac, fapi_nr_dl_config_request_t *dl
// check available SS IDs
if
(
pdcch_ConfigCommon
->
choice
.
setup
->
ra_SearchSpace
){
if
(
ss
->
searchSpaceId
==
*
pdcch_ConfigCommon
->
choice
.
setup
->
ra_SearchSpace
){
LOG_D
(
MAC
,
"[DCI_CONFIG] Configure monitoring of PDCCH candidates in Type1-PDCCH common random access search space
\n
"
);
switch
(
mac
->
ra_state
){
case
WAIT_RAR
:
LOG_D
(
MAC
,
"[DCI_CONFIG] Configure monitoring of PDCCH candidates in Type1-PDCCH common random access search space
\n
"
);
rel15
->
num_dci_options
=
1
;
rel15
->
dci_format_options
[
0
]
=
NR_DL_DCI_FORMAT_1_0
;
config_dci_pdu
(
mac
,
rel15
,
dl_config
,
NR_RNTI_RA
,
ss_id
);
...
...
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
View file @
bb0dab22
...
...
@@ -1066,7 +1066,7 @@ int8_t nr_ue_decode_mib(module_id_t module_id,
num_rbs
=
table_38213_13_4_c2
[
index_4msb
];
num_symbols
=
table_38213_13_4_c3
[
index_4msb
];
rb_offset
=
table_38213_13_4_c4
[
index_4msb
];
LOG_
I
(
MAC
,
"<<<<<<<<<index_4msb %d num_rbs %d num_symb %d rb_offset %d
\n
"
,
index_4msb
,
num_rbs
,
num_symbols
,
rb_offset
);
LOG_
D
(
MAC
,
"<<<<<<<<<index_4msb %d num_rbs %d num_symb %d rb_offset %d
\n
"
,
index_4msb
,
num_rbs
,
num_symbols
,
rb_offset
);
}
else
if
(
min_channel_bw
&
bw_40MHz
){
AssertFatal
(
index_4msb
<
10
,
"38.213 Table 13-6 4 MSB out of range
\n
"
);
mac
->
type0_pdcch_ss_mux_pattern
=
1
;
...
...
@@ -1426,6 +1426,7 @@ NR_UE_L2_STATE_t nr_ue_scheduler(nr_downlink_indication_t *dl_info, nr_uplink_in
// check type0 from 38.213 13 if we have no CellGroupConfig
// TODO: implementation to be completed
if
(
mac
->
scg
==
NULL
)
{
if
(
dl_info
->
ssb_index
!=
-
1
){
if
(
mac
->
type0_pdcch_ss_mux_pattern
==
1
){
...
...
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