From 6885accd2664d9a92f54f8bb39517fb586a90546 Mon Sep 17 00:00:00 2001 From: nakasima Date: Thu, 15 May 2008 09:59:55 +0000 Subject: [PATCH] =?UTF-8?q?=E8=B5=A4=E7=AE=B1=E3=81=8C=E3=82=B9=E3=83=AA?= =?UTF-8?q?=E3=83=BC=E3=83=97=E3=82=B7=E3=83=A3=E3=83=83=E3=83=88=E3=83=80?= =?UTF-8?q?=E3=82=A6=E3=83=B3=E5=AF=BE=E7=AD=96=E3=81=95=E3=82=8C=E3=80=81?= =?UTF-8?q?TS=E3=83=9C=E3=83=BC=E3=83=89=E3=81=AF=E5=85=83=E3=80=85?= =?UTF-8?q?=E5=95=8F=E9=A1=8C=E7=84=A1=E3=81=8B=E3=81=A3=E3=81=9F=E3=81=9F?= =?UTF-8?q?=E3=82=81=E3=83=87=E3=83=95=E3=82=A9=E3=83=AB=E3=83=88=E3=81=A7?= =?UTF-8?q?=E3=82=B9=E3=83=AA=E3=83=BC=E3=83=97=E5=8F=AF=E8=83=BD=E3=81=AB?= =?UTF-8?q?=E3=80=82=20=E8=93=8B=E9=96=89=E3=81=98=E5=88=A4=E5=AE=9A?= =?UTF-8?q?=E3=82=92=E3=82=B9=E3=83=AA=E3=83=BC=E3=83=97=E9=96=A2=E6=95=B0?= =?UTF-8?q?=E3=81=B8=E5=86=85=E5=8C=85=E3=81=97=E3=81=A6=E5=85=B1=E9=80=9A?= =?UTF-8?q?=E5=8C=96=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@1365 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- build/libraries_sysmenu/sysmenu/ARM9/src/device.c | 6 ++++++ build/libraries_sysmenu/sysmenu/ARM9/src/title.c | 3 +-- build/systemMenu_RED/Launcher/ARM9/src/main.c | 9 +++------ build/systemMenu_tools/SystemUpdater/Makefile | 2 +- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/build/libraries_sysmenu/sysmenu/ARM9/src/device.c b/build/libraries_sysmenu/sysmenu/ARM9/src/device.c index 1b3cce69..9b621cff 100644 --- a/build/libraries_sysmenu/sysmenu/ARM9/src/device.c +++ b/build/libraries_sysmenu/sysmenu/ARM9/src/device.c @@ -199,6 +199,12 @@ void SYSMi_CheckRTC( void ) // スリープモードへの遷移 void SYSM_GoSleepMode( void ) { + // 蓋閉じ判定 + if ( ! PAD_DetectFold() ) + { + return; + } + // デバッガ起動時にはスリープに入らない if ( ! SYSM_IsRunOnDebugger() || (OSi_DetectDebugger() & OS_CONSOLE_TWLDEBUGGER) ) { diff --git a/build/libraries_sysmenu/sysmenu/ARM9/src/title.c b/build/libraries_sysmenu/sysmenu/ARM9/src/title.c index 33c2ed27..7a158e39 100644 --- a/build/libraries_sysmenu/sysmenu/ARM9/src/title.c +++ b/build/libraries_sysmenu/sysmenu/ARM9/src/title.c @@ -409,8 +409,7 @@ static void SYSMi_LoadTitleThreadFunc( TitleProperty *pBootTitle ) region_max }; // [TODO:]DSダウンロードプレイおよびpictochat等のNTR拡張NANDアプリの時は、ROMヘッダを退避する - // が、どうもNTR-ROMヘッダ情報の再配置は、rebootライブラリで行う。らしい。 - // とりあえず現状のままにしておき、動かなければ考える。 + // が、NTR-ROMヘッダは旧無線パッチとデバッガパッチを当てる必要があるため、再配置はrebootライブラリで行う。 // ロード char path[256]; diff --git a/build/systemMenu_RED/Launcher/ARM9/src/main.c b/build/systemMenu_RED/Launcher/ARM9/src/main.c index 98ae3389..76cc1977 100644 --- a/build/systemMenu_RED/Launcher/ARM9/src/main.c +++ b/build/systemMenu_RED/Launcher/ARM9/src/main.c @@ -316,13 +316,10 @@ void TwlMain( void ) (void)SND_FlushCommand(SND_COMMAND_NOBLOCK); #ifndef DISABLE_SLEEP - // スリープモードへの遷移 - if ( PAD_DetectFold() ) - { - SYSM_GoSleepMode(); - } + // スリープモードへの遷移（蓋閉じ判定はデフォルトで行う） + SYSM_GoSleepMode(); #endif // DISABLE_SLEEP -} + } } diff --git a/build/systemMenu_tools/SystemUpdater/Makefile b/build/systemMenu_tools/SystemUpdater/Makefile index 7407b391..48c2ddf6 100644 --- a/build/systemMenu_tools/SystemUpdater/Makefile +++ b/build/systemMenu_tools/SystemUpdater/Makefile @@ -46,7 +46,7 @@ export DO_NOT_SHOW_LAUNCHER = TRUE export DISABLE_WDS_SCAN = TRUE export IGNORE_WLFIRM_SIGNCHECK = FALSE export DISABLE_WLFIRM_LOAD = FALSE -export DISABLE_SLEEP = TRUE +export DISABLE_SLEEP = FASLE export LOAD_APP_VIA_WRAM = FALSE export SYSM_OUTSIDE_UI = TRUE export SYSM_BROADON_UI = FALSE