maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleaning only

Browse Source
This commit is contained in:
laurent
2023-01-19 14:52:39 +01:00
committed by Robert Schmidt
parent 214aa50595
commit b74ba0fb92
142 changed files with 565 additions and 1842 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/SIMULATION/ETH_TRANSPORT/bypass_session_layer.c
+5 -1
View File
@@ -39,7 +39,7 @@
#include "UTIL/LOG/log.h"
#include "multicast_link.h"
#include "openair1/SIMULATION/ETH_TRANSPORT/extern.h"
char rx_bufferP[BYPASS_RX_BUFFER_SIZE];
unsigned int num_bytesP = 0;
int N_P = 0, N_R = 0;
@@ -57,6 +57,10 @@ mapping transport_names[] = {
{"RELEASE TRANSPORT INFO", EMU_TRANSPORT_INFO_RELEASE},
{NULL, -1}
};
static pthread_mutex_t emul_low_mutex;
static pthread_mutex_t emul_low_mutex;
static pthread_cond_t emul_low_cond;
static char emul_low_mutex_var;
void init_bypass (void)
{
openair1/SIMULATION/ETH_TRANSPORT/emu_transport.c
+21
View File
@@ -39,6 +39,27 @@
#include "UTIL/OCG/OCG_extern.h"
#include "UTIL/LOG/log.h"
#include "UTIL/LOG/vcd_signal_dumper.h"
#include "openair1/SIMULATION/ETH_TRANSPORT/extern.h"
unsigned char Emulation_status;
unsigned char emu_tx_status;
unsigned char emu_rx_status;
#if !defined(ENABLE_NEW_MULTICAST)
pthread_mutex_t Tx_mutex;
pthread_cond_t Tx_cond;
char Tx_mutex_var;
#endif
/* Handlers for RX and TX */
rx_handler_t rx_handler;
tx_handler_t tx_handler;
eNB_transport_info_t eNB_transport_info[NUMBER_OF_eNB_MAX][MAX_NUM_CCs];
uint16_t eNB_transport_info_TB_index[NUMBER_OF_eNB_MAX][MAX_NUM_CCs];
UE_transport_info_t UE_transport_info[NUMBER_OF_UE_MAX][MAX_NUM_CCs];
UE_cntl ue_cntl_delay[NUMBER_OF_UE_MAX][MAX_NUM_CCs][2];
extern unsigned int Master_list_rx;
openair1/SIMULATION/ETH_TRANSPORT/extern.h
-3
View File
@@ -42,9 +42,6 @@ extern unsigned char emu_rx_status;
//extern unsigned int Is_primary_master;
#if !defined(ENABLE_NEW_MULTICAST)
extern pthread_mutex_t emul_low_mutex;
extern pthread_cond_t emul_low_cond;
extern char emul_low_mutex_var;
extern pthread_mutex_t Tx_mutex;
extern pthread_cond_t Tx_cond;
extern char Tx_mutex_var;
openair1/SIMULATION/ETH_TRANSPORT/netlink_init.c
+1 -1
View File
@@ -38,7 +38,7 @@
#include <sys/types.h>
#include <fcntl.h>
#include <errno.h>
#include "platform_constants.h"
#include "common/platform_constants.h"
#include <sys/ioctl.h>
#include <sys/socket.h>
openair1/SIMULATION/ETH_TRANSPORT/vars.h
-64
View File
@@ -1,64 +0,0 @@
/*
* Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The OpenAirInterface Software Alliance licenses this file to You under
* the OAI Public License, Version 1.1 (the "License"); you may not use this file
* except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.openairinterface.org/?page_id=698
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*-------------------------------------------------------------------------------
* For more information about the OpenAirInterface (OAI) Software Alliance:
* contact@openairinterface.org
*/
/*! \file vars.h
* \brief specifies the variables for phy emulation
* \author Navid Nikaein and Raymomd Knopp and Hicham Anouar
* \date 2011
* \version 1.0
* \company Eurecom
* \email: navid.nikaein@eurecom.fr
*/
#include <pthread.h>
#include "defs.h"
#ifndef __BYPASS_SESSION_LAYER_VARS_H__
# define __BYPASS_SESSION_LAYER_VARS_H__
unsigned char Emulation_status;
unsigned char emu_tx_status;
unsigned char emu_rx_status;
//unsigned int Master_list=0;
//unsigned short Master_id;
//unsigned int Is_primary_master;
#if !defined(ENABLE_NEW_MULTICAST)
pthread_mutex_t emul_low_mutex;
pthread_cond_t emul_low_cond;
char emul_low_mutex_var;
pthread_mutex_t Tx_mutex;
pthread_cond_t Tx_cond;
char Tx_mutex_var;
#endif
/* Handlers for RX and TX */
rx_handler_t rx_handler;
tx_handler_t tx_handler;
eNB_transport_info_t eNB_transport_info[NUMBER_OF_eNB_MAX][MAX_NUM_CCs];
uint16_t eNB_transport_info_TB_index[NUMBER_OF_eNB_MAX][MAX_NUM_CCs];
UE_transport_info_t UE_transport_info[NUMBER_OF_UE_MAX][MAX_NUM_CCs];
UE_cntl ue_cntl_delay[NUMBER_OF_UE_MAX][MAX_NUM_CCs][2];
#endif
openair1/SIMULATION/LTE_PHY/dlsim.c
-2
View File
@@ -37,7 +37,6 @@
#include <signal.h>
#include "common/config/config_load_configmodule.h"
#include "common/utils/LOG/log.h"
#include "LAYER2/MAC/mac_vars.h"
#include "nfapi/oai_integration/vendor_ext.h"
#include "PHY/types.h"
#include "PHY/defs_eNB.h"
@@ -51,7 +50,6 @@
#include "PHY/MODULATION/modulation_UE.h"
#include "PHY/TOOLS/lte_phy_scope.h"
#include "SCHED/sched_eNB.h"
#include "SCHED/sched_common_vars.h"
#include "SCHED_UE/sched_UE.h"
#include "SIMULATION/TOOLS/sim.h"
#include "UTIL/LISTS/list.h"
openair1/SIMULATION/LTE_PHY/dlsim_tm7.c
-3
View File
@@ -51,9 +51,6 @@
#include "unitary_defs.h"
extern unsigned int dlsch_tbs25[27][25],TBStable[27][110];
extern unsigned char offset_mumimo_llr_drange_fix;
#include "PHY/TOOLS/lte_phy_scope.h"
PHY_VARS_eNB *eNB;
openair1/SIMULATION/LTE_PHY/mbmssim.c
-1
View File
@@ -43,7 +43,6 @@
#include "PHY/phy_vars.h"
#include "SCHED/sched_eNB.h"
#include "SCHED/sched_common_vars.h"
#include "LAYER2/MAC/mac_vars.h"
#include "OCG_vars.h"
openair1/SIMULATION/LTE_PHY/ulsim.c
-2
View File
@@ -33,7 +33,6 @@
#include <string.h>
#include <math.h>
#include <unistd.h>
#include "LAYER2/MAC/mac_vars.h"
#include "PHY/types.h"
#include "PHY/defs_common.h"
#include "PHY/defs_eNB.h"
@@ -43,7 +42,6 @@
#include "PHY/LTE_TRANSPORT/transport_proto.h"
#include "PHY/LTE_UE_TRANSPORT/transport_proto_ue.h"
#include "PHY/TOOLS/lte_phy_scope.h"
#include "SCHED/sched_common_vars.h"
#include "SCHED/sched_eNB.h"
#include "SCHED_UE/sched_UE.h"
#include "SIMULATION/TOOLS/sim.h"
openair1/SIMULATION/LTE_PHY/unitary_defs.h
-4
View File
@@ -28,8 +28,4 @@ void exit_function(const char* file, const char* function, const int line,const
exit(-1);
}
extern unsigned int dlsch_tbs25[27][25],TBStable[27][110];
extern unsigned char offset_mumimo_llr_drange_fix;
extern unsigned short dftsizes[34];
extern short *ul_ref_sigs[30][2][34];
openair1/SIMULATION/NR_PHY/dlschsim.c
+1 -1
View File
@@ -63,7 +63,7 @@ uint64_t downlink_frequency[MAX_NUM_CCs][4];
double cpuf;
//uint8_t nfapi_mode = 0;
uint16_t NB_UE_INST = 1;
const int NB_UE_INST = 1;
uint8_t const nr_rv_round_map[4] = {0, 2, 3, 1};
const short conjugate[8]__attribute__((aligned(16))) = {-1,1,-1,1,-1,1,-1,1};
openair1/SIMULATION/NR_PHY/dlsim.c
+1 -2
View File
@@ -68,7 +68,6 @@
#include "SIMULATION/LTE_PHY/common_sim.h"
#include "PHY/NR_REFSIG/dmrs_nr.h"
#include <openair2/LAYER2/MAC/mac_vars.h>
#include <openair2/RRC/LTE/rrc_vars.h>
#include <executables/softmodem-common.h>
@@ -372,6 +371,7 @@ nrUE_params_t *get_nrUE_params(void) {
void do_nothing(void *args) {
}
int NB_UE_INST = 1;
int main(int argc, char **argv)
{
@@ -414,7 +414,6 @@ int main(int argc, char **argv)
SCM_t channel_model = AWGN; // AWGN Rayleigh1 Rayleigh1_anticorr;
NB_UE_INST = 1;
//double pbch_sinr;
//int pbch_tx_ant;
int N_RB_DL=106,mu=1;
openair1/SIMULATION/NR_PHY/pbchsim.c
+1 -1
View File
@@ -60,7 +60,7 @@ int32_t uplink_frequency_offset[MAX_NUM_CCs][4];
double cpuf;
//uint8_t nfapi_mode = 0;
uint16_t NB_UE_INST = 1;
const int NB_UE_INST = 1;
// needed for some functions
openair0_config_t openair0_cfg[MAX_CARDS];
openair1/SIMULATION/NR_PHY/prachsim.c
+1 -2
View File
@@ -47,7 +47,6 @@
#include "PHY/NR_UE_TRANSPORT/nr_transport_proto_ue.h"
#include "nr_unitary_defs.h"
#include "OCG_vars.h"
#include <openair2/LAYER2/MAC/mac_vars.h>
#include <openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h>
#include <openair2/RRC/LTE/rrc_vars.h>
#include <executables/softmodem-common.h>
@@ -233,6 +232,7 @@ nrUE_params_t *get_nrUE_params(void) {
nr_bler_struct nr_bler_data[NR_NUM_MCS];
void processSlotTX(void *arg) {}
int NB_UE_INST = 1;
int main(int argc, char **argv){
@@ -252,7 +252,6 @@ int main(int argc, char **argv){
uint8_t config_period;
int prachOccasion = 0;
double DS_TDL = .03;
NB_UE_INST=1;
// int8_t interf1=-19,interf2=-19;
// uint8_t abstraction_flag=0,calibration_flag=0;
openair1/SIMULATION/NR_PHY/pucchsim.c
+1 -1
View File
@@ -59,7 +59,7 @@ uint64_t downlink_frequency[MAX_NUM_CCs][4];
double cpuf;
//uint8_t nfapi_mode = 0;
uint16_t NB_UE_INST = 1;
const int NB_UE_INST = 1;
uint8_t const nr_rv_round_map[4] = {0, 2, 3, 1};
const short conjugate[8]__attribute__((aligned(16))) = {-1,1,-1,1,-1,1,-1,1};
const short conjugate2[8]__attribute__((aligned(16))) = {1,-1,1,-1,1,-1,1,-1};
openair1/SIMULATION/NR_PHY/ulschsim.c
+1 -1
View File
@@ -66,7 +66,7 @@ const short conjugate[8]__attribute__((aligned(16))) = {-1,1,-1,1,-1,1,-1,1};
const short conjugate2[8]__attribute__((aligned(16))) = {1,-1,1,-1,1,-1,1,-1};
double cpuf;
//uint8_t nfapi_mode = 0;
uint16_t NB_UE_INST = 1;
const int NB_UE_INST = 1;
// needed for some functions
PHY_VARS_NR_UE *PHY_vars_UE_g[1][1] = { { NULL } };
openair1/SIMULATION/NR_PHY/ulsim.c
+1 -3
View File
@@ -61,7 +61,6 @@
#define inMicroS(a) (((double)(a))/(get_cpu_freq_GHz()*1000.0))
#include "SIMULATION/LTE_PHY/common_sim.h"
#include <openair2/LAYER2/MAC/mac_vars.h>
#include <openair2/RRC/LTE/rrc_vars.h>
#include <executables/softmodem-common.h>
@@ -267,6 +266,7 @@ uint16_t n_rnti = 0x1234;
openair0_config_t openair0_cfg[MAX_CARDS];
channel_desc_t *UE2gNB[NUMBER_OF_UE_MAX][NUMBER_OF_gNB_MAX];
int NB_UE_INST = 1;
int main(int argc, char **argv)
{
@@ -295,8 +295,6 @@ int main(int argc, char **argv)
corr_level_t corr_level = CORR_LEVEL_LOW;
uint16_t N_RB_DL = 106, N_RB_UL = 106, mu = 1;
NB_UE_INST = 1;
//unsigned char frame_type = 0;
NR_DL_FRAME_PARMS *frame_parms;
int loglvl = OAILOG_WARNING;
openair1/SIMULATION/NR_UE_PHY/unit_tests/src/pss_util_test.c
-2
View File
@@ -44,8 +44,6 @@
/* to declare ue variables */
#include "PHY/phy_vars_nr_ue.h"
#include "PHY/LTE_TRANSPORT/transport_vars.h"
#include "SCHED/sched_common_vars.h"
#include "PHY/MODULATION/modulation_vars.h"
#include "PHY/NR_REFSIG/pss_nr.h"
#include "PHY/NR_REFSIG/sss_nr.h"
openair1/SIMULATION/TOOLS/channel_sim.c
+9 -16
View File
@@ -69,16 +69,16 @@ void do_DL_sig(sim_t *sim,
double s_re0[30720];
double s_re1[30720];
double *s_re[RC.nb_RU];
double *s_re[NB_ANTENNAS_TX];
double s_im0[30720];
double s_im1[30720];
double *s_im[RC.nb_RU];
double *s_im[NB_ANTENNAS_TX];
double r_re00[30720];
double r_re01[30720];
double *r_re0[RC.nb_RU];
double *r_re0[NB_ANTENNAS_RX];
double r_im00[30720];
double r_im01[30720];
double *r_im0[RC.nb_RU];
double *r_im0[NB_ANTENNAS_RX];
LTE_DL_FRAME_PARMS *frame_parms;
s_re[0] = s_re0;
@@ -295,14 +295,7 @@ void do_DL_sig(sim_t *sim,
}
void do_UL_sig(sim_t *sim,
uint16_t subframe,
uint8_t abstraction_flag,
LTE_DL_FRAME_PARMS *frame_parms,
uint32_t frame,
int ru_id,
uint8_t CC_id)
void do_UL_sig(sim_t *sim, uint16_t subframe, uint8_t abstraction_flag, LTE_DL_FRAME_PARMS *frame_parms, uint32_t frame, int ru_id, uint8_t CC_id, int NB_UE_INST)
{
int32_t **txdata,**rxdata;
uint8_t UE_id=0;
@@ -319,16 +312,16 @@ void do_UL_sig(sim_t *sim,
double s_re0[30720];
double s_re1[30720];
double *s_re[NB_UE_INST];
double *s_re[NB_ANTENNAS_TX];
double s_im0[30720];
double s_im1[30720];
double *s_im[NB_UE_INST];
double *s_im[NB_ANTENNAS_TX];
double r_re00[30720];
double r_re01[30720];
double *r_re0[NB_UE_INST];
double *r_re0[NB_ANTENNAS_RX];
double r_im00[30720];
double r_im01[30720];
double *r_im0[NB_UE_INST];
double *r_im0[NB_ANTENNAS_RX];
s_re[0] = s_re0;
s_im[0] = s_im0;
openair1/SIMULATION/TOOLS/sim.h
+2 -8
View File
@@ -288,7 +288,7 @@ typedef enum {
{CHANNELMOD_MODEL_DT_PNAME, "delay spread for TDL models\n", 0, dblptr:NULL, defdblval:0, TYPE_DOUBLE, 0 }\
}
#include "platform_constants.h"
#include "common/platform_constants.h"
typedef struct {
channel_desc_t *RU2UE[NUMBER_OF_RU_MAX][NUMBER_OF_UE_MAX][MAX_NUM_CCs];
@@ -573,12 +573,6 @@ void do_DL_sig(sim_t *sim,
uint8_t UE_id,
int CC_id);
void do_UL_sig(sim_t *sim,
uint16_t subframe,
uint8_t abstraction_flag,
LTE_DL_FRAME_PARMS *frame_parms,
uint32_t frame,
int ru_id,
uint8_t CC_id);
void do_UL_sig(sim_t *sim, uint16_t subframe, uint8_t abstraction_flag, LTE_DL_FRAME_PARMS *frame_parms, uint32_t frame, int ru_id, uint8_t CC_id, int NB_UEs);
#endif