From 7ef1a1e6eb6368c9ab572c976c3dfc0a4c805042 Mon Sep 17 00:00:00 2001
From: mizu <mizu@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Fri, 21 Sep 2012 05:35:56 +0000
Subject: [PATCH] git-svn-id:
 file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_Repair@712
 385bec56-5757-e545-9c3a-d8741f4650f1

---
 trunk/CardSaveData/Mover/body/OMakefile       |    4 +-
 trunk/CardSaveData/Mover/body/body_card2.rsf  |    6 +-
 trunk/CardSaveData/Mover/body/source/main.cpp | 2245 ++++++-----------
 trunk/CardSaveData/Mover/body/source/main.h   |   15 +-
 .../Mover/body/source/screen/screen.cpp       |  605 ++---
 .../Mover/body/source/screen/screen.h         |   42 +-
 trunk/CardSaveData/Mover/body/source/sub.cpp  |  462 ++++
 trunk/CardSaveData/Mover/body/source/sub.h    |   75 +
 trunk/CardSaveData/Mover/body/ver.h           |    3 +-
 trunk/CardSaveData/Mover/card2注�.txt        |   16 +
 trunk/CardSaveData/Mover/release.txt          |    9 +-
 trunk/CardSaveData/common/common.cpp          |   59 +-
 trunk/CardSaveData/common/gui/gui.cpp         |   53 +-
 trunk/CardSaveData/common/gui/gui.h           |    3 +
 trunk/CardSaveData/common/icon.icn            |  Bin 0 -> 14016 bytes
 trunk/CardSaveData/common/my_defs.h           |    3 +
 .../CardSaveData/common/savefile/savefile.cpp |   47 +-
 trunk/CardSaveData/common/savefile/savefile.h |    8 +-
 trunk/CardSaveData/common/shfnt.cpp           |   39 +-
 trunk/CardSaveData/common/test_data.cpp       |  367 ++-
 20 files changed, 2063 insertions(+), 1998 deletions(-)
 create mode 100644 trunk/CardSaveData/Mover/body/source/sub.cpp
 create mode 100644 trunk/CardSaveData/Mover/body/source/sub.h
 create mode 100644 trunk/CardSaveData/Mover/card2注�.txt
 create mode 100644 trunk/CardSaveData/common/icon.icn

diff --git a/trunk/CardSaveData/Mover/body/OMakefile b/trunk/CardSaveData/Mover/body/OMakefile
index d0c22ec..b06b205 100644
--- a/trunk/CardSaveData/Mover/body/OMakefile
+++ b/trunk/CardSaveData/Mover/body/OMakefile
@@ -28,6 +28,7 @@ CTR_APPTYPE = BOTH
 #SD‚ɃZ�[ƒu‚·‚é�ê�‡‚Ímembak -> exsave •Ï�X
 SOURCES[]           =
                         ./source/main.cpp
+                        ./source/sub.cpp
                         ./source/screen/screen.cpp
                         ../../common/savefile/savedata.cpp
                         ../../common/savefile/membak.cpp
@@ -70,7 +71,8 @@ CTR_BANNER_SPEC      =   banner_null_icon.bsf
 #Cia ƒo�[ƒWƒ‡ƒ“:ƒ}ƒXƒ^ƒŠƒ“ƒO–ˆ‚É�X�V‚·‚邱‚Æ
 #ƒ�ƒWƒƒ�[‚Írsf‚ÅŽw’è(Remasterversion)
 #micro ‚Ì�ãŒÀ‚Í15(4bit)
-MAKECIAFLAGS = -minor 1 -micro 1
+#latest release 2.1.3 :2012/9/21 ver 2.0
+MAKECIAFLAGS = -minor 1 -micro 3
 
 include $(ROOT_OMAKE)/modulerules
 
diff --git a/trunk/CardSaveData/Mover/body/body_card2.rsf b/trunk/CardSaveData/Mover/body/body_card2.rsf
index 130ce4c..052094c 100644
--- a/trunk/CardSaveData/Mover/body/body_card2.rsf
+++ b/trunk/CardSaveData/Mover/body/body_card2.rsf
@@ -5,7 +5,7 @@ BasicInfo:
   Logo : Nintendo
 #  CompanyCode: "00"
   ProductCode     : "CTR-N-22NA"
-  MediaSize : 512MB
+#  MediaSize : 2G
 
 TitleInfo:
 #  Category: 0x0010
@@ -15,10 +15,10 @@ TitleInfo:
 
 Rom:
   HostRoot      : romfiles
-  SaveDataSize: 256MB
+  SaveDataSize: 20MB
 
 CardInfo:
-  CardDevice: None
+#  CardDevice: None
   MediaType: Card2
 
 AccessControlInfo:
diff --git a/trunk/CardSaveData/Mover/body/source/main.cpp b/trunk/CardSaveData/Mover/body/source/main.cpp
index 9071a20..dff485b 100644
--- a/trunk/CardSaveData/Mover/body/source/main.cpp
+++ b/trunk/CardSaveData/Mover/body/source/main.cpp
@@ -18,75 +18,61 @@
 #include <nn.h>
 //#include <nn/os.h>
 #include <nn/applet.h>
+#include <nn/crypto.h>
 #include <nn/ndm.h>
 #include <nn/cfg.h>
+#include <nn/cfg/ctr/cfg_apiinit.h>
 //#include <nn/ndm/ndm_DebugControl.h>
 #include <nn/ndm/ndm_UserControl.h>
 #include <nn/fs/ctr/mpcore/fs_FileSystemBasePrivate.h>
 #include <nn/fs/fs_Parameters.h>
 //#include <nn/fs/fs_ApiProcessInfo.h>
-#include "../../../common/savefile/savefile.h"
-#include "../../../common/savefile/savedata.h"
-#include "../../../common/savefile/membak.h"
 #include "./screen/screen.h"
+#include "../ver.h"
 #include "../../../common/common.h"
 
-//ヘッダ�フラグ���コメントアウト�旧版相当(SD�対応)
+#include "sub.h"
 #include "main.h"
-#ifdef CSM_FLAG_USE_SD
-#include "../../../common/savefile/exsave.h"
-#endif
 
 nn::fnd::ExpHeap appHeap;
 uptr heapForGx;
-//Gui gui;
 myResult errRes;
-
-//char strBuff[128];
-//bool exist;
-
-SaveData savedata;
-nn::os::LightEvent ejectEvnt(false);
-nn::os::LightEvent insEvnt(false);
-#ifdef CSM_FLAG_USE_SD
-ExSave exsave;
-nn::os::LightEvent ejectEvntSd(false);
-nn::os::LightEvent insEvntSd(false);
-bool BkupSd = false;//�ックアップ先�SD�(ファイルサイズ�計��択)
-#endif
-MemBak memsave;
+bool alive_Sd;//SD有効フラグ
+TgtDev BkupDev = TGT_MEM;//�ックアップ先(MEM or SD)
+bool forceSD = false;//強制�SD使用
 
 //�ックアップ�状態
-bool Active,Formatted;
-bool exActive,exFormatted;
+bool Active,Formatted;//カード�り�セーブ�り
+bool Effective = false;//リード済�
 tArcInfo arcInfo,arcInfo2;//アーカイブ情報
 tDcList dcList,dcList2;//ディレクトリ格�
 
+//動作モード
+bool CopyMode=false;
 
-//プロダクトコード�一致
-bool isAgreePCode;
-//SD�り起動
-bool alive_Sd;
+//セーブデータを扱�クラス
+CsmSaveFile save;
 
-//Top画�エラー表示
-int tmerr;
+//Top画�表示
+int tm_err,tm_mode;
 
 //�果
 typedef enum {
     SUCCESS
     ,ERROR
     ,CANCEL
-    ,INSEXIT
+    ,INSEJECT
 }RetCode;
 
 //挿抜イベント時�設定
-typedef enum {
-    InEx_None
-    ,InEx_InsCard
-    ,InEx_EjcCard
-    ,InEx_InsSd
-    ,InEx_EjcSd
-}tIsInsEject;
+#define InEj_None 0
+#define InEj_InsCard 1
+#define InEj_EjcCard 2
+#define InEj_InsSd 4
+#define InEj_EjcSd 8
+
+#define InEj_Sd (InEj_InsSd + InEj_EjcSd)
+#define InEj_Card (InEj_InsCard + InEj_EjcCard)
 
 //メッセージ用タグ
 enum eMesTag{
@@ -100,28 +86,33 @@ MT_Complate,//終了
 MT_CardFormat,//ユーザセーブ�フォーマット時
 MT_FormatOnly,//フォーマット��行����(ファイル��時)
 MT_Writing,//ライト中
-MT_CrtDir1,//ディレクトリ作�中��1
-MT_CrtDir2,//��２(1,2を交互表示)
-MT_Copy1,// ファイルコピー
-MT_Copy2,//ファイルコピー
+MT_CrtDir,//ディレクトリ作�中
+MT_Copy,// ファイルコピー
 MT_Failed,//失敗
 MT_Break,//中断
 MT_Success,//�功
+MT_ExIcn1,//"�" 実行中アイコン１
+MT_ExIcn2,//" | " �２(1,2 交互�表示)
 MT_END
 };
 
 tChar* MES_NULL = L"";
 
+//メモリ or SD 判定用
+#define MEM_BKUP_LIMIT (MEM_BKUP_SIZE - 1024*1024)
+
 //文字数(終端込)
 #define MESS_SIZE 32
 //メッセージ格�
 wchar_t Mess[MT_END*MESS_SIZE];
+wchar_t MessWork[MESS_SIZE];
+wchar_t MessWork2[MESS_SIZE];
 //メッセージ�置
 int MessPos[MT_END];
 
 #define MessTxt(i) (wchar_t*)&Mess[MessPos[i]]
 
-tIsInsEject isInsEject;
+int isInsEject;
 extern u8 scr_evnt;
 s64 sSize;
 
@@ -131,54 +122,138 @@ int rename_n =0;//リ�ーム番�
 wchar_t file_pathw[MAX_PATH_LENGTH];
 wchar_t file_pathw2[MAX_PATH_LENGTH];
 char file_path[MAX_PATH_LENGTH];
-//ドライ��仕様�速度的�４�イトアライン��方���(SDK 0.14.23 時点)
-char fileBuffer[512] NN_ATTRIBUTE_ALIGN(4);//検証�512�����
-char fileBuffer_ex[512] NN_ATTRIBUTE_ALIGN(4);
-#define FILEBUFF_SIZE sizeof(fileBuffer)
 
 
-void WaitUI();
+u8 WaitUI();
 void PutError(TgtDev dev,int cd=0);
-RetCode Card2Sd();
-RetCode Sd2Card();
-void CheckSaveDataState();
-void CheckExSaveState();
+void failstop();
+myResult OpenWork(TgtDev dev);
+void Delete();
+void InsEjcErrPut();
+void Evt_SdInEx();
+void DeleteWork();
 
 //------------------------------------------------------------ 挿抜�ェック
-bool CheckInsExit()
-{
+//イベント
+nn::os::LightEvent ejectEvnt(false);
+nn::os::LightEvent insEvnt(false);
+#ifndef CSM_FLAG_DEBUG
+nn::os::LightEvent ejectEvntSd(true);//SD�自動クリア��
+nn::os::LightEvent insEvntSd(true);
+#else
+nn::os::LightEvent ejectEvntSd(false);//挿抜�り
+nn::os::LightEvent insEvntSd(false);
+#endif
 
+void InitInsEject()
+{
+    //挿抜イベント
+    //クラス関数内��登録�上手�����（謎）
+    isInsEject = InEj_None;
+    ejectEvnt.ClearSignal();
+    insEvnt.ClearSignal();
+    ejectEvntSd.ClearSignal();
+    insEvntSd.ClearSignal();
+    nn::fs::RegisterCardEjectedEvent(&ejectEvnt);
+    nn::fs::RegisterCardInsertedEvent(&insEvnt);
+    nn::fs::RegisterSdmcEjectedEvent(&ejectEvntSd);
+    nn::fs::RegisterSdmcInsertedEvent(&insEvntSd);
+}
+
+bool CheckInsEjectCard()
+{
     if (ejectEvnt.TryWait()){
-        //CARD抜�
-        CheckSaveDataState();
-        isInsEject = InEx_EjcCard;
+        isInsEject |= InEj_EjcCard;
         return true;
     }
     if (insEvnt.TryWait()){
-        //CARD挿入
-        CheckSaveDataState();
-        isInsEject = InEx_InsCard;
+        isInsEject |= InEj_InsCard;
         return true;
     }
-#ifdef CSM_FLAG_USE_SD
-    if(alive_Sd){
+    return false;
+}
+
+
+bool CheckInsEjectSD()
+{
+    //if(alive_Sd){
         if (ejectEvntSd.TryWait()){
-            //SD抜�
-            CheckExSaveState();
-            isInsEject = InEx_EjcSd;
+            isInsEject |= InEj_EjcSd;
             return true;
         }
         if (insEvntSd.TryWait()){
-            //SD挿入
-            CheckExSaveState();
-            isInsEject = InEx_InsSd;
+            isInsEject |= InEj_InsSd;
             return true;
         }
-    }
-#endif
-        return false;
+   // }
+    return false;
 }
 
+bool CheckInsEject()
+{
+    CheckInsEjectSD();
+    CheckInsEjectCard();
+    return (isInsEject != InEj_None);
+}
+
+
+//---------------------　表示更新
+void UpdateStatus(){
+    
+    CheckInsEject();//挿抜�ェック
+    if (isInsEject & InEj_Sd) Evt_SdInEx();//SD挿抜
+    Active = save.stsActive(TGT_CARD);//内部�GetPrdCode
+    if (Active)Formatted = save.stsFormatted(TGT_CARD);
+    else Formatted = false;
+    if (Effective==false )  arcInfo.Pcode[0] = 0;//プロダクト(ワーク�)表示を消�
+
+    if(Active){//カード�り
+        if (Effective)
+        {//リード�り
+            if (strcmp(save.PrdCode,arcInfo.Pcode)==0)
+            {//プロダクトコード一致
+                tm_mode = SCR_MENU_WRITE;//ライトメニュー
+                tm_err = SCR_ERRPUT_NONE;
+            }else
+            {
+                tm_mode = SCR_MENU_NONE;
+                tm_err = SCR_ERRPUT_PCODE;//プロダクトコード���
+            }
+        }else
+        {//��
+            if (Formatted){//セーブ存在
+                tm_mode = SCR_MENU_READ;//リードメニュー
+                tm_err = SCR_ERRPUT_NONE;
+            }else{
+                tm_mode = SCR_MENU_NONE;
+                tm_err = SCR_ERRPUT_MEDIA;//セーブ�読���
+            }
+        }
+    }else{
+        tm_mode = SCR_MENU_NONE;
+        tm_err = SCR_ERRPUT_CARD;//カード�入����
+    }
+    isInsEject = InEj_None;//フラグクリア
+
+    scr_PrdCode(save.PrdCode);//プロダクトコード表示
+    scr_PrdCodeEx(arcInfo.Pcode);//プロダクトコード表示
+}
+
+
+//SD挿抜
+void Evt_SdInEx()
+{
+#ifdef CSM_FLAG_DEBUG
+    save.Unmount(TGT_SD);//�マウント
+    save.Mount(TGT_SD);
+#else
+    ScrClr();
+    scr_InsEjectSD();
+    failstop();//�止
+#endif
+}
+
+
 
 //---------------------------------------------------------------- 終了処�
 void endfunc()
@@ -189,17 +264,13 @@ void endfunc()
     ejectEvnt.Finalize();
     insEvnt.Finalize();
 
-#ifdef CSM_FLAG_USE_SD
-    if (alive_Sd){
-        nn::fs::UnregisterSdmcEjectedEvent();
-        nn::fs::UnregisterSdmcInsertedEvent();
-        ejectEvntSd.Finalize();
-        insEvntSd.Finalize();
-    }
-#endif
-    savedata.Finalize();
-    memsave.Finalize();
+    nn::fs::UnregisterSdmcEjectedEvent();
+    nn::fs::UnregisterSdmcInsertedEvent();
+    ejectEvntSd.Finalize();
+    insEvntSd.Finalize();
 
+    save.Finalize();
+    save.Unmount();
     ScrFinalize();
 
 }
@@ -208,30 +279,22 @@ void endfunc()
 void failstop()
 {
     NN_LOG("fail %d,stop\n",errRes);
- 
+    save.Finalize();
     while(1){
     	CheckSysBreak();
     }
 }
 
+
 //エラー表示
 tChar sts[64];
 void PutError(TgtDev dev,int cd)
 {
-    nn::Result res;
-    switch (dev)
-    {
-        case TGT_CARD: res = savedata.LastNnResult;break;
-        case TGT_MEM: res = memsave.LastNnResult;break;
-#ifdef CSM_FLAG_USE_SD
-        case TGT_SD: res = exsave.LastNnResult;break;
-#endif
-        default: dev = TGT_NONE;//GetDescriptエラー対策
-    }
-    GetErrorStr(dev,res,cd,sts);
+    GetErrorStr(dev,save.LastNnResult(dev),cd,sts);
     scr_Status(sts,COLOR_RED);
 }
 
+
 //表示テキスト�読込(eMessTag�順)
 //テキスト�SJISやASCII���U-16��存�文字列�改行(0a0d)�終�る
 //BOM(先頭２�イト�ゴミ ^^; )�付���事
@@ -302,168 +365,189 @@ void LoadMessText(wchar_t* path)
     nn::fs::Unmount("rom:");
 }
 
