Raphael Defosseux
94875783dd
Fix a few compilation warnings
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2019-07-05 17:17:44 +02:00
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
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
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
Haruki NAOI
8bec50653f
Fix: eNB output core dump file when exiting eNB process.
2018-05-18 10:01:07 +09:00
Raymond Knopp
66fe9c5d3b
added external-timing option to allow to wait for PPS in usrp_lib.cpp
2018-05-04 17:26:07 +08: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
Raymond Knopp
ffe2967d81
Split init and config USRP device. It seems to have solved the stop/restart RAU without stopping the RRU
2018-03-12 11:31:08 +01:00
Younes
e57ecfb7f8
modifications for RU synch
2018-03-03 21:33:15 +01:00
Raymond Knopp
b68e7d76eb
fixes for if4p5 RRU
2018-03-03 09:36:31 +01:00
Younes
3ab54c8a4b
gpio fix
2018-02-23 16:50:32 +01:00
khadraou
de5e5beee1
Merge remote-tracking branch 'origin/develop' into ru_rau_enhancement
2018-02-22 17:11:44 +01:00
Wu Jing
ba8a111ea1
merge the latest develop branch into issue289
2018-02-01 19:25:29 +09:00
Younes
ba5e3e7463
clock source / timing source split.
...
MTU tuning removed for now.
2018-01-26 16:06:15 +01: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
90731761e3
This commit provides the IQ record-playback feature know under issue #272
2017-11-14 19:03:46 +01:00
Raymond Knopp
51a9107c14
Merge branch 'RU-RAU-split' of https://gitlab.eurecom.fr/oai/openairinterface5g into RU-RAU-split
...
Conflicts:
openair1/SCHED/phy_procedures_lte_eNb.c
openair2/ENB_APP/enb_config.c
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
openair2/RRC/LITE/MESSAGES/asn1_msg.c
targets/RT/USER/lte-ru.c
2017-10-25 00:40:20 +02: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
Raymond Knopp
4fc7846f13
Merge branch 'RU-RAU-split' of https://gitlab.eurecom.fr/oai/openairinterface5g into RU-RAU-split
...
Conflicts:
openair1/PHY/INIT/lte_init.c
openair1/PHY/LTE_TRANSPORT/dlsch_coding.c
openair1/PHY/LTE_TRANSPORT/prach.c
openair1/SCHED/phy_procedures_lte_eNb.c
openair2/ENB_APP/enb_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_primitives.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
openair2/LAYER2/MAC/rar_tools.c
openair2/RRC/LITE/MESSAGES/asn1_msg.c
openair2/RRC/LITE/rrc_eNB.c
2017-10-10 22:09:13 -07: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