From 0db2184e7d8ef41f490b63c4e4b0a12a798f6386 Mon Sep 17 00:00:00 2001 From: yosiokat Date: Thu, 24 Apr 2008 05:46:54 +0000 Subject: [PATCH] =?UTF-8?q?NandFormatter=20ver.0=E3=81=AE=E8=B5=B7?= =?UTF-8?q?=E5=8B=95=E5=88=B6=E9=99=90=E3=81=8C=E3=81=86=E3=81=BE=E3=81=8F?= =?UTF-8?q?=E3=81=84=E3=81=A3=E3=81=A6=E3=81=84=E3=81=AA=E3=81=8B=E3=81=A3?= =?UTF-8?q?=E3=81=9F=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3=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@1253 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- .../libraries_sysmenu/boot/ARM7/src/bootAPI.c | 37 ++++++++++++++++++ .../libraries_sysmenu/boot/ARM9/src/bootAPI.c | 37 +----------------- .../SDK_5_0_FC_plus2_ランチャーチェック表.xls | Bin 49152 -> 49664 bytes 3 files changed, 38 insertions(+), 36 deletions(-) diff --git a/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c b/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c index 793d3ef2..183ab079 100644 --- a/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c +++ b/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c @@ -39,12 +39,21 @@ #define CLRLIST_REBOOT_STACK_PAD_SIZE_IDX (2*3+1) +#define TITLE_ID_NAND_INITIALIZER 0x00030011304E4941UL // 0NIA + +// N^Cgꗗ +typedef struct TitleBlackList { + OSTitleId titleID; + int rom_version; +}TitleBlackList; + // extern data------------------------------------------------------- // function's prototype---------------------------------------------- static void BOOTi_ClearREG_RAM( void ); static void BOOTi_CutAwayRegionList( u32 *regionlist, u32 start, u32 end ); +static void BOOTi_CheckTitleBlackList( void ); // global variables-------------------------------------------------- @@ -74,6 +83,13 @@ static u32 nitro_post_clear_list[POST_CLEAR_NUM_MAX + 1] = // const data-------------------------------------------------------- +// N^Cgꗗ +static const TitleBlackList s_blackList[] = { + { TITLE_ID_NAND_INITIALIZER, 0 }, + { 0UL, -1 }, +}; + + void BOOT_Init( void ) { reg_PXI_MAINPINTF = 0x0000; @@ -103,6 +119,9 @@ BOOL BOOT_WaitStart( void ) MI_CpuCopyFast( (void *)SYSM_CARD_ROM_HEADER_BUF, (void *)HW_ROM_HEADER_BUF, HW_ROM_HEADER_BUF_END - HW_ROM_HEADER_BUF ); } + // ubNXg`FbNAN + BOOTi_CheckTitleBlackList(); + (void)OS_DisableIrq(); // Ŋ荞݋֎~ɂȂƃ_B (void)OS_SetIrqMask(0); // SDKo[W̃T[`ɎԂƁAARM9HALTɂĂ܂AARM7̃TEhXbhARM9FIFOŃf[^M悤ƂĂFIFOtőMłȂԂŖ[vɓĂ܂B (void)OS_SetIrqMaskEx(0); @@ -374,3 +393,21 @@ static void BOOTi_CutAwayRegionList( u32 *regionlist, u32 start, u32 end ) BOOTi_DeliteElementFromList( regionlist, (u32)n ); } } + +// NubNXgTITLẼ`FbN +static void BOOTi_CheckTitleBlackList( void ) +{ + const TitleBlackList *pBlackList = &s_blackList[ 0 ]; + ROM_Header_Short *pROMH = (ROM_Header_Short *)HW_TWL_ROM_HEADER_BUF; + + while( pBlackList->rom_version >= 0 ) { + if( ( pBlackList->titleID == pROMH->titleID ) && + ( pBlackList->rom_version == pROMH->rom_version ) ) { + OS_TPrintf( "Hit black list : %c%c%c%c ver.%d...Terminate.\n", + pROMH->titleID_Lo[ 3 ], pROMH->titleID_Lo[ 2 ], pROMH->titleID_Lo[ 1 ], pROMH->titleID_Lo[ 0 ], + pROMH->rom_version ); + OS_Terminate(); + } + pBlackList++; + } +} diff --git a/build/libraries_sysmenu/boot/ARM9/src/bootAPI.c b/build/libraries_sysmenu/boot/ARM9/src/bootAPI.c index 8636a493..3538f27f 100644 --- a/build/libraries_sysmenu/boot/ARM9/src/bootAPI.c +++ b/build/libraries_sysmenu/boot/ARM9/src/bootAPI.c @@ -30,31 +30,16 @@ // define data------------------------------------------------------- #define SUBP_RECV_IF_ENABLE 0x4000 -#define TITLE_ID_NAND_INITIALIZER 0x00030011304E4941UL // 0NIA - -// N^Cgꗗ -typedef struct TitleBlackList { - OSTitleId titleID; - int rom_version; -}TitleBlackList; // extern data------------------------------------------------------- // function's prototype---------------------------------------------- static void BOOTi_ClearREG_RAM( void ); -static void BOOTi_CheckTitleBlackList( void ); // global variables-------------------------------------------------- // static variables-------------------------------------------------- -// N^Cgꗗ -static const TitleBlackList s_blackList[] = { - { TITLE_ID_NAND_INITIALIZER, 0 }, - { 0UL, -1 }, -}; - - // const data-------------------------------------------------------- void BOOT_Init( void ) { @@ -76,9 +61,6 @@ void BOOT_Ready( void ) BOOL isNtrMode; int i; - // ubNXg`FbNAN - BOOTi_CheckTitleBlackList(); - // GgAhX̐`FbNAȏꍇ͖[vɓB // SYSMi_CheckEntryAddress(); @@ -102,6 +84,7 @@ void BOOT_Ready( void ) OS_WaitIrq( 1, OS_IE_SUBP ); OS_TPrintf( "INTR SUBP passed!!\n" ); + // 荞݂NAčŏIu[gV[PXցB reg_PXI_SUBPINTF &= 0x0f00; // TuvZbT荞݋ƒtONA (void)OS_DisableIrq(); @@ -228,21 +211,3 @@ static void BOOTi_ClearREG_RAM( void ) // WX^NA͊{I OS_Boot ōs } - -// NubNXgTITLẼ`FbN -static void BOOTi_CheckTitleBlackList( void ) -{ - const TitleBlackList *pBlackList = &s_blackList[ 0 ]; - ROM_Header_Short *pROMH = (ROM_Header_Short *)HW_TWL_ROM_HEADER_BUF; - - while( pBlackList->rom_version >= 0 ) { - if( ( pBlackList->titleID == pROMH->titleID ) && - ( pBlackList->rom_version == pROMH->rom_version ) ) { - OS_TPrintf( "Hit black list : %c%c%c%c ver.%d...Terminate.\n", - pROMH->titleID_Lo[ 3 ], pROMH->titleID_Lo[ 2 ], pROMH->titleID_Lo[ 1 ], pROMH->titleID_Lo[ 0 ], - pROMH->rom_version ); - OS_Terminate(); - } - pBlackList++; - } -} diff --git a/docs/リリース_SDK_5_0_FC_plus2/SDK_5_0_FC_plus2_ランチャーチェック表.xls b/docs/リリース_SDK_5_0_FC_plus2/SDK_5_0_FC_plus2_ランチャーチェック表.xls index 47aa7b0f30e8dcbd43417b5c2bdab05b161edc2f..286ff2af338401e8b4f5bd46ada7dbc64e1fffda 100644 GIT binary patch delta 4648 zcmZu#3s6+&6+Zv&f{4J%YXMheT~?x^vIY>>RYXvBK>_i>iag}4;?T!Tld;jb>LfF5 zt%-7CYJ4OyMvXBwnzebDNYX}QtTo11i>X$UCbmtClWAu8;bG-0`zBRW* z=Y0Yxqz)h;5x|`&N*pD$ddG1OKC;9C4#F`I>$UY15d|#btouXvyY83Vk3t-5?!gyg z3(T30eW8I^yFHYZGho5PlWZ6_InFW@^5b#rq;zyo9ue~AUWp4PKvX)}c+q{AY}|E! z<$m7%h&yL6f3VjbtSP7O9d1F9MMEJ)W}?q&_YpThEUgCNONas6a3HS$U9kX-0^pw` z0B)H8=EeieumD_105~575EuziH4NYorMEW*;G-mf_lE}ol2QR;$in6{fVD)vN%35> z0vsC!aFED-c7PK^?i)?_WPrpm0K-VchooIk3?*~{zS>4Dd1C*7mkTSv; zPl;_c<>@O1xaP82c5rtWU+Oz8veb3QuSJRgCw0t#V{hYa!hWeR7h~^)imDq#@T>wS!!VcxkyVUg zHJn!O>&#e#Y=mJIXIRA>RtbicRj$f)qazK%M8hh{uu7)Yd%9i-K6h?ix^yN7ngDO;(^?-WGYE=;X}o{ zpI&eq{90eh1NwVBuw)=J%+F^=onqwkE?>cYO9#Xm+*D^5f55$UmvnXkm5y`>>lTnN zD|~=k0(Nl~4+SoH!jeJ*uh0_)NWB{1M-*kMN2N zyduRryxcCX;hE);Xr>!@(+$yhI2wBY`4#qXG}rNBL&S^6pzTp!PBq%apYY?xh?f}# z-VB2mFMFv_UcBt(27cBQ@!~aTdzF_<&2}+>x0@rpnFiiW#k;n`ELxQ6z|CDd15#IeRXPZ3e_6zkoee3Kdpo*8hl`ZH2&tNSn~K7`I+%o z#qcvjc8E&qvQ~Q0HO)%mJD6Wd{P9qr>{k*$izJ%2`OLClu-hJ_ZU}v3X94rGh$pR9 zF@riJ%c=~r8ul1PG8tS0bCoQLGNNwHtA(r+Bdw!-O-7K$0P+(D zwQM1cB8_6+BIZ%gXX&DQq>EW9Cljf=_#WvJmeQ=i(j_d-(k(A#DNPVk8ib|)BbLVM zNSp!pQNY@E1UTg#M3*TCSXpjUfc16~uC3%_bEwraVvT_(^_8rXyJ#gXEaT0QI`zZ~ zj)7k&T0I+lO3~_>CIec2Pe2VE&~U|T&;x2<{qQqrV10+O-N-B&Ryf#3X8u-M2vS6i zdPGf3qX~^^O%WQgnsin(v*b`GvuHN3nwcf@T*0_xv~a)^q&vb}^nhE4k(;BR(-uAA zekg{!bVS^ySRp?XY5Q`(iLE`kQ8A{G(2CgO6`gpoC!5!+a8p-uu$2u@RAIHU`*X@^ zs~&ti2SYO=2h*+x)6V?x?zQW&$OJl=MYAHE7`c*CHGzeF+Ga4+} z*-D~1SZO7(A}{DlGL;21!m?}?vuJQ-d#ji!U(J3P3CjhLd%0z!=~Dp3rX+YZTBck= zU0VOiq^e+EMw;Z8&Kn&p^Gym>P;rq(#RT}p_omo7NZj}%fX5!DX?r_BH61<6E}B+9 zkH*9YtA|NB&Gwx#r4>@Uy8{p+0KX&mdz#xK@6vD@duy!B2zLH7sNJM}44n@o@6!SzMx z_a}(g@GJV(>vy5=VJBXv`&PQ=RJiam-G4y$j15jaS&<-)V&#S+eR|ZU%C~5$EW+wa zSLoJ;gC>!Jg;gFrzsZSDRJky5vlDMrxk7=>GZSZ}Kmu*FOy3Ifyp_s*xCfg%1U64% zxVwWpAKPR!4T}~Auw5?Q*df$KaTDikKfH?m$`>c}z)V z7YR#cRhC^OgPKIRP1JE-;i@c~h}IeFST9^x>UbL+WK%u}ZYE>siS}BUY5E2a)edCckQ*%9K^lEDzs;P;<0O-(gKK>^ zM=J|`#GqE_9Ym9vtl$8*DTA`~M+|BOpDH9flSN;X^}`I9PD4Wrhv#~%!aX8@;+QxpQ$2LPWZM?7H5~@{oDrxMo9bu~tsHF4H Fe*v;XM%n-X delta 4248 zcmZu!3viUx6+U-22{CMTLtdNk6S5&;4MdngBTF8TgpgztOdyb#c|Rc0BExk05X)mT zv<#;55Kg6p0QFI{Rm;OgQBfYXAY!E;MG&bxs@TDf)fuNUGBiE+{5Sh^ndYB+@7{C1 zbIy0~fB$oC`hIEe>$5+ZE!s9sF~V8_U|-E15gZa8A^Oo{PyfIDUL{Y&8}?|?AG~Sr zh``6A@)9$B!z=#%` zCzS^0XPt8dhTsN7!u3cX6M$(^04)OG*hqjcZ2;hXdRj15h;r;L%Y4 zJILnQSb!7v09=a)h$IK|-2lr7`)U%vCoX`#(E!gAc7p-1pRgOo&=?1BH3eWq0_g*( z1V{w@TvUrYg5Lj>3S0AMXG>hm0cFKAKSkqOk~Zkd1Bkvl2zA^L5bN$mUp5nTWe zEC$&9NbvQgpGDx>qPB3Uhv1E(ta>?!FMr|@J+Kzx9evx~)Fg6n1ro7jsR%1T_% z67V)eK^)k@3;Xa&S-#kbBUhwjVYyfAz#971U+%>%D>CpbjhARl@q1m*D7z%KJAhMG zCSb4Miw~`IidS&EKOc9m%)nbD`Ig4g3NPlZ%D{~@_R;t;jmK9x#armC%tuGSDfVC^ z{hA-h2p*`sV8f}aGcZ`?#bq?!rtuJs<<(x-ZWT6z!yXN;sBRX46G}J$uWqll?e2t!7ie28mD*n#mXYH@vdI!cQT5 z7MxLtsf_3!eZk z_$!`nFvQ3BuLcWuKirAC-{gcB8x3(0|I>ITci6);4L42W?qfFPij9xie6qR83gXj@ zeJaRTO@_FHQO#D6=^Adj79^L0(5J>u4bLb)}_iikF7t&v8@)z zJk2^!adfm9;xcBoSyA#eT)q~ifTK`KV2%YGLnpZRVja^Wv@(`*51br)1ZP>bkY&?vw zpy-*nV{1wZRW>+8d@7{`Qpr-Xo5M&0PyWz|rV_-62iRt4>v-YC@dH_|NR~TbF0aIm z?E?lbUL1?-1{~N=%ORHx{-kR3oFdDO4k)Wb6m; zirvJqsm62crcmrAwx_bnF`EMHz@w(k45PZs%4UYXPcuosIYg+1QB;)~)uN$VLa0_o z$=iusT&sp^Wt8+9Xk&$hv@_!gDqMSraXTZ18MkYMI~YZm3l7r3$dk%L2P4k|r32cA zY+IC&&qO+NUdVwl{LI4LOVUIRJ~21}pB@auTT9|a4{jQaGkS?lI5_FfBHg*ze-|?x zi-!jj0@8;WwM%2v&5Y>k!{@J?8Mz4|SGbUMbRA;dLQU7hzO!U7+Lj(ddf29iP?@1v zJ>)4B=tkDa%3g-iJ&YapGE{yJ=fMdcqCQV8GzVtdV&S!jX@o4IHvE@DADVpu8BkRE zCg@if{$%Oo#BLIt`7wZfB|!NmfL1zvqXy_^HFd-YsRM`$e)F>$n;ijgYe^dRJQm|R zMPj+iFxs~ycq+K&u{Q+WuL_qJhVECfyyShje!0)JQ^CzUSCH;p3HZCl9@NNSLkNubNx=qk{S0pK1#A( zN;aBhZ{XV`dtS*5mc5DD6$zNMYMko@B_G4`gIKZ3=lZ>prLgQR+(@!NDA`z+?ZI;- zdr`?!S@t#>0iWw7CG)WCP_Q#_&^A8yt}~a$XXa%EO=IX`EMDz%{ZYxrvFr%0CE4)J zFr8&bgCDG}8HMr7V#F*QwJc7|=Dw8sGVcA{S8!j+{T%MAxUc4ZuIw@Dsr^{hlZpL3 z(}PpDoDu<!sX*xfj?|#zB^X=z@D^H7`P^qEw?I%yEbn?xU zWaj=~DStBm%S>#>s*GS4PvF6=Mqr(S%+VlK9FqRK;E+{JPKK;vV#A+r6*+WM+BQR0 z(cyJd0yk&XY_p!dJD{5FtYR>iwe+tRE*LO`8!ZJ4P1$=YDO_*P!Qlggi&`6bKNfVKoP?Ry9& zm2FIuvI`TGb-;3HX8++#DJy`fI}g+0!w7(H#c{e@n^`=R%c)9QPYi3ZZ!iYWE{SiD zsr&A9-pQFu(u+