Merge pull request #58 from wwarthen/master

Disk image creation improvements

Doc/ChangeLog.txt

@@ -36,6 +36,7 @@ Version 2.9.2
 - WBW: Added support for Dyno platform (based on work by Steve Garcia)
 - S?G: Added support for BQ4845 RTC (bqrtc.asm)
 - PMS: Added 80x30 video mode to VGA3 driver
+- PMS: Added 80x43 video mode
 
 Version 2.9.1
 -------------

Source/Build.cmd

@@ -3,7 +3,7 @@ setlocal
 
 REM setlocal & call BuildDoc || exit /b 1 & endlocal
 setlocal & call BuildProp || exit /b 1 & endlocal
-setlocal & call BuildImages || exit /b 1 & endlocal
 setlocal & call BuildShared || exit /b 1 & endlocal
+setlocal & call BuildImages || exit /b 1 & endlocal
 REM setlocal & call BuildBP || exit /b 1 & endlocal
 setlocal & call BuildROM %* || exit /b 1 & endlocal

Source/CPM3/Build.cmd

@@ -85,37 +85,3 @@ rem copy genres.dat getcpm.dat
 rem *** Banked ***
 copy cpm3bnk.sys cpm3.sys
 copy genbnk.dat gencpm.dat
-
-if not exist ../../Binary/hd_cpm3.img goto :eof
-
-rem Update cpm_hd.img
-echo.
-echo.
-echo *** Update Disk Image ***
-echo.
-for %%f in (
-  cpmldr.com
-  ccp.com
-  gencpm.com
-  genres.dat
-  genbnk.dat
-  bios3.spr
-  bnkbios3.spr
-  bdos3.spr
-  bnkbdos3.spr
-  resbdos3.spr
-  cpm3res.sys
-  cpm3bnk.sys
-  gencpm.dat
-  cpm3.sys
-  readme.1st
-  cpm3fix.pat
-) do call :upd_img %%f
-
-goto :eof
-
-:upd_img
-echo   %1...
-cpmrm.exe -f wbw_hd0 ../../Binary/hd_cpm3.img 0:%1
-cpmcp.exe -f wbw_hd0 ../../Binary/hd_cpm3.img %1 0:%1
-goto :eof

Source/CPM3/diskdefs

@@ -1,417 +0,0 @@
-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 0
-  boottrk 2
-  os 2.2
-end
-
-# RomWBW 512KB ROM (128KB reserved, 384KB ROM Disk)
-
-diskdef wbw_rom512
-  seclen 512
-  tracks 12
-  sectrk 64
-  blocksize 2048
-  maxdir 256
-  skew 0
-  boottrk 0
-  os 2.2
-end
-
-# RomWBW 1024KB ROM (128KB reserved, 896KB ROM Disk)
-
-diskdef wbw_rom1024
-  seclen 512
-  tracks 28
-  sectrk 64
-  blocksize 2048
-  maxdir 256
-  skew 0
-  boottrk 0
-  os 2.2
-end
-
-# UNA 512KB ROM (128KB reserved, 384KB ROM Disk)
-
-diskdef una_rom512
-  seclen 512
-  tracks 12
-  sectrk 64
-  blocksize 2048
-  maxdir 256
-  skew 0
-  boottrk 0
-  os 2.2
-end
-
-# UNA 512KB ROM (128KB reserved, 896KB ROM Disk)
-
-diskdef una_rom1024
-  seclen 512
-  tracks 28
-  sectrk 64
-  blocksize 2048
-  maxdir 256
-  skew 0
-  boottrk 0
-  os 2.2
-end
-
-# RomWBW 8MB Hard Disk, LU 0-3
-diskdef wbw_hd0
-  seclen 512
-  tracks 65
-  sectrk 256
-  blocksize 4096
-  maxdir 512
-  skew 0
-  boottrk 1
-  os 2.2
-end
-
-diskdef wbw_hd1
-  seclen 512
-  tracks 130
-  sectrk 256
-  blocksize 4096
-  maxdir 512
-  skew 0
-  boottrk 66
-  os 2.2
-end
-
-diskdef wbw_hd2
-  seclen 512
-  tracks 195
-  sectrk 256
-  blocksize 4096
-  maxdir 512
-  skew 0
-  boottrk 131
-  os 2.2
-end
-
-diskdef wbw_hd3
-  seclen 512
-  tracks 260
-  sectrk 256
-  blocksize 4096
-  maxdir 512
-  skew 0
-  boottrk 196
-  os 2.2
-end
-
-# RomWBW 720K floppy media
-diskdef wbw_fd720
-  seclen 512
-  tracks 160
-  sectrk 9
-  blocksize 2048
-  maxdir 128
-  skew 0
-  boottrk 4
-  os 2.2
-end
-
-# RomWBW 1.44M floppy media
-diskdef wbw_fd144
-  seclen 512
-  tracks 160
-  sectrk 18
-  blocksize 2048
-  maxdir 256
-  skew 0
-  boottrk 2
-  os 2.2
-end
-
-# RomWBW 360K floppy media
-diskdef wbw_fd360
-  seclen 512
-  tracks 80
-  sectrk 9
-  blocksize 2048
-  maxdir 128
-  skew 0
-  boottrk 4
-  os 2.2
-end
-
-# RomWBW 1.20M floppy media
-diskdef wbw_fd120
-  seclen 512
-  tracks 160
-  sectrk 15
-  blocksize 2048
-  maxdir 256
-  skew 0
-  boottrk 2
-  os 2.2
-end

