[fuse-emulator-cvs] SF.net SVN: fuse-emulator:[3871] trunk/libspectrum

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

Revision: 3871
          http://fuse-emulator.svn.sourceforge.net/fuse-emulator/?rev=3871&view=rev
Author:   pak21
Date:     2008-12-03 22:33:41 +0000 (Wed, 03 Dec 2008)

Log Message:
-----------
Merge libspectrum_0_5_0-branch changes onto trunk.

Modified Paths:
--------------
    trunk/libspectrum/ChangeLog
    trunk/libspectrum/Makefile.am
    trunk/libspectrum/README
    trunk/libspectrum/configure.in
    trunk/libspectrum/doc/libspectrum.3
    trunk/libspectrum/doc/libspectrum.txt
    trunk/libspectrum/hacking/ChangeLog

Property Changed:
----------------
    trunk/libspectrum/


Property changes on: trunk/libspectrum
___________________________________________________________________
Added: svn:mergeinfo
   + /branches/libspectrum_0_5_0-branch:3809-3870

Modified: trunk/libspectrum/ChangeLog
===================================================================

--- trunk/libspectrum/ChangeLog	2008-12-03 19:39:25 UTC (rev 3870)
+++ trunk/libspectrum/ChangeLog	2008-12-03 22:33:41 UTC (rev 3871)
@@ -42,6 +42,8 @@
 
 	* Remove deprecated functions (Fredrick Meunier).
 
+	* Tweak timings for TS2068 (Fredrick Meunier; thanks Philip Kendall).
+
 2008-01-05  Philip Kendall  <phi...@sh...>
 
 	* libspectrum 0.4.0 released.

Modified: trunk/libspectrum/Makefile.am
===================================================================
--- trunk/libspectrum/Makefile.am	2008-12-03 19:39:25 UTC (rev 3870)
+++ trunk/libspectrum/Makefile.am	2008-12-03 22:33:41 UTC (rev 3871)
@@ -58,7 +58,7 @@
 			 zlib.c \
 			 zxs.c
 
-libspectrum_la_LDFLAGS = -version-info 6:0:1 -no-undefined
+libspectrum_la_LDFLAGS = -version-info 7:0:0 -no-undefined
 
 libspectrum_la_LIBADD = @AUDIOFILE_LIBS@ -lm
 

Modified: trunk/libspectrum/README
===================================================================
--- trunk/libspectrum/README	2008-12-03 19:39:25 UTC (rev 3870)
+++ trunk/libspectrum/README	2008-12-03 22:33:41 UTC (rev 3871)
@@ -1,4 +1,4 @@
-libspectrum 0.4.0
+libspectrum 0.5.0
 =================
 
 libspectrum is a library which is designed to make the input and
@@ -13,6 +13,8 @@
 * Tape images: .tzx, .tap, .spc, .sta and .ltp (read/write) and
   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).
 * Timex cartridges: .dck (read only).
 * IDE hard disk images: .hdf (read/write).
 * Microdrive cartridge images: .mdr (read/write).
@@ -50,6 +52,6 @@
 running 'configure' for the first time.
 
 Philip Kendall <phi...@sh...>
-5 January 2008
+3 December 2008
 
 $Id$

Modified: trunk/libspectrum/configure.in
===================================================================
--- trunk/libspectrum/configure.in	2008-12-03 19:39:25 UTC (rev 3870)
+++ trunk/libspectrum/configure.in	2008-12-03 22:33:41 UTC (rev 3871)
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-dnl Copyright (c) 1999-2004 Philip Kendall
+dnl Copyright (c) 1999-2008 Philip Kendall
 
 dnl $Id$
 
