Commit Graph
7518 Commits
Author SHA1 Message Date
naoi.haruki e35921cf96 Merge branch 'rm886_bugfix' into 'sp3_master'
fix RM886 bug

See merge request !35
2018-04-18 16:34:03 +09:00
Robert Schmidt 72529e6c3a remove useless file/pthread_single declaration 2018-04-17 13:56:19 +02:00
Wu Jing 22da1eac0c fix rm894 bug 2018-04-17 20:12:16 +09:00
Florian Kaltenberger aca606f90d making init_nas_s1 script executable 2018-04-17 09:24:34 +02:00
Florian Kaltenberger fd2e093412 RRC will not send second RRCConnectionReconfiguration with additional DRBs in noS1 mode 2018-04-17 09:23:59 +02:00
Cedric Roux c03650fdc7 minor: fix order of comparisons (easier to understand) 2018-04-16 12:50:34 +02:00
Wu Jing 33b652c5df fix RM886 bug 2018-04-16 19:40:18 +09: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 184d51c6ea Merge remote-tracking branch 'origin/develop_integration_2018_w15' into develop
Summary of changes:
- some work on better parallel processing of eNB
  try the eNB with options: --fepw --codingw
- small changes for multi-UE simulation and simulation accuracy
  (UE power levels)
- initial work for the UE to use TUN device instead of ue_ip.ko
  only done for oaisim, default bearer, compile with:
    ./build_oai --ue-nas-use-tun <rest of options>
2018-04-16 12:19:20 +02:00
Cedric Roux 79eb6eb4d2 integration fix: fix UE softmodem compilation 2018-04-16 11:23:05 +02:00
Haruki NAOI 6e7db95981 clean log. 2018-04-16 16:54:02 +09:00
Cedric Roux 17dda7bd70 integration fix: minor fix 2018-04-13 11:59:56 +02:00
Florian Kaltenberger 9cff72959a Revert "removing the 4 bit left shift of TX signal as already done in driver"
This reverts commit 1043313175.
2018-04-12 17:16:11 +02:00
Florian Kaltenberger 1043313175 removing the 4 bit left shift of TX signal as already done in driver 2018-04-12 17:15:31 +02:00
Haruki NAOI b0798357b9 Merge branch 'sp3_rlc_assertion' into sp3_master 2018-04-12 20:16:01 +09:00
Wu Jing a8ab765fe5 patch rrc_assertion.patch into closed_item
# Conflicts:
#	openair2/RRC/LITE/rrc_eNB.c
2018-04-12 20:05:04 +09:00
Wu Jing 675fd0af4e patch develop-get-freememblock.patch into closed_item 2018-04-12 20:02:36 +09:00
Cedric Roux fa4a9a0cb9 integration fix: update T tracer: add new VCD variables 2018-04-12 11:36:31 +02:00
Cedric Roux a1a60dc19a integration fix: revert target_rx_power to 178 in eNB_scheduler_ulsch.c
158 does not work well with the eNB softmodem.
2018-04-12 11:28:51 +02:00
Wu Jing 5d06a1cabd RLC assert fix ct 2_114 bug 2018-04-12 11:06:35 +09:00
Haruki NAOI afcdb1e6a9 enb-log-mem_sp2.patch into closed_item
(cherry picked from commit 3432385280c3155ee63a54be7c2e4846a17299de)

