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
lizhongxiao
OpenXG-RAN
Commits
18853ab6
Commit
18853ab6
authored
Oct 12, 2023
by
Raymond Knopp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
supression of logs
parent
9cc94863
Changes
11
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
33 additions
and
33 deletions
+33
-33
openair1/PHY/NR_TRANSPORT/nr_dci.c
openair1/PHY/NR_TRANSPORT/nr_dci.c
+2
-2
openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
+3
-3
openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
+7
-7
openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
+1
-1
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures_sl.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures_sl.c
+3
-3
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
+1
-1
openair2/LAYER2/NR_MAC_UE/nr_ue_sci_slsch.c
openair2/LAYER2/NR_MAC_UE/nr_ue_sci_slsch.c
+2
-2
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
+4
-4
openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
+2
-2
openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
+5
-5
openair2/SDAP/nr_sdap/nr_sdap_entity.c
openair2/SDAP/nr_sdap/nr_sdap_entity.c
+3
-3
No files found.
openair1/PHY/NR_TRANSPORT/nr_dci.c
View file @
18853ab6
...
...
@@ -121,7 +121,7 @@ uint32_t nr_generate_dci(PHY_VARS_gNB *gNB, PHY_VARS_NR_UE *ue,
uint32_t
dmrs_length
=
(
n_rb
+
pdcch_pdu_rel15
->
BWPStart
)
*
6
;
//2(QPSK)*3(per RB)*6(REG per CCE)
uint32_t
encoded_length
=
gNB
?
dci_pdu
->
AggregationLevel
*
108
:
dci_pdu
->
AggregationLevel
*
18
;
//2(QPSK)*9(per RB)*6(REG per CCE)
if
(
dci_pdu
->
RNTI
!=
0xFFFF
)
LOG_
I
(
PHY
,
"DL_DCI : rb_offset %d, nb_rb %d, DMRS length per symbol %d
\t
DCI encoded length %d (precoder_granularity %d, reg_mapping %d), Scrambling_Id %d, ScramblingRNTI %x, PayloadSizeBits %d
\n
"
,
LOG_
D
(
PHY
,
"DL_DCI : rb_offset %d, nb_rb %d, DMRS length per symbol %d
\t
DCI encoded length %d (precoder_granularity %d, reg_mapping %d), Scrambling_Id %d, ScramblingRNTI %x, PayloadSizeBits %d
\n
"
,
rb_offset
,
n_rb
,
dmrs_length
,
encoded_length
,
pdcch_pdu_rel15
->
precoderGranularity
,
pdcch_pdu_rel15
->
CceRegMappingType
,
dci_pdu
->
ScramblingId
,
dci_pdu
->
ScramblingRNTI
,
dci_pdu
->
PayloadSizeBits
);
dmrs_length
+=
rb_offset
*
6
;
// To accommodate more DMRS symbols in case of rb offset
...
...
@@ -250,7 +250,7 @@ uint32_t nr_generate_dci(PHY_VARS_gNB *gNB, PHY_VARS_NR_UE *ue,
}
// reg_count
}
// symbol_idx
LOG_
I
(
NR_PHY
,
LOG_
D
(
NR_PHY
,
"DCI: payloadSize = %d | payload = %llx
\n
"
,
dci_pdu
->
PayloadSizeBits
,
*
(
unsigned
long
long
*
)
dci_pdu
->
Payload
);
...
...
openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
View file @
18853ab6
...
...
@@ -50,7 +50,7 @@
#include <syscall.h>
#include "executables/nr-uesoftmodem.h"
#define DEBUG_ULSCH_DECODING
//
#define DEBUG_ULSCH_DECODING
//#define gNB_DEBUG_TRACE
#define OAI_UL_LDPC_MAX_NUM_LLR 27000//26112 // NR_LDPC_NCOL_BG1*NR_LDPC_ZMAX = 68*384
...
...
@@ -310,7 +310,7 @@ int nr_ulsch_decoding(PHY_VARS_gNB *phy_vars_gNB,
// target_code_rate is in 0.1 units
float
Coderate
=
(
float
)
pusch_pdu
->
target_code_rate
/
10240
.
0
f
;
LOG_
I
(
PHY
,
"ULSCH Decoding, harq_pid %d rnti %x TBS %d G %d mcs %d Nl %d nb_rb %d, Qm %d, Coderate %f RV %d round %d new RX %d
\n
"
,
LOG_
D
(
PHY
,
"ULSCH Decoding, harq_pid %d rnti %x TBS %d G %d mcs %d Nl %d nb_rb %d, Qm %d, Coderate %f RV %d round %d new RX %d
\n
"
,
harq_pid
,
ulsch
->
rnti
,
A
,
G
,
mcs
,
n_layers
,
nb_rb
,
Qm
,
Coderate
,
pusch_pdu
->
pusch_data
.
rv_index
,
harq_process
->
round
,
harq_process
->
harq_to_be_cleared
);
t_nrLDPC_dec_params
decParams
=
{
0
};
decParams
.
BG
=
pusch_pdu
->
maintenance_parms_v3
.
ldpcBaseGraph
;
...
...
@@ -531,7 +531,7 @@ int nr_ulsch_decoding(PHY_VARS_gNB *phy_vars_gNB,
rdata
->
ulsch_id
=
ULSCH_id
;
rdata
->
tbslbrm
=
pusch_pdu
->
maintenance_parms_v3
.
tbSizeLbrmBytes
;
pushTpool
(
phy_vars_gNB
?
&
phy_vars_gNB
->
threadPool
:
&
get_nrUE_params
()
->
Tpool
,
req
);
LOG_
I
(
PHY
,
"Added a block to decode, in pipe: %d
\n
"
,
r
);
LOG_
D
(
PHY
,
"Added a block to decode, in pipe: %d
\n
"
,
r
);
r_offset
+=
E
;
offset
+=
(
Kr_bytes
-
(
harq_process
->
F
>>
3
)
-
((
harq_process
->
C
>
1
)
?
3
:
0
));
//////////////////////////////////////////////////////////////////////////////////////////
...
...
openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
View file @
18853ab6
...
...
@@ -2221,17 +2221,17 @@ void nr_rx_pusch(PHY_VARS_gNB *gNB,
}
if
(
ml_rx
==
false
||
nrOfLayers
==
1
)
{
if
(
pssch_pdu
&&
sci2_left
>
0
){
LOG_
I
(
NR_PHY
,
"valid_re_per_slot[%d] %d
\n
"
,
symbol
,
pusch_vars
->
ul_valid_re_per_slot
[
symbol
]);
LOG_
D
(
NR_PHY
,
"valid_re_per_slot[%d] %d
\n
"
,
symbol
,
pusch_vars
->
ul_valid_re_per_slot
[
symbol
]);
int
available_sci2_res_in_symb
=
pusch_vars
->
ul_valid_re_per_slot
[
symbol
];
int
slsch_res_in_symbol
;
LOG_
I
(
NR_PHY
,
"available_sci2_res_in_symb[%d] %d (sci1_re %d)
\n
"
,
symbol
,
available_sci2_res_in_symb
,
sci1_re_per_symb
);
LOG_
D
(
NR_PHY
,
"available_sci2_res_in_symb[%d] %d (sci1_re %d)
\n
"
,
symbol
,
available_sci2_res_in_symb
,
sci1_re_per_symb
);
int
sci2_cnt_prev
=
sci2_cnt
;
if
(
available_sci2_res_in_symb
<
sci2_left
)
{
sci2_cnt
+=
available_sci2_res_in_symb
;
// take all of the PSSCH REs for SCI2
memcpy
(
&
sci2_llrs
[
2
*
sci2_cnt_prev
],
&
pusch_vars
->
rxdataF_comp
[
0
][(
symbol
*
(
off
+
rb_size
*
NR_NB_SC_PER_RB
))
+
sci1_offset
],
available_sci2_res_in_symb
*
sizeof
(
int32_t
));
sci2_left
-=
available_sci2_res_in_symb
;
LOG_
I
(
NR_PHY
,
"SCI2 taking all available REs. sci2_left %d
\n
"
,
sci2_left
);
LOG_
D
(
NR_PHY
,
"SCI2 taking all available REs. sci2_left %d
\n
"
,
sci2_left
);
pusch_vars
->
ul_valid_re_per_slot
[
symbol
]
=
0
;
sci2_cnt_thissymb
=
available_sci2_res_in_symb
;
}
...
...
@@ -2239,7 +2239,7 @@ void nr_rx_pusch(PHY_VARS_gNB *gNB,
memcpy
(
&
sci2_llrs
[
2
*
sci2_cnt_prev
],
&
pusch_vars
->
rxdataF_comp
[
0
][(
symbol
*
(
off
+
rb_size
*
NR_NB_SC_PER_RB
))
+
sci1_re_per_symb
],
sci2_left
*
sizeof
(
int32_t
));
slsch_res_in_symbol
=
available_sci2_res_in_symb
-
sci2_left
;
LOG_
I
(
NR_PHY
,
"SCI2 taking %d REs, SLSCH taking %d
\n
"
,
sci2_left
,
slsch_res_in_symbol
);
LOG_
D
(
NR_PHY
,
"SCI2 taking %d REs, SLSCH taking %d
\n
"
,
sci2_left
,
slsch_res_in_symbol
);
pusch_vars
->
ul_valid_re_per_slot
[
symbol
]
=
slsch_res_in_symbol
;
sci2_cnt_thissymb
=
sci2_left
;
sci2_left
=
0
;
...
...
@@ -2258,7 +2258,7 @@ void nr_rx_pusch(PHY_VARS_gNB *gNB,
pssch_pdu
->
sci2_len
,
sci2_re
);
// send SCI indication with SCI2 payload and get SLSCH information if CRC is OK
LOG_
I
(
NR_PHY
,
"SCI indication (crc %x)
\n
"
,
crc
);
LOG_
D
(
NR_PHY
,
"SCI indication (crc %x)
\n
"
,
crc
);
sl_nr_sci_indication_t
sci_ind
=
{
0
};
sci_ind
.
sfn
=
frame
;
sci_ind
.
slot
=
slot
;
...
...
@@ -2275,11 +2275,11 @@ void nr_rx_pusch(PHY_VARS_gNB *gNB,
nr_sidelink_indication_t
sl_indication
;
nr_fill_sl_indication
(
&
sl_indication
,
NULL
,
&
sci_ind
,
proc
,
ue
,
phy_data
);
ue
->
if_inst
->
sl_indication
(
&
sl_indication
);
LOG_
I
(
NR_PHY
,
"Returning from SCI2 SL indication
\n
"
);
LOG_
D
(
NR_PHY
,
"Returning from SCI2 SL indication
\n
"
);
//
}
}
// (not ML || nrOfLayers==1 ) AND pssch and sci2 REs to handle
if
(
pssch_pdu
)
LOG_
I
(
NR_PHY
,
"symbol %d: PSSCH REs %d (sci1 %d,sci2 %d)
\n
"
,
symbol
,
pusch_vars
->
ul_valid_re_per_slot
[
symbol
],
sci1_offset
,
sci2_cnt_thissymb
);
if
(
pssch_pdu
)
LOG_
D
(
NR_PHY
,
"symbol %d: PSSCH REs %d (sci1 %d,sci2 %d)
\n
"
,
symbol
,
pusch_vars
->
ul_valid_re_per_slot
[
symbol
],
sci1_offset
,
sci2_cnt_thissymb
);
for
(
aatx
=
0
;
aatx
<
nrOfLayers
;
aatx
++
)
{
nr_ulsch_compute_llr
(
&
pusch_vars
->
rxdataF_comp
[
aatx
*
frame_parms
->
nb_antennas_rx
][
symbol
*
(
off
+
rb_size
*
NR_NB_SC_PER_RB
)
+
sci1_offset
+
sci2_cnt_thissymb
],
pusch_vars
->
ul_ch_mag0
[
aatx
*
frame_parms
->
nb_antennas_rx
],
...
...
openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
View file @
18853ab6
...
...
@@ -723,7 +723,7 @@ int32_t nr_rx_pdcch(PHY_VARS_NR_UE *ue,
rel15
->
BWPStart
);
if
(
pscch_flag
==
1
&&
dB_fixed
(
signal_energy_nodc
(
&
pdcch_dl_ch_estimates_ext
[
0
][
s
*
n_rb
*
NBR_RE_PER_RB_WITH_DMRS
],
n_rb
*
NBR_RE_PER_RB_WITH_DMRS
))
>
30
)
LOG_
I
(
NR_PHY
,
"PSCCH: %d.%d rx level0_%d %d ch_level0_%d %d
\n
"
,
proc
->
frame_rx
,
proc
->
nr_slot_rx
,
s
,
dB_fixed
(
signal_energy_nodc
(
&
rxdataF_ext
[
0
][
s
*
n_rb
*
NBR_RE_PER_RB_WITH_DMRS
],
n_rb
*
NBR_RE_PER_RB_WITH_DMRS
)),
s
,
dB_fixed
(
signal_energy_nodc
(
&
pdcch_dl_ch_estimates_ext
[
0
][
s
*
n_rb
*
NBR_RE_PER_RB_WITH_DMRS
],
n_rb
*
NBR_RE_PER_RB_WITH_DMRS
)));
LOG_
D
(
NR_PHY
,
"PSCCH: %d.%d rx level0_%d %d ch_level0_%d %d
\n
"
,
proc
->
frame_rx
,
proc
->
nr_slot_rx
,
s
,
dB_fixed
(
signal_energy_nodc
(
&
rxdataF_ext
[
0
][
s
*
n_rb
*
NBR_RE_PER_RB_WITH_DMRS
],
n_rb
*
NBR_RE_PER_RB_WITH_DMRS
)),
s
,
dB_fixed
(
signal_energy_nodc
(
&
pdcch_dl_ch_estimates_ext
[
0
][
s
*
n_rb
*
NBR_RE_PER_RB_WITH_DMRS
],
n_rb
*
NBR_RE_PER_RB_WITH_DMRS
)));
LOG_D
(
PHY
,
"we enter nr_pdcch_channel_level(avgP=%d) => compute channel level based on ofdm symbol 0, pdcch_vars[eNB_id]->dl_ch_estimates_ext
\n
"
,
*
avgP
);
LOG_D
(
PHY
,
"in nr_pdcch_channel_level(dl_ch_estimates_ext -> dl_ch_estimates_ext)
\n
"
);
// compute channel level based on ofdm symbol 0
...
...
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures_sl.c
View file @
18853ab6
...
...
@@ -567,7 +567,7 @@ uint32_t sl_determine_num_sidelink_slots(uint8_t mod_id, uint16_t *N_SSB_16frame
//Determine total number of Valid Sidelink slots which can be used for Respool in a SFN cycle (1024 frames)
N_SL_SLOTS
=
(
*
N_SL_SLOTS_perframe
*
SL_FRAME_NUMBER_CYCLE
)
-
N_SSB_1024frames
;
LOG_
I
(
MAC
,
"[UE%d]SL-MAC:SSB slots in 1024 frames:%d, N_SL_SLOTS_perframe:%d, N_SL_SLOTs in 1024 frames:%d, SL SLOT bitmap:%x
\n
"
,
LOG_
D
(
MAC
,
"[UE%d]SL-MAC:SSB slots in 1024 frames:%d, N_SL_SLOTS_perframe:%d, N_SL_SLOTs in 1024 frames:%d, SL SLOT bitmap:%x
\n
"
,
mod_id
,
N_SSB_1024frames
,
*
N_SL_SLOTS_perframe
,
N_SL_SLOTS
,
sl_mac
->
sl_slot_bitmap
);
...
...
@@ -590,7 +590,7 @@ void nr_ue_process_mac_sl_pdu(int module_idP,
return
;
}
LOG_
I
(
NR_MAC
,
"In %s : processing PDU %d (with length %d) of %d total number of PDUs...
\n
"
,
__FUNCTION__
,
pdu_id
,
pdu_len
,
rx_ind
->
number_pdus
);
LOG_
D
(
NR_MAC
,
"In %s : processing PDU %d (with length %d) of %d total number of PDUs...
\n
"
,
__FUNCTION__
,
pdu_id
,
pdu_len
,
rx_ind
->
number_pdus
);
while
(
!
done
&&
pdu_len
>
0
){
uint16_t
mac_len
=
0x0000
;
...
...
@@ -604,7 +604,7 @@ void nr_ue_process_mac_sl_pdu(int module_idP,
case
SL_SCH_LCID_4_19
:
if
(
!
get_mac_len
(
pduP
,
pdu_len
,
&
mac_len
,
&
mac_subheader_len
))
return
;
LOG_
I
(
NR_MAC
,
"%4d.%2d : SLSCH -> LCID %d %d bytes
\n
"
,
frame
,
slot
,
rx_lcid
,
mac_len
);
LOG_
D
(
NR_MAC
,
"%4d.%2d : SLSCH -> LCID %d %d bytes
\n
"
,
frame
,
slot
,
rx_lcid
,
mac_len
);
mac_rlc_data_ind
(
module_idP
,
mac
->
src_id
,
...
...
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
View file @
18853ab6
...
...
@@ -3340,7 +3340,7 @@ bool nr_ue_sl_pssch_scheduler(NR_UE_MAC_INST_t *mac,
if
(
sdu_length
>
0
)
{
LOG_
I
(
NR_MAC
,
"In %s: [UE %d] [%d.%d] SL-DXCH -> SLSCH, Generating SL MAC sub-PDU for SDU %d, length %d bytes, RB with LCID 0x%02x (buflen (TBS) %d bytes)
\n
"
,
LOG_
D
(
NR_MAC
,
"In %s: [UE %d] [%d.%d] SL-DXCH -> SLSCH, Generating SL MAC sub-PDU for SDU %d, length %d bytes, RB with LCID 0x%02x (buflen (TBS) %d bytes)
\n
"
,
__FUNCTION__
,
0
,
frame
,
...
...
openair2/LAYER2/NR_MAC_UE/nr_ue_sci_slsch.c
View file @
18853ab6
...
...
@@ -282,7 +282,7 @@ void fill_pssch_pscch_pdu(sl_nr_tx_config_pscch_pssch_pdu_t *nr_sl_pssch_pscch_p
*
sci_payload
|=
(((
uint64_t
)
sci_pdu
->
resource_reservation_period
.
val
>>
(
fsize
-
i
-
1
))
&
1
)
<<
(
sci_size
-
pos
++
-
1
);
// DMRS pattern
fsize
=
sci_pdu
->
dmrs_pattern
.
nbits
;
LOG_
I
(
NR_MAC
,
"SCI1A: dmrs_pattern (%d,%d) in position %d
\n
"
,
sci_pdu
->
dmrs_pattern
.
val
,
fsize
,
pos
);
LOG_
D
(
NR_MAC
,
"SCI1A: dmrs_pattern (%d,%d) in position %d
\n
"
,
sci_pdu
->
dmrs_pattern
.
val
,
fsize
,
pos
);
for
(
int
i
=
0
;
i
<
fsize
;
i
++
)
*
sci_payload
|=
(((
uint64_t
)
sci_pdu
->
dmrs_pattern
.
val
>>
(
fsize
-
i
-
1
))
&
1
)
<<
(
sci_size
-
pos
++
-
1
);
// second_stage_sci_format // 2 bits - Table 8.3.1.1-1
...
...
@@ -355,7 +355,7 @@ void fill_pssch_pscch_pdu(sl_nr_tx_config_pscch_pssch_pdu_t *nr_sl_pssch_pscch_p
N_RE
,
1
+
(
sci_pdu
->
number_of_dmrs_port
&
1
))
>>
3
;
nr_sl_pssch_pscch_pdu
->
mcs
=
sci_pdu
->
mcs
;
nr_sl_pssch_pscch_pdu
->
num_layers
=
sci_pdu
->
number_of_dmrs_port
+
1
;
LOG_
I
(
NR_MAC
,
"PSSCH: mcs %d, coderate %d, Nl %d => tbs %d
\n
"
,
sci_pdu
->
mcs
,
nr_sl_pssch_pscch_pdu
->
target_coderate
,
nr_sl_pssch_pscch_pdu
->
num_layers
,
nr_sl_pssch_pscch_pdu
->
tb_size
);
LOG_
D
(
NR_MAC
,
"PSSCH: mcs %d, coderate %d, Nl %d => tbs %d
\n
"
,
sci_pdu
->
mcs
,
nr_sl_pssch_pscch_pdu
->
target_coderate
,
nr_sl_pssch_pscch_pdu
->
num_layers
,
nr_sl_pssch_pscch_pdu
->
tb_size
);
nr_sl_pssch_pscch_pdu
->
tbslbrm
=
nr_compute_tbslbrm
(
mcs_tb_ind
,
NRRIV2BW
(
sl_bwp
->
sl_BWP_Generic_r16
->
sl_BWP_r16
->
locationAndBandwidth
,
273
),
nr_sl_pssch_pscch_pdu
->
num_layers
);
nr_sl_pssch_pscch_pdu
->
mcs_table
=
mcs_tb_ind
;
nr_sl_pssch_pscch_pdu
->
rv_index
=
sci2_pdu
->
rv_index
;
...
...
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
View file @
18853ab6
...
...
@@ -470,7 +470,7 @@ static void *ue_tun_read_thread(void *_)
exit
(
1
);
}
LOG_
I
(
PDCP
,
"%s(): nas_sock_fd read returns len %d
\n
"
,
__func__
,
len
);
LOG_
D
(
PDCP
,
"%s(): nas_sock_fd read returns len %d
\n
"
,
__func__
,
len
);
nr_pdcp_manager_lock
(
nr_pdcp_ue_manager
);
has_ue
=
nr_pdcp_get_first_ue_id
(
nr_pdcp_ue_manager
,
&
rntiMaybeUEid
);
...
...
@@ -635,7 +635,7 @@ static void deliver_sdu_drb(void *_ue, nr_pdcp_entity_t *entity,
int
i
;
if
(
IS_SOFTMODEM_NOS1
||
UE_NAS_USE_TUN
)
{
LOG_
I
(
PDCP
,
"IP packet received with size %d, to be sent to SDAP interface, UE ID/RNTI: %ld
\n
"
,
size
,
ue
->
rntiMaybeUEid
);
LOG_
D
(
PDCP
,
"IP packet received with size %d, to be sent to SDAP interface, UE ID/RNTI: %ld
\n
"
,
size
,
ue
->
rntiMaybeUEid
);
sdap_data_ind
(
entity
->
rb_id
,
entity
->
is_gnb
,
entity
->
has_sdap_rx
,
entity
->
pdusession_id
,
ue
->
rntiMaybeUEid
,
buf
,
size
);
}
else
{
...
...
@@ -685,7 +685,7 @@ static void deliver_pdu_drb(void *deliver_pdu_data, ue_id_t ue_id, int rb_id,
}
else
{
mem_block_t
*
memblock
=
get_free_mem_block
(
size
,
__FUNCTION__
);
memcpy
(
memblock
->
data
,
buf
,
size
);
LOG_
I
(
PDCP
,
"%s(): (drb %d) calling rlc_data_req size %d
\n
"
,
__func__
,
rb_id
,
size
);
LOG_
D
(
PDCP
,
"%s(): (drb %d) calling rlc_data_req size %d
\n
"
,
__func__
,
rb_id
,
size
);
//for (i = 0; i < size; i++) printf(" %2.2x", (unsigned char)memblock->data[i]);
//printf("\n");
enqueue_rlc_data_req
(
&
ctxt
,
0
,
MBMS_FLAG_NO
,
rb_id
,
sdu_id
,
0
,
size
,
memblock
);
...
...
@@ -1130,7 +1130,7 @@ bool nr_pdcp_data_req_drb(protocol_ctxt_t *ctxt_pP,
{
DevAssert
(
srb_flagP
==
SRB_FLAG_NO
);
LOG_
I
(
PDCP
,
"%s() called, size %d
\n
"
,
__func__
,
sdu_buffer_size
);
LOG_
D
(
PDCP
,
"%s() called, size %d
\n
"
,
__func__
,
sdu_buffer_size
);
nr_pdcp_ue_t
*
ue
;
nr_pdcp_entity_t
*
rb
;
ue_id_t
ue_id
=
ctxt_pP
->
rntiMaybeUEid
;
...
...
openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
View file @
18853ab6
...
...
@@ -287,7 +287,7 @@ rlc_op_status_t rlc_data_req (const protocol_ctxt_t *const ctxt_pP,
nr_rlc_ue_t
*
ue
;
nr_rlc_entity_t
*
rb
;
LOG_
I
(
RLC
,
"%s rnti %d srb_flag %d rb_id %ld mui %d confirm %d sdu_size %d MBMS_flag %d
\n
"
,
LOG_
D
(
RLC
,
"%s rnti %d srb_flag %d rb_id %ld mui %d confirm %d sdu_size %d MBMS_flag %d
\n
"
,
__FUNCTION__
,
rnti
,
srb_flagP
,
rb_idP
,
muiP
,
confirmP
,
sdu_sizeP
,
MBMS_flagP
);
...
...
@@ -483,7 +483,7 @@ rb_found:
exit
(
1
);
}
memcpy
(
memblock
->
data
,
buf
,
size
);
LOG_
I
(
PDCP
,
"Calling PDCP layer from RLC in %s
\n
"
,
__FUNCTION__
);
LOG_
D
(
PDCP
,
"Calling PDCP layer from RLC in %s
\n
"
,
__FUNCTION__
);
if
(
!
pdcp_data_ind
(
&
ctx
,
is_srb
,
0
,
rb_id
,
size
,
memblock
,
NULL
,
NULL
))
{
LOG_E
(
RLC
,
"%s:%d:%s: ERROR: pdcp_data_ind failed
\n
"
,
__FILE__
,
__LINE__
,
__FUNCTION__
);
/* what to do in case of failure? for the moment: nothing */
...
...
openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
View file @
18853ab6
...
...
@@ -1430,7 +1430,7 @@ static void handle_sl_bch(module_id_t module_id,uint8_t *const sl_mib,
uint16_t
frame
=
frame_1
|
frame_0
;
uint8_t
slot
=
((
sl_mib
[
2
]
&
0x01
)
<<
6
)
|
((
sl_mib
[
3
]
&
0xFC
)
>>
2
);
LOG_
I
(
NR_MAC
,
"%s[UE%d]In %d:%d Received SL-MIB:%x .Contents- SL-TDD config:%x, Incov:%d, FN:%d, Slot:%d
\n
"
,
KRED
,
LOG_
D
(
NR_MAC
,
"%s[UE%d]In %d:%d Received SL-MIB:%x .Contents- SL-TDD config:%x, Incov:%d, FN:%d, Slot:%d
\n
"
,
KRED
,
module_id
,
frame_rx
,
slot_rx
,
*
((
uint32_t
*
)
sl_mib
),
*
((
uint16_t
*
)
sl_tdd_config
),
incov
,
frame
,
slot
);
...
...
@@ -1483,7 +1483,7 @@ void sl_nr_process_rx_ind(uint16_t mod_id,
case
SL_NR_RX_PDU_TYPE_SSB
:
if
(
rx_ind
->
rx_indication_body
[
num_pdus
-
1
].
ssb_pdu
.
decode_status
)
{
LOG_
I
(
NR_MAC
,
"%s[UE%d]SL-MAC Received SL-SSB: RSRP:%d dBm/RE, rx_psbch_payload:%x, rx_slss_id:%d
\n
"
,
KRED
,
LOG_
D
(
NR_MAC
,
"%s[UE%d]SL-MAC Received SL-SSB: RSRP:%d dBm/RE, rx_psbch_payload:%x, rx_slss_id:%d
\n
"
,
KRED
,
mod_id
,
rx_ind
->
rx_indication_body
[
num_pdus
-
1
].
ssb_pdu
.
rsrp_dbm
,
*
((
uint32_t
*
)
rx_ind
->
rx_indication_body
[
num_pdus
-
1
].
ssb_pdu
.
psbch_payload
),
rx_ind
->
rx_indication_body
[
num_pdus
-
1
].
ssb_pdu
.
rx_slss_id
);
...
...
@@ -1498,7 +1498,7 @@ void sl_nr_process_rx_ind(uint16_t mod_id,
break
;
case
SL_NR_RX_PDU_TYPE_SLSCH
:
LOG_
I
(
NR_MAC
,
"%s[UE%d]SL-MAC Received SLSCH: rx_slsch_pdu:%p, rx_slsch_len %d, ack_nack %d, harq_pid %d
\n
"
,
KGRN
,
LOG_
D
(
NR_MAC
,
"%s[UE%d]SL-MAC Received SLSCH: rx_slsch_pdu:%p, rx_slsch_len %d, ack_nack %d, harq_pid %d
\n
"
,
KGRN
,
mod_id
,
rx_ind
->
rx_indication_body
[
num_pdus
-
1
].
rx_slsch_pdu
.
pdu
,
rx_ind
->
rx_indication_body
[
num_pdus
-
1
].
rx_slsch_pdu
.
pdu_length
,
rx_ind
->
rx_indication_body
[
num_pdus
-
1
].
rx_slsch_pdu
.
ack_nack
,
...
...
@@ -1524,11 +1524,11 @@ void sl_nr_process_sci_ind(uint16_t module_id, uint32_t frame, uint32_t slot, sl
switch
(
sci_ind
->
sci_pdu
[
idx
].
sci_format_type
)
{
case
SL_SCI_FORMAT_1A_ON_PSCCH
:
LOG_
I
(
NR_MAC
,
"%s%d.%d Received PSCCH PDU %d/%d PSCCH RSRP %d, length %d, sub-channel index %d, Nid %x, payload %llx
\n
"
,
KBLU
,
sci_ind
->
sfn
,
sci_ind
->
slot
,
1
+
idx
,
num_SCIs
,
sci_ind
->
sci_pdu
[
idx
].
pscch_rsrp
,
sci_ind
->
sci_pdu
[
idx
].
sci_payloadlen
,
sci_ind
->
sci_pdu
[
idx
].
subch_index
,
sci_ind
->
sci_pdu
[
idx
].
Nid
,
*
(
unsigned
long
long
*
)
sci_ind
->
sci_pdu
[
idx
].
sci_payloadBits
);
LOG_
D
(
NR_MAC
,
"%s%d.%d Received PSCCH PDU %d/%d PSCCH RSRP %d, length %d, sub-channel index %d, Nid %x, payload %llx
\n
"
,
KBLU
,
sci_ind
->
sfn
,
sci_ind
->
slot
,
1
+
idx
,
num_SCIs
,
sci_ind
->
sci_pdu
[
idx
].
pscch_rsrp
,
sci_ind
->
sci_pdu
[
idx
].
sci_payloadlen
,
sci_ind
->
sci_pdu
[
idx
].
subch_index
,
sci_ind
->
sci_pdu
[
idx
].
Nid
,
*
(
unsigned
long
long
*
)
sci_ind
->
sci_pdu
[
idx
].
sci_payloadBits
);
handle_sl_sci1a
(
module_id
,
frame
,
slot
,
&
sci_ind
->
sci_pdu
[
idx
],
phy_data
);
break
;
case
SL_SCI_FORMAT_2_ON_PSSCH
:
LOG_
I
(
NR_MAC
,
"%s%d.%d Received PSSCH PDU %d/%d PSSCH RSRP %d, length %d, payload %llx
\n
"
,
KBLU
,
sci_ind
->
sfn
,
sci_ind
->
slot
,
1
+
idx
,
num_SCIs
,
sci_ind
->
sci_pdu
[
idx
].
pscch_rsrp
,
sci_ind
->
sci_pdu
[
idx
].
sci_payloadlen
,
*
(
unsigned
long
long
*
)
sci_ind
->
sci_pdu
[
idx
].
sci_payloadBits
);
LOG_
D
(
NR_MAC
,
"%s%d.%d Received PSSCH PDU %d/%d PSSCH RSRP %d, length %d, payload %llx
\n
"
,
KBLU
,
sci_ind
->
sfn
,
sci_ind
->
slot
,
1
+
idx
,
num_SCIs
,
sci_ind
->
sci_pdu
[
idx
].
pscch_rsrp
,
sci_ind
->
sci_pdu
[
idx
].
sci_payloadlen
,
*
(
unsigned
long
long
*
)
sci_ind
->
sci_pdu
[
idx
].
sci_payloadBits
);
handle_sl_sci2
(
module_id
,
frame
,
slot
,
&
sci_ind
->
sci_pdu
[
idx
],
phy_data
);
break
;
default:
...
...
openair2/SDAP/nr_sdap/nr_sdap_entity.c
View file @
18853ab6
...
...
@@ -301,9 +301,9 @@ static void nr_sdap_rx_entity(nr_sdap_entity_t *entity,
*/
extern
int
nas_sock_fd
[];
int
len
=
write
(
nas_sock_fd
[
0
],
&
buf
[
offset
],
size
-
offset
);
LOG_
I
(
SDAP
,
"RX Entity len : %d
\n
"
,
len
);
LOG_
I
(
SDAP
,
"RX Entity size : %d
\n
"
,
size
);
LOG_
I
(
SDAP
,
"RX Entity offset : %d
\n
"
,
offset
);
LOG_
D
(
SDAP
,
"RX Entity len : %d
\n
"
,
len
);
LOG_
D
(
SDAP
,
"RX Entity size : %d
\n
"
,
size
);
LOG_
D
(
SDAP
,
"RX Entity offset : %d
\n
"
,
offset
);
if
(
len
!=
size
-
offset
)
LOG_E
(
SDAP
,
"%s:%d:%s: fatal
\n
"
,
__FILE__
,
__LINE__
,
__FUNCTION__
);
...
...
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