From eda219faa2a24a5bba96c16ab86a82af4532b7bb Mon Sep 17 00:00:00 2001 From: Kelvin Sherlock Date: Sat, 15 Jan 2022 10:54:18 -0500 Subject: [PATCH] Tested and excluded extra CD ROM devices. They were previously excluded from the machine descriptions but they now need to be excluded from the ROM file as well. --- Ample/Resources/roms.plist | 11 ----------- python/mkmachines.py | 23 ++++++++++++++++++++++- python/mkroms.py | 15 +++++++++++++++ 3 files changed, 37 insertions(+), 12 deletions(-) diff --git a/Ample/Resources/roms.plist b/Ample/Resources/roms.plist index 75d30df..c16aac8 100644 --- a/Ample/Resources/roms.plist +++ b/Ample/Resources/roms.plist @@ -66,7 +66,6 @@ am100 am64 ap2000 - aplcd150 apple1 apple2 apple2c @@ -92,26 +91,17 @@ aprissi basis108 ccs7710 - cdd2000 - cdr4210 - cdrn820s - cdu415 - cdu561_25 - cdu75s cec2000 cece cecg ceci cecm cffa1 - cfp1080s cga chessmachine cmsscsi comx_pl80 craft2p - crd254sh - cw7501 d2fdc diskii13 dodo @@ -191,7 +181,6 @@ prav8c prav8m qsound - smoc501 softcard3 space84 spectred diff --git a/python/mkmachines.py b/python/mkmachines.py index 53caa27..e908311 100644 --- a/python/mkmachines.py +++ b/python/mkmachines.py @@ -17,8 +17,29 @@ from machines import MACHINES, SLOTS, SLOT_NAMES # Inside Macintosh: Devices chapter 2 explains the Nubus slot name scheme # (essentially $01-$0e; $0 and $f are reserved) # -# TODO -midiin, -midiout, -printout, -bitbanger +# TODO -printout +# +# SCSI devices: +# ROM 1, a2scsi, golden orchard, as of 239 wip: +# cdrom - CDROM +# aplcdsc - Apple SCSI CDROM +# +# these are all skeleton drivers and generally require a ROM. +# +# aplcd150 - Apple CD 150 - bad dump, known problems warning, shows in finder as hard drive +# cdrn820s - Caravell CDR-N820s - shows in finder as hard drive +# cfp1080s - known problems warning, shows as hard drive +# cdr4210 - known problems warning, shows as hard drive +# cw7501 - known problems warning, shows as hard drive +# cdd2000 - known problems warning, shows as hard drive +# crd254sh - known problems warning, shows as hard drive +# cdu415 - known problems warning, shows as hard drive +# cdu561_25 - known problems warning, shows as hard drive +# smoc501 - known problems warning, shows as hard drive +# cdu75s - known problems warning, shows as hard drive +# +# # don't allow these for now. generally because they add floppy/hard drives diff --git a/python/mkroms.py b/python/mkroms.py index ab031e6..b53c76f 100644 --- a/python/mkroms.py +++ b/python/mkroms.py @@ -93,6 +93,21 @@ EXCLUDE = set([ 'maciix', 'kb_pc83', + +# ROMs for CD Drives, etc, that are intentionally hidden +# due to lack of functionality. + 'aplcd150', + 'cdd2000', + 'cdr4210', + 'cdrn820s', + 'cdu415', + 'cdu561_25', + 'cdu75s', + 'cfp1080s', + 'crd254sh', + 'cw7501', + 'smoc501', + ])