Merge branch 'bler_txoptim' into F1C_extensions_develop
Conflicts: cmake_targets/CMakeLists.txt common/utils/nr/nr_common.c openair1/PHY/INIT/nr_parms.c openair1/PHY/NR_TRANSPORT/pucch_rx.c openair1/PHY/NR_UE_TRANSPORT/dci_nr.c openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c openair1/PHY/NR_UE_TRANSPORT/pucch_nr.c openair1/SCHED_NR/fapi_nr_l1.c openair1/SCHED_NR/phy_procedures_nr_gNB.c openair1/SCHED_NR_UE/phy_procedures_nr_ue.c openair1/SIMULATION/NR_PHY/dlschsim.c openair1/SIMULATION/NR_PHY/dlsim.c openair2/GNB_APP/gnb_config.c openair2/LAYER2/NR_MAC_UE/config_ue.c openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c openair2/LAYER2/NR_MAC_gNB/main.c openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c openair2/RRC/NR/L2_nr_interface.c openair2/RRC/NR/MESSAGES/asn1_msg.c openair2/RRC/NR/MESSAGES/asn1_msg.h openair2/RRC/NR/rrc_gNB_NGAP.c openair3/NAS/NR_UE/nr_nas_msg_sim.c openair3/NAS/NR_UE/nr_nas_msg_sim.h openair3/ocp-gtpu/gtp_itf.cpp targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
This commit is contained in:
Raymond Knopp
@@ -1,123 +0,0 @@
|
||||
include $(OPENAIR_TARGETS)/Makefile.common
|
||||
ifdef TEST_OMG
|
||||
|
||||
CC= gcc
|
||||
|
||||
OBJstatic = OMG.c common.c static.c
|
||||
OBJrwp = OMG.c common.c job.c rwp.c
|
||||
OBJrwalk = OMG.c common.c job.c rwalk.c
|
||||
OBJtrace = OMG.c common.c job.c trace.c mobility_parser.c hashtable.c
|
||||
OBJsumo = OMG.c common.c sumo.c client_traci_OMG.c socket_traci_OMG.c storage_traci_OMG.c id_manager.c
|
||||
|
||||
OBJ = OMG.c common.c static.c job.c rwp.c rwalk.c trace.c sumo.c mobility_parser.c hashtable.c client_traci_OMG.c socket_traci_OMG.c storage_traci_OMG.c id_manager.c
|
||||
|
||||
CFLAGS += -m32 -DTEST_OMG
|
||||
|
||||
.PHONY: help staticOMG rwpOMG clean
|
||||
|
||||
help:
|
||||
@echo ' "make staticOMG" to compile the STATIC version'
|
||||
@echo ' "make rwpOMG" to compile the RWP version'
|
||||
@echo ' "make rwalkOMG" to compile the RWALK version'
|
||||
@echo ' "make traceOMG" to compile the TRACE version'
|
||||
@echo ' "make sumoOMG" to compile the SUMO version'
|
||||
@echo ' "make clean" to remove the generated files and restore the original distribution'
|
||||
@echo ' "make OMG" to compile the complete version'
|
||||
|
||||
|
||||
staticOMG: ${OBJstatic}
|
||||
${CC} ${OBJstatic} -o staticOMG $(CFLAGS)
|
||||
|
||||
|
||||
rwpOMG: ${OBJrwp}
|
||||
${CC} ${OBJrwp} -lm -o rwpOMG $(CFLAGS)
|
||||
@#-lm: used to link to math lib
|
||||
|
||||
traceOMG:${OBJtrace}
|
||||
${CC} ${OBJtrace} -lm -o traceOMG $(CFLAGS)
|
||||
|
||||
rwalkOMG: ${OBJrwalk}
|
||||
${CC} ${OBJrwalk} -lm -o rwalkOMG $(CFLAGS)
|
||||
|
||||
sumoOMG: ${OBJsumo}
|
||||
${CC} ${OBJsumo} -lm -o rwalkOMG $(CFLAGS)
|
||||
|
||||
OMG: ${OBJ}
|
||||
${CC} ${OBJ} -lm -o OMG $(CFLAGS)
|
||||
|
||||
clean:
|
||||
@echo "Cleaning"
|
||||
@rm OMG
|
||||
@#rm rwpOMG
|
||||
@#rm rwalkOMG
|
||||
@#rm traceOMG
|
||||
@#rm staticOMG
|
||||
@#rm OMG
|
||||
|
||||
else
|
||||
|
||||
TOP_DIR = ../..
|
||||
OPENAIR1_TOP = ../..
|
||||
OPENAIR2_TOP = ../../../openair2
|
||||
OPENAIR3_TOP = ../../../openair3
|
||||
OPENAIR3 = $(OPENAIR3_DIR)
|
||||
|
||||
CFLAGS += -DPHYSIM -DNODE_RG -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TX=2 -DMAX_MODULES=1 -I/usr/include/X11 #-Wno-packed-bitfield-compat
|
||||
|
||||
|
||||
CFLAGS += -DOPENAIR_LTE -DOPENAIR2 #-DOFDMA_ULSCH -DIFFT_FPGA -DIFFT_FPGA_UE
|
||||
|
||||
#CFLAGS += -DXFORMS
|
||||
|
||||
ifdef DEBUG_PHY
|
||||
CFLAGS += -DDEBUG_PHY
|
||||
endif
|
||||
|
||||
ifdef PDCP_USE_NETLINK
|
||||
CFLAGS += -DPDCP_USE_NETLINK -DLINUX -DDEBUG_CONTROL
|
||||
endif
|
||||
|
||||
include $(OPENAIR1_DIR)/PHY/Makefile.inc
|
||||
include $(OPENAIR1_DIR)/SCHED/Makefile.inc
|
||||
include $(OPENAIR2_DIR)/LAYER2/Makefile.inc
|
||||
include $(OPENAIR1_DIR)/SIMULATION/ETH_TRANSPORT/Makefile.inc
|
||||
|
||||
SIMULATION_OBJS = $(TOP_DIR)/SIMULATION/TOOLS/gauss.o
|
||||
SIMULATION_OBJS += $(TOP_DIR)/SIMULATION/TOOLS/random_channel.o
|
||||
SIMULATION_OBJS += $(TOP_DIR)/SIMULATION/TOOLS/rangen_double.o
|
||||
SIMULATION_OBJS += $(TOP_DIR)/SIMULATION/TOOLS/taus.o
|
||||
SIMULATION_OBJS += $(TOP_DIR)/SIMULATION/TOOLS/multipath_channel.o
|
||||
SIMULATION_OBJS += $(TOP_DIR)/SIMULATION/RF/rf.o
|
||||
SIMULATION_OBJS += $(TOP_DIR)/SIMULATION/RF/adc.o
|
||||
SIMULATION_OBJS += $(TOP_DIR)/SIMULATION/RF/dac.o
|
||||
|
||||
OBJ = $(PHY_OBJS) $(SIMULATION_OBJS) $(ETHERNET_TRANSPORT_OBJS) $(TOOLS_OBJS) $(SCHED_OBJS) $(STATS_OBJS)
|
||||
|
||||
all: physim
|
||||
|
||||
|
||||
$(OBJ) : %.o : %.c
|
||||
$(CC) -c $(CFLAGS) $(EXTRA_CFLAGS) -DPHY_CONTEXT=1 -I$(TOP_DIR) $(L2_incl) -o $@ $<
|
||||
|
||||
$(L2_OBJS) : %.o : %.c
|
||||
$(CC) -c $(CFLAGS) $(EXTRA_CFLAGS) -DMAC_CONTEXT=1 -DPHY_CONTEXT=1 -I$(TOP_DIR) $(L2_incl) -o $@ $<
|
||||
|
||||
physim : $(OBJ) $(L2_OBJS) OMG.c common.c static.c job.c rwp.c rwalk.c hashtable.c mobility_parser.c trace.c -I$(TOP_DIR) $(L2_incl) -o physim $(CFLAGS) $(EXTRA_CFLAGS) $(OBJ) $(L2_OBJS) -lm -lforms -L/usr/local/lib -lforms -lX11 -L/usr/X11R6/lib -lXpm -lblas -lpthread
|
||||
|
||||
clean:
|
||||
rm -f physim
|
||||
rm -f $(OBJ)
|
||||
rm -f $(L2_OBJS)
|
||||
rm -f *.o
|
||||
rm -f *.exe*
|
||||
|
||||
cleanl1:
|
||||
rm -f physim
|
||||
rm -f $(OBJ)
|
||||
rm -f *.o
|
||||
rm -f *.exe
|
||||
cleanl2:
|
||||
rm -f $(L2_OBJS)
|
||||
|
||||
endif
|
||||
|
||||
@@ -408,7 +408,7 @@ static void SendFrameNR(guint8 radioType, guint8 direction, guint8 rntiType,
|
||||
guint8 isPredefinedData, guint8 retx, guint8 crcStatus,
|
||||
guint8 oob_event, guint8 oob_event_value,
|
||||
uint8_t *pdu_buffer, unsigned int pdu_buffer_size) {
|
||||
unsigned char frameBuffer[9000];
|
||||
unsigned char frameBuffer[12000];
|
||||
unsigned int frameOffset;
|
||||
ssize_t bytesSent;
|
||||
frameOffset = 0;
|
||||
|
||||
@@ -37,8 +37,8 @@ unsigned int start_log_GP=0;
|
||||
unsigned int start_log_GP_bg=0;
|
||||
unsigned int start_log_jitter=0;
|
||||
|
||||
#include"otg_kpi.h"
|
||||
#include"otg_externs.h"
|
||||
#include "otg_kpi.h"
|
||||
#include "otg_externs.h"
|
||||
|
||||
extern unsigned char NB_eNB_INST;
|
||||
extern uint16_t NB_UE_INST;
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
#ifndef __OTG_RX_SOCKET_H__
|
||||
#define __OTG_RX_SOCKET_H__
|
||||
|
||||
#include"otg.h"
|
||||
#include "otg.h"
|
||||
|
||||
|
||||
//-----------------------begin func proto-------------------
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
* \warning
|
||||
*/
|
||||
|
||||
#include"otg_tx_socket.h"
|
||||
#include "otg_tx_socket.h"
|
||||
#include "otg_vars.h"
|
||||
|
||||
|
||||
|
||||
@@ -37,8 +37,8 @@
|
||||
#include <unistd.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include"otg.h"
|
||||
#include"otg_tx.h"
|
||||
#include "otg.h"
|
||||
#include "otg_tx.h"
|
||||
|
||||
|
||||
//-----------------------begin func proto-------------------
|
||||
|
||||
Reference in New Issue
Block a user