rvtr/TwlIPL
1
Fork 0
mirror of https://github.com/rvtr/TwlIPL.git synced 2025-10-31 06:01:12 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

TwlSDK5.0ss4_branch用ブランチの変更をマージ

Browse Source 
git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@1950 b08762b0-b915-fc4b-9d8c-17b2551a87ff
This commit is contained in:
yosiokat 2008-07-22 01:12:59 +00:00
parent 970a86c933
commit 09415f4d4c
5 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
View File

@ -576,12 +576,18 @@ static BOOL isTwlModeLoad(void)
{ {
// TWLカード // TWLカード
if(s_cbData.id_nml & HOTSW_ROMID_TWLROM_MASK){ if(s_cbData.id_nml & HOTSW_ROMID_TWLROM_MASK){
// PlatformCodeがTwl or Hybridの場合 // NANDアプリの場合
if(s_cbData.pBootSegBuf->rh.s.platform_code & 0x02){ if(s_cbData.pBootSegBuf->rh.s.titleID_Hi & TITLE_ID_HI_MEDIA_MASK){
return TRUE; return FALSE;
} }
else{ else{
return FALSE; // PlatformCodeがTwl or Hybridの場合
if(s_cbData.pBootSegBuf->rh.s.platform_code & 0x02){
return TRUE;
}
else{
return FALSE;
}
} }
} }
// DSカード // DSカード

10
build/systemMenu_RED/MachineSettings/ARM9/src/getSysMenuVersion.c
View File

@ -29,10 +29,10 @@
// define data---------------------------------- // define data----------------------------------
#define FS_VERSION_FILE "verinfo:/version.bin" #define FS_VERSION_FILE "verdata:/version.bin"
#define FS_EULA_URL_FILE "verinfo:/eula_url.bin" #define FS_EULA_URL_FILE "verdata:/eula_url.bin"
#define FS_NUP_HOSTNAME_FILE "verinfo:/nup_host.bin" #define FS_NUP_HOSTNAME_FILE "verdata:/nup_host.bin"
#define FS_TIMESTAMP_FILE "verinfo:/time_stamp.bin" #define FS_TIMESTAMP_FILE "verdata:/time_stamp.bin"
typedef struct SystemMenuVersion { typedef struct SystemMenuVersion {
u16 major; u16 major;
@ -53,7 +53,7 @@ static u32 s_timestamp;
// システムメニューバージョンのリード // システムメニューバージョンのリード
BOOL ReadSystemMenuVersionInfo( void *pWork, u32 workSize ) BOOL ReadSystemMenuVersionData( void *pWork, u32 workSize )
{ {
BOOL retval = TRUE; BOOL retval = TRUE;

2
build/systemMenu_RED/MachineSettings/ARM9/src/getSysMenuVersion.h
View File

@ -32,7 +32,7 @@ extern "C" {
#define TWL_NUP_HOSTNAME_LEN 64 #define TWL_NUP_HOSTNAME_LEN 64
// システムメニューバージョン情報もろもろのリード // システムメニューバージョン情報もろもろのリード
extern BOOL ReadSystemMenuVersionInfo( void *pWork, u32 workSize ); extern BOOL ReadSystemMenuVersionData( void *pWork, u32 workSize );
// バージョン文字列の取得 // バージョン文字列の取得

4
build/systemMenu_RED/MachineSettings/ARM9/src/main.c
View File

@ -132,7 +132,7 @@ void TwlMain(void)
u8 *pBuffer = Alloc( NA_VERSION_DATA_WORK_SIZE ); u8 *pBuffer = Alloc( NA_VERSION_DATA_WORK_SIZE );
if( pBuffer && if( pBuffer &&
ReadSystemMenuVersionInfo( pBuffer, NA_VERSION_DATA_WORK_SIZE ) ) { ReadSystemMenuVersionData( pBuffer, NA_VERSION_DATA_WORK_SIZE ) ) {
// リード成功 // リード成功
}else { }else {
// FATALエラー // FATALエラー
@ -145,7 +145,7 @@ void TwlMain(void)
{ {
char str_ver[ TWL_SYSMENU_VER_STR_LEN / sizeof(u16) ]; char str_ver[ TWL_SYSMENU_VER_STR_LEN / sizeof(u16) ];
int len = sizeof(str_ver); int len = sizeof(str_ver);
OS_TPrintf( "SystemMenuVersionInfo\n" ); OS_TPrintf( "SystemMenuVersionData\n" );
// 文字列 // 文字列
if( STD_ConvertStringUnicodeToSjis( str_ver, &len, GetSystemMenuVersionString(), NULL, NULL ) == STD_RESULT_SUCCESS ) { if( STD_ConvertStringUnicodeToSjis( str_ver, &len, GetSystemMenuVersionString(), NULL, NULL ) == STD_RESULT_SUCCESS ) {
OS_TPrintf( " Version(str) : %s\n", str_ver ); OS_TPrintf( " Version(str) : %s\n", str_ver );

3
build/systemMenu_RED/sysmenuVersion/Makefile
View File

@ -49,7 +49,8 @@ USER_AREA_SIZE = 134217728
NUP_HOSTNAME = nus.shop.wii.com:443 NUP_HOSTNAME = nus.shop.wii.com:443
# EULA‚ÌURL # EULA‚ÌURL
EULA_URL = https://cfh-test.t.app.nintendowifi.net/eula/ EULA_URL = https://cfh-test.t.app.nintendowifi.net/eula/ #ŠJ”­—p
#EULA_URL = https://cfh.t.app.nintendowifi.net/eula/ #<23>»•i—p
GEN_VERSION_PARAM = $(DST_DIR) $(VER_TIMESTAMP) $(STR_VERSION) $(MAJOR_VERSION) $(MINOR_VERSION) \ GEN_VERSION_PARAM = $(DST_DIR) $(VER_TIMESTAMP) $(STR_VERSION) $(MAJOR_VERSION) $(MINOR_VERSION) \
$(USER_AREA_SIZE) $(NUP_HOSTNAME) $(EULA_URL) $(USER_AREA_SIZE) $(NUP_HOSTNAME) $(EULA_URL)