Merge branch 'enhancement-10-harmony' into develop_integration_w03

Conflicts: targets/RT/USER/lte-enb.c targets/RT/USER/lte-softmodem.c
2017-01-20 16:49:39 +01:00
parent da0cbaf86c 56241235cf
commit e6f3c9b899
50 changed files with 4118 additions and 992 deletions
@@ -98,6 +98,7 @@ const char* eurecomVariablesNames[] = {
  "rxcnt",
  "trx_ts",
  "trx_tst",
+  "trx_write_flags",
  "tx_ts",
  "rx_ts",
  "hw_cnt_rx",
@@ -70,6 +70,7 @@ typedef enum {
  VCD_SIGNAL_DUMPER_VARIABLES_RXCNT,
  VCD_SIGNAL_DUMPER_VARIABLES_TRX_TS,
  VCD_SIGNAL_DUMPER_VARIABLES_TRX_TST,
+  VCD_SIGNAL_DUMPER_VARIABLES_TRX_WRITE_FLAGS,
  VCD_SIGNAL_DUMPER_VARIABLES_TX_TS,
  VCD_SIGNAL_DUMPER_VARIABLES_RX_TS,
  VCD_SIGNAL_DUMPER_VARIABLES_RX_HWCNT,