diff --git a/.gitignore b/.gitignore index b1e3a4fa..07927f88 100644 --- a/.gitignore +++ b/.gitignore @@ -52,17 +52,9 @@ /mkinstalldirs *.o /options.h -/roms/128p-0.rom -/roms/128p-1.rom -/roms/256s-0.rom -/roms/256s-1.rom -/roms/256s-2.rom -/roms/256s-3.rom /roms/didaktik80.rom -/roms/gluck.rom /roms/if1-2.rom /roms/opus.rom -/roms/trdos.rom /roms/usource.rom /settings.c /settings.h diff --git a/fusepb/FuseX.xcodeproj/project.pbxproj b/fusepb/FuseX.xcodeproj/project.pbxproj index d0e6922f..9adb8ae5 100644 --- a/fusepb/FuseX.xcodeproj/project.pbxproj +++ b/fusepb/FuseX.xcodeproj/project.pbxproj @@ -199,6 +199,14 @@ B68C32961D3BBF2D0082CBD4 /* startup_manager.c in Sources */ = {isa = PBXBuildFile; fileRef = B68C32941D3BBF2D0082CBD4 /* startup_manager.c */; }; B68C32991D3BBF620082CBD4 /* z80_debugger_variables.c in Sources */ = {isa = PBXBuildFile; fileRef = B68C32971D3BBF620082CBD4 /* z80_debugger_variables.c */; }; B69A00421723B8F300FF201C /* disciple.rom in Resources */ = {isa = PBXBuildFile; fileRef = B69A00411723B8F300FF201C /* disciple.rom */; }; + DF64645D648D6690E0717A05 /* 128p-0.rom in Resources */ = {isa = PBXBuildFile; fileRef = 149707A6310CA776B49E44BB /* 128p-0.rom */; }; + 6823C0379589DBCFCE58368B /* 128p-1.rom in Resources */ = {isa = PBXBuildFile; fileRef = 182AC5F263F0617717FE0914 /* 128p-1.rom */; }; + F5C0D7150F9D57C74254E7C8 /* 256s-0.rom in Resources */ = {isa = PBXBuildFile; fileRef = C92EF3866D22AE4CC08978A7 /* 256s-0.rom */; }; + 652334C79C3C45C66BE3C10B /* 256s-1.rom in Resources */ = {isa = PBXBuildFile; fileRef = BE0CE3A70B709644584824ED /* 256s-1.rom */; }; + 35734AD24A1AA881FBBBEB27 /* 256s-2.rom in Resources */ = {isa = PBXBuildFile; fileRef = BB363D13A266FD676FFE3610 /* 256s-2.rom */; }; + BAE50FF21E9FEF6A73AC6175 /* 256s-3.rom in Resources */ = {isa = PBXBuildFile; fileRef = B47A67E8F3CF893BB8B0B51B /* 256s-3.rom */; }; + 9E7F68EF45D46C79F66004E9 /* gluck.rom in Resources */ = {isa = PBXBuildFile; fileRef = 0729E0464F01C4BF0C9CF069 /* gluck.rom */; }; + 6616B2D62512C764FFAC046E /* trdos.rom in Resources */ = {isa = PBXBuildFile; fileRef = 34AD35B155C536CA1C00E688 /* trdos.rom */; }; B69BE5331660DF5300C5D0CE /* socket.c in Sources */ = {isa = PBXBuildFile; fileRef = B69BE5321660DF5300C5D0CE /* socket.c */; }; B69BE5381660DF8B00C5D0CE /* movie.c in Sources */ = {isa = PBXBuildFile; fileRef = B69BE5361660DF8B00C5D0CE /* movie.c */; }; B69BE53C1660E01000C5D0CE /* am29f010.c in Sources */ = {isa = PBXBuildFile; fileRef = B69BE53A1660E01000C5D0CE /* am29f010.c */; }; @@ -640,6 +648,14 @@ B68CB2C503DD920300A804BA /* debugger.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = debugger.h; path = ../debugger/debugger.h; sourceTree = ""; }; B68CB2C603DD920300A804BA /* disassemble.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = disassemble.c; path = ../debugger/disassemble.c; sourceTree = ""; }; B69A00411723B8F300FF201C /* disciple.rom */ = {isa = PBXFileReference; lastKnownFileType = file; name = disciple.rom; path = ../roms/disciple.rom; sourceTree = SOURCE_ROOT; }; + 149707A6310CA776B49E44BB /* 128p-0.rom */ = {isa = PBXFileReference; lastKnownFileType = file; name = "128p-0.rom"; path = "../roms/128p-0.rom"; sourceTree = SOURCE_ROOT; }; + 182AC5F263F0617717FE0914 /* 128p-1.rom */ = {isa = PBXFileReference; lastKnownFileType = file; name = "128p-1.rom"; path = "../roms/128p-1.rom"; sourceTree = SOURCE_ROOT; }; + C92EF3866D22AE4CC08978A7 /* 256s-0.rom */ = {isa = PBXFileReference; lastKnownFileType = file; name = "256s-0.rom"; path = "../roms/256s-0.rom"; sourceTree = SOURCE_ROOT; }; + BE0CE3A70B709644584824ED /* 256s-1.rom */ = {isa = PBXFileReference; lastKnownFileType = file; name = "256s-1.rom"; path = "../roms/256s-1.rom"; sourceTree = SOURCE_ROOT; }; + BB363D13A266FD676FFE3610 /* 256s-2.rom */ = {isa = PBXFileReference; lastKnownFileType = file; name = "256s-2.rom"; path = "../roms/256s-2.rom"; sourceTree = SOURCE_ROOT; }; + B47A67E8F3CF893BB8B0B51B /* 256s-3.rom */ = {isa = PBXFileReference; lastKnownFileType = file; name = "256s-3.rom"; path = "../roms/256s-3.rom"; sourceTree = SOURCE_ROOT; }; + 0729E0464F01C4BF0C9CF069 /* gluck.rom */ = {isa = PBXFileReference; lastKnownFileType = file; name = "gluck.rom"; path = "../roms/gluck.rom"; sourceTree = SOURCE_ROOT; }; + 34AD35B155C536CA1C00E688 /* trdos.rom */ = {isa = PBXFileReference; lastKnownFileType = file; name = "trdos.rom"; path = "../roms/trdos.rom"; sourceTree = SOURCE_ROOT; }; B69BE5321660DF5300C5D0CE /* socket.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = socket.c; sourceTree = ""; }; B69BE5351660DF8B00C5D0CE /* movie_tables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = movie_tables.h; sourceTree = ""; }; B69BE5361660DF8B00C5D0CE /* movie.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = movie.c; sourceTree = ""; }; @@ -1727,6 +1743,14 @@ F559854E0389212301A804BA /* 128-1.rom */, F559854C0389212301A804BA /* 48.rom */, B69A00411723B8F300FF201C /* disciple.rom */, + 149707A6310CA776B49E44BB /* 128p-0.rom */, + 182AC5F263F0617717FE0914 /* 128p-1.rom */, + C92EF3866D22AE4CC08978A7 /* 256s-0.rom */, + BE0CE3A70B709644584824ED /* 256s-1.rom */, + BB363D13A266FD676FFE3610 /* 256s-2.rom */, + B47A67E8F3CF893BB8B0B51B /* 256s-3.rom */, + 0729E0464F01C4BF0C9CF069 /* gluck.rom */, + 34AD35B155C536CA1C00E688 /* trdos.rom */, F55985520389213E01A804BA /* plus2-0.rom */, F55985530389213E01A804BA /* plus2-1.rom */, F55985540389213E01A804BA /* plus3-0.rom */, @@ -2016,6 +2040,14 @@ B61F460E09121DF100C8096C /* 128-1.rom in Resources */, B61F460C09121DF100C8096C /* 48.rom in Resources */, B69A00421723B8F300FF201C /* disciple.rom in Resources */, + DF64645D648D6690E0717A05 /* 128p-0.rom in Resources */, + 6823C0379589DBCFCE58368B /* 128p-1.rom in Resources */, + F5C0D7150F9D57C74254E7C8 /* 256s-0.rom in Resources */, + 652334C79C3C45C66BE3C10B /* 256s-1.rom in Resources */, + 35734AD24A1AA881FBBBEB27 /* 256s-2.rom in Resources */, + BAE50FF21E9FEF6A73AC6175 /* 256s-3.rom in Resources */, + 9E7F68EF45D46C79F66004E9 /* gluck.rom in Resources */, + 6616B2D62512C764FFAC046E /* trdos.rom in Resources */, B61F461709121DF100C8096C /* plus2-0.rom in Resources */, D1DF6DD826F8077F004A4AB7 /* debug.png in Resources */, B61F461809121DF100C8096C /* plus2-1.rom in Resources */, diff --git a/roms/128p-0.rom b/roms/128p-0.rom new file mode 100644 index 00000000..5c7a5716 Binary files /dev/null and b/roms/128p-0.rom differ diff --git a/roms/128p-1.rom b/roms/128p-1.rom new file mode 100644 index 00000000..64c3e737 Binary files /dev/null and b/roms/128p-1.rom differ diff --git a/roms/256s-0.rom b/roms/256s-0.rom new file mode 100644 index 00000000..6cec6822 Binary files /dev/null and b/roms/256s-0.rom differ diff --git a/roms/256s-1.rom b/roms/256s-1.rom new file mode 100644 index 00000000..b33ec98e Binary files /dev/null and b/roms/256s-1.rom differ diff --git a/roms/256s-2.rom b/roms/256s-2.rom new file mode 100644 index 00000000..7c1f3cf9 Binary files /dev/null and b/roms/256s-2.rom differ diff --git a/roms/256s-3.rom b/roms/256s-3.rom new file mode 100644 index 00000000..8811367b Binary files /dev/null and b/roms/256s-3.rom differ diff --git a/roms/Makefile.am b/roms/Makefile.am index 5a0b552c..de318d3b 100644 --- a/roms/Makefile.am +++ b/roms/Makefile.am @@ -23,8 +23,15 @@ ROMS = \ roms/128-0.rom \ roms/128-1.rom \ + roms/128p-0.rom \ + roms/128p-1.rom \ + roms/256s-0.rom \ + roms/256s-1.rom \ + roms/256s-2.rom \ + roms/256s-3.rom \ roms/48.rom \ roms/disciple.rom \ + roms/gluck.rom \ roms/plus2-0.rom \ roms/plus2-1.rom \ roms/plus3-0.rom \ @@ -39,6 +46,7 @@ ROMS = \ roms/tc2048.rom \ roms/tc2068-0.rom \ roms/tc2068-1.rom \ + roms/trdos.rom \ roms/se-0.rom \ roms/se-1.rom \ roms/speccyboot-1.4.rom diff --git a/roms/README.copyright b/roms/README.copyright index 96bbea28..067bb4e2 100644 --- a/roms/README.copyright +++ b/roms/README.copyright @@ -35,6 +35,20 @@ plus3e-3.rom These are derived from Amstrad code, so the above statement applies. The modifications are copyright Garry Lancaster. +128p-0.rom +128p-1.rom +256s-1.rom + +These are main ROMs of the Pentagon and the Scorpion ZS 256. They are +derived from Amstrad code, so the above statement applies. The +modifications are of unrecorded authorship. + +256s-0.rom + +This is derived from Amstrad code, but its copyright message has been +removed, so the above statement does not apply. No permission for +redistribution has been obtained. + se-0.rom se-1.rom @@ -71,3 +85,26 @@ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +trdos.rom +256s-3.rom + +These are TR-DOS, copyright Technology Research Ltd. No permission for +redistribution has been obtained. + +256s-2.rom +gluck.rom + +These are the Scorpion and Gluck service ROMs. Their copyright status is +currently unknown. + +Copyright owners +---------------- + +Where no permission is recorded above, none has been obtained, and in some +cases the copyright owner is unknown. If you own the copyright in any file +in this directory and are reading this, please get in touch at +. + +Those files are distributed for archival and educational use only. No charge +is made for them and no ownership of them is claimed. diff --git a/roms/gluck.rom b/roms/gluck.rom new file mode 100644 index 00000000..748f85be Binary files /dev/null and b/roms/gluck.rom differ diff --git a/roms/trdos.rom b/roms/trdos.rom new file mode 100644 index 00000000..65b24aa7 Binary files /dev/null and b/roms/trdos.rom differ