From d62d08b8ff48e41c01fa93ba793d6a34a3e1aee5 Mon Sep 17 00:00:00 2001 From: N2614 Date: Wed, 27 Apr 2011 02:40:16 +0000 Subject: [PATCH] =?UTF-8?q?LogConsole=E3=81=AE=E3=82=B5=E3=82=A4=E3=82=BA?= =?UTF-8?q?=E3=82=92=E5=85=B1=E9=80=9A=E3=83=98=E3=83=83=E3=83=80=E3=81=AB?= =?UTF-8?q?=E7=A7=BB=E5=8B=95=20Exporter=E3=83=86=E3=82=B9=E3=83=88?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= 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@227 385bec56-5757-e545-9c3a-d8741f4650f1 --- .../sources/ConsoleBackup/ConsoleBackup.cpp | 4 +- .../sources/ConsoleBackup/ConsoleBackup.h | 29 --------- .../sources/ConsoleRestore/ConsoleRestore.cpp | 4 +- .../sources/ConsoleRestore/ConsoleRestore.h | 42 ------------- .../ConsoleRestore/TitleDownloader.cpp | 1 + .../sources/common/common_Types.h | 5 ++ .../tests/ConsoleBackup/Exporter/OMakefile | 62 +++++++++++++++++++ .../sources/tests/OMakefile | 2 +- .../sources/tests/common/OMakefile | 2 +- 9 files changed, 74 insertions(+), 77 deletions(-) delete mode 100644 trunk/ConsoleDataMigration/sources/ConsoleBackup/ConsoleBackup.h delete mode 100644 trunk/ConsoleDataMigration/sources/ConsoleRestore/ConsoleRestore.h create mode 100644 trunk/ConsoleDataMigration/sources/tests/ConsoleBackup/Exporter/OMakefile diff --git a/trunk/ConsoleDataMigration/sources/ConsoleBackup/ConsoleBackup.cpp b/trunk/ConsoleDataMigration/sources/ConsoleBackup/ConsoleBackup.cpp index 9712712..f0e6be4 100644 --- a/trunk/ConsoleDataMigration/sources/ConsoleBackup/ConsoleBackup.cpp +++ b/trunk/ConsoleDataMigration/sources/ConsoleBackup/ConsoleBackup.cpp @@ -39,7 +39,6 @@ #include #include -#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(); diff --git a/trunk/ConsoleDataMigration/sources/ConsoleBackup/ConsoleBackup.h b/trunk/ConsoleDataMigration/sources/ConsoleBackup/ConsoleBackup.h deleted file mode 100644 index a7769dd..0000000 --- a/trunk/ConsoleDataMigration/sources/ConsoleBackup/ConsoleBackup.h +++ /dev/null @@ -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 diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/ConsoleRestore.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/ConsoleRestore.cpp index 6dd39cc..0c42cf9 100644 --- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/ConsoleRestore.cpp +++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/ConsoleRestore.cpp @@ -36,7 +36,6 @@ #include #include -#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(); diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/ConsoleRestore.h b/trunk/ConsoleDataMigration/sources/ConsoleRestore/ConsoleRestore.h deleted file mode 100644 index 5717fc3..0000000 --- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/ConsoleRestore.h +++ /dev/null @@ -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 -#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 diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/TitleDownloader.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/TitleDownloader.cpp index 52d8d75..546e784 100644 --- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/TitleDownloader.cpp +++ b/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; diff --git a/trunk/ConsoleDataMigration/sources/common/common_Types.h b/trunk/ConsoleDataMigration/sources/common/common_Types.h index 3a575e7..7d56462 100644 --- a/trunk/ConsoleDataMigration/sources/common/common_Types.h +++ b/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 設定のサイズ diff --git a/trunk/ConsoleDataMigration/sources/tests/ConsoleBackup/Exporter/OMakefile b/trunk/ConsoleDataMigration/sources/tests/ConsoleBackup/Exporter/OMakefile new file mode 100644 index 0000000..ffa784f --- /dev/null +++ b/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) diff --git a/trunk/ConsoleDataMigration/sources/tests/OMakefile b/trunk/ConsoleDataMigration/sources/tests/OMakefile index 0cbdd35..d25ecc9 100644 --- a/trunk/ConsoleDataMigration/sources/tests/OMakefile +++ b/trunk/ConsoleDataMigration/sources/tests/OMakefile @@ -15,6 +15,6 @@ #---------------------------------------------------------------------------- if $(IsTestBuild) - .SUBDIRS: $(exist-dirs common) + .SUBDIRS: common ConsoleBackup DefineDefaultRules() diff --git a/trunk/ConsoleDataMigration/sources/tests/common/OMakefile b/trunk/ConsoleDataMigration/sources/tests/common/OMakefile index 616f7c7..10686fc 100644 --- a/trunk/ConsoleDataMigration/sources/tests/common/OMakefile +++ b/trunk/ConsoleDataMigration/sources/tests/common/OMakefile @@ -15,6 +15,6 @@ #---------------------------------------------------------------------------- if $(IsTestBuild) - .SUBDIRS: $(exist-dirs util) + .SUBDIRS: util DefineDefaultRules()