Source/Images/d_cpm22.txt

@@ -0,0 +1,22 @@
+#
+# Add RomWBW utilities
+#
+../../Binary/Apps/assign.com 0:
+../../Binary/Apps/fat.com 0:
+../../Binary/Apps/fdu.com 0:
+../../Binary/Apps/format.com 0:
+../../Binary/Apps/mode.com 0:
+../../Binary/Apps/osldr.com 0:
+../../Binary/Apps/rtc.com 0:
+../../Binary/Apps/survey.com 0:
+../../Binary/Apps/syscopy.com 0:
+../../Binary/Apps/sysgen.com 0:
+../../Binary/Apps/talk.com 0:
+../../Binary/Apps/timer.com 0:
+../../Binary/Apps/xm.com 0:
+../../Binary/Apps/inttest.com 0:
+#
+# Add Tune application and sample files
+#
+../../Binary/Apps/tune.com 3:
+../../Binary/Apps/Tunes/*.* 3:

Source/Images/d_cpm3.txt

@@ -0,0 +1,41 @@
+#
+# Add files from CPM3 build
+#
+../CPM3/cpmldr.com 0:
+../CPM3/ccp.com 0:
+../CPM3/gencpm.com 0:
+../CPM3/genres.dat 0:
+../CPM3/genbnk.dat 0:
+../CPM3/bios3.spr 0:
+../CPM3/bnkbios3.spr 0:
+../CPM3/bdos3.spr 0:
+../CPM3/bnkbdos3.spr 0:
+../CPM3/resbdos3.spr 0:
+../CPM3/cpm3res.sys 0:
+../CPM3/cpm3bnk.sys 0:
+../CPM3/gencpm.dat 0:
+../CPM3/cpm3.sys 0:
+../CPM3/readme.1st 0:
+../CPM3/cpm3fix.pat 0:
+#
+# Add RomWBW utilities
+#
+../../Binary/Apps/assign.com 0:
+../../Binary/Apps/fat.com 0:
+../../Binary/Apps/fdu.com 0:
+../../Binary/Apps/format.com 0:
+../../Binary/Apps/mode.com 0:
+../../Binary/Apps/osldr.com 0:
+../../Binary/Apps/rtc.com 0:
+../../Binary/Apps/survey.com 0:
+../../Binary/Apps/syscopy.com 0:
+../../Binary/Apps/sysgen.com 0:
+../../Binary/Apps/talk.com 0:
+../../Binary/Apps/timer.com 0:
+../../Binary/Apps/xm.com 0:
+../../Binary/Apps/inttest.com 0:
+#
+# Add Tune application and sample files
+#
+../../Binary/Apps/tune.com 3:
+../../Binary/Apps/Tunes/*.* 3:

Source/Images/d_nzcom.txt

@@ -0,0 +1,22 @@
+#
+# Add RomWBW utilities
+#
+../../Binary/Apps/assign.com 0:
+../../Binary/Apps/fat.com 0:
+../../Binary/Apps/fdu.com 0:
+../../Binary/Apps/format.com 0:
+../../Binary/Apps/mode.com 0:
+../../Binary/Apps/osldr.com 0:
+../../Binary/Apps/rtc.com 0:
+../../Binary/Apps/survey.com 0:
+../../Binary/Apps/syscopy.com 0:
+../../Binary/Apps/sysgen.com 0:
+../../Binary/Apps/talk.com 0:
+../../Binary/Apps/timer.com 0:
+../../Binary/Apps/xm.com 0:
+../../Binary/Apps/inttest.com 0:
+#
+# Add Tune application and sample files
+#
+../../Binary/Apps/tune.com 3:
+../../Binary/Apps/Tunes/*.* 3:

Source/Images/d_zpm3.txt

@@ -0,0 +1,39 @@
+#
+# Add files from CPM3 build
+#
+../ZPM3/zpmldr.com 0:
+../ZPM3/cpmldr.com 0:
+../ZPM3/autotog.com 0:
+../ZPM3/clrhist.com 0:
+../ZPM3/setz3.com 0:
+../ZPM3/cpm3.sys 0:
+../ZPM3/zccp.com 0:
+../ZPM3/zinstal.zpm 0:
+../ZPM3/startzpm.com 0:
+../ZPM3/makedos.com 0:
+../ZPM3/gencpm.dat 0:
+../ZPM3/bnkbios3.spr 0:
+../ZPM3/bnkbdos3.spr 0:
+../ZPM3/resbdos3.spr 0:
+#
+# Add RomWBW utilities
+#
+../../Binary/Apps/assign.com 0:
+../../Binary/Apps/fat.com 0:
+../../Binary/Apps/fdu.com 0:
+../../Binary/Apps/format.com 0:
+../../Binary/Apps/mode.com 0:
+../../Binary/Apps/osldr.com 0:
+../../Binary/Apps/rtc.com 0:
+../../Binary/Apps/survey.com 0:
+../../Binary/Apps/syscopy.com 0:
+../../Binary/Apps/sysgen.com 0:
+../../Binary/Apps/talk.com 0:
+../../Binary/Apps/timer.com 0:
+../../Binary/Apps/xm.com 0:
+../../Binary/Apps/inttest.com 0:
+#
+# Add Tune application and sample files
+#
+../../Binary/Apps/tune.com 3:
+../../Binary/Apps/Tunes/*.* 3:

Source/Images/d_zsdos.txt

@@ -0,0 +1,22 @@
+#
+# Add RomWBW utilities
+#
+../../Binary/Apps/assign.com 0:
+../../Binary/Apps/fat.com 0:
+../../Binary/Apps/fdu.com 0:
+../../Binary/Apps/format.com 0:
+../../Binary/Apps/mode.com 0:
+../../Binary/Apps/osldr.com 0:
+../../Binary/Apps/rtc.com 0:
+../../Binary/Apps/survey.com 0:
+../../Binary/Apps/syscopy.com 0:
+../../Binary/Apps/sysgen.com 0:
+../../Binary/Apps/talk.com 0:
+../../Binary/Apps/timer.com 0:
+../../Binary/Apps/xm.com 0:
+../../Binary/Apps/inttest.com 0:
+#
+# Add Tune application and sample files
+#
+../../Binary/Apps/tune.com 3:
+../../Binary/Apps/Tunes/*.* 3:

Source/ReadMe.txt

@@ -101,8 +101,9 @@ to determine the <plt> component of the configuration filename:
 	RC2014 w/ Z80	RCZ80_std.rom
 	RC2014 w/ Z180	RCZ180_nat.rom	(native Z180 memory addressing)
 	RC2014 w/ Z180	RCZ180_ext.rom	(external 512K RAM/ROM module)
-	SC-series	SC126, SC130
+	SCZ180		SC126, SC130
 	Easy Z80	EZZ180_std.rom
+	Dyno		DYNO_std.rom
 
 You can use any name you choose for the <cfg> component of the 
 configuration filename.  So, let's say you want to create a custom 
@@ -189,7 +190,7 @@ This command will prompt you twice as it runs.  These prompts
 determine the platform and configuration to be built.  The first 
 prompt is for the platform, as shown below:
 
-    Platform [SBC|ZETA|ZETA2|RCZ80|EZZ80|RCZ180|N8|MK4|UNA]:
+    Platform [SBC|ZETA|ZETA2|RCZ80|EZZ80|UNA|N8|MK4|RCZ180|SCZ180|DYNO]:
 
 Enter the option corresponding to the platform of the ROM firmware 
 you are building.  If you enter something other than one of the 
@@ -304,6 +305,7 @@ BuildImages: RomWBW has the ability to create floppy disk and hard
 	     and will turn them into a writable disk image.  Refer
 	     to the ReadMe.txt document in the Source\Images
 	     directory for a detailed description of this process.
+	     N.B., BuildShared must be run prior to BuildImages.
 
 BuildBP: This command builds another OS variant called BPBIOS.  It
          is a work in progress and should not be used at this time

Source/ZPM3/Build.cmd

@@ -34,34 +34,3 @@ echo.
 copy genbnk.dat gencpm.dat
 zx gencpm -auto -display
 rem pause
-
-if not exist ../../Binary/hd_zpm3.img goto :eof
-
-rem Update hd_zpm3.img
-echo.
-echo.
-echo *** Update Disk Image ***
-echo.
-for %%f in (
-  zpmldr.com
-  cpmldr.com
-  autotog.com
-  clrhist.com
-  setz3.com
-  cpm3.sys
-  zccp.com
-  zinstal.zpm
-  startzpm.com
-  makedos.com
-  gencpm.dat
-  bnkbios3.spr
-  bnkbdos3.spr
-  resbdos3.spr
-) do call :upd_img %%f
-goto :eof
-
-:upd_img
-echo   %1...
-cpmrm.exe -f wbw_hd0 ../../Binary/hd_zpm3.img 0:%1
-cpmcp.exe -f wbw_hd0 ../../Binary/hd_zpm3.img %1 0:%1
-goto :eof

Source/ZPM3/diskdefs

@@ -1,417 +0,0 @@
-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 0
-  boottrk 2
-  os 2.2
-end
-
-# RomWBW 512KB ROM (128KB reserved, 384KB ROM Disk)
-
-diskdef wbw_rom512
-  seclen 512
-  tracks 12
-  sectrk 64
-  blocksize 2048
-  maxdir 256
-  skew 0
-  boottrk 0
-  os 2.2
-end
-
-# RomWBW 1024KB ROM (128KB reserved, 896KB ROM Disk)
-
-diskdef wbw_rom1024
-  seclen 512
-  tracks 28
-  sectrk 64
-  blocksize 2048
-  maxdir 256
-  skew 0
-  boottrk 0
-  os 2.2
-end
-
-# UNA 512KB ROM (128KB reserved, 384KB ROM Disk)
-
-diskdef una_rom512
-  seclen 512
-  tracks 12
-  sectrk 64
-  blocksize 2048
-  maxdir 256
-  skew 0
-  boottrk 0
-  os 2.2
-end
-
-# UNA 512KB ROM (128KB reserved, 896KB ROM Disk)
-
-diskdef una_rom1024
-  seclen 512
-  tracks 28
-  sectrk 64
-  blocksize 2048
-  maxdir 256
-  skew 0
-  boottrk 0
-  os 2.2
-end
-
-# RomWBW 8MB Hard Disk, LU 0-3
-diskdef wbw_hd0
-  seclen 512
-  tracks 65
-  sectrk 256
-  blocksize 4096
-  maxdir 512
-  skew 0
-  boottrk 1
-  os 2.2
-end
-
-diskdef wbw_hd1
-  seclen 512
-  tracks 130
-  sectrk 256
-  blocksize 4096
-  maxdir 512
-  skew 0
-  boottrk 66
-  os 2.2
-end
-
-diskdef wbw_hd2
-  seclen 512
-  tracks 195
-  sectrk 256
-  blocksize 4096
-  maxdir 512
-  skew 0
-  boottrk 131
-  os 2.2
-end
-
-diskdef wbw_hd3
-  seclen 512
-  tracks 260
-  sectrk 256
-  blocksize 4096
-  maxdir 512
-  skew 0
-  boottrk 196
-  os 2.2
-end
-
-# RomWBW 720K floppy media
-diskdef wbw_fd720
-  seclen 512
-  tracks 160
-  sectrk 9
-  blocksize 2048
-  maxdir 128
-  skew 0
-  boottrk 4
-  os 2.2
-end
-
-# RomWBW 1.44M floppy media
-diskdef wbw_fd144
-  seclen 512
-  tracks 160
-  sectrk 18
-  blocksize 2048
-  maxdir 256
-  skew 0
-  boottrk 2
-  os 2.2
-end
-
-# RomWBW 360K floppy media
-diskdef wbw_fd360
-  seclen 512
-  tracks 80
-  sectrk 9
-  blocksize 2048
-  maxdir 128
-  skew 0
-  boottrk 4
-  os 2.2
-end
-
-# RomWBW 1.20M floppy media
-diskdef wbw_fd120
-  seclen 512
-  tracks 160
-  sectrk 15
-  blocksize 2048
-  maxdir 256
-  skew 0
-  boottrk 2
-  os 2.2
-end