From 54a8783f32ac020021ab583d7f7b3f7ade64e675 Mon Sep 17 00:00:00 2001 From: nishikawa_takeshi Date: Tue, 27 Jan 2009 06:26:12 +0000 Subject: [PATCH] =?UTF-8?q?=E3=83=9E=E3=82=B9=E3=82=BF=E3=82=A8=E3=83=87?= =?UTF-8?q?=E3=82=A3=E3=82=BF:CODEC=E3=81=AENTR=E3=83=A2=E3=83=BC=E3=83=89?= =?UTF-8?q?=E3=81=AE=E8=A1=A8=E8=A8=98=E3=82=92"NTR"=E3=81=8B=E3=82=89"DS"?= =?UTF-8?q?=E3=81=AB=E5=A4=89=E6=9B=B4=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/TwlToolsRED@145 7061adef-622a-194b-ae81-725974e89856 --- .../MasterEditorTWL/MasterEditorTWL.ncb | Bin 11439104 -> 11447296 bytes .../MasterEditorTWL/MasterEditorTWL.suo | Bin 69120 -> 68096 bytes .../MasterEditorTWL/Debug/BuildLog.htm | Bin 12174 -> 20662 bytes .../MasterEditorTWL/Form_srl.cpp | 2 +- .../MasterEditorTWL/deliverable.cpp | 2 +- .../MasterEditorTWL/srl_element.h | 36 +++++++++++------- 6 files changed, 25 insertions(+), 15 deletions(-) diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb index 2c035ad8be6e319855724068358bb6b36cdb602a..7d5cb291a0b9356d789addbcd7b32a93102a9594 100644 GIT binary patch delta 28284 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 VD!X2{%WhVSOuGGkg}Uy(?SGWaJJA3D diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm index 47c8af60a28756ec88997a30794e10ee2690f657..ddc4dbb4d13edef6c06dc6c87a0c51c6c921a5b4 100644 GIT binary patch delta 2454 zcmcImOKcle6unMjL*tI~v)kCl^<*q)V-ok}W4HVyLeol7MFMRhAcBnTI3bWYsqMDu z27{0yKnO%`7p#yfA$EwODJV!F#0F)9L?jR^h}s>0q;8PPg7cm;p7Cc}S>y4%d+xdC z-gn;}zmxv_s_RiO@^qO>PR`&dT1A`{#JfOcT0&$e z|CM`sZU2Kdwn>SDXAO$W^*j;VbA>L!wgeUBx=6*aL$`x%i3&j1V{eB1yrKE|(V#zU zGtVPC$$YVn_py*+XTSw*NP1~GRogVQyhy8D(ZX_-UkHZG4egYx^eY@suZNzTbV$ z&42W4^EIE3U+vM&n+NuHwnCe(0k!Y)*f!FPxn=fc{<-HT$4O=D4^Cqgm)C_dCM2)~IB2262F?1&G=?_zj5fifl(J{=76cHHp) zBEA#ew<_YxcPru*@vLYQ zvi~g)oqiNoRnSfG@519iu~-z73RxAQgX8VzHl}B>HY?J5{-c=3DZEY{u_4V+r)&;W zW0i9JhB3X?C#Bb@d2R&+W-XJ`=mW^rN) zI4i4o50>z3t)Ic%DPh%m_2`(^&KFJ**r$Oh0<{E70naHkiolhmW7v~%^(1##damJL zM-j+HyuQkvD$ofjfHU5{nJRe^Ao)i`zT>Kt3E*^^z_DJ&z2>fjRtKyUa8ZuPYLB9s iZi!F$wRj+8rLEIv;#=`68fzPUIycjuHUEi!(D6U%f*vve delta 299 zcmdnCkg+d*gBhE!A%hEp5ra7pTQC?i7%-SIm~8fBd&@R?iIKqMEqof2%LH{cD+n1e zVpBQURyKC?1tk%Xq$|2HlReo?H|wZ`uuhiaVw-HidStSIEYIWy9fi$hT0C6XbZnk# zQV2524Z|o&Gt12h)@DptC2eJ;H$SsfV4VEGflt~9=m#|aFz7KPF(fjSOb%qz+-zpQ kgHafZqRots=1h}|c*Q37xvEW8ag&(*#9L~!j!zd00Kb(zGXMYp diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp index 79ca92b..8e41ecd 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp @@ -86,7 +86,7 @@ void Form1::setSrlForms(void) } else { - this->tboxIsCodec->Text = gcnew System::String( "NTR" ); + this->tboxIsCodec->Text = gcnew System::String( "DS" ); } this->cboxIsSD->Checked = this->hSrl->IsSD; this->cboxIsNAND->Checked = this->hSrl->IsNAND; diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.cpp index 70ddb0c..6bcb5b3 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.cpp @@ -316,7 +316,7 @@ ECDeliverableResult RCDeliverable::writeSpreadsheet( if( hSrl->IsCodecTWL ) node->FirstChild->Value = gcnew System::String("TWL"); else - node->FirstChild->Value = gcnew System::String("NTR"); + node->FirstChild->Value = gcnew System::String("DS"); } if( node->FirstChild->Value->Equals( "TagIsEULA" ) ) { diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_element.h b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_element.h index 0689e2b..b1400bb 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_element.h +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_element.h @@ -142,9 +142,8 @@ namespace MasterEditorTWL property System::UInt32 PrivateSaveSize; property System::Boolean IsMediaNand; // NANDアプリかどうか property System::Boolean IsUseSubBanner; // サブバナーを使用するかどうか - public: - static const System::UInt32 TmdSize = 16 * 1024; private: + static const System::UInt32 cTmdSize = 16 * 1024; static const System::UInt32 cSubBannerSize = 16 * 1024; static const System::UInt32 NandClusterSize = 16 * 1024; static const System::UInt32 ShopBlockSize = 128 * 1024; @@ -168,17 +167,6 @@ namespace MasterEditorTWL { System::UInt32 get(){ return (MasterEditorTWL::roundUp( this->PrivateSaveSize, NandClusterSize )); } } - property System::UInt32 TmdSizeRoundUp - { - System::UInt32 get() - { - if( !this->IsMediaNand ) - { - return 0; - } - return (MasterEditorTWL::roundUp( this->TmdSize, NandClusterSize )); - } - } property System::UInt32 SubBannerSize // サブバナーのサイズは使用するかしないかで異なるので計算した値を property で提供 { System::UInt32 get() @@ -201,6 +189,28 @@ namespace MasterEditorTWL return (MasterEditorTWL::roundUp( this->SubBannerSize, NandClusterSize )); } } + property System::UInt32 TmdSize + { + System::UInt32 get() + { + if( !this->IsMediaNand ) + { + return 0; + } + return this->cTmdSize; + } + } + property System::UInt32 TmdSizeRoundUp + { + System::UInt32 get() + { + if( !this->IsMediaNand ) + { + return 0; + } + return (MasterEditorTWL::roundUp( this->TmdSize, NandClusterSize )); + } + } property System::UInt32 NandUsedSize // 全体のNAND消費サイズは変数で持たず property で提供 { System::UInt32 get()