From ad4eaa27060667779487011bd35f37a84784a616 Mon Sep 17 00:00:00 2001 From: yosiokat Date: Fri, 29 Feb 2008 11:13:13 +0000 Subject: [PATCH] =?UTF-8?q?TwlSDK=E3=81=A8TwlIPL=E3=81=AESVN=E3=83=AA?= =?UTF-8?q?=E3=83=93=E3=82=B8=E3=83=A7=E3=83=B3=E7=95=AA=E5=8F=B7=E3=82=92?= =?UTF-8?q?=E5=8F=96=E5=BE=97=E3=81=97=E3=81=A6=E3=80=81=E3=83=A9=E3=83=B3?= =?UTF-8?q?=E3=83=81=E3=83=A3=E3=83=BC=E3=81=A8=E6=9C=AC=E4=BD=93=E8=A8=AD?= =?UTF-8?q?=E5=AE=9A=E3=81=A7=E8=A1=A8=E7=A4=BA=E3=81=99=E3=82=8B=E3=82=88?= =?UTF-8?q?=E3=81=86=E5=A4=89=E6=9B=B4=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@776 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- build/libraries_sysmenu/sysmenu/ARM9/Makefile | 23 +++++++++++++++++-- .../Launcher/ARM9/src/launcher.c | 4 +++- .../Launcher/ARM9/src/launcher.h | 1 - .../MachineSettings/ARM9/src/MachineSetting.c | 2 +- .../sysmenu/sysmenu_lib/common/sysmenu_api.h | 2 ++ 5 files changed, 27 insertions(+), 5 deletions(-) diff --git a/build/libraries_sysmenu/sysmenu/ARM9/Makefile b/build/libraries_sysmenu/sysmenu/ARM9/Makefile index 8b3eb346..b274306f 100644 --- a/build/libraries_sysmenu/sysmenu/ARM9/Makefile +++ b/build/libraries_sysmenu/sysmenu/ARM9/Makefile @@ -26,6 +26,8 @@ TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED TWL_PROC = ARM9 +REVISION_SRC = src/revision.c + SRCS = sysmenu_lib.c \ util.c \ ninLogoFunc.c \ @@ -35,7 +37,8 @@ SRCS = sysmenu_lib.c \ title.c \ banner.c \ ../common/src/status.c \ - ../common/src/pxi.c + ../common/src/pxi.c \ + $(REVISION_SRC) TARGET_LIB = libsysmenu$(TWL_LIBSUFFIX).a @@ -49,13 +52,29 @@ LINCLUDES = $(ROOT)/build/libraries/mb/common/include \ $(ROOT)/build/libraries/spi/ARM9/include \ $(SYSMENU_ROOT)/build/libraries_sysmenu/sysmenu/common/include +LDIRT_CLEAN = $(REVISION_SRC) + #---------------------------------------------------------------------------- -do-build: $(MYSUBDIRS) $(TARGETS) +do-build: $(REVISION_SRC) $(MYSUBDIRS) $(TARGETS) include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules +#SVNリビジョン埋め込み +$(REVISION_SRC) :: + @if test -e $(SYSMENU_ROOT)/.svn; then \ + svn info $(SYSMENU_ROOT) | grep 'Revision' | sed "s|Revision: \(.*\)|const char *g_strIPLSvnRevision = \"\1\";|" > $(REVISION_SRC); \ + else \ + echo "const char *g_strIPLSvnRevision = \"-\"" > $(REVISION_SRC); \ + fi + @if test -e $(ROOT)/.svn; then \ + svn info $(ROOT) | grep 'Revision' | sed "s|Revision: \(.*\)|const char *g_strSDKSvnRevision = \"\1\";|" >> $(REVISION_SRC); \ + else \ + echo "const char *g_strSDKSvnRevision = \"-\"" >> $(REVISION_SRC); \ + fi + + $(MYSUBDIRS):: # $(MAKE) -C $@ -f MakeCrt0 diff --git a/build/systemMenu_RED/Launcher/ARM9/src/launcher.c b/build/systemMenu_RED/Launcher/ARM9/src/launcher.c index 0a8c3f8b..7978bc3c 100644 --- a/build/systemMenu_RED/Launcher/ARM9/src/launcher.c +++ b/build/systemMenu_RED/Launcher/ARM9/src/launcher.c @@ -396,7 +396,9 @@ void LauncherInit( TitleProperty *pTitleList ) GX_LoadBG2Scr(bg_scr_data2, 0, sizeof(bg_scr_data2)); DrawBackLightSwitch(); - PrintfSJIS( 0, 0, TXT_COLOR_BLUE, "TWL-SYSTEM MENU ver.%06x", SYSMENU_VER ); + PutStringUTF16( 0, 0, TXT_COLOR_BLUE, L"TWL-SYSTEM MENU" ); + PrintfSJIS( 128, 0, TXT_COLOR_BLUE, "IPL:%s", g_strIPLSvnRevision ); + PrintfSJIS( 128, 12, TXT_COLOR_BLUE, "SDK:%s", g_strSDKSvnRevision ); SVC_CpuClear( 0x0000, &tpd, sizeof(TpWork), 16 ); diff --git a/build/systemMenu_RED/Launcher/ARM9/src/launcher.h b/build/systemMenu_RED/Launcher/ARM9/src/launcher.h index 6f586e71..73bca845 100644 --- a/build/systemMenu_RED/Launcher/ARM9/src/launcher.h +++ b/build/systemMenu_RED/Launcher/ARM9/src/launcher.h @@ -26,7 +26,6 @@ extern "C" { #endif // define data------------------------------------------------------- -#define SYSMENU_VER 0x071115 // global variables-------------------------------------------------- diff --git a/build/systemMenu_RED/MachineSettings/ARM9/src/MachineSetting.c b/build/systemMenu_RED/MachineSettings/ARM9/src/MachineSetting.c index f7027673..968cfe03 100644 --- a/build/systemMenu_RED/MachineSettings/ARM9/src/MachineSetting.c +++ b/build/systemMenu_RED/MachineSettings/ARM9/src/MachineSetting.c @@ -163,7 +163,7 @@ void MachineSettingInit( void ) GX_LoadBG1Char(bg_char_data, 0, sizeof(bg_char_data)); GX_LoadBG1Scr(bg_scr_data, 0, sizeof(bg_scr_data)); - PutStringUTF16( 0, 0, TXT_COLOR_BLUE, (const u16 *)L"MACHINE SETTINGS" ); + PrintfSJIS( 0, 0, TXT_COLOR_BLUE, "MACHINE SETTINGS IPL:%s SDK:%s", g_strIPLSvnRevision, g_strSDKSvnRevision ); // NITRO設定データのlanguageに応じたメインメニュー構成言語の切り替え for( i = 0; i < SETTING_MENU_ELEMENT_NUM; i++ ) { diff --git a/include/sysmenu/sysmenu_lib/common/sysmenu_api.h b/include/sysmenu/sysmenu_lib/common/sysmenu_api.h index a3e53e75..bdc9c1bf 100644 --- a/include/sysmenu/sysmenu_lib/common/sysmenu_api.h +++ b/include/sysmenu/sysmenu_lib/common/sysmenu_api.h @@ -72,6 +72,8 @@ typedef enum AuthResult { // global variable------------------------------------------------------ #ifdef SDK_ARM9 +extern const char *g_strIPLSvnRevision; +extern const char *g_strSDKSvnRevision; extern void *SYSM_Alloc( u32 size ); extern void SYSM_Free( void *ptr ); //extern void *(*SYSM_Alloc)( u32 size ); // ライブラリ内部使用