LogConsoleのサイズを共通ヘッダに移動

Exporterテスト追加

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

trunk/ConsoleDataMigration/sources/ConsoleBackup/ConsoleBackup.cpp

@@ -39,7 +39,6 @@
 #include <vector>
 #include <string>
 
-#include "ConsoleBackup.h"
 #include "DrawSystemState.h"
 #include "FileName.h"
 #include "Controller.h"
@@ -126,7 +125,8 @@ extern "C" void nnMain(void)
     common::InitializeSimplePlayer();
 
     // ログ描画の初期化
-    common::Logger::GetLoggerInstance()->Initialize(CONSOLE_WIDTH, CONSOLE_HEIGHT, CONSOLE_MAX_LINE, &renderSystem);
+    common::Logger::GetLoggerInstance()->Initialize(common::CONSOLE_WIDTH, common::CONSOLE_HEIGHT,
+            common::CONSOLE_MAX_LINE, &renderSystem);
 
     // RenderSystemを作ってからログが出せる
     common::Logger::InitializeEjectThread();

trunk/ConsoleDataMigration/sources/ConsoleBackup/ConsoleBackup.h

@@ -1,29 +0,0 @@
-/*---------------------------------------------------------------------------*
-  Project:  Horizon
-  File:     ConsoleBackup.h
-
-  Copyright (C)2009 Nintendo Co., Ltd.  All rights reserved.
-
-  These coded instructions, statements, and computer programs contain
-  proprietary information of Nintendo of America Inc. and/or Nintendo
-  Company Ltd., and are protected by Federal copyright law.  They may
-  not be disclosed to third parties or copied or duplicated in any form,
-  in whole or in part, without the prior written consent of Nintendo.
-
-  $Rev$
- *---------------------------------------------------------------------------*/
-
-#ifndef NN_CONSOLEBACKUP_H_
-#define NN_CONSOLEBACKUP_H_
-
-namespace ConsoleBackup
-{
-
-const u32 CONSOLE_WIDTH = 38;
-const u32 CONSOLE_HEIGHT = 24;
-const u32 CONSOLE_MAX_LINE = 1000;
-
-}
-
-/* NN_CONSOLEBACKUP_H_ */
-#endif

trunk/ConsoleDataMigration/sources/ConsoleRestore/ConsoleRestore.cpp

@@ -36,7 +36,6 @@
 #include <vector>
 #include <string>
 
-#include "ConsoleRestore.h"
 #include "DrawSystemState.h"
 #include "Controller.h"
 #include "SimplePlayer.h"
@@ -145,7 +144,8 @@ extern "C" void nnMain(void)
     common::InitializeSimplePlayer();
 
     // ログ描画の初期化
-    common::Logger::GetLoggerInstance()->Initialize(CONSOLE_WIDTH, CONSOLE_HEIGHT, CONSOLE_MAX_LINE, &s_RenderSystem);
+    common::Logger::GetLoggerInstance()->Initialize(common::CONSOLE_WIDTH, common::CONSOLE_HEIGHT,
+            common::CONSOLE_MAX_LINE, &s_RenderSystem);
 
     // RenderSystemを作ってからログが出せる
     common::Logger::InitializeEjectThread();

trunk/ConsoleDataMigration/sources/ConsoleRestore/ConsoleRestore.h

@@ -1,42 +0,0 @@
-/*---------------------------------------------------------------------------*
-  Project:  Horizon
-  File:     ConsoleRestore.h
-
-  Copyright (C)2009 Nintendo Co., Ltd.  All rights reserved.
-
-  These coded instructions, statements, and computer programs contain
-  proprietary information of Nintendo of America Inc. and/or Nintendo
-  Company Ltd., and are protected by Federal copyright law.  They may
-  not be disclosed to third parties or copied or duplicated in any form,
-  in whole or in part, without the prior written consent of Nintendo.
-
-  $Rev$
- *---------------------------------------------------------------------------*/
-
-#ifndef NN_CONSOLERESTORE_H_
-#define NN_CONSOLERESTORE_H_
-
-#include <nn.h>
-#include "VersionDetect.h"
-
-namespace ConsoleRestore
-{
-
-const u32 CONSOLE_WIDTH = 38;
-const u32 CONSOLE_HEIGHT = 24;
-const u32 CONSOLE_MAX_LINE = 1000;
-
-}
-
-// 描画色の定義
-#define WHITE_COLOR     1.f, 1.f, 1.f, 1.f
-#define GRAY_COLOR      0.5, 0.5, 0.5, 1.f
-#define RED_COLOR       1.f, 0.f, 0.f, 1.f
-#define GREEN_COLOR     0.f, 1.f, 0.f, 1.f
-#define BLUE_COLOR      0.f, 0.f, 1.f, 1.f
-#define SUCCESS_COLOR   0.f, 0.6f,0.f, 1.f
-#define FAIL_COLOR      0.6f, 0.f,0.f, 1.f
-#define NORMAL_COLOR    0.f, 0.f, 0.f, 1.f
-
-/* NN_CONSOLERESTORE_H_ */
-#endif

