[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx: [457] vendor/fuse-emulator/current
Brought to you by:
fredm
|
From: <fr...@us...> - 2007-10-26 10:14:34
|
Revision: 457
http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=457&view=rev
Author: fredm
Date: 2007-10-26 03:14:37 -0700 (Fri, 26 Oct 2007)
Log Message:
-----------
Load . into vendor/fuse-emulator/current.
Modified Paths:
--------------
vendor/fuse-emulator/current/fuse/ChangeLog
vendor/fuse-emulator/current/fuse/Makefile.am
vendor/fuse-emulator/current/fuse/ay.c
vendor/fuse-emulator/current/fuse/compat/Makefile.am
vendor/fuse-emulator/current/fuse/compat/amiga/Makefile.am
vendor/fuse-emulator/current/fuse/compat/amiga/paths.c
vendor/fuse-emulator/current/fuse/compat/morphos/Makefile.am
vendor/fuse-emulator/current/fuse/compat/morphos/osname.c
vendor/fuse-emulator/current/fuse/compat/unix/Makefile.am
vendor/fuse-emulator/current/fuse/compat/unix/osname.c
vendor/fuse-emulator/current/fuse/compat/unix/paths.c
vendor/fuse-emulator/current/fuse/compat/win32/Makefile.am
vendor/fuse-emulator/current/fuse/compat/win32/osname.c
vendor/fuse-emulator/current/fuse/compat/win32/paths.c
vendor/fuse-emulator/current/fuse/compat.h
vendor/fuse-emulator/current/fuse/configure.in
vendor/fuse-emulator/current/fuse/debugger/Makefile.am
vendor/fuse-emulator/current/fuse/debugger/breakpoint.c
vendor/fuse-emulator/current/fuse/debugger/command.c
vendor/fuse-emulator/current/fuse/debugger/commandy.y
vendor/fuse-emulator/current/fuse/debugger/debugger.c
vendor/fuse-emulator/current/fuse/debugger/debugger_internals.h
vendor/fuse-emulator/current/fuse/debugger/disassemble.c
vendor/fuse-emulator/current/fuse/debugger/expression.c
vendor/fuse-emulator/current/fuse/disk/Makefile.am
vendor/fuse-emulator/current/fuse/disk/plusd.c
vendor/fuse-emulator/current/fuse/disk/plusd.h
vendor/fuse-emulator/current/fuse/disk/wd_fdc.c
vendor/fuse-emulator/current/fuse/disk/wd_fdc.h
vendor/fuse-emulator/current/fuse/divide.c
vendor/fuse-emulator/current/fuse/event.c
vendor/fuse-emulator/current/fuse/event.h
vendor/fuse-emulator/current/fuse/fuse.c
vendor/fuse-emulator/current/fuse/hacking/ChangeLog
vendor/fuse-emulator/current/fuse/hacking/cvs-tags
vendor/fuse-emulator/current/fuse/if1.c
vendor/fuse-emulator/current/fuse/if2.c
vendor/fuse-emulator/current/fuse/keyboard.h
vendor/fuse-emulator/current/fuse/keysyms.pl
vendor/fuse-emulator/current/fuse/lib/Makefile.am
vendor/fuse-emulator/current/fuse/machine.c
vendor/fuse-emulator/current/fuse/machines/Makefile.am
vendor/fuse-emulator/current/fuse/machines/machines.h
vendor/fuse-emulator/current/fuse/machines/pentagon.c
vendor/fuse-emulator/current/fuse/machines/scorpion.c
vendor/fuse-emulator/current/fuse/machines/scorpion.h
vendor/fuse-emulator/current/fuse/machines/spec128.c
vendor/fuse-emulator/current/fuse/machines/spec128.h
vendor/fuse-emulator/current/fuse/machines/spec16.c
vendor/fuse-emulator/current/fuse/machines/spec48.c
vendor/fuse-emulator/current/fuse/machines/spec48.h
vendor/fuse-emulator/current/fuse/machines/spec_se.c
vendor/fuse-emulator/current/fuse/machines/specplus2.c
vendor/fuse-emulator/current/fuse/machines/specplus2a.c
vendor/fuse-emulator/current/fuse/machines/specplus3.c
vendor/fuse-emulator/current/fuse/machines/specplus3.h
vendor/fuse-emulator/current/fuse/machines/specplus3e.c
vendor/fuse-emulator/current/fuse/machines/tc2048.c
vendor/fuse-emulator/current/fuse/machines/tc2068.c
vendor/fuse-emulator/current/fuse/machines/tc2068.h
vendor/fuse-emulator/current/fuse/machines/ts2068.c
vendor/fuse-emulator/current/fuse/man/fuse.1
vendor/fuse-emulator/current/fuse/memory.h
vendor/fuse-emulator/current/fuse/menu.c
vendor/fuse-emulator/current/fuse/menu_data.dat
vendor/fuse-emulator/current/fuse/menu_data.pl
vendor/fuse-emulator/current/fuse/periph.c
vendor/fuse-emulator/current/fuse/periph.h
vendor/fuse-emulator/current/fuse/pokefinder/Makefile.am
vendor/fuse-emulator/current/fuse/pokefinder/pokefinder.c
vendor/fuse-emulator/current/fuse/printer.c
vendor/fuse-emulator/current/fuse/profile.c
vendor/fuse-emulator/current/fuse/profile.h
vendor/fuse-emulator/current/fuse/roms/Makefile.am
vendor/fuse-emulator/current/fuse/roms/plus3e-0.rom
vendor/fuse-emulator/current/fuse/roms/plus3e-1.rom
vendor/fuse-emulator/current/fuse/roms/plus3e-2.rom
vendor/fuse-emulator/current/fuse/rzx.c
vendor/fuse-emulator/current/fuse/settings.dat
vendor/fuse-emulator/current/fuse/settings.pl
vendor/fuse-emulator/current/fuse/snapshot.c
vendor/fuse-emulator/current/fuse/sound/Makefile.am
vendor/fuse-emulator/current/fuse/sound/alsasound.c
vendor/fuse-emulator/current/fuse/sound/aosound.c
vendor/fuse-emulator/current/fuse/sound/dxsound.c
vendor/fuse-emulator/current/fuse/sound/hpsound.c
vendor/fuse-emulator/current/fuse/sound/nullsound.c
vendor/fuse-emulator/current/fuse/sound/osssound.c
vendor/fuse-emulator/current/fuse/sound/sdlsound.c
vendor/fuse-emulator/current/fuse/sound/sfifo.c
vendor/fuse-emulator/current/fuse/sound/sunsound.c
vendor/fuse-emulator/current/fuse/sound.c
vendor/fuse-emulator/current/fuse/spectrum.h
vendor/fuse-emulator/current/fuse/tape.c
vendor/fuse-emulator/current/fuse/timer/Makefile.am
vendor/fuse-emulator/current/fuse/timer/timer.c
vendor/fuse-emulator/current/fuse/timer/unix.c
vendor/fuse-emulator/current/fuse/ui/Makefile.am
vendor/fuse-emulator/current/fuse/ui/fb/Makefile.am
vendor/fuse-emulator/current/fuse/ui/fb/fbdisplay.c
vendor/fuse-emulator/current/fuse/ui/fb/fbjoystick.c
vendor/fuse-emulator/current/fuse/ui/fb/fbkeyboard.c
vendor/fuse-emulator/current/fuse/ui/fb/fbmouse.c
vendor/fuse-emulator/current/fuse/ui/fb/fbui.c
vendor/fuse-emulator/current/fuse/ui/gtk/Makefile.am
vendor/fuse-emulator/current/fuse/ui/gtk/binary.c
vendor/fuse-emulator/current/fuse/ui/gtk/browse.c
vendor/fuse-emulator/current/fuse/ui/gtk/confirm.c
vendor/fuse-emulator/current/fuse/ui/gtk/debugger.c
vendor/fuse-emulator/current/fuse/ui/gtk/fileselector.c
vendor/fuse-emulator/current/fuse/ui/gtk/gtkdisplay.c
vendor/fuse-emulator/current/fuse/ui/gtk/gtkjoystick.c
vendor/fuse-emulator/current/fuse/ui/gtk/gtkkeyboard.c
vendor/fuse-emulator/current/fuse/ui/gtk/gtkmouse.c
vendor/fuse-emulator/current/fuse/ui/gtk/gtkui.c
vendor/fuse-emulator/current/fuse/ui/gtk/memory.c
vendor/fuse-emulator/current/fuse/ui/gtk/options-header.pl
vendor/fuse-emulator/current/fuse/ui/gtk/options.pl
vendor/fuse-emulator/current/fuse/ui/gtk/picture.c
vendor/fuse-emulator/current/fuse/ui/gtk/pokefinder.c
vendor/fuse-emulator/current/fuse/ui/gtk/rollback.c
vendor/fuse-emulator/current/fuse/ui/gtk/roms.c
vendor/fuse-emulator/current/fuse/ui/gtk/statusbar.c
vendor/fuse-emulator/current/fuse/ui/options.dat
vendor/fuse-emulator/current/fuse/ui/scaler/Makefile.am
vendor/fuse-emulator/current/fuse/ui/scaler/scaler.c
vendor/fuse-emulator/current/fuse/ui/scaler/scalers.c
vendor/fuse-emulator/current/fuse/ui/sdl/Makefile.am
vendor/fuse-emulator/current/fuse/ui/sdl/sdldisplay.c
vendor/fuse-emulator/current/fuse/ui/sdl/sdljoystick.c
vendor/fuse-emulator/current/fuse/ui/sdl/sdlkeyboard.c
vendor/fuse-emulator/current/fuse/ui/sdl/sdlui.c
vendor/fuse-emulator/current/fuse/ui/svga/Makefile.am
vendor/fuse-emulator/current/fuse/ui/svga/svgadisplay.c
vendor/fuse-emulator/current/fuse/ui/svga/svgajoystick.c
vendor/fuse-emulator/current/fuse/ui/svga/svgakeyboard.c
vendor/fuse-emulator/current/fuse/ui/svga/svgaui.c
vendor/fuse-emulator/current/fuse/ui/ui.h
vendor/fuse-emulator/current/fuse/ui/uijoystick.c
vendor/fuse-emulator/current/fuse/ui/win32/Makefile.am
vendor/fuse-emulator/current/fuse/ui/win32/debugger.c
vendor/fuse-emulator/current/fuse/ui/win32/error.c
vendor/fuse-emulator/current/fuse/ui/win32/menu_data.c
vendor/fuse-emulator/current/fuse/ui/win32/menu_data.h
vendor/fuse-emulator/current/fuse/ui/win32/menu_data.rc
vendor/fuse-emulator/current/fuse/ui/win32/pokefinder.c
vendor/fuse-emulator/current/fuse/ui/win32/statusbar.c
vendor/fuse-emulator/current/fuse/ui/win32/win32display.c
vendor/fuse-emulator/current/fuse/ui/win32/win32display.h
vendor/fuse-emulator/current/fuse/ui/win32/win32internals.h
vendor/fuse-emulator/current/fuse/ui/win32/win32keyboard.c
vendor/fuse-emulator/current/fuse/ui/win32/win32ui.c
vendor/fuse-emulator/current/fuse/ui/xlib/Makefile.am
vendor/fuse-emulator/current/fuse/ui/xlib/xdisplay.c
vendor/fuse-emulator/current/fuse/ui/xlib/xerror.c
vendor/fuse-emulator/current/fuse/ui/xlib/xjoystick.c
vendor/fuse-emulator/current/fuse/ui/xlib/xkeyboard.c
vendor/fuse-emulator/current/fuse/ui/xlib/xui.c
vendor/fuse-emulator/current/fuse/ui.c
vendor/fuse-emulator/current/fuse/utils.c
vendor/fuse-emulator/current/fuse/utils.h
vendor/fuse-emulator/current/fuse/widget/Makefile.am
vendor/fuse-emulator/current/fuse/widget/browse.c
vendor/fuse-emulator/current/fuse/widget/debugger.c
vendor/fuse-emulator/current/fuse/widget/error.c
vendor/fuse-emulator/current/fuse/widget/filesel.c
vendor/fuse-emulator/current/fuse/widget/memory.c
vendor/fuse-emulator/current/fuse/widget/menu.c
vendor/fuse-emulator/current/fuse/widget/options.pl
vendor/fuse-emulator/current/fuse/widget/picture.c
vendor/fuse-emulator/current/fuse/widget/pokefinder.c
vendor/fuse-emulator/current/fuse/widget/query.c
vendor/fuse-emulator/current/fuse/widget/roms.c
vendor/fuse-emulator/current/fuse/widget/select.c
vendor/fuse-emulator/current/fuse/widget/text.c
vendor/fuse-emulator/current/fuse/widget/widget.c
vendor/fuse-emulator/current/fuse/widget/widget.h
vendor/fuse-emulator/current/fuse/widget/widget_internals.h
vendor/fuse-emulator/current/fuse/z80/Makefile.am
vendor/fuse-emulator/current/fuse/z80/coretest.c
vendor/fuse-emulator/current/fuse/z80/z80.c
vendor/fuse-emulator/current/fuse/z80/z80.pl
vendor/fuse-emulator/current/fuse/z80/z80_ops.c
vendor/fuse-emulator/current/fuse-utils/ChangeLog
vendor/fuse-emulator/current/fuse-utils/Makefile.am
vendor/fuse-emulator/current/fuse-utils/hacking/ChangeLog
vendor/fuse-emulator/current/fuse-utils/listbasic.c
vendor/fuse-emulator/current/fuse-utils/man/listbasic.1
vendor/fuse-emulator/current/fuse-utils/man/rzxtool.1
vendor/fuse-emulator/current/fuse-utils/rzxtool.c
vendor/fuse-emulator/current/fusetest/Makefile
vendor/fuse-emulator/current/fusetest/fusetest.asm
vendor/fuse-emulator/current/fusetest/print.asm
vendor/fuse-emulator/current/fusetest/sync.asm
vendor/fuse-emulator/current/fusetest/tests.asm
vendor/fuse-emulator/current/libspectrum/ChangeLog
vendor/fuse-emulator/current/libspectrum/Makefile.am
vendor/fuse-emulator/current/libspectrum/configure.in
vendor/fuse-emulator/current/libspectrum/csw.c
vendor/fuse-emulator/current/libspectrum/doc/libspectrum.txt
vendor/fuse-emulator/current/libspectrum/generate.pl.in
vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog
vendor/fuse-emulator/current/libspectrum/libspectrum.c
vendor/fuse-emulator/current/libspectrum/libspectrum.h.in
vendor/fuse-emulator/current/libspectrum/plusd.c
vendor/fuse-emulator/current/libspectrum/rzx.c
vendor/fuse-emulator/current/libspectrum/sna.c
vendor/fuse-emulator/current/libspectrum/szx.c
vendor/fuse-emulator/current/libspectrum/tape.c
vendor/fuse-emulator/current/libspectrum/test/Makefile.am
vendor/fuse-emulator/current/libspectrum/test/invalid-warajevo-blockoffset.tap
vendor/fuse-emulator/current/libspectrum/test/test.c
vendor/fuse-emulator/current/libspectrum/timings.c
vendor/fuse-emulator/current/libspectrum/z80.c
vendor/fuse-emulator/current/website/.inc/fuse.inc
vendor/fuse-emulator/current/website/COPYING
vendor/fuse-emulator/current/website/fuse.php
Added Paths:
-----------
vendor/fuse-emulator/current/fuse/bitmap.h
vendor/fuse-emulator/current/fuse/disk/beta.c
vendor/fuse-emulator/current/fuse/disk/beta.h
vendor/fuse-emulator/current/fuse/disk/crc.c
vendor/fuse-emulator/current/fuse/disk/crc.h
vendor/fuse-emulator/current/fuse/disk/disk.c
vendor/fuse-emulator/current/fuse/disk/disk.h
vendor/fuse-emulator/current/fuse/disk/fdd.c
vendor/fuse-emulator/current/fuse/disk/fdd.h
vendor/fuse-emulator/current/fuse/machines/pentagon1024.c
vendor/fuse-emulator/current/fuse/roms/gluck.rom
vendor/fuse-emulator/current/fuse/ui/win32/options-header.pl
vendor/fuse-emulator/current/fuse/ui/win32/options-resource.pl
vendor/fuse-emulator/current/fuse/ui/win32/options.pl
vendor/fuse-emulator/current/fuse/z80/z80_checks.h
vendor/fuse-emulator/current/fuse-mgt/
vendor/fuse-emulator/current/fuse-mgt/COPYING
vendor/fuse-emulator/current/fuse-mgt/Makefile
vendor/fuse-emulator/current/fuse-mgt/README
vendor/fuse-emulator/current/fuse-mgt/fuse-mgt.c
vendor/fuse-emulator/current/fusetest/contention.asm
vendor/fuse-emulator/current/fusetest/framelength.asm
vendor/fuse-emulator/current/fusetest/guessmachine.asm
vendor/fuse-emulator/current/libspectrum/test/complete-tzx.pl
vendor/fuse-emulator/current/libspectrum/test/edges.c
vendor/fuse-emulator/current/libspectrum/test/jump.tzx
vendor/fuse-emulator/current/libspectrum/test/loop2.tzx
vendor/fuse-emulator/current/libspectrum/test/test.h
vendor/fuse-emulator/current/libspectrum/test/test15.c
Removed Paths:
-------------
vendor/fuse-emulator/current/fuse/TODO
vendor/fuse-emulator/current/fuse/trdos.c
vendor/fuse-emulator/current/fuse/trdos.h
vendor/fuse-emulator/current/fuse/ui/ggi/
Modified: vendor/fuse-emulator/current/fuse/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse/ChangeLog 2007-10-26 10:12:08 UTC (rev 456)
+++ vendor/fuse-emulator/current/fuse/ChangeLog 2007-10-26 10:14:37 UTC (rev 457)
@@ -4,15 +4,21 @@
* New features:
* Add +D disk interface support (Stuart Brady).
+ * New floppy disk controller emulation for +D and Beta disk
+ interface emulation (Gergely Szasz and Stuart Brady).
+ * Add Pentagon 512 and Pentagon 1024 emulation (Q-Master).
* Add Hi-Fi beeper for improved reproduction of multi-channel beeper
tunes (e.g. Fairlight 2, Wham - the Music Box) (Fredrick Meunier).
- * Add support for saving tape images without using tape traps (Fredrick
- Meunier).
+ * Add support for saving tape images without using tape traps
+ (Fredrick Meunier).
* Add support for loading from WAV tape images (Fredrick Meunier).
* Add support for saving CSW tape images and TZX direct recording
blocks (Fredrick Meunier).
- * Allow distinction between "soft" resets (activing the reset line on
- the Z80) and "hard" resets (pulling the power) (Philip Kendall).
+ * Allow distinction between "soft" resets (activating the reset line
+ on the Z80) and "hard" resets (pulling the power) (Philip Kendall).
+ * New ALSA sound driver (Gergely Szasz).
+ * AmigaOS support (Chris Young).
+ * MorphOS support (Q-Master).
* Emulation core improvements:
* Fix contention for LD?R, CP?R and IN?R (Philip Kendall; thanks,
@@ -23,6 +29,15 @@
* Separate out contention when MREQ isn't active, as the +2A/+3 ULA
applies contention only when MREQ is active (Philip Kendall).
+ * Miscellaneous:
+ * Removed the GTK 1.x UI (please note that GTK 2.x will remain
+ supported for the foreseeable future) (Philip Kendall).
+ * Enable Fuse to build in directories other than the source
+ directory itself (Philip Kendall).
+ * Updated X11 UI (Gergely Szasz).
+ * Updated Win32 UI (Stuart Brady).
+ * Man page fixes (Stuart Brady).
+
* Various other minor bugfixes.
2007-05-11 Philip Kendall <phi...@sh...>
@@ -486,7 +501,7 @@
* Changable emulation speed (Philip Kendall).
- * Change to lib765 0.3.0 for Mac OS X compatability
+ * Change to lib765 0.3.0 for Mac OS X compatibility
(Frederick Meunier).
* Reset the Timex's SCLD when loading snapshot (Philip Kendall,
@@ -602,8 +617,8 @@
* Add contention of memory and io ports. Should make multicolour
effects better (Philip Kendall).
- * Emulation of reading from unattached ports (eg #FF). Makes some
- more games (eg Sidewize) work (Philip Kendall).
+ * Emulation of reading from unattached ports (e.g. #FF). Makes some
+ more games (e.g. Sidewize) work (Philip Kendall).
* Add a keyboard picture -- see the Help menu (Philip Kendall,
Russell Marks).
@@ -663,12 +678,12 @@
* Various improvements to the widget dialog boxes: cursor keys,
Page Up, Page Down, Home and End all do what you would expect,
remove the use of `scandir' function to improve inter-Unix
- compatability, append `/' to directories to make them more
+ compatibility, append `/' to directories to make them more
obvious, stop the hangs if you tried to start a widget whilst
one was active. (Philip Kendall, Russell Marks).
* .z80 snapshots: deal with the case of the end marker being
- preceeded by 0x00 or 0x00 0xed (Philip Kendall).
+ preceded by 0x00 or 0x00 0xed (Philip Kendall).
* Lots of sound improvements (Russell Marks).
@@ -834,4 +849,4 @@
* Version 0.1.0 released.
-$Id: ChangeLog 3048 2007-07-07 13:26:48Z fredm $
+$Id: ChangeLog 3253 2007-10-26 02:02:17Z zubzero $
Modified: vendor/fuse-emulator/current/fuse/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/Makefile.am 2007-10-26 10:12:08 UTC (rev 456)
+++ vendor/fuse-emulator/current/fuse/Makefile.am 2007-10-26 10:14:37 UTC (rev 457)
@@ -1,7 +1,7 @@
-## Process this file with automake to produce Makefile.in
+# Process this file with automake to produce Makefile.in
## Copyright (c) 1999-2004 Philip Kendall
-## $Id: Makefile.am 3091 2007-08-04 16:44:45Z pak21 $
+## $Id: Makefile.am 3218 2007-10-21 23:25:23Z zubzero $
## 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
@@ -27,7 +27,7 @@
SUBDIRS = compat \
debugger \
- @DISK@ \
+ disk \
hacking \
lib \
machines \
@@ -52,6 +52,7 @@
pokefinder \
roms \
sound \
+ timer \
ui \
widget \
z80
@@ -88,7 +89,6 @@
sound.c \
spectrum.c \
tape.c \
- trdos.c \
ui.c \
uidisplay.c \
ula.c \
@@ -101,7 +101,7 @@
fuse_LDADD = debugger/libdebugger.a \
@UI_LIBS@ \
-@DISK_LIBS@ \
+disk/libdisk.a \
machines/libmachines.a \
pokefinder/libpokefinder.a \
sound/libsound.a \
@@ -118,11 +118,11 @@
@X_LIBS@ \
@XML_LIBS@ \
compat/libcompat.a \
-compat/unix/libcompatos.a \
+compat/@COMPAT_OSNAME@/libcompatos.a \
@WINDRES_OBJ@
fuse_DEPENDENCIES = @UI_LIBS@ \
- @DISK_LIBS@ \
+ disk/libdisk.a \
debugger/libdebugger.a \
machines/libmachines.a \
sound/libsound.a \
@@ -132,18 +132,19 @@
BUILT_SOURCES = settings.c settings.h
windres.o: windres.rc winfuse.ico
- @WINDRES@ windres.rc windres.o
+ @WINDRES@ -I$(srcdir) -I. $(srcdir)/windres.rc windres.o
settings.c: settings.pl settings.dat
- @PERL@ settings.pl settings.dat > settings.c
+ @PERL@ -I$(srcdir)/perl $(srcdir)/settings.pl $(srcdir)/settings.dat > $@.tmp && mv $@.tmp $@
settings.h: settings-header.pl settings.dat
- @PERL@ settings-header.pl settings.dat > settings.h
+ @PERL@ -I$(srcdir)/perl $(srcdir)/settings-header.pl $(srcdir)/settings.dat > $@.tmp && mv $@.tmp $@
INCLUDES = @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@ @DSK_CFLAGS@\
@XML_CFLAGS@ @SAMPLERATE_CFLAGS@ -DFUSEDATADIR="\"${pkgdatadir}\""
noinst_HEADERS = ay.h \
+ bitmap.h \
compat.h \
dck.h \
display.h \
@@ -172,7 +173,6 @@
sound.h \
spectrum.h \
tape.h \
- trdos.h \
utils.h \
joystick.h \
printer.h \
@@ -192,3 +192,6 @@
settings.pl \
settings-header.pl \
settings.dat
+
+CLEANFILES = settings.c \
+ settings.h
Deleted: vendor/fuse-emulator/current/fuse/TODO
===================================================================
--- vendor/fuse-emulator/current/fuse/TODO 2007-10-26 10:12:08 UTC (rev 456)
+++ vendor/fuse-emulator/current/fuse/TODO 2007-10-26 10:14:37 UTC (rev 457)
@@ -1,3 +0,0 @@
-TODO
-
-$Id: TODO 2026 2004-03-02 13:38:08Z pak21 $
Modified: vendor/fuse-emulator/current/fuse/ay.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ay.c 2007-10-26 10:12:08 UTC (rev 456)
+++ vendor/fuse-emulator/current/fuse/ay.c 2007-10-26 10:14:37 UTC (rev 457)
@@ -1,7 +1,7 @@
/* ay.c: AY-8-3912 routines
Copyright (c) 1999-2004 Philip Kendall
- $Id: ay.c 2993 2007-06-17 13:54:49Z pak21 $
+ $Id: ay.c 3213 2007-10-21 16:37:52Z 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
@@ -41,13 +41,14 @@
};
+static void ay_reset( int hard_reset );
static void ay_from_snapshot( libspectrum_snap *snap );
static void ay_to_snapshot( libspectrum_snap *snap );
static module_info_t ay_module_info = {
+ ay_reset,
NULL,
- NULL,
ay_from_snapshot,
ay_to_snapshot,
@@ -61,6 +62,15 @@
return 0;
}
+static void
+ay_reset( int hard_reset )
+{
+ ayinfo *ay = &machine_current->ay;
+
+ ay->current_register = 0;
+ memset( ay->registers, 0, sizeof( ay->registers ) );
+}
+
/* What happens when the AY register port (traditionally 0xfffd on the 128K
machines) is read from */
libspectrum_byte
Added: vendor/fuse-emulator/current/fuse/bitmap.h
===================================================================
--- vendor/fuse-emulator/current/fuse/bitmap.h (rev 0)
+++ vendor/fuse-emulator/current/fuse/bitmap.h 2007-10-26 10:14:37 UTC (rev 457)
@@ -0,0 +1,49 @@
+/* bitmap.h: Bitmap routines
+ Copyright (c) 2007 Stuart Brady
+
+ $Id: bitmap.h 3218 2007-10-21 23:25:23Z zubzero $
+
+ 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
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+ Author contact information:
+
+ Philip: phi...@sh...
+
+ Stuart: sd...@nt...
+
+*/
+
+#ifndef FUSE_BITMAP_H
+#define FUSE_BITMAP_H
+
+inline static void
+bitmap_set( libspectrum_byte *b, const size_t n )
+{
+ b[ n / 8 ] |= ( 1 << ( n % 8 ) );
+}
+
+inline static void
+bitmap_reset( libspectrum_byte *b, const size_t n )
+{
+ b[ n / 8 ] &= ~( 1 << ( n % 8 ) );
+}
+
+inline static int
+bitmap_test( const libspectrum_byte *b, const size_t n )
+{
+ return b[ n / 8 ] & ( 1 << ( n % 8 ) );
+}
+
+#endif /* #ifndef FUSE_BITMAP_H */
Modified: vendor/fuse-emulator/current/fuse/compat/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/Makefile.am 2007-10-26 10:12:08 UTC (rev 456)
+++ vendor/fuse-emulator/current/fuse/compat/Makefile.am 2007-10-26 10:14:37 UTC (rev 457)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2003-2007 Philip Kendall
-## $Id: Makefile.am 3091 2007-08-04 16:44:45Z pak21 $
+## $Id: Makefile.am 3115 2007-08-19 02:49:14Z 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
@@ -23,6 +23,8 @@
AUTOMAKE_OPTIONS = foreign
+AM_CPPFLAGS = -I$(srcdir)/..
+
SUBDIRS = @COMPAT_OSNAME@
DIST_SUBDIRS = amiga \
Modified: vendor/fuse-emulator/current/fuse/compat/amiga/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/amiga/Makefile.am 2007-10-26 10:12:08 UTC (rev 456)
+++ vendor/fuse-emulator/current/fuse/compat/amiga/Makefile.am 2007-10-26 10:14:37 UTC (rev 457)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2007 Philip Kendall
-## $Id: Makefile.am 3092 2007-08-04 19:20:58Z pak21 $
+## $Id: Makefile.am 3115 2007-08-19 02:49:14Z 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
@@ -23,6 +23,8 @@
AUTOMAKE_OPTIONS = foreign
+AM_CPPFLAGS = -I$(srcdir)/../..
+
noinst_LIBRARIES = libcompatos.a
libcompatos_a_SOURCES = ../unix/osname.c \
Modified: vendor/fuse-emulator/current/fuse/compat/amiga/paths.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/amiga/paths.c 2007-10-26 10:12:08 UTC (rev 456)
+++ vendor/fuse-emulator/current/fuse/compat/amiga/paths.c 2007-10-26 10:14:37 UTC (rev 457)
@@ -1,7 +1,7 @@
-/* paths.c: Path-related compatability routines
+/* paths.c: Path-related compatibility routines
Copyright (c) 1999-2007 Philip Kendall
- $Id: paths.c 3092 2007-08-04 19:20:58Z pak21 $
+ $Id: paths.c 3253 2007-10-26 02:02:17Z zubzero $
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
@@ -38,3 +38,10 @@
{
return "PROGDIR:settings";
}
+
+int
+compat_is_absolute_path( const char *path )
+{
+ /* Is this correct? */
+ return path[0] == '/';
+}
Modified: vendor/fuse-emulator/current/fuse/compat/morphos/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/morphos/Makefile.am 2007-10-26 10:12:08 UTC (rev 456)
+++ vendor/fuse-emulator/current/fuse/compat/morphos/Makefile.am 2007-10-26 10:14:37 UTC (rev 457)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2007 Philip Kendall
-## $Id: Makefile.am 3092 2007-08-04 19:20:58Z pak21 $
+## $Id: Makefile.am 3115 2007-08-19 02:49:14Z 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
@@ -23,6 +23,8 @@
AUTOMAKE_OPTIONS = foreign
+AM_CPPFLAGS = -I$(srcdir)/../..
+
noinst_LIBRARIES = libcompatos.a
libcompatos_a_SOURCES = osname.c \
Modified: vendor/fuse-emulator/current/fuse/compat/morphos/osname.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/morphos/osname.c 2007-10-26 10:12:08 UTC (rev 456)
+++ vendor/fuse-emulator/current/fuse/compat/morphos/osname.c 2007-10-26 10:14:37 UTC (rev 457)
@@ -1,7 +1,7 @@
/* osname.c: Get a representation of the OS we're running on
Copyright (c) 1999-2007 Philip Kendall
- $Id: osname.c 3091 2007-08-04 16:44:45Z pak21 $
+ $Id: osname.c 3139 2007-09-03 10:27:57Z 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
@@ -31,4 +31,6 @@
int compat_osname( char *buffer, size_t length )
{
snprintf( buffer, length, "%s %s %s", "MorphOS", "Pegasos", "1.4.4" );
+
+ return 0;
}
Modified: vendor/fuse-emulator/current/fuse/compat/unix/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/unix/Makefile.am 2007-10-26 10:12:08 UTC (rev 456)
+++ vendor/fuse-emulator/current/fuse/compat/unix/Makefile.am 2007-10-26 10:14:37 UTC (rev 457)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2007 Philip Kendall
-## $Id: Makefile.am 3092 2007-08-04 19:20:58Z pak21 $
+## $Id: Makefile.am 3115 2007-08-19 02:49:14Z 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
@@ -23,6 +23,8 @@
AUTOMAKE_OPTIONS = foreign
+AM_CPPFLAGS = -I$(srcdir)/../..
+
noinst_LIBRARIES = libcompatos.a
libcompatos_a_SOURCES = osname.c \
Modified: vendor/fuse-emulator/current/fuse/compat/unix/osname.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/unix/osname.c 2007-10-26 10:12:08 UTC (rev 456)
+++ vendor/fuse-emulator/current/fuse/compat/unix/osname.c 2007-10-26 10:14:37 UTC (rev 457)
@@ -1,7 +1,7 @@
/* osname.c: Get a representation of the OS we're running on
Copyright (c) 1999-2007 Philip Kendall
- $Id: osname.c 3094 2007-08-05 14:20:15Z fredm $
+ $Id: osname.c 3115 2007-08-19 02:49:14Z 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/compat/unix/paths.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/unix/paths.c 2007-10-26 10:12:08 UTC (rev 456)
+++ vendor/fuse-emulator/current/fuse/compat/unix/paths.c 2007-10-26 10:14:37 UTC (rev 457)
@@ -1,7 +1,7 @@
-/* paths.c: Path-related compatability routines
+/* paths.c: Path-related compatibility routines
Copyright (c) 1999-2007 Philip Kendall
- $Id: paths.c 3092 2007-08-04 19:20:58Z pak21 $
+ $Id: paths.c 3253 2007-10-26 02:02:17Z zubzero $
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
@@ -46,3 +46,9 @@
dir = getenv( "HOME" ); if( dir ) return dir;
return ".";
}
+
+int
+compat_is_absolute_path( const char *path )
+{
+ return path[0] == '/';
+}
Modified: vendor/fuse-emulator/current/fuse/compat/win32/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/win32/Makefile.am 2007-10-26 10:12:08 UTC (rev 456)
+++ vendor/fuse-emulator/current/fuse/compat/win32/Makefile.am 2007-10-26 10:14:37 UTC (rev 457)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2007 Philip Kendall
-## $Id: Makefile.am 3092 2007-08-04 19:20:58Z pak21 $
+## $Id: Makefile.am 3115 2007-08-19 02:49:14Z 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
@@ -23,6 +23,8 @@
AUTOMAKE_OPTIONS = foreign
+AM_CPPFLAGS = -I$(srcdir)/../..
+
noinst_LIBRARIES = libcompatos.a
libcompatos_a_SOURCES = osname.c \
Modified: vendor/fuse-emulator/current/fuse/compat/win32/osname.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/win32/osname.c 2007-10-26 10:12:08 UTC (rev 456)
+++ vendor/fuse-emulator/current/fuse/compat/win32/osname.c 2007-10-26 10:14:37 UTC (rev 457)
@@ -1,7 +1,7 @@
/* osname.c: Get a representation of the OS we're running on
Copyright (c) 1999-2007 Philip Kendall
- $Id: osname.c 3091 2007-08-04 16:44:45Z pak21 $
+ $Id: osname.c 3163 2007-09-06 21:41:45Z zubzero $
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
@@ -27,14 +27,17 @@
#include <windows.h>
+#include "ui/ui.h"
+
int compat_osname( char *osname, size_t length )
{
- OSVERSIONINFO buf;
- char *windows_name;
+ OSVERSIONINFO buf;
+ char *windows_name;
+ int error;
buf.dwOSVersionInfoSize = sizeof( buf );
- sys_error = GetVersionEx( &buf );
- if( sys_error == 0 ) {
+ error = GetVersionEx( &buf );
+ if( error == 0 ) {
ui_error( UI_ERROR_ERROR, "error getting system information." );
return 1;
}
@@ -46,9 +49,7 @@
default: windows_name = "unknown"; break;
}
- snprintf( osname, length,
- "gcrypt: %s\nlibspectrum: %s\nuname: Windows %s %d.%d build %d %s",
- gcrypt_version, libspectrum_version(),
+ snprintf( osname, length, "Windows %s %ld.%ld build %ld %s",
windows_name, buf.dwMajorVersion, buf.dwMinorVersion,
buf.dwBuildNumber, buf.szCSDVersion );
Modified: vendor/fuse-emulator/current/fuse/compat/win32/paths.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/win32/paths.c 2007-10-26 10:12:08 UTC (rev 456)
+++ vendor/fuse-emulator/current/fuse/compat/win32/paths.c 2007-10-26 10:14:37 UTC (rev 457)
@@ -1,7 +1,7 @@
-/* paths.c: Path-related compatability routines
+/* paths.c: Path-related compatibility routines
Copyright (c) 1999-2007 Philip Kendall
- $Id: paths.c 3092 2007-08-04 19:20:58Z pak21 $
+ $Id: paths.c 3253 2007-10-26 02:02:17Z zubzero $
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
@@ -50,3 +50,11 @@
dir = getenv( "WINDIR" ); if( dir ) return dir;
return ".";
}
+
+int
+compat_is_absolute_path( const char *path )
+{
+ if( path[0] == '\\' ) return 1;
+ if( path[0] && path[1] == ':' ) return 1;
+ return 0;
+}
Modified: vendor/fuse-emulator/current/fuse/compat.h
===================================================================
--- vendor/fuse-emulator/current/fuse/compat.h 2007-10-26 10:12:08 UTC (rev 456)
+++ vendor/fuse-emulator/current/fuse/compat.h 2007-10-26 10:14:37 UTC (rev 457)
@@ -1,7 +1,7 @@
/* compat.h: various compatibility bits
Copyright (c) 2003 Philip Kendall
- $Id: compat.h 3092 2007-08-04 19:20:58Z pak21 $
+ $Id: compat.h 3129 2007-08-30 12:46:32Z 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
@@ -75,5 +75,6 @@
int compat_osname( char *buffer, size_t length );
const char* compat_get_temp_path( void );
const char* compat_get_home_path( void );
+int compat_is_absolute_path( const char *path );
#endif /* #ifndef FUSE_COMPAT_H */
Modified: vendor/fuse-emulator/current/fuse/configure.in
===================================================================
--- vendor/fuse-emulator/current/fuse/configure.in 2007-10-26 10:12:08 UTC (rev 456)
+++ vendor/fuse-emulator/current/fuse/configure.in 2007-10-26 10:14:37 UTC (rev 457)
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-dnl $Id: configure.in 3093 2007-08-04 20:51:34Z pak21 $
+dnl $Id: configure.in 3253 2007-10-26 02:02:17Z zubzero $
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
@@ -335,14 +335,6 @@
lib/tape_se.szx
lib/tape_ts2068.szx])
-dnl LibDsk/lib765 prefix
-AC_ARG_WITH(disk-prefix,
-[ --with-disk-prefix=PFX where the LibDsk and/or lib765 libraries are installed (optional)],
-DSK_CFLAGS=-I$withval/include; DSKLIBS=-L$withval/lib,
-DSK_CFLAGS=""; DSK_LIBS="")
-ac_save_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $DSK_CFLAGS"
-
dnl Do we want +3 disk support?
AC_MSG_CHECKING(whether +3 disk support requested)
AC_ARG_WITH(plus3-disk,
@@ -351,28 +343,21 @@
plus3disk=yes)
AC_MSG_RESULT($plus3disk)
if test "$plus3disk" = yes; then
- AC_CHECK_HEADERS(765.h, DSKLIBS="$DSKLIBS -l765" lib765=yes,
- AC_MSG_WARN(765.h not found - +3 disk support disabled))
+ AC_ARG_WITH(plus3-disk-prefix,
+ [ --with-plus3-disk-prefix=PFX where the +3 libraries are installed (optional)],
+ DSK_CFLAGS=-I$withval/include; DSKLIBS=-L$withval/lib,
+ DSK_CFLAGS=""; DSK_LIBS="")
+ ac_save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $DSK_CFLAGS"
+ AC_CHECK_HEADERS(765.h, DSKLIBS="$DSKLIBS -l765"; lib765=yes,
+ AC_MSG_WARN(765.h not found - disk support disabled))
+ if test "$lib765" = yes; then
+ AC_CHECK_HEADERS(libdsk.h, DSKLIBS="$DSKLIBS -ldsk")
+ fi
+ CPPFLAGS="$ac_save_CPPFLAGS"
fi
-
-dnl Do we want LibDsk support?
-AC_MSG_CHECKING(whether libdsk is available)
-AC_ARG_WITH(libdsk,
- [ --without-libdsk disable LibDsk support],
- if test "$withval" = no; then libdsk=no; else libdsk=yes; fi,
- libdsk=yes)
-AC_MSG_RESULT($libdsk)
-if test "$libdsk" = yes; then
- AC_CHECK_HEADERS(libdsk.h, DSKLIBS="$DSKLIBS -ldsk";
- DISK_LIBS="disk/libdisk.a"; DISK="disk",
- AC_MSG_WARN(libdsk.h not found - LibDsk support disabled))
-fi
-
-CPPFLAGS="$ac_save_CPPFLAGS"
AC_SUBST(DSK_CFLAGS)
AC_SUBST(DSKLIBS)
-AC_SUBST(DISK_LIBS)
-AC_SUBST(DISK)
dnl Check if a version of libpng which supplies png_write_png is available
AC_CHECK_LIB( png, png_write_png,
@@ -429,9 +414,19 @@
[AC_MSG_WARN(dsound.h not found - no DirectSound output)]
)
-PKG_CHECK_MODULES(SAMPLERATE, samplerate >= 0.1.0,
- AC_DEFINE([HAVE_SAMPLERATE],1,[Define to 1 if you have libsamplerate.]),
- [AC_MSG_NOTICE([libsamplerate not present.])])
+dnl Check if libsamplerate is available
+AC_MSG_CHECKING(whether libsamplerate support requested)
+ AC_ARG_WITH(libsamplerate,
+ [ --without-libsamplerate use libsamplerate],
+ if test "$withval" = no; then libsamplerate=no; else libsamplerate=yes; fi,
+ libsamplerate=yes)
+AC_MSG_RESULT($libsamplerate)
+if test "$libsamplerate" = yes; then
+ PKG_CHECK_MODULES(SAMPLERATE, samplerate >= 0.1.0,
+ AC_DEFINE([HAVE_SAMPLERATE],1,[Define to 1 if you have libsamplerate.]),
+ [AC_MSG_NOTICE([libsamplerate not present.])])
+fi
+
AC_SUBST(SAMPLERATE_CFLAGS)
AC_SUBST(SAMPLERATE_LIBS)
@@ -504,7 +499,7 @@
AC_MSG_CHECKING(whether hardware joystick support requested)
AC_ARG_WITH(joystick,
- [ --with-joystick use a real joystick for Kempston emulation etc.],
+ [ --without-joystick use a real joystick for Kempston emulation etc.],
if test "$withval" = no; then stick=no; else stick=yes; fi,
stick=yes)
AC_MSG_RESULT($stick)
@@ -543,9 +538,17 @@
fi
dnl See if libxml2 is available (for the config file handling)
-AM_PATH_XML2(2.0.0,AC_DEFINE([HAVE_LIB_XML2], 1,
- [Defined if we've got libxml2]),
- AC_WARN(libxml2 not found - config file use disabled))
+AC_MSG_CHECKING(whether libxml2 support requested)
+ AC_ARG_WITH(libxml2,
+ [ --without-libxml2 use a libxml2 for settings],
+ if test "$withval" = no; then libxml2=no; else libxml2=yes; fi,
+ libxml2=yes)
+AC_MSG_RESULT($libxml2)
+if test "$libxml2" = yes; then
+ AM_PATH_XML2(2.0.0,AC_DEFINE([HAVE_LIB_XML2], 1,
+ [Defined if we've got libxml2]),
+ AC_WARN(libxml2 not found - config file use disabled))
+fi
dnl Work out which timer routines to use
AC_MSG_CHECKING(which timer routines to use)
@@ -556,7 +559,7 @@
AC_MSG_RESULT(SDL)
else
case "$target_os" in
- win32)
+ mingw32*)
TIMER_LIBADD='win32.$(OBJEXT)'
timer_header='<windows.h>'
timer_type='DWORD'
@@ -585,7 +588,7 @@
fi
if test "$ac_cv_func_getopt_long" = no; then
case "$target_os" in
- amiga|morphos)
+ amigaos|morphos)
dnl Our getopt_long replacement doesn't work, so don't use it
;;
*)
@@ -604,16 +607,16 @@
AC_MSG_RESULT($missing_routines)
AC_SUBST(COMPAT_LIBADD)
-dnl Work out which compatability routines to use
-AC_MSG_CHECKING(which compatability routines to use)
+dnl Work out which compatibility routines to use
+AC_MSG_CHECKING(which compatibility routines to use)
case "$target_os" in
- amiga)
+ amigaos)
COMPAT_OSNAME='amiga'
;;
morphos)
COMPAT_OSNAME='morphos'
;;
- win32)
+ mingw32*)
COMPAT_OSNAME='win32'
;;
*)
Modified: vendor/fuse-emulator/current/fuse/debugger/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/debugger/Makefile.am 2007-10-26 10:12:08 UTC (rev 456)
+++ vendor/fuse-emulator/current/fuse/debugger/Makefile.am 2007-10-26 10:14:37 UTC (rev 457)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2001-2004 Philip Kendall
-## $Id: Makefile.am 2889 2007-05-26 17:45:08Z zubzero $
+## $Id: Makefile.am 3150 2007-09-05 14:05:00Z 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
@@ -23,6 +23,8 @@
AUTOMAKE_OPTIONS = foreign
+AM_CPPFLAGS = -I$(srcdir)/..
+
INCLUDES = @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@
noinst_LIBRARIES = libdebugger.a
@@ -42,3 +44,7 @@
commandy.h \
debugger.h \
debugger_internals.h
+
+CLEANFILES = commandl.c \
+ commandy.c \
+ commandy.h
Modified: vendor/fuse-emulator/current/fuse/debugger/breakpoint.c
===================================================================
--- vendor/fuse-emulator/current/fuse/debugger/breakpoint.c 2007-10-26 10:12:08 UTC (rev 456)
+++ vendor/fuse-emulator/current/fuse/debugger/breakpoint.c 2007-10-26 10:14:37 UTC (rev 457)
@@ -1,7 +1,7 @@
/* breakpoint.c: a debugger breakpoint
- Copyright (c) 2002-2004 Philip Kendall
+ Copyright (c) 2002-2007 Philip Kendall
- $Id: breakpoint.c 3032 2007-06-28 22:48:54Z zubzero $
+ $Id: breakpoint.c 3138 2007-09-02 12:19:16Z 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
@@ -332,7 +332,7 @@
/* Timed breakpoints trigger if we're past the relevant time */
case DEBUGGER_BREAKPOINT_TYPE_TIME:
- if( bp->value.tstates < tstates ) return 0;
+ if( bp->value.tstates > tstates ) return 0;
break;
default:
Modified: vendor/fuse-emulator/current/fuse/debugger/command.c
===================================================================
--- vendor/fuse-emulator/current/fuse/debugger/command.c 2007-10-26 10:12:08 UTC (rev 456)
+++ vendor/fuse-emulator/current/fuse/debugger/command.c 2007-10-26 10:14:37 UTC (rev 457)
@@ -1,7 +1,7 @@
/* command.c: Parse a debugger command
Copyright (c) 2002 Philip Kendall
- $Id: command.c 2889 2007-05-26 17:45:08Z zubzero $
+ $Id: command.c 3115 2007-08-19 02:49:14Z 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/debugger/commandy.y
===================================================================
--- vendor/fuse-emulator/current/fuse/debugger/commandy.y 2007-10-26 10:12:08 UTC (rev 456)
+++ vendor/fuse-emulator/current/fuse/debugger/commandy.y 2007-10-26 10:14:37 UTC (rev 457)
@@ -1,7 +1,7 @@
/* commandy.y: Parse a debugger command
Copyright (c) 2002-2004 Philip Kendall
- $Id: commandy.y 3032 2007-06-28 22:48:54Z zubzero $
+ $Id: commandy.y 3115 2007-08-19 02:49:14Z 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/debugger/debugger.c
===================================================================
--- vendor/fuse-emulator/current/fuse/debugger/debugger.c 2007-10-26 10:12:08 UTC (rev 456)
+++ vendor/fuse-emulator/current/fuse/debugger/debugger.c 2007-10-26 10:14:37 UTC (rev 457)
@@ -1,7 +1,7 @@
/* debugger.c: Fuse's monitor/debugger
Copyright (c) 2002-2004 Philip Kendall
- $Id: debugger.c 2889 2007-05-26 17:45:08Z zubzero $
+ $Id: debugger.c 3115 2007-08-19 02:49:14Z 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/debugger/debugger_internals.h
===================================================================
--- vendor/fuse-emulator/current/fuse/debugger/debugger_internals.h 2007-10-26 10:12:08 UTC (rev 456)
+++ vendor/fuse-emulator/current/fuse/debugger/debugger_internals.h 2007-10-26 10:14:37 UTC (rev 457)
@@ -1,7 +1,7 @@
/* debugger_internals.h: The internals of Fuse's monitor/debugger
Copyright (c) 2002-2003 Philip Kendall
- $Id: debugger_internals.h 2889 2007-05-26 17:45:08Z zubzero $
+ $Id: debugger_internals.h 3111 2007-08-17 12:42:10Z 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
@@ -26,9 +26,7 @@
#ifndef FUSE_DEBUGGER_INTERNALS_H
#define FUSE_DEBUGGER_INTERNALS_H
-#ifndef FUSE_DEBUGGER_H
#include "debugger.h"
-#endif /* #ifndef FUSE_DEBUGGER_H */
int debugger_breakpoint_remove( size_t id );
int debugger_breakpoint_remove_all( void );
Modified: vendor/fuse-emulator/current/fuse/debugger/disassemble.c
===================================================================
--- vendor/fuse-emulator/current/fuse/debugger/disassemble.c 2007-10-26 10:12:08 UTC (rev 456)
+++ vendor/fuse-emulator/current/fuse/debugger/disassemble.c 2007-10-26 10:14:37 UTC (rev 457)
@@ -1,7 +1,7 @@
/* disassemble.c: Fuse's disassembler
Copyright (c) 2002-2003 Darren Salt, Philip Kendall
- $Id: disassemble.c 2889 2007-05-26 17:45:08Z zubzero $
+ $Id: disassemble.c 3115 2007-08-19 02:49:14Z 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/debugger/expression.c
===================================================================
--- vendor/fuse-emulator/current/fuse/debugger/expression.c 2007-10-26 10:12:08 UTC (rev 456)
+++ vendor/fuse-emulator/current/fuse/debugger/expression.c 2007-10-26 10:14:37 UTC (rev 457)
@@ -1,7 +1,7 @@
/* expression.c: A numeric expression
Copyright (c) 2003 Philip Kendall
- $Id: expression.c 3032 2007-06-28 22:48:54Z zubzero $
+ $Id: expression.c 3115 2007-08-19 02:49:14Z 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/disk/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/disk/Makefile.am 2007-10-26 10:12:08 UTC (rev 456)
+++ vendor/fuse-emulator/current/fuse/disk/Makefile.am 2007-10-26 10:14:37 UTC (rev 457)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2007 Stuart Brady
-## $Id: Makefile.am 3059 2007-07-15 21:14:44Z zubzero $
+## $Id: Makefile.am 3207 2007-10-19 20:04:47Z zubzero $
## 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
@@ -23,12 +23,22 @@
AUTOMAKE_OPTIONS = foreign
+AM_CPPFLAGS = -I$(srcdir)/..
+
noinst_LIBRARIES = libdisk.a
INCLUDES = @LIBSPEC_CFLAGS@ @GTK_CFLAGS@ @GLIB_CFLAGS@
-libdisk_a_SOURCES = plusd.c \
- wd1770.c
+libdisk_a_SOURCES = beta.c \
+ crc.c \
+ disk.c \
+ fdd.c \
+ plusd.c \
+ wd_fdc.c
-noinst_HEADERS = plusd.h \
- wd1770.h
+noinst_HEADERS = beta.h \
+ crc.h \
+ disk.h \
+ fdd.h \
+ plusd.h \
+ wd_fdc.h
Added: vendor/fuse-emulator/current/fuse/disk/beta.c
===================================================================
--- vendor/fuse-emulator/current/fuse/disk/beta.c (rev 0)
+++ vendor/fuse-emulator/current/fuse/disk/beta.c 2007-10-26 10:14:37 UTC (rev 457)
@@ -0,0 +1,506 @@
+/* beta.c: Routines for handling the Beta disk interface
+ Copyright (c) 2004-2007 Stuart Brady
+
+ $Id: beta.c 3227 2007-10-23 14:11:20Z zubzero $
+
+ 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
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+ Author contact information:
+
+ Philip: pak...@sr...
+ Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+
+ Stuart: sd...@nt...
+
+*/
+
+#include <config.h>
+
+#include <errno.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <string.h>
+#ifdef HAVE_STRINGS_H
+#include <strings.h> /* Needed for strncasecmp() on QNX6 */
+#endif /* #ifdef HAVE_STRINGS_H */
+#include <limits.h>
+#include <sys/stat.h>
+
+#include <libspectrum.h>
+
+#include "beta.h"
+#include "compat.h"
+#include "event.h"
+#include "machine.h"
+#include "module.h"
+#include "settings.h"
+#include "ui/ui.h"
+#include "utils.h"
+#include "wd_fdc.h"
+#include "z80/z80.h"
+#include "z80/z80_macros.h"
+
+int beta_available = 0;
+int beta_active = 0;
+
+static int beta_index_pulse = 0;
+
+#define BETA_NUM_DRIVES 4
+
+static int beta_datarq;
+static int beta_intrq;
+
+static wd_fdc *beta_fdc;
+static wd_fdc_drive beta_drives[ BETA_NUM_DRIVES ];
+
+void beta_reset( void );
+static void beta_memory_map( void );
+static void beta_from_snapshot( libspectrum_snap *snap );
+static void beta_to_snapshot( libspectrum_snap *snap );
+
+static module_info_t beta_module_info = {
+
+ NULL,
+ beta_memory_map,
+ beta_from_snapshot,
+ beta_to_snapshot,
+
+};
+
+
+void
+beta_page( void )
+{
+ beta_active = 1;
+ machine_current->ram.romcs = 1;
+ machine_current->memory_map();
+}
+
+void
+beta_unpage( void )
+{
+ beta_active = 0;
+ machine_current->ram.romcs = 0;
+ machine_current->memory_map();
+}
+
+static void
+beta_memory_map( void )
+{
+ if( !beta_active ) return;
+
+ memory_map_read[0] = memory_map_write[0] = memory_map_romcs[ 0 ];
+ memory_map_read[1] = memory_map_write[1] = memory_map_romcs[ 1 ];
+}
+
+static void
+beta_set_intrq( wd_fdc *f )
+{
+ beta_intrq = 1;
+}
+
+static void
+beta_set_datarq( wd_fdc *f )
+{
+ beta_datarq = 1;
+}
+
+static void
+beta_reset_datarq( wd_fdc *f )
+{
+ beta_datarq = 0;
+}
+
+int
+beta_init( void )
+{
+ int i;
+ wd_fdc_drive *d;
+
+ beta_fdc = wd_fdc_alloc_fdc( FD1793 );
+ beta_fdc->current_drive = &beta_drives[ 0 ];
+
+ for( i = 0; i < BETA_NUM_DRIVES; i++ ) {
+ d = &beta_drives[ i ];
+ fdd_init( &d->fdd, 0, 0 ); /* drive geometry 'autodetect' */
+ }
+
+ beta_fdc->dden = 1;
+ beta_fdc->set_intrq = beta_set_intrq;
+ beta_fdc->reset_intrq = NULL;
+ beta_fdc->set_datarq = beta_set_datarq;
+ beta_fdc->reset_datarq = beta_reset_datarq;
+
+ module_register( &beta_module_info );
+
+ return 0;
+}
+
+void
+beta_reset( void )
+{
+ int i;
+ wd_fdc_drive *d;
+
+ beta_active = 0;
+
+ event_remove_type( EVENT_TYPE_BETA_INDEX );
+
+ wd_fdc_master_reset( beta_fdc );
+
+ for( i = 0; i < BETA_NUM_DRIVES; i++ ) {
+ d = &beta_drives[ i ];
+
+ d->index_pulse = 0;
+ d->index_interrupt = 0;
+ }
+
+ /* We can eject disks only if they are currently present */
+ ui_menu_activate( UI_MENU_ITEM_MEDIA_DISK_BETA_A_EJECT,
+ beta_drives[ BETA_DRIVE_A ].fdd.loaded );
+ ui_menu_activate( UI_MENU_ITEM_MEDIA_DISK_BETA_B_EJECT,
+ beta_drives[ BETA_DRIVE_B ].fdd.loaded );
+ ui_menu_activate( UI_MENU_ITEM_MEDIA_DISK_BETA_C_EJECT,
+ beta_drives[ BETA_DRIVE_C ].fdd.loaded );
+ ui_menu_activate( UI_MENU_ITEM_MEDIA_DISK_BETA_D_EJECT,
+ beta_drives[ BETA_DRIVE_D ].fdd.loaded );
+
+ beta_fdc->current_drive = &beta_drives[ 0 ];
+ machine_current->memory_map();
+ beta_event_index( 0 );
+
+ ui_statusbar_update( UI_STATUSBAR_ITEM_DISK, UI_STATUSBAR_STATE_INACTIVE );
+}
+
+void
+beta_end( void )
+{
+ beta_available = 0;
+}
+
+libspectrum_byte
+beta_sr_read( libspectrum_word port GCC_UNUSED, int *attached )
+{
+ if( !beta_active ) return 0;
+
+ *attached = 1;
+ return wd_fdc_sr_read( beta_fdc );
+}
+
+void
+beta_cr_write( libspectrum_word port GCC_UNUSED, libspectrum_byte b )
+{
+ if( !beta_active ) return;
+
+ wd_fdc_cr_write( beta_fdc, b );
+}
+
+libspectrum_byte
+beta_tr_read( libspectrum_word port GCC_UNUSED, int *attached )
+{
+ if( !beta_active ) return 0;
+
+ *attached = 1;
+ return wd_fdc_tr_read( beta_fdc );
+}
+
+void
+beta_tr_write( libspectrum_word port GCC_UNUSED, libspectrum_byte b )
+{
+ if( !beta_active ) return;
+
+ wd_fdc_tr_write( beta_fdc, b );
+}
+
+libspectrum_byte
+beta_sec_read( libspectrum_word port GCC_UNUSED, int *attached )
+{
+ if( !beta_active ) return 0;
+
+ *attached = 1;
+ return wd_fdc_sec_read( beta_fdc );
+}
+
+void
+beta_sec_write( libspectrum_word port GCC_UNUSED, libspectrum_byte b )
+{
+ if( !beta_active ) return;
+
+ wd_fdc_sec_write( beta_fdc, b );
+}
+
+libspectrum_byte
+beta_dr_read( libspectrum_word port GCC_UNUSED, int *attached )
+{
+ if( !beta_active ) return 0;
+
+ *attached = 1;
+ return wd_fdc_dr_read( beta_fdc );
+}
+
+void
+beta_dr_write( libspectrum_word port GCC_UNUSED, libspectrum_byte b )
+{
+ if( !beta_active ) return;
+
+ wd_fdc_dr_write( beta_fdc, b );
+}
+
+void
+beta_sp_write( libspectrum_word port GCC_UNUSED, libspectrum_byte b )
+{
+ if( !beta_active ) return;
+
+ beta_fdc->current_drive = &beta_drives[ b & 0x03 ];
+ /* reset 0x04 and then set it to reset controller */
+ /* 0x08 = block hlt, normally set */
+ fdd_set_head( &beta_fdc->current_drive->fdd, ( ( b & 0x10 ) ? 0 : 1 ) );
+ /* 0x20 = density, reset = FM, set = MFM */
+ beta_fdc->dden = b & 0x20 ? 1 : 0;
+}
+
+libspectrum_byte
+beta_sp_read( libspectrum_word port GCC_UNUSED, int *attached )
+{
+ libspectrum_byte b;
+
+ if( !beta_active ) return 0;
+
+ *attached = 1;
+ b = 0;
+
+ if( beta_intrq )
+ b |= 0x80;
+
+ if( beta_datarq )
+ b |= 0x40;
+
+ beta_intrq = 0;
+/* we should reset beta_datarq, but we first need to raise it for each byte
+ * transferred in wd_fdc.c */
+/* beta_datarq = 0; */
+
+ return b;
+}
+
+int
+beta_disk_insert( beta_drive_number which, const char *filename,
+ int autoload )
+{
+ int error;
+ wd_fdc_drive *d;
+
+ if( which >= BETA_NUM_DRIVES ) {
+ ui_error( UI_ERROR_ERROR, "beta_disk_insert: unknown drive %d",
+ which );
+ fuse_abort();
+ }
+
+ d = &beta_drives[ which ];
+
+ /* Eject any disk already in the drive */
+ if( d->fdd.loaded ) {
+ /* Abort the insert if we want to keep the current disk */
+ if( beta_disk_eject( which, 0 ) ) return 0;
+ }
+ if( ( error = disk_open( &d->disk, filename, 0 ) != DISK_OK ) ) {
+ ui_error( UI_ERROR_ERROR, "Failed to open disk image: %s",
+ disk_strerror( d->disk.status ) );
+ return 1;
+ }
+ fdd_load( &d->fdd, &d->disk, 0 );
+
+ /* Set the 'eject' item active */
+ switch( which ) {
+ case BETA_DRIVE_A:
+ ui_menu_activate( UI_MENU_ITEM_MEDIA_DISK_BETA_A_EJECT, 1 );
+ break;
+ case BETA_DRIVE_B:
+ ui_menu_activate( UI_MENU_ITEM_MEDIA_DISK_BETA_B_EJECT, 1 );
+ break;
+ case BETA_DRIVE_C:
+ ui_menu_activate( UI_MENU_ITEM_MEDIA_DISK_BETA_C_EJECT, 1 );
+ break;
+ case BETA_DRIVE_D:
+ ui_menu_activate( UI_MENU_ITEM_MEDIA_DISK_BETA_D_EJECT, 1 );
+ break;
+ }
+
+ if( autoload ) {
+ PC = 0;
+ machine_current->ram.last_byte |= 0x10; /* Select ROM 1 */
+ beta_page();
+ }
+
+ return 0;
+}
+
+int
+beta_disk_insert_default_autoload( beta_drive_number which,
+ const char *filename )
+{
+ return beta_disk_insert( which, filename, settings_current.auto_load );
+}
+
+int
+beta_disk_eject( beta_drive_number which, int write )
+{
+ wd_fdc_drive *d;
+
+ if( which >= BETA_NUM_DRIVES )
+ return 1;
+
+ d = &beta_drives[ which ];
+
+ if( !d->fdd.loaded )
+ return 0;
+
+ if( write ) {
+
+ if( ui_beta_disk_write( which ) ) return 1;
+
+ } else {
+
+ if( d->disk.dirty ) {
+
+ ui_confirm_save_t confirm = ui_confirm_save(
+ "Disk has been modified.\nDo you want to save it?"
+ );
+
+ switch( confirm ) {
+
+ case UI_CONFIRM_SAVE_SAVE:
+ if( ui_beta_disk_write( which ) ) return 1;
+ break;
+
+ case UI_CONFIRM_SAVE_DONTSAVE: break;
+ case UI_CONFIRM_SAVE_CANCEL: return 1;
+
+ }
+ }
+ }
+
+ fdd_unload( &d->fdd );
+ disk_close( &d->disk );
+
+ /* Set the 'eject' item inactive */
+ switch( which ) {
+ case BETA_DRIVE_A:
+ ui_menu_activate( UI_MENU_ITEM_MEDIA_DISK_BETA_A_EJECT, 0 );
+ break;
+ case BETA_DRIVE_B:
+ ui_menu_activate( UI_MENU_ITEM_MEDIA_DISK_BETA_B_EJECT, 0 );
+ break;
+ case BETA_DRIVE_C:
+ ui_menu_activate( UI_MENU_ITEM_MEDIA_DISK_BETA_C_EJECT, 0 );
+ break;
+ case BETA_DRIVE_D:
+ ui_menu_activate( UI_MENU_ITEM_MEDIA_DISK_BETA_D_EJECT, 0 );
+ break;
+ }
+ return 0;
+}
+
+int
+beta_disk_write( beta_drive_number which, const char *filename )
+{
+ wd_fdc_drive *d = &beta_drives[ which ];
+ int error;
+
+ d->disk.type = DISK_TYPE_NONE;
+ error = disk_write( &d->disk, filename );
+
+ if( error != DISK_OK ) {
+ ui_error( UI_ERROR_ERROR, "couldn't write '%s' file: %s", filename,
+ disk_strerror( error ) );
+ return 1;
+ }
+
+ return 0;
+}
+
+int
+beta_event_cmd_done( libspectrum_dword last_tstates )
+{
+ beta_fdc->status_register &= ~WD_FDC_SR_BUSY;
+ return 0;
+}
+
+int
+beta_event_index( libspectrum_dword last_tstates )
+{
+ int error;
+ int next_tstates;
+ int i;
+
+ beta_index_pulse = !beta_index_pulse;
+ for( i = 0; i < BETA_NUM_DRIVES; i++ ) {
+ wd_fdc_drive *d = &beta_drives[ i ];
+
+ d->index_pulse = beta_index_pulse;
+/* disabled, until we have better timing emulation,
+ * to avoid interrupts while reading/writing data */
+ if( !beta_index_pulse && d->index_interrupt ) {
+ wd_fdc_set_intrq( beta_fdc );
+ d->index_interrupt = 0;
+ }
+ }
+ next_tstates = ( beta_index_pulse ? 10 : 190 ) *
+ machine_current->timings.processor_speed / 1000;
+ error = event_add( last_tstates + next_tstates, EVENT_TYPE_BETA_INDEX );
+ if( error )
+ return error;
+ return 0;
+}
+
+static void
+beta_from_snapshot( libspectrum_snap *snap )
+{
+ if( !( machine_current->capabilities & LIBSPECTRUM_MACHINE_CAPABILITY_TRDOS_DISK ) )
+ return;
+
+ beta_active = libspectrum_snap_beta_paged( snap );
+
+ if( beta_active ) {
+ beta_page();
+ } else {
+ beta_unpage();
+ }
+
+ beta_fdc->direction = libspectrum_snap_beta_direction( snap );
+
+ beta_cr_write ( 0x001f, 0 );
+ beta_tr_write ( 0x003f, libspectrum_snap_beta_track ( snap ) );
+ beta_sec_write( 0x005f, libspectrum_snap_beta_sector( snap ) );
+ beta_dr_write ( 0x007f, libspectrum_snap_beta_data ( snap ) );
+ beta_sp_write ( 0x00ff, libspectrum_snap_beta_system( snap ) );
+}
+
+void
+beta_to_snapshot( libspectrum_snap *snap )
+{
+ int attached;
+ wd_fdc *f = beta_fdc;
+
+ libspectrum_snap_set_beta_paged ( snap, beta_active );
+ libspectrum_snap_set_beta_direction( snap, beta_fdc->direction );
+ libspectrum_snap_set_beta_status( snap, beta_sr_read( 0x001f, &attached ) );
+ libspectrum_snap_set_beta_track ( snap, f->track_register );
+ libspectrum_snap_set_beta_sector( snap, f->sector_register );
+ libspectrum_snap_set_beta_data ( snap, f->data_register );
+ libspectrum_snap_set_beta_system( snap, beta_sp_read( 0x00ff, &attached ) );
+}
Added: vendor/fuse-emulator/current/fuse/disk/beta.h
===================================================================
--- vendor/fuse-emulator/current/fuse/disk/beta.h (rev 0)
+++ vendor/fuse-emulator/current/fuse/disk/beta.h 2007-10-26 10:14:37 UTC (rev 457)
@@ -0,0 +1,77 @@
+/* beta.h: Routines for handling the Beta disk interface
+ Copyright (c) 2003-2004 Fredrick Meunier...
[truncated message content] |