summaryrefslogtreecommitdiff
path: root/firmware/pcm_playback.c
diff options
context:
space:
mode:
authorLinus Nielsen Feltzing <linus@haxx.se>2005-11-16 23:42:19 +0000
committerLinus Nielsen Feltzing <linus@haxx.se>2005-11-16 23:42:19 +0000
commit73a35a1aa445932176fca78688d43c636a3fda5e (patch)
treeba8cca63507301045a685883b3b23b79eb3e476e /firmware/pcm_playback.c
parentd79f3a1e845bcad2d64cbaf467c0f0dae596f537 (diff)
downloadrockbox-73a35a1aa445932176fca78688d43c636a3fda5e.tar.gz
rockbox-73a35a1aa445932176fca78688d43c636a3fda5e.zip
Reverted erroneous commit
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7918 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/pcm_playback.c')
-rw-r--r--firmware/pcm_playback.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/firmware/pcm_playback.c b/firmware/pcm_playback.c
index 5f87917844..05c5447ff8 100644
--- a/firmware/pcm_playback.c
+++ b/firmware/pcm_playback.c
@@ -77,10 +77,8 @@ static void dma_start(const void *addr, long size)
77 77
78 /* Enable the FIFO and force one write to it */ 78 /* Enable the FIFO and force one write to it */
79 IIS2CONFIG = IIS_DEFPARM(pcm_freq); 79 IIS2CONFIG = IIS_DEFPARM(pcm_freq);
80#ifdef HAVE_SPDIF_OUT
81 /* Also send the audio to S/PDIF */ 80 /* Also send the audio to S/PDIF */
82 EBU1CONFIG = EBU_DEFPARM; 81 EBU1CONFIG = EBU_DEFPARM;
83#endif
84 DCR0 = DMA_INT | DMA_EEXT | DMA_CS | DMA_SINC | DMA_START; 82 DCR0 = DMA_INT | DMA_EEXT | DMA_CS | DMA_SINC | DMA_START;
85} 83}
86 84
@@ -92,9 +90,7 @@ static void dma_stop(void)
92 DCR0 = 0; 90 DCR0 = 0;
93 /* Reset the FIFO */ 91 /* Reset the FIFO */
94 IIS2CONFIG = IIS_RESET | IIS_DEFPARM(pcm_freq); 92 IIS2CONFIG = IIS_RESET | IIS_DEFPARM(pcm_freq);
95#ifdef HAVE_SPDIF_OUT
96 EBU1CONFIG = IIS_RESET; 93 EBU1CONFIG = IIS_RESET;
97#endif
98 94
99 next_start = NULL; 95 next_start = NULL;
100 next_size = 0; 96 next_size = 0;
@@ -224,9 +220,7 @@ void pcm_play_pause(bool play)
224 //BCR0 = next_size; 220 //BCR0 = next_size;
225 /* Enable the FIFO and force one write to it */ 221 /* Enable the FIFO and force one write to it */
226 IIS2CONFIG = IIS_DEFPARM(pcm_freq); 222 IIS2CONFIG = IIS_DEFPARM(pcm_freq);
227#ifdef HAVE_SPDIF_OUT
228 EBU1CONFIG = EBU_DEFPARM; 223 EBU1CONFIG = EBU_DEFPARM;
229#endif
230 DCR0 |= DMA_EEXT | DMA_START; 224 DCR0 |= DMA_EEXT | DMA_START;
231 } 225 }
232 else if(!pcm_paused && !play) 226 else if(!pcm_paused && !play)
@@ -236,9 +230,7 @@ void pcm_play_pause(bool play)
236 /* Disable DMA peripheral request. */ 230 /* Disable DMA peripheral request. */
237 DCR0 &= ~DMA_EEXT; 231 DCR0 &= ~DMA_EEXT;
238 IIS2CONFIG = IIS_RESET | IIS_DEFPARM(pcm_freq); 232 IIS2CONFIG = IIS_RESET | IIS_DEFPARM(pcm_freq);
239#ifdef HAVE_SPDIF_OUT
240 EBU1CONFIG = IIS_RESET; 233 EBU1CONFIG = IIS_RESET;
241#endif
242 } 234 }
243 pcm_paused = !play; 235 pcm_paused = !play;
244} 236}