Skip to content

O
OpenXG-RAN
Commit 2184a94d authored by Laurent THOMAS's avatar Laurent THOMAS
Browse files
Options

MR2416 simple code cleaning

parent e75490f6
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 6 deletions
openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
View file @ 2184a94d
...@@ -372,7 +372,9 @@ int nr_ulsch_decoding(PHY_VARS_gNB *phy_vars_gNB, ...@@ -372,7 +372,9 @@ int nr_ulsch_decoding(PHY_VARS_gNB *phy_vars_gNB,
} }
LOG_D(PHY, 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", "ULSCH Decoding, ulsch_id %d, 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",
ULSCH_id,
harq_pid, harq_pid,
ulsch->rnti, ulsch->rnti,
A, A,
......
openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
View file @ 2184a94d
...@@ -66,6 +66,7 @@ queue_t nr_tx_req_queue; ...@@ -66,6 +66,7 @@ queue_t nr_tx_req_queue;
queue_t nr_ul_dci_req_queue; queue_t nr_ul_dci_req_queue;
queue_t nr_ul_tti_req_queue; queue_t nr_ul_tti_req_queue;
pthread_mutex_t mac_IF_mutex; pthread_mutex_t mac_IF_mutex;
static void save_pdsch_pdu_for_crnti(nfapi_nr_dl_tti_request_t *dl_tti_request);
void nrue_init_standalone_socket(int tx_port, int rx_port) void nrue_init_standalone_socket(int tx_port, int rx_port)
{ {
...@@ -906,7 +907,7 @@ static void enqueue_nr_nfapi_msg(void *buffer, ssize_t len, nfapi_p7_message_hea ...@@ -906,7 +907,7 @@ static void enqueue_nr_nfapi_msg(void *buffer, ssize_t len, nfapi_p7_message_hea
return; return;
} }
void save_pdsch_pdu_for_crnti(nfapi_nr_dl_tti_request_t *dl_tti_request) static void save_pdsch_pdu_for_crnti(nfapi_nr_dl_tti_request_t *dl_tti_request)
{ {
int count_sent = 0; int count_sent = 0;
NR_UE_MAC_INST_t *mac = get_mac_inst(0); NR_UE_MAC_INST_t *mac = get_mac_inst(0);
......
openair2/NR_UE_PHY_INTERFACE/NR_Packet_Drop.h
View file @ 2184a94d
...@@ -72,8 +72,7 @@ typedef struct { ...@@ -72,8 +72,7 @@ typedef struct {
extern nr_bler_struct nr_bler_data[NR_NUM_MCS]; extern nr_bler_struct nr_bler_data[NR_NUM_MCS];
extern nr_bler_struct nr_mimo_bler_data[NR_NUM_MCS]; extern nr_bler_struct nr_mimo_bler_data[NR_NUM_MCS];
void read_channel_param(const nfapi_nr_dl_tti_pdsch_pdu_rel15_t * pdu, int sf, int index); void read_channel_param(const nfapi_nr_dl_tti_pdsch_pdu_rel15_t *pdu, int sf, int index);
void save_pdsch_pdu_for_crnti(nfapi_nr_dl_tti_request_t *dl_tti_request);
float get_bler_val(uint8_t mcs, int sinr); float get_bler_val(uint8_t mcs, int sinr);
bool should_drop_transport_block(int slot, uint16_t rnti); bool should_drop_transport_block(int slot, uint16_t rnti);
bool is_channel_modeling(void); bool is_channel_modeling(void);
......
openair2/RRC/NR_UE/rrc_UE.c
View file @ 2184a94d
...@@ -566,7 +566,7 @@ static int nr_decode_SI(NR_UE_RRC_SI_INFO *SI_info, NR_SystemInformation_t *si) ...@@ -566,7 +566,7 @@ static int nr_decode_SI(NR_UE_RRC_SI_INFO *SI_info, NR_SystemInformation_t *si)
return 0; return 0;
} }
void nr_rrc_ue_generate_ra_msg(NR_UE_RRC_INST_t *rrc, RA_trigger_t trigger, int rnti) static void nr_rrc_ue_generate_ra_msg(NR_UE_RRC_INST_t *rrc, RA_trigger_t trigger, rnti_t rnti)
{ {
switch (trigger) { switch (trigger) {
case INITIAL_ACCESS_FROM_RRC_IDLE: case INITIAL_ACCESS_FROM_RRC_IDLE:
......
openair3/NAS/NR_UE/nr_nas_msg_sim.c
View file @ 2184a94d
...@@ -48,7 +48,6 @@ ...@@ -48,7 +48,6 @@
#include "intertask_interface.h" #include "intertask_interface.h"
#include "openair2/RRC/NAS/nas_config.h" #include "openair2/RRC/NAS/nas_config.h"
#include <openair3/NAS/COMMON/NR_NAS_defs.h> #include <openair3/NAS/COMMON/NR_NAS_defs.h>
#include <openair1/PHY/phy_extern_nr_ue.h>
#include <openair1/SIMULATION/ETH_TRANSPORT/proto.h> #include <openair1/SIMULATION/ETH_TRANSPORT/proto.h>
#include "openair2/SDAP/nr_sdap/nr_sdap.h" #include "openair2/SDAP/nr_sdap/nr_sdap.h"
#include "openair3/SECU/nas_stream_eia2.h" #include "openair3/SECU/nas_stream_eia2.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment