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
root
6f290e7125
UE add RF board ZC706+AD9371
...
Conflicts:
cmake_targets/build_oai
openair1/PHY/LTE_TRANSPORT/prach.c
openair1/SCHED/phy_procedures_lte_ue.c
targets/ARCH/COMMON/common_lib.h
targets/RT/USER/lte-softmodem.c
2018-04-06 01:28:22 -07: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
Bi-Ruei, Chiu
7321aab67e
Add S1AP R14 based on new asn1c
...
This feature requires an un-official version of asn1c :
https://github.com/velichkov/asn1c/tree/s1ap
2018-03-28 00:19:01 +08: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
Raymond Knopp
df9827b5fb
changes for TDD
2018-03-25 23:57:33 -07:00
Cedric Roux
ff3c929ecf
fix PHY simulators compilation
...
Only ulsim and dlsim compile. The others (dlsim_tm4 pucchsim prachsim
pdcchsim pbchsim mbmssim) have been disabled.
Command line to compile: ./build_oai --phy_simulators
2018-03-23 15:15:51 +01:00
Cedric Roux
3288a6bbe4
Merge remote-tracking branch 'origin/bugfixes-2018-w12' into develop_integration_2018_w12
2018-03-23 10:47:43 +01:00
Cedric Roux
5fdc3077db
disable U-plane inactivity timer.
...
It is annoying and does not seem to work properly.
To be checked/reworked if needed.
Keep in mind that we also want oaisim to be functional.
2018-03-23 10:42:30 +01:00
Robert Schmidt
9c47c860bc
FlexRAN: RCconfig_flexran(): only read necessary information
...
if the FlexRAN agent is disabled, do not read all the data and skip reading
of more information
2018-03-23 09:20:19 +01:00
Robert Schmidt
d54d415125
FlexRAN: add Information in enb_config_reply msg
2018-03-22 18:43:15 +01:00
Robert Schmidt
1854826053
FlexRAN: send agent_id (aka enb_id)
2018-03-22 18:43:15 +01:00
Robert Schmidt
e7a60fc992
FlexRAN: make agent_id for identification purposes, discern from mod_id
...
The agent_id is a uint64 consisting of: module ID (i.e. mod_id, the several
instances of OAI at once, 16 bit), the enb_id from the configuration file (32
bit) and the cell_id from the configuration file (16 bit).
The module ID is part of the agent ID but it is easier to have it directly in
the struct.
2018-03-22 18:41:14 +01:00
Guy De Souza
8824d20cd3
Fix CMakeLists.txt for lte-softmodem
2018-03-21 11:34:08 +01:00
Raymond Knopp
846268fdd3
bug fix for qpsk modulation
2018-03-20 18:02:52 +01:00
Cedric Roux
d393814772
bugfix: send UL NACK (on PHICH) at the right place
...
The PHICH was not programmed for the last round (4) because it was
not programmed in rx_sdu but in schedule_ulsch_rnti, only in case
of a programmed retransmission (there is obviously no retransmission
programmed after the last round).
The case of Msg3 is not handled. To be done somehow.
2018-03-19 10:28:16 +01:00
Raymond Knopp
d312f9c805
debugging for TDD
2018-03-19 01:10:10 -07:00
Haruki NAOI
dbe3208302
Fix: eNB can not accept attach more than 257 times.
2018-03-16 15:32:14 +09:00
Cedric Roux
f1f3b8a0a8
bugfix: fix issue 285 - connect/disconnect multiple time
...
As reported by Emad Alizade:
According to "Issue255 256 257 paging reesta release" that has been
merged in develop version, we have a question: In rrc_eNB_free_UE()
function only all ulsch related memory of user has been cleaned, but
I think not only ulsch memory but also dlsch memory must be cleaned.
I tested the latest develop version and with repetition UE attach-detach
procedures we find that the dlsch memory has not been cleaned and after
repeat this sequence (45 times) assertion with cause UE_id!=-1 (no free
or exiting dlsch_context, dci_tools.c: fill_dci_and_dlsch() ) occurred
and no UE will be attached to system.
The fixes in this commit are from Emad Alizade.
(cherry picked from commit 4b5b556493 )
# Conflicts:
# openair1/PHY/LTE_TRANSPORT/dlsch_coding.c
# openair2/LAYER2/MAC/eNB_scheduler.c
# openair2/RRC/LITE/rrc_eNB.c
2018-03-16 15:25:31 +09:00
Cedric Roux
3da8cac59b
bugfix: try to release HARQ processes properly
...
The code is too complex. This commit may not be enough.
2018-03-15 10:48:16 +01:00
Raymond Knopp
8d90eda600
bug fix after merge
2018-03-14 16:21:51 +01:00
Raymond Knopp
c4a81c2215
changes for TDD signaling.
2018-03-13 16:18:26 +01: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
jftt_wangshanshan
2505f15eab
Fix previous problem for no-ue-extension version of schedule_ulsch_rnti
2018-03-12 12:49:34 +08:00