ビルド環境を2.3ブランチに移行

HOMEメニューがインポートされていない場合エラーとするように


git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_Repair@293 385bec56-5757-e545-9c3a-d8741f4650f1

trunk/CardCup/CardCup.rsf

@@ -1,22 +1,26 @@
 BasicInfo:
-  Title         :   CupCardDemo
+  Title:   SelfCup
-  BackupMemoryType : None
+  BackupMemoryType: None
   Logo: Nintendo
 
+CardInfo:
+  CardDevice: None
+
 TitleInfo:
   Use: Evaluation
   UniqueId: 0xf802a
   Version: 0
 
 SystemControlInfo:
-  AppType     : System
+  AppType     : Application
   Dependency:
-    - codec
+                - nwm
-    - hid
+                - socket
-    - gsp
+                - ssl
-    - dsp
+                - friends
-
+                - ac
-AccessControlInfo:
+                - cecd
-  Priority: 48
+                - boss
-  FileSystemAccess:
+                - news
-    - CategorySystemApplication
+                - ndm
+                - dlp

trunk/CardCup/OMakefile

@@ -28,7 +28,6 @@ LIBS                +=  lib_demo \
                         libnn_am \
                         libnn_cup \
                         libnn_ns \
-                        libnn_ps
 
 
 DESCRIPTOR          =   $(HORIZON_ROOT)/resources/specfiles/SelfCup.desc

trunk/CardCup/main.cpp

@@ -14,7 +14,6 @@
  *---------------------------------------------------------------------------*/
 
 #include <nn.h>
-#include <nn/hid.h>
 #include <nn/os.h>
 #include <nn/dbg.h>
 #include <nn/CTR.h>
@@ -25,6 +24,7 @@
 #include <nn/fs/CTR/MPCore/fs_FileSystemBasePrivate.h>
 #include <nn/applet/CTR/applet_APIForSystem.h>
 #include <nn/am.h>
+#include <nn/ndm.h>
 
 #include <nn/cup.h>
 
@@ -52,6 +52,12 @@ namespace
         // NuiShellの初期化 (CUPに必須)
         NN_UTIL_PANIC_IF_FAILED(nn::ns::CTR::InitializeForShell());
 
+        // ndmの初期化
+        nn::ndm::Initialize();
+
+        // 全デーモンの自律動作をacの自動接続も含めて止める
+        nn::ndm::SuspendScheduler();
+
         // amの初期化
         nn::am::InitializeForSystemMenu();
 
@@ -75,9 +81,6 @@ namespace
         s_GxHeap = reinterpret_cast<uptr>(s_appHeap.Allocate(s_GxHeapSize));
         s_RenderSystem.Initialize(s_GxHeap, s_GxHeapSize);
 
-        // hidの初期化
-        NN_UTIL_PANIC_IF_FAILED(nn::hid::Initialize());
-
         // 描画インスタンスの初期化
         s_scrollBufferInstance.Initialize(&s_RenderSystem);
         s_scrollBuffer=&s_scrollBufferInstance;
@@ -177,7 +180,6 @@ namespace
     {
         nn::Result result;
         nn::Result lastResult=nn::ResultSuccess();
-        nn::hid::PadReader padReader;
 
         /********************* CUPの初期化 *******************/
         s_scrollBuffer->AppendText("Initializing Cup Library")->Render();