Commit Graph
6469 Commits
Author SHA1 Message Date
hbilel 1029a62208 Fix for TDD multiplexing 2017-05-24 16:16:11 +02:00
Elena_Lukashova 82545b8265 Merge branch 'develop' into feature-59-tm4 2017-05-24 12:49:52 +02:00
Elena_Lukashova 10ad08db41 Changes in files outputs. 2017-05-24 10:45:41 +02:00
Cedric Roux b67847c9cf minor: fix file permissions (from 755 to 644) 2017-05-23 17:33:29 +02:00
Cedric Roux 31ef9b5203 cleanup - rewrite a bit allocate_CCEs for better logging
We want the log in case of failure also for the case:
    if (nCCE + (1<<dci_alloc->L) > nCCE_max)
2017-05-23 15:44:48 +02:00
Cedric Roux 324e6501d6 bugfix: wrong CCE allocation
We have to not only ensure that the CCE is free but
also that it's below the number of availables CCEs
with respect to the current PDCCH size.
2017-05-23 15:42:09 +02:00
gabrielC 8758d3d4cf --ue-no-log, add printf to verify attach is ok 2017-05-22 17:26:03 +02:00
Cedric Roux 9bef36f23a Release 0.6. 2017-05-22 11:41:14 +02:00
gabrielC 16acea57cc Merge tag '2017.w20' into UE_logging 2017-05-22 11:31:18 +02:00
Cedric Roux a6f98a8b28 Merge branch 'develop_integration_w20' into 'develop'
develop_integration_w20 into develop

Summary of changes:
- bug fixes
  * UE TDD fixes
  * PDCCH size computation (at phy level, still to be corrected at mac level)
  * DAI increment
  * fix run_enb_ue_virt_noS1 and run_enb_ue_virt_s1 to use Rel14 and
     have --xforms to work
  * compilation warning removals
  * better oaisim logging (print UE security keys,
    print version (git commit ID) at runtime, print working directory)

See merge request !190
2017-05-22 11:03:55 +02:00
Cedric Roux c98339e104 integration fix: remove compilation warnings 2017-05-22 10:41:33 +02:00
Cedric Roux 2237b431c2 integration fix: fix compilation warnings 2017-05-22 10:34:55 +02:00
Cedric Roux c15a9a8294 post-integration fix: remove compilation warnings 2017-05-22 10:23:24 +02:00
Cedric Roux f3914c74f0 Merge remote-tracking branch 'origin/UE_TDD_Fix' into develop_integration_w20 2017-05-19 17:23:03 +02:00
Cedric Roux 312fad1293 Merge remote-tracking branch 'origin/fjt_bug_fix_issue239' into develop_integration_w20 2017-05-19 17:22:39 +02:00
Cedric Roux 87eb459823 Merge remote-tracking branch 'origin/various-fixes-w20' into develop_integration_w20 2017-05-19 17:22:01 +02:00
Cedric Roux 65c845ea67 Merge remote-tracking branch 'origin/oaisim-logging-w20' into develop_integration_w20 2017-05-19 17:21:37 +02:00
Cedric Roux b74f10a878 Merge remote-tracking branch 'origin/exmimo-compilation-fix-w20' into develop_integration_w20 2017-05-19 17:21:16 +02:00
Cedric Roux 8e57a58dd6 fix run_enb_ue_virt_noS1 and run_enb_ue_virt_s1
Problems reported by Jorge Muñoz Castañer <jorgem@gti.uvigo.es>.

- use Rel14 binaries (those are produced by default)
- let -x option work to have graphical output
- fix VCD missing 'echo'
2017-05-19 17:00:36 +02:00
Cedric Roux 9cf288f6f3 pre-integration fix: minor improvement
we can compute CCE_max_used_index out of the loop.
2017-05-19 16:29:07 +02:00
Cedric Roux 685464c204 pre-integration fix: correct comparison
get_nCCE returns the number of available CCEs.

We can put the CCEs numbers [ 0 .. get_nCCE-1 ],
so we need to use <, not <=.
2017-05-19 16:27:08 +02:00
gabrielC dd7691ec60 Fix warning compilation 2017-05-19 16:22:51 +02:00
Cedric Roux 8625a8672a T: improve trace ENB_PHY_ULSCH_UE_DCI 2017-05-19 16:17:56 +02:00
gabrielC abf30c20b1 Remove some logs 2017-05-19 16:01:38 +02:00
hbilel 667bfb0173 TDD config 4,5 harq,bundling,multiplexing,ack,nack
config 4 tested with Amarisoft
2017-05-19 15:37:57 +02:00
gabrielC fe350d5b6f UE logging change :
--ue-trace : Enabling UE trace for debug
--ue-timing : Enabling UE timing trace
--ue-no-log : Disabling all LOG_X traces
2017-05-19 14:28:34 +02:00
echigoya d79c186a13 Fujitsu No.6 Correct DAI incrementation 2017-05-19 09:36:47 +09:00
Tomohiro 8160f8a23f Fujitsu No.39 Correct pdcch symbol calculation 2017-05-19 09:24:49 +09:00
Cedric Roux c08bd6ba9c warning removal
force j to -1, there is a compilation warning with the T tracer
(variable may be used uninitialized)
2017-05-18 15:43:16 +02:00
Cedric Roux dcfdd76113 minor: warnings removal
It seems that ciphering_algorithm is "unsigned int" in RRC Rel10
and "unsigned long" in RRC Rel14 (as processed by asn1c)

