mirror of
https://github.com/rvtr/TwlIPL.git
synced 2025-10-31 06:01:12 -04:00
(1572の反映)
NANDパーティションサイズを変更。（Rawパーティションを4MB->1MB) NANDフォーマット関数のソースコードを共通化。 git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@1573 b08762b0-b915-fc4b-9d8c-17b2551a87ff
This commit is contained in:
kamikawa
parent
b756ab0828
commit
77154782a6
@ -57,9 +57,12 @@ LINCLUDES = $(ROOT)/build/libraries/spi/ARM7/include \
|
|||||||
$(ROOT)/build/libraries/init/common/include \
|
$(ROOT)/build/libraries/init/common/include \
|
||||||
$(TWL_IPL_RED_ROOT)/include \
|
$(TWL_IPL_RED_ROOT)/include \
|
||||||
../../NandInitializerRed/common/include \
|
../../NandInitializerRed/common/include \
|
||||||
../../NandInitializerRed/ARM7.TWL/include
|
../../NandInitializerRed/ARM7.TWL/include \
|
||||||
|
../../common/include
|
||||||
|
|
||||||
SRCDIR = ../../NandInitializerRed/ARM7.TWL/src
|
|
||||||
|
SRCDIR = ../../NandInitializerRed/ARM7.TWL/src \
|
||||||
|
../../common/src
|
||||||
|
|
||||||
LLIBRARY_DIRS += $(TWL_IPL_RED_ROOT)/lib/ARM7-TS/$(TWL_BUILD_DIR) \
|
LLIBRARY_DIRS += $(TWL_IPL_RED_ROOT)/lib/ARM7-TS/$(TWL_BUILD_DIR) \
|
||||||
./obj/ARM7-TS.LTD/$(TWL_BUILD_DIR)
|
./obj/ARM7-TS.LTD/$(TWL_BUILD_DIR)
|
||||||
|
|||||||
@ -56,7 +56,10 @@ LINCLUDES += $(ROOT)/build/libraries/spi/ARM7/include \
|
|||||||
$(ROOT)/build/libraries/os/common/include \
|
$(ROOT)/build/libraries/os/common/include \
|
||||||
$(TWL_IPL_RED_ROOT)/include \
|
$(TWL_IPL_RED_ROOT)/include \
|
||||||
../common/include \
|
../common/include \
|
||||||
$(ROOT)/build/libraries/init/common/include
|
$(ROOT)/build/libraries/init/common/include \
|
||||||
|
../../common/include
|
||||||
|
|
||||||
|
SRCDIR += ../../common/src
|
||||||
|
|
||||||
LLIBRARY_DIRS += $(TWL_IPL_RED_ROOT)/lib/ARM7-TS/$(TWL_BUILD_DIR) \
|
LLIBRARY_DIRS += $(TWL_IPL_RED_ROOT)/lib/ARM7-TS/$(TWL_BUILD_DIR) \
|
||||||
./obj/ARM7-TS.LTD/$(TWL_BUILD_DIR)
|
./obj/ARM7-TS.LTD/$(TWL_BUILD_DIR)
|
||||||
|
|||||||
@ -52,7 +52,10 @@ MAKELCF_FLAGS += -DISDBG_LIBS_TWL='$(if $(ISDBG_LIBS_TWL),$(ISDBG_LIBS_TWL),libs
|
|||||||
-DISDBG_LIBS_NITRO='libstubsisd_sp$(TWL_LIBSUFFIX).a'
|
-DISDBG_LIBS_NITRO='libstubsisd_sp$(TWL_LIBSUFFIX).a'
|
||||||
|
|
||||||
LINCLUDES = $(ROOT)/build/libraries/spi/ARM7/include \
|
LINCLUDES = $(ROOT)/build/libraries/spi/ARM7/include \
|
||||||
..//common/include \
|
../common/include \
|
||||||
|
../../common/include
|
||||||
|
|
||||||
|
SRCDIR += ../../common/src
|
||||||
|
|
||||||
LLIBRARIES += libwl_sp$(TWL_LIBSUFFIX).a \
|
LLIBRARIES += libwl_sp$(TWL_LIBSUFFIX).a \
|
||||||
libsdio_sp$(TWL_LIBSUFFIX).a \
|
libsdio_sp$(TWL_LIBSUFFIX).a \
|
||||||
|
|||||||
@ -1,49 +0,0 @@
|
|||||||
/*---------------------------------------------------------------------------*
|
|
||||||
Project: TwlSDK - NandInitializer
|
|
||||||
File: formatter.h
|
|
||||||
|
|
||||||
Copyright 2008 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$
|
|
||||||
*---------------------------------------------------------------------------*/
|
|
||||||
#ifndef NAND_INITIALIZER_FORMATTER_H_
|
|
||||||
#define NAND_INITIALIZER_FORMATTER_H_
|
|
||||||
|
|
||||||
/*---------------------------------------------------------------------------*
|
|
||||||
型定義
|
|
||||||
*---------------------------------------------------------------------------*/
|
|
||||||
|
|
||||||
typedef enum {
|
|
||||||
FORMAT_MODE_QUICK, // Quickフォーマット
|
|
||||||
FORMAT_MODE_FULL // Fullフォーマット(各パーティション内を0xFFで埋める）
|
|
||||||
} FormatMode;
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*===========================================================================*/
|
|
||||||
|
|
||||||
BOOL ExeFormat(FormatMode format_mode);
|
|
||||||
|
|
||||||
/*===========================================================================*/
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
} /* extern "C" */
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* NAND_INITIALIZER_FORMATTER_H_ */
|
|
||||||
|
|
||||||
/*---------------------------------------------------------------------------*
|
|
||||||
End of file
|
|
||||||
*---------------------------------------------------------------------------*/
|
|
||||||
@ -1,422 +0,0 @@
|
|||||||
/*---------------------------------------------------------------------------*
|
|
||||||
Project: TwlSDK - NandInitializer
|
|
||||||
File: formatter.c
|
|
||||||
|
|
||||||
Copyright 2008 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$
|
|
||||||
*---------------------------------------------------------------------------*/
|
|
||||||
|
|
||||||
#include <nitro/types.h>
|
|
||||||
#include <twl/init/crt0.h>
|
|
||||||
#include <twl/memorymap_sp.h>
|
|
||||||
#include <twl/os.h>
|
|
||||||
#include <twl/spi.h>
|
|
||||||
#include <twl/fatfs.h>
|
|
||||||
#include <nitro/pad.h>
|
|
||||||
#include <nitro/std.h>
|
|
||||||
#include <nitro/card.h>
|
|
||||||
#include "formatter.h"
|
|
||||||
|
|
||||||
extern BOOL FATFSi_nandFillPartition( int partition_no, u32* buf, u32 blocks);
|
|
||||||
|
|
||||||
/*---------------------------------------------------------------------------*
|
|
||||||
型定義
|
|
||||||
*---------------------------------------------------------------------------*/
|
|
||||||
|
|
||||||
typedef struct FileProperty {
|
|
||||||
u32 length;
|
|
||||||
const char *path;
|
|
||||||
}FileProperty;
|
|
||||||
|
|
||||||
/*---------------------------------------------------------------------------*
|
|
||||||
定数定義
|
|
||||||
*---------------------------------------------------------------------------*/
|
|
||||||
|
|
||||||
#define ERROR_RETURN() { OS_TPrintf("FATAL ERROR OCCURED %s %s\n", __FILE__, __LINE__); return 0; }
|
|
||||||
|
|
||||||
//------- 重要 --------
|
|
||||||
#define NAND_SIZE 239
|
|
||||||
#define PARTITION_RAW_SIZE 4
|
|
||||||
#define PARTITION_0_SIZE 203
|
|
||||||
#define PARTITION_1_SIZE 32
|
|
||||||
#define NAND_FAT_PARTITION_NUM 2 // FATパーティション数（RAWパーティションを除く）
|
|
||||||
|
|
||||||
|
|
||||||
// const data--------------------------------------------------------
|
|
||||||
//#define NAND_SEPARATE_READ
|
|
||||||
#define FS_READ_BLOCK_SIZE ( 2 * 1024 )
|
|
||||||
#define FATFS_CLUSTER_SIZE ( 16 * 1024 )
|
|
||||||
|
|
||||||
static const char *s_pDirList0[] = {
|
|
||||||
(const char *)"nand:/sys",
|
|
||||||
(const char *)"nand:/title",
|
|
||||||
(const char *)"nand:/ticket",
|
|
||||||
(const char *)"nand:/shared1",
|
|
||||||
(const char *)"nand:/shared2",
|
|
||||||
(const char *)"nand:/import",
|
|
||||||
(const char *)"nand:/tmp",
|
|
||||||
NULL,
|
|
||||||
};
|
|
||||||
|
|
||||||
static const char *s_pDirList1[] = {
|
|
||||||
(const char *)"nand2:/photo",
|
|
||||||
NULL,
|
|
||||||
};
|
|
||||||
|
|
||||||
/*---------------------------------------------------------------------------*
|
|
||||||
内部関数宣言
|
|
||||||
*---------------------------------------------------------------------------*/
|
|
||||||
|
|
||||||
static BOOL CreateDirectory( const char *pDrive, const char **ppDirList );
|
|
||||||
static BOOL CheckDirectory ( const char *pDrive, const char **ppDirList );
|
|
||||||
static BOOL CreateFile( const FileProperty *pFileList );
|
|
||||||
static BOOL CheckFile ( const FileProperty *pFileList );
|
|
||||||
static int MY_ReadFile( FATFSFileHandle file, void *pBuffer, int length );
|
|
||||||
|
|
||||||
/*---------------------------------------------------------------------------*
|
|
||||||
Name: ExeFormat
|
|
||||||
|
|
||||||
Description: Nandのフォーマットを行います
|
|
||||||
|
|
||||||
Arguments:
|
|
||||||
|
|
||||||
Returns: None.
|
|
||||||
*---------------------------------------------------------------------------*/
|
|
||||||
BOOL
|
|
||||||
ExeFormat(FormatMode format_mode)
|
|
||||||
{
|
|
||||||
u32 *init_datbuf;
|
|
||||||
int nand_fat_partition_num;
|
|
||||||
|
|
||||||
init_datbuf = OS_AllocFromSubPrivWram( 512*16 );
|
|
||||||
if( init_datbuf == NULL ) {
|
|
||||||
OS_TPrintf( "memory allocate error.\n" );
|
|
||||||
ERROR_RETURN();
|
|
||||||
}
|
|
||||||
|
|
||||||
MI_CpuFill8( init_datbuf, 0xFF, 512*16);
|
|
||||||
|
|
||||||
// NANDをフォーマット
|
|
||||||
{
|
|
||||||
int i;
|
|
||||||
u8 drive_nand;
|
|
||||||
u8 drive_nand2;
|
|
||||||
char drive_nand_path[4];
|
|
||||||
char drive_nand2_path[4];
|
|
||||||
|
|
||||||
/* パーティションサイズをプロンプトから設定 */
|
|
||||||
u32 partition_MB_size[5];
|
|
||||||
partition_MB_size[0] = PARTITION_RAW_SIZE; // RAW領域
|
|
||||||
partition_MB_size[1] = PARTITION_0_SIZE; // FAT0領域
|
|
||||||
partition_MB_size[2] = PARTITION_1_SIZE; // FAT1領域
|
|
||||||
nand_fat_partition_num = NAND_FAT_PARTITION_NUM;
|
|
||||||
|
|
||||||
// nand&nand2のドライブ割り当てを調べる
|
|
||||||
{
|
|
||||||
const OSMountInfo *info;
|
|
||||||
|
|
||||||
// ランチャーから起動していない場合はshared領域を参照。
|
|
||||||
if (*(const u8 *)HW_TWL_RED_LAUNCHER_VER == 0)
|
|
||||||
{
|
|
||||||
info = OS_GetMountInfo();
|
|
||||||
}
|
|
||||||
// 環境が新ランチャーへ移行しているならそちらを参照。
|
|
||||||
else
|
|
||||||
{
|
|
||||||
extern const u8 SDK_MOUNT_INFO_TABLE[];
|
|
||||||
info = (const OSMountInfo *)SDK_MOUNT_INFO_TABLE;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (; *info->drive; ++info)
|
|
||||||
{
|
|
||||||
if (!STD_CompareNString( "nand2", info->archiveName, 5 ))
|
|
||||||
{
|
|
||||||
drive_nand2 = *(info->drive);
|
|
||||||
STD_TSPrintf(drive_nand2_path, "%c:", drive_nand2);
|
|
||||||
}
|
|
||||||
else if (!STD_CompareNString( "nand", info->archiveName, 4 ))
|
|
||||||
{
|
|
||||||
drive_nand = *(info->drive);
|
|
||||||
STD_TSPrintf(drive_nand_path, "%c:", drive_nand);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// nand nand2 ドライブアンマウント
|
|
||||||
FATFS_UnmountDrive( drive_nand_path );
|
|
||||||
FATFS_UnmountDrive( drive_nand2_path );
|
|
||||||
|
|
||||||
// NANDのパーティションを指定
|
|
||||||
// sizeInMB : パーティションサイズをメガバイト単位で格納した配列
|
|
||||||
// partitions : パーティション総数
|
|
||||||
if (FATFSi_SetNANDPartitions(partition_MB_size, nand_fat_partition_num))
|
|
||||||
{
|
|
||||||
// マウント
|
|
||||||
if (FATFS_MountDrive(drive_nand_path, FATFS_MEDIA_TYPE_NAND, 0))
|
|
||||||
{
|
|
||||||
// デフォルトドライブ設定
|
|
||||||
if (!FATFS_SetDefaultDrive(drive_nand_path))
|
|
||||||
{
|
|
||||||
return FALSE;
|
|
||||||
}
|
|
||||||
// 指定のパスが指すドライブを含むメディア全体を初期化
|
|
||||||
else if(!FATFS_FormatMedia(drive_nand_path))
|
|
||||||
{
|
|
||||||
return FALSE;
|
|
||||||
}
|
|
||||||
// パーティション内を指定バッファの内容でフィルする
|
|
||||||
else if (format_mode == FORMAT_MODE_FULL && !FATFSi_nandFillPartition( 0, init_datbuf, 16))
|
|
||||||
{
|
|
||||||
return FALSE;
|
|
||||||
}
|
|
||||||
// 指定のパスが指すドライブ全体を初期化
|
|
||||||
else if(!FATFS_FormatDrive(drive_nand_path))
|
|
||||||
{
|
|
||||||
return FALSE;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
// FAT1パーティションの初期化
|
|
||||||
for (i = 1; i < nand_fat_partition_num; ++i)
|
|
||||||
{
|
|
||||||
if(!FATFS_MountDrive(drive_nand2_path, FATFS_MEDIA_TYPE_NAND, (u32)i))
|
|
||||||
{
|
|
||||||
return FALSE;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for (i = 1; i < nand_fat_partition_num; ++i)
|
|
||||||
{
|
|
||||||
if (format_mode == FORMAT_MODE_FULL && !FATFSi_nandFillPartition( i, init_datbuf, 16))
|
|
||||||
{
|
|
||||||
return FALSE;
|
|
||||||
}
|
|
||||||
else if (!FATFS_FormatDrive(drive_nand2_path))
|
|
||||||
{
|
|
||||||
return FALSE;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// メモリ解放
|
|
||||||
OS_FreeToSubPrivWram( init_datbuf );
|
|
||||||
|
|
||||||
// ディレクトリ生成＆チェック
|
|
||||||
if (!CreateDirectory( "nand:", s_pDirList0 )) { return FALSE; }
|
|
||||||
if (!CheckDirectory ( "nand:", s_pDirList0 )) { return FALSE; }
|
|
||||||
if (!CreateDirectory( "nand2:", s_pDirList1 )) { return FALSE; }
|
|
||||||
if (!CheckDirectory ( "nand2:", s_pDirList1 )) { return FALSE; }
|
|
||||||
|
|
||||||
// ファイル生成＆チェック
|
|
||||||
// if (!CreateFile( &s_fileList[0] )) { return FALSE; }
|
|
||||||
// if (!CheckFile ( &s_fileList[0] )) { return FALSE; }
|
|
||||||
|
|
||||||
// 成功
|
|
||||||
return TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// ディレクトリ作成
|
|
||||||
static BOOL CreateDirectory( const char *pDrive, const char **ppDirList )
|
|
||||||
{
|
|
||||||
// デフォルトドライブの指定
|
|
||||||
OS_TPrintf( "\nCreate directory : %s\n", pDrive );
|
|
||||||
if( !FATFS_SetDefaultDrive( pDrive ) ) {
|
|
||||||
ERROR_RETURN();
|
|
||||||
}
|
|
||||||
|
|
||||||
// 指定されたディレクトリをルートに作成
|
|
||||||
while( *ppDirList ) {
|
|
||||||
OS_TPrintf( " %s...", *ppDirList );
|
|
||||||
if( !FATFS_CreateDirectory( *ppDirList, "rwxrwxrwx") ) {
|
|
||||||
OS_TPrintf( "ng.\n" );
|
|
||||||
ERROR_RETURN();
|
|
||||||
}
|
|
||||||
OS_TPrintf( "ok.\n" );
|
|
||||||
ppDirList++;
|
|
||||||
}
|
|
||||||
|
|
||||||
return TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// ディレクトリ存在チェック
|
|
||||||
static BOOL CheckDirectory( const char *pDrive, const char **ppDirList )
|
|
||||||
{
|
|
||||||
// デフォルトドライブの指定
|
|
||||||
OS_TPrintf( "\nCheck directory : %s\n", pDrive );
|
|
||||||
if( !FATFS_SetDefaultDrive( pDrive ) ) {
|
|
||||||
ERROR_RETURN();
|
|
||||||
}
|
|
||||||
|
|
||||||
// 指定されたディレクトリをチェック
|
|
||||||
while( *ppDirList ) {
|
|
||||||
FATFSDirectoryHandle dir = FATFS_OpenDirectory( *ppDirList, "rw");
|
|
||||||
OS_TPrintf( " %s...", *ppDirList );
|
|
||||||
if( dir ) {
|
|
||||||
OS_TPrintf( "ok.\n" );
|
|
||||||
(void)FATFS_CloseDirectory( dir );
|
|
||||||
}else {
|
|
||||||
OS_TPrintf( "ng.\n" );
|
|
||||||
ERROR_RETURN();
|
|
||||||
}
|
|
||||||
ppDirList++;
|
|
||||||
}
|
|
||||||
|
|
||||||
return TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// ファイル作成
|
|
||||||
static BOOL CreateFile( const FileProperty *pFileList )
|
|
||||||
{
|
|
||||||
const FileProperty *pTemp = pFileList;
|
|
||||||
u32 length = 0;
|
|
||||||
u8 *pBuffer;
|
|
||||||
|
|
||||||
// ファイルリスト中の最大サイズのバッファを確保し、"0"埋め
|
|
||||||
while( pTemp->path ) {
|
|
||||||
if( length < pTemp->length ) {
|
|
||||||
length = pTemp->length;
|
|
||||||
}
|
|
||||||
pTemp++;
|
|
||||||
}
|
|
||||||
pBuffer = OS_AllocFromSubPrivWram( length );
|
|
||||||
if( pBuffer == NULL ) {
|
|
||||||
OS_TPrintf( "memory allocate error.\n" );
|
|
||||||
ERROR_RETURN();
|
|
||||||
}
|
|
||||||
MI_CpuClearFast( pBuffer, length );
|
|
||||||
|
|
||||||
OS_TPrintf( "\nCreate File :\n" );
|
|
||||||
|
|
||||||
// 指定されたファイルを作成して、"0"埋め
|
|
||||||
while( pFileList->path ) {
|
|
||||||
FATFSFileHandle file;
|
|
||||||
|
|
||||||
OS_TPrintf( " %s, %dbytes...", pFileList->path, pFileList->length );
|
|
||||||
// ファイル生成
|
|
||||||
if( !FATFS_CreateFile( pFileList->path, TRUE, "rwxrwxrwx" ) ) {
|
|
||||||
OS_TPrintf( "ng.\n" );
|
|
||||||
ERROR_RETURN();
|
|
||||||
}
|
|
||||||
// ファイルオープン
|
|
||||||
file = FATFS_OpenFile( pFileList->path, "w" );
|
|
||||||
if( !file ) {
|
|
||||||
OS_TPrintf( "ng.\n" );
|
|
||||||
ERROR_RETURN();
|
|
||||||
}
|
|
||||||
// ファイル長変更
|
|
||||||
if( !FATFS_SetFileLength( file, (int)pFileList->length ) ) {
|
|
||||||
OS_TPrintf( "ng.\n" );
|
|
||||||
ERROR_RETURN();
|
|
||||||
}
|
|
||||||
// ファイル書き込み
|
|
||||||
if( !FATFS_WriteFile( file, pBuffer, (int)pFileList->length ) ) {
|
|
||||||
OS_TPrintf( "ng.\n" );
|
|
||||||
ERROR_RETURN();
|
|
||||||
}
|
|
||||||
// ファイルクローズ
|
|
||||||
(void)FATFS_CloseFile( file );
|
|
||||||
OS_TPrintf( "ok.\n" );
|
|
||||||
pFileList++;
|
|
||||||
}
|
|
||||||
// メモリ解放
|
|
||||||
OS_FreeToSubPrivWram( pBuffer );
|
|
||||||
|
|
||||||
return TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// ファイルチェック
|
|
||||||
static BOOL CheckFile( const FileProperty *pFileList )
|
|
||||||
{
|
|
||||||
// デフォルトドライブの指定
|
|
||||||
OS_TPrintf( "\nCheck File :\n" );
|
|
||||||
|
|
||||||
// 指定されたディレクトリをルートに作成
|
|
||||||
while( pFileList->path ) {
|
|
||||||
FATFSFileHandle file;
|
|
||||||
u32 *pBuffer;
|
|
||||||
int i;
|
|
||||||
OSTick start;
|
|
||||||
|
|
||||||
OS_TPrintf( " %s, %dbytes...", pFileList->path, pFileList->length );
|
|
||||||
// ファイルオープン
|
|
||||||
file = FATFS_OpenFile( pFileList->path, "r+" );
|
|
||||||
if( !file ) {
|
|
||||||
OS_TPrintf( "ng.\n" );
|
|
||||||
ERROR_RETURN();
|
|
||||||
}
|
|
||||||
// ファイル長チェック
|
|
||||||
if( FATFS_GetFileLength( file ) != pFileList->length ) {
|
|
||||||
OS_TPrintf( "ng. length = %d\n", FATFS_GetFileLength( file ) );
|
|
||||||
ERROR_RETURN();
|
|
||||||
}
|
|
||||||
// バッファ メモリ確保
|
|
||||||
pBuffer = OS_AllocFromSubPrivWram( pFileList->length );
|
|
||||||
if( pBuffer == NULL ) {
|
|
||||||
OS_TPrintf( "memory allocate error.\n" );
|
|
||||||
ERROR_RETURN();
|
|
||||||
}
|
|
||||||
start = OS_GetTick();
|
|
||||||
// ファイル読み込み
|
|
||||||
if(
|
|
||||||
#ifdef NAND_SEPARATE_READ
|
|
||||||
MY_ReadFile( file, pBuffer, (int)pFileList->length )
|
|
||||||
#else
|
|
||||||
FATFS_ReadFile( file, pBuffer, (int)pFileList->length )
|
|
||||||
#endif
|
|
||||||
!= pFileList->length ) {
|
|
||||||
OS_TPrintf( "ng.\n" );
|
|
||||||
ERROR_RETURN();
|
|
||||||
}
|
|
||||||
OS_TPrintf( " [ReadTime : %dms] ", OS_TicksToMilliSeconds( OS_GetTick() - start ) );
|
|
||||||
start = OS_GetTick();
|
|
||||||
// ファイルベリファイ
|
|
||||||
for( i = 0; i < pFileList->length / sizeof(u32); i++ ) {
|
|
||||||
if( pBuffer[ i ] != 0 ) {
|
|
||||||
OS_TPrintf( "ng.\n" );
|
|
||||||
ERROR_RETURN();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
OS_TPrintf( " [VerifyTime : %dms] ", OS_TicksToMilliSeconds( OS_GetTick() - start ) );
|
|
||||||
// メモリ解放
|
|
||||||
OS_FreeToSubPrivWram( pBuffer );
|
|
||||||
// ファイルクローズ
|
|
||||||
(void)FATFS_CloseFile( file );
|
|
||||||
OS_TPrintf( "ok.\n" );
|
|
||||||
pFileList++;
|
|
||||||
}
|
|
||||||
|
|
||||||
return TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef NAND_SEPARATE_READ
|
|
||||||
// NAND不具合をARM7側のFSは吸収しきれいていないので、自前で2KB単位に分割してリード
|
|
||||||
static int MY_ReadFile( FATFSFileHandle file, void *pBuffer, int length )
|
|
||||||
{
|
|
||||||
int length_bak = length;
|
|
||||||
while( length ) {
|
|
||||||
int rdLength = ( length > FS_READ_BLOCK_SIZE ) ? FS_READ_BLOCK_SIZE : length;
|
|
||||||
|
|
||||||
if( FATFS_ReadFile( file, pBuffer, rdLength ) != rdLength ) {
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
pBuffer = (u8 *)pBuffer + rdLength;
|
|
||||||
length -= rdLength;
|
|
||||||
}
|
|
||||||
return length_bak;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
@ -45,8 +45,8 @@ typedef struct FileProperty {
|
|||||||
|
|
||||||
//------- 重要 --------
|
//------- 重要 --------
|
||||||
#define NAND_SIZE 239
|
#define NAND_SIZE 239
|
||||||
#define PARTITION_RAW_SIZE 4
|
#define PARTITION_RAW_SIZE 1
|
||||||
#define PARTITION_0_SIZE 203
|
#define PARTITION_0_SIZE 206
|
||||||
#define PARTITION_1_SIZE 32
|
#define PARTITION_1_SIZE 32
|
||||||
#define NAND_FAT_PARTITION_NUM 2 // FATパーティション数（RAWパーティションを除く）
|
#define NAND_FAT_PARTITION_NUM 2 // FATパーティション数（RAWパーティションを除く）
|
||||||
|
|
||||||
Loading…
Reference in New Issue
Block a user