プライベートパッケージでビルドが通るように

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

branches/work/2_0_RepairToolKit/ConsoleDataMigration/ConsoleBackup/ConsoleBackup.rsf

@@ -3,6 +3,9 @@ BasicInfo:
   ProductCode: ConsoleBackup
   BackupMemoryType: None
 
+CardInfo:
+  CardDevice: None
+
 TitleInfo:
   Use: Evaluation
   Category: Application

branches/work/2_0_RepairToolKit/ConsoleDataMigration/ConsoleBackup/OMakefile

@@ -21,7 +21,7 @@ CTR_MAKE_DEVELOPMENT_IMAGE  =   true
 
 TARGET_PROGRAM      =   ConsoleBackup
 
-SAMPLED_DEMOS_COMMON_INCLUDE_DIR   = $(dir $(HORIZON_ROOT)/../CTR/SampleDemos/common/include)
+SAMPLED_DEMOS_COMMON_INCLUDE_DIR   = $(dir $(HORIZON_ROOT)/../SampleDemos/common/include)
 INCLUDES           += $(SAMPLED_DEMOS_COMMON_INCLUDE_DIR) \
                       ../common
 
@@ -49,19 +49,9 @@ CTR_BANNER_SPEC     =   $(TARGET_PROGRAM).bsf
 ROMFS_ROOT          =   ../common/romfiles
 
 LIBS               +=   libnn_cfg \
-                        libnn_driversEeprom \
+                        libnn_mcu \
-                        libnn_driversi2c \
-                        libnn_driversCal \
                         libnn_crypto \
-                        libnn_driversCodec \
-                        libnn_spi \
-                        libnn_gpio \
-                        libnn_pdn  \
-                        libnn_mcu  \
-                        libnn_i2c \
-                        libnn_driversCamera \
                         libnn_ps \
-                        libnn_driversRsa \
                         lib_demo \
                         libnn_nwm \
                         libnn_friends \
@@ -70,7 +60,7 @@ LIBS               +=   libnn_cfg \
 INSTALL_SDK_TOOL = true
 
 ROM_SPEC_FILE       =   $(TARGET_PROGRAM).rsf
-DESCRIPTOR          =   $(HORIZON_ROOT)/resources/specfiles/_private/RepairTool.desc
+DESCRIPTOR          =   $(HORIZON_ROOT)/resources/specfiles/RepairTool.desc
 
 include $(ROOT_OMAKE)/modulerules
 

branches/work/2_0_RepairToolKit/ConsoleDataMigration/ConsoleRestore/ConsoleRestore.rsf

@@ -3,6 +3,9 @@ BasicInfo:
   ProductCode: ConsoleRestore
   BackupMemoryType: None
 
+CardInfo:
+  CardDevice: None
+
 TitleInfo:
   Use: Evaluation
   Category: Application

branches/work/2_0_RepairToolKit/ConsoleDataMigration/ConsoleRestore/Controller.cpp

@@ -86,6 +86,10 @@ bool s_PlayedStartCursor = false;
 bool s_PlayedRebootCursor = false;
 // SD抜き出し前サウンドを鳴らしたかどうか
 bool s_PlayedSdPullOutCursor = false;
+// バージョンデータが無い警告サウンドを鳴らしたかどうか
+bool s_ExistsVersionDataAnnotation = false;
+// バージョンデータを読んだかどうか
+bool s_ReadVersionDone = false;
 
 // ネットワークアップデートを開始したかどうか
 bool s_ExecuteFgNup = false;
@@ -141,6 +145,47 @@ bool CheckAndReadAPSetting(::std::vector<std::string>& operationMessage)
     return s_ReadSettingSuccess;
 }
 
+bool CheckAndReadVersionData(::std::vector<std::string>& operationMessage)
+{
+    using namespace common;
+
+    if (!ExistsVersionData())
+    {
+        if(!s_ExistsVersionDataAnnotation)
+        {
+            s_ExistsVersionDataAnnotation = true;
+            common::PlaySound(common::SOUND_ANNOTATION);
+        }
+        operationMessage.push_back(::std::string("Version Data does not exist!"));
+        return false;
+    }
+
+    // バージョン情報ファイルを読み込む
+    if (!s_ReadVersionDone)
+    {
+        s_ReadVersionDone = true;
+        s_ReadSettingSuccess = ReadSetting(&s_NupOnlyMode);
+    }
+
+    if(s_NupOnlyMode)
+    {
+        s_RestoreMode = RESTORE_MODE_NUP_ONLY;
+    }
+
+    if (!s_ReadSettingSuccess)
+    {
+        operationMessage.push_back(::std::string("Invalid Accsess_Point_Setting format!"));
+        if(!s_APSettingAnnotation)
+        {
+            s_APSettingAnnotation = true;
+            common::PlaySound(common::SOUND_ANNOTATION);
+        }
+
+    }
+
+    return s_ReadSettingSuccess;
+}
+
 void PutAliveMessage(::std::vector<std::string>& operationMessage, const char* str)
 {
     std::string message = std::string(str);

branches/work/2_0_RepairToolKit/ConsoleDataMigration/ConsoleRestore/OMakefile

@@ -21,7 +21,7 @@ CTR_MAKE_DEVELOPMENT_IMAGE  =   true
 
 TARGET_PROGRAM      =   ConsoleRestore
 
-SAMPLED_DEMOS_COMMON_INCLUDE_DIR   = $(dir $(HORIZON_ROOT)/../CTR/SampleDemos/common/include)
+SAMPLED_DEMOS_COMMON_INCLUDE_DIR   = $(dir $(HORIZON_ROOT)/../SampleDemos/common/include)
 INCLUDES           += $(SAMPLED_DEMOS_COMMON_INCLUDE_DIR) \
                       ../common
 
@@ -52,19 +52,9 @@ CTR_BANNER_SPEC     =   $(TARGET_PROGRAM).bsf
 ROMFS_ROOT          =   ../common/romfiles
 
 LIBS               +=   libnn_cfg \
-                        libnn_driversEeprom \
+                        libnn_mcu \
-                        libnn_driversi2c \
-                        libnn_driversCal \
                         libnn_crypto \
-                        libnn_driversCodec \
-                        libnn_spi \
-                        libnn_gpio \
-                        libnn_pdn  \
-                        libnn_mcu  \
-                        libnn_i2c \
-                        libnn_driversCamera \
                         libnn_ps \
-                        libnn_driversRsa \
                         lib_demo \
                         libnn_nwm \
                         libnn_friends \
@@ -75,7 +65,7 @@ LIBS               +=   libnn_cfg \
 INSTALL_SDK_TOOL = true
 
 ROM_SPEC_FILE       =   $(TARGET_PROGRAM).rsf
-DESCRIPTOR          =   $(HORIZON_ROOT)/resources/specfiles/_private/RepairTool.desc
+DESCRIPTOR          =   $(HORIZON_ROOT)/resources/specfiles/RepairTool.desc
 
 include $(ROOT_OMAKE)/modulerules