Commit: master - L3DiskEx (git)

L3 Disk Explorer is an application in order to access to files in a floppy disk image for retro computer and operating system.

Commit MetaInfo

• Revision: 857db820194c3d92db706bb2e191800d3827f7f1 (tree)
• Time: 2023-07-08 01:10:27
• Author: Sasaji <sasaji@s-sa...>
• Commiter: Sasaji

Log Message

Version 0.6.3 Release

Change Summary

• modified: Makefile.macosx
• modified: data/file_types.xml
• modified: docs/ChangeLog.txt
• modified: docs/DiskBasicSpec.txt
• modified: docs/Readme.txt
• modified: l3diskex.doxy
• modified: src/diskimg/diskhfeparser.cpp
• modified: src/res/Info.plist
• modified: src/version.h

Incremental Difference

--- a/Makefile.macosx
+++ b/Makefile.macosx
@@ -3,7 +3,7 @@
 #
 CC=g++
 
-APPLICATION_VERSION=0.6.2
+APPLICATION_VERSION=0.6.3
 
 CDEFS=
 DBG_CDEFS=-D_DEBUG -D_DEBUG_LOG

--- a/data/file_types.xml
+++ b/data/file_types.xml
@@ -13,7 +13,7 @@
 		<Description lang="ja">CPC DSK形式ファイル</Description>
 	</FileFormatType>
 	<FileFormatType name="fdi">
-		<Description>Anex98 FDI format file</Description>
+		<Description>Anex86 FDI format file</Description>
 		<Description lang="ja">Anex86 FDI形式ファイル</Description>
 	</FileFormatType>
 	<FileFormatType name="cqmimg">

--- a/docs/ChangeLog.txt
+++ b/docs/ChangeLog.txt
@@ -2,6 +2,10 @@
  更新履歴
 ==============================================================================
 
[phone]	Version 0.6.3
+・実機で書き込みしたHxC HFE形式のディスクイメージが読み込めなくなることがある
+  不具合を修正した。
+
 2023-04-03	Version 0.6.2
 ・CDOS II 2DD,2HD版のシステムディスクに対応した。
 ・MSX BASICのベタディスクを読み込めないことがある不具合を修正した。

--- a/docs/DiskBasicSpec.txt
+++ b/docs/DiskBasicSpec.txt
@@ -1,6 +1,6 @@
 ==============================================================================
     L3 Disk Explorer 仕様
-                                                              Version 0.6.2
+                                                              Version 0.6.3
 
                             Copyright(C) Sasaji 2015-2023 All Rights Reserved.
 ==============================================================================

--- a/docs/Readme.txt
+++ b/docs/Readme.txt
@@ -1,7 +1,7 @@
 ==============================================================================
     L3 Disk Explorer
-                                                              Version 0.6.2
-                                                                2023/04/03
+                                                              Version 0.6.3
+                                                                2023/07/08
 
                             Copyright(C) Sasaji 2015-2023 All Rights Reserved.
 ==============================================================================

--- a/l3diskex.doxy
+++ b/l3diskex.doxy
@@ -38,7 +38,7 @@ PROJECT_NAME           = L3DiskExplorer
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 0.6.2
+PROJECT_NUMBER         = 0.6.3
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

