summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2007-10-09 19:59:00 +0000
committerJens Arnold <amiconn@rockbox.org>2007-10-09 19:59:00 +0000
commit6c98c8c6cbcb643fac6ee08f169843922479b96a (patch)
tree7143ad65520adb9e91d2cb93d48e157d750250db
parent8500f485b6610b12398da1672e9a9a0ed745b53a (diff)
downloadrockbox-6c98c8c6cbcb643fac6ee08f169843922479b96a.tar.gz
rockbox-6c98c8c6cbcb643fac6ee08f169843922479b96a.zip
Packed I2S for iPod Mini G2.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15050 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/target/arm/i2s-pp.c2
-rw-r--r--firmware/target/arm/pcm-pp.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/firmware/target/arm/i2s-pp.c b/firmware/target/arm/i2s-pp.c
index 997d27ec8b..66ab0261a8 100644
--- a/firmware/target/arm/i2s-pp.c
+++ b/firmware/target/arm/i2s-pp.c
@@ -71,7 +71,7 @@ void i2s_reset(void)
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 || defined(IPOD_VIDEO) || defined(IPOD_MINI2G)
75 /* Nano works fine with IIS_FIFO_FORMAT_LE16 as well */ 75 /* Nano works fine with IIS_FIFO_FORMAT_LE16 as well */
76 IISCONFIG = ((IISCONFIG & ~IIS_FIFO_FORMAT_MASK) | IIS_FIFO_FORMAT_LE16_2); 76 IISCONFIG = ((IISCONFIG & ~IIS_FIFO_FORMAT_MASK) | IIS_FIFO_FORMAT_LE16_2);
77#else 77#else
diff --git a/firmware/target/arm/pcm-pp.c b/firmware/target/arm/pcm-pp.c
index 21d7f74b0c..7bffc4059c 100644
--- a/firmware/target/arm/pcm-pp.c
+++ b/firmware/target/arm/pcm-pp.c
@@ -31,7 +31,7 @@
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 || defined(IPOD_VIDEO) || defined(IPOD_MINI2G)
35/* 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 */
36#define SAMPLE_SIZE 16 36#define SAMPLE_SIZE 16
37#define TRANSFER_SIZE 32 37#define TRANSFER_SIZE 32