Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Shweta Shrivastava
openairinterface5G
Commits
e72a6798
Commit
e72a6798
authored
Jun 05, 2021
by
Roberto Louro Magueta
Browse files
Change some LOG levels
parent
98caeb10
Changes
38
Hide whitespace changes
Inline
Side-by-side
executables/nr-uesoftmodem.c
View file @
e72a6798
...
...
@@ -153,8 +153,9 @@ int transmission_mode = 1;
int
numerology
=
0
;
int
oaisim_flag
=
0
;
int
emulate_rf
=
0
;
uint32_t
N_RB_DL
=
106
;
char
uecap_xer
[
1024
],
uecap_xer_in
=
0
;
uint32_t
N_RB_DL
=
106
;
char
uecap_xer_in
=
0
;
char
uecap_xer
[
1024
];
/* see file openair2/LAYER2/MAC/main.c for why abstraction_flag is needed
* this is very hackish - find a proper solution
...
...
@@ -335,8 +336,9 @@ void set_options(int CC_id, PHY_VARS_NR_UE *UE){
LOG_I
(
PHY
,
"Set UE frame_type %d
\n
"
,
fp
->
frame_type
);
}
LOG_I
(
PHY
,
"Set UE N_RB_DL %d
\n
"
,
N_RB_DL
);
fp
->
N_RB_DL
=
N_RB_DL
;
LOG_I
(
PHY
,
"Set UE N_RB_DL %d
\n
"
,
N_RB_DL
);
LOG_I
(
PHY
,
"Set UE nb_rx_antenna %d, nb_tx_antenna %d, threequarter_fs %d
\n
"
,
fp
->
nb_antennas_rx
,
fp
->
nb_antennas_tx
,
fp
->
threequarter_fs
);
}
...
...
openair1/PHY/INIT/nr_parms.c
View file @
e72a6798
...
...
@@ -261,11 +261,11 @@ int nr_init_frame_parms_ue(NR_DL_FRAME_PARMS *fp,
LOG_I
(
PHY
,
"Initializing frame parms: set nb_antenna_ports_gNB %d, tdd_config, %d, Nid_cell %d
\n
"
,
fp
->
nb_antenna_ports_gNB
,
fp
->
tdd_config
,
fp
->
Nid_cell
);
uint64_t
dl_bw_khz
=
(
12
*
config
->
carrier_config
.
dl_grid_size
[
config
->
ssb_config
.
scs_common
])
*
(
15
<<
config
->
ssb_config
.
scs_common
);
LOG_I
(
PHY
,
"dl_bw_kHz %lu
\n
"
,
dl_bw_khz
);
fp
->
dl_CarrierFreq
=
((
dl_bw_khz
>>
1
)
+
config
->
carrier_config
.
dl_frequency
)
*
1000
;
LOG_I
(
PHY
,
"dl_CarrierFreq %lu
\n
"
,
fp
->
dl_CarrierFreq
);
LOG_D
(
PHY
,
"dl_bw_kHz %lu
\n
"
,
dl_bw_khz
);
LOG_D
(
PHY
,
"dl_CarrierFreq %lu
\n
"
,
fp
->
dl_CarrierFreq
);
uint64_t
ul_bw_khz
=
(
12
*
config
->
carrier_config
.
ul_grid_size
[
config
->
ssb_config
.
scs_common
])
*
(
15
<<
config
->
ssb_config
.
scs_common
);
fp
->
ul_CarrierFreq
=
((
ul_bw_khz
>>
1
)
+
config
->
carrier_config
.
uplink_frequency
)
*
1000
;
...
...
openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
View file @
e72a6798
...
...
@@ -732,8 +732,10 @@ int32_t nr_rx_pdcch(PHY_VARS_NR_UE *ue,
rel15
=
&
pdcch_vars
->
pdcch_config
[
i
];
int
n_rb
,
rb_offset
;
get_coreset_rballoc
(
rel15
->
coreset
.
frequency_domain_resource
,
&
n_rb
,
&
rb_offset
);
LOG_D
(
PHY
,
"pdcch coreset: freq %x, n_rb %d, rb_offset %d
\n
"
,
rel15
->
coreset
.
frequency_domain_resource
[
0
],
n_rb
,
rb_offset
);
rel15
->
coreset
.
frequency_domain_resource
[
0
],
n_rb
,
rb_offset
);
for
(
int
s
=
rel15
->
coreset
.
StartSymbolIndex
;
s
<
(
rel15
->
coreset
.
StartSymbolIndex
+
rel15
->
coreset
.
duration
);
s
++
)
{
LOG_D
(
PHY
,
"in nr_pdcch_extract_rbs_single(rxdataF -> rxdataF_ext || dl_ch_estimates -> dl_ch_estimates_ext)
\n
"
);
...
...
openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c
View file @
e72a6798
...
...
@@ -264,13 +264,15 @@ int nr_ulsch_encoding(NR_UE_ULSCH_t *ulsch,
LOG_D
(
PHY
,
"ulsch coding nb_rb %d, Nl = %d
\n
"
,
nb_rb
,
harq_process
->
pusch_pdu
.
nrOfLayers
);
LOG_D
(
PHY
,
"ulsch coding A %d G %d mod_order %d
\n
"
,
A
,
G
,
mod_order
);
LOG_D
(
PHY
,
"harq_pid %d harq_process->ndi %d, pusch_data.new_data_indicator %d
\n
"
,
harq_pid
,
harq_process
->
ndi
,
harq_process
->
pusch_pdu
.
pusch_data
.
new_data_indicator
);
LOG_D
(
PHY
,
"harq_pid %d harq_process->ndi %d, pusch_data.new_data_indicator %d
\n
"
,
harq_pid
,
harq_process
->
ndi
,
harq_process
->
pusch_pdu
.
pusch_data
.
new_data_indicator
);
if
(
harq_process
->
first_tx
==
1
||
harq_process
->
ndi
!=
harq_process
->
pusch_pdu
.
pusch_data
.
new_data_indicator
)
{
// this is a new packet
#ifdef DEBUG_ULSCH_CODING
printf
(
"encoding thinks this is a new packet
\n
"
);
#endif
harq_process
->
first_tx
=
0
;
harq_process
->
first_tx
=
0
;
///////////////////////// a---->| add CRC |---->b /////////////////////////
///////////
/*
...
...
@@ -413,7 +415,7 @@ int nr_ulsch_encoding(NR_UE_ULSCH_t *ulsch,
///////////
///////////////////////////////////////////////////////////////////////////////
LOG_D
(
PHY
,
"setting ndi to %d from pusch_data
\n
"
,
harq_process
->
pusch_pdu
.
pusch_data
.
new_data_indicator
);
LOG_D
(
PHY
,
"setting ndi to %d from pusch_data
\n
"
,
harq_process
->
pusch_pdu
.
pusch_data
.
new_data_indicator
);
harq_process
->
ndi
=
harq_process
->
pusch_pdu
.
pusch_data
.
new_data_indicator
;
}
F
=
harq_process
->
F
;
...
...
openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c
View file @
e72a6798
...
...
@@ -147,7 +147,7 @@ void nr_ue_ulsch_procedures(PHY_VARS_NR_UE *UE,
get_num_re_dmrs
(
pusch_pdu
,
&
nb_dmrs_re_per_rb
,
&
number_dmrs_symbols
);
LOG_D
(
PHY
,
"ulsch %x : start_rb %d bwp_start %d start_sc %d start_symbol %d num_symbols %d cdmgrpsnodata %d num_dmrs %d dmrs_re_per_rb %d
\n
"
,
rnti
,
start_rb
,
pusch_pdu
->
bwp_start
,
start_sc
,
start_symbol
,
number_of_symbols
,
cdm_grps_no_data
,
number_dmrs_symbols
,
nb_dmrs_re_per_rb
);
rnti
,
start_rb
,
pusch_pdu
->
bwp_start
,
start_sc
,
start_symbol
,
number_of_symbols
,
cdm_grps_no_data
,
number_dmrs_symbols
,
nb_dmrs_re_per_rb
);
// TbD num_of_mod_symbols is set but never used
N_RE_prime
=
NR_NB_SC_PER_RB
*
number_of_symbols
-
nb_dmrs_re_per_rb
*
number_dmrs_symbols
-
N_PRB_oh
;
...
...
openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
View file @
e72a6798
...
...
@@ -558,7 +558,7 @@ bool pucch_procedures_ue_nr(PHY_VARS_NR_UE *ue, uint8_t gNB_id, UE_nr_rxtx_proc_
/* use of initial pucch configuration provided by system information 1 */
/***********************************************************************/
if
(
initial_pucch_id
!=
NB_INITIAL_PUCCH_RESOURCE
)
{
LOG_
I
(
MAC
,
"Selecting INITIAL PUCCH Resource
\n
"
);
LOG_
D
(
MAC
,
"Selecting INITIAL PUCCH Resource
\n
"
);
format
=
initial_pucch_resource
[
initial_pucch_id
].
format
;
starting_symbol_index
=
initial_pucch_resource
[
initial_pucch_id
].
startingSymbolIndex
;
nb_symbols_total
=
initial_pucch_resource
[
initial_pucch_id
].
nrofSymbols
;
...
...
@@ -989,8 +989,6 @@ uint8_t get_downlink_ack(PHY_VARS_NR_UE *ue, uint8_t gNB_id, UE_nr_rxtx_proc_t
int
V_DAI_m_DL
=
0
;
NR_UE_MAC_INST_t
*
mac
=
get_mac_inst
(
0
);
if
(
mac
->
DLbwp
[
0
]
&&
mac
->
DLbwp
[
0
]
->
bwp_Dedicated
&&
mac
->
DLbwp
[
0
]
->
bwp_Dedicated
->
pdsch_Config
&&
...
...
openair2/COMMON/gtpv1_u_messages_types.h
View file @
e72a6798
...
...
@@ -168,23 +168,23 @@ typedef struct gtpv1u_enb_end_marker_ind_s {
uint32_t
sdu_size
;
uint8_t
*
sdu_p
;
uint8_t
mode
;
uint16_t
rnti
;
uint8_t
module_id
;
uint16_t
rnti
;
uint8_t
module_id
;
uint8_t
eNB_index
;
}
gtpv1u_enb_end_marker_ind_t
;
typedef
struct
{
in_addr_t
enb_ip_address_for_S1u_S12_S4_up
;
tcp_udp_port_t
enb_port_for_S1u_S12_S4_up
;
char
addrStr
[
256
];
char
portStr
[
256
];
char
addrStr
[
256
];
char
portStr
[
256
];
}
Gtpv1uS1Req
;
typedef
struct
{
in_addr_t
gnb_ip_address_for_NGu_up
;
tcp_udp_port_t
gnb_port_for_NGu_up
;
char
addrStr
[
256
];
char
portStr
[
256
];
char
addrStr
[
256
];
char
portStr
[
256
];
}
Gtpv1uNGReq
;
typedef
struct
gtpv1u_gnb_create_tunnel_req_s
{
rnti_t
rnti
;
...
...
openair2/F1AP/f1ap_cu_interface_management.c
View file @
e72a6798
...
...
@@ -146,7 +146,7 @@ int CU_handle_F1_SETUP_REQUEST(instance_t instance,
/* tac */
if
(
served_cells_item_p
->
served_Cell_Information
.
fiveGS_TAC
)
{
OCTET_STRING_TO_INT16
(
served_cells_item_p
->
served_Cell_Information
.
fiveGS_TAC
,
F1AP_SETUP_REQ
(
message_p
).
tac
[
i
]);
LOG_
I
(
F1AP
,
"F1AP_SETUP_REQ(message_p).tac[%d] %d
\n
"
,
i
,
F1AP_SETUP_REQ
(
message_p
).
tac
[
i
]);
LOG_
D
(
F1AP
,
"F1AP_SETUP_REQ(message_p).tac[%d] %d
\n
"
,
i
,
F1AP_SETUP_REQ
(
message_p
).
tac
[
i
]);
}
/* - nRCGI */
TBCD_TO_MCC_MNC
(
&
(
served_cells_item_p
->
served_Cell_Information
.
nRCGI
.
pLMN_Identity
),
F1AP_SETUP_REQ
(
message_p
).
mcc
[
i
],
...
...
@@ -157,7 +157,7 @@ int CU_handle_F1_SETUP_REQUEST(instance_t instance,
// NR cellID
BIT_STRING_TO_NR_CELL_IDENTITY
(
&
served_cells_item_p
->
served_Cell_Information
.
nRCGI
.
nRCellIdentity
,
F1AP_SETUP_REQ
(
message_p
).
nr_cellid
[
i
]);
LOG_
I
(
F1AP
,
"[SCTP %d] Received nRCGI: MCC %d, MNC %d, CELL_ID %llu
\n
"
,
assoc_id
,
LOG_
D
(
F1AP
,
"[SCTP %d] Received nRCGI: MCC %d, MNC %d, CELL_ID %llu
\n
"
,
assoc_id
,
F1AP_SETUP_REQ
(
message_p
).
mcc
[
i
],
F1AP_SETUP_REQ
(
message_p
).
mnc
[
i
],
(
long
long
unsigned
int
)
F1AP_SETUP_REQ
(
message_p
).
nr_cellid
[
i
]);
...
...
@@ -169,7 +169,7 @@ int CU_handle_F1_SETUP_REQUEST(instance_t instance,
served_cells_item_p
->
served_Cell_Information
.
nRCGI
.
nRCellIdentity
.
buf
[
4
]);
/* - nRPCI */
F1AP_SETUP_REQ
(
message_p
).
nr_pci
[
i
]
=
served_cells_item_p
->
served_Cell_Information
.
nRPCI
;
LOG_
I
(
F1AP
,
"F1AP_SETUP_REQ(message_p).nr_pci[%d] %d
\n
"
,
LOG_
D
(
F1AP
,
"F1AP_SETUP_REQ(message_p).nr_pci[%d] %d
\n
"
,
i
,
F1AP_SETUP_REQ
(
message_p
).
nr_pci
[
i
]);
// System Information
...
...
@@ -319,7 +319,7 @@ int CU_send_F1_SETUP_RESPONSE(instance_t instance,
/* mandatory */
/* c3. cells to be Activated list */
int
num_cells_to_activate
=
f1ap_setup_resp
->
num_cells_to_activate
;
LOG_
I
(
F1AP
,
"num_cells_to_activate = %d
\n
"
,
num_cells_to_activate
);
LOG_
D
(
F1AP
,
"num_cells_to_activate = %d
\n
"
,
num_cells_to_activate
);
if
(
num_cells_to_activate
>
0
)
{
ie
=
(
F1AP_F1SetupResponseIEs_t
*
)
calloc
(
1
,
sizeof
(
F1AP_F1SetupResponseIEs_t
));
ie
->
id
=
F1AP_ProtocolIE_ID_id_Cells_to_be_Activated_List
;
...
...
@@ -328,7 +328,7 @@ int CU_send_F1_SETUP_RESPONSE(instance_t instance,
for
(
i
=
0
;
i
<
num_cells_to_activate
;
i
++
)
{
LOG_
I
(
F1AP
,
"[c3] (cell %d) mcc = %d, mnc = %d, mnc_digit_length = %d, nr_cellid = %lu
\n
"
,
LOG_
D
(
F1AP
,
"[c3] (cell %d) mcc = %d, mnc = %d, mnc_digit_length = %d, nr_cellid = %lu
\n
"
,
i
,
f1ap_setup_resp
->
cells_to_activate
[
i
].
mcc
,
f1ap_setup_resp
->
cells_to_activate
[
i
].
mnc
,
...
...
@@ -387,7 +387,7 @@ int CU_send_F1_SETUP_RESPONSE(instance_t instance,
(
const
char
*
)
f1ap_setup_resp
->
cells_to_activate
[
i
].
SI_container
[
sIBtype
],
f1ap_setup_resp
->
cells_to_activate
[
i
].
SI_container_length
[
sIBtype
]);
LOG_
I
(
F1AP
,
"f1ap_setup_resp->SI_container_length[%d][%d] = %d
\n
"
,
i
,
sIBtype
,
f1ap_setup_resp
->
cells_to_activate
[
i
].
SI_container_length
[
sIBtype
]);
LOG_
D
(
F1AP
,
"f1ap_setup_resp->SI_container_length[%d][%d] = %d
\n
"
,
i
,
sIBtype
,
f1ap_setup_resp
->
cells_to_activate
[
i
].
SI_container_length
[
sIBtype
]);
ASN_SEQUENCE_ADD
(
&
gNB_CUSystemInformation
->
sibtypetobeupdatedlist
.
list
,
sib_item
);
}
}
...
...
@@ -577,7 +577,7 @@ int CU_send_gNB_CU_CONFIGURATION_UPDATE(instance_t instance, f1ap_gnb_cu_configu
for
(
i
=
0
;
i
<
f1ap_gnb_cu_configuration_update
->
num_cells_to_activate
;
i
++
)
{
LOG_
I
(
F1AP
,
"[c2] (cell %d) mcc = %d, mnc = %d, mnc_digit_length = %d, nr_cellid = %lu
\n
"
,
LOG_
D
(
F1AP
,
"[c2] (cell %d) mcc = %d, mnc = %d, mnc_digit_length = %d, nr_cellid = %lu
\n
"
,
i
,
f1ap_gnb_cu_configuration_update
->
cells_to_activate
[
i
].
mcc
,
f1ap_gnb_cu_configuration_update
->
cells_to_activate
[
i
].
mnc
,
...
...
@@ -953,9 +953,10 @@ int CU_send_gNB_CU_CONFIGURATION_UPDATE(instance_t instance, f1ap_gnb_cu_configu
return
-
1
;
}
LOG_I
(
F1AP
,
"F1AP gNB-CU CONFIGURATION UPDATE : "
);
for
(
int
i
=
0
;
i
<
len
;
i
++
)
printf
(
"%02x "
,
buffer
[
i
]);
printf
(
"
\n
"
);
LOG_D
(
F1AP
,
"F1AP gNB-CU CONFIGURATION UPDATE
\n
"
);
//for (int i=0;i<len;i++) printf("%02x ",buffer[i]);
//printf("\n");
cu_f1ap_itti_send_sctp_data_req
(
instance
,
f1ap_du_data_from_du
->
assoc_id
,
buffer
,
len
,
0
);
return
0
;
}
...
...
@@ -971,7 +972,7 @@ int CU_handle_gNB_CU_CONFIGURATION_UPDATE_ACKNOWLEDGE(instance_t instance,
uint32_t
assoc_id
,
uint32_t
stream
,
F1AP_F1AP_PDU_t
*
pdu
)
{
LOG_
I
(
F1AP
,
"Cell Configuration ok (assoc_id %d)
\n
"
,
assoc_id
);
LOG_
D
(
F1AP
,
"Cell Configuration ok (assoc_id %d)
\n
"
,
assoc_id
);
return
(
0
);
}
...
...
openair2/F1AP/f1ap_cu_rrc_message_transfer.c
View file @
e72a6798
...
...
@@ -132,10 +132,10 @@ int CU_handle_INITIAL_UL_RRC_MESSAGE_TRANSFER(instance_t instance,
if
(
RC
.
nrrrc
&&
RC
.
nrrrc
[
GNB_INSTANCE_TO_MODULE_ID
(
instance
)]
->
node_type
==
ngran_gNB_CU
)
{
LOG_
I
(
F1AP
,
"%s() RRCContainer (CCCH) size %ld: "
,
__func__
,
ie
->
value
.
choice
.
RRCContainer
.
size
);
for
(
int
i
=
0
;
i
<
ie
->
value
.
choice
.
RRCContainer
.
size
;
i
++
)
printf
(
"%02x "
,
RRC_MAC_CCCH_DATA_IND
(
message_p
).
sdu
[
i
]);
printf
(
"
\n
"
);
LOG_
D
(
F1AP
,
"%s() RRCContainer (CCCH) size %ld: "
,
__func__
,
ie
->
value
.
choice
.
RRCContainer
.
size
);
//
for (int i = 0; i < ie->value.choice.RRCContainer.size; i++)
//
printf("%02x ", RRC_MAC_CCCH_DATA_IND (message_p).sdu[i]);
//
printf("\n");
/* DUtoCURRCContainer */
F1AP_FIND_PROTOCOLIE_BY_ID
(
F1AP_InitialULRRCMessageTransferIEs_t
,
ie
,
container
,
...
...
openair2/F1AP/f1ap_decoder.c
View file @
e72a6798
...
...
@@ -161,7 +161,7 @@ int f1ap_decode_pdu(F1AP_F1AP_PDU_t *pdu, const uint8_t *const buffer, uint32_t
0
,
0
);
if
(
1
/*
asn1_decoder_xer_print
*/
)
{
if
(
asn1_decoder_xer_print
)
{
LOG_E
(
F1AP
,
"----------------- ASN1 DECODER PRINT START-----------------
\n
"
);
xer_fprint
(
stdout
,
&
asn_DEF_F1AP_F1AP_PDU
,
pdu
);
LOG_E
(
F1AP
,
"----------------- ASN1 DECODER PRINT END -----------------
\n
"
);
...
...
openair2/F1AP/f1ap_du_interface_management.c
View file @
e72a6798
...
...
@@ -397,7 +397,7 @@ int DU_send_F1_SETUP_REQUEST(instance_t instance) {
(
const
char
*
)
f1ap_du_data
->
mib
[
i
],
//f1ap_du_data->mib,
f1ap_du_data
->
mib_length
[
i
]);
LOG_
I
(
F1AP
,
"Filling SIB1_message for cell %d, length %d
\n
"
,
i
,
f1ap_du_data
->
sib1_length
[
i
]);
LOG_
D
(
F1AP
,
"Filling SIB1_message for cell %d, length %d
\n
"
,
i
,
f1ap_du_data
->
sib1_length
[
i
]);
OCTET_STRING_fromBuf
(
&
gNB_DU_System_Information
->
sIB1_message
,
// sept. 2018
(
const
char
*
)
f1ap_du_data
->
sib1
[
i
],
f1ap_du_data
->
sib1_length
[
i
]);
...
...
openair2/F1AP/f1ap_du_interface_management.h
View file @
e72a6798
...
...
@@ -98,17 +98,17 @@ int DU_handle_gNB_CU_CONFIGURATION_UPDATE(instance_t instance,
F1AP_F1AP_PDU_t
*
pdu
);
int
DU_send_gNB_CU_CONFIGURATION_UPDATE_FAILURE
(
instance_t
instance
,
f1ap_gnb_cu_configuration_update_failure_t
*
GNBCUConfigurationUpdateFailure
);
f1ap_gnb_cu_configuration_update_failure_t
*
GNBCUConfigurationUpdateFailure
);
int
DU_send_gNB_CU_CONFIGURATION_UPDATE_ACKNOWLEDGE
(
instance_t
instance
,
f1ap_gnb_cu_configuration_update_acknowledge_t
*
GNBCUConfigurationUpdateAcknowledge
);
f1ap_gnb_cu_configuration_update_acknowledge_t
*
GNBCUConfigurationUpdateAcknowledge
);
/*
* gNB-DU Resource Coordination
*/
int
DU_send_gNB_DU_RESOURCE_COORDINATION_REQUEST
(
instance_t
instance
,
F1AP_GNBDUResourceCoordinationRequest_t
*
GNBDUResourceCoordinationRequest
);
F1AP_GNBDUResourceCoordinationRequest_t
*
GNBDUResourceCoordinationRequest
);
int
DU_handle_gNB_DU_RESOURCE_COORDINATION_RESPONSE
(
instance_t
instance
,
uint32_t
assoc_id
,
...
...
openair2/F1AP/f1ap_encoder.c
View file @
e72a6798
...
...
@@ -33,7 +33,7 @@
#include "f1ap_common.h"
#include "f1ap_encoder.h"
int
asn1_encoder_xer_print
=
1
;
int
asn1_encoder_xer_print
=
0
;
/*
static inline int f1ap_encode_initiating(f1ap_message *message,
...
...
openair2/GNB_APP/MACRLC_nr_paramdef.h
View file @
e72a6798
...
...
@@ -84,10 +84,10 @@
{CONFIG_STRING_MACRLC_LOCAL_S_PORTD, NULL, 0, uptr:NULL, defintval:50021, TYPE_UINT, 0}, \
{CONFIG_STRING_MACRLC_REMOTE_S_PORTD, NULL, 0, uptr:NULL, defintval:50021, TYPE_UINT, 0}, \
{CONFIG_STRING_MACRLC_ULSCH_MAX_SLOTS_INACTIVITY, "Maximum number of slots before a UE is scheduled ULSCH due to inactivity", 0, uptr:NULL, defintval:200, TYPE_UINT, 0}, \
{CONFIG_STRING_MACRLC_PUSCHTARGETSNRX10, NULL, 0,
iptr:NULL, defintval:200,
TYPE_INT,
0}, \
{CONFIG_STRING_MACRLC_PUCCHTARGETSNRX10, NULL, 0,
iptr:NULL, defintval:150,
TYPE_INT,
0}, \
{CONFIG_STRING_MACRLC_PUCCHFAILURETHRES, NULL, 0,
iptr:NULL, defintval:10,
TYPE_INT,
0}, \
{CONFIG_STRING_MACRLC_PUSCHFAILURETHRES, NULL, 0,
iptr:NULL, defintval:10,
TYPE_INT,
0}, \
{CONFIG_STRING_MACRLC_PUSCHTARGETSNRX10,
NULL,
0, iptr:NULL,
defintval:200, TYPE_INT, 0},
\
{CONFIG_STRING_MACRLC_PUCCHTARGETSNRX10,
NULL,
0, iptr:NULL,
defintval:150, TYPE_INT, 0},
\
{CONFIG_STRING_MACRLC_PUCCHFAILURETHRES,
NULL,
0, iptr:NULL,
defintval:10, TYPE_INT, 0},
\
{CONFIG_STRING_MACRLC_PUSCHFAILURETHRES,
NULL,
0, iptr:NULL,
defintval:10, TYPE_INT, 0},
\
}
#define MACRLC_CC_IDX 0
#define MACRLC_TRANSPORT_N_PREFERENCE_IDX 1
...
...
openair2/GNB_APP/gnb_app.c
View file @
e72a6798
...
...
@@ -140,7 +140,7 @@ static void init_pdcp(void) {
uint32_t
pdcp_initmask
=
(
IS_SOFTMODEM_NOS1
)
?
(
PDCP_USE_NETLINK_BIT
|
LINK_ENB_PDCP_TO_IP_DRIVER_BIT
)
:
LINK_ENB_PDCP_TO_GTPV1U_BIT
;
if
(
IS_SOFTMODEM_NOS1
)
{
printf
(
"IS_SOFTMODEM_NOS1 option enabled
\n
"
);
LOG_I
(
PDCP
,
"IS_SOFTMODEM_NOS1 option enabled
\n
"
);
pdcp_initmask
=
pdcp_initmask
|
ENB_NAS_USE_TUN_BIT
|
SOFTMODEM_NOKRNMOD_BIT
;
}
...
...
openair2/GNB_APP/gnb_config.c
View file @
e72a6798
...
...
@@ -727,7 +727,7 @@ void RCconfig_nr_macrlc() {
RC
.
nrmac
[
j
]
->
ulsch_max_slots_inactivity
=
*
(
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_ULSCH_MAX_SLOTS_INACTIVITY
].
uptr
);
}
// for (j=0;j<RC.nb_nr_macrlc_inst;j++)
}
else
{
// MacRLC_ParamList.numelt > 0
printf
(
"No %s configuration found
\n
"
,
CONFIG_STRING_MACRLC_LIST
);
LOG_E
(
PHY
,
"No %s configuration found
\n
"
,
CONFIG_STRING_MACRLC_LIST
);
// AssertFatal (0,"No " CONFIG_STRING_MACRLC_LIST " configuration found");
}
...
...
@@ -1301,13 +1301,14 @@ int RCconfig_NR_NG(MessageDef *msg_p, uint32_t i) {
NGAP_REGISTER_GNB_REQ
(
msg_p
).
amf_ip_address
[
j
].
ipv4
=
1
;
NGAP_REGISTER_GNB_REQ
(
msg_p
).
amf_ip_address
[
j
].
ipv6
=
1
;
}
/* not in configuration yet ...
/* not in configuration yet ...
if (NGParamList.paramarray[l][GNB_AMF_BROADCAST_PLMN_INDEX].iptr)
NGAP_REGISTER_GNB_REQ(msg_p).broadcast_plmn_num[l] = NGParamList.paramarray[l][GNB_AMF_BROADCAST_PLMN_INDEX].numelt;
else
NGAP_REGISTER_GNB_REQ(msg_p).broadcast_plmn_num[l] = 0;
*/
*/
AssertFatal
(
NGAP_REGISTER_GNB_REQ
(
msg_p
).
broadcast_plmn_num
[
l
]
<=
NGAP_REGISTER_GNB_REQ
(
msg_p
).
num_plmn
,
"List of broadcast PLMN to be sent to AMF can not be longer than actual "
"PLMN list (max %d, but is %d)
\n
"
,
...
...
openair2/LAYER2/MAC/eNB_scheduler_RA.c
View file @
e72a6798
...
...
@@ -1288,7 +1288,7 @@ initiate_ra_proc(module_id_t module_idP,
prach_ParametersListCE_r13
=
&
ext4_prach
->
prach_ParametersListCE_r13
;
}
LOG_
I
(
MAC
,
LOG_
D
(
MAC
,
"[eNB %d][RAPROC] CC_id %d Frame %d, Subframe %d Initiating RA procedure for preamble index %d, timing offset %d
\n
"
,
module_idP
,
CC_id
,
frameP
,
subframeP
,
preamble_index
,
timing_offset
);
LOG_D
(
MAC
,
...
...
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
View file @
e72a6798
...
...
@@ -316,7 +316,7 @@ rx_sdu(const module_id_t enb_mod_idP,
if
(
no_sig
||
sduP
==
NULL
)
{
// we've got an error on Msg3
if
(
no_sig
)
{
LOG_
W
(
MAC
,
"No signal in Msg3
\n
"
);
LOG_
D
(
MAC
,
"No signal in Msg3
\n
"
);
}
LOG_D
(
MAC
,
"[eNB %d] CC_id %d, RA %d ULSCH in error in round %d/%d
\n
"
,
...
...
@@ -728,7 +728,7 @@ rx_sdu(const module_id_t enb_mod_idP,
}
if
(
no_sig
)
{
LOG_
W
(
MAC
,
"No signal
\n
"
);
LOG_
D
(
MAC
,
"No signal
\n
"
);
break
;
}
...
...
openair2/LAYER2/NR_MAC_UE/config_ue.c
View file @
e72a6798
...
...
@@ -314,9 +314,9 @@ void config_common_ue(NR_UE_MAC_INST_t *mac,
for
(
i
=
0
;
i
<
cfg
->
prach_config
.
num_prach_fd_occasions
;
i
++
)
{
cfg
->
prach_config
.
num_prach_fd_occasions_list
[
i
].
num_prach_fd_occasions
=
i
;
if
(
cfg
->
prach_config
.
prach_sequence_length
)
cfg
->
prach_config
.
num_prach_fd_occasions_list
[
i
].
prach_root_sequence_index
=
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
rach_ConfigCommon
->
choice
.
setup
->
prach_RootSequenceIndex
.
choice
.
l139
;
cfg
->
prach_config
.
num_prach_fd_occasions_list
[
i
].
prach_root_sequence_index
=
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
rach_ConfigCommon
->
choice
.
setup
->
prach_RootSequenceIndex
.
choice
.
l139
;
else
cfg
->
prach_config
.
num_prach_fd_occasions_list
[
i
].
prach_root_sequence_index
=
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
rach_ConfigCommon
->
choice
.
setup
->
prach_RootSequenceIndex
.
choice
.
l839
;
cfg
->
prach_config
.
num_prach_fd_occasions_list
[
i
].
prach_root_sequence_index
=
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
rach_ConfigCommon
->
choice
.
setup
->
prach_RootSequenceIndex
.
choice
.
l839
;
cfg
->
prach_config
.
num_prach_fd_occasions_list
[
i
].
k1
=
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
rach_ConfigCommon
->
choice
.
setup
->
rach_ConfigGeneric
.
msg1_FrequencyStart
;
cfg
->
prach_config
.
num_prach_fd_occasions_list
[
i
].
prach_zero_corr_conf
=
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
rach_ConfigCommon
->
choice
.
setup
->
rach_ConfigGeneric
.
zeroCorrelationZoneConfig
;
...
...
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
View file @
e72a6798
...
...
@@ -63,7 +63,7 @@
#include "common/utils/LOG/vcd_signal_dumper.h"
//#define ENABLE_MAC_PAYLOAD_DEBUG 1
#define DEBUG_EXTRACT_DCI
//
#define DEBUG_EXTRACT_DCI
//#define DEBUG_RAR
extern
uint32_t
N_RB_DL
;
...
...
Prev
1
2
Next
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