Menu
▾
▴
fuse-emulator-cvs
|
From: <fr...@us...> - 2012-12-26 10:48:21
|
Revision: 4799
http://fuse-emulator.svn.sourceforge.net/fuse-emulator/?rev=4799&view=rev
Author: fredm
Date: 2012-12-26 10:48:14 +0000 (Wed, 26 Dec 2012)
Log Message:
-----------
Bump version number to 1.1.0.
Modified Paths:
--------------
trunk/libspectrum/configure.ac
trunk/libspectrum/hacking/ChangeLog
Modified: trunk/libspectrum/configure.ac
===================================================================
--- trunk/libspectrum/configure.ac 2012-12-26 10:42:55 UTC (rev 4798)
+++ trunk/libspectrum/configure.ac 2012-12-26 10:48:14 UTC (rev 4799)
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-dnl Copyright (c) 1999-2008 Philip Kendall
+dnl Copyright (c) 1999-2012 Philip Kendall
dnl $Id$
@@ -22,11 +22,11 @@
dnl E-mail: phi...@sh...
dnl Package version
-m4_define([libspectrum_version], [1.0.0])
+m4_define([libspectrum_version], [1.1.0])
dnl Product full version
m4_define([libspectrum_major_version], [1])
-m4_define([libspectrum_minor_version], [0])
+m4_define([libspectrum_minor_version], [1])
m4_define([libspectrum_micro_version], [0])
m4_define([libspectrum_nano_version], [0])
m4_define([libspectrum_full_version],
Modified: trunk/libspectrum/hacking/ChangeLog
===================================================================
--- trunk/libspectrum/hacking/ChangeLog 2012-12-26 10:42:55 UTC (rev 4798)
+++ trunk/libspectrum/hacking/ChangeLog 2012-12-26 10:48:14 UTC (rev 4799)
@@ -922,3 +922,4 @@
20121226 szx.c: inline constant in write_snet_chunk() (Fred).
20121226 doc/libspectrum.txt: add some text about changes to the interface
(Fred).
+20121226 configure.ac: bump version number to 1.1.0 (Fred).
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2012-12-26 10:52:21
|
Revision: 4800
http://fuse-emulator.svn.sourceforge.net/fuse-emulator/?rev=4800&view=rev
Author: fredm
Date: 2012-12-26 10:52:15 +0000 (Wed, 26 Dec 2012)
Log Message:
-----------
Tweak PZX text.
Modified Paths:
--------------
trunk/libspectrum/doc/libspectrum.txt
trunk/libspectrum/hacking/ChangeLog
Modified: trunk/libspectrum/doc/libspectrum.txt
===================================================================
--- trunk/libspectrum/doc/libspectrum.txt 2012-12-26 10:48:14 UTC (rev 4799)
+++ trunk/libspectrum/doc/libspectrum.txt 2012-12-26 10:52:15 UTC (rev 4800)
@@ -8,7 +8,7 @@
* Snapshots: .z80, .szx, .sna (all read/write), .zxs, .sp., .snp and
+D snapshots (read only).
* Tape images: .tzx, .tap, .spc, .sta and .ltp (read/write) and
- PZX, Warajevo .tap, Z80Em and CSW version 1 (read only).
+ .pzx, Warajevo .tap, Z80Em and CSW version 1 (read only).
* Input recordings: .rzx (read/write).
* Disk images: .dsk (both plain and extended), .fdi, .sad, .scl, .td0,
.trd and .udi (identification only).
Modified: trunk/libspectrum/hacking/ChangeLog
===================================================================
--- trunk/libspectrum/hacking/ChangeLog 2012-12-26 10:48:14 UTC (rev 4799)
+++ trunk/libspectrum/hacking/ChangeLog 2012-12-26 10:52:15 UTC (rev 4800)
@@ -923,3 +923,4 @@
20121226 doc/libspectrum.txt: add some text about changes to the interface
(Fred).
20121226 configure.ac: bump version number to 1.1.0 (Fred).
+20121226 doc/libspectrum.txt: tweak PZX text (Fred).
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2012-12-26 10:55:09
|
Revision: 4801
http://fuse-emulator.svn.sourceforge.net/fuse-emulator/?rev=4801&view=rev
Author: fredm
Date: 2012-12-26 10:55:01 +0000 (Wed, 26 Dec 2012)
Log Message:
-----------
First updates for a "1.1.0" release.
Modified Paths:
--------------
trunk/libspectrum/ChangeLog
trunk/libspectrum/README
trunk/libspectrum/hacking/ChangeLog
Modified: trunk/libspectrum/ChangeLog
===================================================================
--- trunk/libspectrum/ChangeLog 2012-12-26 10:52:15 UTC (rev 4800)
+++ trunk/libspectrum/ChangeLog 2012-12-26 10:55:01 UTC (rev 4801)
@@ -1,3 +1,26 @@
+201?-??-?? Philip Kendall <phi...@sh...>
+
+ * libspectrum 1.1.0 released.
+
+ * Support for Spectranet in snapshots (Philip Kendall).
+
+ * Support for Cheetah SpecDrum in snapshots (Fredrick Meunier).
+
+ * Support reading PZX files (Fredrick Meunier).
+
+ * Support for the TZX set signal level block (Fredrick Meunier).
+
+ * Various minor bug fixes/improvements:
+ * Add support for detecting POK files (Sergio Baldoví).
+ * Advertise support for bzip2 compressed and wav files (Sergio
+ Baldoví).
+ * Drop support for GLib version 1.x (Alberto Garcia).
+ * Add support for audiofile 0.3.x (Alberto Garcia).
+ * Load all snapshot RAM pages for machines with more than 128k
+ (Fredrick Meunier; thanks, ketmar).
+ * Support more SZX 1.5 features (Fredrick Meunier).
+ * Modernise autoconf support (Sergio Baldoví).
+
2010-12-16 Philip Kendall <phi...@sh...>
* libspectrum 1.0.0 released.
Modified: trunk/libspectrum/README
===================================================================
--- trunk/libspectrum/README 2012-12-26 10:52:15 UTC (rev 4800)
+++ trunk/libspectrum/README 2012-12-26 10:55:01 UTC (rev 4801)
@@ -1,4 +1,4 @@
-libspectrum 1.0.0
+libspectrum 1.1.0
=================
libspectrum is a library which is designed to make the input and
@@ -67,6 +67,6 @@
Then, type "make" and if everything went well, "make install".
Philip Kendall <phi...@sh...>
-16 December 2010
+?? ??? 201?
$Id$
Modified: trunk/libspectrum/hacking/ChangeLog
===================================================================
--- trunk/libspectrum/hacking/ChangeLog 2012-12-26 10:52:15 UTC (rev 4800)
+++ trunk/libspectrum/hacking/ChangeLog 2012-12-26 10:55:01 UTC (rev 4801)
@@ -924,3 +924,4 @@
(Fred).
20121226 configure.ac: bump version number to 1.1.0 (Fred).
20121226 doc/libspectrum.txt: tweak PZX text (Fred).
+20121226 ChangeLog,README: first updates for a "1.1.0" release (Fred).
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sba...@us...> - 2012-12-27 21:03:30
|
Revision: 4810
http://fuse-emulator.svn.sourceforge.net/fuse-emulator/?rev=4810&view=rev
Author: sbaldovi
Date: 2012-12-27 21:03:11 +0000 (Thu, 27 Dec 2012)
Log Message:
-----------
Set name for Spectrum 128Ke machine type (Sergio).
Modified Paths:
--------------
trunk/libspectrum/hacking/ChangeLog
trunk/libspectrum/libspectrum.c
Modified: trunk/libspectrum/hacking/ChangeLog
===================================================================
--- trunk/libspectrum/hacking/ChangeLog 2012-12-27 16:22:14 UTC (rev 4809)
+++ trunk/libspectrum/hacking/ChangeLog 2012-12-27 21:03:11 UTC (rev 4810)
@@ -925,3 +925,4 @@
20121226 configure.ac: bump version number to 1.1.0 (Fred).
20121226 doc/libspectrum.txt: tweak PZX text (Fred).
20121226 ChangeLog,README: first updates for a "1.1.0" release (Fred).
+20121227 libspectrum.c: set name for Spectrum 128Ke machine type (Sergio).
Modified: trunk/libspectrum/libspectrum.c
===================================================================
--- trunk/libspectrum/libspectrum.c 2012-12-27 16:22:14 UTC (rev 4809)
+++ trunk/libspectrum/libspectrum.c 2012-12-27 21:03:11 UTC (rev 4810)
@@ -237,6 +237,7 @@
case LIBSPECTRUM_MACHINE_TC2068: return "Timex TC2068";
case LIBSPECTRUM_MACHINE_TS2068: return "Timex TS2068";
case LIBSPECTRUM_MACHINE_128: return "Spectrum 128K";
+ case LIBSPECTRUM_MACHINE_128E: return "Spectrum 128Ke";
case LIBSPECTRUM_MACHINE_PLUS2: return "Spectrum +2";
case LIBSPECTRUM_MACHINE_PENT: return "Pentagon 128K";
case LIBSPECTRUM_MACHINE_PENT512: return "Pentagon 512K";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zu...@us...> - 2012-12-30 00:04:19
|
Revision: 4825
http://fuse-emulator.svn.sourceforge.net/fuse-emulator/?rev=4825&view=rev
Author: zubzero
Date: 2012-12-30 00:04:10 +0000 (Sun, 30 Dec 2012)
Log Message:
-----------
Use an em dash
Modified Paths:
--------------
trunk/libspectrum/doc/libspectrum.3
trunk/libspectrum/hacking/ChangeLog
Modified: trunk/libspectrum/doc/libspectrum.3
===================================================================
--- trunk/libspectrum/doc/libspectrum.3 2012-12-29 23:53:09 UTC (rev 4824)
+++ trunk/libspectrum/doc/libspectrum.3 2012-12-30 00:04:10 UTC (rev 4825)
@@ -27,7 +27,7 @@
.\"------------------------------------------------------------------
.\"
.SH NAME
-libspectrum \- Sinclair ZX Spectrum support library
+libspectrum \(em Sinclair ZX Spectrum support library
.\"
.\"------------------------------------------------------------------
.\"
Modified: trunk/libspectrum/hacking/ChangeLog
===================================================================
--- trunk/libspectrum/hacking/ChangeLog 2012-12-29 23:53:09 UTC (rev 4824)
+++ trunk/libspectrum/hacking/ChangeLog 2012-12-30 00:04:10 UTC (rev 4825)
@@ -926,3 +926,4 @@
20121226 doc/libspectrum.txt: tweak PZX text (Fred).
20121226 ChangeLog,README: first updates for a "1.1.0" release (Fred).
20121227 libspectrum.c: set name for Spectrum 128Ke machine type (Sergio).
+20121229 doc/libspectrum.1: use an em dash (Stuart).
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zu...@us...> - 2012-12-30 15:39:29
|
Revision: 4827
http://fuse-emulator.svn.sourceforge.net/fuse-emulator/?rev=4827&view=rev
Author: zubzero
Date: 2012-12-30 15:39:22 +0000 (Sun, 30 Dec 2012)
Log Message:
-----------
Add timings for the 128Ke, copied from those for the 128K
Modified Paths:
--------------
trunk/libspectrum/hacking/ChangeLog
trunk/libspectrum/timings.c
Modified: trunk/libspectrum/hacking/ChangeLog
===================================================================
--- trunk/libspectrum/hacking/ChangeLog 2012-12-30 11:00:18 UTC (rev 4826)
+++ trunk/libspectrum/hacking/ChangeLog 2012-12-30 15:39:22 UTC (rev 4827)
@@ -927,3 +927,4 @@
20121226 ChangeLog,README: first updates for a "1.1.0" release (Fred).
20121227 libspectrum.c: set name for Spectrum 128Ke machine type (Sergio).
20121229 doc/libspectrum.1: use an em dash (Stuart).
+20121230 timings.c: add timings for 128Ke, copied from those for 128K (Stuart).
Modified: trunk/libspectrum/timings.c
===================================================================
--- trunk/libspectrum/timings.c 2012-12-30 11:00:18 UTC (rev 4826)
+++ trunk/libspectrum/timings.c 2012-12-30 15:39:22 UTC (rev 4827)
@@ -93,6 +93,8 @@
{ 3584000, 1792000, 36, 128, 28, 32, 64, 192, 48, 16, 36, 17988 },
/* 48K NTSC */
{ 3527500, 0, 24, 128, 24, 48, 24, 192, 25, 23, 32, 8960 },
+ /* 128Ke */
+ { 3546900, 1773400, 24, 128, 24, 52, 48, 192, 48, 23, 36, 14362 },
};
libspectrum_dword
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2012-12-30 21:23:29
|
Revision: 4829
http://fuse-emulator.svn.sourceforge.net/fuse-emulator/?rev=4829&view=rev
Author: fredm
Date: 2012-12-30 21:23:21 +0000 (Sun, 30 Dec 2012)
Log Message:
-----------
128Ke timings are intended to be based on +2A.
Modified Paths:
--------------
trunk/libspectrum/hacking/ChangeLog
trunk/libspectrum/timings.c
Modified: trunk/libspectrum/hacking/ChangeLog
===================================================================
--- trunk/libspectrum/hacking/ChangeLog 2012-12-30 19:43:37 UTC (rev 4828)
+++ trunk/libspectrum/hacking/ChangeLog 2012-12-30 21:23:21 UTC (rev 4829)
@@ -928,3 +928,4 @@
20121227 libspectrum.c: set name for Spectrum 128Ke machine type (Sergio).
20121229 doc/libspectrum.1: use an em dash (Stuart).
20121230 timings.c: add timings for 128Ke, copied from those for 128K (Stuart).
+20121231 timings.c: 128Ke timings are intended to be based on +2A (Fred).
Modified: trunk/libspectrum/timings.c
===================================================================
--- trunk/libspectrum/timings.c 2012-12-30 19:43:37 UTC (rev 4828)
+++ trunk/libspectrum/timings.c 2012-12-30 21:23:21 UTC (rev 4829)
@@ -94,7 +94,7 @@
/* 48K NTSC */
{ 3527500, 0, 24, 128, 24, 48, 24, 192, 25, 23, 32, 8960 },
/* 128Ke */
- { 3546900, 1773400, 24, 128, 24, 52, 48, 192, 48, 23, 36, 14362 },
+ { 3546900, 1773400, 24, 128, 24, 52, 48, 192, 48, 23, 32, 14362 },
};
libspectrum_dword
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2012-12-30 21:37:43
|
Revision: 4830
http://fuse-emulator.svn.sourceforge.net/fuse-emulator/?rev=4830&view=rev
Author: fredm
Date: 2012-12-30 21:37:36 +0000 (Sun, 30 Dec 2012)
Log Message:
-----------
Add 128Ke capabilities as long as it is in the library.
Modified Paths:
--------------
trunk/libspectrum/hacking/ChangeLog
trunk/libspectrum/libspectrum.c
Modified: trunk/libspectrum/hacking/ChangeLog
===================================================================
--- trunk/libspectrum/hacking/ChangeLog 2012-12-30 21:23:21 UTC (rev 4829)
+++ trunk/libspectrum/hacking/ChangeLog 2012-12-30 21:37:36 UTC (rev 4830)
@@ -929,3 +929,5 @@
20121229 doc/libspectrum.1: use an em dash (Stuart).
20121230 timings.c: add timings for 128Ke, copied from those for 128K (Stuart).
20121231 timings.c: 128Ke timings are intended to be based on +2A (Fred).
+20121231 libspectrum.c: add 128Ke capabilities as long as it is in the library
+ (Fred).
Modified: trunk/libspectrum/libspectrum.c
===================================================================
--- trunk/libspectrum/libspectrum.c 2012-12-30 21:23:21 UTC (rev 4829)
+++ trunk/libspectrum/libspectrum.c 2012-12-30 21:37:36 UTC (rev 4830)
@@ -297,7 +297,7 @@
switch( type ) {
case LIBSPECTRUM_MACHINE_128: case LIBSPECTRUM_MACHINE_PLUS2:
case LIBSPECTRUM_MACHINE_PLUS2A: case LIBSPECTRUM_MACHINE_PLUS3:
- case LIBSPECTRUM_MACHINE_PLUS3E:
+ case LIBSPECTRUM_MACHINE_PLUS3E: case LIBSPECTRUM_MACHINE_128E:
case LIBSPECTRUM_MACHINE_TC2068: case LIBSPECTRUM_MACHINE_TS2068:
case LIBSPECTRUM_MACHINE_PENT:
case LIBSPECTRUM_MACHINE_PENT512: case LIBSPECTRUM_MACHINE_PENT1024:
@@ -312,7 +312,7 @@
switch( type ) {
case LIBSPECTRUM_MACHINE_128: case LIBSPECTRUM_MACHINE_PLUS2:
case LIBSPECTRUM_MACHINE_PLUS2A: case LIBSPECTRUM_MACHINE_PLUS3:
- case LIBSPECTRUM_MACHINE_PLUS3E:
+ case LIBSPECTRUM_MACHINE_PLUS3E: case LIBSPECTRUM_MACHINE_128E:
case LIBSPECTRUM_MACHINE_PENT:
case LIBSPECTRUM_MACHINE_PENT512: case LIBSPECTRUM_MACHINE_PENT1024:
case LIBSPECTRUM_MACHINE_SCORP:
@@ -326,7 +326,7 @@
/* +3 Spectrum-style 0x1ffd memory paging */
switch( type ) {
case LIBSPECTRUM_MACHINE_PLUS2A: case LIBSPECTRUM_MACHINE_PLUS3:
- case LIBSPECTRUM_MACHINE_PLUS3E:
+ case LIBSPECTRUM_MACHINE_PLUS3E: case LIBSPECTRUM_MACHINE_128E:
capabilities |= LIBSPECTRUM_MACHINE_CAPABILITY_PLUS3_MEMORY; break;
default:
break;
@@ -380,6 +380,7 @@
switch( type ) {
case LIBSPECTRUM_MACHINE_PLUS2: case LIBSPECTRUM_MACHINE_PLUS2A:
case LIBSPECTRUM_MACHINE_PLUS3: case LIBSPECTRUM_MACHINE_PLUS3E:
+ case LIBSPECTRUM_MACHINE_128E:
capabilities |= LIBSPECTRUM_MACHINE_CAPABILITY_SINCLAIR_JOYSTICK; break;
default:
break;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zu...@us...> - 2012-12-31 15:40:20
|
Revision: 4836
http://fuse-emulator.svn.sourceforge.net/fuse-emulator/?rev=4836&view=rev
Author: zubzero
Date: 2012-12-31 15:40:10 +0000 (Mon, 31 Dec 2012)
Log Message:
-----------
Rename 'Interface II' to 'Interface 2' in comments and documentation
Modified Paths:
--------------
trunk/libspectrum/accessor.pl
trunk/libspectrum/doc/libspectrum.txt
trunk/libspectrum/hacking/ChangeLog
trunk/libspectrum/libspectrum.h.in
trunk/libspectrum/sna.c
trunk/libspectrum/z80.c
Modified: trunk/libspectrum/accessor.pl
===================================================================
--- trunk/libspectrum/accessor.pl 2012-12-31 15:35:45 UTC (rev 4835)
+++ trunk/libspectrum/accessor.pl 2012-12-31 15:40:10 UTC (rev 4836)
@@ -174,7 +174,7 @@
size_t zxcf_pages;
libspectrum_byte *zxcf_ram[ SNAPSHOT_ZXCF_PAGES ];
- /* Interface II cartridge */
+ /* Interface 2 cartridge */
int interface2_active;
libspectrum_byte *interface2_rom[1];
Modified: trunk/libspectrum/doc/libspectrum.txt
===================================================================
--- trunk/libspectrum/doc/libspectrum.txt 2012-12-31 15:35:45 UTC (rev 4835)
+++ trunk/libspectrum/doc/libspectrum.txt 2012-12-31 15:40:10 UTC (rev 4836)
@@ -277,7 +277,7 @@
LIBSPECTRUM_ID_UNKNOWN Couldn't identify this file
LIBSPECTRUM_ID_CARTRIDGE_DCK A .dck Timex dock image
-LIBSPECTRUM_ID_CARTRIDGE_IF2 A .rom Interface II cartridge
+LIBSPECTRUM_ID_CARTRIDGE_IF2 A .rom Interface 2 cartridge
LIBSPECTRUM_ID_COMPRESSED_BZ2 A bzip2 compressed file
LIBSPECTRUM_ID_COMPRESSED_GZ A gzip compressed file
@@ -350,7 +350,7 @@
LIBSPECTRUM_CLASS_UNKNOWN An unknown file type
LIBSPECTRUM_CLASS_CARTRIDGE_TIMEX A Timex dock cartridge
-LIBSPECTRUM_CLASS_CARTRIDGE_IF2 An Interface II cartridge
+LIBSPECTRUM_CLASS_CARTRIDGE_IF2 An Interface 2 cartridge
LIBSPECTRUM_CLASS_DISK_GENERIC A generic disk image
LIBSPECTRUM_CLASS_DISK_PLUSD An MGT/+D disk image
LIBSPECTRUM_CLASS_DISK_PLUS3 A +3 disk image
Modified: trunk/libspectrum/hacking/ChangeLog
===================================================================
--- trunk/libspectrum/hacking/ChangeLog 2012-12-31 15:35:45 UTC (rev 4835)
+++ trunk/libspectrum/hacking/ChangeLog 2012-12-31 15:40:10 UTC (rev 4836)
@@ -931,3 +931,5 @@
20121231 timings.c: 128Ke timings are intended to be based on +2A (Fred).
20121231 libspectrum.c: add 128Ke capabilities as long as it is in the library
(Fred).
+20121231 accessor.pl,doc/libspectrum.txt,libspectrum.h.in,sna.c,z80.c: rename
+ 'Interface II' to 'Interface 2' in comments and documentation (Stuart).
Modified: trunk/libspectrum/libspectrum.h.in
===================================================================
--- trunk/libspectrum/libspectrum.h.in 2012-12-31 15:35:45 UTC (rev 4835)
+++ trunk/libspectrum/libspectrum.h.in 2012-12-31 15:40:10 UTC (rev 4836)
@@ -191,7 +191,7 @@
/* Below here, present only in 0.2.2 and later */
LIBSPECTRUM_ID_HARDDISK_HDF, /* .hdf hard disk image */
- LIBSPECTRUM_ID_CARTRIDGE_IF2, /* .rom Interface II cartridge image */
+ LIBSPECTRUM_ID_CARTRIDGE_IF2, /* .rom Interface 2 cartridge image */
/* Below here, present only in 0.3.0 and later */
@@ -246,7 +246,7 @@
/* Below here, present only in 0.2.2 and later */
LIBSPECTRUM_CLASS_HARDDISK, /* A hard disk image */
- LIBSPECTRUM_CLASS_CARTRIDGE_IF2, /* Interface II cartridges */
+ LIBSPECTRUM_CLASS_CARTRIDGE_IF2, /* Interface 2 cartridges */
/* Below here, present only in 0.3.0 and later */
Modified: trunk/libspectrum/sna.c
===================================================================
--- trunk/libspectrum/sna.c 2012-12-31 15:35:45 UTC (rev 4835)
+++ trunk/libspectrum/sna.c 2012-12-31 15:40:10 UTC (rev 4836)
@@ -310,7 +310,7 @@
if( libspectrum_snap_divide_active( snap ) )
*out_flags |= LIBSPECTRUM_FLAG_SNAPSHOT_MAJOR_INFO_LOSS;
- /* We don't save the Interface II ROM at all */
+ /* We don't save the Interface 2 ROM at all */
if( libspectrum_snap_interface2_active( snap ) )
*out_flags |= LIBSPECTRUM_FLAG_SNAPSHOT_MAJOR_INFO_LOSS;
Modified: trunk/libspectrum/z80.c
===================================================================
--- trunk/libspectrum/z80.c 2012-12-31 15:35:45 UTC (rev 4835)
+++ trunk/libspectrum/z80.c 2012-12-31 15:40:10 UTC (rev 4836)
@@ -93,7 +93,7 @@
Z80_MACHINE_FIRST_EXTENSION = Z80_MACHINE_PLUS3,
};
-/* Constants representing a Sinclair Interface II port 1 joystick as a .z80
+/* Constants representing a Sinclair Interface 2 port 1 joystick as a .z80
user defined joystick */
static const libspectrum_word if2_left_map_l = 0x0f03;
static const libspectrum_word if2_left_map_r = 0x0803;
@@ -1260,7 +1260,7 @@
break;
case LIBSPECTRUM_JOYSTICK_SINCLAIR_2:
/* Write Z80_JOYSTICK_USER_DEFINED_V3 and custom key mapping corresponding
- to Sinclair Interface II right port */
+ to Sinclair Interface 2 right port */
joystick_flags = Z80_JOYSTICK_USER_DEFINED_V3;
break;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sba...@us...> - 2013-01-03 00:01:12
|
Revision: 4845
http://sourceforge.net/p/fuse-emulator/code/4845
Author: sbaldovi
Date: 2013-01-03 00:01:09 +0000 (Thu, 03 Jan 2013)
Log Message:
-----------
Make some URLs point to the new sourceforge forge and update copyright date to 2013.
Modified Paths:
--------------
trunk/libspectrum/configure.ac
trunk/libspectrum/hacking/ChangeLog
Modified: trunk/libspectrum/configure.ac
===================================================================
--- trunk/libspectrum/configure.ac 2013-01-02 23:49:55 UTC (rev 4844)
+++ trunk/libspectrum/configure.ac 2013-01-03 00:01:09 UTC (rev 4845)
@@ -35,11 +35,11 @@
[libspectrum_major_version,libspectrum_minor_version,libspectrum_micro_version,libspectrum_nano_version])
dnl Package info
-m4_define([libspectrum_copyright], ["(c) 1999-2012 Philip Kendall and others"])
+m4_define([libspectrum_copyright], ["(c) 1999-2013 Philip Kendall and others"])
m4_define([libspectrum_url],
[http://fuse-emulator.sourceforge.net/libspectrum.php])
m4_define([libspectrum_bugreport],
- [http://sourceforge.net/tracker/?group_id=91293&atid=596648])
+ [http://sourceforge.net/p/fuse-emulator/bugs])
AC_INIT([libspectrum],[libspectrum_version],[libspectrum_bugreport],
[libspectrum],[libspectrum_url])
Modified: trunk/libspectrum/hacking/ChangeLog
===================================================================
--- trunk/libspectrum/hacking/ChangeLog 2013-01-02 23:49:55 UTC (rev 4844)
+++ trunk/libspectrum/hacking/ChangeLog 2013-01-03 00:01:09 UTC (rev 4845)
@@ -933,3 +933,5 @@
(Fred).
20121231 accessor.pl,doc/libspectrum.txt,libspectrum.h.in,sna.c,z80.c: rename
'Interface II' to 'Interface 2' in comments and documentation (Stuart).
+20130103 configure.ac: make some URLs point to the new sourceforge forge and
+ update copyright date to 2013 (Sergio).
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zu...@us...> - 2013-01-03 09:16:17
|
Revision: 4847
http://sourceforge.net/p/fuse-emulator/code/4847
Author: zubzero
Date: 2013-01-03 09:16:15 +0000 (Thu, 03 Jan 2013)
Log Message:
-----------
Add trailing slash to URL of bug tracker
Modified Paths:
--------------
trunk/libspectrum/configure.ac
trunk/libspectrum/hacking/ChangeLog
Modified: trunk/libspectrum/configure.ac
===================================================================
--- trunk/libspectrum/configure.ac 2013-01-03 09:14:29 UTC (rev 4846)
+++ trunk/libspectrum/configure.ac 2013-01-03 09:16:15 UTC (rev 4847)
@@ -39,7 +39,7 @@
m4_define([libspectrum_url],
[http://fuse-emulator.sourceforge.net/libspectrum.php])
m4_define([libspectrum_bugreport],
- [http://sourceforge.net/p/fuse-emulator/bugs])
+ [http://sourceforge.net/p/fuse-emulator/bugs/])
AC_INIT([libspectrum],[libspectrum_version],[libspectrum_bugreport],
[libspectrum],[libspectrum_url])
Modified: trunk/libspectrum/hacking/ChangeLog
===================================================================
--- trunk/libspectrum/hacking/ChangeLog 2013-01-03 09:14:29 UTC (rev 4846)
+++ trunk/libspectrum/hacking/ChangeLog 2013-01-03 09:16:15 UTC (rev 4847)
@@ -935,3 +935,4 @@
'Interface II' to 'Interface 2' in comments and documentation (Stuart).
20130103 configure.ac: make some URLs point to the new sourceforge forge and
update copyright date to 2013 (Sergio).
+20130103 configure.ac: add trailing slash to URL of bug tracker (Stuart).
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2013-01-26 11:33:28
|
Revision: 4860
http://sourceforge.net/p/fuse-emulator/code/4860
Author: fredm
Date: 2013-01-26 11:33:25 +0000 (Sat, 26 Jan 2013)
Log Message:
-----------
Add support for storing ZX Printer state (bug [#274]).
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 2013-01-26 10:39:28 UTC (rev 4859)
+++ trunk/libspectrum/accessor.pl 2013-01-26 11:33:25 UTC (rev 4860)
@@ -236,6 +236,9 @@
/* Timings emulation */
int late_timings;
+
+ /* Printer emulation */
+ int zx_printer_active;
};
/* Initialise a libspectrum_snap structure */
Modified: trunk/libspectrum/doc/libspectrum.txt
===================================================================
--- trunk/libspectrum/doc/libspectrum.txt 2013-01-26 10:39:28 UTC (rev 4859)
+++ trunk/libspectrum/doc/libspectrum.txt 2013-01-26 11:33:25 UTC (rev 4860)
@@ -705,6 +705,8 @@
* int late_timings
+* int zx_printer_enabled
+
Most of those should be fairly self-explanatory; those which may not
be are:
@@ -729,6 +731,9 @@
should use timings 1 t-state later than usual as in some machines
that have warmed up.
+* `zx_printer_enabled' being non-zero signals that the emulated Spectrum
+ has a ZX Printer connected.
+
* The `beta_*' functions represent the Betadisk
interface. `beta_paged' is non-zero if the Betadisk ROM is currently
paged in between 0x0000 and 0x3fff and `beta_direction' is non-zero
Modified: trunk/libspectrum/hacking/ChangeLog
===================================================================
--- trunk/libspectrum/hacking/ChangeLog 2013-01-26 10:39:28 UTC (rev 4859)
+++ trunk/libspectrum/hacking/ChangeLog 2013-01-26 11:33:25 UTC (rev 4860)
@@ -936,3 +936,5 @@
20130103 configure.ac: make some URLs point to the new sourceforge forge and
update copyright date to 2013 (Sergio).
20130103 configure.ac: add trailing slash to URL of bug tracker (Stuart).
+20130126 accessor.pl,doc/libspectrum.txt,snap_accessors.txt,snapshot.c,szx.c:
+ add support for storing ZX Printer state (bug #274) (Fred).
Modified: trunk/libspectrum/snap_accessors.txt
===================================================================
--- trunk/libspectrum/snap_accessors.txt 2013-01-26 10:39:28 UTC (rev 4859)
+++ trunk/libspectrum/snap_accessors.txt 2013-01-26 11:33:25 UTC (rev 4860)
@@ -191,3 +191,5 @@
libspectrum_byte* spectranet_ram 1
int late_timings
+
+int zx_printer_active
Modified: trunk/libspectrum/snapshot.c
===================================================================
--- trunk/libspectrum/snapshot.c 2013-01-26 10:39:28 UTC (rev 4859)
+++ trunk/libspectrum/snapshot.c 2013-01-26 11:33:25 UTC (rev 4860)
@@ -220,6 +220,8 @@
libspectrum_snap_set_spectranet_ram( snap, 0, NULL );
libspectrum_snap_set_late_timings( snap, 0 );
+
+ libspectrum_snap_set_zx_printer_active( snap, 0 );
return snap;
}
Modified: trunk/libspectrum/szx.c
===================================================================
--- trunk/libspectrum/szx.c 2013-01-26 10:39:28 UTC (rev 4859)
+++ trunk/libspectrum/szx.c 2013-01-26 11:33:25 UTC (rev 4860)
@@ -128,6 +128,7 @@
#define ZXSTBID_ROM "ROM\0"
#define ZXSTBID_ZXPRINTER "ZXPR"
+static const libspectrum_word ZXSTPRF_ENABLED = 1;
#define ZXSTBID_IF1 "IF1\0"
static const libspectrum_word ZXSTIF1F_ENABLED = 1;
@@ -333,6 +334,9 @@
write_dirp_chunk( libspectrum_byte **buffer, libspectrum_byte **ptr,
size_t *length, libspectrum_snap *snap, int page,
int compress );
+static libspectrum_error
+write_zxpr_chunk( libspectrum_byte **buffer, libspectrum_byte **ptr,
+ size_t *length, int *out_flags, libspectrum_snap *snap );
static void
write_chunk_header( libspectrum_byte **buffer, libspectrum_byte **ptr,
@@ -1730,6 +1734,27 @@
}
static libspectrum_error
+read_zxpr_chunk( libspectrum_snap *snap, libspectrum_word version,
+ const libspectrum_byte **buffer,
+ const libspectrum_byte *end GCC_UNUSED, size_t data_length,
+ szx_context *ctx GCC_UNUSED )
+{
+ libspectrum_word flags;
+
+ if( data_length != 2 ) {
+ libspectrum_print_error( LIBSPECTRUM_ERROR_UNKNOWN,
+ "%s:read_zxpr_chunk: unknown length %lu",
+ __FILE__, (unsigned long)data_length );
+ return LIBSPECTRUM_ERROR_UNKNOWN;
+ }
+
+ flags = libspectrum_read_word( buffer );
+ libspectrum_snap_set_zx_printer_active( snap, flags & ZXSTPRF_ENABLED );
+
+ return LIBSPECTRUM_ERROR_NONE;
+}
+
+static libspectrum_error
read_if2r_chunk( libspectrum_snap *snap, libspectrum_word version GCC_UNUSED,
const libspectrum_byte **buffer,
const libspectrum_byte *end GCC_UNUSED, size_t data_length,
@@ -2179,7 +2204,7 @@
{ ZXSTBID_ZXATASP, read_zxat_chunk },
{ ZXSTBID_ZXCF, read_zxcf_chunk },
{ ZXSTBID_ZXCFRAMPAGE, read_cfrp_chunk },
- { ZXSTBID_ZXPRINTER, skip_chunk },
+ { ZXSTBID_ZXPRINTER, read_zxpr_chunk },
{ ZXSTBID_ZXTAPE, skip_chunk },
};
@@ -2552,6 +2577,9 @@
if( error ) return error;
}
+ error = write_zxpr_chunk( buffer, &ptr, length, out_flags, snap );
+ if( error ) return error;
+
/* Set length to be actual length, not allocated length */
*length = ptr - *buffer;
@@ -2830,6 +2858,22 @@
}
static libspectrum_error
+write_zxpr_chunk( libspectrum_byte **buffer, libspectrum_byte **ptr,
+ size_t *length, int *out_flags, libspectrum_snap *snap )
+{
+ libspectrum_word flags;
+
+ write_chunk_header( buffer, ptr, length, ZXSTBID_ZXPRINTER, 2 );
+
+ flags = 0;
+ if( libspectrum_snap_zx_printer_active( snap ) ) flags |= ZXSTPRF_ENABLED;
+
+ libspectrum_write_word( ptr, flags );
+
+ return LIBSPECTRUM_ERROR_NONE;
+}
+
+static libspectrum_error
write_rom_chunk( libspectrum_byte **buffer, libspectrum_byte **ptr, size_t *length,
int *out_flags, libspectrum_snap *snap, int compress )
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pa...@us...> - 2013-01-30 19:39:07
|
Revision: 4866
http://sourceforge.net/p/fuse-emulator/code/4866
Author: pak21
Date: 2013-01-30 19:39:05 +0000 (Wed, 30 Jan 2013)
Log Message:
-----------
Correct video timing for +2A/+3 etc machines (libspectrum part of patch #305).
Modified Paths:
--------------
trunk/libspectrum/hacking/ChangeLog
trunk/libspectrum/timings.c
Modified: trunk/libspectrum/hacking/ChangeLog
===================================================================
--- trunk/libspectrum/hacking/ChangeLog 2013-01-28 20:54:40 UTC (rev 4865)
+++ trunk/libspectrum/hacking/ChangeLog 2013-01-30 19:39:05 UTC (rev 4866)
@@ -938,3 +938,5 @@
20130103 configure.ac: add trailing slash to URL of bug tracker (Stuart).
20130126 accessor.pl,doc/libspectrum.txt,snap_accessors.txt,snapshot.c,szx.c:
add support for storing ZX Printer state (bug #274) (Fred).
+20130130 timings.c: correct video timing for +2A/+3 etc machines (part of
+ patch #305).
Modified: trunk/libspectrum/timings.c
===================================================================
--- trunk/libspectrum/timings.c 2013-01-28 20:54:40 UTC (rev 4865)
+++ trunk/libspectrum/timings.c 2013-01-30 19:39:05 UTC (rev 4866)
@@ -70,9 +70,9 @@
/* Pentagon */
{ 3584000, 1792000, 36, 128, 28, 32, 64, 192, 48, 16, 36, 17988 },
/* +2A */
- { 3546900, 1773400, 24, 128, 24, 52, 48, 192, 48, 23, 32, 14362 },
+ { 3546900, 1773400, 24, 128, 24, 52, 48, 192, 48, 23, 32, 14365 },
/* +3 */
- { 3546900, 1773400, 24, 128, 24, 52, 48, 192, 48, 23, 32, 14362 },
+ { 3546900, 1773400, 24, 128, 24, 52, 48, 192, 48, 23, 32, 14365 },
/* Unknown machine */
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
/* 16K */
@@ -82,7 +82,7 @@
/* Scorpion */
{ 3500000, 1750000, 24, 128, 32, 40, 48, 192, 48, 24, 36, 14336 },
/* +3e */
- { 3546900, 1773400, 24, 128, 24, 52, 48, 192, 48, 23, 32, 14362 },
+ { 3546900, 1773400, 24, 128, 24, 52, 48, 192, 48, 23, 32, 14365 },
/* SE */
{ 3500000, 1750000, 24, 128, 24, 48, 47, 192, 48, 25, 32, 14336 },
/* TS2068 */
@@ -94,7 +94,7 @@
/* 48K NTSC */
{ 3527500, 0, 24, 128, 24, 48, 24, 192, 25, 23, 32, 8960 },
/* 128Ke */
- { 3546900, 1773400, 24, 128, 24, 52, 48, 192, 48, 23, 32, 14362 },
+ { 3546900, 1773400, 24, 128, 24, 52, 48, 192, 48, 23, 32, 14365 },
};
libspectrum_dword
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pa...@us...> - 2013-03-08 20:21:07
|
Revision: 4904
http://sourceforge.net/p/fuse-emulator/code/4904
Author: pak21
Date: 2013-03-08 20:21:02 +0000 (Fri, 08 Mar 2013)
Log Message:
-----------
Implement Spectranet's "suppress NMI" flipflop (bug #259).
Modified Paths:
--------------
trunk/libspectrum/accessor.pl
trunk/libspectrum/hacking/ChangeLog
trunk/libspectrum/snap_accessors.txt
trunk/libspectrum/szx.c
Modified: trunk/libspectrum/accessor.pl
===================================================================
--- trunk/libspectrum/accessor.pl 2013-03-03 22:23:16 UTC (rev 4903)
+++ trunk/libspectrum/accessor.pl 2013-03-08 20:21:02 UTC (rev 4904)
@@ -222,6 +222,7 @@
int spectranet_active;
int spectranet_paged;
int spectranet_paged_via_io;
+ int spectranet_nmi_flipflop;
int spectranet_programmable_trap_active;
int spectranet_programmable_trap_msb;
int spectranet_all_traps_disabled;
Modified: trunk/libspectrum/hacking/ChangeLog
===================================================================
--- trunk/libspectrum/hacking/ChangeLog 2013-03-03 22:23:16 UTC (rev 4903)
+++ trunk/libspectrum/hacking/ChangeLog 2013-03-08 20:21:02 UTC (rev 4904)
@@ -940,3 +940,5 @@
add support for storing ZX Printer state (bug #274) (Fred).
20130130 timings.c: correct video timing for +2A/+3 etc machines (part of
patch #305).
+20130307 accessor.pl,snap_accessors.txt,szx.c: implement Spectranet's "suppress
+ NMI" flipflop (bug #259).
Modified: trunk/libspectrum/snap_accessors.txt
===================================================================
--- trunk/libspectrum/snap_accessors.txt 2013-03-03 22:23:16 UTC (rev 4903)
+++ trunk/libspectrum/snap_accessors.txt 2013-03-08 20:21:02 UTC (rev 4904)
@@ -178,6 +178,7 @@
int spectranet_active
int spectranet_paged
int spectranet_paged_via_io
+int spectranet_nmi_flipflop
int spectranet_programmable_trap_active
int spectranet_programmable_trap_msb
int spectranet_all_traps_disabled
Modified: trunk/libspectrum/szx.c
===================================================================
--- trunk/libspectrum/szx.c 2013-03-03 22:23:16 UTC (rev 4903)
+++ trunk/libspectrum/szx.c 2013-03-08 20:21:02 UTC (rev 4904)
@@ -210,6 +210,7 @@
static const libspectrum_word ZXSTSNET_ALL_DISABLED = 16;
static const libspectrum_word ZXSTSNET_RST8_DISABLED = 32;
static const libspectrum_word ZXSTSNET_DENY_DOWNSTREAM_A15 = 64;
+static const libspectrum_word ZXSTSNET_NMI_FLIPFLOP = 128;
#define ZXSTBID_SPECTRANETFLASHPAGE "SNEF"
static const libspectrum_byte ZXSTSNEF_FLASH_COMPRESSED = 1;
@@ -2064,6 +2065,7 @@
libspectrum_snap_set_spectranet_all_traps_disabled( snap, flags & ZXSTSNET_ALL_DISABLED );
libspectrum_snap_set_spectranet_rst8_trap_disabled( snap, flags & ZXSTSNET_RST8_DISABLED );
libspectrum_snap_set_spectranet_deny_downstream_a15( snap, flags & ZXSTSNET_DENY_DOWNSTREAM_A15 );
+ libspectrum_snap_set_spectranet_nmi_flipflop( snap, flags & ZXSTSNET_NMI_FLIPFLOP );
libspectrum_snap_set_spectranet_page_a( snap, **buffer ); (*buffer)++;
libspectrum_snap_set_spectranet_page_b( snap, **buffer ); (*buffer)++;
@@ -3783,6 +3785,8 @@
flags |= ZXSTSNET_RST8_DISABLED;
if( libspectrum_snap_spectranet_deny_downstream_a15( snap ) )
flags |= ZXSTSNET_DENY_DOWNSTREAM_A15;
+ if( libspectrum_snap_spectranet_nmi_flipflop( snap ) )
+ flags |= ZXSTSNET_NMI_FLIPFLOP;
libspectrum_write_word( ptr, flags );
*(*ptr)++ = libspectrum_snap_spectranet_page_a( snap );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pa...@us...> - 2013-05-16 19:39:59
|
Revision: 4934
http://sourceforge.net/p/fuse-emulator/code/4934
Author: pak21
Date: 2013-05-16 19:39:57 +0000 (Thu, 16 May 2013)
Log Message:
-----------
Update library version number for 1.1 release.
Modified Paths:
--------------
trunk/libspectrum/Makefile.am
trunk/libspectrum/hacking/ChangeLog
Modified: trunk/libspectrum/Makefile.am
===================================================================
--- trunk/libspectrum/Makefile.am 2013-05-13 21:31:07 UTC (rev 4933)
+++ trunk/libspectrum/Makefile.am 2013-05-16 19:39:57 UTC (rev 4934)
@@ -1,5 +1,5 @@
## Process this file with automake to produce Makefile.in
-## Copyright (c) 2001-2004 Philip Kendall
+## Copyright (c) 2001-2013 Philip Kendall
## $Id$
@@ -63,7 +63,7 @@
zlib.c \
zxs.c
-libspectrum_la_LDFLAGS = -version-info 8:0:0 -no-undefined @WINDRES_LDFLAGS@
+libspectrum_la_LDFLAGS = -version-info 9:0:0 -no-undefined @WINDRES_LDFLAGS@
libspectrum_la_LIBADD = @AUDIOFILE_LIBS@ @GLIB_LIBS@ -lm
Modified: trunk/libspectrum/hacking/ChangeLog
===================================================================
--- trunk/libspectrum/hacking/ChangeLog 2013-05-13 21:31:07 UTC (rev 4933)
+++ trunk/libspectrum/hacking/ChangeLog 2013-05-16 19:39:57 UTC (rev 4934)
@@ -942,3 +942,4 @@
patch #305).
20130307 accessor.pl,snap_accessors.txt,szx.c: implement Spectranet's "suppress
NMI" flipflop (bug #259).
+20130516 Makefile.am: update library version number for 1.1 release.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pa...@us...> - 2013-05-16 20:59:38
|
Revision: 4947
http://sourceforge.net/p/fuse-emulator/code/4947
Author: pak21
Date: 2013-05-16 20:59:36 +0000 (Thu, 16 May 2013)
Log Message:
-----------
Update date in main changelog.
Modified Paths:
--------------
trunk/libspectrum/ChangeLog
trunk/libspectrum/hacking/ChangeLog
Modified: trunk/libspectrum/ChangeLog
===================================================================
--- trunk/libspectrum/ChangeLog 2013-05-16 20:57:25 UTC (rev 4946)
+++ trunk/libspectrum/ChangeLog 2013-05-16 20:59:36 UTC (rev 4947)
@@ -1,4 +1,4 @@
-201?-??-?? Philip Kendall <phi...@sh...>
+2013-05-18 Philip Kendall <phi...@sh...>
* libspectrum 1.1.0 released.
Modified: trunk/libspectrum/hacking/ChangeLog
===================================================================
--- trunk/libspectrum/hacking/ChangeLog 2013-05-16 20:57:25 UTC (rev 4946)
+++ trunk/libspectrum/hacking/ChangeLog 2013-05-16 20:59:36 UTC (rev 4947)
@@ -944,3 +944,4 @@
NMI" flipflop (bug #259).
20130516 Makefile.am: update library version number for 1.1 release.
20130516 doc/libspectrum.3: update version number and date for 1.1 release.
+20130516 ChangeLog: update date in main changelog.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pa...@us...> - 2013-05-17 18:42:48
|
Revision: 4950
http://sourceforge.net/p/fuse-emulator/code/4950
Author: pak21
Date: 2013-05-17 18:42:45 +0000 (Fri, 17 May 2013)
Log Message:
-----------
Update one more date for the 1.1 release.
Modified Paths:
--------------
trunk/libspectrum/README
trunk/libspectrum/hacking/ChangeLog
Modified: trunk/libspectrum/README
===================================================================
--- trunk/libspectrum/README 2013-05-17 05:21:07 UTC (rev 4949)
+++ trunk/libspectrum/README 2013-05-17 18:42:45 UTC (rev 4950)
@@ -67,6 +67,6 @@
Then, type "make" and if everything went well, "make install".
Philip Kendall <phi...@sh...>
-?? ??? 201?
+18th May, 2013
$Id$
Modified: trunk/libspectrum/hacking/ChangeLog
===================================================================
--- trunk/libspectrum/hacking/ChangeLog 2013-05-17 05:21:07 UTC (rev 4949)
+++ trunk/libspectrum/hacking/ChangeLog 2013-05-17 18:42:45 UTC (rev 4950)
@@ -945,3 +945,4 @@
20130516 Makefile.am: update library version number for 1.1 release.
20130516 doc/libspectrum.3: update version number and date for 1.1 release.
20130516 ChangeLog: update date in main changelog.
+20130517 README: update one more date for the 1.1 release.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sba...@us...> - 2013-05-17 22:14:19
|
Revision: 4957
http://sourceforge.net/p/fuse-emulator/code/4957
Author: sbaldovi
Date: 2013-05-17 22:14:16 +0000 (Fri, 17 May 2013)
Log Message:
-----------
Update version number for 1.1 release.
Modified Paths:
--------------
trunk/libspectrum/doc/libspectrum.txt
trunk/libspectrum/hacking/ChangeLog
Modified: trunk/libspectrum/doc/libspectrum.txt
===================================================================
--- trunk/libspectrum/doc/libspectrum.txt 2013-05-17 22:11:51 UTC (rev 4956)
+++ trunk/libspectrum/doc/libspectrum.txt 2013-05-17 22:14:16 UTC (rev 4957)
@@ -1,4 +1,4 @@
-libspectrum 1.0.0
+libspectrum 1.1.0
=================
libspectrum is a fairly simple library designed to make the handling
Modified: trunk/libspectrum/hacking/ChangeLog
===================================================================
--- trunk/libspectrum/hacking/ChangeLog 2013-05-17 22:11:51 UTC (rev 4956)
+++ trunk/libspectrum/hacking/ChangeLog 2013-05-17 22:14:16 UTC (rev 4957)
@@ -946,3 +946,4 @@
20130516 doc/libspectrum.3: update version number and date for 1.1 release.
20130516 ChangeLog: update date in main changelog.
20130517 README: update one more date for the 1.1 release.
+20130518 doc/libspectrum.txt: update version number for 1.1 release (Sergio).
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zu...@us...> - 2013-05-24 10:02:36
|
Revision: 4982
http://sourceforge.net/p/fuse-emulator/code/4982
Author: zubzero
Date: 2013-05-24 10:02:33 +0000 (Fri, 24 May 2013)
Log Message:
-----------
Update libtool age to support binaries built against libspectrum 1.0.0
Modified Paths:
--------------
trunk/libspectrum/Makefile.am
trunk/libspectrum/hacking/ChangeLog
Modified: trunk/libspectrum/Makefile.am
===================================================================
--- trunk/libspectrum/Makefile.am 2013-05-23 22:21:17 UTC (rev 4981)
+++ trunk/libspectrum/Makefile.am 2013-05-24 10:02:33 UTC (rev 4982)
@@ -63,7 +63,7 @@
zlib.c \
zxs.c
-libspectrum_la_LDFLAGS = -version-info 9:0:0 -no-undefined @WINDRES_LDFLAGS@
+libspectrum_la_LDFLAGS = -version-info 9:0:1 -no-undefined @WINDRES_LDFLAGS@
libspectrum_la_LIBADD = @AUDIOFILE_LIBS@ @GLIB_LIBS@ -lm
Modified: trunk/libspectrum/hacking/ChangeLog
===================================================================
--- trunk/libspectrum/hacking/ChangeLog 2013-05-23 22:21:17 UTC (rev 4981)
+++ trunk/libspectrum/hacking/ChangeLog 2013-05-24 10:02:33 UTC (rev 4982)
@@ -947,3 +947,5 @@
20130516 ChangeLog: update date in main changelog.
20130517 README: update one more date for the 1.1 release.
20130518 doc/libspectrum.txt: update version number for 1.1 release (Sergio).
+20130524 Makefile.am: update libtool age to support binaries built against
+ libspectrum 1.0.0 (Stuart).
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sba...@us...> - 2013-05-26 15:10:24
|
Revision: 4999
http://sourceforge.net/p/fuse-emulator/code/4999
Author: sbaldovi
Date: 2013-05-26 15:10:22 +0000 (Sun, 26 May 2013)
Log Message:
-----------
Add dll.c into the dist tarball.
Modified Paths:
--------------
trunk/libspectrum/Makefile.am
trunk/libspectrum/hacking/ChangeLog
Modified: trunk/libspectrum/Makefile.am
===================================================================
--- trunk/libspectrum/Makefile.am 2013-05-26 15:07:32 UTC (rev 4998)
+++ trunk/libspectrum/Makefile.am 2013-05-26 15:10:22 UTC (rev 4999)
@@ -104,6 +104,7 @@
AM_CPPFLAGS = @GLIB_CFLAGS@ @AUDIOFILE_CFLAGS@
EXTRA_DIST = accessor.pl \
+ dll.c \
generate.pl.in \
m4/audiofile.m4 \
make-perl.c \
Modified: trunk/libspectrum/hacking/ChangeLog
===================================================================
--- trunk/libspectrum/hacking/ChangeLog 2013-05-26 15:07:32 UTC (rev 4998)
+++ trunk/libspectrum/hacking/ChangeLog 2013-05-26 15:10:22 UTC (rev 4999)
@@ -949,3 +949,4 @@
20130518 doc/libspectrum.txt: update version number for 1.1 release (Sergio).
20130524 Makefile.am: update libtool age to support binaries built against
libspectrum 1.0.0 (Stuart).
+20130526 Makefile.am: add dll.c into the dist tarball (Sergio).
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sba...@us...> - 2013-09-28 06:55:06
|
Revision: 5046
http://sourceforge.net/p/fuse-emulator/code/5046
Author: sbaldovi
Date: 2013-09-28 06:55:03 +0000 (Sat, 28 Sep 2013)
Log Message:
-----------
Use 'subdir-objects' option as advised by automake 1.14 to place object files in subdirectories.
Modified Paths:
--------------
trunk/libspectrum/configure.ac
trunk/libspectrum/hacking/ChangeLog
Modified: trunk/libspectrum/configure.ac
===================================================================
--- trunk/libspectrum/configure.ac 2013-09-28 06:48:01 UTC (rev 5045)
+++ trunk/libspectrum/configure.ac 2013-09-28 06:55:03 UTC (rev 5046)
@@ -49,7 +49,7 @@
AC_CANONICAL_HOST
dnl Use automake to produce `Makefile.in'
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([subdir-objects])
dnl Substitutions for .in files
LIBSPECTRUM_FULL_VERSION=libspectrum_full_version
Modified: trunk/libspectrum/hacking/ChangeLog
===================================================================
--- trunk/libspectrum/hacking/ChangeLog 2013-09-28 06:48:01 UTC (rev 5045)
+++ trunk/libspectrum/hacking/ChangeLog 2013-09-28 06:55:03 UTC (rev 5046)
@@ -950,3 +950,5 @@
20130524 Makefile.am: update libtool age to support binaries built against
libspectrum 1.0.0 (Stuart).
20130526 Makefile.am: add dll.c into the dist tarball (Sergio).
+20130928 configure.ac: use 'subdir-objects' option as advised by automake 1.14
+ to place object files in subdirectories (Sergio).
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sba...@us...> - 2014-01-12 23:50:37
|
Revision: 5063
http://sourceforge.net/p/fuse-emulator/code/5063
Author: sbaldovi
Date: 2014-01-12 23:50:31 +0000 (Sun, 12 Jan 2014)
Log Message:
-----------
Allow to finalise rzx recordings (part of bug #305).
Modified Paths:
--------------
trunk/libspectrum/hacking/ChangeLog
trunk/libspectrum/libspectrum.h.in
trunk/libspectrum/rzx.c
Modified: trunk/libspectrum/hacking/ChangeLog
===================================================================
--- trunk/libspectrum/hacking/ChangeLog 2013-12-15 11:32:02 UTC (rev 5062)
+++ trunk/libspectrum/hacking/ChangeLog 2014-01-12 23:50:31 UTC (rev 5063)
@@ -955,3 +955,5 @@
20131013 configure.ac: replace obsolete ac_cv_prog_gcc with ac_cv_c_compiler_gnu
(Sergio).
20131215 rzx.c: fix snapshot insertion in rzx recordings (Sergio).
+20140113 libspectrum.h.in,rzx.c: allow to finalise rzx recordings (part of bug
+ #305) (Sergio).
Modified: trunk/libspectrum/libspectrum.h.in
===================================================================
--- trunk/libspectrum/libspectrum.h.in 2013-12-15 11:32:02 UTC (rev 5062)
+++ trunk/libspectrum/libspectrum.h.in 2014-01-12 23:50:31 UTC (rev 5063)
@@ -806,6 +806,8 @@
libspectrum_rzx_iterator_begin( libspectrum_rzx *rzx );
WIN32_DLL libspectrum_rzx_iterator
libspectrum_rzx_iterator_next( libspectrum_rzx_iterator it );
+WIN32_DLL libspectrum_rzx_iterator
+libspectrum_rzx_iterator_last( libspectrum_rzx *rzx );
WIN32_DLL libspectrum_rzx_block_id
libspectrum_rzx_iterator_get_type( libspectrum_rzx_iterator it );
@@ -820,6 +822,9 @@
WIN32_DLL int
libspectrum_rzx_iterator_snap_is_automatic( libspectrum_rzx_iterator it );
+WIN32_DLL libspectrum_error
+libspectrum_rzx_finalise( libspectrum_rzx *rzx );
+
/*
* Microdrive image handling routines
*/
Modified: trunk/libspectrum/rzx.c
===================================================================
--- trunk/libspectrum/rzx.c 2013-12-15 11:32:02 UTC (rev 5062)
+++ trunk/libspectrum/rzx.c 2014-01-12 23:50:31 UTC (rev 5063)
@@ -1,5 +1,5 @@
/* rzx.c: routines for dealing with .rzx files
- Copyright (c) 2002-2008 Philip Kendall
+ Copyright (c) 2002-2014 Philip Kendall
$Id$
@@ -281,6 +281,7 @@
rzx->current_input->frames = NULL;
rzx->current_input->allocated = 0;
rzx->current_input->count = 0;
+ rzx->current_input->non_repeat = 0;
rzx->blocks = g_slist_append( rzx->blocks, block );
}
@@ -393,12 +394,36 @@
return LIBSPECTRUM_ERROR_NONE;
}
+static libspectrum_error
+input_block_resize( input_block_t *input, size_t new_count )
+{
+ libspectrum_rzx_frame_t *ptr;
+ size_t new_allocated;
+
+ /* Get more space if we need it; allocate twice as much as we currently
+ have, with a minimum of 50 */
+ if( new_count > input->allocated ) {
+
+ new_allocated = input->allocated >= 25 ? 2 * input->allocated : 50;
+ if( new_allocated < new_count ) new_allocated = new_count;
+
+ ptr = libspectrum_realloc( input->frames, new_allocated * sizeof( *ptr ) );
+ if( !ptr ) return LIBSPECTRUM_ERROR_MEMORY;
+
+ input->frames = ptr;
+ input->allocated = new_allocated;
+ }
+
+ return LIBSPECTRUM_ERROR_NONE;
+}
+
libspectrum_error
libspectrum_rzx_store_frame( libspectrum_rzx *rzx, size_t instructions,
size_t count, libspectrum_byte *in_bytes )
{
input_block_t *input;
libspectrum_rzx_frame_t *frame;
+ libspectrum_error error;
input = rzx->current_input;
@@ -411,19 +436,10 @@
return LIBSPECTRUM_ERROR_INVALID;
}
- /* Get more space if we need it; allocate twice as much as we currently
- have, with a minimum of 50 */
- if( input->count == input->allocated ) {
-
- libspectrum_rzx_frame_t *ptr; size_t new_allocated;
-
- new_allocated = input->allocated >= 25 ? 2 * input->allocated : 50;
-
- ptr = realloc( input->frames, new_allocated * sizeof( *ptr ) );
- if( !ptr ) return LIBSPECTRUM_ERROR_MEMORY;
-
- input->frames = ptr;
- input->allocated = new_allocated;
+ /* Get more space if we need it */
+ if( input->allocated == input->count ) {
+ error = input_block_resize( input, input->count + 1 );
+ if( error ) return error;
}
frame = &input->frames[ input->count ];
@@ -438,6 +454,8 @@
) {
frame->repeat_last = 1;
+ frame->count = 0;
+ frame->in_bytes = NULL;
} else {
@@ -601,6 +619,7 @@
{
g_slist_foreach( rzx->blocks, block_free_wrapper, NULL );
g_slist_free( rzx->blocks );
+ libspectrum_free( rzx );
return LIBSPECTRUM_ERROR_NONE;
}
@@ -1646,6 +1665,13 @@
return it->next;
}
+libspectrum_rzx_iterator
+libspectrum_rzx_iterator_last( libspectrum_rzx *rzx )
+{
+ /* This function iterates over the whole list */
+ return g_slist_last( rzx->blocks );
+}
+
libspectrum_rzx_block_id
libspectrum_rzx_iterator_get_type( libspectrum_rzx_iterator it )
{
@@ -1692,3 +1718,84 @@
return block->types.snap.automatic;
}
+
+static libspectrum_error
+input_block_merge( input_block_t *input, input_block_t *next_input )
+{
+ libspectrum_error error;
+
+ /* Get more space if we need it */
+ if( input->allocated < input->count + next_input->count ) {
+ error = input_block_resize( input, input->count + next_input->count );
+ if( error ) return error;
+ }
+
+ /* Note in_bytes are not duplicated */
+ memcpy( &( input->frames[input->count] ), next_input->frames,
+ next_input->count * sizeof( libspectrum_rzx_frame_t ) );
+
+ input->non_repeat = input->count + next_input->non_repeat;
+ input->count += next_input->count;
+ next_input->count = 0; /* don't free reused in_bytes */
+
+ return 0;
+}
+
+libspectrum_error
+libspectrum_rzx_finalise( libspectrum_rzx *rzx )
+{
+ GSList *list, *item, *next_item;
+ rzx_block_t *block, *next_block;
+ libspectrum_error error;
+ int first_snap = 1;
+ int finalised = 0;
+
+ /* Delete interspersed snapshots */
+ list = rzx->blocks;
+
+ while( list ) {
+ item = list;
+ block = list->data;
+ list = list->next;
+
+ if( block->type == LIBSPECTRUM_RZX_SNAPSHOT_BLOCK ) {
+ if( first_snap ) {
+ first_snap = 0;
+ } else {
+ block_free( block );
+ rzx->blocks = g_slist_delete_link( rzx->blocks, item );
+ finalised = 1;
+ }
+ }
+ }
+
+ /* Merge adjacent input blocks */
+ list = rzx->blocks;
+
+ while( list ) {
+ block = list->data;
+
+ if( block->type == LIBSPECTRUM_RZX_INPUT_BLOCK ) {
+
+ next_item = list->next;
+ next_block = ( next_item )? next_item->data : NULL;
+
+ if( next_block && next_block->type == LIBSPECTRUM_RZX_INPUT_BLOCK ) {
+ error = input_block_merge( &( block->types.input ),
+ &( next_block->types.input ) );
+ if( error ) return error;
+
+ block_free( next_block );
+ rzx->blocks = g_slist_delete_link( rzx->blocks, next_item );
+ finalised = 1;
+ } else {
+ list = list->next;
+ }
+
+ } else {
+ list = list->next;
+ }
+ }
+
+ return finalised? LIBSPECTRUM_ERROR_NONE : LIBSPECTRUM_ERROR_INVALID;
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sba...@us...> - 2014-02-09 23:15:28
|
Revision: 5070
http://sourceforge.net/p/fuse-emulator/code/5070
Author: sbaldovi
Date: 2014-02-09 23:15:25 +0000 (Sun, 09 Feb 2014)
Log Message:
-----------
Use SZX format for interspersed snapshots in RZX recordings (part of bug #304).
Modified Paths:
--------------
trunk/libspectrum/hacking/ChangeLog
trunk/libspectrum/rzx.c
Modified: trunk/libspectrum/hacking/ChangeLog
===================================================================
--- trunk/libspectrum/hacking/ChangeLog 2014-02-09 23:01:03 UTC (rev 5069)
+++ trunk/libspectrum/hacking/ChangeLog 2014-02-09 23:15:25 UTC (rev 5070)
@@ -957,3 +957,5 @@
20131215 rzx.c: fix snapshot insertion in rzx recordings (Sergio).
20140113 libspectrum.h.in,rzx.c: allow to finalise rzx recordings (part of bug
#305) (Sergio).
+20140210 rzx.c: use SZX format for interspersed snapshots in RZX recordings
+ (part of bug #304) (Sergio).
Modified: trunk/libspectrum/rzx.c
===================================================================
--- trunk/libspectrum/rzx.c 2014-02-09 23:01:03 UTC (rev 5069)
+++ trunk/libspectrum/rzx.c 2014-02-09 23:15:25 UTC (rev 5070)
@@ -1283,6 +1283,9 @@
break;
case LIBSPECTRUM_RZX_INPUT_BLOCK:
+ /* z80 snapshots can't safely store an intermediate state */
+ snap_format = LIBSPECTRUM_ID_SNAPSHOT_SZX;
+
error = rzx_write_input( &( block->types.input ), buffer, &ptr, length,
compress );
if( error != LIBSPECTRUM_ERROR_NONE ) return error;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2014-05-04 13:46:07
|
Revision: 5079
http://sourceforge.net/p/fuse-emulator/code/5079
Author: fredm
Date: 2014-05-04 13:46:01 +0000 (Sun, 04 May 2014)
Log Message:
-----------
Ensure that we have an edge at the end of a tape to ensure that the last pulse
is terminated - fixes loading of Moon Cresta (thanks, Lee Tonks).
Modified Paths:
--------------
trunk/libspectrum/hacking/ChangeLog
trunk/libspectrum/tape.c
Modified: trunk/libspectrum/hacking/ChangeLog
===================================================================
--- trunk/libspectrum/hacking/ChangeLog 2014-04-23 22:58:51 UTC (rev 5078)
+++ trunk/libspectrum/hacking/ChangeLog 2014-05-04 13:46:01 UTC (rev 5079)
@@ -959,3 +959,6 @@
#305) (Sergio).
20140210 rzx.c: use SZX format for interspersed snapshots in RZX recordings
(part of bug #304) (Sergio).
+20140504 tape.c: ensure that we have an edge at the end of a tape to ensure that
+ the last pulse is terminated - fixes loading of Moon Cresta (thanks,
+ Lee Tonks) (Fred).
Modified: trunk/libspectrum/tape.c
===================================================================
--- trunk/libspectrum/tape.c 2014-04-23 22:58:51 UTC (rev 5078)
+++ trunk/libspectrum/tape.c 2014-05-04 13:46:01 UTC (rev 5079)
@@ -499,6 +499,9 @@
if( libspectrum_tape_iterator_current( it->current_block ) == NULL ) {
*flags |= LIBSPECTRUM_TAPE_FLAGS_STOP;
*flags |= LIBSPECTRUM_TAPE_FLAGS_TAPE;
+ /* Need to have an edge at the end of the tape to terminate the last
+ pulse so clear the NO_EDGE flag if it has been set */
+ *flags &= ~LIBSPECTRUM_TAPE_FLAGS_NO_EDGE;
libspectrum_tape_iterator_init( &(it->current_block), tape );
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2014-12-29 13:04:20
|
Revision: 5104
http://sourceforge.net/p/fuse-emulator/code/5104
Author: fredm
Date: 2014-12-29 13:04:11 +0000 (Mon, 29 Dec 2014)
Log Message:
-----------
Guard against passing a NULL pointer to memcpy in write_if1_chunk() (thanks,
clang static analyser).
Modified Paths:
--------------
trunk/libspectrum/hacking/ChangeLog
trunk/libspectrum/szx.c
Modified: trunk/libspectrum/hacking/ChangeLog
===================================================================
--- trunk/libspectrum/hacking/ChangeLog 2014-12-29 12:40:38 UTC (rev 5103)
+++ trunk/libspectrum/hacking/ChangeLog 2014-12-29 13:04:11 UTC (rev 5104)
@@ -962,3 +962,5 @@
20140504 tape.c: ensure that we have an edge at the end of a tape to ensure that
the last pulse is terminated - fixes loading of Moon Cresta (thanks,
Lee Tonks) (Fred).
+20141230 szx.c: guard against passing a NULL pointer to memcpy in
+ write_if1_chunk() (thanks, clang static analyser) (Fred).
Modified: trunk/libspectrum/szx.c
===================================================================
--- trunk/libspectrum/szx.c 2014-12-29 12:40:38 UTC (rev 5103)
+++ trunk/libspectrum/szx.c 2014-12-29 13:04:11 UTC (rev 5104)
@@ -3284,6 +3284,15 @@
return LIBSPECTRUM_ERROR_LOGIC;
}
rom_data = libspectrum_snap_interface1_rom( snap, 0 );
+ if( rom_data == NULL ) {
+ libspectrum_print_error( LIBSPECTRUM_ERROR_LOGIC,
+ "Interface 1 custom ROM specified to be %lu "
+ "bytes but NULL pointer provided",
+ (unsigned long)
+ libspectrum_snap_interface1_rom_length(
+ snap, 0 ) );
+ return LIBSPECTRUM_ERROR_LOGIC;
+ }
uncompressed_rom_length = disk_rom_length =
libspectrum_snap_interface1_rom_length( snap, 0 );
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X