Merge branch 'master' of https://github.com/stella-emu/stella

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
+}

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

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

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", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },

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");
 

src/emucore/stella.pro

@@ -21013,7 +21013,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"

src/unix/r77/SettingsR77.cxx

@@ -88,12 +88,12 @@ 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();
-// FIXME   system("/bin/fsync /mnt/stella/stellarc&");
+  system("/bin/fsync /mnt/stella/stellarc&");
 
   return true;
 }