--- a/src/diskimg/diskhfeparser.cpp
+++ b/src/diskimg/diskhfeparser.cpp
@@ -252,19 +252,26 @@ FormatMFMParser::FormatMFMParser(DiskD88Disk *n_disk, int n_track_number, int n_
  clk   1 0 0 1  0 0 0 0  \n
        10010010 01010100 -> 9245 \n
  rev   01001001 00101010 -> 492A \n
+
+ @par SYNC code
+ 00 ->  0 0 0 0  0 0 0 0 \n
+ clk   1 1 1 1  1 1 1 1  \n
+       10101010 10101010 \n
+ rev   01010101 01010101 -> 5555 \n
 */
-/// @return GAPフィールドあり
+/// @return GAP and SYNCフィールドあり
 bool FormatMFMParser::AdjustGap()
 {
 	bool found = false;
 	int maxlen = data_len;
-	wxUint8 buf[4];
+	wxUint8 buf[6];
 	int pos = 0;
+	// search GAP field
 	for(; pos<maxlen; pos++) {
 		memcpy(buf, &data[pos], 3);
 		int cnt = 0;
 		for(; cnt<8; cnt++) {
-			if (buf[0] == 0x49 && buf[1] == 0x2a) {
+			if (memcmp(buf, "\x49\x2a", 2) == 0) {
 				found = true;
 				break;
 			}
@@ -279,17 +286,44 @@ bool FormatMFMParser::AdjustGap()
 	}
 	if (!found) {
 		data_len = 0;
+		return found;
+	}
+	// search the terminate of SYNC field
+	found =false;
+	pos = 0;
+	for(; pos<maxlen; pos++) {
+		memcpy(buf, &data[pos], 4);
+		int cnt = 0;
+		for(; cnt<8; cnt++) {
+			if (memcmp(buf, "\x55\x55\x25", 3) == 0
+			 || memcmp(buf, "\x55\x55\xa5", 3) == 0) {
+				found = true;
+				break;
+			}
+
+			// bit shift left
+			ShiftBits(buf, 4, 1);
+		}
+		if (found) {
+			if (cnt >= 4) {
+				cnt -= 4;
+			} else {
+				pos--;
+				cnt += 4;
+			}
+			if (pos >= 0) {
+				data_len = ShiftBits(data, data_len, pos * 8 + cnt);
+			}
+			break;
+		}
+	}
+	if (!found) {
+		data_len = 0;
 	}
 	return found;
 }
 /** データの解析(MFM)
 
-@par SYNC code
- 00 ->  0 0 0 0  0 0 0 0 \n
- clk   1 1 1 1  1 1 1 1  \n
-       10101010 10101010 \n
- rev   01010101 01010101 -> 5555 \n
-
 @par PRE AM
  A1 ->  1 0 1 0  0 0 0 1 \n
  clk   0 0 0 0  1 x 1 0  \n
@@ -417,19 +451,26 @@ FormatFMParser::FormatFMParser(DiskD88Disk *n_disk, int n_track_number, int n_si
  clk   01  01   01  01   01  01   01  01   \n
        01010101 01010101 01010101 01010101 -> 55555555 \n
  rev   10101010 10101010 10101010 10101010 -> AAAAAAAA \n
+
+ @par SYNC code
+ 00 ->   00  00   00  00   00  00   00  00 \n
+ clk   01  01   01  01   01  01   01  01   \n
+       01000100 01000100 01000100 01000100 \n
+ rev   00100010 00100010 00100010 00100010 -> 22222222 \n
 */
-/// @return GAPフィールドあり
+/// @return GAP and SYNCフィールドあり
 bool FormatFMParser::AdjustGap()
 {
 	bool found = false;
 	int maxlen = data_len;
-	wxUint8 buf[6];
+	wxUint8 buf[8];
 	int pos = 0;
+	// search GAP field
 	for(; pos<maxlen; pos++) {
 		memcpy(buf, &data[pos], 5);
 		int cnt = 0;
 		for(; cnt<8; cnt++) {
-			if (buf[0] == 0xaa && buf[1] == 0xaa && buf[2] == 0xaa && buf[3] == 0xaa) {
+			if (memcmp(buf, "\xaa\xaa\xaa\xaa", 4) == 0) {
 				found = true;
 				break;
 			}
@@ -444,17 +485,46 @@ bool FormatFMParser::AdjustGap()
 	}
 	if (!found) {
 		data_len = 0;
+		return found;
+	}
+	// search the terminate of SYNC field
+	found =false;
+	pos = 0;
+	for(; pos<maxlen; pos++) {
+		if (pos == 0xb3) {
+			int nn=0;
+		}
+		memcpy(buf, &data[pos], 6);
+		int cnt = 0;
+		for(; cnt<8; cnt++) {
+			if (memcmp(buf, "\x22\x22\x22\x22\xa2", 5) == 0) {
+				found = true;
+				break;
+			}
+
+			// bit shift left
+			ShiftBits(buf, 6, 1);
+		}
+		if (found) {
+			if (cnt >= 4) {
+				cnt -= 4;
+			} else {
+				pos--;
+				cnt += 4;
+			}
+			if (pos >= 0) {
+				data_len = ShiftBits(data, data_len, pos * 8 + cnt);
+			}
+			break;
+		}
+	}
+	if (!found) {
+		data_len = 0;
 	}
 	return found;
 }
 /** データの解析(FM)
 
-@par SYNC code
- 00 ->   00  00   00  00   00  00   00  00 \n
- clk   01  01   01  01   01  01   01  01   \n
-       01000100 01000100 01000100 01000100 \n
- rev   00100010 00100010 00100010 00100010 -> 22222222 \n
-
 @par INDEX mark
  FC ->   01  01   01  01   01  01   00  00 \n
  clk   01  01   0x  01   0x  01   01  01   \n

--- a/src/res/Info.plist
+++ b/src/res/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>l3diskex</string>
 	<key>CFBundleGetInfoString</key>
-	<string>L3DiskExplorer version 0.6.2, (c) 2015-2023 Sasaji</string>
+	<string>L3DiskExplorer version 0.6.3, (c) 2015-2023 Sasaji</string>
 	<key>CFBundleIconFile</key>
 	<string>l3diskex.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -19,17 +19,17 @@
 		<string>jp</string>
 	</array>
 	<key>CFBundleLongVersionString</key>
-	<string>0.6.2, (c) 2015-2023 Sasaji</string>
+	<string>0.6.3, (c) 2015-2023 Sasaji</string>
 	<key>CFBundleName</key>
 	<string>L3DiskExproler</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.6.2</string>
+	<string>0.6.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>0.6.2</string>
+	<string>0.6.3</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 	<key>LSApplicationCategoryType</key>

--- a/src/version.h
+++ b/src/version.h
@@ -6,10 +6,10 @@
 #ifndef _VERSION_H_
 #define _VERSION_H_
 
-#define APPLICATION_VERSION	"0.6.2"
+#define APPLICATION_VERSION	"0.6.3"
 #define APP_VER_MAJOR	0
 #define APP_VER_MINOR	6
-#define APP_VER_REV	2
+#define APP_VER_REV	3
 #define APP_VER_BUILD	0
 #define APP_COPYRIGHT	"Copyright (C) 2015-2023 Sasaji"