Commit Graph
203 Commits
Author SHA1 Message Date
jftt_wangshanshan 0889d79969 Modify CQI scheduling strategy 2018-04-23 09:45:08 +08: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
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 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
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
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
jftt_wangshanshan 2505f15eab Fix previous problem for no-ue-extension version of schedule_ulsch_rnti 2018-03-12 12:49:34 +08:00
jftt_wangshanshan 485b7fc060 Fix the defecitve process while there is an uci scheduled before an ulsch. 2018-03-12 11:07:59 +08:00
Wu Jing d45572446c fix mcs when retranssmission 2018-03-08 12:38:54 +09:00
Wu Jing 45655197eb merge ues_test branch into sp3_tdd_config1 2018-03-07 13:42:05 +09:00
Wu Jing 54cf2d9aef fix TBS_UL data_type from uint8_t to uint16_t 2018-03-06 16:15:24 +09:00
naoi 4b02d81839 Fix: Random access information may not release if msg3_round initial value is not zero. 2018-03-01 16:21:32 +09:00
naoi af6ca15020 Fix: Random access information is not released when Msg3(response to PDCCH order) re-transmission fails. 2018-02-28 17:11:37 +09:00
naoi 497a3275c6 fix: drop reestablishment request after UL failure is detected in layer2.
eNB should be keep UE context longer than T311 timer after UL failure is detected in layer2.
Configuration file(GENERIC-LTE-EPC) sets T311 to 10s, so eNB keep UE context up to 20s.
2018-02-22 10:17:34 +09:00
Wu Jing c641f334bb fix total usable RBs when pucch rb=6 2018-02-12 18:38:26 +09:00
jftt_wangshanshan 19a2b37c75 Fix bug in Adaptive Retransmission for ULSCH. Fix Qm,mcs,TBS setting. 2018-02-12 16:52:48 +08:00
Xu Bo dcdda7ba35 set UL schedule period to 5Frame for TDD config1 2018-02-11 18:10:11 +09: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
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
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
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
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 1471846030 Merge branch 'issue271_hundreds_of_ues' into ues_test 2018-01-13 10:53:27 +00:00
Xu Bo f6911c934b fix n1_pucch issue: 25RB pucch 2RB;50RB/100RB pucch 4RB 2018-01-13 08:23:22 +00: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
Xu Bo e108727c80 merge develop 2017.w48 into origin/issue255_256_257_paging_reesta_release 2017-12-11 05:02:51 +00:00
Xu Bo f5678be960 merge develop branch 2017-12-05 17:09:41 +09:00
Xu Bo d81438cd17 merge the implemention of Paging, RRCConnectionRelease, RRCConnectionReestablishment, E-RAB Modify, E-RAB Release 2017-11-28 11:13:03 +09:00
Cedric Roux b0d505d2e8 bugfix: always cancel Random Access Process
Even if the old UE is not found, we have to cancel the random access.
2017-11-27 11:19:12 +01:00
Xu Bo 34bc087707 modify function for issue271 2017-11-10 06:56:57 +09:00
Raymond Knopp d01aa2d08a changing of notation for Random-Access procedure to match documentation. Function remains the same. Indentation (-kr) run on all files in LAYER2/MAC 2017-11-04 09:55:11 -07:00
Cedric Roux 6da4265876 bugfix: fix timing advance
- remove global variables in the function lte_est_timing_advance_pusch
- do the smoothing logic that was in lte_est_timing_advance_pusch
  in rx_sdu (is it necessary? is it correct?)
- put back the value 100 in prach_procedures for the test on prach energy
- change the value of timing_advance_update

  it was:

     timing_advance_update                  = sync_pos - eNB->frame_parms.nb_prefix_samples/4; //to check

  it is now:

     timing_advance_update                  = sync_pos; // - eNB->frame_parms.nb_prefix_samples/4; //to check

  this should be checked somehow. The computation looked suspicious. Maybe
  the new one is wrong.
2017-10-25 14:26:49 +02:00
Cedric Roux b4a48e199e Merge remote-tracking branch 'origin/update-license' into RU-RAU-split
Conflicts:
	openair1/PHY/CODING/rate_matching.c
	openair1/PHY/LTE_REFSIG/primary_synch.h
	openair2/LAYER2/layer2_top.c
	openair2/RRC/LITE/rrc_config.c
2017-10-23 15:00:30 +02:00
Cedric Roux 1b1f941e3c upgrade license to version 1.1 2017-10-23 12:22:13 +02:00
Cedric Roux f1e8bff3ec remove gcc warnings
phy_init_lte_ue_signal was renamed init_lte_ue_signal in openair1/PHY/INIT/defs.h
maybe it's the opposite that should have been done?

Functions used in one file and defined in another may have been
declared in the wrong header file.
2017-10-19 17:00:30 +02:00
Cedric Roux 256c5ab060 improve crnti reception (still not correct, we need to reconfigure the UE)
TODO: if the UE did random access (followed by a MAC uplink with
CRNTI) because none of its scheduling request was granted, then
according to 36.321 5.4.4 the UE's MAC will notify RRC to release
PUCCH/SRS. According to 36.331 5.3.13 the UE will then apply
default configuration for CQI reporting and scheduling requests,
which basically means that the CQI requests won't work anymore and
that the UE won't do any scheduling request anymore as long as the
eNB doesn't reconfigure the UE.
We have to take care of this. As the code is, nothing is done and
the UE state in the eNB is wrong.
2017-10-18 09:56:29 +02:00