From 3410b9269ec6ba074b1342cb77e212c8bc1ec472 Mon Sep 17 00:00:00 2001 From: yosiokat Date: Fri, 14 Mar 2008 04:57:36 +0000 Subject: [PATCH] =?UTF-8?q?SDK4737=E3=81=AElcfg=E3=83=A9=E3=82=A4=E3=83=96?= =?UTF-8?q?=E3=83=A9=E3=83=AA=E4=BF=AE=E6=AD=A3=E3=81=AB=E5=AF=BE=E5=BF=9C?= =?UTF-8?q?=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@879 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- .../sysmenu/ARM9/src/device.c | 17 ++--- .../sysmenu/ARM9/src/sysmenu_lib.c | 10 +-- .../libraries_sysmenu/sysmenu/ARM9/src/util.c | 2 +- .../HWInfoWriter/ARM9/src/hwi.c | 1 - .../MachineSettings/ARM9/src/MachineSetting.c | 64 ------------------ .../MachineSettings/ARM9/src/MachineSetting.h | 1 - .../MachineSettings/ARM9/src/calibrationTP.c | 5 -- .../MachineSettings/ARM9/src/selectCountry.c | 5 -- .../MachineSettings/ARM9/src/selectLanguage.c | 5 -- .../MachineSettings/ARM9/src/selectRegion.c | 6 -- .../MachineSettings/ARM9/src/setOwnerInfo.c | 6 -- .../ARM9/src/setParentalControl.c | 4 -- .../MachineSettings/ARM9/src/setRTC.c | 13 ---- docs/セキュアアプリ.mmap | Bin 27945 -> 28157 bytes 14 files changed, 6 insertions(+), 133 deletions(-) diff --git a/build/libraries_sysmenu/sysmenu/ARM9/src/device.c b/build/libraries_sysmenu/sysmenu/ARM9/src/device.c index 9e0350db..2e05d08f 100644 --- a/build/libraries_sysmenu/sysmenu/ARM9/src/device.c +++ b/build/libraries_sysmenu/sysmenu/ARM9/src/device.c @@ -33,6 +33,7 @@ u32 PMi_WriteRegisterAsync(u16 registerAddr, u16 data, PMCallback callback, void // global variable------------------------------------------------------------- // static variable------------------------------------------------------------- +static u8 s_brightness; // const data------------------------------------------------------------------ // ============================================================================ @@ -59,7 +60,7 @@ u8 SYSM_GetBackLightBlightness( void ) if ( SYSMi_GetMcuVersion() <= 1 ) { // X2ȑO - brightness = (u8)LCFG_TSD_GetBacklightBrightness(); + brightness = s_brightness; } else #endif // SDK_SUPPORT_PMIC_2 @@ -89,17 +90,8 @@ void SYSM_SetBackLightBrightness( u8 brightness ) #ifdef SDK_SUPPORT_PMIC_2 if ( SYSMi_GetMcuVersion() <= 1 ) { - ( void )PMi_WriteRegister( REG_PMIC_BL_BRT_B_ADDR, (u8)(brightness * 2) ); - - // X2ȑÕ{[ĥLCFGɒlۑ - LCFG_TSD_SetBacklightBrightness( brightness ); - { - u8 *pBuffer = SYSM_Alloc( LCFG_WRITE_TEMP ); - if( pBuffer != NULL ) { - LCFG_WriteTWLSettings( (u8 (*)[ LCFG_WRITE_TEMP ] )pBuffer ); - SYSM_Free( pBuffer ); - } - } + s_brightness = brightness; + ( void )PMi_WriteRegister( REG_PMIC_BL_BRT_B_ADDR, (u8)(s_brightness * 2) ); } else #endif // SDK_SUPPORT_PMIC_2 @@ -163,7 +155,6 @@ void SYSMi_CheckRTC( void ) #endif ) { // RTCُ̈oArtc̓tOrtcOffset0ɂNVRAMɏ݁B OS_TPrintf("\"RTC reset\" or \"Illegal RTC data\" detect!\n"); - LCFG_TSD_SetFlagDateTime( FALSE ); LCFG_TSD_SetRTCOffset( 0 ); LCFG_TSD_SetRTCLastSetYear( 0 ); { diff --git a/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c b/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c index f3b44f22..f38d04dc 100644 --- a/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c +++ b/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c @@ -131,7 +131,6 @@ void SYSMi_SendKeysToARM7( void ) TitleProperty *SYSM_ReadParameters( void ) { TitleProperty *pBootTitle = NULL; - u8 brightness = LCFG_TWL_BACKLIGHT_LEVEL_MAX; // ARM7̃Zbgp[^擾̂҂ while( !SYSMi_GetWork()->flags.common.isARM9Start ) { @@ -194,13 +193,6 @@ TitleProperty *SYSM_ReadParameters( void ) SYSMi_GetWork()->flags.common.isFatalError = TRUE; }else if( LCFG_ReadTWLSettings( (u8 (*)[LCFG_READ_TEMP])pBuffer ) ) { // NANDTWL{̐ݒf[^[h SYSM_CaribrateTP(); // ǂݏoTWL{̐ݒf[^ƂTPLu[VB -#ifdef SDK_SUPPORT_PMIC_2 - if ( SYSMi_GetMcuVersion() <= 1 ) - { - // X2{[hȑOPxǂݍ - brightness = (u8)LCFG_TSD_GetBacklightBrightness(); - } -#endif // SDK_SUPPORT_PMIC_2 }else { SYSMi_GetWork()->flags.common.isInitialSettings = TRUE; // [hsȂ珉NV[PX } @@ -217,7 +209,7 @@ TitleProperty *SYSM_ReadParameters( void ) if ( SYSMi_GetMcuVersion() <= 1 ) { // X2{[hȑOPxݒ肷 - SYSM_SetBackLightBrightness( brightness ); + SYSM_SetBackLightBrightness( LCFG_TWL_BACKLIGHT_LEVEL_MAX ); } #endif // SDK_SUPPORT_PMIC_2 // RTC␳ diff --git a/build/libraries_sysmenu/sysmenu/ARM9/src/util.c b/build/libraries_sysmenu/sysmenu/ARM9/src/util.c index ac51c715..89248f1a 100644 --- a/build/libraries_sysmenu/sysmenu/ARM9/src/util.c +++ b/build/libraries_sysmenu/sysmenu/ARM9/src/util.c @@ -51,7 +51,7 @@ s64 SYSM_CalcRTCOffset( RTCDate *newDatep, RTCTime *newTimep ) oldTime.second = 0; // RTCݒ莞́A̐ݒłǂꂾRTClωibItZbgPʁjZoB - if( ( oldDate.year < LCFG_TSD_GetRTCLastSetYear() ) && ( LCFG_TSD_IsSetDateTime() ) ) { + if( ( oldDate.year < LCFG_TSD_GetRTCLastSetYear() ) && ( LCFG_TSD_IsFinishedInitialSetting() ) ) { oldDate.year += 100; // O̐ݒ`̐ݒ̊ԂRTCĂ܂Ayear100ZoffsetvZB } LCFG_TSD_SetRTCLastSetYear( (u8)newDatep->year ); diff --git a/build/systemMenu_RED/HWInfoWriter/ARM9/src/hwi.c b/build/systemMenu_RED/HWInfoWriter/ARM9/src/hwi.c index 37765583..9230c2b8 100644 --- a/build/systemMenu_RED/HWInfoWriter/ARM9/src/hwi.c +++ b/build/systemMenu_RED/HWInfoWriter/ARM9/src/hwi.c @@ -269,7 +269,6 @@ void HWI_ModifyLanguage( u8 region ) } // R[hNAĂB - LCFG_TSD_SetFlagCountry( FALSE ); LCFG_TSD_SetCountry( LCFG_TWL_COUNTRY_UNDEFINED ); // yA^Rg[NAĂ diff --git a/build/systemMenu_RED/MachineSettings/ARM9/src/MachineSetting.c b/build/systemMenu_RED/MachineSettings/ARM9/src/MachineSetting.c index 71fc1066..235e2478 100644 --- a/build/systemMenu_RED/MachineSettings/ARM9/src/MachineSetting.c +++ b/build/systemMenu_RED/MachineSettings/ARM9/src/MachineSetting.c @@ -40,12 +40,8 @@ extern u32 bg_char_data[8 * 6]; extern u16 bg_scr_data[32 * 32]; // function's prototype declaration--------------------- -static BOOL InitialSetting( void ); -static void InitialSettingFinalizeInit( void ); -static int InitialSettingFinalizeMain( void ); // global variable ------------------------------------- -BOOL g_initialSet = FALSE; // static variable ------------------------------------- static u16 s_csr = 0; @@ -161,11 +157,6 @@ void MachineSettingInit( void ) { int i; - // NV[PX - if( InitialSetting() ) { - return; - } - GX_DispOff(); GXS_DispOff(); NNS_G2dCharCanvasClear( &gCanvas, TXT_COLOR_NULL ); @@ -279,61 +270,6 @@ void CheckOKCancelButton(BOOL *tp_ok, BOOL *tp_cancel) // //--------------------------------------------------------- -// NV[PX -static BOOL InitialSetting( void ) -{ -#if 0 - if( !TSD_GetFlagLanguage() ) { // ݒ肪܂B - g_initialSet = TRUE; - s_csr = 2; - SelectLangageInit(); - g_pNowProcess = SelectLanguageMain; - return TRUE; - }else if( !TSD_GetFlagTP() ) { // TPLu[V܂B - g_initialSet = TRUE; - s_csr = 3; - TP_CalibrationInit(); - g_pNowProcess = TP_CalibrationMain; - return TRUE; - }else if( !TSD_GetFlagDateTime() ) { // RTCݒ肪܂B - ClearRTC(); - g_initialSet = TRUE; - s_csr = 1; - SetRTCInit(); - g_pNowProcess = SetRTCMain; - return TRUE; - }else if( !TSD_GetFlagNickname() || // jbNl[܂͍DȐF͂܂B - !TSD_GetFlagUserColor() ) { -/* g_initialSet = TRUE; - s_csr = 0; - SetOwnerInfoInit(); - g_pNowProcess = SetOwnerInfoMain; - return TRUE; -*/ } - - if( g_initialSet ) { - InitialSettingFinalizeInit(); - g_pNowProcess = InitialSettingFinalizeMain(); - return TRUE; - } -#endif - return FALSE; -} - - -static void InitialSettingFinalizeInit( void ) -{ - NNS_G2dCharCanvasClear( &gCanvas, TXT_COLOR_WHITE ); - (void)PutStringUTF16( 6 * 8, 10 * 8, TXT_COLOR_BLACK, (const u16 *)L" Initial setting completed."); - (void)PutStringUTF16( 6 * 8, 12 * 8, TXT_COLOR_BLACK, (const u16 *)L" Please reboot."); -} - - -static int InitialSettingFinalizeMain( void ) -{ - return 0; -} - // {̐ݒf[^̃Cg BOOL MY_WriteTWLSettings( void ) diff --git a/build/systemMenu_RED/MachineSettings/ARM9/src/MachineSetting.h b/build/systemMenu_RED/MachineSettings/ARM9/src/MachineSetting.h index ddd66e6c..f3862e3a 100644 --- a/build/systemMenu_RED/MachineSettings/ARM9/src/MachineSetting.h +++ b/build/systemMenu_RED/MachineSettings/ARM9/src/MachineSetting.h @@ -49,7 +49,6 @@ typedef struct InputNumParam { // global variable------------------------------------------------------ extern NNSFndAllocator g_allocator; -extern BOOL g_initialSet; extern int (*g_pNowProcess)( void ); extern BOOL g_isValidTSD; diff --git a/build/systemMenu_RED/MachineSettings/ARM9/src/calibrationTP.c b/build/systemMenu_RED/MachineSettings/ARM9/src/calibrationTP.c index c232a60d..116f6e9a 100644 --- a/build/systemMenu_RED/MachineSettings/ARM9/src/calibrationTP.c +++ b/build/systemMenu_RED/MachineSettings/ARM9/src/calibrationTP.c @@ -418,7 +418,6 @@ int TP_CalibrationMain( void ) s_pTPC->calibTemp.data.dy2 = DISP_Y_SIZE - 32; LCFG_TSD_SetTPCalibration( &s_pTPC->calibTemp ); - LCFG_TSD_SetFlagTP( TRUE ); // ^b`pl̓tO𗧂ĂB // :::::::::::::::::::::::::::::::::::::::::::::: // TWLݒf[^t@Cւ̏ // :::::::::::::::::::::::::::::::::::::::::::::: @@ -479,10 +478,6 @@ void TP_CalibrationInit( void ) PutStringUTF16( 0, 0, TXT_COLOR_BLUE, (const u16 *)L"TOUCH PANEL CALIBRATION" ); - if( g_initialSet ) { - PutStringUTF16( 8 * 8, 18 * 8, TXT_COLOR_RED, (const u16 *)L"Calibrate touch panel." ); - } - DisplayInit(); s_pTPC = Alloc( sizeof(CalibWork) ); // Lu[Vpϐ̊m diff --git a/build/systemMenu_RED/MachineSettings/ARM9/src/selectCountry.c b/build/systemMenu_RED/MachineSettings/ARM9/src/selectCountry.c index b2e1b13d..7b617f0b 100644 --- a/build/systemMenu_RED/MachineSettings/ARM9/src/selectCountry.c +++ b/build/systemMenu_RED/MachineSettings/ARM9/src/selectCountry.c @@ -140,10 +140,6 @@ void SelectCountryInit( void ) PutStringUTF16( 0, 0, TXT_COLOR_BLUE, (const u16 *)L"COUNTRY SELECT" ); PutStringUTF16( CANCEL_BUTTON_TOP_X, CANCEL_BUTTON_TOP_Y, TXT_COLOR_CYAN, (const u16 *)L"CANCEL" ); - if( g_initialSet ) { - PutStringUTF16( 8 * 8, 18 * 8, TXT_COLOR_RED, (const u16 *)L"Select country." ); - } - // ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: // 炩TWLݒf[^t@Cǂݍݍς݂̐ݒ擾 // ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: @@ -319,7 +315,6 @@ int SelectCountryMain( void ) if( ( pad.trg & PAD_BUTTON_A ) || tp_select ) { // j[ڂւ̕ LCFG_TSD_SetCountry( s_countryCode ); // R[hݒ - LCFG_TSD_SetFlagCountry( TRUE ); // R[h̓tO𗧂Ă // :::::::::::::::::::::::::::::::::::::::::::::: // TWLݒf[^t@Cւ̏ // :::::::::::::::::::::::::::::::::::::::::::::: diff --git a/build/systemMenu_RED/MachineSettings/ARM9/src/selectLanguage.c b/build/systemMenu_RED/MachineSettings/ARM9/src/selectLanguage.c index 72bcde7c..eefc8abf 100644 --- a/build/systemMenu_RED/MachineSettings/ARM9/src/selectLanguage.c +++ b/build/systemMenu_RED/MachineSettings/ARM9/src/selectLanguage.c @@ -99,10 +99,6 @@ void SelectLanguageInit( void ) PutStringUTF16( 0, 0, TXT_COLOR_BLUE, (const u16 *)L"LANGUAGE SELECT" ); PutStringUTF16( CANCEL_BUTTON_TOP_X, CANCEL_BUTTON_TOP_Y, TXT_COLOR_CYAN, (const u16 *)L"CANCEL" ); - if( g_initialSet ) { - PutStringUTF16( 8 * 8, 18 * 8, TXT_COLOR_RED, (const u16 *)L"Select language." ); - } - // ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: // 炩TWLݒf[^t@Cǂݍݍς݂̐ݒ擾 // ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: @@ -177,7 +173,6 @@ int SelectLanguageMain( void ) if( ( pad.trg & PAD_BUTTON_A ) || tp_select ) { // j[ڂւ̕ LCFG_TSD_SetLanguage( s_langCodeList[s_lang] ); - LCFG_TSD_SetFlagLanguage( TRUE ); // ̓tO𗧂Ă // :::::::::::::::::::::::::::::::::::::::::::::: // TWLݒf[^t@Cւ̏ // :::::::::::::::::::::::::::::::::::::::::::::: diff --git a/build/systemMenu_RED/MachineSettings/ARM9/src/selectRegion.c b/build/systemMenu_RED/MachineSettings/ARM9/src/selectRegion.c index 9527f492..dd3f2fea 100644 --- a/build/systemMenu_RED/MachineSettings/ARM9/src/selectRegion.c +++ b/build/systemMenu_RED/MachineSettings/ARM9/src/selectRegion.c @@ -95,10 +95,6 @@ void SelectRegionInit( void ) PutStringUTF16( 0, 0, TXT_COLOR_BLUE, (const u16 *)L"REGION SELECT" ); PutStringUTF16( CANCEL_BUTTON_TOP_X, CANCEL_BUTTON_TOP_Y, TXT_COLOR_CYAN, (const u16 *)L"CANCEL" ); - if( g_initialSet ) { - PutStringUTF16( 8 * 8, 18 * 8, TXT_COLOR_RED, (const u16 *)L"Select region." ); - } - // ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: // 炩TWLݒf[^t@Cǂݍݍς݂̐ݒ擾 // ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: @@ -157,8 +153,6 @@ int SelectRegionMain( void ) // :::::::::::::::::::::::::::::::::::::::::::::: TSD_SetLanguage( default_lang_list[s_regionCode] ); // ftHgɋݒ TSD_SetCountry( default_country_list[s_regionCode] ); // ftHgɋݒ - TSD_SetFlagLanguage( TRUE ); // Language̓tO𗧂Ă - //TSD_SetFlagCountry( TRUE ); // Country̓tO𗧂Ă (void)SYSM_WriteTWLSettingsFile(); MachineSettingInit(); diff --git a/build/systemMenu_RED/MachineSettings/ARM9/src/setOwnerInfo.c b/build/systemMenu_RED/MachineSettings/ARM9/src/setOwnerInfo.c index 20ef6f8b..7a5304b5 100644 --- a/build/systemMenu_RED/MachineSettings/ARM9/src/setOwnerInfo.c +++ b/build/systemMenu_RED/MachineSettings/ARM9/src/setOwnerInfo.c @@ -386,20 +386,16 @@ static void PushKeys( u16 code, NameOrComment noc ) u16 *buf; u8 *length; u16 max_length; - void (*setflag)(BOOL) = NULL; if(noc == NOC_NAME) { buf = s_temp_name; length = &s_temp_name_length; max_length = LCFG_TWL_NICKNAME_LENGTH; - setflag = LCFG_TSD_SetFlagNickname; }else if(noc == NOC_COMMENT) { buf = s_temp_comment; length = &s_temp_comment_length; max_length = LCFG_TWL_COMMENT_LENGTH; - // setflag = TSD_SetFlagComment; - setflag = NULL; }else { //unknown @@ -422,7 +418,6 @@ static void PushKeys( u16 code, NameOrComment noc ) if(*length < max_length) buf[(*length)++] = L'@'; break; case OK_BUTTON_: - if(setflag) setflag(TRUE);// ݒ芮tO𗧂ĂĂ SVC_CpuClear(0, buf + *length, (max_length - *length) * 2, 16);// [NA if(noc == NOC_NAME) { LCFG_TSD_SetNickname( buf ); @@ -766,7 +761,6 @@ static int SetBirthdayMain( void ) if( pad.trg & PAD_BUTTON_A || (tp_touch && temp_ok_cancel == KEY_OK) ) { LCFG_TSD_SetBirthday(&s_temp_birthday); - LCFG_TSD_SetFlagBirthday( TRUE ); // :::::::::::::::::::::::::::::::::::::::::::::: // TWLݒf[^t@Cւ̏ // :::::::::::::::::::::::::::::::::::::::::::::: diff --git a/build/systemMenu_RED/MachineSettings/ARM9/src/setParentalControl.c b/build/systemMenu_RED/MachineSettings/ARM9/src/setParentalControl.c index e20609f1..8556fc08 100644 --- a/build/systemMenu_RED/MachineSettings/ARM9/src/setParentalControl.c +++ b/build/systemMenu_RED/MachineSettings/ARM9/src/setParentalControl.c @@ -1094,7 +1094,6 @@ static void PushKeys( u16 code, eUseSoftKey noc ) u16 min_length; u16 max_length; u16 bufsize; - void (*setflag)(BOOL) = NULL; if(noc == USE_SOFTKEY_COMMON) { // unused @@ -1108,8 +1107,6 @@ static void PushKeys( u16 code, eUseSoftKey noc ) min_length = sMinLenAnswer; max_length = sMaxLenAnswer; bufsize = sBufSizeAnswer; - // setflag = TSD_SetFlagComment; - setflag = NULL; } else { @@ -1136,7 +1133,6 @@ static void PushKeys( u16 code, eUseSoftKey noc ) if( *length >= min_length ) // ŏɖȂƂOKłȂ { //DEBUGPRINT( "OK: length = %d, min_length = %d, max_length = %d\n", *length, min_length, max_length ); - if(setflag) setflag(TRUE);// ݒ芮tO𗧂ĂĂ // ƃobt@TCYقȂƂɒԂ̃f[^0NAĂقS SVC_CpuClear(0, buf + *length, (bufsize - *length) * 2, 16 ); // ̏܂łł͂Ȃobt@̍Ō܂0NA diff --git a/build/systemMenu_RED/MachineSettings/ARM9/src/setRTC.c b/build/systemMenu_RED/MachineSettings/ARM9/src/setRTC.c index e3e66842..c28e8242 100644 --- a/build/systemMenu_RED/MachineSettings/ARM9/src/setRTC.c +++ b/build/systemMenu_RED/MachineSettings/ARM9/src/setRTC.c @@ -112,14 +112,6 @@ void SetRTCInit( void ) PutStringUTF16( 0, 0, TXT_COLOR_BLUE, (const u16 *)L"DATE & TIME SET" ); PutStringUTF16( RETURN_BUTTON_TOP_X, RETURN_BUTTON_TOP_Y, TXT_COLOR_CYAN, (const u16 *)L" RETURN " ); - if( g_initialSet ) { - if( SYSMi_GetWork()->rtcStatus & 0x01) { - PutStringUTF16( 8 * 8, 18 * 8, TXT_COLOR_RED, (const u16 *)L"RTC reset is detected!" ); - }else { - PutStringUTF16( 8 * 8, 18 * 8, TXT_COLOR_RED, (const u16 *)L"Set RTC." ); - } - } - s_pWork = Alloc( sizeof(SetRtcWork) ); // RTCݒp[N̊m if( s_pWork == NULL ) { OS_Panic( "ARM9- Fail to allocate memory...\n" ); @@ -175,9 +167,6 @@ int SetRTCMain( void ) tp_return = WithinRangeTP( RETURN_BUTTON_TOP_X, RETURN_BUTTON_TOP_Y, RETURN_BUTTON_BOTTOM_X, RETURN_BUTTON_BOTTOM_Y, &tpd.disp ); } - if( g_initialSet && !LCFG_TSD_IsSetDateTime() ) { - tp_set = TRUE; - } //-------------------------------------- // L[͏ //-------------------------------------- @@ -379,7 +368,6 @@ static int InputRtcDateTimeMain( void ) LCFG_TSD_SetRTCOffset( SYSM_CalcRTCOffset( &date, &s_pWork->dtp.Time ) ); } - LCFG_TSD_SetFlagDateTime( TRUE ); // RTC̓tO𗧂ĂB // :::::::::::::::::::::::::::::::::::::::::::::: // TWLݒf[^t@Cւ̏ // :::::::::::::::::::::::::::::::::::::::::::::: @@ -545,7 +533,6 @@ void ClearRTC( void ) RTCDate date = { 0, 1, 1, RTC_WEEK_SUNDAY }; RTCTime time = { 0, 0, 0 }; (void)RTC_SetDateTime( &date, &time ); - LCFG_TSD_SetFlagDateTime( TRUE ); LCFG_TSD_SetRTCOffset( 0 ); LCFG_TSD_SetRTCLastSetYear( 0 ); // :::::::::::::::::::::::::::::::::::::::::::::: diff --git a/docs/セキュアアプリ.mmap b/docs/セキュアアプリ.mmap index 25b7e6f6e30be116dbe570bbbe4a40ec94da6fed..a8920c0bd16f77fc6315438cb3fa9c5cb027d51a 100644 GIT binary patch delta 6271 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 Fe*k-w)*1i+ delta 6057 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 BgN6VA