Commit Graph
138 Commits
Author SHA1 Message Date
Florian Kaltenberger aff8b57cce adding support for N300 to gNB config 2018-10-25 04:28:24 -07: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
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 0c445bedda Merge remote-tracking branch 'origin/bugfix-310-IQrecplay' into develop 2018-06-18 16:25:48 +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
bruno mongazon acbd1f1f7d fix issue 310 IQrecplay 2018-06-04 13:05:13 +02:00
Haruki NAOI 8bec50653f Fix: eNB output core dump file when exiting eNB process. 2018-05-18 10:01:07 +09:00
Raymond Knopp b2cc1252c6 Merge remote-tracking branch 'origin/develop' into RU-RAU-split-parallel-EMUFH-phy-test-merge
Conflicts:
	cmake_targets/build_oai
	common/utils/itti/intertask_interface.c
	openair1/PHY/INIT/lte_init.c
	openair1/PHY/LTE_TRANSPORT/dci.c
	openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
	openair1/PHY/defs.h
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair2/ENB_APP/enb_paramdef.h
	openair2/LAYER2/MAC/defs.h
	openair2/LAYER2/MAC/eNB_scheduler.c
	targets/ARCH/COMMON/common_lib.c
	targets/COMMON/create_tasks.c
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-ru.c
	targets/RT/USER/lte-softmodem.h
2018-03-12 12:10:48 +01:00
Wu Jing ba8a111ea1 merge the latest develop branch into issue289 2018-02-01 19:25:29 +09:00
Massive f0376d1b4f adding uhd network interface 2018-01-19 13:00:51 +01:00
Cedric Roux 55641754d9 Merge remote-tracking branch 'origin/issue281_iq_filename' into develop_integration_2018_w02 2018-01-15 15:58:48 +01:00
Cedric Roux 922b5b595a Fix NFAPI integration
This commit fixes issues introduced by the previous commit.

Summary of work:
- cleanup:
  - fix LOG_XX to be less verbose
  - fix cmake_targets/CMakeLists.txt
  - fix oaienv
  - remove dead code
- bug fixes:
  - in openair1/SCHED/fapi_l1.c we had:
      eNB->pdcch_vars[subframe&1].num_dci           = number_dci;
    should be:
      eNB->pdcch_vars[subframe&1].num_dci           = 0;
    This bug let the PHY send more DCIs than what should have been
    sent because num_dci is incremented later on in the code.
    This fix may be a problem for fapi mode, to be checked.
  - add new T VCD traces
  - revert openair1/PHY/TOOLS/file_output.c to 'develop' version
  - remove thread_id in logRecord/logRecord_mt
  - revert (and adapt) configuration files
  - be careful when doing frame++, we need to % 1024
  - revert target_rx_power in openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
- NFAPI:
  - the open-nFAPI code has been included in the repository. See nfapi/README.
    Maybe we should "git clone" the Cisco repository instead. We have to be
    careful of availability though.

What has been tested:
- monolithic eNB FDD 5/10MHz with one UE, iperf UDP/TCP uplink/downlink

Anything else may fail to work, especially the FAPI mode, which has not
been tested at all.
2018-01-15 15:24:50 +01:00
Cedric Roux 7757b9e7e7 import NFAPI work from David Price from Cisco (non-working commit, do not use it)
It has been chosen to not include the full history of commits
from David. He included a binary version of wireshark, probably
a modified one that understands NFAPI. Wireshark is released under
the GPL license, we cannot include it in the repository. We could
have done a next commit to remove this binary. But then it would
still be present in the history of commits, which may not be allowed.
And it would take space on disk. We could edit the history to remove
wireshark entirely. But this operation is too complicated.

There was also a pcap capture file, which has nothing to do in
the history of commits and would take space on disk. There again,
it's too difficult to edit the history to remove it.

There was a file .gitignore that was also removed.

The original history can be found on David's repository:
https://gitlab.eurecom.fr/daveprice/openairinterface5g/
The branch is: nfapi-ru-rau-split.

A copy of that branch has been included in the internal OAI
repository, for those who have access to it.
The branch is the same. The last commit ID is
9106438239e0bc626ff1fa1d97d911caadd0fbb9.

You can compare the current commit with the commit 9106...
to see what differs.

The current commit has to be considered non-working.
The commit following the current commit will fix problems with
the work in the current commit.

