Commit Graph
275 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 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 593ebc4732 Fix bug in subframe2harq_pid. Remove if tdd condition while calling this method since there is already if-else in the method. 2018-02-08 18:08:38 +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 9c820805fa TDD config1 initial merge 2018-02-05 15:43:20 +08:00
Wu Jing ba8a111ea1 merge the latest develop branch into issue289 2018-02-01 19:25:29 +09:00
Xu Bo da94f64c95 Merge remote-tracking branch 'remotes/origin/issue255_256_257_tmp' into ues_test 2018-01-23 09:37:15 +00:00
Xu Bo 573c703cd2 fix issue about nb_rb=0 assertion failed 2018-01-23 09:31:01 +00: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
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 9c8b6e56f2 Merge remote-tracking branch 'origin/hotfix-dci-clear-padding-bits' into develop_integration_2018_w02 2018-01-15 15:45:18 +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 27c3074ff9 fix RRCConnectionReestablishment issue when multiple RRCConnectionReestablishment happen 2018-01-08 15:27:54 +09:00
Cedric Roux c5ca2bd862 hotfix: clear DCI padding bits
The problem is the following (as reported by an user):

  "one UE is attached to OAI system. UE is near the antenna. Try to detach
  the UE and attach again. Repeat this procedure for 5-6 times. OAI system
  does not work and any the UE can not attach to this system. I use TEMS
  software and I can see MIB signaling on this UE but UE can not decode SIB1
  and SIB2."

What happens is that the DCI for SIB1 and SIB2 is not cleared before
use. That is the bits in the 'padding' field keep the values that were
set before. If the structure has been used to transmit other DCIs
(eg. for UEs) in the past, it may be reused with some of those bits set
to 1. When receiving this DCI, the UE won't accept it because it
gets some bits at 1 where it expects them to be 0.

The short-term/quick solution is to clear the 'padding' field.
A better solution would be to rewrite this part of the code,
which is way too complicated for what it does. But this takes
too much time.

In dci.h the field 'dummy' of some structures was renamed to 'padding'.
The fields 'padding32' and 'padding64' were also renamed to 'padding'
for consistency.

