From 6ca897739aa17ded749f468c6b9c63807acd9bd3 Mon Sep 17 00:00:00 2001 From: Kelvin Sherlock Date: Fri, 19 Mar 2021 17:24:28 -0400 Subject: [PATCH] add support for mac 128k family --- Ample.xcodeproj/project.pbxproj | 42 ++++ Ample/Resources/mac128k.plist | 370 +++++++++++++++++++++++++++++ Ample/Resources/mac512k.plist | 370 +++++++++++++++++++++++++++++ Ample/Resources/mac512ke.plist | 370 +++++++++++++++++++++++++++++ Ample/Resources/macclasc.plist | 204 ++++++++++++++++ Ample/Resources/macplus.plist | 400 ++++++++++++++++++++++++++++++++ Ample/Resources/macse.plist | 204 ++++++++++++++++ Ample/Resources/macsefd.plist | 204 ++++++++++++++++ Ample/Resources/models.plist | 51 ++++ Ample/Resources/roms.plist | 18 ++ python/machines.py | 6 + python/mkmodels.py | 4 +- 12 files changed, 2242 insertions(+), 1 deletion(-) create mode 100644 Ample/Resources/mac128k.plist create mode 100644 Ample/Resources/mac512k.plist create mode 100644 Ample/Resources/mac512ke.plist create mode 100644 Ample/Resources/macclasc.plist create mode 100644 Ample/Resources/macplus.plist create mode 100644 Ample/Resources/macse.plist create mode 100644 Ample/Resources/macsefd.plist diff --git a/Ample.xcodeproj/project.pbxproj b/Ample.xcodeproj/project.pbxproj index d1a44ad..afa459d 100644 --- a/Ample.xcodeproj/project.pbxproj +++ b/Ample.xcodeproj/project.pbxproj @@ -151,6 +151,20 @@ B6DE323926044C1100418375 /* caution.png in Resources */ = {isa = PBXBuildFile; fileRef = B6DE323526044C1100418375 /* caution.png */; }; B6DE323B26044DB800418375 /* caution@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = B6DE323A26044DB800418375 /* caution@3x.png */; }; B6DE323C26044DB800418375 /* caution@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = B6DE323A26044DB800418375 /* caution@3x.png */; }; + B6DE32442605482500418375 /* mac128k.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6DE323D2605482400418375 /* mac128k.plist */; }; + B6DE32452605482500418375 /* mac128k.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6DE323D2605482400418375 /* mac128k.plist */; }; + B6DE32462605482500418375 /* macclasc.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6DE323E2605482400418375 /* macclasc.plist */; }; + B6DE32472605482500418375 /* macclasc.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6DE323E2605482400418375 /* macclasc.plist */; }; + B6DE32482605482500418375 /* mac512ke.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6DE323F2605482400418375 /* mac512ke.plist */; }; + B6DE32492605482500418375 /* mac512ke.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6DE323F2605482400418375 /* mac512ke.plist */; }; + B6DE324A2605482500418375 /* macsefd.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6DE32402605482500418375 /* macsefd.plist */; }; + B6DE324B2605482500418375 /* macsefd.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6DE32402605482500418375 /* macsefd.plist */; }; + B6DE324C2605482500418375 /* macplus.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6DE32412605482500418375 /* macplus.plist */; }; + B6DE324D2605482500418375 /* macplus.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6DE32412605482500418375 /* macplus.plist */; }; + B6DE324E2605482500418375 /* mac512k.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6DE32422605482500418375 /* mac512k.plist */; }; + B6DE324F2605482500418375 /* mac512k.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6DE32422605482500418375 /* mac512k.plist */; }; + B6DE32502605482500418375 /* macse.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6DE32432605482500418375 /* macse.plist */; }; + B6DE32512605482500418375 /* macse.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6DE32432605482500418375 /* macse.plist */; }; B6E08076252574690075F4E1 /* vmnet_helper in CopyFiles */ = {isa = PBXBuildFile; fileRef = B6841BD0251EC913006A5C39 /* vmnet_helper */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; B6E4B5B024FDE2670094A35C /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = B6BA258724E99BEB005FB8FF /* main.m */; }; B6E4B5B124FDE2670094A35C /* LaunchWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = B6D6DE4024FADFAC00661A5F /* LaunchWindowController.m */; }; @@ -395,6 +409,13 @@ B6DE323426044C1000418375 /* caution@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "caution@2x.png"; sourceTree = ""; }; B6DE323526044C1100418375 /* caution.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = caution.png; sourceTree = ""; }; B6DE323A26044DB800418375 /* caution@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "caution@3x.png"; sourceTree = ""; }; + B6DE323D2605482400418375 /* mac128k.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = mac128k.plist; sourceTree = ""; }; + B6DE323E2605482400418375 /* macclasc.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = macclasc.plist; sourceTree = ""; }; + B6DE323F2605482400418375 /* mac512ke.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = mac512ke.plist; sourceTree = ""; }; + B6DE32402605482500418375 /* macsefd.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = macsefd.plist; sourceTree = ""; }; + B6DE32412605482500418375 /* macplus.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = macplus.plist; sourceTree = ""; }; + B6DE32422605482500418375 /* mac512k.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = mac512k.plist; sourceTree = ""; }; + B6DE32432605482500418375 /* macse.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = macse.plist; sourceTree = ""; }; B6E4B5FA24FDE2670094A35C /* Ample Lite.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Ample Lite.app"; sourceTree = BUILT_PRODUCTS_DIR; }; B6E9A17E25088B1B005E7525 /* NewSlotViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NewSlotViewController.h; sourceTree = ""; }; B6E9A17F25088B1B005E7525 /* NewSlotViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NewSlotViewController.m; sourceTree = ""; }; @@ -498,6 +519,13 @@ B65085B825B616AC00354EC9 /* maciici.plist */, B65085B625B616AC00354EC9 /* maclc2.plist */, B65085B725B616AC00354EC9 /* maclc3.plist */, + B6DE323D2605482400418375 /* mac128k.plist */, + B6DE32422605482500418375 /* mac512k.plist */, + B6DE323F2605482400418375 /* mac512ke.plist */, + B6DE323E2605482400418375 /* macclasc.plist */, + B6DE32412605482500418375 /* macplus.plist */, + B6DE32432605482500418375 /* macse.plist */, + B6DE32402605482500418375 /* macsefd.plist */, B63C1F1125B147E10016A611 /* CheatSheet.html */, ); path = Resources; @@ -764,7 +792,9 @@ B65085BB25B616AC00354EC9 /* maclc3.plist in Resources */, B6109A3424F5F377005CB652 /* am64.plist in Resources */, B6DDECCC2505A86E0093587A /* eject-16x16@2x.png in Resources */, + B6DE32462605482500418375 /* macclasc.plist in Resources */, B6004DF124FB05D600D38596 /* LogWindow.xib in Resources */, + B6DE32502605482500418375 /* macse.plist in Resources */, B6BA258224E99BEB005FB8FF /* Assets.xcassets in Resources */, B6109A1724F5F377005CB652 /* apple2e.plist in Resources */, B6109A3C24F5F377005CB652 /* am100.plist in Resources */, @@ -774,10 +804,12 @@ B6109A2824F5F377005CB652 /* apple2ep.plist in Resources */, B6DDECC225057A550093587A /* drag-handle-4x10@2x.png in Resources */, B6109A1924F5F377005CB652 /* apple2ees.plist in Resources */, + B6DE32482605482500418375 /* mac512ke.plist in Resources */, B6109A3924F5F377005CB652 /* prav8c.plist in Resources */, B6109A1C24F5F377005CB652 /* ivelultr.plist in Resources */, B6DE323325FE7BD400418375 /* tk3000.plist in Resources */, B6109A3824F5F377005CB652 /* maxxi.plist in Resources */, + B6DE32442605482500418375 /* mac128k.plist in Resources */, B6109A2E24F5F377005CB652 /* apple2eefr.plist in Resources */, B6109A2C24F5F377005CB652 /* spectred.plist in Resources */, B6109A4124F5F377005CB652 /* apple2cp.plist in Resources */, @@ -785,6 +817,7 @@ B6109A3A24F5F377005CB652 /* prav82.plist in Resources */, B6DD1FE825B407E7004A3242 /* maclc.plist in Resources */, B6109A2024F5F377005CB652 /* apple2euk.plist in Resources */, + B6DE324C2605482500418375 /* macplus.plist in Resources */, B6DE323826044C1100418375 /* caution.png in Resources */, B6109A2F24F5F377005CB652 /* uniap2ti.plist in Resources */, B6DDECD42505A86E0093587A /* eject-hover-16x16@3x.png in Resources */, @@ -805,6 +838,7 @@ B6109A3224F5F377005CB652 /* basis108.plist in Resources */, B6DE323B26044DB800418375 /* caution@3x.png in Resources */, B6109A4324F5F377005CB652 /* agat7.plist in Resources */, + B6DE324E2605482500418375 /* mac512k.plist in Resources */, B6DDECC425057A550093587A /* drag-handle-4x10@3x.png in Resources */, B6109A2B24F5F377005CB652 /* elppa.plist in Resources */, B63C1B8E25004C6D00511A71 /* mame-data.tgz in Resources */, @@ -833,6 +867,7 @@ B6109A2924F5F377005CB652 /* apple2gs.plist in Resources */, B6109A1F24F5F377005CB652 /* apple2jp.plist in Resources */, B63C1F0B25B143C50016A611 /* CheatSheet.xib in Resources */, + B6DE324A2605482500418375 /* macsefd.plist in Resources */, B6109A3024F5F377005CB652 /* apple2.plist in Resources */, B6109A2D24F5F377005CB652 /* prav8m.plist in Resources */, ); @@ -847,12 +882,14 @@ B63C1BA0250192D800511A71 /* ceci.plist in Resources */, B6E4B5BD24FDE2670094A35C /* las128ex.plist in Resources */, B6E4B5BE24FDE2670094A35C /* space84.plist in Resources */, + B6DE324F2605482500418375 /* mac512k.plist in Resources */, B63C1BA6250192D800511A71 /* cecm.plist in Resources */, B6E4B5BF24FDE2670094A35C /* agat9.plist in Resources */, B6E4B5C024FDE2670094A35C /* LaunchWindow.xib in Resources */, B6DE323726044C1100418375 /* caution@2x.png in Resources */, B6E4B5C124FDE2670094A35C /* apple1.plist in Resources */, B6E4B5C224FDE2670094A35C /* ace100.plist in Resources */, + B6DE32472605482500418375 /* macclasc.plist in Resources */, B6E4B5C324FDE2670094A35C /* am64.plist in Resources */, B6E4B5C424FDE2670094A35C /* LogWindow.xib in Resources */, B6E4B5C524FDE2670094A35C /* Assets.xcassets in Resources */, @@ -870,6 +907,7 @@ B6E4B5CC24FDE2670094A35C /* prav8c.plist in Resources */, B6E4B5CD24FDE2670094A35C /* ivelultr.plist in Resources */, B6E4B5CE24FDE2670094A35C /* maxxi.plist in Resources */, + B6DE324B2605482500418375 /* macsefd.plist in Resources */, B6E4B5CF24FDE2670094A35C /* apple2eefr.plist in Resources */, B6DE323926044C1100418375 /* caution.png in Resources */, B6E4B5D124FDE2670094A35C /* spectred.plist in Resources */, @@ -887,7 +925,10 @@ B6E4B5DB24FDE2670094A35C /* apple2p.plist in Resources */, B6DDECD12505A86E0093587A /* eject-hover-16x16.png in Resources */, B65085BE25B616AC00354EC9 /* maciici.plist in Resources */, + B6DE32512605482500418375 /* macse.plist in Resources */, B65085BC25B616AC00354EC9 /* maclc3.plist in Resources */, + B6DE32492605482500418375 /* mac512ke.plist in Resources */, + B6DE32452605482500418375 /* mac128k.plist in Resources */, B63C1BA4250192D800511A71 /* cec2000.plist in Resources */, B6DDECD32505A86E0093587A /* eject-hover-16x16@2x.png in Resources */, B6E4B5DC24FDE2670094A35C /* hkc8800a.plist in Resources */, @@ -914,6 +955,7 @@ B6E4B5EB24FDE2670094A35C /* apple2ee.plist in Resources */, B6E4B5EC24FDE2670094A35C /* dodo.plist in Resources */, B63C1F1325B147E10016A611 /* CheatSheet.html in Resources */, + B6DE324D2605482500418375 /* macplus.plist in Resources */, B6E4B5ED24FDE2670094A35C /* Preferences.xib in Resources */, B6DDECD72505A86E0093587A /* eject-16x16.png in Resources */, B6E4B5EF24FDE2670094A35C /* apple2gs.plist in Resources */, diff --git a/Ample/Resources/mac128k.plist b/Ample/Resources/mac128k.plist new file mode 100644 index 0000000..5919afe --- /dev/null +++ b/Ample/Resources/mac128k.plist @@ -0,0 +1,370 @@ + + + + + value + mac128k + description + Macintosh 128k + media + + + resolution + + 512 + 342 + + slots + + + name + ramsize + description + RAM + options + + + intValue + 131072 + description + 128K + value + 128K + default + + + + + + name + smartport + description + Disk Drives + options + + + value + + description + + devname + smartport + default + + + + + + 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 + mackbd_m0120 + slots + + + name + :kbd + options + + + value + + description + —None— + default + + + + value + gb + description + Macintosh Keyboard (British - M0110B) + default + + + + value + fr + description + Macintosh Keyboard (French - M0110F) + default + + + + value + it + description + Macintosh Keyboard (Italian - M0110T) + default + + + + value + us + description + Macintosh Keyboard (U.S. - M0110) + default + + + + value + pad + description + Macintosh Numeric Keypad (English - M0120) + default + + + + value + eupad + description + Macintosh Numeric Keypad (European - M0120P) + default + + + + value + frp + description + Macintosh Plus Keyboard (French - M0110A F) + default + + + + value + jpp + description + Macintosh Plus Keyboard (Japanese - M0110A J) + default + + + + value + usp + description + Macintosh Plus Keyboard (U.S. - M0110A) + default + + + + + + + + name + mackbd_m0120p + slots + + + name + :kbd + options + + + value + + description + —None— + default + + + + value + gb + description + Macintosh Keyboard (British - M0110B) + default + + + + value + fr + description + Macintosh Keyboard (French - M0110F) + default + + + + value + it + description + Macintosh Keyboard (Italian - M0110T) + default + + + + value + us + description + Macintosh Keyboard (U.S. - M0110) + default + + + + value + pad + description + Macintosh Numeric Keypad (English - M0120) + default + + + + value + eupad + description + Macintosh Numeric Keypad (European - M0120P) + default + + + + value + frp + description + Macintosh Plus Keyboard (French - M0110A F) + default + + + + value + jpp + description + Macintosh Plus Keyboard (Japanese - M0110A J) + default + + + + value + usp + description + Macintosh Plus Keyboard (U.S. - M0110A) + default + + + + + + + + software + + mac_flop.xml + mac_hdd.xml + + + diff --git a/Ample/Resources/mac512k.plist b/Ample/Resources/mac512k.plist new file mode 100644 index 0000000..dabf714 --- /dev/null +++ b/Ample/Resources/mac512k.plist @@ -0,0 +1,370 @@ + + + + + value + mac512k + description + Macintosh 512k + media + + + resolution + + 512 + 342 + + slots + + + name + ramsize + description + RAM + options + + + intValue + 524288 + description + 512K + value + 512K + default + + + + + + name + smartport + description + Disk Drives + options + + + value + + description + + devname + smartport + default + + + + + + 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 + mackbd_m0120 + slots + + + name + :kbd + options + + + value + + description + —None— + default + + + + value + gb + description + Macintosh Keyboard (British - M0110B) + default + + + + value + fr + description + Macintosh Keyboard (French - M0110F) + default + + + + value + it + description + Macintosh Keyboard (Italian - M0110T) + default + + + + value + us + description + Macintosh Keyboard (U.S. - M0110) + default + + + + value + pad + description + Macintosh Numeric Keypad (English - M0120) + default + + + + value + eupad + description + Macintosh Numeric Keypad (European - M0120P) + default + + + + value + frp + description + Macintosh Plus Keyboard (French - M0110A F) + default + + + + value + jpp + description + Macintosh Plus Keyboard (Japanese - M0110A J) + default + + + + value + usp + description + Macintosh Plus Keyboard (U.S. - M0110A) + default + + + + + + + + name + mackbd_m0120p + slots + + + name + :kbd + options + + + value + + description + —None— + default + + + + value + gb + description + Macintosh Keyboard (British - M0110B) + default + + + + value + fr + description + Macintosh Keyboard (French - M0110F) + default + + + + value + it + description + Macintosh Keyboard (Italian - M0110T) + default + + + + value + us + description + Macintosh Keyboard (U.S. - M0110) + default + + + + value + pad + description + Macintosh Numeric Keypad (English - M0120) + default + + + + value + eupad + description + Macintosh Numeric Keypad (European - M0120P) + default + + + + value + frp + description + Macintosh Plus Keyboard (French - M0110A F) + default + + + + value + jpp + description + Macintosh Plus Keyboard (Japanese - M0110A J) + default + + + + value + usp + description + Macintosh Plus Keyboard (U.S. - M0110A) + default + + + + + + + + software + + mac_flop.xml + mac_hdd.xml + + + diff --git a/Ample/Resources/mac512ke.plist b/Ample/Resources/mac512ke.plist new file mode 100644 index 0000000..36d4fed --- /dev/null +++ b/Ample/Resources/mac512ke.plist @@ -0,0 +1,370 @@ + + + + + value + mac512ke + description + Macintosh 512ke + media + + + resolution + + 512 + 342 + + slots + + + name + ramsize + description + RAM + options + + + intValue + 524288 + description + 512K + value + 512K + default + + + + + + name + smartport + description + Disk Drives + options + + + value + + description + + devname + smartport + default + + + + + + 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 + mackbd_m0120 + slots + + + name + :kbd + options + + + value + + description + —None— + default + + + + value + gb + description + Macintosh Keyboard (British - M0110B) + default + + + + value + fr + description + Macintosh Keyboard (French - M0110F) + default + + + + value + it + description + Macintosh Keyboard (Italian - M0110T) + default + + + + value + us + description + Macintosh Keyboard (U.S. - M0110) + default + + + + value + pad + description + Macintosh Numeric Keypad (English - M0120) + default + + + + value + eupad + description + Macintosh Numeric Keypad (European - M0120P) + default + + + + value + frp + description + Macintosh Plus Keyboard (French - M0110A F) + default + + + + value + jpp + description + Macintosh Plus Keyboard (Japanese - M0110A J) + default + + + + value + usp + description + Macintosh Plus Keyboard (U.S. - M0110A) + default + + + + + + + + name + mackbd_m0120p + slots + + + name + :kbd + options + + + value + + description + —None— + default + + + + value + gb + description + Macintosh Keyboard (British - M0110B) + default + + + + value + fr + description + Macintosh Keyboard (French - M0110F) + default + + + + value + it + description + Macintosh Keyboard (Italian - M0110T) + default + + + + value + us + description + Macintosh Keyboard (U.S. - M0110) + default + + + + value + pad + description + Macintosh Numeric Keypad (English - M0120) + default + + + + value + eupad + description + Macintosh Numeric Keypad (European - M0120P) + default + + + + value + frp + description + Macintosh Plus Keyboard (French - M0110A F) + default + + + + value + jpp + description + Macintosh Plus Keyboard (Japanese - M0110A J) + default + + + + value + usp + description + Macintosh Plus Keyboard (U.S. - M0110A) + default + + + + + + + + software + + mac_flop.xml + mac_hdd.xml + + + diff --git a/Ample/Resources/macclasc.plist b/Ample/Resources/macclasc.plist new file mode 100644 index 0000000..d14dfdd --- /dev/null +++ b/Ample/Resources/macclasc.plist @@ -0,0 +1,204 @@ + + + + + value + macclasc + description + Macintosh Classic + media + + hard + 2 + + resolution + + 512 + 342 + + slots + + + name + ramsize + description + RAM + options + + + intValue + 2097152 + description + 2M + value + 2M + default + + + + intValue + 2621440 + description + 2560K + value + 2560K + default + + + + intValue + 4194304 + description + 4M + value + 4M + default + + + + + + name + smartport + description + Disk Drives + options + + + value + + description + + devname + smartport + default + + + + + + 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 + + + + + + + + software + + mac_flop.xml + mac_hdd.xml + + + diff --git a/Ample/Resources/macplus.plist b/Ample/Resources/macplus.plist new file mode 100644 index 0000000..a2da962 --- /dev/null +++ b/Ample/Resources/macplus.plist @@ -0,0 +1,400 @@ + + + + + value + macplus + description + Macintosh Plus + media + + + resolution + + 512 + 342 + + slots + + + name + ramsize + description + RAM + options + + + intValue + 1048576 + description + 1M + value + 1M + default + + + + intValue + 2097152 + description + 2M + value + 2M + default + + + + intValue + 2621440 + description + 2560K + value + 2560K + default + + + + intValue + 4194304 + description + 4M + value + 4M + default + + + + + + name + smartport + description + Disk Drives + options + + + value + + description + + devname + smartport + default + + + + + + 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 + mackbd_m0120 + slots + + + name + :kbd + options + + + value + + description + —None— + default + + + + value + gb + description + Macintosh Keyboard (British - M0110B) + default + + + + value + fr + description + Macintosh Keyboard (French - M0110F) + default + + + + value + it + description + Macintosh Keyboard (Italian - M0110T) + default + + + + value + us + description + Macintosh Keyboard (U.S. - M0110) + default + + + + value + pad + description + Macintosh Numeric Keypad (English - M0120) + default + + + + value + eupad + description + Macintosh Numeric Keypad (European - M0120P) + default + + + + value + frp + description + Macintosh Plus Keyboard (French - M0110A F) + default + + + + value + jpp + description + Macintosh Plus Keyboard (Japanese - M0110A J) + default + + + + value + usp + description + Macintosh Plus Keyboard (U.S. - M0110A) + default + + + + + + + + name + mackbd_m0120p + slots + + + name + :kbd + options + + + value + + description + —None— + default + + + + value + gb + description + Macintosh Keyboard (British - M0110B) + default + + + + value + fr + description + Macintosh Keyboard (French - M0110F) + default + + + + value + it + description + Macintosh Keyboard (Italian - M0110T) + default + + + + value + us + description + Macintosh Keyboard (U.S. - M0110) + default + + + + value + pad + description + Macintosh Numeric Keypad (English - M0120) + default + + + + value + eupad + description + Macintosh Numeric Keypad (European - M0120P) + default + + + + value + frp + description + Macintosh Plus Keyboard (French - M0110A F) + default + + + + value + jpp + description + Macintosh Plus Keyboard (Japanese - M0110A J) + default + + + + value + usp + description + Macintosh Plus Keyboard (U.S. - M0110A) + default + + + + + + + + software + + mac_flop.xml + mac_hdd.xml + + + diff --git a/Ample/Resources/macse.plist b/Ample/Resources/macse.plist new file mode 100644 index 0000000..052de0f --- /dev/null +++ b/Ample/Resources/macse.plist @@ -0,0 +1,204 @@ + + + + + value + macse + description + Macintosh SE + media + + hard + 2 + + resolution + + 512 + 342 + + slots + + + name + ramsize + description + RAM + options + + + intValue + 2097152 + description + 2M + value + 2M + default + + + + intValue + 2621440 + description + 2560K + value + 2560K + default + + + + intValue + 4194304 + description + 4M + value + 4M + default + + + + + + name + smartport + description + Disk Drives + options + + + value + + description + + devname + smartport + default + + + + + + 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 + + + + + + + + software + + mac_flop.xml + mac_hdd.xml + + + diff --git a/Ample/Resources/macsefd.plist b/Ample/Resources/macsefd.plist new file mode 100644 index 0000000..e3d40bf --- /dev/null +++ b/Ample/Resources/macsefd.plist @@ -0,0 +1,204 @@ + + + + + value + macsefd + description + Macintosh SE (FDHD) + media + + hard + 2 + + resolution + + 512 + 342 + + slots + + + name + ramsize + description + RAM + options + + + intValue + 2097152 + description + 2M + value + 2M + default + + + + intValue + 2621440 + description + 2560K + value + 2560K + default + + + + intValue + 4194304 + description + 4M + value + 4M + default + + + + + + name + smartport + description + Disk Drives + options + + + value + + description + + devname + smartport + default + + + + + + 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 + + + + + + + + software + + mac_flop.xml + mac_hdd.xml + + + diff --git a/Ample/Resources/models.plist b/Ample/Resources/models.plist index 82a2dcb..18a34f8 100644 --- a/Ample/Resources/models.plist +++ b/Ample/Resources/models.plist @@ -383,6 +383,57 @@ + + description + Macintosh (128K) + value + mac128k + children + + + description + Macintosh 128k + value + mac128k + + + description + Macintosh 512k + value + mac512k + + + description + Macintosh 512ke + value + mac512ke + + + description + Macintosh Plus + value + macplus + + + description + Macintosh SE + value + macse + + + description + Macintosh SE (FDHD) + value + macsefd + + + description + Macintosh Classic + value + macclasc + + + description Macintosh (NuBus) diff --git a/Ample/Resources/roms.plist b/Ample/Resources/roms.plist index 61d4fa0..260fe61 100644 --- a/Ample/Resources/roms.plist +++ b/Ample/Resources/roms.plist @@ -118,10 +118,26 @@ lx800 lx810l m68705p3 + mac128k + mac512k + mac512ke + macclasc maciici + mackbd_m0110 + mackbd_m0110a + mackbd_m0110a_f + mackbd_m0110a_j + mackbd_m0110b + mackbd_m0110f + mackbd_m0110t + mackbd_m0120 + mackbd_m0120p maclc maclc2 maclc3 + macplus + macse + macsefd maxxi microeng mprof3 @@ -142,6 +158,8 @@ nb_vikbw nb_wspt p72 + pds_hyper + pds_sefp prav82 prav8c prav8m diff --git a/python/machines.py b/python/machines.py index 8fb89bc..cf0d0ec 100644 --- a/python/machines.py +++ b/python/machines.py @@ -24,6 +24,12 @@ MACHINES = ( # macintosh... "maclc", "maclc2", "maclc3", "maciici", + + # mac 128k-classic + "mac128k", "mac512k", "mac512ke", "macplus", "macse", "macsefd", "macclasc", + + # 128k clones + # "unitron", "utrn1024", ) diff --git a/python/mkmodels.py b/python/mkmodels.py index b407ff3..4ba9c57 100644 --- a/python/mkmodels.py +++ b/python/mkmodels.py @@ -25,6 +25,7 @@ cec_children = ["cec2000", "cece", "cecg", "ceci", "cecm"] agat_children = ["agat7", "agat9"] mac_nubus_children = ["maclc", "maclc2", "maclc3", "maciici"] +mac_128k_children = ["mac128k", "mac512k", "mac512ke", "macplus", "macse", "macsefd", "macclasc"] tree = [ ("Apple I", "apple1", apple1_children), @@ -38,7 +39,8 @@ tree = [ ("Laser", "laser128", laser_children), ("Agat", "agat7", agat_children), ("China Education Computer", None, cec_children), - ("Macintosh (NuBus)", "maclc", mac_nubus_children) + ("Macintosh (128K)", "mac128k", mac_128k_children), + ("Macintosh (NuBus)", "maclc", mac_nubus_children), ] env = {'DYLD_FALLBACK_FRAMEWORK_PATH': '../embedded'}