laurent
da54778c4a
fix warnings
2020-05-03 18:27:07 +02:00
laurent
dfafa90037
big merge with develop
2020-04-14 18:02:45 +02:00
laurent
861caa735d
merge develop
2020-04-13 18:04:18 +02:00
Robert Schmidt
ffc4f464f5
Remove useless mac_proto.h include
...
When a header is changed, all including files need to be recompiled,
too. Thus, including a header needlessly all over the place drives
compile times up without any reason.
2020-04-01 08:49:26 +02:00
Raymond Knopp
9cf9ea7c99
remainder of merge
2020-03-14 13:50:07 +01:00
Raymond Knopp
914e17b57b
Merge remote-tracking branch 'origin/develop' into NR_RRCConfiguration
...
Conflicts:
executables/nr-softmodem.c
executables/nr-ue.c
executables/softmodem-common.c
openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
openair1/SCHED_NR/phy_procedures_nr_gNB.c
openair1/SIMULATION/NR_PHY/dlsim.c
openair1/SIMULATION/NR_PHY/ulsim.c
openair2/LAYER2/NR_MAC_UE/mac_proto.h
openair2/NR_PHY_INTERFACE/NR_IF_Module.c
openair2/RRC/NR/MESSAGES/asn1_msg.c
openair2/RRC/NR/MESSAGES/asn1_msg.h
openair2/RRC/NR/nr_rrc_config.c
openair2/RRC/NR/nr_rrc_defs.h
openair2/RRC/NR/nr_rrc_proto.h
openair2/RRC/NR/rrc_gNB.c
2020-03-14 12:45:02 +01:00
laurent
756ac05e4d
merge develop,fix basic sim and warnings
2020-03-04 13:32:03 +01:00
laurent
53db39b8a0
split 7.3 ready for merge
2020-03-02 15:41:21 +01:00
Gabriele Perrone
5ef412ec8a
Merge remote-tracking branch 'origin/tools_5Gadapt' into develop_integration_w08
2020-02-19 13:24:31 +01:00
frtabu
6014ca42ac
ENABLE_ITTI macro removal, modified telnet server to support all executables, modified record player to finalize switch to run-time option and allow usage with any device
2020-02-12 19:05:44 +01:00
matzakos
4e51e1ea10
nr-ip-ul-nos1: Merge with develop
2020-02-12 16:45:22 +01:00
Florian Kaltenberger
a01e93be0c
Merge remote-tracking branch 'origin/develop' into NR_RRCConfiguration
2020-02-09 21:38:04 +01:00
frtabu
64e4826c81
add softmodem-common.c and common error handler
2020-02-04 17:39:36 +01:00
cig
7344d87567
Merge branch 'fhg-ta' into fhg-ra
2020-02-03 10:45:29 +01:00
Cedric Roux
1c026a0b32
Merge remote-tracking branch 'origin/nr-dual-connectivity' into NR_RRCConfiguration
2020-01-28 12:28:26 +01:00
Florian Kaltenberger
8dac3a46c9
Merge remote-tracking branch 'origin/NR_RRCConfiguration' into NR_RRC_PUSCH
2020-01-24 15:22:14 +01:00
Florian Kaltenberger
9624fb0183
reactivating phy scope gNB
2020-01-24 15:08:32 +01:00
Cedric Roux
49d27bdf11
Merge remote-tracking branch 'origin/NR_RRCConfiguration' into nr-dual-connectivity
2020-01-23 16:37:21 +01:00
Raymond Knopp
0a136997d3
nr-ip-UL noS1: Merge with develop branch
2020-01-23 12:35:01 +01:00
matzakos
99fce8a359
nr-ip noS1 uplink: Uplink IP traffic successfully received at the IP TUN interface of the gNB now. Logs cleanup.
2020-01-22 13:05:10 +01:00
Francesco Mani
63866165ee
fixing some warnings
2020-01-22 09:50:57 +01:00
frtabu
61f6af80ad
build improvements: allow build mode selection (-g -G options) allow all exec build in one pass, remove remaining USE_MME macros in nr code
2020-01-20 19:06:15 +01:00
Francesco Mani
0c6b51015f
merge between FR2 and RRC branches
2020-01-16 17:20:56 +01:00
Raymond Knopp
3a52199351
Merge remote-tracking branch 'origin/NR_RRCConfiguration' into nr-dual-connectivity
2020-01-14 14:57:10 +01:00
matzakos
8f46241522
ENDC: Merge NR_RRCConfiguration into nr-dual-connectivity branch
2020-01-14 12:57:35 +01:00
Francesco Mani
e640af84ca
UE PHY parameters configured from fapi config req (UE is running, to be verified with gNB)
2020-01-13 10:29:56 +01:00
Raphael Defosseux
c409da3bb8
Patch provided by Gabriel Arrobo.
...
Mainly comestics and integer type management
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2020-01-09 14:10:04 +01:00
Raymond Knopp
8911335fc3
Merge remote-tracking branch 'origin/develop-nr' into NR_RRCConfiguration
2019-12-20 02:01:39 +01:00
Raymond Knopp
e30ab2d0c6
Merge remote-tracking branch 'origin/develop-nr' into NR_RRCConfiguration
...
Conflicts:
cmake_targets/CMakeLists.txt
executables/nr-ru.c
executables/nr-softmodem.c
openair1/PHY/INIT/nr_parms.c
openair1/PHY/INIT/phy_init.h
openair1/PHY/NR_TRANSPORT/nr_dlsch.c
openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c
openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
openair1/PHY/NR_UE_TRANSPORT/dci_tools_nr.c
openair1/SCHED_NR/fapi_nr_l1.c
openair1/SCHED_NR/nr_ru_procedures.c
openair1/SCHED_NR/phy_procedures_nr_common.c
openair1/SCHED_NR/phy_procedures_nr_gNB.c
openair1/SCHED_NR/sched_nr.h
openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
openair1/SIMULATION/NR_PHY/dlsim.c
openair2/GNB_APP/gnb_config.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/LAYER2/NR_MAC_gNB/main.c
openair2/RRC/NR/MESSAGES/asn1_msg.c
openair2/RRC/NR/MESSAGES/asn1_msg.h
openair2/RRC/NR/nr_rrc_defs.h
2019-12-15 22:04:40 +01:00
Florian Kaltenberger
320e3f1f14
Merge remote-tracking branch 'origin/develop-nr' into fix-clock-source
2019-12-13 16:42:04 +01:00
Cedric Roux
1a46b66d74
nr rlc: first commit
...
Initial implementation.
nr_rlc/nr_rlc_oai_api.c will need some clean rewrite at some point.
More testing is also needed.
2019-12-10 10:06:17 +01:00
Florian Kaltenberger
a78b5da529
fixes an issue with clock source
...
- command line paramter --clock-source can only be set at UE (removed this option from gNB)
- at gNB use clock_source from RU section in config file
- in both cases if clock_source is present in usrp_args, it will override clock_source
2019-12-06 08:54:17 +01:00
Francesco Mani
c6ec207487
adapting config_request to scf nfapi (compiling ok but still not running)
2019-12-04 13:41:13 +01:00
Raymond Knopp
930e1fde33
Merge remote-tracking branch 'origin/develop-nr' into NR_RRCConfiguration
...
Conflicts:
cmake_targets/CMakeLists.txt
executables/nr-ru.c
executables/nr-softmodem.c
nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h
openair1/PHY/INIT/nr_init.c
openair1/PHY/NR_TRANSPORT/nr_dci_tools.c
openair1/PHY/NR_TRANSPORT/nr_dlsch.c
openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
openair1/PHY/NR_TRANSPORT/nr_tbs_tools.c
openair1/PHY/NR_TRANSPORT/nr_transport_common_proto.h
openair1/PHY/NR_UE_ESTIMATION/nr_ue_measurements.c
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
openair1/SCHED_NR/nr_ru_procedures.c
openair1/SCHED_NR/phy_procedures_nr_common.c
openair1/SCHED_NR/phy_procedures_nr_gNB.c
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
openair1/SIMULATION/NR_PHY/dlsim.c
openair1/SIMULATION/NR_PHY/pbchsim.c
openair1/SIMULATION/NR_PHY/ulsim.c
openair2/COMMON/rrc_messages_types.h
openair2/GNB_APP/gnb_config.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
openair2/LAYER2/NR_MAC_gNB/main.c
openair2/RRC/NR/MESSAGES/asn1_msg.c
openair2/RRC/NR/MESSAGES/asn1_msg.h
2019-11-02 01:12:15 +01:00
matzakos
5cfcc415fc
Merge remote-tracking branch 'origin/NR_RRCConfiguration' into nr-dual-connectivity
2019-10-18 17:01:00 +02:00
Florian Kaltenberger
c046eb66a6
Merge remote-tracking branch 'origin/nr-ip-over-LTE-stack' into integration_develop-nr_2019w42
...
Conflicts:
executables/nr-softmodem.c
executables/nr-softmodem.h
targets/ARCH/rfsimulator/simulator.c
2019-10-14 13:40:03 +02:00
Raymond Knopp
d554707919
Merge remote-tracking branch 'origin/develop-nr' into NR_RRCConfiguration
...
Conflicts:
cmake_targets/CMakeLists.txt
executables/nr-gnb.c
nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h
openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_mPass.h
openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_types.h
openair1/PHY/INIT/nr_init_ue.c
openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
openair1/PHY/NR_UE_TRANSPORT/nr_prach.c
openair2/COMMON/rrc_messages_types.h
openair2/GNB_APP/gnb_config.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/LAYER2/NR_MAC_gNB/config.c
openair2/NR_PHY_INTERFACE/NR_IF_Module.c
openair2/RRC/NR/MESSAGES/asn1_msg.c
openair2/RRC/NR/nr_rrc_defs.h
openair2/RRC/NR/rrc_gNB.c
2019-10-10 12:29:20 +02:00
matzakos
7916e17666
ENDC: Add X2AP initial configuration and X2AP task in nr-softmodem. Small issue with parsing NRCCPARAMS_DESC from RCconfig_NR_X2() needs to be resolved
2019-10-08 18:48:39 +02:00
yilmazt
08eda57aca
final minor changes before the merge
2019-10-08 18:32:02 +02:00
yilmazt
e5a9f02af6
develop-nr merge
2019-10-07 12:04:58 +02:00
yilmazt
c348a9eec6
common thread-related minor functions in new .h file
2019-10-04 16:48:13 +02:00
Raymond Knopp
dfbe9fc1fd
nr-ip-over-LTE: Synch with develop-nr and modification of max limits on number of UEs and eNBs
2019-10-04 12:07:39 +02:00
yilmazt
84af6103f8
another batch of cppcheck error corrections
2019-09-24 11:59:17 +02:00
frtabu
b9b4d05e41
remove RRC_VERSION macros, simplify build-oai and CMakefile.txt accordingly, get rid of remaining compilation warnings (opt module improperly merged and patch asn1c files with tests against max 64 bits integer value)
2019-09-23 19:46:44 +02:00
matzakos
f629b77e63
nr-ip-over-LTE: Add checks for noS1 use case (nr-UE side)
2019-09-17 11:44:12 +02:00
Raymond Knopp
adf76a5f51
Merge remote-tracking branch 'origin/develop-nr' into nr_prach
...
Conflicts:
cmake_targets/CMakeLists.txt
cmake_targets/build_oai
executables/nr-ru.c
executables/nr-softmodem.c
nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h
openair1/PHY/INIT/nr_init.c
openair1/PHY/NR_UE_ESTIMATION/nr_ue_measurements.c
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
openair1/PHY/NR_UE_TRANSPORT/nr_transport_proto_ue.h
openair1/PHY/TOOLS/Makefile
openair1/PHY/TOOLS/lte_dfts.c
openair1/PHY/TOOLS/nr_phy_scope.c
openair1/SCHED_NR/phy_procedures_nr_common.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
openair1/SIMULATION/NR_PHY/pbchsim.c
openair1/SIMULATION/NR_PHY/pucchsim.c
openair1/SIMULATION/NR_PHY/ulschsim.c
openair1/SIMULATION/NR_PHY/ulsim.c
openair2/COMMON/rrc_messages_types.h
openair2/GNB_APP/RRC_nr_paramsvalues.h
openair2/GNB_APP/gnb_config.c
openair2/GNB_APP/gnb_paramdef.h
openair2/LAYER2/NR_MAC_gNB/config.c
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
openair2/NR_PHY_INTERFACE/NR_IF_Module.c
openair2/RRC/NR/MESSAGES/asn1_msg.c
openair2/RRC/NR/MESSAGES/asn1_msg.h
2019-09-05 05:01:26 +02:00
Raymond Knopp
b3a26f9548
New merge with develop-nr. DL IP traffic reaching up to UE's MAC layer now successfully.
2019-09-04 17:40:08 +02:00
Raymond Knopp
56d7f6fcaf
Merge remote-tracking branch 'origin/develop-nr' into nr_prach
...
Conflicts:
cmake_targets/CMakeLists.txt
cmake_targets/build_oai
executables/nr-ue.c
openair1/PHY/INIT/nr_init.c
openair1/PHY/NR_TRANSPORT/nr_dlsch.c
openair1/PHY/NR_TRANSPORT/nr_dlsch.h
openair1/PHY/NR_TRANSPORT/nr_transport_common_proto.h
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
openair1/PHY/defs_gNB.h
openair1/SCHED_NR/phy_procedures_nr_gNB.c
openair1/SCHED_NR_UE/defs.h
openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
openair1/SIMULATION/NR_PHY/dlsim.c
openair1/SIMULATION/NR_PHY/pucchsim.c
openair1/SIMULATION/NR_PHY/ulschsim.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
2019-07-29 15:48:26 +02:00
yilmazt
f37a17e540
develop&-nr current as of 22.7.19 & OAI fully ready for testing
2019-07-22 21:56:44 +02:00
Florian Kaltenberger
a980e8895e
fixing a few minor things for nr-softmodem and nr-uesoftmodem
2019-07-08 18:16:51 +02:00