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

removal of MAC_INTERFACE directory and its consequences

Browse Source
This commit is contained in:
Raymond Knopp
2016-03-27 02:50:47 -07:00
parent 0057448b91
commit aab91dd0d4
31 changed files with 5 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/PHY/LTE_ESTIMATION/adjust_gain.c
-2
View File
@@ -29,8 +29,6 @@
#include "PHY/types.h"
#include "PHY/defs.h"
#include "PHY/extern.h"
#include "MAC_INTERFACE/defs.h"
#include "MAC_INTERFACE/extern.h"
#ifdef EXMIMO
#include "openair0_lib.h"
openair1/PHY/LTE_ESTIMATION/lte_adjust_sync.c
-2
View File
@@ -29,8 +29,6 @@
#include "PHY/types.h"
#include "PHY/defs.h"
#include "PHY/extern.h"
#include "MAC_INTERFACE/defs.h"
#include "MAC_INTERFACE/extern.h"
#define DEBUG_PHY
openair1/PHY/LTE_ESTIMATION/lte_eNB_measurements.c
+2 -3
View File
@@ -48,7 +48,7 @@ void lte_eNB_I0_measurements(PHY_VARS_eNB *phy_vars_eNB,
LTE_eNB_COMMON *eNB_common_vars = &phy_vars_eNB->lte_eNB_common_vars;
LTE_DL_FRAME_PARMS *frame_parms = &phy_vars_eNB->lte_frame_parms;
PHY_MEASUREMENTS_eNB *phy_measurements = &phy_vars_eNB->PHY_measurements_eNB[eNB_id];
int32_t *rb_mask = phy_vars_eNB->rb_mask_ul;
uint32_t *rb_mask = phy_vars_eNB->rb_mask_ul;
uint32_t aarx,rx_power_correction;
uint32_t rb;
@@ -56,7 +56,6 @@ void lte_eNB_I0_measurements(PHY_VARS_eNB *phy_vars_eNB,
int32_t n0_power_tot;
int len;
int offset;
int Nsymb = (frame_parms->Ncp==NORMAL)?14:12;
// noise measurements
// for the moment we measure the noise on the 7th OFDM symbol (in S subframe)
@@ -88,7 +87,7 @@ void lte_eNB_I0_measurements(PHY_VARS_eNB *phy_vars_eNB,
// select the 7th symbol in an uplink subframe
offset = (frame_parms->first_carrier_offset + (rb*12))%frame_parms->ofdm_symbol_size;
offset += (7*frame_parms->ofdm_symbol_size);//(((Nsymb*subframe)+7)*frame_parms->ofdm_symbol_size);
offset += (7*frame_parms->ofdm_symbol_size);
ul_ch = &eNB_common_vars->rxdataF[eNB_id][aarx][offset];
len = 12;
// just do first half of middle PRB for odd number of PRBs
openair1/PHY/LTE_ESTIMATION/lte_sync_time.c
-2
View File
@@ -37,8 +37,6 @@
#include "PHY/defs.h"
#include "PHY/extern.h"
#include "SCHED/extern.h"
#include "MAC_INTERFACE/defs.h"
#include "MAC_INTERFACE/extern.h"
#include <math.h>
#ifdef OPENAIR2
openair1/PHY/LTE_TRANSPORT/dci_tools.c
-2
View File
@@ -40,8 +40,6 @@
#include "PHY/defs.h"
#include "PHY/extern.h"
#include "SCHED/defs.h"
#include "MAC_INTERFACE/defs.h"
#include "MAC_INTERFACE/extern.h"
#ifdef DEBUG_DCI_TOOLS
#include "PHY/vars.h"
#endif
openair1/PHY/LTE_TRANSPORT/pcfich.c
-1
View File
@@ -38,7 +38,6 @@
* \warning
*/
#include "PHY/defs.h"
#include "MAC_INTERFACE/extern.h"
//uint16_t pcfich_reg[4];
//uint8_t pcfich_first_reg_idx = 0;
openair1/PHY/LTE_TRANSPORT/rar_tools.c
-4
View File
@@ -40,12 +40,8 @@
#include "PHY/defs.h"
#include "PHY/extern.h"
#include "SCHED/extern.h"
#ifdef OPENAIR2
#include "LAYER2/MAC/defs.h"
#include "MAC_INTERFACE/defs.h"
#include "MAC_INTERFACE/extern.h"
#include "SCHED/defs.h"
#endif
#include "assertions.h"
openair1/PHY/LTE_TRANSPORT/uci_tools.c
-2
View File
@@ -39,8 +39,6 @@
*/
#include "PHY/defs.h"
#include "PHY/extern.h"
#include "MAC_INTERFACE/defs.h"
#include "MAC_INTERFACE/extern.h"
#ifdef DEBUG_UCI_TOOLS
#include "PHY/vars.h"
#endif
openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
-2
View File
@@ -44,8 +44,6 @@
#include "PHY/extern.h"
#include "PHY/CODING/extern.h"
#include "extern.h"
#include "MAC_INTERFACE/defs.h"
#include "MAC_INTERFACE/extern.h"
#include "SCHED/extern.h"
#ifdef OPENAIR2
#include "LAYER2/MAC/defs.h"
openair1/PHY/LTE_TRANSPORT/ulsch_demodulation.c
-2
View File
@@ -40,8 +40,6 @@
#include "PHY/defs.h"
#include "PHY/extern.h"
#include "MAC_INTERFACE/defs.h"
#include "MAC_INTERFACE/extern.h"
#include "defs.h"
#include "extern.h"
//#define DEBUG_ULSCH
openair1/PHY/MODULATION/slot_fep.c
-1
View File
@@ -27,7 +27,6 @@
*******************************************************************************/
#include "PHY/defs.h"
#include "MAC_INTERFACE/extern.h"
#include "defs.h"
//#define DEBUG_FEP
openair1/PHY/MODULATION/slot_fep_mbsfn.c
-1
View File
@@ -27,7 +27,6 @@
*******************************************************************************/
#include "PHY/defs.h"
#include "MAC_INTERFACE/extern.h"
#include "defs.h"
//#define DEBUG_FEP
openair1/PHY/extern.h
+2 -5
View File
@@ -30,7 +30,7 @@
#define __PHY_EXTERN_H__
#include "PHY/defs.h"
#include "PHY_INTERFACE/defs.h"
extern char* namepointer_chMag ;
extern char* namepointer_log2;
@@ -39,10 +39,7 @@ extern char fmageren_name2[512];
extern unsigned int RX_DMA_BUFFER[4][NB_ANTENNAS_RX];
extern unsigned int TX_DMA_BUFFER[4][NB_ANTENNAS_TX];
#ifdef OPENAIR_LTE
#include "PHY/LTE_TRANSPORT/extern.h"
#include "MAC_INTERFACE/defs.h"
#include "MAC_INTERFACE/extern.h"
#include "SIMULATION/ETH_TRANSPORT/extern.h"
extern unsigned int DAQ_MBOX;
@@ -56,6 +53,7 @@ extern PHY_VARS_eNB ***PHY_vars_eNB_g;
extern PHY_VARS_RN **PHY_vars_RN_g;
extern LTE_DL_FRAME_PARMS *lte_frame_parms_g;
extern MAC_xface *mac_xface;
extern short primary_synch0[144];
@@ -78,7 +76,6 @@ extern char mode_string[4][20];
#include "PHY/LTE_TRANSPORT/extern.h"
#endif
#ifndef OPENAIR2
extern unsigned char NB_eNB_INST;
openair1/SCHED/phy_mac_stub.c
-2
View File
@@ -40,8 +40,6 @@
#include "PHY/defs.h"
#include "PHY/extern.h"
#include "MAC_INTERFACE/defs.h"
#include "MAC_INTERFACE/extern.h"
#include "SCHED/defs.h"
#include "SCHED/extern.h"
#include "LAYER2/MAC/extern.h"
openair1/SCHED/phy_procedures_lte_common.c
-2
View File
@@ -39,8 +39,6 @@
*/
#include "PHY/defs.h"
#include "PHY/extern.h"
#include "MAC_INTERFACE/defs.h"
#include "MAC_INTERFACE/extern.h"
#include "SCHED/defs.h"
#include "SCHED/extern.h"
openair1/SCHED/phy_procedures_lte_eNb.c
-2
View File
@@ -40,8 +40,6 @@
#include "PHY/defs.h"
#include "PHY/extern.h"
#include "MAC_INTERFACE/defs.h"
#include "MAC_INTERFACE/extern.h"
#include "SCHED/defs.h"
#include "SCHED/extern.h"
openair1/SCHED/phy_procedures_lte_ue.c
-2
View File
@@ -42,8 +42,6 @@
#include "defs.h"
#include "PHY/defs.h"
#include "PHY/extern.h"
#include "MAC_INTERFACE/defs.h"
#include "MAC_INTERFACE/extern.h"
#include "SCHED/defs.h"
#include "SCHED/extern.h"
openair2/LAYER2/MAC/rar_tools.c
-2
View File
@@ -39,8 +39,6 @@
#include "defs.h"
#include "proto.h"
#include "extern.h"
#include "MAC_INTERFACE/defs.h"
#include "MAC_INTERFACE/extern.h"
#include "SIMULATION/TOOLS/defs.h"
#include "UTIL/LOG/log.h"
#include "OCG.h"
openair2/LAYER2/MAC/vars.h
+1
View File
@@ -55,6 +55,7 @@ const uint32_t BSR_TABLE[BSR_TABLE_SIZE]= {0,10,12,14,17,19,22,26,31,36,42,49,57
//uint32_t EBSR_Level[63]={0,10,13,16,19,23,29,35,43,53,65,80,98,120,147,181};
MAC_xface *mac_xface;
uint32_t RRC_CONNECTION_FLAG;
openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_dar.c
-1
View File
@@ -37,7 +37,6 @@
#include "rlc_primitives.h"
#include "mac_primitives.h"
#include "list.h"
#include "MAC_INTERFACE/extern.h"
#include "UTIL/LOG/log.h"
#include "UTIL/LOG/vcd_signal_dumper.h"
openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_receiver.c
-1
View File
@@ -36,7 +36,6 @@
#include "rlc_primitives.h"
#include "mac_primitives.h"
#include "list.h"
#include "MAC_INTERFACE/extern.h"
#include "UTIL/LOG/log.h"
//-----------------------------------------------------------------------------
openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_segment.c
-1
View File
@@ -40,7 +40,6 @@
#include "list.h"
#include "rlc_um.h"
#include "rlc_primitives.h"
#include "MAC_INTERFACE/extern.h"
#include "UTIL/LOG/log.h"
//-----------------------------------------------------------------------------
targets/RT/USER/lte-softmodem.c
-4
View File
@@ -77,8 +77,6 @@ struct gps_fix_t dummy_gps_data;
//#undef FRAME_LENGTH_COMPLEX_SAMPLES //there are two conflicting definitions, so we better make sure we don't use it at all
#include "PHY/vars.h"
#include "MAC_INTERFACE/vars.h"
//#include "SCHED/defs.h"
#include "SCHED/vars.h"
#include "LAYER2/MAC/vars.h"
@@ -88,13 +86,11 @@ struct gps_fix_t dummy_gps_data;
#include "SCHED/phy_procedures_emos.h"
#endif
#ifdef OPENAIR2
#include "LAYER2/MAC/defs.h"
#include "LAYER2/MAC/vars.h"
#include "LAYER2/MAC/proto.h"
#include "RRC/LITE/vars.h"
#include "PHY_INTERFACE/vars.h"
#endif
#ifdef SMBV
#include "PHY/TOOLS/smbv.h"
targets/RT/USER/lte-ue.c
-4
View File
@@ -75,13 +75,9 @@
#endif
#include "PHY/extern.h"
#include "MAC_INTERFACE/extern.h"
//#include "SCHED/defs.h"
#include "SCHED/extern.h"
#ifdef OPENAIR2
#include "LAYER2/MAC/extern.h"
#include "LAYER2/MAC/proto.h"
#endif
#include "UTIL/LOG/log_extern.h"
#include "UTIL/OTG/otg_tx.h"
targets/RT/USER/sched_dlsch.c
-8
View File
@@ -51,14 +51,6 @@
#include "SCHED/defs.h"
#include "MAC_INTERFACE/extern.h"
#ifdef CBMIMO1
#include "ARCH/CBMIMO1/DEVICE_DRIVER/cbmimo1_device.h"
#include "ARCH/CBMIMO1/DEVICE_DRIVER/extern.h"
#include "ARCH/CBMIMO1/DEVICE_DRIVER/defs.h"
#endif // CBMIMO1
#include "UTIL/LOG/vcd_signal_dumper.h"
#define DEBUG_PHY
targets/RT/USER/sched_rx_pdsch.c
-2
View File
@@ -51,8 +51,6 @@
#include "SCHED/defs.h"
#include "SCHED/extern.h"
#include "MAC_INTERFACE/extern.h"
#include "UTIL/LOG/vcd_signal_dumper.h"
RTIME time0,time1;
targets/SIMU/USER/channel_sim.c
-1
View File
@@ -39,7 +39,6 @@
#include "PHY/types.h"
#include "PHY/defs.h"
#include "PHY/extern.h"
#include "MAC_INTERFACE/extern.h"
#ifdef OPENAIR2
#include "LAYER2/MAC/defs.h"
targets/SIMU/USER/init_lte.c
-3
View File
@@ -38,14 +38,11 @@
#include "init_lte.h"
#include "PHY/extern.h"
#include "MAC_INTERFACE/extern.h"
#ifdef OPENAIR2
#include "LAYER2/MAC/defs.h"
#include "LAYER2/MAC/extern.h"
#include "UTIL/LOG/log_if.h"
#include "PHY_INTERFACE/extern.h"
#endif
targets/SIMU/USER/oaisim.c
-1
View File
@@ -53,7 +53,6 @@
#include "PHY/defs.h"
#include "PHY/LTE_TRANSPORT/proto.h"
#include "PHY/vars.h"
#include "MAC_INTERFACE/vars.h"
#include "SIMULATION/ETH_TRANSPORT/proto.h"
targets/SIMU/USER/oaisim_functions.c
-1
View File
@@ -51,7 +51,6 @@
#include "oaisim_functions.h"
#include "PHY/extern.h"
#include "MAC_INTERFACE/extern.h"
#include "LAYER2/MAC/extern.h"
#ifdef OPENAIR2
#include "LAYER2/MAC/proto.h"
targets/SIMU/USER/sinr_sim.c
-1
View File
@@ -40,7 +40,6 @@
#include "PHY/types.h"
#include "PHY/defs.h"
#include "PHY/extern.h"
#include "MAC_INTERFACE/extern.h"
#include "oaisim_config.h"
#ifdef OPENAIR2