From 66c588476e1ad618bfd49d9421fe69da7c9ca551 Mon Sep 17 00:00:00 2001 From: Stephen Anthony Date: Fri, 5 Apr 2019 13:35:20 -0230 Subject: [PATCH 1/5] Disabled mappings for R77 port for upcoming beta test. More work needs to be done in the core before this can be activated. --- src/unix/r77/SettingsR77.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/unix/r77/SettingsR77.cxx b/src/unix/r77/SettingsR77.cxx index 83f127ba0..cecc364b9 100644 --- a/src/unix/r77/SettingsR77.cxx +++ b/src/unix/r77/SettingsR77.cxx @@ -88,8 +88,8 @@ bool SettingsR77::saveConfigFile(const string& cfgfile) const out << "fullscreen = " << getString("fullscreen") << endl; out << "lastrom = " << getString("lastrom") << endl; - out << "keymap = " << getString("keymap") << endl; - out << "joymap = " << getString("joymap") << endl; +// out << "keymap = " << getString("keymap") << endl; +// out << "joymap = " << getString("joymap") << endl; out.flush(); out.close(); From 88af3c0b4363965692c44afb974c1759002417ed Mon Sep 17 00:00:00 2001 From: Stephen Anthony Date: Fri, 5 Apr 2019 23:37:48 -0230 Subject: [PATCH 2/5] Add ARM detection to bspf. Fixed a few minor warnings. --- src/common/PKeyboardHandler.cxx | 2 +- src/common/PKeyboardHandler.hxx | 3 ++- src/common/bspf.hxx | 4 ++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/common/PKeyboardHandler.cxx b/src/common/PKeyboardHandler.cxx index e4db1d820..56697f14b 100644 --- a/src/common/PKeyboardHandler.cxx +++ b/src/common/PKeyboardHandler.cxx @@ -610,4 +610,4 @@ bool PhysicalKeyboardHandler::handleControlEvent(StellaKey key, StellaMod mod, b handled = false; return handled; -} \ No newline at end of file +} diff --git a/src/common/PKeyboardHandler.hxx b/src/common/PKeyboardHandler.hxx index cc21f05fe..5e0faaf73 100644 --- a/src/common/PKeyboardHandler.hxx +++ b/src/common/PKeyboardHandler.hxx @@ -75,7 +75,8 @@ class PhysicalKeyboardHandler // Array of key events, indexed by StellaKey Event::Type myKeyTable[KBDK_LAST][kNumModes]; // Array of mod keys, indexed by StellaKey - StellaMod myModKeyTable[KBDK_LAST][kNumModes]; + // TODO - uncomment when this is ready + //StellaMod myModKeyTable[KBDK_LAST][kNumModes]; // Sometimes key combos with the Alt key become 'stuck' after the // window changes state, and we want to ignore that event diff --git a/src/common/bspf.hxx b/src/common/bspf.hxx index a04c91f9f..fd841cfbd 100644 --- a/src/common/bspf.hxx +++ b/src/common/bspf.hxx @@ -111,6 +111,10 @@ namespace BSPF static const string ARCH = "x86_64"; #elif defined(__powerpc__) || defined(__ppc__) static const string ARCH = "ppc"; + #elif defined(__arm__) || defined(__thumb__) + static const string ARCH = "arm32"; + #elif defined(__aarch64__) + static const string ARCH = "arm64"; #else static const string ARCH = "NOARCH"; #endif From 4e2df09b10049479f8544676fa707cd3ba200eec Mon Sep 17 00:00:00 2001 From: Stephen Anthony Date: Fri, 5 Apr 2019 23:59:09 -0230 Subject: [PATCH 3/5] Reactivate syncing for R77 stellarc file. --- src/unix/r77/SettingsR77.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/unix/r77/SettingsR77.cxx b/src/unix/r77/SettingsR77.cxx index cecc364b9..5808bee77 100644 --- a/src/unix/r77/SettingsR77.cxx +++ b/src/unix/r77/SettingsR77.cxx @@ -93,7 +93,7 @@ bool SettingsR77::saveConfigFile(const string& cfgfile) const out.flush(); out.close(); -// FIXME system("/bin/fsync /mnt/stella/stellarc&"); + system("/bin/fsync /mnt/stella/stellarc&"); return true; } From c96d97c8e818fad56d9f2bcad24b0bc680a0afd0 Mon Sep 17 00:00:00 2001 From: Stephen Anthony Date: Sat, 6 Apr 2019 00:05:00 -0230 Subject: [PATCH 4/5] Set default TIA aspect to 100% for both NTSC and PAL. This is in the process of being reworked, and may disappear eventually. --- src/emucore/Settings.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/emucore/Settings.cxx b/src/emucore/Settings.cxx index 4bdb3502c..c62fcc32d 100644 --- a/src/emucore/Settings.cxx +++ b/src/emucore/Settings.cxx @@ -42,8 +42,8 @@ Settings::Settings() // TIA specific options setPermanent("tia.zoom", "3"); setPermanent("tia.inter", "false"); - setPermanent("tia.aspectn", "91"); - setPermanent("tia.aspectp", "109"); + setPermanent("tia.aspectn", "100"); + setPermanent("tia.aspectp", "100"); setPermanent("tia.fsfill", "false"); setPermanent("tia.dbgcolors", "roygpb"); From 8c3741fc97009f753a4f4078a9972f7607a005b4 Mon Sep 17 00:00:00 2001 From: Stephen Anthony Date: Sat, 6 Apr 2019 00:20:36 -0230 Subject: [PATCH 5/5] Updated ROM properties. --- src/emucore/DefProps.hxx | 2 +- src/emucore/stella.pro | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/emucore/DefProps.hxx b/src/emucore/DefProps.hxx index ada69f8b4..a4b19d8d9 100644 --- a/src/emucore/DefProps.hxx +++ b/src/emucore/DefProps.hxx @@ -1649,7 +1649,7 @@ static const char* const DefProps[DEF_PROPS_SIZE][21] = { { "76f66ce3b83d7a104a899b4b3354a2f2", "UA Limited", "", "Cat Trax (1983) (UA Limited) (1)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "" }, { "77057d9d14b99e465ea9e29783af0ae3", "Activision, David Crane", "AG-001", "Dragster (1980) (Activision)", "AKA Drag Strip", "", "", "", "", "", "", "", "", "", "", "", "", "", "20", "", "" }, { "7732e4e4cc2644f163d6650ddcc9d9df", "HES", "771-333", "2 Pak Special - Challenge, Surfing (1990) (HES) (PAL)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, - { "7761418d46af069b8cd80c29fe6cd814", "Dion Olsthoorn", "RetroN 77 edition", "Amoeba Jump (DionoiD)", "", "Homebrew", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, + { "7761418d46af069b8cd80c29fe6cd814", "Dion Olsthoorn", "RetroN 77 edition", "Amoeba Jump (R77) (DionoiD)", "", "Homebrew", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "7778ac65d775a079f537e97cbdad541c", "", "", "Spider Fighter (Unknown) (PAL)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "777aece98d7373998ffb8bc0b5eff1a2", "", "", "2600 Collison Demo 2 (Piero Cavina) (PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "77887e4192a6b0a781530e6cf9be7199", "Atari", "CX2604", "Space War (1978) (Atari) [b1]", "", "Uncommon", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, diff --git a/src/emucore/stella.pro b/src/emucore/stella.pro index f05846908..0b0b02775 100644 --- a/src/emucore/stella.pro +++ b/src/emucore/stella.pro @@ -21002,7 +21002,7 @@ "" "Cartridge.MD5" "7761418d46af069b8cd80c29fe6cd814" -"Cartridge.Name" "Amoeba Jump (DionoiD)" +"Cartridge.Name" "Amoeba Jump (R77) (DionoiD)" "Cartridge.ModelNo" "RetroN 77 edition" "Cartridge.Manufacturer" "Dion Olsthoorn" "Cartridge.Rarity" "Homebrew"