Commit Graph
282 Commits
Author SHA1 Message Date
Wang Tsu-Han 310359c678 adding log for priority setting and using pipeline structure 2019-07-03 16:11:57 +02:00
Wang Tsu-Han a2bf9dc9f4 modified logging for PBCH and function pointer for uhd priority fix 2019-07-02 15:23:25 +02:00
Wang Tsu-Han dda7fbd74b adding NULL function for priority setting for plateform other than USRP 2019-07-02 14:50:50 +02:00
Wang Tsu-Han 29bfcdb371 modified uhd set priority to USRP only 2019-07-02 14:36:35 +02:00
yilmazt ce9c9ec88f develop and develop-nr are now current as of 14.6.19 2019-06-17 16:11:52 +02:00
WANG Tsu-Han a6ecd29f90 Merge branch 'develop-nr' into uhd_set_thread_prio
Conflicts:
	openair1/SCHED_NR/phy_procedures_nr_gNB.c
	targets/RT/USER/nr-ru.c
2019-06-11 17:00:39 +02:00
yilmazt a2cad44f0f Merging latest develop-nr commits 2019-06-06 21:44:15 +02:00
Raymond Knopp 4cd3d635f7 more pthread protection in nr-gnb.c 2019-05-21 19:25:02 +02:00
Raymond Knopp aaa3afb722 fix in usrp_lib.cpp 2019-05-21 16:02:34 +02:00
Florian Kaltenberger eaa83242a8 first try to add a function to the usrp_lib to set the thread priority 2019-05-21 07:14:56 +02:00
yilmazt ccd60195e0 Merging test-x310, ci-dev-nr-add-gnb-nr-ur-uspr-testing and nr-mimo-mode-clean branches 2019-05-20 21:32:34 +02:00
Raymond Knopp 38a2762d18 UHD transpor parameters for USB3 (like develop now) 2019-05-20 00:12:48 +02:00
matzakos 07d6d0ab02 fixed unwanted modification on ue NAS configuration. cleanup of commented code in usrp_lib.cpp 2019-05-19 21:18:20 +02:00
Raymond Knopp da9b879112 Merge remote-tracking branch 'origin/develop-nr' into develop-nr-less-logging
Conflicts:
	openair1/SCHED_NR/sched_nr.h
2019-05-18 15:49:13 +02:00
yilmazt 7719314983 Merge branch 'develop' into develop-nr 2019-05-17 17:11:31 +02:00
Florian Kaltenberger b472d97b27 Merge remote-tracking branch 'origin/develop-nr' into test-x310 2019-05-14 09:47:39 +02:00
Florian Kaltenberger 01879c3e2b Merge remote-tracking branch 'origin/develop-nr' into develop-nr-less-logging 2019-05-14 09:20:16 +02:00
matzakos d44479ffec tuning on laptops and fix of race condition between L1_RX -> L1_TX 2019-05-08 10:53:00 +02:00
Raymond Knopp c3b3b39ef8 :wqMerge branch 'develop-nr-less-logging' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nr-less-logging 2019-05-05 21:57:33 +02:00
Raymond Knopp 317cbfd601 minor changes to thread synchronization after testing with N310 @ 122.88 Ms/s 2019-05-05 21:52:03 +02:00
Raymond Knopp c66fc1fd28 Merge branch 'develop-nr-less-logging' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nr-less-logging
Conflicts:
	openair1/SCHED_NR/phy_procedures_nr_gNB.c
