From 7a077e5ec80f80ff7183976f0b1558b7494e3497 Mon Sep 17 00:00:00 2001 From: Kelvin Sherlock Date: Mon, 31 Oct 2022 17:47:10 -0400 Subject: [PATCH] add mac color classic and lc 520 (mame 249) --- Ample/Resources/maccclas.plist | 974 +++++++++++++++++++++++++++++++ Ample/Resources/maclc520.plist | 1004 ++++++++++++++++++++++++++++++++ Ample/Resources/models.plist | 12 + Ample/Resources/roms.plist | 18 + python/machines.py | 4 +- python/mkmodels.py | 4 +- 6 files changed, 2012 insertions(+), 4 deletions(-) create mode 100644 Ample/Resources/maccclas.plist create mode 100644 Ample/Resources/maclc520.plist diff --git a/Ample/Resources/maccclas.plist b/Ample/Resources/maccclas.plist new file mode 100644 index 0000000..590bf8f --- /dev/null +++ b/Ample/Resources/maccclas.plist @@ -0,0 +1,974 @@ + + + + + value + maccclas + description + Macintosh Color Classic + media + + + resolution + + 512 + 384 + + slots + + + name + ramsize + description + RAM + options + + + 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 + + + + + + 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 + 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 + 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 + + + + + + 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 + + + + + + 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 + + + + + + name + scsi:3 + 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 + + + + + + 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 + + + + + + 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 + + + + + + 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 + + + + + + + + name + rs232_patch_box + slots + + + name + :dce + options + + + value + + description + —None— + default + + + + value + ie15 + description + IE15 Terminal + 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 + mac_hdflop.xml + + + diff --git a/Ample/Resources/maclc520.plist b/Ample/Resources/maclc520.plist new file mode 100644 index 0000000..edabfc2 --- /dev/null +++ b/Ample/Resources/maclc520.plist @@ -0,0 +1,1004 @@ + + + + + value + maclc520 + description + Macintosh LC 520 + media + + + resolution + + 640 + 480 + + slots + + + name + ramsize + description + RAM + options + + + 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 + + + + + + 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 + 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 + 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 + + + + + + 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 + + + + + + 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 + + + + + + name + scsi:3 + 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 + + + + + + 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 + + + + + + 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 + + + + + + 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 + + + + + + + + name + rs232_patch_box + slots + + + name + :dce + options + + + value + + description + —None— + default + + + + value + ie15 + description + IE15 Terminal + 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 + mac_hdflop.xml + + + diff --git a/Ample/Resources/models.plist b/Ample/Resources/models.plist index 64292d6..842605b 100644 --- a/Ample/Resources/models.plist +++ b/Ample/Resources/models.plist @@ -481,6 +481,12 @@ value macclas2 + + description + Macintosh Color Classic + value + maccclas + @@ -562,6 +568,12 @@ value maclc3 + + description + Macintosh LC 520 + value + maclc520 + diff --git a/Ample/Resources/roms.plist b/Ample/Resources/roms.plist index a0dfadf..a6a12ab 100644 --- a/Ample/Resources/roms.plist +++ b/Ample/Resources/roms.plist @@ -146,6 +146,12 @@ description Apple //e (enhanced, UK) + + value + cuda + description + Apple Cuda + value a2iwm @@ -710,6 +716,12 @@ description Macintosh Classic II + + value + maccclas + description + Macintosh Color Classic + value macii @@ -776,6 +788,12 @@ description Macintosh LC + + value + maclc520 + description + Macintosh LC 520 + value maclc2 diff --git a/python/machines.py b/python/machines.py index 0ad7fa8..b7db4d8 100644 --- a/python/machines.py +++ b/python/machines.py @@ -30,11 +30,11 @@ MACHINES = ( # macintosh... "macii", "maciihmu", "mac2fdhd", "maciix", "maciicx", "maciici", "maciisi", "maciivx", "maciivi", - "maclc", "maclc2", "maclc3", + "maclc", "maclc2", "maclc3", "maclc520", # mac 128k-classic "mac128k", "mac512k", "mac512ke", "macplus", "macse", "macsefd", "macse30", - "macclasc", "macclas2", + "macclasc", "macclas2", "maccclas", # 128k clones # "unitron", "utrn1024", diff --git a/python/mkmodels.py b/python/mkmodels.py index e2124df..2890af6 100644 --- a/python/mkmodels.py +++ b/python/mkmodels.py @@ -27,11 +27,11 @@ agat_children = ["agat7", "agat9"] mac_nubus_children = [ "macii", "maciihmu", "mac2fdhd", "maciix", "maciicx", "maciici", "maciisi", "maciivx", "maciivi", - "maclc", "maclc2", "maclc3"] + "maclc", "maclc2", "maclc3", "maclc520"] # se/30 and classic 2 are implemented as a nubus but i'm sticking then with the 128 due to the form factor. mac_128k_children = ["mac128k", "mac512k", "mac512ke", "macplus", - "macse", "macsefd", "macse30", "macclasc", "macclas2"] + "macse", "macsefd", "macse30", "macclasc", "macclas2", "maccclas"] tree = [ ("Apple I", "apple1", apple1_children),