• Raymond Knopp's avatar
    Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into l1-sidelink · 7cdabedc
    Raymond Knopp authored
    Conflicts:
    	cmake_targets/CMakeLists.txt
    	cmake_targets/build_oai
    	common/config/config_cmdline.c
    	open-nfapi.oai.patch
    	openair1/PHY/INIT/lte_init.c
    	openair1/PHY/LTE_TRANSPORT/dci.c
    	openair1/PHY/LTE_TRANSPORT/dci_tools.c
    	openair1/PHY/LTE_TRANSPORT/drs_modulation.c
    	openair1/SCHED/fapi_l1.c
    	openair1/SCHED/phy_procedures_lte_eNb.c
    	openair1/SCHED/phy_procedures_lte_ue.c
    	openair1/SCHED/ru_procedures.c
    	openair2/ENB_APP/enb_app.c
    	openair2/ENB_APP/enb_config.c
    	openair2/ENB_APP/enb_paramdef.h
    	openair2/ENB_APP/flexran_agent_common.c
    	openair2/LAYER2/MAC/config.c
    	openair2/LAYER2/MAC/defs.h
    	openair2/LAYER2/MAC/eNB_scheduler.c
    	openair2/LAYER2/MAC/eNB_scheduler_RA.c
    	openair2/LAYER2/MAC/eNB_scheduler_bch.c
    	openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
    	openair2/LAYER2/MAC/eNB_scheduler_mch.c
    	openair2/LAYER2/MAC/eNB_scheduler_primitives.c
    	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
    	openair2/LAYER2/MAC/flexran_agent_scheduler_dataplane.c
    	openair2/LAYER2/MAC/flexran_agent_scheduler_dlsch_ue.c
    	openair2/LAYER2/MAC/main.c
    	openair2/LAYER2/MAC/pre_processor.c
    	openair2/LAYER2/MAC/proto.h
    	openair2/LAYER2/MAC/ra_procedures.c
    	openair2/LAYER2/MAC/ue_procedures.c
    	openair2/LAYER2/PDCP_v10.1.0/pdcp.c
    	openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
    	openair2/LAYER2/RLC/rlc_rrc.c
    	openair2/PHY_INTERFACE/IF_Module.c
    	openair2/RRC/LITE/L2_interface.c
    	openair2/RRC/LITE/defs.h
    	openair2/RRC/LITE/proto.h
    	openair2/RRC/LITE/rrc_UE.c
    	openair2/RRC/LITE/rrc_common.c
    	openair2/RRC/LITE/rrc_eNB.c
    	openair2/UTIL/LOG/log.c
    	openair2/UTIL/LOG/log.h
    	openair3/GTPV1-U/gtpv1u_eNB.c
    	targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
    	targets/COMMON/create_tasks.c
    	targets/PROJECTS/GENERIC-LTE-EPC/CONF/oaiL1.nfapi.usrpb210.conf
    	targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.50PRB.nfapi.conf
    	targets/RT/USER/lte-enb.c
    	targets/RT/USER/lte-ru.c
    	targets/RT/USER/lte-softmodem.c
    	targets/RT/USER/lte-softmodem.h
    	targets/RT/USER/lte-ue.c
    	targets/SIMU/USER/channel_sim.c
    7cdabedc
L2_interface_ue.c 16.4 KB