-//ユーザセーブ�ブロックリード
-//中身�データ�作�サイズ�満���場��
-//未書込�領域�検証エラー(desc=329)��る場���る
-//読���ブロック���置���る(SDKツール�SaveFiler���方法..ロン�当時)
-//size = サイズ
-//        検証�512���読��る����置�����よ�512以下�指定
-//        尚�ユーザセーブ以外�検証�4096��
-//pos = �置指定
-//         SDK3.1(より？)エラー時�ファイル�インタ更新�����2.0より
-bool ReadBlock(s64 pos,int size)
+//動作中アイコン
+//�ら���MessWork�入��る文字列�付�る
+int IconCt=0;
+void Icon(eColor col){
+        wcscpy(MessWork2,MessWork);
+        if(++IconCt & 1) wcscat(MessWork2,MessTxt(MT_ExIcn1));//"-"
+        else wcscat(MessWork2,MessTxt(MT_ExIcn2));//"|"
+        scr_Status(MessWork2,col);
+}
+
+
+//ワーク�ルート�置�
+//起動時リード�る��
+// アーカイブ情報や空ディレクトリも�����ダメ
+wchar_t WorkPath[] = L"/work.bin";
+u32 WorkNumber=0,WorkNumberBkup=0;
+#define WORK_HEADER_SIZE 4
+
+struct tWorkInfo
 {
-    if ((size > 512) || (size < 0))return false;
-    savedata.SetPos(pos);
-    if(savedata.Read(fileBuffer,size) != size )
-    {
-        NN_LOG("%d\n",savedata.LastNnResult.GetDescription());
-        if(nn::fs::ResultVerificationFailed::Includes(savedata.LastNnResult))
-        {//検証エラー
-            for (int i = 0; i < size; i++) fileBuffer[i] = 0;//0埋�
-        }else return false;
+    wchar_t path[MAX_PATH_LENGTH];
+    u32 size;//max 4Gbyte
+};
+
+tWorkInfo work_info;
+#define WORK_INFO_SIZE sizeof(tWorkInfo)
+
+//ワークファイル作�
+bool CreateWork(TgtDev dev,tArcInfo *ai)
+{
+    s64 size;
+    bool res;
+    //int n;
+    
+    if (Effective || (dev == TGT_CARD))return false;//無効
+    DeleteWork();//ワーク削除
+    //n = save.LastNnResult(dev).GetDescription();
+    //NN_LOG("%d\n",n);
+    size = ai->total + WORK_HEADER_SIZE + (WORK_INFO_SIZE * ai->FileCount);
+    if (dev == TGT_SD){
+        res = save.CreateFile(dev,WorkPath,size);//拡張セーブ�Open��Create必��MEM�OpenW��
+        //NN_LOG("%d\n",save.LastNnResult(dev).GetDescription());
+    }else{
+        res = (save.Create(dev,1,1) == RESULT_OK);//MEM�ファイル��消去無���アーカイブ��
     }
-    return true;
+    if (res)
+     if (save.OpenW(dev,WorkPath,size)){
+        while(1){ //先頭�乱数セット
+            nn::crypto::GenerateRandomBytes( (char*)&WorkNumber,WORK_HEADER_SIZE );
+            //��FFFFFFFF��回���値　�使���
+            if ( (WorkNumber != 0) && (WorkNumber != 0xffffffff)
+                && (WorkNumber != WorkNumberBkup))break;
+        }
+        WorkNumberBkup = WorkNumber;
+        NN_LOG("create work,number = %4x\n",WorkNumber);
+        if (save.Write(dev,(char*)&WorkNumber,WORK_HEADER_SIZE) 
+            == WORK_HEADER_SIZE) Effective = true;
+        else save.CloseW(dev);
+     }
+    return Effective;
+}
+
+//ワーク開�
+myResult OpenWork(TgtDev dev)
+{
+    int num;
+    if(CheckInsEject())return RESULT_INSEJECT;//挿抜検出
+    if (save.Open(dev,WorkPath )){
+        if(save.Read(dev,(char*)&num,WORK_HEADER_SIZE) == WORK_HEADER_SIZE)
+        {
+            //記録時�ヘッダ�一致�る�
+            if (num==WorkNumber)return RESULT_OK;
+        }
+        save.Close(dev);
+    }
+    NN_LOG("%d\n",save.LastNnResult(dev).GetDescription());
+    return RESULT_FAIL_WORK;
+}
+
+//ワーク削除
+void DeleteWork(){
+    //SD,MEM両方消�
+    if(alive_Sd){
+        save.Close(TGT_SD);//オープン������削除����
+        save.CloseW(TGT_SD);
+        save.DeleteFile(TGT_SD,WorkPath);//SD�ファイル��
+    }
+    save.Delete(TGT_MEM);//メモリ�アーカイブ��
+    Effective = false;
 }
 
 
 //-------------------------------------------------- Verifi
-bool Verifi(bool flg)
+myResult Verifi(TgtDev dest,TgtDev src)
 {
     myResult res;
-    int ct,i,msize,rsize;
-    s64 total=0,pos;
+    int ct,i;
+    s64 total=0;
+    TgtDev dev;//ワーク�デ�イス
 
-    //セーブデータ�マウント
-    res = savedata.Mount();
-    if(res != RESULT_OK){
-        //PutError(TGT_CARD);
-        return false;
-    }
+    if (dest == src)return RESULT_FAIL;//デ�イス���
+    if (dest == TGT_CARD)dev = src;
+    else if(src == TGT_CARD)dev = dest;
+    else return RESULT_FAIL; //片方�必�CARD����ダメ
+
+    wcscpy(MessWork,MessTxt(MT_Compair));//"Verifi"メッセージ
+    Icon(COLOR_YELLO);
+    scr_Vsnc();
     
-
-    //�ッファデ�イス�マウント
-    res = memsave.Mount();
-    if(res != RESULT_OK){
-        //PutError(TGT_MEM);
-        return false;
-    }
-
-    //ディレクトリ�確�
-    //空ディレクトリ�ェック�るアプリ�り(マリカ７)
+    //セーブデータ�マウント
+    res = save.Mount(TGT_CARD);
+    if(res != RESULT_OK)return res;
+    
+    //カード上�ディレクトリ確�
+    //空ディレクトリも�ェック�るアプリ対策(マリカ７)
     //ファイル��状態�り�る��先�確�
     if( dcList.num >0 )
     {
         nn::fs::Directory dc;
         for(i=0;i<dcList.num;i++)
         {
-            if(dc.TryInitialize(dcList.name[i]).IsFailure())
-            {
+            if(CheckInsEject() || 
+                dc.TryInitialize(dcList.name[i]).IsFailure())
+            {//ディレクトリ開���
                 dc.Finalize();
-        	    return false;
+                save.Unmount(TGT_CARD);
+        	    return RESULT_FAIL_OPEN;
         	}
-        	dc.Finalize();
+        	dc.Finalize();//開��ディレクトリを閉�る
         }
     }
 
-    ct =0;
+    ct =0;;
     if (arcInfo.FileCount == 0)//ファイル�無�
     {
-        savedata.Unmount();
-        memsave.Unmount();
-        return true;//フォーマット一致��
+        save.Unmount(TGT_CARD);
+        return RESULT_OK;
     }else{
-        scr_Status(MessTxt(MT_Compair),COLOR_YELLO);
-        savedata.ResetPath();
-        memsave.ResetPath();
-        s64 fsize;
+        //ワークを開�
+        res = OpenWork(dev);
+        if(res != RESULT_OK){
+            save.Unmount(TGT_CARD);
+            return res;
+        }
+        
         res = RESULT_OK;
         while(res==RESULT_OK){
-            res = savedata.GetPath(file_pathw);
-            if (res != RESULT_OK)
-            {
-                if (res == RESULT_DIR_LEVEL_OVER){
-                    break;
-                }
-                if (res == RESULT_PATH_LENGTH_OVER){
-                    break;
-                }
-                res = RESULT_FAIL_OPEN;
-                break;
-            }
-            if (file_pathw[0] == 0)break;//root then end
-            if (ct>=arcInfo.FileCount)
-            {//カウンタ壊れ�メモリフロー��能性
-                res = RESULT_FAIL;
-                break;
-            }
-            scr_CountPerMax(ct,arcInfo.FileCount);
-            if (savedata.Open(file_pathw)==false)
-            {
-                res = RESULT_FAIL_OPEN;
-                break;
-            }
-            fsize = savedata.FileSize;
-            total += fsize;
-            if (memsave.Open(file_pathw)==false)
-            {
-                res = RESULT_FAIL_OPENW;
-                //savedata.Close();
-                break;
-            }
-            if (fsize != memsave.FileSize)//file size
-            {
-                res = RESULT_FAIL;
-                break;
-            }
-            msize=fsize;
-            if(msize <= FILEBUFF_SIZE ){//一回�読�るサイズ�らゲージ�出���
-                  scr_CountPerMax2(0,0,-1);
-            }
-            pos = 0;
-            while(fsize)
-            {
-                if(msize > FILEBUFF_SIZE ){
-                    scr_CountPerMax2(msize-fsize,msize,0);
-                }
-                if (fsize > FILEBUFF_SIZE)
-                {
-                    rsize = FILEBUFF_SIZE;
-                    fsize -= FILEBUFF_SIZE;
+            if(CheckInsEject())res = RESULT_INSEJECT;//挿抜�ェック
+            else{
+                i = save.Read(dev,(char*)&work_info,WORK_INFO_SIZE);//ファイル情報
+                if (i != WORK_INFO_SIZE){
+                    if (i) res = RESULT_FAIL_WORK;//リードエラー
+                    else break;//終端 or 読�����
                 }else{
-                    rsize = fsize;
-                    fsize = 0;
-                }
-                if (ReadBlock(pos,rsize)==false)
-                {
-                    res = RESULT_FAIL_READ;
-                    break;
-                }
-                pos += rsize;
-                if(memsave.Read(fileBuffer_ex,rsize) != rsize )
-                {//メモリ���実行時�グ
-                    res = RESULT_FAIL;
-                    break;
-                }
-                //verifi
-                for (i = 0;i<rsize;i++)if (fileBuffer[i] != fileBuffer_ex[i])
-                {
-                    res = RESULT_FAIL_VERIFI;
-                    break;
+                    if (work_info.path[0] == 0)res = RESULT_FAIL_WORK;//無効データ
+                    else if (ct >= arcInfo.FileCount)res = RESULT_FAIL;//ファイル数オー�
+                    else{//Open
+                        if (save.Open(TGT_CARD,work_info.path)==false)res = RESULT_FAIL_OPEN;
+                        else{
+                            if (work_info.size != save.FileSize(TGT_CARD))res = RESULT_FAIL_VERIFI;
+                            else{
+                                scr_CountPerMax(ct,arcInfo.FileCount);//ファイルカウンタ
+                                res = save.OpnCmp(dest,src,work_info.size);//比較
+                                if (res == RESULT_OK){
+                                    total += work_info.size;
+                                    ct++;
+                                }
+                            }
+                        }
+                        save.Close(TGT_CARD);
+                    }
                 }
             }
-            savedata.Close();
-            memsave.Close();
-            if (res != RESULT_OK)break;
-            ct++;
         }
-        savedata.Close();
-        memsave.Close();
+        if((res==RESULT_OK) && ct != arcInfo.FileCount)res=RESULT_FAIL;//異常�ループ抜�
     }
-
+    save.Close(dev);
+    scr_Status(MessTxt(MT_ChkCard),COLOR_YELLO);//ユーザセーブ�確�
+    scr_Vsnc();//画�更新待�
+    
     //セーブ�後�構��一致�る�
-    if(flg){//読�込�時�無駄���フラグ�キャンセル
-        if(savedata.GetInfo(&arcInfo2,&dcList2)==false)res = RESULT_FAIL_VERIFI;
+    if((res == RESULT_OK) && (dest == TGT_CARD)){//読�込�時���
+        if(save.GetInfo(&arcInfo2,&dcList2)==false)res = RESULT_FAIL_VERIFI;
         else if (arcInfo.total != arcInfo2.total)res = RESULT_FAIL_VERIFI;
         else if (arcInfo.DirEntry != arcInfo2.DirEntry)res = RESULT_FAIL_VERIFI;
         else if (arcInfo.DirCount != arcInfo2.DirCount)res = RESULT_FAIL_VERIFI;
@@ -484,292 +568,262 @@ bool Verifi(bool flg)
            }
         }
     }
-    savedata.Unmount();
-    memsave.Unmount();
+  
+    save.Unmount(TGT_CARD);
+    scr_Total(total);
     scr_CountPerMax(ct,arcInfo.FileCount);
-    scr_CountPerMax2(0,0,total);
-    
-    
-    if (res != RESULT_OK){
-        //PutError(TGT_CARD,ERC_VERIFI);
-        return false;
-    }
-    
-    
-    return true;
+   
+    return res;
 }
 
-//---------------------------------------------------------------------- from CARD
-RetCode Card2Ctr()
+
+//�果�らエラー表示
+RetCode PutResltErr(myResult res,TgtDev rdev,TgtDev wdev)
 {
-    myResult res;
-    int ct=0,msize,rsize;
-     s64 total=0,pos;
-
-    scr_BackupYesNo();//実行確�
-    WaitUI();//入力待�
-    if(isInsEject != InEx_None )
-    {//挿抜？
-        //isInsEject = InEx_None;
-        return INSEXIT;//挿抜�よる中断
-    }
-    if (scr_evnt != EVNT_YES)return CANCEL;//キャンセル
-    scr_Backup();//画�表示
-    scr_Status(MessTxt(MT_ChkCard),COLOR_YELLO);
-    //セーブデータ�マウント
-    res = savedata.Mount();
-    if(res != RESULT_OK){
-        PutError(TGT_CARD);
-        return ERROR;
-    }
-   
-    //セーブデータ�情報
-    //arcInfo <- フォーマット情報�ファイル�ディレクトリ数
-    //scList <- ディレクトリパス
-    if(savedata.GetInfo(&arcInfo,&dcList)==false)
-    {
-        savedata.Unmount();
-        PutError(TGT_CARD);
-        return ERROR;
-    }
-    
-    //strcpy(arcInfo.Pcode,savedata.PrdCode);
-    
-    //カウント異常�ら実行エラー
-    if (arcInfo.FileCount > arcInfo.FileEntry)
-    {
-        savedata.Unmount();
-        PutError(TGT_NONE,ERC_EXEC);
-        return ERROR;
-    }
-    if (arcInfo.DirCount > arcInfo.DirEntry)
-    {
-        savedata.Unmount();
-        PutError(TGT_NONE,ERC_EXEC);
-        return ERROR;
-    }
-    
-    if(arcInfo.DirCount >= MAX_DCLIST)
-    {//ディレクトリ数�多��
-        savedata.Unmount();
-        PutError(TGT_MEM,ERC_EXEC);
-        return ERROR;
-    }
-    
-    //メモリFS�予想�有サイズ
-    sSize = arcInfo.total+arcInfo.FileCount*512;
-
-#ifdef CSM_FLAG_FORCE_SD
-    return Card2Sd();//デ�グ用�強制�SD�
-     //警告抑制 unreachable
-#pragma diag_suppress 111
-#endif
-
-    //簡易サイズ�ェック
-    if (sSize > MEM_BKUP_SIZE)
-    {
-#ifdef CSM_FLAG_USE_SD
-        if (alive_Sd)return Card2Sd();//SD使用
-#endif
-        savedata.Unmount();
-        PutError(TGT_MEM,ERC_NOSPACE);//容�オー�
-        return ERROR;
-    }
-#ifdef CSM_FLAG_USE_SD
-    //本体メモリ使用
-    BkupSd = false;
-#endif
-
-    //一時�存�存在��ら消�
-    scr_Status(MessTxt(MT_ChkBkup),COLOR_YELLO);
-    if(memsave.IsExist()){
-        if(memsave.Delete()==false)
-        {
-            savedata.Unmount();
-            PutError(TGT_MEM);
-            return ERROR;
-        }
-    }
-
-    //一時�存先�作�
-    scr_Status(MessTxt(MT_CrtBkup),COLOR_YELLO);
-    res = memsave.Create(arcInfo.DirEntry+1,arcInfo.FileEntry+1);
-    if (res != RESULT_OK){
-        savedata.Unmount();
-        PutError(TGT_MEM);
-        return ERROR;
-    }
-
-    if (arcInfo.FileCount == 0)//ファイル�無�
-    {
-        scr_Status(MessTxt(MT_FileNot),COLOR_YELLO);
-        savedata.Unmount();
-        memsave.Unmount();
-        strcpy(arcInfo.Pcode,savedata.PrdCode);
-        return SUCCESS;//フォーマット��
-    }else{
-        scr_Status(MessTxt(MT_Reading),COLOR_SKY);
-        savedata.ResetPath();
-        s64 fsize;
-        res = RESULT_OK;
-        while(res==RESULT_OK){
-            res = savedata.GetPath(file_pathw);
-            if (res != RESULT_OK)
-            {
-                if (res == RESULT_DIR_LEVEL_OVER){
-                    //PutError(ERC_DEV_CARD,ERC_DIRDEPTH);
-                    PutError(TGT_NONE,ERC_WORK);
-                    break;
-                }
-                if (res == RESULT_PATH_LENGTH_OVER){
-                    //PutError(ERC_DEV_CARD,ERC_PATH);
-                    PutError(TGT_NONE,ERC_WORK);
-                    break;
-                }
-                res = RESULT_FAIL_OPEN;
-                break;
-            }
-            if (file_pathw[0] == 0)break;//root then end
-            if (ct>=arcInfo.FileCount)
-            {//カウンタ壊れ�メモリフロー��能性
-                res = RESULT_FAIL;
-                break;
-            }
- 
-            scr_CountPerMax(ct,arcInfo.FileCount);
-            if (savedata.Open(file_pathw)==false)
-            {
-                res = RESULT_FAIL_OPEN;
-                break;
-            }
-            fsize = savedata.FileSize;
-            total += fsize;
-            if (memsave.OpenW(file_pathw,fsize)==false)
-            {
-                res = RESULT_FAIL_OPENW;
-                //savedata.Close();
-                break;
-            }
-        
-
-            //検証���512��
-                msize=fsize;
-                pos = 0;
-                while(fsize)
-                {
-                    if(msize > FILEBUFF_SIZE * 2){
-                        scr_CountPerMax2(msize-fsize,msize,0);
-                    }
-                    if (fsize>FILEBUFF_SIZE)
-                    {
-                        rsize = FILEBUFF_SIZE;
-                        fsize -= FILEBUFF_SIZE;
-                    }else{
-                        rsize = fsize;
-                        fsize = 0;
-                    }
-                    if (ReadBlock(pos,rsize)==false)
-                    {
-                        res = RESULT_FAIL_READ;
-                        break;
-                    }
-                    pos += rsize;
-                    if(memsave.Write(fileBuffer,rsize) != rsize )
-                    {
-                        res = RESULT_FAIL_WRITE;
-                        break;
-                    }
-                }
-            
-            savedata.Close();
-            memsave.CloseW();
-            //todo: ゲージ表示
-            ct++;
-        }
-        savedata.Close();
-        memsave.CloseW();
-    }
-    
-    if (res == RESULT_OK){
-        if (ct != arcInfo.FileCount)//ファイル数�満���パス検索終了
-        {//ディレクトリ情報�パス�得�失敗��る���れる
-            PutError(TGT_NONE,ERC_EXEC);
-            return ERROR;
-        }
-    }
-    savedata.Unmount();
-    //memsave.Commit(); Nand,SD�コミット入れる
-    memsave.Unmount();
-    scr_CountPerMax(ct,arcInfo.FileCount);
-    if(total>0)scr_CountPerMax2(0,0,total);
-
-//�果
+    int err_code;
+    TgtDev err_tgt;
     switch(res)
     {
         case RESULT_OK:
-            if (Verifi(false))
-            {
-                scr_Status(MessTxt(MT_Complate),COLOR_WHITE);
-                strcpy(arcInfo.Pcode,savedata.PrdCode);
-                return SUCCESS;
-            }
-            PutError(TGT_CARD,ERC_VERIFI);
-            break;
+            scr_Status(MessTxt(MT_Complate),COLOR_WHITE);
+            return SUCCESS;
+        case RESULT_INSEJECT:
+            return INSEJECT;
         case RESULT_FAIL_WRITE:
         case RESULT_FAIL_OPENW:
-            PutError(TGT_MEM,ERC_WRITE);
+            err_tgt = wdev;err_code = ERC_WRITE;
             break;
         case RESULT_FAIL_READ:
         case RESULT_FAIL_OPEN:
-            PutError(TGT_CARD,ERC_READ);
+            err_tgt = rdev;err_code = ERC_READ;
             break;
-        default:
-            PutError(TGT_NONE,ERC_EXEC);
+        case RESULT_WORK_OVER:
+            err_tgt = TGT_CTR;err_code = ERC_WORK;
+            break;
+        case RESULT_FAIL_WORK:
+            if (rdev != TGT_CARD)err_tgt = rdev;
+            else err_tgt = wdev;
+            err_code = ERC_WORK;
             break;
         
+        default:
+            err_tgt = TGT_CTR;err_code= ERC_EXEC;
+            break;
     }
-    memsave.Delete();//�ックアップを削除
+    PutError(err_tgt,err_code);
     return ERROR;
 }
 
-
-bool mkdir;
-//---------------------------------------------------------------- to CARD
-RetCode Ctr2Card()
+//---------------------------------------------------------------------- save to Work file
+//Cardマウント�ワークファイルオープン��呼�
+myResult Save2Work(TgtDev dev,u32 num)
 {
-    myResult res;
-    int ct=0;
-    int msize,rsize;
     s64 total = 0;
+    int ct=0;
+    myResult res;
 
-    scr_RestoreYesNo();//実行確�
-    WaitUI();//入力待�
-    if(isInsEject != InEx_None ){//挿抜？
-        //isInsEject = InEx_None;
-        return INSEXIT;//挿抜�よる中断
+    if (num == 0)return RESULT_FAIL;//パラメータエラー
+    res = RESULT_OK;
+    save.ResetPath(TGT_CARD);
+    while(res==RESULT_OK){
+        CheckSysBreak();//Home,電�ボタン�よる中断処�
+        if(CheckInsEject())res = RESULT_INSEJECT;//挿抜�ェック
+        else{
+            res = save.GetPath(TGT_CARD,work_info.path);//パス��得
+            if (res != RESULT_OK)
+            {
+                if ((res == RESULT_DIR_LEVEL_OVER)
+                 || (res == RESULT_PATH_LENGTH_OVER)) res = RESULT_WORK_OVER;
+                else res = RESULT_FAIL_OPEN;
+            }else{
+                if (work_info.path[0] == 0)break;//root then end
+                if (ct >= num)res = RESULT_FAIL;//ファイル数オー�
+                else{
+                    //コピー元オープン
+                    if (save.Open(TGT_CARD,work_info.path)==false)res =  RESULT_FAIL_OPEN;
+                    else{
+                        //ファイル情報を格�
+                        work_info.size = save.FileSize(TGT_CARD);
+                        if(save.Write(dev,(char*)&work_info,WORK_INFO_SIZE) ==  WORK_INFO_SIZE)
+                        {//データ格�
+                            scr_CountPerMax(ct,num);//カウンタ表示
+                            res = save.OpnCpy(dev,TGT_CARD,work_info.size);//ワーク�書�出�
+                            if (res == RESULT_OK){
+                                total += work_info.size;
+                                ct++;
+                            }
+                        }else res= RESULT_FAIL_WRITE;
+                        save.Close(TGT_CARD);
+                    }
+                }
+            }
+        }
+    }
+    save.CloseW(dev);//Close & Flush
+    save.Unmount(TGT_CARD);
+    scr_Total(total);//サイズ表示
+    scr_CountPerMax(ct,num);//カウンタ表示
+    
+    
+    if ((res == RESULT_OK) && (ct != num))res = RESULT_FAIL;//指定��ファイル数�一致���
+    return res;
+}
+
+//---------------------------------------------------------------------- restore from Work file
+//ワーク�ファイル情報�ェック
+//　　サイズ�ェック�使����存時�tArcInfoを�照
+bool InfoChk(tWorkInfo *wi)
+{
+    int i;
+    if (wi->path[0]==0)return false;//空文字
+    //�ッファオー�予防�終端確�
+    for (i = 1;i<MAX_PATH_LENGTH;i++)if (wi->path[i]==0)break;
+    if (i==MAX_PATH_LENGTH)return false;
+    if((wi->size < arcInfo.min) || (wi->size > arcInfo.max))return false;
+    return true;
+}
+
+//--------------------------------------------------------- make save by work file
+//Cardマウント�ワークファイルオープン��呼�
+//ファイル無(num=0) -> コミット��
+myResult Work2Save(TgtDev dev,u32 num)
+{
+    s64 total = 0;
+    int ct=0;
+    myResult res;
+    
+    res = RESULT_OK;
+    while((res==RESULT_OK) && (ct < num)){
+        CheckSysBreak();//Home,電�ボタン�よる中断処�
+        if(CheckInsEject())res = RESULT_INSEJECT;//挿抜�ェック
+        else{
+            if(save.Read(dev,(char*)&work_info,WORK_INFO_SIZE) != WORK_INFO_SIZE)
+            {
+                res= RESULT_FAIL_READ;
+            }else{
+                if (InfoChk(&work_info)==false)res = RESULT_FAIL_READ;//無効�ファイル情報
+                else{
+                    //作�付オープン
+                    //if (save.OpenW(TGT_CARD,work_info.path)==false)res =  RESULT_FAIL_OPENW;
+                    //大容���先�Create���方�断然速�終�る(2012.9月�在�SDK4.2.3��)
+                    if (save.CreateFile(TGT_CARD,work_info.path,work_info.size)==false)res =  RESULT_FAIL_OPENW;
+                    if (save.OpenW(TGT_CARD,work_info.path)==false)res =  RESULT_FAIL_OPENW;
+                    else{
+                        scr_CountPerMax(ct,arcInfo.FileCount);//カウンタ表示
+                        res = save.OpnCpy(TGT_CARD,dev,work_info.size);//dev -> Card
+                        if (res == RESULT_OK){
+                            total += save.FileSize(TGT_CARD);
+                            ct++;
+                            if (ct == num)break;//終了
+                        }
+                        save.CloseW(TGT_CARD);//Close & flush
+                    }
+                }
+            }
+        }
+    }
+    save.Close(dev);//Close
+    if (res==RESULT_OK){
+        if(ct != num)res = RESULT_FAIL;//異常�ループ抜�
+        else if(save.Commit()==false)res = RESULT_FAIL_WRITE;
+    }
+    save.Unmount(TGT_CARD);
+    scr_Total(total);//サイズ表示
+    scr_CountPerMax(ct,num);//カウンタ表示
+    return res;
+}
+
+
+
+//------------------------------------------------------- Card -> CTR
+RetCode Card2Ctr()
+{
+    BkupDev = TGT_MEM;//デフォ�メモリ
+
+    //実行確�
+    scr_BackupYesNo();
+    u8 evt = WaitUI();//入力待�
+    if (evt == EVNT_INEX)return INSEJECT;//挿抜�よる中断
+    if (evt != EVNT_YES)return CANCEL;//キャンセル
+    //画�表示
+    scr_Backup();
+
+    scr_Status(MessTxt(MT_ChkCard),COLOR_YELLO);//"カード確�中"表示
+    scr_Vsnc();//画�更新待�
+    //マウント＆ディレクトリ情報�得
+    if( save.Mount(TGT_CARD) != RESULT_OK ){PutError(TGT_CARD);return ERROR;}
+    if(save.GetInfo(&arcInfo,&dcList)==false){PutError(TGT_CARD);save.Unmount(TGT_CARD);return ERROR;}
+    if ((arcInfo.FileCount > arcInfo.FileEntry)
+          || (arcInfo.DirCount > arcInfo.DirEntry)){PutError(TGT_CTR,ERC_EXEC);save.Unmount(TGT_CARD);return ERROR;}
+    if(arcInfo.DirCount >= MAX_DCLIST){PutError(TGT_MEM,ERC_EXEC);save.Unmount(TGT_CARD);return ERROR;}
+
+    
+    //ワーク作�先�判定
+    if (forceSD && alive_Sd) BkupDev = TGT_SD;//強制SD
+    else{//�サイズ�メモリ���る�？
+        if (arcInfo.total > MEM_BKUP_LIMIT)
+        {
+            if (alive_Sd)BkupDev = TGT_SD;//SD
+            else {//メモリオー�
+                PutError(TGT_MEM,ERC_NOSPACE);
+                save.Unmount(TGT_CARD);
+                return ERROR;
+            }
+        }
     }
 
-    if (scr_evnt != EVNT_YES)return CANCEL;//キャンセル
-    scr_Restore();//画�表示
-    scr_Status(MessTxt(MT_ChkBkup),COLOR_YELLO);
-
-#ifdef CSM_FLAG_USE_SD
-    if (BkupSd)return Sd2Card();//SD使用
-#endif
-
-    //一時�存�マウント
-    res = memsave.Mount();
-    if(res != RESULT_OK){
-        PutError(TGT_MEM);
+    //ワークファイル作�
+    scr_Status(MessTxt(MT_CrtBkup),COLOR_YELLO);
+    scr_Vsnc();
+    if (CreateWork(BkupDev,&arcInfo)==false)
+    {
+        PutError(BkupDev);
+        save.Unmount(TGT_CARD);
         return ERROR;
     }
 
-    //セーブデータ�フォーマット＆マウント
+    if (arcInfo.FileCount == 0)
+    {//ファイル��(ディレクトリ作��必����書戻��忘れ����)
+        scr_Status(MessTxt(MT_FileNot),COLOR_YELLO);//"ファイル��"警告
+        save.CloseW(TGT_SD);
+        save.Unmount(TGT_CARD);
+        strcpy(arcInfo.Pcode,save.PrdCode);
+        return SUCCESS;
+    }
+
+    wcscpy(MessWork,MessTxt(MT_Reading));//"Reading"メッセージ
+    //if (BkupDev == TGT_SD)wcscat(MessWork,L"(to SD)");
+    myResult res = Save2Work(BkupDev,arcInfo.FileCount);//Card -> Work
+    if (res == RESULT_OK){
+        res = Verifi(BkupDev,TGT_CARD);
+        if (res == RESULT_OK){
+            strcpy(arcInfo.Pcode,save.PrdCode);
+        }
+    }
+    return PutResltErr(res,TGT_CARD,BkupDev);//�果表示&リターン
+
+}
+
+//------------------------------------------------------- CTR -> Card
+RetCode Ctr2Card()
+{
+//Card2Ctr�BkupDev�ワークファイル作�済���
+
+    //実行確�
+    scr_RestoreYesNo();
+    u8 evt = WaitUI();//入力待�
+    if (evt == EVNT_INEX)return INSEJECT;//挿抜�よる中断
+    if (evt != EVNT_YES)return CANCEL;//キャンセル
+    //画�表示
+    scr_Restore();
+
+    //セーブデータ�フォーマット(マウント込)
     scr_Status(MessTxt(MT_CardFormat),COLOR_YELLO);
-    res = savedata.Format(&arcInfo);
-    if(res != RESULT_OK){
-        memsave.Unmount();
+    scr_Vsnc();
+    if(save.Format(&arcInfo) != RESULT_OK)
+    {
         PutError(TGT_CARD);
+        save.Unmount(TGT_CARD);
         return ERROR;
     }
  
@@ -778,901 +832,57 @@ RetCode Ctr2Card()
 	//ファイル�存在�関係��作�
     if(dcList.num >0)
     {
-        int i,rev=0;
+        int i;
+        bool mkdir,err = false;
+        wcscpy(MessWork,MessTxt(MT_CrtDir));
+        
         for (i=0;i<dcList.num;i++)
     	{
-            while(1){
-                if (savedata.MakeDir(dcList.name[i],&mkdir)==false)
-                {
-                    if(mkdir==false)
-                    {
-                        res = RESULT_FAIL_OPENW;
-                        break;
-                    }
-                }else break;
+            while(err==false){
+                Icon(COLOR_YELLO);
+                if(CheckInsEject())err =true;//挿抜�ェック
+                else{
+                    if (save.MakeDir(TGT_CARD,dcList.name[i],&mkdir))break;
+                    if(mkdir==false)err = true;
+                }
             }
-            if (res != RESULT_OK)break;
-            rev^=1;
-            if (rev & 1)scr_Status(MessTxt(MT_CrtDir1),COLOR_YELLO);
-            else scr_Status(MessTxt(MT_CrtDir2),COLOR_YELLO);
+            if (err)break;
+            else if (mkdir){err = true;break;}//異常�ループ抜� 
         }
-        if (res != RESULT_OK)
+        if (err)
         {
-            memsave.Unmount();
-            savedata.Unmount();
             PutError(TGT_CARD);
+            save.Unmount(TGT_CARD);
             return ERROR;
         }
     }
 
-    //パラメータ��ックアップ時
-    //Top画�開始時�挿入イベント����得済�
-    if (arcInfo.FileCount == 0)
-    {    //ファイル�無�場�抜�る
-        scr_Status(MessTxt(MT_FormatOnly),COLOR_YELLO);
-        savedata.Unmount();
-        memsave.Unmount();
-        memsave.Delete();
-        return SUCCESS;
-    }else{
-        scr_Status(MessTxt(MT_Writing),COLOR_PARPL);
-        memsave.ResetPath();
-        s64 fsize;
-        res = RESULT_OK;
-        while(res==RESULT_OK){
-            res = memsave.GetPath(file_pathw);
-            if (res != RESULT_OK)
-            {
-                if (res == RESULT_DIR_LEVEL_OVER)break;
-                if (res == RESULT_PATH_LENGTH_OVER)break;
-                res = RESULT_FAIL_OPEN;
-                break;
-            }
-            if (file_pathw[0] == 0)break;//root then end
-            if (ct>=arcInfo.FileCount)
-            {//カウンタ壊れ�メモリフロー��能性
-                res = RESULT_FAIL;
-                break;
-            }
- 
-            scr_CountPerMax(ct,arcInfo.FileCount);
-            if (memsave.Open(file_pathw)==false)
-            {
-                res = RESULT_FAIL_OPEN;
-                break;
-            }
-            fsize = memsave.FileSize;
-            total  += fsize;
- 
-            if (savedata.OpenC(file_pathw,fsize,&mkdir)==false)
-            {
-            	//ディレクトリ�作�済����作��れ�らエラー
-                res = RESULT_FAIL_OPENW;
-                break;
-            }
-            /*
-            int rev = 0;
-            while(1){
-                if (savedata.OpenC(file_pathw,fsize,&mkdir)==false)
-                {
-                    if(mkdir)//ディレクトリ��作�
-                    {//深�場��作��多��画��止�る��
-                        rev++;
-                        if (rev & 1)scr_MessOnCount2(MessTxt(MT_CrtDir1));
-                        else scr_MessOnCount2(MessTxt(MT_CrtDir2));
-                        
-                    }else{
-                        res = RESULT_FAIL_OPENW;
-                        //memsave.Close();
-                        break;
-                    }
-                }else break;
-            }
-            if (res != RESULT_OK)break;
-            */
-            
-            //メモリファイル�検証エラー�����512����る必��無��
-            //メモリ節約�����方法を�る
-            msize = fsize;
-            int itvl = 0;
-            while(fsize)
-            {
-                if(msize > FILEBUFF_SIZE * 2){
-                    scr_CountPerMax2(msize-fsize,msize,0);
-                    if (++itvl & 1)scr_Status(MessTxt(MT_Copy1),COLOR_PARPL);
-                    else scr_Status(MessTxt(MT_Copy2),COLOR_PARPL);
-                }else scr_MessOnCount2(MES_NULL);
-                
-                if (fsize>FILEBUFF_SIZE)
-                {
-                    rsize = FILEBUFF_SIZE;
-                    fsize -= FILEBUFF_SIZE;
-                }else{
-                    rsize = fsize;
-                    fsize = 0;
-                }
-                if(memsave.Read(fileBuffer,rsize) != rsize )
-                {
-                    res = RESULT_FAIL_READ;
-                    break;
-                }
-                if(savedata.Write(fileBuffer,rsize) != rsize )
-                {
-                    res = RESULT_FAIL_WRITE;
-                    break;
-                }
-            }
-            savedata.CloseW();
-            memsave.Close();
-            ct++;
+    //ワーク開�
+    if(OpenWork(BkupDev) != RESULT_OK){
+        PutError(BkupDev);
+        save.Unmount(TGT_CARD);
+        return ERROR;
+    }
+
+    wcscpy(MessWork,MessTxt(MT_Writing));//"Writing"
+    //if (BkupDev == TGT_SD)wcscat(MessWork,L"(from SD)");
+    myResult res =  Work2Save(BkupDev,arcInfo.FileCount);// Work -> CARD
+    if (res == RESULT_OK){
+        res = Verifi(TGT_CARD,BkupDev);//ベリファイ
+        if(res != RESULT_OK){
+            //表示�都��Verifi�エラー�rdevをCARD��る
+            return PutResltErr(res,TGT_CARD,BkupDev);
         }
-        savedata.Close();
-        memsave.CloseW();
     }
-    
-    savedata.Commit();
-    savedata.Unmount();
-    memsave.Unmount();
-    scr_CountPerMax(ct,arcInfo.FileCount);
-    scr_CountPerMax2(0,0,total);
-    
-//�果
-    switch(res){
-        case RESULT_OK:
-            if (Verifi(true)){
-                if(memsave.Delete()){//�ックアップを削除
-                    scr_Status(MessTxt(MT_Complate),COLOR_WHITE);
-                    return SUCCESS;
-                }
-            }
-            PutError(TGT_CARD,ERC_VERIFI);
-            break;
-            
-        case RESULT_FAIL_WRITE:
-        case RESULT_FAIL_OPENW:
-            PutError(TGT_CARD,ERC_WRITE);
-            break;
-        case RESULT_FAIL_READ:
-        case RESULT_FAIL_OPEN:
-            PutError(TGT_MEM,ERC_READ);
-            break;
-        default:
-            PutError(TGT_NONE,ERC_EXEC);
-            break;
-    }
-    return ERROR;
+    return PutResltErr(res,BkupDev,TGT_CARD);//�果表示&リターン
 }
 
 
-//******************************************** for SD
-//パス長オー��ファイル�メモリ上�記録
-//mem:/元�ーム  <- リ�ーム�格�
-//sd:/ワーク/リ�ーム� <-データ格�
-//20000ファイル程度��
-
-#ifdef CSM_FLAG_USE_SD
-bool VerifiSd()
-{
-    myResult res;
-    int ct,i,msize,rsize;
-    s64 total=0,pos;
-    wchar_t ws[20];//"/"+16文字+"\0"
-    
-
-    //セーブデータ�マウント
-    res = savedata.Mount();
-    if(res != RESULT_OK){
-        //PutError(TGT_CARD);
-        return false;
-    }
-
-    //出力デ�イス�マウント
-    res = exsave.Mount();
-    if(res != RESULT_OK){
-        //PutError(TGT_SD);
-        return false;
-    }
-    memsave.Mount();
-
-    ct =0;
-    if (arcInfo.FileCount == 0)//ファイル�無�
-    {
-        savedata.Unmount();
-        exsave.Unmount();
-        return true;//フォーマット一致��
-    }else{
-        scr_Status(MessTxt(MT_Compair),COLOR_YELLO);
-        savedata.ResetPath();
-        exsave.ResetPath();
-        s64 fsize;
-        res = RESULT_OK;
-        while(res==RESULT_OK){
-            if(CheckInsExit())break;//挿抜�よる中断
-            res = savedata.GetPath(file_pathw);
-            if (res != RESULT_OK)
-            {
-                if (res == RESULT_DIR_LEVEL_OVER){
-                    break;
-                }
-                if (res == RESULT_PATH_LENGTH_OVER){
-                    break;
-                }
-                res = RESULT_FAIL_OPEN;
-                break;
-            }
-            if (file_pathw[0] == 0)break;//root then end
-            if (ct>=arcInfo.FileCount)
-            {//カウンタ壊れ�メモリフロー��能性
-                res = RESULT_FAIL;
-                break;
-            }
-            if(CheckInsExit())break;//挿抜�よる中断
-            scr_CountPerMax(ct,arcInfo.FileCount);
-            if (savedata.Open(file_pathw)==false)
-            {
-                res = RESULT_FAIL_OPEN;
-                break;
-            }
-            fsize = savedata.FileSize;
-            total += fsize;
-           
-            if (memsave.Open(file_pathw))
-            {//リ�ーム対象
-                memsave.Read((char*)ws,18);//リ�ーム�
-                ws[9]=0;ws[10]=0;
-                wcscpy(file_pathw,wk_dir);//格�先ディレクトリ
-                wcscat(file_pathw,ws);//パス変�
-                memsave.Close();
-            }
-            if(CheckInsExit())break;//挿抜�よる中断
-            if (exsave.Open(file_pathw)==false)
-            {
-                res = RESULT_FAIL_OPENW;
-                //savedata.Close();
-                break;
-            }
-            if (fsize != exsave.FileSize)//file size
-            {
-                res = RESULT_FAIL;
-                break;
-            }
-            
-            msize=fsize;
-            if(msize <= FILEBUFF_SIZE ){//一回�読�るサイズ�らゲージ�出���
-                 scr_CountPerMax2(0,0,-1);
-            }
-            pos = 0;
-            while(fsize)
-            {
-                if(msize > FILEBUFF_SIZE ){
-                    scr_CountPerMax2(msize-fsize,msize,0);
-                }
-                if (fsize > FILEBUFF_SIZE)
-                {
-                    rsize = FILEBUFF_SIZE;
-                    fsize -= FILEBUFF_SIZE;
-                }else{
-                    rsize = fsize;
-                    fsize = 0;
-                }
-                if(CheckInsExit())break;//挿抜�よる中断
-                if (ReadBlock(pos,rsize)==false)
-                {
-                    res = RESULT_FAIL_READ;
-                    break;
-                }
-                pos += rsize;
-                if(CheckInsExit())break;//挿抜�よる中断
-                if(exsave.Read(fileBuffer_ex,rsize) != rsize )
-                {
-                    res = RESULT_FAIL;
-                    break;
-                }
-                for (i = 0;i<rsize;i++)if (fileBuffer[i] != fileBuffer_ex[i])
-                {
-                    res = RESULT_FAIL;
-                    break;
-                }
-            }
-            savedata.Close();
-            exsave.Close();
-            memsave.Close();
-            if(isInsEject != InEx_None )break;//挿抜�よる中断
-            if (res != RESULT_OK)break;
-            //verifi
-            ct++;
-        }
-        savedata.Close();
-        exsave.Close();
-        memsave.Close();
-    }
-    
-    savedata.Unmount();
-    exsave.Unmount();
-    memsave.Unmount();
-    scr_CountPerMax(ct,arcInfo.FileCount);
-    scr_CountPerMax2(0,0,total);
-    
-    if (res != RESULT_OK){
-    //    PutError(ERC_DEV_OTHER,ERC_VERIFI);
-        return false;
-    }
-    return true;
-}
-
-//エラー表示＆リターン�択(抜� or ERROR)
-RetCode PutErrRetCode(TgtDev dev,int erc = 0)
-{
-    savedata.Unmount();
-    exsave.Unmount();
-    memsave.Unmount();
-    if(CheckInsExit())return INSEXIT;
-    PutError(dev,erc);
-    return ERROR;
-}
-
-
-//Ctr2Cardより呼�れる
-RetCode Sd2Card()
-{
-    myResult res;
-    int ct=0,msize,rsize;
-    s64 total = 0;
-    wchar_t ws[20];//"/"+16文字+"\0"
-
-    //カード�フォーマット＆マウント
-    scr_Status(MessTxt(MT_CardFormat),COLOR_YELLO);
-    res = savedata.Format(&arcInfo);
-    if(res != RESULT_OK) return PutErrRetCode(TGT_CARD,ERC_FORMAT);
-
-    //パラメータ��ックアップ時
-    //Top画�開始時�挿入イベント��得
-    if (arcInfo.FileCount == 0)//ファイル�無�
-    {
-        savedata.Unmount();
-        if(exsave.Delete()){//�ックアップを削除
-             scr_Status(MessTxt(MT_FormatOnly),COLOR_YELLO);
-             return SUCCESS;
-        }
-        return PutErrRetCode(TGT_SD,ERC_ACCESS);
-    }
-
-    //拡張セーブ�マウント
-    res = exsave.Mount();
-    if(res != RESULT_OK) return PutErrRetCode(TGT_SD);
-    memsave.Mount();
-
-    scr_Status(MessTxt(MT_Writing),COLOR_PARPL);
-    exsave.ResetPath();
-    s64 fsize;
-    res = RESULT_OK;
-    while(res==RESULT_OK){
-        res = exsave.GetPath(file_pathw);
-        if (res != RESULT_OK)
-        {
-            if ((res != RESULT_DIR_LEVEL_OVER) 
-                && (res != RESULT_PATH_LENGTH_OVER))res = RESULT_FAIL_OPEN;
-            break;
-        }
-        if (file_pathw[0] == 0)break;//root then end
-        if (ct>=arcInfo.FileCount)
-        {//カウンタ壊れ�メモリフロー��能性
-            res = RESULT_FAIL;
-            break;
-        }
-
-        scr_CountPerMax(ct,arcInfo.FileCount);//カウンタ表示
-        if (exsave.Open(file_pathw)==false)
-        {
-            res = RESULT_FAIL_OPEN;
-            break;
-        }
-        fsize = exsave.FileSize;
-        total  += fsize;
-
-        if (savedata.CheckPathBit & cpb_ex )
-        {//��パス��り？
-            if (CmpDirW(file_pathw,wk_dir)==1)
-            {//リ�ームファイル�ら元�パス�を探�
-                memsave.ResetPath();
-                int i=0;bool b=false;
-                ws[9]=0;ws[10]=0;
-                while(i<rename_n){
-                    memsave.GetPath(file_pathw2);
-                    if(file_pathw2[0]==0)break;
-                    memsave.Open(file_pathw2);
-                    memsave.Read((char*)ws,18);
-                    if(CmpNameW(file_pathw,ws)){
-                        wcscpy(file_pathw,file_pathw2);
-                        b = true;
-                        break;
-                    }
-                    i++;
-                }//while
-                if (b==false){//見��ら��->差替?? or メモリ破壊??
-                    res = RESULT_FAIL;
-                    break;
-                }
-            }
-        }
-  
-        int rev = 0;
-        while(1){
-            if (savedata.OpenC(file_pathw,fsize,&mkdir)==false)
-            {
-                if(mkdir)//ディレクトリ��作�
-                {//深�場��作��多��画��止�る��
-                    rev++;
-                    if (rev & 1)scr_MessOnCount2(MessTxt(MT_CrtDir1));
-                    else scr_MessOnCount2(MessTxt(MT_CrtDir2));
-                }else{
-                    res = RESULT_FAIL_OPENW;
-                    //exsave.Close();
-                    break;
-                }
-            }else break;
-        }//while
-        if (res != RESULT_OK)break;
-        
-        msize = fsize;
-        int itvl = 0;
-        while(fsize)
-        {
-            if(msize > FILEBUFF_SIZE * 2){
-                scr_CountPerMax2(msize-fsize,msize,0);
-                if (++itvl & 1)scr_Status(MessTxt(MT_Copy1),COLOR_PARPL);
-                else scr_Status(MessTxt(MT_Copy2),COLOR_PARPL);
-            }else scr_MessOnCount2(MES_NULL);
-            
-            if (fsize>FILEBUFF_SIZE)
-            {
-                rsize = FILEBUFF_SIZE;
-                fsize -= FILEBUFF_SIZE;
-            }else{
-                rsize = fsize;
-                fsize = 0;
-            }
-            if(exsave.Read(fileBuffer,rsize) != rsize )
-            {
-                res = RESULT_FAIL_READ;
-                break;
-            }
-            if(savedata.Write(fileBuffer,rsize) != rsize )
-            {
-                res = RESULT_FAIL_WRITE;
-                break;
-            }
-        }//while
-        savedata.CloseW();
-        exsave.Close();
-        ct++;
-    }//while
-    savedata.Close();
-    exsave.CloseW();
-    if(res == RESULT_OK)savedata.Commit();
-
-    savedata.Unmount();
-    exsave.Unmount();
-    memsave.Unmount();
-    scr_CountPerMax(ct,arcInfo.FileCount);
-    scr_CountPerMax2(0,0,total);
-    
-//�果
-    TgtDev ercd;
-    int ercc;
-    switch(res){
-        case RESULT_OK:
-            if (VerifiSd()){
-                memsave.Delete();
-                if(exsave.Delete()){//�ックアップを削除
-                    scr_Status(MessTxt(MT_Complate),COLOR_WHITE);
-                    return SUCCESS;
-                }
-            }
-            ercd =TGT_CARD;ercc = ERC_VERIFI;//ベリファイエラー
-            break;
-        case RESULT_FAIL_WRITE:
-        case RESULT_FAIL_OPENW:
-            ercd = TGT_CARD;ercc = ERC_WRITE;
-            break;
-        case RESULT_FAIL_READ:
-        case RESULT_FAIL_OPEN:
-            ercd = TGT_SD;ercc = ERC_READ;
-            break;
-        default:
-            ercd = TGT_NONE;ercc = ERC_EXEC;
-            break;
-    }
-    return PutErrRetCode(ercd,ercc);
-}
-
-
-
-//Crad2Ctrより呼�れる
-RetCode Card2Sd()
-{
-    myResult res;
-    int ct=0,msize,rsize;
-    s64 total=0,fsize,pos;
-    
-    int i;
-    wchar_t ws[20];//"/"+16文字+"\0"
-    
-    BkupSd = true;
-
-    //拡張セーブ�存在��ら消�
-    scr_Status(MessTxt(MT_ChkBkup),COLOR_YELLO);
-    if(exsave.IsExist()){
-        if(exsave.Delete()==false) return PutErrRetCode(TGT_SD);
-    }
-    if(CheckInsExit())return INSEXIT;//抜��"��"判定�場�
-
-    //一時�存先�作�
-    scr_Status(MessTxt(MT_CrtBkup),COLOR_YELLO);
-    //拡張セーブ�����るパス��り？
-    if (savedata.CheckPathBit & cpb_ex )
-    {
-        //該当ファイルを変��存�るディレクトリ追加
-        res = exsave.Create(arcInfo.DirEntry+1,arcInfo.FileEntry);
-    }else res = exsave.Create(arcInfo.DirEntry,arcInfo.FileEntry);
-    if (res != RESULT_OK) return PutErrRetCode(TGT_SD);
-
-    if(CheckInsExit())return INSEXIT;//抜�
-
-    //パラメータ��ックアップ時
-    //Top画�開始時�挿入イベント��得
-    if (arcInfo.FileCount == 0)//ファイル�無�
-    {
-        scr_Status(MessTxt(MT_FileNot),COLOR_YELLO);
-        strcpy(arcInfo.Pcode,savedata.PrdCode);
-        savedata.Unmount();
-        return SUCCESS;//フォーマット��
-    }
-    
-
-    //簡易サイズ�ェック
-    //SD�クラスタサイズやヘッダ�メモリFSより多��有�る
-    //セクタサイズ4Ｋ:2GB�32K:4GB 余裕を見���(ファイル数上���最悪)
-    //4GBデ�イス�移行�ら�8G以上�SDを使�
-    fsize = exsave.GetFreeSize();//�得API�マウント必須���Create後����ダメ
-    //ヘッダ16k+4K(ファイル�+アライメント) ..ＳＤセクタサイズ4K���
-    sSize = arcInfo.total + arcInfo.FileCount*20480;
-    if ((sSize > fsize) || (fsize ==0)) return PutErrRetCode(TGT_SD,ERC_NOSPACE);
-
-    //メモリFS上�作�..ファイル��存����中身�SD上�ファイル�
-    //拡張セーブ�最大パス長�ユーザセーブより短���超�るも��変�
-    //オリジナルファイル��作���ファイル�変更後�ファイル�を格�
-    //ワーク�10MByte�1万ファイル�ら� 
-    memsave.Delete();
-    memsave.Create(1,arcInfo.FileCount);
-    memsave.Mount();
-
-    //read
-    scr_Status(MessTxt(MT_Reading),COLOR_PARPL);
-    savedata.ResetPath();
-    total=0;ct=0;rename_n=0;
-    res = RESULT_OK;
-    while(res==RESULT_OK){
-        res = savedata.GetPath(file_pathw);
-        if (res != RESULT_OK)
-        {
-            if ((res != RESULT_DIR_LEVEL_OVER)
-                 && (res != RESULT_PATH_LENGTH_OVER)) res = RESULT_FAIL_OPEN;
-            break;
-        }
-        if (file_pathw[0] == 0)break;//root then end
-        if (ct>=arcInfo.FileCount)
-        {//カウンタ壊れ�メモリフロー��能性
-            res = RESULT_FAIL;
-            break;
-        }
-            
-        scr_CountPerMax(ct,arcInfo.FileCount);
-        if (savedata.Open(file_pathw)==false)
-        {
-            res = RESULT_FAIL_OPEN;
-            break;
-        }
-        fsize = savedata.FileSize;
-        total  += fsize;
-
-        //パス��ェック
-        if (CheckPathEx(file_pathw) == false)
-        {//メモリFS上�ファイル作�(パス�記録��目的)
-            savedata.Close();
-            if (memsave.OpenW(file_pathw,512)==false)
-            {
-                res = RESULT_FAIL_OPENW;
-                break;
-            }
-                
-            //リ�ーム��格�
-            swprintf(ws,16,L"/%8x",rename_n);//リ�ーム
-            for (i=1;i<8;i++)if(ws[i]==L' ')ws[i]=L'0';
-            rename_n++;
-            if(memsave.Write( (char*)ws,18) != 18)//wchar 9文字
-            {
-                res = RESULT_WORK_OVER;//ワーク�足
-                break;
-            }
-            memsave.CloseW();
-        }else
-        {
-            int rev = 0;
-            while(1){
-                if (exsave.OpenC(file_pathw,fsize,&mkdir)==false)
-                {
-                    if(mkdir)//ディレクトリ��作�
-                    {//深�場��作��多��画��止�る��
-                        rev++;
-                        if (rev & 1)scr_MessOnCount2(MessTxt(MT_CrtDir1));
-                        else scr_MessOnCount2(MessTxt(MT_CrtDir2));
-                    }else{
-                        res = RESULT_FAIL_OPENW;
-                            //exsave.Close();
-                        break;
-                    }
-                }else break;
-            }
-            if (res != RESULT_OK)break;
-            msize = fsize;
-            int itvl = 0;
-            pos =0;
-            while(fsize)
-            {
-                if(msize > FILEBUFF_SIZE * 2)
-                {
-                    scr_CountPerMax2(msize-fsize,msize,0);
-                    if (++itvl & 1)scr_Status(MessTxt(MT_Copy1),COLOR_PARPL);
-                    else scr_Status(MessTxt(MT_Copy2),COLOR_PARPL);
-                }else scr_MessOnCount2(MES_NULL);
-                
-                if (fsize>FILEBUFF_SIZE)
-                {
-                    rsize = FILEBUFF_SIZE;
-                    fsize -= FILEBUFF_SIZE;
-                }else{
-                    rsize = fsize;
-                    fsize = 0;
-                }
-                if (ReadBlock(pos,rsize)==false)
-                {
-                    res = RESULT_FAIL_READ;
-                    break;
-                }
-                pos += rsize;
-                if(exsave.Write(fileBuffer,rsize) != rsize )
-                {
-                    NN_LOG("desc = %d\n",savedata.LastNnResult.GetDescription());
-                    res = RESULT_FAIL_WRITE;
-                    break;
-                }
-            }//fsize
-            ct++;
-            savedata.Close();
-            exsave.CloseW();
-        }//else
-    }//while
-
-    if ((res == RESULT_OK) && (savedata.CheckPathBit & cpb_ex))
-    {//��パス�り�ら�リ�ーム���存
-        nn::Result result;
-        nn::fnd::DateTime tm;
-        //ディレクトリ作�..既存�を��る��作�後�行�
-        i = 0;
-        while(i++ < 10 ){//試行回数(無駄？)
-            tm = nn::fnd::DateTime::GetNow();
-            //退�先ディレクトリ�作�:SDK制��16文字��
-            swprintf(file_pathw,3,L"%3d",tm.GetMilliSecond());
-            if (file_pathw[0]==L' ')file_pathw[0] = L'0';
-            if (file_pathw[1]==L' ')file_pathw[1] = L'0';
-            wcscpy(wk_dir,L"/cSm_");//通常�使�れ����������る
-            wcscat(wk_dir,file_pathw);
-            wcscat(wk_dir,L"_zzz");
-            exsave.GetRootPath(file_pathw);
-            wcscat(file_pathw,wk_dir);
-            result = nn::fs::TryCreateDirectory(file_pathw);
-            if (result.IsSuccess())break;
-            if(CheckInsExit())break;
-        }
-        if (result.IsFailure()){
-            exsave.Unmount();
-            memsave.Unmount();
-            savedata.Unmount();
-            exsave.Delete();//�ックアップを削除
-            memsave.Delete();
-            if(isInsEject != InEx_None )return INSEXIT;
-            PutError(TGT_SD,ERC_WORK);//退�先�確�����
-            return ERROR;
-        }
-        
-        memsave.ResetPath();
-        while(res==RESULT_OK){
-            res = memsave.GetPath(file_pathw);//リ�ーム対象ファイル�
-            if (file_pathw[0] == 0)break;//root then end
-            if (ct>=arcInfo.FileCount)
-            {
-                res = RESULT_FAIL;
-                break;
-            }
-
-            scr_CountPerMax(ct,arcInfo.FileCount);
-            
-            if (savedata.Open(file_pathw)==false)//ユーザセーブ開�
-            {
-                res = RESULT_FAIL_OPEN;
-                break;
-            }
-            fsize = savedata.FileSize;
-            
-            //リ�ーム��得
-            if (memsave.Open(file_pathw)==false)
-            {
-                res = RESULT_FAIL;//メモリ�ら���通常�り���
-                break;
-            }
-            if(memsave.Read((char*)ws,18)!=18)//wchar 9文字
-            {
-                res = RESULT_FAIL;//メモリ�ら���通常�り���
-                break;
-            }
-            memsave.Close();
-            ws[9]=0;//終端
-            ws[10]=0;
-            wcscpy(file_pathw2,wk_dir);
-            wcscat(file_pathw2,ws);
-            if (exsave.OpenC(file_pathw2,fsize,&mkdir)==false)
-            {//エラーも����退�先ディレクトリ�無�
-                res = RESULT_FAIL_OPENW;
-                break;
-            }
-            msize = fsize;
-            pos =0;
-            while(fsize)
-            {
-                if (fsize>FILEBUFF_SIZE)
-                {
-                    rsize = FILEBUFF_SIZE;
-                    fsize -= FILEBUFF_SIZE;
-                }else{
-                    rsize = fsize;
-                    fsize = 0;
-                }
-                if (ReadBlock(pos,rsize)==false)
-                {
-                    res = RESULT_FAIL_READ;
-                    break;
-                }
-                pos += rsize;
-                if(exsave.Write(fileBuffer,rsize) != rsize )
-                {
-                    res = RESULT_FAIL_WRITE;
-                    break;
-                }
-            }//while(fsize)
-            ct++;
-            savedata.Close();
-            exsave.CloseW();
-            memsave.Close();
-        }//while
-    }//if
-    savedata.Unmount();
-    exsave.Unmount();
-    memsave.Unmount();
-    scr_CountPerMax(ct,arcInfo.FileCount);
-    scr_CountPerMax2(0,0,total);
-
-//�果
-    TgtDev ercd;
-    int ercc;
-    switch(res)
-    {
-        case RESULT_OK:
-            if (VerifiSd())
-            {
-                scr_Status(MessTxt(MT_Complate),COLOR_WHITE);
-                strcpy(arcInfo.Pcode,savedata.PrdCode);
-                return SUCCESS;
-            }
-            ercd = TGT_CARD;ercc = ERC_VERIFI;
-            break;
-        case RESULT_FAIL_WRITE:
-        case RESULT_FAIL_OPENW:
-            ercd = TGT_SD;ercc = ERC_WRITE;//ライト失敗
-            break;
-        case RESULT_FAIL_READ:
-        case RESULT_FAIL_OPEN:
-            ercd = TGT_CARD;ercc = ERC_READ;//リード
-            break;
-        case RESULT_WORK_OVER:
-            ercd = TGT_NONE;ercc = ERC_NOSPACE;//ワーク�足..��フアイル多��
-            break;
-        default:
-            ercd = TGT_NONE;ercc = ERC_EXEC;
-            break;
-    }
-    exsave.Delete();//�ックアップを削除
-    memsave.Delete();
-    return PutErrRetCode(ercd,ercc);
-}
-
-#endif
-
-//---------------------------------------------------------------    セーブデータ�情報�得
-//呼��� tmerr �クリアを忘れ��事
-void CheckSaveDataState()
-{
-    Formatted = false;
-    Active = false;
-    
-    if (savedata.GetPrdCode())
-    {
-        //NN_LOG("%d",savedata.LastNnResult.GetDescription());
-        Active = true;//カード
-        if (savedata.IsExist())//マウント�確�
-        {
-            Formatted=true;
-        }else{
-            tmerr |= SDATA_ERRPUT_MEDIA;
-        }
-    }
-    scr_PrdCode(savedata.PrdCode);
-    //プロダクトコード��ェック
-    isAgreePCode = strcmp(savedata.PrdCode,arcInfo.Pcode)==0;
-}
-
-void CheckExSaveState()
-{
-#ifdef CSM_FLAG_USE_SD
-    if (alive_Sd)exActive = nn::fs::IsSdmcWritable();
-    else exActive = true;
-#else
-    exActive = true;
-#endif
-    if (exActive){
-#ifdef CSM_FLAG_USE_SD
-        if (BkupSd){
-            exFormatted = exsave.IsExist();
-            exsave.Unmount();
-        }else{
-#endif
-            exFormatted = memsave.IsExist();
-            memsave.Unmount();
-#ifdef CSM_FLAG_USE_SD
-        }
-#endif
-
-    }else{
-        exFormatted = false;
-    }
-//デ�グ時�抜��もクリア���
-#ifndef CSM_FLAG_DEBUG
-    if (exFormatted==false)  arcInfo.Pcode[0] = 0;
-#endif
-    scr_PrdCodeEx(arcInfo.Pcode);
-    //プロダクトコード��ェック
-    isAgreePCode = strcmp(savedata.PrdCode,arcInfo.Pcode)==0;
-}
-
-//SD挿抜
-void Evt_SdInEx()
-{
-#ifndef CSM_FLAG_DEBUG
-    ScrClr();
-    scr_TopMenu(Formatted,Active,exFormatted,exActive,tmerr);
-    scr_Draw();
-    failstop();//�止
-#else
-    CheckExSaveState();//状態更新
-    scr_evnt = EVNT_INEX;
-#endif
-}
 
 
 //---------------------------------------------------------------- 入力待�
-void WaitUI()
+u8 WaitUI()
 {
-    tmerr = 0;
     scr_Draw();//画�更新
     scr_evnt = EVNT_NONE;
     while(scr_evnt == EVNT_NONE)
@@ -1680,82 +890,51 @@ void WaitUI()
         //nn::os::Thread::Yield();//スレッド実行
          //scr_GetEvnt();//入力イベント
 
-        CheckSysBreak();//中断処�
+        CheckSysBreak();//Home,電�ボタン�よる中断処�
 
-#ifdef CSM_FLAG_USE_SD
-        //挿抜を検知��らアプリ終了待��るよ��る
-        if (ejectEvntSd.TryWait()){
-            isInsEject = InEx_EjcSd;
-            Evt_SdInEx();
-            return;
-        }
-        if (insEvntSd.TryWait()){
-            isInsEject = InEx_InsSd;
-            Evt_SdInEx();
-            return;
-        }
-#endif
-        //挿抜を検知��ら中断��抜�る
-        //トップ以外��トップメニュー�戻るよ��る
-        if (ejectEvnt.TryWait()){
-            isInsEject = InEx_EjcCard;
-            CheckSaveDataState();
-            scr_evnt = EVNT_INEX;
-            return;
-        }
-        if (insEvnt.TryWait()){
-            isInsEject = InEx_InsCard;
-            CheckSaveDataState();
-            scr_evnt = EVNT_INEX;
-            return;
+        //挿抜�ェック
+        //SD:�止
+        //Card:トップメニュー��無視�リードライト中�トップメニュー�戻る
+        if(CheckInsEject()){
+            return EVNT_INEX;
         }
         nn::os::Thread::Yield();//スレッド実行..タッ�＆ボタン�得
     }
     ScrClr();//画�消去
     nn::os::Thread::Sleep(nn::fnd::TimeSpan::FromMilliSeconds(500));//�ャタ対策
+    return scr_evnt;
 }
 
-void InsExtErrPut(tIsInsEject n)
+void InsEjcErrPut()
 {
-    switch (n)
-    {
-        case InEx_EjcSd:
-        case InEx_InsSd://SD insert or exit
-            PutError(TGT_SD,ERC_PULLOUT);
-#ifndef CSM_FLAG_DEBUG
-            failstop();//stop running
-#endif
-            break;
-        case InEx_EjcCard:
-            PutError(TGT_CARD,ERC_DEVICE);
-            break;
-        case InEx_InsCard://素早�抜�差��Ejectイベント消�る?
-            PutError(TGT_CARD,ERC_PULLOUT);
-            break;
-        default://通常�り��� .. 実行時エラー
-            PutError(TGT_NONE,ERC_EXEC);
-            failstop();//stop running
-            break;
+    if (isInsEject & InEj_Sd) Evt_SdInEx();
+    else if (isInsEject & InEj_Card) PutError(TGT_CARD,ERC_PULLOUT);
+    else {
+        PutError(TGT_CTR,ERC_EXEC);
+        failstop();//stop running
     }
 }
 
 
-//---------------------- main loop --------------------------
-void nnMain()
+//起動時�モード�択ボタン
+#ifndef CSM_FLAG_DEBUG 
+#define STUP_BTN_COPYMODE (nn::hid::BUTTON_X | nn::hid::BUTTON_B)
+#define STUP_BTN_FSD (nn::hid::BUTTON_Y | nn::hid::BUTTON_B)
+#else
+#define STUP_BTN_COPYMODE nn::hid::BUTTON_UP
+#define STUP_BTN_FSD nn::hid::BUTTON_Y
+#endif
+
+
+//�期化
+void Init()
 {
-    RetCode retc;
-    //tColStr *colstr[4];
-    //colstr[2] = &mess_WhenExc;
-    //colstr[3] = &mess_PoffSys;
-    isInsEject = InEx_None;
-   
     //NN_LOG("Start\n");
-    nn::os::Initialize();
+    //nn::os::Initialize();//SDK4.2 より���入れる�止�る
     nn::fs::Initialize();
 
     //DEA-SUP��推奨�フリーズ暫定対策：無線デーモンを�止 (2011.3.1 �在)
-    //����スリープ時�止�ら��
-    //心��ら本体スイッ��切���
+    //スリープ中�（�����通信？）止�ら����本体スイッ�切る��確実
     nn::ndm::Initialize();
     nn::ndm::SuspendScheduler();
 
@@ -1766,78 +945,118 @@ void nnMain()
 
     nn::applet::DisableSleep();//スリープ�対応
 
-#ifdef CSM_FLAG_USE_SD
-    //起動時�ＳＤ確�
-    alive_Sd = nn::fs::IsSdmcWritable();
-#else
-    alive_Sd = false;
-#endif
     //Heap
     appHeap.Initialize(nn::os::GetDeviceMemoryAddress(), 
         nn::os::GetDeviceMemorySize(), nn::os::ALLOCATE_OPTION_LINEAR);
 	const u32 GxHeapSize = 0x800000;
 	heapForGx = reinterpret_cast<uptr>(appHeap.Allocate(GxHeapSize));
-    //画��期化
-
-	//メッセージ用テキスト�読�込�
-	 bool jp;
-	// nn::cfg::CTR::Initialize();
-	// if (nn::cfg::GetLanguage() == nn::cfg::CFG_LANGUAGE_JAPANESE)
-	// {
-	//	jp = true;
-	//	LoadMessText(L"rom:/lang_jp.mes");
-	 //}
-	 //else{
-		jp = false;
-		LoadMessText(L"rom:/lang_en.mes");
-	// }
-	// nn::cfg::Finalize();
-	
-#ifdef CSM_FLAG_DEBUG
-	//リリース��区別�る��タイトル�[debug]を付�る(�セキュア���出予防)
-    if (ScrInitialize(heapForGx,GxHeapSize,jp,true) == false)finish();
-#else
-    if (ScrInitialize(heapForGx,GxHeapSize,jp,false) == false)finish();
-#endif
-	
 
     //挿抜イベント
-    ejectEvnt.ClearSignal();
-    insEvnt.ClearSignal();
-    nn::fs::RegisterCardEjectedEvent(&ejectEvnt);
-    nn::fs::RegisterCardInsertedEvent(&insEvnt);
-#ifdef CSM_FLAG_USE_SD
-    if (alive_Sd){
-        ejectEvntSd.ClearSignal();
-        insEvntSd.ClearSignal();
-        nn::fs::RegisterSdmcEjectedEvent(&ejectEvntSd);
-        nn::fs::RegisterSdmcInsertedEvent(&insEvntSd);
-        //拡張セーブ�存在��ら消�
-        if(exsave.IsExist())exsave.Delete();
-    }
-#endif
+    InitInsEject();
 
-    // スリープ�求�対�る返答を有効��る
-    // ���蓋�状態�ェックを行�蓋�閉�られ��る�らスリープ�求�発生�る
+    //ＳＤ確�
+    //終了��マウント継続�差替タイミング出�る��リマウント��る
+    alive_Sd = nn::fs::IsSdmcWritable();
+    if (alive_Sd){
+        if(save.Mount(TGT_SD) != RESULT_OK){
+            if(save.Create(TGT_SD,1,1) != RESULT_OK)alive_Sd = false;
+        }//�り���時間優先���������る場�消���作�����も
+    }
+
+    //ボタン押�起動�ェック
+  {
+    nn::hid::Initialize();
+    nn::hid::PadReader padR;
+    nn::hid::PadStatus padS;
+    while (padR.ReadLatest(&padS) == false){};
+    NN_LOG("PAD = %x",padS.hold);
+    
+#ifdef CSM_FLAG_FORCE_SD
+    forceSD = alive_Sd;
+#else
+    forceSD = false;
+#endif
+    CopyMode = false;
+    switch(padS.hold){
+        case STUP_BTN_COPYMODE:
+            CopyMode = true;
+            break;
+        case STUP_BTN_FSD:
+            if (alive_Sd){
+                forceSD = true;
+            }else NN_LOG("mode cancel,no detect SD");
+            break;
+        case STUP_BTN_COPYMODE | STUP_BTN_FSD:
+            if (alive_Sd){
+                CopyMode = true;
+                forceSD = true;
+            }else NN_LOG("mode cancel,no detect SD");
+            break;
+    }
+    if (CopyMode) NN_LOG("Copy mode\n");
+    if (forceSD) NN_LOG("force SD\n");
+    
+  }
+  
+    
+  {//テキスト設定
+#ifdef CSM_FLAG_DEBUG
+	//リリース��区別�る��タイトル�[debug]を付�る(�セキュア���出予防)
+	u8 flg = SCR_FLG_DBG;
+#else
+    u8 flg = 0;
+#endif
+    if(forceSD)flg += SCR_FLG_FSD;//"強制SD"
+    else if(alive_Sd==false)flg += SCR_FLG_NOSD;//"SD��"
+    if(CopyMode)flg += SCR_FLG_CP;//コピーモード
+
+    //言語コード�日英メッセージ切替
+    nn::cfg::CTR::init::Initialize();//desc�cfg::u �無����init�ら呼�
+    nn::cfg::CTR::CfgLanguageCode lcd = nn::cfg::CTR::GetLanguage();
+    nn::cfg::CTR::init::Finalize();
+    //メッセージ用テキスト�読�込�
+    if (lcd == nn::cfg::CFG_LANGUAGE_JAPANESE)
+    {
+        LoadMessText(L"rom:/lang_jp.mes");
+        flg += SCR_FLG_JP;
+    }
+    else{
+        LoadMessText(L"rom:/lang_en.mes");
+    }
+    //画��期化
+    if (ScrInitialize(heapForGx,GxHeapSize,flg) == false)finish();
+   }
+}
+
+
+
+//---------------------- main loop --------------------------
+void nnMain()
+{
+    u8 evt;
+    RetCode retc;
+
+    Init();//�期化
+
+    // スリープ�求有効
+    // ファイル�作中�キャンセル��諸々�倒����対応
     //nn::applet::EnableSleep(true);
 
-    extern u8 scr_evnt;
-    u8 scr_evntbk;
     while(1)
     {
-        tmerr = 0;
-        CheckSaveDataState();   //セーブデータ�状態�得
-        CheckExSaveState();    //��ックアップ
-        if (isAgreePCode==false) tmerr |= SDATA_ERRPUT_PCODE;
-        scr_TopMenu(Formatted,Active,exFormatted,exActive,tmerr);
-        
-        WaitUI();//入力待�
-        scr_evntbk = scr_evnt;
-        switch(scr_evnt)
+        UpdateStatus();//デ�イス状態�表示更新
+        scr_TopMenu(tm_mode,tm_err);
+        scr_Vsnc();
+        evt = WaitUI();//入力待�
+        switch(evt)
         {
             case EVNT_INEX:
-                isInsEject= InEx_None;
-                break;
+                //SD�ら��止����る��カード挿抜
+                //tm_mode =SCR_MENU_NONE;
+                //tm_err =SCR_ERRPUT_CARD2;//"Checking"
+                //scr_TopMenu(tm_mode,tm_err);
+                //scr_Vsnc();
+                //break;
             case EVNT_PUSH_B:
             case EVNT_PUSH_R:
             case EVNT_PUSH_Y:
@@ -1846,73 +1065,57 @@ void nnMain()
             case EVNT_SEL_READ://****************************    リード
                 NN_LOG("select read\n");
                 retc = Card2Ctr();
-                switch (retc){
-                    case SUCCESS:
-                        //CheckExSaveState();    //状態�更新
-                        scr_ResultQuit(MessTxt(MT_Success),COLOR_GREEN);//�功�Quitボタン
-                        break;
-                    case INSEXIT:
-                        //scr_InsExitQuit();//挿抜検知表示 & Quit
-                        ScrClr();//画�消去
-                        scr_Backup();
-                        InsExtErrPut(isInsEject);
-                        scr_ResultQuit(MessTxt(MT_Break),COLOR_RED);//エラー�Quitボタン
-                        break;
-                    case CANCEL:
-                        break;
-                    default://errors
-                        if (CheckInsExit())InsExtErrPut(isInsEject);//抜差イベント？
-                        scr_ResultQuit(MessTxt(MT_Failed),COLOR_RED);//エラー�Quitボタン
-                        break;
-                }
                 break;
             case EVNT_SEL_WRITE:// ****************************   リストア
                 NN_LOG("select write\n");
                 retc = Ctr2Card();
-                switch (retc){
-                    case SUCCESS:
-                        //CheckSaveDataState();    //状態�更新
-                        //CheckExSaveState();
-                        scr_ResultQuit(MessTxt(MT_Success),COLOR_GREEN);//�功�Quitボタン
-                        break;
-                    case INSEXIT:
-                        //scr_InsExitQuit();//挿抜検知表示 & Quit
-                        ScrClr();//画�消去
-                        scr_Restore();
-                        InsExtErrPut(isInsEject);
-                        scr_ResultQuit(MessTxt(MT_Break),COLOR_RED);//エラー�Quitボタン
-                    case CANCEL:
-                        break;
-                    default://errors
-                        if (CheckInsExit())InsExtErrPut(isInsEject);//抜差イベント？
-                        scr_ResultQuit(MessTxt(MT_Failed),COLOR_RED);//エラー�Quitボタン
-                        break;
-                }
                 break;
             case EVNT_PUSH_LEFT_X:// -------------------------------------  LEFT + X
                 //�ックアップ削除
                 scr_DelConf();//実行確�
-                WaitUI();
-                if (scr_evnt != EVNT_YES)break;
-                memsave.Delete();
-#ifdef CSM_FLAG_USE_SD
-                if(alive_Sd)exsave.Delete();
-#endif
+                if (WaitUI() != EVNT_YES)break;
+                DeleteWork();
                 break;
             
-            default:
+            default://通常�������
+                scr_TopMenu(SCR_MENU_NONE,SCR_ERRPUT_EXEC);//実行エラー
                 failstop();
                 break;
         }
-        if (((scr_evntbk == EVNT_SEL_WRITE)||(scr_evntbk == EVNT_SEL_READ)) && (retc != CANCEL))
+        //scr_PrdCode(save.PrdCode);//プロダクトコード表示
+        //3tscr_PrdCodeEx(arcInfo.Pcode);//プロダクトコード表示
+        if ( ((evt == EVNT_SEL_WRITE) || (evt == EVNT_SEL_READ)) 
+            && (retc != CANCEL))
         {
+            switch (retc){
+                case SUCCESS:
+                    scr_ResultQuit(MessTxt(MT_Success),COLOR_GREEN);//�功�Quitボタン
+                    //コピーモード���れ�ライト�功時�ワーク消�
+                    if ((evt == EVNT_SEL_WRITE) && (CopyMode == false))DeleteWork();
+                    break;
+                case INSEJECT:
+                    ScrClr();//画�消去
+                    if(evt==EVNT_SEL_READ)scr_Backup();
+                    else scr_Restore();
+                    InsEjcErrPut();
+                    scr_ResultQuit(MessTxt(MT_Break),COLOR_RED);//エラー�Quitボタン
+                    break;
+                default://error or else
+                    if (isInsEject != InEj_None)InsEjcErrPut();//抜差イベント発生
+                    else if (CheckInsEject())InsEjcErrPut();//抜差�ェック
+                    scr_ResultQuit(MessTxt(MT_Failed),COLOR_RED);//エラー�Quitボタン
+                    break;
+            }
+            if ((retc != SUCCESS) && (evt == EVNT_SEL_READ))DeleteWork();//リード失敗�らワーク削除
+            //戻るボタン待�
             while(1){
-                WaitUI();
-                if (scr_evnt == EVNT_INEX)isInsEject = InEx_None;
-                if ((scr_evnt==EVNT_QUIT) || (scr_evnt==EVNT_PUSH_B))break;
+                UpdateStatus();
+                evt = WaitUI();
+                if ((evt==EVNT_QUIT) || (evt==EVNT_PUSH_B))break;
             }
         }
 	}//while()
+	
 
 }
 
diff --git a/trunk/CardSaveData/Mover/body/source/main.h b/trunk/CardSaveData/Mover/body/source/main.h
index dd20674..360178c 100644
--- a/trunk/CardSaveData/Mover/body/source/main.h
+++ b/trunk/CardSaveData/Mover/body/source/main.h
@@ -1,8 +1,13 @@
-//ƒfƒoƒO—p
+#ifndef _MAIN_H_
+#define _MAIN_H_
+
+//‹­�§‚r‚c
+//#define CSM_FLAG_FORCE_SD 1
+
+//ƒfƒoƒOƒtƒ‰ƒO
+//(—LŒøŽž�j
+//  ‰æ–Ê�¶�ã‚É"DEBUG"‚Ì•¶Žš
+//  SD”²‚¯ƒ`ƒFƒbƒN–³Œø .. Break‚µ‚ÄPCŠm”F‚·‚é‚Æ‚«–Ê“|‚È‚Ì‚Å
 //#define CSM_FLAG_DEBUG 1 
 
-//ˆêŽž•Û‘¶�æ‚ÉSD‚àŽg‚¤�F‘�ƒTƒCƒY‚ªƒ�ƒ‚ƒŠ‚É”[‚Ü‚ç‚È‚¢�ê�‡ .. Card2
-//#define CSM_FLAG_USE_SD 1
-#ifdef CSM_FLAG_USE_SD
-#define CSM_FLAG_FORCE_SD 1  //‹­�§‚r‚cŽg—p
 #endif
diff --git a/trunk/CardSaveData/Mover/body/source/screen/screen.cpp b/trunk/CardSaveData/Mover/body/source/screen/screen.cpp
index 324a413..45f062d 100644
--- a/trunk/CardSaveData/Mover/body/source/screen/screen.cpp
+++ b/trunk/CardSaveData/Mover/body/source/screen/screen.cpp
@@ -12,6 +12,11 @@
 Gui gui;
 u8 scr_evnt;
 
+//ƒ^ƒCƒgƒ‹—pƒ��[ƒN
+//ƒTƒCƒYƒI�[ƒo’�ˆÓ
+tChar wS_Title[32];
+//eColor wC_Title;
+
 enum{
 //PANEL_END,
 PANEL_ERROR,
@@ -27,7 +32,7 @@ PANEL_CONFIRM,
 PANEL_DELCONF,
 PANEL_MENU,
 PANEL_BKUP,
-PANEL_INSEXIT,
+PANEL_INSEJECT,
 PANEL_DBGLOG
 };
 
@@ -48,22 +53,16 @@ MESSAGE_DELCONF_TITLE,
 MESSAGE_DELCONF_MSG,
 MESSAGE_DELCONF_MSG2,
 MESSAGE_DELCONF_MSG3,
-//MESSAGE_TOPMENU_HELP_TITLE,
-MESSAGE_TOPMENU_HELP_READ,
-MESSAGE_TOPMENU_HELP_WRITE,
-MESSAGE_TOPMENU_HELP_END,
-MESSAGE_TOPMENU_HELP_OPERATE,
 MESSAGE_TITLE,
 MESSAGE_MENU_READ,
 MESSAGE_MENU_WRITE,
-//MESSAGE_MENU_END,
 MESSAGE_MENU_OPERATE,
 MESSAGE_MENU_CAUTION,
 MESSAGE_MENU_ERROR,
 MESSAGE_MENU_DEBUG,
-MESSAGE_INSEXT_1,
-MESSAGE_INSEXT_2,
-MESSAGE_INSEXT_3,
+MESSAGE_INSEJC_1,
+MESSAGE_INSEJC_2,
+MESSAGE_INSEJC_3,
 MESSAGE_OPERATE,
 MESSAGE_RESULT,
 MESSAGE_QUIT_OPERATE,
@@ -165,121 +164,111 @@ void touchQuit(u32 pos NN_IS_UNUSED_VAR)
 #define LOG_MAX 10
 
 // -------------------------------------------------- ƒRƒ“ƒ|�[ƒlƒ“ƒg�ÝŒv
-//‰º‰æ–Ê
-#ifdef USE_WCHAR
-/*
-tChar* S_Backup = L"“Ç�ž";
-tChar* S_Restore = L"�‘�ž";
-tChar* S_Yes = L"‚Í‚¢";
-tChar* S_No = L"‚¢‚¢‚¦";
-tChar* S_Quit = L"–ß‚é";
-tChar* S_Space = L"�@";
-tChar* S_Execute = L"ŽÀ�s‚µ‚Ü‚·‚©�H";
-tChar* S_HelpBackup = L"[“Ç�ž] ƒJ�[ƒh‚©‚ç“Ç‚Þ";
-tChar* S_HelpRestore = L"[�‘�ž] ƒJ�[ƒh‚É�‘‚­";
-tChar* S_Touch = L"ƒ^ƒbƒ`‚ÅŽÀ�s‚µ‚Ü‚·";
-tChar* S_Version = L"‚u‚…‚’";
-tChar* S_QuitB = L"ƒ^ƒbƒ`‚©‚aƒ{ƒ^ƒ“‚Å–ß‚è‚Ü‚·";
-tChar* S_Insexit = L"ƒfƒoƒCƒX‚Ì‘}”²‚ðŒŸ’m‚µ‚Ü‚µ‚½";
-tChar* S_RetTop = L"ŠJŽn‰æ–Ê‚É–ß‚è‚Ü‚·";
-tChar* S_Del = L"�@�–�–�@�í�œ�@�–�–�@";
-tChar* S_Del2 = L"�@�@�@�@’�ˆÓ";
-tChar* S_Del3 = L"“Ç�o‚µ‚½ƒf�[ƒ^‚ð�í�œ‚µ‚Ü‚·";
-tChar* S_Title = L"�@�ƒƒJ�[ƒhƒZ�[ƒuˆÚ�s�„";
-tChar* S_InsertCard = L"ƒJ�[ƒh‚ð‘}“ü‚µ‚ĉº‚³‚¢";
-tChar* S_TitleBkup = L"�@�|�|�@ƒJ�[ƒh‚©‚ç“Ç�ž�@�|�|";
-tChar* S_TitleRestore = L"�@�|�|�@ƒJ�[ƒh‚Ö�‘�ž�@�|�|";
-*/
-tChar* S_Backup = L"Backup";
-tChar* S_Restore = L"Restore";
-tChar* S_Yes = L"YES";
-tChar* S_No = L"NO";
-tChar* S_Quit = L"Quit";
-tChar* S_Space = L" ";
-tChar* S_Execute = L"Do you execute?";
-tChar* S_HelpBackup = L"[Backup] read from Card";
-tChar* S_HelpRestore = L"[Restore] write to Card";
-tChar* S_Touch = L"Touch below";
-tChar* S_Version = L"version";
-tChar* S_QuitB = L"touch [Quit] or push B";
-tChar* S_Insexit = L"device insert or pull out is detected";
-tChar* S_RetTop = L"return to top menu";
-tChar* S_Del = L" *** DELETE *** ";
-tChar* S_Del2 = L"       caution!";
-tChar* S_Del3 = L"this is delete backup";
-tChar* S_Title = L"  < CTR Card Savedata Mover >";
-tChar* S_InsertCard = L"Please Insert Card";
-tChar* S_TitleBkup = L" --- Backup Card Savedata ---";
-tChar* S_TitleRestore = L"--- Restore Card Savedata ---";
+//•\Ž¦•¶Žš—ñ
+enum {//index of message string
+    I_Backup,
+    I_Restore,
+    I_Yes,
+    I_No,
+    I_Quit,
+    I_Space,
+    I_Execute,
+    I_HelpBackup,
+    I_HelpRestore,
+    I_Touch,
+    I_Version,
+    I_QuitB,
+    I_Inseject,
+    I_RetTop,
+    I_InsejectSD,
+    I_Restart1,
+    I_Restart2,
+    I_Del,
+    I_Del2,
+    I_Del3,
+    I_Title,
+    I_TitleCp,
+    I_InsertCard,
+    I_TitleBkup,
+    I_TitleRestore,
+    I_CardChk,
+    I_EndNum
+};
 
 
-#else
-tChar* S_Backup = "Backup";
-tChar* S_Restore = "Restore";
-tChar* S_Yes = "YES";
-tChar* S_No = "NO";
-tChar* S_Quit = "Quit";
-tChar* S_Space = " ";
-tChar* S_Execute = "Do you execute?";
-tChar* S_HelpBackup = "[Backup] read from Card";
-tChar* S_HelpRestore = "[Restore] write to Card";
-tChar* S_Touch = "Touch below";
-tChar* S_Version = "version";
-tChar* S_QuitB = "touch [Quit] or push B";
-tChar* S_Insexit = "device insert or pull out is detected";
-tChar* S_RetTop = "return to top menu";
-tChar* S_Del = " *** DELETE *** ";
-tChar* S_Del2 = "       caution!";
-tChar* S_Del3 = "this is delete backup";
-tChar* S_Title = "  < CTR Card Savedata Mover >";
-tChar* S_InsertCard = "Please Insert Card";
-tChar* S_TitleBkup = " --- Backup Card Savedata ---";
-tChar* S_TitleRestore = "--- Restore Card Savedata ---";
-#endif
+tChar* S_StringsJp[I_EndNum] = {
+    L"“Ç�ž",
+    L"�‘�ž",
+    L"‚Í‚¢",
+    L"‚¢‚¢‚¦",
+    L"–ß‚é",
+    L"�@",
+    L"ŽÀ�s‚µ‚Ü‚·‚©�H", 
+    L"[“Ç�ž] ƒJ�[ƒh‚©‚ç“Ç‚Þ",
+    L"[�‘�ž] ƒJ�[ƒh‚É�‘‚­",
+    L"ƒ^ƒbƒ`‚ÅŽÀ�s‚µ‚Ü‚·",
+    L"‚u‚…‚’",
+    L"ƒ^ƒbƒ`‚©‚aƒ{ƒ^ƒ“‚Å–ß‚è‚Ü‚·",
+    L"ƒJ�[ƒh‚Ì‘}”²‚ðŒŸ’m‚µ‚Ü‚µ‚½",
+    L"ŠJŽn‰æ–Ê‚É–ß‚è‚Ü‚·",
+    L"‚r‚c‚Ì‘}”²‚ðŒŸ’m‚µ‚Ü‚µ‚½",
+    L"“®�ì’†‚Í‹ÖŽ~‚Å‚·",
+    L"“dŒ¹OFF‚©‚ç‚â‚è’¼‚µ‚Ä‚­‚¾‚³‚¢",
+    L"�@�–�–�@�í�œ�@�–�–�@",
+    L"�@�@�@�@’�ˆÓ",
+    L"“Ç�o‚µ‚½ƒf�[ƒ^‚ð�í�œ‚µ‚Ü‚·",
+    L"�@�@�@�ƒƒJ�[ƒhƒZ�[ƒuˆÚ�s�„",
+    L"�@�@�@�|�@ƒRƒs�[ƒ‚�[ƒh�@�|",
+    L"ƒJ�[ƒh‚ð‘}“ü‚µ‚ĉº‚³‚¢",
+    L"�@�|�|�@ƒJ�[ƒh‚©‚ç“Ç�ž�@�|�|",
+    L"�@�|�|�@ƒJ�[ƒh‚Ö�‘�ž�@�|�|",
+    L"�@Šm”F‚µ‚Ä‚Ü‚·"
+};
+
+tChar* S_Strings[I_EndNum] = {
+    L"Backup",
+    L"Restore",
+    L"YES",
+    L"NO",
+    L"Quit",
+    L" ",
+    L"Do you execute?",
+    L"[Backup] read from Card",
+    L"[Restore] write to Card",
+    L"Touch below",
+    L"version",
+    L"touch [Quit] or push B",
+    L"CARD insert or pull out is detected",
+    L"return to top menu",
+    L"SD insert or pull out is ",
+    L"prohibited during operation",
+    L" turn off the power and restart",
+    L" *** DELETE *** ",
+    L"       caution!",
+    L"this is delete backup",
+    L"  < CTR Card Savedata Mover >",
+    L"         -   Copy mode   -",
+    L"Please Insert Card",
+    L" --- Backup Card Savedata ---",
+    L"--- Restore Card Savedata ---",
+    L"Checking"
+};
+
+//•¶Žš—ñƒ|ƒCƒ“ƒ^Ši”[
+tChar* pS_Str[I_EndNum]; 
 
 //Top Menu
-const tPanel panel_Read = {(uptr)touchRead,S_Backup,80+20,30,160,80,PANEL_READ,SCREEN_LOWER};
-const tPanel panel_Write = {(uptr)touchWrite,S_Restore,80+20,130,160,80,PANEL_WRITE,SCREEN_LOWER};
+const tPanel panel_Read = {(uptr)touchRead,NULL_STR,80+20,30,160,80,PANEL_READ,SCREEN_LOWER};
+const tPanel panel_Write = {(uptr)touchWrite,NULL_STR,80+20,130,160,80,PANEL_WRITE,SCREEN_LOWER};
 //const tPanel panel_End = {(uptr)touchEnd,"End",80,180,160,30,PANEL_END,SCREEN_LOWER};
 
 //Yes No
-const tPanel panel_Yes = {(uptr)touchYes,S_Yes,40+10,60,80,120,PANEL_YES,SCREEN_LOWER};
-const tPanel panel_No = {(uptr)touchNo,S_No,200+30,60,80,120,PANEL_NO,SCREEN_LOWER};
+const tPanel panel_Yes = {(uptr)touchYes,NULL_STR,40+10,60,80,120,PANEL_YES,SCREEN_LOWER};
+const tPanel panel_No = {(uptr)touchNo,NULL_STR,200+30,60,80,120,PANEL_NO,SCREEN_LOWER};
 
 //Quit
-const tPanel panel_Quit = {(uptr)touchQuit,S_Quit,80+20,60,160,120,PANEL_QUIT,SCREEN_LOWER};
+const tPanel panel_Quit = {(uptr)touchQuit,NULL_STR,80+20,60,160,120,PANEL_QUIT,SCREEN_LOWER};
 
-//�ã‰æ–Ê
-/*
-//ƒfƒoƒO—p
-//ƒGƒ‰�[•\Ž¦
-const tPanel panel_Error = {NULL_PTR,NULL_STR,LOC_CONF_X,LOC_CONF_Y,LOC_CONF_W,LOC_CONF_H,PANEL_ERROR,SCREEN_UPPER};
-const tMessage mess_Title_Err = {S_Space,10,10,COLOR_RED,8,MESSAGE_ERROR_TITLE,PANEL_ERROR};
-const tMessage mess_Info_Err = {S_Space,10,22,COLOR_RED,8,MESSAGE_ERROR_INFO,PANEL_ERROR};
-const tMessage mess_Info2_Err = {S_Space,10,40,COLOR_RED,8,MESSAGE_ERROR_INFO2,PANEL_ERROR};
-const tMessage mess_Info3_Err = {S_Space,10,50,COLOR_RED,8,MESSAGE_ERROR_INFO3,PANEL_ERROR};
-
-//�¬Œ÷
-const tPanel panel_Success = {NULL_PTR,NULL_STR,LOC_CONF_X,LOC_CONF_Y,LOC_CONF_W,LOC_CONF_H,PANEL_SUCCESS,SCREEN_UPPER};
-const tMessage mess_Title_Suc = {S_Space,10,10,COLOR_GREEN,8,MESSAGE_SUCCESS_TITLE,PANEL_SUCCESS};
-const tMessage mess_Info_Suc = {S_Space,10,40,COLOR_WHITE,8,MESSAGE_SUCCESS_INFO,PANEL_SUCCESS};
-const tMessage mess_Info2_Suc = {S_Space,10,50,COLOR_WHITE,8,MESSAGE_SUCCESS_INFO2,PANEL_SUCCESS};
-
-//ŽÀ�sŠm”F
-const tPanel panel_Confirm = {NULL_PTR,NULL_STR,LOC_CONF_X,LOC_CONF_Y,LOC_CONF_W,LOC_CONF_H,PANEL_CONFIRM,SCREEN_UPPER};
-const tMessage mess_conf_Title = {S_Space,10,10,COLOR_YELLO,8,MESSAGE_CONFIRM_TITLE,PANEL_CONFIRM};
-const tMessage mess_conf_Msg = {S_Execute,10,40,COLOR_WHITE,8,MESSAGE_CONFIRM_MSG,PANEL_CONFIRM};
-
-//ƒgƒbƒvƒ�ƒjƒ…�[
-//const tPanel panel_topmenu_help = {NULL_PTR,NULL_STR,LOC_CONF_X,LOC_CONF_Y,LOC_CONF_W,LOC_CONF_H,PANEL_TOPMENU,SCREEN_UPPER};
-//const tMessage mess_topmenu_help_read = {S_HelpBackup,10,4,COLOR_WHITE,8,MESSAGE_TOPMENU_HELP_READ,PANEL_TOPMENU};
-//const tMessage mess_topmenu_help_write = {S_HelpRestore,10,16,COLOR_WHITE,8,MESSAGE_TOPMENU_HELP_WRITE,PANEL_TOPMENU};
-//const tMessage mess_topmenu_help_operate = {S_Touch,10,48,COLOR_GREEN,8,MESSAGE_TOPMENU_HELP_OPERATE,PANEL_TOPMENU};
-
-//ƒ�ƒO•\Ž¦
-const tPanel panel_dbglog = {NULL_PTR,NULL_STR,LOC_LOG_X,LOC_LOG_Y,LOC_LOG_W,LOC_LOG_H,PANEL_DBGLOG,SCREEN_UPPER};
-const tMemo memo_dbglog = {LOG_MAX,10,10,COLOR_WHITE,8,MEMO_DBGLOG,PANEL_DBGLOG};
-*/
 
 //’Ê�펞
 //ƒ^ƒCƒgƒ‹
@@ -290,10 +279,10 @@ const tMemo memo_dbglog = {LOG_MAX,10,10,COLOR_WHITE,8,MEMO_DBGLOG,PANEL_DBGLOG}
 #define LOC_TITL_H 50
 #define FONT_SIZE_PRODUCT 10
 const tPanel panel_title = {NULL_PTR,NULL_STR,LOC_TITL_X,LOC_TITL_Y,LOC_TITL_W,LOC_TITL_H,PANEL_TITLE,SCREEN_UPPER};
-const tMessage mess_title = {S_Space,0,0,COLOR_WHITE,FONT_SIZE_TITLE,MESSAGE_TITLE,PANEL_TITLE};
-const tMessage mess_product = {S_Space,0,LOC_TITL_H - 22,COLOR_WHITE,FONT_SIZE_PRODUCT,MESSAGE_PRODUCT,PANEL_TITLE};
-const tMessage mess_product2 = {S_Space,0,LOC_TITL_H - 10,COLOR_WHITE,FONT_SIZE_PRODUCT,MESSAGE_PRODUCT2,PANEL_TITLE};
-const tMessage mess_version = {S_Version,LOC_TITL_W-FONT_SIZE_PRODUCT*6,FONT_SIZE_TITLE+2,COLOR_WHITE,FONT_SIZE_PRODUCT,MESSAGE_VERSION,PANEL_TITLE};
+const tMessage mess_title = {NULL_STR,0,0,COLOR_WHITE,FONT_SIZE_TITLE,MESSAGE_TITLE,PANEL_TITLE};
+const tMessage mess_product = {NULL_STR,0,LOC_TITL_H - 22,COLOR_WHITE,FONT_SIZE_PRODUCT,MESSAGE_PRODUCT,PANEL_TITLE};
+const tMessage mess_product2 = {NULL_STR,0,LOC_TITL_H - 10,COLOR_WHITE,FONT_SIZE_PRODUCT,MESSAGE_PRODUCT2,PANEL_TITLE};
+const tMessage mess_version = {NULL_STR,LOC_TITL_W-FONT_SIZE_PRODUCT*6,FONT_SIZE_TITLE+2,COLOR_WHITE,FONT_SIZE_PRODUCT,MESSAGE_VERSION,PANEL_TITLE};
 
 #define LOC_MESS_X  20
 #define LOC_MESS_W  (400 - LOC_MESS_X*2)
@@ -303,119 +292,98 @@ const tMessage mess_version = {S_Version,LOC_TITL_W-FONT_SIZE_PRODUCT*6,FONT_SIZ
 #define FONT_SIZE 10
 #define STR_LINE(ln) (FONT_SIZE + 2)*ln
 const tPanel panel_menu = {NULL_PTR,NULL_STR,LOC_MESS_X,LOC_MESS_Y,LOC_MESS_W,LOC_MESS_H,PANEL_MENU,SCREEN_UPPER};
-const tMessage mess_menu_read = {S_HelpBackup,10,STR_LINE(1),COLOR_WHITE,FONT_SIZE,MESSAGE_MENU_READ,PANEL_MENU};
-const tMessage mess_menu_write = {S_HelpRestore,10,STR_LINE(2),COLOR_WHITE,FONT_SIZE,MESSAGE_MENU_WRITE,PANEL_MENU};
-const tMessage mess_menu_operate = {S_Touch,10,STR_LINE(4),COLOR_GREEN,FONT_SIZE,MESSAGE_MENU_OPERATE,PANEL_MENU};
-const tMessage mess_bkuperr = {S_Space,10,STR_LINE(6),COLOR_RED,FONT_SIZE,MESSAGE_MENU_ERROR,PANEL_MENU};
-const tMessage mess_carderr = {S_Space,10,STR_LINE(7),COLOR_YELLO,FONT_SIZE,MESSAGE_MENU_CAUTION,PANEL_MENU};
+const tMessage mess_menu_read = {NULL_STR,10,STR_LINE(1),COLOR_WHITE,FONT_SIZE,MESSAGE_MENU_READ,PANEL_MENU};
+const tMessage mess_menu_write = {NULL_STR,10,STR_LINE(2),COLOR_WHITE,FONT_SIZE,MESSAGE_MENU_WRITE,PANEL_MENU};
+const tMessage mess_menu_operate = {NULL_STR,10,STR_LINE(4),COLOR_GREEN,FONT_SIZE,MESSAGE_MENU_OPERATE,PANEL_MENU};
+const tMessage mess_bkuperr = {NULL_STR,10,STR_LINE(6),COLOR_RED,FONT_SIZE,MESSAGE_MENU_ERROR,PANEL_MENU};
+const tMessage mess_carderr = {NULL_STR,10,STR_LINE(7),COLOR_YELLO,FONT_SIZE,MESSAGE_MENU_CAUTION,PANEL_MENU};
 
 //Backup
 const tPanel panel_bkup = {NULL_PTR,NULL_STR,LOC_MESS_X,LOC_MESS_Y,LOC_MESS_W,LOC_MESS_H,PANEL_BKUP,SCREEN_UPPER};
-const tMessage mess_quit_operate = {S_QuitB,10,STR_LINE(4),COLOR_SKY,FONT_SIZE,MESSAGE_QUIT_OPERATE,PANEL_BKUP};
-const tMessage mess_conf = {S_Execute,10,STR_LINE(2),COLOR_WHITE,FONT_SIZE,MESSAGE_CONF,PANEL_BKUP};
-const tMessage mess_result = {S_Space,10,STR_LINE(2),COLOR_WHITE,FONT_SIZE,MESSAGE_RESULT,PANEL_BKUP};
-const tMessage mess_operate = {S_Touch,10,STR_LINE(4),COLOR_GREEN,FONT_SIZE,MESSAGE_OPERATE,PANEL_BKUP};
-const tMessage mess_status = {S_Space,10,STR_LINE(7),COLOR_WHITE,FONT_SIZE,MESSAGE_STATUS,PANEL_BKUP};
-const tMessage mess_count = {S_Space,10,STR_LINE(8),COLOR_WHITE,FONT_SIZE,MESSAGE_COUNT,PANEL_BKUP};
-const tMessage mess_count2 = {S_Space,10,STR_LINE(9),COLOR_GREEN,FONT_SIZE,MESSAGE_COUNT2,PANEL_BKUP};
+const tMessage mess_quit_operate = {NULL_STR,10,STR_LINE(4),COLOR_SKY,FONT_SIZE,MESSAGE_QUIT_OPERATE,PANEL_BKUP};
+const tMessage mess_conf = {NULL_STR,10,STR_LINE(2),COLOR_WHITE,FONT_SIZE,MESSAGE_CONF,PANEL_BKUP};
+const tMessage mess_result = {NULL_STR,10,STR_LINE(2),COLOR_WHITE,FONT_SIZE,MESSAGE_RESULT,PANEL_BKUP};
+const tMessage mess_operate = {NULL_STR,10,STR_LINE(4),COLOR_GREEN,FONT_SIZE,MESSAGE_OPERATE,PANEL_BKUP};
+const tMessage mess_status = {NULL_STR,10,STR_LINE(7),COLOR_WHITE,FONT_SIZE,MESSAGE_STATUS,PANEL_BKUP};
+const tMessage mess_count = {NULL_STR,10,STR_LINE(8),COLOR_WHITE,FONT_SIZE,MESSAGE_COUNT,PANEL_BKUP};
+const tMessage mess_count2 = {NULL_STR,10,STR_LINE(9),COLOR_GREEN,FONT_SIZE,MESSAGE_COUNT2,PANEL_BKUP};
 
 
 //‘}”²”­�¶Žž
-const tPanel panel_insexit = {NULL_PTR,NULL_STR,LOC_MESS_X,LOC_MESS_Y,LOC_MESS_W,LOC_MESS_H,PANEL_INSEXIT,SCREEN_UPPER};
-const tMessage mess_insexit = {S_Insexit,10,STR_LINE(3),COLOR_RED,8,MESSAGE_INSEXT_1,PANEL_INSEXIT};
-const tMessage mess_insexit2 = {S_RetTop,10,STR_LINE(5),COLOR_WHITE,8,MESSAGE_INSEXT_2,PANEL_INSEXIT};
-const tMessage mess_insexit3 = {S_QuitB,10,STR_LINE(6),COLOR_WHITE,8,MESSAGE_INSEXT_3,PANEL_INSEXIT};
+const tPanel panel_inseject = {NULL_PTR,NULL_STR,LOC_MESS_X,LOC_MESS_Y,LOC_MESS_W,LOC_MESS_H,PANEL_INSEJECT,SCREEN_UPPER};
+const tMessage mess_inseject = {NULL_STR,10,STR_LINE(3),COLOR_RED,10,MESSAGE_INSEJC_1,PANEL_INSEJECT};
+const tMessage mess_inseject2 = {NULL_STR,10,STR_LINE(5),COLOR_WHITE,10,MESSAGE_INSEJC_2,PANEL_INSEJECT};
+const tMessage mess_inseject3 = {NULL_STR,10,STR_LINE(6),COLOR_WHITE,10,MESSAGE_INSEJC_3,PANEL_INSEJECT};
 
 //�í�œŠm”F
 const tPanel panel_delconf = {NULL_PTR,NULL_STR,LOC_MESS_X,LOC_MESS_Y-36,LOC_MESS_W,LOC_MESS_H,PANEL_DELCONF,SCREEN_UPPER};
-const tMessage mess_delconf_Title = {S_Del,10,10,COLOR_YELLO,16,MESSAGE_DELCONF_TITLE,PANEL_DELCONF};
-const tMessage mess_delconf_Msg = {S_Del2,10,50,COLOR_YELLO,12,MESSAGE_DELCONF_MSG,PANEL_DELCONF};
-const tMessage mess_delconf_Msg2 = {S_Del3,10,70,COLOR_YELLO,12,MESSAGE_DELCONF_MSG2,PANEL_DELCONF};
-const tMessage mess_delconf_Msg3 = {S_Execute,10,90,COLOR_YELLO,12,MESSAGE_DELCONF_MSG3,PANEL_DELCONF};
-
+const tMessage mess_delconf_Title = {NULL_STR,10,10,COLOR_YELLO,16,MESSAGE_DELCONF_TITLE,PANEL_DELCONF};
+const tMessage mess_delconf_Msg = {NULL_STR,10,50,COLOR_YELLO,12,MESSAGE_DELCONF_MSG,PANEL_DELCONF};
+const tMessage mess_delconf_Msg2 = {NULL_STR,10,70,COLOR_YELLO,12,MESSAGE_DELCONF_MSG2,PANEL_DELCONF};
+const tMessage mess_delconf_Msg3 = {NULL_STR,10,90,COLOR_YELLO,12,MESSAGE_DELCONF_MSG3,PANEL_DELCONF};
 
 
 nn::os::LightEvent stopEvnt(true);
 
 tChar scr_ver[16];
 tChar scr_err[32];
-tChar scr_debug[32];
-//menu
-bool ScrInitialize(uptr heap,u32 size,bool jp,bool deb)
+
+bool ScrInitialize(uptr heap,u32 size,u8 flag)
 {
+    int i;
     scr_evnt = EVNT_NONE;
     holdVal = 0;
     holdTck = nn::fnd::TimeSpan(0);
 
     if (gui.Initialize(heap,size,&stopEvnt)==false)return false;
 
+    //“ú–{Œê or ‰pŒê
+    if (flag & SCR_FLG_JP)for (i =0;i<I_EndNum;i++)pS_Str[i] = S_StringsJp[i]; 
+    else 
+    for (i =0;i<I_EndNum;i++)pS_Str[i] = S_Strings[i]; 
+
     gui.ButtonCallback((uptr)pushButton);
     //ƒRƒ“ƒ|�[ƒlƒ“ƒg“o˜^
     gui.PanelSet(&panel_Read);
     gui.PanelSet(&panel_Write);
-//    gui.PanelSet(&panel_End);
     gui.PanelSet(&panel_Yes);
     gui.PanelSet(&panel_No);
     gui.PanelSet(&panel_Quit);
-//    gui.PanelSet(&panel_Error);
-//    gui.PanelSet(&panel_Success);
-//    gui.PanelSet(&panel_Confirm);
     gui.PanelSet(&panel_delconf);
-//    gui.PanelSet(&panel_topmenu_help);
     gui.PanelSet(&panel_title);
     gui.PanelSet(&panel_menu);
     gui.PanelSet(&panel_bkup);
-//    gui.PanelSet(&panel_dbglog);
-    gui.PanelSet(&panel_insexit);
+    gui.PanelSet(&panel_inseject);
 
     gui.PanelLineStyle(PANEL_TITLE,COLOR_BLACK);
 
-
-//    gui.MessSet(&mess_Title_Err);
-//    gui.MessSet(&mess_Info_Err);
-//    gui.MessSet(&mess_Info2_Err);
-//    gui.MessSet(&mess_Info3_Err);
-//    gui.MessSet(&mess_Title_Suc);
-//    gui.MessSet(&mess_Info_Suc);
-//    gui.MessSet(&mess_Info2_Suc);
-//    gui.MessSet(&mess_conf_Title);
-//    gui.MessSet(&mess_conf_Msg);
     gui.MessSet(&mess_delconf_Title);
     gui.MessSet(&mess_delconf_Msg);
     gui.MessSet(&mess_delconf_Msg2);
     gui.MessSet(&mess_delconf_Msg3);
 
-//    gui.MessSet(&mess_topmenu_help_read);
-//    gui.MessSet(&mess_topmenu_help_write);
-//    gui.MessSet(&mess_topmenu_help_end);
-//    gui.MessSet(&mess_topmenu_help_operate);
-    
     gui.MessSet(&mess_title);
     gui.MessSet(&mess_version);
     gui.MessSet(&mess_product);
     gui.MessSet(&mess_product2);
     gui.MessSet(&mess_menu_read);
     gui.MessSet(&mess_menu_write);
-//    gui.MessSet(&mess_menu_end);
     gui.MessSet(&mess_menu_operate);
     gui.MessSet(&mess_quit_operate);
     gui.MessSet(&mess_conf);
     gui.MessSet(&mess_operate);
     gui.MessSet(&mess_bkuperr);
     gui.MessSet(&mess_carderr);
-//    gui.MessSet(&mess_debug);
     gui.MessSet(&mess_result);
     gui.MessSet(&mess_status);
     gui.MessSet(&mess_count);
     gui.MessSet(&mess_count2);
 
-    gui.MessSet(&mess_insexit);
-    gui.MessSet(&mess_insexit2);
-    gui.MessSet(&mess_insexit3);
+    gui.MessSet(&mess_inseject);
+    gui.MessSet(&mess_inseject2);
+    gui.MessSet(&mess_inseject3);
 
-//    gui.MemoSet(&memo_dbglog);
 
-//    gui.MemoEffective(MESSAGE_PRODUCT);
     gui.MessEffective(MESSAGE_ERROR_TITLE);
     gui.MessEffective(MESSAGE_ERROR_INFO);
     gui.MessEffective(MESSAGE_ERROR_INFO2);
@@ -429,38 +397,64 @@ bool ScrInitialize(uptr heap,u32 size,bool jp,bool deb)
     gui.MessEffective(MESSAGE_DELCONF_MSG);
     gui.MessEffective(MESSAGE_DELCONF_MSG2);
     gui.MessEffective(MESSAGE_DELCONF_MSG3);
-    gui.MessEffective(MESSAGE_TOPMENU_HELP_READ);
-    gui.MessEffective(MESSAGE_TOPMENU_HELP_WRITE);
-    gui.MessEffective(MESSAGE_TOPMENU_HELP_END);
-    gui.MessEffective(MESSAGE_TOPMENU_HELP_OPERATE);
     gui.MessEffective(MESSAGE_MENU_READ);
     gui.MessEffective(MESSAGE_MENU_WRITE);
-//    gui.MessEffective(MESSAGE_MENU_END);
     gui.MessEffective(MESSAGE_MENU_OPERATE);
-    gui.MessEffective(MESSAGE_INSEXT_1);
-    gui.MessEffective(MESSAGE_INSEXT_2);
-    gui.MessEffective(MESSAGE_INSEXT_3);
+    gui.MessEffective(MESSAGE_INSEJC_1);
+    gui.MessEffective(MESSAGE_INSEJC_2);
+    gui.MessEffective(MESSAGE_INSEJC_3);
     gui.MessEffective(MESSAGE_TITLE);
     gui.MessEffective(MESSAGE_VERSION);
-  //  gui.MemoEffective(MEMO_DBGLOG);
 
     gui.PanelLineStyle(PANEL_DELCONF,COLOR_YELLO);
 
-#ifdef USE_WCHAR
 	if (VERSION != 0.0){
         swprintf(scr_ver,10,L"ver %.2f",VERSION);
-        if (deb)wcscat(scr_ver,L" DEBUG");
+        if (flag & SCR_FLG_DBG)wcscat(scr_ver,L" DEBUG");
     }else wcscpy(scr_ver,VERSION_TXT_W);
-#else
-	if (VERSION != 0.0){
-        sprintf(scr_ver,"ver %.2f",VERSION);
-        if (deb)strcat(scr_ver," DEBUG");
-    }else strcpy(scr_ver,VERSION_TXT);
-#endif
+    
     gui.MessStr(MESSAGE_VERSION,scr_ver);
     gui.MessStr(MESSAGE_MENU_CAUTION,scr_err);
     gui.MessStr(MESSAGE_MENU_ERROR,scr_err);
-//    gui.MessStr(MESSAGE_MENU_DEBUG,scr_debug);
+    
+    gui.MessStr(MESSAGE_MENU_READ,pS_Str[I_HelpBackup]);
+    gui.MessStr(MESSAGE_MENU_WRITE,pS_Str[I_HelpRestore]);
+    gui.MessStr(MESSAGE_MENU_OPERATE,pS_Str[I_Touch]);
+    gui.MessStr(MESSAGE_QUIT_OPERATE,pS_Str[I_QuitB]);
+    gui.MessStr(MESSAGE_CONF,pS_Str[I_Execute]);
+    gui.MessStr(MESSAGE_OPERATE,pS_Str[I_Touch]);
+    gui.MessStr(MESSAGE_INSEJC_1,pS_Str[I_Inseject]);
+    gui.MessStr(MESSAGE_INSEJC_2,pS_Str[I_RetTop]);
+    gui.MessStr(MESSAGE_INSEJC_3,pS_Str[I_QuitB]);
+    gui.MessStr(MESSAGE_DELCONF_TITLE,pS_Str[I_Del]);
+    gui.MessStr(MESSAGE_DELCONF_MSG,pS_Str[I_Del2]);
+    gui.MessStr(MESSAGE_DELCONF_MSG2,pS_Str[I_Del3]);
+    gui.MessStr(MESSAGE_DELCONF_MSG3,pS_Str[I_Execute]);
+
+    gui.PanelCaption(PANEL_READ,pS_Str[I_Backup]);
+    gui.PanelCaption(PANEL_WRITE,pS_Str[I_Restore]);
+    gui.PanelCaption(PANEL_YES,pS_Str[I_Yes]);
+    gui.PanelCaption(PANEL_NO,pS_Str[I_No]);
+    gui.PanelCaption(PANEL_QUIT,pS_Str[I_Quit]);
+
+
+    if (flag & SCR_FLG_CP){//ƒRƒs�[ƒ‚�[ƒh‚È‚ç‰æ–ʂɕω»
+        //ƒ{ƒ^ƒ“˜g�F•Ï�X
+        gui.PanelLineStyle(PANEL_READ,COLOR_YELLO);
+        gui.PanelLineStyle(PANEL_WRITE,COLOR_YELLO);
+        gui.PanelLineStyle(PANEL_YES,COLOR_YELLO);
+        gui.PanelLineStyle(PANEL_NO,COLOR_YELLO);
+        gui.PanelLineStyle(PANEL_QUIT,COLOR_YELLO);
+        //ƒ^ƒCƒgƒ‹
+        //wS_Title = pS_Str[I_TitleCp];
+        wcscpy(wS_Title,pS_Str[I_TitleCp]);
+        gui.MessCol(MESSAGE_TITLE,COLOR_YELLO);
+    }else wcscpy(wS_Title,pS_Str[I_Title]);
+    //}else wS_Title = pS_Str[I_Title];
+
+    //if (flag & SCR_FLG_NOSD)wcscat(wS_Title,L" (no SD)");
+    //else
+    if (flag & SCR_FLG_FSD)wcscat(wS_Title,L" (use SD)");
 
     return true;
 
@@ -492,38 +486,6 @@ void Quit()
     gui.Draw();
 }
 
-/*
-//ƒgƒbƒvƒ�ƒjƒ…�[‰æ–Ê
-//ˆø�”:ƒJ�[ƒh�ó‘Ô
-void scr_TopMenuDbg(bool formatted,bool insertted)//ƒfƒoƒbƒO—p
-{
-    scr_evnt = EVNT_NONE;
-    gui.ButtonMask(nn::hid::BUTTON_A | nn::hid::BUTTON_R | nn::hid::BUTTON_L);
-
-    if (formatted)
-    {//ƒŠ�[ƒh‰Â”\
-        gui.MessSet(&mess_topmenu_help_read);
-        gui.PanelEffective(PANEL_READ);
-    }else{//ƒŠ�[ƒh•s‰Â
-        gui.MessSet(&mess_topmenu_help_notread);
-        gui.PanelEffective(PANEL_READ,false);
-    }
-    if (insertted)
-    {//�‘‚«�ž‚݉Â
-        gui.MessSet(&mess_topmenu_help_write);
-        gui.PanelEffective(PANEL_WRITE);
-    }else{//�‘‚«�ž‚Ý•s‰Â
-        gui.MessSet(&mess_topmenu_help_notwrite);
-        gui.PanelEffective(PANEL_WRITE,false);
-    }
-
-    gui.MessEffective(MESSAGE_TOPMENU_HELP_READ);
-    gui.MessEffective(MESSAGE_TOPMENU_HELP_WRITE);
-//    gui.PanelEffective(PANEL_END);
-    gui.PanelEffective(PANEL_TOPMENU);
-    gui.Draw();
-}
-*/
 
 //’Ê�펞
 
@@ -532,7 +494,6 @@ void scr_TopMenuDbg(bool formatted,bool insertted)//
 tChar scr_pcode[32];
 tChar scr_pcode2[32];
 
-#ifdef USE_WCHAR
 void scr_PrdCode(char *s)
 {
     wcscpy(scr_pcode,L"CARD : ");
@@ -548,23 +509,6 @@ void scr_PrdCodeEx(char *s)
     else mbstowcs(&scr_pcode2[7],s,30);
     gui.MessStr(MESSAGE_PRODUCT2,scr_pcode2);
 }
-#else
-void scr_PrdCode(char *s)
-{
-    strcpy(scr_pcode,"CARD : ");
-    if (s[0]==0) strcat(scr_pcode,"----");
-    else strcat(scr_pcode,s);
-    gui.MessStr(MESSAGE_PRODUCT,scr_pcode);
-}
-
-void scr_PrdCodeEx(char *s)
-{
-    strcpy(scr_pcode2,"BKUP : ");
-    if (s[0]==0) strcat(scr_pcode2,"----");
-    else strcat(scr_pcode2,s);
-    gui.MessStr(MESSAGE_PRODUCT2,scr_pcode2);
-}
-#endif
 
 
 
@@ -577,7 +521,6 @@ void scr_DelConf()
 }
 
 //ƒGƒ‰�[•\Ž¦
-#ifdef USE_WCHAR
 inline void set_err(int i)
 {
             swprintf(scr_err,16,L"ERROR %d",i);
@@ -588,78 +531,57 @@ inline void set_err(wchar_t* s)
             wcscpy(scr_err,s);
 }
 
-#else
-inline void set_err(int i)
-{
-            sprintf(scr_err,"ERROR %d",i);
-}
 
-inline void set_err(char* s)
-{
-            strcpy(scr_err,s);
-}
-#endif
 
 //Top menu
-//ˆø�”:ƒfƒoƒCƒX�ó‘Ô
-//arg : ƒvƒ�ƒ_ƒNƒgƒR�[ƒhˆê’v
-void scr_TopMenu(bool formatted,bool inserted,bool exfm,bool bkupins,int err)
+void scr_TopMenu(int mode,int err)
 {
 
-    int i;
-    scr_evnt = EVNT_NONE;
-
-    u32 mask = 0;
-    mask |= (nn::hid::BUTTON_LEFT | nn::hid::BUTTON_X);//LEFT+X = Delete —LŒø
-
-    gui.MessStr(MESSAGE_TITLE,S_Title);
+    gui.MessStr(MESSAGE_TITLE,wS_Title);
 
     gui.MessEffective(MESSAGE_MENU_ERROR,false,false);
     gui.MessEffective(MESSAGE_MENU_CAUTION,false,false);
     gui.MessEffective(MESSAGE_MENU_OPERATE,false,false);
-    //•Ð•û‚Ì‚Ý—LŒø
-    if (formatted && bkupins && (exfm == false))
-    {//ƒoƒbƒNƒAƒbƒv
-        gui.MessEffective(MESSAGE_MENU_OPERATE);
-        gui.PanelEffective(PANEL_READ);
-        gui.PanelEffective(PANEL_WRITE,false,false);
-    }else if (exfm && inserted)
-    {//ƒŠƒXƒgƒA
-        mask |= (nn::hid::BUTTON_LEFT | nn::hid::BUTTON_X);//LEFT+X = Delete —LŒø
-        gui.PanelEffective(PANEL_READ,false,false);
-        i =0;
-        if (err & SDATA_ERRPUT_PCODE) i = TGT_CARD + ERC_PRODCODE;//ƒvƒ�ƒ_ƒNƒgƒR�[ƒh•sˆê’v
-        //else
-        //if (err & SDATA_ERRPUT_MEDIA) i = ERC_MEDIA + TGT_CARD;//ƒoƒbƒNƒAƒbƒv‚È‚µ
-        if (i !=0 )
-        {
-            gui.PanelEffective(PANEL_WRITE,false,false);
-            set_err(i);
-            gui.MessEffective(MESSAGE_MENU_ERROR);
-        }
-        else{ 
-            gui.MessEffective(MESSAGE_MENU_OPERATE);
-            gui.PanelEffective(PANEL_WRITE);
-        }
-    }else{//‚È‚µ
-        gui.PanelEffective(PANEL_WRITE,false,false);
-        gui.PanelEffective(PANEL_READ,false,false);
 
-        if (inserted == false)
-        {
-            set_err(S_InsertCard);
+    gui.PanelEffective(PANEL_WRITE,false,false);
+    gui.PanelEffective(PANEL_READ,false,false);
+
+    if (err){
+      switch (err){//Œx���AƒGƒ‰�[•\Ž¦
+        case SCR_ERRPUT_CARD://ƒJ�[ƒh‚ª–³‚¢ƒ��[ƒjƒ“ƒO
+            set_err(pS_Str[I_InsertCard]);
             gui.MessEffective(MESSAGE_MENU_CAUTION);
-            
-        }else{
-            if (err & SDATA_ERRPUT_MEDIA) i = ERC_MEDIA + TGT_CARD;//ƒZ�[ƒuƒf�[ƒ^‚ªƒ}ƒEƒ“ƒg‚Å‚«‚È‚¢
-            else if (bkupins == false) i = ERC_DEVICE + TGT_SD;//�‘�o‚µ�æƒfƒoƒCƒX‚ª–³‚¢(SD‚Ì‚Ý”­�¶)
-            else i = ERC_EXEC;//ŽÀ�sƒGƒ‰�[�Aƒtƒ‰ƒO�Ý’èƒ~ƒX�H
-            set_err(i);
+            break;
+        case SCR_ERRPUT_CARD2://ƒJ�[ƒhŠm”F’†
+            set_err(pS_Str[I_CardChk]);
+            gui.MessEffective(MESSAGE_MENU_CAUTION);
+            break;
+        case SCR_ERRPUT_PCODE://ƒvƒ�ƒ_ƒNƒgƒR�[ƒh•sˆê’v
+            set_err(TGT_CARD + ERC_PRODCODE);
             gui.MessEffective(MESSAGE_MENU_ERROR);
-        }
+            break;
+        case SCR_ERRPUT_MEDIA://ƒZ�[ƒuƒf�[ƒ^‚ªƒ}ƒEƒ“ƒg‚Å‚«‚È‚¢
+            set_err(TGT_CARD + ERC_MEDIA);
+            gui.MessEffective(MESSAGE_MENU_ERROR);
+            break;
+        default://ŽÀ�sƒGƒ‰�[
+            set_err(TGT_CTR + ERC_EXEC);
+            gui.MessEffective(MESSAGE_MENU_ERROR);
+            break;
+      }
+    }else{
+       if (mode == SCR_MENU_READ){
+           gui.MessEffective(MESSAGE_MENU_OPERATE);
+           gui.PanelEffective(PANEL_READ);
+       }else
+       if (mode == SCR_MENU_WRITE){
+           gui.MessEffective(MESSAGE_MENU_OPERATE);
+           gui.PanelEffective(PANEL_WRITE);
+       }
     }
-
-    gui.ButtonMask(mask);
+    
+    //LEFT+X = Delete —LŒø
+    gui.ButtonMask(nn::hid::BUTTON_LEFT | nn::hid::BUTTON_X);
     
     gui.MessEffective(MESSAGE_PRODUCT);
     gui.MessEffective(MESSAGE_PRODUCT2);
@@ -670,6 +592,8 @@ void scr_TopMenu(bool formatted,bool inserted,bool exfm,bool bkupins,int err)
     gui.Draw();
 }
 
+
+
 //ƒfƒoƒbƒO—p�Aƒ{ƒ^ƒ“‘Ò‚¿
 void ScrStep()
 {
@@ -695,7 +619,7 @@ void scr_Backup()
 {
     scr_evnt = EVNT_NONE;
     gui.PanelLineStyle(PANEL_BKUP,COLOR_SKY);
-    gui.MessStr(MESSAGE_TITLE,S_TitleBkup);
+    gui.MessStr(MESSAGE_TITLE,pS_Str[I_TitleBkup]);
     gui.PanelEffective(PANEL_TITLE);
     ClearBkupMess();
     gui.Draw();
@@ -714,7 +638,7 @@ void scr_Restore()
 {
     scr_evnt = EVNT_NONE;
     gui.PanelLineStyle(PANEL_BKUP,COLOR_PARPL);
-    gui.MessStr(MESSAGE_TITLE,S_TitleRestore);
+    gui.MessStr(MESSAGE_TITLE,pS_Str[I_TitleRestore]);
     gui.PanelEffective(PANEL_TITLE);
     ClearBkupMess();//backup‚Æ“¯‚¶ƒpƒlƒ‹‚ðŽg‚¤
     gui.Draw();
@@ -734,7 +658,7 @@ void scr_Status(tChar *s,eColor col)
     gui.MessCol(MESSAGE_STATUS,col);
     gui.MessStr(MESSAGE_STATUS,s);
     gui.MessEffective(MESSAGE_STATUS);
-    gui.Draw();
+    gui.Draw_U();
 }
 
 void scr_ResultQuit(tChar *s,eColor col)
@@ -747,62 +671,63 @@ void scr_ResultQuit(tChar *s,eColor col)
 }
 
 
-void scr_InsExitQuit()
+void scr_InsEjectQuit()
 {
     ClearBkupMess();
-    gui.PanelLineStyle(PANEL_INSEXIT,COLOR_RED);
-    gui.PanelEffective(PANEL_INSEXIT);
+    gui.PanelLineStyle(PANEL_INSEJECT,COLOR_RED);
+    gui.PanelEffective(PANEL_INSEJECT);
     Quit();
 }
 
+void scr_InsEjectSD()
+{
+    ClearBkupMess();
+    gui.MessStr(MESSAGE_INSEJC_1,pS_Str[I_InsejectSD]);
+    gui.MessStr(MESSAGE_INSEJC_2,pS_Str[I_Restart1]);
+    gui.MessStr(MESSAGE_INSEJC_3,pS_Str[I_Restart2]);
+    gui.PanelLineStyle(PANEL_INSEJECT,COLOR_RED);
+    gui.PanelEffective(PANEL_INSEJECT);
+    gui.Draw();
+}
+
+
+
 // ƒJƒEƒ“ƒg/MAX •\Ž¦
 tChar str_Counter[32];
 tChar str_Counter2[32];
 void scr_CountPerMax(int ct,int max)
 {
-#ifdef USE_WCHAR
     swprintf(str_Counter,30,L"%d / %d",ct,max);
-#else
-    sprintf(str_Counter,"%d / %d",ct,max);
-#endif
     gui.MessStr(MESSAGE_COUNT,str_Counter);
     gui.MessEffective(MESSAGE_COUNT);
-    gui.Draw();
+//    gui.Draw();
 }
 
-//ƒQ�[ƒW�•total
-void scr_CountPerMax2(int ct,int max,int total)
+//ƒQ�[ƒW
+void scr_Gage(int ct,int max)
 {
     int i,lv;
-    if (total == -1) str_Counter2[0]=0;
-    else if (total != 0){
-//        gui.MessCol(MESSAGE_COUNT2,COLOR_WHITE);
-#ifdef USE_WCHAR
-        swprintf(str_Counter2,30,L"total size  %d",total);
-    }else{
-//        gui.MessCol(MESSAGE_COUNT2,COLOR_YELLO);
-        lv = ct/(max/25);
-        for (i =0;i<lv;i++)str_Counter2[i] = L'>';
-        while ( i < 25 )str_Counter2[i++] = L'|';
-        str_Counter2[i] = 0;
-    }
-#else
-        sprintf(str_Counter2,"total size  %d",total);
-    }else{
-//        gui.MessCol(MESSAGE_COUNT2,COLOR_YELLO);
-        lv = ct/(max/25);
-        for (i =0;i<lv;i++)str_Counter2[i] = '>';
-        while ( i < 25 )str_Counter2[i++] = '|';
-        str_Counter2[i] = 0;
-    }
-#endif
+    lv = ct/(max/25);
+    for (i =0;i<lv;i++)str_Counter2[i] = L'>';
+    while ( i < 25 )str_Counter2[i++] = L'|';
+    str_Counter2[i] = 0;
      //sprintf(str_Counter2,"%d / %d",ct,max);
     gui.MessStr(MESSAGE_COUNT2,str_Counter2);
     gui.MessEffective(MESSAGE_COUNT2);
-    gui.Draw();
-    
+    //gui.Draw();
 }
 
+//total
+void scr_Total(int total)
+{
+    swprintf(str_Counter2,30,L"total size  %d",total);
+    gui.MessStr(MESSAGE_COUNT2,str_Counter2);
+    gui.MessEffective(MESSAGE_COUNT2);
+    //gui.Draw();
+}
+
+
+
 void scr_MessOnCount2(tChar *str)
 {
 //    gui.MessCol(MESSAGE_COUNT2,COLOR_YELLO);
@@ -860,6 +785,12 @@ void scr_Draw()
     gui.Draw();
 }
 
+
+void scr_Vsnc()
+{
+    gui.WaitVsnc();
+}
+
 void scr_GetEvnt()
 {
 //    gui.thUpdate();
diff --git a/trunk/CardSaveData/Mover/body/source/screen/screen.h b/trunk/CardSaveData/Mover/body/source/screen/screen.h
index 43b892e..ed11e5b 100644
--- a/trunk/CardSaveData/Mover/body/source/screen/screen.h
+++ b/trunk/CardSaveData/Mover/body/source/screen/screen.h
@@ -34,21 +34,42 @@ typedef struct{
 }tColStr;
 
 
-//Topƒ�ƒjƒ…�[‚ł̃Gƒ‰�[•\Ž¦—p‚̃tƒ‰ƒO
-//bitˆÊ’u‚Ì‚n‚q
-#define  SDATA_ERRPUT_PCODE	(1 << 0)
-#define  SDATA_ERRPUT_MEDIA	(1 << 1)
-#define  SDATA_ERRPUT_VERIFI (1 << 2)
+//Topƒ�ƒjƒ…�[‚ł̃Gƒ‰�[&�ó‘Ô•\Ž¦ƒtƒ‰ƒO
+enum{
+SCR_ERRPUT_NONE,
+SCR_ERRPUT_PCODE,
+SCR_ERRPUT_MEDIA,
+SCR_ERRPUT_EXEC,
+SCR_ERRPUT_CARD,
+SCR_ERRPUT_CARD2
+};
+
 //ƒfƒoƒOƒ‚�[ƒh‚Ì•\Ž¦
 //#define  SDATA_ERRPUT_DEBUG (1>>3)
 
-bool ScrInitialize(uptr heap,u32 size,bool jp,bool deb);
+//Initialize—pƒtƒ‰ƒO
+//“ú–{Œê�AƒRƒs�[ƒ‚�[ƒh�A‹­�§SD�ASD‚È‚µ�AƒfƒoƒO
+#define SCR_FLG_JP 1
+#define SCR_FLG_CP 2
+#define SCR_FLG_FSD 4
+#define SCR_FLG_NOSD 8
+#define SCR_FLG_DBG 0x80
+
+//ƒ�ƒjƒ…�[•\Ž¦
+enum{
+SCR_MENU_NONE,
+SCR_MENU_READ,
+SCR_MENU_WRITE
+};
+
+
+bool ScrInitialize(uptr heap,u32 size,u8 flag);
 void ScrFinalize();
 void ScrClr();
 int ScrDbgLogGetMax();
 void ScrStep();
 void scr_TopMenuDbg(bool formatted,bool insertted);
-void scr_TopMenu(bool formatted,bool inserted,bool exfm,bool sdins,int err);
+void scr_TopMenu(int mode,int err);
 void scr_ErrorQuitDbg(tColStr **s);
 void scr_SuccessQuitDbg(tColStr **s);
 void scr_ConfirmDbg(char *str);
@@ -56,17 +77,20 @@ void scr_BackupYesNo();
 void scr_Backup();
 void scr_RestoreYesNo();
 void scr_Restore();
-void scr_InsExitQuit();
+void scr_InsEjectQuit();
+void scr_InsEjectSD();
 void scr_Status(tChar *s,eColor col);
 void scr_ResultQuit(tChar *s,eColor col);
 void scr_CountPerMax(int ct,int max);
-void scr_CountPerMax2(int ct,int max,int total);
+void scr_Gage(int ct,int max);
+void scr_Total(int total);
 void scr_PrdCode(char *s);
 void scr_PrdCodeEx(char *s);
 void scr_DelConf();
 void scr_MessOnCount2(tChar *str);
 void scr_Draw();
 void scr_GetEvnt();
+void scr_Vsnc();
 
 #endif
 
diff --git a/trunk/CardSaveData/Mover/body/source/sub.cpp b/trunk/CardSaveData/Mover/body/source/sub.cpp
new file mode 100644
index 0000000..244b9f7
--- /dev/null
+++ b/trunk/CardSaveData/Mover/body/source/sub.cpp
@@ -0,0 +1,462 @@
+//#include <nn/fs/ctr/mpcore/fs_FileSystemBasePrivate.h>
+#include "sub.h"
+#include "./screen/screen.h"
+
+//何故�クラス関数�イベント登録出�����外部�照
+extern bool CheckInsEject();//挿抜�ェック
+
+
+//-------------------------------------------------------  メン�関数
+//**** ラッピング *** 
+//コンストラクタ
+CsmSaveFile::CsmSaveFile()
+{
+    finalized = false;
+    pos_card = 0;
+}
+
+
+//終了
+void CsmSaveFile::Finalize()
+{
+
+    if (finalized)return;
+
+    savedata.Finalize();
+    exsave.Finalize();
+    memsave.Finalize();
+    finalized = true;
+}
+
+//デストラクタ
+CsmSaveFile:: ~CsmSaveFile()
+{
+    Finalize();
+}
+
+//存在�ェック
+bool CsmSaveFile::IsExist(TgtDev dev)
+{
+   if(dev == TGT_CARD)return savedata.IsExist();
+   if(dev == TGT_SD)return exsave.IsExist();
+   if(dev == TGT_MEM)return memsave.IsExist();
+   return false;
+}
+
+//削除
+bool CsmSaveFile::Delete(TgtDev dev)
+{
+   //if(dev == TGT_CARD)return false;
+   if(dev == TGT_SD)return exsave.Delete();
+   if(dev == TGT_MEM)return memsave.Delete();
+   return false;
+}
+
+
+//Result
+nn::Result CsmSaveFile::LastNnResult(TgtDev dev)
+{
+    nn::Result res;
+    if(dev == TGT_CARD)res = savedata.LastNnResult;
+    else if(dev == TGT_SD)res = exsave.LastNnResult;
+    else if(dev == TGT_MEM)res = memsave.LastNnResult;
+    return res;
+}
+
+//Mount
+myResult CsmSaveFile::Mount(TgtDev dev)
+{
+    myResult res;
+    if(dev == TGT_CARD)res = savedata.Mount();
+    else if(dev == TGT_SD)res = exsave.Mount();
+    else if(dev == TGT_MEM)res = memsave.Mount();
+    return res;
+}
+
+//Unmoun
+void CsmSaveFile::Unmount(TgtDev dev)
+{
+    if(dev == TGT_CARD)savedata.Unmount();
+    else if(dev == TGT_SD)exsave.Unmount();
+    else if(dev == TGT_MEM)memsave.Unmount();
+}
+
+void CsmSaveFile::Unmount()
+{
+    savedata.Unmount();
+    exsave.Unmount();
+    memsave.Unmount();
+}
+
+//ワーク�作�
+myResult CsmSaveFile::Create(TgtDev dev,u32 entryDir,u32 entryFile)
+{
+    if(dev == TGT_SD)return exsave.Create(entryDir,entryFile);
+    else if(dev == TGT_MEM)return memsave.Create(entryDir,entryFile);
+    return RESULT_FAIL;
+    
+}
+
+//パス�得�置リセット
+void CsmSaveFile::ResetPath(TgtDev dev)
+{
+    if(dev == TGT_CARD)savedata.ResetPath();
+    else if(dev == TGT_SD)exsave.ResetPath();
+    else if(dev == TGT_MEM)memsave.ResetPath();
+}
+
+//パス�得
+myResult CsmSaveFile::GetPath(TgtDev dev,wchar_t *path)
+{
+    if(dev == TGT_CARD)return savedata.GetPath(path);
+    if(dev == TGT_SD)return exsave.GetPath(path);
+    if(dev == TGT_MEM)return memsave.GetPath(path);
+    return RESULT_FAIL;
+
+}
+
+//フラッシュ
+bool CsmSaveFile::Flush(TgtDev dev)
+{
+    if(dev == TGT_CARD)return savedata.Flush();
+    if(dev == TGT_SD)return exsave.Flush();
+    if(dev == TGT_MEM)return true;
+    return false;
+
+}
+
+
+
+//オープンファイル
+bool CsmSaveFile::Open(TgtDev dev,wchar_t *path)
+{
+    if(dev == TGT_CARD){
+        pos_card = 0;
+        return savedata.Open(path);
+    }else if(dev == TGT_SD)return exsave.Open(path);
+    else if(dev == TGT_MEM)return memsave.Open(path);
+    return false;
+}
+
+
+bool CsmSaveFile::OpenW(TgtDev dev,wchar_t *path,s64 size)
+{
+    if(dev == TGT_CARD)return savedata.OpenW(path,true);//作��り
+    else if(dev == TGT_SD)return exsave.OpenW(path,false);//拡張セーブ�先�Create���
+    else if(dev == TGT_MEM)if(size>0)return memsave.OpenW(path,size);
+    return false;
+}
+
+bool CsmSaveFile::CreateFile(TgtDev dev,wchar_t *path,s64 size)
+{
+    if(dev == TGT_CARD)return savedata.CreateFile(path,size);
+    else if(dev == TGT_SD)return exsave.CreateFile(path,size);
+    return false;
+}
+
+
+//クローズ
+void CsmSaveFile::Close(TgtDev dev)
+{
+    if(dev == TGT_CARD)savedata.Close();
+    else if(dev == TGT_SD)exsave.Close();
+    else if(dev == TGT_MEM)memsave.Close();
+}
+
+void CsmSaveFile::Close()
+{
+    savedata.Close();
+    exsave.Close();
+    memsave.Close();
+}
+
+void CsmSaveFile::CloseW(TgtDev dev)
+{
+    if(dev == TGT_CARD)savedata.CloseW();
+    else if(dev == TGT_SD)exsave.CloseW();
+    else if(dev == TGT_MEM)memsave.CloseW();
+}
+
+//ファイルサイズ�得
+s64 CsmSaveFile::FileSize(TgtDev dev)
+{
+    if(dev == TGT_CARD)return savedata.FileSize;
+    else if(dev == TGT_SD)return exsave.FileSize;
+    else if(dev == TGT_MEM)return memsave.FileSize;
+    return 0;
+}
+
+//ライト
+s32 CsmSaveFile::Write(TgtDev dev,char *buffer,size_t size)
+{
+    if(dev == TGT_CARD)return savedata.Write(buffer,size);
+    else if(dev == TGT_SD)return exsave.Write(buffer,size);
+    else if(dev == TGT_MEM)return memsave.Write(buffer,size);
+    return 0;
+}
+
+//リード
+s32 CsmSaveFile::Read(TgtDev dev,char *buffer,size_t size)
+{
+    if(dev == TGT_CARD)return savedata.Read(buffer,size);
+    else if(dev == TGT_SD)return exsave.Read(buffer,size);
+    else if(dev == TGT_MEM)return memsave.Read(buffer,size);
+    return 0;
+}
+
+
+//**** カード専用 ***
+//プロダクトコード�得
+bool CsmSaveFile::GetPrdCode()
+{
+   PrdCode[0] = 0;//Clear
+   if (savedata.GetPrdCode()){
+       strcpy(PrdCode,savedata.PrdCode);
+       return true;
+   }
+   return false;
+}
+
+//セーブデータ�情報
+//arcInfo <- フォーマット情報�ファイル�ディレクトリ数
+//scList <- ディレクトリパス
+bool CsmSaveFile::GetInfo(tArcInfo *pinfo,tDcList *pDcList,size_t clsz)
+{
+    return savedata.GetInfo(pinfo,pDcList,clsz);
+}
+
+//ユーザセーブ�ブロックリード
+//中身�データ�作�サイズ�満���場��
+//未書込�領域�検証エラー(desc=329)��る場���る
+//読���ブロック���置���る(SDKツール�SaveFiler���方法..ロン�当時)
+//size = サイズ
+//        検証�512���読��る����置�����よ�512以下�指定
+//        尚�ユーザセーブ以外�検証�4096��
+//pos = �置指定
+//         SDK3.1(より？)エラー時�ファイル�インタ更新�����2.0より
+bool CsmSaveFile::ReadBlock(char* buffer,size_t size)
+{
+    if ((size > 512) || (size < 0))return false;
+    savedata.SetPos(pos_card);
+    if(savedata.Read(buffer,size) != size )
+    {
+        NN_LOG("%d\n",LastNnResult(TGT_CARD).GetDescription());
+        if(nn::fs::ResultVerificationFailed::Includes(LastNnResult(TGT_CARD)))
+        {//検証エラー
+            for (int i = 0; i < size; i++) buffer[i] = 0;//0埋�
+        }else return false;
+    }
+    pos_card += size;
+    return true;
+}
+
+//*** 状態�得 ***
+bool CsmSaveFile::stsActive(TgtDev dev)
+{
+    if (dev == TGT_CARD)return GetPrdCode();
+    if (dev == TGT_MEM)return true;
+    if (dev == TGT_SD)return nn::fs::IsSdmcWritable();
+    return false;
+}
+
+bool CsmSaveFile::stsFormatted(TgtDev dev)
+{
+    return IsExist(dev);
+}
+
+extern void Icon(eColor col);
+
+//*** ファイルコピー ***
+myResult CsmSaveFile::Copy(TgtDev dest,TgtDev src,wchar_t *path,wchar_t *pathw)
+{
+    myResult res;
+    int rsize;
+    s64 fsize,msize;
+
+    if (Open(src,path)==false)return RESULT_FAIL_OPEN;
+    fsize = FileSize(src);
+    if (pathw == 0)pathw = path;
+    if (OpenW(dest,pathw,fsize)==false)return RESULT_FAIL_OPENW;
+
+    //カード�検証���512��読む��
+    msize=fsize;
+    res = RESULT_OK;
+    while(fsize)
+    {
+        if(CheckInsEject()){
+            res = RESULT_INSEJECT;
+            break;
+        }
+
+        if(dest == TGT_CARD)Icon(COLOR_PARPL);//動作中アイコン"-","|"
+        else Icon(COLOR_SKY);
+        if(msize > FILEBUFF_SIZE * 2){
+            scr_Gage(msize-fsize,msize);
+        }
+        
+        if (fsize>FILEBUFF_SIZE)
+        {
+            rsize = FILEBUFF_SIZE;
+            fsize -= FILEBUFF_SIZE;
+        }else{
+            rsize = fsize;
+            fsize = 0;
+        }
+        if (src == TGT_CARD){//カード�空�領域補正��リード
+            if(ReadBlock(fileBuffer,rsize)==false){
+                res = RESULT_FAIL_READ;
+                break;
+            }
+        }else{
+            if(Read(src,fileBuffer,rsize)!=rsize){
+                res = RESULT_FAIL_READ;
+                break;
+            }
+        }
+        if(Write(dest,fileBuffer,rsize) != rsize ){
+            res= RESULT_FAIL_WRITE;
+            break;
+        }
+    }
+    Close(src);
+    CloseW(dest);
+    if (res != RESULT_OK)return res;
+    else if (fsize != 0)res = RESULT_FAIL;//想定外�ループ抜�
+    return res;
+}
+
+//*** オープン済ファイル間�コピー ***
+myResult CsmSaveFile::OpnCpy(TgtDev dest,TgtDev src,size_t size)
+{
+    myResult res;
+    int rsize;
+    s64 msize;
+    
+    //カード�検証���512��読む��
+    msize=size;
+    res = RESULT_OK;
+    while(size)
+    {
+        if(CheckInsEject()){
+            res = RESULT_INSEJECT;
+            break;
+        }
+        
+        if(msize > FILEBUFF_SIZE * 2){
+            scr_Gage(msize-size,msize);//ゲージ
+        }
+        if(dest == TGT_CARD)Icon(COLOR_PARPL);//動作中アイコン"-","|"
+        else Icon(COLOR_SKY);
+        
+        if (size>FILEBUFF_SIZE)
+        {
+            rsize = FILEBUFF_SIZE;
+            size -= FILEBUFF_SIZE;
+        }else{
+            rsize = size;
+            size = 0;
+        }
+        
+        if (src == TGT_CARD){//カード�空�領域補正��リード
+            if(ReadBlock(fileBuffer,rsize)==false){
+                res = RESULT_FAIL_READ;
+                break;
+            }
+        }else{
+            if(Read(src,fileBuffer,rsize)!=rsize){
+                res = RESULT_FAIL_READ;
+                break;
+            }
+        }
+        if(Write(dest,fileBuffer,rsize) != rsize ){
+            res= RESULT_FAIL_WRITE;
+            break;
+        }
+    }
+    if ((res == RESULT_OK) && (size != 0))res = RESULT_FAIL;//想定外�ループ抜�
+    return res;
+
+}
+
+
+//*** オープン済ファイル間�コンペア ***
+myResult CsmSaveFile::OpnCmp(TgtDev dest,TgtDev src,size_t size)
+{
+    myResult res;
+    int rsize;
+    s64 msize;
+
+    //カード�検証���512��読む��
+    msize=size;
+    res = RESULT_OK;
+    while(size)
+    {
+        if(CheckInsEject()){
+            res = RESULT_INSEJECT;
+            break;
+        }
+        
+        if(msize > FILEBUFF_SIZE * 2){
+            scr_Gage(msize-size,msize);//ゲージ
+        }
+        Icon(COLOR_YELLO);//動作中アイコン"-","|"
+        
+        if (size>FILEBUFF_SIZE)
+        {
+            rsize = FILEBUFF_SIZE;
+            size -= FILEBUFF_SIZE;
+        }else{
+            rsize = size;
+            size = 0;
+        }
+        
+        if (src == TGT_CARD){//カード�空�領域補正��リード
+            if(ReadBlock(fileBuffer,rsize)==false){
+                res = RESULT_FAIL_READ;
+                break;
+            }
+        }else{
+            if(Read(src,fileBuffer,rsize)!=rsize){
+                res = RESULT_FAIL_READ;
+                break;
+            }
+        }
+        //dest�カード指定����ライト後����通常リード
+        if(Read(dest,fileBuffer2,rsize)!=rsize){
+            res = RESULT_FAIL_READ;
+            break;
+        }
+        //比較
+        if(memcmp(fileBuffer,fileBuffer2,rsize)!=0){
+            res = RESULT_FAIL_VERIFI;
+            break;
+        }
+    }
+    if ((res == RESULT_OK) && (size != 0))res = RESULT_FAIL;//想定外�ループ抜�
+    return res;
+
+}
+
+//ディレクトリ作�
+bool CsmSaveFile::MakeDir(TgtDev dev,wchar_t *path,bool *mkdir)
+{
+    if(dev == TGT_CARD)return savedata.MakeDir(path,mkdir);
+    if(dev == TGT_SD)return exsave.MakeDir(path,mkdir);
+    //if(dev == TGT_MEM)return memsave.MakeDir(path,mkdir);
+    return false;
+}
+
+//ファイル削除
+bool CsmSaveFile::DeleteFile(TgtDev dev,wchar_t *path)
+{
+    if(dev == TGT_CARD)return savedata.DeleteFile(path);
+    if(dev == TGT_SD)return exsave.DeleteFile(path);
+    //if(dev == TGT_MEM)return memsave.MakeDir(path,mkdir);
+    return false;
+
+
+}
+/*---------------------------------------------------------------------------*
+  End of file
+ *---------------------------------------------------------------------------*/
+
diff --git a/trunk/CardSaveData/Mover/body/source/sub.h b/trunk/CardSaveData/Mover/body/source/sub.h
new file mode 100644
index 0000000..f2ea1c1
--- /dev/null
+++ b/trunk/CardSaveData/Mover/body/source/sub.h
@@ -0,0 +1,75 @@
+#ifndef _SUB_H_
+#define _SUB_H_
+
+
+#include <nn.h>
+#include "../../../common/savefile/membak.h"
+#include "../../../common/savefile/exsave.h"
+#include "../../../common/savefile/savefile.h"
+#include "../../../common/savefile/savedata.h"
+#include "../../../common/my_defs.h"
+
+//ƒZ�[ƒuƒf�[ƒ^‚ÌŒŸ�؃f�[ƒ^‚ª512’PˆÊ‚È‚Ì‚Å
+#define FILEBUFF_SIZE 512
+
+//ƒNƒ‰ƒX�錾
+class CsmSaveFile
+{
+    public:
+        char PrdCode[20];
+    private:
+        bool finalized;
+        s64 pos_card;//ƒJ�[ƒh‚̃Š�[ƒhˆÊ’u
+        //ƒhƒ‰ƒCƒo‚ÌŽd—l‚Å‘¬“x“I‚É‚SƒoƒCƒgƒAƒ‰ƒCƒ“‚µ‚½•û‚ª‚¢‚¢(SDK 0.14.23 Žž“_)
+        char fileBuffer[FILEBUFF_SIZE] NN_ATTRIBUTE_ALIGN(4);
+        char fileBuffer2[FILEBUFF_SIZE] NN_ATTRIBUTE_ALIGN(4);
+    private:
+        SaveData savedata;
+        ExSave exsave;
+        MemBak memsave;
+        
+    public:
+        CsmSaveFile();
+        ~CsmSaveFile();
+        //void Initialize();
+        bool IsExist(TgtDev dev);
+        bool Delete(TgtDev dev);
+        void Finalize();
+        nn::Result LastNnResult(TgtDev dev);
+        myResult Mount(TgtDev dev);
+        void Unmount(TgtDev dev);
+        void Unmount();
+        myResult Create(TgtDev dev,u32 entryDir,u32 entryFile);
+        void ResetPath(TgtDev dev);
+        myResult GetPath(TgtDev dev,wchar_t *path);
+        bool Open(TgtDev dev,wchar_t *path);
+        bool OpenW(TgtDev dev,wchar_t *path,s64 size=0);
+        bool CreateFile(TgtDev dev,wchar_t *path,s64 size);
+        void Close(TgtDev dev);
+        void Close();
+        void CloseW(TgtDev dev);
+        s64 FileSize(TgtDev dev);
+        s32 Write(TgtDev dev,char *buffer,size_t size);
+        s32 Read(TgtDev dev,char *buffer,size_t size);
+        myResult Copy(TgtDev dest,TgtDev src,wchar_t *path,wchar_t *pathw = 0);
+        myResult OpnCpy(TgtDev dest,TgtDev src,size_t size);
+        myResult OpnCmp(TgtDev dest,TgtDev src,size_t size);
+        bool stsActive(TgtDev dev);
+        bool stsFormatted(TgtDev dev);
+        bool MakeDir(TgtDev dev,wchar_t *path,bool *mkdir);
+        bool DeleteFile(TgtDev dev,wchar_t *path);
+        bool Flush(TgtDev dev);
+        //Card
+        bool GetPrdCode();
+        bool GetInfo(tArcInfo *pinfo,tDcList *pDcList,size_t clsz = 0);
+        bool ReadBlock(char* buffer,size_t size);
+        myResult Format(tArcInfo *pinfo){return savedata.Format(pinfo);};
+        bool Commit(){return savedata.Commit();};
+        //SD
+        bool SetPos(s64 pos){return exsave.SetPosW(pos);};
+
+};
+
+
+#endif
+
diff --git a/trunk/CardSaveData/Mover/body/ver.h b/trunk/CardSaveData/Mover/body/ver.h
index 9c6064f..56891a5 100644
--- a/trunk/CardSaveData/Mover/body/ver.h
+++ b/trunk/CardSaveData/Mover/body/ver.h
@@ -16,10 +16,11 @@
 #ifndef VER_H_
 #define VER_H_
 
-#define VERSION 1.2
+#define VERSION 2.0
 // ver = 0 �らテキスト�方を表示
 //#define VERSION 0.0
 #define VERSION_TXT "TEST ONLY"
 #define VERSION_TXT_W L"TEST ONLY"
 
+
 #endif
diff --git a/trunk/CardSaveData/Mover/card2注�.txt b/trunk/CardSaveData/Mover/card2注�.txt
new file mode 100644
index 0000000..65e9632
--- /dev/null
+++ b/trunk/CardSaveData/Mover/card2注�.txt
@@ -0,0 +1,16 @@
+�Eimp‚̃eƒXƒgƒf�[ƒ^�ì�¬
+‘Î�ÛƒfƒoƒCƒX‚É�‡‚킹‚Ä
+rsf‚ÌCARD2Žw’è‚·‚é
+ƒfƒoƒK‚ÅMover–{‘Ì‚ðƒJ�[ƒhƒAƒvƒŠŽÀ�s‚·‚é�ê�‡
+rsf‚̃TƒCƒY‚ðimp�ì�¬Žž‚ƈê’v‚³‚¹‚é
+
+�E”’” ƒfƒoƒO
+ƒGƒ~ƒ…ƒŒ�[ƒVƒ‡ƒ“ƒ�ƒ‚ƒŠ‚©‚ç�‘‚«–ß‚³‚È‚¢‚Æ
+ƒJ�[ƒh�ã‚̃Z�[ƒuƒGƒŠƒA‚É”½‰f‚µ‚È‚¢
+’�ˆÓ) rsf‚̃TƒCƒY•Ï�X‚µ‚½‚çROM�Ä‚«‚µ‚Ä
+ƒZ�[ƒu�Ý’è‚ðˆê’v‚³‚¹‚Æ‚­
+
+ƒJ�[ƒh‚Ƀf�[ƒ^‚ª‚ ‚Á‚Ä‚à�AƒfƒoƒO‚Å‚Í
+ƒGƒ~ƒ…ƒ�ƒ‚ƒŠ‚ðŒ©‚É�s‚­‚Ì‚Å�Aƒ��[ƒh‚·‚é‚©�ì�¬‚µ‚È‚¢‚Æ
+”FŽ¯‚µ‚È‚¢
+
diff --git a/trunk/CardSaveData/Mover/release.txt b/trunk/CardSaveData/Mover/release.txt
index affd3ac..f5a9493 100644
--- a/trunk/CardSaveData/Mover/release.txt
+++ b/trunk/CardSaveData/Mover/release.txt
@@ -29,7 +29,14 @@ CUP
 [Histry]
 #•\Ž¦ver�@ƒ}ƒXƒ^ƒŠƒ“ƒOŽž‚Ìver
 #  •Ï�X“à—e
-v1.20 - body:‹ó‚̃fƒBƒŒƒNƒgƒŠ‚ª�ì�¬‚³‚ê‚È‚¢•s‹ï�‡‚ð�C�³
+v2.00 - Remaster 2.1.3
+          CARD2‘Ήž�A‘å—e—Ê‚Ì‚Æ‚«SDŽg—p(Šg’£ƒZ�[ƒu)
+
+v1.30 - Remaster 2.1.2
+         ƒRƒs�[ƒ‚�[ƒh’ljÁ�Aƒ†�[ƒU�î•ñ‚Ń�ƒbƒZ�[ƒW‚̉p/“ú�Ø‚è‘Ö‚¦
+�@�@�@�@
+v1.20 - Remaster 2.1.0
+        body:‹ó‚̃fƒBƒŒƒNƒgƒŠ‚ª�ì�¬‚³‚ê‚È‚¢•s‹ï�‡‚ð�C�³
 	ƒ�ƒbƒZ�[ƒW‚ð“ú–{Œê•\Ž¦
 
 v1.10‰ü imp�FNOA‚ŃCƒ“ƒ|�[ƒg�o—ˆ‚È‚©‚Á‚½‚Ì‚ÅŒ…ƒ`ƒFƒbƒN�í�œ
diff --git a/trunk/CardSaveData/common/common.cpp b/trunk/CardSaveData/common/common.cpp
index 815d735..b40cf91 100644
--- a/trunk/CardSaveData/common/common.cpp
+++ b/trunk/CardSaveData/common/common.cpp
@@ -51,20 +51,22 @@ void GetErrorStr(TgtDev dev,nn::Result res,int cd,tChar* s)
 
 
 bool prohibitHome = false;// HOME ƒ{ƒ^ƒ“‹ÖŽ~
-// ƒtƒ@ƒCƒ‹ƒVƒXƒeƒ€�ˆ—�‚Æ‘JˆÚ‚âƒXƒŠ�[ƒv�ˆ—�‚Æ‚Ì”r‘¼�§Œä‚É—˜—p
-//nn::os::CriticalSection g_SleepCS;
 // HOME ƒ{ƒ^ƒ“‘JˆÚ‚ƃtƒ@ƒCƒ‹ƒVƒXƒeƒ€�ˆ—�‚Ì”r‘¼�§Œä‚É—˜—p�iŽè“®ƒŠƒZƒbƒg�j
-nn::os::LightEvent g_TransitionEvent;
+//nn::os::LightEvent g_TransitionEvent;
 // ƒXƒŠ�[ƒv‚ƃtƒ@ƒCƒ‹ƒVƒXƒeƒ€�ˆ—�‚Ì”r‘¼�§Œä‚É—˜—p�iŽè“®ƒŠƒZƒbƒg�j
 nn::os::LightEvent g_AwakeEvent;
+nn::os::CriticalSection g_CriticalSection;
+nn::os::CriticalSection g_CriticalSectionForSleep;
 
 void restoreGraphicSetting()
 {
     // GPU ƒŒƒWƒXƒ^�Ý’è‚Ì•œ‹A
     // ‚½‚¾‚µ�A‰º‹L‚Í DMPGL API ‚ðŽg—p‚µ‚Ä�ݒ肵‚½�ó‘Ô‚Ì•œ‹A‚Ì‚Ý
-    // ƒŒƒWƒXƒ^�Ý’èƒRƒ}ƒ“ƒh‚Í‘S‚Ä�Ä”­�s‚·‚é‚ׂ«
+    // ‘¼‚̃‰ƒCƒuƒ‰ƒŠ‚ð—˜—p‚·‚é�ê�‡‚Í�A‚»‚ꂼ‚ê‚Ì•û–@‚ŃŒƒWƒXƒ^�Ý’èƒRƒ}ƒ“ƒh‚ð‘S‚Ä�Ä”­�s‚·‚é•K—v‚ª‚ ‚è‚Ü‚·�B
+        // �iŽQ�l�jGD ƒ‰ƒCƒuƒ‰ƒŠ‚É‚æ‚é�Ý’è‚𕜌³‚·‚é
+        // nn::gd::System::ForceDirty(nn::gd::MODULE_ALL);
     nngxUpdateState(NN_GX_STATE_ALL);
-    nngxValidateState(NN_GX_STATE_ALL,GL_TRUE);
+    //nngxValidateState(NN_GX_STATE_ALL,GL_TRUE);  //delete 2012.8.22, cause error SDK4.x firm
 }
 
 FUNCP end_func;
@@ -73,13 +75,14 @@ void InitSysBreak(uptr adrs){
 
     SleepHandler::Initialize();
 
-    //g_SleepCS.Initialize();
     g_AwakeEvent.Initialize(true);
-    g_TransitionEvent.Initialize(true);
+//    g_TransitionEvent.Initialize(true);
+    g_CriticalSection.Initialize();
+    g_CriticalSectionForSleep.Initialize();
 
     // ‹N�°’†‚Í�í‚É Signal �ó‘Ô‚É‚µ‚Ä‚¨‚­
     g_AwakeEvent.Signal();
-    g_TransitionEvent.Signal();
+ //   g_TransitionEvent.Signal();
 
     // ƒAƒvƒŒƒbƒgƒ‰ƒCƒuƒ‰ƒŠ‚ÉŠÖ‚·‚é‹@”\‚ð—LŒø‚É‚·‚é
     nn::applet::Enable(false);
@@ -89,9 +92,12 @@ void InitSysBreak(uptr adrs){
     // ƒ�ƒS•\Ž¦Žž‚É“dŒ¹ƒ{ƒ^ƒ“‚ª‰Ÿ‚³‚ꂽ‚È‚Ç�AŠù‚É�I—¹�ðŒ�‚ª—§‚Á‚Ä‚¢‚½�ê�‡�A‚±‚±‚ŃAƒvƒŠ‚ð�I—¹‚³‚¹‚é
     if ( nn::applet::IsExpectedToCloseApplication() )
     {
+        g_AwakeEvent.Finalize();
+        g_CriticalSection.Finalize();
+        g_CriticalSectionForSleep.Finalize();
         SleepHandler::Finalize();
-        nn::Result result = nn::applet::PrepareToCloseApplication();
-        NN_UTIL_PANIC_IF_FAILED( result );
+       // nn::Result result = nn::applet::PrepareToCloseApplication();
+      //  NN_UTIL_PANIC_IF_FAILED( result );
         nn::applet::CloseApplication();
     }
     // ƒOƒ‰ƒtƒBƒbƒNƒXƒ‰ƒCƒuƒ‰ƒŠ‚Ì�‰Šú‰»‚Í�AˆÈ�~‚Å�s‚í‚È‚¯‚ê‚΂Ȃç‚È‚¢
@@ -103,14 +109,16 @@ void InitSysBreak(uptr adrs){
 //�I—¹�ˆ—�
 void finish()
 {
-
-	SleepHandler::Finalize();//SLEEP
-    //g_SleepCS.Finalize();
+//	SleepHandler::Finalize();//SLEEP
 
     (*end_func)();
 
     g_AwakeEvent.Finalize();
-    g_TransitionEvent.Finalize();
+    //g_TransitionEvent.Finalize();
+    g_CriticalSection.Finalize();
+    g_CriticalSectionForSleep.Finalize();
+
+	SleepHandler::Finalize();//SLEEP
 
     //nn::fs::Finalize();
 
@@ -119,15 +127,16 @@ void finish()
     appHeap.Finalize();
 
     nn::os::SetDeviceMemorySize(0);
-    nn::os::SetHeapSize(0);
+//    nn::os::SetHeapSize(0);
 
     NN_LOG("End\n");
-    nn::applet::PrepareToCloseApplication();
+    //nn::applet::PrepareToCloseApplication();
     nn::applet::CloseApplication();
 }
 
 
 void CheckSysBreak(){
+
         // ƒXƒŠ�[ƒv‚©‚ç‚Ì‹N�°Žž‚Í�A1ƒtƒŒ�[ƒ€•ª‚Ì•`‰æŠ®—¹‚ð‘Ò‚Á‚Ä‚©‚ç LCD ‚ð—LŒø‚É‚·‚é
         if ( SleepHandler::s_IsAfterWakeUp ) {
             nn::gx::StartLcdDisplay();
@@ -158,7 +167,7 @@ void CheckSysBreak(){
                 nn::applet::ClearHomeButtonState();//HOME ƒ{ƒ^ƒ“ƒtƒ‰ƒO�í�œ
             }else
             {
-                g_TransitionEvent.ClearSignal();
+                //g_TransitionEvent.ClearSignal();
 
                 // ƒtƒ@ƒCƒ‹ƒVƒXƒeƒ€�ˆ—�’†‚Í‘JˆÚ‚ð‘Ò‚Â
                 //if ( g_SleepCS.TryEnter() )
@@ -171,8 +180,7 @@ void CheckSysBreak(){
                     nn::applet::AppletWakeupState wState = nn::applet::WaitForStarting();
                     NN_UNUSED_VAR(wState);
                 
-                    //g_SleepCS.Leave();
-                    g_TransitionEvent.Signal();
+                    //g_TransitionEvent.Signal();
 
                     // HOME ƒ�ƒjƒ…�[‚©‚ç‚Ì’†’f‚âƒoƒbƒeƒŠ�[•s‘«‚Ì—vˆö‚É‚æ‚è
                     // ƒAƒvƒŠ�I—¹‚Æ”»’f‚³‚ꂽ�ê�‡�AƒAƒvƒŠ‚̃�ƒCƒ“ƒ‹�[ƒv‚𔲂¯‚Ä�I—¹�ˆ—�‚Ö
@@ -195,20 +203,19 @@ void CheckSysBreak(){
         // “dŒ¹ƒ{ƒ^ƒ“�ˆ—��iƒOƒ‰ƒtƒBƒbƒNƒXƒ‰ƒCƒuƒ‰ƒŠ‚ª�‰Šú‰»�Ï‚Ý‚Å‚È‚¯‚ê‚΂Ȃç‚È‚¢�j
         if ( nn::applet::IsExpectedToProcessPowerButton() )
         {
-            g_TransitionEvent.ClearSignal();
+            //g_TransitionEvent.ClearSignal();
 
             // ƒtƒ@ƒCƒ‹ƒVƒXƒeƒ€�ˆ—�’†‚Í‘JˆÚ‚ð‘Ò‚Â
             //if ( g_SleepCS.TryEnter() )
             {
                 nn::applet::DisableSleep();
-                //nngxWaitCmdlistDone();
+                nngxWaitCmdlistDone();
                 nn::applet::ProcessPowerButton();
-                nn::applet::AppletWakeupState wState = nn::applet::WaitForStarting();
-
-                NN_UNUSED_VAR(wState);
+                //nn::applet::AppletWakeupState wState = nn::applet::WaitForStarting();
+                //NN_UNUSED_VAR(wState);
+                nn::applet::WaitForStarting();
                 
-                //g_SleepCS.Leave();
-                g_TransitionEvent.Signal();
+                //g_TransitionEvent.Signal();
                 
                 // ƒAƒvƒŠ�I—¹‚Æ”»’f‚³‚ꂽ�ê�‡�AƒAƒvƒŠ‚̃�ƒCƒ“ƒ‹�[ƒv‚𔲂¯‚Ä�I—¹�ˆ—�‚Ö
                 if ( nn::applet::IsExpectedToCloseApplication() )
diff --git a/trunk/CardSaveData/common/gui/gui.cpp b/trunk/CardSaveData/common/gui/gui.cpp
index 27a4077..87e9301 100644
--- a/trunk/CardSaveData/common/gui/gui.cpp
+++ b/trunk/CardSaveData/common/gui/gui.cpp
@@ -247,14 +247,13 @@ void drawDisp()
             setText(s_Panel[s_Message[si].parent].pos.x+s_Message[si].pos.x,
                 s_Panel[s_Message[si].parent].pos.y+s_Message[si].pos.y,s_Message[si].caption);
             
-            
             //NN_LOG(s_Message[i].caption);
             //NN_LOG("   %d\n",i);
         }
     }
 
     s_RenderSystem.SwapBuffers();
-    nngxWaitVSync(NN_GX_DISPLAY0);
+//    nngxWaitVSync(NN_GX_DISPLAY0);
     
     //下
     tCol col;
@@ -279,10 +278,41 @@ void drawDisp()
     }
     s_RenderSystem.SwapBuffers();
 
-    nngxWaitVSync(NN_GX_DISPLAY1);
+//    nngxWaitVSync(NN_GX_DISPLAY1);
 
 }
 
+//上��
+void drawDisp_U()
+{
+    //NN_LOG("draw\n");
+    //上
+    s_RenderSystem.SetRenderTarget(NN_GX_DISPLAY0);
+    s_RenderSystem.Clear();
+    int i;
+
+    for (i=0;i<PANEL_MAX;i++){
+        if ((s_Panel[i].visible) && (s_Panel[i].scr == 0)){
+            drawBox(s_Panel[i].pos,s_Panel[i].size,&s_Panel[i].style,s_Panel[i].caption);
+        }
+    }
+
+    for (si=0;si<MESS_MAX;si++){
+        if ( s_Message[si].visible && s_Panel[s_Message[si].parent].visible ){
+            setSize(s_Message[si].style.width);
+            setColor(&s_Message[si].style.color);
+            //s_RenderSystem.DrawText(s_Panel[s_Message[i].parent].pos.x+s_Message[i].pos.x,
+            //    s_Panel[s_Message[i].parent].pos.y+s_Message[i].pos.y,s_Message[i].caption);
+            setText(s_Panel[s_Message[si].parent].pos.x+s_Message[si].pos.x,
+                s_Panel[s_Message[si].parent].pos.y+s_Message[si].pos.y,s_Message[si].caption);
+            
+            //NN_LOG(s_Message[i].caption);
+            //NN_LOG("   %d\n",i);
+        }
+    }
+
+    s_RenderSystem.SwapBuffers();
+}
 
 void ColorFromCode(eColor c,tCol *col)
 {
@@ -480,6 +510,13 @@ myResult Gui::PanelSet(const tPanel *panel)
     return RESULT_OK;
 }
 
+myResult Gui::PanelCaption(u8 id,tChar *str)
+{
+    if (id >= PANEL_MAX)return RESULT_BAD_PARAM;
+    s_Panel[id].caption = str;
+    return RESULT_OK;
+}
+
 myResult Gui::PanelEffective(u8 id,bool enable,bool visible)
 {
     if (id >= PANEL_MAX)return RESULT_BAD_PARAM;
@@ -541,6 +578,16 @@ void Gui::Draw()
     drawDisp();
 }
 
+void Gui::Draw_U()
+{
+    drawDisp_U();
+}
+
+void Gui::WaitVsnc()
+{
+    nngxWaitVSync(NN_GX_DISPLAY0);
+    nngxWaitVSync(NN_GX_DISPLAY1);
+}
 
 void Gui::DisableAll()
 {
diff --git a/trunk/CardSaveData/common/gui/gui.h b/trunk/CardSaveData/common/gui/gui.h
index 5e9c06e..52fb497 100644
--- a/trunk/CardSaveData/common/gui/gui.h
+++ b/trunk/CardSaveData/common/gui/gui.h
@@ -80,14 +80,17 @@ public:
     myResult MessSet(const tMessage *mes);
 //    myResult MemoSet(const tMemo *m);
     void Draw();
+    void Draw_U();
     void DisableAll();
     myResult PanelEffective(u8 id,bool enable=true,bool visible=true);
+    myResult PanelCaption(u8 id,tChar *str);
     myResult MessEffective(u8 id,bool enable=true,bool visible=true);
 //    myResult MemoEffective(u8 id,bool enable=true,bool visible=true);
     myResult MessStr(u8 id,tChar *str);
     myResult MessCol(u8 id,eColor col);
 //    myResult MemoStr(u8 id,tChar *str,u16 ln);
     myResult PanelLineStyle(u8 id,eColor col=COLOR_WHITE,u8 width = 2);
+    void WaitVsnc();
     //void thUpdate();
 };
 
diff --git a/trunk/CardSaveData/common/icon.icn b/trunk/CardSaveData/common/icon.icn
new file mode 100644
index 0000000000000000000000000000000000000000..b41a5f69eaf25eee2c09985e550848e21bc86f0c
GIT binary patch
literal 14016
zcmeHKO;VdN3^ltfv&=ELLV^C$&XDE=?UZSmDQ$<eOQtNoWmcW8IReMXH8=uGmS6qQ
zyvkNS$02`))*imdlBFl<$qC8m&A|)j*T}tdr|z5k?2g^O`{Yji?t^>fEhDdeb!YB7
z+%~q-`Ct3&U);xyWqugINA8Dv?>RqlW6$@o=X<-WoByYt`I7TT{yP6{+=TA=KlAsn
z<ouDp&cEFJpZiaulJiIYI{$L>f9e10mz+QH*ZG&5|ETcyKjg3TFE{`F!r%Xpzs|qh
z{15$auackt$Y1AQZvF@US82)lBY&NLx%nRze*YtXoqxIczb*X!NB%nhZOp&ss0>sF
zDg%{)%0OkHGEf=#zZkf<aCd+H<!-fY`!i%<XUA)J%<_KsTG#DvbAIF8Zgbr_cYc!#
zzPx?X!y~Vkw^q-^n{xlEy}f=joaCZgU!$yk)3$h0y4v9dUy-y^_M6^b+y44ZeK74e
zS7Ybk4;%KdVGkSpu@6^h%XI**!8y1F=XQm-;hy}2Htg9KrNy&4<H0pBsi&myGo0|;
z;!!7W&{+#4<0!#($QSLD#G@nzCGC{`W-!H+s1ql3KUgQ@biP+(u?a$oALN<epJZko
za!Zv5)(H!qS$#NJgdf(;cuL+A&W${19g>;;QiZ%XU;~qbX}qH^B)A4oq3vJYV}|Ta
z=P92#U3S_^O4hkqsT_bIWl8L-<_3Sj=;D!fO6vprs!Q{SHAts9Y+Fw$opmxlbxLce
zPMPvc*%?<_vc9ym_tom@NI9|ou`d0~y@9`+DkjdwE>cfqH|rl_rD7CQ@h$T5`h76r
z`w$kpWi8OLPuc1B*d_Z*OSxg}Q*LO?O*%GzLflXy3OZ$Y7TWXZc@M>w&J;f%`*=K*
zOYKrRUq=thnX<_p@N?&@)}Z*3OL9x6Ic(OsSs8K=*R_tkA;-2~;OEX)twHf6m(+lL
z9@*AAtH(IPp5o5>Tg&`-L7G1wAi_^_6Q8&#D`R5+5KFsIbhX8}M6uHPTiyCwUHwzL
zxQ<yCQgO7;kC%FYO1{Xe#H(F!h^lp1|5&&FR+s#erK?i)@7}F1UXkKm+z)F+HL>4v
zT31&<B7W|CxvUzc_&Q(7uRfdHY5vrXj7t@qhSZpfS=_E&ON=nz6~DM=S9Hpz+)8Kc
LD_utlX*v5J5USJ&

literal 0
HcmV?d00001

diff --git a/trunk/CardSaveData/common/my_defs.h b/trunk/CardSaveData/common/my_defs.h
index 5e07fae..93d7edf 100644
--- a/trunk/CardSaveData/common/my_defs.h
+++ b/trunk/CardSaveData/common/my_defs.h
@@ -60,6 +60,7 @@ ERC_FATAL = 99 //深刻�エラー
 
 typedef enum{//対象デ�イス指定
 TGT_NONE = 0,
+TGT_CTR = 900,
 TGT_CARD = 100,
 TGT_SD = 200,
 TGT_MEM = 300
@@ -80,6 +81,7 @@ typedef enum {
   RESULT_FAIL_FORMAT,
   RESULT_FAIL_GETDIR,
   RESULT_FAIL_VERIFI,
+  RESULT_FAIL_WORK,
   RESULT_NOT_FAUND,
   RESULT_NO_MEDIA,
   RESULT_NOT_FORMAT,
@@ -94,6 +96,7 @@ typedef enum {
   RESULT_PATH_LENGTH_OVER,
   RESULT_DEVICE_FULL,
   RESULT_WORK_OVER,
+  RESULT_INSEJECT,//挿抜
   RESULT_MAX
 }myResult;
 
diff --git a/trunk/CardSaveData/common/savefile/savefile.cpp b/trunk/CardSaveData/common/savefile/savefile.cpp
index 28457ac..bd1a4e1 100644
--- a/trunk/CardSaveData/common/savefile/savefile.cpp
+++ b/trunk/CardSaveData/common/savefile/savefile.cpp
@@ -115,6 +115,19 @@ bool CmpPathW(wchar_t *s,wchar_t *s2)
 
 
 //-------------- Class SaveFileWrite
+
+//file create
+bool SaveFileWrite::CreateFile(wchar_t *path,s64 size)
+{
+    wcscpy(pathw_w,root_w);
+    ChainPath(pathw_w,path);
+
+    LastNnResult = nn::fs::TryCreateFile(pathw_w,size);
+    if(LastNnResult.IsSuccess())return true;
+    nn::fs::TryDeleteFile(pathw_w);//ƒSƒ~‘|�œ
+    return false;
+}
+
 //ƒfƒBƒŒƒNƒgƒŠ�ì�¬‚ ‚è‚̃I�[ƒvƒ“
 bool SaveFileWrite::OpenC(wchar_t *path,s64 size,bool *mkdir)
 {
@@ -130,6 +143,7 @@ bool SaveFileWrite::OpenC(wchar_t *path,s64 size,bool *mkdir)
        LastNnResult = writer.TryInitialize(pathw_w,false);
        return LastNnResult.IsSuccess();
     }
+    nn::fs::TryDeleteFile(pathw_w);//ƒSƒ~‘|�œ
     //ƒfƒBƒŒƒNƒgƒŠ‚ª‚È‚¯‚ê‚΃fƒBƒŒƒNƒgƒŠ‚ð�ì�¬
     pos = GetPosDelmLast(pathw_w,RootLength);//ƒtƒ@ƒCƒ‹‚ª‘¶�Ý‚·‚éƒfƒBƒŒƒNƒgƒŠ
     if (pos <= 0)return false;//root‚©ƒpƒX‚ª•s�³
@@ -194,12 +208,12 @@ bool SaveFileWrite::OpenAdd(wchar_t *path)
 }
 
 
-//ƒfƒBƒŒƒNƒgƒŠ�ì�¬‚È‚µƒI�[ƒvƒ“
-bool SaveFileWrite::OpenW(const wchar_t *path)
+//ƒfƒBƒŒƒNƒgƒŠƒI�[ƒvƒ“
+bool SaveFileWrite::OpenW(const wchar_t *path,bool make)
 {
     wcscpy(pathw_w,root_w);
     ChainPath(pathw_w,(wchar_t*)path);
-    LastNnResult = writer.TryInitialize(pathw_w,true);
+    LastNnResult = writer.TryInitialize(pathw_w,make);
     return LastNnResult.IsSuccess();
 }
 
@@ -208,13 +222,15 @@ bool SaveFileWrite::OpenW(const wchar_t *path)
 //ƒNƒ��[ƒY
 void SaveFileWrite::CloseW()
 {
+    writer.TryFlush();
     writer.Finalize();
 }
 
 s32 SaveFileWrite::Write(char *buffer,size_t size)
 {
     s32 ct;
-    LastNnResult = writer.TryWrite(&ct,(void*)buffer,size);
+//    LastNnResult = writer.TryWrite(&ct,(void*)buffer,size,true);
+    LastNnResult = writer.TryWrite(&ct,(void*)buffer,size,false);
     if(LastNnResult.IsFailure()){NN_LOG("write fail\n");ct=0;}
     return ct;
 }
@@ -235,12 +251,27 @@ bool SaveFileWrite::DeleteDir(const wchar_t *dir)
     return LastNnResult.IsSuccess();
 }
 
-bool SaveFileWrite::DeleteFile(const wchar_t *path)
+bool SaveFileWrite::DeleteFile(wchar_t *path)
 {
-    LastNnResult =  nn::fs::TryDeleteFile(path);
+    wcscpy(pathw_w,root_w);
+    ChainPath(pathw_w,path);
+    LastNnResult =  nn::fs::TryDeleteFile(pathw_w);
     return LastNnResult.IsSuccess();
 }
 
+bool SaveFileWrite::SetPosW(s64 pos)
+{
+    LastNnResult = writer.TrySetPosition(pos);
+    return LastNnResult.IsSuccess();
+} 
+
+bool SaveFileWrite::Flush()
+{
+    LastNnResult = writer.TryFlush();
+    return LastNnResult.IsSuccess();
+} 
+
+
 //------------------------------------------------------ Class SaveFileRead
 bool SaveFileRead::Open(const wchar_t *path)
 {
@@ -351,6 +382,8 @@ static nn::fs::Directory dcl;
     m_info.DirEntry = 0;
     m_info.FileEntry = 0;
     m_info.total = 0;
+    m_info.min = 0;
+    m_info.max = 0;
     m_info.Dup = false;
     wcscpy(pathw_w,root_w);
     wcscat(pathw_w,L"/");
@@ -392,6 +425,8 @@ static nn::fs::Directory dcl;
                    m_info.FileCount++;
                    if (clsz==0){
                        m_info.total += dcEntryl.entrySize;
+                       if (dcEntryl.entrySize < m_info.min )m_info.min = dcEntryl.entrySize;
+                       if (dcEntryl.entrySize > m_info.max )m_info.max = dcEntryl.entrySize;
                    }else{//ƒNƒ‰ƒXƒ^ƒTƒCƒY‚Å’²�® .. SD�è—L—e—Ê
                        sn = dcEntryl.entrySize / clsz;
                        if ((dcEntryl.entrySize % clsz) > 0 )sn++;
diff --git a/trunk/CardSaveData/common/savefile/savefile.h b/trunk/CardSaveData/common/savefile/savefile.h
index 57db5fc..58fb781 100644
--- a/trunk/CardSaveData/common/savefile/savefile.h
+++ b/trunk/CardSaveData/common/savefile/savefile.h
@@ -59,6 +59,7 @@ bool CmpPathW(wchar_t *s,wchar_t *s2);
 #define INFO_VERSION 0
 struct tArcInfo{
     s64 total;//ƒtƒ@ƒCƒ‹ƒTƒCƒY‘�Œv
+    u32 min,max;//�Å�­�A�Å‘å
     u32 DirEntry,FileEntry;//ƒtƒH�[ƒ}ƒbƒg
     u32 DirCount,FileCount;//Dir,ƒtƒ@ƒCƒ‹�”
     char Pcode[20];//product code SDK‚̃TƒCƒY‚ð‰º‰ñ‚ç‚È‚¢‚±‚Æ
@@ -135,13 +136,16 @@ public:
     ~SaveFileWrite(){};
     bool DeleteDir(const wchar_t *dir);
     bool MakeDir(wchar_t *path,bool *mkdir);
-    bool DeleteFile(const wchar_t *path);
-    bool OpenW(const wchar_t *path);
+    bool DeleteFile(wchar_t *path);
+    bool OpenW(const wchar_t *path,bool make);
     bool OpenC(wchar_t *path,s64 size,bool *mkdir);
     bool OpenAdd(wchar_t *path);
     void CloseW();
+    bool SetPosW(s64 pos); 
+    bool CreateFile(wchar_t *path,s64 size);
     s32 Write(char *buffer,size_t size);
     bool CreateDir(const wchar_t *dir);
+    bool Flush();
 };
 
 //ƒŠ�[ƒh
diff --git a/trunk/CardSaveData/common/shfnt.cpp b/trunk/CardSaveData/common/shfnt.cpp
index 3f471bd..dbb9c1b 100644
--- a/trunk/CardSaveData/common/shfnt.cpp
+++ b/trunk/CardSaveData/common/shfnt.cpp
@@ -395,6 +395,7 @@ void shf_SetColorW(f32 r,f32 g,f32 b,f32 a)
 }
 
 
+#define STD_FONT_ONLY 1
 
 //�期化
 //AppHeap確��RenderSystem.Initit�後�呼�
@@ -402,11 +403,12 @@ void SharedFontInit()
 {
 
     InitGX();
-
-    // 共有フォント��期化
+    
+#ifndef STD_FONT_ONLY
+    // 本体リージョン�フォントロード
     NN_UTIL_PANIC_IF_FAILED(nn::pl::InitializeSharedFont());
 
-    // 共有フォント�ロード�完了�る��待機
+    // ロード�完了�る��待機
     while (nn::pl::GetSharedFontLoadState() != nn::pl::SHARED_FONT_LOAD_STATE_LOADED)
     {
         // 共有フォント�ロード�失敗������確�
@@ -417,11 +419,31 @@ void SharedFontInit()
         nn::os::Thread::Sleep(nn::fnd::TimeSpan::FromMilliSeconds(1));
     }
 
-    // 共有フォント�種類を�得
+    // フォント�種類を�得
     //nn::pl::SharedFontType sharedFontType = nn::pl::GetSharedFontType();
 
-    // 共有フォントデータ�アドレスを�得
+    // フォントデータ�アドレスを�得
     void* pFontBuffer = nn::pl::GetSharedFontAddress();
+#else
+//日英フォントロード
+    const size_t ROMFS_BUFFER_SIZE = 1024 * 64;
+    static char buffer[ROMFS_BUFFER_SIZE];
+
+    nn::pl::MountSharedFont("font:",nn::pl::SHARED_FONT_TYPE_STD,
+    16, 16, buffer, ROMFS_BUFFER_SIZE);
+    nn::fs::FileReader fontReader("font:/cbf_std.bcfnt.lz");
+
+    const u32 fileSize = (u32)fontReader.GetSize();
+
+    void* fontBinary = appHeap.Allocate(fileSize);
+    NN_NULL_ASSERT(fontBinary);
+
+    fontReader.Read(fontBinary, fileSize);
+    const u32 fontsize = nn::cx::GetUncompressedSize(fontBinary);
+    void* pFontBuffer = appHeap.Allocate(fontsize,128);
+    NN_NULL_ASSERT(pFontBuffer);
+    nn::cx::UncompressAny(fontBinary,pFontBuffer);
+#endif
 
     InitFont(&font, pFontBuffer);
 
@@ -440,6 +462,13 @@ void SharedFontInit()
 
     SetupTextCamera(&drawer,  NN_GX_DISPLAY0_WIDTH, NN_GX_DISPLAY0_HEIGHT);
     
+#ifdef STD_FONT_ONLY
+    appHeap.Free(pFontBuffer);
+    appHeap.Free(fontBinary);
+    fontReader.Finalize();
+    nn::pl::UnmountSharedFont("font:");
+#endif
+
 }
 
 
diff --git a/trunk/CardSaveData/common/test_data.cpp b/trunk/CardSaveData/common/test_data.cpp
index a40eebd..0d88f8a 100644
--- a/trunk/CardSaveData/common/test_data.cpp
+++ b/trunk/CardSaveData/common/test_data.cpp
@@ -31,8 +31,8 @@ wchar_t file_pathw[1024];
 char file_path[1024];
 char file_path2[1024];
 char src_buff[1024*1024];
-char get_buff[1024*1024];
-char str[512];
+char get_buff[1024*1024];//リード指定サイズより����ら��よ�注�
+char str[1024];
 
 
 extern demo::RenderSystemDrawing s_RenderSystem;
@@ -63,11 +63,13 @@ void make_pattern()
 
 //TEST ライト
 s32 size;
-#define SIZE_TEST1 421888
+s64 lsize;
+//#define SIZE_TEST1 421888
 //#define SIZE_TEST1 244736 //dup
 #define DMX_TEST0 100
 #define FMX_TEST0 100
 #define DUP_TEST0 true
+#define SIZE_TEST0 500
 bool Test0_W(int n)//Casual
 {
 
@@ -82,7 +84,9 @@ bool Test0_W(int n)//Casual
 	         return false;
     }
 
-    int num = 0,total=0,size=512;
+    
+    s32 wsize= SIZE_TEST0;
+    int num = 0,total=0;
     while(1){
         /*
         swprintf(file_pathw,512,L"data:/空ディレクトリ%d",num);
@@ -100,14 +104,14 @@ bool Test0_W(int n)//Casual
              nn::fs::Unmount("data:");
 	         return false;
         }
-        sprintf(file_path,"data:/null%d",num);
+        sprintf(file_path,"data:/test0dir%d",num);
         res = nn::fs::TryCreateDirectory(file_path);
         if (res.IsFailure()){
              drawText(8,100,"Dir create Fail");
              nn::fs::Unmount("data:");
 	         return false;
         }
-        sprintf(file_path,"data:/null%d/nulldir",num);
+        sprintf(file_path,"data:/test0dir%d/nulldir",num);
         res = nn::fs::TryCreateDirectory(file_path);
         if (res.IsFailure()){
              drawText(8,100,"Dir create Fail");
@@ -125,6 +129,7 @@ bool Test0_W(int n)//Casual
         //sprintf(file_path,"data:/test%d/test%d.bin",num,num);
         //res = fout.TryInitialize(file_path,true);
         //swprintf(file_pathw,512,L"data:/テスト%d/テスト%d.bin",num,num);
+
         swprintf(file_pathw,512,L"data:/test%d/test%d.bin",num,num);
         res = fout.TryInitialize(file_pathw,true);
         if (res.IsFailure()){
@@ -132,7 +137,7 @@ bool Test0_W(int n)//Casual
              nn::fs::Unmount("data:");
 	         return false;
         }
-        res = fout.TryWrite( &size,&src_buff[total],size);
+        res = fout.TryWrite( &size,&src_buff[total],wsize,true);
         if (res.IsFailure()){
 	         drawText(8,100,"write Fail");
              fout.Finalize();
@@ -141,7 +146,18 @@ bool Test0_W(int n)//Casual
         }
         fout.Finalize();
         total += size;
-        size += size;
+        wsize += SIZE_TEST0;
+
+        swprintf(file_pathw,512,L"data:/test%d/null%d.bin",num,num);
+        res = fout.TryInitialize(file_pathw,true);
+        if (res.IsFailure()){
+	         drawText(8,100,"open Fail");
+             nn::fs::Unmount("data:");
+	         return false;
+        }
+        fout.TryFlush();
+        fout.Finalize();
+
         num++;
         sprintf(str,"size %d , num %d",total,num);
         s_RenderSystem.Clear();
@@ -163,7 +179,8 @@ bool Test0_W(int n)//Casual
 bool Test0_V(int n)//Casual
 {
 
-    int num = 0,total=0,size = 512;
+    int num = 0,total=0;
+    s32 rsize=SIZE_TEST0;
     size_t maxF,maxD;
     bool isDup;
     
@@ -181,8 +198,6 @@ bool Test0_V(int n)//Casual
 	     return false;
     }
 
-	
-
     while(1){
         sprintf(file_path,"data:/nulldir%d",num);//ディレクトリ
         res = dc.TryInitialize(file_path);
@@ -193,7 +208,7 @@ bool Test0_V(int n)//Casual
 	         return false;
         }
         dc.Finalize();
-        sprintf(file_path,"data:/null%d/nulldir",num);//ディレクトリ
+        sprintf(file_path,"data:/test0dir%d/nulldir",num);//ディレクトリ
         res = dc.TryInitialize(file_path);
         if (res.IsFailure()){
 	         drawText(8,100,"open Dir");
@@ -214,6 +229,7 @@ bool Test0_V(int n)//Casual
         dc.Finalize();
         */
         //swprintf(file_pathw,512,L"data:/テスト%d/テスト%d.bin",num,num);
+
         swprintf(file_pathw,512,L"data:/test%d/test%d.bin",num,num);
         res = fin.TryInitialize(file_pathw);
         if (res.IsFailure()){
@@ -221,17 +237,43 @@ bool Test0_V(int n)//Casual
              nn::fs::Unmount("data:");
 	         return false;
         }
-        res = fin.TryRead( &size,&get_buff[total],size);
+        res = fin.TryRead( &size,get_buff,rsize);
         if (res.IsFailure()){
 	         drawText(8,100,"read Fail");
              fin.Finalize();
              nn::fs::Unmount("data:");
              return false;
         }
-        for(int i=0;i<size;i++)if (src_buff[total+i]!=get_buff[total+i])return false;
         fin.Finalize();
+        if (size != rsize){
+	         drawText(8,100,"size Fail");
+             nn::fs::Unmount("data:");
+            return false;
+        }
+        for(int i=0;i<size;i++)if (src_buff[total+i]!=get_buff[i]){
+	         drawText(8,100,"verifi Fail");
+             nn::fs::Unmount("data:");
+            return false;
+        }
         total += size;
-        size+=size;
+        rsize+=SIZE_TEST0;
+        
+
+        swprintf(file_pathw,512,L"data:/test%d/null%d.bin",num,num);
+        res = fin.TryInitialize(file_pathw);
+        if (res.IsFailure()){
+	         drawText(8,100,"open Fail");
+             nn::fs::Unmount("data:");
+	         return false;
+        }
+        res = fin.TryGetSize( &lsize);
+        fin.Finalize();
+        if (res.IsFailure() || (lsize !=0)){
+	         drawText(8,100,"size Fail");
+             nn::fs::Unmount("data:");
+             return false;
+        }
+
         num++;
         sprintf(str,"size %d , num %d",total,num);
         s_RenderSystem.Clear();
@@ -239,9 +281,10 @@ bool Test0_V(int n)//Casual
         s_RenderSystem.SwapBuffers();
         //if (size<512)break;
         if (num == n)break;
+   
+     
     }
     fin.Finalize();
-    nn::fs::CommitSaveData();
     nn::fs::Unmount("data:");
     NN_LOG("total %d",total);
     drawText(10,100,"end");
@@ -250,12 +293,13 @@ bool Test0_V(int n)//Casual
     return true;
 }
 
-
-bool Test1_W()
+s64 test1_sz = 0;
+bool Test1_W(int sft)
 {
-    int total,size2;
+    int total,size2,idx;
 
     res = nn::fs::FormatSaveData(1,0,false);
+//    res = nn::fs::FormatSaveData(1,0,true);
     if (res.IsFailure()){
 	         drawText(8,100,"format Fail");
 	         return false;
@@ -266,7 +310,16 @@ bool Test1_W()
 	         return false;
     }
 
-    res = nn::fs::TryCreateFile(L"data:/test1.bin",SIZE_TEST1);
+    res = nn::fs::GetArchiveFreeBytes(&test1_sz,"data:");
+    if (res.IsFailure()){
+	         drawText(8,100,"GetSize Fail");
+	         return false;
+    }
+    
+    test1_sz = test1_sz >> sft;
+
+//    res = nn::fs::TryCreateFile(L"data:/test1.bin",SIZE_TEST1);
+    res = nn::fs::TryCreateFile(L"data:/test1.bin",test1_sz);
     if (res.IsFailure()){
 	     drawText(8,100,"Create Fail");
 	     nn::fs::Unmount("data:");
@@ -278,12 +331,10 @@ bool Test1_W()
          nn::fs::Unmount("data:");
 	     return false;
     }
-    total =0;
+    total =0;idx =0;
     size2 = 512;
-    //size2 = 4096;
-    //size2 = SIZE_TEST1;
     while(1){
-        res = fout.TryWrite( &size,&src_buff[total],size2);
+        res = fout.TryWrite( &size,&src_buff[idx],size2,false);
         if (res.IsFailure()){
 	         drawText(8,100,"write Fail");
              fout.Finalize();
@@ -291,15 +342,24 @@ bool Test1_W()
              return false;
         }
         total += size;
-        sprintf(str,"size %d",total);
+        sprintf(str,"size %d / %d",total,(s32)test1_sz);
         s_RenderSystem.Clear();
         drawText(10,80,str);
         s_RenderSystem.SwapBuffers();
-        //if (size<512)break;
-        if (total >= SIZE_TEST1)break;
-        if ((SIZE_TEST1 - total) < 512)size2 = SIZE_TEST1 - total ;
+        if (size<512)break;
+        idx += size;
+        if (idx >= sizeof(src_buff))idx = 0;
+        //if ((SIZE_TEST1 - total) < 512)size2 = SIZE_TEST1 - total ;
+        if ((test1_sz - total) < 512)size2 = test1_sz - total ;
+        if (size2 ==0)break;
     }
+    res = fout.TryFlush();
     fout.Finalize();
+    if (res.IsFailure()){
+	     drawText(8,100,"flush Fail");
+         nn::fs::Unmount("data:");
+	     return false;
+    }
     nn::fs::CommitSaveData();
     nn::fs::Unmount("data:");
     NN_LOG("total %d",total);
@@ -310,9 +370,16 @@ bool Test1_W()
 }
 
 //ベリファイ
-bool Test1_V()
+bool Test1_V(int sft)
 {
-    int i,total;
+    int i,total,idx;
+
+    res = nn::fs::GetArchiveFreeBytes(&test1_sz,"data:");
+    if (res.IsFailure()){
+	         drawText(8,100,"GetSize Fail");
+	         return false;
+    }
+    test1_sz = test1_sz >> sft;
 
     res = fin.TryInitialize(L"data:/test1.bin");
     if (res.IsFailure())
@@ -322,9 +389,20 @@ bool Test1_V()
          nn::fs::Unmount("data:");
 	     return false;
     }
-    total =0;
+
+    res = fin.TryGetSize(&test1_sz);
+    if (res.IsFailure())
+    {
+         //NN_LOG("%d\n",res.GetDescription());
+	     drawText(8,100,"GetSize Fail");
+         fin.Finalize();
+         nn::fs::Unmount("data:");
+	     return false;
+    }
+
+    total =0;idx=0;
     while(1){
-        res = fin.TryRead( &size,&get_buff[total],512);
+        res = fin.TryRead( &size,get_buff,512);
         if (res.IsFailure()){
 	         drawText(8,100,"read Fail");
              fin.Finalize();
@@ -332,7 +410,7 @@ bool Test1_V()
              return false;
         }
         //if (size == 0)break;
-        for (i=0;i<size;i++) if (src_buff[total+i] != get_buff[total+i])
+        for (i=0;i<size;i++) if (src_buff[idx+i] != get_buff[i])
         {
 	         drawText(8,100,"verifi Fail at %d",total+i);
              fin.Finalize();
@@ -340,16 +418,18 @@ bool Test1_V()
              return false;
         
         }
-        if (total >= SIZE_TEST1)break;
         
+        idx += size;
+        if (idx >= sizeof(src_buff))idx=0;
         total += size;
+        if (total >= test1_sz)break;
         s_RenderSystem.Clear();
         sprintf(str,"now %d",total);
         drawText(10,80,str);
         s_RenderSystem.SwapBuffers();
         if (size<512)break;
     }
-    fout.Finalize();
+    fin.Finalize();
     nn::fs::Unmount("data:");
     drawText(10,100,"end");
     s_RenderSystem.SwapBuffers();
@@ -357,7 +437,8 @@ bool Test1_V()
     return true;
 }
 
-#define test2_max 680
+//#define test2_max 680
+#define test2_max 100
 #define test2_ct test2_max
 //#define test2_max 10
 //#define test2_ct 5
@@ -396,7 +477,7 @@ bool Test2_W(int n)
              nn::fs::Unmount("data:");
 	         return false;
         }
-        res = fout.TryWrite( &size,&src_buff[total],size2);
+        res = fout.TryWrite( &size,&src_buff[total],size2,true);
         if (res.IsFailure()){
 	         drawText(8,100,"write Fail");
              fout.Finalize();
@@ -438,14 +519,14 @@ bool Test2_V(int n)
              nn::fs::Unmount("data:");
 	         return false;
         }
-        res = fin.TryRead( &size,&get_buff[total],size2);
+        res = fin.TryRead( &size,get_buff,size2);
         if (res.IsFailure()){
 	         drawText(8,100,"read Fail");
              fin.Finalize();
              nn::fs::Unmount("data:");
              return false;
         }
-        for (i=0;i<size;i++) if (src_buff[total+i] != get_buff[total+i])
+        for (i=0;i<size;i++) if (src_buff[total+i] != get_buff[i])
         {
              drawText(8,100,"verifi Fail at %d",total+i);
              fin.Finalize();
@@ -520,7 +601,7 @@ bool Test3_W()
                 nn::fs::Unmount("data:");
 	            return false;
             }
-            res = fout.TryWrite( &size,&src_buff[total],size2);
+            res = fout.TryWrite( &size,&src_buff[total],size2,true);
             if (res.IsFailure()){
 	            drawText(8,100,"write Fail");
                 fout.Finalize();
@@ -571,14 +652,14 @@ bool Test3_V()
                 nn::fs::Unmount("data:");
 	            return false;
             }
-            res = fin.TryRead( &size,&get_buff[total],size2);
+            res = fin.TryRead( &size,get_buff,size2);
             if (res.IsFailure()){
 	            drawText(8,100,"read Fail");
                 fin.Finalize();
                 nn::fs::Unmount("data:");
                 return false;
             }
-            for (i=0;i<size;i++) if (src_buff[total+i] != get_buff[total+i])
+            for (i=0;i<size;i++) if (src_buff[total+i] != get_buff[i])
             {
 	            drawText(8,100,"verifi Fail at %d",total+i);
                 fin.Finalize();
@@ -640,7 +721,7 @@ bool Test4_W()
          nn::fs::Unmount("data:");
 	     return false;
     }
-    res = fout.TryWrite( &size,&src_buff[0],512);
+    res = fout.TryWrite( &size,&src_buff[0],512,true);
     if (res.IsFailure()){
 	         drawText(8,100,"Write Fail");
              fout.Finalize();
@@ -669,7 +750,7 @@ bool Test4_V()
              nn::fs::Unmount("data:");
 	         return false;
     }
-    res = fin.TryRead( &size,&get_buff[0],512);
+    res = fin.TryRead( &size,get_buff,512);
     if (res.IsFailure()){
 	         drawText(8,100,"Read Fail");
              fin.Finalize();
@@ -764,6 +845,7 @@ bool Test4_V()
 }
 */
 
+
 #define SIZE_TEST5 (512*100)
 #define SIZE_TEST5_HZ 4096
 #define SIZE_TEST5_START 512*16
@@ -810,7 +892,7 @@ bool Test5_W()
     pos = SIZE_TEST5_START;
     while(1){
         fout.SetPosition(pos);
-        res = fout.TryWrite( &size,&src_buff[pos],512);
+        res = fout.TryWrite( &size,&src_buff[pos],512,false);
         if (res.IsFailure() || (size!=512)){
 	         drawText(8,100,"write Fail");
              fout.Finalize();
@@ -824,8 +906,13 @@ bool Test5_W()
         pos += SIZE_TEST5_HZ;//間を飛��
         if (pos >= SIZE_TEST5)break;
     }
-   
+    res = fout.TryFlush();
     fout.Finalize();
+    if (res.IsFailure()){
+	     drawText(8,100,"flush Fail");
+         nn::fs::Unmount("data:");
+	     return false;
+    }
     nn::fs::CommitSaveData();
     nn::fs::Unmount("data:");
     drawText(10,100,"end");
@@ -849,7 +936,7 @@ bool Test5_V()
     pos = SIZE_TEST5_START;
     while(1){
         fin.SetPosition(pos);
-        res = fin.TryRead( &size,&get_buff[pos],512);
+        res = fin.TryRead( &size,get_buff,512);
         if (res.IsFailure() || (size!=512)){
 	         drawText(8,100,"read Fail");
              fin.Finalize();
@@ -861,7 +948,7 @@ bool Test5_V()
         drawText(10,80,str);
         s_RenderSystem.SwapBuffers();
 
-        for (i=0;i<512;i++) if (src_buff[pos+i] != get_buff[pos+i])
+        for (i=0;i<512;i++) if (src_buff[pos+i] != get_buff[i])
         {
 	        drawText(8,100,"verifi Fail at %d",i);
             return false;
@@ -936,7 +1023,7 @@ bool Test6_W()
             nn::fs::Unmount("data:");
 	        return false;
         }
-        res = fout.TryWrite( &size,&src_buff[ofst],512);
+        res = fout.TryWrite( &size,&src_buff[ofst],512,true);
         if (res.IsFailure()){
 	        drawText(8,100,"write fail");
             nn::fs::Unmount("data:");
@@ -977,7 +1064,7 @@ bool Test6_W()
             nn::fs::Unmount("data:");
 	        return false;
         }
-        res = fout.TryWrite( &size,&src_buff[ofst],512);
+        res = fout.TryWrite( &size,&src_buff[ofst],512,true);
         if (res.IsFailure()){
 	        drawText(8,100,"write fail");
             nn::fs::Unmount("data:");
@@ -1010,7 +1097,7 @@ bool Test6_W()
             nn::fs::Unmount("data:");
 	        return false;
         }
-        res = fout.TryWrite( &size,&src_buff[ofst],512);
+        res = fout.TryWrite( &size,&src_buff[ofst],512,true);
         if (res.IsFailure()){
 	        drawText(8,100,"write fail");
             nn::fs::Unmount("data:");
@@ -1063,7 +1150,7 @@ bool Test6_V()
             nn::fs::Unmount("data:");
 	        return false;
         }
-        res = fin.TryRead( &size,&get_buff[ofst],512);
+        res = fin.TryRead( &size,get_buff,512);
         if (res.IsFailure()){
 	        drawText(8,100,"read fail");
             nn::fs::Unmount("data:");
@@ -1071,7 +1158,7 @@ bool Test6_V()
         }
         fin.Finalize();
         
-        for(j=0;j<512;j++)if(src_buff[ofst+i] != get_buff[ofst+i]){
+        for(j=0;j<512;j++)if(src_buff[ofst+i] != get_buff[i]){
 	        drawText(8,100,"verifi fail");
             nn::fs::Unmount("data:");
 	        return false;
@@ -1102,7 +1189,7 @@ bool Test6_V()
             nn::fs::Unmount("data:");
 	        return false;
         }
-        res = fin.TryRead( &size,&get_buff[ofst],512);
+        res = fin.TryRead( &size,get_buff,512);
         if (res.IsFailure()){
 	        drawText(8,100,"write fail");
             nn::fs::Unmount("data:");
@@ -1110,7 +1197,7 @@ bool Test6_V()
         }
         fout.Finalize();
         
-        for(j=0;j<512;j++)if(src_buff[ofst+i] != get_buff[ofst+i]){
+        for(j=0;j<512;j++)if(src_buff[ofst+i] != get_buff[i]){
 	        drawText(8,100,"verifi fail");
             nn::fs::Unmount("data:");
 	        return false;
@@ -1135,7 +1222,7 @@ bool Test6_V()
             nn::fs::Unmount("data:");
 	        return false;
         }
-        res = fin.TryRead( &size,&get_buff[ofst],512);
+        res = fin.TryRead( &size,get_buff,512);
         if (res.IsFailure()){
 	        drawText(8,100,"read fail");
             nn::fs::Unmount("data:");
@@ -1143,7 +1230,7 @@ bool Test6_V()
         }
         fin.Finalize();
         
-        for(j=0;j<512;j++)if(src_buff[ofst+i] != get_buff[ofst+i]){
+        for(j=0;j<512;j++)if(src_buff[ofst+i] != get_buff[i]){
 	        drawText(8,100,"verifi fail");
             nn::fs::Unmount("data:");
 	        return false;
@@ -1160,11 +1247,129 @@ bool Test6_V()
     return true;
 }
 
-#define menu_ct 7
-#define menu_max (menu_ct-1)
-char* menu_str[menu_ct] = {"Casual check","Large size","many files","Deep directry","max size name","data < create size","fat error name"};
 
-#define menu_top_Y 80
+//ディレクトリ��
+bool Test7_W(int n)
+{
+
+    res = nn::fs::FormatSaveData(DMX_TEST0,FMX_TEST0,DUP_TEST0);
+    if (res.IsFailure()){
+	         drawText(8,100,"format Fail");
+	         return false;
+    }
+    res =nn::fs::MountSaveData();
+    if (res.IsFailure()){
+	         drawText(8,100,"Mount Fail");
+	         return false;
+    }
+
+    int num = 0;
+    while(1){
+        sprintf(file_path,"data:/nulldir%d",num);
+        res = nn::fs::TryCreateDirectory(file_path);
+        if (res.IsFailure()){
+             drawText(8,100,"Dir create Fail");
+             nn::fs::Unmount("data:");
+	         return false;
+        }
+        
+        sprintf(file_path,"data:/test7dir%d",num);
+        res = nn::fs::TryCreateDirectory(file_path);
+        if (res.IsFailure()){
+             drawText(8,100,"Dir create Fail");
+             nn::fs::Unmount("data:");
+	         return false;
+        }
+        
+        sprintf(file_path,"data:/test7dir%d/nulldir",num);
+        res = nn::fs::TryCreateDirectory(file_path);
+        if (res.IsFailure()){
+             drawText(8,100,"Dir create Fail");
+             nn::fs::Unmount("data:");
+	         return false;
+        }
+
+        num++;
+        sprintf(str,"num %d",num*3);
+        s_RenderSystem.Clear();
+        drawText(10,80,str);
+        s_RenderSystem.SwapBuffers();
+        //if (size<512)break;
+        if (num == n)break;
+    }
+    nn::fs::CommitSaveData();
+    nn::fs::Unmount("data:");
+    drawText(10,100,"end");
+    s_RenderSystem.SwapBuffers();
+    nngxWaitVSync(NN_GX_DISPLAY0);
+    return true;
+}
+
+bool Test7_V(int n)
+{
+    int num = 0;
+    size_t maxF,maxD;
+    bool isDup;
+    
+    nn::fs::Directory dc;
+
+    res = nn::fs::GetSaveDataFormatInfo(&maxF,&maxD,&isDup);
+    if (res.IsFailure()){
+	     drawText(8,100,"fail to get formatinfo");
+         nn::fs::Unmount("data:");
+	     return false;
+    }
+    if ((maxF != FMX_TEST0)||(maxD!=DMX_TEST0)||(isDup != DUP_TEST0)){
+	     drawText(8,100,"wrong format");
+         nn::fs::Unmount("data:");
+	     return false;
+    }
+
+    while(1){
+        sprintf(file_path,"data:/nulldir%d",num);//ディレクトリ
+        res = dc.TryInitialize(file_path);
+        if (res.IsFailure()){
+	         drawText(8,100,"open Dir");
+             dc.Finalize();
+             nn::fs::Unmount("data:");
+	         return false;
+        }
+        dc.Finalize();
+        sprintf(file_path,"data:/test7dir%d/nulldir",num);//ディレクトリ
+        res = dc.TryInitialize(file_path);
+        if (res.IsFailure()){
+	         drawText(8,100,"open Dir");
+             dc.Finalize();
+             nn::fs::Unmount("data:");
+	         return false;
+        }
+        dc.Finalize();
+
+        num++;
+        sprintf(str," num %d",num*3);
+        s_RenderSystem.Clear();
+        drawText(10,80,str);
+        s_RenderSystem.SwapBuffers();
+        if (num == n)break;
+    
+    }
+    nn::fs::Unmount("data:");
+    drawText(10,100,"end");
+    s_RenderSystem.SwapBuffers();
+    nngxWaitVSync(NN_GX_DISPLAY0);
+    return true;
+}
+
+
+
+
+
+#define menu_ct 9
+#define menu_max (menu_ct-1)
+char* menu_str[menu_ct] = {"Casual check","Max size","Max/32 size","many files","Deep directry"
+,"max size name","data < create size","fat error name","Dir Only"};
+
+#define menu_top_Y 70
 #define menu_top_X 60
 #define menu_spc 14
 
@@ -1181,18 +1386,18 @@ void TestMain()
     
     //TEST PATTERN
     make_pattern();
-    
+ 
     while(1){
-    
-      //menu 表示
+       //menu 表示
       s_RenderSystem.Clear();
 	  drawText(8,20," Backup Verifi for SaveDataMover Test ");
-	  drawText(8,40," for 512KB Backup");
+	  //drawText(8,40," for 512KB Backup");
       for (i=0;i<menu_ct;i++)drawText(menu_top_X,menu_top_Y+menu_spc*i,menu_str[i]);
       drawText(menu_top_X-30,menu_top_Y+menu_spc*curs,"->");
       drawText(menu_top_X,menu_top_Y+menu_spc*(menu_max+2),"push A:Write ,X:Verifi");
       s_RenderSystem.SwapBuffers();
       nngxWaitVSync(NN_GX_DISPLAY0);
+  
     
       //ボタン待�
       value = WaitKey(nn::hid::BUTTON_A | nn::hid::BUTTON_X |nn::hid::BUTTON_UP |nn::hid::BUTTON_DOWN);
@@ -1203,17 +1408,21 @@ void TestMain()
           s_RenderSystem.SwapBuffers();
           nngxWaitVSync(NN_GX_DISPLAY0);
           switch(curs){
-              case 0:sccs = Test0_W(5);break;
-              case 1:sccs = Test1_W();break;
-              case 2:sccs = Test2_W(test2_ct);break;
-              case 3:sccs = Test3_W();break;
-              case 4:sccs = Test4_W();break;
-              case 5:sccs = Test5_W();break;
-              case 6:sccs = Test6_W();break;
+              case 0:sccs = Test0_W(5);break;//5file
+              case 1:sccs = Test1_W(0);break;
+              case 2:sccs = Test1_W(5);break;//max >> 5
+              case 3:sccs = Test2_W(test2_ct);break;
+              case 4:sccs = Test3_W();break;
+              case 5:sccs = Test4_W();break;
+              case 6:sccs = Test5_W();break;
+              case 7:sccs = Test6_W();break;
+              case 8:sccs = Test7_W(5);break;
               default:break;
           }
       }else if (value & nn::hid::BUTTON_X)
       {//ベリファイ
+       //書��分��ェック�余分��る����見���
+       //ツール��構��ェックを�る��
           sccs = false;
           s_RenderSystem.Clear();
           drawText(10,70,"verifi");
@@ -1225,12 +1434,14 @@ void TestMain()
           }else
           switch(curs){
               case 0:sccs = Test0_V(5);break;
-              case 1:sccs = Test1_V();break;
-              case 2:sccs = Test2_V(680);break;
-              case 3:sccs = Test3_V();break;
-              case 4:sccs = Test4_V();break;
-              case 5:sccs = Test5_V();break;
-              case 6:sccs = Test6_V();break;
+              case 1:sccs = Test1_V(0);break;
+              case 2:sccs = Test1_V(5);break;
+              case 3:sccs = Test2_V(test2_ct);break;
+              case 4:sccs = Test3_V();break;
+              case 5:sccs = Test4_V();break;
+              case 6:sccs = Test5_V();break;
+              case 7:sccs = Test6_V();break;
+              case 8:sccs = Test7_V(5);break;
               default:break;
           }
       }else if (value & nn::hid::BUTTON_UP){