fix: fix type amsdos for binary mode

jeromelesaux · Oct 28, 2023 · 417f4f9 · 417f4f9
1 parent 4e8f52d
commit 417f4f9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/cli/main.go b/cli/main.go
@@ -43,7 +43,7 @@ var (
 	loadingAddress = flag.String("load", "", "Loading address of the inserted file. (hexadecimal #170 allowed.)")
 	user           = flag.Int("user", 0, "User number of the inserted file.")
 	force          = flag.Bool("force", false, "Force overwriting of the inserted file.")
-	fileType       = flag.String("type", "", "Type of the inserted file \n\tascii : type ascii\n\tbinary : type binary\n")
+	fileType       = flag.String("type", "", "Type of the inserted file \n\tascii : type ascii\n\tprotected : type ascii protected\n\tbinary : type binary\n")
 	snaPath        = flag.String("sna", "", "SNA file to handle")
 	analyse        = flag.Bool("analyze", false, "Returns the DSK header")
 	cpcType        = flag.Int("cpctype", 2, "CPC type (sna import feature): \n\tCPC464 : 0\n\tCPC664: 1\n\tCPC6128 : 2\n\tUnknown : 3\n\tCPCPlus6128 : 4\n\tCPCPlus464 : 5\n\tGX4000 : 6\n\t")
@@ -57,7 +57,7 @@ var (
 	autotest       = flag.Bool("autotest", false, "Executs all tests.")
 	autoextract    = flag.String("autoextract", "", "Extract all DSK contained in the folder path")
 	snaVersion     = flag.Int("snaversion", 1, "Set the sna version (1 or 2 available).")
-	appVersion     = "0.18"
+	appVersion     = "0.19"
 )
 
 func main() {

diff --git a/dsk/dsk.go b/dsk/dsk.go
@@ -32,7 +32,8 @@ var (
 
 var (
 	MODE_ASCII        uint8     = 0
-	MODE_BINAIRE      uint8     = 1
+	MODE_PROTECTED    uint8     = 1
+	MODE_BINAIRE      uint8     = 2
 	EXTENDED_DSK_TYPE           = 1
 	DSK_TYPE                    = 0
 	DataFormat        DskFormat = 0
@@ -729,6 +730,10 @@ func (d *DSK) PutFile(masque string, typeModeImport uint8, loadAddress, exeAddre
 		buff[fileLength] = 0x1A
 	}
 
+	if typeModeImport == MODE_PROTECTED && fileLength%128 != 0 {
+		buff[fileLength] = 0x1A
+	}
+
 	var isAmsdos bool
 	//
 	// Regarde si le fichier contient une en-tete ou non

diff --git a/hfe/hfe_test.go b/hfe/hfe_test.go
@@ -1,7 +1,6 @@
 package hfe_test
 
 import (
-	"fmt"
 	"os"
 	"testing"
 
@@ -28,7 +27,6 @@ func TestReadHfe(t *testing.T) {
 		assert.NoError(t, err)
 		assert.NotEmpty(t, h)
 		assert.Equal(t, hfe.CPC_DD_FLOPPYMODE, h.Header.FloppyInterfaceMode)
-		fmt.Printf("format:%v\n", hfe.String(h.Header.FloppyInterfaceMode))
 	})
 
 }