maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,934 Commits 5 Branches 0 Tags
0511ff45dc8f9fa3ddc40f0cc5a23ffb2fba4521
Commit Graph
136 Commits
Author SHA1 Message Date
Wang Tsu-Han 5b1260a759 fixed for phy-simulation mode 2018-09-13 15:02:15 +02:00
Wang Tsu-Han 3005929bca modify threading option into config file 2018-09-11 18:50:11 +02:00
Wang Tsu-Han 8bb3b91665 Merge branch 'develop' into parallel-config 
Conflicts:
	targets/RT/USER/lte-ru.c
 2018-09-11 16:11:59 +02:00
Robert Schmidt f0670154b3 Correctly join RU threads 
* join pthread_FH (ru_thread) once all condition variables have been set
* join RU FHTX only if it has been started (check as for pthread_create())
* join PRACH thread in the monolithic case
* send broadcast on condition variable cond_eNBs, as there can be multiple
  waits on it
* integrate stop_ru(*ru) into kill_RU_proc(*ru)
* Correct memory freeing
 2018-09-03 18:10:28 +02:00
Robert Schmidt 2e1dfb5b3e place oai_exit test after wait_on_condition() in threads 2018-09-03 18:10:28 +02:00
Wang Tsu-Han ee04caab8a replacing judgment from get_nprocs() and worker flags by paralle_stage and worker_stage 2018-08-31 12:58:49 +02:00
Cedric Roux c22180ff31 Merge remote-tracking branch 'origin/issue326_LOGreview' into develop_integration_2018_w35 
Conflicts:
	cmake_targets/CMakeLists.txt
	openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
	openair1/SCHED_UE/phy_procedures_lte_ue.c
	openair2/LAYER2/MAC/eNB_scheduler_phytest.c
 2018-08-31 12:55:28 +02:00
Cedric Roux 4aec4a23a8 Merge remote-tracking branch 'origin/multi-sdr-ip-conf' into develop_integration_2018_w35 2018-08-31 11:50:19 +02:00
frtabu 79588a494e LOG_F replaced by LOG_DUMPMSG. Add a generic function to dump a buffer or message. Go on with LOG_M implementation improvement. Remove redundant options to enable/disable logs. 2018-08-24 17:43:14 +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
Konstantinos Alexandris 5c85231782 GPS synchronization 2018-08-10 11:06:21 +02:00
Cedric Roux 15f7ae91be fix single_thread_flag usage 2018-08-03 14:58:18 +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
Wang Tsu-Han d45fcd6fc2 Merge branch 'develop' into parallel-phy-test-EMUFH 
Conflicts:
	openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
	openair1/PHY/LTE_UE_TRANSPORT/get_pmi.c
	openair2/LAYER2/MAC/eNB_scheduler_phytest.c
	openair3/S1AP/MESSAGES/ASN1/R8/s1ap-8.10.0.asn1
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-ru.c
	targets/RT/USER/rfsim.h
 2018-07-30 11:42:34 +02:00
Wang Tsu-Han aa00a4734a reset for remerging 2018-07-30 11:24:08 +02:00
Cedric Roux b1d0287327 Merge remote-tracking branch 'origin/issue321_tdd_config1' into develop_integration_2018_w29 
Conflicts:
	openair2/LAYER2/MAC/eNB_scheduler_primitives.c
 2018-07-20 12:26:13 +02:00
Cedric Roux c836ef28f4 Merge remote-tracking branch 'origin/enhancement-rfsim' into develop_integration_2018_w29 
Conflicts:
	openair2/LAYER2/MAC/eNB_scheduler_primitives.c
	openair2/UTIL/LOG/log.c
	targets/RT/USER/lte-uesoftmodem.c
	targets/SIMU/USER/oaisim.c
	targets/SIMU/USER/oaisim_functions.c
 2018-07-20 12:06:26 +02:00
Haruki NAOI eb030b6a29 fix: compile error using "--mu" build option. 2018-07-13 14:53:14 +09:00
Raymond Knopp 494348e2f0 Merge remote-tracking branch 'origin/develop' into enhancement-rfsim 2018-07-06 06:24:31 +02:00
oai bfecc0110b Remove compilation warnings, also fix telnet server compilation failure and NB-IoT shared lib compilation failure introduced when reviewing L1 sources organization 2018-07-05 17:37:38 +02:00
Raymond Knopp 5a808cb1ca Merge branch 'develop' into enhancement-rfsim 
Conflicts:
	openair1/SCHED_UE/phy_procedures_lte_ue.c
	openair2/RRC/LTE/rrc_UE.c
	targets/RT/USER/lte-ru.c
	targets/RT/USER/lte-uesoftmodem.c
 2018-06-28 14:54:15 -07:00
Raymond Knopp 27892e0935 Merge remote-tracking branch 'origin/develop' into enhancement-rfsim 
Conflicts:
	cmake_targets/build_oai
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf
	targets/RT/USER/lte-ru.c
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-uesoftmodem.c
 2018-06-28 14:44:47 -07:00
bruno mongazon 94611edefe fix issue #322 2018-06-28 14:15:15 +02:00
Cedric Roux 142fa8f4da hotfix: remove code that deadlocks 
We have to not call that function here because
it blocks everything if number of proc > 4.
 2018-06-26 10:43:31 +02:00
