[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx: [298] vendor/fuse/current
Brought to you by:
fredm
Menu
▾
▴
[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx: [298] vendor/fuse/current
|
From: <fr...@us...> - 2007-02-04 11:16:18
|
Revision: 298
http://svn.sourceforge.net/fuse-for-macosx/?rev=298&view=rev
Author: fredm
Date: 2007-02-04 03:14:46 -0800 (Sun, 04 Feb 2007)
Log Message:
-----------
Load . into vendor/fuse/current.
Modified Paths:
--------------
vendor/fuse/current/ChangeLog
vendor/fuse/current/Makefile.am
vendor/fuse/current/README
vendor/fuse/current/autogen.sh
vendor/fuse/current/ay.c
vendor/fuse/current/ay.h
vendor/fuse/current/compat/Makefile.am
vendor/fuse/current/compat/dirname.c
vendor/fuse/current/compat.h
vendor/fuse/current/configure.in
vendor/fuse/current/dck.c
vendor/fuse/current/dck.h
vendor/fuse/current/debugger/Makefile.am
vendor/fuse/current/debugger/breakpoint.c
vendor/fuse/current/debugger/breakpoint.h
vendor/fuse/current/debugger/command.c
vendor/fuse/current/debugger/commandl.l
vendor/fuse/current/debugger/commandy.y
vendor/fuse/current/debugger/debugger.c
vendor/fuse/current/debugger/debugger.h
vendor/fuse/current/debugger/debugger_internals.h
vendor/fuse/current/debugger/disassemble.c
vendor/fuse/current/debugger/expression.c
vendor/fuse/current/display.c
vendor/fuse/current/display.h
vendor/fuse/current/divide.c
vendor/fuse/current/divide.h
vendor/fuse/current/event.c
vendor/fuse/current/event.h
vendor/fuse/current/fuse.c
vendor/fuse/current/fuse.h
vendor/fuse/current/hacking/ChangeLog
vendor/fuse/current/hacking/Makefile.am
vendor/fuse/current/hacking/cvs-tags
vendor/fuse/current/ide.c
vendor/fuse/current/ide.h
vendor/fuse/current/if1.c
vendor/fuse/current/if1.h
vendor/fuse/current/if2.c
vendor/fuse/current/if2.h
vendor/fuse/current/input.c
vendor/fuse/current/input.h
vendor/fuse/current/joystick.c
vendor/fuse/current/joystick.h
vendor/fuse/current/keyboard.c
vendor/fuse/current/keyboard.h
vendor/fuse/current/keysyms.dat
vendor/fuse/current/keysyms.pl
vendor/fuse/current/lib/Makefile.am
vendor/fuse/current/loader.c
vendor/fuse/current/loader.h
vendor/fuse/current/machine.c
vendor/fuse/current/machine.h
vendor/fuse/current/machines/Makefile.am
vendor/fuse/current/machines/machines.h
vendor/fuse/current/machines/pentagon.c
vendor/fuse/current/machines/scorpion.c
vendor/fuse/current/machines/scorpion.h
vendor/fuse/current/machines/spec128.c
vendor/fuse/current/machines/spec128.h
vendor/fuse/current/machines/spec16.c
vendor/fuse/current/machines/spec48.c
vendor/fuse/current/machines/spec48.h
vendor/fuse/current/machines/spec_se.c
vendor/fuse/current/machines/specplus2.c
vendor/fuse/current/machines/specplus2a.c
vendor/fuse/current/machines/specplus3.c
vendor/fuse/current/machines/specplus3.h
vendor/fuse/current/machines/specplus3e.c
vendor/fuse/current/machines/tc2048.c
vendor/fuse/current/machines/tc2068.c
vendor/fuse/current/machines/tc2068.h
vendor/fuse/current/machines/ts2068.c
vendor/fuse/current/man/Makefile.am
vendor/fuse/current/man/fuse.1
vendor/fuse/current/memory.c
vendor/fuse/current/memory.h
vendor/fuse/current/menu.c
vendor/fuse/current/menu.h
vendor/fuse/current/menu_data.c
vendor/fuse/current/menu_data.pl
vendor/fuse/current/periph.c
vendor/fuse/current/periph.h
vendor/fuse/current/perl/Fuse/Dialog.pm
vendor/fuse/current/perl/Fuse/Makefile.am
vendor/fuse/current/perl/Fuse.pm
vendor/fuse/current/perl/Makefile.am
vendor/fuse/current/perl/cpp-perl.pl
vendor/fuse/current/pokefinder/Makefile.am
vendor/fuse/current/pokefinder/pokefinder.c
vendor/fuse/current/pokefinder/pokefinder.h
vendor/fuse/current/printer.c
vendor/fuse/current/printer.h
vendor/fuse/current/profile.c
vendor/fuse/current/profile.h
vendor/fuse/current/psg.c
vendor/fuse/current/psg.h
vendor/fuse/current/roms/Makefile.am
vendor/fuse/current/rzx.c
vendor/fuse/current/rzx.h
vendor/fuse/current/scld.c
vendor/fuse/current/screenshot.c
vendor/fuse/current/screenshot.h
vendor/fuse/current/settings-header.pl
vendor/fuse/current/settings.dat
vendor/fuse/current/settings.pl
vendor/fuse/current/simpleide.c
vendor/fuse/current/slt.c
vendor/fuse/current/slt.h
vendor/fuse/current/snapshot.c
vendor/fuse/current/snapshot.h
vendor/fuse/current/sound/Makefile.am
vendor/fuse/current/sound/aosound.c
vendor/fuse/current/sound/dxsound.c
vendor/fuse/current/sound/lowlevel.h
vendor/fuse/current/sound/sdlsound.c
vendor/fuse/current/sound/sfifo.c
vendor/fuse/current/sound.c
vendor/fuse/current/sound.h
vendor/fuse/current/spectrum.c
vendor/fuse/current/spectrum.h
vendor/fuse/current/tape.c
vendor/fuse/current/tape.h
vendor/fuse/current/timer.c
vendor/fuse/current/timer.h
vendor/fuse/current/trdos.c
vendor/fuse/current/trdos.h
vendor/fuse/current/ui/Makefile.am
vendor/fuse/current/ui/aalib/Makefile.am
vendor/fuse/current/ui/aalib/aalibdisplay.c
vendor/fuse/current/ui/aalib/aalibkeyboard.c
vendor/fuse/current/ui/aalib/aalibkeyboard.h
vendor/fuse/current/ui/aalib/aalibui.c
vendor/fuse/current/ui/aalib/aalibui.h
vendor/fuse/current/ui/aalib/error.c
vendor/fuse/current/ui/fb/Makefile.am
vendor/fuse/current/ui/fb/fbdisplay.c
vendor/fuse/current/ui/fb/fbdisplay.h
vendor/fuse/current/ui/fb/fbjoystick.c
vendor/fuse/current/ui/fb/fbkeyboard.c
vendor/fuse/current/ui/fb/fbkeyboard.h
vendor/fuse/current/ui/fb/fbui.c
vendor/fuse/current/ui/ggi/Makefile.am
vendor/fuse/current/ui/ggi/ggi_internals.h
vendor/fuse/current/ui/ggi/ggidisplay.c
vendor/fuse/current/ui/ggi/ggikeyboard.c
vendor/fuse/current/ui/ggi/ggiui.c
vendor/fuse/current/ui/gtk/Makefile.am
vendor/fuse/current/ui/gtk/binary.c
vendor/fuse/current/ui/gtk/browse.c
vendor/fuse/current/ui/gtk/confirm.c
vendor/fuse/current/ui/gtk/debugger.c
vendor/fuse/current/ui/gtk/fileselector.c
vendor/fuse/current/ui/gtk/gtkdisplay.c
vendor/fuse/current/ui/gtk/gtkinternals.h
vendor/fuse/current/ui/gtk/gtkjoystick.c
vendor/fuse/current/ui/gtk/gtkkeyboard.c
vendor/fuse/current/ui/gtk/gtkui.c
vendor/fuse/current/ui/gtk/memory.c
vendor/fuse/current/ui/gtk/options-header.pl
vendor/fuse/current/ui/gtk/options.pl
vendor/fuse/current/ui/gtk/picture.c
vendor/fuse/current/ui/gtk/pixmaps.c
vendor/fuse/current/ui/gtk/pokefinder.c
vendor/fuse/current/ui/gtk/rollback.c
vendor/fuse/current/ui/gtk/roms.c
vendor/fuse/current/ui/gtk/statusbar.c
vendor/fuse/current/ui/gtk/stock.c
vendor/fuse/current/ui/options.dat
vendor/fuse/current/ui/scaler/Makefile.am
vendor/fuse/current/ui/scaler/scaler.c
vendor/fuse/current/ui/scaler/scaler.h
vendor/fuse/current/ui/scaler/scaler_internals.h
vendor/fuse/current/ui/scaler/scalers.c
vendor/fuse/current/ui/sdl/Makefile.am
vendor/fuse/current/ui/sdl/sdldisplay.c
vendor/fuse/current/ui/sdl/sdldisplay.h
vendor/fuse/current/ui/sdl/sdljoystick.c
vendor/fuse/current/ui/sdl/sdljoystick.h
vendor/fuse/current/ui/sdl/sdlkeyboard.c
vendor/fuse/current/ui/sdl/sdlkeyboard.h
vendor/fuse/current/ui/sdl/sdlui.c
vendor/fuse/current/ui/svga/Makefile.am
vendor/fuse/current/ui/svga/svgadisplay.c
vendor/fuse/current/ui/svga/svgadisplay.h
vendor/fuse/current/ui/svga/svgajoystick.c
vendor/fuse/current/ui/svga/svgakeyboard.c
vendor/fuse/current/ui/svga/svgakeyboard.h
vendor/fuse/current/ui/svga/svgaui.c
vendor/fuse/current/ui/ui.h
vendor/fuse/current/ui/uidisplay.h
vendor/fuse/current/ui/uijoystick.c
vendor/fuse/current/ui/uijoystick.h
vendor/fuse/current/ui/win32/Makefile.am
vendor/fuse/current/ui/win32/debugger.c
vendor/fuse/current/ui/win32/debugger.h
vendor/fuse/current/ui/win32/debugger.rc
vendor/fuse/current/ui/win32/error.c
vendor/fuse/current/ui/win32/keysyms.c
vendor/fuse/current/ui/win32/menu_data.c
vendor/fuse/current/ui/win32/menu_data.h
vendor/fuse/current/ui/win32/menu_data.rc
vendor/fuse/current/ui/win32/pokefinder.c
vendor/fuse/current/ui/win32/pokefinder.h
vendor/fuse/current/ui/win32/pokefinder.rc
vendor/fuse/current/ui/win32/statusbar.c
vendor/fuse/current/ui/win32/win32display.c
vendor/fuse/current/ui/win32/win32display.h
vendor/fuse/current/ui/win32/win32internals.h
vendor/fuse/current/ui/win32/win32keyboard.c
vendor/fuse/current/ui/win32/win32keyboard.h
vendor/fuse/current/ui/win32/win32ui.c
vendor/fuse/current/ui/win32/win32ui.rc
vendor/fuse/current/ui/xlib/Makefile.am
vendor/fuse/current/ui/xlib/xdisplay.c
vendor/fuse/current/ui/xlib/xdisplay.h
vendor/fuse/current/ui/xlib/xerror.c
vendor/fuse/current/ui/xlib/xjoystick.c
vendor/fuse/current/ui/xlib/xkeyboard.c
vendor/fuse/current/ui/xlib/xkeyboard.h
vendor/fuse/current/ui/xlib/xui.c
vendor/fuse/current/ui/xlib/xui.h
vendor/fuse/current/ui.c
vendor/fuse/current/uidisplay.c
vendor/fuse/current/ula.c
vendor/fuse/current/ula.h
vendor/fuse/current/utils.c
vendor/fuse/current/utils.h
vendor/fuse/current/widget/Makefile.am
vendor/fuse/current/widget/browse.c
vendor/fuse/current/widget/debugger.c
vendor/fuse/current/widget/error.c
vendor/fuse/current/widget/filesel.c
vendor/fuse/current/widget/menu.c
vendor/fuse/current/widget/options-header.pl
vendor/fuse/current/widget/options.pl
vendor/fuse/current/widget/picture.c
vendor/fuse/current/widget/roms.c
vendor/fuse/current/widget/select.c
vendor/fuse/current/widget/text.c
vendor/fuse/current/widget/widget.c
vendor/fuse/current/widget/widget.h
vendor/fuse/current/widget/widget_internals.h
vendor/fuse/current/z80/Makefile.am
vendor/fuse/current/z80/coretest.c
vendor/fuse/current/z80/harness.pl
vendor/fuse/current/z80/tests/Makefile.am
vendor/fuse/current/z80/z80.c
vendor/fuse/current/z80/z80.h
vendor/fuse/current/z80/z80.pl
vendor/fuse/current/z80/z80_macros.h
vendor/fuse/current/z80/z80_ops.c
vendor/fuse/current/zxatasp.c
vendor/fuse/current/zxatasp.h
vendor/fuse/current/zxcf.c
vendor/fuse/current/zxcf.h
Added Paths:
-----------
vendor/fuse/current/sound/coreaudiosound.c
Modified: vendor/fuse/current/ChangeLog
===================================================================
--- vendor/fuse/current/ChangeLog 2007-02-04 08:40:22 UTC (rev 297)
+++ vendor/fuse/current/ChangeLog 2007-02-04 11:14:46 UTC (rev 298)
@@ -1,30 +1,56 @@
-2005-??-?? Philip Kendall <pak...@sr...>
+2007-??-?? Philip Kendall <phi...@sh...>
+ * Fuse 0.8.0 released
+
* New features:
+ * Loader improvements: automatically run at full speed while
+ a loader is in progress and automatically start/stop the tape
+ when the start/end of a loader is detected (Philip Kendall).
* RZX 'rollback' support (Philip Kendall).
+ * DivIDE support (Matthew Westcott)
+ * Interface I and microdrive emulation (Gergely Szasz).
* TS2068 support (Fredrick Meunier).
- * Interface I and microdrive emulation (Gergely Szasz).
* Kempston mouse emulation (Darren Salt).
+ * TZX generalized data block (0x19) support (Philip Kendall).
+ * Much improved widget UI, including allowing selection of
+ filenames (Darren Salt, Gergely Szasz).
* Allow SDL full screen mode to be used (Darren Salt).
* Add the ability to save 'movies' as collections of screenshots
(Gergely Szasz).
* Widget pokefinder (Darren Salt).
* Add a simple code profiler (Philip Kendall).
* New libao sound driver (Gergely Szasz).
+ * New CoreAudio sound driver (Fredrick Meunier).
+ * New PALTV 1-3x and TV3x graphics scalers (Gergely Szasz).
* Emulation core improvements:
* Improved screen rendering code (now character accurate rather
- than line accurate) (Philip Kendall).
+ than line accurate) (Philip Kendall, Fredrick Meunier).
+ * Corrections to write ordering and contention for EX (SP),HL,
+ EX (SP),IX and EX (SP),IY (Philip Kendall; thanks, Mark
+ Woodmass).
+ * Corrections to contention for OTIR and OTDR (Philip Kendall;
+ thanks, Mark Woodmass).
+ * IR contention (Philip Kendall; thanks, Mark Woodmass).
+ * Flag bits 3 and 5 are copied on all BIT instructions (Philip
+ Kendall; thanks, Mark Woodmass).
* Improved ULA emulation with respect to interrupt length
(thanks, Jon Needle, Ramsoft and Mark Woodmass) (Philip
Kendall).
+ * Fix timings of shifted no operation opcodes (Philip Kendall).
+ * An interrupt in IM 0 takes 13 tstates to acknowledge, not 12
+ (Philip Kendall).
* Improved speed control code (Fredrick Meunier).
* Miscellaneous:
- * Allow filenames to be selected from the widget UIs (Darren
- Salt).
* Add a 'save, don't save, cancel' confirmation dialog before any
changes to media are lost under the GTK+ UIs (Philip Kendall).
+ * On the Pentagon, page in the TR-DOS ROM on NMI, allowing the
+ snapshot function to work (Philip Kendall). On the Scorpion,
+ page in ROM 2, allowing the monitor to work (thanks, Erik
+ Kunze).
+ * Default snapshot format is now .szx rather than .z80 (Fredrick
+ Meunier)
* Store current joystick information in snapshots (Fredrick
Meunier).
* Optional use of doublescan modes in the framebuffer and
@@ -35,11 +61,8 @@
* Use stock button icons in the GTK+ 2.x UI (Darren Salt).
* Save/restore the 'issue 2 keyboard' flag from snapshots
(Philip Kendall).
- * Deactivate widget menu items when they are inappropriate
- (Darren Salt).
* Correctly quote '-' characters in the man page (needed for
UTF-8 environments) (Darren Salt, Stuart Brady).
- * Widget query confirmation dialog (Darren Salt).
* Use separate menus for controlling +3 and TR-DOS disks (Philip
Kendall).
* Fix behaviour of ZXATASP and ZXCF on reset (Garry Lancaster).
@@ -50,9 +73,13 @@
(Darren Salt).
* Various minor improvements to the framebuffer UI (Darren
Salt).
+ * Various fixes to allow compilation with gcc 4.x (Philip
+ Kendall).
- * Various other minor bugfixes (Fredrick Meunier, Philip Kendall,
- Mark Round, Darren Salt, Paul van der Laan).
+ * Various other minor bugfixes (Philip Kendall, Fredrick Meunier,
+ Jon Needle, Markus Oberhumer, Mark Round, Darren Salt, Gergely
+ Szasz, Paul van der Laan and other people to whom I apologise
+ for forgetting).
2004-07-16 Philip Kendall <pak...@sr...>
@@ -756,4 +783,4 @@
* Version 0.1.0 released.
-$Id: ChangeLog,v 1.42 2005/03/26 17:24:54 pak21 Exp $
+$Id: ChangeLog,v 1.46 2007/02/02 16:21:50 pak21 Exp $
Modified: vendor/fuse/current/Makefile.am
===================================================================
--- vendor/fuse/current/Makefile.am 2007-02-04 08:40:22 UTC (rev 297)
+++ vendor/fuse/current/Makefile.am 2007-02-04 11:14:46 UTC (rev 298)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 1999-2004 Philip Kendall
-## $Id: Makefile.am,v 1.118 2006/07/30 19:00:40 pak21 Exp $
+## $Id: Makefile.am,v 1.120 2007/02/02 16:21:50 pak21 Exp $
## 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
@@ -19,8 +19,7 @@
##
## Author contact information:
##
-## E-mail: pak...@sr...
-## Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+## E-mail: phi...@sh...
AUTOMAKE_OPTIONS = foreign
@@ -107,6 +106,7 @@
@GLIB_LIBS@ \
@PNG_LIBS@ \
@AO_LIBS@ \
+@COREAUDIO_LIBS@ \
@X_LIBS@ \
@XML_LIBS@ \
compat/libcompat.a
Modified: vendor/fuse/current/README
===================================================================
--- vendor/fuse/current/README 2007-02-04 08:40:22 UTC (rev 297)
+++ vendor/fuse/current/README 2007-02-04 11:14:46 UTC (rev 298)
@@ -136,7 +136,7 @@
the Usenet group 'comp.sys.sinclair', but do read the FAQ
( http://www.worldofspectrum.org/faq/index.html ) first!
-Philip Kendall <pak...@sr...>
+Philip Kendall <phi...@sh...>
16 July 2004
-$Id: README,v 1.39 2004/07/15 10:42:29 pak21 Exp $
+$Id: README,v 1.40 2007/02/02 16:21:50 pak21 Exp $
Modified: vendor/fuse/current/autogen.sh
===================================================================
--- vendor/fuse/current/autogen.sh 2007-02-04 08:40:22 UTC (rev 297)
+++ vendor/fuse/current/autogen.sh 2007-02-04 11:14:46 UTC (rev 298)
@@ -3,7 +3,7 @@
# autogen.sh: autotools invocation
# Copyright (c) 2004 Philip Kendall
-# $Id: autogen.sh,v 1.4 2005/12/24 16:18:18 pak21 Exp $
+# $Id: autogen.sh,v 1.5 2007/02/02 16:21:50 pak21 Exp $
# 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
@@ -21,8 +21,7 @@
# Author contact information:
-# E-mail: Philip Kendall <pak...@sr...>
-# Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+# E-mail: Philip Kendall <phi...@sh...>
# Exit on errors
set -e
Modified: vendor/fuse/current/ay.c
===================================================================
--- vendor/fuse/current/ay.c 2007-02-04 08:40:22 UTC (rev 297)
+++ vendor/fuse/current/ay.c 2007-02-04 11:14:46 UTC (rev 298)
@@ -1,7 +1,7 @@
/* ay.c: AY-8-3912 routines
Copyright (c) 1999-2004 Philip Kendall
- $Id: ay.c,v 1.25 2004/06/15 09:48:40 pak21 Exp $
+ $Id: ay.c,v 1.26 2007/02/02 16:21:50 pak21 Exp $
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
@@ -19,8 +19,7 @@
Author contact information:
- E-mail: pak...@sr...
- Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+ E-mail: phi...@sh...
*/
Modified: vendor/fuse/current/ay.h
===================================================================
--- vendor/fuse/current/ay.h 2007-02-04 08:40:22 UTC (rev 297)
+++ vendor/fuse/current/ay.h 2007-02-04 11:14:46 UTC (rev 298)
@@ -1,7 +1,7 @@
/* ay.h: AY-8-3912 routines
Copyright (c) 1999-2004 Philip Kendall
- $Id: ay.h,v 1.15 2004/06/15 09:48:40 pak21 Exp $
+ $Id: ay.h,v 1.16 2007/02/02 16:21:50 pak21 Exp $
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
@@ -19,8 +19,7 @@
Author contact information:
- E-mail: pak...@sr...
- Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+ E-mail: phi...@sh...
*/
Modified: vendor/fuse/current/compat/Makefile.am
===================================================================
--- vendor/fuse/current/compat/Makefile.am 2007-02-04 08:40:22 UTC (rev 297)
+++ vendor/fuse/current/compat/Makefile.am 2007-02-04 11:14:46 UTC (rev 298)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2003 Philip Kendall
-## $Id: Makefile.am,v 1.5 2004/03/28 09:55:50 pak21 Exp $
+## $Id: Makefile.am,v 1.6 2007/02/02 16:21:53 pak21 Exp $
## 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
@@ -19,8 +19,7 @@
##
## Author contact information:
##
-## E-mail: pak...@sr...
-## Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+## E-mail: phi...@sh...
AUTOMAKE_OPTIONS = foreign
Modified: vendor/fuse/current/compat/dirname.c
===================================================================
--- vendor/fuse/current/compat/dirname.c 2007-02-04 08:40:22 UTC (rev 297)
+++ vendor/fuse/current/compat/dirname.c 2007-02-04 11:14:46 UTC (rev 298)
@@ -20,8 +20,7 @@
Author contact information:
- E-mail: pak...@sr...
- Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+ E-mail: phi...@sh...
*/
Modified: vendor/fuse/current/compat.h
===================================================================
--- vendor/fuse/current/compat.h 2007-02-04 08:40:22 UTC (rev 297)
+++ vendor/fuse/current/compat.h 2007-02-04 11:14:46 UTC (rev 298)
@@ -1,7 +1,7 @@
/* compat.h: various compatbility bits
Copyright (c) 2003 Philip Kendall
- $Id: compat.h,v 1.6 2004/04/11 10:13:22 pak21 Exp $
+ $Id: compat.h,v 1.7 2007/02/02 16:21:50 pak21 Exp $
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
@@ -19,8 +19,7 @@
Author contact information:
- E-mail: pak...@sr...
- Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+ E-mail: phi...@sh...
*/
Modified: vendor/fuse/current/configure.in
===================================================================
--- vendor/fuse/current/configure.in 2007-02-04 08:40:22 UTC (rev 297)
+++ vendor/fuse/current/configure.in 2007-02-04 11:14:46 UTC (rev 298)
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-dnl $Id: configure.in,v 1.151 2005/03/06 05:30:27 fredm Exp $
+dnl $Id: configure.in,v 1.155 2007/02/02 16:21:50 pak21 Exp $
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
@@ -17,8 +17,7 @@
dnl
dnl Author contact information:
dnl
-dnl E-mail: pak...@sr...
-dnl Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+dnl E-mail: phi...@sh...
AC_INIT(fuse.c)
AM_CONFIG_HEADER(config.h)
@@ -397,8 +396,7 @@
AC_CHECK_LIB( ao, ao_open_live,
[AC_CHECK_HEADER(
ao/ao.h,
- [AC_DEFINE([USE_LIBAO], 1, [Defined if we're going to be using the instal
-ed libao]) AO_LIBS='-lao'],
+ [AC_DEFINE([USE_LIBAO], 1, [Defined if we're going to be using the installed libao]) AO_LIBS='-lao'],
[AC_MSG_WARN(ao/ao.h not found - no libao sound output)]
)],
[AC_MSG_WARN(ao_open_live not found - no libao sound output)]
@@ -406,6 +404,14 @@
AC_SUBST(AO_LIBS)
fi
+dnl Check if CoreAudio is available
+AC_CHECK_HEADER(
+ CoreAudio/AudioHardware.h,
+ [AC_DEFINE([USE_COREAUDIO], 1, [Defined if we're going to be using CoreAudio]) COREAUDIO_LIBS='-framework CoreAudio -framework AudioUnit -framework CoreServices'],
+ [AC_MSG_WARN(CoreAudio/AudioHardware.h not found - no CoreAudio sound output)]
+)
+AC_SUBST(COREAUDIO_LIBS)
+
dnl Are we supplying the ROMs or relying on another package?
AC_MSG_CHECKING(where to find the Spectrum ROM images)
AC_ARG_WITH(roms-dir,
Modified: vendor/fuse/current/dck.c
===================================================================
--- vendor/fuse/current/dck.c 2007-02-04 08:40:22 UTC (rev 297)
+++ vendor/fuse/current/dck.c 2007-02-04 11:14:46 UTC (rev 298)
@@ -1,7 +1,7 @@
/* dck.c: dock snapshot (Warajevo .DCK) handling routines
Copyright (c) 2003-2004 Darren Salt, Fredrick Meunier, Philip Kendall
- $Id: dck.c,v 1.21 2004/05/25 10:05:05 fredm Exp $
+ $Id: dck.c,v 1.22 2007/02/02 16:21:50 pak21 Exp $
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
@@ -19,8 +19,7 @@
Author contact information:
- Philip: pak...@sr...
- Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+ Philip: phi...@sh...
Darren: li...@yo...
Fred: fr...@sp...
Modified: vendor/fuse/current/dck.h
===================================================================
--- vendor/fuse/current/dck.h 2007-02-04 08:40:22 UTC (rev 297)
+++ vendor/fuse/current/dck.h 2007-02-04 11:14:46 UTC (rev 298)
@@ -1,7 +1,7 @@
/* dck.c: dock snapshot (Warajevo .DCK) handling routines
Copyright (c) 2003 Darren Salt, Fredrick Meunier
- $Id: dck.h,v 1.2 2004/05/25 10:05:06 fredm Exp $
+ $Id: dck.h,v 1.3 2007/02/02 16:21:50 pak21 Exp $
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
@@ -19,8 +19,7 @@
Author contact information:
- Philip: pak...@sr...
- Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+ Philip: phi...@sh...
Darren: li...@yo...
Fred: fr...@sp...
Modified: vendor/fuse/current/debugger/Makefile.am
===================================================================
--- vendor/fuse/current/debugger/Makefile.am 2007-02-04 08:40:22 UTC (rev 297)
+++ vendor/fuse/current/debugger/Makefile.am 2007-02-04 11:14:46 UTC (rev 298)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2001-2004 Philip Kendall
-## $Id: Makefile.am,v 1.12 2004/07/09 17:38:06 pak21 Exp $
+## $Id: Makefile.am,v 1.13 2007/02/02 16:21:53 pak21 Exp $
## 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
@@ -19,8 +19,7 @@
##
## Author contact information:
##
-## E-mail: pak...@sr...
-## Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+## E-mail: phi...@sh...
AUTOMAKE_OPTIONS = foreign
Modified: vendor/fuse/current/debugger/breakpoint.c
===================================================================
--- vendor/fuse/current/debugger/breakpoint.c 2007-02-04 08:40:22 UTC (rev 297)
+++ vendor/fuse/current/debugger/breakpoint.c 2007-02-04 11:14:46 UTC (rev 298)
@@ -1,7 +1,7 @@
/* breakpoint.c: a debugger breakpoint
Copyright (c) 2002-2004 Philip Kendall
- $Id: breakpoint.c,v 1.8 2006/12/15 20:50:47 pak21 Exp $
+ $Id: breakpoint.c,v 1.9 2007/02/02 16:21:53 pak21 Exp $
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
@@ -19,8 +19,7 @@
Author contact information:
- E-mail: pak...@sr...
- Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+ E-mail: phi...@sh...
*/
Modified: vendor/fuse/current/debugger/breakpoint.h
===================================================================
--- vendor/fuse/current/debugger/breakpoint.h 2007-02-04 08:40:22 UTC (rev 297)
+++ vendor/fuse/current/debugger/breakpoint.h 2007-02-04 11:14:46 UTC (rev 298)
@@ -1,7 +1,7 @@
/* breakpoint.h: a debugger breakpoint
Copyright (c) 2002-2004 Philip Kendall
- $Id: breakpoint.h,v 1.4 2004/05/14 22:05:57 pak21 Exp $
+ $Id: breakpoint.h,v 1.5 2007/02/02 16:21:53 pak21 Exp $
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
@@ -19,8 +19,7 @@
Author contact information:
- E-mail: pak...@sr...
- Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+ E-mail: phi...@sh...
*/
Modified: vendor/fuse/current/debugger/command.c
===================================================================
--- vendor/fuse/current/debugger/command.c 2007-02-04 08:40:22 UTC (rev 297)
+++ vendor/fuse/current/debugger/command.c 2007-02-04 11:14:46 UTC (rev 298)
@@ -1,7 +1,7 @@
/* command.c: Parse a debugger command
Copyright (c) 2002 Philip Kendall
- $Id: command.c,v 1.16 2003/12/02 14:56:32 pak21 Exp $
+ $Id: command.c,v 1.17 2007/02/02 16:21:53 pak21 Exp $
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
@@ -19,8 +19,7 @@
Author contact information:
- E-mail: pak...@sr...
- Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+ E-mail: phi...@sh...
*/
Modified: vendor/fuse/current/debugger/commandl.l
===================================================================
--- vendor/fuse/current/debugger/commandl.l 2007-02-04 08:40:22 UTC (rev 297)
+++ vendor/fuse/current/debugger/commandl.l 2007-02-04 11:14:46 UTC (rev 298)
@@ -1,7 +1,7 @@
/* commandl.l: Debugger command lexical scanner
Copyright (c) 2002 Philip Kendall
- $Id: commandl.l,v 1.36 2004/06/16 14:46:34 pak21 Exp $
+ $Id: commandl.l,v 1.37 2007/02/02 16:21:53 pak21 Exp $
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
@@ -19,8 +19,7 @@
Author contact information:
- E-mail: pak...@sr...
- Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+ E-mail: phi...@sh...
*/
Modified: vendor/fuse/current/debugger/commandy.y
===================================================================
--- vendor/fuse/current/debugger/commandy.y 2007-02-04 08:40:22 UTC (rev 297)
+++ vendor/fuse/current/debugger/commandy.y 2007-02-04 11:14:46 UTC (rev 298)
@@ -1,7 +1,7 @@
/* commandy.y: Parse a debugger command
Copyright (c) 2002-2004 Philip Kendall
- $Id: commandy.y,v 1.42 2004/06/16 14:46:34 pak21 Exp $
+ $Id: commandy.y,v 1.43 2007/02/02 16:21:53 pak21 Exp $
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
@@ -19,8 +19,7 @@
Author contact information:
- E-mail: pak...@sr...
- Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+ E-mail: phi...@sh...
*/
Modified: vendor/fuse/current/debugger/debugger.c
===================================================================
--- vendor/fuse/current/debugger/debugger.c 2007-02-04 08:40:22 UTC (rev 297)
+++ vendor/fuse/current/debugger/debugger.c 2007-02-04 11:14:46 UTC (rev 298)
@@ -1,7 +1,7 @@
/* debugger.h: Fuse's monitor/debugger
Copyright (c) 2002-2004 Philip Kendall
- $Id: debugger.c,v 1.35 2004/12/29 13:11:16 pak21 Exp $
+ $Id: debugger.c,v 1.36 2007/02/02 16:21:53 pak21 Exp $
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
@@ -19,8 +19,7 @@
Author contact information:
- E-mail: pak...@sr...
- Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+ E-mail: phi...@sh...
*/
Modified: vendor/fuse/current/debugger/debugger.h
===================================================================
--- vendor/fuse/current/debugger/debugger.h 2007-02-04 08:40:22 UTC (rev 297)
+++ vendor/fuse/current/debugger/debugger.h 2007-02-04 11:14:46 UTC (rev 298)
@@ -1,7 +1,7 @@
/* debugger.h: Fuse's monitor/debugger
Copyright (c) 2002-2004 Philip Kendall
- $Id: debugger.h,v 1.25 2004/02/26 20:03:09 pak21 Exp $
+ $Id: debugger.h,v 1.26 2007/02/02 16:21:53 pak21 Exp $
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
@@ -19,8 +19,7 @@
Author contact information:
- E-mail: pak...@sr...
- Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+ E-mail: phi...@sh...
*/
Modified: vendor/fuse/current/debugger/debugger_internals.h
===================================================================
--- vendor/fuse/current/debugger/debugger_internals.h 2007-02-04 08:40:22 UTC (rev 297)
+++ vendor/fuse/current/debugger/debugger_internals.h 2007-02-04 11:14:46 UTC (rev 298)
@@ -1,7 +1,7 @@
/* debugger_internals.h: The internals of Fuse's monitor/debugger
Copyright (c) 2002-2003 Philip Kendall
- $Id: debugger_internals.h,v 1.25 2004/06/16 14:46:34 pak21 Exp $
+ $Id: debugger_internals.h,v 1.26 2007/02/02 16:21:53 pak21 Exp $
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
@@ -19,8 +19,7 @@
Author contact information:
- E-mail: pak...@sr...
- Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+ E-mail: phi...@sh...
*/
Modified: vendor/fuse/current/debugger/disassemble.c
===================================================================
--- vendor/fuse/current/debugger/disassemble.c 2007-02-04 08:40:22 UTC (rev 297)
+++ vendor/fuse/current/debugger/disassemble.c 2007-02-04 11:14:46 UTC (rev 298)
@@ -1,7 +1,7 @@
/* disassemble.h: Fuse's disassembler
Copyright (c) 2002-2003 Darren Salt, Philip Kendall
- $Id: disassemble.c,v 1.10 2003/11/14 11:46:47 pak21 Exp $
+ $Id: disassemble.c,v 1.11 2007/02/02 16:21:53 pak21 Exp $
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
@@ -21,8 +21,7 @@
Darren: li...@yo...
- Philip: pak...@sr...
- Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+ Philip: phi...@sh...
*/
Modified: vendor/fuse/current/debugger/expression.c
===================================================================
--- vendor/fuse/current/debugger/expression.c 2007-02-04 08:40:22 UTC (rev 297)
+++ vendor/fuse/current/debugger/expression.c 2007-02-04 11:14:46 UTC (rev 298)
@@ -1,7 +1,7 @@
/* expression.c: A numeric expression
Copyright (c) 2003 Philip Kendall
- $Id: expression.c,v 1.13 2004/06/16 14:05:38 pak21 Exp $
+ $Id: expression.c,v 1.14 2007/02/02 16:21:53 pak21 Exp $
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
@@ -19,8 +19,7 @@
Author contact information:
- E-mail: pak...@sr...
- Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+ E-mail: phi...@sh...
*/
Modified: vendor/fuse/current/display.c
===================================================================
--- vendor/fuse/current/display.c 2007-02-04 08:40:22 UTC (rev 297)
+++ vendor/fuse/current/display.c 2007-02-04 11:14:46 UTC (rev 298)
@@ -2,7 +2,7 @@
Copyright (c) 1999-2006 Philip Kendall, Thomas Harte, Witold Filipczyk
and Fredrick Meunier
- $Id: display.c,v 1.57 2006/09/17 00:56:18 fredm Exp $
+ $Id: display.c,v 1.59 2007/02/02 16:21:50 pak21 Exp $
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
@@ -20,8 +20,7 @@
Author contact information:
- E-mail: pak...@sr...
- Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+ E-mail: phi...@sh...
*/
@@ -641,7 +640,7 @@
critical_region_x = beam_x;
}
-static void
+inline static void
get_beam_position( int *x, int *y )
{
if( tstates < machine_current->line_times[ 0 ] ) {
@@ -685,7 +684,7 @@
/* Mark the 8-pixel chunk at (x,y) as maybe dirty and update the critical
region as appropriate */
-static void
+inline static void
display_dirty_chunk( int x, int y )
{
/* If the write is between the start of the critical region and the
Modified: vendor/fuse/current/display.h
===================================================================
--- vendor/fuse/current/display.h 2007-02-04 08:40:22 UTC (rev 297)
+++ vendor/fuse/current/display.h 2007-02-04 11:14:46 UTC (rev 298)
@@ -1,7 +1,7 @@
/* display.h: Routines for printing the Spectrum's screen
Copyright (c) 1999-2006 Philip Kendall
- $Id: display.h,v 1.26 2006/09/17 00:56:18 fredm Exp $
+ $Id: display.h,v 1.27 2007/02/02 16:21:50 pak21 Exp $
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
@@ -19,8 +19,7 @@
Author contact information:
- E-mail: pak...@sr...
- Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+ E-mail: phi...@sh...
*/
Modified: vendor/fuse/current/divide.c
===================================================================
--- vendor/fuse/current/divide.c 2007-02-04 08:40:22 UTC (rev 297)
+++ vendor/fuse/current/divide.c 2007-02-04 11:14:46 UTC (rev 298)
@@ -1,7 +1,7 @@
/* divide.c: DivIDE interface routines
Copyright (c) 2005 Matthew Westcott
- $Id: divide.c,v 1.2 2005/10/31 12:09:10 pak21 Exp $
+ $Id: divide.c,v 1.3 2007/02/02 16:21:51 pak21 Exp $
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
@@ -19,8 +19,7 @@
Author contact information:
- E-mail: Philip Kendall <pak...@sr...>
- Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+ E-mail: Philip Kendall <phi...@sh...>
*/
Modified: vendor/fuse/current/divide.h
===================================================================
--- vendor/fuse/current/divide.h 2007-02-04 08:40:22 UTC (rev 297)
+++ vendor/fuse/current/divide.h 2007-02-04 11:14:46 UTC (rev 298)
@@ -17,8 +17,7 @@
Author contact information:
- E-mail: Philip Kendall <pak...@sr...>
- Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+ E-mail: Philip Kendall <phi...@sh...>
*/
Modified: vendor/fuse/current/event.c
===================================================================
--- vendor/fuse/current/event.c 2007-02-04 08:40:22 UTC (rev 297)
+++ vendor/fuse/current/event.c 2007-02-04 11:14:46 UTC (rev 298)
@@ -1,7 +1,7 @@
/* event.c: Routines needed for dealing with the event list
Copyright (c) 2000-2004 Philip Kendall
- $Id: event.c,v 1.56 2006/09/03 14:12:22 fredm Exp $
+ $Id: event.c,v 1.57 2007/02/02 16:21:51 pak21 Exp $
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
@@ -19,8 +19,7 @@
Author contact information:
- E-mail: pak...@sr...
- Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+ E-mail: phi...@sh...
*/
Modified: vendor/fuse/current/event.h
===================================================================
--- vendor/fuse/current/event.h 2007-02-04 08:40:22 UTC (rev 297)
+++ vendor/fuse/current/event.h 2007-02-04 11:14:46 UTC (rev 298)
@@ -1,7 +1,7 @@
/* event.h: Routines needed for dealing with the event list
Copyright (c) 2000-2004 Philip Kendall
- $Id: event.h,v 1.24 2006/08/06 10:41:52 pak21 Exp $
+ $Id: event.h,v 1.25 2007/02/02 16:21:51 pak21 Exp $
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
@@ -19,8 +19,7 @@
Author contact information:
- E-mail: pak...@sr...
- Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+ E-mail: phi...@sh...
*/
Modified: vendor/fuse/current/fuse.c
===================================================================
--- vendor/fuse/current/fuse.c 2007-02-04 08:40:22 UTC (rev 297)
+++ vendor/fuse/current/fuse.c 2007-02-04 11:14:46 UTC (rev 298)
@@ -1,7 +1,7 @@
/* fuse.c: The Free Unix Spectrum Emulator
Copyright (c) 1999-2005 Philip Kendall
- $Id: fuse.c,v 1.130 2006/07/28 15:06:14 fredm Exp $
+ $Id: fuse.c,v 1.133 2007/02/02 16:21:51 pak21 Exp $
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
@@ -19,8 +19,7 @@
Author contact information:
- E-mail: pak...@sr...
- Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+ E-mail: phi...@sh...
*/
@@ -92,12 +91,6 @@
/* Is Spectrum emulation currently paused, and if so, how many times? */
int fuse_emulation_paused;
-/* Are we going to try and use the sound card; this differs from
- sound.c:sound_enabled in that this gives a desire, whereas sound_enabled
- is an actual state; when the Spectrum emulation is not running, this
- stores whether we try to reenable the sound card afterwards */
-int fuse_sound_in_use;
-
/* The creator information we'll store in file formats that support this */
libspectrum_creator *fuse_creator;
@@ -243,16 +236,6 @@
z80_init();
- fuse_sound_in_use = 0;
- if( settings_current.sound && settings_current.emulation_speed == 100 )
- sound_init( settings_current.sound_device );
-
- if( sound_enabled ) {
- fuse_sound_in_use = 1;
- } else {
- settings_current.sound = 0;
- }
-
if( timer_init() ) return 1;
error = timer_estimate_reset(); if( error ) return error;
@@ -383,7 +366,7 @@
printf( "\n" );
fuse_show_version();
printf(
- "Copyright (c) 1999-2005 Philip Kendall <pak...@sr...>\n"
+ "Copyright (c) 1999-2005 Philip Kendall <phi...@sh...>\n"
"and others; see the file 'AUTHORS' for more details.\n"
"\n"
"This program is distributed in the hope that it will be useful,\n"
@@ -428,43 +411,6 @@
"--version Print version number and exit.\n\n" );
}
-/* Start sound output */
-void
-fuse_sound_enable(void)
-{
- /* No sound if fastloading in progress */
- if( settings_current.fastload && tape_is_playing() ) return;
-
- /* If we now want sound, enable it */
- if( settings_current.sound && settings_current.emulation_speed == 100 ) {
-
- sound_init( settings_current.sound_device );
- sound_ay_reset();
-
- /* If the sound code couldn't re-initialise, fall back to the
- signal based routines */
- if( !sound_enabled ) {
- /* Increment pause_count, report, decrement pause_count
- * (i.e. avoid the effects of fuse_emulation_{,un}pause).
- * Otherwise, we may be recursively reporting this error. */
- fuse_emulation_paused++;
- fuse_emulation_paused--;
- settings_current.sound = fuse_sound_in_use = 0;
-
- }
- fuse_sound_in_use = sound_enabled;
- } else if( fuse_sound_in_use ) {
- fuse_sound_in_use = 0;
- }
-}
-
-/* Stop sound output */
-void
-fuse_sound_disable(void)
-{
- if( sound_enabled ) sound_end();
-}
-
/* Stop all activities associated with actual Spectrum emulation */
int fuse_emulation_pause(void)
{
@@ -482,7 +428,7 @@
/* If we had sound enabled (and hence doing the speed regulation),
turn it off */
- if( sound_enabled ) sound_end();
+ sound_pause();
return 0;
}
@@ -496,11 +442,12 @@
decrement the pause count */
if( --fuse_emulation_paused ) return 0;
+ /* If we now want sound, enable it */
+ sound_unpause();
+
/* Restart speed estimation with no information */
error = timer_estimate_reset(); if( error ) return error;
- fuse_sound_enable();
-
return 0;
}
@@ -763,6 +710,7 @@
simpleide_end();
zxatasp_end();
zxcf_end();
+ if1_end();
divide_end();
machine_end();
Modified: vendor/fuse/current/fuse.h
===================================================================
--- vendor/fuse/current/fuse.h 2007-02-04 08:40:22 UTC (rev 297)
+++ vendor/fuse/current/fuse.h 2007-02-04 11:14:46 UTC (rev 298)
@@ -1,7 +1,7 @@
/* fuse.h: Variables exported from the main file
Copyright (c) 2000-2003 Philip Kendall
- $Id: fuse.h,v 1.18 2006/07/15 17:33:58 pak21 Exp $
+ $Id: fuse.h,v 1.20 2007/02/02 16:21:51 pak21 Exp $
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
@@ -19,8 +19,7 @@
Author contact information:
- E-mail: pak...@sr...
- Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+ E-mail: phi...@sh...
*/
@@ -42,13 +41,8 @@
int fuse_emulation_pause(void); /* Stop and start emulation */
int fuse_emulation_unpause(void);
-void fuse_sound_enable(); /* Start sound output */
-void fuse_sound_disable(); /* Stop sound output */
-
void fuse_abort( void ) GCC_NORETURN; /* Emergency shutdown */
-extern int fuse_sound_in_use; /* Are we trying to produce sound? */
-
extern libspectrum_creator *fuse_creator; /* Creator information for file
formats which support this */
Modified: vendor/fuse/current/hacking/ChangeLog
===================================================================
--- vendor/fuse/current/hacking/ChangeLog 2007-02-04 08:40:22 UTC (rev 297)
+++ vendor/fuse/current/hacking/ChangeLog 2007-02-04 11:14:46 UTC (rev 298)
@@ -1481,3 +1481,47 @@
Stuart Brady)
20061217 machine.c: load rom into correct memory bank (fixes If1 ROM paging)
(Fred).
+20061217 menu.c,rzx.[ch]: reset rzx_instructions_offset on rollback to fix
+ replay of rolled back recordings (and some refactoring).
+20061222 sound/sdlsound.c: clear sound fifo before closing (Fred).
+20061222 Makefile.am,configure.in,sound/{Makefile.am,coreaudiosound.c,
+ lowlevel.h,sfifo.c},timer.c: add CoreAudio sound driver for Mac OS X
+ (Fred).
+20061223 configure.in: fix CoreAudio comment (Fred).
+20061223 configure.in: fix typo in above! (Fred).
+20070101 menu_data.c,ui.c,man/fuse.1: change capitalisation of
+ "Insert snapshot" command and document rollback commands.
+20070106 tape.c: support "no edge", "level low" and "level high" from
+ tape edges.
+20070111 tape.c: display vaguely useful information in the tape browser for
+ generalised data blocks.
+20070113 ChangeLog: bring up to date.
+20070115 fuse.[ch],machine.c,sound.[ch],tape.c: make the sound lifecycle be
+ treated more like the uidisplay - initialised and ended based on machine
+ lifecycle (fixes bug #1582087) (Fred).
+20070115 ChangeLog: add reference to new CoreAudio sound driver (Fred).
+20070117 fuse.c, if1.[ch]: free memory on exit. Use C89-style struct
+ initialisation (patch #1637020) (Gergely Szasz).
+20070120 if1.c: reduce magic number count.
+20070122 display.c: inline get_beam_position and display_dirty_chunk for more
+ speed (Fred).
+20070128 settings.dat,ui/options.dat,ui/gtk/gtkdisplay.c,ui/sdl/sdldisplay.c,
+ ui/scaler/{scaler.[ch],scaler_internals.h,scalers.c}: add new PAL TV
+ scalers that attempt to reproduce TV-esque colour reproduction (patch
+ #1537920) (Gergely Szasz).
+20070128 ChangeLog,man/fuse.1: add information about PAL scalers (Fred).
+20070128 ui/{fb/fbdisplay.c,ggi/ggidisplay.c,gtk/gtkdisplay.c,
+ svga/svgadisplay.c,win32/win32display.c,xlib/xdisplay.c}: fix hires
+ Timex display (Fred).
+20070128 man/fuse.1: updates.
+20070129 man/fuse.1: add documentation for "MDR cartridge len" and "Snap
+ joystick prompt" (Fred).
+20070129 ui/scaler/scalers.c: corrections to YUV to RGB conversions etc.
+ (more from patch #1537920) (Gergely Szasz).
+20070202 <almost everything>: change my e-mail address to @shadowmagic and
+ remove my postal address.
+20070202 TAG: Release-0_8_0-trunk
+20070202 BRANCH: Release-0_8_0-branch
+20070202 TAG: Release-0_8_0-pre1 (Release-0_8_0-branch)
+20070204 sound.c: don't disable sound completely if we don't enable sound
+ after an unpause (fixes bug #1648246) (Fred).
Modified: vendor/fuse/current/hacking/Makefile.am
===================================================================
--- vendor/fuse/current/hacking/Makefile.am 2007-02-04 08:40:22 UTC (rev 297)
+++ vendor/fuse/current/hacking/Makefile.am 2007-02-04 11:14:46 UTC (rev 298)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2002 Philip Kendall
-## $Id: Makefile.am,v 1.1 2002/08/18 14:14:07 pak21 Exp $
+## $Id: Makefile.am,v 1.2 2007/02/02 16:21:53 pak21 Exp $
## 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
@@ -19,8 +19,7 @@
##
## Author contact information:
##
-## E-mail: pak...@sr...
-## Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+## E-mail: phi...@sh...
AUTOMAKE_OPTIONS = foreign
Modified: vendor/fuse/current/hacking/cvs-tags
===================================================================
--- vendor/fuse/current/hacking/cvs-tags 2007-02-04 08:40:22 UTC (rev 297)
+++ vendor/fuse/current/hacking/cvs-tags 2007-02-04 11:14:46 UTC (rev 298)
@@ -1,6 +1,6 @@
CVS tags for Fuse
-$Id: cvs-tags,v 1.31 2006/08/25 03:16:05 pak21 Exp $
+$Id: cvs-tags,v 1.32 2007/02/02 17:16:19 pak21 Exp $
| Release-0_3_1
| Release-0_3_2pre1
@@ -141,4 +141,11 @@
| |
| | Release-0_7_0-disciple-branch
|
+| Release-0_8_0-trunk
+|
++-\
+| | Release-0_8_0-pre1
+| |
+| | Release-0_8_0-branch
+|
HEAD
Modified: vendor/fuse/current/ide.c
===================================================================
--- vendor/fuse/current/ide.c 2007-02-04 08:40:22 UTC (rev 297)
+++ vendor/fuse/current/ide.c 2007-02-04 11:14:46 UTC (rev 298)
@@ -1,7 +1,7 @@
/* ide.c: Generic routines shared between the various IDE devices
Copyright (c) 2005 Philip Kendall
- $Id: ide.c,v 1.3 2005/02/19 18:02:28 pak21 Exp $
+ $Id: ide.c,v 1.4 2007/02/02 16:21:51 pak21 Exp $
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
@@ -19,8 +19,7 @@
Author contact information:
- E-mail: Philip Kendall <pak...@sr...>
- Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+ E-mail: Philip Kendall <phi...@sh...>
*/
Modified: vendor/fuse/current/ide.h
===================================================================
--- vendor/fuse/current/ide.h 2007-02-04 08:40:22 UTC (rev 297)
+++ vendor/fuse/current/ide.h 2007-02-04 11:14:46 UTC (rev 298)
@@ -1,7 +1,7 @@
/* ide.h: Generic routines shared between the various IDE devices
Copyright (c) 2005 Philip Kendall
- $Id: ide.h,v 1.3 2005/02/19 18:02:28 pak21 Exp $
+ $Id: ide.h,v 1.4 2007/02/02 16:21:51 pak21 Exp $
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
@@ -19,8 +19,7 @@
Author contact information:
- E-mail: Philip Kendall <pak...@sr...>
- Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+ E-mail: Philip Kendall <phi...@sh...>
*/
Modified: vendor/fuse/current/if1.c
===================================================================
--- vendor/fuse/current/if1.c 2007-02-04 08:40:22 UTC (rev 297)
+++ vendor/fuse/current/if1.c 2007-02-04 11:14:46 UTC (rev 298)
@@ -1,7 +1,7 @@
/* if2.c: Interface I handling routines
- Copyright (c) 2004-2005 Gergely Szasz, Philip Kendall
+ Copyright (c) 2004-2007 Gergely Szasz, Philip Kendall
- $Id: if1.c,v 1.12 2006/10/21 05:28:33 fredm Exp $
+ $Id: if1.c,v 1.14 2007/01/20 17:54:51 pak21 Exp $
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
@@ -71,13 +71,13 @@
int fd_r; /* file descriptor for reading bytes or bits RS232 */
int fd_t; /* file descriptor for writing bytes or bits RS232 */
int fd_net; /* file descriptor for rw bytes or bits SinclairNET */
- int rs232_mode; /* comunication mode: RS232_RAW, RS232_INT */
- int s_net_mode; /* comunication mode: S_NET_RAW, S_NET_INT */
+ int rs232_mode; /* communication mode: RS232_RAW, RS232_INT */
+ int s_net_mode; /* communication mode: S_NET_RAW, S_NET_INT */
int status; /* if1_ula/SinclairNET */
- int comms_data; /* the previouse data comms state */
- int comms_clk; /* the previouse data comms state */
- int cts; /* CTS */
- int dtr; /* DTR */
+ int comms_data; /* the previous data comms state */
+ int comms_clk; /* the previous data comms state */
+ int cts; /* CTS of peripheral */
+ int dtr; /* DTR of peripheral */
int tx; /* TxD the name is very kind, because this is the read end of
the TxD wire of DATA machine (really RxD the view of
spectrum */
@@ -104,29 +104,9 @@
unsigned int mdr_seed;
int rnd_factor = ( ( RAND_MAX >> 2 ) << 2 ) / 19 + 1;
-static microdrive_t microdrive[8] = {
- { .filename = NULL, .inserted = 0, .modified = 0 },
- { .filename = NULL, .inserted = 0, .modified = 0 },
- { .filename = NULL, .inserted = 0, .modified = 0 },
- { .filename = NULL, .inserted = 0, .modified = 0 },
- { .filename = NULL, .inserted = 0, .modified = 0 },
- { .filename = NULL, .inserted = 0, .modified = 0 },
- { .filename = NULL, .inserted = 0, .modified = 0 },
- { .filename = NULL, .inserted = 0, .modified = 0 }
-}; /* We have 8 microdrive */
+static microdrive_t microdrive[8]; /* We have 8 microdrive */
+static if1_ula_t if1_ula;
-static if1_ula_t if1_ula = {
- .fd_r = -1,
- .fd_t = -1,
- .rs232_mode = RS232_INT,
- .dtr = 0,
- .comms_clk = 0,
- .comms_data = 0, /* realy? */
- .fd_net = -1,
- .s_net_mode = S_NET_INT,
- .net = 0,
-};
-
static void microdrives_reset( void );
static void microdrives_restart( void );
static void increment_head( int m );
@@ -213,15 +193,42 @@
{
size_t i;
+ if1_ula.fd_r = -1;
+ if1_ula.fd_t = -1;
+ if1_ula.rs232_mode = RS232_INT;
+ if1_ula.dtr = 0;
+ if1_ula.comms_clk = 0;
+ if1_ula.comms_data = 0; /* really? */
+ if1_ula.fd_net = -1;
+ if1_ula.s_net_mode = S_NET_INT;
+ if1_ula.net = 0;
+
for( i = 0; i < 8; i++ ) {
libspectrum_error error =
libspectrum_microdrive_alloc( &( microdrive[i].cartridge ) );
if( error ) return error;
+ microdrive[i].filename = NULL;
+ microdrive[i].inserted = 0;
+ microdrive[i].modified = 0;
}
return 0;
}
+libspectrum_error
+if1_end( void )
+{
+ size_t i;
+
+ for( i = 0; i < 8; i++ ) {
+ libspectrum_error error =
+ libspectrum_microdrive_free( microdrive[i].cartridge );
+ if( error ) return error;
+ }
+
+ return LIBSPECTRUM_ERROR_NONE;
+}
+
void
if1_update_menu( void )
{
@@ -714,16 +721,16 @@
int m;
for( m = 0; m < 8; m++ ) {
- while( ( microdrive[m].head_pos % 543 ) != 0 &&
- ( microdrive[m].head_pos % 543 ) != 15 )
+ while( ( microdrive[m].head_pos % LIBSPECTRUM_MICRODRIVE_BLOCK_LEN ) != 0 &&
+ ( microdrive[m].head_pos % LIBSPECTRUM_MICRODRIVE_BLOCK_LEN ) != LIBSPECTRUM_MICRODRIVE_HEAD_LEN )
increment_head( m ); /* put head in the start of a block */
microdrive[m].transfered = 0; /* reset current number of bytes written */
- if( ( microdrive[m].head_pos % 543 ) == 0 ) {
- microdrive[m].max_bytes = 15; /* up to 15 bytes for header blocks */
+ if( ( microdrive[m].head_pos % LIBSPECTRUM_MICRODRIVE_BLOCK_LEN ) == 0 ) {
+ microdrive[m].max_bytes = LIBSPECTRUM_MICRODRIVE_HEAD_LEN; /* up to 15 bytes for header blocks */
} else {
- microdrive[m].max_bytes = 528; /* up to 528 bytes for data blocks */
+ microdrive[m].max_bytes = LIBSPECTRUM_MICRODRIVE_HEAD_LEN + LIBSPECTRUM_MICRODRIVE_DATA_LEN + 1; /* up to 528 bytes for data blocks */
}
}
}
@@ -760,7 +767,7 @@
/ rnd_factor;
} else
len = settings_current.mdr_len = settings_current.mdr_len < 10 ? 10 :
- settings_current.mdr_len > 254 ? 254 : settings_current.mdr_len;
+ settings_current.mdr_len > LIBSPECTRUM_MICRODRIVE_BLOCK_MAX ? LIBSPECTRUM_MICRODRIVE_BLOCK_MAX : settings_current.mdr_len;
/* Erase the entire cartridge */
libspectrum_microdrive_set_cartridge_len( mdr->cartridge, len );
Modified: vendor/fuse/current/if1.h
===================================================================
--- vendor/fuse/current/if1.h 2007-02-04 08:40:22 UTC (rev 297)
+++ vendor/fuse/current/if1.h 2007-02-04 11:14:46 UTC (rev 298)
@@ -1,7 +1,7 @@
/* if2.c: Interface I handling routines
Copyright (c) 2004-2005 Gergely Szasz, Philip Kendall
- $Id: if1.h,v 1.5 2005/01/02 18:39:11 pak21 Exp $
+ $Id: if1.h,v 1.6 2007/01/17 21:33:44 pak21 Exp $
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
@@ -33,6 +33,7 @@
extern int if1_available;
int if1_init( void );
+libspectrum_error if1_end( void );
int if1_reset( void );
void if1_page( void );
Modified: vendor/fuse/current/if2.c
===================================================================
--- vendor/fuse/current/if2.c 2007-02-04 08:40:22 UTC (rev 297)
+++ vendor/fuse/current/if2.c 2007-02-04 11:14:46 UTC (rev 298)
@@ -2,7 +2,7 @@
Copyright (c) 2003 Darren Salt, Fredrick Meunier, Philip Kendall
Copyright (c) 2004 Fredrick Meunier
- $Id: if2.c,v 1.8 2006/10/21 05:28:33 fredm Exp $
+ $Id: if2.c,v 1.9 2007/02/02 16:21:51 pak21 Exp $
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
@@ -20,8 +20,7 @@
Author contact information:
- E-mail: pak...@sr...
- Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+ E-mail: phi...@sh...
Darren: li...@yo...
Fred: fr...@sp...
Modified: vendor/fuse/current/if2.h
===================================================================
--- vendor/fuse/current/if2.h 2007-02-04 08:40:22 UTC (rev 297)
+++ vendor/fuse/current/if2.h 2007-02-04 11:14:46 UTC (rev 298)
@@ -1,7 +1,7 @@
/* if2.c: Interface II cartridge handling routines
Copyright (c) 2004 Fredrick Meunier
- $Id: if2.h,v 1.4 2004/06/06 22:31:14 pak21 Exp $
+ $Id: if2.h,v 1.5 2007/02/02 16:21:51 pak21 Exp $
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
@@ -19,8 +19,7 @@
Author contact information:
- Philip: pak...@sr...
- Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+ Philip: phi...@sh...
Fred: fr...@sp...
Modified: vendor/fuse/current/input.c
===================================================================
--- vendor/fuse/current/input.c 2007-02-04 08:40:22 UTC (rev 297)
+++ vendor/fuse/current/input.c 2007-02-04 11:14:46 UTC (rev 298)
@@ -1,7 +1,7 @@
/* input.c: generalised input events layer for Fuse
Copyright (c) 2004 Philip Kendall
- $Id: input.c,v 1.17 2005/06/06 14:20:17 fredm Exp $
+ $Id: input.c,v 1.18 2007/02/02 16:21:51 pak21 Exp $
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
@@ -19,8 +19,7 @@
Author contact information:
- E-mail: pak...@sr...
- Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+ E-mail: phi...@sh...
*/
Modified: vendor/fuse/current/input.h
===================================================================
--- vendor/fuse/current/input.h 2007-02-04 08:40:22 UTC (rev 297)
+++ vendor/fuse/current/input.h 2007-02-04 11:14:46 UTC (rev 298)
@@ -1,7 +1,7 @@
/* input.h: generalised input events layer for Fuse
Copyright (c) 2004 Philip Kendall
- $Id: input.h,v 1.8 2005/02/23 21:21:13 pak21 Exp $
+ $Id: input.h,v 1.9 2007/02/02 16:21:51 pak21 Exp $
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
@@ -19,8 +19,7 @@
Author contact information:
- E-mail: pak...@sr...
- Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+ E-mail: phi...@sh...
*/
Modified: vendor/fuse/current/joystick.c
===================================================================
--- vendor/fuse/current/joystick.c 2007-02-04 08:40:22 UTC (rev 297)
+++ vendor/fuse/current/joystick.c 2007-02-04 11:14:46 UTC (rev 298)
@@ -2,7 +2,7 @...
[truncated message content] |
