Commit Graph
6601 Commits
Author SHA1 Message Date
Cedric Roux 282f6a5077 Merge branch 'issue255_256_257_paging_reesta_release' into develop_integration_2018_w03
Conflicts:
	targets/RT/USER/lte-softmodem.c
2018-01-17 11:49:44 +01:00
bruno mongazon 9c93307ab4 Fix #582, merge from develop 2018-01-16 14:31:23 +01:00
Raymond Knopp d32cdd1f33 Merge remote-tracking branch 'origin/develop' into develop-nos1-fixes
Conflicts:
	openair1/SCHED/fapi_l1.c
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair2/LAYER2/MAC/config.c
2018-01-16 03:55:37 -08:00
Raymond Knopp 5dc0d7ccea Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop
Conflicts:
	openair2/LAYER2/MAC/config.c
2018-01-16 03:46:24 -08:00
bruno mongazon 8d2f0931a7 Fix #582, NB_ANTENNAS_TXRX removed 2018-01-16 12:35:56 +01:00
bruno mongazon 2157727f5f Fix #582, PC_TARGET removed 2018-01-16 11:10:05 +01:00
bruno mongazon dac7888f27 Fix #582, PC_DSP removed 2018-01-16 10:52:41 +01:00
Xu Bo 3e550e02ef revert modification of pre_scd and reduce of LC channel number 2018-01-16 16:41:18 +09:00
bruno mongazon cf0e9175dd Fix #582, RTAI, RTAI_ENABLED, ENABLE_RTAI_CLOCK, RTAI_ISNT_POSIX, _RTAI_MATH_H, CELLULAR, TIMER_ONESHOT_MODE, EMOS, EMOS_CHANNEL, OAI_EMU, OPENAIR_EMU, PHY_ABSTRACTION, PHY_ABSTRACTION_UL removed 2018-01-15 18:47:07 +01:00
Cedric Roux 922b5b595a Fix NFAPI integration
This commit fixes issues introduced by the previous commit.

Summary of work:
- cleanup:
  - fix LOG_XX to be less verbose
  - fix cmake_targets/CMakeLists.txt
  - fix oaienv
  - remove dead code
- bug fixes:
  - in openair1/SCHED/fapi_l1.c we had:
      eNB->pdcch_vars[subframe&1].num_dci           = number_dci;
    should be:
      eNB->pdcch_vars[subframe&1].num_dci           = 0;
    This bug let the PHY send more DCIs than what should have been
    sent because num_dci is incremented later on in the code.
    This fix may be a problem for fapi mode, to be checked.
  - add new T VCD traces
  - revert openair1/PHY/TOOLS/file_output.c to 'develop' version
  - remove thread_id in logRecord/logRecord_mt
  - revert (and adapt) configuration files
  - be careful when doing frame++, we need to % 1024
  - revert target_rx_power in openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
- NFAPI:
  - the open-nFAPI code has been included in the repository. See nfapi/README.
    Maybe we should "git clone" the Cisco repository instead. We have to be
    careful of availability though.

What has been tested:
- monolithic eNB FDD 5/10MHz with one UE, iperf UDP/TCP uplink/downlink

Anything else may fail to work, especially the FAPI mode, which has not
been tested at all.
2018-01-15 15:24:50 +01:00
Younes 22638ba012 Merge branch 'develop-nos1-fixes' into ru_rau_enhancement 2018-01-15 14:32:57 +01:00
Cedric Roux 7757b9e7e7 import NFAPI work from David Price from Cisco (non-working commit, do not use it)
It has been chosen to not include the full history of commits
from David. He included a binary version of wireshark, probably
a modified one that understands NFAPI. Wireshark is released under
the GPL license, we cannot include it in the repository. We could
have done a next commit to remove this binary. But then it would
still be present in the history of commits, which may not be allowed.
And it would take space on disk. We could edit the history to remove
wireshark entirely. But this operation is too complicated.

There was also a pcap capture file, which has nothing to do in
the history of commits and would take space on disk. There again,
it's too difficult to edit the history to remove it.

There was a file .gitignore that was also removed.

The original history can be found on David's repository:
https://gitlab.eurecom.fr/daveprice/openairinterface5g/
The branch is: nfapi-ru-rau-split.

A copy of that branch has been included in the internal OAI
repository, for those who have access to it.
The branch is the same. The last commit ID is
9106438239e0bc626ff1fa1d97d911caadd0fbb9.

You can compare the current commit with the commit 9106...
to see what differs.

The current commit has to be considered non-working.
The commit following the current commit will fix problems with
the work in the current commit.

