[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx:[589] branches/Release-0_10_0-branch
Brought to you by:
fredm
Menu
▾
▴
[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx:[589] branches/Release-0_10_0-branch
|
From: <fr...@us...> - 2009-01-15 13:01:48
|
Revision: 589
http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=589&view=rev
Author: fredm
Date: 2009-01-15 11:54:04 +0000 (Thu, 15 Jan 2009)
Log Message:
-----------
Merge in vendor 0.10.0.2 changes.
Modified Paths:
--------------
branches/Release-0_10_0-branch/fuse/ChangeLog
branches/Release-0_10_0-branch/fuse/README
branches/Release-0_10_0-branch/fuse/disk/disk.c
branches/Release-0_10_0-branch/fuse/disk/fdd.c
branches/Release-0_10_0-branch/fuse/disk/plusd.c
branches/Release-0_10_0-branch/fuse/event.c
branches/Release-0_10_0-branch/fuse/event.h
branches/Release-0_10_0-branch/fuse/fuse.c
branches/Release-0_10_0-branch/fuse/fusepb/Info-Fuse.plist
branches/Release-0_10_0-branch/fuse/fusepb/config.h
branches/Release-0_10_0-branch/fuse/fusepb/resources/Fuse Help/html/changelog.html
branches/Release-0_10_0-branch/fuse/hacking/ChangeLog
branches/Release-0_10_0-branch/fuse/hacking/cvs-tags
branches/Release-0_10_0-branch/fuse/loader.c
branches/Release-0_10_0-branch/fuse/man/fuse.1
branches/Release-0_10_0-branch/fuse/ui/widget/options-header.pl
branches/Release-0_10_0-branch/fuse/ui/widget/query.c
branches/Release-0_10_0-branch/libspectrum/config.h
branches/Release-0_10_0-branch/libspectrum/libspectrum/ChangeLog
branches/Release-0_10_0-branch/libspectrum/libspectrum/README
branches/Release-0_10_0-branch/libspectrum/libspectrum/configure.in
branches/Release-0_10_0-branch/libspectrum/libspectrum/doc/libspectrum.3
branches/Release-0_10_0-branch/libspectrum/libspectrum/hacking/ChangeLog
branches/Release-0_10_0-branch/libspectrum/libspectrum/libspectrum.c
branches/Release-0_10_0-branch/libspectrum/libspectrum/tap.c
Modified: branches/Release-0_10_0-branch/fuse/ChangeLog
===================================================================
--- branches/Release-0_10_0-branch/fuse/ChangeLog 2009-01-09 23:23:40 UTC (rev 588)
+++ branches/Release-0_10_0-branch/fuse/ChangeLog 2009-01-15 11:54:04 UTC (rev 589)
@@ -1,3 +1,23 @@
+2009-01-14 Philip Kendall <phi...@sh...>
+
+ * Fuse 0.10.0.2 released
+
+ * Make loader acceleration work on all compilers (Philip Kendall;
+ thanks, Carlos Almeida, Alberto Garcia and Alexander Yurchenko).
+
+ * Make the "Don't Save" option in the widget UI do the right thing
+ (Frederick Meunier).
+
+ * Allow both +3 disk drives to be used at once (Gergely Szasz).
+
+ * Allow both +D disk drives to be used at once (Gergely Szasz).
+
+ * Make .dsk code handle missing newline on "Track-Info" header
+ (Gergely Szasz; thanks, Simon Owen).
+
+ * Remove unnecessary 'use' directive when building widget options
+ header file; fixes some build issues (Frederick Meunier)
+
2008-12-10 Philip Kendall <phi...@sh...>
* Fuse 0.10.0.1 released
@@ -941,4 +961,4 @@
* Version 0.1.0 released.
-$Id: ChangeLog 3823 2008-11-16 17:32:18Z pak21 $
+$Id: ChangeLog 3957 2009-01-14 19:52:20Z pak21 $
Modified: branches/Release-0_10_0-branch/fuse/README
===================================================================
--- branches/Release-0_10_0-branch/fuse/README 2009-01-09 23:23:40 UTC (rev 588)
+++ branches/Release-0_10_0-branch/fuse/README 2009-01-15 11:54:04 UTC (rev 589)
@@ -1,4 +1,4 @@
-The Free Unix Spectrum Emulator (Fuse) 0.10.0.1
+The Free Unix Spectrum Emulator (Fuse) 0.10.0.2
===============================================
Fuse (the Free Unix Spectrum Emulator) was originally, and somewhat
@@ -150,6 +150,6 @@
( http://www.worldofspectrum.org/faq/index.html ) first!
Philip Kendall <phi...@sh...>
-10 December 2008
+14 January 2009
-$Id: README 3866 2008-11-29 17:05:40Z pak21 $
+$Id: README 3957 2009-01-14 19:52:20Z pak21 $
Modified: branches/Release-0_10_0-branch/fuse/disk/disk.c
===================================================================
--- branches/Release-0_10_0-branch/fuse/disk/disk.c 2009-01-09 23:23:40 UTC (rev 588)
+++ branches/Release-0_10_0-branch/fuse/disk/disk.c 2009-01-15 11:54:04 UTC (rev 589)
@@ -1,7 +1,7 @@
/* disk.c: Routines for handling disk images
Copyright (c) 2007 Gergely Szasz
- $Id: disk.c 3858 2008-11-29 11:15:22Z fredm $
+ $Id: disk.c 3942 2009-01-10 14:18:46Z pak21 $
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
@@ -993,7 +993,7 @@
break;
}
if( buffavail( buffer ) < 256 ||
- memcmp( buff, "Track-Info\r\n", 12 ) ) /* check track header */
+ memcmp( buff, "Track-Info", 10 ) ) /* check track header */
return d->status = DISK_OPEN;
gap = (unsigned char)buff[0x16] == 0xff ? GAP_MINIMAL_FM :
Modified: branches/Release-0_10_0-branch/fuse/disk/fdd.c
===================================================================
--- branches/Release-0_10_0-branch/fuse/disk/fdd.c 2009-01-09 23:23:40 UTC (rev 588)
+++ branches/Release-0_10_0-branch/fuse/disk/fdd.c 2009-01-15 11:54:04 UTC (rev 589)
@@ -1,7 +1,7 @@
/* fdd.c: Routines for emulating floppy disk drives
Copyright (c) 2007 Gergely Szasz
- $Id: fdd.c 3802 2008-11-02 17:06:41Z pak21 $
+ $Id: fdd.c 3942 2009-01-10 14:18:46Z pak21 $
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
@@ -135,7 +135,7 @@
d->fdd_heads = heads;
d->fdd_cylinders = cyls;
- return d->status = DISK_OK;
+ return d->status = FDD_OK;
}
void
@@ -159,7 +159,7 @@
Note: Pre-ready is the state that at least one INDEX
pulse has been detected after item iii) is satisfied
*/
- event_remove_type( motor_event ); /* remove pending motor-on event */
+ event_remove_type_user_data( motor_event, d ); /* remove pending motor-on event for *this* drive */
if( on ) {
event_add_with_data( tstates + 4 * /* 2 revolution: 2 * 200 / 1000 */
machine_current->timings.processor_speed / 10,
@@ -222,7 +222,7 @@
fdd_head_load( d, 1 );
fdd_set_data( d, FDD_LOAD_FACT );
- return d->status = DISK_OK;
+ return d->status = FDD_OK;
}
void
Modified: branches/Release-0_10_0-branch/fuse/disk/plusd.c
===================================================================
--- branches/Release-0_10_0-branch/fuse/disk/plusd.c 2009-01-09 23:23:40 UTC (rev 588)
+++ branches/Release-0_10_0-branch/fuse/disk/plusd.c 2009-01-15 11:54:04 UTC (rev 589)
@@ -2,7 +2,7 @@
Copyright (c) 1999-2007 Stuart Brady, Fredrick Meunier, Philip Kendall,
Dmitry Sanarin, Darren Salt
- $Id: plusd.c 3681 2008-06-16 09:40:29Z pak21 $
+ $Id: plusd.c 3942 2009-01-10 14:18:46Z pak21 $
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
@@ -306,8 +306,15 @@
}
fdd_select( &plusd_drives[ (!drive) ].fdd, 0 );
fdd_select( &plusd_drives[ drive ].fdd, 1 );
- plusd_fdc->current_drive = &plusd_drives[ drive ];
+ if( plusd_fdc->current_drive != &plusd_drives[ drive ] ) {
+ if( plusd_fdc->current_drive->fdd.motoron ) { /* swap motoron */
+ fdd_motoron( &plusd_drives[ (!drive) ].fdd, 0 );
+ fdd_motoron( &plusd_drives[ drive ].fdd, 1 );
+ }
+ plusd_fdc->current_drive = &plusd_drives[ drive ];
+ }
+
printer_parallel_strobe_write( b & 0x40 );
}
Modified: branches/Release-0_10_0-branch/fuse/event.c
===================================================================
--- branches/Release-0_10_0-branch/fuse/event.c 2009-01-09 23:23:40 UTC (rev 588)
+++ branches/Release-0_10_0-branch/fuse/event.c 2009-01-15 11:54:04 UTC (rev 589)
@@ -1,7 +1,7 @@
/* event.c: Routines needed for dealing with the event list
Copyright (c) 2000-2008 Philip Kendall
- $Id: event.c 3682 2008-06-19 05:43:54Z pak21 $
+ $Id: event.c 3942 2009-01-10 14:18:46Z pak21 $
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
@@ -58,6 +58,11 @@
char *description;
} event_descriptor_t;
+typedef struct event_typeuser_t {
+ int type;
+ gpointer data;
+} event_typeuser_t;
+
static GArray *registered_events;
int
@@ -213,6 +218,16 @@
if( ptr->type == *type ) ptr->type = event_type_null;
}
+static void
+set_event_null_2( gpointer data, gpointer user_data )
+{
+ event_t *ptr = data;
+ event_typeuser_t *e = user_data;
+
+ if( ptr->type == e->type && ptr->user_data == e->data )
+ ptr->type = event_type_null;
+}
+
/* Remove all events of a specific type from the stack */
int
event_remove_type( int type )
@@ -221,6 +236,18 @@
return 0;
}
+/* Remove all events of a specific type and user data from the stack */
+int
+event_remove_type_user_data( int type, gpointer user_data )
+{
+ event_typeuser_t e;
+
+ e.type = type;
+ e.data = user_data;
+ g_slist_foreach( event_list, set_event_null_2, &e );
+ return 0;
+}
+
/* Free the memory used by a specific entry */
static void
event_free_entry( gpointer data, gpointer user_data GCC_UNUSED )
Modified: branches/Release-0_10_0-branch/fuse/event.h
===================================================================
--- branches/Release-0_10_0-branch/fuse/event.h 2009-01-09 23:23:40 UTC (rev 588)
+++ branches/Release-0_10_0-branch/fuse/event.h 2009-01-15 11:54:04 UTC (rev 589)
@@ -1,7 +1,7 @@
/* event.h: Routines needed for dealing with the event list
Copyright (c) 2000-2004 Philip Kendall
- $Id: event.h 3681 2008-06-16 09:40:29Z pak21 $
+ $Id: event.h 3942 2009-01-10 14:18:46Z pak21 $
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
@@ -82,6 +82,9 @@
/* Remove all events of a specific type from the stack */
int event_remove_type( int type );
+/* Remove all events of a specific type and user data from the stack */
+int event_remove_type_user_data( int type, gpointer user_data );
+
/* Clear the event stack */
int event_reset(void);
Modified: branches/Release-0_10_0-branch/fuse/fuse.c
===================================================================
--- branches/Release-0_10_0-branch/fuse/fuse.c 2009-01-09 23:23:40 UTC (rev 588)
+++ branches/Release-0_10_0-branch/fuse/fuse.c 2009-01-15 11:54:04 UTC (rev 589)
@@ -364,7 +364,7 @@
printf( "\n" );
fuse_show_version();
printf(
- "Copyright (c) 1999-2008 Philip Kendall and others; see the file\n"
+ "Copyright (c) 1999-2009 Philip Kendall and others; see the file\n"
"'AUTHORS' for more details.\n"
"\n"
"For help, please mail <fus...@li...> or use\n"
Modified: branches/Release-0_10_0-branch/fuse/fusepb/Info-Fuse.plist
===================================================================
--- branches/Release-0_10_0-branch/fuse/fusepb/Info-Fuse.plist 2009-01-09 23:23:40 UTC (rev 588)
+++ branches/Release-0_10_0-branch/fuse/fusepb/Info-Fuse.plist 2009-01-15 11:54:04 UTC (rev 589)
@@ -480,7 +480,7 @@
<key>CFBundleSignature</key>
<string>FUSE</string>
<key>CFBundleVersion</key>
- <string>0.10.0.1</string>
+ <string>0.10.0.2</string>
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSPrincipalClass</key>
Modified: branches/Release-0_10_0-branch/fuse/fusepb/config.h
===================================================================
--- branches/Release-0_10_0-branch/fuse/fusepb/config.h 2009-01-09 23:23:40 UTC (rev 588)
+++ branches/Release-0_10_0-branch/fuse/fusepb/config.h 2009-01-15 11:54:04 UTC (rev 589)
@@ -152,7 +152,7 @@
/* #undef USE_WIDGET */
/* Version number of package */
-#define VERSION "0.10.0.1"
+#define VERSION "0.10.0.2"
/* Define to 1 if your processor stores words with the most significant byte
first (like Motorola and SPARC, unlike Intel and VAX). */
Modified: branches/Release-0_10_0-branch/fuse/fusepb/resources/Fuse Help/html/changelog.html
===================================================================
--- branches/Release-0_10_0-branch/fuse/fusepb/resources/Fuse Help/html/changelog.html 2009-01-09 23:23:40 UTC (rev 588)
+++ branches/Release-0_10_0-branch/fuse/fusepb/resources/Fuse Help/html/changelog.html 2009-01-15 11:54:04 UTC (rev 589)
@@ -18,17 +18,25 @@
<ul>
<li><font face="Lucida Grande,Helvetica,Arial">Miscellaneous bugfixes:</font></li>
<ul>
+ <li><font face="Lucida Grande,Helvetica,Arial">Allow both +3 disk
+drives to be used at once (Gergely Szasz).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Allow both +D disk
+drives to be used at once (Gergely Szasz).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Make .dsk code
+handle missing newline on "Track-Info" header
+(Gergely Szasz; thanks, Simon Owen).<br>
+ </font></li>
<li><font face="Lucida Grande,Helvetica,Arial">Fix running with
sound off and with non-default speed (Fredrick Meunier; thanks, Andrew
Owen).</font></li>
<li><font face="Lucida Grande,Helvetica,Arial">Fix colours in
minimised toolbar icon on GMA950 card (Roine Gustafsson).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Stop displayLink
+ <li><font face="Lucida Grande,Helvetica,Arial">Stop DisplayLink
when quitting from emulator before stopping emulator thread (Fredrick
Meunier).</font></li>
<li><font face="Lucida Grande,Helvetica,Arial">Decouple texture
-updating and drawing and only update texture when there are<br>
-changes (Roine Gustafsson).</font></li>
+updating and drawing and only update texture when there are changes
+(Roine Gustafsson).</font></li>
<li><font face="Lucida Grande,Helvetica,Arial">Update the statusbar
if nothing has changed on the Speccy screen (Fredrick Meunier).<br>
</font></li>
Modified: branches/Release-0_10_0-branch/fuse/hacking/ChangeLog
===================================================================
--- branches/Release-0_10_0-branch/fuse/hacking/ChangeLog 2009-01-09 23:23:40 UTC (rev 588)
+++ branches/Release-0_10_0-branch/fuse/hacking/ChangeLog 2009-01-15 11:54:04 UTC (rev 589)
@@ -2959,3 +2959,17 @@
O_TRUNC to ensure that any old data is cleared out. Also fix a
dependency problem (thanks, Matthew Westcott).
20081210 ChangeLog,configure.in,man/fuse.1,README: update for 0.10.0.1 release.
+20090110 Merge changes from trunk:
+ * disk/disk.c: relax "Track-Info" check (Gergely Szasz; thanks, Simon
+ Owen).
+ * ui/widget/options-header.pl: remove unnecessary use directive (Fred).
+ * event.[ch],disk/fdd.c: fix issue with FDD motor events preventing
+ both +3 disk drives from being used (bug #2424700) (Gergely Szasz).
+ * ui/widget/query.c: make "Don't Save" return the correct enum (Fred).
+ * disk/plusd.c: support +D switching between the two drives when the
+ motor on signal is 'ON' as when copying between drives (fixes bug
+ #2465540) (Gergely Szasz).
+ * fuse.c: update copyright date.
+ * loader.c: don't call readbyte_internal macro with an argument that
+ has side effects (fixes accelerated loaders with gcc 3.x; thanks,
+ Carlos Almeida, Alberto Garcia and Alexander Yurchenko).
Modified: branches/Release-0_10_0-branch/fuse/hacking/cvs-tags
===================================================================
--- branches/Release-0_10_0-branch/fuse/hacking/cvs-tags 2009-01-09 23:23:40 UTC (rev 588)
+++ branches/Release-0_10_0-branch/fuse/hacking/cvs-tags 2009-01-15 11:54:04 UTC (rev 589)
@@ -1,6 +1,6 @@
CVS tags for Fuse
-$Id: cvs-tags 3812 2008-11-09 11:43:44Z pak21 $
+$Id: cvs-tags 3897 2008-12-10 18:42:11Z pak21 $
| Release-0_3_1
| Release-0_3_2pre1
Modified: branches/Release-0_10_0-branch/fuse/loader.c
===================================================================
--- branches/Release-0_10_0-branch/fuse/loader.c 2009-01-09 23:23:40 UTC (rev 588)
+++ branches/Release-0_10_0-branch/fuse/loader.c 2009-01-15 11:54:04 UTC (rev 589)
@@ -1,7 +1,7 @@
/* loader.c: loader detection
Copyright (c) 2006 Philip Kendall
- $Id: loader.c 3681 2008-06-16 09:40:29Z pak21 $
+ $Id: loader.c 3942 2009-01-10 14:18:46Z pak21 $
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
@@ -82,8 +82,8 @@
z80.bc.b.h = 0x00;
}
z80.af.b.l |= 0x01;
- z80.pc.b.l = readbyte_internal( z80.sp.w++ );
- z80.pc.b.h = readbyte_internal( z80.sp.w++ );
+ z80.pc.b.l = readbyte_internal( z80.sp.w ); z80.sp.w++;
+ z80.pc.b.h = readbyte_internal( z80.sp.w ); z80.sp.w++;
event_remove_type( tape_edge_event );
tape_next_edge( tstates, 0, NULL );
Modified: branches/Release-0_10_0-branch/fuse/man/fuse.1
===================================================================
--- branches/Release-0_10_0-branch/fuse/man/fuse.1 2009-01-09 23:23:40 UTC (rev 588)
+++ branches/Release-0_10_0-branch/fuse/man/fuse.1 2009-01-15 11:54:04 UTC (rev 589)
@@ -23,7 +23,7 @@
.\" E-mail: phi...@sh...
.\"
.\"
-.TH fuse 1 "10th December, 2008" "Version 0.10.0.1" "Emulators"
+.TH fuse 1 "14th January, 2009" "Version 0.10.0.2" "Emulators"
.\"
.\"------------------------------------------------------------------
.\"
Modified: branches/Release-0_10_0-branch/fuse/ui/widget/options-header.pl
===================================================================
--- branches/Release-0_10_0-branch/fuse/ui/widget/options-header.pl 2009-01-09 23:23:40 UTC (rev 588)
+++ branches/Release-0_10_0-branch/fuse/ui/widget/options-header.pl 2009-01-15 11:54:04 UTC (rev 589)
@@ -3,7 +3,7 @@
# options-header.pl: generate options dialog boxes
# Copyright (c) 2001-2002,2004 Philip Kendall
-# $Id: options-header.pl 2889 2007-05-26 17:45:08Z zubzero $
+# $Id: options-header.pl 3942 2009-01-10 14:18:46Z pak21 $
# 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
@@ -25,8 +25,6 @@
use strict;
-use lib '../perl';
-
use Fuse;
use Fuse::Dialog;
Modified: branches/Release-0_10_0-branch/fuse/ui/widget/query.c
===================================================================
--- branches/Release-0_10_0-branch/fuse/ui/widget/query.c 2009-01-09 23:23:40 UTC (rev 588)
+++ branches/Release-0_10_0-branch/fuse/ui/widget/query.c 2009-01-15 11:54:04 UTC (rev 589)
@@ -1,7 +1,7 @@
/* query.c: The query widgets
Copyright (c) 2004-2008 Darren Salt, Fredrick Meunier
- $Id: query.c 3749 2008-08-15 12:47:44Z fredm $
+ $Id: query.c 3942 2009-01-10 14:18:46Z pak21 $
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
@@ -81,7 +81,7 @@
static void
widget_dont_save_click( void )
{
- widget_query.save = UI_CONFIRM_SAVE_CANCEL;
+ widget_query.save = UI_CONFIRM_SAVE_DONTSAVE;
}
static void
Modified: branches/Release-0_10_0-branch/libspectrum/config.h
===================================================================
--- branches/Release-0_10_0-branch/libspectrum/config.h 2009-01-09 23:23:40 UTC (rev 588)
+++ branches/Release-0_10_0-branch/libspectrum/config.h 2009-01-15 11:54:04 UTC (rev 589)
@@ -86,7 +86,7 @@
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "0.5.0"
+#define VERSION "0.5.0.1"
/* Define to 1 if your processor stores words with the most significant byte
first (like Motorola and SPARC, unlike Intel and VAX). */
Modified: branches/Release-0_10_0-branch/libspectrum/libspectrum/ChangeLog
===================================================================
--- branches/Release-0_10_0-branch/libspectrum/libspectrum/ChangeLog 2009-01-09 23:23:40 UTC (rev 588)
+++ branches/Release-0_10_0-branch/libspectrum/libspectrum/ChangeLog 2009-01-15 11:54:04 UTC (rev 589)
@@ -1,5 +1,13 @@
-2008-11-?? Philip Kendall <phi...@sh...>
+2009-01-14 Philip Kendall <phi...@sh...>
+ * libspectrum 0.5.0.1 released
+
+ * Loosen signature checks for .dsk files to allow files not strictly
+ compliant with the specification to work (Gergely Szasz; thanks,
+ zx81 and Simon Owen).
+
+2008-12-03 Philip Kendall <phi...@sh...>
+
* libspectrum 0.5.0 released.
* Memory management change: memory allocation functions now abort
@@ -271,5 +279,5 @@
* libspectrum separated from Fuse just before the 0.5.0 release of
Fuse; see Fuse's ChangeLog for changes up to this point
-$Id: ChangeLog 3867 2008-11-29 23:43:28Z fredm $
+$Id: ChangeLog 3956 2009-01-14 19:50:48Z pak21 $
Modified: branches/Release-0_10_0-branch/libspectrum/libspectrum/README
===================================================================
--- branches/Release-0_10_0-branch/libspectrum/libspectrum/README 2009-01-09 23:23:40 UTC (rev 588)
+++ branches/Release-0_10_0-branch/libspectrum/libspectrum/README 2009-01-15 11:54:04 UTC (rev 589)
@@ -1,5 +1,5 @@
-libspectrum 0.5.0
-=================
+libspectrum 0.5.0.1
+===================
libspectrum is a library which is designed to make the input and
output of ZX Spectrum emulator files slightly easier than it would be
@@ -52,6 +52,6 @@
running 'configure' for the first time.
Philip Kendall <phi...@sh...>
-3 December 2008
+14 January 2008
-$Id: README 3864 2008-11-29 16:45:36Z pak21 $
+$Id: README 3956 2009-01-14 19:50:48Z pak21 $
Modified: branches/Release-0_10_0-branch/libspectrum/libspectrum/configure.in
===================================================================
--- branches/Release-0_10_0-branch/libspectrum/libspectrum/configure.in 2009-01-09 23:23:40 UTC (rev 588)
+++ branches/Release-0_10_0-branch/libspectrum/libspectrum/configure.in 2009-01-15 11:54:04 UTC (rev 589)
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
dnl Copyright (c) 1999-2008 Philip Kendall
-dnl $Id: configure.in 3864 2008-11-29 16:45:36Z pak21 $
+dnl $Id: configure.in 3956 2009-01-14 19:50:48Z pak21 $
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@
AM_CONFIG_HEADER(config.h)
dnl Use automake to produce `Makefile.in'
-AM_INIT_AUTOMAKE(libspectrum, 0.5.0)
+AM_INIT_AUTOMAKE(libspectrum, 0.5.0.1)
dnl Checks for programs.
AC_PROG_CC
Modified: branches/Release-0_10_0-branch/libspectrum/libspectrum/doc/libspectrum.3
===================================================================
--- branches/Release-0_10_0-branch/libspectrum/libspectrum/doc/libspectrum.3 2009-01-09 23:23:40 UTC (rev 588)
+++ branches/Release-0_10_0-branch/libspectrum/libspectrum/doc/libspectrum.3 2009-01-15 11:54:04 UTC (rev 589)
@@ -1,7 +1,7 @@
.\" -*- nroff -*-
.\"
.\" libspectrum.3: libspectrum summary
-.\" Copyright (c) 2004-2008 Philip Kendall
+.\" Copyright (c) 2004-2009 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 "3rd December, 2008" "Version 0.5.0" "Emulators"
+.TH libspectrum 3 "14th January, 2009" "Version 0.5.0.1" "Emulators"
.\"
.\"------------------------------------------------------------------
.\"
Modified: branches/Release-0_10_0-branch/libspectrum/libspectrum/hacking/ChangeLog
===================================================================
--- branches/Release-0_10_0-branch/libspectrum/libspectrum/hacking/ChangeLog 2009-01-09 23:23:40 UTC (rev 588)
+++ branches/Release-0_10_0-branch/libspectrum/libspectrum/hacking/ChangeLog 2009-01-15 11:54:04 UTC (rev 589)
@@ -710,3 +710,6 @@
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).
+20090110 Merge fix from trunk:
+ * libspectrum.c: loosen signature checks for .dsk files (Gergely;
+ thanks, zx81 and Simon Owen).
Modified: branches/Release-0_10_0-branch/libspectrum/libspectrum/libspectrum.c
===================================================================
--- branches/Release-0_10_0-branch/libspectrum/libspectrum/libspectrum.c 2009-01-09 23:23:40 UTC (rev 588)
+++ branches/Release-0_10_0-branch/libspectrum/libspectrum/libspectrum.c 2009-01-15 11:54:04 UTC (rev 589)
@@ -1,7 +1,7 @@
/* libspectrum.c: Some general routines
Copyright (c) 2001-2004 Philip Kendall, Darren Salt, Fredrick Meunier
- $Id: libspectrum.c 3806 2008-11-08 10:42:38Z pak21 $
+ $Id: libspectrum.c 3943 2009-01-10 14:24:56Z pak21 $
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
@@ -540,8 +540,8 @@
{ LIBSPECTRUM_ID_DISK_IMG, "img", 3, NULL, 0, 0, 0 },
{ LIBSPECTRUM_ID_DISK_UDI, "udi", 3, "UDI!", 0, 4, 4 },
- { LIBSPECTRUM_ID_DISK_ECPC, "dsk", 3, "EXTENDED CPC DSK File\r\nDisk-Info\r\n", 0, 34, 4 },
- { LIBSPECTRUM_ID_DISK_CPC, "dsk", 3, "MV - CPCEMU Disk-File\r\nDisk-Info\r\n", 0, 34, 4 },
+ { LIBSPECTRUM_ID_DISK_ECPC, "dsk", 3, "EXTENDED", 0, 8, 4 },
+ { LIBSPECTRUM_ID_DISK_CPC, "dsk", 3, "MV - CPC", 0, 8, 4 },
{ LIBSPECTRUM_ID_DISK_FDI, "fdi", 3, "FDI", 0, 3, 4 },
{ LIBSPECTRUM_ID_DISK_SAD, "sad", 3, "Aley's disk backup", 0, 18, 4 },
{ LIBSPECTRUM_ID_DISK_TD0, "td0", 3, "TD", 0, 2, 4 },
Modified: branches/Release-0_10_0-branch/libspectrum/libspectrum/tap.c
===================================================================
--- branches/Release-0_10_0-branch/libspectrum/libspectrum/tap.c 2009-01-09 23:23:40 UTC (rev 588)
+++ branches/Release-0_10_0-branch/libspectrum/libspectrum/tap.c 2009-01-15 11:54:04 UTC (rev 589)
@@ -1,4 +1,4 @@
-/* tape.c: Routines for handling .tap files
+/* tap.c: Routines for handling .tap files
Copyright (c) 2001-2003 Philip Kendall
$Id: tap.c 3784 2008-10-22 12:36:07Z fredm $
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
