From 94dfbc6e3eda2d157452db038c4abc54025a4ad2 Mon Sep 17 00:00:00 2001 From: Kelvin Sherlock Date: Fri, 26 Mar 2021 22:21:56 -0400 Subject: [PATCH] mac2fdhd needed as parent of se/30, etc. --- Ample.xcodeproj/project.pbxproj | 12 + Ample/Resources/mac2fdhd.plist | 1305 +++++++++++++++++++++++++++++++ Ample/Resources/maciihmu.plist | 1305 +++++++++++++++++++++++++++++++ Ample/Resources/models.plist | 12 + Ample/Resources/roms.plist | 2 + python/machines.py | 2 +- python/mkmodels.py | 2 +- python/mkroms.py | 1 + 8 files changed, 2639 insertions(+), 2 deletions(-) create mode 100644 Ample/Resources/mac2fdhd.plist create mode 100644 Ample/Resources/maciihmu.plist diff --git a/Ample.xcodeproj/project.pbxproj b/Ample.xcodeproj/project.pbxproj index 2bc924f..ddf026a 100644 --- a/Ample.xcodeproj/project.pbxproj +++ b/Ample.xcodeproj/project.pbxproj @@ -80,6 +80,10 @@ B6374ADE260ECB400045CA16 /* maciivx.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6374ACF260ECB3F0045CA16 /* maciivx.plist */; }; B6374ADF260ECB400045CA16 /* macse30.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6374AD0260ECB400045CA16 /* macse30.plist */; }; B6374AE0260ECB400045CA16 /* macse30.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6374AD0260ECB400045CA16 /* macse30.plist */; }; + B6374AE3260ECDDD0045CA16 /* maciihmu.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6374AE1260ECDDD0045CA16 /* maciihmu.plist */; }; + B6374AE4260ECDDD0045CA16 /* maciihmu.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6374AE1260ECDDD0045CA16 /* maciihmu.plist */; }; + B6374AE5260ECDDD0045CA16 /* mac2fdhd.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6374AE2260ECDDD0045CA16 /* mac2fdhd.plist */; }; + B6374AE6260ECDDD0045CA16 /* mac2fdhd.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6374AE2260ECDDD0045CA16 /* mac2fdhd.plist */; }; B63C1B8B24FF4BF700511A71 /* Ample.m in Sources */ = {isa = PBXBuildFile; fileRef = B63C1B8A24FF4BF700511A71 /* Ample.m */; }; B63C1B8C24FF4BF700511A71 /* Ample.m in Sources */ = {isa = PBXBuildFile; fileRef = B63C1B8A24FF4BF700511A71 /* Ample.m */; }; B63C1B8E25004C6D00511A71 /* mame-data.tgz in Resources */ = {isa = PBXBuildFile; fileRef = B63C1B8D25004C6D00511A71 /* mame-data.tgz */; }; @@ -373,6 +377,8 @@ B6374ACE260ECB3F0045CA16 /* maciix.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = maciix.plist; sourceTree = ""; }; B6374ACF260ECB3F0045CA16 /* maciivx.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = maciivx.plist; sourceTree = ""; }; B6374AD0260ECB400045CA16 /* macse30.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = macse30.plist; sourceTree = ""; }; + B6374AE1260ECDDD0045CA16 /* maciihmu.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = maciihmu.plist; sourceTree = ""; }; + B6374AE2260ECDDD0045CA16 /* mac2fdhd.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = mac2fdhd.plist; sourceTree = ""; }; B63C1B8924FF4B7100511A71 /* Ample.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Ample.h; sourceTree = ""; }; B63C1B8A24FF4BF700511A71 /* Ample.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Ample.m; sourceTree = ""; }; B63C1B8D25004C6D00511A71 /* mame-data.tgz */ = {isa = PBXFileReference; lastKnownFileType = file; name = "mame-data.tgz"; path = "embedded/mame-data.tgz"; sourceTree = ""; }; @@ -570,6 +576,7 @@ B6109A0224F5F371005CB652 /* uniap2ti.plist */, B63C1BA7250192E600511A71 /* zijini.plist */, B6DE323D2605482400418375 /* mac128k.plist */, + B6374AE2260ECDDD0045CA16 /* mac2fdhd.plist */, B6DE32422605482500418375 /* mac512k.plist */, B6DE323F2605482400418375 /* mac512ke.plist */, B6374AC9260ECB3F0045CA16 /* macclas2.plist */, @@ -581,6 +588,7 @@ B6374ACC260ECB3F0045CA16 /* maciivi.plist */, B6374ACF260ECB3F0045CA16 /* maciivx.plist */, B6374ACE260ECB3F0045CA16 /* maciix.plist */, + B6374AE1260ECDDD0045CA16 /* maciihmu.plist */, B6DD1FE725B407E6004A3242 /* maclc.plist */, B65085B625B616AC00354EC9 /* maclc2.plist */, B65085B725B616AC00354EC9 /* maclc3.plist */, @@ -935,6 +943,7 @@ B64AF1EE250EC35B00A09B9B /* DiskImages.xib in Resources */, B6109A3B24F5F377005CB652 /* apple2gsr1.plist in Resources */, B65085BD25B616AC00354EC9 /* maciici.plist in Resources */, + B6374AE3260ECDDD0045CA16 /* maciihmu.plist in Resources */, B6374ADF260ECB400045CA16 /* macse30.plist in Resources */, B63C1F1225B147E10016A611 /* CheatSheet.html in Resources */, B63C1B9625008A2700511A71 /* DownloadWindow.xib in Resources */, @@ -944,6 +953,7 @@ B6109A1B24F5F377005CB652 /* uniap2pt.plist in Resources */, B6109A3724F5F377005CB652 /* las128e2.plist in Resources */, B61099E824F5F231005CB652 /* MediaView.xib in Resources */, + B6374AE5260ECDDD0045CA16 /* mac2fdhd.plist in Resources */, B63C1B90250088DD00511A71 /* roms.plist in Resources */, B6109A2724F5F377005CB652 /* uniap2en.plist in Resources */, B6109A2A24F5F377005CB652 /* apple3.plist in Resources */, @@ -970,6 +980,7 @@ buildActionMask = 2147483647; files = ( B6DDECCF2505A86E0093587A /* eject-16x16@3x.png in Resources */, + B6374AE6260ECDDD0045CA16 /* mac2fdhd.plist in Resources */, B6374ADC260ECB400045CA16 /* maciix.plist in Resources */, B6E4B5BC24FDE2670094A35C /* apple2eeuk.plist in Resources */, B63C1BA0250192D800511A71 /* ceci.plist in Resources */, @@ -1030,6 +1041,7 @@ B63C1BA4250192D800511A71 /* cec2000.plist in Resources */, B6DDECD32505A86E0093587A /* eject-hover-16x16@2x.png in Resources */, B6E4B5DC24FDE2670094A35C /* hkc8800a.plist in Resources */, + B6374AE4260ECDDD0045CA16 /* maciihmu.plist in Resources */, B6DDECC525057A550093587A /* drag-handle-4x10@3x.png in Resources */, B6E4B5DD24FDE2670094A35C /* apple2gsr0.plist in Resources */, B6DE323C26044DB800418375 /* caution@3x.png in Resources */, diff --git a/Ample/Resources/mac2fdhd.plist b/Ample/Resources/mac2fdhd.plist new file mode 100644 index 0000000..2bbf249 --- /dev/null +++ b/Ample/Resources/mac2fdhd.plist @@ -0,0 +1,1305 @@ + + + + + value + mac2fdhd + description + Macintosh II (FDHD) + media + + hard + 2 + + resolution + + 640 + 480 + + slots + + + name + ramsize + description + RAM + options + + + intValue + 2097152 + description + 2M + value + 2M + default + + + + intValue + 8388608 + description + 8M + value + 8M + default + + + + intValue + 33554432 + description + 32M + value + 32M + default + + + + intValue + 67108864 + description + 64M + value + 64M + default + + + + intValue + 100663296 + description + 96M + value + 96M + default + + + + intValue + 134217728 + description + 128M + value + 128M + default + + + + + + name + smartport + description + Disk Drives + options + + + value + + description + + devname + smartport + default + + + + + + name + nb9 + description + Slot 9 + options + + + value + + description + —None— + default + + + + value + 48gc + description + Apple 4*8 video card + default + + devname + nb_48gc + + + value + 824gc + description + Apple 8*24 video card + devname + nb_824gc + + + value + enetnb + description + Apple NuBus Ethernet card + devname + nb_aenet + + + value + quadralink + description + Applied Engineering Quadralink serial card + devname + nb_qdlink + + + value + asmc3nb + description + Asante MC3NB Ethernet card + devname + nb_amc3b + + + value + bootbug + description + Brigent BootBug debugger card + devname + nb_btbug + + + value + m2hires + description + Macintosh II Hi-Resolution video card + devname + nb_m2hr + + + value + portrait + description + Macintosh II Portrait Video Card + devname + nb_wspt + + + value + m2video + description + Macintosh II Video Card + devname + nb_m2vc + + + value + vikbw + description + Moniterm Viking video card + devname + nb_vikbw + + + value + image + description + NuBus Disk Image Pseudo-Card + devname + nb_image + media + + pseudo_disk + 1 + + + + value + radiustpd + description + Radius Two Page Display video card + devname + nb_rtpd + + + value + cb264 + description + RasterOps ColorBoard 264 video card + devname + nb_c264 + + + value + laserview + description + Sigma Designs LaserView video card + devname + nb_laserview + + + value + specpdq + description + SuperMac Spectrum PDQ video card + devname + nb_spdq + + + value + spec8s3 + description + SuperMac Spectrum/8 Series III video card + devname + nb_sp8s3 + + + + + name + nba + description + Slot A + options + + + value + + description + —None— + default + + + + value + 48gc + description + Apple 4*8 video card + devname + nb_48gc + + + value + 824gc + description + Apple 8*24 video card + devname + nb_824gc + + + value + enetnb + description + Apple NuBus Ethernet card + devname + nb_aenet + + + value + quadralink + description + Applied Engineering Quadralink serial card + devname + nb_qdlink + + + value + asmc3nb + description + Asante MC3NB Ethernet card + devname + nb_amc3b + + + value + bootbug + description + Brigent BootBug debugger card + devname + nb_btbug + + + value + m2hires + description + Macintosh II Hi-Resolution video card + devname + nb_m2hr + + + value + portrait + description + Macintosh II Portrait Video Card + devname + nb_wspt + + + value + m2video + description + Macintosh II Video Card + devname + nb_m2vc + + + value + vikbw + description + Moniterm Viking video card + devname + nb_vikbw + + + value + image + description + NuBus Disk Image Pseudo-Card + devname + nb_image + media + + pseudo_disk + 1 + + + + value + radiustpd + description + Radius Two Page Display video card + devname + nb_rtpd + + + value + cb264 + description + RasterOps ColorBoard 264 video card + devname + nb_c264 + + + value + laserview + description + Sigma Designs LaserView video card + devname + nb_laserview + + + value + specpdq + description + SuperMac Spectrum PDQ video card + devname + nb_spdq + + + value + spec8s3 + description + SuperMac Spectrum/8 Series III video card + devname + nb_sp8s3 + + + + + name + nbb + description + Slot B + options + + + value + + description + —None— + default + + + + value + 48gc + description + Apple 4*8 video card + devname + nb_48gc + + + value + 824gc + description + Apple 8*24 video card + devname + nb_824gc + + + value + enetnb + description + Apple NuBus Ethernet card + devname + nb_aenet + + + value + quadralink + description + Applied Engineering Quadralink serial card + devname + nb_qdlink + + + value + asmc3nb + description + Asante MC3NB Ethernet card + devname + nb_amc3b + + + value + bootbug + description + Brigent BootBug debugger card + devname + nb_btbug + + + value + m2hires + description + Macintosh II Hi-Resolution video card + devname + nb_m2hr + + + value + portrait + description + Macintosh II Portrait Video Card + devname + nb_wspt + + + value + m2video + description + Macintosh II Video Card + devname + nb_m2vc + + + value + vikbw + description + Moniterm Viking video card + devname + nb_vikbw + + + value + image + description + NuBus Disk Image Pseudo-Card + devname + nb_image + media + + pseudo_disk + 1 + + + + value + radiustpd + description + Radius Two Page Display video card + devname + nb_rtpd + + + value + cb264 + description + RasterOps ColorBoard 264 video card + devname + nb_c264 + + + value + laserview + description + Sigma Designs LaserView video card + devname + nb_laserview + + + value + specpdq + description + SuperMac Spectrum PDQ video card + devname + nb_spdq + + + value + spec8s3 + description + SuperMac Spectrum/8 Series III video card + devname + nb_sp8s3 + + + + + name + nbc + description + Slot C + options + + + value + + description + —None— + default + + + + value + 48gc + description + Apple 4*8 video card + devname + nb_48gc + + + value + 824gc + description + Apple 8*24 video card + devname + nb_824gc + + + value + enetnb + description + Apple NuBus Ethernet card + devname + nb_aenet + + + value + quadralink + description + Applied Engineering Quadralink serial card + devname + nb_qdlink + + + value + asmc3nb + description + Asante MC3NB Ethernet card + devname + nb_amc3b + + + value + bootbug + description + Brigent BootBug debugger card + devname + nb_btbug + + + value + m2hires + description + Macintosh II Hi-Resolution video card + devname + nb_m2hr + + + value + portrait + description + Macintosh II Portrait Video Card + devname + nb_wspt + + + value + m2video + description + Macintosh II Video Card + devname + nb_m2vc + + + value + vikbw + description + Moniterm Viking video card + devname + nb_vikbw + + + value + image + description + NuBus Disk Image Pseudo-Card + devname + nb_image + media + + pseudo_disk + 1 + + + + value + radiustpd + description + Radius Two Page Display video card + devname + nb_rtpd + + + value + cb264 + description + RasterOps ColorBoard 264 video card + devname + nb_c264 + + + value + laserview + description + Sigma Designs LaserView video card + devname + nb_laserview + + + value + specpdq + description + SuperMac Spectrum PDQ video card + devname + nb_spdq + + + value + spec8s3 + description + SuperMac Spectrum/8 Series III video card + devname + nb_sp8s3 + + + + + name + nbd + description + Slot D + options + + + value + + description + —None— + default + + + + value + 48gc + description + Apple 4*8 video card + devname + nb_48gc + + + value + 824gc + description + Apple 8*24 video card + devname + nb_824gc + + + value + enetnb + description + Apple NuBus Ethernet card + devname + nb_aenet + + + value + quadralink + description + Applied Engineering Quadralink serial card + devname + nb_qdlink + + + value + asmc3nb + description + Asante MC3NB Ethernet card + devname + nb_amc3b + + + value + bootbug + description + Brigent BootBug debugger card + devname + nb_btbug + + + value + m2hires + description + Macintosh II Hi-Resolution video card + devname + nb_m2hr + + + value + portrait + description + Macintosh II Portrait Video Card + devname + nb_wspt + + + value + m2video + description + Macintosh II Video Card + devname + nb_m2vc + + + value + vikbw + description + Moniterm Viking video card + devname + nb_vikbw + + + value + image + description + NuBus Disk Image Pseudo-Card + devname + nb_image + media + + pseudo_disk + 1 + + + + value + radiustpd + description + Radius Two Page Display video card + devname + nb_rtpd + + + value + cb264 + description + RasterOps ColorBoard 264 video card + devname + nb_c264 + + + value + laserview + description + Sigma Designs LaserView video card + devname + nb_laserview + + + value + specpdq + description + SuperMac Spectrum PDQ video card + devname + nb_spdq + + + value + spec8s3 + description + SuperMac Spectrum/8 Series III video card + devname + nb_sp8s3 + + + + + name + nbe + description + Slot E + options + + + value + + description + —None— + default + + + + value + 48gc + description + Apple 4*8 video card + devname + nb_48gc + + + value + 824gc + description + Apple 8*24 video card + devname + nb_824gc + + + value + enetnb + description + Apple NuBus Ethernet card + devname + nb_aenet + + + value + quadralink + description + Applied Engineering Quadralink serial card + devname + nb_qdlink + + + value + asmc3nb + description + Asante MC3NB Ethernet card + devname + nb_amc3b + + + value + bootbug + description + Brigent BootBug debugger card + devname + nb_btbug + + + value + m2hires + description + Macintosh II Hi-Resolution video card + devname + nb_m2hr + + + value + portrait + description + Macintosh II Portrait Video Card + devname + nb_wspt + + + value + m2video + description + Macintosh II Video Card + devname + nb_m2vc + + + value + vikbw + description + Moniterm Viking video card + devname + nb_vikbw + + + value + image + description + NuBus Disk Image Pseudo-Card + devname + nb_image + media + + pseudo_disk + 1 + + + + value + radiustpd + description + Radius Two Page Display video card + devname + nb_rtpd + + + value + cb264 + description + RasterOps ColorBoard 264 video card + devname + nb_c264 + + + value + laserview + description + Sigma Designs LaserView video card + devname + nb_laserview + + + value + specpdq + description + SuperMac Spectrum PDQ video card + devname + nb_spdq + + + value + spec8s3 + description + SuperMac Spectrum/8 Series III video card + devname + nb_sp8s3 + + + + + devices + + + name + smartport + slots + + + name + fdc:0 + options + + + value + + description + —None— + default + + + + value + 35dd + description + 3.5" DD + default + + media + + floppy_3_5 + 1 + + + + value + 35hd + description + 3.5" HD + default + + media + + floppy_3_5 + 1 + + + + value + 35sd + description + 3.5" SD + default + + media + + floppy_3_5 + 1 + + + + + + name + fdc:1 + options + + + value + + description + —None— + default + + + + value + 35dd + description + 3.5" DD + default + + media + + floppy_3_5 + 1 + + + + value + 35hd + description + 3.5" HD + default + + media + + floppy_3_5 + 1 + + + + value + 35sd + description + 3.5" SD + default + + media + + floppy_3_5 + 1 + + + + + + + + name + nb_btbug + slots + + + name + :serport0 + options + + + value + + description + —None— + default + + + + value + null_modem + description + RS232 Null Modem + default + + + + value + terminal + description + Serial Terminal + default + + + + + + + + name + nb_qdlink + slots + + + name + :serport0 + options + + + value + + description + —None— + default + + + + value + null_modem + description + RS232 Null Modem + default + + + + value + terminal + description + Serial Terminal + default + + + + + + name + :serport1 + options + + + value + + description + —None— + default + + + + value + null_modem + description + RS232 Null Modem + default + + + + value + terminal + description + Serial Terminal + default + + + + + + name + :serport2 + options + + + value + + description + —None— + default + + + + value + null_modem + description + RS232 Null Modem + default + + + + value + terminal + description + Serial Terminal + default + + + + + + name + :serport3 + options + + + value + + description + —None— + default + + + + value + null_modem + description + RS232 Null Modem + default + + + + value + terminal + description + Serial Terminal + default + + + + + + + + software + + mac_hdd.xml + mac_flop.xml + + + diff --git a/Ample/Resources/maciihmu.plist b/Ample/Resources/maciihmu.plist new file mode 100644 index 0000000..88ccddd --- /dev/null +++ b/Ample/Resources/maciihmu.plist @@ -0,0 +1,1305 @@ + + + + + value + maciihmu + description + Macintosh II (w/o 68851 MMU) + media + + hard + 2 + + resolution + + 640 + 480 + + slots + + + name + ramsize + description + RAM + options + + + intValue + 2097152 + description + 2M + value + 2M + default + + + + intValue + 8388608 + description + 8M + value + 8M + default + + + + intValue + 33554432 + description + 32M + value + 32M + default + + + + intValue + 67108864 + description + 64M + value + 64M + default + + + + intValue + 100663296 + description + 96M + value + 96M + default + + + + intValue + 134217728 + description + 128M + value + 128M + default + + + + + + name + smartport + description + Disk Drives + options + + + value + + description + + devname + smartport + default + + + + + + name + nb9 + description + Slot 9 + options + + + value + + description + —None— + default + + + + value + 48gc + description + Apple 4*8 video card + default + + devname + nb_48gc + + + value + 824gc + description + Apple 8*24 video card + devname + nb_824gc + + + value + enetnb + description + Apple NuBus Ethernet card + devname + nb_aenet + + + value + quadralink + description + Applied Engineering Quadralink serial card + devname + nb_qdlink + + + value + asmc3nb + description + Asante MC3NB Ethernet card + devname + nb_amc3b + + + value + bootbug + description + Brigent BootBug debugger card + devname + nb_btbug + + + value + m2hires + description + Macintosh II Hi-Resolution video card + devname + nb_m2hr + + + value + portrait + description + Macintosh II Portrait Video Card + devname + nb_wspt + + + value + m2video + description + Macintosh II Video Card + devname + nb_m2vc + + + value + vikbw + description + Moniterm Viking video card + devname + nb_vikbw + + + value + image + description + NuBus Disk Image Pseudo-Card + devname + nb_image + media + + pseudo_disk + 1 + + + + value + radiustpd + description + Radius Two Page Display video card + devname + nb_rtpd + + + value + cb264 + description + RasterOps ColorBoard 264 video card + devname + nb_c264 + + + value + laserview + description + Sigma Designs LaserView video card + devname + nb_laserview + + + value + specpdq + description + SuperMac Spectrum PDQ video card + devname + nb_spdq + + + value + spec8s3 + description + SuperMac Spectrum/8 Series III video card + devname + nb_sp8s3 + + + + + name + nba + description + Slot A + options + + + value + + description + —None— + default + + + + value + 48gc + description + Apple 4*8 video card + devname + nb_48gc + + + value + 824gc + description + Apple 8*24 video card + devname + nb_824gc + + + value + enetnb + description + Apple NuBus Ethernet card + devname + nb_aenet + + + value + quadralink + description + Applied Engineering Quadralink serial card + devname + nb_qdlink + + + value + asmc3nb + description + Asante MC3NB Ethernet card + devname + nb_amc3b + + + value + bootbug + description + Brigent BootBug debugger card + devname + nb_btbug + + + value + m2hires + description + Macintosh II Hi-Resolution video card + devname + nb_m2hr + + + value + portrait + description + Macintosh II Portrait Video Card + devname + nb_wspt + + + value + m2video + description + Macintosh II Video Card + devname + nb_m2vc + + + value + vikbw + description + Moniterm Viking video card + devname + nb_vikbw + + + value + image + description + NuBus Disk Image Pseudo-Card + devname + nb_image + media + + pseudo_disk + 1 + + + + value + radiustpd + description + Radius Two Page Display video card + devname + nb_rtpd + + + value + cb264 + description + RasterOps ColorBoard 264 video card + devname + nb_c264 + + + value + laserview + description + Sigma Designs LaserView video card + devname + nb_laserview + + + value + specpdq + description + SuperMac Spectrum PDQ video card + devname + nb_spdq + + + value + spec8s3 + description + SuperMac Spectrum/8 Series III video card + devname + nb_sp8s3 + + + + + name + nbb + description + Slot B + options + + + value + + description + —None— + default + + + + value + 48gc + description + Apple 4*8 video card + devname + nb_48gc + + + value + 824gc + description + Apple 8*24 video card + devname + nb_824gc + + + value + enetnb + description + Apple NuBus Ethernet card + devname + nb_aenet + + + value + quadralink + description + Applied Engineering Quadralink serial card + devname + nb_qdlink + + + value + asmc3nb + description + Asante MC3NB Ethernet card + devname + nb_amc3b + + + value + bootbug + description + Brigent BootBug debugger card + devname + nb_btbug + + + value + m2hires + description + Macintosh II Hi-Resolution video card + devname + nb_m2hr + + + value + portrait + description + Macintosh II Portrait Video Card + devname + nb_wspt + + + value + m2video + description + Macintosh II Video Card + devname + nb_m2vc + + + value + vikbw + description + Moniterm Viking video card + devname + nb_vikbw + + + value + image + description + NuBus Disk Image Pseudo-Card + devname + nb_image + media + + pseudo_disk + 1 + + + + value + radiustpd + description + Radius Two Page Display video card + devname + nb_rtpd + + + value + cb264 + description + RasterOps ColorBoard 264 video card + devname + nb_c264 + + + value + laserview + description + Sigma Designs LaserView video card + devname + nb_laserview + + + value + specpdq + description + SuperMac Spectrum PDQ video card + devname + nb_spdq + + + value + spec8s3 + description + SuperMac Spectrum/8 Series III video card + devname + nb_sp8s3 + + + + + name + nbc + description + Slot C + options + + + value + + description + —None— + default + + + + value + 48gc + description + Apple 4*8 video card + devname + nb_48gc + + + value + 824gc + description + Apple 8*24 video card + devname + nb_824gc + + + value + enetnb + description + Apple NuBus Ethernet card + devname + nb_aenet + + + value + quadralink + description + Applied Engineering Quadralink serial card + devname + nb_qdlink + + + value + asmc3nb + description + Asante MC3NB Ethernet card + devname + nb_amc3b + + + value + bootbug + description + Brigent BootBug debugger card + devname + nb_btbug + + + value + m2hires + description + Macintosh II Hi-Resolution video card + devname + nb_m2hr + + + value + portrait + description + Macintosh II Portrait Video Card + devname + nb_wspt + + + value + m2video + description + Macintosh II Video Card + devname + nb_m2vc + + + value + vikbw + description + Moniterm Viking video card + devname + nb_vikbw + + + value + image + description + NuBus Disk Image Pseudo-Card + devname + nb_image + media + + pseudo_disk + 1 + + + + value + radiustpd + description + Radius Two Page Display video card + devname + nb_rtpd + + + value + cb264 + description + RasterOps ColorBoard 264 video card + devname + nb_c264 + + + value + laserview + description + Sigma Designs LaserView video card + devname + nb_laserview + + + value + specpdq + description + SuperMac Spectrum PDQ video card + devname + nb_spdq + + + value + spec8s3 + description + SuperMac Spectrum/8 Series III video card + devname + nb_sp8s3 + + + + + name + nbd + description + Slot D + options + + + value + + description + —None— + default + + + + value + 48gc + description + Apple 4*8 video card + devname + nb_48gc + + + value + 824gc + description + Apple 8*24 video card + devname + nb_824gc + + + value + enetnb + description + Apple NuBus Ethernet card + devname + nb_aenet + + + value + quadralink + description + Applied Engineering Quadralink serial card + devname + nb_qdlink + + + value + asmc3nb + description + Asante MC3NB Ethernet card + devname + nb_amc3b + + + value + bootbug + description + Brigent BootBug debugger card + devname + nb_btbug + + + value + m2hires + description + Macintosh II Hi-Resolution video card + devname + nb_m2hr + + + value + portrait + description + Macintosh II Portrait Video Card + devname + nb_wspt + + + value + m2video + description + Macintosh II Video Card + devname + nb_m2vc + + + value + vikbw + description + Moniterm Viking video card + devname + nb_vikbw + + + value + image + description + NuBus Disk Image Pseudo-Card + devname + nb_image + media + + pseudo_disk + 1 + + + + value + radiustpd + description + Radius Two Page Display video card + devname + nb_rtpd + + + value + cb264 + description + RasterOps ColorBoard 264 video card + devname + nb_c264 + + + value + laserview + description + Sigma Designs LaserView video card + devname + nb_laserview + + + value + specpdq + description + SuperMac Spectrum PDQ video card + devname + nb_spdq + + + value + spec8s3 + description + SuperMac Spectrum/8 Series III video card + devname + nb_sp8s3 + + + + + name + nbe + description + Slot E + options + + + value + + description + —None— + default + + + + value + 48gc + description + Apple 4*8 video card + devname + nb_48gc + + + value + 824gc + description + Apple 8*24 video card + devname + nb_824gc + + + value + enetnb + description + Apple NuBus Ethernet card + devname + nb_aenet + + + value + quadralink + description + Applied Engineering Quadralink serial card + devname + nb_qdlink + + + value + asmc3nb + description + Asante MC3NB Ethernet card + devname + nb_amc3b + + + value + bootbug + description + Brigent BootBug debugger card + devname + nb_btbug + + + value + m2hires + description + Macintosh II Hi-Resolution video card + devname + nb_m2hr + + + value + portrait + description + Macintosh II Portrait Video Card + devname + nb_wspt + + + value + m2video + description + Macintosh II Video Card + devname + nb_m2vc + + + value + vikbw + description + Moniterm Viking video card + devname + nb_vikbw + + + value + image + description + NuBus Disk Image Pseudo-Card + devname + nb_image + media + + pseudo_disk + 1 + + + + value + radiustpd + description + Radius Two Page Display video card + devname + nb_rtpd + + + value + cb264 + description + RasterOps ColorBoard 264 video card + devname + nb_c264 + + + value + laserview + description + Sigma Designs LaserView video card + devname + nb_laserview + + + value + specpdq + description + SuperMac Spectrum PDQ video card + devname + nb_spdq + + + value + spec8s3 + description + SuperMac Spectrum/8 Series III video card + devname + nb_sp8s3 + + + + + devices + + + name + smartport + slots + + + name + fdc:0 + options + + + value + + description + —None— + default + + + + value + 35dd + description + 3.5" DD + default + + media + + floppy_3_5 + 1 + + + + value + 35hd + description + 3.5" HD + default + + media + + floppy_3_5 + 1 + + + + value + 35sd + description + 3.5" SD + default + + media + + floppy_3_5 + 1 + + + + + + name + fdc:1 + options + + + value + + description + —None— + default + + + + value + 35dd + description + 3.5" DD + default + + media + + floppy_3_5 + 1 + + + + value + 35hd + description + 3.5" HD + default + + media + + floppy_3_5 + 1 + + + + value + 35sd + description + 3.5" SD + default + + media + + floppy_3_5 + 1 + + + + + + + + name + nb_btbug + slots + + + name + :serport0 + options + + + value + + description + —None— + default + + + + value + null_modem + description + RS232 Null Modem + default + + + + value + terminal + description + Serial Terminal + default + + + + + + + + name + nb_qdlink + slots + + + name + :serport0 + options + + + value + + description + —None— + default + + + + value + null_modem + description + RS232 Null Modem + default + + + + value + terminal + description + Serial Terminal + default + + + + + + name + :serport1 + options + + + value + + description + —None— + default + + + + value + null_modem + description + RS232 Null Modem + default + + + + value + terminal + description + Serial Terminal + default + + + + + + name + :serport2 + options + + + value + + description + —None— + default + + + + value + null_modem + description + RS232 Null Modem + default + + + + value + terminal + description + Serial Terminal + default + + + + + + name + :serport3 + options + + + value + + description + —None— + default + + + + value + null_modem + description + RS232 Null Modem + default + + + + value + terminal + description + Serial Terminal + default + + + + + + + + software + + mac_hdd.xml + mac_flop.xml + + + diff --git a/Ample/Resources/models.plist b/Ample/Resources/models.plist index a9f3565..701ba81 100644 --- a/Ample/Resources/models.plist +++ b/Ample/Resources/models.plist @@ -459,6 +459,18 @@ value macii + + description + Macintosh II (w/o 68851 MMU) + value + maciihmu + + + description + Macintosh II (FDHD) + value + mac2fdhd + description Macintosh IIx diff --git a/Ample/Resources/roms.plist b/Ample/Resources/roms.plist index dfec03f..695c9e7 100644 --- a/Ample/Resources/roms.plist +++ b/Ample/Resources/roms.plist @@ -119,6 +119,7 @@ lx810l m68705p3 mac128k + mac2fdhd mac512k mac512ke macclas2 @@ -126,6 +127,7 @@ macii maciici maciicx + maciihmu maciisi maciivi maciivx diff --git a/python/machines.py b/python/machines.py index 23ae2a2..2969c65 100644 --- a/python/machines.py +++ b/python/machines.py @@ -23,7 +23,7 @@ MACHINES = ( "cec2000", "cece", "cecg", "ceci", "cecm", # macintosh... - "macii", "maciix", "maciicx", "maciici", "maciisi", + "macii", "maciihmu", "mac2fdhd", "maciix", "maciicx", "maciici", "maciisi", "maciivx", "maciivi", "maclc", "maclc2", "maclc3", diff --git a/python/mkmodels.py b/python/mkmodels.py index fba872a..0daf0f8 100644 --- a/python/mkmodels.py +++ b/python/mkmodels.py @@ -25,7 +25,7 @@ cec_children = ["cec2000", "cece", "cecg", "ceci", "cecm"] agat_children = ["agat7", "agat9"] mac_nubus_children = [ - "macii", "maciix", "maciicx", "maciici", "maciisi", "maciivx", "maciivi", + "macii", "maciihmu", "mac2fdhd", "maciix", "maciicx", "maciici", "maciisi", "maciivx", "maciivi", "maclc", "maclc2", "maclc3"] # se/30 and classic 2 are implemented as a nubus but i'm sticking then with the 128 due to the form factor. diff --git a/python/mkroms.py b/python/mkroms.py index ddab637..5b070ef 100644 --- a/python/mkroms.py +++ b/python/mkroms.py @@ -26,6 +26,7 @@ EXTRA_MACHINES = [ 'apple2c0', 'apple2c3', 'apple2c4', + 'mac2fdhd', ]