From 82dcfe1e930bd46297c29abdf1bd8ae04698acc2 Mon Sep 17 00:00:00 2001
From: miya <miya@randommeaninglesscharacters.com>
Date: Tue, 20 Apr 2010 07:39:23 +0000
Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E8=A8=AD=E5=AE=9A=E3=82=92=E3=82=AA?=
 =?UTF-8?q?=E3=83=AA=E3=82=B8=E3=83=8A=E3=83=AB=E3=81=AE=E8=A8=AD=E5=AE=9A?=
 =?UTF-8?q?=E3=81=8B=E3=82=89=E3=81=9D=E3=81=AE=E3=81=BE=E3=81=BE=E4=BD=BF?=
 =?UTF-8?q?=E3=81=86=E3=82=88=E3=81=86=E4=BF=AE=E6=AD=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlToolsRED@502 7061adef-622a-194b-ae81-725974e89856
---
 build/tools/sctools/common/src/hwi.c      | 4 ++--
 build/tools/sctools/copy_dst/src/main.c   | 3 +--
 build/tools/sctools/copy_dst/src/mfiler.c | 5 ++++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/build/tools/sctools/common/src/hwi.c b/build/tools/sctools/common/src/hwi.c
index db5d742..1c618ba 100644
--- a/build/tools/sctools/common/src/hwi.c
+++ b/build/tools/sctools/common/src/hwi.c
@@ -357,8 +357,8 @@ BOOL MiyaRestoreTWLSettings(const char *path)
 
 
 #if 1
-  // 国が選択されていないなら適当に設定
-  if( LCFG_TSD_GetCountry() == LCFG_TWL_COUNTRY_UNDEFINED ) {
+  if( cfg_data.country == LCFG_TWL_COUNTRY_UNDEFINED ) {
+    // 国が選択されていないなら適当に設定
     switch( LCFG_THW_GetRegion() ) {
     case OS_TWL_REGION_JAPAN:
       cfg_data.country = LCFG_TWL_COUNTRY_JAPAN;
diff --git a/build/tools/sctools/copy_dst/src/main.c b/build/tools/sctools/copy_dst/src/main.c
index dfffbbd..9b68082 100644
--- a/build/tools/sctools/copy_dst/src/main.c
+++ b/build/tools/sctools/copy_dst/src/main.c
@@ -533,10 +533,10 @@ static BOOL RestoreFromSDCard3(void)
 
 static BOOL RestoreFromSDCard4(void)
 {
-  // static BOOL SDBackupToSDCard3(void)
   if( mydata.user_settings_flag == TRUE ) {
     mprintf("User setting param. restore  ");
     if( TRUE == MiyaRestoreTWLSettings( MyFile_GetUserSettingsFileName() ) ) {
+      /*   国設定完了 LCFG_TSD_SetCountry( (LCFGTWLCountryCode)cfg_data.country ) */
       m_set_palette(tc[0], M_TEXT_COLOR_GREEN );
       mprintf("OK.\n");
       m_set_palette(tc[0], M_TEXT_COLOR_WHITE );
@@ -557,7 +557,6 @@ static BOOL RestoreFromSDCard4(void)
 
 static BOOL RestoreFromSDCard5(void)
 {
-  // static BOOL SDBackupToSDCard4(void)
   int list_count;
   int error_count;
   BOOL ret_flag = TRUE;
diff --git a/build/tools/sctools/copy_dst/src/mfiler.c b/build/tools/sctools/copy_dst/src/mfiler.c
index bf8e108..e45709c 100644
--- a/build/tools/sctools/copy_dst/src/mfiler.c
+++ b/build/tools/sctools/copy_dst/src/mfiler.c
@@ -157,7 +157,6 @@ int MFILER_ReadDir(MY_ENTRY_LIST **headp, const char *path_src)
   while( FS_ReadDirectory(&f_src, &entry_src) ) {
 
     if( STD_StrCmp(entry_src.longname, ".") == 0 ) {
-
     }
     else if( STD_StrCmp(entry_src.longname, "..") == 0 ) {
     }
@@ -165,6 +164,10 @@ int MFILER_ReadDir(MY_ENTRY_LIST **headp, const char *path_src)
     }
     else if( STD_StrCmp(entry_src.longname, "nup_log.txt") == 0 ) {
     }
+    else if( STD_StrCmp(entry_src.longname, "sdtads") == 0 ) {
+    }
+    else if( STD_StrCmp(entry_src.longname, "sdtaddevs") == 0 ) {
+    }
     else if( entry_src.attributes & FS_ATTRIBUTE_DOS_VOLUME ) {
     }
     else {