Commit Graph
6024 Commits
Author SHA1 Message Date
Rohit Gupta 477a171fbc adding config file for TDD testing 2017-03-07 16:53:50 +01:00
Florian Kaltenberger b45e9a68a8 adding config file for band 38, TM1, usrp 2017-03-07 15:53:09 +01:00
Cedric Roux 5c375d3ae8 Merge branch 'develop_integration_w09' into 'develop'
Develop integration w09

Summary of changes:
- bug fixes

See merge request !128
2017-03-06 15:29:55 +01:00
Cedric Roux c1e460183b Merge remote-tracking branch 'origin/nokia-fixes-w08' into develop_integration_w09 2017-03-03 15:33:20 +01:00
Cedric Roux 05f89b3922 Merge remote-tracking branch 'origin/bug-fix-if-defs' into develop_integration_w09 2017-03-03 15:33:08 +01:00
Cedric Roux 1b1270e847 Merge remote-tracking branch 'origin/feature-59-tm4' into develop_integration_w09 2017-03-03 15:32:54 +01:00
Cedric Roux f94835becf bugfix: "if_compress" parameter not taken into account
Bug reported by Bruno Mongazon from Nokia.

"Without this line, the config file parameter is not properly stored and
the FH will always work with compression."
2017-03-03 15:25:10 +01:00
Cedric Roux 94229ca593 bugfix: = instead of ==
Bug reported by Bruno Mongazon from Nokia.
2017-03-03 15:17:00 +01:00
Elena_Lukashova b2c57f42fc Fixing bug in modulation for TM4 64QAM. 2017-03-02 22:40:54 +01:00
Elena_Lukashova 74e2cf77fa Fixing throughput computations for multiple rounds in TM4. 2017-03-01 16:43:30 +01:00
Elena_Lukashova 7d649f432b Fixing bler limits for different receivers. 2017-03-01 16:00:56 +01:00
Elena_Lukashova 2e9dfe0fbb Changing names for bler and abstraction output files
in dlsim_tm4 to distinguish from the old runs.
2017-03-01 15:33:55 +01:00
khadraou 0a46cc56a2 fixed PRACH hardcoded size 2017-03-01 10:11:07 +01:00
Elena_Lukashova 25f35fbbb4 fix: remove verbose printfs 2017-02-28 16:18:30 +01:00
Elena_Lukashova 2edbcbdf66 bugfix: fix copy/paste error
mcs1 was taken instead of mcs2 in several places.
2017-02-28 16:17:48 +01:00
Elena_Lukashova 3d8fb53073 Merge remote-tracking branch 'origin/develop' into feature-59-tm4 2017-02-28 16:03:47 +01:00
Cedric Roux 5c0f42a277 Merge branch 'develop_integration_w08' into 'develop'
Develop integration w08

Summary of changes:
- various bugs fixed
- pre-commit script for better indentation: see commit 068ce4ca55
  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
2017-02-27 12:08:29 +01:00
Elena_Lukashova b1bf9db8fa Merge branch 'develop' into feature-59-tm4 2017-02-25 01:39:17 +01:00
Elena_Lukashova 2ef3dd8ff7 Adjusting power level for TM4,5,6.
Before that the scaling was aplied in precoder.
Now it is done in sqrt_rho_a and sqrt_rho_b.
For TM4 there still remains 1/sqrt(2) instead of
1/2 both at the transmitter and receievr side.
2017-02-24 23:35:30 +01:00
Elena_Lukashova b81ee87f4d Cleaning up for SIC llrs 2017-02-24 23:33:53 +01:00
Elena_Lukashova bf6a3b522d Removing dlsch1 from arguments of dlsch_modulation_SIC 2017-02-24 23:30:35 +01:00
Elena_Lukashova 3a7fd01f22 Fixing dump_dlsch2 2017-02-24 23:28:35 +01:00
Cedric Roux 465ab00bc5 Merge remote-tracking branch 'origin/compilation-T-quickfix-w08' into develop_integration_w08 2017-02-24 15:21:06 +01:00
Cedric Roux fa9b91ad1d Merge remote-tracking branch 'origin/pre-commit-hook' into develop_integration_w08 2017-02-24 15:18:13 +01:00
Cedric Roux 2c238010a7 Merge remote-tracking branch 'origin/enhancement-212-warning-counts' into develop_integration_w08 2017-02-24 15:17:54 +01:00
Cedric Roux 60b83d84ea hotfix: pass "%s" to LOG_W to avoid compilation warnings
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.
2017-02-23 11:01:45 +01:00
gabrielC abfeb4ef06 Fix problem in DCI decoding following dci_handling_br branch integration 2017-02-23 10:49:06 +01:00
gabrielC c17e81b2aa Merge remote-tracking branch 'origin/develop_UE_20MHz' into develop_integration_w08
Conflicts:
	openair1/PHY/LTE_TRANSPORT/dci_tools.c
