From b59447dd4b646c96995fc6f50aa9a8de66f646a2 Mon Sep 17 00:00:00 2001 From: miya Date: Mon, 27 Oct 2008 05:53:15 +0000 Subject: [PATCH] git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlToolsRED@33 7061adef-622a-194b-ae81-725974e89856 --- build/tools/sctools/common/src/stream.c | 2 +- build/tools/sctools/copy_dst/src/hatamotolib.cpp | 3 ++- build/tools/sctools/copy_dst/src/main.c | 5 ++++- build/tools/sctools/copy_org/src/main.c | 1 + 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/build/tools/sctools/common/src/stream.c b/build/tools/sctools/common/src/stream.c index b2484bd..35ad0bb 100644 --- a/build/tools/sctools/common/src/stream.c +++ b/build/tools/sctools/common/src/stream.c @@ -259,7 +259,7 @@ void stream_main(void) } readSize = 0; - OS_TPrintf("%s %d Readfile %s len=%d\n",__FUNCTION__,__LINE__,myfsfile[i].path, myfsfile[i].length); + // OS_TPrintf("%s %d Readfile %s len=%d\n",__FUNCTION__,__LINE__,myfsfile[i].path, myfsfile[i].length); readSize = FS_ReadFile(&(myfsfile[i].file), myfsfile[i].data, (int)myfsfile[i].length ); if( readSize != myfsfile[i].length ) { OS_TPrintf("Failed Read File: %s %s %d\n",myfsfile[i].path, __FUNCTION__,__LINE__); diff --git a/build/tools/sctools/copy_dst/src/hatamotolib.cpp b/build/tools/sctools/copy_dst/src/hatamotolib.cpp index 3aab952..4008572 100644 --- a/build/tools/sctools/copy_dst/src/hatamotolib.cpp +++ b/build/tools/sctools/copy_dst/src/hatamotolib.cpp @@ -438,7 +438,8 @@ BOOL SetupEC(void) //#define EC_LOG_FINER 5 //#define EC_LOG_FINEST 6 - logLevel = EC_LOG_FINEST; + // logLevel = EC_LOG_FINEST; + logLevel = EC_LOG_FINE; // logLevel = EC_LOG_NONE; LoadCert(&pClientCert, &clientCertSize, ".twl-nup-cert.der"); diff --git a/build/tools/sctools/copy_dst/src/main.c b/build/tools/sctools/copy_dst/src/main.c index 4b1f3a7..dcfe62f 100644 --- a/build/tools/sctools/copy_dst/src/main.c +++ b/build/tools/sctools/copy_dst/src/main.c @@ -773,7 +773,7 @@ void TwlMain(void) reboot_flag = OS_IsRebooted(); /* デバッグのために今だけ強制的にオン(UPDATE mode) */ /* miya */ - reboot_flag = TRUE; + // reboot_flag = TRUE; if( FALSE == SDCardValidation() ) { @@ -892,6 +892,9 @@ void TwlMain(void) } else { + // 不要:NAM の初期化 + NAM_Init(&AllocForNAM, &FreeForNAM); + /* 書き戻し過程 */ if( sd_card_flag == TRUE ) { text_blink_current_line(tc[0]); diff --git a/build/tools/sctools/copy_org/src/main.c b/build/tools/sctools/copy_org/src/main.c index a0ed595..203a679 100644 --- a/build/tools/sctools/copy_org/src/main.c +++ b/build/tools/sctools/copy_org/src/main.c @@ -72,6 +72,7 @@ static void SDEvents(void *userdata, FSEvent event, void *arg) } } + static MyData mydata; #ifdef LCD_UPPER_LOWER_FLIP