From 1db4646ea88497d720d27eb1ffd13e15a6487d32 Mon Sep 17 00:00:00 2001 From: kamikawa Date: Tue, 25 Mar 2008 08:49:18 +0000 Subject: [PATCH] =?UTF-8?q?main.rsf=20=20=20=20:=20SDCardAccess=20?= =?UTF-8?q?=E3=82=92=20TRUE=E3=80=80=E6=8C=87=E5=AE=9A=20formatter.c=20:?= =?UTF-8?q?=20=E5=8F=82=E7=85=A7=E3=81=99=E3=82=8B=E3=83=9E=E3=82=A6?= =?UTF-8?q?=E3=83=B3=E3=83=88=E6=83=85=E5=A0=B1=E3=82=A2=E3=83=89=E3=83=AC?= =?UTF-8?q?=E3=82=B9=E3=82=92=E9=81=A9=E5=88=87=E3=81=AA=E3=82=82=E3=81=AE?= =?UTF-8?q?=E3=81=AB=E5=A4=89=E6=9B=B4=E3=80=82NAND=E3=83=95=E3=82=A1?= =?UTF-8?q?=E3=83=BC=E3=83=A0=E8=B5=B7=E5=8B=95=E3=81=AA=E3=82=89WRAM?= =?UTF-8?q?=E3=80=82NOR=E3=83=95=E3=82=A1=E3=83=BC=E3=83=A0=E8=B5=B7?= =?UTF-8?q?=E5=8B=95=E3=81=AA=E3=82=89SHARED=E9=A0=98=E5=9F=9F=E3=82=92?= =?UTF-8?q?=E5=8F=82=E7=85=A7=E3=80=82=20main.c=20=20=20=20=20=20:=20?= =?UTF-8?q?=E3=82=B3=E3=83=BC=E3=83=89=E7=BE=8E=E5=8C=96?= 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@942 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- .../NandInitializer/ARM7.TWL/src/formatter.c | 17 ++++++++++++++-- .../NandInitializer/ARM7.TWL/src/main.c | 18 +---------------- .../NandInitializer/ARM9.TWL/main.rsf | 20 +++++++++++++++++++ 3 files changed, 36 insertions(+), 19 deletions(-) diff --git a/build/systemMenu_RED/NandInitializer/ARM7.TWL/src/formatter.c b/build/systemMenu_RED/NandInitializer/ARM7.TWL/src/formatter.c index 859ba46c..040dc05d 100644 --- a/build/systemMenu_RED/NandInitializer/ARM7.TWL/src/formatter.c +++ b/build/systemMenu_RED/NandInitializer/ARM7.TWL/src/formatter.c @@ -133,10 +133,23 @@ ExeFormat(FormatMode format_mode) partition_MB_size[2] = PARTITION_1_SIZE; // FAT1領域 nand_fat_partition_num = NAND_FAT_PARTITION_NUM; - // OSMountInfoよりnand&nand2のドライブ割り当てを調べる + // nand&nand2のドライブ割り当てを調べる { const OSMountInfo *info; - for (info = OS_GetMountInfo(); *info->drive; ++info) + + // ランチャーから起動していない場合はshared領域を参照。 + if (*(const u8 *)HW_TWL_RED_LAUNCHER_VER == 0) + { + info = OS_GetMountInfo(); + } + // 環境が新ランチャーへ移行しているならそちらを参照。 + else + { + extern const u8 SDK_MOUNT_INFO_TABLE[]; + info = (const OSMountInfo *)SDK_MOUNT_INFO_TABLE; + } + + for (; *info->drive; ++info) { if (!STD_CompareNString( "nand2", info->archiveName, 5 )) { diff --git a/build/systemMenu_RED/NandInitializer/ARM7.TWL/src/main.c b/build/systemMenu_RED/NandInitializer/ARM7.TWL/src/main.c index c042e88f..60866054 100644 --- a/build/systemMenu_RED/NandInitializer/ARM7.TWL/src/main.c +++ b/build/systemMenu_RED/NandInitializer/ARM7.TWL/src/main.c @@ -432,7 +432,7 @@ VBlankIntr(void) /*---------------------------------------------------------------------------* Name: AttachAES - Description: マウント情報を強制的に上書きします。 + Description: 強制的にAESマウントするようにします。 Arguments: None. @@ -442,22 +442,6 @@ extern BOOL sdmc_aes_attach_for_nand; // static void AttachAES(void) { -/* - // デフォルトマウント情報リスト - OSMountInfo DefaultSettings[] ATTRIBUTE_ALIGN(4) = { - // drive device target pertitionIdx resource userPermission rsvA B archive path - { 'A', OS_MOUNT_DEVICE_SD, OS_MOUNT_TGT_ROOT, 0, OS_MOUNT_RSC_MMEM, (OS_MOUNT_USR_R|OS_MOUNT_USR_W), 0, 0, "sdmc", "/" }, - { 'B', OS_MOUNT_DEVICE_NAND, OS_MOUNT_TGT_ROOT, 0, OS_MOUNT_RSC_WRAM, (OS_MOUNT_USR_R|OS_MOUNT_USR_W), 0, 0, "nand", "/" }, // ユーザーアプリはこのアーカイブではWrite不可 - { 'C', OS_MOUNT_DEVICE_NAND, OS_MOUNT_TGT_ROOT, 1, OS_MOUNT_RSC_WRAM, (OS_MOUNT_USR_R|OS_MOUNT_USR_W), 0, 0, "nand2", "/" }, // ユーザーアプリはこのアーカイブではWrite不可 -// { 'D', OS_MOUNT_DEVICE_NAND, OS_MOUNT_TGT_DIR, 0, OS_MOUNT_RSC_MMEM, (OS_MOUNT_USR_R|OS_MOUNT_USR_W), 0, 0, "shared2", "nand2:/shared2" }, -// { 'E', OS_MOUNT_DEVICE_NAND, OS_MOUNT_TGT_DIR, 0, OS_MOUNT_RSC_MMEM, (OS_MOUNT_USR_R|OS_MOUNT_USR_W), 0, 0, "photo", "nand2:/photo" }, -// { 'F', OS_MOUNT_DEVICE_NAND, OS_MOUNT_TGT_FILE, 0, OS_MOUNT_RSC_MMEM, (OS_MOUNT_USR_R|OS_MOUNT_USR_W), 0, 0, "dataPrv", NULL }, // NANDにセーブデータがないアプリの場合は、マウントされない。 -// { 'G', OS_MOUNT_DEVICE_NAND, OS_MOUNT_TGT_FILE, 0, OS_MOUNT_RSC_MMEM, (OS_MOUNT_USR_R|OS_MOUNT_USR_W), 0, 0, "dataPub", NULL }, // NANDにセーブデータがないアプリの場合は、マウントされない。 - { 0, }, - }; - - MI_CpuCopy8(DefaultSettings, (void*)OS_GetMountInfo(), sizeof(DefaultSettings)); -*/ // 強制AESマウント sdmc_aes_attach_for_nand = TRUE; } diff --git a/build/systemMenu_RED/NandInitializer/ARM9.TWL/main.rsf b/build/systemMenu_RED/NandInitializer/ARM9.TWL/main.rsf index 82fba180..a4e23ba7 100644 --- a/build/systemMenu_RED/NandInitializer/ARM9.TWL/main.rsf +++ b/build/systemMenu_RED/NandInitializer/ARM9.TWL/main.rsf @@ -121,6 +121,26 @@ Property # CardRegion Japan + # + # CommonClientKey: launcher deliver common client Key [TRUE/FALSE] + # + #CommonClientKey TRUE + + # + # HwAESSlotB: launcher deliver HW AES slot B setting [TRUE/FALSE] + # + #HwAESSlotB TRUE + + # + # HwAESSlotC: launcher deliver HW AES slot C setting [TRUE/FALSE] + # + #HwAESSlotC TRUE + + # + # SDCardAccess: sd card access control [TRUE/FALSE] + # + SDCardAccess TRUE + # # Codec mode: # don't have to edit