diff options
author | Aidan MacDonald <amachronic@protonmail.com> | 2021-07-25 15:22:33 +0100 |
---|---|---|
committer | Aidan MacDonald <amachronic@protonmail.com> | 2021-07-25 15:22:33 +0100 |
commit | 148fac6f34217a9576e72104009122d6f9eab2ba (patch) | |
tree | ab80c53d7f4cf85a543ba59b9be1bb82d1457086 | |
parent | e532714d1f76ccdbd1dcfeb3b4579d324cb519c1 (diff) | |
download | rockbox-148fac6f34217a9576e72104009122d6f9eab2ba.tar.gz rockbox-148fac6f34217a9576e72104009122d6f9eab2ba.zip |
Fix yellow from e532714d1f
Change-Id: I4f49e93fc1efa78874fb76de6a436ad1fc894cc5
-rw-r--r-- | firmware/target/arm/imx233/pcm-imx233.c | 1 | ||||
-rw-r--r-- | firmware/target/mips/ingenic_jz47xx/pcm-jz4740.c | 19 |
2 files changed, 0 insertions, 20 deletions
diff --git a/firmware/target/arm/imx233/pcm-imx233.c b/firmware/target/arm/imx233/pcm-imx233.c index 4738485b3d..1588d2c874 100644 --- a/firmware/target/arm/imx233/pcm-imx233.c +++ b/firmware/target/arm/imx233/pcm-imx233.c | |||
@@ -42,7 +42,6 @@ __ENSURE_STRUCT_CACHE_FRIENDLY(struct pcm_dma_command_t) | |||
42 | 42 | ||
43 | static int dac_locked = 0; | 43 | static int dac_locked = 0; |
44 | static struct pcm_dma_command_t dac_dma; | 44 | static struct pcm_dma_command_t dac_dma; |
45 | static bool dac_freezed = false; | ||
46 | 45 | ||
47 | static const void *dac_buf; /* current buffer */ | 46 | static const void *dac_buf; /* current buffer */ |
48 | static size_t dac_size; /* remaining size */ | 47 | static size_t dac_size; /* remaining size */ |
diff --git a/firmware/target/mips/ingenic_jz47xx/pcm-jz4740.c b/firmware/target/mips/ingenic_jz47xx/pcm-jz4740.c index a56214f84b..178da0b153 100644 --- a/firmware/target/mips/ingenic_jz47xx/pcm-jz4740.c +++ b/firmware/target/mips/ingenic_jz47xx/pcm-jz4740.c | |||
@@ -184,25 +184,6 @@ void pcm_play_unlock(void) | |||
184 | restore_irq(flags); | 184 | restore_irq(flags); |
185 | } | 185 | } |
186 | 186 | ||
187 | static int get_dma_count(void) | ||
188 | { | ||
189 | int count = REG_DMAC_DTCR(DMA_AIC_TX_CHANNEL); | ||
190 | switch(REG_DMAC_DCMD(DMA_AIC_TX_CHANNEL) & DMAC_DCMD_DS_MASK) | ||
191 | { | ||
192 | case DMAC_DCMD_DS_16BIT: | ||
193 | count *= 2; | ||
194 | break; | ||
195 | case DMAC_DCMD_DS_32BIT: | ||
196 | count *= 4; | ||
197 | break; | ||
198 | case DMAC_DCMD_DS_16BYTE: | ||
199 | count *= 16; | ||
200 | break; | ||
201 | } | ||
202 | |||
203 | return count; | ||
204 | } | ||
205 | |||
206 | void audiohw_close(void) | 187 | void audiohw_close(void) |
207 | { | 188 | { |
208 | /* TODO: prevent pop */ | 189 | /* TODO: prevent pop */ |