Commit Graph
7335 Commits
Author SHA1 Message Date
Raymond Knopp 5e991ecc3d fixed compilatiaon issues after merge with develop and enhancement-rfsim. Intitial testing with emulator. 2018-06-10 17:10:16 -07:00
Raymond Knopp 45dc7ed608 Merge branch 'enhancement-rfsim' into ru_rau_enhancement
Conflicts:
	cmake_targets/build_oai
	openair1/PHY/LTE_ESTIMATION/lte_sync_time.c
	openair1/PHY/LTE_TRANSPORT/dci_tools.c
	openair1/PHY/LTE_TRANSPORT/if4_tools.c
	openair1/PHY/LTE_TRANSPORT/prach.c
	openair1/PHY/defs_eNB.h
	openair1/PHY/impl_defs_lte.h
	openair2/ENB_APP/enb_config.c
	openair2/LAYER2/MAC/eNB_scheduler.c
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-ru.c
	targets/SIMU/USER/channel_sim.c
	targets/SIMU/USER/oaisim.c
	targets/SIMU/USER/oaisim_config.c
	targets/SIMU/USER/oaisim_functions.c
2018-06-10 15:14:09 -07:00
Raymond Knopp 6ecf336ae7 missing declaration 2018-06-10 14:29:45 -07:00
Raymond Knopp cffb083914 Merge branch 'ru_rau_enhancement' of http://gitlab.eurecom.fr/oai/openairinterface5g into ru_rau_enhancement
Conflicts:
	targets/RT/USER/lte-ru.c
2018-06-06 08:12:41 +02:00
Massive 59a07e2117 testing with 2 RUS (changes in default precoder) 2018-06-06 07:46:16 +02:00
Raymond Knopp c2ad982b76 vcd debugging for RF simulator 2018-06-05 05:47:43 -07:00
Raymond Knopp f1ddab49dc Merge branch 'enhancement-rfsim' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-rfsim 2018-06-05 01:36:58 -07:00
Raymond Knopp 74c7d3efc4 Merge branch 'develop' into enhancement-rfsim
Conflicts:
	targets/RT/USER/lte-uesoftmodem.c
2018-06-04 22:33:07 -07:00
Raymond Knopp 6416c6d4ea minor changes to remove global variable in dci handling 2018-06-04 22:31:43 -07:00
Raymond Knopp 79de529592 removed undef in lte-softmodem.h 2018-06-04 01:36:11 +02:00
Raymond Knopp 8dd9cf3c86 creation of simulation data structure. some cleanup and testing with multiple UEs 2018-06-04 00:12:48 +02:00
Raymond Knopp c3c6284b83 Merge remote-tracking branch 'origin/develop' into enhancement-rfsim 2018-06-03 08:57:24 +02:00
Raymond Knopp b91a763065 removal of dead include 2018-06-03 08:56:33 +02:00
Raymond Knopp 71f0135a89 removal of dead oaisim-related files 2018-06-03 08:51:47 +02:00
Raymond Knopp 293110e2cc cleanup of warnings and default parameters for simulator target 2018-06-03 08:48:42 +02:00
Raymond Knopp 897de9f8e2 testing of rf simulation in UE 2018-06-02 10:10:35 -07:00
Raymond Knopp fa8b42c0d5 debugging of --siml1 2018-05-31 13:57:48 +02:00
Raymond Knopp 16b7faaafa added missing .h file 2018-05-30 17:52:49 -07:00
Raymond Knopp eb363157c6 moved simulation target into lte-uesoftmodem with --simL1 option 2018-05-30 17:49:55 -07:00
Raymond Knopp 6bbe833735 fixing for testing 2018-05-30 16:40:27 +02:00
Cedric Roux 3fd2470533 Merge remote-tracking branch 'origin/fix-unitary-simulations' into develop 2018-05-29 09:38:00 +02:00
Raymond Knopp b036b18afe moved sidlink L1 functions to LTE_UE_TRANSPORT, corrected issue related to "find_dlsch" which is needed to compile UE and creates problem for unitary simulations (moved to lte-ue.c application) 2018-05-28 11:09:38 -07:00
Cedric Roux 4b943d4b7b Merge remote-tracking branch 'origin/develop_integration_2018_w19' into develop
Summary of changes:
- split UE and eNB directories
- nFAPI L2 emulator
- basic simulator
- various bug fixes

