Commit Graph
897 Commits
Author SHA1 Message Date
jftt_wangshanshan 19a2b37c75 Fix bug in Adaptive Retransmission for ULSCH. Fix Qm,mcs,TBS setting. 2018-02-12 16:52:48 +08:00
jftt_wangshanshan 5a461002a1 Merge branch 'sp3_tdd_config1' of http://takoyaki.np1s.css.fujitsu.com:8000/gitlab/vran/release_enb into sp3_tdd_config1 2018-02-12 14:01:46 +08:00
Xu Bo dcdda7ba35 set UL schedule period to 5Frame for TDD config1 2018-02-11 18:10:11 +09:00
jftt_wangshanshan 4898d609e6 Fix a bug in HI_DCI0_req clear 2018-02-11 16:42:12 +08:00
jftt_wangshanshan 1bc258a729 Merge branch 'sp3_tdd_config1' of http://takoyaki.np1s.css.fujitsu.com:8000/gitlab/vran/release_enb into sp3_tdd_config1 2018-02-08 18:09:53 +08:00
jftt_wangshanshan 9ba0355000 add switch tdd config to Msg4 timing setting 2018-02-08 18:04:23 +08:00
jftt_wangshanshan 89b261efe5 Fix bug in schedule_ulsch 2018-02-08 16:28:13 +08:00
Wu Jing 8fffe90dbe fix hundreds_of_ues issue(n1_PUCCH_AN DAI) for TDD cofnig1 2018-02-08 02:24:54 +00:00
jftt_wangshanshan e8300aa944 Don't use assert since the comment above said it's perfectly possible to have this NULL here. 2018-02-06 16:50:27 +08:00
Xu Bo 5c76360c2d Fix special subframe only use 2 symbols to transmit pdcch 2018-02-06 11:01:05 +09:00
Xu Bo f9f20c7300 allocate_CCEs only called on dl subframes 2018-02-05 20:17:53 +09:00
Xu Bo 4387070cda fix merge bug 2018-02-05 17:25:57 +09:00
jftt_wangshanshan 9c820805fa TDD config1 initial merge 2018-02-05 15:43:20 +08:00
Xu Bo 10d7599d08 fix merge error 2018-02-03 17:52:03 +09:00
Wu Jing 069ce49e9c Merge remote-tracking branch 'other/issue289_tdd_config1' into sp3_master 2018-02-03 17:50:53 +09:00
naoi 3ea62dbdee modify log. 2018-02-01 21:26:05 +09:00
Wu Jing ba8a111ea1 merge the latest develop branch into issue289 2018-02-01 19:25:29 +09:00
Xu Bo d42ddeac56 fix CRNTI process 2018-02-01 01:57:54 +00:00
Xu Bo ef4aee1e28 Merge branch 'issue255_256_257_tmp' into ues_test 2018-01-27 04:14:06 +00:00
Xu Bo 0dcc3dceaf reduce UL failure timer log by change LOG_I to LOG_D 2018-01-27 04:13:12 +00:00
Xu Bo 664d1a4b5f merge issue271_hundreds_of_ues into ues_test and fix conflict in openair2/LAYER2/MAC/defs.h 2018-01-27 02:24:43 +00:00
Xu Bo 098a177d6f Merge branch 'issue271_hundreds_of_ues' into ues_test 2018-01-27 02:12:47 +00:00
Xu Bo dedd3c6344 fix issue that when RRCConnectionRelease happened by UL failure DL SCD doesn't send DCCH(RRCConnectionRelease) to UE because ul_out_of_sync is set to 1 2018-01-27 02:11:57 +00:00
Xu Bo b7e2a90ef4 fix release timer by starting timer after SCD DCCH(RRCConnectionRelease) 2018-01-27 02:06:08 +00:00
Xu Bo 260a2a7d3d Merge branch 'issue255_256_257_tmp' into ues_test 2018-01-26 17:08:09 +09:00
Xu Bo d9d28e3209 reset release_timer from 200ms to 100ms because of flightmode on/off issue, reduce ul failure timer log 2018-01-26 08:00:57 +00:00
Xu Bo 1547a45eae Merge remote-tracking branch 'remotes/origin/issue255_256_257_tmp' into ues_test 2018-01-26 07:15:45 +00:00
Xu Bo 0105373cdc Merge remote-tracking branch 'remotes/origin/issue271_hundreds_of_ues' into ues_test 2018-01-26 06:43:41 +00:00
Xu Bo b44c83ef46 add remove ue info of pre_scd thread to freeList and for ru_thread to remove the UE in the freeList 2018-01-26 06:15:28 +00:00
Xu Bo 23b5b6ac20 add remove ue info to freeList when RRCConnectionReestablish occurs and for ru_thread to remove the info 2018-01-26 05:57:37 +00:00
Cedric Roux ecd4aebbe0 Merge remote-tracking branch 'origin/issue-285-connect-disconnect-multiple-time' into develop_integration_2018_w04 2018-01-22 18:44:32 +01:00
Cedric Roux 97ebc165cc Merge remote-tracking branch 'origin/282-flags-cleanup' into develop_integration_2018_w04
Conflicts:
	openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
	openair1/SCHED/defs.h
	openair2/LAYER2/PDCP_v10.1.0/pdcp.c
	openair2/RRC/LITE/rrc_eNB.c
2018-01-22 17:47:01 +01:00
Cedric Roux 4b5b556493 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.
2018-01-22 15:32:41 +01:00
Xu Bo 2efaf51280 modify pre_scd thread and add phy_tx thread and rf_tx thread 2018-01-22 05:58:14 +00:00
Xu Bo b67c169145 Merge branch 'issue255_256_257_tmp' into ues_test 2018-01-22 13:58:56 +09:00
Xu Bo 70da4b5902 modify pre_scd thread and add phy_tx and rf_tx thread 2018-01-22 03:59:04 +00:00
Xu Bo f59a509ec7 fix RRCConnectionRelease timer from 100ms to 200ms and clear MSG3_round after schedule_RA 2018-01-22 02:38:17 +00:00
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
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
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
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