From a4f2cd8c119b0b0f892e440b7d448f7e6dd4933e Mon Sep 17 00:00:00 2001 From: Wayne Warthen Date: Tue, 15 Oct 2019 14:21:10 -0700 Subject: [PATCH] Fix CPM3 Build Credit to Phil Summers for finding the missing diskdefs files. --- Source/CPM3/DISKDEFS | 417 +++++++++++++++++++++++++++++++++++++++++ Source/CPM3/genres.old | 158 ---------------- Source/ZPM3/DISKDEFS | 417 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 834 insertions(+), 158 deletions(-) create mode 100644 Source/CPM3/DISKDEFS delete mode 100644 Source/CPM3/genres.old create mode 100644 Source/ZPM3/DISKDEFS diff --git a/Source/CPM3/DISKDEFS b/Source/CPM3/DISKDEFS new file mode 100644 index 00000000..937bfcf2 --- /dev/null +++ b/Source/CPM3/DISKDEFS @@ -0,0 +1,417 @@ +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 diff --git a/Source/CPM3/genres.old b/Source/CPM3/genres.old deleted file mode 100644 index 75b45a49..00000000 --- a/Source/CPM3/genres.old +++ /dev/null @@ -1,158 +0,0 @@ -PRTMSG = Y -PAGWID = 4F -PAGLEN = 17 -BACKSPC = N -RUBOUT = N -BOOTDRV = A -MEMTOP = FD -BNKSWT = N -COMBAS = 00 -LERROR = Y -NUMSEGS = 03 -MEMSEG00 = 00,80,00 -MEMSEG01 = 00,C0,02 -MEMSEG02 = 00,C0,03 -MEMSEG03 = 00,C0,04 -MEMSEG04 = 00,C0,05 -MEMSEG05 = 00,C0,06 -MEMSEG06 = 00,C0,07 -MEMSEG07 = 00,C0,08 -MEMSEG08 = 00,C0,09 -MEMSEG09 = 00,C0,0A -MEMSEG0A = 00,C0,0B -MEMSEG0B = 00,C0,0C -MEMSEG0C = 00,C0,0D -MEMSEG0D = 00,C0,0E -MEMSEG0E = 00,C0,0F -MEMSEG0F = 00,C0,10 -HASHDRVA = N -HASHDRVB = Y -HASHDRVC = Y -HASHDRVD = Y -HASHDRVE = Y -HASHDRVF = Y -HASHDRVG = Y -HASHDRVH = Y -HASHDRVI = Y -HASHDRVJ = Y -HASHDRVK = Y -HASHDRVL = Y -HASHDRVM = Y -HASHDRVN = Y -HASHDRVO = Y -HASHDRVP = Y -ALTBNKSA = N -ALTBNKSB = N -ALTBNKSC = N -ALTBNKSD = N -ALTBNKSE = N -ALTBNKSF = N -ALTBNKSG = N -ALTBNKSH = N -ALTBNKSI = N -ALTBNKSJ = N -ALTBNKSK = N -ALTBNKSL = N -ALTBNKSM = N -ALTBNKSN = N -ALTBNKSO = N -ALTBNKSP = N -NDIRRECA = 01 -NDIRRECB = 01 -NDIRRECC = 01 -NDIRRECD = 01 -NDIRRECE = 01 -NDIRRECF = 01 -NDIRRECG = 01 -NDIRRECH = 01 -NDIRRECI = 01 -NDIRRECJ = 01 -NDIRRECK = 01 -NDIRRECL = 01 -NDIRRECM = 01 -NDIRRECN = 01 -NDIRRECO = 01 -NDIRRECP = 01 -NDTARECA = 01 -NDTARECB = 01 -NDTARECC = 01 -NDTARECD = 01 -NDTARECE = 01 -NDTARECF = 01 -NDTARECG = 01 -NDTARECH = 01 -NDTARECI = 01 -NDTARECJ = 01 -NDTARECK = 01 -NDTARECL = 01 -NDTARECM = 01 -NDTARECN = 01 -NDTARECO = 01 -NDTARECP = 01 -ODIRDRVA = A -ODIRDRVB = A -ODIRDRVC = A -ODIRDRVD = A -ODIRDRVE = A -ODIRDRVF = A -ODIRDRVG = A -ODIRDRVH = A -ODIRDRVI = A -ODIRDRVJ = A -ODIRDRVK = A -ODIRDRVL = A -ODIRDRVM = A -ODIRDRVN = A -ODIRDRVO = A -ODIRDRVP = A -ODTADRVA = A -ODTADRVB = A -ODTADRVC = A -ODTADRVD = A -ODTADRVE = A -ODTADRVF = A -ODTADRVG = A -ODTADRVH = A -ODTADRVI = A -ODTADRVJ = A -ODTADRVK = A -ODTADRVL = A -ODTADRVM = A -ODTADRVN = A -ODTADRVO = A -ODTADRVP = A -OVLYDIRA = Y -OVLYDIRB = Y -OVLYDIRC = Y -OVLYDIRD = Y -OVLYDIRE = Y -OVLYDIRF = Y -OVLYDIRG = Y -OVLYDIRH = Y -OVLYDIRI = Y -OVLYDIRJ = Y -OVLYDIRK = Y -OVLYDIRL = Y -OVLYDIRM = Y -OVLYDIRN = Y -OVLYDIRO = Y -OVLYDIRP = Y -OVLYDTAA = Y -OVLYDTAB = Y -OVLYDTAC = Y -OVLYDTAD = Y -OVLYDTAE = Y -OVLYDTAF = Y -OVLYDTAG = Y -OVLYDTAH = Y -OVLYDTAI = Y -OVLYDTAJ = Y -OVLYDTAK = Y -OVLYDTAL = Y -OVLYDTAM = Y -OVLYDTAN = Y -OVLYDTAO = Y -OVLYDTAP = Y -CRDATAF = N -DBLALV = N - \ No newline at end of file diff --git a/Source/ZPM3/DISKDEFS b/Source/ZPM3/DISKDEFS new file mode 100644 index 00000000..937bfcf2 --- /dev/null +++ b/Source/ZPM3/DISKDEFS @@ -0,0 +1,417 @@ +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