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
Haruki NAOI
a3f5e632ea
Merge remote-tracking branch 'remotes/origin/rm804_bugfix2' into sp3_master
2018-04-23 19:12:31 +09:00
jftt_wangshanshan
c5b3aaa2dd
Fix a bug in log
2018-04-23 14:26:43 +08:00
Haruki NAOI
9a8ea23f9f
Merge remote-tracking branch 'remotes/origin/rm804_bugfix2' into sp3_master
2018-04-23 11:21:15 +09:00
Haruki NAOI
20fd63b1e2
Merge remote-tracking branch 'remotes/origin/rm898_bugfix' into sp3_master
2018-04-23 11:20:05 +09:00
jftt_wangshanshan
ef5ff53ecf
change log level to debug
2018-04-23 09:58:50 +08:00
jftt_wangshanshan
0889d79969
Modify CQI scheduling strategy
2018-04-23 09:45:08 +08: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
Haruki NAOI
c8267c2cf9
Revert "Merge branch 'rm884_bugfix' into 'sp3_master'"
...
This reverts commit fad303fe37 , reversing
changes made to e35921cf96 .
2018-04-20 18:41:35 +09:00
Wu Jing
e2a1b98658
fix rm898 SecurityModeFailure
2018-04-20 17:56:47 +09:00
tomita
2bf209e469
Delete LOG_I .
2018-04-19 18:25:34 +09:00
Wu Jing
7813e898ba
RM884 fix, when cqi received is 0, don not update dl_cqi
2018-04-19 12:26:20 +09:00
Wu Jing
22da1eac0c
fix rm894 bug
2018-04-17 20:12:16 +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
Haruki NAOI
b0798357b9
Merge branch 'sp3_rlc_assertion' into sp3_master
2018-04-12 20:16:01 +09:00
Wu Jing
675fd0af4e
patch develop-get-freememblock.patch into closed_item
2018-04-12 20:02:36 +09: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
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
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
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
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
Raymond Knopp
ef719e7945
Merge remote-tracking branch 'origin/develop' into develop-uedirectorysplit
2018-04-08 13:07:23 -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
Cedric Roux
cf45997110
Use TUN device for NAS for the UE instead of ue_ip.ko
...
This work is based on work by NTT.
To use the code, do:
./build_oai --oaisim --ue-nas-use-tun -t ETHERNET -c
This commit only handles oaisim in S1 mode.
We won't handle noS1 mode.
2018-04-06 16:53:42 +02:00
Raymond Knopp
eee7673893
warning remove
2018-04-06 15:57:23 +02:00
Raymond Knopp
be816fab6f
Merge branch 'develop' into RU-RAU-split-parallel-EMUFH-phy-test-merge
2018-04-06 15:12:46 +02:00
Raymond Knopp
3d8a21636a
multi-ue checks in pdcp
2018-04-05 22:32:18 +02:00
Raymond Knopp
9fa001c3c5
prevent UL_indication from overlapping with tx process which cause the drop
2018-04-05 16:33:08 +02:00
Nikos Makris
4195681fc9
Merge remote-tracking branch 'origin/develop' into feature-127-protocol-split
...
Tested with one UE
Possibly broken FLEXRAN (different methods for configuring the link manager)
2018-04-05 13:22:12 +03:00
Wu Jing
dbddecb775
fix Paging bug when PO=subframe0 and sfn_sf error
2018-04-04 18:56:56 +09:00
jftt_wangshanshan
1846c56d54
Add the missing part of DAI setting and harq_pid calculation to OAI SCD
2018-04-04 15:54:44 +08:00
Wu Jing
6d21972e43
merge ues_test branch
2018-04-03 17:24:27 +09:00
Raymond Knopp
03dfe63a1b
reseting in_synch after receiving RU_CONFIG
2018-03-26 16:34:53 +02:00
Haruki NAOI
8f86f38d58
Fix: memory leak occurs when memblock is exhausted.
...
(cherry picked from commit 0e550a32e46d797d03fd72e54e474762d4db7614)
# Conflicts:
# openair2/LAYER2/RLC/rlc.c
2018-03-26 19:32:11 +09:00
Masayuki HARADA
5646b07870
Fix ul scd problems.
...
・Delete double BSR calculation.
・change TBS for mcs setting bit to byte.
(cherry picked from commit 39cd022424ebe98c95be32cbb4127aa9d0e0ff3b)
2018-03-26 19:30:12 +09:00