From 114b487bdcae9d4b771ce8ca81e0a1afc9307fde Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Thu, 24 Jul 2008 06:24:20 +0000
Subject: [PATCH] =?UTF-8?q?(=E6=9B=B4=E6=96=B0=EF=BC=9AAkabane=20Jumpei)?=
 =?UTF-8?q?=20=E3=82=AB=E3=83=BC=E3=83=89=E3=83=AA=E3=83=BC=E3=83=89?=
 =?UTF-8?q?=E6=99=82=E3=81=AE=E3=82=B9=E3=82=AF=E3=83=A9=E3=83=B3=E3=83=96?=
 =?UTF-8?q?=E3=83=AB=E9=96=A2=E9=80=A3=E3=81=AE=E3=83=95=E3=83=A9=E3=82=B0?=
 =?UTF-8?q?=E3=83=9E=E3=82=B9=E3=82=AF=E3=82=92=E4=BF=AE=E6=AD=A3?=
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@1978 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 .../libraries_sysmenu/hotsw/ARM7/include/hotswTypes.h  |  3 +--
 build/libraries_sysmenu/hotsw/ARM7/src/dsCardCommon.c  | 10 +++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/build/libraries_sysmenu/hotsw/ARM7/include/hotswTypes.h b/build/libraries_sysmenu/hotsw/ARM7/include/hotswTypes.h
index e8b7748d..a42ab4b6 100644
--- a/build/libraries_sysmenu/hotsw/ARM7/include/hotswTypes.h
+++ b/build/libraries_sysmenu/hotsw/ARM7/include/hotswTypes.h
@@ -109,8 +109,7 @@ extern "C" {
 #define START_SHIFT                         31
 #define START_MASK                          0x80000000
 
-#define SCRAMBLE_MASK                       0x1040e000 // スクランブル関係のフラグマスク
-#define SECURE_COMMAND_SCRAMBLE_MASK		0x00406000 // CS SE DSのマスク
+#define SCRAMBLE_MASK						0x00406000 // CS SE DSのマスク
 
 // --- Page Count
 #define HOTSW_PAGE_0     			  		0x0UL << PC_SHIFT
diff --git a/build/libraries_sysmenu/hotsw/ARM7/src/dsCardCommon.c b/build/libraries_sysmenu/hotsw/ARM7/src/dsCardCommon.c
index c1070df2..66af1552 100644
--- a/build/libraries_sysmenu/hotsw/ARM7/src/dsCardCommon.c
+++ b/build/libraries_sysmenu/hotsw/ARM7/src/dsCardCommon.c
@@ -516,7 +516,7 @@ HotSwState ReadIDSecure(CardBootData *cbd)
     }
 
     // スクランブルの設定
-    scrambleMask = HOTSWi_IsRomEmulation() ? 0 : (u32)(SECURE_COMMAND_SCRAMBLE_MASK & ~CS_MASK);
+    scrambleMask = HOTSWi_IsRomEmulation() ? 0 : (u32)(SCRAMBLE_MASK & ~CS_MASK);
     
     // コマンド作成・設定
 	SetSecureCommand(S_RD_ID, cbd);
@@ -558,7 +558,7 @@ HotSwState ReadIDSecure(CardBootData *cbd)
  *---------------------------------------------------------------------------*/
 HotSwState ReadSegSecure(CardBootData *cbd)
 {
-    u32 			scrambleMask = HOTSWi_IsRomEmulation() ? 0 : (u32)(SECURE_COMMAND_SCRAMBLE_MASK & ~CS_MASK);
+    u32 			scrambleMask = HOTSWi_IsRomEmulation() ? 0 : (u32)(SCRAMBLE_MASK & ~CS_MASK);
 	u32				*buf = (cbd->modeType == HOTSW_MODE1) ? cbd->pSecureSegBuf : cbd->pSecure2SegBuf;
     u32				loop, pc, size, interval, i, j=0, k;
 	u64				segNum = 4;
@@ -647,7 +647,7 @@ HotSwState SwitchONPNGSecure(CardBootData *cbd)
     }
 
     // スクランブルの設定
-    scrambleMask = HOTSWi_IsRomEmulation() ? 0 : (u32)(SECURE_COMMAND_SCRAMBLE_MASK & ~CS_MASK);
+    scrambleMask = HOTSWi_IsRomEmulation() ? 0 : (u32)(SCRAMBLE_MASK & ~CS_MASK);
     
     // コマンド作成・設定
 	SetSecureCommand(S_PNG_ON, cbd);
@@ -685,7 +685,7 @@ HotSwState SwitchOFFPNGSecure(CardBootData *cbd)
     }
 
     // スクランブルの設定
-    scrambleMask = HOTSWi_IsRomEmulation() ? 0 : (u32)(SECURE_COMMAND_SCRAMBLE_MASK & ~CS_MASK);
+    scrambleMask = HOTSWi_IsRomEmulation() ? 0 : (u32)(SCRAMBLE_MASK & ~CS_MASK);
     
     // コマンド作成・設定
 	SetSecureCommand(S_PNG_OFF, cbd);
@@ -725,7 +725,7 @@ HotSwState ChangeModeSecure(CardBootData *cbd)
     }
 
     // スクランブルの設定
-    scrambleMask = HOTSWi_IsRomEmulation() ? 0 : (u32)(SECURE_COMMAND_SCRAMBLE_MASK & ~CS_MASK);
+    scrambleMask = HOTSWi_IsRomEmulation() ? 0 : (u32)(SCRAMBLE_MASK & ~CS_MASK);
     
     // コマンド作成・設定
 	SetSecureCommand(S_CHG_MODE, cbd);