rvtr/TwlIPL
1
Fork 0
mirror of https://github.com/rvtr/TwlIPL.git synced 2025-10-31 06:01:12 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

・Makefile内のinclude以外のところで$(TWLSDK_ROOT)を使用していたのを$(ROOT)に変更。

Browse Source 
・UIGランチャーでTwlIPLのacsignライブラリとTwlWiFiのnsslライブラリで特定のシンボルがぶつかるワーニング
　が出ることの修正として、acsignライブラリからEncrypt関数を抜き出して、別ライブラリとする。

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@456 b08762b0-b915-fc4b-9d8c-17b2551a87ff
This commit is contained in:
yosiokat 2008-01-11 05:24:33 +00:00
parent 8216155b96
commit 954b313f5d
29 changed files with 112 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.full
View File

@ -23,7 +23,7 @@ include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
export TWL_ARCHGEN = ALL
SUBDIRS = \
$(TWLSDK_ROOT)/build/libraries/reboot \
$(ROOT)/build/libraries/reboot \
$(TWLSYSTEM_ROOT) \
build

8
build/buildtools/commondefs.sysmenu
View File

@ -32,8 +32,8 @@ TWL_KEYSDIR ?= $(SYSMENU_ROOT)/keys/rsa/dummy
SYSMENU_ROOT := $(subst $(SPACE),\ ,$(subst \,/,$(TWL_IPL_RED_ROOT)))
SYSMENU_BUILDTOOLSDIR := $(SYSMENU_ROOT)/build/buildtools
SYSMENU_INCDIR := $(SYSMENU_ROOT)/include \
$(TWLSDK_ROOT)/build/libraries/spi/arm9/include \
$(TWLSDK_ROOT)/build/libraries/mb/common/include
$(ROOT)/build/libraries/spi/arm9/include \
$(ROOT)/build/libraries/mb/common/include
SYSMENU_TOOLSDIR := $(SYSMENU_ROOT)/tools
SYSMENU_COMPONENTSDIR := $(SYSMENU_ROOT)/components
@ -87,7 +87,7 @@ MAKEBANNER := $(SYSMENU_TOOLSDIR)/bin/makebanner.exe
MAKESYSMENU_RSA_PRVKEY ?= $(SYSMENU_TOOLSDIR)/openssl/rsa_private.der
MAKESYSMENU_RSA_PUBKEY ?= $(SYSMENU_TOOLSDIR)/openssl/rsa_public.der
MAKETAD ?= $(TWLSDK_ROOT)/tools/bin/makeTad.pl
MAKETAD ?= $(ROOT)/tools/bin/makeTad.pl
#----------------------------------------------------------------------------
@ -105,7 +105,7 @@ SYSMENU_INSTALL_INCDIR := $(SYSMENU_INSTALL_ROOT)/include
SYSMENU_INSTALL_TOOLSDIR := $(SYSMENU_INSTALL_ROOT)/tools
SYSMENU_INSTALL_LIBDIR := $(SYSMENU_INSTALL_ROOT)/lib/$(TWL_LIBTYPE)
SYSMENU_INSTALL_COMPONENTSDIR := $(SYSMENU_INSTALL_ROOT)/components
SDK_NMENU_DATADIR = $(TWLSDK_ROOT)/build/tools/TwlNMenu/data
SDK_NMENU_DATADIR = $(ROOT)/build/tools/TwlNMenu/data
#----------------------------------------------------------------------------
endif # TWL_SYSMENU_COMMONDEFS_

2
build/components/hyena.TWL/Makefile
View File

@ -34,7 +34,7 @@ TARGET_NAME = hyena
TARGET_NEF = $(TARGET_NAME).tef
LCFILE_SPEC = $(TARGET_NAME).lsf
LCFILE_TEMPLATE = $(TARGET_NAME).lcf.template
LDRES_TEMPLATE = $(TWLSDK_ROOT)/build/components/racoon.TWL/racoon.response.template
LDRES_TEMPLATE = $(ROOT)/build/components/racoon.TWL/racoon.response.template
CRT0_O = crt0.LTD.TWL.o