# Conflicts:
#	openair2/UTIL/LOG/log.c
2018-04-12 10:53:44 +09:00
Haruki NAOI 7b4298a637 Merge remote-tracking branch 'remotes/origin/sp3_tdd_config1' into sp3_master 2018-04-12 10:13:12 +09: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
Cedric Roux 86599d47a9 Merge remote-tracking branch 'origin/ue-use-tun-for-nas' into develop_integration_2018_w15 2018-04-11 15:15:49 +02:00
Cedric Roux bf678f7fb0 Merge remote-tracking branch 'origin/RU-RAU-split-parallel-EMUFH-phy-test-merge' into develop_integration_2018_w15 2018-04-11 15:15:39 +02:00
WANG Tsu-Han 68fdd19cb7 fixs for 5-7 core 2018-04-11 15:09:07 +02:00
Haruki NAOI 597890ab61 eNB RLC Assertions(assert macros) skip & fix warning. 2018-04-11 19:01:43 +09:00
Wu Jing b27984349d fix ct test bug 2_37 2_72 2018-04-11 13:44:56 +09:00
WANG Tsu-Han 658aa00119 bug fix for threading with under 8core 2018-04-10 16:52:05 +02:00
Wu Jing a32857885a Merge branch 'sp3_tdd_config1' of http://10.37.145.15:8000/gitlab/vran/release_enb into sp3_tdd_config1 2018-04-10 17:32:31 +09:00
Wu Jing b7a8889741 fix Assertion because of round==8 in extract_harq when re-establishment happen 2018-04-10 17:31:52 +09:00
Wu Jing aca800dae9 fix SegmentFault by harq_pid==8 after clean_dlsch_eNB 2018-04-10 17:19:52 +09:00
Wu Jing 7b0231f926 Merge branch 'sp3_rlc_assertion' of http://10.37.145.15:8000/gitlab/vran/release_enb into sp3_rlc_assertion 2018-04-10 15:53:55 +09:00
Wu Jing 03232d30c2 RLC assertion 760~796 add 1428 1429 2018-04-10 15:37:30 +09:00
Raymond Knopp b458c09841 Merge branch 'develop-uedirectorysplit' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-uedirectorysplit
Conflicts:
	cmake_targets/CMakeLists.txt
	openair1/PHY/LTE_ESTIMATION/lte_adjust_sync.c
	openair1/PHY/LTE_UE_TRANSPORT/dci_ue.c
2018-04-09 15:55:08 -07:00
Raymond Knopp 8b1416b862 debugging of new directory structure, file renaming, and eNB/UE splitting. dlsim/ulsim functional. 2018-04-09 15:32:49 -07:00
teramoto.genki c5310874fa Merge branch 'sp3_rlc_assertion' of http://10.37.145.15:8000/gitlab/vran/release_enb into sp3_rlc_assertion
# Conflicts:
#	openair2/LAYER2/RLC/rlc.c
2018-04-09 21:12:02 +09:00
teramoto.genki 43382defec eNB RLC Assertions skip. 2018-04-09 21:00:13 +09:00
Masayuki HARADA 5e4f0a924d Merge branch 'ues_test' into sp3_tdd_config1
# Conflicts:
#	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
2018-04-09 20:21:24 +09:00
Masayuki HARADA f8f149fd1b Fix calculation of ul_total_buffer. 2018-04-09 20:05:45 +09:00
Masayuki HARADA b58ecfc5d8 Change SCH_PAYLOAD_SIZE_MAX from 4096 to 8192. 2018-04-09 20:01:38 +09:00
Haruki NAOI 8b44c8bfb6 modify: skip RLC assertion. 2018-04-09 19:57:33 +09:00
Masayuki HARADA 7ced1a2eb1 Remove nb_rb = 64 form rb_table in SCD. Because PHY UL cannot decode nb_rb = 64. 2018-04-09 19:56:33 +09:00
Masayuki HARADA 901c0da013 Fix attach NG on FDD 10MHz 20MHz. 2018-04-09 15:10:23 +09:00
naoi.haruki dcf3b235f5 Merge branch 'sp3_tdd_config1' into 'sp3_master'
Sp3 tdd config1

See merge request !31
2018-04-09 10:59:43 +09:00
Raymond Knopp ef719e7945 Merge remote-tracking branch 'origin/develop' into develop-uedirectorysplit 2018-04-08 13:07:23 -07:00
Raymond Knopp ac7cbf17e2 band 38 files x310 2018-04-08 13:07:07 -07:00
Raymond Knopp 551f32cc20 more splitting eNB/UE files/directories 2018-04-08 13:00:08 -07:00
Raymond Knopp 0ab2b2b261 modifications for simulator : power normalizations for UE TX, small changes to SNR targets for power control, default UE power (23 dBm now) 2018-04-06 10:27:23 -07:00