improve a slave issue when not pwm out

 {
     "files.associations": {
-        "xutility": "c"
+        "xutility": "c",
+        "app_main.h": "c"
     }
 }
\ No newline at end of file

@@ -144,7 +144,7 @@ void app_dac_init (void)
 #ifdef I2S1_DATA_OUT
 	DMA_Channel0_Init((U32 *)DA_I2S_OUT_FIFO_ADDR,   (U32 *)awOutStore.awOutSampleStore[0], DAC_OUT_FRAME_SZIE/4, SOURCE_DMA_IIS1_OUT);
 	if (app_main_data.share_link_role == SL_ROLE_SLAVE)
-		DMA_Channel8_Init((U32 *)DA_PP_CLASSD_FIFO_ADDR, (U32 *)awOutStore.awOutSampleStore[0], DAC_OUT_FRAME_SZIE/4, SOURCE_DMA_DA_PP);
+		DMA_Channel8_Init((U32 *)DA_SPDIF_OUT_FIFO_ADDR, (U32 *)awOutStore.awOutSampleStore[0], DAC_OUT_FRAME_SZIE/4, SOURCE_DMA_SPDIF_DAC_OUT);
 #else
 #ifdef AUDIO_PWM_OUTPUT
 	DMA_Channel0_Init((U32 *)DA_PP_CLASSD_FIFO_ADDR, (U32 *)awOutStore.awOutSampleStore[0], DAC_OUT_FRAME_SZIE/4, SOURCE_DMA_DA_PP);
@@ -480,11 +480,13 @@ void Dma_0_TransmitIsr(void)
 	}
 }
 
+static int dma8src[4] = {0,0,0,0};
 void Dma_8_TransmitIsr (void)
 {
 	U16 len;
 	int *pBuf,i;
 
+
 	if (DMA_0_COUNT == 0)
 	{
 		if (awOut_contrls.awSize)
@@ -494,7 +496,7 @@ void Dma_8_TransmitIsr (void)
 			DMA_0_SOURCE = (int *) &awOutStore.awOutSampleStore[awOut_contrls.awIndex][0]; //Source address
 			DMA_0_COUNT = len;
 
-			DMA_8_SOURCE = (int *) &awOutStore.awOutSampleStore[0][0];
+			DMA_8_SOURCE = dma8src;//(int *) &awOutStore.awOutSampleStore[0][0];
 			DMA_8_COUNT = len - TRANS_PART2_COUNT;
 
 			/*Clear the previous out data*/
@@ -515,7 +517,7 @@ void Dma_8_TransmitIsr (void)
 			DMA_0_SOURCE = (int *) &awOutStore.awOutSampleStore[1-awOut_contrls.awIndex][0]; //Source address
 			DMA_0_COUNT = Zero_Buf_Size*2;
 
-			DMA_8_SOURCE = (int *) &awOutStore.awOutSampleStore[0][0];
+			DMA_8_SOURCE = dma8src;//(int *) &awOutStore.awOutSampleStore[0][0];
 			DMA_8_COUNT = Zero_Buf_Size*2 - TRANS_PART2_COUNT;			
 		}		
 	}
@@ -523,7 +525,7 @@ void Dma_8_TransmitIsr (void)
 	{		
 		SOFT3_INT_SET;
 
-		DMA_8_SOURCE = (int *) &awOutStore.awOutSampleStore[0][0];
+		DMA_8_SOURCE = dma8src;//(int *) &awOutStore.awOutSampleStore[0][0];
 		DMA_8_COUNT = (TRANS_PART1_COUNT + TRANS_PART2_COUNT)*2;
 	}
 }

@@ -1652,14 +1652,14 @@ void taskDec(void *pvParameters)
 				//optek_hifi2_16b_to_24b(pDacbuf,pDacbuf,(samples<<1));		
 			}
 			#endif
-/*
+
 			if (pOut_up != NULL)
 			{
 				app_main_data.playing_stream_chans = 1;
 				len >>= 1;
 				pOut = pOut_up;
 			}
-*/
+
 			while(len > max_out_len)
 			{
 				slice <<= 1;
@@ -1691,6 +1691,8 @@ void taskDec(void *pvParameters)
 			I32 adj;
 			U32 hsamples = TRANS_PART1_SAMPLES/2;
 
+			adj_outsamples -= last_adj;
+
 			last_adj = 0;
 			
 			adj = adj_outsamples;
@@ -1714,8 +1716,7 @@ void taskDec(void *pvParameters)
 					last_adj = -adj;
 				}
 