Let's force it to unsigned long in the log to avoid compilation-time
warnings.
2017-05-18 15:42:30 +02:00
Cedric Roux 9d65f4dd09 warnings removal in LOG_X
those popped up thanks to previous commit
2017-05-18 14:16:24 +02:00
Cedric Roux 94dd884325 redo commit cb67d586a4
Seems like this commit got lost at some point.

Here was the message:
-----------------------------------------------------------------------------
Author: Cedric Roux <cedric.roux@eurecom.fr>
Date:   Tue Jan 10 14:21:02 2017 +0100

    add format indicator to get LOG_X warnings

    The LOG_X macros emit a lot of warnings when compiling with the T
    because they call the function logRecord (or logRecord_mt)
    which has not been "marked" as calling printf, so gcc won't
    emit typical printf warnings.

    With the T, they directly translate to sprintf, so those warnings
    pop up, much more verbose due to several macro expansions.

    Let's make them pop up all the time so it's easier to fix them.
-----------------------------------------------------------------------------
2017-05-18 11:34:58 +02:00
Cedric Roux f6693af628 add CQI to periodic logging of UE 2017-05-18 11:24:40 +02:00
Cedric Roux 4eefaffb47 minor: change files mode (from 755 to 644) 2017-05-18 11:12:11 +02:00
Cedric Roux 5e323eefa2 improve logging in oaisim
- print current working directory
- print git version (if available)
- print security keys
  this last one is a security breach, but as of today
  it's not a problem
2017-05-18 10:39:25 +02:00
Cedric Roux dd07d878a3 bugfix: fix compilation for express MIMO target 2017-05-17 12:58:21 +02:00
Cedric Roux 430a8c4e11 Merge branch 'develop_integration_w19' into 'develop'
develop_integration_w19 into develop

Summary of changes:
- bug fixes:
  * RLC AM fixes
  * UE TDD fixes
  * Fujitsu bug fixes (TDD also)
  * mobipass fixes (bad management of carriers, softmodem was failing with more than one CC)
  * compilation warnings removal
- PUCCH format 3 preliminary support (work from Fujitsu)
- build fixes: do not include shared library in main executable (work from Nokia)
  express MIMO2 needs some more work here

See merge request !184
2017-05-15 22:45:56 +02:00
Cedric Roux 099b7f2ac6 integration fix: fix rrh_gw compilation 2017-05-15 16:13:32 +02:00
Cedric Roux 0023d448f7 integration fix: expressMIMO should be aligned with the rest now
No need for this special case. Plus, it fails with the work
from Nokia on compilation cleanup.
2017-05-15 16:12:33 +02:00
Cedric Roux ce08fa8e9e integration fix: remove various warnings 2017-05-15 15:57:26 +02:00
Cedric Roux 15bb39704a integration fix: remove warnings introduced by PUCCH format 3 handling 2017-05-15 15:56:49 +02:00
Cedric Roux f12350ce62 integration fix: remove warnings in dlsim 2017-05-15 15:42:27 +02:00
Cedric Roux 9cd3e2e887 integration fix: remove warnings in ulsim 2017-05-15 15:42:01 +02:00
Cedric Roux 11006597c9 integration fix: let dlsim and ulsim work again
There is now the function copy_harq_proc_struct and some
procedures for the UE have changed, which makes necessary
to have UE->dlsch valid for both subframes (odd and even).

We increase memory usage, maybe it's not the correct solution.
To be kept in mind if something goes wrong at some point.
2017-05-15 11:13:56 +02:00
Cedric Roux 0f42d5a344 Merge remote-tracking branch 'origin/bugfix_multiple_carriers_mobipass' into develop_integration_w19 2017-05-15 11:13:45 +02:00
Cedric Roux 9eaee53bb6 rewrite phy_stats_exist
We have to test that all active CCs of a given UE exist in the PHY layer.
Maybe not the end of the story...
2017-05-13 12:45:17 +02:00
Cedric Roux 0bb229451a Merge remote-tracking branch 'origin/bugfix_Fujitsu_reviewed' into develop 2017-05-12 15:57:33 +02:00
Cedric Roux 2d97b777b6 Merge remote-tracking branch 'origin/enhancement-124-hw_library_new' into develop 2017-05-12 15:57:10 +02:00
Cedric Roux 06f2889b2d Merge remote-tracking branch 'origin/UE_TDD_Fix' into develop 2017-05-12 15:56:52 +02:00
Cedric Roux 9107d2831b Merge remote-tracking branch 'origin/bugfix-238-rlc-am' into develop 2017-05-12 15:53:25 +02:00