The nFAPI L2 emulator is not functional yet. Some code had to be removed
because it made the monolithic eNB non functional.

The unitary simulators (ulsim, dlsim) do not compile anymore. This will
be fixed later.
2018-05-28 17:31:09 +02:00
Raymond Knopp d9568d2c06 bugfix after merge 2018-05-28 15:31:14 +02:00
Cedric Roux b66b872928 integration fix: remove warnings
Remove warnings found while running:
    ./build_oai --UE -c -w USRP

And:
    ./build_oai --basic-simulator -c
2018-05-28 12:44:14 +02:00
Raymond Knopp 8a11946f73 Merge remote-tracking branch 'origin/develop' into ru_rau_enhancement 2018-05-28 11:53:34 +02:00
Raymond Knopp a0e193c5e8 fixing conflicts 2018-05-27 05:27:58 +02:00
Raymond Knopp 3864136700 fixing conflicts 2018-05-26 06:30:36 +02:00
Raymond Knopp 285e01943d fixing conflicts 2018-05-26 06:26:33 +02:00
Raymond Knopp 8364b4f97d adding thread_tx from develop 2018-05-26 05:49:49 +02:00
Cedric Roux ed49592754 integration fix: remove warnings
Remove warnings popping up on:
    ./build_oai --eNB -w USRP

Maybe not always the best solution.
2018-05-24 17:15:42 +02:00
Cedric Roux f9aac56e84 fix: let ue_ip.ko compile
MAX_MOBILES_PER_ENB cannot be used to compile ue_ip
because it is defined in platform_constants.h and this
cannot be included to compile a kernel module.

Let's use NUMBER_OF_UE_MAX as it was before instead.
2018-05-15 17:43:35 +02:00
Cedric Roux 343bbbac68 Merge remote-tracking branch 'origin/feature-better-sw-configuration-between-various-version' into develop_integration_2018_w19
Conflicts:
	cmake_targets/CMakeLists.txt
	openair1/PHY/LTE_TRANSPORT/prach.c
	openair1/PHY/LTE_TRANSPORT/print_stats.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/sched_common.h
	openair1/SCHED_UE/phy_procedures_lte_ue.c
	openair2/LAYER2/MAC/mac.h
	openair2/LAYER2/PDCP_v10.1.0/pdcp.c
	openair2/LAYER2/PDCP_v10.1.0/pdcp.h
	openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
	openair2/LAYER2/RLC/rlc.c
	openair2/PHY_INTERFACE/defs.h
	openair2/RRC/LTE/MESSAGES/asn1_msg.c
	openair2/RRC/LTE/MESSAGES/asn1_msg.h
	openair2/RRC/LTE/rrc_UE.c
	openair2/RRC/LTE/rrc_eNB.c
	targets/SIMU/USER/oaisim_functions.c
2018-05-15 17:43:12 +02:00
Cedric Roux 1038590489 Merge remote-tracking branch 'origin/feature-ubuntu-18.04-build-usrp' into develop_integration_2018_w19 2018-05-15 15:33:28 +02:00
Cedric Roux 96b1d47552 Merge remote-tracking branch 'origin/fix-rdtsc' into develop_integration_2018_w19 2018-05-15 15:30:53 +02:00
Cedric Roux a42e2de0e0 Merge remote-tracking branch 'origin/bugfix-add-error-indication-handling' into develop_integration_2018_w19 2018-05-15 15:23:00 +02:00
Cedric Roux bdda76430f Merge remote-tracking branch 'origin/fixes-T-tracer-2018-w17' into develop_integration_2018_w19 2018-05-15 15:20:12 +02:00
Cedric Roux f7b3ea03a3 fix: hacks to have the UE functional again
The new 'basic simulator' is now functional.
A proper solution is needed to deal with SIB18/19/21
for the D2D functionality.
2018-05-15 12:09:31 +02:00
Cedric Roux 689f98ea9d fix compilation of lte-uesoftmodem 2018-05-15 12:07:40 +02:00
Cedric Roux 11a1dd090c fix: hack to have the UE compile
This is a quick and dirty solution, something better is needed.
2018-05-15 09:55:11 +02:00
Cedric Roux 5fcc9a6106 bugfix: fix compilation of basic simulator
- conf2uedata compilation was not properly started
- success/failure of compilation of UE and eNB
  was not handled properly