4
build/libraries/fatfs/ARM7/Makefile
View File

@ -29,8 +29,8 @@ TWL_CODEGEN_ALL ?= TRUE
TWL_PROC = ARM7
INCDIR = \
$(TWLSDK_ROOT)/build/libraries/fatfs/ARM7.TWL/include \
$(TWLSDK_ROOT)/build/libraries/fatfs/ARM7.TWL/include/twl/fatfs/ARM7
$(ROOT)/build/libraries/fatfs/ARM7.TWL/include \
$(ROOT)/build/libraries/fatfs/ARM7.TWL/include/twl/fatfs/ARM7
SRCDIR = src

4
build/libraries/fs/ARM7/Makefile
View File

@ -29,8 +29,8 @@ TWL_CODEGEN_ALL ?= TRUE
TWL_PROC = ARM7
LINCLUDES = \
$(TWLSDK_ROOT)/build/libraries/fatfs/ARM7.TWL/include \
$(TWLSDK_ROOT)/build/libraries/fatfs/ARM7.TWL/include/twl/fatfs/ARM7
$(ROOT)/build/libraries/fatfs/ARM7.TWL/include \
$(ROOT)/build/libraries/fatfs/ARM7.TWL/include/twl/fatfs/ARM7
SRCS = fs_firm.c

4
build/libraries/os/ARM7/Makefile
View File

@ -28,8 +28,8 @@ TWL_PROC = ARM7
SRCDIR = ../common .
INCDIR = ./include ../common/include \
$(TWLSDK_ROOT)/build/libraries/fatfs/ARM7.TWL/include \
$(TWLSDK_ROOT)/build/libraries/fatfs/ARM7.TWL/include/twl/fatfs/ARM7 \
$(ROOT)/build/libraries/fatfs/ARM7.TWL/include \
$(ROOT)/build/libraries/fatfs/ARM7.TWL/include/twl/fatfs/ARM7 \
SRCS = \
os_init_firm.c \

2
build/libraries/pm/ARM7/Makefile
View File

@ -28,7 +28,7 @@ TWL_CODEGEN_ALL ?= TRUE
# Codegen for sub processer
TWL_PROC = ARM7
INCDIR = $(TWLSDK_ROOT)/build/libraries/spi/ARM7/pm/include \
INCDIR = $(ROOT)/build/libraries/spi/ARM7/pm/include \
SRCDIR = .

7
build/libraries_sysmenu/acsign/ARM9/Makefile
View File

@ -18,7 +18,8 @@
#----------------------------------------------------------------------------
SUBDIRS =
SUBDIRS =
SUBMAKES = Makefile.encrypt
#----------------------------------------------------------------------------
@ -28,11 +29,9 @@ TWL_ARCHGEN = LIMITED
TWL_PROC = ARM9
INCDIR = include \
$(TWLSDK_ROOT)/build/libraries/mb/common/include
$(ROOT)/build/libraries/mb/common/include
SRCS = acsign.c acmemory.c acsign_util.c \
acsign_encrypt.c \
ber_lib.c ber_isk.c ber_par.c
TARGET_LIB = libacsign$(TWL_LIBSUFFIX).a

57
build/libraries_sysmenu/acsign/ARM9/Makefile.encrypt Normal file
View File

