From dc5ab08d4bfcb5f6a7b4779301c1893f0c677ee8 Mon Sep 17 00:00:00 2001 From: Kelvin Sherlock Date: Mon, 18 Jan 2021 14:47:00 -0500 Subject: [PATCH] add maclc2, maclc3, and maciici (plus nubus roms) which are reportedly also usable. --- Ample.xcodeproj/project.pbxproj | 18 ++ Ample/Resources/maciici.plist | 524 ++++++++++++++++++++++++++++++++ Ample/Resources/maclc2.plist | 67 ++++ Ample/Resources/maclc3.plist | 97 ++++++ Ample/Resources/models.plist | 18 ++ Ample/Resources/roms.plist | 18 ++ python/machines.py | 2 +- python/mkmachines.py | 4 +- python/mkmodels.py | 2 +- python/rom.py | 18 ++ 10 files changed, 764 insertions(+), 4 deletions(-) create mode 100644 Ample/Resources/maciici.plist create mode 100644 Ample/Resources/maclc2.plist create mode 100644 Ample/Resources/maclc3.plist diff --git a/Ample.xcodeproj/project.pbxproj b/Ample.xcodeproj/project.pbxproj index cb49d93..430b2e1 100644 --- a/Ample.xcodeproj/project.pbxproj +++ b/Ample.xcodeproj/project.pbxproj @@ -94,6 +94,12 @@ B64AF1FA250EF6A500A09B9B /* Transformers.m in Sources */ = {isa = PBXBuildFile; fileRef = B64AF1F9250EF6A500A09B9B /* Transformers.m */; }; B64AF1FB250EF6A500A09B9B /* Transformers.m in Sources */ = {isa = PBXBuildFile; fileRef = B64AF1F9250EF6A500A09B9B /* Transformers.m */; }; B64E15A924EA1D5300E8AD3D /* MachineViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B64E15A824EA1D5300E8AD3D /* MachineViewController.m */; }; + B65085B925B616AC00354EC9 /* maclc2.plist in Resources */ = {isa = PBXBuildFile; fileRef = B65085B625B616AC00354EC9 /* maclc2.plist */; }; + B65085BA25B616AC00354EC9 /* maclc2.plist in Resources */ = {isa = PBXBuildFile; fileRef = B65085B625B616AC00354EC9 /* maclc2.plist */; }; + B65085BB25B616AC00354EC9 /* maclc3.plist in Resources */ = {isa = PBXBuildFile; fileRef = B65085B725B616AC00354EC9 /* maclc3.plist */; }; + B65085BC25B616AC00354EC9 /* maclc3.plist in Resources */ = {isa = PBXBuildFile; fileRef = B65085B725B616AC00354EC9 /* maclc3.plist */; }; + B65085BD25B616AC00354EC9 /* maciici.plist in Resources */ = {isa = PBXBuildFile; fileRef = B65085B825B616AC00354EC9 /* maciici.plist */; }; + B65085BE25B616AC00354EC9 /* maciici.plist in Resources */ = {isa = PBXBuildFile; fileRef = B65085B825B616AC00354EC9 /* maciici.plist */; }; B66236A924FD9A34006CABD7 /* PreferencesWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = B66236A824FD9A34006CABD7 /* PreferencesWindowController.m */; }; B66236B524FDA527006CABD7 /* SDL2.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B66236B224FDA522006CABD7 /* SDL2.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; B66236C124FDB7A6006CABD7 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = B66236BF24FDB7A6006CABD7 /* Credits.rtf */; }; @@ -326,6 +332,9 @@ B64AF1F9250EF6A500A09B9B /* Transformers.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Transformers.m; sourceTree = ""; }; B64E15A724EA1D5300E8AD3D /* MachineViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MachineViewController.h; sourceTree = ""; }; B64E15A824EA1D5300E8AD3D /* MachineViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MachineViewController.m; sourceTree = ""; }; + B65085B625B616AC00354EC9 /* maclc2.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = maclc2.plist; sourceTree = ""; }; + B65085B725B616AC00354EC9 /* maclc3.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = maclc3.plist; sourceTree = ""; }; + B65085B825B616AC00354EC9 /* maciici.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = maciici.plist; sourceTree = ""; }; B65593AF24ECB61800722E0C /* SlotViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SlotViewController.h; sourceTree = ""; }; B65593B024ECB61800722E0C /* SlotViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SlotViewController.m; sourceTree = ""; }; B66236A724FD9A34006CABD7 /* PreferencesWindowController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PreferencesWindowController.h; sourceTree = ""; }; @@ -461,6 +470,9 @@ B61099EE24F5F36E005CB652 /* uniap2pt.plist */, B6109A0224F5F371005CB652 /* uniap2ti.plist */, B6DD1FE725B407E6004A3242 /* maclc.plist */, + B65085B825B616AC00354EC9 /* maciici.plist */, + B65085B625B616AC00354EC9 /* maclc2.plist */, + B65085B725B616AC00354EC9 /* maclc3.plist */, B63C1F1125B147E10016A611 /* CheatSheet.html */, ); path = Resources; @@ -715,6 +727,7 @@ B6D6DE3E24FADF8B00661A5F /* LaunchWindow.xib in Resources */, B6109A3124F5F377005CB652 /* apple1.plist in Resources */, B6109A3524F5F377005CB652 /* ace100.plist in Resources */, + B65085BB25B616AC00354EC9 /* maclc3.plist in Resources */, B6109A3424F5F377005CB652 /* am64.plist in Resources */, B6DDECCC2505A86E0093587A /* eject-16x16@2x.png in Resources */, B6004DF124FB05D600D38596 /* LogWindow.xib in Resources */, @@ -745,6 +758,7 @@ B6109A3E24F5F377005CB652 /* albert.plist in Resources */, B66236C124FDB7A6006CABD7 /* Credits.rtf in Resources */, B6109A4224F5F377005CB652 /* apple2p.plist in Resources */, + B65085B925B616AC00354EC9 /* maclc2.plist in Resources */, B6109A1824F5F377005CB652 /* hkc8800a.plist in Resources */, B6109A2324F5F377005CB652 /* apple2gsr0.plist in Resources */, B63C1BA1250192D800511A71 /* cecg.plist in Resources */, @@ -759,6 +773,7 @@ B6DDECCE2505A86E0093587A /* eject-16x16@3x.png in Resources */, B64AF1EE250EC35B00A09B9B /* DiskImages.xib in Resources */, B6109A3B24F5F377005CB652 /* apple2gsr1.plist in Resources */, + B65085BD25B616AC00354EC9 /* maciici.plist in Resources */, B63C1F1225B147E10016A611 /* CheatSheet.html in Resources */, B63C1B9625008A2700511A71 /* DownloadWindow.xib in Resources */, B6D6DE3B24FACF4F00661A5F /* Defaults.plist in Resources */, @@ -825,11 +840,14 @@ B6E4B5D524FDE2670094A35C /* apple2euk.plist in Resources */, B6E4B5D624FDE2670094A35C /* uniap2ti.plist in Resources */, B6E4B5D724FDE2670094A35C /* apple2c.plist in Resources */, + B65085BA25B616AC00354EC9 /* maclc2.plist in Resources */, B6E4B5D824FDE2670094A35C /* microeng.plist in Resources */, B6E4B5D924FDE2670094A35C /* albert.plist in Resources */, B6E4B5DA24FDE2670094A35C /* Credits.rtf in Resources */, B6E4B5DB24FDE2670094A35C /* apple2p.plist in Resources */, B6DDECD12505A86E0093587A /* eject-hover-16x16.png in Resources */, + B65085BE25B616AC00354EC9 /* maciici.plist in Resources */, + B65085BC25B616AC00354EC9 /* maclc3.plist in Resources */, B63C1BA4250192D800511A71 /* cec2000.plist in Resources */, B6DDECD32505A86E0093587A /* eject-hover-16x16@2x.png in Resources */, B6E4B5DC24FDE2670094A35C /* hkc8800a.plist in Resources */, diff --git a/Ample/Resources/maciici.plist b/Ample/Resources/maciici.plist new file mode 100644 index 0000000..c25f78d --- /dev/null +++ b/Ample/Resources/maciici.plist @@ -0,0 +1,524 @@ + + + + + value + maciici + description + Macintosh IIci + ram + + + intValue + 2097152 + description + 2M + value + 2M + default + + + + intValue + 4194304 + description + 4M + value + 4M + default + + + + intValue + 8388608 + description + 8M + value + 8M + default + + + + intValue + 16777216 + description + 16M + value + 16M + default + + + + intValue + 33554432 + description + 32M + value + 32M + default + + + + intValue + 50331648 + description + 48M + value + 48M + default + + + + intValue + 67108864 + description + 64M + value + 64M + default + + + + intValue + 134217728 + description + 128M + value + 128M + default + + + + media + + flop_3_5 + 2 + hard + 2 + cdrm + 1 + + resolution + + 640 + 480 + + nbc + + + value + + description + —None— + default + + + + value + 48gc + description + Apple 4*8 video card + default + + + + value + 824gc + description + Apple 8*24 video card + default + + + + value + enetnb + description + Apple NuBus Ethernet card + default + + + + value + quadralink + description + Applied Engineering Quadralink serial card + default + + + + value + asmc3nb + description + Asante MC3NB Ethernet card + default + + + + value + bootbug + description + Brigent BootBug debugger card + default + + + + value + m2hires + description + Macintosh II Hi-Resolution video card + default + + + + value + portrait + description + Macintosh II Portrait Video Card + default + + + + value + m2video + description + Macintosh II Video Card + default + + + + value + vikbw + description + Moniterm Viking video card + default + + + + value + image + description + NuBus Disk Image Pseudo-Card + default + + + + value + radiustpd + description + Radius Two Page Display video card + default + + + + value + cb264 + description + RasterOps ColorBoard 264 video card + default + + + + value + laserview + description + Sigma Designs LaserView video card + default + + + + value + specpdq + description + SuperMac Spectrum PDQ video card + default + + + + value + spec8s3 + description + SuperMac Spectrum/8 Series III video card + default + + + + nbd + + + value + + description + —None— + default + + + + value + 48gc + description + Apple 4*8 video card + default + + + + value + 824gc + description + Apple 8*24 video card + default + + + + value + enetnb + description + Apple NuBus Ethernet card + default + + + + value + quadralink + description + Applied Engineering Quadralink serial card + default + + + + value + asmc3nb + description + Asante MC3NB Ethernet card + default + + + + value + bootbug + description + Brigent BootBug debugger card + default + + + + value + m2hires + description + Macintosh II Hi-Resolution video card + default + + + + value + portrait + description + Macintosh II Portrait Video Card + default + + + + value + m2video + description + Macintosh II Video Card + default + + + + value + vikbw + description + Moniterm Viking video card + default + + + + value + image + description + NuBus Disk Image Pseudo-Card + default + + + + value + radiustpd + description + Radius Two Page Display video card + default + + + + value + cb264 + description + RasterOps ColorBoard 264 video card + default + + + + value + laserview + description + Sigma Designs LaserView video card + default + + + + value + specpdq + description + SuperMac Spectrum PDQ video card + default + + + + value + spec8s3 + description + SuperMac Spectrum/8 Series III video card + default + + + + nbe + + + value + + description + —None— + default + + + + value + 48gc + description + Apple 4*8 video card + default + + + + value + 824gc + description + Apple 8*24 video card + default + + + + value + enetnb + description + Apple NuBus Ethernet card + default + + + + value + quadralink + description + Applied Engineering Quadralink serial card + default + + + + value + asmc3nb + description + Asante MC3NB Ethernet card + default + + + + value + bootbug + description + Brigent BootBug debugger card + default + + + + value + m2hires + description + Macintosh II Hi-Resolution video card + default + + + + value + portrait + description + Macintosh II Portrait Video Card + default + + + + value + m2video + description + Macintosh II Video Card + default + + + + value + vikbw + description + Moniterm Viking video card + default + + + + value + image + description + NuBus Disk Image Pseudo-Card + default + + + + value + radiustpd + description + Radius Two Page Display video card + default + + + + value + cb264 + description + RasterOps ColorBoard 264 video card + default + + + + value + laserview + description + Sigma Designs LaserView video card + default + + + + value + specpdq + description + SuperMac Spectrum PDQ video card + default + + + + value + spec8s3 + description + SuperMac Spectrum/8 Series III video card + default + + + + + diff --git a/Ample/Resources/maclc2.plist b/Ample/Resources/maclc2.plist new file mode 100644 index 0000000..3df9d39 --- /dev/null +++ b/Ample/Resources/maclc2.plist @@ -0,0 +1,67 @@ + + + + + value + maclc2 + description + Macintosh LC II + ram + + + intValue + 4194304 + description + 4M + value + 4M + default + + + + intValue + 6291456 + description + 6M + value + 6M + default + + + + intValue + 8388608 + description + 8M + value + 8M + default + + + + intValue + 10485760 + description + 10M + value + 10M + default + + + + media + + flop_3_5 + 2 + hard + 2 + cdrm + 1 + + resolution + + 640 + 480 + + + diff --git a/Ample/Resources/maclc3.plist b/Ample/Resources/maclc3.plist new file mode 100644 index 0000000..eeaf8b0 --- /dev/null +++ b/Ample/Resources/maclc3.plist @@ -0,0 +1,97 @@ + + + + + value + maclc3 + description + Macintosh LC III + ram + + + intValue + 4194304 + description + 4M + value + 4M + default + + + + intValue + 8388608 + description + 8M + value + 8M + default + + + + intValue + 16777216 + description + 16M + value + 16M + default + + + + intValue + 33554432 + description + 32M + value + 32M + default + + + + intValue + 50331648 + description + 48M + value + 48M + default + + + + intValue + 67108864 + description + 64M + value + 64M + default + + + + intValue + 83886080 + description + 80M + value + 80M + default + + + + media + + flop_3_5 + 2 + hard + 2 + cdrm + 1 + + resolution + + 640 + 480 + + + diff --git a/Ample/Resources/models.plist b/Ample/Resources/models.plist index 3745d80..310cb46 100644 --- a/Ample/Resources/models.plist +++ b/Ample/Resources/models.plist @@ -390,6 +390,24 @@ value maclc + + description + Macintosh LC II + value + maclc2 + + + description + Macintosh LC III + value + maclc3 + + + description + Macintosh IIci + value + maciici + diff --git a/Ample/Resources/roms.plist b/Ample/Resources/roms.plist index a7a7fd6..9fdb354 100644 --- a/Ample/Resources/roms.plist +++ b/Ample/Resources/roms.plist @@ -71,7 +71,25 @@ egret keytronic_pc3270 m68705p3 + maciici maclc + maclc2 + maclc3 + nb_824gc + nb_aenet + nb_amc3b + nb_btbug + nb_c264 + nb_image + nb_laserview + nb_m2hr + nb_m2vc + nb_qdlink + nb_rtpd + nb_sp8s3 + nb_spdq + nb_vikbw + nb_wspt qsound votrax ym2608 diff --git a/python/machines.py b/python/machines.py index a776e29..419ca87 100644 --- a/python/machines.py +++ b/python/machines.py @@ -23,7 +23,7 @@ MACHINES = ( "cec2000", "cece", "cecg", "ceci", "cecm", # macintosh... - "maclc" + "maclc", "maclc2", "maclc3", "maciici", ) diff --git a/python/mkmachines.py b/python/mkmachines.py index 9fd7385..82e6244 100644 --- a/python/mkmachines.py +++ b/python/mkmachines.py @@ -84,7 +84,7 @@ def find_machine_media(parent): if mname == "apple2c" and slot == "sl6": slot = None # hack for now - these are scsi:1-7 slots but slot option isn't adjustable. - if mname == "maclc" and slot == "scsi": slot = None + if mname[0:3] == "mac" and slot == "scsi": slot = None if slot: continue # skip slot devices -- they'll be handled as part of the device. @@ -215,7 +215,7 @@ for m in machines: # node = machine.find('display[@tag="screen"]') node = machine.find('./display') hscale = 2 - if m in ("maclc"): hscale = 1 + if m[0:3] == "mac": hscale = 1 data["resolution"] = [int(node.get("width")), int(node.get("height")) * hscale] mm = {} diff --git a/python/mkmodels.py b/python/mkmodels.py index f71f5ff..76b93ec 100644 --- a/python/mkmodels.py +++ b/python/mkmodels.py @@ -24,7 +24,7 @@ iie_clones_children = ["mprof3", "prav8c", "spectred", "zijini"] cec_children = ["cec2000", "cece", "cecg", "ceci", "cecm"] agat_children = ["agat7", "agat9"] -mac_nubus_children = ["maclc"] +mac_nubus_children = ["maclc", "maclc2", "maclc3", "maciici"] tree = [ ("Apple I", "apple1", apple1_children), diff --git a/python/rom.py b/python/rom.py index e8f3a48..c545894 100644 --- a/python/rom.py +++ b/python/rom.py @@ -73,7 +73,25 @@ aprissi # macintosh maclc +maclc2 +maclc3 +maciici egret +nb_image +nb_824gc +nb_aenet +nb_qdlink +nb_amc3b +nb_btbug +nb_m2hr +nb_wspt +nb_m2vc +nb_vikbw +nb_rtpd +nb_c264 +nb_laserview +nb_spdq +nb_sp8s3 """.splitlines() #