From b5d43c9b066d3f7ed2052e645ffb7718ae0f1681 Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Tue, 31 May 2011 04:01:20 +0000
Subject: [PATCH] =?UTF-8?q?=E3=83=93=E3=83=AB=E3=83=89=E7=92=B0=E5=A2=83?=
 =?UTF-8?q?=E3=82=922.3=E3=83=96=E3=83=A9=E3=83=B3=E3=83=81=E3=81=AB?=
 =?UTF-8?q?=E7=A7=BB=E8=A1=8C=20HOME=E3=83=A1=E3=83=8B=E3=83=A5=E3=83=BC?=
 =?UTF-8?q?=E3=81=8C=E3=82=A4=E3=83=B3=E3=83=9D=E3=83=BC=E3=83=88=E3=81=95?=
 =?UTF-8?q?=E3=82=8C=E3=81=A6=E3=81=84=E3=81=AA=E3=81=84=E5=A0=B4=E5=90=88?=
 =?UTF-8?q?=E3=82=A8=E3=83=A9=E3=83=BC=E3=81=A8=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@293 385bec56-5757-e545-9c3a-d8741f4650f1
---
 trunk/CardCup/CardCup.rsf |  28 ++++++++++++++++------------
 trunk/CardCup/OMakefile   |   1 -
 trunk/CardCup/Readme.txt  | Bin 104 -> 138 bytes
 trunk/CardCup/main.cpp    |  12 +++++++-----
 4 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/trunk/CardCup/CardCup.rsf b/trunk/CardCup/CardCup.rsf
index 88792b8..a1ec0c2 100644
--- a/trunk/CardCup/CardCup.rsf
+++ b/trunk/CardCup/CardCup.rsf
@@ -1,22 +1,26 @@
 BasicInfo:
-  Title         :   CupCardDemo
-  BackupMemoryType : None
+  Title:   SelfCup
+  BackupMemoryType: None
   Logo: Nintendo
 
+CardInfo:
+  CardDevice: None
+
 TitleInfo:
   Use: Evaluation
   UniqueId: 0xf802a
   Version: 0
 
 SystemControlInfo:
-  AppType     : System
+  AppType     : Application
   Dependency:
-    - codec
-    - hid
-    - gsp
-    - dsp
-
-AccessControlInfo:
-  Priority: 48
-  FileSystemAccess:
-    - CategorySystemApplication
+                - nwm
+                - socket
+                - ssl
+                - friends
+                - ac
+                - cecd
+                - boss
+                - news
+                - ndm
+                - dlp
diff --git a/trunk/CardCup/OMakefile b/trunk/CardCup/OMakefile
index dea8ad5..4e9b587 100644
--- a/trunk/CardCup/OMakefile
+++ b/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
diff --git a/trunk/CardCup/Readme.txt b/trunk/CardCup/Readme.txt
index df7ea21f57e887d4310a681c3af290b1607d48e6..b54f3e8d28d8325aa874def3c25d2a83b1be9006 100644
GIT binary patch
literal 138
zcmezWZ-MG%gVzQp4K|cCNAPkn0MT!QU<MZkZx9oR6oAl!A)ld$A(NpBNaq3hMhtok
z#y~m=D4GZqNoL3Z@``|B<_wk$1`LKko;Fm(0?4-niv%;IGUPC%F*q}nG86z!NCEPT
JfqEhK002ec81VoA

literal 104
zcmZo%*j&`y-JH>NsCzXpSEFmNi#IQqf=7N)W>tQkf`Oi)iJp<MLQ+v;UUG&)k+HFf
pvAKdak_sa|Bv}gsOGAa=)SNWu(gMAd)Z*l(56wZ%#f{OtTmT>@A|3z$

diff --git a/trunk/CardCup/main.cpp b/trunk/CardCup/main.cpp
index 4e8016e..e5dd962 100644
--- a/trunk/CardCup/main.cpp
+++ b/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();