summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Chapman <dave@dchapman.com>2007-10-09 20:57:31 +0000
committerDave Chapman <dave@dchapman.com>2007-10-09 20:57:31 +0000
commit1092edf3e121ae67475a8d54c89f58fc3926fb60 (patch)
treeb0c180c3612a03e62b5d1bc6e160e93055e75330
parentfd3fe45bc14a0a540f2525102551c92a64a73b76 (diff)
downloadrockbox-1092edf3e121ae67475a8d54c89f58fc3926fb60.tar.gz
rockbox-1092edf3e121ae67475a8d54c89f58fc3926fb60.zip
Packed I2S for ipod Color (tested) and ipod 4G (untested, but assumed to be the same as the Color - everything else is).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15053 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/target/arm/i2s-pp.c1
-rw-r--r--firmware/target/arm/pcm-pp.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/firmware/target/arm/i2s-pp.c b/firmware/target/arm/i2s-pp.c
index beb8e1e581..6397c1c0ac 100644
--- a/firmware/target/arm/i2s-pp.c
+++ b/firmware/target/arm/i2s-pp.c
@@ -73,6 +73,7 @@ void i2s_reset(void)
73 73
74#if defined (IRIVER_H10) || defined (IRIVER_H10_5GB) || defined(IPOD_NANO) \ 74#if defined (IRIVER_H10) || defined (IRIVER_H10_5GB) || defined(IPOD_NANO) \
75 || defined(IPOD_VIDEO) || defined(IPOD_MINI2G) \ 75 || defined(IPOD_VIDEO) || defined(IPOD_MINI2G) \
76 || defined(IPOD_COLOR) || defined(IPOD_4G) \
76 || defined (SANSA_C200) || defined (SANSA_E200) 77 || defined (SANSA_C200) || defined (SANSA_E200)
77 /* Nano works fine with IIS_FIFO_FORMAT_LE16 as well */ 78 /* Nano works fine with IIS_FIFO_FORMAT_LE16 as well */
78 IISCONFIG = ((IISCONFIG & ~IIS_FIFO_FORMAT_MASK) | IIS_FIFO_FORMAT_LE16_2); 79 IISCONFIG = ((IISCONFIG & ~IIS_FIFO_FORMAT_MASK) | IIS_FIFO_FORMAT_LE16_2);
diff --git a/firmware/target/arm/pcm-pp.c b/firmware/target/arm/pcm-pp.c
index 7bffc4059c..dcf2ee9c53 100644
--- a/firmware/target/arm/pcm-pp.c
+++ b/firmware/target/arm/pcm-pp.c
@@ -31,7 +31,8 @@
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) || defined(IPOD_MINI2G) 34 || defined(IPOD_VIDEO) || defined(IPOD_MINI2G) \
35 || defined(IPOD_COLOR) || defined(IPOD_4G)
35/* 16-bit, L-R packed into 32 bits with left in the least significant halfword */ 36/* 16-bit, L-R packed into 32 bits with left in the least significant halfword */
36#define SAMPLE_SIZE 16 37#define SAMPLE_SIZE 16
37#define TRANSFER_SIZE 32 38#define TRANSFER_SIZE 32