@ -0,0 +1,57 @@
#! make -f
#----------------------------------------------------------------------------
# Project: TwlIPL
# File: Makefile
#
# Copyright 2007 Nintendo. 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.
#
# $Date:: $
# $Rev$
# $Author$
#----------------------------------------------------------------------------
#----------------------------------------------------------------------------
SUBDIRS =
#----------------------------------------------------------------------------
TARGET_FIRM = SYSTEMMENU
TARGET_PLATFORM = TWL
TWL_ARCHGEN = LIMITED
TWL_PROC = ARM9
INCDIR = include
SRCS = acsign_encrypt.c \
ber_lib.c ber_isk.c ber_par.c
TARGET_LIB = libacsign_enc$(TWL_LIBSUFFIX).a
include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
INSTALL_TARGETS = $(TARGETS)
INSTALL_DIR = $(SYSMENU_INSTALL_LIBDIR)
CCFLAGS += -DSMALL_CODE_SIZE \
-DSTANDALONE \
-DOPT_32_BIT \
-DNO_SPLIT \
-DNO_FP_API \
-DNO_R_DIAG \
-DNO_STDIO_H \
-DNO_STDLIB_H
do-build: $(TARGETS)
include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
#===== End of Makefile =====

3
build/libraries_sysmenu/acsign/ARM9/src/acsign_util.c
View File

@ -16,7 +16,8 @@
*---------------------------------------------------------------------------*/
#include <nitro.h>
#include <sysmenu/acsign.h>
#include <sysmenu/acsign/ARM9/acsign.h>
#include <sysmenu/acsign/ARM9/acsign_util.h>
#include <string.h>
#define AUTH_KEY_BUFFER_LEN 128

4
build/libraries_sysmenu/boot/ARM7/Makefile
View File

@ -29,8 +29,8 @@ TWL_PROC = ARM7
SRCDIR = ./src
INCDIR = ../common/include \
$(TWLSDK_ROOT)/build/libraries/fatfs/ARM7.TWL/include \
$(TWLSDK_ROOT)/build/libraries/fatfs/ARM7.TWL/include/twl/fatfs/ARM7 \
$(ROOT)/build/libraries/fatfs/ARM7.TWL/include \
$(ROOT)/build/libraries/fatfs/ARM7.TWL/include/twl/fatfs/ARM7 \
SRCS = bootAPI.c boot.c

2
build/libraries_sysmenu/mb_loader/ARM7/Makefile
View File

@ -29,7 +29,7 @@ TWL_PROC = ARM7
SRCDIR = ../common/src
INCDIR = ../common/include \
$(TWLSDK_ROOT)/build/libraries/mb/common/include
$(ROOT)/build/libraries/mb/common/include
SRCS = mb_loader.c

2
build/libraries_sysmenu/mb_loader/ARM9/Makefile
View File

@ -29,7 +29,7 @@ TWL_PROC = ARM9
SRCDIR = ../common/src
INCDIR = ../common/include \
$(TWLSDK_ROOT)/build/libraries/mb/common/include
$(ROOT)/build/libraries/mb/common/include
SRCS = mb_loader.c

2
build/libraries_sysmenu/settings/ARM9/Makefile
View File

@ -36,7 +36,7 @@ include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
INSTALL_TARGETS = $(TARGETS)
INSTALL_DIR = $(SYSMENU_INSTALL_LIBDIR)
LINCLUDES = $(TWLSDK_ROOT)/build/libraries/spi/ARM9/include \
LINCLUDES = $(ROOT)/build/libraries/spi/ARM9/include \
#----------------------------------------------------------------------------

4
build/libraries_sysmenu/sysmenu/ARM9/Makefile
View File

@ -37,8 +37,8 @@ include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
INSTALL_TARGETS = $(TARGETS)
INSTALL_DIR = $(SYSMENU_INSTALL_LIBDIR)
LINCLUDES = $(TWLSDK_ROOT)/build/libraries/mb/common/include \
$(TWLSDK_ROOT)/build/libraries/spi/ARM9/include \
LINCLUDES = $(ROOT)/build/libraries/mb/common/include \
$(ROOT)/build/libraries/spi/ARM9/include \
#----------------------------------------------------------------------------

8
build/libraries_sysmenu/sysmenu/ARM9/src/mountInfo.c
View File