-				adj_outsamples -= last_adj;
-				DBG_Printf("adj:%d,left:%d\r\n",last_adj,adj_outsamples);
+				DBG_Printf("adj:%d,left:%d\r\n",last_adj,adj_outsamples - last_adj);
 			}
 /*********sync end***************/
 

@@ -2,6 +2,8 @@
 #define _AUDIO_DEC_H_
 
 #include "hw_codec.h"
+#include "hw_da_pp.h"
+
 
 #define CO_PROCESSOR_MASK_BITS    0x03
 
@@ -110,8 +112,15 @@ extern U16 dec_frame_size;
 #define TRANS_PART1_COUNT SAMPLES2DMACOUNT(TRANS_PART1_SAMPLES)
 #define TRANS_PART2_COUNT SAMPLES2DMACOUNT(TRANS_PART2_SAMPLES)
 
-#define DMA_UNDERFLOW_DELAY_COUNT 32
-
+#ifdef I2S1_DATA_OUT
+	#define DMA_UNDERFLOW_DELAY_COUNT 8
+#else
+	#ifdef AUDIO_PWM_OUTPUT
+	#define DMA_UNDERFLOW_DELAY_COUNT 32
+	#else
+	#define DMA_UNDERFLOW_DELAY_COUNT 8
+	#endif
+#endif
 void app_nav_spdif_stream_reinit (void);
 
 void dec_direct_out_24bit( int *pBuf, U16 len );

@@ -24,6 +24,8 @@
 
 #include "app_i2c.h"
 
+#include "app_main.h"
+
 #define ADC_MASTER
 #define SINGLE_ENDED_OUTPUT
 
@@ -804,10 +806,16 @@ void audio_code_init(void)
 
     SPDIF_CONFIG = temp;
 
-
-#if 1//ndef AUDIO_PWM_OUTPUT	
-	DA_PP_CLASSD_EN |= 0x02; //spdif_en enable
-#endif
+    if (app_main_data.share_link_role == SL_ROLE_SLAVE)
+    {
+        DA_PP_CLASSD_EN = 0x03;
+    }
+    else
+    {
+    #ifndef AUDIO_PWM_OUTPUT	
+        DA_PP_CLASSD_EN = 0x02; //spdif_en enable
+    #endif
+    }
 
 
     //codec setting

@@ -82,14 +82,12 @@ void dda_pp_init(void)
 #endif
 
 
-#if (SHARE_LINK_MODE == SL_SUBWOOFER)
 	if (app_main_data.share_link_role == SL_ROLE_SLAVE)
 	{
 		classd_config_ahb->pp_clk_config = 2;
 		classd_config_ahb->osr_config = 0;
 		classd_config_ahb->sigma_delta_quan = 7;
 	}
-#endif
 
 	classd_config_ahb->sigma_delta_order = 1;
 #if 0//def PWM_HALF_BRIDGE

@@ -48,7 +48,7 @@
 
 //#define I2S1_MI2SIN_B_GROUP        /* only for OTK5282/83/P */
 #define I2S1_MI2SIN_BCK_LRCK_OUT     //Outdead: #define I2S1_BCK_LRCK_OUT
-//#define I2S1_DATA_OUT
+#define I2S1_DATA_OUT
 
 #define I2S1_DATA_IN
 

@@ -233,7 +233,7 @@ void DMA_Channel8_Init(U32 *dest, U32 *src, U32 byte_count, U8 dma_source)
 	
 	pCtrl->size = DMA_TRANSMIT_SIZE_WORD;	//Transfer size
 	pCtrl->burst_size = DMA_BURST_SINGLE;	    //1
-	pCtrl->saddr_inc = DMA_SRC_ADDR_INC;;	//Source address inc select
+	pCtrl->saddr_inc = DMA_SRC_ADDR_FIXED;;	//Source address inc select
 	pCtrl->daddr_inc = DMA_SRC_ADDR_FIXED;	//Destination address inc select
 	pCtrl->source = dma_source;			    //Dma source select
 	pCtrl->start = 0;						//not software dma start