2019-05-03 13:38:16 +02:00
Raymond Knopp 26d5eb90b6 intermediate commit to synch machine 2019-05-03 13:37:22 +02:00
Raymond Knopp 4c3c8f2c6c more logging removal 2019-05-03 13:33:07 +02:00
laurent ba6d47a758 rework threads in 5G 2019-04-30 21:46:49 +02:00
laurent 8a92138086 rework threads in 5G 2019-04-30 10:17:08 +02:00
Rakesh Mundlamuri a531ea62fa The changes made in this branch is to enable -E(threequarter sampling rate) option for mu=1 and 217PRB(ie; 80 MHz) to run on USRP x310. 2019-04-19 17:24:18 +05:30
Raymond Knopp ca111641d4 Merge remote-tracking branch 'origin/develop' into ru_rau_enhancement_L1_renaming
Conflicts:
	cmake_targets/build_oai
	cmake_targets/oaisim_build_oai/CMakeLists.template
	cmake_targets/oaisim_mme_build_oai/CMakeLists.template
	cmake_targets/oaisim_noS1_build_oai/CMakeLists.template
	openair1/PHY/LTE_ESTIMATION/lte_sync_time.c
	openair1/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c
	openair1/PHY/LTE_TRANSPORT/dci_tools.c
	openair1/PHY/LTE_TRANSPORT/if4_tools.c
	openair1/PHY/LTE_TRANSPORT/prach.c
	openair1/PHY/LTE_TRANSPORT/pucch.c
	openair1/PHY/LTE_UE_TRANSPORT/dlsch_demodulation.c
	openair1/PHY/impl_defs_lte.h
	openair1/SCHED/fapi_l1.c
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair1/SIMULATION/LTE_PHY/dlsim.c
	openair2/ENB_APP/enb_config.c
	openair2/ENB_APP/enb_paramdef.h
	openair2/LAYER2/MAC/eNB_scheduler_RA.c
	openair2/LAYER2/MAC/eNB_scheduler_primitives.c
	targets/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c
	targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-ru.c
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-softmodem.h
2019-04-14 20:34:03 +02:00
Florian Kaltenberger 7ca8fc9de1 increasing timeout on trx_read for x300/n300 in usrp_lib.cpp
removing unncesessary sleeps and mallocs, improving error messages in nr-ue.c
2019-03-21 15:40:36 +01:00
Robert Schmidt 544d80c40d Merge branch 'develop' into feature-127-protocol-split 2019-02-25 18:06:35 +01:00
Raphael Defosseux 929d71d06d Merge remote-tracking branch 'origin/uhd_3131_fix' into develop_integration_2019_w08 2019-02-22 12:14:12 +01:00
Robert Schmidt 030e11ba9a Merge branch 'develop' into feature-127-protocol-split 2019-02-21 20:18:35 +01:00
Florian Kaltenberger 7fd089fe3f putting back uhd transport args for b200 with a reduced frame size. This is still compatible with uhd 3.13.1 and above. 2019-02-21 13:36:38 +01:00
matzakos c1364f0117 changes to make oai work with UHD 3.13.1 2019-02-20 16:45:39 +01:00
frtabu 299f627d8a more fixes for cppcheck, soon all the easiest ones completed (invalid printf format...) 2019-02-12 10:12:07 +01:00
Raymond Knopp d24f521a5a Merge remote-tracking branch 'origin/develop' into enhancement-ltem
Conflicts:
	openair1/PHY/INIT/lte_init.c
	openair1/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c
	openair1/PHY/LTE_TRANSPORT/dci.c
	openair1/PHY/LTE_TRANSPORT/dci_tools.c
	openair1/PHY/LTE_TRANSPORT/dlsch_coding.c
	openair1/PHY/LTE_TRANSPORT/edci.c
	openair1/PHY/LTE_TRANSPORT/if4_tools.c
	openair1/PHY/LTE_TRANSPORT/prach.c
	openair1/PHY/LTE_TRANSPORT/print_stats.c
	openair1/PHY/LTE_TRANSPORT/pucch.c
	openair1/PHY/LTE_TRANSPORT/transport_eNB.h
	openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
	openair1/PHY/LTE_UE_TRANSPORT/transport_proto_ue.h
	openair1/PHY/impl_defs_lte.h
	openair1/SCHED/fapi_l1.c
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair2/COMMON/rrc_messages_types.h
	openair2/ENB_APP/enb_config.c
	openair2/ENB_APP/enb_paramdef.h
	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_primitives.c
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
	openair2/LAYER2/MAC/pre_processor.c
	openair2/LAYER2/MAC/rar_tools.c
	openair2/LAYER2/MAC/ue_procedures.c
	openair2/PHY_INTERFACE/IF_Module.c
	openair2/RRC/LITE/rrc_common.c
	openair2/RRC/LTE/L2_interface_ue.c
	openair2/RRC/LTE/MESSAGES/asn1_msg.c
	openair2/RRC/LTE/rrc_eNB.c
	targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-ru.c
2018-10-29 07:54:17 +01:00
Florian Kaltenberger aff8b57cce adding support for N300 to gNB config 2018-10-25 04:28:24 -07:00
Raymond Knopp 9b3e36a79d debugging of OTA synchronization (sirius) 2018-10-22 08:01:40 +02:00
Raymond Knopp ea11edadb3 Merge remote-tracking branch 'origin/develop' into ru_rau_enhancement-external-timing 2018-10-19 09:50:42 +02:00
Florian Kaltenberger 84d04b3cd5 new interpretation of sdr_addrs string in RU config file: this is now directly passed to the uhd to specify a device. It may contain a device type (i.e., "type=x300") or an IP address (i.e., "addr=192.168.10.2") 2018-09-28 00:11:35 -07:00
Florian Kaltenberger c4afc399fc astyling usrp_lib.cpp 2018-09-28 00:08:13 -07:00
Cedric Roux 99535adacc integration: remove compilation warning 2018-08-31 12:02:04 +02:00
Eino Virtanen be0e409594 USRP addressess and clock sources can be configured in the configuration file with the RU section with comma separated IP addresses in 'sdr_addrs' and with strings "internal"/"external"/"gpsdo" in 'clock_src'.
TODO: Currently the driver picks the two first RX and TX channels when nb_tx and nb_rx are both set to 2. If a developers wants to force usage of two devices, 'set_rx_subdev_spec' and 'set_tx_subdev_spec' can be used to indicate to the driver so that antennas from separate devices will be used. To rephrase: until 4 antennas are supported by OAI, testing with two devices, so that antennas from both devices are used, requires manual configuration of which subdevices' antennas are used.

