Remove temporary set of sourceSelect=none in Output shortcuts

diff --git a/processor_audio_sdk_1_00_00_00/pasdk/test_dsp/application/itopo/evmk2g/io.c b/processor_audio_sdk_1_00_00_00/pasdk/test_dsp/application/itopo/evmk2g/io.c
index 539d33b8b76c20e64607c45a1127f69adeda1ec2..9e6f82a94f6110022f207b675696cb3a381de615 100644 (file)
--- a/processor_audio_sdk_1_00_00_00/pasdk/test_dsp/application/itopo/evmk2g/io.c
+++ b/processor_audio_sdk_1_00_00_00/pasdk/test_dsp/application/itopo/evmk2g/io.c
@@ -490,12 +490,13 @@ const struct
     writeOBSioSelectN(DEVOUT_NULL), \
     wb32DECSourceSelect_3, \
     0xcdf0,execPAIOutNone
-#endif
+#else
 // execPAIOutNone
 #define CUS_SIGMA48_S \
     writeOBSioSelectN(DEVOUT_NULL), \
     writePA3Await(rb32OBSioSelect,ob32OBSioSelect(DEVOUT_NULL)), \
     0xcdf0,execPAIOutNone
+#endif    
     
 #pragma DATA_SECTION(cus_sigma48_s0, ".none")
 const ACP_Unit cus_sigma48_s0[] = {
@@ -511,42 +512,50 @@ const ACP_Unit cus_sigma48_s[] = {
 #ifndef SIMULATE_SIO
 // .............................................................................
 // execPAIOutAnalog
-#ifdef TEST_MULTICHANNEL
-#define CUS_SIGMA49_S \
-    rb32DECSourceSelect_3, \
-    writeDECSourceSelectNone, \
-    writePA3Await(rb32DECSourceDecode,ob32DECSourceDecodeNone), \
-    writeOBSioSelectN(DEVOUT_DAC), \
-    writeENCChannelMapTo16(0,4,1,5,2,6,3,7,-3,-3,-3,-3,-3,-3,-3,-3), \
-    wb32DECSourceSelect_3, \
-    0xcdf0,execPAIOutAnalog
-#else
-#define CUS_SIGMA49_S \
-    rb32DECSourceSelect_3, \
-    writeDECSourceSelectNone, \
-    writePA3Await(rb32DECSourceDecode,ob32DECSourceDecodeNone), \
-    writeOBSioSelectN(2), \
-    writeENCChannelMapTo16(0,1,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3), \
-    wb32DECSourceSelect_3, \
-    0xcdf0,execPAIOutAnalog
-#endif
+    #ifdef TEST_MULTICHANNEL
+        #if 0  // (***) FL: remove change in Dec sourceSelect since this will cause break in TaskAsip
+        #define CUS_SIGMA49_S \
+            rb32DECSourceSelect_3, \
+            writeDECSourceSelectNone, \
+            writePA3Await(rb32DECSourceDecode,ob32DECSourceDecodeNone), \
+            writeOBSioSelectN(DEVOUT_DAC), \
+            writeENCChannelMapTo16(0,4,1,5,2,6,3,7,-3,-3,-3,-3,-3,-3,-3,-3), \
+            wb32DECSourceSelect_3, \
+            0xcdf0,execPAIOutAnalog
+        #else
+        #define CUS_SIGMA49_S \
+            writeOBSioSelectN(DEVOUT_DAC), \
+            writeENCChannelMapTo16(0,4,1,5,2,6,3,7,-3,-3,-3,-3,-3,-3,-3,-3), \
+            0xcdf0,execPAIOutAnalog
+        #endif
+    #else // TEST_MULTICHANNEL
+        #define CUS_SIGMA49_S \
+            rb32DECSourceSelect_3, \
+            writeDECSourceSelectNone, \
+            writePA3Await(rb32DECSourceDecode,ob32DECSourceDecodeNone), \
+            writeOBSioSelectN(2), \
+            writeENCChannelMapTo16(0,1,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3), \
+            wb32DECSourceSelect_3, \
+            0xcdf0,execPAIOutAnalog
+        #endif // TEST_MULTICHANNEL
 
 #else // SIMULATE_SIO
-#if 0 // (***) FL: remove change in Dec sourceSelect since this will cause break in TaskAsip
-#define CUS_SIGMA49_S \
-    rb32DECSourceSelect_3, \
-    writeDECSourceSelectNone, \
-    writePA3Await(rb32DECSourceDecode,ob32DECSourceDecodeNone), \
-    writeOBSioSelectN(1), \
-    writeENCChannelMapTo16(3,7,2,6,1,5,0,4,-3,-3,-3,-3,-3,-3,-3,-3), \
-    wb32DECSourceSelect_3, \
-    0xcdf0,execPAIOutAnalog
-#endif
-#define CUS_SIGMA49_S \
-    writeOBSioSelectN(1), \
-    writePA3Await(rb32OBSioSelect,ob32OBSioSelect(1)), \
-    writeENCChannelMapTo16(3,7,2,6,1,5,0,4,-3,-3,-3,-3,-3,-3,-3,-3), \
-    0xcdf0,execPAIOutAnalog
+    #if 0 // (***) FL: remove change in Dec sourceSelect since this will cause break in TaskAsip
+    #define CUS_SIGMA49_S \
+        rb32DECSourceSelect_3, \
+        writeDECSourceSelectNone, \
+        writePA3Await(rb32DECSourceDecode,ob32DECSourceDecodeNone), \
+        writeOBSioSelectN(1), \
+        writeENCChannelMapTo16(3,7,2,6,1,5,0,4,-3,-3,-3,-3,-3,-3,-3,-3), \
+        wb32DECSourceSelect_3, \
+        0xcdf0,execPAIOutAnalog
+    #else
+    #define CUS_SIGMA49_S \
+        writeOBSioSelectN(1), \
+        writePA3Await(rb32OBSioSelect,ob32OBSioSelect(1)), \
+        writeENCChannelMapTo16(3,7,2,6,1,5,0,4,-3,-3,-3,-3,-3,-3,-3,-3), \
+        0xcdf0,execPAIOutAnalog
+    #endif    
     
 #endif // SIMULATE_SIO
 
@@ -564,6 +573,7 @@ const ACP_Unit cus_sigma49_s[] = {
 
 // .............................................................................
 // execPAIOutAnalogSlave
+#if 0 // (***) FL: remove change in Dec sourceSelect since this will cause break in TaskAsip
 #define CUS_SIGMA50_S \
     rb32DECSourceSelect_3, \
     writeDECSourceSelectNone, \
@@ -572,6 +582,12 @@ const ACP_Unit cus_sigma49_s[] = {
        writeENCChannelMapTo16(0,4,1,5,2,6,3,7,-3,-3,-3,-3,-3,-3,-3,-3), \
     wb32DECSourceSelect_3, \
     0xcdf0,execPAIOutAnalogSlave
+#else
+#define CUS_SIGMA50_S \
+    writeOBSioSelectN(DEVOUT_DAC_SLAVE), \
+       writeENCChannelMapTo16(0,4,1,5,2,6,3,7,-3,-3,-3,-3,-3,-3,-3,-3), \
+    0xcdf0,execPAIOutAnalogSlave
+#endif    
 
 #pragma DATA_SECTION(cus_sigma50_s0, ".none")
 const ACP_Unit cus_sigma50_s0[] = {