make it possible to over-ride upstream datarootdir in Makefile

[debian/cpmtools] / diskdefs

diff --git a/diskdefs b/diskdefs
index 020dfbf9f3eb494b36aca22fb7a0ee22168956a4..3c2c4d66f3114e95ce88e872c2983e4a661b0c1f 100644 (file)
--- a/diskdefs
+++ b/diskdefs
@@ -231,16 +231,6 @@ diskdef p112
   tracks 160
   sectrk 18
   blocksize 2048
-<<<<<<< HEAD:diskdefs
-  maxdir 128
-  skew 1
-  boottrk 1
-  os 3
-end
-
-
-diskdef p112a
-=======
   maxdir 256
   skew 1
   boottrk 2
@@ -248,22 +238,15 @@ diskdef p112a
 end
 
 diskdef p112-old
->>>>>>> 224b4e6d27a3af235500d9d8028ddbd3a60af7ed:diskdefs
   seclen 512
   tracks 160
   sectrk 18
   blocksize 2048
-<<<<<<< HEAD:diskdefs
-  maxdir 256
-=======
   maxdir 128
->>>>>>> 224b4e6d27a3af235500d9d8028ddbd3a60af7ed:diskdefs
   skew 1
   boottrk 1
   os 3
 end
-<<<<<<< HEAD:diskdefs
-=======
 
 diskdef kpii
   seclen 512
@@ -275,4 +258,63 @@ diskdef kpii
   boottrk 1
   os 2.2
 end
->>>>>>> 224b4e6d27a3af235500d9d8028ddbd3a60af7ed:diskdefs
+
+# setfdprm /dev/fd0 dd sect=10
+diskdef interak
+  seclen 512
+  tracks 80
+  sectrk 20
+  blocksize 4096
+  maxdir 256
+  skew 1
+  boottrk 2
+  os 2.2
+end
+
+# Timex FDD3000 3"
+diskdef fdd3000
+  seclen 256
+  tracks 40
+  sectrk 16
+  blocksize 1024
+  maxdir 128
+  boottrk 4
+  os 2.2
+  skew 7
+end
+
+# Timex FDD3000 3"
+diskdef fdd3000_2
+  seclen 256
+  tracks 40
+  sectrk 16
+  blocksize 1024
+  maxdir 128
+  boottrk 2
+  os 2.2
+  skew 5
+end
+
+# Robotron 1715
+diskdef 1715
+  seclen 1024
+  tracks 40
+  sectrk 5
+  blocksize 1024
+  maxdir 64
+  skew 0
+  boottrk 3
+  os 2.2
+end
+
+# Robotron 1715 with SCP3
+diskdef 17153
+  seclen 1024
+  tracks 160
+  sectrk 5
+  blocksize 2048
+  maxdir 128
+  skew 0
+  boottrk 4
+  os 3
+end