From d3fee837c33790ac088c33c1296a896479e799b8 Mon Sep 17 00:00:00 2001 From: kamikawa Date: Fri, 11 Jul 2008 08:04:21 +0000 Subject: [PATCH] =?UTF-8?q?=E6=9C=AC=E4=BD=93=E5=88=9D=E6=9C=9F=E5=8C=96?= =?UTF-8?q?=E6=99=82=E3=81=ABshared2=E4=BB=A5=E4=B8=8B=E3=82=92=E6=B6=88?= =?UTF-8?q?=E5=8E=BB=E3=81=97=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB?= =?UTF-8?q?=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F=E3=80=82=20=E6=9C=AC?= =?UTF-8?q?=E4=BD=93=E5=88=9D=E6=9C=9F=E5=8C=96=E6=99=82=E3=81=AB=E6=9C=AC?= =?UTF-8?q?=E4=BD=93=E3=83=9C=E3=83=AA=E3=83=A5=E3=83=BC=E3=83=A0=E3=81=A8?= =?UTF-8?q?=E3=83=90=E3=83=83=E3=82=AF=E3=83=A9=E3=82=A4=E3=83=88=E8=BC=9D?= =?UTF-8?q?=E5=BA=A6=E3=82=92=E5=88=9D=E6=9C=9F=E5=8C=96=E3=81=99=E3=82=8B?= =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F?= =?UTF-8?q?=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@1859 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- .../libraries_sysmenu/namut/ARM9/src/namut.c | 37 ++++++++++++++++--- .../MachineSettings/ARM9/src/main.c | 3 ++ .../NandInitializerRed/ARM7.TWL/Makefile | 3 ++ .../NandInitializerRed/ARM7.TWL/armadillo.lsf | 2 +- .../NandInitializerRed/ARM9.TWL/src/main.c | 1 + 5 files changed, 39 insertions(+), 7 deletions(-) diff --git a/build/libraries_sysmenu/namut/ARM9/src/namut.c b/build/libraries_sysmenu/namut/ARM9/src/namut.c index 6d39e8a9..4e92359d 100644 --- a/build/libraries_sysmenu/namut/ARM9/src/namut.c +++ b/build/libraries_sysmenu/namut/ARM9/src/namut.c @@ -48,7 +48,6 @@ // 指定ディレクトリ自体は残ります。 static const char* sDeleteDirectoryList[] = { - "nand:/shared2", "nand:/import", "nand:/progress", "nand2:/photo", @@ -63,8 +62,8 @@ static const char* sFillFileList[] = "nand:/shared1/TWLCFG1.dat" }; -static u8 sClearData[CLEAR_DATA_SIZE] ATTRIBUTE_ALIGN(32); -static u32 sNCFGAddr; +#define VOLUME_INITIAL_VALUE 5 // 本体初期化時に設定する本体ボリューム値 +#define BACKLIGHT_INITIAL_VALUE 3 // 本体初期化時に設定するバックライト輝度 /*---------------------------------------------------------------------------* 内部変数定義 @@ -75,6 +74,8 @@ static NAMUTFree spFreeFunc; static FSDirectoryEntryInfo sEntryInfo; static NAMTitleId sTitleIdArray[TITLE_LIST_MAX]; static char sCurrentFullPath[FS_ENTRY_LONGNAME_MAX]; +static u8 sClearData[CLEAR_DATA_SIZE] ATTRIBUTE_ALIGN(32); +static u32 sNCFGAddr; /*---------------------------------------------------------------------------* 内部関数宣言 @@ -170,6 +171,18 @@ BOOL NAMUT_Format(void) // RTCのクリアは必要ない。2008.06.25 小野沢確認。 // 本体初期化後の初回起動シーケンス起動時にRTCをクリアするため。 + // 本体ボリューム設定 + if (SNDEX_SetVolume(VOLUME_INITIAL_VALUE) != SNDEX_RESULT_SUCCESS) + { + ret = FALSE; + } + + // バックライト輝度設定 + if (PM_SendUtilityCommand( PMi_UTIL_SET_BACKLIGHT_BRIGHTNESS, (u16)BACKLIGHT_INITIAL_VALUE, NULL ) != PM_SUCCESS) + { + ret = FALSE; + } + return ret; } @@ -487,9 +500,18 @@ BOOL NAMUTi_DestroySubBanner(const char* path) static BOOL NAMUTi_MountAndFormatOtherTitleSaveData(u64 titleID, const char *arcname) { BOOL succeeded = FALSE; - static FSFATFSArchiveWork work; + FSFATFSArchiveWork* pWork; + FSResult result; + + if (!spAllocFunc || !spFreeFunc) + { + return FALSE; + } + + pWork = spAllocFunc( sizeof(FSFATFSArchiveWork) ); + // マウント試行。 - FSResult result = FSi_MountSpecialArchive(titleID, arcname, &work); + result = FSi_MountSpecialArchive(titleID, arcname, pWork); if (result != FS_RESULT_SUCCESS) { OS_TWarning("FSi_MountSpecialArchive failed. (%d)\n", result); @@ -514,8 +536,11 @@ static BOOL NAMUTi_MountAndFormatOtherTitleSaveData(u64 titleID, const char *arc // ドライブ情報をダンプ。 // DumpArchiveResource(path); // アンマウント。 - (void)FSi_MountSpecialArchive(titleID, NULL, &work); + (void)FSi_MountSpecialArchive(titleID, NULL, pWork); } + + spFreeFunc ( pWork ); + return succeeded; } diff --git a/build/systemMenu_RED/MachineSettings/ARM9/src/main.c b/build/systemMenu_RED/MachineSettings/ARM9/src/main.c index bfc8bb93..10206a5d 100644 --- a/build/systemMenu_RED/MachineSettings/ARM9/src/main.c +++ b/build/systemMenu_RED/MachineSettings/ARM9/src/main.c @@ -61,6 +61,9 @@ void TwlMain(void) GX_SetPower(GX_POWER_ALL); // 各ロジック パワーON FS_Init( 3 ); + SND_Init(); + SNDEX_Init(); + // 割り込み許可---------------------------- (void)OS_SetIrqFunction(OS_IE_V_BLANK, INTR_VBlank); (void)OS_EnableIrqMask(OS_IE_V_BLANK); diff --git a/build/systemMenu_tools/NandInitializerRed/ARM7.TWL/Makefile b/build/systemMenu_tools/NandInitializerRed/ARM7.TWL/Makefile index 9c3225a1..b8692866 100644 --- a/build/systemMenu_tools/NandInitializerRed/ARM7.TWL/Makefile +++ b/build/systemMenu_tools/NandInitializerRed/ARM7.TWL/Makefile @@ -71,6 +71,9 @@ LLIBRARIES += libwl_sp$(TWL_LIBSUFFIX).a \ libhotsw_sp$(TWL_LIBSUFFIX).a \ libreloc_info_sp$(TWL_LIBSUFFIX).a +LLIBRARIES += libpm_sp.SYSMENU$(TWL_LIBSUFFIX).a +GLIBRARIES := $(filter-out libpm_sp$(TWL_LIBSUFFIX).a,$(GLIBRARIES)) + LDEPENDS_NEF = $(TWL_LIBS) $(LLIBRARIES) do-build: $(TARGETS) diff --git a/build/systemMenu_tools/NandInitializerRed/ARM7.TWL/armadillo.lsf b/build/systemMenu_tools/NandInitializerRed/ARM7.TWL/armadillo.lsf index bdd98e47..bdf38819 100644 --- a/build/systemMenu_tools/NandInitializerRed/ARM7.TWL/armadillo.lsf +++ b/build/systemMenu_tools/NandInitializerRed/ARM7.TWL/armadillo.lsf @@ -61,7 +61,7 @@ Ltdautoload SCRWRAM Library libsnd_sp$(LIBSUFFIX).a Library libsndex_sp$(LIBSUFFIX).a Library libspi_sp$(LIBSUFFIX).a - Library libpm_sp$(LIBSUFFIX).a + Library libpm_sp.SYSMENU$(LIBSUFFIX).a Library libtp_sp$(LIBSUFFIX).a Library libtpex_sp$(LIBSUFFIX).a Library libmic_sp$(LIBSUFFIX).a diff --git a/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/main.c b/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/main.c index 15470551..4f219f7d 100644 --- a/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/main.c +++ b/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/main.c @@ -73,6 +73,7 @@ TwlMain() GX_Init(); FX_Init(); SND_Init(); + SNDEX_Init(); TP_Init(); RTC_Init();