2017-02-23 09:09:01 +01:00
gabrielC 2f4fcb5ecc Merge remote-tracking branch 'origin/bugfix214_timingoffset' into develop_integration_w08 2017-02-23 08:56:51 +01:00
gabrielC dcb48081a0 Merge remote-tracking branch 'origin/dci_handling_br' into develop_integration_w08 2017-02-23 08:54:04 +01:00
hbilel 34ca9a7f93 [OAI-UE] issue#214 fix timing offset compensation 2017-02-22 11:52:01 +01:00
Florian Kaltenberger 068ce4ca55 adding a client-side pre-commit script. This script needs to be installed by every developer manually. see comments in script. 2017-02-22 09:29:33 +01:00
gabrielC 46b37aaa31 UE 20 MHz fix + remove too restrictive assert 2017-02-21 14:35:00 +01:00
Cedric Roux e98c3e8143 report warnings to user after compilation
Let the user see how many warnings a compilation generates.
The goal is to have 0 warning, for any compiled component
of openair.
2017-02-20 12:54:46 +01:00
Cedric Roux 38771f270b Merge branch 'develop_integration_w07' into 'develop'
Develop integration w07

See merge request !116

Summary of changes:
- integration of branch tm4-fixes (feature-59-tm4 + somes fixes)
- integration of branch enhancement-199-nas-multi-ue
- integration of branch develop-realtime-lts
- integration of branch enhancement-211-snapping
- various bugfixes
2017-02-20 11:52:32 +01:00
Cedric Roux 339353a96c integration fix: have a central place of definition for clock_difftime_ns
Prior to this commit, the following command failed to build dlsim:
    ./build_oai --phy_simulators -c

Choice has been made to define it in a .h file as a static inline
function.
2017-02-20 10:53:35 +01:00
Cedric Roux c8e642494b integration fix: protect include file
The command line to get the error was:
    ./build_oai --eNB -w EXMIMO -c
2017-02-20 10:10:00 +01:00
Cedric Roux ea858d54fa integration fix: strerror has to be used, not perror
The command line to get the error was:
    ./build_oai --eNB -w EXMIMO -c
2017-02-20 10:09:05 +01:00
Cedric Roux b82e7c1a88 hotfix: forgot targets/COMMON/threads_t.h in a previous commit 2017-02-17 20:19:24 +01:00
Cedric Roux 39f26e945e Merge remote-tracking branch 'origin/enhancement-211-snapping' into develop_integration_w07 2017-02-17 18:27:33 +01:00
Cedric Roux e62f569b5d Merge remote-tracking branch 'origin/various-l2-fixes-187' into develop_integration_w07 2017-02-17 18:23:00 +01:00
Cedric Roux f9b5dafe29 T: let it compile with C++
We now have 4 versions of T_HEADER:
 - bad quality C++ version with time
 - good quality C version with time
 - bad quality C++ version without time
 - good quality C version without time
2017-02-17 18:16:22 +01:00
Cedric Roux 603c84c700 fix warnings: fix LOG_X problems when compiling lte-softmodem
The compilation line was:
    ./build_oai --eNB -w USRP

The file openairinterface5g/cmake_targets/log/lte-softmodem.Rel10.txt
has been checked and all LOG_X (and 'msg') warnings have been fixed.
2017-02-17 18:07:06 +01:00
Cedric Roux 96dc12ccce fix warning: add missing */ 2017-02-17 18:07:06 +01:00
Cedric Roux 37bc075cb2 fix: exit if memory_read fails in the function nas_user_initialize 2017-02-17 18:07:06 +01:00
Cedric Roux 74afbf84f4 warning fix: remove pragma in LFDS
Not sure that it's correct, but those #pragma seem
to be of no use for gcc. Let's remove them
completely.
2017-02-17 18:07:05 +01:00
Cedric Roux baeb930397 use ln -sf instead of ln -s in cmake_targets/build_oai
When rebuilding oaisim, I had a failure because the target
link already exists. The -f flag forces the link to be done.
2017-02-17 18:01:17 +01:00
Cedric Roux 053704b5c2 remove wrong comment 2017-02-17 18:01:02 +01:00
Cedric Roux ac7c0df520 integration fix: let oaisim (S1) work again
- some cleanup
- thread names to include UE Mod_id
- arg of UE_thread_rxn_txnp4 to be struct rx_tx_thread_data again
- sync in UE_thread_rxn_txnp4 to use instance_cnt_rxtx again
- UE_thread to call itti_send_msg_to_task with UE->Mod_id + NB_eNB_INST
  instead of INSTANCE_DEFAULT again

This may break the softmodem UE, to be tested.
The most problematic thing may be the synchronization.
I don't think it will impact the processing at all,
but I won't bet my shirt on it.
2017-02-17 17:55:27 +01:00
Cedric Roux 7c11cf9646 redo commit 5805215227
git show -p 5805215227
to see what it's about
2017-02-17 14:39:00 +01:00