Updated various files for the impending 2.6.1 release.

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1522 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba

stella/Announce.txt

@@ -9,7 +9,7 @@
      SSSS     ttt  eeeee llll llll  aaaaa
 
 ===============================================================================
-                 Release 2.6 for Linux, Mac OSX and Windows
+                 Release 2.6.1 for Linux, Mac OSX and Windows
 ===============================================================================
 
 The Atari 2600 Video Computer System (VCS), introduced in 1977, was the most 
@@ -21,23 +21,23 @@ of your favorite Atari 2600 games again!  Stella was originally developed for
 Linux by Bradford W. Mott, however, it has been ported to a number of other
 platforms.
 
-This is the 2.6 release of Stella for Linux, Mac OSX, Windows and GP2X.
+This is the 2.6.1 release of Stella for Linux, Mac OSX, Windows and GP2X.
 Distributions for other operating systems will appear as they become available.
 The distributions currently available are:
 
-  * Binary distribution in 32-bit RPM format for Linux (stella-2.6-1.i586.rpm)
+  * Binary distribution in 32-bit RPM format for Linux (stella-2.6.1-1.i586.rpm)
 
-  * Binary distribution in 32-bit Ubuntu DEB format (stella_2.6-1_i386.deb)
+  * Binary distribution in 32-bit Ubuntu DEB format (stella_2.6.1-1_i386.deb)
 
-  * Binary distribution in 64-bit Ubuntu DEB format (stella_2.6-1_amd64.deb)
+  * Binary distribution in 64-bit Ubuntu DEB format (stella_2.6.1-1_amd64.deb)
 
-  * Binary distribution for Mac OSX (StellaOSX2.6.dmg.gz)
+  * Binary distribution for Mac OSX (StellaOSX2.6.1.dmg.gz)
 
-  * Binary installer (exe) for Windows (stella-2.6-win32.exe)
+  * Binary installer (exe) for Windows (stella-2.6.1-win32.exe)
 
-  * Binary zip for Windows (stella-2.6-win32.zip)
+  * Binary zip for Windows (stella-2.6.1-win32.zip)
 
-  * Source code distribution for all platforms (stella-2.6-src.tar.gz)
+  * Source code distribution for all platforms (stella-2.6.1-src.tar.gz)
 
 PLEASE DO NOT WRITE ASKING FOR ROM IMAGES TO USE WITH STELLA! ALL SUCH
 REQUESTS WILL BE IGNORED!

stella/Changes.txt

@@ -12,6 +12,41 @@
                                Release History
 ===============================================================================
 
+2.6 to 2.6.1: (May 21, 2008)
+
+  * Introduced more accurate timing for NTSC vs. PAL modes, where the
+    framerate is based on the number of scanlines per frame.  This should
+    eliminate 'clicking' sounds when emulating ROMs that don't follow
+    the exact NTSC or PAL specs.
+
+  * Added ability to see the current number of scanlines and corresponding
+    framerate to the TIA emulation.  This can be set with the '-stats'
+    commandline argument, or dynamically turned on and off with the
+    'Alt-l' key combo.
+
+  * Fixed issue with debugger disassembly and mirrored $40 TIA write
+    addresses.  They were actually defined at $30, and generating incorrect
+    labels.
+
+  * Fixed issue in AtariVox and SaveKey controllers where accessing the
+    EEPROM sometimes failed after the first write.
+
+  * Changed AtariVox and SaveKey EEPROM emulation to default to $FF for
+    a blank EEPROM.
+
+  * Fixed regression in cart auto-detection logic; some F6 ROMs were being
+    misdetected as E7.
+
+  * Fixed issue with M6532/RIOT timer initialization; it was causing some
+    ROMs to hang (most notably Summer Games).  Related to this, reworked
+    the built-in random number generator to generate 'more random' numbers.
+
+  * Fixed bug in CommandMenu where console buttons (Select, Reset, etc)
+    weren't doing anything.
+
+-Have fun!
+
+
 2.5.1 to 2.6: (May 16, 2008)
 
   * Added AtariVox support using a real AtariVox device, where Stella
@@ -55,8 +90,6 @@
 
   * For the Win32 port; Win9x should be fully supported again.
 
--Have fun!
-
 
 2.5 to 2.5.1: (April 9, 2008)
 

stella/Readme.txt

@@ -1,4 +1,4 @@
-This is release 2.6 of Stella.  Stella is a multi-platform Atari 2600 VCS
+This is release 2.6.1 of Stella.  Stella is a multi-platform Atari 2600 VCS
 emulator which allows you to play all of your favorite Atari 2600 games
 on your PC.  You'll find the Stella Users Manual in the docs subdirectory.
 If you'd like to verify that you have the latest release of Stella visit
