[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx:[667] vendor/fuse-emulator/current
Brought to you by:
fredm
Menu
▾
▴
[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx:[667] vendor/fuse-emulator/current
|
From: <fr...@us...> - 2011-04-02 12:18:59
|
Revision: 667
http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=667&view=rev
Author: fredm
Date: 2011-04-02 12:18:51 +0000 (Sat, 02 Apr 2011)
Log Message:
-----------
Load . into vendor/fuse-emulator/current.
Modified Paths:
--------------
vendor/fuse-emulator/current/fuse/ChangeLog
vendor/fuse-emulator/current/fuse/README
vendor/fuse-emulator/current/fuse/configure.in
vendor/fuse-emulator/current/fuse/debugger/breakpoint.c
vendor/fuse-emulator/current/fuse/fuse.c
vendor/fuse-emulator/current/fuse/hacking/ChangeLog
vendor/fuse-emulator/current/fuse/ide/divide.c
vendor/fuse-emulator/current/fuse/ide/divide.h
vendor/fuse-emulator/current/fuse/ide/ide.c
vendor/fuse-emulator/current/fuse/ide/ide.h
vendor/fuse-emulator/current/fuse/ide/simpleide.c
vendor/fuse-emulator/current/fuse/ide/simpleide.h
vendor/fuse-emulator/current/fuse/ide/zxatasp.c
vendor/fuse-emulator/current/fuse/ide/zxatasp.h
vendor/fuse-emulator/current/fuse/ide/zxcf.c
vendor/fuse-emulator/current/fuse/ide/zxcf.h
vendor/fuse-emulator/current/fuse/keysyms.pl
vendor/fuse-emulator/current/fuse/man/fuse.1
vendor/fuse-emulator/current/fuse/memory.c
vendor/fuse-emulator/current/fuse/roms/Makefile.am
vendor/fuse-emulator/current/fuse/ui/fb/fbdisplay.c
vendor/fuse-emulator/current/fuse/ui/widget/filesel.c
vendor/fuse-emulator/current/libspectrum/ChangeLog
vendor/fuse-emulator/current/libspectrum/Makefile.am
vendor/fuse-emulator/current/libspectrum/README
vendor/fuse-emulator/current/libspectrum/configure.in
vendor/fuse-emulator/current/libspectrum/doc/libspectrum.txt
vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog
vendor/fuse-emulator/current/libspectrum/test/Makefile.am
vendor/fuse-emulator/current/libspectrum/warajevo_read.c
Added Paths:
-----------
vendor/fuse-emulator/current/fuse/roms/README.copyright
Removed Paths:
-------------
vendor/fuse-emulator/current/fuse/roms/128p-0.rom
vendor/fuse-emulator/current/fuse/roms/128p-1.rom
vendor/fuse-emulator/current/fuse/roms/256s-0.rom
vendor/fuse-emulator/current/fuse/roms/256s-1.rom
vendor/fuse-emulator/current/fuse/roms/256s-2.rom
vendor/fuse-emulator/current/fuse/roms/256s-3.rom
vendor/fuse-emulator/current/fuse/roms/gluck.rom
vendor/fuse-emulator/current/fuse/roms/if1-1.rom
vendor/fuse-emulator/current/fuse/roms/if1-2.rom
vendor/fuse-emulator/current/fuse/roms/opus.rom
vendor/fuse-emulator/current/fuse/roms/trdos.rom
Modified: vendor/fuse-emulator/current/fuse/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse/ChangeLog 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/fuse/ChangeLog 2011-04-02 12:18:51 UTC (rev 667)
@@ -1,3 +1,19 @@
+2011-04-01 Philip Kendall <phi...@sh...>
+
+ * Fuse 1.0.0.1a released.
+
+ * Remove all ROMs for which there isn't explicit permission to
+ distribute (Philip Kendall).
+
+2011-01-12 Philip Kendall <phi...@sh...>
+
+ * Fuse 1.0.0.1 released.
+
+ * Fix temporary breakpoints on platforms using replacement Glib
+ (Fredrick Meunier, Sergio Baldovi; thanks, Chris Cowley)
+ * Ensure Amiga port can load files (Chris Young)
+ * Fix SVGAlib compilation (rkd77)
+
2010-12-16 Philip Kendall <phi...@sh...>
* Fuse 1.0.0 released.
@@ -1035,4 +1051,4 @@
* Version 0.1.0 released.
-$Id: ChangeLog 4220 2010-12-17 10:54:29Z fredm $
+$Id: ChangeLog 4331 2011-04-01 07:47:06Z pak21 $
Modified: vendor/fuse-emulator/current/fuse/README
===================================================================
--- vendor/fuse-emulator/current/fuse/README 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/fuse/README 2011-04-02 12:18:51 UTC (rev 667)
@@ -1,5 +1,5 @@
-The Free Unix Spectrum Emulator (Fuse) 1.0.0
-============================================
+The Free Unix Spectrum Emulator (Fuse) 1.0.0.1a
+===============================================
Fuse (the Free Unix Spectrum Emulator) was originally, and somewhat
unsurprisingly, an emulator of the ZX Spectrum (a popular 1980s home
@@ -214,6 +214,6 @@
<http://www.worldofspectrum.org/forums/>.
Philip Kendall <phi...@sh...>
-16 December 2010
+28 March 2011
-$Id: README 4220 2010-12-17 10:54:29Z fredm $
+$Id: README 4329 2011-03-27 22:26:07Z pak21 $
Modified: vendor/fuse-emulator/current/fuse/configure.in
===================================================================
--- vendor/fuse-emulator/current/fuse/configure.in 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/fuse/configure.in 2011-04-02 12:18:51 UTC (rev 667)
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-dnl $Id: configure.in 4220 2010-12-17 10:54:29Z fredm $
+dnl $Id: configure.in 4329 2011-03-27 22:26:07Z 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
@@ -23,7 +23,7 @@
AM_CONFIG_HEADER(config.h)
AC_CANONICAL_SYSTEM
-define(FUSE_VERSION, [1.0.0])
+define(FUSE_VERSION, [1.0.0.1a])
dnl Use automake to produce `Makefile.in'
AM_INIT_AUTOMAKE(fuse, FUSE_VERSION)
Modified: vendor/fuse-emulator/current/fuse/debugger/breakpoint.c
===================================================================
--- vendor/fuse-emulator/current/fuse/debugger/breakpoint.c 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/fuse/debugger/breakpoint.c 2011-04-02 12:18:51 UTC (rev 667)
@@ -1,7 +1,7 @@
/* breakpoint.c: a debugger breakpoint
Copyright (c) 2002-2008 Philip Kendall
- $Id: breakpoint.c 3685 2008-06-21 12:37:24Z pak21 $
+ $Id: breakpoint.c 4239 2011-01-01 15:41:13Z 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
@@ -237,19 +237,26 @@
debugger_check( debugger_breakpoint_type type, libspectrum_dword value )
{
GSList *ptr; debugger_breakpoint *bp;
+ GSList *ptr_next;
switch( debugger_mode ) {
case DEBUGGER_MODE_INACTIVE: return 0;
case DEBUGGER_MODE_ACTIVE:
- for( ptr = debugger_breakpoints; ptr; ptr = ptr->next ) {
+ for( ptr = debugger_breakpoints; ptr; ptr = ptr_next ) {
bp = ptr->data;
+ ptr_next = ptr->next;
if( breakpoint_check( bp, type, value ) ) {
- debugger_mode = DEBUGGER_MODE_HALTED;
- debugger_command_evaluate( bp->commands );
+ debugger_mode = DEBUGGER_MODE_HALTED;
+ debugger_command_evaluate( bp->commands );
+
+ if( bp->life == DEBUGGER_BREAKPOINT_LIFE_ONESHOT ) {
+ debugger_breakpoints = g_slist_remove( debugger_breakpoints, bp );
+ free( bp );
+ }
}
}
@@ -352,11 +359,6 @@
if( bp->condition && !debugger_expression_evaluate( bp->condition ) )
return 0;
- if( bp->life == DEBUGGER_BREAKPOINT_LIFE_ONESHOT ) {
- debugger_breakpoints = g_slist_remove( debugger_breakpoints, bp );
- free( bp );
- }
-
if( bp->type == DEBUGGER_BREAKPOINT_TYPE_TIME )
bp->value.time.triggered = 1;
Modified: vendor/fuse-emulator/current/fuse/fuse.c
===================================================================
--- vendor/fuse-emulator/current/fuse/fuse.c 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/fuse/fuse.c 2011-04-02 12:18:51 UTC (rev 667)
@@ -1,7 +1,7 @@
/* fuse.c: The Free Unix Spectrum Emulator
Copyright (c) 1999-2010 Philip Kendall and others
- $Id: fuse.c 4165 2010-09-30 21:55:05Z pak21 $
+ $Id: fuse.c 4329 2011-03-27 22:26:07Z 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
@@ -393,7 +393,7 @@
printf( "\n" );
fuse_show_version();
printf(
- "Copyright (c) 1999-2010 Philip Kendall and others; see the file\n"
+ "Copyright (c) 1999-2011 Philip Kendall and others; see the file\n"
"'AUTHORS' for more details.\n"
"\n"
"For help, please mail <fus...@li...> or use\n"
Modified: vendor/fuse-emulator/current/fuse/hacking/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse/hacking/ChangeLog 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/fuse/hacking/ChangeLog 2011-04-02 12:18:51 UTC (rev 667)
@@ -3372,3 +3372,22 @@
20101203 ui/fb/fbdisplay.c: improve fb colour handling and initialise scaler
system (fixes bugs #3124787 and #3124788) (rkd77).
20101216 ChangeLog,README,configure.in,man/fuse.1: update for 1.0.0 release.
+20101217 keysyms.pl: fix SVGAlib compilation (rkd77).
+20101229 debugger/breakpoint.c: don't free temporary breakpoint until after we have run
+ it (fixes bug #3084862) (thanks, Chris Cowley) (Fred).
+20101230 debugger/breakpoint.c: stop evaluating breakpoints when we have hit a
+ temporary breakpoint (really fixes bug #3084862) (patch #3142840)
+ (Sergio Baldovi).
+20110101 debugger/breakpoint.c: evaluate all breakpoints again, but store the
+ next breakpoint before deleteing the current one from the list
+ (really really fixes bug #3084862) (thanks, Phil) (Fred).
+20110109 ui/widget/filesel.c: make Amiga work again (Chris Young).
+20110112 ChangeLog,README,configure.in,man/fuse.1: updates for 1.0.0.1 release.
+20110327 man/fuse.1,roms/{128p-[01].rom,256s-[0123].rom,Makefile.am,
+ README.copyright,gluck.rom,if1-[12].rom,opus.rom,trdos.rom,
+ Makefile.am}: remove ROMs that there is no formal permission to
+ distribute.
+20110327 roms/Makefile.am: distribute README.copyright.
+20110327 ChangeLog,README,configure.in,fuse.c,man/fuse.1: updates for 1.0.0.1a
+ release.
+20110401 ChangeLog,man/fuse.1: didn't manage to release this earlier.
Modified: vendor/fuse-emulator/current/fuse/ide/divide.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ide/divide.c 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/fuse/ide/divide.c 2011-04-02 12:18:51 UTC (rev 667)
@@ -1,7 +1,7 @@
/* divide.c: DivIDE interface routines
Copyright (c) 2005-2008 Matthew Westcott, Philip Kendall
- $Id: divide.c 4220 2010-12-17 10:54:29Z fredm $
+ $Id: divide.c 4225 2010-12-17 20:14:40Z 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
Modified: vendor/fuse-emulator/current/fuse/ide/divide.h
===================================================================
--- vendor/fuse-emulator/current/fuse/ide/divide.h 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/fuse/ide/divide.h 2011-04-02 12:18:51 UTC (rev 667)
@@ -1,7 +1,7 @@
/* divide.h: DivIDE interface routines
Copyright (c) 2005 Matthew Westcott
- $Id: divide.h 4220 2010-12-17 10:54:29Z fredm $
+ $Id: divide.h 4225 2010-12-17 20:14:40Z 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
Modified: vendor/fuse-emulator/current/fuse/ide/ide.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ide/ide.c 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/fuse/ide/ide.c 2011-04-02 12:18:51 UTC (rev 667)
@@ -1,7 +1,7 @@
/* ide.c: Generic routines shared between the various IDE devices
Copyright (c) 2005 Philip Kendall
- $Id: ide.c 4220 2010-12-17 10:54:29Z fredm $
+ $Id: ide.c 4225 2010-12-17 20:14:40Z 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
Modified: vendor/fuse-emulator/current/fuse/ide/ide.h
===================================================================
--- vendor/fuse-emulator/current/fuse/ide/ide.h 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/fuse/ide/ide.h 2011-04-02 12:18:51 UTC (rev 667)
@@ -1,7 +1,7 @@
/* ide.h: Generic routines shared between the various IDE devices
Copyright (c) 2005 Philip Kendall
- $Id: ide.h 4220 2010-12-17 10:54:29Z fredm $
+ $Id: ide.h 4225 2010-12-17 20:14:40Z 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
Modified: vendor/fuse-emulator/current/fuse/ide/simpleide.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ide/simpleide.c 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/fuse/ide/simpleide.c 2011-04-02 12:18:51 UTC (rev 667)
@@ -3,7 +3,7 @@
2004 Philip Kendall,
2008 Fredrick Meunier
- $Id: simpleide.c 4220 2010-12-17 10:54:29Z fredm $
+ $Id: simpleide.c 4225 2010-12-17 20:14:40Z 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
Modified: vendor/fuse-emulator/current/fuse/ide/simpleide.h
===================================================================
--- vendor/fuse-emulator/current/fuse/ide/simpleide.h 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/fuse/ide/simpleide.h 2011-04-02 12:18:51 UTC (rev 667)
@@ -1,7 +1,7 @@
/* simpleide.h: Simple 8-bit IDE interface routines
Copyright (c) 2003-2004 Garry Lancaster
- $Id: simpleide.h 4220 2010-12-17 10:54:29Z fredm $
+ $Id: simpleide.h 4225 2010-12-17 20:14:40Z 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
Modified: vendor/fuse-emulator/current/fuse/ide/zxatasp.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ide/zxatasp.c 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/fuse/ide/zxatasp.c 2011-04-02 12:18:51 UTC (rev 667)
@@ -1,7 +1,7 @@
/* zxatasp.c: ZXATASP interface routines
Copyright (c) 2003-2008 Garry Lancaster and Philip Kendall
- $Id: zxatasp.c 4220 2010-12-17 10:54:29Z fredm $
+ $Id: zxatasp.c 4225 2010-12-17 20:14:40Z 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
Modified: vendor/fuse-emulator/current/fuse/ide/zxatasp.h
===================================================================
--- vendor/fuse-emulator/current/fuse/ide/zxatasp.h 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/fuse/ide/zxatasp.h 2011-04-02 12:18:51 UTC (rev 667)
@@ -2,7 +2,7 @@
Copyright (c) 2003-2004 Garry Lancaster,
2004 Philip Kendall
- $Id: zxatasp.h 4220 2010-12-17 10:54:29Z fredm $
+ $Id: zxatasp.h 4225 2010-12-17 20:14:40Z 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
Modified: vendor/fuse-emulator/current/fuse/ide/zxcf.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ide/zxcf.c 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/fuse/ide/zxcf.c 2011-04-02 12:18:51 UTC (rev 667)
@@ -1,7 +1,7 @@
/* zxcf.c: ZXCF interface routines
Copyright (c) 2003-2008 Garry Lancaster and Philip Kendall
- $Id: zxcf.c 4220 2010-12-17 10:54:29Z fredm $
+ $Id: zxcf.c 4225 2010-12-17 20:14:40Z 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
Modified: vendor/fuse-emulator/current/fuse/ide/zxcf.h
===================================================================
--- vendor/fuse-emulator/current/fuse/ide/zxcf.h 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/fuse/ide/zxcf.h 2011-04-02 12:18:51 UTC (rev 667)
@@ -2,7 +2,7 @@
Copyright (c) 2003-2004 Garry Lancaster,
2004 Philip Kendall
- $Id: zxcf.h 4220 2010-12-17 10:54:29Z fredm $
+ $Id: zxcf.h 4225 2010-12-17 20:14:40Z 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
Modified: vendor/fuse-emulator/current/fuse/keysyms.pl
===================================================================
--- vendor/fuse-emulator/current/fuse/keysyms.pl 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/fuse/keysyms.pl 2011-04-02 12:18:51 UTC (rev 667)
@@ -4,7 +4,7 @@
# Copyright (c) 2000-2007 Philip Kendall, Matan Ziv-Av, Russell Marks,
# Fredrick Meunier, Catalin Mihaila, Stuart Brady
-# $Id: keysyms.pl 4103 2009-11-21 10:16:36Z fredm $
+# $Id: keysyms.pl 4225 2010-12-17 20:14:40Z 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
@@ -203,6 +203,7 @@
Down => 'CURSORBLOCKDOWN',
Up => 'CURSORBLOCKUP',
Right => 'CURSORBLOCKRIGHT',
+ KP_Enter => 'KEYPADENTER',
},
function => \&svga_keysym,
},
Modified: vendor/fuse-emulator/current/fuse/man/fuse.1
===================================================================
--- vendor/fuse-emulator/current/fuse/man/fuse.1 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/fuse/man/fuse.1 2011-04-02 12:18:51 UTC (rev 667)
@@ -1,7 +1,7 @@
.\" -*- nroff -*-
.\"
.\" fuse.1: Fuse man page
-.\" Copyright (c) 2001-2010 Russell Marks, Philip Kendall, Darren Salt,
+.\" Copyright (c) 2001-2011 Russell Marks, Philip Kendall, Darren Salt,
.\" Fredrick Meunier, Stuart Brady
.\"
.\" This program is free software; you can redistribute it and/or modify
@@ -23,7 +23,7 @@
.\" E-mail: phi...@sh...
.\"
.\"
-.TH fuse 1 "16th December, 2010" "Version 1.0.0" "Emulators"
+.TH fuse 1 "1st April, 2011" "Version 1.0.0.1a" "Emulators"
.\"
.\"------------------------------------------------------------------
.\"
@@ -670,7 +670,9 @@
.RI ( plusd.rom ),
and the TR-DOS ROM for Beta 128 emulation with the 48K, TC2048, 128K or +2
.RI ( trdos.rom ).
-The names in brackets denote the defaults.
+The names in brackets denote the defaults. Note that not all these ROMs
+are supplied with Fuse - you must supply your own copies of those which
+are not.
.RE
.PP
.I \-\-no\-rs232\-handshake
Modified: vendor/fuse-emulator/current/fuse/memory.c
===================================================================
--- vendor/fuse-emulator/current/fuse/memory.c 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/fuse/memory.c 2011-04-02 12:18:51 UTC (rev 667)
@@ -1,7 +1,7 @@
/* memory.c: Routines for accessing memory
Copyright (c) 1999-2004 Philip Kendall
- $Id: memory.c 4186 2010-10-25 10:29:45Z fredm $
+ $Id: memory.c 4207 2010-12-05 10:01:23Z fredm $
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
Deleted: vendor/fuse-emulator/current/fuse/roms/128p-0.rom
===================================================================
(Binary files differ)
Deleted: vendor/fuse-emulator/current/fuse/roms/128p-1.rom
===================================================================
(Binary files differ)
Deleted: vendor/fuse-emulator/current/fuse/roms/256s-0.rom
===================================================================
(Binary files differ)
Deleted: vendor/fuse-emulator/current/fuse/roms/256s-1.rom
===================================================================
(Binary files differ)
Deleted: vendor/fuse-emulator/current/fuse/roms/256s-2.rom
===================================================================
(Binary files differ)
Deleted: vendor/fuse-emulator/current/fuse/roms/256s-3.rom
===================================================================
(Binary files differ)
Modified: vendor/fuse-emulator/current/fuse/roms/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/roms/Makefile.am 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/fuse/roms/Makefile.am 2011-04-02 12:18:51 UTC (rev 667)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 1999-2001 Philip Kendall
-## $Id: Makefile.am 4060 2009-07-30 13:21:38Z fredm $
+## $Id: Makefile.am 4328 2011-03-27 22:19:27Z 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,18 +25,14 @@
ROMS = 128-0.rom 128-1.rom \
48.rom \
- opus.rom \
plus2-0.rom plus2-1.rom \
plus3-0.rom plus3-1.rom plus3-2.rom plus3-3.rom \
plus3e-0.rom plus3e-1.rom plus3e-2.rom plus3e-3.rom \
tc2048.rom \
tc2068-0.rom tc2068-1.rom \
- gluck.rom 128p-0.rom 128p-1.rom trdos.rom \
- 256s-0.rom 256s-1.rom 256s-2.rom 256s-3.rom \
se-0.rom se-1.rom \
- if1-1.rom if1-2.rom \
plusd.rom
pkgdata_DATA = $(ROMS)
-EXTRA_DIST = $(ROMS)
+EXTRA_DIST = $(ROMS) README.copyright
Added: vendor/fuse-emulator/current/fuse/roms/README.copyright
===================================================================
--- vendor/fuse-emulator/current/fuse/roms/README.copyright (rev 0)
+++ vendor/fuse-emulator/current/fuse/roms/README.copyright 2011-04-02 12:18:51 UTC (rev 667)
@@ -0,0 +1,47 @@
+Note that the files in this directory are _not_ covered by the GNU GPL.
+
+The following licenses apply:
+
+128-0.rom
+128-1.rom
+48.rom
+plus2-0.rom
+plus2-1.rom
+plus3-0.rom
+plus3-1.rom
+plus3-2.rom
+plus3-3.rom
+tc2048.rom
+
+These are copyright Amstrad, who allow distribution of the ROMs but
+retain the copyright. You may not sell the ROMs or embed the ROMs in
+hardware, although it is allowed to sell a product which contains the
+ROMs, so long as the charge is being made for the product, not for the
+ROMs themselves. See
+<http://groups.google.com/group/comp.sys.amstrad.8bit/msg/c092cc4d4943131e>
+for more details.
+
+tc2068-0.rom
+tc2068-1.rom
+
+These are derived from Amstrad code, so the above statement applies. The
+modifications made by Timex are in the public domain.
+
+plus3e-0.rom
+plus3e-1.rom
+plus3e-2.rom
+plus3e-3.rom
+
+These are derived from Amstrad code, so the above statement applies. The
+modifications are copyright Garry Lancaster.
+
+se-0.rom
+se-1.rom
+
+These are derived from Amstrad code, so the above statement applies. The
+modifications are by Andrew Owen and are subject to the same conditions.
+
+plusd.rom
+
+This is copyright Datel Microelectronics, who allow distribution. See
+<http://www.shadowmagic.org.uk/spectrum/datel.html> for details.
Deleted: vendor/fuse-emulator/current/fuse/roms/gluck.rom
===================================================================
(Binary files differ)
Deleted: vendor/fuse-emulator/current/fuse/roms/if1-1.rom
===================================================================
(Binary files differ)
Deleted: vendor/fuse-emulator/current/fuse/roms/if1-2.rom
===================================================================
(Binary files differ)
Deleted: vendor/fuse-emulator/current/fuse/roms/opus.rom
===================================================================
(Binary files differ)
Deleted: vendor/fuse-emulator/current/fuse/roms/trdos.rom
===================================================================
(Binary files differ)
Modified: vendor/fuse-emulator/current/fuse/ui/fb/fbdisplay.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/fb/fbdisplay.c 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/fuse/ui/fb/fbdisplay.c 2011-04-02 12:18:51 UTC (rev 667)
@@ -2,7 +2,7 @@
Copyright (c) 2000-2003 Philip Kendall, Matan Ziv-Av, Darren Salt,
Witold Filipczyk
- $Id: fbdisplay.c 4205 2010-12-03 10:39:39Z fredm $
+ $Id: fbdisplay.c 4206 2010-12-03 11:59:23Z fredm $
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
Modified: vendor/fuse-emulator/current/fuse/ui/widget/filesel.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/widget/filesel.c 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/fuse/ui/widget/filesel.c 2011-04-02 12:18:51 UTC (rev 667)
@@ -2,7 +2,7 @@
Copyright (c) 2001-2005 Matan Ziv-Av, Philip Kendall, Russell Marks,
Marek Januszewski
- $Id: filesel.c 4103 2009-11-21 10:16:36Z fredm $
+ $Id: filesel.c 4246 2011-01-09 20:47:53Z 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
@@ -64,6 +64,9 @@
int err = 0;
+
+char *amiga_asl( char *title, BOOL is_saving );
+
#endif /* ifdef AMIGA */
struct widget_dirent **widget_filenames; /* Filenames in the current
@@ -145,13 +148,21 @@
char *
ui_get_open_filename( const char *title )
{
+#if !defined AMIGA && !defined __MORPHOS__
return widget_get_filename( title, 0 );
+#else
+ return amiga_asl( title, FALSE );
+#endif
}
char *
ui_get_save_filename( const char *title )
{
+#if !defined AMIGA && !defined __MORPHOS__
return widget_get_filename( title, 1 );
+#else
+ return amiga_asl( title, TRUE );
+#endif
}
static int widget_add_filename( int *allocated, int *number,
@@ -207,8 +218,8 @@
}
#if defined AMIGA || defined __MORPHOS__
-static char *
-amiga_asl( char *title ) {
+char *
+amiga_asl( char *title, BOOL is_saving ) {
char *filename;
struct FileRequester *filereq;
@@ -499,8 +510,7 @@
/* Show all the filenames */
widget_print_all_filenames( widget_filenames, widget_numfiles,
top_left_file, current_file, directory );
-#else /* ifndef AMIGA */
- amiga_asl(title);
+
#endif /* ifndef AMIGA */
return 0;
Modified: vendor/fuse-emulator/current/libspectrum/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/libspectrum/ChangeLog 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/libspectrum/ChangeLog 2011-04-02 12:18:51 UTC (rev 667)
@@ -310,5 +310,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 4220 2010-12-17 10:54:29Z fredm $
+$Id: ChangeLog 4212 2010-12-16 21:36:50Z pak21 $
Modified: vendor/fuse-emulator/current/libspectrum/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/libspectrum/Makefile.am 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/libspectrum/Makefile.am 2011-04-02 12:18:51 UTC (rev 667)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2001-2004 Philip Kendall
-## $Id: Makefile.am 4220 2010-12-17 10:54:29Z fredm $
+## $Id: Makefile.am 4222 2010-12-17 18:56:50Z 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
@@ -53,6 +53,7 @@
tzx_write.c \
warajevo_read.c \
wav.c \
+ windres.rc \
z80.c \
z80em.c \
zlib.c \
Modified: vendor/fuse-emulator/current/libspectrum/README
===================================================================
--- vendor/fuse-emulator/current/libspectrum/README 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/libspectrum/README 2011-04-02 12:18:51 UTC (rev 667)
@@ -69,4 +69,4 @@
Philip Kendall <phi...@sh...>
16 December 2010
-$Id: README 4220 2010-12-17 10:54:29Z fredm $
+$Id: README 4210 2010-12-16 21:34:52Z pak21 $
Modified: vendor/fuse-emulator/current/libspectrum/configure.in
===================================================================
--- vendor/fuse-emulator/current/libspectrum/configure.in 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/libspectrum/configure.in 2011-04-02 12:18:51 UTC (rev 667)
@@ -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 4220 2010-12-17 10:54:29Z fredm $
+dnl $Id: configure.in 4210 2010-12-16 21:34:52Z 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
Modified: vendor/fuse-emulator/current/libspectrum/doc/libspectrum.txt
===================================================================
--- vendor/fuse-emulator/current/libspectrum/doc/libspectrum.txt 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/libspectrum/doc/libspectrum.txt 2011-04-02 12:18:51 UTC (rev 667)
@@ -1745,4 +1745,4 @@
Write `data' to register `reg' of the IDE channel `chn'.
-$Id: libspectrum.txt 4220 2010-12-17 10:54:29Z fredm $
+$Id: libspectrum.txt 4193 2010-11-29 20:29:25Z pak21 $
Modified: vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog 2011-04-02 12:18:51 UTC (rev 667)
@@ -794,3 +794,5 @@
for 1.0.0 release.
20101216 ChangeLog: update date here as well.
20101216 test/Makefile.am: ensure all test files are distributed.
+20101217 Makefile.am: mark windres.rc as a source file so it is distributed
+ (thanks, Guesser).
Modified: vendor/fuse-emulator/current/libspectrum/test/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/libspectrum/test/Makefile.am 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/libspectrum/test/Makefile.am 2011-04-02 12:18:51 UTC (rev 667)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2007 Philip Kendall
-## $Id: Makefile.am 4220 2010-12-17 10:54:29Z fredm $
+## $Id: Makefile.am 4218 2010-12-16 21:56:33Z 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
Modified: vendor/fuse-emulator/current/libspectrum/warajevo_read.c
===================================================================
--- vendor/fuse-emulator/current/libspectrum/warajevo_read.c 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/libspectrum/warajevo_read.c 2011-04-02 12:18:51 UTC (rev 667)
@@ -2,7 +2,7 @@
Copyright (c) 2001, 2002 Philip Kendall, Darren Salt
Copyright (c) 2003 Fredrick Meunier
- $Id: warajevo_read.c 4196 2010-11-30 18:45:18Z pak21 $
+ $Id: warajevo_read.c 4197 2010-11-30 18:48:20Z 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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
