From 887c0b4f6e995941286c707a780e67c59997996a Mon Sep 17 00:00:00 2001
From: nakasima <nakasima@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Tue, 11 Dec 2007 08:30:29 +0000
Subject: [PATCH] =?UTF-8?q?DS=E4=BA=92=E6=8F=9B=E3=83=A2=E3=83=BC=E3=83=89?=
 =?UTF-8?q?=E3=82=B5=E3=82=A6=E3=83=B3=E3=83=89=E5=AF=BE=E5=BF=9C=E3=80=82?=
 =?UTF-8?q?=20TwlSDK-r2947=E3=81=AE=E5=A4=89=E6=9B=B4=E3=81=AB=E5=AF=BE?=
 =?UTF-8?q?=E5=BF=9C=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@340 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/components/hyena.TWL/src/main.c           |  2 +-
 build/libraries_sysmenu/boot/ARM7/src/bootAPI.c | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/build/components/hyena.TWL/src/main.c b/build/components/hyena.TWL/src/main.c
index 12994a88..4e6679bf 100644
--- a/build/components/hyena.TWL/src/main.c
+++ b/build/components/hyena.TWL/src/main.c
@@ -34,7 +34,7 @@
 #include    <twl/cdc.h>
 #include    <twl/aes.h>
 #include    <twl/mcu.h>
-#include	<twl/hw/ARM7/mmap_wramEnv.h>
+#include	<twl/hw/common/mmap_wramEnv.h>
 #include    <sysmenu.h>
 #include    "nvram_sp.h"
 
diff --git a/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c b/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c
index df1bd79f..03349957 100644
--- a/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c
+++ b/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c
@@ -16,6 +16,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <twl.h>
+#include <twl/cdc.h>
 #include <sysmenu.h>
 #include "reboot.h"
 
@@ -78,7 +79,7 @@ BOOL BOOT_WaitStart( void )
 			// メモリリストの設定
 			static u32 mem_list[PRE_CLEAR_NUM_MAX + 1 + COPY_NUM_MAX + 2 + POST_CLEAR_NUM_MAX + 1] = 
 			{
-                // pre clear
+				// pre clear
 				SYSM_OWN_ARM7_MMEM_ADDR, SYSM_OWN_ARM7_MMEM_ADDR_END - SYSM_OWN_ARM7_MMEM_ADDR,
 				SYSM_OWN_ARM9_MMEM_ADDR, SYSM_OWN_ARM9_MMEM_ADDR_END - SYSM_OWN_ARM9_MMEM_ADDR,
 				SYSM_OWN_ARM7_WRAM_ADDR, SYSM_OWN_ARM7_WRAM_ADDR_END - SYSM_OWN_ARM7_WRAM_ADDR,
@@ -89,11 +90,11 @@ BOOL BOOT_WaitStart( void )
 #endif
 				HW_MAIN_MEM_SHARED, HW_RED_RESERVED - HW_MAIN_MEM_SHARED,
 				NULL,
-                // copy forward
+				// copy forward
 				NULL,
-                // copy backward
+				// copy backward
 				NULL,
-                // post clear
+				// post clear
 				NULL,
 			};
 			
@@ -140,6 +141,11 @@ 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;
 			}
 			
 			// リブート