1. 27 Feb, 2017 1 commit
    • Cedric Roux's avatar
      Merge branch 'develop_integration_w08' into 'develop' · 5c0f42a2
      Cedric Roux authored
      Develop integration w08
      
      Summary of changes:
      - various bugs fixed
      - pre-commit script for better indentation: see commit 068ce4ca
        For the moment, each contributor has to enable the script (and install astyle) by hand.
        Maybe at some point the script will be mandatory.
      
      See merge request !124
      5c0f42a2
  2. 24 Feb, 2017 3 commits
  3. 23 Feb, 2017 5 commits
    • Cedric Roux's avatar
      hotfix: pass "%s" to LOG_W to avoid compilation warnings · 60b83d84
      Cedric Roux authored
      The warning was:
      
      ------------------------
      In file included from /roux/openairinterface5g/openair2/UTIL/LOG/log.h:306:0,
                       from /roux/openairinterface5g/openair1/PHY/defs.h:54,
                       from /roux/openairinterface5g/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c:33:
      /roux/openairinterface5g/openair2/UTIL/LOG/log.h: In function 'printMeas':
      /roux/openairinterface5g/common/utils/T/T.h:94:26: warning: format not a string literal and no format arguments [-Wformat-security]
       #define T_ID(x) ((struct T_header *)(uintptr_t)(x))
                                ^
      /roux/openairinterface5g/common/utils/T/T.h:29:22: note: in definition of macro 'T_PUT_int'
           int T_PUT_var = (val); \
                            ^
      /roux/openairinterface5g/common/utils/T/T.h:269:7: note: in expansion of macro 'T_HEADER'
             T_HEADER(t); \
             ^
      /roux/openairinterface5g/common/utils/T/T.h:101:76: note: in expansion of macro 'T3'
               n18,n19,n20,n21,n22,n23,n24,n25,n26,n27,n28,n29,n30,n31,n32,n,...) T##n
                                                                                  ^
      /roux/openairinterface5g/common/utils/T/T.h:102:16: note: in expansion of macro 'TN'
       #define T(...) TN(__VA_ARGS__)
                      ^
      /roux/openairinterface5g/openair2/UTIL/LOG/log.h:308:28: note: in expansion of macro 'T'
       #    define LOG_W(c, x...) T(T_LEGACY_ ## c ## _WARNING, T_PRINTF(x))
                                  ^
      /roux/openairinterface5g/common/utils/T/T_IDs.h:71:30: note: in expansion of macro 'T_ID'
       #define T_LEGACY_PHY_WARNING T_ID(68)
                                    ^
      /roux/openairinterface5g/openair2/UTIL/LOG/log.h:308:30: note: in expansion of macro 'T_LEGACY_PHY_WARNING'
       #    define LOG_W(c, x...) T(T_LEGACY_ ## c ## _WARNING, T_PRINTF(x))
                                    ^
      /roux/openairinterface5g/openair2/UTIL/LOG/log.h:411:9: note: in expansion of macro 'LOG_W'
               LOG_W(PHY,txt2);
      ------------------------
      
      over and over.
      
      By replacing LOG_W(PHY,txt2) by LOG_W(PHY,"%s",txt2) all the warnings
      are removed.
      60b83d84
    • Gabriel's avatar
    • Gabriel's avatar
      Merge remote-tracking branch 'origin/develop_UE_20MHz' into develop_integration_w08 · c17e81b2
      Gabriel authored
      Conflicts:
      	openair1/PHY/LTE_TRANSPORT/dci_tools.c
      c17e81b2
    • Gabriel's avatar
    • Gabriel's avatar
  4. 22 Feb, 2017 2 commits
  5. 21 Feb, 2017 1 commit
  6. 20 Feb, 2017 5 commits
  7. 17 Feb, 2017 20 commits
  8. 16 Feb, 2017 3 commits
    • Cedric Roux's avatar
      bugfix: do not allocate memory · 9a5d17d9
      Cedric Roux authored
      Memory was allocated which was "lost" because the
      address of the block was put in a pointer that is
      overwritten just after.
      
      Discussing with Elena, the current commit is the correct
      way to do things.
      9a5d17d9
    • Cedric Roux's avatar
      bugfix: make some functions thread safe · 9535e7a2
      Cedric Roux authored
      Those functions modify a global char array (a string).
      
      Let's pass a buffer to those functions, so that it's
      thread safe. The caller has been modified, with hopefully
      a buffer big enough (still bigger than what was there before,
      so should not break more than it did).
      9535e7a2
    • Cedric Roux's avatar
      integration fix: remove ^M from file · 31c85b22
      Cedric Roux authored
      command run:
          dos2unix openair1/SIMULATION/TOOLS/taus.c
      31c85b22