Merge branch '338-correcting-changes-made-in-dlsch_demodulation-c-in-8cbe7cf6af8adf63680d6e610b570acf45df40c2' into mex_mmse_receiver

Merge branch '337-fix-t_ids-h-issue-for-phy_mex' into mex_mmse_receiver
Removing printout in a median function.
2026-07-21 00:20:30 +00:00 · 2018-08-01 14:32:40 +02:00 · 2018-08-01 14:32:30 +02:00 · 2018-07-31 22:45:14 +02:00 · 2018-07-31 22:42:42 +02:00 · 2018-07-31 11:59:18 +02:00
2 changed files with 14 additions and 15 deletions
--- a/cmake_targets/CMakeLists.txt
+++ b/cmake_targets/CMakeLists.txt
@@ -1215,6 +1215,11 @@ set(PHY_MEX_UE
  ${OPENAIR1_DIR}/PHY/TOOLS/signal_energy.c
  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_ue_measurements.c
  ${OPENAIR2_DIR}/UTIL/LOG/log.c
+  ${OPENAIR_DIR}/common/utils/T/T.c
+  ${OPENAIR_DIR}/common/utils/T/local_tracer.c
+  ${OPENAIR_DIR}/common/config/config_cmdline.c
+  ${OPENAIR_DIR}/common/config/config_userapi.c
+  ${OPENAIR_DIR}/common/config/config_load_configmodule.c
  )
 add_library(PHY_MEX ${PHY_MEX_UE})

@@ -2182,7 +2187,7 @@ if (${T_TRACER})
        oai_eth_transpro
        FLPT_MSG ASYNC_IF FLEXRAN_AGENT HASHTABLE MSC UTIL OMG_SUMO SECU_OSA
        SECU_CN SCHED_LIB PHY L2 default_sched remote_sched RAL CN_UTILS
-        GTPV1U SCTP_CLIENT UDP LIB_NAS_UE LFDS LFDS7 SIMU OPENAIR0_LIB)
+        GTPV1U SCTP_CLIENT UDP LIB_NAS_UE LFDS LFDS7 SIMU OPENAIR0_LIB PHY_MEX)
    if (TARGET ${i})
      add_dependencies(${i} generate_T)
    endif()
--- a/openair1/PHY/LTE_UE_TRANSPORT/dlsch_demodulation.c
+++ b/openair1/PHY/LTE_UE_TRANSPORT/dlsch_demodulation.c
@@ -1315,13 +1315,12 @@ void dlsch_channel_compensation(int **rxdataF_ext,

    for (aarx=0; aarx<frame_parms->nb_antennas_rx; aarx++) {

-      dl_ch128          = (__m128i *)&dl_ch_estimates_ext[aatx*2 + aarx][symbol*frame_parms->N_RB_DL*12];
+      dl_ch128          = (__m128i *)&dl_ch_estimates_ext[aatx*frame_parms->nb_antennas_rx + aarx][symbol*frame_parms->N_RB_DL*12];
      //print_shorts("dl_ch128[0]=",&dl_ch128[0]);*/
-      dl_ch_mag128      = (__m128i *)&dl_ch_mag[aatx*2 + aarx][symbol*frame_parms->N_RB_DL*12];
-      dl_ch_mag128b     = (__m128i *)&dl_ch_magb[aatx*2 + aarx][symbol*frame_parms->N_RB_DL*12];
+      dl_ch_mag128      = (__m128i *)&dl_ch_mag[aatx*frame_parms->nb_antennas_rx + aarx][symbol*frame_parms->N_RB_DL*12];
+      dl_ch_mag128b     = (__m128i *)&dl_ch_magb[aatx*frame_parms->nb_antennas_rx + aarx][symbol*frame_parms->N_RB_DL*12];
      rxdataF128        = (__m128i *)&rxdataF_ext[aarx][symbol*frame_parms->N_RB_DL*12];
-      rxdataF_comp128   = (__m128i *)&rxdataF_comp[aatx*2 + aarx][symbol*frame_parms->N_RB_DL*12];
-
+      rxdataF_comp128   = (__m128i *)&rxdataF_comp[aatx*frame_parms->nb_antennas_rx + aarx][symbol*frame_parms->N_RB_DL*12];

      for (rb=0; rb<nb_rb; rb++) {
        if (mod_order>2) {
@@ -1772,11 +1771,11 @@ void dlsch_channel_compensation_core(int **rxdataF_ext,

    for (aarx=0; aarx<n_rx; aarx++) {

-    dl_ch128          = (__m128i *)&dl_ch_estimates_ext[aatx*2 + aarx][start_point];
-    dl_ch_mag128      = (__m128i *)&dl_ch_mag[aatx*2 + aarx][start_point];
-    dl_ch_mag128b     = (__m128i *)&dl_ch_magb[aatx*2 + aarx][start_point];
+    dl_ch128          = (__m128i *)&dl_ch_estimates_ext[aatx*n_rx + aarx][start_point];
+    dl_ch_mag128      = (__m128i *)&dl_ch_mag[aatx*n_rx + aarx][start_point];
+    dl_ch_mag128b     = (__m128i *)&dl_ch_magb[aatx*n_rx + aarx][start_point];
    rxdataF128        = (__m128i *)&rxdataF_ext[aarx][start_point];
-    rxdataF_comp128   = (__m128i *)&rxdataF_comp[aatx*2 + aarx][start_point];
+    rxdataF_comp128   = (__m128i *)&rxdataF_comp[aatx*n_rx + aarx][start_point];

      length_mod8 = length&7;
      if (length_mod8 == 0){
@@ -3980,11 +3979,6 @@ void dlsch_channel_level_median(int **dl_ch_estimates_ext,
                    ((int32_t*)&norm128D)[2] +
                    ((int32_t*)&norm128D)[3];

-        if (ii<1){
-          print_ints("norm128D",&norm128D[0]);
-          printf("norm_pack[%d] %d\n", aatx*n_rx + aarx, norm_pack);
-        }
-
        if (norm_pack > max)
          max = norm_pack;
        if (norm_pack < min)
Author	SHA1	Message	Date
Elena Lukashova	2a63cc98bf	Merge branch '338-correcting-changes-made-in-dlsch_demodulation-c-in-8cbe7cf6af8adf63680d6e610b570acf45df40c2' into mex_mmse_receiver	2018-08-01 14:32:40 +02:00
Elena Lukashova	0e7df9b334	Merge branch '337-fix-t_ids-h-issue-for-phy_mex' into mex_mmse_receiver	2018-08-01 14:32:30 +02:00
Elena Lukashova	4b4ded0c27	Removing printout in a median function.	2018-07-31 22:45:14 +02:00
Elena Lukashova	eec9f293b1	Making channel and data arrays dimensions in compensation function more flexible to support 4x4 system.	2018-07-31 22:42:42 +02:00
Elena Lukashova	c3e4f68609	1.Adding PHY_MEX to the list of the libraries to be compiled with T_tracer, otherwise T_IDs.h was not generated. 2.Adding extra files to the PHY_MEX library.	2018-07-31 11:59:18 +02:00