From 6cc0cfb9f74bbe07bf6c967e0f5b7125e793e316 Mon Sep 17 00:00:00 2001 From: aoki_ryoma Date: Tue, 22 Jul 2008 05:58:32 +0000 Subject: [PATCH] =?UTF-8?q?ContentVersion=E5=86=85=E3=81=A7changable?= =?UTF-8?q?=E3=83=95=E3=83=A9=E3=82=B0=E3=81=AE=E3=83=81=E3=82=A7=E3=83=83?= =?UTF-8?q?=E3=82=AF=E6=BC=8F=E3=82=8C=E3=81=8C=E3=81=82=E3=81=A3=E3=81=9F?= =?UTF-8?q?=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3=E3=80=82=20OtherInfo?= =?UTF-8?q?=E5=86=85=E3=81=AELast=20boot=20soft=20ID=E3=81=8C=E5=8F=8D?= =?UTF-8?q?=E8=BB=A2=E3=81=97=E3=81=A6=E3=81=84=E3=81=9F=E3=81=AE=E3=82=92?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=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@1959 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- build/tests/DisplaySystemInformation/ARM9/src/control.c | 2 +- .../DisplaySystemInformation/ARM9/src/viewSystemInfo.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/build/tests/DisplaySystemInformation/ARM9/src/control.c b/build/tests/DisplaySystemInformation/ARM9/src/control.c index 06a66d33..180b3975 100644 --- a/build/tests/DisplaySystemInformation/ARM9/src/control.c +++ b/build/tests/DisplaySystemInformation/ARM9/src/control.c @@ -237,7 +237,7 @@ BOOL control( int *menu, int *line, int *changeLine, int *changeMode ) } } - else if( gAllInfo[*menu][*line].changable ) + else if( *menu < MENU_VERSION && gAllInfo[*menu][*line].changable ) { controlFlag = TRUE; diff --git a/build/tests/DisplaySystemInformation/ARM9/src/viewSystemInfo.c b/build/tests/DisplaySystemInformation/ARM9/src/viewSystemInfo.c index cb1e4fa7..f5514018 100644 --- a/build/tests/DisplaySystemInformation/ARM9/src/viewSystemInfo.c +++ b/build/tests/DisplaySystemInformation/ARM9/src/viewSystemInfo.c @@ -362,6 +362,8 @@ void getParentalInfo( void ) void getOtherInfo( void ) { + // この辺からマクロで生成した分 + int value; value = OS_IsAgreeEULA(); @@ -443,12 +445,14 @@ void getOtherInfo( void ) { u64 buf = LCFG_TSD_GetLastTimeBootSoftTitleID(); + u32 titleID = MI_LoadBE32( &buf ); gAllInfo[MENU_OTHER][OTHER_LCFG_LASTBOOT_ID].isAligned = FALSE; gAllInfo[MENU_OTHER][OTHER_LCFG_LASTBOOT_ID].numLines = 2; gAllInfo[MENU_OTHER][OTHER_LCFG_LASTBOOT_ID].fromLCFG = TRUE; - MI_CpuCopy( &buf, gAllInfo[MENU_OTHER][OTHER_LCFG_LASTBOOT_ID].str.sjis, 8 ); + + MI_CpuCopy( &titleID, gAllInfo[MENU_OTHER][OTHER_LCFG_LASTBOOT_ID].str.sjis, 4 ); gAllInfo[MENU_OTHER][OTHER_LCFG_LASTBOOT_ID].str.sjis[8] = '\0'; } }