Commit Graph
6048 Commits
Author SHA1 Message Date
Cedric Roux 20b420bb84 fix compilation for ubuntu 16
This work was done by Laurent Thomas.
2017-03-16 14:44:38 +01:00
Cedric Roux bd3394f528 Merge branch 'develop_integration_w10' into 'develop'
Develop integration w10

Summary of changes:
- MIMO for UE
- TDD in test setup
- bug fixes

See merge request !133
2017-03-13 15:48:07 +01:00
Cedric Roux a500b2b293 integration fix: fix compilation of ulsim
We use the odd/even dlsch corresponding to the configured
subframe. It may not be the right thing to do.
2017-03-13 15:43:43 +01:00
hbilel cec9cb7662 fix compilation error for dlsim 2017-03-13 12:05:47 +01:00
hbilel b82b7781ee integration fix clear tx-buffer of ue in case of empty subframe
for all processing including oaisim
2017-03-13 10:14:26 +01:00
Cedric Roux a194009e00 integration fix: put dlsch_demod_shift into dlsch_demodulation 2017-03-13 10:06:26 +01:00
hbilel 947e50f33d integration fix optional compilation of avx2 2017-03-13 09:49:56 +01:00
Cedric Roux fe5fd2494c Merge remote-tracking branch 'origin/tdd_w10' into develop_integration_w10 2017-03-10 22:27:29 +01:00
Cedric Roux 8e8fec1e19 test setup v2: add TDD tests
New tests: 0186xx for TDD with the huawei 3276 dongle.
All necessary files to configure and use it have been added.
Existing code has been adapted for the TDD tests.
Only the test setup v2 has been adapted.
The file test_case_list.xml has been changed to add tests
0186xx, but only to work with test setup v2. It won't
work with test setup v1. To be completed if needed.

The tests are similar to FDD tests.
Throughputs for TDD have to be adjusted, the throughputs
of FDD are used for the moment.
2017-03-10 20:18:36 +01:00
Cedric Roux e6cd9873cd cleanup test setup README file 2017-03-10 12:19:29 +01:00
gabrielC 8e022654dc Merge remote-tracking branch 'origin/UE_20MHz_fix' into develop_integration_w10 2017-03-09 16:37:12 +01:00
gabrielC 4abc1d21e3 20 MHz UE fix 2017-03-09 16:33:07 +01:00
gabrielC 83b311beac Merge branch 'remove_printf' into develop_integration_w10 2017-03-09 10:23:11 +01:00
gabrielC 28c009a072 Chenge LOG_I to LOG_D 2017-03-09 10:20:52 +01:00
gabrielC 212dff253f Merge remote-tracking branch 'origin/mimo_feature_ue_br' into develop_integration_w10 2017-03-09 09:49:42 +01:00
hbilel 305ebf5c4b rebase branch to develop 2017.w09 2017-03-08 14:57:30 +01:00
hbilel 9dd65f2801 [OAI-UE] remove unused debug-printf 2017-03-08 14:21:14 +01:00
hbilel 05fe029a62 [OAI-UE] fix in de-precoding for tm3/4 2017-03-08 13:59:49 +01:00
hbilel 3d1e01e283 [OAI-UE] llr computation clean up 2017-03-08 12:16:38 +01:00
hbilel bb8c6b2c52 [OAI-UE] code clean up for merge 2017-03-08 12:16:38 +01:00
hbilel 3dc1963a2d [OAI-UE] MIMO fixes + disabling MIB/SIB decoding on connected mode 2017-03-08 12:16:38 +01:00
Sebastian Wagner 42b834d64c Changes for 64qam_64qam for avx2
Conflicts:
	openair1/PHY/LTE_TRANSPORT/dlsch_llr_computation.c
2017-03-08 12:16:38 +01:00
hbilel ba55fcac27 [OAI-UE] Mimo LLR computation AVX2 + fix in TM3 deprecoding 2017-03-08 12:16:38 +01:00
hbilel ff6d41b6e8 [OAI-UE] Mimo feature 2017-03-08 12:15:02 +01:00
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