1. 17 Feb, 2017 6 commits
    • Cedric Roux's avatar
      redo commit 58052152273b537207fccf85c86bfa3152fbd4f9 · 9fbec888
      Cedric Roux authored
      git show -p 58052152273b537207fccf85c86bfa3152fbd4f9
      to see what it's about
      9fbec888
    • Cedric Roux's avatar
      redo commit 157707b0422201ef1cd9b505578c9a11d6e19604 · bb650cec
      Cedric Roux authored
      git show 157707b0422201ef1cd9b505578c9a11d6e19604
      to see what it's about
      bb650cec
    • Cedric Roux's avatar
      integration fix: restore enb.band7.tm1.usrpb210.conf · 5883f6fe
      Cedric Roux authored
      Many variables were changed that should not have been changed.
      5883f6fe
    • Cedric Roux's avatar
      Revert "fix nettle" · 88753df8
      Cedric Roux authored
      This reverts commit d31634c358f35548f14daf1645268a741d21b371.
      
      Laurent Thomas had a problem on one machine with the build_oai
      way of checking for nettle.
      
      The problem with the alternative solution of including nettle/bignum.h
      is that it is very unclear.
      
      The problem with nettle is that the file nettle/config.h does not
      exist for version 2. It was introduced in version 3.
      
      We want to support both versions, but there is an API incompatibility.
      So we need an #if #else mechanism.
      
      The file nettle/bignum.h is present in both versions 2 and 3 and it
      includes nettle/version.h in the version 3.
      
      So by including this file, we can check for the existence of
      NETTLE_VERSION_MAJOR (that comes from nettle/config.h) in the
      code.
      
      But as you can see, the reasoning is way too complex.
      
      So it's better to keep the check in cmake_targets/CMakeLists.txt.
      
      As long as we support version 2 this will be the way to go.
      
      It is possible to force a given version in specific non-generic
      customized environments.
      88753df8
    • gabrielC's avatar
      Merge branch 'develop-realtime-lts' into develop_integration_w07 · d3cf1a77
      gabrielC authored
      Conflicts:
      	targets/RT/USER/lte-enb.c
      	targets/RT/USER/lte-softmodem.c
      	targets/RT/USER/lte-ue.c
      d3cf1a77
    • Cedric Roux's avatar
  2. 16 Feb, 2017 13 commits
  3. 15 Feb, 2017 3 commits
    • Cedric Roux's avatar
      bugfix: fix PDCP inst · 7f9a7d74
      Cedric Roux authored
      This commit is a continuation of 614d6bbe2af5c34f3bace7a8cb5003f07a8931b2
      (ue_ip: use correct instance).
      
      Now in openair2/NETWORK_DRIVER/UE_IP/common.c the 'inst' is not
      forced to 1 anymore, we take the value 'pdcph_p->inst'.
      
      It turns out that 'pdcph_p->inst' is 0 instead of 1 when we
      run lte-softmodem as an UE.
      
      So let's modify PDCP to set 'inst' to 1 where it was set to 0 for
      the UE softmodem case, and skip the places where it is reset to 0,
      still for the UE softmodem case.
      
      This may break things, I am not sure.
      7f9a7d74
    • Cedric Roux's avatar
      bugfix: variable was on the stack · 816d96ba
      Cedric Roux authored
      Guess what happens when we return from the function...
      816d96ba
    • Florian Kaltenberger's avatar
  4. 14 Feb, 2017 10 commits
    • hbilel's avatar
      [OAI-UE] fix pucch format2 regression · d4caf268
      hbilel authored
      d4caf268
    • Laurent's avatar
      remove debug traces · 83fc564f
      Laurent authored
      83fc564f
    • Laurent's avatar
      gcc warning fix · d4c17684
      Laurent authored
      d4c17684
    • Cedric Roux's avatar
      cleanup lte-softmodem.c · bb041379
      Cedric Roux authored
      For whatever reason, lte-softmodem.c was totally messed up...
      
      We took the version from the branch develop and added
      abstraction_flag, which is needed in openair2/LAYER2/MAC/main.c
      (this is not clean, previous commit added a comment for this).
      This has to be cleaned at some point.
      bb041379
    • gabrielC's avatar
      UE logging, Replace LOG_I by LOG_D · 856e7864
      gabrielC authored
      856e7864
    • Cedric Roux's avatar
      minor: add a comment · a656e1ec
      Cedric Roux authored
      a656e1ec
    • Cedric Roux's avatar
      fix build_oai · 285e6485
      Cedric Roux authored
      - the option --UE was abused! Let's introduce --UE-conf-nvram and
        --UE-gen-nvram
      - the option name --UE-OUTPUT was not clear and is now replaced by
        --UE-gen-nvram
      - the new options are described when running ./build_oai -h
      - print_help has been modified (' replaced by ") to print
        $conf_nvram_path and $gen_nvram_path
      285e6485
    • gabrielC's avatar
      Merge remote-tracking branch 'origin/tm4-fixes' into develop_integration_w07 · 75346166
      gabrielC authored
      Conflicts:
      	openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
      	openair1/PHY/LTE_TRANSPORT/power_control.c
      	openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
      	targets/SIMU/USER/oaisim_functions.c
      75346166
    • Cedric Roux's avatar
      ue_ip: use correct instance · 70111fd5
      Cedric Roux authored
      The problem was the following.
      
      Run oaisim with two UEs:
      
          sudo ../cmake_targets/oaisim_build_oai/build/oaisim -O enb.conf -u2 -s15 -AAWGN -y1 -b1 -Q0
      
      Then wait for both UEs to be connected. The interfaces "oip1" and "oip2" are
      activated, with IP addresses 192.172.0.2 for the first UE and 192.172.0.3 for
      the second.
      
      Then on the EPC machine, do:
      
          ping 192.172.0.3
      
      No reply.
      On the oaisim machine, we see that the packets are sent to "oip1" instead
      of "oip2".
      
      The fix may break softmodem UE. The inst was forced to "1" for some reason.
      To be checked.
      70111fd5
    • Cedric Roux's avatar
      deal with empty subframes at UE side even in oaisim · f6b3158c
      Cedric Roux authored
      The memset was also too big. It should only clear
      one subframe.
      
      Only tested without abstraction.
      Abstraction does not work for the moment anyway, but just to
      keep that in mind.
      f6b3158c
  5. 13 Feb, 2017 8 commits