Thread: [fuse-emulator-cvs] SF.net SVN: fuse-emulator:[4282] trunk/libspectrum (Page 3)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 4282
          http://fuse-emulator.svn.sourceforge.net/fuse-emulator/?rev=4282&view=rev
Author:   pak21
Date:     2011-01-30 21:10:05 +0000 (Sun, 30 Jan 2011)

Log Message:
-----------
Add support for SpecDrum in SZX snapshots (patch #3164313) (Jon Mitchell).

Modified Paths:
--------------
    trunk/libspectrum/accessor.pl
    trunk/libspectrum/doc/libspectrum.txt
    trunk/libspectrum/hacking/ChangeLog
    trunk/libspectrum/snap_accessors.txt
    trunk/libspectrum/snapshot.c
    trunk/libspectrum/szx.c

Modified: trunk/libspectrum/accessor.pl
===================================================================

--- trunk/libspectrum/accessor.pl	2011-01-30 02:55:55 UTC (rev 4281)
+++ trunk/libspectrum/accessor.pl	2011-01-30 21:10:05 UTC (rev 4282)
@@ -211,6 +211,10 @@
 
   /* Melodik status */
   int melodik_active;
+
+  /* Cheetah SpecDrum status */
+  int specdrum_active;
+  libspectrum_signed_byte specdrum_dac;
 };
 
 /* Initialise a libspectrum_snap structure */

Modified: trunk/libspectrum/doc/libspectrum.txt
===================================================================
--- trunk/libspectrum/doc/libspectrum.txt	2011-01-30 02:55:55 UTC (rev 4281)
+++ trunk/libspectrum/doc/libspectrum.txt	2011-01-30 21:10:05 UTC (rev 4282)
@@ -678,6 +678,9 @@
 * int fuller_box_active
 * int melodik_active
 
+* int specdrum_active
+* libspectrum_signed_byte specdrum_dac
+
 Most of those should be fairly self-explanatory; those which may not
 be are:
 

Modified: trunk/libspectrum/hacking/ChangeLog
===================================================================
--- trunk/libspectrum/hacking/ChangeLog	2011-01-30 02:55:55 UTC (rev 4281)
+++ trunk/libspectrum/hacking/ChangeLog	2011-01-30 21:10:05 UTC (rev 4282)
@@ -800,3 +800,6 @@
          update g_hash_table_new() function to support the
          g_hash_table_new( NULL, NULL ) syntax (patch #3160211) (Sergio
          Baldovi).
+20110130 accessor.pl,doc/libspectrum.txt,snap_accessors.txt,snapshot.c,szx.c:
+         add support for SpecDrum in SZX snapshots (patch #3164313) (Jon
+         Mitchell).

Modified: trunk/libspectrum/snap_accessors.txt
===================================================================
--- trunk/libspectrum/snap_accessors.txt	2011-01-30 02:55:55 UTC (rev 4281)
+++ trunk/libspectrum/snap_accessors.txt	2011-01-30 21:10:05 UTC (rev 4282)
@@ -168,3 +168,6 @@
 int fuller_box_active
 
 int melodik_active
+
+int specdrum_active
+libspectrum_signed_byte specdrum_dac

Modified: trunk/libspectrum/snapshot.c
===================================================================
--- trunk/libspectrum/snapshot.c	2011-01-30 02:55:55 UTC (rev 4281)
+++ trunk/libspectrum/snapshot.c	2011-01-30 21:10:05 UTC (rev 4282)
@@ -192,6 +192,9 @@
 
   libspectrum_snap_set_simpleide_active( snap, 0 );
 
+  libspectrum_snap_set_specdrum_active( snap, 0 );
+  libspectrum_snap_set_specdrum_dac( snap, 0 );
+
   libspectrum_snap_set_divide_active( snap, 0 );
   libspectrum_snap_set_divide_eprom_writeprotect( snap, 0 );
   libspectrum_snap_set_divide_paged( snap, 0 );

Modified: trunk/libspectrum/szx.c
===================================================================
--- trunk/libspectrum/szx.c	2011-01-30 02:55:55 UTC (rev 4281)
+++ trunk/libspectrum/szx.c	2011-01-30 21:10:05 UTC (rev 4282)
@@ -274,6 +274,9 @@
 static libspectrum_error
 write_side_chunk( libspectrum_byte **buffer, libspectrum_byte **ptr,
 		  size_t *length, libspectrum_snap *snap );
+static libspectrum_error
+write_drum_chunk( libspectrum_byte **buffer, libspectrum_byte **ptr,
+		  size_t *length, libspectrum_snap *snap );
 
 #ifdef HAVE_ZLIB_H
 
@@ -977,6 +980,27 @@
   return LIBSPECTRUM_ERROR_NONE;
 }
 
+static libspectrum_error
+read_drum_chunk( libspectrum_snap *snap, libspectrum_word version GCC_UNUSED,
+		 const libspectrum_byte **buffer,
+		 const libspectrum_byte *end GCC_UNUSED, size_t data_length,
+                 szx_context *ctx GCC_UNUSED )
+{
+  if( data_length != 1 ) {
+    libspectrum_print_error( LIBSPECTRUM_ERROR_UNKNOWN,
+			     "%s:read_drum_chunk: unknown length %lu",
+			     __FILE__, (unsigned long)data_length );
+    return LIBSPECTRUM_ERROR_UNKNOWN;
+  }
+
+  libspectrum_snap_set_specdrum_dac( snap, *(*buffer)++ );
+
+  libspectrum_snap_set_specdrum_active( snap, 1 );
+
+  return LIBSPECTRUM_ERROR_NONE;
+}
+
+
 static void
 add_joystick( libspectrum_snap *snap, libspectrum_joystick type, int inputs )
 {
@@ -1916,7 +1940,7 @@
   { ZXSTBID_RAMPAGE,	    read_ramp_chunk },
   { ZXSTBID_ROM,	    read_rom_chunk  },
   { ZXSTBID_SIMPLEIDE,	    read_side_chunk },
-  { ZXSTBID_SPECDRUM,	    skip_chunk      },
+  { ZXSTBID_SPECDRUM,	    read_drum_chunk },
   { ZXSTBID_SPECREGS,	    read_spcr_chunk },
   { ZXSTBID_TIMEXREGS,	    read_scld_chunk },
   { ZXSTBID_USPEECH,	    skip_chunk      },
@@ -2254,6 +2278,11 @@
     if( error ) return error;
   }
 
+  if( libspectrum_snap_specdrum_active( snap ) ) {
+    error = write_drum_chunk( buffer, &ptr, length, snap );
+    if( error ) return error;
+  }
+
   if( libspectrum_snap_divide_active( snap ) ) {
     error = write_dide_chunk( buffer, &ptr, length, snap, compress );
     if( error ) return error;
@@ -3333,6 +3362,17 @@
 }
 
 static libspectrum_error
+write_drum_chunk( libspectrum_byte **buffer, libspectrum_byte **ptr,
+		  size_t *length, libspectrum_snap *snap )
+{
+  write_chunk_header( buffer, ptr, length, ZXSTBID_SPECDRUM, 1 );
+
+  *(*ptr)++ = libspectrum_snap_specdrum_dac( snap );
+
+  return LIBSPECTRUM_ERROR_NONE;
+}
+
+static libspectrum_error
 write_dide_chunk( libspectrum_byte **buffer, libspectrum_byte **ptr,
 		  size_t *length, libspectrum_snap *snap, int compress )
 {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


