From 4a778bf6e294eceb1724c7707d0578c16d487ff5 Mon Sep 17 00:00:00 2001 From: N2614 Date: Fri, 27 Apr 2012 07:35:37 +0000 Subject: [PATCH] =?UTF-8?q?=E3=82=BB=E3=83=BC=E3=83=95=E3=83=A2=E3=83=BC?= =?UTF-8?q?=E3=83=89=E3=81=A7=E8=B5=B7=E5=8B=95=E3=81=99=E3=82=8B=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_Repair@697 385bec56-5757-e545-9c3a-d8741f4650f1 --- branches/CardCupForNBD/CardCup/CardCup.rsf | 14 +- branches/CardCupForNBD/CardCup/OMakefile | 7 +- branches/CardCupForNBD/CardCup/Readme.txt | Bin 264 -> 416 bytes branches/CardCupForNBD/CardCup/SelfCup.desc | 230 ++++++++++++++++++ .../CardCup/{CardCup.bsf => SelfCupTool.bsf} | Bin branches/CardCupForNBD/CardCup/main.cpp | 73 +++--- 6 files changed, 279 insertions(+), 45 deletions(-) create mode 100644 branches/CardCupForNBD/CardCup/SelfCup.desc rename branches/CardCupForNBD/CardCup/{CardCup.bsf => SelfCupTool.bsf} (100%) diff --git a/branches/CardCupForNBD/CardCup/CardCup.rsf b/branches/CardCupForNBD/CardCup/CardCup.rsf index 8c0de8c..1b26702 100644 --- a/branches/CardCupForNBD/CardCup/CardCup.rsf +++ b/branches/CardCupForNBD/CardCup/CardCup.rsf @@ -4,9 +4,6 @@ BasicInfo: BackupMemoryType: None Logo: Nintendo -CardInfo: - CardDevice: None - TitleInfo: Use: Evaluation UniqueId: 0xf802a @@ -15,14 +12,9 @@ TitleInfo: SystemControlInfo: AppType : Application Dependency: - - nwm - - socket - - ssl - - friends - - ac - - cecd - - boss - - ndm + - codec + - hid + - gsp Rom: # ROM に含めるファイルシステムのルートパスを指定します。 HostRoot: "$(ROMFS_ROOT)" diff --git a/branches/CardCupForNBD/CardCup/OMakefile b/branches/CardCupForNBD/CardCup/OMakefile index 23eabde..8091212 100644 --- a/branches/CardCupForNBD/CardCup/OMakefile +++ b/branches/CardCupForNBD/CardCup/OMakefile @@ -30,6 +30,7 @@ LIBS += lib_demo \ libnn_cup \ libnn_ns \ libnn_erreula \ + libnn_ulcd \ LIBFILES += $`(addprefix $(NW4C_ROOT)$(DIRSEP)libraries$(DIRSEP)$(config.getTargetSubDirectory true)$(DIRSEP), libnw_demo) LIBFILES += $`(addprefix $(NW4C_ROOT)$(DIRSEP)libraries$(DIRSEP)$(config.getTargetSubDirectory true)$(DIRSEP), libnw_dev) @@ -48,14 +49,14 @@ ROMFS_FILES[] += $(ROMFS_ROOT)/shaders/nwfont_TextWriterShader.shbin $(ROMFS_ROOT)/shaders/nwfont_RectDrawerShader.shbin -DESCRIPTOR = $(HORIZON_ROOT)/resources/specfiles/SelfCup.desc +DESCRIPTOR = SelfCup.desc -TARGET_PROGRAM = CardCup +TARGET_PROGRAM = SelfCupToolForNWTrial TITLE = CardCup ROM_SPEC_FILE = CardCup.rsf -CTR_BANNER_SPEC = $(TARGET_PROGRAM).bsf +CTR_BANNER_SPEC = SelfCupTool.bsf include $(NW4C_ROOT)/build/omake/modulerules diff --git a/branches/CardCupForNBD/CardCup/Readme.txt b/branches/CardCupForNBD/CardCup/Readme.txt index d9c453f53a932d7cee0a4293df21886c3521c146..0154f95d827aaab04cdab53da8d738a73d70caf8 100644 GIT binary patch literal 416 zcmbV|OAY}+6h-e?BDP>I=@jj=00u;2pb;}EbfQCiTKB}%hHS&wGAu!YQ$!dduYRxY z&8b)Kc0HN1IhsSVA7(RRTuh*b+V0566HToYE7FdANp9q+s4{CwKKU5cqD(X+i@Ebr zebqh~j^m=hOz@=m=bU4lHHcMJ$ktkDqyUaZ2{ok>i{Glp`w42O7PlUbcYWWn>oB^| q`@9@!Lj^BZ^r-z`-T+RlElk%PkKJ|RSDItEAE*4$N}b&3Nw@>o(mrVb literal 264 zcmX|5%?bfw6g_L@9cH6Qac2B9*|Jc|0>#$PC!$f)u(0(8p1{HbC{JNc-eGtI!kHo6 z?(aGG-t&I#QfJ #include #include -#include #include #include @@ -62,6 +61,47 @@ namespace s_appHeap.Free(gxHeap); } +nn::ProgramId GetHomeMenuProgramId(nn::cfg::CTR::CfgRegionCode region) +{ +nn::ProgramId pid; +bit32 uid = nn::CTR::PROGRAM_ID_UNIQUE_ID_HOMEMENU; +bit8 ver = nn::CTR::PROGRAM_ID_VERSION_HOMEMENU; + + switch( region ) + { + case nn::cfg::CTR::CFG_REGION_AMERICA: + uid = nn::CTR::PROGRAM_ID_UNIQUE_ID_SYSMENU_US; + ver = nn::CTR::PROGRAM_ID_VERSION_SYSMENU_US; + break; + + case nn::cfg::CTR::CFG_REGION_EUROPE: + case nn::cfg::CTR::CFG_REGION_AUSTRALIA: + uid = nn::CTR::PROGRAM_ID_UNIQUE_ID_SYSMENU_EU; + ver = nn::CTR::PROGRAM_ID_VERSION_SYSMENU_EU; + break; + + case nn::cfg::CTR::CFG_REGION_CHINA: + uid = nn::CTR::PROGRAM_ID_UNIQUE_ID_SYSMENU_CN; + ver = nn::CTR::PROGRAM_ID_VERSION_SYSMENU_CN; + break; + + case nn::cfg::CTR::CFG_REGION_KOREA: + uid = nn::CTR::PROGRAM_ID_UNIQUE_ID_SYSMENU_KR; + ver = nn::CTR::PROGRAM_ID_VERSION_SYSMENU_KR; + break; + + case nn::cfg::CTR::CFG_REGION_TAIWAN: + uid = nn::CTR::PROGRAM_ID_UNIQUE_ID_SYSMENU_TW; + ver = nn::CTR::PROGRAM_ID_VERSION_SYSMENU_TW; + break; + } + + pid = nn::CTR::MakeProgramId( nn::CTR::PROGRAM_ID_CATEGORY_APPLET, + uid, + ver ); // プログラムID + return pid; +} + // デモの初期化 void Initialize() { @@ -71,12 +111,6 @@ namespace // NuiShellの初期化 (CUPに必須) NN_UTIL_PANIC_IF_FAILED(nn::ns::CTR::InitializeForShell()); - // ndmの初期化 - nn::ndm::Initialize(); - - // 全デーモンの自律動作をacの自動接続も含めて止める - nn::ndm::SuspendScheduler(); - // amの初期化 nn::am::InitializeForSystemMenu(); @@ -188,30 +222,8 @@ extern "C" void nnMain() // ロゴ表示開始 StartDrawerThread(); - nn::ProgramId MMEN_PROGRAM_ID = 0x0004003000008202; - nn::cfg::CfgRegionCode region = nn::cfg::GetRegion(); - switch(region) - { - case nn::cfg::CFG_REGION_AMERICA: - { - MMEN_PROGRAM_ID = 0x0004003000008f02; - } - break; - - case nn::cfg::CFG_REGION_EUROPE: - case nn::cfg::CFG_REGION_AUSTRALIA: - { - MMEN_PROGRAM_ID = 0x0004003000009802; - } - break; - - case nn::cfg::CFG_REGION_JAPAN: - { - MMEN_PROGRAM_ID = 0x0004003000008202; - } - break; - } + nn::ProgramId MMEN_PROGRAM_ID = GetHomeMenuProgramId(region); nn::am::ProgramInfo outInfos; result = nn::am::GetProgramInfos(&outInfos, nn::fs::MEDIA_TYPE_NAND, &MMEN_PROGRAM_ID, 1); @@ -262,7 +274,6 @@ extern "C" void nnMain() nn::cfg::Finalize(); nn::fs::Finalize(); nn::am::FinalizeForSystemMenu(); - nn::ndm::Finalize(); nn::ns::FinalizeForShell(); nn::applet::PrepareToCloseApplication();