2018-05-14 17:31:30 +02:00
Cedric Roux 351ca5e726 Merge remote-tracking branch 'origin/basic-simulator' into develop_integration_2018_w19
Conflicts:
	openair1/PHY/LTE_TRANSPORT/prach.c
	targets/RT/USER/lte-ue.c
2018-05-14 17:30:18 +02:00
Cedric Roux 7da4367cb7 Merge remote-tracking branch 'origin/fix-remove-lte-ran-file' into develop_integration_2018_w19
Conflicts:
	openair1/PHY/defs_eNB.h
2018-05-14 16:34:50 +02:00
Cedric Roux 68479fa4f8 Merge remote-tracking branch 'origin/develop-uedirectorysplit' into develop_integration_2018_w19
Status so far:
- monolithic eNB compiles and is functional with 1 UE in FDD, 5/10/20MHz.
  For 20MHz we don't have a nice TCP downlink (on haswell).
- oaisim does not compile
- UE does not compile
- phy simulators don't compile
- many new warnings

Conflicts:
	cmake_targets/CMakeLists.txt
	openair1/PHY/LTE_TRANSPORT/transport_eNB.h
	openair1/PHY/LTE_UE_TRANSPORT/transport_proto_ue.h
	openair1/PHY/defs_eNB.h
	openair1/SCHED/pusch_pc.c
	openair1/SCHED/sched_common.h
	openair1/SCHED_UE/phy_procedures_lte_ue.c
	openair2/LAYER2/MAC/eNB_scheduler.c
	openair2/LAYER2/MAC/eNB_scheduler_mch.c
	openair2/LAYER2/MAC/mac.h
	openair2/LAYER2/MAC/ra_procedures.c
	openair2/LAYER2/MAC/ue_procedures.c
	openair2/RRC/LTE/MESSAGES/asn1_msg.h
	openair2/RRC/LTE/rrc_UE.c
	openair2/RRC/LTE/rrc_defs.h
	targets/RT/USER/lte-softmodem.h
	targets/RT/USER/lte-ue.c
2018-05-14 16:28:04 +02:00
Raymond Knopp 0ad9ab947c dmrs-based OTA synchronization for RU 2018-05-13 15:53:59 -07:00
Raymond Knopp fe861bf49e compilation passes and 1 UE simulation ok. 2018-05-13 05:16:57 -07:00
Raymond Knopp 0b89046a81 Merge branch 'ru_rau_enhancement' of https://gitlab.eurecom.fr/oai/openairinterface5g into ru_rau_enhancement 2018-05-13 00:47:48 -07:00
Bi-Ruei, Chiu 02aeb1c16d Build eNB using USRP on Ubuntu 18.04 2018-05-13 10:45:48 +08:00
Cedric Roux ad46183e23 fix rdtsc usage
One user had a problem compiling oaisim.
This commit fixes it.

The compilation log was saying:

    targets/RT/USER/lte-ue.c:
    In function UE_thread_rxn_txnp4:

    openair2/UTIL/LOG/log.h:370:3:
    error: inconsistent operand constraints in an asm

         __asm__ volatile ("rdtsc" : "=a" (a), "=d" (d));

         ^
2018-05-11 14:21:05 +02:00
Cedric Roux f488673e80 Merge remote-tracking branch 'origin/nfapi-L2-emulator-for-develop' into develop_integration_2018_w19 2018-05-09 14:51:48 +02:00