OSDN Git Service

[VM][General] Merge Upstream 20180530.
[csp-qt/common_source_project-fm7.git] / source / src / vm / disk.cpp
index fcddb85..5c20d6b 100644 (file)
@@ -7,22 +7,23 @@
        [ d88 handler ]
 */
 
+#ifndef _ANY2D88
+#include "../emu.h"
+#endif
+
 #include "disk.h"
-#include "../config.h"
 #include "../fileio.h"
 
 #ifndef _ANY2D88
-#define bios_path(x) emu->bios_path(x)
+#define local_path(x) create_local_path(x)
 #else
-#define bios_path(x) (x)
-#endif
-
-#if !defined(MSC_VER)
-# define min(a,b) (a > b) ? b : a
+#define local_path(x) (x)
 #endif
+#define FM     false
+#define MFM    true
 
 // crc table
-static const uint16 crc_table[256] = {
+static const uint16_t crc_table[256] = {
        0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7, 0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad, 0xe1ce, 0xf1ef,
        0x1231, 0x0210, 0x3273, 0x2252, 0x52b5, 0x4294, 0x72f7, 0x62d6, 0x9339, 0x8318, 0xb37b, 0xa35a, 0xd3bd, 0xc39c, 0xf3ff, 0xe3de,
        0x2462, 0x3443, 0x0420, 0x1401, 0x64e6, 0x74c7, 0x44a4, 0x5485, 0xa56a, 0xb54b, 0x8528, 0x9509, 0xe5ee, 0xf5cf, 0xc5ac, 0xd58d,
@@ -45,30 +46,9 @@ static const int secsize[8] = {
        128, 256, 512, 1024, 2048, 4096, 8192, 16384
 };
 
-static uint8 tmp_buffer[DISK_BUFFER_SIZE];
-
-// physical format table for solid image
-typedef struct {
-       int type;
-       int ncyl, nside, nsec, size;
-       bool mfm;
-} fd_format_t;
+static uint8_t tmp_buffer[DISK_BUFFER_SIZE];
 
-#define FM     false
-#define MFM    true
-
-static const fd_format_t fd_formats[] = {
-#if defined(_SC3000)
-       { MEDIA_TYPE_2D,  40, 1, 16,  256, MFM },       // 1D   160KB
-#elif defined(_SMC70) || defined(_SMC777)
-       { MEDIA_TYPE_2DD, 70, 1, 16,  256, MFM },       // 1DD  280KB
-#elif defined(_X1) || defined(_X1TWIN) || defined(_X1TURBO) || defined(_X1TURBOZ)
-       { MEDIA_TYPE_2D,  40, 2, 16,  256, MFM },       // 2D   320KB
-#elif defined(_M5)
-       { MEDIA_TYPE_2D,  40, 2, 18,  256, MFM },       // 2D   360KB
-#elif defined(_MZ80B) || defined(_MZ2000) || defined(_MZ2200) || defined(_MZ2500)
-       { MEDIA_TYPE_2DD, 80, 2, 16,  256, MFM },       // 2DD  640KB
-#endif
+static const fd_format_t fd_formats_base[] = {
        { MEDIA_TYPE_2D,  35, 1, 16,  128, FM  },       // 1S   70KB
        { MEDIA_TYPE_2D,  35, 2, 16,  128, FM  },       // 2S   140KB
        { MEDIA_TYPE_2DD, 77, 1, 26,  128, FM  },       // 1S   250KB
@@ -106,6 +86,79 @@ static const fd_format_t fd_formats[] = {
 
 #define IS_VALID_TRACK(offset) ((offset) >= 0x20 && (offset) < sizeof(buffer))
 
+void DISK::setup_fd_formats(void)
+{
+       fd_format_t nt;
+       bool checked = false;
+       memset(fd_formats, 0, sizeof(fd_formats));
+#if !defined(_ANY2D88)
+       osd = emu->get_osd();
+       if(osd->check_feature(_T("_SC3000"))) {
+               checked = true;
+               type_sc3000 = true;
+               nt = { MEDIA_TYPE_2D,  40, 1, 16,  256, MFM };  // 1D   160KB
+       } else if(osd->check_feature(_T("SMC70")) || osd->check_feature(_T("_SMC777"))) {
+               checked = true;
+               type_smc70 = true;
+               nt = { MEDIA_TYPE_2DD, 70, 1, 16,  256, MFM };  // 1DD  280KB
+       } else if (osd->check_feature(_T("_X1")) || osd->check_feature(_T("_X1TWIN"))) {
+               checked = true;
+               type_x1 = true;
+               nt = { MEDIA_TYPE_2D,  40, 2, 16,  256, MFM };  // 2D   320KB
+       } else if(osd->check_feature(_T("_X1TURBO")) || osd->check_feature(_T("_X1TURBOZ"))) {
+               checked = true;
+               type_x1 = true;
+               type_x1turbo = true;
+               nt = { MEDIA_TYPE_2D,  40, 2, 16,  256, MFM };  // 2D   320KB
+       } else if(osd->check_feature(_T("_M5"))) {
+               checked = true;
+               type_m5 = true;
+               nt = { MEDIA_TYPE_2D,  40, 2, 18,  256, MFM };  // 2D   360KB
+       } else if(osd->check_feature(_T("_MZ80B")) || osd->check_feature(_T("_MZ2000")) ||
+                         osd->check_feature(_T("_MZ2200")) || osd->check_feature(_T("_MZ2500"))) {
+               checked = true;
+               type_mz80b = true;
+               nt = { MEDIA_TYPE_2DD, 80, 2, 16,  256, MFM };  // 2DD  640KB
+       } else if (osd->check_feature(_T("_YIS"))) {
+               checked = true;
+               type_yis = true;
+               nt = { MEDIA_TYPE_2DD,  80, 1, 16,  256, MFM }; // 1DD  320KB
+       }
+       if(osd->check_feature(_T("_FM7")) || osd->check_feature(_T("_FM8"))) {
+               checked = false;
+               type_fm7 = true;
+       } else if(osd->check_feature(_T("_FM77_VARIANTS"))) {
+               checked = false;
+               type_fm7 = true;
+               type_fm77 = true;
+       } else if(osd->check_feature(_T("_FM77AV_VARIANTS"))) {
+               checked = false;
+               type_fm7 = true;
+               type_fm77 = true;
+               type_fm77av = true;
+               if(osd->check_feature(_T("_FM77AV40")) || osd->check_feature(_T("_FM77AV40EX")) ||
+                  osd->check_feature(_T("_FM77AV40SX")) || osd->check_feature(_T("_FM77AV20")) ||
+                  osd->check_feature(_T("_FM77AV20EX"))) {
+                       type_fm77av_2dd = true;
+               }
+       }
+       if(osd->check_feature(_T("SUPPORT_MEDIA_TYPE_1DD"))) {
+               type_1dd = true;
+       }
+       if(osd->check_feature(_T("_ANY2D88"))) {
+               type_any2d88 = true;
+       }
+#else // _ANY2D88
+       type_any2d88 = true;
+#endif 
+       if(checked) {
+               fd_formats[0] = nt;
+               memcpy(&fd_formats[1], fd_formats_base, sizeof(fd_formats_base));
+       } else {
+               memcpy(&fd_formats[0], fd_formats_base, sizeof(fd_formats_base));
+       }               
+}
+
 void DISK::open(const _TCHAR* file_path, int bank)
 {
        // check current disk image
@@ -115,10 +168,14 @@ void DISK::open(const _TCHAR* file_path, int bank)
                }
                close();
        }
+       if(bank < 0) {
+               return;
+       }
        memset(buffer, 0, sizeof(buffer));
        file_bank = 0;
        write_protected = false;
        media_type = MEDIA_TYPE_UNK;
+       is_special_disk = 0;
        is_solid_image = is_fdi_image = is_1dd_image = false;
        trim_required = false;
        track_mfm = drive_mfm;
@@ -126,15 +183,15 @@ void DISK::open(const _TCHAR* file_path, int bank)
        // open disk image
        FILEIO *fio = new FILEIO();
        if(fio->Fopen(file_path, FILEIO_READ_BINARY)) {
-               _tcscpy_s(orig_path, _MAX_PATH, file_path);
-               _tcscpy_s(dest_path, _MAX_PATH, file_path);
+               my_tcscpy_s(orig_path, _MAX_PATH, file_path);
+               my_tcscpy_s(dest_path, _MAX_PATH, file_path);
                
                file_size.d = fio->FileLength();
                fio->Fseek(0, FILEIO_SEEK_SET);
                
                if(check_file_extension(file_path, _T(".d88")) || check_file_extension(file_path, _T(".d77")) || check_file_extension(file_path, _T(".1dd"))) {
                        // d88 image
-                       uint32 offset = 0;
+                       uint32_t offset = 0;
                        for(int i = 0; i < bank; i++) {
                                fio->Fseek(offset + 0x1c, SEEK_SET);
                                offset += fio->FgetUint32_LE();
@@ -153,14 +210,14 @@ void DISK::open(const _TCHAR* file_path, int bank)
                        
                        // fix sector number from big endian to little endian
                        for(int trkside = 0; trkside < 164; trkside++) {
-                               pair offset;
+                               pair_t offset;
                                offset.read_4bytes_le_from(buffer + 0x20 + trkside * 4);
                                
                                if(!IS_VALID_TRACK(offset.d)) {
                                        break;
                                }
-                               uint8* t = buffer + offset.d;
-                               pair sector_num, data_size;
+                               uint8_t* t = buffer + offset.d;
+                               pair_t sector_num, data_size;
                                sector_num.read_2bytes_le_from(t + 4);
                                bool is_be = (sector_num.b.l == 0 && sector_num.b.h >= 4);
                                if(is_be) {
@@ -178,78 +235,234 @@ void DISK::open(const _TCHAR* file_path, int bank)
                } else if(check_file_extension(file_path, _T(".td0"))) {
                        // teledisk image
                        try {
-                               inserted = changed = teledisk_to_d88(fio);
-                               _stprintf_s(dest_path, _MAX_PATH, _T("%s.D88"), file_path);
+                               if(teledisk_to_d88(fio)) {
+                                       inserted = changed = true;
+                                       my_stprintf_s(dest_path, _MAX_PATH, _T("%s.D88"), file_path);
+                               }
                        } catch(...) {
                                // failed to convert the disk image
                        }
                } else if(check_file_extension(file_path, _T(".imd"))) {
                        // imagedisk image
                        try {
-                               inserted = changed = imagedisk_to_d88(fio);
-                               _stprintf_s(dest_path, _MAX_PATH, _T("%s.D88"), file_path);
+                               if(imagedisk_to_d88(fio)) {
+                                       inserted = changed = true;
+                                       my_stprintf_s(dest_path, _MAX_PATH, _T("%s.D88"), file_path);
+                               }
                        } catch(...) {
                                // failed to convert the disk image
                        }
                } else if(check_file_extension(file_path, _T(".dsk"))) {
                        // cpdread image
                        try {
-                               inserted = changed = cpdread_to_d88(fio);
-                               _stprintf_s(dest_path, _MAX_PATH, _T("%s.D88"), file_path);
+                               if(cpdread_to_d88(fio)) {
+                                       inserted = changed = true;
+                                       my_stprintf_s(dest_path, _MAX_PATH, _T("%s.D88"), file_path);
+                               }
+                       } catch(...) {
+                               // failed to convert the disk image
+                       }
+               } else if(check_file_extension(file_path, _T(".nfd"))) {
+                       // T98-NEXT nfd r0/r1 image for NEC PC-98x1 series
+                       try {
+                               if(nfdr0_to_d88(fio) || nfdr1_to_d88(fio)) {
+                                       inserted = changed = true;
+                                       my_stprintf_s(dest_path, _MAX_PATH, _T("%s.D88"), file_path);
+                               }
+                       } catch(...) {
+                               // failed to convert the disk image
+                       }
+               } else if(check_file_extension(file_path, _T(".fdi"))) {
+                       // Anex86 fdi image for NEC PC-98x1 series
+                       if(file_size.d == 4096 + 77 * 2 * 8 * 1024) {
+                               try {
+                                       fio->Fread(fdi_header, 4096, 1);
+                                       if(solid_to_d88(fio, MEDIA_TYPE_2HD, 77, 2, 8, 1024, true)) {
+                                               inserted = changed = is_solid_image = is_fdi_image = true;
+                                       }
+                               } catch(...) {
+                                       // failed to convert the disk image
+                               }
+                       } else if(file_size.d == 4096 + 80 * 2 * 15 * 512) {
+                               try {
+                                       fio->Fread(fdi_header, 4096, 1);
+                                       if(solid_to_d88(fio, MEDIA_TYPE_2HD, 80, 2, 15, 512, true)) {
+                                               inserted = changed = is_solid_image = is_fdi_image = true;
+                                       }
+                               } catch(...) {
+                                       // failed to convert the disk image
+                               }
+                       } else if(file_size.d == 4096 + 80 * 2 * 18 * 512) {
+                               try {
+                                       fio->Fread(fdi_header, 4096, 1);
+                                       if(solid_to_d88(fio, MEDIA_TYPE_144, 80, 2, 18, 512, true)) {
+                                               inserted = changed = is_solid_image = is_fdi_image = true;
+                                       }
+                               } catch(...) {
+                                       // failed to convert the disk image
+                               }
+                       } else if(file_size.d == 4096 + 77 * 2 * 26 * 256) {
+                               try {
+                                       fio->Fread(fdi_header, 4096, 1);
+                                       if(solid_to_d88(fio, MEDIA_TYPE_2HD, 77, 2, 26, 256, true)) {
+                                               inserted = changed = is_solid_image = is_fdi_image = true;
+                                       }
+                               } catch(...) {
+                                       // failed to convert the disk image
+                               }
+                       } else if(file_size.d == 4096 + 80 * 2 * 9 * 512) {
+                               try {
+                                       fio->Fread(fdi_header, 4096, 1);
+                                       if(solid_to_d88(fio, MEDIA_TYPE_2DD, 80, 2, 9, 512, true)) {
+                                               inserted = changed = is_solid_image = is_fdi_image = true;
+                                       }
+                               } catch(...) {
+                                       // failed to convert the disk image
+                               }
+                       } else if(file_size.d == 4096 + 80 * 2 * 8 * 512) {
+                               try {
+                                       fio->Fread(fdi_header, 4096, 1);
+                                       if(solid_to_d88(fio, MEDIA_TYPE_2DD, 80, 2, 8, 512, true)) {
+                                               inserted = changed = is_solid_image = is_fdi_image = true;
+                                       }
+                               } catch(...) {
+                                       // failed to convert the disk image
+                               }
+                       }
+               } else if(check_file_extension(file_path, _T(".hdm")) && file_size.d == 77 * 2 * 8 * 1024) {
+                       // BKDSK hdm image for NEC PC-98x1 series
+                       try {
+                               if(solid_to_d88(fio, MEDIA_TYPE_2HD, 77, 2, 8, 1024, true)) {
+                                       inserted = changed = is_solid_image = true;
+                               }
+                       } catch(...) {
+                               // failed to convert the disk image
+                       }
+               } else if(check_file_extension(file_path, _T(".hd5")) && file_size.d == 80 * 2 * 15 * 512) {
+                       // BKDSK hd5 image for NEC PC-98x1 series
+                       try {
+                               if(solid_to_d88(fio, MEDIA_TYPE_2HD, 80, 2, 15, 512, true)) {
+                                       inserted = changed = is_solid_image = true;
+                               }
+                       } catch(...) {
+                               // failed to convert the disk image
+                       }
+               } else if(check_file_extension(file_path, _T(".hd4")) && file_size.d == 80 * 2 * 18 * 512) {
+                       // BKDSK hd4 image for NEC PC-98x1 series
+                       try {
+                               if(solid_to_d88(fio, MEDIA_TYPE_144, 80, 2, 18, 512, true)) {
+                                       inserted = changed = is_solid_image = true;
+                               }
+                       } catch(...) {
+                               // failed to convert the disk image
+                       }
+               } else if(check_file_extension(file_path, _T(".hdb")) && file_size.d == 77 * 2 * 26 * 256) {
+                       // BKDSK hdb image for NEC PC-98x1 series
+                       try {
+                               if(solid_to_d88(fio, MEDIA_TYPE_2HD, 77, 2, 26, 256, true)) {
+                                       inserted = changed = is_solid_image = true;
+                               }
+                       } catch(...) {
+                               // failed to convert the disk image
+                       }
+               } else if(check_file_extension(file_path, _T(".dd9")) && file_size.d == 80 * 2 * 9 * 512) {
+                       // BKDSK dd9 image for NEC PC-98x1 series
+                       try {
+                               if(solid_to_d88(fio, MEDIA_TYPE_2DD, 80, 2, 9, 512, true)) {
+                                       inserted = changed = is_solid_image = true;
+                               }
+                       } catch(...) {
+                               // failed to convert the disk image
+                       }
+               } else if(check_file_extension(file_path, _T(".dd6")) && file_size.d == 80 * 2 * 8 * 512) {
+                       // BKDSK dd6 image for NEC PC-98x1 series
+                       try {
+                               if(solid_to_d88(fio, MEDIA_TYPE_2DD, 80, 2, 8, 512, true)) {
+                                       inserted = changed = is_solid_image = true;
+                               }
+                       } catch(...) {
+                               // failed to convert the disk image
+                       }
+               } else if(check_file_extension(file_path, _T(".xdf")) && file_size.d == 77 * 2 * 8 * 1024) {
+                       // EX68 xdf image for SHARP X680x0 series
+                       try {
+                               if(solid_to_d88(fio, MEDIA_TYPE_2HD, 77, 2, 8, 1024, true)) {
+                                       inserted = changed = is_solid_image = true;
+                               }
                        } catch(...) {
                                // failed to convert the disk image
                        }
                } else if(check_file_extension(file_path, _T(".2d"))  && file_size.d == 40 * 2 * 16 * 256) {
                        // 2d image for SHARP X1 series
-                       inserted = changed = is_solid_image = solid_to_d88(fio, MEDIA_TYPE_2D, 40, 2, 16, 256, true);
-               } else if(check_file_extension(file_path, _T(".img"))  && file_size.d == 70 * 1 * 16 * 256) {
-                       // img image for SONY SMC-70/777 series
-                       inserted = changed = is_solid_image = solid_to_d88(fio, MEDIA_TYPE_2DD, 70, 1, 16, 256, true);
+                       try {
+                               if(solid_to_d88(fio, MEDIA_TYPE_2D, 40, 2, 16, 256, true)) {
+                                       inserted = changed = is_solid_image = true;
+                               }
+                       } catch(...) {
+                               // failed to convert the disk image
+                       }
                } else if(check_file_extension(file_path, _T(".sf7")) && file_size.d == 40 * 1 * 16 * 256) {
                        // sf7 image for SEGA SC-3000 + SF-7000
-                       inserted = changed = is_solid_image = solid_to_d88(fio, MEDIA_TYPE_2D, 40, 1, 16, 256, true);
+                       try {
+                               if(solid_to_d88(fio, MEDIA_TYPE_2D, 40, 1, 16, 256, true)) {
+                                       inserted = changed = is_solid_image = true;
+                               }
+                       } catch(...) {
+                               // failed to convert the disk image
+                       }
+               } else if(check_file_extension(file_path, _T(".img"))  && file_size.d == 70 * 1 * 16 * 256) {
+                       // img image for SONY SMC-70/777 series
+                       try {
+                               if(solid_to_d88(fio, MEDIA_TYPE_2DD, 70, 1, 16, 256, true)) {
+                                       inserted = changed = is_solid_image = true;
+                               }
+                       } catch(...) {
+                               // failed to convert the disk image
+                       }
                }
                if(!inserted) {
                        // check solid image file format
-                       bool is_fdi_tmp = check_file_extension(file_path, _T(".fdi"));
                        for(int i = 0;; i++) {
                                const fd_format_t *p = &fd_formats[i];
                                if(p->type == -1) {
                                        break;
                                }
-                               int len = p->ncyl * p->nside * p->nsec * p->size;
-                               // 4096 bytes: FDI header ???
-                               if(file_size.d == len + (is_fdi_tmp ? 4096 : 0)) {
+                               if(file_size.d == (uint32_t)(p->ncyl * p->nside * p->nsec * p->size)) {
                                        fio->Fseek(0, FILEIO_SEEK_SET);
-                                       if(is_fdi_tmp) {
-                                               is_fdi_image = true;
-                                               fio->Fread(fdi_header, 4096, 1);
-                                       }
                                        int type = p->type;
                                        int ncyl = p->ncyl;
                                        int nside = p->nside;
                                        int nsec = p->nsec;
                                        int size = p->size;
-#if defined(SUPPORT_MEDIA_TYPE_1DD)
-                                       if(type == MEDIA_TYPE_2D && nside == 2 && p->mfm) {
-                                               type = MEDIA_TYPE_2DD;
-                                               nside = 1;
-                                               ncyl *= 2;
-                                       }
-#elif defined(_ANY2D88)
-                                       if(open_as_1dd && type == MEDIA_TYPE_2D && nside == 2 && p->mfm) {
-                                               type = MEDIA_TYPE_2DD;
-                                               nside = 1;
-                                               ncyl *= 2;
-                                       }
-                                       if(open_as_256 && (size == 512 || size == 1024)) {
-                                               nsec *= size / 256;
-                                               size = 256;
+//#if defined(SUPPORT_MEDIA_TYPE_1DD)
+                                               if(type_1dd) {
+                                                       if(type == MEDIA_TYPE_2D && nside == 2 && p->mfm) {
+                                                               type = MEDIA_TYPE_2DD;
+                                                               nside = 1;
+                                                               ncyl *= 2;
+                                                       }
+                                               } else if(type_any2d88) {
+//#elif defined(_ANY2D88)
+                                                       if(open_as_1dd && type == MEDIA_TYPE_2D && nside == 2 && p->mfm) {
+                                                               type = MEDIA_TYPE_2DD;
+                                                               nside = 1;
+                                                               ncyl *= 2;
+                                                       }
+                                                       if(open_as_256 && (size == 512 || size == 1024)) {
+                                                               nsec *= size / 256;
+                                                               size = 256;
+                                                       }
+                                               }
+//#endif
+                                       try {
+//                                             if(solid_to_d88(fio, p->type, p->ncyl, p->nside, p->nsec, p->size, p->mfm)) {
+                                               if(solid_to_d88(fio, type, ncyl, nside, nsec, size, p->mfm)) {
+                                                       inserted = changed = is_solid_image = true;
+                                               }
+                                       } catch(...) {
+                                               // failed to convert the disk image
                                        }
-#endif
-//                                     if(solid_to_d88(fio, p->type, p->ncyl, p->nside, p->nsec, p->size, p->mfm)) {
-                                       if(solid_to_d88(fio, type, ncyl, nside, nsec, size, p->mfm)) {
-                                               inserted = changed = is_solid_image = true;
+                                       if(inserted) {
                                                break;
                                        }
                                }
@@ -258,25 +471,25 @@ void DISK::open(const _TCHAR* file_path, int bank)
                if(fio->IsOpened()) {
                        fio->Fclose();
                }
-               if(inserted) {
-                       if(buffer[0x1a] != 0) {
-                               buffer[0x1a] = 0x10;
-                               write_protected = true;
-                       }
-                       crc32 = getcrc32(buffer, file_size.d);
-               }
+       }
+       delete fio;
+       
+       // check loaded image
+       if(inserted) {
+               // check media type
                if(media_type == MEDIA_TYPE_UNK) {
                        if((media_type = buffer[0x1b]) == MEDIA_TYPE_2HD) {
+                               // check 1.2MB or 1.44MB
                                for(int trkside = 0; trkside < 164; trkside++) {
-                                       pair offset;
+                                       pair_t offset;
                                        offset.read_4bytes_le_from(buffer + 0x20 + trkside * 4);
                                        
                                        if(!IS_VALID_TRACK(offset.d)) {
                                                continue;
                                        }
                                        // track found
-                                       uint8 *t = buffer + offset.d;
-                                       pair sector_num, data_size;
+                                       uint8_t *t = buffer + offset.d;
+                                       pair_t sector_num, data_size;
                                        sector_num.read_2bytes_le_from(t + 4);
                                        data_size.read_2bytes_le_from(t + 14);
                                        
@@ -287,178 +500,258 @@ void DISK::open(const _TCHAR* file_path, int bank)
                                }
                        }
                }
-               is_special_disk = 0;
-#if defined(_FM7) || defined(_FM8) || defined(_FM77_VARIANTS) || defined(_FM77AV_VARIANTS)
-               // FIXME: ugly patch for FM-7 Gambler Jiko Chuushin Ha, DEATH FORCE and Psy-O-Blade
-               if(media_type == MEDIA_TYPE_2D) {
-                       // check first track
-                       pair offset, sector_num, data_size;
-                       offset.read_4bytes_le_from(buffer + 0x20);
-                       if(IS_VALID_TRACK(offset.d)) {
-                               // check the sector (c,h,r,n) = (0,0,7,1) or (0,0,f7,2)
-                               uint8* t = buffer + offset.d;
-                               sector_num.read_2bytes_le_from(t + 4);
-                               for(int i = 0; i < sector_num.sd; i++) {
-                                       data_size.read_2bytes_le_from(t + 14);
-                                       if(data_size.sd == 0x100 && t[0] == 0 && t[1] == 0 && t[2] == 7 && t[3] == 1) {
-                                               static const uint8 gambler[] = {0xb7, 0xde, 0xad, 0xdc, 0xdd, 0xcc, 0xde, 0xd7, 0xb1, 0x20, 0xbc, 0xde, 0xba, 0xc1, 0xad, 0xb3, 0xbc, 0xdd, 0xca};
-                                               if(memcmp((void *)(t + 0x30), gambler, sizeof(gambler)) == 0) {
-                                                       is_special_disk = SPECIAL_DISK_FM7_GAMBLER;
-                                                       break;
-                                               }
-                                       } else if(data_size.sd == 0x200 && t[0] == 0 && t[1] == 0 && t[2] == 0xf7 && t[3] == 2) {
-                                               //"DEATHFORCE/77AV" + $f7*17 + $00 + $00
-                                               static const uint8 deathforce[] ={
-                                                       0x44, 0x45, 0x41, 0x54, 0x48, 0x46, 0x4f, 0x52,
-                                                       0x43, 0x45, 0x2f, 0x37, 0x37, 0x41, 0x56, 0xf7,
-                                                       0xf7, 0xf7, 0xf7, 0xf7, 0xf7, 0xf7, 0xf7, 0xf7,
-                                                       0xf7, 0xf7, 0xf7, 0xf7, 0xf7, 0xf7, 0xf7, 0xf7,
-                                                       0x00, 0x00
-                                               };
-                                               if(memcmp((void *)(t + 0x10), deathforce, sizeof(deathforce)) == 0) {
-                                                       is_special_disk = SPECIAL_DISK_FM7_DEATHFORCE;
-                                                       break;
-                                               }
-                                       } else if(data_size.sd == 0x100 && t[0] == 0 && t[1] == 0 && t[2] == 1 && t[3] == 1) {
-                                               //$03 + $2D + "PSY-O-BLADE   Copyright 1988 by T&E SOFT Inc" + $B6 + $FD + $05
-                                               static const uint8 psyoblade_ipl1[] ={
-                                                       0x03, 0x2d, 0x50, 0x53, 0x59, 0xa5, 0x4f, 0xa5,
-                                                       0x42, 0x4c, 0x41, 0x44, 0x45, 0x20, 0x20, 0x20,
-                                                       0x43, 0x6f, 0x70, 0x79, 0x72, 0x69, 0x67, 0x68,
-                                                       0x74, 0x20, 0x31, 0x39, 0x38, 0x38, 0x20, 0x62,
-                                                       0x79, 0x20, 0x54, 0x26, 0x45, 0x20, 0x53, 0x4f,
-                                                       0x46, 0x54, 0x20, 0x49, 0x6e, 0x63, 0x2e, 0xb6,
-                                                       0xfd, 0x05
-                                               };
-                                               //IPL Signature1
-                                               static const uint8 psyoblade_disk_1[] ={
-                                                       0xc3, 0x00, 0x01, 0x00, 0x1a, 0x50, 0x86, 0xff,
-                                                       0xb7, 0xfd, 0x10, 0xb7, 0xfd, 0x0f, 0x30, 0x8c,
-                                                       0x0e, 0x8d, 0x35, 0x30, 0x8c, 0x14, 0x8d, 0x30,
-                                                       0x30, 0x8c, 0x14, 0x8d, 0x2b, 0x20, 0xfe, 0x0a,
-                                               };
-                                               //$00 + $00 + $03 + $14 + "PSY-O-BLADE  DISK" + $B6 + $FD + $05
-                                               static const uint8 psyoblade_disk_2[] ={
-                                                       0x00, 0x00, 0x03, 0x14, 0x50, 0x53, 0x59, 0xa5,
-                                                       0x4f, 0xa5, 0x42, 0x4c, 0x41, 0x44, 0x45, 0x20,
-                                                       0x20, 0x20, 0x44, 0x49, 0x53, 0x4B, 0x20
-                                               };
-                                               if(memcmp((void *)(t + 0x58), psyoblade_ipl1, sizeof(psyoblade_ipl1)) == 0) {
-                                                       is_special_disk = SPECIAL_DISK_FM77AV_PSYOBLADE;
-                                                       break;
-                                               } else if(memcmp((void *)(t + 0x10), psyoblade_disk_1, sizeof(psyoblade_disk_1)) == 0) {
-                                                       if(memcmp((void *)(t + 0x40), psyoblade_disk_2, sizeof(psyoblade_disk_2)) == 0) {
-                                                               is_special_disk = SPECIAL_DISK_FM77AV_PSYOBLADE;
-                                                               break;
-                                                       }
-                                               }
-                                       }
-                                       t += data_size.sd + 0x10;
+               
+               // check two side
+               int valid_side = 0;
+               
+               for(int trk = 0; trk < 82; trk++) {
+                       for(int side = 0; side < 2; side++) {
+                               int trkside = trk * 2 + side;
+                               pair_t offset;
+                               offset.read_4bytes_le_from(buffer + 0x20 + trkside * 4);
+                               
+                               if(IS_VALID_TRACK(offset.d)) {
+                                       valid_side |= (1 << side);
                                }
-                               if(is_special_disk == 0) {
-                                       t = buffer + offset.d;
+                       }
+                       if(valid_side == 3) break;
+               }
+               // FIXME: unformat disk is recognized as two side
+               two_side = (valid_side != 1);
+               
+               // fix write protect flag
+               if(buffer[0x1a] != 0) {
+                       buffer[0x1a] = 0x10;
+                       write_protected = true;
+               }
+               
+               // get crc32 for midification check
+               orig_file_size = file_size.d;
+               orig_crc32 = get_crc32(buffer, file_size.d);
+               
+               // check special disk image
+//#if defined(_FM7) || defined(_FM8) || defined(_FM77_VARIANTS) || defined(_FM77AV_VARIANTS)
+               if(type_fm7) {
+                       // FIXME: ugly patch for FM-7 Gambler Jiko Chuushin Ha, DEATH FORCE and Psy-O-Blade
+                       if(media_type == MEDIA_TYPE_2D) {
+                               // check first track
+                               pair_t offset, sector_num, data_size;
+                               offset.read_4bytes_le_from(buffer + 0x20);
+
+                               if(IS_VALID_TRACK(offset.d)) {
+                                       // check the sector (c,h,r,n) = (0,0,7,1) or (0,0,f7,2)
+                                       uint8_t* t = buffer + offset.d;
                                        sector_num.read_2bytes_le_from(t + 4);
-                               
-                                       for(int i = 0; i < sector_num.sd; i++) {
+                                       for(int _i = 0; _i < sector_num.sd; _i++) {
                                                data_size.read_2bytes_le_from(t + 14);
-                                               // FIXME : Check DEATH FORCE
-                                               if(data_size.sd == 0x200 && t[0] == 0 && t[1] == 0 && t[2] == 0xf7 && t[3] == 0x02) {
-                                                       static const uint8 deathforce[] ={
+                                               if(data_size.sd == 0x100 && t[0] == 0 && t[1] == 0 && t[2] == 7 && t[3] == 1) {
+                                                       /* Type 1: Sec07, +$50- "1989/09/12 ... "*/
+                                                       static const uint8_t gamblerfm_1[] = {
+                                                               0x31, 0x39, 0x38, 0x39, 0x2f, 0x30, 0x39, 0x2f,
+                                                               0x31, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                               0x28, 0x43, 0x29, 0x47, 0x41, 0x4d, 0x45, 0x41,
+                                                               0x52, 0x54, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                               0x20, 0x20, 0x20, 0x59, 0x45, 0x4c, 0x4c, 0x4f,
+                                                               0x57, 0x48, 0x4f, 0x52, 0x4e, 0x00, 0x00, 0x00,
+                                                               0x20, 0x20, 0x20, 0x4b, 0x4f, 0x55, 0x44, 0x41,
+                                                               0x4e, 0x53, 0x59, 0x41, 0x20, 0x59, 0x4f, 0x55,
+                                                               0x4e, 0x47, 0x2d, 0x4d, 0x41, 0x47, 0x41, 0x5a,
+                                                               0x49, 0x4e, 0x45, 0x00 
+                                                       };
+                                                       /* Type 2: Sec07, +$30- */
+                                                       static const uint8_t gamblerfm_2[] = {
+                                                               0xb7, 0xde, 0xad, 0xdc, 0xdd, 0xcc, 0xde, 0xd7,
+                                                               0xb1, 0x20, 0xbc, 0xde, 0xba, 0xc1, 0xad, 0xb3,
+                                                               0xbc, 0xdd, 0xca
+                                                       };
+                                                       if(memcmp((void *)(t + 0x50), gamblerfm_1, sizeof(gamblerfm_1)) == 0) {
+                                                               is_special_disk = SPECIAL_DISK_FM7_GAMBLER;
+                                                               break;
+                                                       }
+                                                       if(memcmp((void *)(t + 0x30), gamblerfm_2, sizeof(gamblerfm_2)) == 0) {
+                                                               is_special_disk = SPECIAL_DISK_FM7_GAMBLER;
+                                                               break;
+                                                       }
+                                               } else if(data_size.sd == 0x200 && t[0] == 0 && t[1] == 0 && t[2] == 0xf7 && t[3] == 2) {
+                                                       //"DEATHFORCE/77AV" + $f7*17 + $00 + $00
+                                                       static const uint8_t deathforce[] ={
                                                                0x44, 0x45, 0x41, 0x54, 0x48, 0x46, 0x4f, 0x52,
                                                                0x43, 0x45, 0x2f, 0x37, 0x37, 0x41, 0x56, 0xf7,
                                                                0xf7, 0xf7, 0xf7, 0xf7, 0xf7, 0xf7, 0xf7, 0xf7,
                                                                0xf7, 0xf7, 0xf7, 0xf7, 0xf7, 0xf7, 0xf7, 0xf7,
-                                                               0x00, 0x00};    //"DEATHFORCE/77AV" + $f7*17 + $00 + $00
+                                                               0x00, 0x00
+                                                       };
                                                        if(memcmp((void *)(t + 0x10), deathforce, sizeof(deathforce)) == 0) {
                                                                is_special_disk = SPECIAL_DISK_FM7_DEATHFORCE;
+                                                               break;
                                                        }
-                                                       break;
-                                               }
-                                               t += data_size.sd + 0x10;
-                                       }
-                               }
-                               if(is_special_disk == 0) {
-                                       t = buffer + offset.d;
-                                       sector_num.read_2bytes_le_from(t + 4);
-                               
-                                       for(int i = 0; i < sector_num.sd; i++) {
-                                               data_size.read_2bytes_le_from(t + 14);
-                                               // FIXME : Check Psy-O-Blade (Program)
-                                               if(data_size.sd == 0x100 && t[0] == 0 && t[1] == 0 && t[2] == 0x01 && t[3] == 0x01) {
-                                                       static const uint8 psyoblade_ipl1[] ={
+                                               } else if(data_size.sd == 0x100 && t[0] == 0 && t[1] == 0 && t[2] == 5 && t[3] == 1) {
+                                                       //$00 * 16 + $00 + "Protected by  N & A (SUPER HACKER COMBI)
+                                                       //Can you found CHECK-ROUTINES ?Can you crack these protect ?
+                                                       //good bye !ou "
+                                                       static const uint8_t xanadu2fm_d_1[] ={
+                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                       };
+                                                       static const uint8_t xanadu2fm_d_2[] = {
+                                                               0x50, 0x72, 0x6F, 0x74, 0x65, 0x63, 0x74, 0x65,
+                                                               0x64, 0x20, 0x62, 0x79, 0x20, 0x20, 0x4E, 0x20,
+                                                               0x26, 0x20, 0x41, 0x20, 0x28, 0x53, 0x55, 0x50,
+                                                               0x45, 0x52, 0x20, 0x48, 0x41, 0x43, 0x4B, 0x45,
+                                                               0x52, 0x20, 0x43, 0x4F, 0x4D, 0x42, 0x49, 0x29,
+                                                               0x43, 0x61, 0x6E, 0x20, 0x79, 0x6F, 0x75, 0x20,
+                                                               0x66, 0x6F, 0x75, 0x6E, 0x64, 0x20, 0x43, 0x48,
+                                                               0x45, 0x43, 0x4B, 0x2D, 0x52, 0x4F, 0x55, 0x54,
+                                                               0x49, 0x4E, 0x45, 0x53, 0x20, 0x3F, 0x43, 0x61,
+                                                               0x6E, 0x20, 0x79, 0x6F, 0x75, 0x20, 0x63, 0x72,
+                                                               0x61, 0x63, 0x6B, 0x20, 0x74, 0x68, 0x65, 0x73,
+                                                               0x65, 0x20, 0x70, 0x72, 0x6F, 0x74, 0x65, 0x63,
+                                                               0x74, 0x20, 0x3F, 0x67, 0x6F, 0x6F, 0x64, 0x20,
+                                                               0x62, 0x79, 0x65, 0x20, 0x21, 0x6F, 0x75, 0x20,
+                                                       };
+                                                       if(memcmp((void *)(t + 0x10 + 0x60), xanadu2fm_d_1, sizeof(xanadu2fm_d_1)) == 0) {
+                                                               if(memcmp((void *)(t + 0x10 + 0x70), xanadu2fm_d_2, sizeof(xanadu2fm_d_2)) == 0) {
+                                                                       is_special_disk = SPECIAL_DISK_FM7_XANADU2_D;
+                                                                       break;
+                                                               }
+                                                       }
+                                               } else if(data_size.sd == 0x100 && t[0] == 0 && t[1] == 0 && t[2] == 8 && t[3] == 1) {
+                                                       // Xanadu 1
+                                                       static const uint8_t xanadu1fm_d_1[] = {
+                                                               0xFF, 0x43, 0x6F, 0x6E, 0x74, 0x69, 0x6E, 0x75,
+                                                               0x65, 0x20, 0x74, 0x68, 0x69, 0x73, 0x20, 0x70,
+                                                               0x72, 0x6F, 0x67, 0x72, 0x61 ,0x6D, 0x2E, 0x0D,
+                                                               0xFF, 0x00, 0x34, 0x01, 0x1C ,0xAF, 0x6F, 0x8D,
+                                                               0x01, 0x3F, 0x17, 0xFA, 0xE4, 0x27, 0xFB, 0x35,
+                                                               0x81, 0x34, 0x13, 0xA6, 0x80, 0x81, 0xFF, 0x27,
+                                                               0x04, 0x8D, 0x04, 0x20, 0xF6, 0x35, 0x93, 0x34,
+                                                               0x15, 0xA7, 0x8D, 0x00, 0xB6, 0xC6, 0x05, 0x30,
+                                                               0x8D, 0x00, 0xAC, 0x17, 0x00, 0xB6, 0x17, 0x00,
+                                                               0xD6, 0x35, 0x95, 0x00, 0x00, 0x3F, 0x59, 0x41,
+                                                               0x4D, 0x41, 0x55, 0x43, 0x48, 0x49, 0x91, 0xD3,
+                                                       };
+                                                       static const uint8_t xanadu1fm_d_2[] = {
+                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                               0x00, 0x00, 0x00, 0x00, 0x3F, 0x59, 0x41, 0x4D,
+                                                               0x41, 0x55, 0x43, 0x48, 0x49, 0x93, 0xD3, 0x8F,
+                                                               0x90, 0x8E, 
+                                                       };
+                                                       if(memcmp((void *)(t + 0x10 + 0), xanadu1fm_d_1, sizeof(xanadu1fm_d_1)) == 0) {
+                                                               if(memcmp((void *)(t + 0x10 + 0xb0), xanadu1fm_d_2, sizeof(xanadu1fm_d_2)) == 0) {
+                                                                       is_special_disk = SPECIAL_DISK_FM7_XANADU2_D; // Same issue as Xanadu2.
+                                                                       break;
+                                                               }
+                                                       }
+                                               } else if(data_size.sd == 0x100 && t[0] == 0 && t[1] == 0 && t[2] == 1 && t[3] == 1) {
+                                                       //$03 + $2D + "PSY-O-BLADE   Copyright 1988 by T&E SOFT Inc." + $B6 + $FD + $05
+                                                       static const uint8_t psyoblade_ipl1[] ={
                                                                0x03, 0x2d, 0x50, 0x53, 0x59, 0xa5, 0x4f, 0xa5,
                                                                0x42, 0x4c, 0x41, 0x44, 0x45, 0x20, 0x20, 0x20,
                                                                0x43, 0x6f, 0x70, 0x79, 0x72, 0x69, 0x67, 0x68,
                                                                0x74, 0x20, 0x31, 0x39, 0x38, 0x38, 0x20, 0x62,
                                                                0x79, 0x20, 0x54, 0x26, 0x45, 0x20, 0x53, 0x4f,
                                                                0x46, 0x54, 0x20, 0x49, 0x6e, 0x63, 0x2e, 0xb6,
-                                                               0xfd, 0x05};
-                                                       //$03 + $2D + "PSY-O-BLADE   Copyright 1988 by T&E SOFT Inc" + $B6 + $FD + $05
-                                                       if(memcmp((void *)(t + 0x58), psyoblade_ipl1, sizeof(psyoblade_ipl1)) == 0) {
-                                                               is_special_disk = SPECIAL_DISK_FM77AV_PSYOBLADE;
-                                                               //printf("Disk: PSY-O-BLADE\n");
-                                                       }
-                                                       break;
-                                               }
-                                               t += data_size.sd + 0x10;
-                                       }
-                               }
-                               if(is_special_disk == 0) {
-                                       t = buffer + offset.d;
-                                       sector_num.read_2bytes_le_from(t + 4);
-                               
-                                       for(int i = 0; i < sector_num.sd; i++) {
-                                               data_size.read_2bytes_le_from(t + 14);
-                                               // FIXME : Check Psy-O-Blade (Program)
-                                               if(data_size.sd == 0x100 && t[0] == 0 && t[1] == 0 && t[2] == 0x01 && t[3] == 0x01) {
+                                                               0xfd, 0x05
+                                                       };
                                                        //IPL Signature1
-                                                       static const uint8 psyoblade_disk_1[] ={
+                                                       static const uint8_t psyoblade_disk_1[] ={
                                                                0xc3, 0x00, 0x01, 0x00, 0x1a, 0x50, 0x86, 0xff,
                                                                0xb7, 0xfd, 0x10, 0xb7, 0xfd, 0x0f, 0x30, 0x8c,
                                                                0x0e, 0x8d, 0x35, 0x30, 0x8c, 0x14, 0x8d, 0x30,
                                                                0x30, 0x8c, 0x14, 0x8d, 0x2b, 0x20, 0xfe, 0x0a,
                                                        };
                                                        //$00 + $00 + $03 + $14 + "PSY-O-BLADE  DISK" + $B6 + $FD + $05
-                                                       static const uint8 psyoblade_disk_2[] ={
+                                                       static const uint8_t psyoblade_disk_2[] ={
                                                                0x00, 0x00, 0x03, 0x14, 0x50, 0x53, 0x59, 0xa5,
                                                                0x4f, 0xa5, 0x42, 0x4c, 0x41, 0x44, 0x45, 0x20,
-                                                               0x20, 0x20, 0x44, 0x49, 0x53, 0x4B, 0x20};
-                                                       if(memcmp((void *)(t + 0x10), psyoblade_disk_1, sizeof(psyoblade_disk_1)) == 0) {
+                                                               0x20, 0x20, 0x44, 0x49, 0x53, 0x4B, 0x20
+                                                       };
+                                                       //RIGLAS/FM: $3E - $7D 
+                                                       static const uint8_t riglas_fm[] = {
+                                                               0x0d, 0x56, /* $3e-$3f */
+                                                               0x44, 0x53, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, /* $40-$47 */
+                                                               0x43, 0x4d, 0x44, 0x00, 0x00, 0x02, 0x1b, 0x02, /* $48-$4f */
+                                                               0x1e, 0x00, 0x04, 0x00, 0x00, 0x03, 0x0d, 0x56, /* $50-$57 */
+                                                               0x43, 0x4f, 0x50, 0x59, 0x00, 0x00, 0x00, 0x00, /* $58-$5f */
+                                                               0x43, 0x4d, 0x44, 0x00, 0x00, 0x02, 0x1f, 0x03, /* $60-$67 */
+                                                               0x03, 0x00, 0x05, 0x00, 0x00, 0x03, 0x0d, 0x56, /* $68-$6f */
+                                                               0x44, 0x45, 0x4c, 0x45, 0x54, 0x45, 0x00, 0x00, /* $70-$77 */
+                                                               0x43, 0x4d, 0x44, 0x00, 0x00, 0x03              /* $78-$7d */
+                                                       };
+                                                       if(memcmp((void *)(t + 0x58), psyoblade_ipl1, sizeof(psyoblade_ipl1)) == 0) {
+                                                               is_special_disk = SPECIAL_DISK_FM77AV_PSYOBLADE;
+                                                               break;
+                                                       } else if(memcmp((void *)(t + 0x10), psyoblade_disk_1, sizeof(psyoblade_disk_1)) == 0) {
                                                                if(memcmp((void *)(t + 0x40), psyoblade_disk_2, sizeof(psyoblade_disk_2)) == 0) {
                                                                        is_special_disk = SPECIAL_DISK_FM77AV_PSYOBLADE;
-                                                                       //printf("Disk: PSY-O-BLADE\n");
+                                                                       break;
                                                                }
+                                                       } else if(memcmp((void *)(t + 0x3e + 0x10), riglas_fm, sizeof(riglas_fm)) == 0) {
+                                                               is_special_disk = SPECIAL_DISK_FM7_RIGLAS;
+                                                               break;
+                                                       }
+                                       } else if(data_size.sd == 0x100 && t[0] == 0 && t[1] == 0 && t[2] == 3 && t[3] == 1) {
+                                                       static const uint8_t taiyoufm1[] = {
+                                                               0x10, 0xff, 0x04, 0x9f, 0x10, 0xce, 0xfc, 0xf4,
+                                                               0x37, 0x20, 0x34, 0x20, 0x37, 0x36, 0x34, 0x36, //7 4 7646
+                                                               0x37, 0x36, 0x34, 0x36, 0x37, 0x36, 0x34, 0x36, //76467646
+                                                               0x37, 0x36, 0x34, 0x36, 0x37, 0x36, 0x34, 0x36, //76467646
+                                                               0x37, 0x36, 0x34, 0x36, 0x37, 0x36, 0x34, 0x36, //76467646
+                                                               0x37, 0x36, 0x34, 0x36, 0x37, 0x36, 0x34, 0x36, //76467646
+                                                               0x37, 0x36, 0x34, 0x36, 0x37, 0x36, 0x34, 0x36, //76467646
+                                                               0x10, 0xfe, 0x04, 0x9f, 0x1c, 0xef, 0x86, 0xff,
+                                                               0xb7, 0xfc, 0xf8, 0x17, 0x03, 0x3d, 0x33, 0xc9,
+                                                               0xdb, 0x9c, 0x35, 0x04, 0x5a, 0x26, 0xa0, 0xfe,
+                                                       };
+                                                       if(memcmp((void *)(t + 0x70), taiyoufm1, sizeof(taiyoufm1)) == 0) {
+                                                               is_special_disk = SPECIAL_DISK_FM7_TAIYOU1;
+                                                               break;
+                                                       }
+                                               } else if(data_size.sd == 0x100 && t[0] == 0 && t[1] == 0 && t[2] == 2 && t[3] == 1) {
+                                                       static const uint8_t taiyoufm2[] = {
+                                                               0x3d, 0x02, 0xa3, 0xd6, 0x01, 0xc7, 0x06, 0x86,
+                                                               0x07, 0x00, 0x00, 0xc7, 0x06, 0xd4, 0x01, 0x00,
+                                                               0x00, 0xb4, 0x19, 0xcd, 0x21, 0xfe, 0xc0, 0xa2,
+                                                               0xda, 0x01, 0x06, 0xb9, 0x10, 0x00, 0xbb, 0x40,
+                                                               0x00, 0x8e, 0xc3, 0xbb, 0x00, 0x00, 0xfe, 0x06,
+                                                               0xd9, 0x01, 0x26, 0x80, 0xbf, 0x6c, 0x02, 0x00,
+                                                               0x74, 0x03, 0x43, 0xe2, 0xf1, 0x07, 0xc6, 0x06,
+                                                               0xdb, 0x01, 0x00, 0xbb, 0x80, 0x00, 0x80, 0x3f,
+                                                       };
+                                                       if(memcmp((void *)(t + 0x00), taiyoufm2, sizeof(taiyoufm2)) == 0) {
+                                                               is_special_disk = SPECIAL_DISK_FM7_TAIYOU2;
+                                                               break;
                                                        }
-                                                       break;
                                                }
                                                t += data_size.sd + 0x10;
                                        }
                                }
                        }
-               }
-#elif defined(_X1) || defined(_X1TWIN) || defined(_X1TURBO) || defined(_X1TURBOZ)
-               // FIXME: ugly patch for X1turbo ALPHA and X1 Batten Tanuki
-               if(media_type == MEDIA_TYPE_2D) {
-                       // check first track
-                       pair offset;
-                       offset.read_4bytes_le_from(buffer + 0x20);
-                       if(IS_VALID_TRACK(offset.d)) {
-                               // check first sector
-                               static const uint8 batten[] = {0xca, 0xde, 0xaf, 0xc3, 0xdd, 0x20, 0xc0, 0xc7, 0xb7};
-                               uint8 *t = buffer + offset.d;
-#if defined(_X1TURBO) || defined(_X1TURBOZ)
+               } else if(type_x1) { 
+//#elif defined(_X1) || defined(_X1TWIN) || defined(_X1TURBO) || defined(_X1TURBOZ)
+                       // FIXME: ugly patch for X1turbo ALPHA and X1 Batten Tanuki
+                       if(media_type == MEDIA_TYPE_2D) {
+                               // check first track
+                               pair_t offset;
+                               offset.read_4bytes_le_from(buffer + 0x20);
+                               if(IS_VALID_TRACK(offset.d)) {
+                                       // check first sector
+                                       static const uint8_t batten[] = {0xca, 0xde, 0xaf, 0xc3, 0xdd, 0x20, 0xc0, 0xc7, 0xb7};
+                                       uint8_t *t = buffer + offset.d;
+//#if defined(_X1TURBO) || defined(_X1TURBOZ)
 //                             if(strncmp((char *)(t + 0x11), "turbo ALPHA", 11) == 0) {
 //                                     is_special_disk = SPECIAL_DISK_X1TURBO_ALPHA;
 //                             } else
-#endif
-                               if(memcmp((void *)(t + 0x11), batten, sizeof(batten)) == 0) {
-                                       is_special_disk = SPECIAL_DISK_X1_BATTEN;
+//#endif
+                                               if(memcmp((void *)(t + 0x11), batten, sizeof(batten)) == 0) {
+                                                       is_special_disk = SPECIAL_DISK_X1_BATTEN;
+                                               }
                                }
                        }
                }
-#endif
+//#endif
        }
-       delete fio;
 }
 
 void DISK::close()
@@ -471,30 +764,30 @@ void DISK::close()
                }
                buffer[0x1a] = write_protected ? 0x10 : 0; // mey be changed
                
-               if(/*!write_protected &&*/ file_size.d && getcrc32(buffer, file_size.d) != crc32) {
+               if(/*!write_protected &&*/ !(file_size.d == orig_file_size && get_crc32(buffer, file_size.d) == orig_crc32)) {
                        // write image
                        FILEIO* fio = new FILEIO();
                        int pre_size = 0, post_size = 0;
-                       uint8 *pre_buffer = NULL, *post_buffer = NULL;
+                       uint8_t *pre_buffer = NULL, *post_buffer = NULL;
                        
                        // is this d88 format ?
                        if(check_file_extension(dest_path, _T(".d88")) || check_file_extension(dest_path, _T(".d77")) || check_file_extension(dest_path, _T(".1dd"))) {
                                if(fio->Fopen(dest_path, FILEIO_READ_BINARY)) {
                                        fio->Fseek(0, FILEIO_SEEK_END);
-                                       uint32 total_size = fio->Ftell(), offset = 0;
+                                       uint32_t total_size = fio->Ftell(), offset = 0;
                                        for(int i = 0; i < file_bank; i++) {
                                                fio->Fseek(offset + 0x1c, SEEK_SET);
                                                offset += fio->FgetUint32_LE();
                                        }
                                        if((pre_size = offset) > 0) {
-                                               pre_buffer = (uint8 *)malloc(pre_size);
+                                               pre_buffer = (uint8_t *)malloc(pre_size);
                                                fio->Fseek(0, FILEIO_SEEK_SET);
                                                fio->Fread(pre_buffer, pre_size, 1);
                                        }
                                        fio->Fseek(offset + 0x1c, SEEK_SET);
                                        offset += fio->FgetUint32_LE();
                                        if((post_size = total_size - offset) > 0) {
-                                               post_buffer = (uint8 *)malloc(post_size);
+                                               post_buffer = (uint8_t *)malloc(post_size);
                                                fio->Fseek(offset, FILEIO_SEEK_SET);
                                                fio->Fread(post_buffer, post_size, 1);
                                        }
@@ -508,7 +801,7 @@ void DISK::close()
                                int tracks = 0;
                                
                                for(int trkside = 0; trkside < 164; trkside++) {
-                                       pair offset;
+                                       pair_t offset;
                                        offset.read_4bytes_le_from(buffer + 0x20 + trkside * 4);
                                        
                                        if(!IS_VALID_TRACK(offset.d)) {
@@ -519,8 +812,8 @@ void DISK::close()
                                        }
                                        tracks++;
                                        
-                                       uint8* t = buffer + offset.d;
-                                       pair sector_num, data_size;
+                                       uint8_t* t = buffer + offset.d;
+                                       pair_t sector_num, data_size;
                                        sector_num.read_2bytes_le_from(t + 4);
                                        
                                        if(sector_num.sd != solid_nsec) {
@@ -541,15 +834,13 @@ void DISK::close()
                                        formatted = true;
                                }
                                if(formatted) {
-                                       _stprintf_s(dest_path, _MAX_PATH, _T("%s.D88"), orig_path);
+                                       my_stprintf_s(dest_path, _MAX_PATH, _T("%s.D88"), orig_path);
                                        is_solid_image = false;
                                }
                        }
                        
-                       if((FILEIO::IsFileExists(dest_path) && FILEIO::IsFileProtected(dest_path)) || !fio->Fopen(dest_path, FILEIO_WRITE_BINARY)) {
-                               _TCHAR tmp_path[_MAX_PATH];
-                               _stprintf_s(tmp_path, _MAX_PATH, _T("temporary_saved_floppy_disk_#%d.d88"), drive_num);
-                               fio->Fopen(bios_path(tmp_path), FILEIO_WRITE_BINARY);
+                       if((FILEIO::IsFileExisting(dest_path) && FILEIO::IsFileProtected(dest_path)) || !fio->Fopen(dest_path, FILEIO_WRITE_BINARY)) {
+                               fio->Fopen(local_path(create_string(_T("temporary_saved_floppy_disk_#%d.d88"), drive_num)), FILEIO_WRITE_BINARY);
                        }
                        if(fio->IsOpened()) {
                                if(pre_buffer) {
@@ -560,14 +851,14 @@ void DISK::close()
                                                fio->Fwrite(fdi_header, 4096, 1);
                                        }
                                        for(int trkside = 0; trkside < 164; trkside++) {
-                                               pair offset;
+                                               pair_t offset;
                                                offset.read_4bytes_le_from(buffer + 0x20 + trkside * 4);
                                                
                                                if(!IS_VALID_TRACK(offset.d)) {
                                                        continue;
                                                }
-                                               uint8* t = buffer + offset.d;
-                                               pair sector_num, data_size;
+                                               uint8_t* t = buffer + offset.d;
+                                               pair_t sector_num, data_size;
                                                sector_num.read_2bytes_le_from(t + 4);
                                                
                                                for(int i = 0; i < sector_num.sd; i++) {
@@ -600,9 +891,10 @@ void DISK::close()
        sector = NULL;
 }
 
-#ifdef _ANY2D88
+//#ifdef _ANY2D88
 void DISK::save_as_d88(const _TCHAR* file_path)
 {
+//#ifdef _ANY2D88
        if(inserted) {
                FILEIO* fio = new FILEIO();
                if(fio->Fopen(file_path, FILEIO_WRITE_BINARY)) {
@@ -619,19 +911,36 @@ void DISK::save_as_d88(const _TCHAR* file_path)
                }
                delete fio;
        }
+//#endif
 }
-#endif
+//#endif
 
 bool DISK::get_track(int trk, int side)
 {
+       if(media_type == MEDIA_TYPE_2D && drive_type == DRIVE_TYPE_2DD) {
+               if(trk >= 0) {
+                       if(trk & 1) {
+                               return false; // unformat
+                       }
+                       trk >>= 1;
+               }
+       } else if(media_type == MEDIA_TYPE_2DD && drive_type == DRIVE_TYPE_2D) {
+               if(trk >= 0) trk <<= 1;
+       }
+       return get_track_tmp(trk, side);
+}
+
+bool DISK::get_track_tmp(int trk, int side)
+{
        sector_size.sd = sector_num.sd = 0;
        invalid_format = false;
-       //no_skew = true;
-
+//     no_skew = true;
+       
        // disk not inserted or invalid media type
        if(!(inserted && check_media_type())) {
                return false;
        }
+       
        // search track
        int trkside = is_1dd_image ? trk : (trk * 2 + (side & 1));
        if(!(0 <= trkside && trkside < 164)) {
@@ -640,7 +949,7 @@ bool DISK::get_track(int trk, int side)
        cur_track = trk;
        cur_side = side;
        
-       pair offset;
+       pair_t offset;
        offset.read_4bytes_le_from(buffer + 0x20 + trkside * 4);
        
        if(!IS_VALID_TRACK(offset.d)) {
@@ -650,7 +959,7 @@ bool DISK::get_track(int trk, int side)
        // track found
        sector = buffer + offset.d;
        sector_num.read_2bytes_le_from(sector + 4);
-       pair data_size;
+       pair_t data_size;
        data_size.read_2bytes_le_from(sector + 14);
        
        // create each sector position in track
@@ -658,7 +967,7 @@ bool DISK::get_track(int trk, int side)
        if(sector_num.sd == 0) {
                track_mfm = drive_mfm;
        } else {
-               uint8* t = sector;
+               uint8_t* t = sector;
                for(int i = 0; i < sector_num.sd; i++) {
                        data_size.read_2bytes_le_from(t + 14);
                        // t[6]: 0x00 = double-density, 0x40 = single-density
@@ -698,36 +1007,47 @@ bool DISK::get_track(int trk, int side)
                }
        }
        
-       uint8* t = sector;
-       int total = sync_size + (am_size + 1);
+       uint8_t* t = sector;
+       int total = 0, valid_sector_num = 0;
        
        for(int i = 0; i < sector_num.sd; i++) {
                data_size.read_2bytes_le_from(t + 14);
+               sync_position[i] = total; // for invalid format case
                total += sync_size + (am_size + 1) + (4 + 2) + gap2_size;
                if(data_size.sd > 0) {
                        total += sync_size + (am_size + 1);
                        total += data_size.sd + 2;
+                       valid_sector_num++;
                }
 //             if(t[2] != i + 1) {
 //                     no_skew = false;
 //             }
                t += data_size.sd + 0x10;
        }
+       total += sync_size + (am_size + 1); // sync in preamble
+       
        if(gap3_size == 0) {
-               gap3_size = (get_track_size() - total - gap0_size - gap1_size) / (sector_num.sd + 1);
+               gap3_size = (get_track_size() - total - gap0_size - gap1_size) / (valid_sector_num + 1);
        }
-       gap4_size = get_track_size() - total - gap0_size - gap1_size - gap3_size * sector_num.sd;
+       gap4_size = get_track_size() - total - gap0_size - gap1_size - gap3_size * valid_sector_num;
        
        if(gap3_size < 8 || gap4_size < 8) {
-               gap0_size = gap1_size = gap3_size = (get_track_size() - total) / (2 + sector_num.sd + 1);
-               gap4_size = get_track_size() - total - gap0_size - gap1_size - gap3_size * sector_num.sd;
+               gap0_size = gap1_size = gap3_size = (get_track_size() - total) / (2 + valid_sector_num + 1);
+               gap4_size = get_track_size() - total - gap0_size - gap1_size - gap3_size * valid_sector_num;
        }
        if(gap3_size < 8 || gap4_size < 8) {
-               gap0_size = gap1_size = gap3_size = gap4_size = 32;
+               gap0_size = gap1_size = gap3_size = gap4_size = 8;
                invalid_format = true;
        }
        int preamble_size = gap0_size + sync_size + (am_size + 1) + gap1_size;
        
+       if(invalid_format) {
+               total -= sync_size + (am_size + 1);
+               for(int i = 0; i < sector_num.sd; i++) {
+                       sync_position[i] *= get_track_size() - preamble_size - gap4_size;
+                       sync_position[i] /= total;
+               }
+       }
        t = sector;
        total = preamble_size;
        sync_position[array_length(sync_position) - 1] = gap0_size; // sync position in preamble
@@ -735,7 +1055,7 @@ bool DISK::get_track(int trk, int side)
        for(int i = 0; i < sector_num.sd; i++) {
                data_size.read_2bytes_le_from(t + 14);
                if(invalid_format) {
-                       total = preamble_size + (get_track_size() - preamble_size - gap4_size) * i / sector_num.sd;
+                       total = preamble_size + sync_position[i];
                }
                sync_position[i] = total;
                total += sync_size;
@@ -747,10 +1067,10 @@ bool DISK::get_track(int trk, int side)
                        total += sync_size + (am_size + 1);
                        data_position[i] = total;
                        total += data_size.sd + 2;
+                       total += gap3_size;
                } else {
                        data_position[i] = total; // FIXME
                }
-               total += gap3_size;
                t += data_size.sd + 0x10;
        }
        return true;
@@ -758,9 +1078,24 @@ bool DISK::get_track(int trk, int side)
 
 bool DISK::make_track(int trk, int side)
 {
+       if(media_type == MEDIA_TYPE_2D && drive_type == DRIVE_TYPE_2DD) {
+               if(trk >= 0) {
+                       if(trk & 1) {
+                               return false; // unformat
+                       }
+                       trk >>= 1;
+               }
+       } else if(media_type == MEDIA_TYPE_2DD && drive_type == DRIVE_TYPE_2D) {
+               if(trk >= 0) trk <<= 1;
+       }
+       return make_track_tmp(trk, side);
+}
+
+bool DISK::make_track_tmp(int trk, int side)
+{
        int track_size = get_track_size();
        
-       if(!get_track(trk, side)) {
+       if(!get_track_tmp(trk, side)) {
                // create a dummy track
                for(int i = 0; i < track_size; i++) {
                        track[i] = rand();
@@ -772,7 +1107,7 @@ bool DISK::make_track(int trk, int side)
        int sync_size  = track_mfm ? 12 : 6;
        int am_size = track_mfm ? 3 : 0;
        int gap2_size = track_mfm ? 22 : 11;
-       uint8 gap_data = track_mfm ? 0x4e : 0xff;
+       uint8_t gap_data = track_mfm ? 0x4e : 0xff;
        
        // preamble
        memset(track, gap_data, track_size);
@@ -789,10 +1124,10 @@ bool DISK::make_track(int trk, int side)
        track[q++] = 0xfc;
        
        // sectors
-       uint8 *t = sector;
+       uint8_t *t = sector;
        
        for(int i = 0; i < sector_num.sd; i++) {
-               pair data_size;
+               pair_t data_size;
                data_size.read_2bytes_le_from(t + 14);
                int p = sync_position[i];
                
@@ -801,20 +1136,22 @@ bool DISK::make_track(int trk, int side)
                        if(p < track_size) track[p++] = 0x00;
                }
                // am1
+               uint16_t crc = 0xffff;
                for(int j = 0; j < am_size; j++) {
                        if(p < track_size) track[p++] = 0xa1;
+                       crc = (uint16_t)((crc << 8) ^ crc_table[(uint8_t)(crc >> 8) ^ 0xa1]);
                }
                if(p < track_size) track[p++] = 0xfe;
+               crc = (uint16_t)((crc << 8) ^ crc_table[(uint8_t)(crc >> 8) ^ 0xfe]);
                // id
                if(p < track_size) track[p++] = t[0];
                if(p < track_size) track[p++] = t[1];
                if(p < track_size) track[p++] = t[2];
                if(p < track_size) track[p++] = t[3];
-               uint16 crc = 0;
-               crc = (uint16)((crc << 8) ^ crc_table[(uint8)(crc >> 8) ^ t[0]]);
-               crc = (uint16)((crc << 8) ^ crc_table[(uint8)(crc >> 8) ^ t[1]]);
-               crc = (uint16)((crc << 8) ^ crc_table[(uint8)(crc >> 8) ^ t[2]]);
-               crc = (uint16)((crc << 8) ^ crc_table[(uint8)(crc >> 8) ^ t[3]]);
+               crc = (uint16_t)((crc << 8) ^ crc_table[(uint8_t)(crc >> 8) ^ t[0]]);
+               crc = (uint16_t)((crc << 8) ^ crc_table[(uint8_t)(crc >> 8) ^ t[1]]);
+               crc = (uint16_t)((crc << 8) ^ crc_table[(uint8_t)(crc >> 8) ^ t[2]]);
+               crc = (uint16_t)((crc << 8) ^ crc_table[(uint8_t)(crc >> 8) ^ t[3]]);
                if(p < track_size) track[p++] = (crc >> 8) & 0xff;
                if(p < track_size) track[p++] = (crc >> 0) & 0xff;
                // gap2
@@ -828,15 +1165,18 @@ bool DISK::make_track(int trk, int side)
                                if(p < track_size) track[p++] = 0x00;
                        }
                        // am2
+                       crc = 0xffff;
                        for(int j = 0; j < am_size; j++) {
                                if(p < track_size) track[p++] = 0xa1;
+                               crc = (uint16_t)((crc << 8) ^ crc_table[(uint8_t)(crc >> 8) ^ 0xa1]);
                        }
-                       if(p < track_size) track[p++] = (t[7] != 0) ? 0xf8 : 0xfb;
+                       uint8_t am2 = (t[7] != 0) ? 0xf8 : 0xfb;
+                       if(p < track_size) track[p++] = am2;
+                       crc = (uint16_t)((crc << 8) ^ crc_table[(uint8_t)(crc >> 8) ^ am2]);
                        // data
-                       crc = 0;
                        for(int j = 0; j < data_size.sd; j++) {
                                if(p < track_size) track[p++] = t[0x10 + j];
-                               crc = (uint16)((crc << 8) ^ crc_table[(uint8)(crc >> 8) ^ t[0x10 + j]]);
+                               crc = (uint16_t)((crc << 8) ^ crc_table[(uint8_t)(crc >> 8) ^ t[0x10 + j]]);
                        }
                        if(p < track_size) track[p++] = (crc >> 8) & 0xff;
                        if(p < track_size) track[p++] = (crc >> 0) & 0xff;
@@ -848,6 +1188,21 @@ bool DISK::make_track(int trk, int side)
 
 bool DISK::get_sector(int trk, int side, int index)
 {
+       if(media_type == MEDIA_TYPE_2D && drive_type == DRIVE_TYPE_2DD) {
+               if(trk >= 0) {
+                       if(trk & 1) {
+                               return false; // unformat
+                       }
+                       trk >>= 1;
+               }
+       } else if(media_type == MEDIA_TYPE_2DD && drive_type == DRIVE_TYPE_2D) {
+               if(trk >= 0) trk <<= 1;
+       }
+       return get_sector_tmp(trk, side, index);
+}
+
+bool DISK::get_sector_tmp(int trk, int side, int index)
+{
        sector_size.sd = sector_num.sd = 0;
        sector = NULL;
        
@@ -855,7 +1210,7 @@ bool DISK::get_sector(int trk, int side, int index)
        if(!(inserted && check_media_type())) {
                return false;
        }
-
+       
        // search track
        if(trk == -1 && side == -1) {
                trk = cur_track;
@@ -865,7 +1220,7 @@ bool DISK::get_sector(int trk, int side, int index)
        if(!(0 <= trkside && trkside < 164)) {
                return false;
        }
-       pair offset;
+       pair_t offset;
        offset.read_4bytes_le_from(buffer + 0x20 + trkside * 4);
        
        if(!IS_VALID_TRACK(offset.d)) {
@@ -873,7 +1228,7 @@ bool DISK::get_sector(int trk, int side, int index)
        }
        
        // track found
-       uint8* t = buffer + offset.d;
+       uint8_t* t = buffer + offset.d;
        sector_num.read_2bytes_le_from(t + 4);
        
        if(index >= sector_num.sd) {
@@ -882,7 +1237,7 @@ bool DISK::get_sector(int trk, int side, int index)
        
        // skip sector
        for(int i = 0; i < index; i++) {
-               pair data_size;
+               pair_t data_size;
                data_size.read_2bytes_le_from(t + 14);
                t += data_size.sd + 0x10;
        }
@@ -890,31 +1245,35 @@ bool DISK::get_sector(int trk, int side, int index)
        return true;
 }
 
-void DISK::set_sector_info(uint8 *t)
+void DISK::set_sector_info(uint8_t *t)
 {
        // header info
+       int am_size = track_mfm ? 3 : 0;
+       uint16_t crc = 0xffff;
+       for(int i = 0; i < am_size; i++) {
+               crc = (uint16_t)((crc << 8) ^ crc_table[(uint8_t)(crc >> 8) ^ 0xa1]);
+       }
+       crc = (uint16_t)((crc << 8) ^ crc_table[(uint8_t)(crc >> 8) ^ 0xfe]);
        id[0] = t[0];
        id[1] = t[1];
        id[2] = t[2];
        id[3] = t[3];
-       uint16 crc = 0;
-       crc = (uint16)((crc << 8) ^ crc_table[(uint8)(crc >> 8) ^ t[0]]);
-       crc = (uint16)((crc << 8) ^ crc_table[(uint8)(crc >> 8) ^ t[1]]);
-       crc = (uint16)((crc << 8) ^ crc_table[(uint8)(crc >> 8) ^ t[2]]);
-       crc = (uint16)((crc << 8) ^ crc_table[(uint8)(crc >> 8) ^ t[3]]);
+       crc = (uint16_t)((crc << 8) ^ crc_table[(uint8_t)(crc >> 8) ^ t[0]]);
+       crc = (uint16_t)((crc << 8) ^ crc_table[(uint8_t)(crc >> 8) ^ t[1]]);
+       crc = (uint16_t)((crc << 8) ^ crc_table[(uint8_t)(crc >> 8) ^ t[2]]);
+       crc = (uint16_t)((crc << 8) ^ crc_table[(uint8_t)(crc >> 8) ^ t[3]]);
        id[4] = (crc >> 8) & 0xff;
        id[5] = (crc >> 0) & 0xff;
-       // http://www,gnu-darwin.or.jp/www001/src/ports/emulators/quasi88/work/quasi88-0.6.3/document/FORMAT.TXT
+       // http://www.gnu-darwin.or.jp/www001/src/ports/emulators/quasi88/work/quasi88-0.6.3/document/FORMAT.TXT
        // t[6]: 0x00 = double-density, 0x40 = single-density
        // t[7]: 0x00 = normal, 0x10 = deleted mark
        // t[8]: 0x00 = valid, 0x10 = valid (deleted data), 0xa0 = id crc error, 0xb0 = data crc error, 0xe0 = address mark missing, 0xf0 = data mark missing
        density = t[6];
        deleted = (t[7] != 0);
-   
 //     if(ignore_crc()) {
-//             crc_error = false;
+//             addr_crc_error = false;
+//             data_crc_error = false;
 //     } else {
-//             crc_error = (((t[8] & 0xf0) != 0x00) && ((t[8] & 0xf0) != 0x10));
                addr_crc_error = ((t[8] & 0xf0) == 0xa0);
                data_crc_error = ((t[8] & 0xf0) == 0xb0);
 //     }
@@ -925,11 +1284,11 @@ void DISK::set_sector_info(uint8 *t)
 void DISK::set_deleted(bool value)
 {
        if(sector != NULL) {
-               uint8 *t = sector - 0x10;
+               uint8_t *t = sector - 0x10;
                t[7] = value ? 0x10 : 0;
                if((t[8] & 0xf0) == 0x00 || (t[8] & 0xf0) == 0x10) {
                        t[8] = (t[8] & 0x0f) | t[7];
-               }
+               }
        }
        deleted = value;
 }
@@ -937,7 +1296,7 @@ void DISK::set_deleted(bool value)
 void DISK::set_data_crc_error(bool value)
 {
        if(sector != NULL) {
-               uint8 *t = sector - 0x10;
+               uint8_t *t = sector - 0x10;
                t[8] = (t[8] & 0x0f) | (value ? 0xb0 : t[7]);
        }
        data_crc_error = value;
@@ -946,18 +1305,31 @@ void DISK::set_data_crc_error(bool value)
 void DISK::set_data_mark_missing()
 {
        if(sector != NULL) {
-               uint8 *t = sector - 0x10;
-               //t[8] = (t[8] & 0x0f) | (value ? 0xb0 : t[7]); // FIXME: always data crc error ?
+               uint8_t *t = sector - 0x10;
                t[8] = (t[8] & 0x0f) | 0xf0;
                t[14] = t[15] = 0;
-
        }
-       //addr_crc_error = value;
+//     addr_crc_error = false;
        data_crc_error = false;
 }
 
 bool DISK::format_track(int trk, int side)
 {
+       if(media_type == MEDIA_TYPE_2D && drive_type == DRIVE_TYPE_2DD) {
+               if(trk >= 0) {
+                       if(trk & 1) {
+                               return false; // unformat
+                       }
+                       trk >>= 1;
+               }
+       } else if(media_type == MEDIA_TYPE_2DD && drive_type == DRIVE_TYPE_2D) {
+               if(trk >= 0) trk <<= 1;
+       }
+       return format_track_tmp(trk, side);
+}
+
+bool DISK::format_track_tmp(int trk, int side)
+{
        // disk not inserted or invalid media type
        if(!(inserted && check_media_type())) {
                return false;
@@ -975,7 +1347,7 @@ bool DISK::format_track(int trk, int side)
                trim_required = false;
        }
        memset(buffer + DISK_BUFFER_SIZE, 0, sizeof(buffer) - DISK_BUFFER_SIZE);
-       pair offset;
+       pair_t offset;
        offset.d = DISK_BUFFER_SIZE;
        offset.write_4bytes_le_to(buffer + 0x20 + trkside * 4);
        
@@ -986,15 +1358,15 @@ bool DISK::format_track(int trk, int side)
        return true;
 }
 
-void DISK::insert_sector(uint8 c, uint8 h, uint8 r, uint8 n, bool deleted, bool data_crc_error, uint8 fill_data, int length)
+void DISK::insert_sector(uint8_t c, uint8_t h, uint8_t r, uint8_t n, bool deleted, bool data_crc_error, uint8_t fill_data, int length)
 {
-       uint8* t = buffer + DISK_BUFFER_SIZE;
+       uint8_t* t = buffer + DISK_BUFFER_SIZE;
        
        sector_num.sd++;
        for(int i = 0; i < (sector_num.sd - 1); i++) {
                t[4] = sector_num.b.l;
                t[5] = sector_num.b.h;
-               pair data_size;
+               pair_t data_size;
                data_size.read_2bytes_le_from(t + 14);
                t += data_size.sd + 0x10;
        }
@@ -1025,20 +1397,27 @@ void DISK::sync_buffer()
 void DISK::trim_buffer()
 {
        int max_tracks = 164;
-       uint32 dest_offset = 0x2b0;
+       int track_limit = 164;
+       uint32_t dest_offset = 0x2b0;
        
        // copy header
        memset(tmp_buffer, 0, sizeof(tmp_buffer));
        memcpy(tmp_buffer, buffer, 0x20);
        
        // check max tracks
+       if(media_type == MEDIA_TYPE_2D) {
+               track_limit = 84;
+       }
        for(int trkside = 0; trkside < 164; trkside++) {
-               pair src_trk_offset;
+               pair_t src_trk_offset;
                src_trk_offset.read_4bytes_le_from(buffer + 0x20 + trkside * 4);
                if(src_trk_offset.d != 0) {
 #if 1
                        if(src_trk_offset.d < 0x2b0) {
                                max_tracks = (src_trk_offset.d - 0x20) >> 2;
+                               if(max_tracks > track_limit) {
+                                       max_tracks = track_limit;
+                               }
                        }
 #else
                        if(src_trk_offset.d != 0x2b0) {
@@ -1054,15 +1433,15 @@ void DISK::trim_buffer()
        
        // copy tracks
        for(int trkside = 0; trkside < max_tracks; trkside++) {
-               pair src_trk_offset;
+               pair_t src_trk_offset;
                src_trk_offset.read_4bytes_le_from(buffer + 0x20 + trkside * 4);
                
-               pair dest_trk_offset;
+               pair_t dest_trk_offset;
                dest_trk_offset.d = 0;
                
                if(IS_VALID_TRACK(src_trk_offset.d)) {
-                       uint8* t = buffer + src_trk_offset.d;
-                       pair sector_num, data_size;
+                       uint8_t* t = buffer + src_trk_offset.d;
+                       pair_t sector_num, data_size;
                        sector_num.read_2bytes_le_from(t + 4);
                        if(sector_num.sd != 0) {
                                dest_trk_offset.d = dest_offset;
@@ -1082,8 +1461,18 @@ void DISK::trim_buffer()
        file_size.write_4bytes_le_to(tmp_buffer + 0x1c);
        
        memset(buffer, 0, sizeof(buffer));
-       memcpy(buffer, tmp_buffer, min(sizeof(buffer), file_size.d));
-       //memcpy(buffer, tmp_buffer, (file_size.d > sizeof(buffer)) ? sizeof(buffer) : file_size.d);
+       memcpy(buffer, tmp_buffer, min((unsigned int)sizeof(buffer), file_size.d));
+}
+
+int DISK::get_max_tracks()
+{
+       if(drive_type != DRIVE_TYPE_UNK) {
+               return (drive_type != DRIVE_TYPE_2D) ? 84 : 42;
+       } else if(inserted) {
+               return (media_type != MEDIA_TYPE_2D) ? 84 : 42;
+       } else {
+               return 84; // 2DD or 2HD
+       }
 }
 
 int DISK::get_rpm()
@@ -1099,19 +1488,11 @@ int DISK::get_rpm()
 
 int DISK::get_track_size()
 {
-       if(inserted) {
-#if defined(_FM7) || defined(_FM8) || defined(_FM77_VARIANTS) || defined(_FM77AV_VARIANTS)
-               if(is_special_disk == SPECIAL_DISK_FM7_DEATHFORCE) {
-                       return media_type == MEDIA_TYPE_144 ? 12500 : media_type == MEDIA_TYPE_2HD ? 10410 : drive_mfm ? 6300 : 3100;
-               }
-#endif
+       if(track_size != 0) {
+               return track_size;
+       } else if(inserted) {
                return media_type == MEDIA_TYPE_144 ? 12500 : media_type == MEDIA_TYPE_2HD ? 10410 : track_mfm ? 6250 : 3100;
        } else {
-#if defined(_FM7) || defined(_FM8) || defined(_FM77_VARIANTS) || defined(_FM77AV_VARIANTS)
-               if(is_special_disk == SPECIAL_DISK_FM7_DEATHFORCE) {
-                       return media_type == MEDIA_TYPE_144 ? 12500 : media_type == MEDIA_TYPE_2HD ? 10410 : drive_mfm ? 6300 : 3100;
-               }
-#endif
                return drive_type == DRIVE_TYPE_144 ? 12500 : drive_type == DRIVE_TYPE_2HD ? 10410 : drive_mfm ? 6250 : 3100;
        }
 }
@@ -1123,11 +1504,6 @@ double DISK::get_usec_per_track()
 
 double DISK::get_usec_per_bytes(int bytes)
 {
-#if defined(_FM77AV_VARIANTS)
-       if(is_special_disk == SPECIAL_DISK_FM77AV_PSYOBLADE) {
-               return 1000000.0 / (get_track_size() * (get_rpm() / 60.0) * 2.2) * bytes;
-       }
-#endif 
        return 1000000.0 / (get_track_size() * (get_rpm() / 60.0)) * bytes;
 }
 
@@ -1140,12 +1516,7 @@ bool DISK::check_media_type()
 {
        switch(drive_type) {
        case DRIVE_TYPE_2D:
-#if defined(_FM77AV40) || defined(_FM77AV40EX) || defined(_FM77AV40SX) || \
-       defined(_FM77AV20) || defined(_FM77AV20EX) || defined(_FM77AV20SX)
-               return (media_type == MEDIA_TYPE_2D || media_type == MEDIA_TYPE_2DD);
-#else          
-               return (media_type == MEDIA_TYPE_2D);
-#endif         
+                       return (media_type == MEDIA_TYPE_2D || media_type == MEDIA_TYPE_2DD);
        case DRIVE_TYPE_2DD:
                return (media_type == MEDIA_TYPE_2D || media_type == MEDIA_TYPE_2DD);
        case DRIVE_TYPE_2HD:
@@ -1170,19 +1541,19 @@ bool DISK::check_media_type()
 
 typedef struct {
        char title[17];
-       uint8 rsrv[9];
-       uint8 protect;
-       uint8 type;
-       uint32 size;
-       uint32 trkptr[164];
+       uint8_t rsrv[9];
+       uint8_t protect;
+       uint8_t type;
+       uint32_t size;
+       uint32_t trkptr[164];
 } d88_hdr_t;
 
 typedef struct {
-       uint8 c, h, r, n;
-       uint16 nsec;
-       uint8 dens, del, stat;
-       uint8 rsrv[5];
-       uint16 size;
+       uint8_t c, h, r, n;
+       uint16_t nsec;
+       uint8_t dens, del, stat;
+       uint8_t rsrv[5];
+       uint16_t size;
 } d88_sct_t;
 
 // teledisk image decoder
@@ -1205,18 +1576,18 @@ typedef struct {
 #define ROOT_POSITION          (TABLE_SIZE - 1)
 #define MAX_FREQ               0x8000
 
-static uint8 td_text_buf[STRING_BUFFER_SIZE + LOOKAHEAD_BUFFER_SIZE - 1];
-static uint16 td_ptr;
-static uint16 td_bufcnt, td_bufndx, td_bufpos;
-static uint16 td_ibufcnt, td_ibufndx;
-static uint8 td_inbuf[512];
-static uint16 td_freq[TABLE_SIZE + 1];
+static uint8_t td_text_buf[STRING_BUFFER_SIZE + LOOKAHEAD_BUFFER_SIZE - 1];
+static uint16_t td_ptr;
+static uint16_t td_bufcnt, td_bufndx, td_bufpos;
+static uint16_t td_ibufcnt, td_ibufndx;
+static uint8_t td_inbuf[512];
+static uint16_t td_freq[TABLE_SIZE + 1];
 static short td_prnt[TABLE_SIZE + N_CHAR];
 static short td_son[TABLE_SIZE];
-static uint16 td_getbuf;
-static uint8 td_getlen;
+static uint16_t td_getbuf;
+static uint8_t td_getlen;
 
-static const uint8 td_d_code[256] = {
+static const uint8_t td_d_code[256] = {
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
        0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
@@ -1234,7 +1605,7 @@ static const uint8 td_d_code[256] = {
        0x28, 0x28, 0x29, 0x29, 0x2a, 0x2a, 0x2b, 0x2b, 0x2c, 0x2c, 0x2d, 0x2d, 0x2e, 0x2e, 0x2f, 0x2f,
        0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f
 };
-static const uint8 td_d_len[256] = {
+static const uint8_t td_d_len[256] = {
        0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
        0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
        0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
@@ -1293,7 +1664,7 @@ static int td_get_byte(FILEIO* fio)
        if(td_next_word(fio) != 0) {
                return -1;
        }
-       uint16 i = td_getbuf;
+       uint16_t i = td_getbuf;
        td_getbuf <<= 8;
        td_getlen -= 8;
        i >>= 8;
@@ -1322,7 +1693,7 @@ static void td_start_huff()
 static void td_reconst()
 {
        short i, j = 0, k;
-       uint16 f, l;
+       uint16_t f, l;
        for(i = 0; i < TABLE_SIZE; i++) {
                if(td_son[i] >= TABLE_SIZE) {
                        td_freq[j] = (td_freq[i] + 1) / 2;
@@ -1385,7 +1756,7 @@ static void td_update(int c)
 static short td_decode_char(FILEIO* fio)
 {
        int ret;
-       uint16 c = td_son[ROOT_POSITION];
+       uint16_t c = td_son[ROOT_POSITION];
        while(c < TABLE_SIZE) {
                if((ret = td_get_bit(fio)) < 0) {
                        return -1;
@@ -1401,12 +1772,12 @@ static short td_decode_char(FILEIO* fio)
 static short td_decode_position(FILEIO* fio)
 {
        short bit;
-       uint16 i, j, c;
+       uint16_t i, j, c;
        if((bit = td_get_byte(fio)) < 0) {
                return -1;
        }
-       i = (uint16)bit;
-       c = (uint16)td_d_code[i] << 6;
+       i = (uint16_t)bit;
+       c = (uint16_t)td_d_code[i] << 6;
        j = td_d_len[i] - 2;
        while(j--) {
                if((bit = td_get_bit(fio)) < 0) {
@@ -1414,7 +1785,7 @@ static short td_decode_position(FILEIO* fio)
                }
                i = (i << 1) + bit;
        }
-       return (c | i & 0x3f);
+       return (c | (i & 0x3f));
 }
 
 static void td_init_decode()
@@ -1428,7 +1799,7 @@ static void td_init_decode()
        td_ptr = STRING_BUFFER_SIZE - LOOKAHEAD_BUFFER_SIZE;
 }
 
-static int td_decode(FILEIO* fio, uint8 *buf, int len)
+static int td_decode(FILEIO* fio, uint8_t *buf, int len)
 {
        short c, pos;
        int  count;
@@ -1438,8 +1809,8 @@ static int td_decode(FILEIO* fio, uint8 *buf, int len)
                                return count;
                        }
                        if(c < 256) {
-                               *(buf++) = (uint8)c;
-                               td_text_buf[td_ptr++] = (uint8)c;
+                               *(buf++) = (uint8_t)c;
+                               td_text_buf[td_ptr++] = (uint8_t)c;
                                td_ptr &= (STRING_BUFFER_SIZE - 1);
                                count++;
                        } else {
@@ -1453,9 +1824,9 @@ static int td_decode(FILEIO* fio, uint8 *buf, int len)
                } else {
                        while(td_bufndx < td_bufcnt && count < len) {
                                c = td_text_buf[(td_bufpos + td_bufndx) & (STRING_BUFFER_SIZE - 1)];
-                               *(buf++) = (uint8)c;
+                               *(buf++) = (uint8_t)c;
                                td_bufndx++;
-                               td_text_buf[td_ptr++] = (uint8)c;
+                               td_text_buf[td_ptr++] = (uint8_t)c;
                                td_ptr &= (STRING_BUFFER_SIZE - 1);
                                count++;
                        }
@@ -1469,31 +1840,31 @@ static int td_decode(FILEIO* fio, uint8 *buf, int len)
 
 typedef struct {
        char sig[3];
-       uint8 unknown;
-       uint8 ver;
-       uint8 dens;
-       uint8 type;
-       uint8 flag;
-       uint8 dos;
-       uint8 sides;
-       uint16 crc;
+       uint8_t unknown;
+       uint8_t ver;
+       uint8_t dens;
+       uint8_t type;
+       uint8_t flag;
+       uint8_t dos;
+       uint8_t sides;
+       uint16_t crc;
 } td_hdr_t;
 
 typedef struct {
-       uint16 crc;
-       uint16 len;
-       uint8 ymd[3];
-       uint8 hms[3];
+       uint16_t crc;
+       uint16_t len;
+       uint8_t ymd[3];
+       uint8_t hms[3];
 } td_cmt_t;
 
 typedef struct {
-       uint8 nsec, trk, head;
-       uint8 crc;
+       uint8_t nsec, trk, head;
+       uint8_t crc;
 } td_trk_t;
 
 typedef struct {
-       uint8 c, h, r, n;
-       uint8 ctrl, crc;
+       uint8_t c, h, r, n;
+       uint8_t ctrl, crc;
 } td_sct_t;
 
 bool DISK::teledisk_to_d88(FILEIO *fio)
@@ -1502,7 +1873,7 @@ bool DISK::teledisk_to_d88(FILEIO *fio)
        td_cmt_t cmt;
        td_trk_t trk;
        td_sct_t sct;
-       uint8 obuf[512];
+       uint8_t obuf[512];
        bool temporary = false;
        
        // check teledisk header
@@ -1512,7 +1883,7 @@ bool DISK::teledisk_to_d88(FILEIO *fio)
                // this image is compressed
                // decompress to the temporary file
                FILEIO* fio_tmp = new FILEIO();
-               if(!fio_tmp->Fopen(bios_path(_T("teledisk.$$$")), FILEIO_WRITE_BINARY)) {
+               if(!fio_tmp->Fopen(local_path(_T("teledisk.$$$")), FILEIO_WRITE_BINARY)) {
                        delete fio_tmp;
                        return false;
                }
@@ -1549,8 +1920,7 @@ bool DISK::teledisk_to_d88(FILEIO *fio)
        d88_sct_t d88_sct;
        
        memset(&d88_hdr, 0, sizeof(d88_hdr_t));
-       //_strcpy_s(d88_hdr.title, sizeof(d88_hdr.title), "TELEDISK");
-       strncpy(d88_hdr.title, "TELEDISK", sizeof(d88_hdr.title));
+       my_strcpy_s(d88_hdr.title, sizeof(d88_hdr.title), "TELEDISK");
        d88_hdr.protect = 0; // non-protected
        
        file_size.d = 0;
@@ -1567,7 +1937,7 @@ bool DISK::teledisk_to_d88(FILEIO *fio)
                
                // read sectors in this track
                for(int i = 0; i < trk.nsec; i++) {
-                       uint8 buf[2048], dst[2048];
+                       uint8_t buf[2048], dst[2048];
                        memset(buf, 0, sizeof(buf));
                        memset(dst, 0, sizeof(dst));
                        
@@ -1601,7 +1971,7 @@ bool DISK::teledisk_to_d88(FILEIO *fio)
                                if(flag == 0) {
                                        memcpy(dst, buf, len);
                                } else if(flag == 1) {
-                                       pair len2;
+                                       pair_t len2;
                                        len2.read_2bytes_le_from(buf);
                                        while(len2.sd--) {
                                                dst[d++] = buf[2];
@@ -1616,7 +1986,7 @@ bool DISK::teledisk_to_d88(FILEIO *fio)
                                                                dst[d++] = buf[s++];
                                                        }
                                                } else if(type < 5) {
-                                                       uint8 pat[256];
+                                                       uint8_t pat[256];
                                                        int n = 2;
                                                        while(type-- > 1) {
                                                                n *= 2;
@@ -1646,7 +2016,7 @@ bool DISK::teledisk_to_d88(FILEIO *fio)
                // read next track
                fio->Fread(&trk, sizeof(td_trk_t), 1);
        }
-       d88_hdr.type = ((hdr.dens & 3) == 2) ? MEDIA_TYPE_2HD : ((trkcnt >> 1) > 45) ? MEDIA_TYPE_2DD : MEDIA_TYPE_2D;
+       d88_hdr.type = ((hdr.dens & 3) == 2) ? MEDIA_TYPE_2HD : ((trkcnt >> 1) > 60) ? MEDIA_TYPE_2DD : MEDIA_TYPE_2D;
        d88_hdr.size = trkptr;
        memcpy(buffer, &d88_hdr, sizeof(d88_hdr_t));
        
@@ -1660,16 +2030,14 @@ bool DISK::teledisk_to_d88(FILEIO *fio)
 
 bool DISK::imagedisk_to_d88(FILEIO *fio)
 {
-       //d88_hdr_t d88_hdr;
-       //d88_sct_t d88_sct;
        int size = fio->FileLength();
        fio->Fseek(0, FILEIO_SEEK_SET);
        fio->Fread(tmp_buffer, size, 1);
-       
+       
        if(memcmp(tmp_buffer, "IMD ", 4) != 0) {
                return false;
        }
-       
+       
        int pos;
        for(pos = 0; pos < size && tmp_buffer[pos] != 0x1a; pos++);
        pos++;
@@ -1683,8 +2051,7 @@ bool DISK::imagedisk_to_d88(FILEIO *fio)
        d88_sct_t d88_sct;
        
        memset(&d88_hdr, 0, sizeof(d88_hdr_t));
-       strncpy(d88_hdr.title, "IMAGEDISK", sizeof(d88_hdr.title));
-       //_strcpy_s(d88_hdr.title, sizeof(d88_hdr.title), "IMAGEDISK");
+       my_strcpy_s(d88_hdr.title, sizeof(d88_hdr.title), "IMAGEDISK");
        d88_hdr.protect = 0; // non-protected
        
        file_size.d = 0;
@@ -1693,19 +2060,15 @@ bool DISK::imagedisk_to_d88(FILEIO *fio)
        // create tracks
        int trkcnt = 0, trkptr = sizeof(d88_hdr_t);
        int img_mode = -1;
-       uint8 dst[8192];
-       
-       //int pos;
-       //for(pos = 0; pos < size && tmp_buffer[pos] != 0x1a; pos++);
-       //pos++;
+       uint8_t dst[8192];
        
        while(pos < size) {
                // check track header
-               uint8 mode = tmp_buffer[pos++];
-               uint8 track = tmp_buffer[pos++];
-               uint8 head = tmp_buffer[pos++];
-               uint8 sector_count = tmp_buffer[pos++];
-               uint8 ssize = tmp_buffer[pos++];
+               uint8_t mode = tmp_buffer[pos++];
+               uint8_t track = tmp_buffer[pos++];
+               uint8_t head = tmp_buffer[pos++];
+               uint8_t sector_count = tmp_buffer[pos++];
+               uint8_t ssize = tmp_buffer[pos++];
                
                if(sector_count == 0) {
                        continue;
@@ -1713,15 +2076,15 @@ bool DISK::imagedisk_to_d88(FILEIO *fio)
                if(ssize == 0xff) {
                        return false;
                }
-               uint32 actual_size = ssize < 7 ? 128 << ssize : 8192;
+               uint32_t actual_size = ssize < 7 ? 128 << ssize : 8192;
                
                // setup sector id
-               const uint8 *snum = &tmp_buffer[pos];
+               const uint8_t *snum = &tmp_buffer[pos];
                pos += sector_count;
-               const uint8 *tnum = head & 0x80 ? &tmp_buffer[pos] : NULL;
+               const uint8_t *tnum = head & 0x80 ? &tmp_buffer[pos] : NULL;
                if(tnum)
                        pos += sector_count;
-               const uint8 *hnum = head & 0x40 ? &tmp_buffer[pos] : NULL;
+               const uint8_t *hnum = head & 0x40 ? &tmp_buffer[pos] : NULL;
                if(hnum)
                        pos += sector_count;
                head &= 0x3f;
@@ -1741,7 +2104,7 @@ bool DISK::imagedisk_to_d88(FILEIO *fio)
                // read sectors in this track
                for(int i = 0; i < sector_count; i++) {
                        // create d88 sector header
-                       uint8 stype = tmp_buffer[pos++];
+                       uint8_t stype = tmp_buffer[pos++];
                        memset(&d88_sct, 0, sizeof(d88_sct_t));
                        d88_sct.c = tnum ? tnum[i] : track;
                        d88_sct.h = hnum ? hnum[i] : head;
@@ -1788,26 +2151,26 @@ bool DISK::imagedisk_to_d88(FILEIO *fio)
 
 #pragma pack(1)
 struct track_header {
-       uint8 headertag[13];
-       uint16 unused1;
-       uint8 unused1b;
-       uint8 track_number;
-       uint8 side_number;
-       uint8 datarate;
-       uint8 rec_mode;
-       uint8 sector_size_code;
-       uint8 number_of_sector;
-       uint8 gap3_length;
-       uint8 filler_byte;
+       uint8_t headertag[13];
+       uint16_t unused1;
+       uint8_t unused1b;
+       uint8_t track_number;
+       uint8_t side_number;
+       uint8_t datarate;
+       uint8_t rec_mode;
+       uint8_t sector_size_code;
+       uint8_t number_of_sector;
+       uint8_t gap3_length;
+       uint8_t filler_byte;
 };
 struct sector_header {
-       uint8 track;
-       uint8 side;
-       uint8 sector_id;
-       uint8 sector_size_code;
-       uint8 fdc_status_reg1;
-       uint8 fdc_status_reg2;
-       uint16 data_length;
+       uint8_t track;
+       uint8_t side;
+       uint8_t sector_id;
+       uint8_t sector_size_code;
+       uint8_t fdc_status_reg1;
+       uint8_t fdc_status_reg2;
+       uint16_t data_length;
 };
 #pragma pack()
 
@@ -1838,7 +2201,8 @@ bool DISK::cpdread_to_d88(FILEIO *fio)
        if(!extendformat) {
                int cnt = 0, tmp = 0x100;
                for(int i = 0; i < tracks * heads; i++) {
-                       if(track_offsets_error = (memcmp(tmp_buffer + tmp, "Track-Info", 10) != 0)) {
+                       track_offsets_error = (memcmp(tmp_buffer + tmp, "Track-Info", 10) != 0);
+                       if(track_offsets_error) {
                                break;
                        }
                        track_offsets[cnt] = tmp;
@@ -1850,7 +2214,8 @@ bool DISK::cpdread_to_d88(FILEIO *fio)
                for(int i = 0; i < tracks * heads; i++) {
                        int length = tmp_buffer[0x34 + i] << 8;
                        if(length != 0) {
-                               if(track_offsets_error = (memcmp(tmp_buffer + tmp, "Track-Info", 10) != 0)) {
+                               track_offsets_error = (memcmp(tmp_buffer + tmp, "Track-Info", 10) != 0);
+                               if(track_offsets_error) {
                                        break;
                                }
                                track_offsets[cnt] = tmp;
@@ -1868,7 +2233,8 @@ bool DISK::cpdread_to_d88(FILEIO *fio)
                for(int i = 0; i < tracks * heads; i++) {
                        bool found = false;
                        for(; tmp < image_size; tmp += 0x10) {
-                               if(found = (memcmp(tmp_buffer + tmp, "Track-Info", 10) == 0)) {
+                               found = (memcmp(tmp_buffer + tmp, "Track-Info", 10) == 0);
+                               if(found) {
                                        break;
                                }
                        }
@@ -1887,8 +2253,7 @@ bool DISK::cpdread_to_d88(FILEIO *fio)
        d88_sct_t d88_sct;
        
        memset(&d88_hdr, 0, sizeof(d88_hdr_t));
-       strncpy(d88_hdr.title, "CPDREAD", sizeof(d88_hdr.title));
-       //_strcpy_s(d88_hdr.title, sizeof(d88_hdr.title), "CPDREAD");
+       my_strcpy_s(d88_hdr.title, sizeof(d88_hdr.title), "CPDREAD");
        d88_hdr.protect = 0; // non-protected
        
        file_size.d = 0;
@@ -1952,6 +2317,196 @@ bool DISK::cpdread_to_d88(FILEIO *fio)
        return true;
 }
 
+// nfd r0/r1 image decoder
+
+bool DISK::nfdr0_to_d88(FILEIO *fio)
+{
+       // from NFD r0\8c`\8e®\83t\83@\83C\83\8b\8d\\91¢\8ed\97l 2001/01/22 LED
+       typedef struct {
+           BYTE  C;                            // C \81i0xFF\82Ì\8e\9e\83Z\83N\83^\96³\82µ\81j
+           BYTE  H;                            // H
+           BYTE  R;                            // R
+           BYTE  N;                            // N
+           BYTE  flMFM;                        // 0:FM / 1:MFM
+           BYTE  flDDAM;                       // 0:DAM / 1:DDAM
+           BYTE  byStatus;                     // READ DATA(FDDBIOS)\82Ì\8c\8b\89Ê
+           BYTE  byST0;                        // READ DATA(FDDBIOS)\82Ì\8c\8b\89Ê ST0
+           BYTE  byST1;                        // READ DATA(FDDBIOS)\82Ì\8c\8b\89Ê ST1
+           BYTE  byST2;                        // READ DATA(FDDBIOS)\82Ì\8c\8b\89Ê ST2
+           BYTE  byPDA;                        // FDDBIOS\82Å\8eg\97p\82·\82é\83A\83h\83\8c\83X
+           char Reserve1[5];                   // \97\\96ñ
+       }NFD_SECT_ID,*LP_NFD_SECT_ID;
+       
+       typedef struct {
+           char  szFileID[15];                 // \8e¯\95ÊID "T98FDDIMAGE.R0"
+           char  Reserve1[1];                  // \97\\96ñ
+           char  szComment[0x100];             // \83C\83\81\81[\83W\83R\83\81\83\93\83g(ASCIIz)
+           DWORD dwHeadSize;                   // \83w\83b\83_\95\94\82Ì\83T\83C\83Y
+           BYTE  flProtect;                    // 0\88È\8aO : \83\89\83C\83g\83v\83\8d\83e\83N\83g
+           BYTE  byHead;                       // \83w\83b\83h\90\94
+           char  Reserve2[10];                 // \97\\96ñ
+           NFD_SECT_ID si[163][26];            // \83Z\83N\83^ID(\8cã\8fq)
+           char  Reserve3[0x10];               // \97\\96ñ
+       }NFD_FILE_HEAD,*LP_NFD_FILE_HEAD;
+       
+       // check nfd header
+       NFD_FILE_HEAD head;
+       
+       fio->Fseek(0, FILEIO_SEEK_SET);
+       fio->Fread(&head, sizeof(head), 1);
+       
+       if(strncmp(head.szFileID, "T98FDDIMAGE.R0", 14) != 0) {
+               return false;
+       }
+       fio->Fseek(head.dwHeadSize, FILEIO_SEEK_SET);
+       
+       // create d88 header
+       d88_hdr_t d88_hdr;
+       d88_sct_t d88_sct;
+       
+       memset(&d88_hdr, 0, sizeof(d88_hdr_t));
+       my_strcpy_s(d88_hdr.title, sizeof(d88_hdr.title), "NFD R0");
+       d88_hdr.protect = head.flProtect;
+       
+       file_size.d = 0;
+       COPYBUFFER(&d88_hdr, sizeof(d88_hdr_t));
+       
+       // create tracks
+       int trkptr = sizeof(d88_hdr_t);
+       
+       for(int c = 0; c < 163; c++) {
+               int nsec = 0;
+               
+               for(int s = 0; s < 26; s++) {
+                       if(head.si[c][s].C != 0xff) {
+                               nsec++;
+                       }
+               }
+               if(nsec) {
+                       d88_hdr.trkptr[c] = trkptr;
+                       
+                       // read sectors in this track
+                       for(int s = 0; s < 26; s++) {
+                               if(head.si[c][s].C != 0xff) {
+                                       // create d88 sector header
+                                       memset(&d88_sct, 0, sizeof(d88_sct_t));
+                                       d88_sct.c = head.si[c][s].C;
+                                       d88_sct.h = head.si[c][s].H;
+                                       d88_sct.r = head.si[c][s].R;
+                                       d88_sct.n = head.si[c][s].N;
+                                       d88_sct.nsec = nsec;
+                                       d88_sct.dens = head.si[c][s].flMFM ? 0 : 0x40;
+                                       d88_sct.del = head.si[c][s].flDDAM ? 0x10 : 0;
+                                       if(head.si[c][s].byST1 & 0x20) {
+                                               if(head.si[c][s].byST2 & 0x20) {
+                                                       d88_sct.stat = 0xb0; // data crc error
+                                               } else {
+                                                       d88_sct.stat = 0xa0; // id crc error
+                                               }
+                                       } else if(head.si[c][s].byST1 & 0x01) {
+                                               d88_sct.stat = 0xe0; // address mark missing
+                                       } else if(head.si[c][s].byST2 & 0x01) {
+                                               d88_sct.stat = 0xf0; // data mark missing
+                                       } else {
+                                               d88_sct.stat = d88_sct.del;
+                                       }
+                                       d88_sct.size = secsize[d88_sct.n & 3];
+                                       
+                                       // create sector image
+                                       uint8_t dst[16384];
+                                       memset(dst, 0xe5, sizeof(dst));
+                                       fio->Fread(dst, d88_sct.size, 1);
+                                       
+                                       // copy to d88
+                                       COPYBUFFER(&d88_sct, sizeof(d88_sct_t));
+                                       COPYBUFFER(dst, d88_sct.size);
+                                       trkptr += sizeof(d88_sct_t) + d88_sct.size;
+                                       
+                                       if(head.si[c][s].byPDA == 0x10) {
+                                               d88_hdr.type = MEDIA_TYPE_2DD;
+                                       } else {
+                                               d88_hdr.type = MEDIA_TYPE_2HD;
+                                       }
+                               }
+                       }
+               }
+       }
+       d88_hdr.size = trkptr;
+       memcpy(buffer, &d88_hdr, sizeof(d88_hdr_t));
+       return true;
+}
+
+bool DISK::nfdr1_to_d88(FILEIO *fio)
+{
+       // from NFD r1\8c`\8e®\83t\83@\83C\83\8b\8d\\91¢\8ed\97l 2001/09/14 LED
+       typedef struct {
+//         char szFileID[sizeof(NFD_FILE_ID1)];        /* \8e¯\95ÊID "T98FDDIMAGE.R1"  */
+//         char Reserv1[0x10-sizeof(NFD_FILE_ID1)];    /* \97\\94õ                     */
+           char  szFileID[15];                         /* \8e¯\95ÊID "T98FDDIMAGE.R1"  */
+           char  Reserve1[1];                          /* \97\\96ñ                     */
+           char szComment[0x100];                      /* \83R\83\81\83\93\83g                 */
+           DWORD dwHeadSize;                           /* \83w\83b\83_\82Ì\83T\83C\83Y           */
+           BYTE flProtect;                             /* \83\89\83C\83g\83v\83\8d\83e\83N\83g0\88È\8aO    */
+           BYTE byHead;                                /* \83w\83b\83h\90\94 1-2             */
+           char Reserv2[0x10-4-1-1];                   /* \97\\94õ                     */
+           DWORD dwTrackHead[164];                     /* \83g\83\89\83b\83NID\88Ê\92u           */
+           DWORD dwAddInfo;                            /* \92Ç\89Á\8fî\95ñ\83w\83b\83_\82Ì\83A\83h\83\8c\83X */
+           char Reserv3[0x10-4];                       /* \97\\94õ                     */
+       }NFD_FILE_HEAD1,*LP_NFD_FILE_HEAD1;
+       
+       typedef struct {
+           WORD wSector;                               /* \83Z\83N\83^ID\90\94               */
+           WORD wDiag;                                 /* \93Á\8eê ID\90\94                */
+           char Reserv1[0x10-4];                       /* \97\\94õ                     */
+       }NFD_TRACK_ID1,*LP_NFD_TRACK_ID1;
+       
+       typedef struct {
+           BYTE    C;                                  /* C                        */
+           BYTE    H;                                  /* H                        */
+           BYTE    R;                                  /* R                        */
+           BYTE    N;                                  /* N                        */
+           BYTE    flMFM;                              /* MFM(1)/FM(0)             */
+           BYTE    flDDAM;                             /* DDAM(1)/DAM(0)           */
+           BYTE    byStatus;                           /* READ DATA RESULT         */
+           BYTE    bySTS0;                             /* ST0                      */
+           BYTE    bySTS1;                             /* ST1                      */
+           BYTE    bySTS2;                             /* ST2                      */
+           BYTE    byRetry;                            /* RetryData\82È\82µ(0)\82 \82è(1-) */
+           BYTE    byPDA;                              /* PDA                      */
+           char Reserv1[0x10-12];                      /* \97\\94õ                     */
+       }NFD_SECT_ID1,*LP_NFD_SECT_ID1;
+       
+       typedef struct {
+           BYTE    Cmd;                                /* Command                  */
+           BYTE    C;                                  /* C                        */
+           BYTE    H;                                  /* H                        */
+           BYTE    R;                                  /* R                        */
+           BYTE    N;                                  /* N                        */
+           BYTE    byStatus;                           /* READ DATA RESULT         */
+           BYTE    bySTS0;                             /* ST0                      */
+           BYTE    bySTS1;                             /* ST1                      */
+           BYTE    bySTS2;                             /* ST2                      */
+           BYTE    byRetry;                            /* RetryData\82È\82µ(0)\82 \82è(1-) */
+           DWORD   dwDataLen;
+           BYTE    byPDA;                              /* PDA                      */
+           char Reserv1[0x10-15];                      /* \97\\94õ                     */
+       }NFD_DIAG_ID1,*LP_NFD_DIAG_ID1;
+       
+       // check nfd header
+       NFD_FILE_HEAD1 head;
+       
+       fio->Fseek(0, FILEIO_SEEK_SET);
+       fio->Fread(&head, sizeof(head), 1);
+       
+       if(strncmp(head.szFileID, "T98FDDIMAGE.R1", 14) != 0) {
+               return false;
+       }
+       fio->Fseek(head.dwHeadSize, FILEIO_SEEK_SET);
+       
+       // not implemented yet :-(
+       return false;
+}
+
 // solid image decoder
 
 bool DISK::solid_to_d88(FILEIO *fio, int type, int ncyl, int nside, int nsec, int size, bool mfm)
@@ -1970,8 +2525,7 @@ bool DISK::solid_to_d88(FILEIO *fio, int type, int ncyl, int nside, int nsec, in
        d88_sct_t d88_sct;
        
        memset(&d88_hdr, 0, sizeof(d88_hdr_t));
-       strncpy(d88_hdr.title, "SOLID", sizeof(d88_hdr.title));
-       //_strcpy_s(d88_hdr.title, sizeof(d88_hdr.title), "SOLID");
+       my_strcpy_s(d88_hdr.title, sizeof(d88_hdr.title), "SOLID");
        d88_hdr.protect = 0; // non-protected
        
        file_size.d = 0;
@@ -2010,7 +2564,7 @@ bool DISK::solid_to_d88(FILEIO *fio, int type, int ncyl, int nside, int nsec, in
                                d88_sct.size = size;
                                
                                // create sector image
-                               uint8 dst[16384];
+                               uint8_t dst[16384];
                                memset(dst, 0xe5, sizeof(dst));
                                fio->Fread(dst, size, 1);
                                
@@ -2027,102 +2581,175 @@ bool DISK::solid_to_d88(FILEIO *fio, int type, int ncyl, int nside, int nsec, in
        return true;
 }
 
-#define STATE_VERSION  10
+#define STATE_VERSION  14
+
+#include "../../statesub.h"
+#include "../../qt/gui/csp_logger.h"
 
+void DISK::decl_state(void *p)
+{
+       CSP_Logger *p_logger = (CSP_Logger *)p;
+       state_entry = new csp_state_utils(STATE_VERSION, drive_num, _T("FLOPPY_DISK"), p_logger);
+
+       DECL_STATE_ENTRY_1D_ARRAY(buffer, sizeof(buffer));
+       DECL_STATE_ENTRY_STRING(orig_path, sizeof(orig_path) / sizeof(_TCHAR));
+       DECL_STATE_ENTRY_STRING(dest_path, sizeof(dest_path) / sizeof(_TCHAR));
+       
+       DECL_STATE_ENTRY_PAIR(file_size);
+       DECL_STATE_ENTRY_INT32(file_bank);
+       DECL_STATE_ENTRY_UINT32(orig_file_size);
+       DECL_STATE_ENTRY_UINT32(orig_crc32);
+       DECL_STATE_ENTRY_BOOL(trim_required);
+       DECL_STATE_ENTRY_BOOL(is_1dd_image);
+       DECL_STATE_ENTRY_BOOL(is_solid_image);
+       DECL_STATE_ENTRY_BOOL(is_fdi_image);
+       
+       DECL_STATE_ENTRY_1D_ARRAY(fdi_header, sizeof(fdi_header));
+       
+       DECL_STATE_ENTRY_INT32(solid_ncyl);
+       DECL_STATE_ENTRY_INT32(solid_nside);
+       DECL_STATE_ENTRY_INT32(solid_nsec);
+       DECL_STATE_ENTRY_INT32(solid_size);
+       DECL_STATE_ENTRY_BOOL(solid_mfm);
+       DECL_STATE_ENTRY_BOOL(inserted);
+       DECL_STATE_ENTRY_BOOL(ejected);
+       DECL_STATE_ENTRY_BOOL(write_protected);
+       DECL_STATE_ENTRY_BOOL(changed);
+       DECL_STATE_ENTRY_UINT8(media_type);
+       DECL_STATE_ENTRY_INT32(is_special_disk);
+       
+       DECL_STATE_ENTRY_1D_ARRAY(track, sizeof(track));
+                                                         
+       DECL_STATE_ENTRY_PAIR(sector_num);
+       DECL_STATE_ENTRY_BOOL(track_mfm);
+       DECL_STATE_ENTRY_BOOL(invalid_format);
+//     DECL_STATE_ENTRY_BOOL(no_skew);
+       DECL_STATE_ENTRY_1D_ARRAY(sync_position, sizeof(sync_position) / sizeof(int));
+       DECL_STATE_ENTRY_1D_ARRAY(am1_position, sizeof(am1_position) / sizeof(int));
+       DECL_STATE_ENTRY_1D_ARRAY(id_position, sizeof(id_position) / sizeof(int));
+       DECL_STATE_ENTRY_1D_ARRAY(data_position, sizeof(data_position) / sizeof(int));
+//     DECL_STATE_ENTRY_INT32(gap3_size);
+       DECL_STATE_ENTRY_INT32(_tmp_sector_offset);
+       DECL_STATE_ENTRY_PAIR(sector_size);
+       
+       DECL_STATE_ENTRY_1D_ARRAY(id, sizeof(id));
+       DECL_STATE_ENTRY_UINT8(density);
+       DECL_STATE_ENTRY_BOOL(deleted);
+       DECL_STATE_ENTRY_BOOL(addr_crc_error);
+       DECL_STATE_ENTRY_BOOL(data_crc_error);
+       DECL_STATE_ENTRY_UINT8(drive_type);
+       DECL_STATE_ENTRY_INT32(drive_rpm);
+       DECL_STATE_ENTRY_BOOL(drive_mfm);
+}
 void DISK::save_state(FILEIO* state_fio)
 {
-       state_fio->FputUint32(STATE_VERSION);
-       
-       state_fio->Fwrite(buffer, sizeof(buffer), 1);
-       state_fio->Fwrite(orig_path, sizeof(orig_path), 1);
-       state_fio->Fwrite(dest_path, sizeof(dest_path), 1);
-       state_fio->FputUint32(file_size.d);
-       state_fio->FputInt32(file_bank);
-       state_fio->FputUint32(crc32);
-       state_fio->FputBool(trim_required);
-       state_fio->FputBool(is_1dd_image);
-       state_fio->FputBool(is_solid_image);
-       state_fio->FputBool(is_fdi_image);
-       state_fio->Fwrite(fdi_header, sizeof(fdi_header), 1);
-       state_fio->FputInt32(solid_ncyl);
-       state_fio->FputInt32(solid_nside);
-       state_fio->FputInt32(solid_nsec);
-       state_fio->FputInt32(solid_size);
-       state_fio->FputBool(solid_mfm);
-       state_fio->FputBool(inserted);
-       state_fio->FputBool(ejected);
-       state_fio->FputBool(write_protected);
-       state_fio->FputBool(changed);
-       state_fio->FputUint8(media_type);
-       state_fio->FputInt32(is_special_disk);
-       state_fio->Fwrite(track, sizeof(track), 1);
-       state_fio->FputInt32(sector_num.sd);
-       state_fio->FputBool(track_mfm);
-       state_fio->FputBool(invalid_format);
+       _tmp_sector_offset = (sector != NULL) ? (int)(sector - buffer) : -1;
+       
+       if(state_entry != NULL) {
+               state_entry->save_state(state_fio);
+       }
+       //state_fio->FputUint32(STATE_VERSION);
+       
+       //state_fio->Fwrite(buffer, sizeof(buffer), 1);
+       //state_fio->Fwrite(orig_path, sizeof(orig_path), 1);
+       //state_fio->Fwrite(dest_path, sizeof(dest_path), 1);
+       //state_fio->FputUint32(file_size.d);
+       //state_fio->FputInt32(file_bank);
+       //state_fio->FputUint32(orig_file_size);
+       //state_fio->FputUint32(orig_crc32);
+       //state_fio->FputBool(trim_required);
+       //state_fio->FputBool(is_1dd_image);
+       //state_fio->FputBool(is_solid_image);
+       //state_fio->FputBool(is_fdi_image);
+       //state_fio->Fwrite(fdi_header, sizeof(fdi_header), 1);
+       //state_fio->FputInt32(solid_ncyl);
+       //state_fio->FputInt32(solid_nside);
+       //state_fio->FputInt32(solid_nsec);
+       //state_fio->FputInt32(solid_size);
+       //state_fio->FputBool(solid_mfm);
+       //state_fio->FputBool(inserted);
+       //state_fio->FputBool(ejected);
+       //state_fio->FputBool(write_protected);
+       //state_fio->FputBool(changed);
+       //state_fio->FputUint8(media_type);
+       //state_fio->FputInt32(is_special_disk);
+       //state_fio->Fwrite(track, sizeof(track), 1);
+       //state_fio->FputInt32(sector_num.sd);
+       //state_fio->FputBool(track_mfm);
+       //state_fio->FputBool(invalid_format);
 //     state_fio->FputBool(no_skew);
-       state_fio->Fwrite(sync_position, sizeof(sync_position), 1);
-       state_fio->Fwrite(am1_position, sizeof(am1_position), 1);
-       state_fio->Fwrite(id_position, sizeof(id_position), 1);
-       state_fio->Fwrite(data_position, sizeof(data_position), 1);
-       state_fio->FputInt32(sector ? (int)(sector - buffer) : -1);
-       state_fio->FputInt32(sector_size.sd);
-       state_fio->Fwrite(id, sizeof(id), 1);
-       state_fio->FputUint8(density);
-       state_fio->FputBool(deleted);
-       state_fio->FputBool(addr_crc_error);
-       state_fio->FputBool(data_crc_error);
-       state_fio->FputUint8(drive_type);
-       state_fio->FputInt32(drive_rpm);
-       state_fio->FputBool(drive_mfm);
+       //state_fio->Fwrite(sync_position, sizeof(sync_position), 1);
+       //state_fio->Fwrite(am1_position, sizeof(am1_position), 1);
+       //state_fio->Fwrite(id_position, sizeof(id_position), 1);
+       //state_fio->Fwrite(data_position, sizeof(data_position), 1);
+//     state_fio->FputInt32(gap3_size);
+       //state_fio->FputInt32(sector ? (int)(sector - buffer) : -1);
+       //state_fio->FputInt32(sector_size.sd);
+       //state_fio->Fwrite(id, sizeof(id), 1);
+       //state_fio->FputUint8(density);
+       //state_fio->FputBool(deleted);
+       //state_fio->FputBool(addr_crc_error);
+       //state_fio->FputBool(data_crc_error);
+       //state_fio->FputUint8(drive_type);
+       //state_fio->FputInt32(drive_rpm);
+       //state_fio->FputBool(drive_mfm);
 }
 
 bool DISK::load_state(FILEIO* state_fio)
 {
-       if(state_fio->FgetUint32() != STATE_VERSION) {
-               return false;
-       }
-       state_fio->Fread(buffer, sizeof(buffer), 1);
-       state_fio->Fread(orig_path, sizeof(orig_path), 1);
-       state_fio->Fread(dest_path, sizeof(dest_path), 1);
-       file_size.d = state_fio->FgetUint32();
-       file_bank = state_fio->FgetInt32();
-       crc32 = state_fio->FgetUint32();
-       trim_required = state_fio->FgetBool();
-       is_1dd_image = state_fio->FgetBool();
-       is_solid_image = state_fio->FgetBool();
-       is_fdi_image = state_fio->FgetBool();
-       state_fio->Fread(fdi_header, sizeof(fdi_header), 1);
-       solid_ncyl = state_fio->FgetInt32();
-       solid_nside = state_fio->FgetInt32();
-       solid_nsec = state_fio->FgetInt32();
-       solid_size = state_fio->FgetInt32();
-       solid_mfm = state_fio->FgetBool();
-       inserted = state_fio->FgetBool();
-       ejected = state_fio->FgetBool();
-       write_protected = state_fio->FgetBool();
-       changed = state_fio->FgetBool();
-       media_type = state_fio->FgetUint8();
-       is_special_disk = state_fio->FgetInt32();
-       state_fio->Fread(track, sizeof(track), 1);
-       sector_num.sd = state_fio->FgetInt32();
-       track_mfm = state_fio->FgetBool();
-       invalid_format = state_fio->FgetBool();
+       bool mb = false;
+       if(state_entry != NULL) {
+               mb = state_entry->load_state(state_fio);
+       }
+       if(!mb) return false;
+       //if(state_fio->FgetUint32() != STATE_VERSION) {
+       //      return false;
+       //}
+       //state_fio->Fread(buffer, sizeof(buffer), 1);
+       //state_fio->Fread(orig_path, sizeof(orig_path), 1);
+       //state_fio->Fread(dest_path, sizeof(dest_path), 1);
+       //file_size.d = state_fio->FgetUint32();
+       //file_bank = state_fio->FgetInt32();
+       //orig_file_size = state_fio->FgetUint32();
+       //orig_crc32 = state_fio->FgetUint32();
+       //trim_required = state_fio->FgetBool();
+       //is_1dd_image = state_fio->FgetBool();
+       //is_solid_image = state_fio->FgetBool();
+       //is_fdi_image = state_fio->FgetBool();
+       //state_fio->Fread(fdi_header, sizeof(fdi_header), 1);
+       //solid_ncyl = state_fio->FgetInt32();
+       //solid_nside = state_fio->FgetInt32();
+       //solid_nsec = state_fio->FgetInt32();
+       //solid_size = state_fio->FgetInt32();
+       //solid_mfm = state_fio->FgetBool();
+       //inserted = state_fio->FgetBool();
+       //ejected = state_fio->FgetBool();
+       //write_protected = state_fio->FgetBool();
+       //changed = state_fio->FgetBool();
+       //media_type = state_fio->FgetUint8();
+       //is_special_disk = state_fio->FgetInt32();
+       //state_fio->Fread(track, sizeof(track), 1);
+       //sector_num.sd = state_fio->FgetInt32();
+       //track_mfm = state_fio->FgetBool();
+       //invalid_format = state_fio->FgetBool();
 //     no_skew = state_fio->FgetBool();
-       state_fio->Fread(sync_position, sizeof(sync_position), 1);
-       state_fio->Fread(am1_position, sizeof(am1_position), 1);
-       state_fio->Fread(id_position, sizeof(id_position), 1);
-       state_fio->Fread(data_position, sizeof(data_position), 1);
-       int offset = state_fio->FgetInt32();
-       sector = (offset != -1) ? buffer + offset : NULL;
-       sector_size.sd = state_fio->FgetInt32();
-       state_fio->Fread(id, sizeof(id), 1);
-       density = state_fio->FgetUint8();
-       deleted = state_fio->FgetBool();
-       addr_crc_error = state_fio->FgetBool();
-       data_crc_error = state_fio->FgetBool();
-       drive_type = state_fio->FgetUint8();
-       drive_rpm = state_fio->FgetInt32();
-       drive_mfm = state_fio->FgetBool();
+       //state_fio->Fread(sync_position, sizeof(sync_position), 1);
+       //state_fio->Fread(am1_position, sizeof(am1_position), 1);
+       //state_fio->Fread(id_position, sizeof(id_position), 1);
+       //state_fio->Fread(data_position, sizeof(data_position), 1);
+//     gap3_size = state_fio->FgetInt32();
+       //int offset = state_fio->FgetInt32();
+       //sector = (offset != -1) ? buffer + offset : NULL;
+       //sector_size.sd = state_fio->FgetInt32();
+       //state_fio->Fread(id, sizeof(id), 1);
+       //density = state_fio->FgetUint8();
+       //deleted = state_fio->FgetBool();
+       //addr_crc_error = state_fio->FgetBool();
+       //data_crc_error = state_fio->FgetBool();
+       //drive_type = state_fio->FgetUint8();
+       //drive_rpm = state_fio->FgetInt32();
+       //drive_mfm = state_fio->FgetBool();
+       sector = (_tmp_sector_offset != -1) ? (buffer + _tmp_sector_offset) : NULL;
        return true;
 }