@@ -9,4 +9,4 @@ the Stella Website at:
 Enjoy,
 
 The Stella Team
-May 16, 2008
+May 21, 2008

stella/docs/index.html

@@ -10,7 +10,7 @@
 	<br><br>
 	<center><h2><b>A multi-platform Atari 2600 VCS emulator</b></h2></center>
 
-	<center><h4><b>Release 2.6</b></h4></center>
+	<center><h4><b>Release 2.6.1</b></h4></center>
 	<br><br>
 
 	<center><h2><b>User's Guide</b></h2></center>
@@ -221,49 +221,38 @@
     Sega Dreamcast, Unix, and Windows.
 	</p>
 
-	<h2><b>New in Release 2.6</b></h2>
+	<h2><b>New in Release 2.6.1</b></h2>
 
 	<ul>
-    <li>Added AtariVox support using a real AtariVox device, where Stella
+<li>Introduced more accurate timing for NTSC vs. PAL modes, where the
-    sends data directly to the AtariVox.  For now, this is supported in
+    framerate is based on the number of scanlines per frame.  This should
-    Linux/UNIX, OSX, and Win32 only.  You'll obviously need a real
+    eliminate 'clicking' sounds when emulating ROMs that don't follow
-    AtariVox, and a serial<->USB adaptor to connect it to your system.
+    the exact NTSC or PAL specs.</li>
-    Added '-avoxport' commandline argument used to set the serial port
-    to which the AtariVox is connected.  Special thanks to Al Yarusso
-    and Richard H. for providing sample hardware.</li>
 
-    <li>Added AtariVox and SaveKey EEPROM emulation.  This reads/writes data
+<li>Added ability to see the current number of scanlines and corresponding
-    to a 32KB file, not to the actual hardware.  Very useful for testing
+    framerate to the TIA emulation.  This can be set with the '-stats'
-    EEPROM support without actually wearing out the real device.  Special
+    commandline argument, or dynamically turned on and off with the
-    thanks to J. Payson for providing the EEPROM emulation code, and A.
+    'Alt-l' key combo.</li>
-    Herbert for answering many driver-related questions.</li>
 
-    <li>Added support for CX-22, CX-80, and AmigaMouse trackball controllers.</li>
+<li>Fixed issue with debugger disassembly and mirrored $40 TIA write
+    addresses.  They were actually defined at $30, and generating incorrect
+    labels.</li>
 
-    <li>Improved debugger symfile handling so that addresses accessed as
+<li>Fixed issue in AtariVox and SaveKey controllers where accessing the
-    read-only won't use write-only labels (and vice-versa).  More work
+    EEPROM sometimes failed after the first write.</li>
-    is still needed in this area.</li>
 
-    <li>Added M6532/RIOT tab to the debugger.  This will be expanded on in a
+<li>Changed AtariVox and SaveKey EEPROM emulation to default to $FF for
-    future release.</li>
+    a blank EEPROM.</li>
 
-    <li>Added TIA emulation fixes for graphical glitches in Escape from the
+<li>Fixed regression in cart auto-detection logic; some F6 ROMs were being
-    Mindmaster, Mission Survive, Solaris, and SWOOPS!</li>
+    misdetected as E7.</li>
 
-    <li>Fixed bug where fullscreen OpenGL scaling wasn't working on 4:3 monitors.</li>
+<li>Fixed issue with M6532/RIOT timer initialization; it was causing some
+    ROMs to hang (most notably Summer Games).  Related to this, reworked
+    the built-in random number generator to generate 'more random' numbers.</li>
 
-    <li>Further improvements to the M6532/RIOT emulation, which unfortunately
+<li>Fixed bug in CommandMenu where console buttons (Select, Reset, etc)
-    have broken old state files (again).</li>
+    weren't doing anything.</li>
-
-    <li>Added deadzone setting, for adjusting the deadzone amount for
-    analog joysticks.  This can be set using the commandline argument
-    '-joydeadzone' or dynamically within the UI.</li>
-
-    <li>Make ROM disassembly in debugger take advantage of a wide window.</li>
-
-    <li>Fixed bug in 6507 BCD handling introduced in the last release.</li>
-
-    <li>For the Win32 port; Win9x should be fully supported again.</li>
 	</ul>
 
 	<p>
@@ -756,6 +745,11 @@
 			<td>Generate single snapshot instead of many.</td>
 		</tr>
 
+		<tr>
+			<td><pre>-stats &lt;0|1&gt;</pre></td>
+			<td>Show scanline and framerate info during emulation.</td>
+		</tr>
+
 		<tr>
 			<td><pre>-listrominfo</pre></td>
 			<td>Prints relevant contents of the Stella ROM database, one ROM per line,
@@ -1698,6 +1692,12 @@
 			<td>Control + l</td>
 			<td>Cmd + l</td>
 		</tr>
