From a28c42a2b658a01359376db8df152419b83b8025 Mon Sep 17 00:00:00 2001 From: Kelvin Sherlock Date: Sun, 10 Mar 2024 19:21:25 -0400 Subject: [PATCH] mactv --- Ample.xcodeproj/project.pbxproj | 6 + Ample/Resources/mactv.plist | 1000 +++++++++++++++++++++++++++++++ Ample/Resources/models.plist | 6 + python/machines.py | 2 +- python/mkmachines.py | 2 +- python/mkmodels.py | 2 +- 6 files changed, 1015 insertions(+), 3 deletions(-) create mode 100644 Ample/Resources/mactv.plist diff --git a/Ample.xcodeproj/project.pbxproj b/Ample.xcodeproj/project.pbxproj index e7e0db5..5c3616f 100644 --- a/Ample.xcodeproj/project.pbxproj +++ b/Ample.xcodeproj/project.pbxproj @@ -58,6 +58,8 @@ B64AF1F7250ED5E400A09B9B /* TableCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = B64AF1F5250ED5E400A09B9B /* TableCellView.m */; }; B64AF1FA250EF6A500A09B9B /* Transformers.m in Sources */ = {isa = PBXBuildFile; fileRef = B64AF1F9250EF6A500A09B9B /* Transformers.m */; }; B64AF1FB250EF6A500A09B9B /* Transformers.m in Sources */ = {isa = PBXBuildFile; fileRef = B64AF1F9250EF6A500A09B9B /* Transformers.m */; }; + B65C0A772B9E77DC00CB24C9 /* mactv.plist in Resources */ = {isa = PBXBuildFile; fileRef = B65C0A762B9E77DC00CB24C9 /* mactv.plist */; }; + B65C0A782B9E77DC00CB24C9 /* mactv.plist in Resources */ = {isa = PBXBuildFile; fileRef = B65C0A762B9E77DC00CB24C9 /* mactv.plist */; }; B65D718625E70BD5008C5F87 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B65D718525E70BD5008C5F87 /* WebKit.framework */; }; B65D718725E70BE5008C5F87 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B65D718525E70BD5008C5F87 /* WebKit.framework */; }; B66236A924FD9A34006CABD7 /* PreferencesWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = B66236A824FD9A34006CABD7 /* PreferencesWindowController.m */; }; @@ -702,6 +704,7 @@ 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 = ""; }; + B65C0A762B9E77DC00CB24C9 /* mactv.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = mactv.plist; sourceTree = ""; }; B65D718525E70BD5008C5F87 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; }; B66116842A2535EF0038A3E2 /* st.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = st.plist; sourceTree = ""; }; B66116872A2535F50038A3E2 /* megast.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = megast.plist; sourceTree = ""; }; @@ -1092,6 +1095,7 @@ B6896DF92B016CDC00251FA4 /* macqd650.plist */, B6896E0E2B016CE100251FA4 /* macqd800.plist */, B6896E1A2B016CE400251FA4 /* macse30.plist */, + B65C0A762B9E77DC00CB24C9 /* mactv.plist */, B6896E042B016CDF00251FA4 /* maxxi.plist */, B6896DCB2B016CD100251FA4 /* microeng.plist */, B6896DDA2B016CD400251FA4 /* models~extra.plist */, @@ -1559,6 +1563,7 @@ B67878982B01732700CFACF2 /* ip6800.plist in Resources */, B67878892B01732700CFACF2 /* indigo_r4000.plist in Resources */, B67878B92B01732700CFACF2 /* pi4d30.plist in Resources */, + B65C0A772B9E77DC00CB24C9 /* mactv.plist in Resources */, B67878822B01732700CFACF2 /* hp9k330.plist in Resources */, B67878C82B01732700CFACF2 /* tk3000.plist in Resources */, B678787E2B01732700CFACF2 /* ds3100.plist in Resources */, @@ -1817,6 +1822,7 @@ B67878622B01732600CFACF2 /* models.plist in Resources */, B67877D62B01732600CFACF2 /* am100.plist in Resources */, B678783E2B01732600CFACF2 /* apple2c.plist in Resources */, + B65C0A782B9E77DC00CB24C9 /* mactv.plist in Resources */, B67878012B01732600CFACF2 /* ip6800.plist in Resources */, B678782B2B01732600CFACF2 /* rtpc010.plist in Resources */, B6852ECD2B0EAA7500BBFFC7 /* a2000n.plist in Resources */, diff --git a/Ample/Resources/mactv.plist b/Ample/Resources/mactv.plist new file mode 100644 index 0000000..27fb41a --- /dev/null +++ b/Ample/Resources/mactv.plist @@ -0,0 +1,1000 @@ + + + + + value + mactv + description + Macintosh TV + media + + cdrom + 1 + + resolution + + 640 + 480 + + slots + + + name + ramsize + description + RAM + options + + + intValue + 4194304 + description + 4M + value + 4M + default + + + + intValue + 5242880 + description + 5M + value + 5M + default + + + + intValue + 6291456 + description + 6M + value + 6M + default + + + + intValue + 8388608 + description + 8M + value + 8M + default + + + + + + name + smartport + description + Disk Drives + options + + + value + + description + + devname + smartport + default + + + + + + name + printer + description + Printer + options + + + value + + description + —None— + default + + + + value + ie15 + description + IE15 Terminal + devname + ie15_terminal + + + value + scorpion + description + Micro-Robotics Scorpion Intelligent Controller + devname + scorpion_ic + + + value + pty + description + Pseudo Terminal + devname + pseudo_terminal + + + value + rs_printer + description + Radio Shack Serial Printer + devname + rs_serial_printer + + + value + patch + description + RS-232 Patch Box + devname + rs232_patch_box + + + value + loopback + description + RS232 Loopback + devname + rs232_loopback + + + value + dec_loopback + description + RS232 Loopback (DEC 12-15336-00) + devname + dec_rs232_loopback + + + value + null_modem + description + RS232 Null Modem + devname + null_modem + media + + bitbanger + 1 + + + + value + rs232_sync_io + description + RS232 Synchronous I/O + devname + rs232_sync_io + media + + bitbanger + 1 + + + + value + keyboard + description + Serial Keyboard + devname + serial_keyboard + + + value + printer + description + Serial Printer + devname + serial_printer + + + value + terminal + description + Serial Terminal + devname + serial_terminal + + + value + sunkbd + description + Sun Keyboard Adaptor + devname + sunkbd_adaptor + + + value + mockingboard + description + Sweet Micro Systems Mockingboard D + devname + mockingboardd + + + value + swtpc8212 + description + SWTPC8212 Terminal + devname + swtpc8212_terminal + + + + + name + modem + description + Modem + options + + + value + + description + —None— + default + + + + value + ie15 + description + IE15 Terminal + devname + ie15_terminal + + + value + scorpion + description + Micro-Robotics Scorpion Intelligent Controller + devname + scorpion_ic + + + value + pty + description + Pseudo Terminal + devname + pseudo_terminal + + + value + rs_printer + description + Radio Shack Serial Printer + devname + rs_serial_printer + + + value + patch + description + RS-232 Patch Box + devname + rs232_patch_box + + + value + loopback + description + RS232 Loopback + devname + rs232_loopback + + + value + dec_loopback + description + RS232 Loopback (DEC 12-15336-00) + devname + dec_rs232_loopback + + + value + null_modem + description + RS232 Null Modem + devname + null_modem + media + + bitbanger + 1 + + + + value + rs232_sync_io + description + RS232 Synchronous I/O + devname + rs232_sync_io + media + + bitbanger + 1 + + + + value + keyboard + description + Serial Keyboard + devname + serial_keyboard + + + value + printer + description + Serial Printer + devname + serial_printer + + + value + terminal + description + Serial Terminal + devname + serial_terminal + + + value + sunkbd + description + Sun Keyboard Adaptor + devname + sunkbd_adaptor + + + value + mockingboard + description + Sweet Micro Systems Mockingboard D + devname + mockingboardd + + + value + swtpc8212 + description + SWTPC8212 Terminal + devname + swtpc8212_terminal + + + + + devices + + + name + smartport + slots + + + name + scsi:0 + options + + + value + + description + —None— + default + + + + value + aplcdsc + description + Apple SCSI CD-ROM + default + + media + + cdrom + 1 + + + + value + cdrom + description + CD-ROM + default + + media + + cdrom + 1 + + + + value + harddisk + description + Hard Disk + default + + media + + hard + 1 + + + + value + tape + description + SCSI tape + default + + + + + + name + scsi:1 + options + + + value + + description + —None— + default + + + + value + aplcdsc + description + Apple SCSI CD-ROM + default + + media + + cdrom + 1 + + + + value + cdrom + description + CD-ROM + default + + media + + cdrom + 1 + + + + value + harddisk + description + Hard Disk + default + + media + + hard + 1 + + + + value + tape + description + SCSI tape + default + + + + + + name + scsi:2 + options + + + value + + description + —None— + default + + + + value + aplcdsc + description + Apple SCSI CD-ROM + default + + media + + cdrom + 1 + + + + value + cdrom + description + CD-ROM + default + + media + + cdrom + 1 + + + + value + harddisk + description + Hard Disk + default + + media + + hard + 1 + + + + value + tape + description + SCSI tape + default + + + + + + name + scsi:4 + options + + + value + + description + —None— + default + + + + value + aplcdsc + description + Apple SCSI CD-ROM + default + + media + + cdrom + 1 + + + + value + cdrom + description + CD-ROM + default + + media + + cdrom + 1 + + + + value + harddisk + description + Hard Disk + default + + media + + hard + 1 + + + + value + tape + description + SCSI tape + default + + + + + + name + scsi:5 + options + + + value + + description + —None— + default + + + + value + aplcdsc + description + Apple SCSI CD-ROM + default + + media + + cdrom + 1 + + + + value + cdrom + description + CD-ROM + default + + media + + cdrom + 1 + + + + value + harddisk + description + Hard Disk + default + + media + + hard + 1 + + + + value + tape + description + SCSI tape + default + + + + + + name + scsi:6 + options + + + value + + description + —None— + default + + + + value + aplcdsc + description + Apple SCSI CD-ROM + default + + media + + cdrom + 1 + + + + value + cdrom + description + CD-ROM + default + + media + + cdrom + 1 + + + + value + harddisk + description + Hard Disk + default + + media + + hard + 1 + + + + value + tape + description + SCSI tape + default + + + + + + + + name + rs232_patch_box + slots + + + name + :dce + options + + + value + + description + —None— + default + + + + value + ie15 + description + IE15 Terminal + default + + + + value + scorpion + description + Micro-Robotics Scorpion Intelligent Controller + default + + + + value + pty + description + Pseudo terminal + default + + + + value + rs_printer + description + Radio Shack Serial Printer + default + + + + value + patch + description + RS-232 Patch Box + default + + + + value + loopback + description + RS232 Loopback + default + + + + value + dec_loopback + description + RS232 Loopback (DEC 12-15336-00) + default + + + + value + null_modem + description + RS232 Null Modem + default + + media + + bitbanger + 1 + + + + value + rs232_sync_io + description + RS232 Synchronous I/O + default + + media + + bitbanger + 1 + + + + value + keyboard + description + Serial Keyboard + default + + + + value + printer + description + Serial Printer + default + + + + value + terminal + description + Serial Terminal + default + + + + value + sunkbd + description + Sun Keyboard Adaptor + default + + + + value + mockingboard + description + Sweet Micro Systems Mockingboard D + default + + + + value + swtpc8212 + description + SWTPC8212 Terminal + default + + + + + + + + name + sunkbd_adaptor + slots + + + name + :keyboard + options + + + value + + description + —None— + default + + + + value + type3hle + description + Sun Type 3 Keyboard (HLE) + default + + + + value + type4hle + description + Sun Type 4 Keyboard (HLE) + default + + + + value + type5gbhle + description + Sun Type 5 Keyboard (Great Britain - HLE) + default + + + + value + type5jphle + description + Sun Type 5 Keyboard (Japan - HLE) + default + + + + value + type5sehle + description + Sun Type 5 Keyboard (Sweden - HLE) + default + + + + value + type5hle + description + Sun Type 5 Keyboard (U.S.A. - HLE) + default + + + + + + + + software + + mac_hdd.xml + + name + mac_cdrom.xml + filter + MC68030,MC68030_32 + + mac_hdflop.xml + + + diff --git a/Ample/Resources/models.plist b/Ample/Resources/models.plist index bca3b8d..b4b8e6b 100644 --- a/Ample/Resources/models.plist +++ b/Ample/Resources/models.plist @@ -654,6 +654,12 @@ value macct650 + + description + Macintosh TV + value + mactv + diff --git a/python/machines.py b/python/machines.py index 0a713ad..5fbd99e 100644 --- a/python/machines.py +++ b/python/machines.py @@ -30,7 +30,7 @@ MACHINES = ( # macintosh... "macii", "maciihmu", "mac2fdhd", "maciix", "maciicx", "maciici", "maciisi", "maciivx", "maciivi", - "maclc", "maclc2", "maclc3", "maclc3p", "maclc520", "maclc550", + "maclc", "maclc2", "maclc3", "maclc3p", "maclc520", "maclc550", "mactv", # mac 128k-classic "mac128k", "mac512k", "mac512ke", "macplus", "macse", "macsefd", "macse30", diff --git a/python/mkmachines.py b/python/mkmachines.py index ee749ac..9b9078d 100644 --- a/python/mkmachines.py +++ b/python/mkmachines.py @@ -663,7 +663,7 @@ devices = {} p = argparse.ArgumentParser() p.add_argument('machine', nargs="*") -p.add_argument('--extra', action='store_true') +p.add_argument('--extra', action='store_true', help='also generate Ample Lite machines') args = p.parse_args() extra = args.extra diff --git a/python/mkmodels.py b/python/mkmodels.py index c8e0181..231cbec 100644 --- a/python/mkmodels.py +++ b/python/mkmodels.py @@ -34,7 +34,7 @@ mac_ii_children = [ mac_lc_children = [ "maclc", "maclc2", "maclc3", "maclc3p", "maclc475", "maclc520", "maclc550", "maclc575", - "macct610", "macct650", + "macct610", "macct650", "mactv", ] # maclc50" / macqd630 slots are messed up right now.