trunk/ConsoleDataMigration/sources/ConsoleRestore/TitleDownloader.cpp

@@ -194,6 +194,7 @@ void TitleDownloader::Start()
 
 nn::Result TitleDownloader::ListUp()
 {
+    // TODO: ファイルリストを読み出してリスト生成
     const u32 AM_TICKET_MAX = 7168;
 
     s32 personalizedTicketNum;

trunk/ConsoleDataMigration/sources/common/common_Types.h

@@ -29,6 +29,11 @@
 namespace common
 {
 
+const u32 CONSOLE_WIDTH = 38;
+const u32 CONSOLE_HEIGHT = 24;
+const u32 CONSOLE_MAX_LINE = 1000;
+
+
 const u32 NTR_WIFI_SETTING_SIZE             = 0x400;    // NTR Wifi 設定のサイズ
 const u32 TWL_WIFI_SETTING_SIZE             = 0x600;    // TWL Wifi 設定のサイズ
 

trunk/ConsoleDataMigration/sources/tests/ConsoleBackup/Exporter/OMakefile

@@ -0,0 +1,62 @@
+#!/usr/bin/env omake
+#----------------------------------------------------------------------------
+# Project:  Horizon
+# File:     OMakefile
+#
+# Copyright (C)2009 Nintendo Co., Ltd.  All rights reserved.
+#
+# These coded instructions, statements, and computer programs contain
+# proprietary information of Nintendo of America Inc. and/or Nintendo
+# Company Ltd., and are protected by Federal copyright law.  They may
+# not be disclosed to third parties or copied or duplicated in any form,
+# in whole or in part, without the prior written consent of Nintendo.
+#
+# $Rev$
+#----------------------------------------------------------------------------
+SUPPORTED_TARGETS   =   CTR-*.Process.MPCore.*
+
+include $(makePlatformDefsPath tests)
+
+SAMPLED_DEMOS_COMMON_INCLUDE_DIR   = $(dir $(HORIZON_ROOT)/../CTR/SampleDemos/common/include)
+INCLUDES           +=   $(SAMPLED_DEMOS_COMMON_INCLUDE_DIR) \
+                        ../../../common \
+                        ../../../ConsoleBackup \
+
+
+
+TEST_COMMON_SOURCES[] =
+                        ../../../ConsoleBackup/Exporter.cpp
+                        ../../../common/Util.cpp
+                        ../../../common/HeapManager.cpp
+                        ../../../common/SdLogger.cpp
+                        ../../../common/LogConsole.cpp
+                        ../../../common/CommonLogger.cpp
+                        ../../../common/SdMountManager.cpp
+                        ../../../common/PlayHistoryManager.cpp
+                        ../../../common/VersionDetect.cpp
+                        ../../../common/HardwareStateManager.cpp
+                        ../../../common/FileTransfer.cpp
+                        ../../../common/SdReaderWriter.cpp
+
+
+SOURCES_TEST[]      =   test_Exporter.cpp
+
+ROMFS_ROOT          =   ../../../common/romfiles
+
+TEST_ENVIRONMENT_PROCESSLIST = true
+TEST_ENVIRONMENT_EMUMEM = true
+
+LIBS                +=  libnn_test \
+                        libnn_mcu  \
+                        libnn_ps \
+                        libnn_am \
+
+
+ROM_SPEC_FILE       =   ../../../ConsoleBackup/ConsoleBackup.rsf
+DESCRIPTOR          =   $(HORIZON_ROOT)/resources/specfiles/_private/RepairTool.desc
+
+
+include $(makePlatformDefsPath build.tests)
+
+
+tests: $(TEST_TARGETS)

trunk/ConsoleDataMigration/sources/tests/OMakefile

@@ -15,6 +15,6 @@
 #----------------------------------------------------------------------------
 
 if $(IsTestBuild)
-    .SUBDIRS: $(exist-dirs common)
+    .SUBDIRS: common ConsoleBackup
 
 DefineDefaultRules()

trunk/ConsoleDataMigration/sources/tests/common/OMakefile

@@ -15,6 +15,6 @@
 #----------------------------------------------------------------------------
 
 if $(IsTestBuild)
-    .SUBDIRS: $(exist-dirs util)
+    .SUBDIRS: util
 
 DefineDefaultRules()