Conflicts:
	targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
2018-08-16 16:22:13 +02:00
Raymond Knopp 91d23cb31d Merge remote-tracking branch 'origin/ru_rau_enhancement' into ru_rau_enhancement-external-timing
Conflicts:
	targets/RT/USER/lte-ru.c
	targets/RT/USER/lte-softmodem.h
2018-08-09 09:45:57 +02:00
Raymond Knopp f7dfb6c6b2 Merge remote-tracking branch 'origin/develop' into ru_rau_enhancement
Conflicts:
	cmake_targets/build_oai
	openair1/PHY/LTE_TRANSPORT/prach.c
	openair1/PHY/LTE_TRANSPORT/pucch.c
	openair1/PHY/LTE_UE_TRANSPORT/initial_sync.c
	openair1/SCHED/fapi_l1.c
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair2/LAYER2/MAC/eNB_scheduler.c
	openair2/LAYER2/MAC/eNB_scheduler_RA.c
	openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
	openair2/LAYER2/MAC/eNB_scheduler_primitives.c
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
	targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-ru.c
	targets/RT/USER/lte-softmodem.h
2018-08-07 19:44:53 +02:00
Cedric Roux 409b3d5c20 Merge remote-tracking branch 'origin/issue326_LOGreview' into develop_integration_2018_w31 2018-08-03 09:45:26 +02:00
frtabu b85cbddeec log.c simplification, fix usefull functionality which never worked, move all log code from openair2 to common 2018-07-30 20:07:22 +02:00
bruno mongazon-cazavet 006fced248 Fix #334 2018-07-23 16:25:34 +02:00
Cedric Roux 5c6ad3142d Merge remote-tracking branch 'origin/develop' into mu_with_tdd1
The monolithic eNodeB is not fully functional in FDD.

The TDD mode has not been tested.

Do not consider this commit as functional.

Conflicts:
	cmake_targets/CMakeLists.txt
	cmake_targets/build_oai
	common/utils/itti/intertask_interface.c
	openair1/PHY/INIT/lte_init.c
	openair1/PHY/LTE_ESTIMATION/lte_adjust_sync.c
	openair1/PHY/LTE_TRANSPORT/dci_tools.c
	openair1/PHY/LTE_TRANSPORT/dlsch_scrambling.c
	openair1/PHY/LTE_TRANSPORT/transport_eNB.h
	openair1/PHY/LTE_UE_TRANSPORT/transport_proto_ue.h
	openair1/PHY/defs_eNB.h
	openair1/PHY/impl_defs_lte.h
	openair1/SCHED/fapi_l1.c
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair1/SCHED/pusch_pc.c
	openair2/COMMON/platform_types.h
	openair2/COMMON/rrc_messages_types.h
	openair2/ENB_APP/enb_config.c
	openair2/ENB_APP/enb_paramdef.h
	openair2/LAYER2/MAC/config.c
	openair2/LAYER2/MAC/eNB_scheduler.c
	openair2/LAYER2/MAC/eNB_scheduler_RA.c
	openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
	openair2/LAYER2/MAC/eNB_scheduler_primitives.c
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
	openair2/LAYER2/MAC/flexran_agent_scheduler_dlsch_ue.c
	openair2/LAYER2/MAC/mac.h
	openair2/LAYER2/MAC/mac_proto.h
	openair2/LAYER2/MAC/pre_processor.c
	openair2/LAYER2/RLC/rlc.c
	openair2/LAYER2/RLC/rlc_rrc.c
	openair2/RRC/LITE/rrc_common.c
	openair2/RRC/LTE/L2_interface.c
	openair2/RRC/LTE/MESSAGES/asn1_msg.c
	openair2/RRC/LTE/rrc_eNB.c
	openair2/UTIL/LOG/log.h
	targets/COMMON/openairinterface5g_limits.h
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-ru.c
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-softmodem.h
2018-06-12 16:23:36 +02:00
sharma 3c1c5a1508 merge in changes from local copy which were made just prior to Orange Research Day demonstration 2018-06-04 08:15:16 +02:00
Raymond Knopp 8a11946f73 Merge remote-tracking branch 'origin/develop' into ru_rau_enhancement 2018-05-28 11:53:34 +02:00