diff --git a/branches/s100/Source/diskdefs b/branches/s100/Source/diskdefs
index 516ae28a..2e1f5725 100644
--- a/branches/s100/Source/diskdefs
+++ b/branches/s100/Source/diskdefs
@@ -1,341 +1,341 @@
-diskdef ibm-3740
-  seclen 128
-  tracks 77
-  sectrk 26
-  blocksize 1024
-  maxdir 64
-  skew 6
-  boottrk 2
-  os p2dos
-end
-
-diskdef 4mb-hd
-  seclen 128
-  tracks 1024
-  sectrk 32
-  blocksize 2048
-  maxdir 256
-  skew 1
-  boottrk 0
-  os p2dos
-end
-
-diskdef pcw
-  seclen 512
-  tracks 40
-  sectrk 9
-  blocksize 1024
-  maxdir 64
-  skew 1
-  boottrk 1
-  os 3
-end
-
-diskdef pc1.2m
-  seclen 512
-  tracks 80
-  # this format uses 15 sectors per track, but 30 per cylinder
-  sectrk 30
-  blocksize 4096
-  maxdir 256
-  skew 1
-  boottrk 0
-  os 3
-end
-
-# CP/M 86 on 1.44MB floppies
-diskdef cpm86-144feat
-  seclen 512
-  tracks 160
-  sectrk 18
-  blocksize 4096
-  maxdir 256
-  skew 1
-  boottrk 2
-  os 3
-end
-
-diskdef cf2dd
-  seclen 512
-  tracks 160
-  sectrk 9
-  blocksize 2048
-  maxdir 256
-  skew 1
-  boottrk 1
-  os 3
-end
-
-#amstrad: values are read from super block (special name hardcoded)
-
-# Royal alphatronic
-# setfdprm /dev/fd1 dd ssize=256 cyl=40 sect=16 head=2
-diskdef alpha
-  seclen 256
-  tracks 40
-  sectrk 32
-  blocksize 2048
-  maxdir 128
-  skew 1
-  boottrk 2
-  os 2.2
-end
-
-# Apple II CP/M skew o Apple II DOS 3.3 skew
-diskdef apple-do
-  seclen 256
-  tracks 35
-  sectrk 16
-  blocksize 1024
-  maxdir 64
-  skew 0
-  boottrk 3
-  os 2.2
-end
-
-# Apple II CP/M skew o Apple II PRODOS skew
-diskdef apple-po
-  seclen 256
-  tracks 35
-  sectrk 16
-  blocksize 1024
-  maxdir 64
-  skew 0
-  boottrk 3
-  os 2.2
-end
-
-# MYZ80 hard drive (only works with libdsk, because it has a 256-byte header)
-diskdef myz80
-  seclen 1024
-  tracks 64
-  sectrk 128
-  blocksize 4096
-  maxdir 1024
-  skew 1
-  boottrk 0
-  os 3
-end
-
-# Despite being Amstrad formats, CPC System and CPC Data don't have an Amstrad 
-# superblock. You'll need to use libdsk to access them because the Linux 
-# and Windows kernel drivers won't touch them.
-diskdef cpcsys
-  seclen 512
-  tracks 40
-  sectrk 9
-  blocksize 1024
-  maxdir 64
-  skew 1
-  boottrk 2
-  os 3
-end
-diskdef cpcdata
-  seclen 512
-  tracks 40
-  sectrk 9
-  blocksize 1024
-  maxdir 64
-  skew 1
-  boottrk 0
-  os 3
-end
-
-# after being read in with no sector skew.
-diskdef nigdos
-  seclen 512
-  # NigDos double sided disk format, 42 tracks * 2 sides
-  tracks 84
-  sectrk 10
-  blocksize 2048
-  maxdir 128
-  skew 1
-  boottrk 0
-  # this format wastes half of the directory entry
-  logicalextents 1
-  os 3
-end
-
-diskdef epsqx10
-  seclen 512
-  tracks 40
-  sectrk 20
-  blocksize 2048
-  maxdir 128
-  skew 0
-  boottrk 2
-  os 2.2
-end
-
-diskdef ibm-8ss
-  seclen 512
-  tracks 40
-  sectrk 8
-  blocksize 1024
-  maxdir 64
-  skew 0
-  boottrk 1
-  os 2.2
-end
-
-diskdef ibm-8ds
-  seclen 512
-  tracks 40
-  sectrk 8
-  blocksize 1024
-  maxdir 64
-  skew 0
-  boottrk 1
-  os 2.2
-end
-
-diskdef electroglas
-  seclen 512
-  tracks 80
-  sectrk 10
-  blocksize 2048
-  maxdir 256
-  skew 0
-  boottrk 1
-  os 3
-end
-
-# IBM CP/M-86
-# setfdprm /dev/fd1 sect=8 dtr=1 hd ssize=512 tpi=48 head=1
-diskdef ibmpc-514ss
-   seclen 512
-   tracks 40
-   sectrk 8
-   blocksize 1024
-   maxdir 64
-   skew 1
-   boottrk 1
-   os 2.2
-end
-
-# IBM CP/M-86
-# setfdprm /dev/fd1 sect=8 dtr=1 hd ssize=512 tpi=48
-diskdef ibmpc-514ds
-   seclen 512
-   tracks 80
-   sectrk 8
-   blocksize 2048
-   maxdir 64
-   skew 0
-   boottrk 2
-   os 2.2
-end
-
-diskdef p112
-  seclen 512
-  tracks 160
-  sectrk 18
-  blocksize 2048
-  maxdir 256
-  skew 1
-  boottrk 2
-  os 3
-end
-
-diskdef p112-old
-  seclen 512
-  tracks 160
-  sectrk 18
-  blocksize 2048
-  maxdir 128
-  skew 1
-  boottrk 1
-  os 3
-end
-
-diskdef kpii
-  seclen 512
-  tracks 40
-  sectrk 10
-  blocksize 1024
-  maxdir 32
-  skew 0
-  boottrk 1
-  os 2.2
-end
-
-# 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
-
-# For 512KB ROM, less 32K for system image
-diskdef rom512KB
-  seclen 128
-  tracks 14
-  sectrk 256
-  blocksize 2048
-  maxdir 256
-  skew 1
-  boottrk 0
-  os 2.2
-end
-
-# For 1024KB ROM, less 32K for system image
-diskdef rom1024KB
-  seclen 128
-  tracks 30
-  sectrk 256
-  blocksize 2048
-  maxdir 256
-  skew 1
-  boottrk 0
-  os 2.2
-end
-
-# For N8VEM mass storage (4 raw partitions)
-diskdef hd0
-  seclen 512
-  tracks 65
-  sectrk 256
-  blocksize 4096
-  maxdir 512
-  skew 1
-  boottrk 1
-  os 2.2
-end
-
-diskdef hd1
-  seclen 512
-  tracks 130
-  sectrk 256
-  blocksize 4096
-  maxdir 512
-  skew 1
-  boottrk 66
-  os 2.2
-end
-
-diskdef hd2
-  seclen 512
-  tracks 195
-  sectrk 256
-  blocksize 4096
-  maxdir 512
-  skew 1
-  boottrk 131
-  os 2.2
-end
-
-diskdef hd3
-  seclen 512
-  tracks 260
-  sectrk 256
-  blocksize 4096
-  maxdir 512
-  skew 1
-  boottrk 196
-  os 2.2
-end
+diskdef ibm-3740
+  seclen 128
+  tracks 77
+  sectrk 26
+  blocksize 1024
+  maxdir 64
+  skew 6
+  boottrk 2
+  os p2dos
+end
+
+diskdef 4mb-hd
+  seclen 128
+  tracks 1024
+  sectrk 32
+  blocksize 2048
+  maxdir 256
+  skew 1
+  boottrk 0
+  os p2dos
+end
+
+diskdef pcw
+  seclen 512
+  tracks 40
+  sectrk 9
+  blocksize 1024
+  maxdir 64
+  skew 1
+  boottrk 1
+  os 3
+end
+
+diskdef pc1.2m
+  seclen 512
+  tracks 80
+  # this format uses 15 sectors per track, but 30 per cylinder
+  sectrk 30
+  blocksize 4096
+  maxdir 256
+  skew 1
+  boottrk 0
+  os 3
+end
+
+# CP/M 86 on 1.44MB floppies
+diskdef cpm86-144feat
+  seclen 512
+  tracks 160
+  sectrk 18
+  blocksize 4096
+  maxdir 256
+  skew 1
+  boottrk 2
+  os 3
+end
+
+diskdef cf2dd
+  seclen 512
+  tracks 160
+  sectrk 9
+  blocksize 2048
+  maxdir 256
+  skew 1
+  boottrk 1
+  os 3
+end
+
+#amstrad: values are read from super block (special name hardcoded)
+
+# Royal alphatronic
+# setfdprm /dev/fd1 dd ssize=256 cyl=40 sect=16 head=2
+diskdef alpha
+  seclen 256
+  tracks 40
+  sectrk 32
+  blocksize 2048
+  maxdir 128
+  skew 1
+  boottrk 2
+  os 2.2
+end
+
+# Apple II CP/M skew o Apple II DOS 3.3 skew
+diskdef apple-do
+  seclen 256
+  tracks 35
+  sectrk 16
+  blocksize 1024
+  maxdir 64
+  skew 0
+  boottrk 3
+  os 2.2
+end
+
+# Apple II CP/M skew o Apple II PRODOS skew
+diskdef apple-po
+  seclen 256
+  tracks 35
+  sectrk 16
+  blocksize 1024
+  maxdir 64
+  skew 0
+  boottrk 3
+  os 2.2
+end
+
+# MYZ80 hard drive (only works with libdsk, because it has a 256-byte header)
+diskdef myz80
+  seclen 1024
+  tracks 64
+  sectrk 128
+  blocksize 4096
+  maxdir 1024
+  skew 1
+  boottrk 0
+  os 3
+end
+
+# Despite being Amstrad formats, CPC System and CPC Data don't have an Amstrad 
+# superblock. You'll need to use libdsk to access them because the Linux 
+# and Windows kernel drivers won't touch them.
+diskdef cpcsys
+  seclen 512
+  tracks 40
+  sectrk 9
+  blocksize 1024
+  maxdir 64
+  skew 1
+  boottrk 2
+  os 3
+end
+diskdef cpcdata
+  seclen 512
+  tracks 40
+  sectrk 9
+  blocksize 1024
+  maxdir 64
+  skew 1
+  boottrk 0
+  os 3
+end
+
+# after being read in with no sector skew.
+diskdef nigdos
+  seclen 512
+  # NigDos double sided disk format, 42 tracks * 2 sides
+  tracks 84
+  sectrk 10
+  blocksize 2048
+  maxdir 128
+  skew 1
+  boottrk 0
+  # this format wastes half of the directory entry
+  logicalextents 1
+  os 3
+end
+
+diskdef epsqx10
+  seclen 512
+  tracks 40
+  sectrk 20
+  blocksize 2048
+  maxdir 128
+  skew 0
+  boottrk 2
+  os 2.2
+end
+
+diskdef ibm-8ss
+  seclen 512
+  tracks 40
+  sectrk 8
+  blocksize 1024
+  maxdir 64
+  skew 0
+  boottrk 1
+  os 2.2
+end
+
+diskdef ibm-8ds
+  seclen 512
+  tracks 40
+  sectrk 8
+  blocksize 1024
+  maxdir 64
+  skew 0
+  boottrk 1
+  os 2.2
+end
+
+diskdef electroglas
+  seclen 512
+  tracks 80
+  sectrk 10
+  blocksize 2048
+  maxdir 256
+  skew 0
+  boottrk 1
+  os 3
+end
+
+# IBM CP/M-86
+# setfdprm /dev/fd1 sect=8 dtr=1 hd ssize=512 tpi=48 head=1
+diskdef ibmpc-514ss
+   seclen 512
+   tracks 40
+   sectrk 8
+   blocksize 1024
+   maxdir 64
+   skew 1
+   boottrk 1
+   os 2.2
+end
+
+# IBM CP/M-86
+# setfdprm /dev/fd1 sect=8 dtr=1 hd ssize=512 tpi=48
+diskdef ibmpc-514ds
+   seclen 512
+   tracks 80
+   sectrk 8
+   blocksize 2048
+   maxdir 64
+   skew 0
+   boottrk 2
+   os 2.2
+end
+
+diskdef p112
+  seclen 512
+  tracks 160
+  sectrk 18
+  blocksize 2048
+  maxdir 256
+  skew 1
+  boottrk 2
+  os 3
+end
+
+diskdef p112-old
+  seclen 512
+  tracks 160
+  sectrk 18
+  blocksize 2048
+  maxdir 128
+  skew 1
+  boottrk 1
+  os 3
+end
+
+diskdef kpii
+  seclen 512
+  tracks 40
+  sectrk 10
+  blocksize 1024
+  maxdir 32
+  skew 0
+  boottrk 1
+  os 2.2
+end
+
+# 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
+
+# For 512KB ROM, less 32K for system image
+diskdef rom512KB
+  seclen 128
+  tracks 14
+  sectrk 256
+  blocksize 2048
+  maxdir 256
+  skew 1
+  boottrk 0
+  os 2.2
+end
+
+# For 1024KB ROM, less 32K for system image
+diskdef rom1024KB
+  seclen 128
+  tracks 30
+  sectrk 256
+  blocksize 2048
+  maxdir 256
+  skew 1
+  boottrk 0
+  os 2.2
+end
+
+# For N8VEM mass storage (4 raw partitions)
+diskdef hd0
+  seclen 512
+  tracks 65
+  sectrk 256
+  blocksize 4096
+  maxdir 512
+  skew 1
+  boottrk 1
+  os 2.2
+end
+
+diskdef hd1
+  seclen 512
+  tracks 130
+  sectrk 256
+  blocksize 4096
+  maxdir 512
+  skew 1
+  boottrk 66
+  os 2.2
+end
+
+diskdef hd2
+  seclen 512
+  tracks 195
+  sectrk 256
+  blocksize 4096
+  maxdir 512
+  skew 1
+  boottrk 131
+  os 2.2
+end
+
+diskdef hd3
+  seclen 512
+  tracks 260
+  sectrk 256
+  blocksize 4096
+  maxdir 512
+  skew 1
+  boottrk 196
+  os 2.2
+end