If you use git bisect, don't spend time analyzing the current
commit.
2018-01-15 11:32:30 +01:00
bruno mongazon 1823ce9525 Fix #281 2018-01-11 10:37:17 +01:00
Xu Bo 663b1d8b7b fix bugs for hundreds_of_ues(UE SCD) 2017-12-27 13:23:06 +09:00
bruno mongazon 98e87ab193 provides feature #272 iq record-playback 2017-11-20 16:21:25 +01:00
bruno mongazon 90731761e3 This commit provides the IQ record-playback feature know under issue #272 2017-11-14 19:03:46 +01:00
Cedric Roux b4a48e199e Merge remote-tracking branch 'origin/update-license' into RU-RAU-split
Conflicts:
	openair1/PHY/CODING/rate_matching.c
	openair1/PHY/LTE_REFSIG/primary_synch.h
	openair2/LAYER2/layer2_top.c
	openair2/RRC/LITE/rrc_config.c
2017-10-23 15:00:30 +02:00
Wang Tsu-Han 23c54b8db4 added parallelization of fep and encoding
added numerology paramter
2017-10-23 14:47:26 +02:00
Cedric Roux 1b1f941e3c upgrade license to version 1.1 2017-10-23 12:22:13 +02:00
Cedric Roux 4aa1a41edc bugfix: fix usrp_lib.cpp 2017-09-27 18:02:21 +02:00
Raymond Knopp bc9c587b48 Merge remote-tracking branch 'origin/develop' into RU-RAU-split
Conflicts:
	openair1/PHY/INIT/lte_init.c
	openair1/PHY/LTE_ESTIMATION/defs.h
	openair1/PHY/LTE_ESTIMATION/lte_ue_measurements.c
	openair1/PHY/LTE_TRANSPORT/dci.c
	openair1/PHY/LTE_TRANSPORT/dci_tools.c
	openair1/PHY/LTE_TRANSPORT/defs.h
	openair1/PHY/LTE_TRANSPORT/dlsch_decoding.c
	openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
	openair1/PHY/LTE_TRANSPORT/dlsch_llr_computation.c
	openair1/PHY/LTE_TRANSPORT/if5_tools.c
	openair1/PHY/LTE_TRANSPORT/phich.c
	openair1/PHY/LTE_TRANSPORT/proto.h
	openair1/PHY/defs.h
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair1/SCHED/phy_procedures_lte_ue.c
	openair1/SCHED/pusch_pc.c
	openair2/ENB_APP/enb_config.c
	openair2/LAYER2/MAC/defs.h
	openair2/LAYER2/MAC/eNB_scheduler.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/ue_procedures.c
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-softmodem.h
	targets/RT/USER/lte-ue.c
	targets/SIMU/USER/init_lte.c
	targets/SIMU/USER/oaisim_functions.c
2017-09-26 21:43:03 -07:00
Raymond Knopp 91f312ebde 12->16bit rescaling (transmission) for USRP device 2017-09-20 23:34:54 -07:00
Florian Kaltenberger 592bcf3867 fix in trx_usrp_start when gpsdo is not used 2017-08-22 15:48:07 +02:00
Florian Kaltenberger c5fd670803 making use of gpsdo optional 2017-08-18 17:18:02 +02:00
Florian Kaltenberger 9c167fc3bf adding GPIO control for TDD to USRP 2017-08-18 11:13:47 +02:00
Florian Kaltenberger d7096758aa USRP GPS sync 2017-08-18 11:12:15 +02:00
Raymond Knopp 828077c2de bugfixes for eNB on usrp, some minor fixes for eMTC 2017-08-13 23:04:16 -07:00
Cedric Roux 9d65f4dd09 warnings removal in LOG_X
those popped up thanks to previous commit
2017-05-18 14:16:24 +02:00
Laurent 23c7547698 remove debug traces 2017-02-14 18:24:31 +01:00
Laurent 012d333c8e tune USRP/USB packet size 2017-02-10 17:08:28 +01:00
Laurent b9e03cf251 fix usrp thread priority 2017-02-09 19:17:28 +01:00
laurent 3c191c26f3 fix BCH tracking 2017-02-09 17:46:04 +01:00
Laurent 00ebfbb0bc fix merge compilation 2017-02-01 15:00:01 +01:00
Laurent 9f33d0904b merge develop 2017-02-01 13:08:35 +01:00
Raymond Knopp 8be18c360b debugging for RRU if4p5 TDD 2017-01-15 08:58:26 +01:00
Raymond Knopp 848f78465b addition of IF4p5 ULTICK packet for TDD fronthaul 2017-01-13 19:49:22 +01:00
Raymond Knopp 1d331c0bf8 Changes for 20 MHz RRU (dual-thread mode) 2017-01-03 07:46:36 +01:00
laurent cedde4ad1f realtime for UE 2016-12-26 21:19:26 +01:00
Raymond.Knopp 1255cf856f Merge remote-tracking branch 'origin/develop' into enhancement-10-harmony
Conflicts:
	targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-softmodem.c
