From a194009e00a59d3d60c44421015da846a57e6633 Mon Sep 17 00:00:00 2001 From: Cedric Roux Date: Mon, 13 Mar 2017 10:06:26 +0100 Subject: [PATCH] integration fix: put dlsch_demod_shift into dlsch_demodulation --- openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c | 7 ++++++- targets/RT/USER/lte-softmodem.c | 7 ++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c b/openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c index 9ed40ce162..a842a8a9dc 100644 --- a/openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c +++ b/openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c @@ -42,7 +42,12 @@ #define NOCYGWIN_STATIC #endif -extern int16_t dlsch_demod_shift; +/* dynamic shift for LLR computation for TM3/4 + * set as command line argument, see lte-softmodem.c + * default value: 0 + */ +int16_t dlsch_demod_shift = 0; + //#define DEBUG_HARQ //#undef LOG_D diff --git a/targets/RT/USER/lte-softmodem.c b/targets/RT/USER/lte-softmodem.c index 5761577259..65f578fd25 100644 --- a/targets/RT/USER/lte-softmodem.c +++ b/targets/RT/USER/lte-softmodem.c @@ -151,8 +151,6 @@ uint8_t usim_test = 0; uint8_t nb_antenna_tx = 1; uint8_t nb_antenna_rx = 1; -int16_t dlsch_demod_shift = 0; - char ref[128] = "internal"; char channels[128] = "0"; @@ -323,6 +321,7 @@ void help (void) { printf(" --ue-txgain set UE TX gain\n"); printf(" --ue-nb-ant-rx set UE number of rx antennas "); printf(" --ue-scan_carrier set UE to scan around carrier\n"); + printf(" --dlsch-demod-shift dynamic shift for LLR compuation for TM3/4 (default 0)\n"); printf(" --loop-memory get softmodem (UE) to loop through memory instead of acquiring from HW\n"); printf(" --mmapped-dma sets flag for improved EXMIMO UE performance\n"); printf(" --external-clock tells hardware to use an external clock reference\n"); @@ -804,9 +803,11 @@ static void get_options (int argc, char **argv) { case LONG_OPTION_THREADEVENSUBFRAME: threads.even=atoi(optarg); break; - case LONG_OPTION_DEMOD_SHIFT: + case LONG_OPTION_DEMOD_SHIFT: { + extern int16_t dlsch_demod_shift; dlsch_demod_shift = atof(optarg); break; + } #if T_TRACER case LONG_OPTION_T_PORT: { extern int T_port;