+
+		<tr>
+			<td>Toggle frame stats (scanline count and fps)</td>
+			<td>Alt + l</td>
+			<td>Shift-Cmd + l</td>
+		</tr>
 	</table>
 
 <!-- /////////////////////////////////////////////////////////////////////////  -->
@@ -1939,7 +1939,7 @@
 	</table>
 
 	<p>Note that these EEPROM files will be created when necessary, and
-	initialized as a real EEPROM would be (with randomized data).  The
+	initialized as a real EEPROM would be (containing all $FF).  The
 	files can be manually deleted, which is very useful in testing
 	cases where a ROM is accessing the EEPROM for the first time.</p>
 

stella/src/common/Snapshot.cxx

@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: Snapshot.cxx,v 1.20 2008-05-20 13:42:50 stephena Exp $
+// $Id: Snapshot.cxx,v 1.21 2008-05-20 14:35:50 stephena Exp $
 //============================================================================
 
 #include <zlib.h>
@@ -105,7 +105,7 @@ void Snapshot::savePNG(FrameBuffer& framebuffer, const Properties& props,
     if(compmem) delete[] compmem;
     out.close();
 
-    // Re-enabled old messages
+    // Re-enable old messages
     framebuffer.enableMessages(true);
     framebuffer.showMessage("Snapshot saved");
   }

stella/src/unix/stella.SlackBuild

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $Id: stella.SlackBuild,v 1.11 2008-05-16 12:04:35 stephena Exp $
+# $Id: stella.SlackBuild,v 1.12 2008-05-20 14:35:50 stephena Exp $
 
 # stella.SlackBuild for Stella 2.x, B. Watson, 2005
 
@@ -13,7 +13,7 @@ die() {
 	exit 1
 }
 
-VERSION=2.6
+VERSION=2.6.1
 ARCH=${ARCH-i486}
 BUILD=1
 

stella/src/unix/stella.spec

@@ -1,5 +1,5 @@
 %define name    stella
-%define version 2.6
+%define version 2.6.1
 %define rel     1
 
 %define enable_gl 1
@@ -107,6 +107,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 %_datadir/icons/large/%{name}.png
 
 %changelog
+* Fri May 21 2008 Stephen Anthony <stephena@users.sf.net> 2.6.1-1
+- Version 2.6.1 release
+
 * Fri May 16 2008 Stephen Anthony <stephena@users.sf.net> 2.6-1
 - Version 2.6 release
 

stella/src/win32/stella.iss

@@ -3,14 +3,14 @@
 
 [Setup]
 AppName=Stella
-AppVerName=Stella 2.6
+AppVerName=Stella 2.6.1
 AppPublisher=Bradford W. Mott and the Stella team
 AppPublisherURL=http://stella.sourceforge.net
 AppSupportURL=http://stella.sourceforge.net
 AppUpdatesURL=http://stella.sourceforge.net
 DefaultDirName={pf}\Stella
 DefaultGroupName=Stella
-OutputBaseFilename=stella-2.6-win32
+OutputBaseFilename=stella-2.6.1-win32
 Compression=lzma
 SolidCompression=yes
 
@@ -21,10 +21,10 @@ Name: "eng"; MessagesFile: "compiler:Default.isl"
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 
 [Files]
-Source: "..\..\stella-2.6\Stella.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\..\stella-2.6.1\Stella.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\..\stella-2.6\zlib1.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\..\stella-2.6.1\zlib1.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\..\stella-2.6\SDL.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\..\stella-2.6.1\SDL.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\..\stella-2.6\docs\*"; DestDir: "{app}\docs"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "..\..\stella-2.6.1\docs\*"; DestDir: "{app}\docs"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]

stella/src/win32/stella.rc

@@ -36,8 +36,8 @@ IDI_ICON                ICON                    "stella.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,6,0,0
+ FILEVERSION 2,6,1,0
- PRODUCTVERSION 2,6,0,0
+ PRODUCTVERSION 2,6,1,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -55,12 +55,12 @@ BEGIN
             VALUE "Comments", "The multi-platform Atari 2600 emulator.  Stella is released under the GPL."
             VALUE "CompanyName", "Bradford W. Mott and the Stella team (http://stella.sourceforge.net)"
             VALUE "FileDescription", "Stella"
-            VALUE "FileVersion", "2.6"
+            VALUE "FileVersion", "2.6.1"
             VALUE "InternalName", "Stella"
             VALUE "LegalCopyright", "Copyright (C) 1995-2008 B. Mott & the Stella team"
             VALUE "OriginalFilename", "Stella.exe"
             VALUE "ProductName", "Stella"
-            VALUE "ProductVersion", "2.6"
+            VALUE "ProductVersion", "2.6.1"
         END
     END
     BLOCK "VarFileInfo"