Some structures (DCI2B_1_5MHz_TDD, DCI2B_10MHz_FDD, DCI2D_1_5MHz_FDD,
DCI2D_5MHz_FDD, DCI2D_10MHz_FDD) had a 'padding' field at the end, which
was renamed to 'padding0'. I don't know if this field should be here at all.
To me this field looks very suspicious. When we test DCIs 2B and 2D we
should be careful.
2018-01-03 11:19:54 +01:00
Xu Bo 663b1d8b7b fix bugs for hundreds_of_ues(UE SCD) 2017-12-27 13:23:06 +09:00
Xu Bo 3651852e16 1.NUMBER_OF_UE_MAX 16 -> 256 2.fix type of UE number from uint8_t to uint16_t 2017-12-07 11:40:52 +08:00
Xu Bo ac0d39af37 fix ULSCH harq_pid calculate issue 2017-11-23 16:23:08 +09: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
Raymond Knopp cc47fbed90 Merge branch 'RU-RAU-split' of https://gitlab.eurecom.fr/oai/openairinterface5g into RU-RAU-split 2017-10-19 12:27:13 +02:00
Raymond Knopp b09a281b09 modifications for TDD and IF4p5 (in particular TDD). Both in RRU and RAU components. Monolithic is unchanged. 2017-10-19 12:25:51 +02:00
Cedric Roux 311f439a6a T tracer: add uplink TBS (retransmissions not handled) 2017-10-19 12:05:16 +02:00
Cedric Roux 1a04ba5bfc bugfix: do not modify dlsch structure at all in case of PDCCH order for RAPROC
introduce a new function to deal with this special case
2017-10-18 17:40:10 +02:00
Cedric Roux 00f45ec9f5 bugfix: modulo from frame 2017-10-13 12:19:12 +02:00
Cedric Roux beaeea740d bugfix: careful when setting harq_mask (didn't work for dci 1a sent to UE to do uplink) 2017-10-12 16:28:37 +02:00
Cedric Roux f80f1f617d bugfixes
- better ulsch harq management in phy (maybe not over)
- don't do schedule_CSI if UE not in RRC_CONNECTED (not sure if correct)
- don't call find_ulsch in fill_dci0
- some spaces cleaned
- log improved
2017-10-12 14:39:55 +02:00
Cedric Roux 6abbf040be bugfix: test existence before adding a new one 2017-10-11 17:45:53 +02:00
Cedric Roux c407cdba2d bugfix: use rnti 0 to mean "unused" instead of -1
-1 does not work
2017-10-11 16:44:27 +02:00
Cedric Roux ac6f09eb2f fix find_dlsch and find_ulsch 2017-10-11 12:08:28 +02:00
Raymond Knopp 8e6cc01905 handling of PDCCH order. stoping UE-specific scheduler during RA procedure. checking for DCI format (resource allocation) to not overwrite resource_block_coding for format 1A DCIs. 2017-10-09 01:25:23 +02:00
Raymond Knopp 6bfc0d63b4 put 50 PRB back in default enb configuration. added handling of UE release in L1/L2. detection of stale ULSCH configuration 2017-10-08 13:04:08 +02:00
Raymond Knopp b8235ff707 bugfix in dci generation (padding bits set to 0 in format 0 DCI)
removal of LOG_I put for debugging.
2017-10-07 08:22:02 +02:00
Raymond Knopp 09e683a3be switching some LOG_I to LOG_D, fixes for RRU IF4p5. It was broken after changes in configuration procedures. Some configuration file changes. 2017-10-05 23:24:44 +02:00
Cedric Roux b21b2dada3 bugfix: Msc_initial wrong 2017-10-03 15:31:16 +02:00
Cedric Roux ed4b2b74e2 cleanup + fix
- remove old unused code
- check dlsch0 the right way
2017-10-03 13:45:02 +02:00
Cedric Roux 70e30375eb bugfix: compute rhoA and rhoB at the right place 2017-10-03 13:41:44 +02:00
Raymond Knopp 14b2827cec fixed various bugs in NFAPI interface and DCI CCE allocations (eNB_scheduler_primitives.c:allocate_CCEs()) 2017-10-01 02:56:46 -07:00
Raymond Knopp 28707a6948 fixed Msg4 retransmissions. PUCCH still null after merge with develop 2017-09-28 01:05:38 -07:00
Cedric Roux e6936f1b7c update T tracer
not finished, UE may not work, many things bad/to fix properly
2017-09-27 17:59:08 +02:00
Raymond Knopp bc9c587b48 Merge remote-tracking branch 'origin/develop' into RU-RAU-split
Conflicts:
	openair1/PHY/INIT/lte_init.c
	openair1/PHY/LTE_ESTIMATION/defs.h
	openair1/PHY/LTE_ESTIMATION/lte_ue_measurements.c
	openair1/PHY/LTE_TRANSPORT/dci.c
	openair1/PHY/LTE_TRANSPORT/dci_tools.c
	openair1/PHY/LTE_TRANSPORT/defs.h
	openair1/PHY/LTE_TRANSPORT/dlsch_decoding.c
	openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
	openair1/PHY/LTE_TRANSPORT/dlsch_llr_computation.c
	openair1/PHY/LTE_TRANSPORT/if5_tools.c
	openair1/PHY/LTE_TRANSPORT/phich.c
	openair1/PHY/LTE_TRANSPORT/proto.h
	openair1/PHY/defs.h
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair1/SCHED/phy_procedures_lte_ue.c
	openair1/SCHED/pusch_pc.c
	openair2/ENB_APP/enb_config.c
	openair2/LAYER2/MAC/defs.h
	openair2/LAYER2/MAC/eNB_scheduler.c
	openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
	openair2/LAYER2/MAC/eNB_scheduler_primitives.c
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
	openair2/LAYER2/MAC/pre_processor.c
	openair2/LAYER2/MAC/ue_procedures.c
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-softmodem.h
	targets/RT/USER/lte-ue.c
	targets/SIMU/USER/init_lte.c
	targets/SIMU/USER/oaisim_functions.c
2017-09-26 21:43:03 -07:00
Francois TABURET ada735527a debugging of ULSCH with nFAPI 2017-09-25 16:33:14 +02:00
Raymond Knopp 3e86d30b82 some correction in RA processing for Msg4 harq handling 2017-09-24 11:33:00 -07:00
Raymond Knopp d75dc39a32 removal of more compilation warnings 2017-09-21 21:28:49 +02:00
Raymond Knopp 0fccd99446 patch for open-nfapi 2017-09-19 04:59:15 -07:00
Raymond Knopp 55a39eb2f3 initial version for testing with nFAPI interfaces. Still lots of debugging traces. 2017-09-15 06:09:12 -07:00
Raymond Knopp 362f584d66 integration of remaining nFAPI messages 2017-09-14 07:15:49 -07:00
Raymond Knopp 5c0ea2b446 addition of MPDCCH format 5. X_u_br sequences for BL/CE UE support and bugfixes in rx_prach0 for eMTC. 2017-08-17 00:51:23 -07:00
tct-labo4 a738eeade4 ue using new thread index instead of modulo 2017-07-26 16:09:03 +02:00
Raymond.Knopp 8ee3f3b353 initial tests with USRP as monolithic eNB, "connectionless" execution is fine. 2017-07-25 22:15:52 +02:00