diff --git a/build/buildtools/commondefs.firm b/build/buildtools/commondefs.firm index 69dd10ca..ff4aeba0 100644 --- a/build/buildtools/commondefs.firm +++ b/build/buildtools/commondefs.firm @@ -108,7 +108,7 @@ MAKENORFIRM := $(FIRM_TOOLSDIR)/bin/makenorfirm.exe MAKENANDFIRM := $(FIRM_TOOLSDIR)/bin/makenandfirm.exe MAKEGCDFIRM := $(FIRM_TOOLSDIR)/bin/makegcdfirm.exe OPENSSL := $(FIRM_TOOLSDIR)/openssl/openssl.exe -NTEXCONV := $(FIRM_TOOLSDIR)/bin/ntexconv.exe +NTEXCONV := $(ROOT)/tools/bin/ntexconv.exe MAKEBANNER := $(FIRM_TOOLSDIR)/bin/makebanner.exe MAKEFIRM_RSA_PRVKEY ?= $(FIRM_TOOLSDIR)/openssl/rsa_private.der diff --git a/build/buildtools/commondefs.sysmenu b/build/buildtools/commondefs.sysmenu index 9e1d57da..c203e28b 100644 --- a/build/buildtools/commondefs.sysmenu +++ b/build/buildtools/commondefs.sysmenu @@ -81,7 +81,7 @@ endif # MY BUILD TOOLS # OPENSSL := $(SYSMENU_TOOLSDIR)/openssl/openssl.exe -NTEXCONV := $(SYSMENU_TOOLSDIR)/bin/ntexconv.exe +NTEXCONV := $(ROOT)/tools/bin/ntexconv.exe MAKEBANNER := $(SYSMENU_TOOLSDIR)/bin/makebanner.exe MAKESYSMENU_RSA_PRVKEY ?= $(SYSMENU_TOOLSDIR)/openssl/rsa_private.der diff --git a/build/libraries_sysmenu/settings/ARM9/src/TWLSettings.c b/build/libraries_sysmenu/settings/ARM9/src/TWLSettings.c index 816ee339..4f0213b0 100644 --- a/build/libraries_sysmenu/settings/ARM9/src/TWLSettings.c +++ b/build/libraries_sysmenu/settings/ARM9/src/TWLSettings.c @@ -219,7 +219,7 @@ static void TSDi_ClearSettingsDirect( TWLSettingsData *pTSD ) static BOOL TSDi_CheckValue( const TWLSettingsData *pSrc ) { // 国コード - if( TSD_IsSetCountry() ) { + if( pSrc->flags.isSetCountry ) { u32 countryStart = (u32)( s_regionCountryList[ THW_GetRegion() ] >> 16 ); u32 countryEnd = (u32)( s_regionCountryList[ THW_GetRegion() ] & 0x0000ffff ); if( ( pSrc->country < countryStart ) || @@ -231,8 +231,8 @@ static BOOL TSDi_CheckValue( const TWLSettingsData *pSrc ) } // 言語コード - if( TSD_IsSetLanguage() && - ( THW_GetValidLanguageBitmap() & ( 0x0001 << pSrc->language ) ) + if( pSrc->flags.isSetLanguage && + !( THW_GetValidLanguageBitmap() & ( 0x0001 << pSrc->language ) ) ) { return FALSE; } diff --git a/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c b/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c index 48cc7400..8526c61b 100644 --- a/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c +++ b/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c @@ -834,6 +834,35 @@ void SYSM_LoadAndAuthenticateTitleThread( TitleProperty *pBootTitle ) // デバイス制御 // // ============================================================================ +#ifdef SDK_FINALROM +u32 PM_SendUtilityCommandAsync(u32 number, u16 parameter, u16* retValue, PMCallback callback, void *arg); +u32 PM_SendUtilityCommand(u32 number, u16 parameter, u16* retValue); +u32 PMi_WriteRegister(u16 registerAddr, u16 data); +u32 PMi_WriteRegisterAsync(u16 registerAddr, u16 data, PMCallback callback, void *arg); +/*---------------------------------------------------------------------------* + Name: PMi_WriteRegisterAsync + + Description: send write register command to ARM7 + + Arguments: registerAddr : PMIC register number (0-3) + data : data written to PMIC register + callback : callback function + arg : callback argument + + Returns: result of issueing command + PM_RESULT_BUSY : busy + PM_RESULT_SUCCESS : success + *---------------------------------------------------------------------------*/ +u32 PMi_WriteRegisterAsync(u16 registerAddr, u16 data, PMCallback callback, void *arg) +{ + return PM_SendUtilityCommandAsync(PMi_UTIL_WRITEREG, (u16)((registerAddr<<16) | (data&0xff)), NULL, callback, arg); +} + +u32 PMi_WriteRegister(u16 registerAddr, u16 data) +{ + return PM_SendUtilityCommand(PMi_UTIL_WRITEREG, (u16)((registerAddr<<16) | (data&0xff)), NULL); +} +#endif // バックライト輝度調整 void SYSM_SetBackLightBrightness( u8 brightness ) diff --git a/build/systemMenu_RED/MachineSettings/ARM9/Makefile b/build/systemMenu_RED/MachineSettings/ARM9/Makefile index 50ad594b..e9e20a0f 100644 --- a/build/systemMenu_RED/MachineSettings/ARM9/Makefile +++ b/build/systemMenu_RED/MachineSettings/ARM9/Makefile @@ -38,7 +38,7 @@ MISC_DIR = ../../misc BG_DIR = ../../data SRCS = main.c MachineSetting.c \ - setRTC.c selectLanguage.c calibrationTP.c setOwnerInfo.c selectRegion.c selectCountry.c \ + setRTC.c selectLanguage.c calibrationTP.c setOwnerInfo.c selectCountry.c \ CountryNameMappingData.c \ $(MISC_DIR)/src/misc.c $(MISC_DIR)/src/cmn.c \ $(BG_DIR)/BGData_MachineSettings.c diff --git a/build/systemMenu_RED/MachineSettings/ARM9/src/MachineSetting.c b/build/systemMenu_RED/MachineSettings/ARM9/src/MachineSetting.c index 3e31e407..5edb3af2 100644 --- a/build/systemMenu_RED/MachineSettings/ARM9/src/MachineSetting.c +++ b/build/systemMenu_RED/MachineSettings/ARM9/src/MachineSetting.c @@ -32,7 +32,7 @@ #define OK_BUTTON_BOTTOM_Y ( OK_BUTTON_TOP_Y + 2 * 8 ) -#define SETTING_MENU_ELEMENT_NUM 7 // メインメニューの項目数 +#define SETTING_MENU_ELEMENT_NUM 5 // メインメニューの項目数（※ピクトチャット起動テストは除いておく） // extern data------------------------------------------ @@ -98,16 +98,6 @@ static const u16 *const s_pStrSettingElemTbl[ SETTING_MENU_ELEMENT_NUM ][ TWL_LA (const u16 *)L"TOUCH PANEL(C)", (const u16 *)L"TOUCH PANEL(K)", }, - { - (const u16 *)L"リージョン設定", - (const u16 *)L"REGION", - (const u16 *)L"REGION(F)", - (const u16 *)L"REGION(G)", - (const u16 *)L"REGION(I)", - (const u16 *)L"REGION(S)", - (const u16 *)L"REGION(C)", - (const u16 *)L"REGION(K)", - }, { (const u16 *)L"国設定", (const u16 *)L"COUNTRY", @@ -118,6 +108,7 @@ static const u16 *const s_pStrSettingElemTbl[ SETTING_MENU_ELEMENT_NUM ][ TWL_LA (const u16 *)L"COUNTRY(C)", (const u16 *)L"COUNTRY(K)", }, +#if 0 { (const u16 *)L"ピクトチャット起動テスト", (const u16 *)L"PICTOCHAT", @@ -128,6 +119,7 @@ static const u16 *const s_pStrSettingElemTbl[ SETTING_MENU_ELEMENT_NUM ][ TWL_LA (const u16 *)L"PICTOCHAT(C)", (const u16 *)L"PICTOCHAT(K)", }, +#endif }; static MenuPos s_settingPos[] = { @@ -137,7 +129,6 @@ static MenuPos s_settingPos[] = { { TRUE, 4 * 8, 12 * 8 }, { TRUE, 4 * 8, 14 * 8 }, { TRUE, 4 * 8, 16 * 8 }, - { TRUE, 4 * 8, 18 * 8 }, }; @@ -241,14 +232,10 @@ int MachineSettingMain( void ) g_pNowProcess = TP_CalibrationMain; break; case 4: - SelectRegionInit(); - g_pNowProcess = SelectRegionMain; - break; - case 5: SelectCountryInit(); g_pNowProcess = SelectCountryMain; break; - case 6: + case 5: //pictochat起動テスト OS_SetLauncherParamAndResetHardware( 0, 0x0003000550434854, &tempflag ); } diff --git a/build/systemMenu_RED/MachineSettings/ARM9/src/selectCountry.c b/build/systemMenu_RED/MachineSettings/ARM9/src/selectCountry.c index ab117cf9..15b78fb9 100644 --- a/build/systemMenu_RED/MachineSettings/ARM9/src/selectCountry.c +++ b/build/systemMenu_RED/MachineSettings/ARM9/src/selectCountry.c @@ -319,7 +319,7 @@ int SelectCountryMain( void ) if( ( pad.trg & PAD_BUTTON_A ) || tp_select ) { // メニュー項目への分岐 TSD_SetCountry( s_countryCode ); // 国コード設定 - //TSD_SetFlagCountry( TRUE ); // 国コード入力フラグを立てる + TSD_SetFlagCountry( TRUE ); // 国コード入力フラグを立てる // :::::::::::::::::::::::::::::::::::::::::::::: // TWL設定データファイルへの書き込み // :::::::::::::::::::::::::::::::::::::::::::::: diff --git a/tools/bin/ntexconv.exe b/tools/bin/ntexconv.exe deleted file mode 100644 index d29e2ed2..00000000 Binary files a/tools/bin/ntexconv.exe and /dev/null differ