From 7a0a03e160a50d001172e0182b6e31e31c671fe5 Mon Sep 17 00:00:00 2001 From: Stephen Anthony Date: Thu, 9 Jun 2022 17:33:03 -0230 Subject: [PATCH 1/2] Minor formatting fix. Just my OCD kicking in. --- src/emucore/CartDetector.cxx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/emucore/CartDetector.cxx b/src/emucore/CartDetector.cxx index c882bacad..6467d041f 100644 --- a/src/emucore/CartDetector.cxx +++ b/src/emucore/CartDetector.cxx @@ -353,9 +353,9 @@ bool CartDetector::isProbably0FA0(const ByteBuffer& image, size_t size) // accessing address 0xFC0 using 'BIT $FC0', 'BIT $FC0' or 'STA $FC0' // Also a game (Motocross) using 'BIT $EFC0' has been found static constexpr uInt8 signature[4][3] = { - { 0x2C, 0xC0, 0x0F }, // BIT $FC0 (H.E.R.O., Kung-Fu Master) - { 0x8D, 0xC0, 0x0F }, // STA $FC0 (Pole Position, Subterranea) - { 0xAD, 0xC0, 0x0F }, // LDA $FC0 (Front Line, Zaxxon) + { 0x2C, 0xC0, 0x0F }, // BIT $FC0 (H.E.R.O., Kung-Fu Master) + { 0x8D, 0xC0, 0x0F }, // STA $FC0 (Pole Position, Subterranea) + { 0xAD, 0xC0, 0x0F }, // LDA $FC0 (Front Line, Zaxxon) { 0x2C, 0xC0, 0xEF } // BIT $EFC0 (Motocross) }; for(uInt32 i = 0; i < 4; ++i) @@ -384,7 +384,7 @@ bool CartDetector::isProbably3E(const ByteBuffer& image, size_t size) bool CartDetector::isProbably3EX(const ByteBuffer& image, size_t size) { // 3EX cart have at least 2 occurrences of the string "3EX" - static constexpr uInt8 _3EX[] = { '3', 'E', 'X'}; + static constexpr uInt8 _3EX[] = { '3', 'E', 'X' }; return searchForBytes(image, size, _3EX, 3, 2); } @@ -470,7 +470,7 @@ bool CartDetector::isProbablyBUS(const ByteBuffer& image, size_t size) // BUS ARM code has 2 occurrences of the string BUS // Note: all Harmony/Melody custom drivers also contain the value // 0x10adab1e (LOADABLE) if needed for future improvement - static constexpr uInt8 bus[] = { 'B', 'U', 'S'}; + static constexpr uInt8 bus[] = { 'B', 'U', 'S' }; return searchForBytes(image, size, bus, 3, 2); } @@ -768,7 +768,7 @@ bool CartDetector::isProbablySB(const ByteBuffer& image, size_t size) bool CartDetector::isProbablyTVBoy(const ByteBuffer& image, size_t size) { // TV Boy cart bankswitching switches banks by accessing addresses 0x1800..$187F - static constexpr uInt8 signature[5] = {0x91, 0x82, 0x6c, 0xfc, 0xff}; // STA ($82),Y; JMP ($FFFC) + static constexpr uInt8 signature[5] = { 0x91, 0x82, 0x6c, 0xfc, 0xff }; // STA ($82),Y; JMP ($FFFC) return searchForBytes(image, size, signature, 5); } @@ -827,7 +827,7 @@ bool CartDetector::isProbablyX07(const ByteBuffer& image, size_t size) bool CartDetector::isProbablyPlusROM(const ByteBuffer& image, size_t size) { // PlusCart uses this pattern to detect a PlusROM - static constexpr uInt8 signature[3] = {0x8d, 0xf0, 0x1f}; // STA $1FF0 + static constexpr uInt8 signature[3] = { 0x8d, 0xf0, 0x1f }; // STA $1FF0 return searchForBytes(image, size, signature, 3); } From 67c2e7b6ad8ebe02e52b84251805ff26c1e65d5d Mon Sep 17 00:00:00 2001 From: Stephen Anthony Date: Thu, 9 Jun 2022 19:18:33 -0230 Subject: [PATCH 2/2] Pushed 6.7 release to Monday, June 13. This is the last time, I promise :) --- Changes.txt | 2 +- debian/changelog | 2 +- src/unix/stella.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Changes.txt b/Changes.txt index c5ed8034a..5b41fbc9d 100644 --- a/Changes.txt +++ b/Changes.txt @@ -12,7 +12,7 @@ Release History =========================================================================== -6.6 to 6.7 (June 11, 2022) +6.6 to 6.7 (June 13, 2022) * IMPORTANT NOTES: - Because of fixes to JSON handling, all remappings will be reset diff --git a/debian/changelog b/debian/changelog index acf0f085d..9ec01e37e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,7 @@ stella (6.7) stable; urgency=high * Version 6.7 release - -- Stephen Anthony Sat, 11 Jun 2022 17:09:59 -0230 + -- Stephen Anthony Mon, 13 Jun 2022 17:09:59 -0230 stella (6.6) stable; urgency=high diff --git a/src/unix/stella.spec b/src/unix/stella.spec index 4ca23d151..9dfe0f9d5 100644 --- a/src/unix/stella.spec +++ b/src/unix/stella.spec @@ -100,7 +100,7 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} %_datadir/icons/large/%{name}.png %changelog -* Sat Jun 11 2022 Stephen Anthony 6.7-1 +* Mon Jun 13 2022 Stephen Anthony 6.7-1 - Version 6.7 release * Tue Nov 16 2021 Stephen Anthony 6.6-1