From: Frank Livingston <frank-livingston@ti.com>
Date: Mon, 2 Oct 2017 21:21:22 +0000 (-0500)
Subject: PASDK-401:Clean up compile-time component selection in ARM&DSP patchs files
X-Git-Url: https://git.ti.com/gitweb?p=processor-sdk%2Fperformance-audio-sr.git;a=commitdiff_plain;h=332671157a4eb79bfb6ea40311e36598c63c6814

PASDK-401:Clean up compile-time component selection in ARM&DSP patchs files
---

diff --git a/pasdk/test_arm/framework/itopo/patchs.c b/pasdk/test_arm/framework/itopo/patchs.c
index 0bfb8fcb..00407121 100644
--- a/pasdk/test_arm/framework/itopo/patchs.c
+++ b/pasdk/test_arm/framework/itopo/patchs.c
@@ -53,32 +53,28 @@ All rights reserved.
 #include <pcm.h>
 #include <pcm_mds.h>
 
-#ifdef DTS_BUILD
-//
-// DTS build
-//
-#define _DTS_
-
-#elif defined DH_BUILD
+#ifdef DH_BUILD
 //
 // DH build
 //
-
 #define _DDPAT_
 #define _THD_
-    
-#else
+#else    
+#undef  _DDPAT_
+#undef  _THD_
+#endif // DH_BUILD
+
+#ifdef DTS_BUILD
 //
-// NO-IP build
+// DTS build
 //
-#undef _DTS_
-#undef _DDPAT_
-#undef _THD_ 
-    
-#endif
+#define _DTS_
+#else
+#undef  _DTS_
+#endif // DTS_BUILD
 
-//#define _SRC4_
 
+//#define _SRC4_
 
 
 #ifdef _DDPAT_
diff --git a/pasdk/test_dsp/application/itopo/evmk2g/alpha/i13_a.h b/pasdk/test_dsp/application/itopo/evmk2g/alpha/i13_a.h
index 4fcc75be..aef66be3 100644
--- a/pasdk/test_dsp/application/itopo/evmk2g/alpha/i13_a.h
+++ b/pasdk/test_dsp/application/itopo/evmk2g/alpha/i13_a.h
@@ -65,11 +65,11 @@ All rights reserved.
 #include <car_a.h>
 #include <oar_a.h>
 #include <bmda_a.h>
+#endif // DH_BUILD
 
-#elif defined DTS_BUILD
+#ifdef DTS_BUILD
 #include <dtsuhda_a.h>
 #include <dtsuhdb_a.h>
-
-#endif
+#endif // DTS_BUILD
 
 #endif /* _I13_A_H_ */
diff --git a/pasdk/test_dsp/framework/itopo/patchs.c b/pasdk/test_dsp/framework/itopo/patchs.c
index baa4c4e5..374e8066 100644
--- a/pasdk/test_dsp/framework/itopo/patchs.c
+++ b/pasdk/test_dsp/framework/itopo/patchs.c
@@ -53,51 +53,36 @@ All rights reserved.
 // DTS build
 //
 #define _DTS_
-
-#elif defined DH_BUILD
+#else
+#undef  _DTS_
+#endif // DTS_BUILD
+   
+#ifdef DH_BUILD
 //
 // DH build
 //
-    
-#ifndef _ENABLE_BENCHMARK_PCMHSR_SRC_CAR_
-//
-// NOT performing PCM high-sampling rate + SRC + CAR benchmarking
-//
-
-//#define _AE0_
 #define _SRC4_
 #define _CAR_
 #define _OAR_
 #define _BMDA_
-//#define _ML0_
 
-#else // _ENABLE_BENCHMARK_PCMHSR_SRC_CAR_
-//
-// Performing PCM high-sampling rate + SRC + CAR benchmarking
+#ifdef _ENABLE_BENCHMARK_PCMHSR_SRC_CAR_
 //
+// Performing PCM high-sampling rate + SRC + CAR benchmarking.
+// This is DH build, but with OAR removed.
+#undef  _OAR_
+#endif // _ENABLE_BENCHMARK_PCMHSR_SRC_CAR_
+
+#else
+#undef  _SRC4_
+#undef  _CAR_
+#undef  _OAR_
+#undef  _BMDA_    
+#endif // DH_BUILD
 
-//#define _AE0_
-#define _SRC4_
-#define _CAR_
-//#define _OAR_
-#define _BMDA_
-//#define _ML0_
 
-#endif // _ENABLE_BENCHMARK_PCMHSR_SRC_CAR_
-    
-#else 
-//
-// NO-IP build
-//
-#undef _DTS_
-#undef _CAR_
-#undef _OAR_
-#undef _BMDA_
 //#define _AE0_
 //#define _ML0_
-    
-#endif
-
 
 
 //