From 8f0f7ed65791aad847e73efd8fbd947985f63733 Mon Sep 17 00:00:00 2001 From: "(no author)" <(no author)@b08762b0-b915-fc4b-9d8c-17b2551a87ff> Date: Tue, 27 Nov 2007 07:08:55 +0000 Subject: [PATCH] =?UTF-8?q?(=E5=A4=89=E6=9B=B4=E8=80=85=EF=BC=9Aakabane=5F?= =?UTF-8?q?jumpei)=E5=85=AC=E9=96=8B=E3=81=99=E3=82=8B=E5=BF=85=E8=A6=81?= =?UTF-8?q?=E3=81=AE=E3=81=AA=E3=81=84=E3=83=98=E3=83=83=E3=83=80=E3=83=BC?= =?UTF-8?q?=E3=82=92=E7=A7=BB=E5=8B=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@266 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- build/libraries_sysmenu/hotsw/ARM7/Makefile | 3 ++- .../libraries_sysmenu/hotsw/ARM7/include}/blowfish.h | 2 +- .../libraries_sysmenu/hotsw/ARM7/include}/dsCardType1.h | 2 +- .../libraries_sysmenu/hotsw/ARM7/include}/dsCardType2.h | 2 +- build/libraries_sysmenu/hotsw/ARM7/src/blowfish.c | 2 +- build/libraries_sysmenu/hotsw/ARM7/src/dsCardType1.c | 3 ++- build/libraries_sysmenu/hotsw/ARM7/src/dsCardType2.c | 3 ++- build/libraries_sysmenu/hotsw/ARM7/src/ds_blowfish_table.c | 2 +- build/libraries_sysmenu/hotsw/ARM7/src/{Card.c => hotsw.c} | 3 +++ include/sysmenu/hotsw.h | 3 --- 10 files changed, 14 insertions(+), 11 deletions(-) rename {include/sysmenu/hotsw/common => build/libraries_sysmenu/hotsw/ARM7/include}/blowfish.h (95%) rename {include/sysmenu/hotsw/common => build/libraries_sysmenu/hotsw/ARM7/include}/dsCardType1.h (95%) rename {include/sysmenu/hotsw/common => build/libraries_sysmenu/hotsw/ARM7/include}/dsCardType2.h (94%) rename build/libraries_sysmenu/hotsw/ARM7/src/{Card.c => hotsw.c} (96%) diff --git a/build/libraries_sysmenu/hotsw/ARM7/Makefile b/build/libraries_sysmenu/hotsw/ARM7/Makefile index dc7fcd6d..77291c13 100644 --- a/build/libraries_sysmenu/hotsw/ARM7/Makefile +++ b/build/libraries_sysmenu/hotsw/ARM7/Makefile @@ -27,8 +27,9 @@ TWL_PROC = ARM7 #---------------------------------------------------------------------------- SRCDIR = ./src +INCDIR = ./include -SRCS = blowfish.c Card.c ds_blowfish_table.c dsCardType1.c dsCardType2.c +SRCS = blowfish.c hotsw.c ds_blowfish_table.c dsCardType1.c dsCardType2.c TARGET_LIB = libcardboot_sp$(TWL_LIBSUFFIX).a diff --git a/include/sysmenu/hotsw/common/blowfish.h b/build/libraries_sysmenu/hotsw/ARM7/include/blowfish.h similarity index 95% rename from include/sysmenu/hotsw/common/blowfish.h rename to build/libraries_sysmenu/hotsw/ARM7/include/blowfish.h index b7aa46c9..a3dd6f2f 100644 --- a/include/sysmenu/hotsw/common/blowfish.h +++ b/build/libraries_sysmenu/hotsw/ARM7/include/blowfish.h @@ -15,7 +15,7 @@ #include -#include "hotsw.h" +#include #ifdef __cplusplus extern "C" { diff --git a/include/sysmenu/hotsw/common/dsCardType1.h b/build/libraries_sysmenu/hotsw/ARM7/include/dsCardType1.h similarity index 95% rename from include/sysmenu/hotsw/common/dsCardType1.h rename to build/libraries_sysmenu/hotsw/ARM7/include/dsCardType1.h index 41dbf391..843b0991 100644 --- a/include/sysmenu/hotsw/common/dsCardType1.h +++ b/build/libraries_sysmenu/hotsw/ARM7/include/dsCardType1.h @@ -11,7 +11,7 @@ extern "C" { #include -#include "hotsw.h" +#include // =========================================================================== // Function Describe diff --git a/include/sysmenu/hotsw/common/dsCardType2.h b/build/libraries_sysmenu/hotsw/ARM7/include/dsCardType2.h similarity index 94% rename from include/sysmenu/hotsw/common/dsCardType2.h rename to build/libraries_sysmenu/hotsw/ARM7/include/dsCardType2.h index d3d2e66b..1874e2de 100644 --- a/include/sysmenu/hotsw/common/dsCardType2.h +++ b/build/libraries_sysmenu/hotsw/ARM7/include/dsCardType2.h @@ -11,7 +11,7 @@ extern "C" { #include -#include "hotsw.h" +#include // =========================================================================== // Function Describe diff --git a/build/libraries_sysmenu/hotsw/ARM7/src/blowfish.c b/build/libraries_sysmenu/hotsw/ARM7/src/blowfish.c index b72166b3..faade710 100644 --- a/build/libraries_sysmenu/hotsw/ARM7/src/blowfish.c +++ b/build/libraries_sysmenu/hotsw/ARM7/src/blowfish.c @@ -11,7 +11,7 @@ in whole or in part, without the prior written consent of Nintendo. *---------------------------------------------------------------------------*/ #include -#include +#include #define MAXKEYBYTES 56 /* 448 bits */ #define N 16 diff --git a/build/libraries_sysmenu/hotsw/ARM7/src/dsCardType1.c b/build/libraries_sysmenu/hotsw/ARM7/src/dsCardType1.c index d650bdbe..1f3657e0 100644 --- a/build/libraries_sysmenu/hotsw/ARM7/src/dsCardType1.c +++ b/build/libraries_sysmenu/hotsw/ARM7/src/dsCardType1.c @@ -4,7 +4,8 @@ *---------------------------------------------------------------------------*/ #include -#include +#include +#include // Define data -------------------------------------------------------------- #define PAGE_SIZE 512 diff --git a/build/libraries_sysmenu/hotsw/ARM7/src/dsCardType2.c b/build/libraries_sysmenu/hotsw/ARM7/src/dsCardType2.c index 88b115ed..66bb4d0e 100644 --- a/build/libraries_sysmenu/hotsw/ARM7/src/dsCardType2.c +++ b/build/libraries_sysmenu/hotsw/ARM7/src/dsCardType2.c @@ -4,7 +4,8 @@ *---------------------------------------------------------------------------*/ #include -#include +#include +#include // Define Data -------------------------------------------------------------- #define SECURE_SEGMENT_NUM 4 diff --git a/build/libraries_sysmenu/hotsw/ARM7/src/ds_blowfish_table.c b/build/libraries_sysmenu/hotsw/ARM7/src/ds_blowfish_table.c index 89a4bf27..bdf8a5f1 100644 --- a/build/libraries_sysmenu/hotsw/ARM7/src/ds_blowfish_table.c +++ b/build/libraries_sysmenu/hotsw/ARM7/src/ds_blowfish_table.c @@ -10,7 +10,7 @@ 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. *---------------------------------------------------------------------------*/ -#include +#include const BLOWFISH_CTX GCDi_BlowfishInitTableDS = { diff --git a/build/libraries_sysmenu/hotsw/ARM7/src/Card.c b/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c similarity index 96% rename from build/libraries_sysmenu/hotsw/ARM7/src/Card.c rename to build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c index 05ee8e00..44e66cee 100644 --- a/build/libraries_sysmenu/hotsw/ARM7/src/Card.c +++ b/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c @@ -17,6 +17,9 @@ #include #include +#include +#include +#include // define ------------------------------------------------------------------- #define STACK_SIZE 1024 // スタックサイズ diff --git a/include/sysmenu/hotsw.h b/include/sysmenu/hotsw.h index 6d9602a9..c3a14925 100644 --- a/include/sysmenu/hotsw.h +++ b/include/sysmenu/hotsw.h @@ -18,10 +18,7 @@ #ifndef SYSM_HOTSW_H_ #define SYSM_HOTSW_H_ -#include #include -#include -#include #ifdef __cplusplus extern "C" {