From b25b9ce9ea37c2f5d0f5f414bf146295a55aeb36 Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Tue, 21 Jul 2009 06:19:59 +0000
Subject: [PATCH] =?UTF-8?q?=E3=82=BD=E3=83=BC=E3=82=B9=E3=81=AE=E6=95=B4?=
 =?UTF-8?q?=E7=90=863?=
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@2875 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 .../NandFirmWriter/ARM9.TWL/Makefile          | 11 +++------
 .../ARM9.TWL/include/kami_write_nandfirm.h    | 24 +++++++++++++++++++
 .../ARM9.TWL/src/kami_write_nandfirm.c        |  1 -
 3 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/build/systemMenu_tools/NandFirmWriter/ARM9.TWL/Makefile b/build/systemMenu_tools/NandFirmWriter/ARM9.TWL/Makefile
index dd94c935..9e564e17 100644
--- a/build/systemMenu_tools/NandFirmWriter/ARM9.TWL/Makefile
+++ b/build/systemMenu_tools/NandFirmWriter/ARM9.TWL/Makefile
@@ -53,16 +53,13 @@ SRCDIR				=	src \
 
 #----------------------------------------------------------------------------
 
-include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
+include $(TWLSDK_ROOT)/build/buildtools/commondefs
 
 MAKEROM_FLAGS		+=	-DTITLEID_LO='$(TITLEID_LO)' \
 						-DDISABLE_DEBUG='$(SYSM_DISABLE_DEBUG)'
 
 MAKETAD_FLAGS		+=	-s
 
-SYSMENU_LIBS		=	\
-						libnamut$(TWL_LIBSUFFIX).a
-
 SDK_APPEND_LIBS		=	\
 						libes$(TWL_LIBSUFFIX).a \
 						libboc$(TWL_LIBSUFFIX).a \
@@ -70,8 +67,7 @@ SDK_APPEND_LIBS		=	\
 						libnam$(TWL_LIBSUFFIX).a \
 						libsea$(TWL_LIBSUFFIX).a \
 						liblcfg$(TWL_LIBSUFFIX).a \
-						libna$(TWL_LIBSUFFIX).a \
-						liberrorlog$(TWL_LIBSUFFIX).a
+						libna$(TWL_LIBSUFFIX).a 
 
 LLIBRARIES			+=	$(SYSMENU_LIBS) $(SDK_APPEND_LIBS)
 
@@ -85,7 +81,6 @@ INSTALL_DIR			=	$(SDK_NMENU_DATADIR)
 
 do-build:		$(TARGETS)
 
-#include	$(TWLSDK_ROOT)/build/buildtools/modulerules
-include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
+include	$(TWLSDK_ROOT)/build/buildtools/modulerules
 
 #===== End of Makefile =====
diff --git a/build/systemMenu_tools/NandFirmWriter/ARM9.TWL/include/kami_write_nandfirm.h b/build/systemMenu_tools/NandFirmWriter/ARM9.TWL/include/kami_write_nandfirm.h
index c1da0b6e..67e0a469 100644
--- a/build/systemMenu_tools/NandFirmWriter/ARM9.TWL/include/kami_write_nandfirm.h
+++ b/build/systemMenu_tools/NandFirmWriter/ARM9.TWL/include/kami_write_nandfirm.h
@@ -33,6 +33,30 @@ extern "C" {
 typedef void* (*KAMIAlloc)(u32 size);
 typedef void  (*KAMIFree)(void* ptr);
 
+
+// DS-IPL2ヘッダ
+typedef struct
+{
+	u16		reserved_0h[4];
+	u32		ds_key;
+	u16		ds_arm9_romAdr;
+	u16		ds_arm9_ramAdr;
+	u16		ds_arm7_romAdr;
+	u16		ds_arm7_ramAdr;
+	u16		ds_arm9_romOffsetUnit:3;
+	u16		ds_arm9_ramOffsetUnit:3;
+	u16		ds_arm7_romOffsetUnit:3;
+	u16		ds_arm7_ramOffsetUnit:3;
+	u16		:2;
+	u16		ds_header_ver:2;
+	u16		ds_data_romAdr;
+	u64		card_key;
+	u16		ncd_romAdr;
+	u16		reserved_24h[2];
+	u16		ds_data_crc16;
+}
+NORHeaderDS;
+
 /*---------------------------------------------------------------------------*
     関数定義
  *---------------------------------------------------------------------------*/
diff --git a/build/systemMenu_tools/NandFirmWriter/ARM9.TWL/src/kami_write_nandfirm.c b/build/systemMenu_tools/NandFirmWriter/ARM9.TWL/src/kami_write_nandfirm.c
index 24ff9d44..7d3bc79a 100644
--- a/build/systemMenu_tools/NandFirmWriter/ARM9.TWL/src/kami_write_nandfirm.c
+++ b/build/systemMenu_tools/NandFirmWriter/ARM9.TWL/src/kami_write_nandfirm.c
@@ -21,7 +21,6 @@
 #include <nitro/snd.h>
 #include <twl/nam.h>
 #include <nitro/nvram.h>
-#include <firm/format/firm_common.h>
 #include <../build/libraries/spi/ARM9/include/spi.h>
 
 #include "common_utility.h"