@@ -25,7 +25,7 @@
 AM_CONFIG_HEADER(config.h)
 
 dnl Use automake to produce `Makefile.in'
-AM_INIT_AUTOMAKE(libspectrum, 0.4.0)
+AM_INIT_AUTOMAKE(libspectrum, 0.5.0)
 
 dnl Checks for programs.
 AC_PROG_CC

Modified: trunk/libspectrum/doc/libspectrum.3
===================================================================
--- trunk/libspectrum/doc/libspectrum.3	2008-12-03 19:39:25 UTC (rev 3870)
+++ trunk/libspectrum/doc/libspectrum.3	2008-12-03 22:33:41 UTC (rev 3871)
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
 .\"
 .\" libspectrum.3: libspectrum summary
-.\" Copyright (c) 2004-2007 Philip Kendall
+.\" Copyright (c) 2004-2008 Philip Kendall
 .\"
 .\" This program is free software; you can redistribute it and/or modify
 .\" it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@
 .\" E-mail: phi...@sh...
 .\"
 .\"
-.TH libspectrum 3 "5th January, 2008" "Version 0.4.0" "Emulators"
+.TH libspectrum 3 "3rd December, 2008" "Version 0.5.0" "Emulators"
 .\"
 .\"------------------------------------------------------------------
 .\"
@@ -50,6 +50,9 @@
 .IP \(bu 2
 Input recordings: .rzx (read/write).
 .IP \(bu 2
+Disk images: .dsk (both plain and extended), .fdi, .sad, .scl, .td0, .trd
+and .udi (identification only).
+.IP \(bu 2
 Timex cartridges: .dck (read only).
 .IP \(bu 2
 IDE hard disk images: .hdf (read/write).

Modified: trunk/libspectrum/doc/libspectrum.txt
===================================================================
--- trunk/libspectrum/doc/libspectrum.txt	2008-12-03 19:39:25 UTC (rev 3870)
+++ trunk/libspectrum/doc/libspectrum.txt	2008-12-03 22:33:41 UTC (rev 3871)
@@ -1,4 +1,4 @@
-libspectrum 0.4.0
+libspectrum 0.5.0
 =================
 
 libspectrum is a fairly simple library designed to make the handling
@@ -213,6 +213,12 @@
 LIBSPECTRUM_MACHINE_CAPABILITY_NTSC
   This machine has an NTSC video output.
 
+LIBSPECTRUM_MACHINE_CAPABILITY_PENT1024_MEMORY
+  This machine has 1024K of memory accessible as on the Pentagon 1024.
+
+LIBSPECTRUM_MACHINE_CAPABILITY_PENT512_MEMORY
+  This machine has 512K of memory accessible as on the Pentagon 512.
+
 LIBSPECTRUM_MACHINE_CAPABILITY_PLUS3_MEMORY
   This machine can change into all-RAM configurations as the +2A/+3.
 
@@ -1254,11 +1260,11 @@
 automatically and transparently decompressed.
 
 libspectrum_error
-libspectrum_rzx_write2( libspectrum_byte **buffer, size_t *length,
-			libspectrum_rzx *rzx,
-		        libspectrum_byte *snap, libspectrum_id_t snap_format,
-			libspectrum_creator *creator,
-		        int compress, libspectrum_rzx_dsa_key *key )
+libspectrum_rzx_write( libspectrum_byte **buffer, size_t *length,
+		       libspectrum_rzx *rzx,
+		       libspectrum_byte *snap, libspectrum_id_t snap_format,
+		       libspectrum_creator *creator,
+		       int compress, libspectrum_rzx_dsa_key *key )
 
 Given input recording data in `rzx' and a snapshot in `snap', create a
 .rzx file in `*buffer'. If no embedded snapshot is required, set

Modified: trunk/libspectrum/hacking/ChangeLog
===================================================================
--- trunk/libspectrum/hacking/ChangeLog	2008-12-03 19:39:25 UTC (rev 3870)
+++ trunk/libspectrum/hacking/ChangeLog	2008-12-03 22:33:41 UTC (rev 3871)
@@ -696,9 +696,19 @@
 	 identification of more disk images (part of patch #2233744)
 	 (Gergely Szasz).
 20081109 doc/cvs-tags: document 0.5.0 branch tag.
+20081110 doc/libspectrum.txt: minor documentation updates
+         (libspectrum_0_5_0-branch).
+20081117 configure.in: bump version number for 0.5.0-pre1 release
+	 (libspectrum_0_5_0-branch).
 20081118 test/Makefile.am: distribute empty.z80 and writeprotected.mdr test
          data files (Fred).
 20081118 configure.in: set glib status off if we can't find it (thanks, Chris
          Young) (Fred).
 20081129 timings.c: correct first contended tstate for TS2068 based on updated
          fusetest from Phil (Fred).
+20081129 configure.in,doc/libspectrum.{3,txt},hacking/ChangeLog,Makefile.am,
+	 README: final tweaks for 0.5.0 release (libspectrum_0_5_0-branch).
+20081130 ChangeLog: add reference to TS2068 timing update
+         (libspectrum_0_5_0-branch) (Fred).
+20081203 ChangeLog,Makefile.am,README,doc/libspectrum.{3,txt},hacking/ChangeLog,
+	 configure.in: merge libspectrum_0_5_0-branch changes onto trunk.


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