@ -69,7 +69,7 @@ OSMountInfo s_defaultMountList[ DEFAULT_MOUNT_LIST_NUM ] ATTRIBUTE_ALIGN(4) = {
/*
要確認
カードブート時のBootSRLPathは、"rom:"ではなく、""なのか？
カードブート時のBootSRLPathは、"rom:"ではなく、""でいく。
"nand:" と "nand1:"のuserPermissionは"OS_MOUNT_USR_R"で良いのか？
*/
@ -89,10 +89,10 @@ void SYSM_SetBootAppMountInfo( TitleProperty *pBootTitle )
// 起動アプリのSRLパスをセット
SYSMi_SetBootSRLPath( pBootTitle->titleID, (TitleMedia)pBootTitle->flags.media );
// ユーザーアプリの場合、"nand:", "nand2:"アーカイブをReadOnlyに変更。
// ユーザーアプリの場合、"nand:", "nand2:"アーカイブを変更。
if( ( titleID_Hi & TITLEID_HI_APP_SYS_FLAG ) == 0 ) {
s_defaultMountList[ 1 ].userPermission = OS_MOUNT_USR_R; // "nand:" アーカイブをReadOnlyに
s_defaultMountList[ 2 ].userPermission = OS_MOUNT_USR_R; // "nand2:" アーカイブをReadOnlyに
s_defaultMountList[ 1 ].userPermission = 0; // "nand:"
s_defaultMountList[ 2 ].userPermission = 0; // "nand2:"
}
// セーブデータ有無によるマウント情報の編集

8
build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c
View File

@ -356,6 +356,7 @@ int SYSM_GetNandTitleList( TitleProperty *pTitleList_Nand, int listNum )
{
// filter_flag : ALL, ALL_APP, SYS_APP, USER_APP, Data only, 等の条件を指定してタイトルリストを取得する。
// とりあえずALL
OSTick start;
int l;
int gotten;
NAMTitleId titleIdArray[ LAUNCHER_TITLE_LIST_NUM ];
@ -363,8 +364,13 @@ int SYSM_GetNandTitleList( TitleProperty *pTitleList_Nand, int listNum )
if( listNum > LAUNCHER_TITLE_LIST_NUM ) {
OS_TPrintf( "Warning: TitleList_Nand num over LAUNCHER_TITLE_LIST_NUM(%d)\n", LAUNCHER_TITLE_LIST_NUM );
}
start = OS_GetTick();
gotten = NAM_GetTitleList( &titleIdArray[ 0 ], LAUNCHER_TITLE_LIST_NUM - 1 );
OS_TPrintf( "NAM_GetTitleList : %dus\n", OS_TicksToMicroSeconds( OS_GetTick() - start ) );
start = OS_GetTick();
gotten = NAM_GetNumTitles(); // [TODO:]本来だったら必要ないが、現在はNAM_GetTitleListがアプリ個数をちゃんと返してくれないので。
OS_TPrintf( "NAM_GetNumTitles : %dus\n", OS_TicksToMicroSeconds( OS_GetTick() - start ) );
for(l=0;l<gotten;l++)
{
@ -377,7 +383,9 @@ int SYSM_GetNandTitleList( TitleProperty *pTitleList_Nand, int listNum )
s32 readLen;
s32 offset;
start = OS_GetTick();
readLen = NAM_GetTitleBootContentPath(path, titleIdArray[l]);
OS_TPrintf( "NAM_GetTitleBootContentPath : %dus\n", OS_TicksToMicroSeconds( OS_GetTick() - start ) );
if(readLen != NAM_OK){
OS_TPrintf("NAM_GetTitleBootContentPath failed %d,%lld,%d\n",l,titleIdArray[l],readLen);

4
build/systemMenu_RED/DS_DownloadPlay/ARM9/Makefile
View File

@ -31,8 +31,8 @@ ROM_SPEC = main.rsf
SRCS = main.c mainFunc.c DS_DownloadPlay.c
LINCLUDES = $(TWLSDK_ROOT)/build/libraries/spi/arm9/include \
$(TWLSDK_ROOT)/build/libraries/mb/common/include \
LINCLUDES = $(ROOT)/build/libraries/spi/arm9/include \
$(ROOT)/build/libraries/mb/common/include \
LLIBRARY_DIRS =
LLIBRARIES =

1
build/systemMenu_RED/HWInfoWriter/ARM9/Makefile
View File

@ -39,6 +39,7 @@ SRCS = main.c HWInfoWriter.c \
$(MISC_DIR)/src/misc.c $(MISC_DIR)/src/cmn.c
LINCLUDES = $(MISC_DIR)/include
LLIBRARIES = libacsign_enc$(TWL_LIBSUFFIX).a
MAKEROM_FLAGS += -DTITLEID_LO='$(TITLEID_LO)'
MAKETAD_FLAGS += -s

2
build/systemMenu_RED/Launcher/ARM9/Makefile
View File

@ -18,11 +18,11 @@
SUBDIRS = \
../../../libraries_sysmenu/sysmenu \
../../../components/hyena.TWL
# ../../../libraries_sysmenu/reloc_info \
# ../../../libraries_sysmenu/settings \
# ../../../libraries_sysmenu/boot \
# ../../../libraries_sysmenu/hotsw \
# ../../../components/hyena.TWL
#----------------------------------------------------------------------------

2
build/tests/RelocateChecker/ARM7/Makefile.0
View File

@ -33,7 +33,7 @@ BINDIR = ./bin/$(TWL_BUILDTYPE)/$(TARGET_NAME)
TARGET_NEF = $(TARGET_NAME).tef
LCFILE_SPEC = hyena_rc.lsf
LCFILE_TEMPLATE = $(TARGET_NAME).lcf.template
LDRES_TEMPLATE = $(TWLSDK_ROOT)/build/components/racoon.TWL/racoon.response.template
LDRES_TEMPLATE = $(ROOT)/build/components/racoon.TWL/racoon.response.template
LLIBRARY_DIRS += ../crt/ARM7/obj/ARM7-TS.LTD/$(TWL_BUILD_DIR)

2
build/tests/RelocateChecker/ARM7/Makefile.1
View File

@ -33,7 +33,7 @@ BINDIR = ./bin/$(TWL_BUILDTYPE)/$(TARGET_NAME)
TARGET_NEF = $(TARGET_NAME).tef
LCFILE_SPEC = hyena_rc.lsf
LCFILE_TEMPLATE = $(TARGET_NAME).lcf.template
LDRES_TEMPLATE = $(TWLSDK_ROOT)/build/components/racoon.TWL/racoon.response.template
LDRES_TEMPLATE = $(ROOT)/build/components/racoon.TWL/racoon.response.template
LLIBRARY_DIRS += ../crt/ARM7/obj/ARM7-TS.LTD/$(TWL_BUILD_DIR)

2
build/tests/RelocateChecker/ARM7/Makefile.2
View File

@ -33,7 +33,7 @@ BINDIR = ./bin/$(TWL_BUILDTYPE)/$(TARGET_NAME)
TARGET_NEF = $(TARGET_NAME).tef
LCFILE_SPEC = hyena_rc.lsf
LCFILE_TEMPLATE = $(TARGET_NAME).lcf.template
LDRES_TEMPLATE = $(TWLSDK_ROOT)/build/components/racoon.TWL/racoon.response.template
LDRES_TEMPLATE = $(ROOT)/build/components/racoon.TWL/racoon.response.template
LLIBRARY_DIRS += ../crt/ARM7/obj/ARM7-TS.LTD/$(TWL_BUILD_DIR)

2
build/tests/RelocateChecker/ARM7/Makefile.3
View File

@ -33,7 +33,7 @@ BINDIR = ./bin/$(TWL_BUILDTYPE)/$(TARGET_NAME)
TARGET_NEF = $(TARGET_NAME).tef
LCFILE_SPEC = hyena_rc.lsf
LCFILE_TEMPLATE = $(TARGET_NAME).lcf.template
LDRES_TEMPLATE = $(TWLSDK_ROOT)/build/components/racoon.TWL/racoon.response.template
LDRES_TEMPLATE = $(ROOT)/build/components/racoon.TWL/racoon.response.template
LLIBRARY_DIRS += ../crt/ARM7/obj/ARM7-TS.LTD/$(TWL_BUILD_DIR)

2
build/tests/RelocateChecker/ARM7/Makefile.4
View File

@ -33,7 +33,7 @@ BINDIR = ./bin/$(TWL_BUILDTYPE)/$(TARGET_NAME)
TARGET_NEF = $(TARGET_NAME).tef
LCFILE_SPEC = hyena_rc.lsf
LCFILE_TEMPLATE = $(TARGET_NAME).lcf.template
LDRES_TEMPLATE = $(TWLSDK_ROOT)/build/components/racoon.TWL/racoon.response.template
LDRES_TEMPLATE = $(ROOT)/build/components/racoon.TWL/racoon.response.template
LLIBRARY_DIRS += ../crt/ARM7/obj/ARM7-TS.LTD/$(TWL_BUILD_DIR)

2
build/tests/RelocateChecker/ARM7/Makefile.5
View File

@ -33,7 +33,7 @@ BINDIR = ./bin/$(TWL_BUILDTYPE)/$(TARGET_NAME)
TARGET_NEF = $(TARGET_NAME).tef
LCFILE_SPEC = hyena_rc5.lsf
LCFILE_TEMPLATE = $(TARGET_NAME).lcf.template
LDRES_TEMPLATE = $(TWLSDK_ROOT)/build/components/racoon.TWL/racoon.response.template
LDRES_TEMPLATE = $(ROOT)/build/components/racoon.TWL/racoon.response.template
LLIBRARY_DIRS += ../crt/ARM7/obj/ARM7-TS.LTD/$(TWL_BUILD_DIR)

2
build/tools/acsign/Makefile
View File

@ -29,7 +29,7 @@ SUBDIRS =
#----------------------------------------------------------------------------
SRCDIR = ./src
INCDIR = ./include $(TWLSDK_ROOT)/build/libraries/mb/include
INCDIR = ./include $(ROOT)/build/libraries/mb/include
SRCS = acsign.c acmemory.c acsign_util.c

2
include/sysmenu/acsign.h
View File

@ -21,7 +21,7 @@
#ifdef SDK_ARM9
#include <sysmenu/acsign/ARM9/acsign.h>
#include <sysmenu/acsign/ARM9/acsign_util.h>
//#include <sysmenu/acsign/ARM9/acsign_util.h>
#endif // SDK_ARM9
#ifdef __cplusplus

8
include/sysmenu/settings/common/TWLHWInfo.h
View File

@ -82,12 +82,16 @@ typedef struct TWLHWNormalInfo{
// TWL_HWセキュア情報設定データ（署名で改ざん保護する必要があるもの）
// ※基本、過去ver互換を考慮して、追加しかしない方針で。
// ※SystemShared領域にリードしているので、サイズが変わった時は注意する。
// ※SystemShared領域にロードしているので、サイズが変わった時は注意する。
typedef struct TWLHWSecureInfo{
u32 validLanguageBitmap; // 本体で有効な言語コードをビット列で表現
u8 region; // リージョン
u8 serialNo[ TWL_HWINFO_SERIALNO_LEN_MAX ]; // シリアルNo.（終端付きASCII文字列）
}TWLHWSecureInfo; // 20bytes
//-------------------------------------------------------------
// [TODO:]ここまでの20bytesをランチャーでSystemSharedにロードする。
//-------------------------------------------------------------
u8 launcherTitleID_Lo[ 4 ];
}TWLHWSecureInfo; // 24bytes
#ifdef SDK_ARM9