マイク入力関連で不具合の発生するDSタイトルのためにスピーカ音量を下げる処理を追加。（再調整）

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@1967 b08762b0-b915-fc4b-9d8c-17b2551a87ff

build/libraries_sysmenu/boot/ARM7/src/bootAPI.c

@@ -310,10 +310,10 @@ static void BOOTi_RebootCallback( void** entryp, void* mem_list_v, REBOOTTarget*
 			// CODEC-DSモードへの遷移
             if ( isNtrMode || th->s.exFlags.codec_mode == OS_CODECMODE_NITRO )
             {
-				// マイク不具合DSタイトルは音量を絞る
+				// DSタイトルのスピーカ設定を行う
 	            if ( *target == REBOOT_TARGET_DS_APP )
 	            {
-                    DS_CheckSpeakerVolume( dh );
+                    DS_SetSpeakerVolume( dh );
 				}
 				CDC_GoDsMode();
             }

build/libraries_sysmenu/ds/ARM7/src/ds_volume.c

@@ -20,67 +20,207 @@
 #include <sysmenu.h>
 #include <sysmenu/ds.h>
 
+/*---------------------------------------------------------------------------*
+    定数定義
+ *---------------------------------------------------------------------------*/
+
+#define NUM_OF_MIC_PROBLEM_TITLE   128
+
 /*---------------------------------------------------------------------------*
     型宣言
  *---------------------------------------------------------------------------*/
 
-typedef struct _DsSpecialSpeakerVolumeTitle
+typedef struct _DsMicProblemTitle
 {
-	u8 gamecode[6];  // NULL終端兼アライメント用に2バイト大きいサイズを与える
+	u8 gamecode[4];  // NULL終端兼アライメント用に1バイト大きいサイズを与える
-	u8 rom_version;
+
-	u8 volume;
+} DsMicProblemTitle;
-} DsSpecialSpeakerVolumeTitle;
 
 /*---------------------------------------------------------------------------*
     静的変数定義
  *---------------------------------------------------------------------------*/
 
-static DsSpecialSpeakerVolumeTitle sList[] ATTRIBUTE_ALIGN(32) =
+static DsMicProblemTitle sList[NUM_OF_MIC_PROBLEM_TITLE] ATTRIBUTE_ALIGN(32) =
 {
-	{ "AKEJ", 0, 0x40 },
+	"ABX",
-	{ "ABXJ", 0, 0x40 },
+	"YO9",
-	{ "ALHJ", 0, 0x40 },
+	"ALH",
-	{ "YFSJ", 0, 0x40 },
+    "ACC",
-	{ "AY8E", 0, 0x40 },
+    "YCQ",
-	{ "YONJ", 0, 0x40 },
+    "YYK",
-	{ "ACCE", 0, 0x40 },
+    "AZW",
-	{ "AN9E", 0, 0x40 },
+    "AKA",
-	{ "A5HE", 0, 0x40 },
+    "AN9",
-	{ "A5IE", 0, 0x40 },
+    "AKE",
-	{ "AMHE", 0, 0x40 },
+    "YFS",
-	{ "A3TX", 0, 0x40 },
+    "YG8",
-	{ "YCQE", 0, 0x40 },
+    "AY7",
-	{ "YBOE", 0, 0x40 },
+    "YON",
-	{ "ADAE", 5, 0x40 },
+    "A5H",
-	{ "APAE", 5, 0x40 },
+    "A5I",
-	{ "ACZY", 0, 0x40 },
+    "AMH",
-	{ "APYJ", 0, 0x40 },
+    "A3T",
-	{ "AY7P", 0, 0x40 },
+    "YBO",
-	{ "AWHP", 0, 0x40 },
+    "ADA",
-	{ "AWHE", 0, 0x40 },
+    "APA",
-	{ "AOIJ", 0, 0x40 },
+    "CPU",
-	{ "AOIJ", 1, 0x40 },
+    "APY",
-	{ "YO9J", 0, 0x40 },
+    "AWH",
-	{ "YYKJ", 0, 0x40 }
+    "AXB",
+
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+    "000",
+
+    "000",
+    "000",
+    "000"
 };
 
 /*---------------------------------------------------------------------------*
     グローバル関数定義
  *---------------------------------------------------------------------------*/
 
