diff --git a/python/machines.py b/python/machines.py index b7db4d8..89b97d2 100644 --- a/python/machines.py +++ b/python/machines.py @@ -38,6 +38,9 @@ MACHINES = ( # 128k clones # "unitron", "utrn1024", + + #atari + "st", "megast" ) @@ -54,6 +57,9 @@ SLOTS = ( # mac nubus "nb1", "nb2", "nb3", "nb4", "nb5", "nb6", "nb7", "nb8", "nb9", "nba", "nbb", "nbc", "nbd", "nbe", + + # st + "centronics", "mdin", "mdout" ) SLOT_NAMES = { @@ -69,7 +75,7 @@ SLOT_NAMES = { "sl7": "Slot 7", "exp": "Expansion", "aux": "Auxiliary", - "rs232": "RS232", + "rs232": "Modem", "gameio": "Game I/O", "modem": "Modem", "printer": "Printer", @@ -80,4 +86,8 @@ SLOT_NAMES = { "nbc": "Slot C", "nbd": "Slot D", "nbe": "Slot E", + + "centronics": "Printer", + "mdin": "MIDI In", + "mdout": "MIDI Out", } diff --git a/python/mkmachines.py b/python/mkmachines.py index c659764..ba58cbf 100644 --- a/python/mkmachines.py +++ b/python/mkmachines.py @@ -210,6 +210,8 @@ def find_media(parent, include_slots=False): "bitbanger": "bitbanger", # null_modem, etc. "picture_image": "picture", # a2ceyes # "printer_image": "printout", + "midiin": "midiin", + "midiout": "midiout", } remap_slot = { # now handled at the slot level. @@ -310,6 +312,7 @@ DEVICE_EXCLUDE = set([ 'smoc501', 'cfp1080s', 'cf', # ATA compact flash + 'cp2024', # Conner Peripherals CP-2024 hard disk ]) def make_device_options(slot): @@ -445,8 +448,6 @@ def make_bios(m): } - - def make_smartport(machine): @@ -457,12 +458,14 @@ def make_smartport(machine): # maclc # macse + # atari st, etc: slots = [] SLOTS = [ *['fdc:' + str(x) for x in range(0,4)], *['scsi:' + str(x) for x in range(0,7)], *['scsibus:' + str(x) for x in range(0,7)], + *['wd1772:' + str(x) for x in range(0,4)], "sl6:0", "sl6:1", "0", "1", "2", "3" ] diff --git a/python/mkmodels.py b/python/mkmodels.py index 2890af6..2aff95e 100644 --- a/python/mkmodels.py +++ b/python/mkmodels.py @@ -33,6 +33,8 @@ mac_nubus_children = [ mac_128k_children = ["mac128k", "mac512k", "mac512ke", "macplus", "macse", "macsefd", "macse30", "macclasc", "macclas2", "maccclas"] +atari_st_children = ["st", "megast"] + tree = [ ("Apple I", "apple1", apple1_children), ("Apple ][", "apple2", apple2_children), @@ -48,6 +50,7 @@ tree = [ ("China Education Computer", None, cec_children), ("Macintosh (Compact)", "macse30", mac_128k_children), ("Macintosh (NuBus)", "maciix", mac_nubus_children), + ("Atari ST", "st", atari_st_children) ] env = {'DYLD_FALLBACK_FRAMEWORK_PATH': '../embedded'}