Merge pull request #596 from davidgiven/c64

Minor C64 changes.

Author: davidgiven

Makefile

@@ -159,11 +159,11 @@ include tests/build.mk
 do-encodedecodetest = $(eval $(do-encodedecodetest-impl))
 define do-encodedecodetest-impl
 
-tests: $(OBJDIR)/$1.encodedecode
-$(OBJDIR)/$1.encodedecode: scripts/encodedecodetest.sh $(FLUXENGINE_BIN) $2
+tests: $(OBJDIR)/$1$3.encodedecode
+$(OBJDIR)/$1$3.encodedecode: scripts/encodedecodetest.sh $(FLUXENGINE_BIN) $2
 	@mkdir -p $(dir $$@)
-	@echo ENCODEDECODETEST $1
-	@scripts/encodedecodetest.sh $1 flux $(FLUXENGINE_BIN) $2 > $$@
+	@echo ENCODEDECODETEST $1 $3
+	@scripts/encodedecodetest.sh $1 flux $(FLUXENGINE_BIN) $2 $3 > $$@
 
 endef
 
@@ -180,8 +180,10 @@ $(call do-encodedecodetest,atarist820)
 $(call do-encodedecodetest,bk800)
 $(call do-encodedecodetest,brother120)
 $(call do-encodedecodetest,brother240)
-$(call do-encodedecodetest,commodore1541t35,scripts/commodore1541_test.textpb)
+$(call do-encodedecodetest,commodore1541,scripts/commodore1541_test.textpb,--35)
+$(call do-encodedecodetest,commodore1541,scripts/commodore1541_test.textpb,--40)
 $(call do-encodedecodetest,commodore1581)
+$(call do-encodedecodetest,cmd_fd2000)
 $(call do-encodedecodetest,hp9121)
 $(call do-encodedecodetest,ibm1200)
 $(call do-encodedecodetest,ibm1232)

doc/disk-c64.md

@@ -33,14 +33,14 @@ Reading 1541 disks
 Just do:
 
 ```
-fluxengine read commodore1541t35 -o commodore1541.d64
+fluxengine read commodore1541 -o commodore1541.d64
 ```
 
 You should end up with an `commodore1541.d64` file which is 174848 bytes long.
 You can load this straight into a Commodore 64 emulator such as
 [VICE](http://vice-emu.sourceforge.net/).
 
-If you have a 40-track disk, use `commodore1541t40` instead.
+If you have a 40-track disk, add `--40`.
 
 **Big warning!** Commodore 64 disk images are complicated due to the way the
 tracks are different sizes and the odd sector size, so you need the special D64
@@ -52,16 +52,16 @@ Writing 1541 disks
 
 Just do:
 ```
-fluxengine write commodore1541t35 -i file.d64
+fluxengine write commodore1541 -i file.d64
 ```
 
-If you have a 40-track disk, use `commodore1541t40` instead.
+If you have a 40-track disk, add `--40`.
 
 Note that only standard Commodore 64 BAM file systems can be written this way,
 as the disk ID in the BAM has to be copied to every sector on the disk.
 
-Reading 1581 disks
-------------------
+Reading and writing 1581 disks
+------------------------------
 
 1581 disks are just another version of the standard IBM scheme.
 
@@ -71,15 +71,30 @@ Just do:
 fluxengine read commodore1581 -o commodore1581.d81
 ```
 
-Writing 1581 disks
-------------------
+or:
+
+```
+fluxengine write commodore1581 -i commodore1581.img
+```
+
+Reading and writing CMD FD2000 disks
+------------------------------------
+
+Yet again, these are another IBM scheme variant.
 
 Just do:
 
 ```
-fluxengine write commodore1581 -i commodore1581.img
+fluxengine read cmd_fd2000 -o cmd_fd2000.d81
 ```
 
+or:
+
+```
+fluxengine write cmd_fd2000 -i cmd_fd2000.img
+```
+
+
 Useful references
 -----------------
 

src/formats/build.mk

@@ -5,7 +5,6 @@ FORMATS = \
 	_micropolis \
 	_northstar \
 	_mx \
-	_commodore1541 \
 	40track_drive \
 	acornadfs160 \
 	acornadfs320 \
@@ -31,9 +30,9 @@ FORMATS = \
 	bk800 \
 	brother120 \
 	brother240 \
-	commodore1541t35 \
-	commodore1541t40 \
+	commodore1541 \
 	commodore1581 \
+	cmd_fd2000 \
 	eco1 \
 	epsonpf10 \
 	f85 \

src/formats/cmd_fd2000.textpb

@@ -0,0 +1,43 @@
+comment: 'CMD FD2000 1620kB 3.5" DSHD'
+
+image_reader {
+	filename: "cmd_fd2000.img"
+	img {}
+}
+
+image_writer {
+	filename: "cmd_fd2000.img"
+	img {}
+}
+
+layout {
+	tracks: 81
+	sides: 2
+	swap_sides: true
+	layoutdata {
+		sector_size: 1024
+		physical {
+			start_sector: 1
+			count: 10
+		}
+	}
+}
+
+encoder {
+	ibm {
+		trackdata {
+			target_rotational_period_ms: 200
+			target_clock_period_us: 2
+			emit_iam: false
+		}
+	}
+}
+
+decoder {
+	ibm {
+		trackdata {
+			ignore_side_byte: true
+		}
+	}
+}
+

src/formats/_commodore1541.textpb src/formats/commodore1541.textpbsrc/formats/_commodore1541.textpb renamed to src/formats/commodore1541.textpb

@@ -1,5 +1,4 @@
-comment: 'Commodore 1541 common settings'
-is_extension: true
+comment: 'Commodore 1541 171kB/192kB 5.25" 35/40-track SS GCR'
 
 image_reader {
 	filename: "commodore1541.d64"
@@ -13,6 +12,7 @@ image_writer {
 
 layout {
 	sides: 1
+	tracks: 35
 	layoutdata {
 		sector_size: 256
 	}
@@ -63,3 +63,28 @@ tpi: 48
 filesystem {
 	cbmfs {}
 }
+
+option {
+	name: "35"
+	comment: "35-track variant (default)"
+	message: "using 35-track variant"
+	
+	config {
+		layout {
+			tracks: 35
+		}
+	}
+}
+	
+option {
+	name: "40"
+	comment: "40-track variant"
+	message: "using 40-track variant"
+	
+	config {
+		layout {
+			tracks: 40
+		}
+	}
+}
+