[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx:[739] vendor/fuse-emulator/current
Brought to you by:
fredm
Menu
▾
▴
[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx:[739] vendor/fuse-emulator/current
|
From: <fr...@us...> - 2013-04-20 07:01:48
|
Revision: 739
http://sourceforge.net/p/fuse-for-macosx/code/739
Author: fredm
Date: 2013-04-20 07:01:40 +0000 (Sat, 20 Apr 2013)
Log Message:
-----------
Load . into vendor/fuse-emulator/current.
Modified Paths:
--------------
vendor/fuse-emulator/current/fuse/AUTHORS
vendor/fuse-emulator/current/fuse/ChangeLog
vendor/fuse-emulator/current/fuse/Makefile.am
vendor/fuse-emulator/current/fuse/README
vendor/fuse-emulator/current/fuse/THANKS
vendor/fuse-emulator/current/fuse/compat/amiga/Makefile.am
vendor/fuse-emulator/current/fuse/compat/linux/Makefile.am
vendor/fuse-emulator/current/fuse/compat/mkstemp.c
vendor/fuse-emulator/current/fuse/compat/morphos/Makefile.am
vendor/fuse-emulator/current/fuse/compat/unix/Makefile.am
vendor/fuse-emulator/current/fuse/compat/unix/socket.c
vendor/fuse-emulator/current/fuse/compat/unix/tuntap.c
vendor/fuse-emulator/current/fuse/compat/wii/Makefile.am
vendor/fuse-emulator/current/fuse/compat/win32/Makefile.am
vendor/fuse-emulator/current/fuse/compat/win32/paths.c
vendor/fuse-emulator/current/fuse/configure.ac
vendor/fuse-emulator/current/fuse/fuse.c
vendor/fuse-emulator/current/fuse/hacking/ChangeLog
vendor/fuse-emulator/current/fuse/hacking/peripheral_tests.txt
vendor/fuse-emulator/current/fuse/hacking/spectranet.txt
vendor/fuse-emulator/current/fuse/input.c
vendor/fuse-emulator/current/fuse/input.h
vendor/fuse-emulator/current/fuse/keysyms.pl
vendor/fuse-emulator/current/fuse/lib/compressed/tape_se.szx
vendor/fuse-emulator/current/fuse/lib/uncompressed/tape_se.szx
vendor/fuse-emulator/current/fuse/machines/spec_se.c
vendor/fuse-emulator/current/fuse/man/fuse.1
vendor/fuse-emulator/current/fuse/memory.c
vendor/fuse-emulator/current/fuse/menu.c
vendor/fuse-emulator/current/fuse/menu.h
vendor/fuse-emulator/current/fuse/menu_data.dat
vendor/fuse-emulator/current/fuse/periph.c
vendor/fuse-emulator/current/fuse/periph.h
vendor/fuse-emulator/current/fuse/peripherals/disk/beta.c
vendor/fuse-emulator/current/fuse/peripherals/disk/disciple.c
vendor/fuse-emulator/current/fuse/peripherals/disk/disciple.h
vendor/fuse-emulator/current/fuse/peripherals/disk/disk.c
vendor/fuse-emulator/current/fuse/peripherals/disk/disk.h
vendor/fuse-emulator/current/fuse/peripherals/disk/fdd.h
vendor/fuse-emulator/current/fuse/peripherals/disk/opus.c
vendor/fuse-emulator/current/fuse/peripherals/disk/plusd.c
vendor/fuse-emulator/current/fuse/peripherals/disk/plusd.h
vendor/fuse-emulator/current/fuse/peripherals/flash/am29f010.c
vendor/fuse-emulator/current/fuse/peripherals/fuller.c
vendor/fuse-emulator/current/fuse/peripherals/ide/divide.c
vendor/fuse-emulator/current/fuse/peripherals/ide/simpleide.c
vendor/fuse-emulator/current/fuse/peripherals/ide/zxatasp.c
vendor/fuse-emulator/current/fuse/peripherals/ide/zxcf.c
vendor/fuse-emulator/current/fuse/peripherals/if1.c
vendor/fuse-emulator/current/fuse/peripherals/if1.h
vendor/fuse-emulator/current/fuse/peripherals/if2.c
vendor/fuse-emulator/current/fuse/peripherals/if2.h
vendor/fuse-emulator/current/fuse/peripherals/kempmouse.c
vendor/fuse-emulator/current/fuse/peripherals/melodik.c
vendor/fuse-emulator/current/fuse/peripherals/nic/Makefile.am
vendor/fuse-emulator/current/fuse/peripherals/nic/w5100.c
vendor/fuse-emulator/current/fuse/peripherals/nic/w5100_internals.h
vendor/fuse-emulator/current/fuse/peripherals/nic/w5100_socket.c
vendor/fuse-emulator/current/fuse/peripherals/printer.c
vendor/fuse-emulator/current/fuse/peripherals/scld.c
vendor/fuse-emulator/current/fuse/peripherals/speccyboot.c
vendor/fuse-emulator/current/fuse/peripherals/specdrum.c
vendor/fuse-emulator/current/fuse/peripherals/spectranet.c
vendor/fuse-emulator/current/fuse/peripherals/spectranet.h
vendor/fuse-emulator/current/fuse/pokefinder/pokemem.c
vendor/fuse-emulator/current/fuse/rectangle.c
vendor/fuse-emulator/current/fuse/roms/Makefile.am
vendor/fuse-emulator/current/fuse/roms/README.copyright
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/roms/se-0.rom
vendor/fuse-emulator/current/fuse/roms/se-1.rom
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/blipbuffer.c
vendor/fuse-emulator/current/fuse/sound/blipbuffer.h
vendor/fuse-emulator/current/fuse/sound/win32sound.c
vendor/fuse-emulator/current/fuse/sound.c
vendor/fuse-emulator/current/fuse/spectrum.c
vendor/fuse-emulator/current/fuse/tape.c
vendor/fuse-emulator/current/fuse/ui/gtk/binary.c
vendor/fuse-emulator/current/fuse/ui/gtk/debugger.c
vendor/fuse-emulator/current/fuse/ui/gtk/gtkjoystick.c
vendor/fuse-emulator/current/fuse/ui/options.dat
vendor/fuse-emulator/current/fuse/ui/sdl/sdljoystick.c
vendor/fuse-emulator/current/fuse/ui/uijoystick.c
vendor/fuse-emulator/current/fuse/ui/widget/filesel.c
vendor/fuse-emulator/current/fuse/ui/widget/menu.c
vendor/fuse-emulator/current/fuse/ui/widget/options.pl
vendor/fuse-emulator/current/fuse/ui/win32/about.rc
vendor/fuse-emulator/current/fuse/ui/win32/binary.c
vendor/fuse-emulator/current/fuse/ui/win32/binary.rc
vendor/fuse-emulator/current/fuse/ui/win32/browse.rc
vendor/fuse-emulator/current/fuse/ui/win32/debugger.h
vendor/fuse-emulator/current/fuse/ui/win32/debugger.rc
vendor/fuse-emulator/current/fuse/ui/win32/hyperlinks.c
vendor/fuse-emulator/current/fuse/ui/win32/memorybrowser.c
vendor/fuse-emulator/current/fuse/ui/win32/memorybrowser.rc
vendor/fuse-emulator/current/fuse/ui/win32/picture.c
vendor/fuse-emulator/current/fuse/ui/win32/picture.rc
vendor/fuse-emulator/current/fuse/ui/win32/pokefinder.rc
vendor/fuse-emulator/current/fuse/ui/win32/pokemem.c
vendor/fuse-emulator/current/fuse/ui/win32/pokemem.rc
vendor/fuse-emulator/current/fuse/ui/win32/rollback.rc
vendor/fuse-emulator/current/fuse/ui/win32/roms.c
vendor/fuse-emulator/current/fuse/ui/win32/select_template.rc
vendor/fuse-emulator/current/fuse/ui/win32/statusbar.c
vendor/fuse-emulator/current/fuse/ui/win32/win32joystick.c
vendor/fuse-emulator/current/fuse/ui/win32/win32ui.c
vendor/fuse-emulator/current/fuse/ui.c
vendor/fuse-emulator/current/fuse/unittests/unittests.c
vendor/fuse-emulator/current/fuse/utils.c
vendor/fuse-emulator/current/fuse/windres.rc
vendor/fuse-emulator/current/fuse/z80/coretest.c
vendor/fuse-emulator/current/fuse/z80/z80.c
vendor/fuse-emulator/current/fuse/z80/z80.h
vendor/fuse-emulator/current/fuse/z80/z80.pl
vendor/fuse-emulator/current/fuse-utils/AUTHORS
vendor/fuse-emulator/current/fuse-utils/ChangeLog
vendor/fuse-emulator/current/fuse-utils/README
vendor/fuse-emulator/current/fuse-utils/configure.ac
vendor/fuse-emulator/current/fuse-utils/converter/romloader.cc
vendor/fuse-emulator/current/fuse-utils/converter/romloader.h
vendor/fuse-emulator/current/fuse-utils/fmfconv.c
vendor/fuse-emulator/current/fuse-utils/fmfconv_au.c
vendor/fuse-emulator/current/fuse-utils/fmfconv_ff.c
vendor/fuse-emulator/current/fuse-utils/hacking/ChangeLog
vendor/fuse-emulator/current/fuse-utils/man/audio2tape.1
vendor/fuse-emulator/current/fuse-utils/man/createhdf.1
vendor/fuse-emulator/current/fuse-utils/man/fmfconv.1
vendor/fuse-emulator/current/fuse-utils/man/fuse-utils.1
vendor/fuse-emulator/current/fuse-utils/man/listbasic.1
vendor/fuse-emulator/current/fuse-utils/man/profile2map.1
vendor/fuse-emulator/current/fuse-utils/man/raw2hdf.1
vendor/fuse-emulator/current/fuse-utils/man/rzxcheck.1
vendor/fuse-emulator/current/fuse-utils/man/rzxdump.1
vendor/fuse-emulator/current/fuse-utils/man/rzxtool.1
vendor/fuse-emulator/current/fuse-utils/man/scl2trd.1
vendor/fuse-emulator/current/fuse-utils/man/snap2tzx.1
vendor/fuse-emulator/current/fuse-utils/man/snapconv.1
vendor/fuse-emulator/current/fuse-utils/man/tape2wav.1
vendor/fuse-emulator/current/fuse-utils/man/tapeconv.1
vendor/fuse-emulator/current/fuse-utils/man/tzxlist.1
vendor/fuse-emulator/current/fuse-utils/scl2trd.c
vendor/fuse-emulator/current/libspectrum/ChangeLog
vendor/fuse-emulator/current/libspectrum/README
vendor/fuse-emulator/current/libspectrum/accessor.pl
vendor/fuse-emulator/current/libspectrum/configure.ac
vendor/fuse-emulator/current/libspectrum/csw.c
vendor/fuse-emulator/current/libspectrum/doc/libspectrum.3
vendor/fuse-emulator/current/libspectrum/doc/libspectrum.txt
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/make-perl.c
vendor/fuse-emulator/current/libspectrum/rzx.c
vendor/fuse-emulator/current/libspectrum/sna.c
vendor/fuse-emulator/current/libspectrum/snap_accessors.txt
vendor/fuse-emulator/current/libspectrum/snapshot.c
vendor/fuse-emulator/current/libspectrum/szx.c
vendor/fuse-emulator/current/libspectrum/timings.c
vendor/fuse-emulator/current/libspectrum/z80.c
Added Paths:
-----------
vendor/fuse-emulator/current/fuse/roms/disciple.rom
Modified: vendor/fuse-emulator/current/fuse/AUTHORS
===================================================================
--- vendor/fuse-emulator/current/fuse/AUTHORS 2013-04-11 13:17:03 UTC (rev 738)
+++ vendor/fuse-emulator/current/fuse/AUTHORS 2013-04-20 07:01:40 UTC (rev 739)
@@ -39,7 +39,7 @@
* Garry Lancaster: the simple 8-bit IDE, ZXATASP and ZXCF support.
-* Gergely Szasz: +3, +D, Opus and Interface I/microdrive emulation, the 'movie'
+* Gergely Szasz: +3, +D, Opus and Interface 1/Microdrive emulation, the 'movie'
code and the ao sound driver.
* Bjoern Giesler: the original Wii port.
@@ -52,4 +52,4 @@
* Philip Kendall: everything else.
-$Id: AUTHORS 4237 2010-12-31 19:31:26Z pak21 $
+$Id: AUTHORS 4835 2012-12-31 15:35:45Z zubzero $
Modified: vendor/fuse-emulator/current/fuse/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse/ChangeLog 2013-04-11 13:17:03 UTC (rev 738)
+++ vendor/fuse-emulator/current/fuse/ChangeLog 2013-04-20 07:01:40 UTC (rev 739)
@@ -1,3 +1,62 @@
+201?-??-?? Philip Kendall <phi...@sh...>
+
+ * Fuse 1.1.0 released.
+
+ * Remove ROMs that there is no formal permission to distribute.
+
+ * New features:
+ * Add Spectranet ethernet interface emulation (Philip Kendall).
+ * Add SpeccyBoot ethernet interface emulation (Patrik Persson).
+ * Add SpecDrum sound interface emulation (Jon Mitchell).
+ * Add DISCiPLE disk interface emulation (Stuart Brady).
+ Sinclair Network emulation is not provided, and the interface is
+ not available under 128K emulation in this release.
+ * Support reading PZX files (Fredrick Meunier).
+ * Add support for POK files (Sergio Baldoví).
+ * Add recording of movies to FMF files (Gergely Szasz).
+ * Add GTK+ 3 compatibility (Sergio Baldoví).
+
+ * Emulation core improvements:
+ * Add support for ABC AY stereo (Stuart Brady).
+ * Correct feedback in AY noise generator (Patrik Rak).
+ * MIC bit only isn't enough to drive the speaker (Fredrick Meunier).
+ * Mirror Interface 1 ROM to the second 8Kb of ROM as in the real
+ interface (Fredrick Meunier, with thanks to mcleod_ideafix and
+ zx81).
+ * Support the Beta interface setting to not auto-boot the interface
+ on 48K machines (ketmar).
+
+ * Machine specific improvements:
+ * Read and write all potential 1024k worth of memory pages from a
+ snap (ketmar and Fredrick Meunier).
+ * Initialise the Pentagon 1024k memory ports from a snapshot (ketmar
+ and Fredrick Meunier).
+ * Restore the paged state of the Beta ROM when loading Pentagon
+ 128k/512k/1024k snapshots (ketmar and Fredrick Meunier).
+
+ * Debugger improvements:
+ * Disassemble ED 4D as RETI (Simon Owen).
+ * Add IM, IFF1 and IFF2 setting and getting to the debugger (Alex
+ Badea).
+
+ * Miscellaneous improvements:
+ * Many improvements to Win32 UI and installer (Sergio Baldoví).
+ * Allow the use of the SDL joystick code in the GTK+ and Xlib UIs
+ (Sergio Baldoví).
+ * Add current machine name to GTK+ and Win32 statusbars (Sergio
+ Baldoví).
+ * Allow the drag and drop of files from KDE (Dolphin/Konqueror)
+ (Sergio Baldoví, with thanks to Diondeville).
+ * Add a statusbar for the xlib UI (Gergely Szasz).
+ * Extend supported symbol characters on SDL and xlib UIs (Sergio
+ Baldoví).
+ * Support for the TZX set signal level block (Fredrick Meunier).
+ * Drop support for GLib and GTK+ version 1.x (Alberto Garcia and
+ Sergio Baldoví).
+ * Support setting late timings from snapshots (Fredrick Meunier).
+
+ * Various other minor bugfixes.
+
2010-12-16 Philip Kendall <phi...@sh...>
* Fuse 1.0.0 released.
@@ -1035,4 +1094,4 @@
* Version 0.1.0 released.
-$Id: ChangeLog 4409 2011-05-01 10:47:07Z zubzero $
+$Id: ChangeLog 4879 2013-02-12 00:36:01Z zubzero $
Modified: vendor/fuse-emulator/current/fuse/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/Makefile.am 2013-04-11 13:17:03 UTC (rev 738)
+++ vendor/fuse-emulator/current/fuse/Makefile.am 2013-04-20 07:01:40 UTC (rev 739)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 1999-2009 Philip Kendall
-## $Id: Makefile.am 4770 2012-11-23 22:59:48Z sbaldovi $
+## $Id: Makefile.am 4782 2012-12-02 22:49:57Z sbaldovi $
## 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
@@ -290,7 +290,8 @@
@test `find $(top_win32dir) -type f -name \*.dll -print | wc -l` -ne 0 || \
{ echo "ERROR: external libraries not found in $(top_win32dir). Please, manually copy them."; exit 1; }
# Locate NSIS in system path, MSYS drive or Cygwin drive
- @if makensis -VERSION > /dev/null 2>&1; then \
+ @NSISFILE="$(abs_top_builddir)/ui/win32/installer/fuse.nsi"; \
+ if makensis -VERSION > /dev/null 2>&1; then \
MAKENSIS="makensis"; \
elif [ -x "/c/Program Files/NSIS/makensis" ]; then \
MAKENSIS="/c/Program\ Files/NSIS/makensis"; \
@@ -299,8 +300,11 @@
else \
echo 'ERROR: cannot locate makensis tool'; exit 1; \
fi; \
+ case "`uname -s`" in \
+ CYGWIN*) NSISFILE=`cygpath -m $$NSISFILE`;; \
+ esac; \
cd $(top_win32dir); \
- eval "$$MAKENSIS -V2 -NOCD $(abs_top_builddir)/ui/win32/installer/fuse.nsi"
+ eval "$$MAKENSIS -V2 -NOCD $$NSISFILE"
mv $(top_win32dir)/$(package_win32)-setup.exe $(top_builddir)
-sha1sum $(top_builddir)/$(package_win32)-setup.exe > $(top_builddir)/$(package_win32)-setup.exe.sha1 && \
{ test -z "$(UNIX2DOS)" || $(UNIX2DOS) $(top_builddir)/$(package_win32)-setup.exe.sha1; }
Modified: vendor/fuse-emulator/current/fuse/README
===================================================================
--- vendor/fuse-emulator/current/fuse/README 2013-04-11 13:17:03 UTC (rev 738)
+++ vendor/fuse-emulator/current/fuse/README 2013-04-20 07:01:40 UTC (rev 739)
@@ -1,4 +1,4 @@
-The Free Unix Spectrum Emulator (Fuse) 1.0.0
+The Free Unix Spectrum Emulator (Fuse) 1.1.0
============================================
Fuse (the Free Unix Spectrum Emulator) was originally, and somewhat
@@ -24,7 +24,7 @@
* Emulation of some of the printers you could attach to a Spectrum.
* Support for the RZX input recording file format, including
rollback and 'competition mode'.
-* Emulation of the DivIDE, Interface I, Kempston mouse, Spectrum +3e,
+* Emulation of the DivIDE, Interface 1, Kempston mouse, Spectrum +3e,
ZXATASP, ZXCF, Beta 128, Opus Discovery and +D interfaces.
Help! <xyz> doesn't work
@@ -33,7 +33,7 @@
If you're having a problem using/running/building Fuse, the two places
you're most likely to get help are the development mailing list
<fus...@li...> or the official forums at
-<http://sourceforge.net/projects/fuse-emulator/forums>.
+<http://sourceforge.net/p/fuse-emulator/discussion/>.
What you'll need to run Fuse
----------------------------
@@ -105,6 +105,6 @@
<http://www.worldofspectrum.org/forums/>.
Philip Kendall <phi...@sh...>
-16 December 2010
+?? ???? 2012
-$Id: README 4763 2012-11-16 11:01:59Z fredm $
+$Id: README 4846 2013-01-03 09:14:29Z zubzero $
Modified: vendor/fuse-emulator/current/fuse/THANKS
===================================================================
--- vendor/fuse-emulator/current/fuse/THANKS 2013-04-11 13:17:03 UTC (rev 738)
+++ vendor/fuse-emulator/current/fuse/THANKS 2013-04-20 07:01:40 UTC (rev 739)
@@ -5,10 +5,10 @@
* Michael Bukin: for XWinAllegro, which was used by previous versions of
Fuse for the graphical display.
- (http://www.canvaslink.com/allegro/xwinallegro/)
+ (http://web.archive.org/web/19990210094206/http://www.canvaslink.com/allegro/xwinallegro/)
* Ian Collier: the source to his xz80
- (http://www.comlab.ox.ac.uk/oucl/users/ian.collier/Spectrum/index.html)
+ (http://web.archive.org/web/19990428010016/http://www.comlab.ox.ac.uk/oucl/users/ian.collier/Spectrum/index.html)
was very helpful for getting the z80 opcodes right; also the ZX Printer
emulation is based on xz80's.
@@ -27,9 +27,9 @@
* Ian Greenway: for information about reading from unattached ports. If
you've got an Amiga, you may well like to check out Ian's Spectrum
- Emulator, ASp: http://www.greew.freeserve.co.uk/ASp.html
+ Emulator, ASp: http://www.lasernet.plus.com/asp.html
-* Shawn Hargreaves: for Allegro (http://www.talula.demon.co.uk/allegro/)
+* Shawn Hargreaves: for Allegro (http://alleg.sourceforge.net/)
(again, used by previous versions of Fuse for the graphical display)
* Steven Harrison: for helping track down why the SDL sound routines
@@ -67,7 +67,7 @@
* Darren Salt: quite a few bits of code (see `AUTHORS')
-* Dmitry Sanarin: the author of Glukalka (http://glukalka.sf.net/),
+* Dmitry Sanarin: the author of Glukalka (http://www.sanarin.ru/glukalka/),
from which Fuse's TR-DOS emulation code was taken.
* Steve Snake (via Mark Woodmass): for pointing out which memory pages
@@ -78,10 +78,11 @@
the code which is used as the graphics scalers. For ScummVM, check out
http://www.scummvm.org/
-* Gergely Szasz: Interface I/microdrive emulation, the 'movie' code and the
+* Gergely Szasz: Interface 1/Microdrive emulation, the 'movie' code and the
ao sound driver (see `AUTHORS')
-* Miklos Szeredi: his `SpectEmu' (http://www.inf.bme.hu/~mszeredi/spectemu/)
+* Miklos Szeredi: his `SpectEmu'
+ (http://web.archive.org/web/20100408033206/http://www.inf.bme.hu/~mszeredi/spectemu/)
gave the inspiration for an important rewrite of the Z80 core, and was
also _very_ useful whilst trying to track down some bugs.
@@ -101,4 +102,4 @@
* Matan Ziv-Av: for various bits of code (see `AUTHORS')
-$Id: THANKS 2433 2004-11-28 21:58:44Z pak21 $
+$Id: THANKS 4882 2013-02-15 23:47:37Z sbaldovi $
Modified: vendor/fuse-emulator/current/fuse/compat/amiga/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/amiga/Makefile.am 2013-04-11 13:17:03 UTC (rev 738)
+++ vendor/fuse-emulator/current/fuse/compat/amiga/Makefile.am 2013-04-20 07:01:40 UTC (rev 739)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2007-2012 Philip Kendall
-## $Id: Makefile.am 4743 2012-10-10 13:20:50Z fredm $
+## $Id: Makefile.am 4898 2013-02-25 22:20:54Z 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
@@ -31,8 +31,11 @@
../unix/file.c \
osname.c \
paths.c \
- ../unix/timer.c \
- ../unix/tuntap.c
+ ../unix/timer.c
+if HAVE_TUNTAP
+libcompatos_a_SOURCES += ../unix/tuntap.c
+endif
+
AM_CPPFLAGS += @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@ \
-DFUSEDATADIR="\"${pkgdatadir}\""
Modified: vendor/fuse-emulator/current/fuse/compat/linux/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/linux/Makefile.am 2013-04-11 13:17:03 UTC (rev 738)
+++ vendor/fuse-emulator/current/fuse/compat/linux/Makefile.am 2013-04-20 07:01:40 UTC (rev 739)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2012 Philip Kendall
-## $Id: Makefile.am 4779 2012-11-29 18:55:54Z sbaldovi $
+## $Id: Makefile.am 4898 2013-02-25 22:20:54Z 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
@@ -31,12 +31,15 @@
../unix/file.c \
../unix/osname.c \
paths.c \
- ../unix/timer.c \
- ../unix/tuntap.c
+ ../unix/timer.c
if HAVE_SOCKETS
libcompatos_a_SOURCES += ../unix/socket.c
endif
+if HAVE_TUNTAP
+libcompatos_a_SOURCES += ../unix/tuntap.c
+endif
+
AM_CPPFLAGS += @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@ \
-DFUSEDATADIR="\"${pkgdatadir}\""
Modified: vendor/fuse-emulator/current/fuse/compat/mkstemp.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/mkstemp.c 2013-04-11 13:17:03 UTC (rev 738)
+++ vendor/fuse-emulator/current/fuse/compat/mkstemp.c 2013-04-20 07:01:40 UTC (rev 739)
@@ -49,7 +49,6 @@
int len;
char *XXXXXX;
static uint64_t value;
- uint64_t random_time_bits;
unsigned int count;
int fd = -1;
int save_errno = errno;
Modified: vendor/fuse-emulator/current/fuse/compat/morphos/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/morphos/Makefile.am 2013-04-11 13:17:03 UTC (rev 738)
+++ vendor/fuse-emulator/current/fuse/compat/morphos/Makefile.am 2013-04-20 07:01:40 UTC (rev 739)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2007-2008 Philip Kendall
-## $Id: Makefile.am 4743 2012-10-10 13:20:50Z fredm $
+## $Id: Makefile.am 4898 2013-02-25 22:20:54Z 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
@@ -31,7 +31,10 @@
../unix/file.c \
osname.c \
../amiga/paths.c \
- ../unix/timer.c \
- ../unix/tuntap.c
+ ../unix/timer.c
+if HAVE_TUNTAP
+libcompatos_a_SOURCES += ../unix/tuntap.c
+endif
+
AM_CPPFLAGS += @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@
Modified: vendor/fuse-emulator/current/fuse/compat/unix/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/unix/Makefile.am 2013-04-11 13:17:03 UTC (rev 738)
+++ vendor/fuse-emulator/current/fuse/compat/unix/Makefile.am 2013-04-20 07:01:40 UTC (rev 739)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2007-2012 Philip Kendall
-## $Id: Makefile.am 4779 2012-11-29 18:55:54Z sbaldovi $
+## $Id: Makefile.am 4898 2013-02-25 22:20:54Z 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
@@ -31,12 +31,15 @@
file.c \
osname.c \
paths.c \
- timer.c \
- tuntap.c
+ timer.c
if HAVE_SOCKETS
libcompatos_a_SOURCES += socket.c
endif
+if HAVE_TUNTAP
+libcompatos_a_SOURCES += tuntap.c
+endif
+
AM_CPPFLAGS += @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@ \
-DFUSEDATADIR="\"${pkgdatadir}\""
Modified: vendor/fuse-emulator/current/fuse/compat/unix/socket.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/unix/socket.c 2013-04-11 13:17:03 UTC (rev 738)
+++ vendor/fuse-emulator/current/fuse/compat/unix/socket.c 2013-04-20 07:01:40 UTC (rev 739)
@@ -1,7 +1,7 @@
/* socket.c: Socket-related compatibility routines
- Copyright (c) 2011 Philip Kendall
+ Copyright (c) 2011-2012 Philip Kendall
- $Id: socket.c 4775 2012-11-26 23:03:36Z sbaldovi $
+ $Id: socket.c 4828 2012-12-30 19:43:37Z 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
@@ -116,5 +116,12 @@
char bitbucket;
ssize_t bytes_read;
- bytes_read = read( self->read_fd, &bitbucket, 1 );
+ do {
+ bytes_read = read( self->read_fd, &bitbucket, 1 );
+ if( bytes_read == -1 && errno != EINTR ) {
+ ui_error( UI_ERROR_ERROR,
+ "%s: %d: unexpected error %d (%s) reading from pipe", __FILE__,
+ __LINE__, errno, strerror(errno) );
+ }
+ } while( bytes_read < 0 );
}
Modified: vendor/fuse-emulator/current/fuse/compat/unix/tuntap.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/unix/tuntap.c 2013-04-11 13:17:03 UTC (rev 738)
+++ vendor/fuse-emulator/current/fuse/compat/unix/tuntap.c 2013-04-20 07:01:40 UTC (rev 739)
@@ -1,7 +1,7 @@
/* tuntap.c: TUN/TAP compatability layer
Copyright (c) 2009-2010 Patrik Persson, Philip Kendall
- $Id: tuntap.c 4432 2011-05-11 14:08:17Z pak21 $
+ $Id: tuntap.c 4898 2013-02-25 22:20:54Z 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
@@ -30,11 +30,9 @@
#include <sys/types.h>
#include <sys/stat.h>
-#ifdef LINUX_TAP
#include <linux/if_tun.h>
#include <net/if.h>
#include <sys/ioctl.h>
-#endif /* #ifdef LINUX_TAP */
#include "ui/ui.h"
@@ -43,8 +41,6 @@
{
int fd = -1;
-#ifdef LINUX_TAP
-
if ( (fd = open( "/dev/net/tun", O_RDWR | O_NONBLOCK )) < 0 )
ui_error( UI_ERROR_ERROR, "couldn't open TUN/TAP device '/dev/net/tun'" );
else {
@@ -59,12 +55,5 @@
}
}
-#else
-
- ui_error( UI_ERROR_ERROR,
- "TUN/TAP not yet supported for this operating system" );
-
-#endif /* #ifdef LINUX_TAP */
-
return fd;
}
Modified: vendor/fuse-emulator/current/fuse/compat/wii/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/wii/Makefile.am 2013-04-11 13:17:03 UTC (rev 738)
+++ vendor/fuse-emulator/current/fuse/compat/wii/Makefile.am 2013-04-20 07:01:40 UTC (rev 739)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2007-2008 Philip Kendall
-## $Id: Makefile.am 4743 2012-10-10 13:20:50Z fredm $
+## $Id: Makefile.am 4898 2013-02-25 22:20:54Z 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
@@ -31,7 +31,10 @@
../unix/file.c \
osname.c \
paths.c \
- timer.c \
- ../unix/tuntap.c
+ timer.c
+if HAVE_TUNTAP
+libcompatos_a_SOURCES += ../unix/tuntap.c
+endif
+
AM_CPPFLAGS += @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@
Modified: vendor/fuse-emulator/current/fuse/compat/win32/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/win32/Makefile.am 2013-04-11 13:17:03 UTC (rev 738)
+++ vendor/fuse-emulator/current/fuse/compat/win32/Makefile.am 2013-04-20 07:01:40 UTC (rev 739)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2007-2008 Philip Kendall
-## $Id: Makefile.am 4779 2012-11-29 18:55:54Z sbaldovi $
+## $Id: Makefile.am 4898 2013-02-25 22:20:54Z 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
@@ -31,8 +31,7 @@
../unix/file.c \
osname.c \
paths.c \
- timer.c \
- ../unix/tuntap.c
+ timer.c
if HAVE_SOCKETS
libcompatos_a_SOURCES += socket.c
Modified: vendor/fuse-emulator/current/fuse/compat/win32/paths.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/win32/paths.c 2013-04-11 13:17:03 UTC (rev 738)
+++ vendor/fuse-emulator/current/fuse/compat/win32/paths.c 2013-04-20 07:01:40 UTC (rev 739)
@@ -1,7 +1,7 @@
/* paths.c: Path-related compatibility routines
Copyright (c) 1999-2012 Philip Kendall
- $Id: paths.c 4739 2012-10-10 12:14:56Z fredm $
+ $Id: paths.c 4882 2013-02-15 23:47:37Z sbaldovi $
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
@@ -42,7 +42,7 @@
const char *dir;
/* Something close to this algorithm specified at
- http://msdn.microsoft.com/library/default.asp?url=/library/en-us/fileio/base/gettemppath.asp
+ http://msdn.microsoft.com/en-us/library/windows/desktop/aa364992%28v=vs.85%29.aspx
*/
dir = getenv( "TMP" ); if( dir ) return dir;
dir = getenv( "TEMP" ); if( dir ) return dir;
Modified: vendor/fuse-emulator/current/fuse/configure.ac
===================================================================
--- vendor/fuse-emulator/current/fuse/configure.ac 2013-04-11 13:17:03 UTC (rev 738)
+++ vendor/fuse-emulator/current/fuse/configure.ac 2013-04-20 07:01:40 UTC (rev 739)
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-dnl $Id: configure.ac 4779 2012-11-29 18:55:54Z sbaldovi $
+dnl $Id: configure.ac 4898 2013-02-25 22:20:54Z pak21 $
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
@@ -20,20 +20,20 @@
dnl E-mail: phi...@sh...
dnl Package version
-m4_define([fuse_version], [1.0.0])
+m4_define([fuse_version], [1.1.0])
dnl Product full version
m4_define([fuse_major_version], [1])
-m4_define([fuse_minor_version], [0])
+m4_define([fuse_minor_version], [1])
m4_define([fuse_micro_version], [0])
m4_define([fuse_nano_version], [0])
m4_define([fuse_full_version], [fuse_major_version.fuse_minor_version.fuse_micro_version.fuse_nano_version])
m4_define([fuse_rc_version], [fuse_major_version,fuse_minor_version,fuse_micro_version,fuse_nano_version])
dnl Package info
-m4_define([fuse_copyright], ["(c) 1999-2012 Philip Kendall and others"])
-m4_define([fuse_url], [http://fuse-emulator.sourceforge.net])
-m4_define([fuse_bugreport], [http://sourceforge.net/tracker/?group_id=91293&atid=596648])
+m4_define([fuse_copyright], ["(c) 1999-2013 Philip Kendall and others"])
+m4_define([fuse_url], [http://fuse-emulator.sourceforge.net/])
+m4_define([fuse_bugreport], [http://sourceforge.net/p/fuse-emulator/bugs/])
AC_INIT([fuse],[fuse_version],[fuse_bugreport],[fuse],[fuse_url])
AC_CONFIG_SRCDIR(fuse.c)
@@ -105,6 +105,7 @@
dnl Checks for library functions.
AC_CHECK_FUNCS(dirname geteuid getopt_long mkstemp fsync)
+AC_CHECK_LIB([m],[cos])
dnl Allow the user to say that various libraries are in one place
AC_ARG_WITH(local-prefix,
@@ -134,6 +135,7 @@
AC_DEFINE([UI_WIN32], 1, [Defined if Win32 UI in use])
AC_DEFINE([WINVER], 0x0400, [Minimal supported version of Windows is 95 or NT4])
AC_DEFINE([_WIN32_IE], 0x400, [Internet Explorer is 4.0 or higher is required])
+ AC_DEFINE([WIN32_LEAN_AND_MEAN],, [Exclude rarely used stuff from Windows headers <windows.h>])
UI=win32; UI_LIBS="ui/win32/libuiwin32.a",
AC_MSG_ERROR([Win32 UI not found]))
fi
@@ -531,7 +533,9 @@
dsound.h,
[dxsound_available=yes],
[AC_MSG_WARN(dsound.h not found - no DirectSound output)],
- [#define DIRECTSOUND_VERSION 0x0700]
+ [#define DIRECTSOUND_VERSION 0x0700
+ #include <windows.h>
+ #include <mmsystem.h>]
)
dnl Check if MS Windows Multimedia API sound is available
@@ -759,11 +763,14 @@
int test2 = TUNSETIFF;
]])
],
- [AC_DEFINE([LINUX_TAP], 1, [Define to 1 if Linux TAP devices are supported.])
+ [AC_DEFINE([BUILD_SPECCYBOOT], 1, [Define to 1 if SpeccyBoot is supported.])
+ linux_tap=yes
AC_MSG_RESULT(yes)],
[AC_MSG_RESULT(no)]
)
CPPFLAGS="$ac_save_CPPFLAGS"
+AM_CONDITIONAL(HAVE_TUNTAP, test x$linux_tap != x)
+AM_CONDITIONAL(BUILD_SPECCYBOOT, test x$linux_tap != x)
dnl Work out which standard routines we're missing
AC_MSG_CHECKING(which standard routines we're missing)
Modified: vendor/fuse-emulator/current/fuse/fuse.c
===================================================================
--- vendor/fuse-emulator/current/fuse/fuse.c 2013-04-11 13:17:03 UTC (rev 738)
+++ vendor/fuse-emulator/current/fuse/fuse.c 2013-04-20 07:01:40 UTC (rev 739)
@@ -1,7 +1,7 @@
/* fuse.c: The Free Unix Spectrum Emulator
Copyright (c) 1999-2012 Philip Kendall and others
- $Id: fuse.c 4762 2012-11-12 11:32:09Z fredm $
+ $Id: fuse.c 4846 2013-01-03 09:14:29Z 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
@@ -121,6 +121,7 @@
const char *disk_opus;
const char *disk_plusd;
const char *disk_beta;
+ const char *disk_disciple;
const char *dock;
const char *if2;
const char *playback;
@@ -390,7 +391,7 @@
"'AUTHORS' for more details.\n"
"\n"
"For help, please mail <fus...@li...> or use\n"
- "the forums at <http://sourceforge.net/projects/fuse-emulator/forums>.\n"
+ "the forums at <http://sourceforge.net/p/fuse-emulator/discussion/>.\n"
"\n"
"This program is distributed in the hope that it will be useful,\n"
"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -480,6 +481,7 @@
start_files->disk_plus3 = settings_current.plus3disk_file;
start_files->disk_opus = settings_current.opusdisk_file;
start_files->disk_plusd = settings_current.plusddisk_file;
+ start_files->disk_disciple = settings_current.discipledisk_file;
start_files->disk_beta = settings_current.betadisk_file;
start_files->dock = settings_current.dck_file;
start_files->if2 = settings_current.if2_file;
@@ -579,7 +581,11 @@
start_files->disk_opus = filename; break;
case LIBSPECTRUM_CLASS_DISK_PLUSD:
- start_files->disk_plusd = filename; break;
+ if( periph_is_active( PERIPH_TYPE_DISCIPLE ) )
+ start_files->disk_disciple = filename;
+ else
+ start_files->disk_plusd = filename;
+ break;
case LIBSPECTRUM_CLASS_DISK_TRDOS:
start_files->disk_beta = filename; break;
@@ -598,6 +604,8 @@
start_files->disk_beta = filename;
else if( periph_is_active( PERIPH_TYPE_PLUSD ) )
start_files->disk_plusd = filename;
+ else if( periph_is_active( PERIPH_TYPE_DISCIPLE ) )
+ start_files->disk_disciple = filename;
else if( periph_is_active( PERIPH_TYPE_OPUS ) )
start_files->disk_opus = filename;
}
@@ -678,12 +686,12 @@
start_files->dock = NULL;
}
- /* Can't use disks and the Interface II simultaneously */
+ /* Can't use disks and the Interface 2 simultaneously */
if( ( start_files->disk_plus3 || start_files->disk_beta ) &&
start_files->if2 ) {
ui_error(
UI_ERROR_WARNING,
- "can't use disks and the Interface II simultaneously; cartridge ignored"
+ "can't use disks and the Interface 2 simultaneously; cartridge ignored"
);
start_files->if2 = NULL;
}
@@ -707,6 +715,11 @@
if( error ) return error;
}
+ if( start_files->disk_disciple ) {
+ error = utils_open_file( start_files->disk_disciple, autoload, NULL );
+ if( error ) return error;
+ }
+
if( start_files->disk_opus ) {
error = utils_open_file( start_files->disk_opus, autoload, NULL );
if( error ) return error;
Modified: vendor/fuse-emulator/current/fuse/hacking/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse/hacking/ChangeLog 2013-04-11 13:17:03 UTC (rev 738)
+++ vendor/fuse-emulator/current/fuse/hacking/ChangeLog 2013-04-20 07:01:40 UTC (rev 739)
@@ -3607,7 +3607,7 @@
periph.h,peripherals/disk/{Makefile.am,disciple.[ch]},settings.dat,
tape.c,ui.c,ui/{options.dat,ui.h},z80/{coretest.c,z80_checks.h,
z80_ops.c}: DISCiPLE emulation (Stuart).
-20110414 disciple.c: avoid C++/C99 comments (Stuart).
+20110414 peripherals/disk/disciple.c: avoid C++/C99 comments (Stuart).
20110415 ui/win32/win32ui.c: fix the disabling of menu entries below a
separator, e.g., /File/Movie/Stop Movie Recording (patch #3286195)
(Sergio Baldoví).
@@ -4297,3 +4297,167 @@
peripherals/spectranet.c,ui/options.dat,utils.c: allow the disabling of
Spectranet code if required libraries are not present (patch #3589476)
(Sergio).
+20121202 Makefile.am: translate path used for makensis on cygwin (win32 port)
+ (Sergio).
+20121208 configure.ac,peripherals/flash/am29f010.c,peripherals/printer.c,
+ pokefinder/pokemem.c,rectangle.c,sound/{blipbuffer.c,win32sound.c},
+ sound.c,ui/win32/{about.rc,browse.rc,binary.{c,rc},debugger.rc,
+ hyperlinks.c,memorybrowser.{c,rc},picture.{c,rc},pokefinder.rc,
+ pokemem.{c,rc},rollback.rc,roms.c,select_template.rc,win32joystick.c,
+ win32ui.c},windres.rc: preliminary support for 64-bits binaries for
+ Windows (patch #3591613) (Sergio).
+20121208 man/fuse.1: Update man page for movie, stereo separation and statusbar
+ options. Remove reference to fixed issue in joystick dialog on GTK+ UI
+ (Sergio).
+20121208 man/fuse.1: document support for reading PZX files (Sergio).
+20121210 man/fuse.1: fix a couple of typos (Fred).
+20121222 hacking/spectranet.txt: add reference to precompiled installers (Fred).
+20121222 man/fuse.1: add information on SpecDrum settings and Spectranet
+ (bug #3495082) (Fred).
+20121222 configure.ac: link explicitly against the math library. This is
+ necessary for the binutils gold linker (patch #3596551) (Alberto
+ Garcia).
+20121225 snapshot.c: support setting late timings from snapshots (Fred).
+20121227 man/fuse.1: update descriptions for SpeccyBoot interface and
+ confirm-actions option. Fix dashes (Sergio).
+20121227 configure.ac: bump version number to 1.1.0 (Fred).
+20121227 ChangeLog,README: first updates for a "1.1.0" release (Fred).
+20121227 man/fuse.1: fix spelling, capitalisation, dashes, quotes and
+ whitespace (Stuart).
+20121228 man/fuse.1: fix whitespace and grammar issues (Stuart).
+20121228 man/fuse.1: make better use of named glyphs (Stuart).
+20121228 man/fuse.1: remove trailing spaces (Stuart).
+20121228 compat/unix/socket.c,tape.c,unittests.c: fix warnings.
+20121228 man/fuse.1: whitespace and italics fixes (Stuart).
+20121228 man/fuse.1: add missing 'SpecDrum volume' section (Stuart).
+20121228 man/fuse.1: restore spacing between synopsis and description and
+ use default paragraph spacing for the entire man page (Stuart).
+20121228 man/fuse.1: use 'tbl' syntax for example of Spectranet current
+ configuration screen (Stuart).
+20121229 unittests/unittests.c: make unit tests pass for 16K and Timex
+ machines.
+20121229 man/fuse.1: whitespace and punctuation fixes (Stuart).
+20121230 man/fuse.1: use bold font for command line option names (Stuart).
+20121230 compat/unix/socket.c: don't ignore the return code from read().
+20121230 man/fuse.1: formatting fixes (Stuart).
+20121230 man/fuse.1: fix typo (Fred).
+20121230 man/fuse.1: fix typo (thanks, Fred) (Stuart).
+20121230 man/fuse.1: use conformant and more consistent syntax (Stuart).
+20121231 AUTHORS,README,THANKS,fuse.c,man/fuse.1,menu.[ch],menu_data.dat,
+ peripherals/if[12].[ch],ui.c,ui/options.dat: rename 'Interface I' and
+ 'Interface II' to 'Interface 1' and 'Interface 2' (Stuart).
+20121231 man/fuse.1: use non-breaking spaces where appropriate (Stuart).
+20130101 man/fuse.1: fix text in SPECTRANET EMULATION section (Fred).
+20130102 menu.c,menu_data.dat,settings.{dat,pl}: fix command line options and
+ add menu items for Opus Discovery and DISCiPLE ROM selection (Stuart).
+20130102 fuse.c,man/fuse.1,utils.c: wire up the --discipledisk option and
+ document it (Stuart).
+20130102 hacking/peripheral_tests.txt: add instructions for testing the
+ DISCiPLE interface (Stuart).
+20130103 configure.ac,fuse.c: make some URLs point to the new sourceforge forge
+ and update copyright date to 2013 (Sergio).
+20130103 configure.ac,fuse.c,README: add trailing slashes to URLs where
+ appropriate (Stuart).
+20130103 peripherals/disk/disciple.c: fix inverted printer busy logic (Stuart).
+20130104 ui/win32/win32ui.c: empty sound buffer when emulation is paused using a
+ shortcut key on Win32 UI (thanks, Lee Tonks) (Sergio).
+20130105 roms/{Makefile.am,README.copyright,disciple.rom}: add DISCiPLE ROM
+ with EPSON printer support (Fred).
+20130106 compat/mkstemp.c: remove unused variable (Sergio).
+20130106 peripherals/disk/disciple.c: swap order of ROM banks (Stuart).
+20130107 man/fuse.1: initial documentation of the drive emulation flags
+ (bug #250) (Fred).
+20130123 memory.c: correct restore of pentagon 1024 memory ports from snapshots
+ (bug #275) (rkd77).
+20130126 peripherals/nic/w5100_socket.c: make sure write_pending member of
+ nic_w5100_socket_t is initialised (bug #275) (rkd77).
+20130126 machines/spec_se.c: make sure that RAM variables are initialised before
+ they are referenced (more from bug #275) (rkd77).
+20130126 man/fuse.1,peripherals/printer.c,settings.dat,ui/options.dat:
+ add separate switch to enable ZX Printer emulation (bug #274) (Fred).
+20130127 machines/spec_se.c: fix SE writing dock and exrom pages to snapshots
+ (Fred).
+20130127 lib/{compressed/tape_se.szx,uncompressed/tape_se.szx},man/fuse.1,
+ roms/{README.copyright,se-0.rom,se-1.rom},tape.c: update SE ROMs to
+ v4.04 (Fred).
+20130128 peripherals/disk/{beta.c,disciple.c,opus.c,plusd.c},
+ peripherals/ide/divide.c,peripherals/{if1.c,if2.c,scld.c,speccyboot.c,
+ spectranet.c}: make sure that an associated peripheral is enabled
+ before running it's associated memory_map function (bug #276) (Fred).
+20130128 peripherals/nic/w5100_socket.c: ensure we don't read bogus data on
+ UDP writes (bug #271).
+20130130 spectrum.c: changes to keep +2A/+3 contention correct after
+ libspectrum timing changes in r4866 (Fuse part of patch #305).
+20130131 man/fuse.1: document the Poke Memory dialog (Sergio).
+20130131 man/fuse.1: fix bad syntax in the Fuse Movie File section. Add missing
+ space before TS2068 machine (Sergio).
+20130203 peripherals/disk/{beta.c,disciple.c,opus.c,plusd.c},
+ peripherals/ide/divide.c,peripherals/{if1.c,if2.c,scld.c,speccyboot.c,
+ spectranet.c}: revert fix to bug #273, ensure that interfaces are
+ disabled in the reset function unless the peripheral is enabled
+ (bug #276 #278) (thanks, Stuart Brady) (Fred).
+20130203 peripherals/nic/w5100_socket.c: remove data races (patch #306) (thanks,
+ Alberto Garcia and helgrind).
+20130211 peripherals/disk/disciple.c: fix typo in comment documenting port
+ decoding at the single bit level (Stuart).
+20130212 peripherals/disk/{disciple.c,opus.c,plusd.c}: revert further changes
+ made when reverting the fix to bug #273, causing the Opus Discovery
+ to be left paged in after a reset and +D/DISCiPLE to be left paged in
+ if loading of the interface's ROM fails (bug #284) (Stuart).
+20130212 ChangeLog: document limitations of the DISCiPLE emulation (bug #285)
+ (Stuart).
+20130216 compat/win32/paths.c,keysyms.pl,man/fuse.1,sound/blipbuffer.[ch],
+ spectrum.c,THANKS,ui/win32/debugger.h: fix broken URLs (thanks, Fred)
+ (Sergio).
+20130223 ui/widget/filesel.c: fix a couple of memory leaks (Sergio).
+20130223 peripherals/disk/{disk.h,fdd.h}: fix header descriptions (Sergio).
+20130223 peripherals/disk/disciple.c,roms/disciple.rom: remove GDOS from
+ DISCiPLE ROM image and use 8 KiB ROMs (Stuart).
+20130223 peripherals/disk/disciple.c: remove comments regarding unattached
+ port I/O for paging operations (Stuart).
+20130223 peripherals/disk/{disciple,plusd}.[ch]: rename the paging port
+ functions to {disciple,plusd}_patch_{read,write} (from *_mem_*)
+ to follow MGT terminology (Stuart).
+20130223 man/fuse.1: improve NMI documentation for +D and DISCiPLE (Stuart).
+20130225 compat/{win32/Makefile.am,unix/{Makefile.am,tuntap.c},
+ morphos/Makefile.am,wii/Makefile.am,amiga/Makefile.am,
+ linux/Makefile.am},configure.ac,peripherals/{speccyboot.c,
+ nic/Makefile.am}: improve SpeccyBoot behaviour on non-Linux systems
+ and when ROM is not available (patch #302) (Sergio).
+20130229 man/fuse.1: sort disciple, discipledisk, paltv2x, sound-device and
+ specdrum options alphabetically (Sergio).
+20130301 man/fuse.1: add Spectranet options and fix a couple of typos (bug #244)
+ (Sergio).
+20130303 ui/widget/menu.c: remove potential use of uninitialised variable
+ (Fred).
+20130303 peripherals/disk/disk.c: fix memory disk image corrupted after save
+ (bug #279) (Sergio).
+20130303 man/fuse.1: document hq2x and hq3x filters (Sergio).
+20130308 peripherals/spectranet.[ch],z80/{coretest.c,z80.{c,h,pl}}: implement
+ Spectranet's "suppress NMI" flipflop (bug #259).
+20130310 periph.[ch],peripherals/disk/{beta.c,disciple.c,opus.c,plusd.c},
+ peripherals/ide/{divide.c,simpleide.c,zxatasp.c,zxcf.c},
+ peripherals/{fuller.c,if1.c,kempmouse.c,melodik.c,printer.c,
+ speccyboot.c,specdrum.c,spectranet.c},
+ ui/options.dat: do a hard reset when a peripheral that requires it is
+ enabled or disabled in settings (bugs #281, #283, #289) (Fred).
+20130310 man/fuse.1: mention that peripherals changes can result in hard resets
+ (Fred).
+20130310 ui/gtk/{binary.c,debugger.c}: replace deprecated GtkTable with GtkGrid
+ (patch #307) (Sergio).
+20130310 ui/win32/{picture.c,statusbar.c}: use best practices for releasing GDI
+ objects on win32 UI (thanks, Dr. Memory) (Sergio).
+20130322 roms/{plus3e-0.rom,plus3e-1.rom,plus3e-2.rom}: update to v1.38 of the
+ +3e ROMs (fixes bug #290) (thanks, Guesser) (Fred).
+20130324 peripherals/nic/{w5100.c,w5100_internals.h,w5100_socket.c}: destroy
+ mutex before closing (patch #308) (Sergio).
+20130325 ui/widget/options.pl: run the peripherals posthook at the appropriate
+ point to work (bug #281) (Sergio and Fred).
+20130404 ui/win32/win32joystick.c: fix input events fired when various joystick
+ buttons are pressed simultaneously (Sergio).
+20130407 input.[ch],man/fuse.1,settings.dat,ui/{gtk/gtkjoystick.c,
+ sdl/sdljoystick.c,uijoystick.c,widget/menu.c}: allow up to 15 joytick
+ buttons to be defined to accomodate e.g. XBox 360 ABXY button use
+ (patch #309) (Fred).
+20130420 peripherals/disk/disk.c: fix loading of EDSK files with redundant
+ sector images (bug #293) (Fred).
Modified: vendor/fuse-emulator/current/fuse/hacking/peripheral_tests.txt
===================================================================
--- vendor/fuse-emulator/current/fuse/hacking/peripheral_tests.txt 2013-04-11 13:17:03 UTC (rev 738)
+++ vendor/fuse-emulator/current/fuse/hacking/peripheral_tests.txt 2013-04-20 07:01:40 UTC (rev 739)
@@ -13,11 +13,26 @@
* Uncompress lib/tests/success.mgt.bz2
* Start fuse as
./fuse --plusd --plusddisk lib/tests/success.mgt PlusDSystemTape.tzx
+* Hit enter
* Hit <Break>
* Enter NEW
* Enter LOAD d1"Success"
* You should see "Congraturation! You sucsess!"
+DISCiPLE
+
+* Acquire the DISCiPLE system tape from
+ ftp://ftp.worldofspectrum.org/pub/sinclair/utils/DISCiPLESystemTapeV3d.tzx.zip
+* Uncompress lib/tests/success.mgt.bz2
+* Place a DISCiPLE ROM image in the 'roms' directory.
+* Start fuse as
+ ./fuse --disciple --discipledisk lib/tests/success.mgt DISCiPLESystemTapeV3d.tzx.zip
+* Hit enter
+* Hit <Break>
+* Enter NEW
+* Enter LOAD d1"Success"
+* You should see "Congraturation! You sucsess!"
+
DivIDE
* Acquire the FATware installer from http://baze.au.com/divide/
Modified: vendor/fuse-emulator/current/fuse/hacking/spectranet.txt
===================================================================
--- vendor/fuse-emulator/current/fuse/hacking/spectranet.txt 2013-04-11 13:17:03 UTC (rev 738)
+++ vendor/fuse-emulator/current/fuse/hacking/spectranet.txt 2013-04-20 07:01:40 UTC (rev 739)
@@ -7,11 +7,11 @@
a later firmware than this, things may have changed slightly.
The first thing you will need to do is to obtain a copy of the
-Spectranet installer as a .tap file (or similar). This may in fact be
-the hardest step - see below for instructions for building the installer
-from source if you really can't find a copy. A number of
-Spectranet-enabled folks hang out in the #zx channel on the Coldfront
-IRC network (irc.coldfront.net) - try asking in there.
+Spectranet installer as a .tap file (or similar). You can find installers
+at http://spectrum.alioth.net/doc/index.php in the Downloads section, or
+you can see below for instructions for building the installer from
+source. A number of Spectranet-enabled folks hang out in the #zx channel
+on the Coldfront IRC network (irc.coldfront.net) - try asking in there.
Once you have a copy of the installer, start Fuse and tick the
"Spectranet" and "Spectranet disable" options from the Options /
Modified: vendor/fuse-emulator/current/fuse/input.c
===================================================================
--- vendor/fuse-emulator/current/fuse/input.c 2013-04-11 13:17:03 UTC (rev 738)
+++ vendor/fuse-emulator/current/fuse/input.c 2013-04-20 07:01:40 UTC (rev 739)
@@ -1,7 +1,7 @@
/* input.c: generalised input events layer for Fuse
Copyright (c) 2004 Philip Kendall
- $Id: input.c 4545 2011-09-19 01:57:01Z fredm $
+ $Id: input.c 4915 2013-04-07 05:32:09Z 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
@@ -159,6 +159,11 @@
case INPUT_JOYSTICK_FIRE_8 : return settings_current.joystick_1_fire_8;
case INPUT_JOYSTICK_FIRE_9 : return settings_current.joystick_1_fire_9;
case INPUT_JOYSTICK_FIRE_10: return settings_current.joystick_1_fire_10;
+ case INPUT_JOYSTICK_FIRE_11: return settings_current.joystick_1_fire_11;
+ case INPUT_JOYSTICK_FIRE_12: return settings_current.joystick_1_fire_12;
+ case INPUT_JOYSTICK_FIRE_13: return settings_current.joystick_1_fire_13;
+ case INPUT_JOYSTICK_FIRE_14: return settings_current.joystick_1_fire_14;
+ case INPUT_JOYSTICK_FIRE_15: return settings_current.joystick_1_fire_15;
default: break;
}
break;
@@ -175,6 +180,11 @@
case INPUT_JOYSTICK_FIRE_8 : return settings_current.joystick_2_fire_8;
case INPUT_JOYSTICK_FIRE_9 : return settings_current.joystick_2_fire_9;
case INPUT_JOYSTICK_FIRE_10: return settings_current.joystick_2_fire_10;
+ case INPUT_JOYSTICK_FIRE_11: return settings_current.joystick_2_fire_11;
+ case INPUT_JOYSTICK_FIRE_12: return settings_current.joystick_2_fire_12;
+ case INPUT_JOYSTICK_FIRE_13: return settings_current.joystick_2_fire_13;
+ case INPUT_JOYSTICK_FIRE_14: return settings_current.joystick_2_fire_14;
+ case INPUT_JOYSTICK_FIRE_15: return settings_current.joystick_2_fire_15;
default: break;
}
break;
Modified: vendor/fuse-emulator/current/fuse/input.h
===================================================================
--- vendor/fuse-emulator/current/fuse/input.h 2013-04-11 13:17:03 UTC (rev 738)
+++ vendor/fuse-emulator/current/fuse/input.h 2013-04-20 07:01:40 UTC (rev 739)
@@ -1,7 +1,7 @@
/* input.h: generalised input events layer for Fuse
Copyright (c) 2004 Philip Kendall
- $Id: input.h 4698 2012-05-07 02:38:35Z fredm $
+ $Id: input.h 4915 2013-04-07 05:32:09Z 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
@@ -199,6 +199,11 @@
INPUT_JOYSTICK_FIRE_8,
INPUT_JOYSTICK_FIRE_9,
INPUT_JOYSTICK_FIRE_10,
+ INPUT_JOYSTICK_FIRE_11,
+ INPUT_JOYSTICK_FIRE_12,
+ INPUT_JOYSTICK_FIRE_13,
+ INPUT_JOYSTICK_FIRE_14,
+ INPUT_JOYSTICK_FIRE_15,
} input_key;
Modified: vendor/fuse-emulator/current/fuse/keysyms.pl
===================================================================
--- vendor/fuse-emulator/current/fuse/keysyms.pl 2013-04-11 13:17:03 UTC (rev 738)
+++ vendor/fuse-emulator/current/fuse/keysyms.pl 2013-04-20 07:01:40 UTC (rev 739)
@@ -4,7 +4,7 @@
# Copyright (c) 2000-2007 Philip Kendall, Matan Ziv-Av, Russell Marks,
# Fredrick Meunier, Catalin Mihaila, Stuart Brady
-# $Id: keysyms.pl 4723 2012-07-08 13:26:15Z fredm $
+# $Id: keysyms.pl 4882 2013-02-15 23:47:37Z sbaldovi $
# 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
@@ -104,7 +104,7 @@
my $keysym = shift;
- # http://msdn2.microsoft.com/en-us/library/ms645540.aspx
+ # http://msdn.microsoft.com/en-us/library/dd375731(VS.85).aspx
$keysym =~ tr/a-z/A-Z/;
Modified: vendor/fuse-emulator/current/fuse/lib/compressed/tape_se.szx
===================================================================
(Binary files differ)
Modified: vendor/fuse-emulator/current/fuse/lib/uncompressed/tape_se.szx
===================================================================
(Binary files differ)
Modified: vendor/fuse-emulator/current/fuse/machines/spec_se.c
===================================================================
--- vendor/fuse-emulator/current/fuse/machines/spec_se.c 2013-04-11 13:17:03 UTC (rev 738)
+++ vendor/fuse-emulator/current/fuse/machines/spec_se.c 2013-04-20 07:01:40 UTC (rev 739)
@@ -1,7 +1,7 @@
/* spec_se.c: ZX Spectrum SE specific routines
Copyright (c) 1999-2011 Fredrick Meunier, Philip Kendall, Darren Salt
- $Id: spec_se.c 4724 2012-07-08 13:38:21Z fredm $
+ $Id: spec_se.c 4862 2013-01-27 11:00:36Z 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
@@ -46,7 +46,7 @@
#include "tc2068.h"
#include "ui/ui.h"
-static int dock_exrom_reset( void );
+static void dock_exrom_reset( void );
static int spec_se_reset( void );
static int spec_se_memory_map( void );
@@ -73,13 +73,11 @@
return 0;
}
-static int
+static void
dock_exrom_reset( void )
{
/* The dock is always active on the SE */
dck_active = 1;
-
- return 0;
}
int
@@ -88,7 +86,7 @@
int error;
size_t i, j;
- error = dock_exrom_reset(); if( error ) return error;
+ dock_exrom_reset();
error = machine_load_rom( 0, settings_current.rom_spec_se_0,
settings_default.rom_spec_se_0, 0x4000 );
@@ -128,10 +126,9 @@
periph_set_present( PERIPH_TYPE_SCLD, PERIPH_PRESENT_ALWAYS );
/* ZX Printer available */
- periph_set_present( PERIPH_TYPE_ZXPRINTER_FULL_DECODE, PERIPH_PRESENT_OPTIONAL );
+ periph_set_present( PERIPH_TYPE_ZXPRINTER_FULL_DECODE,
+ PERIPH_PRESENT_OPTIONAL );
- periph_update();
-
for( i = 0; i < 8; i++ ) {
libspectrum_byte *dock_ram = memory_pool_allocate( 0x2000 );
@@ -145,12 +142,16 @@
timex_dock[page_num].offset = j * MEMORY_PAGE_SIZE;
timex_dock[page_num].page_num = i;
timex_dock[page_num].contended = 0;
+ timex_dock[page_num].writable = 1;
+ timex_dock[page_num].save_to_snapshot = 1;
timex_dock[page_num].source = memory_source_dock;
timex_exrom[page_num].page = exrom_ram + j * MEMORY_PAGE_SIZE;
timex_exrom[page_num].offset = j * MEMORY_PAGE_SIZE;
timex_exrom[page_num].page_num = i;
timex_exrom[page_num].contended = 0;
+ timex_exrom[page_num].writable = 1;
+ timex_exrom[page_num].save_to_snapshot = 1;
timex_exrom[page_num].source = memory_source_exrom;
}
}
@@ -171,6 +172,10 @@
memory_current_screen = 5;
memory_screen_mask = 0xdfff;
+ /* Make sure SCLD and friends are enabled, calls memory_map() as a side
+ effect so we need memory related variables etc. to be initialised */
+ periph_update();
+
scld_dec_write( 0x00ff, 0x80 );
scld_dec_write( 0x00ff, 0x00 );
scld_hsr_write( 0x00f4, 0x00 );
Modified: vendor/fuse-emulator/current/fuse/man/fuse.1
===================================================================
--- vendor/fuse-emulator/current/fuse/man/fuse.1 2013-04-11 13:17:03 UTC (rev 738)
+++ vendor/fuse-emulator/current/fuse/man/fuse.1 2013-04-20 07:01:40 UTC (rev 739)
@@ -23,50 +23,48 @@
.\" E-mail: phi...@sh...
.\"
.\"
-.TH fuse 1 "16th December, 2010" "Version 1.0.0" "Emulators"
+.TH fuse 1 "??th ????, 201?" "Version 1.1.0" "Emulators"
.\"
.\"------------------------------------------------------------------
.\"
.SH NAME
-fuse \- Sinclair ZX Spectrum emulator
+fuse \(em Sinclair ZX Spectrum emulator
.\"
.\"------------------------------------------------------------------
.\"
.SH SYNOPSIS
.\" the trend for long-option-using programs is to give a largely
.\" generic synopsis, so...
-.PD 0
.B fuse
.RI [ options ]
.P
-.PD 1
.\"
.\"------------------------------------------------------------------
.\"
.SH DESCRIPTION
-Fuse is a Sinclair ZX Spectrum emulator. It supports several models
+Fuse is a Sinclair ZX\ Spectrum emulator. It supports several models
(including the 128), with quite faithful emulation of the display and
sound.
.PP
The emulator can load any of the formats supported by
.IR libspectrum (3)
-\- this includes Z80, SNA and SZX snapshots, and TAP and TZX
+\(em this includes Z80, SNA and SZX snapshots, and PZX, TAP and TZX
virtual-tape files. Saving to SZX, Z80 and SNA snapshots and TZX and
TAP tape files is supported. The SLT extension to the Z80 format is
partly supported (enough for multi-load games); however, loading of
-the old DAT-file variant is not. DSK, UDI, FDI, TR0, SDF, MGT, IMG,
+the old DAT-file variant is not. DSK, UDI, FDI, TR0, SDF, MGT, IMG,
SAD, TRD, SCL and OPD disk images are supported when a disk interface
-is being emulated, including the integrated disk drives on +3,
+is being emulated, including the integrated disk drives on +3,
Pentagon or Scorpion machines as well as the +D, DISCiPLE,
-Opus Discovery and Beta 128 interfaces. DCK cartridge images are
-supported when emulating a Timex 2068 variant. Interface II ROM
+Opus Discovery and Beta\ 128 interfaces. DCK cartridge images are
+supported when emulating a Timex\ 2068 variant. Interface\ 2 ROM
cartridges are also supported.
.PP
Finally, there is also support for reading and writing the RZX input recording
format.
.PP
See the
-.B COMPRESSED FILES
+.B "COMPRESSED FILES"
section for details on reading files compressed with
.IR bzip2 "(3)"
or
@@ -82,18 +80,18 @@
.\" the options list is in alphabetical order by long option name (or
.\" short option name if none).
.\"
-.I \-\-accelerate\-loader
+.B \-\-accelerate\-loader
.RS
-Specify whether Fuse should attempt to accelerate tape loaders ...
[truncated message content] |
