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

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

View File

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

View File

@ -29,10 +29,10 @@
// define data----------------------------------
#define FS_VERSION_FILE "verinfo:/version.bin"
#define FS_EULA_URL_FILE "verinfo:/eula_url.bin"
#define FS_NUP_HOSTNAME_FILE "verinfo:/nup_host.bin"
#define FS_TIMESTAMP_FILE "verinfo:/time_stamp.bin"
#define FS_VERSION_FILE "verdata:/version.bin"
#define FS_EULA_URL_FILE "verdata:/eula_url.bin"
#define FS_NUP_HOSTNAME_FILE "verdata:/nup_host.bin"
#define FS_TIMESTAMP_FILE "verdata:/time_stamp.bin"
typedef struct SystemMenuVersion {
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;

View File

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

View File

@ -132,7 +132,7 @@ void TwlMain(void)
u8 *pBuffer = Alloc( NA_VERSION_DATA_WORK_SIZE );
if( pBuffer &&
ReadSystemMenuVersionInfo( pBuffer, NA_VERSION_DATA_WORK_SIZE ) ) {
ReadSystemMenuVersionData( pBuffer, NA_VERSION_DATA_WORK_SIZE ) ) {
// リード成功
}else {
// FATALエラー
@ -145,7 +145,7 @@ void TwlMain(void)
{
char str_ver[ TWL_SYSMENU_VER_STR_LEN / sizeof(u16) ];
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 ) {
OS_TPrintf( " Version(str) : %s\n", str_ver );

View File

@ -49,7 +49,8 @@ USER_AREA_SIZE = 134217728
NUP_HOSTNAME = nus.shop.wii.com:443
# 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) \
$(USER_AREA_SIZE) $(NUP_HOSTNAME) $(EULA_URL)