2016-12-04 09:46:02 +01:00
Raymond Knopp f02c1f20e4 frame synchronization mechanism and robustification of if4p5 packet handling for out-of-order asynchronous reception (PDLFFT) 2016-11-23 13:42:37 +08:00
Raymond Knopp f974ec264e debugging information in lte-enb, addition of external reference option in lte-softmodem and usrp_lib.cpp 2016-11-21 10:37:01 +08:00
Rohit Gupta b481bfd985 Merge branch 'develop' into feature-131-new-license 2016-10-10 19:25:02 +02:00
Tien-Thinh Nguyen 461e2430d1 fix the issues related to sending ULlULL... to RRU 2016-10-06 14:40:30 +02:00
Cedric Roux 74316f6b69 remove COPYING files
Most of them were the GPL.

It is useless to have a copy of the license in every
sub-directory.

From now on, there is only the LICENSE in the top
directory of the distribution.

	deleted:    common/utils/COPYING
	deleted:    common/utils/hashtable/COPYING
	deleted:    common/utils/itti/COPYING
	deleted:    common/utils/itti_analyzer/COPYING
	deleted:    common/utils/itti_analyzer/common/COPYING
	deleted:    common/utils/itti_analyzer/libbuffers/COPYING
	deleted:    common/utils/itti_analyzer/libparser/COPYING
	deleted:    common/utils/itti_analyzer/libresolver/COPYING
	deleted:    common/utils/itti_analyzer/libui/COPYING
	deleted:    openair1/COPYING
	deleted:    openair1/PHY/CODING/COPYING
	deleted:    openair1/PHY/CODING/TESTBENCH/COPYING
	deleted:    openair1/PHY/COPYING
	deleted:    openair1/PHY/INIT/COPYING
	deleted:    openair1/PHY/LTE_ESTIMATION/COPYING
	deleted:    openair1/PHY/LTE_REFSIG/COPYING
	deleted:    openair1/PHY/LTE_TRANSPORT/COPYING
	deleted:    openair1/PHY/MODULATION/COPYING
	deleted:    openair1/PHY/TOOLS/COPYING
	deleted:    openair1/SCHED/COPYING
	deleted:    openair1/SIMULATION/COPYING
	deleted:    openair1/SIMULATION/ETH_TRANSPORT/COPYING
	deleted:    openair1/SIMULATION/LTE_PHY/COPYING
	deleted:    openair1/SIMULATION/RF/COPYING
	deleted:    openair1/SIMULATION/TOOLS/COPYING
	deleted:    openair2/COMMON/COPYING
	deleted:    openair2/DOCS/TEMPLATES/CODE/COPYING
	deleted:    openair2/LAYER2/COPYING
	deleted:    openair2/LAYER2/MAC/COPYING
	deleted:    openair2/LAYER2/PDCP_v10.1.0/COPYING
	deleted:    openair2/LAYER2/RLC/AM_v9.3.0/COPYING
	deleted:    openair2/LAYER2/RLC/COPYING
	deleted:    openair2/LAYER2/RLC/TM_v9.3.0/COPYING
	deleted:    openair2/LAYER2/RLC/UM_v9.3.0/COPYING
	deleted:    openair2/NETWORK_DRIVER/LITE/COPYING
	deleted:    openair2/NETWORK_DRIVER/MESH/COPYING
	deleted:    openair2/NETWORK_DRIVER/UE_IP/COPYING
	deleted:    openair2/PHY_INTERFACE/COPYING
	deleted:    openair2/RRC/L2_INTERFACE/COPYING
	deleted:    openair2/RRC/LITE/COPYING
	deleted:    openair2/RRC/LITE/MESSAGES/COPYING
	deleted:    openair2/RRC/NAS/COPYING
	deleted:    openair2/RRM_4_RRC_LITE/COPYING
	deleted:    openair2/RRM_4_RRC_LITE/src/COPYING
	deleted:    openair2/RRM_4_RRC_LITE/src/radio_resources/COPYING
	deleted:    openair2/UTIL/BIGPHYS/COPYING
	deleted:    openair2/UTIL/CLI/COPYING
	deleted:    openair2/UTIL/FIFO/COPYING
	deleted:    openair2/UTIL/LISTS/COPYING
	deleted:    openair2/UTIL/LOG/COPYING
	deleted:    openair2/UTIL/MATH/COPYING
	deleted:    openair2/UTIL/MEM/COPYING
	deleted:    openair2/UTIL/OCG/COPYING
	deleted:    openair2/UTIL/OMG/COPYING
	deleted:    openair2/UTIL/OMV/COPYING
	deleted:    openair2/UTIL/OPT/COPYING
	deleted:    openair2/UTIL/OSA/COPYING
	deleted:    openair2/UTIL/OSD/COPYING
	deleted:    openair2/UTIL/OTG/COPYING
	deleted:    openair2/UTIL/SCTP/COPYING
	deleted:    openair2/UTIL/TIMER/COPYING
	deleted:    openair2/UTIL/TRACE/COPYING
	deleted:    openair2/X2AP/COPYING
	deleted:    openair3/COPYING
	deleted:    openair3/DOCS/COPYING
	deleted:    openair3/DOCS/DOXYGEN/COPYING
	deleted:    openair3/DOCS/Latex/COPYING
	deleted:    openair3/DOCS/Latex/DefaultBearer/COPYING
	deleted:    openair3/DOCS/Latex/EPC/COPYING
	deleted:    openair3/NAS/COMMON/API/NETWORK/COPYING
	deleted:    openair3/NAS/COMMON/COPYING
	deleted:    openair3/NAS/COMMON/EMM/MSG/COPYING
	deleted:    openair3/NAS/COMMON/ESM/MSG/COPYING
	deleted:    openair3/NAS/COMMON/IES/COPYING
	deleted:    openair3/NAS/COMMON/UTIL/COPYING
	deleted:    openair3/NAS/COPYING
	deleted:    openair3/NAS/TEST/AS_SIMULATOR/COPYING
	deleted:    openair3/NAS/TEST/COPYING
	deleted:    openair3/NAS/TEST/MSC/COPYING
	deleted:    openair3/NAS/TEST/NETWORK/COPYING
	deleted:    openair3/NAS/TEST/USER/COPYING
	deleted:    openair3/NAS/TOOLS/COPYING
	deleted:    openair3/NAS/UE/API/USER/COPYING
	deleted:    openair3/NAS/UE/API/USIM/COPYING
	deleted:    openair3/NAS/UE/EMM/SAP/COPYING
	deleted:    openair3/NAS/UE/ESM/SAP/COPYING
	deleted:    openair3/S1AP/COPYING
	deleted:    openair3/S1AP/MESSAGES/ASN1/COPYING
	deleted:    openair3/S1AP/MESSAGES/ASN1/R10.5/COPYING
	deleted:    openair3/S1AP/MESSAGES/ASN1/R8.10/COPYING
	deleted:    openair3/S1AP/MESSAGES/ASN1/R9.8/COPYING
	deleted:    openair3/S1AP/MESSAGES/COPYING
	deleted:    openair3/SCTP/COPYING
	deleted:    openair3/SECU/COPYING
	deleted:    openair3/TEST/COPYING
	deleted:    openair3/UTILS/COPYING
	deleted:    targets/ARCH/COMMON/COPYING
	deleted:    targets/ARCH/ETHERNET/USERSPACE/LIB/COPYING
	deleted:    targets/ARCH/EXMIMO/DEFS/COPYING
	deleted:    targets/ARCH/EXMIMO/DRIVER/eurecom/COPYING
	deleted:    targets/ARCH/EXMIMO/DRIVER/exmimo3/COPYING
	deleted:    targets/ARCH/EXMIMO/DRIVER/telecomparistech/COPYING
	deleted:    targets/ARCH/EXMIMO/USERSPACE/LIB/COPYING
	deleted:    targets/ARCH/EXMIMO/USERSPACE/OAI_FW_INIT/COPYING
	deleted:    targets/ARCH/EXMIMO/USERSPACE/OCTAVE/COPYING
	deleted:    targets/ARCH/USRP/USERSPACE/LIB/COPYING
	deleted:    targets/COMMON/COPYING
	deleted:    targets/COPYING
	deleted:    targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/COPYING
	deleted:    targets/PROJECTS/COPYING
	deleted:    targets/PROJECTS/GENERIC-LTE-EPC/COPYING
	deleted:    targets/RT/USER/COPYING
	deleted:    targets/SIMU/PROC/COPYING
	deleted:    targets/SIMU/USER/COPYING
2016-09-28 10:45:02 +02:00