Cedric Roux 0c445bedda Merge remote-tracking branch 'origin/bugfix-310-IQrecplay' into develop 2018-06-18 16:25:48 +02:00
Haruki NAOI 0fb553916b Fix: modify temporary disabled code by the commit of 5c6ad3142d. 2018-06-18 15:29:17 +09:00
Wang Tsu-Han 0b405e3d2b throughput fix for sdu and config file change back to 93 2018-06-15 12:14:34 +02:00
Haruki NAOI e84fd27ec1 Fix: build fails when executing build with option "--mu" 2018-06-14 16:49:45 +09: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
Wang Tsu-Han e4a7318877 Merge branch 'develop' into parallel-phy-test-EMUFH 
Conflicts:
	openair1/PHY/defs_eNB.h
	targets/RT/USER/lte-enb.c
 2018-06-12 16:18:45 +02:00
bruno mongazon acbd1f1f7d fix issue 310 IQrecplay 2018-06-04 13:05:13 +02:00
Wang Tsu-Han b40215665a fixes for printing single thread fep timing measurment 2018-05-31 14:20:18 +02:00
Raymond Knopp fa8b42c0d5 debugging of --siml1 2018-05-31 13:57:48 +02:00
Raymond Knopp eb363157c6 moved simulation target into lte-uesoftmodem with --simL1 option 2018-05-30 17:49:55 -07:00
Wang Tsu-Han c6e8419839 remove print 2018-05-17 11:44:51 +02:00
Wang Tsu-Han 003c4b6cb0 numerology fix 2018-05-17 11:01:58 +02:00
Wang Tsu-Han 4fdbfc31ee adding timing check for emulate-rf 2018-05-16 16:18:50 +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
Masayuki HARADA de1996ec3e change compile option from UE_EXPANSION to UE_EXPANSION,PHY_TX_THREAD,PRE_SCD_THREAD. 2018-05-15 17:37:43 +09:00
Wang Tsu-Han db7b1f5903 phy test fix 2018-05-14 11:18:41 +02:00
Raymond Knopp ea784f2b4b full IF4p5 simulation working 2018-04-29 09:35:23 -07:00
Masayuki HARADA 30427be126 Fix problem of RF-IF on TDD system. 2018-04-26 13:26:09 +09:00
Raymond Knopp 83b2f1c01c Merge remote-tracking branch 'origin/develop' into develop-uedirectorysplit 
Conflicts:
	openair1/PHY/INIT/lte_init.c
	openair1/PHY/LTE_TRANSPORT/dci_tools.c
	openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
	openair1/PHY/LTE_UE_TRANSPORT/transport_proto_ue.h
	openair1/PHY/defs_eNB.h
	openair1/SCHED_UE/phy_procedures_lte_ue.c
	openair2/LAYER2/MAC/mac.h
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-softmodem.h
 2018-04-23 23:08:10 -07:00
Raymond Knopp 861d06e855 UE directory splits, creation of UE-specific files, common UE/eNB files and extraction of UE/common components from eNodeB files. renaming of files to minimize common names across directories (i.e. defs.h, vars.h, extern.h) 2018-04-22 11:33:43 -07:00
Bi-Ruei, Chiu 5c23af773a Compare version number using MAKE_VERSION macro to provide better SW configuration: 
1. Previous SW configuration for different RRC version relies on whether macro Rel10,
   Rel14 defined or not by checking #ifdef Rel14 or #if defined(Rel10) || defined(R14).
   Whenever there is a newer RRC version, e.g. Rel15, it will be very a tedious and
   error-prone job to add defined(Rel15) in every place.

2. Some RRC messages are defined in release 13 instead of release 14, NB-IoT
   feature is one of such example. Our code shall reflect this fact instead of using
   an afterward version number in software configuration.

3. Some RRC messages or some fields of certain RRC messages are added in the middle
   a release, e.g. SystemInformationBlockType1_v1310_IEs_t defined in RRC 13.1.0
   and RRC 9.2.0 made some changes to SIB12 and SIB13 so we have sib12_v920 and
   sib13_v920 fields in SIB12 and SIB13's struct.
   We need a finer grain of control when using ASN1 from different RRC version.

4. S1AP also has this problem that it use UPDATE_RELEASE_9 and UPDATE_RELEASE_10 to
   differentiate between various S1AP version.

This commit propose using MAKE_VERSION(x,y,z) to designate the version number and
modify current conditional compilation accordingly.

Note: 2018/04/16, Modified based on Cedric's comment.
 2018-04-16 12:32:29 +02:00
Cedric Roux e29d500db6 integration fix: various fixes 
- fix compilation of dlsim/ulsim/oaisim by defining some needed
  global variables
- fix compilation of oaisim: compile coding and params_libconfig
- fix running of if4p5 with low CPU count (oaisim was not working
  on the machine 'haswell' because of this)
 2018-04-11 17:15:14 +02:00
Cedric Roux 1f446432f6 Merge remote-tracking branch 'origin/develop-simL1-fixes' into develop_integration_2018_w15 2018-04-11 15:15:54 +02:00
WANG Tsu-Han 68fdd19cb7 fixs for 5-7 core 2018-04-11 15:09:07 +02:00
WANG Tsu-Han 658aa00119 bug fix for threading with under 8core 2018-04-10 16:52:05 +02:00