diff options
-rw-r--r-- | firmware/drivers/wm8731l.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/iriver/h10/power-h10.c | 11 | ||||
-rwxr-xr-x | tools/configure | 4 |
3 files changed, 7 insertions, 10 deletions
diff --git a/firmware/drivers/wm8731l.c b/firmware/drivers/wm8731l.c index f73de68b97..71ccfdb4f6 100644 --- a/firmware/drivers/wm8731l.c +++ b/firmware/drivers/wm8731l.c | |||
@@ -227,7 +227,7 @@ void wmcodec_enable_output(bool enable) | |||
227 | } else { | 227 | } else { |
228 | #if defined(IRIVER_H10) || defined(IRIVER_H10_5GB) | 228 | #if defined(IRIVER_H10) || defined(IRIVER_H10_5GB) |
229 | /* We need to disable bit 4 of GPIOL to disable sound on H10 */ | 229 | /* We need to disable bit 4 of GPIOL to disable sound on H10 */ |
230 | GPIOL_OUTPUT_VAL ^= 0x10; | 230 | GPIOL_OUTPUT_VAL &= ~0x10; |
231 | #endif | 231 | #endif |
232 | wmcodec_mute(1); | 232 | wmcodec_mute(1); |
233 | } | 233 | } |
diff --git a/firmware/target/arm/iriver/h10/power-h10.c b/firmware/target/arm/iriver/h10/power-h10.c index 71eae2105e..6e7b65a803 100644 --- a/firmware/target/arm/iriver/h10/power-h10.c +++ b/firmware/target/arm/iriver/h10/power-h10.c | |||
@@ -89,11 +89,8 @@ bool ide_powered(void) | |||
89 | 89 | ||
90 | void power_off(void) | 90 | void power_off(void) |
91 | { | 91 | { |
92 | /* set_irq_level(HIGHEST_IRQ_LEVEL);*/ | 92 | /* Give things a second to settle before cutting power */ |
93 | #ifndef BOOTLOADER | 93 | sleep(HZ); |
94 | /* We don't turn off the ipod, we put it in a deep sleep */ | 94 | |
95 | /* pcf50605_standby_mode(); */ | 95 | GPIOF_OUTPUT_VAL &=~ 0x20; |
96 | while(1) | ||
97 | yield(); | ||
98 | #endif | ||
99 | } | 96 | } |
diff --git a/tools/configure b/tools/configure index 522b3c7fd0..b98dbdc490 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -952,7 +952,7 @@ EOF | |||
952 | plugins="yes" | 952 | plugins="yes" |
953 | codecs="libmad liba52 libffmpegFLAC libTremor libwavpack dumb libmusepack libalac libfaad libm4a" | 953 | codecs="libmad liba52 libffmpegFLAC libTremor libwavpack dumb libmusepack libalac libfaad libm4a" |
954 | boottool="$rootdir/tools/scramble -mi4v3" | 954 | boottool="$rootdir/tools/scramble -mi4v3" |
955 | bootoutput="h10.mi4" | 955 | bootoutput="H10_20GC.mi4" |
956 | # toolset is the tools within the tools directory that we build for | 956 | # toolset is the tools within the tools directory that we build for |
957 | # this particular target. | 957 | # this particular target. |
958 | toolset="$genericbitmaptools scramble" | 958 | toolset="$genericbitmaptools scramble" |
@@ -1004,7 +1004,7 @@ EOF | |||
1004 | plugins="yes" | 1004 | plugins="yes" |
1005 | codecs="libmad liba52 libffmpegFLAC libTremor libwavpack dumb libmusepack libalac libfaad libm4a" | 1005 | codecs="libmad liba52 libffmpegFLAC libTremor libwavpack dumb libmusepack libalac libfaad libm4a" |
1006 | boottool="$rootdir/tools/scramble -mi4v2" | 1006 | boottool="$rootdir/tools/scramble -mi4v2" |
1007 | bootoutput="h10.mi4" | 1007 | bootoutput="H10.mi4" |
1008 | # toolset is the tools within the tools directory that we build for | 1008 | # toolset is the tools within the tools directory that we build for |
1009 | # this particular target. | 1009 | # this particular target. |
1010 | toolset="$genericbitmaptools scramble" | 1010 | toolset="$genericbitmaptools scramble" |