summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThom Johansen <thomj@rockbox.org>2007-10-09 19:24:18 +0000
committerThom Johansen <thomj@rockbox.org>2007-10-09 19:24:18 +0000
commit8500f485b6610b12398da1672e9a9a0ed745b53a (patch)
tree4471e6dc2c937ca75f8b7dfce4da7af1aeb9bc8f
parent9ff40579c383972ab4274013338e2d211084c10d (diff)
downloadrockbox-8500f485b6610b12398da1672e9a9a0ed745b53a.tar.gz
rockbox-8500f485b6610b12398da1672e9a9a0ed745b53a.zip
FS #7917 by Andree Buschmann. Packed I2S also for Ipod Video.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15049 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/target/arm/i2s-pp.c3
-rw-r--r--firmware/target/arm/pcm-pp.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/firmware/target/arm/i2s-pp.c b/firmware/target/arm/i2s-pp.c
index 38a3f9837e..997d27ec8b 100644
--- a/firmware/target/arm/i2s-pp.c
+++ b/firmware/target/arm/i2s-pp.c
@@ -70,7 +70,8 @@ void i2s_reset(void)
70 IISCLK = (IISCLK & ~0x1ff) | 33; 70 IISCLK = (IISCLK & ~0x1ff) | 33;
71 IISDIV = 7; 71 IISDIV = 7;
72 IISCONFIG = ((IISCONFIG & ~IIS_FIFO_FORMAT_MASK) | IIS_FIFO_FORMAT_LE16); 72 IISCONFIG = ((IISCONFIG & ~IIS_FIFO_FORMAT_MASK) | IIS_FIFO_FORMAT_LE16);
73#elif defined (IRIVER_H10) || defined (IRIVER_H10_5GB) || defined(IPOD_NANO) 73#elif defined (IRIVER_H10) || defined (IRIVER_H10_5GB) || defined(IPOD_NANO) \
74 || defined(IPOD_VIDEO)
74 /* Nano works fine with IIS_FIFO_FORMAT_LE16 as well */ 75 /* Nano works fine with IIS_FIFO_FORMAT_LE16 as well */
75 IISCONFIG = ((IISCONFIG & ~IIS_FIFO_FORMAT_MASK) | IIS_FIFO_FORMAT_LE16_2); 76 IISCONFIG = ((IISCONFIG & ~IIS_FIFO_FORMAT_MASK) | IIS_FIFO_FORMAT_LE16_2);
76#else 77#else
diff --git a/firmware/target/arm/pcm-pp.c b/firmware/target/arm/pcm-pp.c
index e246ce0066..21d7f74b0c 100644
--- a/firmware/target/arm/pcm-pp.c
+++ b/firmware/target/arm/pcm-pp.c
@@ -30,7 +30,8 @@
30 and codec setup using "arithmetic" the hardware supports like halfword 30 and codec setup using "arithmetic" the hardware supports like halfword
31 swapping. Try to use 32-bit packed in IIS modes if possible. */ 31 swapping. Try to use 32-bit packed in IIS modes if possible. */
32#if defined(SANSA_C200) || defined(SANSA_E200) \ 32#if defined(SANSA_C200) || defined(SANSA_E200) \
33 || defined(IRIVER_H10) || defined(IRIVER_H10_5GB) || defined(IPOD_NANO) 33 || defined(IRIVER_H10) || defined(IRIVER_H10_5GB) || defined(IPOD_NANO) \
34 || defined(IPOD_VIDEO)
34/* 16-bit, L-R packed into 32 bits with left in the least significant halfword */ 35/* 16-bit, L-R packed into 32 bits with left in the least significant halfword */
35#define SAMPLE_SIZE 16 36#define SAMPLE_SIZE 16
36#define TRANSFER_SIZE 32 37#define TRANSFER_SIZE 32