From 9ca3b3f6119eafaed09ec50fadb689c976693798 Mon Sep 17 00:00:00 2001
From: nakasima <nakasima@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Tue, 29 Jan 2008 06:52:20 +0000
Subject: [PATCH] =?UTF-8?q?TWL=E3=82=A2=E3=83=97=E3=83=AA=E3=81=AECODEC-DS?=
 =?UTF-8?q?=E3=83=A2=E3=83=BC=E3=83=89=E5=AF=BE=E5=BF=9C=E3=80=82=20CODEC-?=
 =?UTF-8?q?DS=E3=83=A2=E3=83=BC=E3=83=89=E9=81=B7=E7=A7=BB=E6=99=82?=
 =?UTF-8?q?=E3=81=ABI2S=E5=81=9C=E6=AD=A2=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@536 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/libraries_sysmenu/boot/ARM7/src/bootAPI.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c b/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c
index 531c0717..4ab68a5f 100644
--- a/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c
+++ b/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c
@@ -178,11 +178,6 @@ BOOL BOOT_WaitStart( void )
 			else
 			{
 				target = REBOOT_TARGET_DS_APP;
-				CDC_GoDsMode();
-				// DSサウンド：DSP = 8:0
-				// 32KHz
-				reg_SND_SMX_CNT = REG_SND_SMX_CNT_MIX_RATE_MASK |
-								  REG_SND_SMX_CNT_E_MASK;
 			}
 			
             if ( target == REBOOT_TARGET_DS_APP || target == REBOOT_TARGET_DS_WIFI )
@@ -190,6 +185,17 @@ BOOL BOOT_WaitStart( void )
                 ds = TRUE;
             }
 
+            if ( ds || th->s.codec_mode == OS_CODECMODE_NITRO )
+            {
+				// I2S停止（MCLKは動作継続）
+				reg_SND_SMX_CNT &= ~REG_SND_SMX_CNT_E_MASK;
+				CDC_GoDsMode();
+				// DSサウンド：DSP = 8:0
+				// 32KHz
+				reg_SND_SMX_CNT = REG_SND_SMX_CNT_MIX_RATE_MASK |
+								  REG_SND_SMX_CNT_E_MASK;
+            }
+
 #ifdef FIRM_USE_TWLSDK_KEYS
             // TwlSDK内の鍵を使っている時は製品用CPUではTWLアプリはブートしない
             if ( ! (*(u8*)HWi_WSYS08_ADDR & HWi_WSYS08_OP_OPT_MASK) && !ds )