If you use git bisect, don't spend time analyzing the current
commit.
2018-01-15 11:32:30 +01:00
Rohit Gupta 8b5a963346 changes for noS1 IP addressing 2018-01-14 08:54:51 +01:00
Xu Bo 6acfbe21e1 fix compiler error generated by merge 2018-01-13 12:33:10 +00:00
Xu Bo aebb015981 Merge remote-tracking branch 'remotes/origin/issue271_hundreds_of_ues' into ues_test 2018-01-13 12:21:15 +00:00
Xu Bo d6dfd5f82f fix issues about pre_scd thread,duplication call pucp_run funciton 2018-01-13 11:54:33 +00:00
Xu Bo 1471846030 Merge branch 'issue271_hundreds_of_ues' into ues_test 2018-01-13 10:53:27 +00:00
Xu Bo 296ea0571c Merge branch 'issue255_256_257_tmp' into ues_test 2018-01-13 10:42:37 +00:00
Xu Bo ac7c131baf seperate scd to pre_scd thread 2018-01-13 10:27:25 +00:00
Xu Bo cb14cd7bf9 fix RRCConnectionReestablishment issue 2018-01-13 09:56:04 +00:00
Xu Bo c6169f0fd3 reduce the LC channel number from 11 to 3(DCCH, DCCH1, DTCH) when schedule dlsch 2018-01-13 09:50:17 +00:00
Xu Bo 04fe22d8e2 set max ue number for each DL and UL: 5MHz(4UE), 10MHz(6UE), 20MHz(10UE) 2018-01-13 09:41:04 +00:00
Xu Bo 7d782a4a46 fix n1_pucch issue:50RB/100RB prach_freq_offset 2 ->3 2018-01-13 09:11:47 +00:00
Xu Bo f6911c934b fix n1_pucch issue: 25RB pucch 2RB;50RB/100RB pucch 4RB 2018-01-13 08:23:22 +00:00
bruno mongazon afcc9aabd8 Fix #582, USER_MODE flag removed 2018-01-11 16:50:50 +01:00
Xu Bo 61128d7737 Merge branch 'issue271_hundreds_of_ues' into ues_test 2018-01-11 20:26:16 +09:00
Xu Bo eb610af36b fix DLSCH ACK/NAK cce_index issue 2018-01-11 11:19:57 +00:00
Xu Bo b3ab7bc58f fix ifdef after merge issue255_256_257 into ues_test 2018-01-09 15:35:24 +09:00
Xu Bo 89ea5ed988 fix RRCConnection timer thres when GTPV1U_ENB_DELETE_TUNNEL_RESP 2018-01-09 13:52:41 +09:00
Xu Bo 52a3053ac0 Modify Merge branch issue271_hundreds_of_ues into ues_test 2018-01-08 22:28:54 +09:00
Xu Bo 764d6fc068 Merge branch 'issue271_hundreds_of_ues' into ues_test 2018-01-08 19:49:11 +09:00
Xu Bo baf5926a67 Merge branch issue255_256_257_paging_reesta_release into branch ues_test 2018-01-08 19:39:21 +09:00
Xu Bo d69390c273 delete unused comment 2018-01-08 19:07:35 +09:00
Xu Bo 0f2cb0aada fix the timer between reestablishment and reestablishmentComplete 2018-01-08 18:53:30 +09:00
Xu Bo 1c1a01adfd fix double free bug 2018-01-08 17:07:40 +09:00
Raymond Knopp b74bab25b5 Merge remote-tracking branch 'origin/develop' into develop-nos1-fixes 2018-01-07 23:57:17 -08:00
Xu Bo 27c3074ff9 fix RRCConnectionReestablishment issue when multiple RRCConnectionReestablishment happen 2018-01-08 15:27:54 +09:00
Raymond Knopp 840d37edf3 Merge branch 'oaisim_config_module_fix' into develop-nos1-fixes
Includes the following updates:
1. oaisim/lte-softmodem in noS1
2. UE fixes for oaisim
3. IF4p5 fixes (doesn't work on develop)
4. UE fixes for DCI handling (corrects problem introduced in develop)
Conflicts:
	cmake_targets/CMakeLists.txt
	targets/SIMU/USER/oaisim_functions.c
2018-01-01 08:34:02 -08:00
Raymond Knopp 02d18cc583 noS1 will compile and run correctly on develop, also for oaisim/RRU 2017-12-28 17:30:00 -08:00
Xu Bo da47348373 fix issue271_hundreds_of_ues bugs with issue255_256_257 2017-12-28 22:41:43 +09:00
Xu Bo 90476be196 Merge branch issue255_256_257_paging_reesta_release into branch ues_test 2017-12-28 15:49:37 +09:00
Xu Bo 663b1d8b7b fix bugs for hundreds_of_ues(UE SCD) 2017-12-27 13:23:06 +09:00
shahab SHARIAT BAGHERI a09728addb Warning decreasing 2017-12-24 10:17:18 +01:00
shahab SHARIAT BAGHERI b1acde2007 Neighbouring cell RRC measurement + decrease warning 2017-12-21 13:55:37 +01:00
Eurecom 0f0204556d added config slave 2017-12-20 14:50:27 +01:00
Eurecom 70388157af added is_slave to config file 2017-12-19 16:41:07 +01:00
Navid Nikaein b049f0c820 Ue stats bugfix for dynamic reconfiguration 2017-12-15 18:10:12 +01:00
Navid Nikaein d35f52a228 Add observation window to the PDCP stats 2017-12-14 15:15:00 +01:00
Robert Schmidt 359e1528dd refactor: FlexRAN reads eNB configuration automatically 2017-12-14 13:06:05 +01:00
Robert Schmidt f39dd5df18 bugfix: handle variable start_eNB in restart 2017-12-14 13:06:05 +01:00