-void DS_CheckSpeakerVolume( void* romHeaderNTR )
+/*---------------------------------------------------------------------------*
+  Name:         DS_SetSpeakerVolume
+
+  Description:  DSタイトルのスピーカ音量を設定します。
+                マイク入力関係で問題の発生するタイトルは音量をNTRレベルに
+                抑えます。
+
+  Arguments:    romHeaderNTR: DSタイトルのROMヘッダ
+
+  Returns:      None
+ *---------------------------------------------------------------------------*/
+void DS_SetSpeakerVolume( void* romHeaderNTR )
 {
-	ROM_Header* dh = romHeaderNTR;
+	ROM_Header* dh   = romHeaderNTR;
+	u32 arg_gamecode = *(u32 *)dh->s.game_code & 0x00ffffff;
+	BOOL hit;
 	int i;
-	int limit = sizeof(sList)/sizeof(sList[0]);
+
-	for (i=0;i<limit;i++)
+	// 負荷をなるべく一定にするためリストと一致した場合でも全リストをチェックする
+	for (i=0;i<NUM_OF_MIC_PROBLEM_TITLE;i++)
 	{
-		if (*(u32 *)sList[i].gamecode == *(u32 *)dh->s.game_code && 
+		// リージョンに関係なく比較する
-            sList[i].rom_version == dh->s.rom_version)
+		u32 list_gamecode = *(u32 *)sList[i].gamecode & 0x00ffffff;
+		if ( list_gamecode == arg_gamecode)
 		{
-		    CDC_WriteSpiRegisterEx( 1, REG_CDC1_SP_ANGVOL_L_ADDR, (u8)(CDC1_ANGVOL_E | sList[i].volume) );
+			hit = TRUE;
-		    CDC_WriteSpiRegisterEx( 1, REG_CDC1_SP_ANGVOL_R_ADDR, (u8)(CDC1_ANGVOL_E | sList[i].volume) );
-			break;
 		}
 	}
+
+	if (hit)
+	{
+		// NTR並のSP音量(マイク入力問題のあるDSタイトル）
+		CDC_WriteSpiRegisterEx( 1, REG_CDC1_SP_ANGVOL_L_ADDR, (u8)(CDC1_ANGVOL_E | CDC1_ANGVOL_GAIN_NTR_SP) );
+		CDC_WriteSpiRegisterEx( 1, REG_CDC1_SP_ANGVOL_R_ADDR, (u8)(CDC1_ANGVOL_E | CDC1_ANGVOL_GAIN_NTR_SP) );
+	}
+	else
+	{
+		// NTRよりもやや大きいSP音量
+		CDC_WriteSpiRegisterEx( 1, REG_CDC1_SP_ANGVOL_L_ADDR, (u8)(CDC1_ANGVOL_E | CDC1_ANGVOL_GAIN_MAX_SP) );
+		CDC_WriteSpiRegisterEx( 1, REG_CDC1_SP_ANGVOL_R_ADDR, (u8)(CDC1_ANGVOL_E | CDC1_ANGVOL_GAIN_MAX_SP) );
+	}
 }
+

include/sysmenu/ds/common/ds.h

@@ -29,7 +29,7 @@ extern "C" {
 #define DS_WLPATCH_COPYCODE_SIZE			(10*4)
 
 void DS_InsertWLPatch( void* romHeaderNTR );
-void DS_CheckSpeakerVolume( void* romHeaderNTR );
+void DS_SetSpeakerVolume( void* romHeaderNTR );
 
 #ifdef __cplusplus
 } /* extern "C" */