From 8a5bccea8691c8d7d8680487165382d490d71d35 Mon Sep 17 00:00:00 2001 From: N2614 Date: Tue, 21 Feb 2012 04:44:42 +0000 Subject: [PATCH] =?UTF-8?q?=E3=83=AA=E3=83=93=E3=82=B8=E3=83=A7=E3=83=B3?= =?UTF-8?q?=20645=20=E3=82=92=20trunk/ConsoleDataMigration=20=E3=81=8B?= =?UTF-8?q?=E3=82=89=E3=83=9E=E3=83=BC=E3=82=B8:=20=E6=88=90=E6=9E=9C?= =?UTF-8?q?=E7=89=A9=E3=81=AE=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E5=90=8D?= =?UTF-8?q?=E3=81=AB=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E7=95=AA?= =?UTF-8?q?=E5=8F=B7=E3=82=92=E5=85=A5=E3=82=8C=E3=82=89=E3=82=8C=E3=82=8B?= =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=20UnfixedKey=E7=94=A8=E3=83=93?= =?UTF-8?q?=E3=83=AB=E3=83=89=E3=82=92=E8=BF=BD=E5=8A=A0=20........=20?= =?UTF-8?q?=E3=83=93=E3=83=AB=E3=83=89=E3=81=8C=E9=80=9A=E3=82=8B=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3?= 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@647 385bec56-5757-e545-9c3a-d8741f4650f1 --- branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/OMakefile | 5 +++-- branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/OMakefile | 5 +++-- .../sources/tests/ConsoleBackup/Exporter/OMakefile | 3 +-- .../sources/tests/ConsoleBackup/Exporter/test_Exporter.cpp | 4 ++-- .../sources/tests/ConsoleRestore/TitleDownloader/OMakefile | 3 +-- .../ConsoleRestore/TitleDownloader/test_TitleDownloader.cpp | 4 ++-- .../1stNUP_for_2ndNUP/sources/tests/common/util/OMakefile | 2 +- branches/1stNUP_for_2ndNUP/sources/tools/CmacAdder/OMakefile | 3 ++- .../sources/tools/ExportedDataDecrypter/OMakefile | 5 +++-- .../sources/tools/ExportedDataVerifier/OMakefile | 5 +++-- .../sources/tools/FatDataEncrypter/OMakefile | 5 +++-- 11 files changed, 24 insertions(+), 20 deletions(-) diff --git a/branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/OMakefile b/branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/OMakefile index dfa19be..007d622 100644 --- a/branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/OMakefile +++ b/branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/OMakefile @@ -44,7 +44,8 @@ SOURCES[] = ../common/ResFont.cpp ../common/HardwareStateManager.cpp -CTR_BANNER_SPEC = $(TARGET_PROGRAM).bsf +include $(ROOT)/common/BuildSwitch.om +CTR_BANNER_SPEC = $(TARGET_NAME).bsf ROMFS_ROOT = ../common/romfiles @@ -66,7 +67,7 @@ LIBS += libnn_cfg \ INSTALL_SDK_TOOL = true -ROM_SPEC_FILE = $(TARGET_PROGRAM).rsf +ROM_SPEC_FILE = $(TARGET_NAME).rsf DESCRIPTOR = $(HORIZON_ROOT)/resources/specfiles/RepairTool.desc include $(ROOT_OMAKE)/modulerules diff --git a/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/OMakefile b/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/OMakefile index 4e80b07..5567dd4 100644 --- a/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/OMakefile +++ b/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/OMakefile @@ -47,7 +47,8 @@ SOURCES[] = ../common/ResFont.cpp ../common/HardwareStateManager.cpp -CTR_BANNER_SPEC = $(TARGET_PROGRAM).bsf +include $(ROOT)/common/BuildSwitch.om +CTR_BANNER_SPEC = $(TARGET_NAME).bsf ROMFS_ROOT = ../common/romfiles @@ -69,7 +70,7 @@ LIBS += libnn_cfg \ INSTALL_SDK_TOOL = true -ROM_SPEC_FILE = $(TARGET_PROGRAM).rsf +ROM_SPEC_FILE = $(TARGET_NAME).rsf DESCRIPTOR = $(HORIZON_ROOT)/resources/specfiles/RepairTool.desc include $(ROOT_OMAKE)/modulerules diff --git a/branches/1stNUP_for_2ndNUP/sources/tests/ConsoleBackup/Exporter/OMakefile b/branches/1stNUP_for_2ndNUP/sources/tests/ConsoleBackup/Exporter/OMakefile index ef5f9f7..2cc5c19 100644 --- a/branches/1stNUP_for_2ndNUP/sources/tests/ConsoleBackup/Exporter/OMakefile +++ b/branches/1stNUP_for_2ndNUP/sources/tests/ConsoleBackup/Exporter/OMakefile @@ -32,7 +32,6 @@ TEST_COMMON_SOURCES[] = ../../../common/LogConsole.cpp ../../../common/CommonLogger.cpp ../../../common/SdMountManager.cpp - ../../../common/PlayHistoryManager.cpp ../../../common/VersionDetect.cpp ../../../common/HardwareStateManager.cpp ../../../common/FileTransfer.cpp @@ -54,7 +53,7 @@ LIBS += libnn_test \ ROM_SPEC_FILE = ../../../ConsoleBackup/ConsoleBackup.rsf -DESCRIPTOR = $(HORIZON_ROOT)/resources/specfiles/_private/RepairTool.desc +DESCRIPTOR = $(HORIZON_ROOT)/resources/specfiles/RepairTool.desc include $(makePlatformDefsPath build.tests) diff --git a/branches/1stNUP_for_2ndNUP/sources/tests/ConsoleBackup/Exporter/test_Exporter.cpp b/branches/1stNUP_for_2ndNUP/sources/tests/ConsoleBackup/Exporter/test_Exporter.cpp index 486e320..4f2f9be 100644 --- a/branches/1stNUP_for_2ndNUP/sources/tests/ConsoleBackup/Exporter/test_Exporter.cpp +++ b/branches/1stNUP_for_2ndNUP/sources/tests/ConsoleBackup/Exporter/test_Exporter.cpp @@ -65,10 +65,10 @@ bool ExporterTest::InitializeSuite() nn::am::InitializeForSystemMenu(); // ヒープの確保 - common::HeapManager::GetHeap()->Initialize(nn::os::GetDeviceMemoryAddress(), nn::os::GetDeviceMemorySize(), nn::os::ALLOCATE_OPTION_LINEAR); + common::HeapManager gxHeap(s_GxHeapSize); // RenderSystem の準備 - uptr heapForGx = reinterpret_cast(common::HeapManager::GetHeap()->Allocate(s_GxHeapSize)); + uptr heapForGx = reinterpret_cast(gxHeap.GetAddr()); demo::RenderSystemDrawing renderSystem; renderSystem.Initialize(heapForGx, s_GxHeapSize); diff --git a/branches/1stNUP_for_2ndNUP/sources/tests/ConsoleRestore/TitleDownloader/OMakefile b/branches/1stNUP_for_2ndNUP/sources/tests/ConsoleRestore/TitleDownloader/OMakefile index 30f3b2d..bcb51d9 100644 --- a/branches/1stNUP_for_2ndNUP/sources/tests/ConsoleRestore/TitleDownloader/OMakefile +++ b/branches/1stNUP_for_2ndNUP/sources/tests/ConsoleRestore/TitleDownloader/OMakefile @@ -33,7 +33,6 @@ TEST_COMMON_SOURCES[] = ../../../common/LogConsole.cpp ../../../common/CommonLogger.cpp ../../../common/SdMountManager.cpp - ../../../common/PlayHistoryManager.cpp ../../../common/VersionDetect.cpp ../../../common/HardwareStateManager.cpp ../../../common/FileTransfer.cpp @@ -56,7 +55,7 @@ LIBS += libnn_test \ ROM_SPEC_FILE = ../../../ConsoleRestore/ConsoleRestore.rsf -DESCRIPTOR = $(HORIZON_ROOT)/resources/specfiles/_private/RepairTool.desc +DESCRIPTOR = $(HORIZON_ROOT)/resources/specfiles/RepairTool.desc include $(makePlatformDefsPath build.tests) diff --git a/branches/1stNUP_for_2ndNUP/sources/tests/ConsoleRestore/TitleDownloader/test_TitleDownloader.cpp b/branches/1stNUP_for_2ndNUP/sources/tests/ConsoleRestore/TitleDownloader/test_TitleDownloader.cpp index 97adbe2..ddd1aa2 100644 --- a/branches/1stNUP_for_2ndNUP/sources/tests/ConsoleRestore/TitleDownloader/test_TitleDownloader.cpp +++ b/branches/1stNUP_for_2ndNUP/sources/tests/ConsoleRestore/TitleDownloader/test_TitleDownloader.cpp @@ -66,10 +66,10 @@ bool TitleDownloaderTest::InitializeSuite() nn::am::InitializeForSystemMenu(); // ヒープの確保 - common::HeapManager::GetHeap()->Initialize(nn::os::GetDeviceMemoryAddress(), nn::os::GetDeviceMemorySize(), nn::os::ALLOCATE_OPTION_LINEAR); + common::HeapManager gxHeap(s_GxHeapSize); // RenderSystem の準備 - uptr heapForGx = reinterpret_cast(common::HeapManager::GetHeap()->Allocate(s_GxHeapSize)); + uptr heapForGx = reinterpret_cast(gxHeap.GetAddr()); demo::RenderSystemDrawing renderSystem; renderSystem.Initialize(heapForGx, s_GxHeapSize); diff --git a/branches/1stNUP_for_2ndNUP/sources/tests/common/util/OMakefile b/branches/1stNUP_for_2ndNUP/sources/tests/common/util/OMakefile index 825ae74..c33d265 100644 --- a/branches/1stNUP_for_2ndNUP/sources/tests/common/util/OMakefile +++ b/branches/1stNUP_for_2ndNUP/sources/tests/common/util/OMakefile @@ -46,7 +46,7 @@ LIBS += libnn_test \ ROM_SPEC_FILE = ../../../ConsoleRestore/ConsoleRestore.rsf -DESCRIPTOR = $(HORIZON_ROOT)/resources/specfiles/_private/RepairTool.desc +DESCRIPTOR = $(HORIZON_ROOT)/resources/specfiles/RepairTool.desc include $(makePlatformDefsPath build.tests) diff --git a/branches/1stNUP_for_2ndNUP/sources/tools/CmacAdder/OMakefile b/branches/1stNUP_for_2ndNUP/sources/tools/CmacAdder/OMakefile index 4001800..8daafd0 100644 --- a/branches/1stNUP_for_2ndNUP/sources/tools/CmacAdder/OMakefile +++ b/branches/1stNUP_for_2ndNUP/sources/tools/CmacAdder/OMakefile @@ -39,6 +39,7 @@ SOURCES[] = ../../common/configLoader.cpp ../../common/VersionDetect.cpp +include $(ROOT)/common/BuildSwitch.om CTR_BANNER_SPEC = AutoBoot.bsf ROMFS_ROOT = ../../common/romfiles @@ -56,7 +57,7 @@ LIBS += libnn_cfg \ INSTALL_SDK_TOOL = true -ROM_SPEC_FILE = $(TARGET_PROGRAM).rsf +ROM_SPEC_FILE = $(TARGET_NAME).rsf DESCRIPTOR = $(HORIZON_ROOT)/resources/specfiles/RepairTool.desc include $(ROOT_OMAKE)/modulerules diff --git a/branches/1stNUP_for_2ndNUP/sources/tools/ExportedDataDecrypter/OMakefile b/branches/1stNUP_for_2ndNUP/sources/tools/ExportedDataDecrypter/OMakefile index f9b9027..0c27e16 100644 --- a/branches/1stNUP_for_2ndNUP/sources/tools/ExportedDataDecrypter/OMakefile +++ b/branches/1stNUP_for_2ndNUP/sources/tools/ExportedDataDecrypter/OMakefile @@ -39,7 +39,8 @@ SOURCES[] = ../../common/configLoader.cpp ../../common/VersionDetect.cpp -CTR_BANNER_SPEC = $(TARGET_PROGRAM).bsf +include $(ROOT)/common/BuildSwitch.om +CTR_BANNER_SPEC = $(TARGET_NAME).bsf ROMFS_ROOT = ../../common/romfiles @@ -56,7 +57,7 @@ LIBS += libnn_cfg \ INSTALL_SDK_TOOL = true -ROM_SPEC_FILE = $(TARGET_PROGRAM).rsf +ROM_SPEC_FILE = $(TARGET_NAME).rsf DESCRIPTOR = $(HORIZON_ROOT)/resources/specfiles/RepairTool.desc include $(ROOT_OMAKE)/modulerules diff --git a/branches/1stNUP_for_2ndNUP/sources/tools/ExportedDataVerifier/OMakefile b/branches/1stNUP_for_2ndNUP/sources/tools/ExportedDataVerifier/OMakefile index 3eec50d..4f6a1e0 100644 --- a/branches/1stNUP_for_2ndNUP/sources/tools/ExportedDataVerifier/OMakefile +++ b/branches/1stNUP_for_2ndNUP/sources/tools/ExportedDataVerifier/OMakefile @@ -39,7 +39,8 @@ SOURCES[] = ../../common/configLoader.cpp ../../common/VersionDetect.cpp -CTR_BANNER_SPEC = $(TARGET_PROGRAM).bsf +include $(ROOT)/common/BuildSwitch.om +CTR_BANNER_SPEC = $(TARGET_NAME).bsf ROMFS_ROOT = ../../common/romfiles @@ -56,7 +57,7 @@ LIBS += libnn_cfg \ INSTALL_SDK_TOOL = true -ROM_SPEC_FILE = $(TARGET_PROGRAM).rsf +ROM_SPEC_FILE = $(TARGET_NAME).rsf DESCRIPTOR = $(HORIZON_ROOT)/resources/specfiles/RepairTool.desc include $(ROOT_OMAKE)/modulerules diff --git a/branches/1stNUP_for_2ndNUP/sources/tools/FatDataEncrypter/OMakefile b/branches/1stNUP_for_2ndNUP/sources/tools/FatDataEncrypter/OMakefile index ada531f..2c0d424 100644 --- a/branches/1stNUP_for_2ndNUP/sources/tools/FatDataEncrypter/OMakefile +++ b/branches/1stNUP_for_2ndNUP/sources/tools/FatDataEncrypter/OMakefile @@ -39,7 +39,8 @@ SOURCES[] = ../../common/configLoader.cpp ../../common/VersionDetect.cpp -CTR_BANNER_SPEC = $(TARGET_PROGRAM).bsf +include $(ROOT)/common/BuildSwitch.om +CTR_BANNER_SPEC = $(TARGET_NAME).bsf ROMFS_ROOT = ../../common/romfiles @@ -56,7 +57,7 @@ LIBS += libnn_cfg \ INSTALL_SDK_TOOL = true -ROM_SPEC_FILE = $(TARGET_PROGRAM).rsf +ROM_SPEC_FILE = $(TARGET_NAME).rsf DESCRIPTOR = $(HORIZON_ROOT)/resources/specfiles/RepairTool.desc include $(ROOT_OMAKE)/modulerules