Thread: [Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx:[532] vendor/fuse-emulator/current
Brought to you by:
fredm
Menu
▾
▴
fuse-for-macosx-commits
|
From: <fr...@us...> - 2008-09-28 12:27:37
|
Revision: 532
http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=532&view=rev
Author: fredm
Date: 2008-09-28 12:26:43 +0000 (Sun, 28 Sep 2008)
Log Message:
-----------
Load . into vendor/fuse-emulator/current.
Modified Paths:
--------------
vendor/fuse-emulator/current/fuse/Makefile.am
vendor/fuse-emulator/current/fuse/README
vendor/fuse-emulator/current/fuse/compat/amiga/Makefile.am
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/osname.c
vendor/fuse-emulator/current/fuse/compat/win32/Makefile.am
vendor/fuse-emulator/current/fuse/compat.h
vendor/fuse-emulator/current/fuse/configure.in
vendor/fuse-emulator/current/fuse/dck.c
vendor/fuse-emulator/current/fuse/debugger/Makefile.am
vendor/fuse-emulator/current/fuse/debugger/breakpoint.c
vendor/fuse-emulator/current/fuse/debugger/breakpoint.h
vendor/fuse-emulator/current/fuse/debugger/command.c
vendor/fuse-emulator/current/fuse/debugger/commandl.l
vendor/fuse-emulator/current/fuse/debugger/commandy.y
vendor/fuse-emulator/current/fuse/debugger/debugger.c
vendor/fuse-emulator/current/fuse/debugger/debugger.h
vendor/fuse-emulator/current/fuse/debugger/debugger_internals.h
vendor/fuse-emulator/current/fuse/debugger/expression.c
vendor/fuse-emulator/current/fuse/disk/beta.c
vendor/fuse-emulator/current/fuse/disk/beta.h
vendor/fuse-emulator/current/fuse/disk/disk.c
vendor/fuse-emulator/current/fuse/disk/fdd.c
vendor/fuse-emulator/current/fuse/disk/fdd.h
vendor/fuse-emulator/current/fuse/disk/plusd.c
vendor/fuse-emulator/current/fuse/disk/plusd.h
vendor/fuse-emulator/current/fuse/disk/upd_fdc.c
vendor/fuse-emulator/current/fuse/disk/upd_fdc.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/if1.c
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/loader.c
vendor/fuse-emulator/current/fuse/machine.c
vendor/fuse-emulator/current/fuse/machines/specplus3.h
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/menu_data.pl
vendor/fuse-emulator/current/fuse/periph.c
vendor/fuse-emulator/current/fuse/periph.h
vendor/fuse-emulator/current/fuse/profile.c
vendor/fuse-emulator/current/fuse/rzx.c
vendor/fuse-emulator/current/fuse/rzx.h
vendor/fuse-emulator/current/fuse/screenshot.c
vendor/fuse-emulator/current/fuse/settings.dat
vendor/fuse-emulator/current/fuse/simpleide.c
vendor/fuse-emulator/current/fuse/snapshot.c
vendor/fuse-emulator/current/fuse/sound/alsasound.c
vendor/fuse-emulator/current/fuse/sound/dxsound.c
vendor/fuse-emulator/current/fuse/sound/win32sound.c
vendor/fuse-emulator/current/fuse/spectrum.c
vendor/fuse-emulator/current/fuse/spectrum.h
vendor/fuse-emulator/current/fuse/tape.c
vendor/fuse-emulator/current/fuse/tape.h
vendor/fuse-emulator/current/fuse/timer/timer.c
vendor/fuse-emulator/current/fuse/timer/timer.h
vendor/fuse-emulator/current/fuse/ui/fb/fbdisplay.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/gtk/gtkkeyboard.c
vendor/fuse-emulator/current/fuse/ui/gtk/gtkui.c
vendor/fuse-emulator/current/fuse/ui/options.dat
vendor/fuse-emulator/current/fuse/ui/scaler/scalers.c
vendor/fuse-emulator/current/fuse/ui/sdl/sdldisplay.c
vendor/fuse-emulator/current/fuse/ui/sdl/sdljoystick.c
vendor/fuse-emulator/current/fuse/ui/svga/svgadisplay.c
vendor/fuse-emulator/current/fuse/ui/svga/svgajoystick.c
vendor/fuse-emulator/current/fuse/ui/uidisplay.h
vendor/fuse-emulator/current/fuse/ui/uijoystick.c
vendor/fuse-emulator/current/fuse/ui/widget/Makefile.am
vendor/fuse-emulator/current/fuse/ui/widget/browse.c
vendor/fuse-emulator/current/fuse/ui/widget/debugger.c
vendor/fuse-emulator/current/fuse/ui/widget/error.c
vendor/fuse-emulator/current/fuse/ui/widget/filesel.c
vendor/fuse-emulator/current/fuse/ui/widget/memory.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/widget/picture.c
vendor/fuse-emulator/current/fuse/ui/widget/pokefinder.c
vendor/fuse-emulator/current/fuse/ui/widget/query.c
vendor/fuse-emulator/current/fuse/ui/widget/roms.c
vendor/fuse-emulator/current/fuse/ui/widget/select.c
vendor/fuse-emulator/current/fuse/ui/widget/text.c
vendor/fuse-emulator/current/fuse/ui/widget/widget.c
vendor/fuse-emulator/current/fuse/ui/widget/widget.h
vendor/fuse-emulator/current/fuse/ui/widget/widget_internals.h
vendor/fuse-emulator/current/fuse/ui/win32/Makefile.am
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.c
vendor/fuse-emulator/current/fuse/ui/win32/browse.h
vendor/fuse-emulator/current/fuse/ui/win32/browse.rc
vendor/fuse-emulator/current/fuse/ui/win32/debugger.c
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/memorybrowser.c
vendor/fuse-emulator/current/fuse/ui/win32/memorybrowser.h
vendor/fuse-emulator/current/fuse/ui/win32/memorybrowser.rc
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/ui/win32/picture.c
vendor/fuse-emulator/current/fuse/ui/win32/picture.h
vendor/fuse-emulator/current/fuse/ui/win32/picture.rc
vendor/fuse-emulator/current/fuse/ui/win32/pokefinder.c
vendor/fuse-emulator/current/fuse/ui/win32/pokefinder.h
vendor/fuse-emulator/current/fuse/ui/win32/pokefinder.rc
vendor/fuse-emulator/current/fuse/ui/win32/rollback.c
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/roms.rc
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/win32display.c
vendor/fuse-emulator/current/fuse/ui/win32/win32internals.h
vendor/fuse-emulator/current/fuse/ui/win32/win32joystick.c
vendor/fuse-emulator/current/fuse/ui/win32/win32joystick.rc
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/xdisplay.c
vendor/fuse-emulator/current/fuse/ui/xlib/xui.c
vendor/fuse-emulator/current/fuse/unittests/unittests.c
vendor/fuse-emulator/current/fuse/utils.c
vendor/fuse-emulator/current/fuse/z80/coretest.c
vendor/fuse-emulator/current/fuse/z80/tests/tests.expected
vendor/fuse-emulator/current/fuse/z80/tests/tests.in
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/z80/z80_ops.c
vendor/fuse-emulator/current/fuse/zxatasp.c
vendor/fuse-emulator/current/fuse/zxcf.c
vendor/fuse-emulator/current/fuse-utils/Makefile.am
vendor/fuse-emulator/current/fuse-utils/configure.in
vendor/fuse-emulator/current/fuse-utils/hacking/ChangeLog
vendor/fuse-emulator/current/fuse-utils/listbasic.c
vendor/fuse-emulator/current/fuse-utils/man/audio2tape.1
vendor/fuse-emulator/current/fuse-utils/man/tapeconv.1
vendor/fuse-emulator/current/fuse-utils/rzxcheck.c
vendor/fuse-emulator/current/fuse-utils/rzxtool.c
vendor/fuse-emulator/current/fuse-utils/snap2tzx.c
vendor/fuse-emulator/current/fuse-utils/snapconv.c
vendor/fuse-emulator/current/fuse-utils/tape2wav.c
vendor/fuse-emulator/current/fuse-utils/tapeconv.c
vendor/fuse-emulator/current/fuse-utils/tzxlist.c
vendor/fuse-emulator/current/fuse-utils/utils.c
vendor/fuse-emulator/current/libspectrum/Makefile.am
vendor/fuse-emulator/current/libspectrum/accessor.pl
vendor/fuse-emulator/current/libspectrum/bzip2.c
vendor/fuse-emulator/current/libspectrum/configure.in
vendor/fuse-emulator/current/libspectrum/creator.c
vendor/fuse-emulator/current/libspectrum/crypto.c
vendor/fuse-emulator/current/libspectrum/csw.c
vendor/fuse-emulator/current/libspectrum/dck.c
vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog
vendor/fuse-emulator/current/libspectrum/ide.c
vendor/fuse-emulator/current/libspectrum/internals.h
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/microdrive.c
vendor/fuse-emulator/current/libspectrum/myglib/Makefile.am
vendor/fuse-emulator/current/libspectrum/myglib/ghash.c
vendor/fuse-emulator/current/libspectrum/myglib/gslist.c
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/snapshot.c
vendor/fuse-emulator/current/libspectrum/sp.c
vendor/fuse-emulator/current/libspectrum/szx.c
vendor/fuse-emulator/current/libspectrum/tap.c
vendor/fuse-emulator/current/libspectrum/tape.c
vendor/fuse-emulator/current/libspectrum/tape_block.c
vendor/fuse-emulator/current/libspectrum/tape_block.h
vendor/fuse-emulator/current/libspectrum/test/Makefile.am
vendor/fuse-emulator/current/libspectrum/test/edges.c
vendor/fuse-emulator/current/libspectrum/test/test.c
vendor/fuse-emulator/current/libspectrum/test/test.h
vendor/fuse-emulator/current/libspectrum/test/test15.c
vendor/fuse-emulator/current/libspectrum/tzx_read.c
vendor/fuse-emulator/current/libspectrum/tzx_write.c
vendor/fuse-emulator/current/libspectrum/warajevo_read.c
vendor/fuse-emulator/current/libspectrum/wav.c
vendor/fuse-emulator/current/libspectrum/z80.c
vendor/fuse-emulator/current/libspectrum/z80em.c
vendor/fuse-emulator/current/libspectrum/zlib.c
vendor/fuse-emulator/current/libspectrum/zxs.c
vendor/fuse-emulator/current/website/fuse.php
vendor/fuse-emulator/current/website/libspectrum.php
Added Paths:
-----------
vendor/fuse-emulator/current/fuse/PORTING
vendor/fuse-emulator/current/fuse/compat/unix/file.c
vendor/fuse-emulator/current/fuse/compat/wii/
vendor/fuse-emulator/current/fuse/compat/wii/Makefile.am
vendor/fuse-emulator/current/fuse/compat/wii/file.c
vendor/fuse-emulator/current/fuse/debugger/event.c
vendor/fuse-emulator/current/fuse/debugger/variable.c
vendor/fuse-emulator/current/fuse/mempool.c
vendor/fuse-emulator/current/fuse/mempool.h
vendor/fuse-emulator/current/fuse/ui/win32/confirm.c
vendor/fuse-emulator/current/fuse/ui/win32/fileselector.c
vendor/fuse-emulator/current/fuse-basic/
vendor/fuse-emulator/current/fuse-basic/COPYING
vendor/fuse-emulator/current/fuse-basic/Makefile.am
vendor/fuse-emulator/current/fuse-basic/autogen.sh
vendor/fuse-emulator/current/fuse-basic/basic.c
vendor/fuse-emulator/current/fuse-basic/basic.h
vendor/fuse-emulator/current/fuse-basic/basicl.l
vendor/fuse-emulator/current/fuse-basic/basicy.y
vendor/fuse-emulator/current/fuse-basic/check
vendor/fuse-emulator/current/fuse-basic/configure.ac
vendor/fuse-emulator/current/fuse-basic/dump.c
vendor/fuse-emulator/current/fuse-basic/dump.h
vendor/fuse-emulator/current/fuse-basic/explist.c
vendor/fuse-emulator/current/fuse-basic/explist.h
vendor/fuse-emulator/current/fuse-basic/line.c
vendor/fuse-emulator/current/fuse-basic/line.h
vendor/fuse-emulator/current/fuse-basic/numexp.c
vendor/fuse-emulator/current/fuse-basic/numexp.h
vendor/fuse-emulator/current/fuse-basic/parse.c
vendor/fuse-emulator/current/fuse-basic/parse.h
vendor/fuse-emulator/current/fuse-basic/printlist.c
vendor/fuse-emulator/current/fuse-basic/printlist.h
vendor/fuse-emulator/current/fuse-basic/program.c
vendor/fuse-emulator/current/fuse-basic/program.h
vendor/fuse-emulator/current/fuse-basic/spectrum-string.c
vendor/fuse-emulator/current/fuse-basic/spectrum-string.h
vendor/fuse-emulator/current/fuse-basic/statement.c
vendor/fuse-emulator/current/fuse-basic/statement.h
vendor/fuse-emulator/current/fuse-basic/strexp.c
vendor/fuse-emulator/current/fuse-basic/strexp.h
vendor/fuse-emulator/current/fuse-basic/tests/
vendor/fuse-emulator/current/fuse-basic/tests/abs.bas
vendor/fuse-emulator/current/fuse-basic/tests/abs.out
vendor/fuse-emulator/current/fuse-basic/tests/acs.bas
vendor/fuse-emulator/current/fuse-basic/tests/acs.out
vendor/fuse-emulator/current/fuse-basic/tests/and.bas
vendor/fuse-emulator/current/fuse-basic/tests/and.out
vendor/fuse-emulator/current/fuse-basic/tests/asn.bas
vendor/fuse-emulator/current/fuse-basic/tests/asn.out
vendor/fuse-emulator/current/fuse-basic/tests/atn.bas
vendor/fuse-emulator/current/fuse-basic/tests/atn.out
vendor/fuse-emulator/current/fuse-basic/tests/chrs.bas
vendor/fuse-emulator/current/fuse-basic/tests/chrs.out
vendor/fuse-emulator/current/fuse-basic/tests/code.bas
vendor/fuse-emulator/current/fuse-basic/tests/code.out
vendor/fuse-emulator/current/fuse-basic/tests/cos.bas
vendor/fuse-emulator/current/fuse-basic/tests/cos.out
vendor/fuse-emulator/current/fuse-basic/tests/dim.bas
vendor/fuse-emulator/current/fuse-basic/tests/dim.out
vendor/fuse-emulator/current/fuse-basic/tests/divide.bas
vendor/fuse-emulator/current/fuse-basic/tests/divide.out
vendor/fuse-emulator/current/fuse-basic/tests/equal.bas
vendor/fuse-emulator/current/fuse-basic/tests/equal.out
vendor/fuse-emulator/current/fuse-basic/tests/exp.bas
vendor/fuse-emulator/current/fuse-basic/tests/exp.out
vendor/fuse-emulator/current/fuse-basic/tests/for.bas
vendor/fuse-emulator/current/fuse-basic/tests/for.out
vendor/fuse-emulator/current/fuse-basic/tests/ge.bas
vendor/fuse-emulator/current/fuse-basic/tests/ge.out
vendor/fuse-emulator/current/fuse-basic/tests/gosub.bas
vendor/fuse-emulator/current/fuse-basic/tests/gosub.out
vendor/fuse-emulator/current/fuse-basic/tests/goto.bas
vendor/fuse-emulator/current/fuse-basic/tests/goto.out
vendor/fuse-emulator/current/fuse-basic/tests/greater.bas
vendor/fuse-emulator/current/fuse-basic/tests/greater.out
vendor/fuse-emulator/current/fuse-basic/tests/if.bas
vendor/fuse-emulator/current/fuse-basic/tests/if.out
vendor/fuse-emulator/current/fuse-basic/tests/int.bas
vendor/fuse-emulator/current/fuse-basic/tests/int.out
vendor/fuse-emulator/current/fuse-basic/tests/le.bas
vendor/fuse-emulator/current/fuse-basic/tests/le.out
vendor/fuse-emulator/current/fuse-basic/tests/len.bas
vendor/fuse-emulator/current/fuse-basic/tests/len.out
vendor/fuse-emulator/current/fuse-basic/tests/less.bas
vendor/fuse-emulator/current/fuse-basic/tests/less.out
vendor/fuse-emulator/current/fuse-basic/tests/let.bas
vendor/fuse-emulator/current/fuse-basic/tests/let.out
vendor/fuse-emulator/current/fuse-basic/tests/ln.bas
vendor/fuse-emulator/current/fuse-basic/tests/ln.out
vendor/fuse-emulator/current/fuse-basic/tests/minus.bas
vendor/fuse-emulator/current/fuse-basic/tests/minus.out
vendor/fuse-emulator/current/fuse-basic/tests/ne.bas
vendor/fuse-emulator/current/fuse-basic/tests/ne.out
vendor/fuse-emulator/current/fuse-basic/tests/not.bas
vendor/fuse-emulator/current/fuse-basic/tests/not.out
vendor/fuse-emulator/current/fuse-basic/tests/or.bas
vendor/fuse-emulator/current/fuse-basic/tests/or.out
vendor/fuse-emulator/current/fuse-basic/tests/pi.bas
vendor/fuse-emulator/current/fuse-basic/tests/pi.out
vendor/fuse-emulator/current/fuse-basic/tests/plus.bas
vendor/fuse-emulator/current/fuse-basic/tests/plus.out
vendor/fuse-emulator/current/fuse-basic/tests/power.bas
vendor/fuse-emulator/current/fuse-basic/tests/power.out
vendor/fuse-emulator/current/fuse-basic/tests/rnd.bas
vendor/fuse-emulator/current/fuse-basic/tests/rnd.out
vendor/fuse-emulator/current/fuse-basic/tests/sgn.bas
vendor/fuse-emulator/current/fuse-basic/tests/sgn.out
vendor/fuse-emulator/current/fuse-basic/tests/sin.bas
vendor/fuse-emulator/current/fuse-basic/tests/sin.out
vendor/fuse-emulator/current/fuse-basic/tests/slicer.bas
vendor/fuse-emulator/current/fuse-basic/tests/slicer.out
vendor/fuse-emulator/current/fuse-basic/tests/sqr.bas
vendor/fuse-emulator/current/fuse-basic/tests/sqr.out
vendor/fuse-emulator/current/fuse-basic/tests/stop.bas
vendor/fuse-emulator/current/fuse-basic/tests/stop.out
vendor/fuse-emulator/current/fuse-basic/tests/tan.bas
vendor/fuse-emulator/current/fuse-basic/tests/tan.out
vendor/fuse-emulator/current/fuse-basic/tests/times.bas
vendor/fuse-emulator/current/fuse-basic/tests/times.out
vendor/fuse-emulator/current/fuse-basic/token.h
vendor/fuse-emulator/current/fuse-basic/utils.c
vendor/fuse-emulator/current/fuse-basic/utils.h
vendor/fuse-emulator/current/fuse-basic/val.c
vendor/fuse-emulator/current/fuse-basic/val.h
vendor/fuse-emulator/current/fuse-utils/audio2tape.cc
vendor/fuse-emulator/current/fuse-utils/audio2tape.h
vendor/fuse-emulator/current/fuse-utils/converter/
vendor/fuse-emulator/current/fuse-utils/converter/findpilot.cc
vendor/fuse-emulator/current/fuse-utils/converter/findpilot.h
vendor/fuse-emulator/current/fuse-utils/converter/findsync1.cc
vendor/fuse-emulator/current/fuse-utils/converter/findsync1.h
vendor/fuse-emulator/current/fuse-utils/converter/getpulse1.cc
vendor/fuse-emulator/current/fuse-utils/converter/getpulse1.h
vendor/fuse-emulator/current/fuse-utils/converter/getpulse2.cc
vendor/fuse-emulator/current/fuse-utils/converter/getpulse2.h
vendor/fuse-emulator/current/fuse-utils/converter/getsync2.cc
vendor/fuse-emulator/current/fuse-utils/converter/getsync2.h
vendor/fuse-emulator/current/fuse-utils/converter/romloader.cc
vendor/fuse-emulator/current/fuse-utils/converter/romloader.h
vendor/fuse-emulator/current/fuse-utils/converter/romloaderstate.h
vendor/fuse-emulator/current/fuse-utils/importer/
vendor/fuse-emulator/current/fuse-utils/importer/interpolator.h
vendor/fuse-emulator/current/fuse-utils/importer/schmitt.h
vendor/fuse-emulator/current/fuse-utils/importer/simple.h
vendor/fuse-emulator/current/fuse-utils/importer/soundfile.cc
vendor/fuse-emulator/current/fuse-utils/importer/soundfile.h
vendor/fuse-emulator/current/fuse-utils/importer/trigger.cc
vendor/fuse-emulator/current/fuse-utils/importer/trigger.h
vendor/fuse-emulator/current/libspectrum/memory.c
vendor/fuse-emulator/current/libspectrum/myglib/garray.c
vendor/fuse-emulator/current/libspectrum/test/writeprotected.mdr
Removed Paths:
-------------
vendor/fuse-emulator/current/fuse/ui/win32/error.c
vendor/fuse-emulator/current/fuse/ui/win32/win32display.h
vendor/fuse-emulator/current/fuse/ui/win32/win32keyboard.h
vendor/fuse-emulator/current/fuse-utils/audio2tape.c
Modified: vendor/fuse-emulator/current/fuse/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/Makefile.am 2008-05-10 23:53:25 UTC (rev 531)
+++ vendor/fuse-emulator/current/fuse/Makefile.am 2008-09-28 12:26:43 UTC (rev 532)
@@ -1,7 +1,7 @@
# Process this file with automake to produce Makefile.in
## Copyright (c) 1999-2008 Philip Kendall
-## $Id: Makefile.am 3609 2008-05-01 13:17:56Z fredm $
+## $Id: Makefile.am 3617 2008-05-17 08:09:47Z 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
@@ -72,6 +72,7 @@
loader.c \
machine.c \
memory.c \
+ mempool.c \
menu.c \
module.c \
periph.c \
Added: vendor/fuse-emulator/current/fuse/PORTING
===================================================================
--- vendor/fuse-emulator/current/fuse/PORTING (rev 0)
+++ vendor/fuse-emulator/current/fuse/PORTING 2008-09-28 12:26:43 UTC (rev 532)
@@ -0,0 +1,22 @@
+Porting Fuse
+============
+
+Sorry, at the moment this isn't a helpful guide as to what you need to do
+to port Fuse to a new platform.
+
+Unfortunately, various people have failed to read and understand the GNU
+General Public License (see 'COPYING') before porting Fuse, so this is a
+very brief guide to what you can and can't do with Fuse's code:
+
+* If you release a binary of Fuse, you *must* release *all* the source
+ code you used to create it at the same time. "Soon" or "when I've
+ tidied up the code" is NOT acceptable.
+
+* If you use any code which you haven't written yourself, it must be
+ available under a licence compatible with the GPL. As an example, this
+ means you may *not* use any code which "may not be used for commercial
+ purposes". Any code which is licenced under the GPL (v2), the modified
+ BSD license or which is truly in the public domain is OK.
+
+Note that above is not an exhaustive list of what you can and cannot
+do with Fuse's code. For the full details, see the GPL.
Modified: vendor/fuse-emulator/current/fuse/README
===================================================================
--- vendor/fuse-emulator/current/fuse/README 2008-05-10 23:53:25 UTC (rev 531)
+++ vendor/fuse-emulator/current/fuse/README 2008-09-28 12:26:43 UTC (rev 532)
@@ -26,6 +26,14 @@
* Emulation of the DivIDE, Interface I, Kempston mouse, Spectrum +3e,
ZXATASP, ZXCF, Beta 128 and +D interfaces.
+Help! <xyz> doesn't work
+------------------------
+
+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/forum/?group_id=91293>.
+
What you'll need to run Fuse
----------------------------
@@ -143,4 +151,4 @@
Philip Kendall <phi...@sh...>
5 January 2008
-$Id: README 3584 2008-03-25 10:27:30Z fredm $
+$Id: README 3718 2008-07-19 12:29:41Z pak21 $
Modified: vendor/fuse-emulator/current/fuse/compat/amiga/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/amiga/Makefile.am 2008-05-10 23:53:25 UTC (rev 531)
+++ vendor/fuse-emulator/current/fuse/compat/amiga/Makefile.am 2008-09-28 12:26:43 UTC (rev 532)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
-## Copyright (c) 2007 Philip Kendall
+## Copyright (c) 2007-2008 Philip Kendall
-## $Id: Makefile.am 3578 2008-03-22 20:51:36Z zubzero $
+## $Id: Makefile.am 3687 2008-06-23 11:55:23Z 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
@@ -27,7 +27,8 @@
noinst_LIBRARIES = libcompatos.a
-libcompatos_a_SOURCES = osname.c \
+libcompatos_a_SOURCES = ../unix/file.c \
+ osname.c \
paths.c
INCLUDES = @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@
Modified: vendor/fuse-emulator/current/fuse/compat/morphos/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/morphos/Makefile.am 2008-05-10 23:53:25 UTC (rev 531)
+++ vendor/fuse-emulator/current/fuse/compat/morphos/Makefile.am 2008-09-28 12:26:43 UTC (rev 532)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
-## Copyright (c) 2007 Philip Kendall
+## Copyright (c) 2007-2008 Philip Kendall
-## $Id: Makefile.am 3115 2007-08-19 02:49:14Z fredm $
+## $Id: Makefile.am 3687 2008-06-23 11:55:23Z 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
@@ -27,7 +27,8 @@
noinst_LIBRARIES = libcompatos.a
-libcompatos_a_SOURCES = osname.c \
+libcompatos_a_SOURCES = ../unix/file.c \
+ osname.c \
../amiga/paths.c
INCLUDES = @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 2008-05-10 23:53:25 UTC (rev 531)
+++ vendor/fuse-emulator/current/fuse/compat/unix/Makefile.am 2008-09-28 12:26:43 UTC (rev 532)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
-## Copyright (c) 2007 Philip Kendall
+## Copyright (c) 2007-2008 Philip Kendall
-## $Id: Makefile.am 3115 2007-08-19 02:49:14Z fredm $
+## $Id: Makefile.am 3687 2008-06-23 11:55:23Z 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
@@ -27,7 +27,8 @@
noinst_LIBRARIES = libcompatos.a
-libcompatos_a_SOURCES = osname.c \
+libcompatos_a_SOURCES = file.c \
+ osname.c \
paths.c
INCLUDES = @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@
Added: vendor/fuse-emulator/current/fuse/compat/unix/file.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/unix/file.c (rev 0)
+++ vendor/fuse-emulator/current/fuse/compat/unix/file.c 2008-09-28 12:26:43 UTC (rev 532)
@@ -0,0 +1,107 @@
+/* file.c: File-related compatibility routines
+ Copyright (c) 2008 Philip Kendall
+
+ $Id: file.c 3722 2008-07-22 03:12:28Z specu $
+
+ 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:
+
+ E-mail: phi...@sh...
+
+*/
+
+#include <config.h>
+
+#include <errno.h>
+#include <fcntl.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+#include "compat.h"
+#include "ui/ui.h"
+
+/* Certain brain damaged operating systems (DOS/Windows) treat text
+ and binary files different in open(2) and need to be given the
+ O_BINARY flag to tell them it's a binary file */
+#ifndef O_BINARY
+#define O_BINARY 0
+#endif /* #ifndef O_BINARY */
+
+const compat_fd COMPAT_FILE_OPEN_FAILED = -1;
+
+compat_fd
+compat_file_open( const char *path, int write )
+{
+ int flags = write ? O_WRONLY | O_CREAT | O_BINARY : O_RDONLY | O_BINARY;
+ return open( path, flags );
+}
+
+off_t
+compat_file_get_length( compat_fd fd )
+{
+ struct stat file_info;
+
+ if( fstat( fd, &file_info ) ) {
+ ui_error( UI_ERROR_ERROR, "couldn't stat file: %s", strerror( errno ) );
+ return -1;
+ }
+
+ return file_info.st_size;
+}
+
+int
+compat_file_read( compat_fd fd, utils_file *file )
+{
+ ssize_t bytes = read( fd, file->buffer, file->length );
+ if( bytes != file->length ) {
+ if( bytes == -1 ) {
+ ui_error( UI_ERROR_ERROR, "error reading file: %s", strerror( errno ) );
+ } else {
+ ui_error( UI_ERROR_ERROR,
+ "error reading file: expected %ld bytes, but read only %ld",
+ (unsigned long)file->length, (unsigned long)bytes );
+ }
+ return 1;
+ }
+
+ return 0;
+}
+
+int
+compat_file_write( compat_fd fd, const unsigned char *buffer, size_t length )
+{
+ ssize_t bytes = write( fd, buffer, length );
+ if( bytes != length ) {
+ if( bytes == -1 ) {
+ ui_error( UI_ERROR_ERROR, "error writing file: %s", strerror( errno ) );
+ } else {
+ ui_error( UI_ERROR_ERROR,
+ "error writing file: expected %ld bytes, but wrote only %ld",
+ (unsigned long)length, (unsigned long)bytes );
+ }
+ return 1;
+ }
+
+ return 0;
+}
+
+int
+compat_file_close( compat_fd fd )
+{
+ return close( fd );
+}
Modified: vendor/fuse-emulator/current/fuse/compat/unix/osname.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/unix/osname.c 2008-05-10 23:53:25 UTC (rev 531)
+++ vendor/fuse-emulator/current/fuse/compat/unix/osname.c 2008-09-28 12:26:43 UTC (rev 532)
@@ -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 3115 2007-08-19 02:49:14Z fredm $
+ $Id: osname.c 3626 2008-05-23 10:30:30Z 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
@@ -38,7 +38,7 @@
int error;
error = uname( &osname );
- if( error ) {
+ if( error < 0 ) {
ui_error( UI_ERROR_ERROR, "error getting system information: %s",
strerror( errno ) );
return 1;
Added: vendor/fuse-emulator/current/fuse/compat/wii/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/wii/Makefile.am (rev 0)
+++ vendor/fuse-emulator/current/fuse/compat/wii/Makefile.am 2008-09-28 12:26:43 UTC (rev 532)
@@ -0,0 +1,34 @@
+## Process this file with automake to produce Makefile.in
+## Copyright (c) 2007-2008 Philip Kendall
+
+## $Id: Makefile.am 3687 2008-06-23 11:55:23Z 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
+## 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:
+##
+## E-mail: phi...@sh...
+
+AUTOMAKE_OPTIONS = foreign
+
+AM_CPPFLAGS = -I$(srcdir)/../..
+
+noinst_LIBRARIES = libcompatos.a
+
+libcompatos_a_SOURCES = file.c \
+ osname.c \
+ paths.c
+
+INCLUDES = @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@
Added: vendor/fuse-emulator/current/fuse/compat/wii/file.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/wii/file.c (rev 0)
+++ vendor/fuse-emulator/current/fuse/compat/wii/file.c 2008-09-28 12:26:43 UTC (rev 532)
@@ -0,0 +1,90 @@
+/* file.c: File-related compatibility routines
+ Copyright (c) 2008 Philip Kendall
+
+ $Id: file.c 3688 2008-06-23 18:17:56Z pak21 $
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ 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:
+
+ E-mail: phi...@sh...
+
+*/
+
+#include <config.h>
+
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+#include "compat.h"
+#include "ui/ui.h"
+
+const compat_fd COMPAT_FILE_OPEN_FAILED = NULL;
+
+compat_fd
+compat_file_open( const char *path, int write )
+{
+ return fopen( path, write ? "w" : "r" );
+}
+
+off_t
+compat_file_get_length( compat_fd fd )
+{
+ struct stat file_info;
+
+ if( fstat( fileno( fd ), &file_info ) ) {
+ ui_error( UI_ERROR_ERROR, "couldn't stat file: %s", strerror( errno ) );
+ return -1;
+ }
+
+ return file_info.st_size;
+}
+
+int
+compat_file_read( compat_fd fd, utils_file *file )
+{
+ size_t bytes = fread( file->buffer, 1, file->length, fd );
+ if( bytes != file->length ) {
+ ui_error( UI_ERROR_ERROR,
+ "error reading file: expected %d bytes, but read only %d",
+ file->length, bytes );
+ return 1;
+ }
+
+ return 0;
+}
+
+int
+compat_file_write( compat_fd fd, const unsigned char *buffer, size_t length )
+{
+ size_t bytes = fwrite( buffer, 1, length, fd );
+ if( bytes != length ) {
+ ui_error( UI_ERROR_ERROR,
+ "error writing file: expected %d bytes, but wrote only %d",
+ length, bytes );
+ return 1;
+ }
+
+ return 0;
+}
+
+int
+compat_file_close( compat_fd fd )
+{
+ return fclose( fd );
+}
Modified: vendor/fuse-emulator/current/fuse/compat/win32/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/win32/Makefile.am 2008-05-10 23:53:25 UTC (rev 531)
+++ vendor/fuse-emulator/current/fuse/compat/win32/Makefile.am 2008-09-28 12:26:43 UTC (rev 532)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
-## Copyright (c) 2007 Philip Kendall
+## Copyright (c) 2007-2008 Philip Kendall
-## $Id: Makefile.am 3115 2007-08-19 02:49:14Z fredm $
+## $Id: Makefile.am 3687 2008-06-23 11:55:23Z 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
@@ -27,7 +27,8 @@
noinst_LIBRARIES = libcompatos.a
-libcompatos_a_SOURCES = osname.c \
+libcompatos_a_SOURCES = ../unix/file.c \
+ osname.c \
paths.c
INCLUDES = @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@
Modified: vendor/fuse-emulator/current/fuse/compat.h
===================================================================
--- vendor/fuse-emulator/current/fuse/compat.h 2008-05-10 23:53:25 UTC (rev 531)
+++ vendor/fuse-emulator/current/fuse/compat.h 2008-09-28 12:26:43 UTC (rev 532)
@@ -1,7 +1,7 @@
/* compat.h: various compatibility bits
- Copyright (c) 2003 Philip Kendall
+ Copyright (c) 2003-2008 Philip Kendall
- $Id: compat.h 3129 2007-08-30 12:46:32Z pak21 $
+ $Id: compat.h 3687 2008-06-23 11:55:23Z 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
@@ -28,6 +28,8 @@
#include <stdlib.h>
+#include <utils.h>
+
/* Remove the gcc-specific incantations if we're not using gcc */
#ifdef __GNUC__
@@ -43,14 +45,6 @@
#endif /* #ifdef __GNUC__ */
-/* Certain brain damaged operating systems (DOS/Windows) treat text
- and binary files different in open(2) and need to be given the
- O_BINARY flag to tell them it's a binary file */
-#ifndef O_BINARY
-#define O_BINARY 0
-#endif /* #ifndef O_BINARY */
-
-/* Replacement functions */
#ifndef HAVE_DIRNAME
char *dirname( char *path );
#endif /* #ifndef HAVE_DIRNAME */
@@ -77,4 +71,19 @@
const char* compat_get_home_path( void );
int compat_is_absolute_path( const char *path );
+#ifndef UI_WII
+typedef int compat_fd;
+#else /* #ifndef UI_WII */
+typedef FILE* compat_fd;
+#endif /* #ifndef UI_WII */
+
+extern const compat_fd COMPAT_FILE_OPEN_FAILED;
+
+compat_fd compat_file_open( const char *path, int write );
+off_t compat_file_get_length( compat_fd fd );
+int compat_file_read( compat_fd fd, utils_file *file );
+int compat_file_write( compat_fd fd, const unsigned char *buffer,
+ size_t length );
+int compat_file_close( compat_fd fd );
+
#endif /* #ifndef FUSE_COMPAT_H */
Modified: vendor/fuse-emulator/current/fuse/configure.in
===================================================================
--- vendor/fuse-emulator/current/fuse/configure.in 2008-05-10 23:53:25 UTC (rev 531)
+++ vendor/fuse-emulator/current/fuse/configure.in 2008-09-28 12:26:43 UTC (rev 532)
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-dnl $Id: configure.in 3609 2008-05-01 13:17:56Z fredm $
+dnl $Id: configure.in 3756 2008-08-24 13:41:23Z specu $
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
@@ -94,6 +94,8 @@
AC_CHECK_HEADER(windows.h,
LIBS="$LIBS -mwindows -lcomctl32";
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])
UI=win32; UI_LIBS="ui/win32/libuiwin32.a",
AC_MSG_ERROR([Win32 UI not found]))
fi
@@ -363,7 +365,8 @@
AC_CHECK_HEADER(
dsound.h,
[dxsound_available=yes],
- [AC_MSG_WARN(dsound.h not found - no DirectSound output)]
+ [AC_MSG_WARN(dsound.h not found - no DirectSound output)],
+ [#define DIRECTSOUND_VERSION 0x0700]
)
dnl Check if MS Windows Multimedia API sound is available
@@ -402,15 +405,16 @@
dnl
AC_MSG_CHECKING(which sound routines to use)
-if test "$dxsound_available" = yes; then
+if test "$UI" = sdl; then
+ SOUND_LIBADD='sdlsound.$(OBJEXT)' SOUND_LIBS='' sound_fifo=yes
+ AC_MSG_RESULT(SDL)
+elif test "$dxsound_available" = yes; then
SOUND_LIBADD='dxsound.$(OBJEXT)' SOUND_LIBS='-ldsound -lole32 -ldxguid'
AC_MSG_RESULT(DirectX)
+ AC_DEFINE([DIRECTSOUND_VERSION], 0x0700, [DirectX 7 or higher is required])
elif test "$win32sound_available" = yes; then
SOUND_LIBADD='win32sound.$(OBJEXT)' SOUND_LIBS='-lwinmm'
AC_MSG_RESULT(win32sound)
-elif test "$UI" = sdl; then
- SOUND_LIBADD='sdlsound.$(OBJEXT)' SOUND_LIBS='' sound_fifo=yes
- AC_MSG_RESULT(SDL)
elif test "$alsa_available" = yes; then
SOUND_LIBADD='alsasound.$(OBJEXT)' SOUND_LIBS='-lasound'
AC_MSG_RESULT(ALSA)
Modified: vendor/fuse-emulator/current/fuse/dck.c
===================================================================
--- vendor/fuse-emulator/current/fuse/dck.c 2008-05-10 23:53:25 UTC (rev 531)
+++ vendor/fuse-emulator/current/fuse/dck.c 2008-09-28 12:26:43 UTC (rev 532)
@@ -1,7 +1,7 @@
/* dck.c: dock snapshot (Warajevo .DCK) handling routines
Copyright (c) 2003-2004 Darren Salt, Fredrick Meunier, Philip Kendall
- $Id: dck.c 3609 2008-05-01 13:17:56Z fredm $
+ $Id: dck.c 3703 2008-06-30 20:36:11Z 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
@@ -99,7 +99,7 @@
return 0;
}
- error = libspectrum_dck_alloc( &dck ); if( error ) return error;
+ dck = libspectrum_dck_alloc();
error = utils_read_file( settings_current.dck_file, &file );
if( error ) { libspectrum_dck_free( dck, 0 ); return error; }
Modified: vendor/fuse-emulator/current/fuse/debugger/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/debugger/Makefile.am 2008-05-10 23:53:25 UTC (rev 531)
+++ vendor/fuse-emulator/current/fuse/debugger/Makefile.am 2008-09-28 12:26:43 UTC (rev 532)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
-## Copyright (c) 2001-2004 Philip Kendall
+## Copyright (c) 2001-2008 Philip Kendall
-## $Id: Makefile.am 3150 2007-09-05 14:05:00Z pak21 $
+## $Id: Makefile.am 3657 2008-06-08 15:04: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
@@ -35,7 +35,9 @@
commandy.y \
debugger.c \
disassemble.c \
- expression.c
+ event.c \
+ expression.c \
+ variable.c
commandl.c: commandy.c
commandy.h: commandy.c
Modified: vendor/fuse-emulator/current/fuse/debugger/breakpoint.c
===================================================================
--- vendor/fuse-emulator/current/fuse/debugger/breakpoint.c 2008-05-10 23:53:25 UTC (rev 531)
+++ vendor/fuse-emulator/current/fuse/debugger/breakpoint.c 2008-09-28 12:26:43 UTC (rev 532)
@@ -1,7 +1,7 @@
/* breakpoint.c: a debugger breakpoint
- Copyright (c) 2002-2007 Philip Kendall
+ Copyright (c) 2002-2008 Philip Kendall
- $Id: breakpoint.c 3138 2007-09-02 12:19:16Z pak21 $
+ $Id: breakpoint.c 3685 2008-06-21 12:37:24Z 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,6 +26,7 @@
#include <config.h>
#include <ctype.h>
+#include <string.h>
#include <libspectrum.h>
@@ -43,11 +44,11 @@
/* Textual representations of the breakpoint types and lifetimes */
const char *debugger_breakpoint_type_text[] = {
- "Execute", "Read", "Write", "Port Read", "Port Write", "Time",
+ "Execute", "Read", "Write", "Port Read", "Port Write", "Time", "Event",
};
const char debugger_breakpoint_type_abbr[][4] = {
- "Exe", "Rd", "Wr", "PtR", "PtW", "Tm",
+ "Exe", "Rd", "Wr", "PtR", "PtW", "Tm", "Ev",
};
const char *debugger_breakpoint_life_text[] = {
@@ -146,11 +147,46 @@
fuse_abort();
}
- value.tstates = tstates;
+ value.time.tstates = tstates;
return breakpoint_add( type, value, ignore, life, condition );
}
+int
+debugger_breakpoint_add_event( debugger_breakpoint_type type,
+ const char *type_string, const char *detail,
+ size_t ignore, debugger_breakpoint_life life,
+ debugger_expression *condition )
+{
+ debugger_breakpoint_value value;
+
+ switch( type ) {
+ case DEBUGGER_BREAKPOINT_TYPE_EVENT:
+ break;
+
+ default:
+ ui_error( UI_ERROR_ERROR, "%s given type %d", __func__, type );
+ fuse_abort();
+ }
+
+ if( !debugger_event_is_registered( type_string, detail ) ) {
+ ui_error( UI_ERROR_WARNING, "Event type %s:%s not known", type_string,
+ detail );
+ return 1;
+ }
+
+ value.event.detail = NULL;
+ value.event.type = strdup( type_string );
+ value.event.detail = strdup( detail );
+ if( !value.event.type || !value.event.detail ) {
+ free( value.event.type );
+ free( value.event.detail );
+ return 1;
+ }
+
+ return breakpoint_add( type, value, ignore, life, condition );
+}
+
static int
breakpoint_add( debugger_breakpoint_type type, debugger_breakpoint_value value,
size_t ignore, debugger_breakpoint_life life,
@@ -158,7 +194,7 @@
{
debugger_breakpoint *bp;
- bp = malloc( sizeof( debugger_breakpoint ) );
+ bp = malloc( sizeof( *bp ) );
if( !bp ) {
ui_error( UI_ERROR_ERROR, "Out of memory at %s:%d", __FILE__, __LINE__ );
return 1;
@@ -167,8 +203,18 @@
bp->id = next_breakpoint_id++; bp->type = type;
bp->value = value;
bp->ignore = ignore; bp->life = life;
- bp->condition = condition;
+ if( condition ) {
+ bp->condition = debugger_expression_copy( condition );
+ if( !bp->condition ) {
+ free( bp );
+ return 1;
+ }
+ } else {
+ bp->condition = NULL;
+ }
+ bp->commands = NULL;
+
debugger_breakpoints = g_slist_append( debugger_breakpoints, bp );
if( debugger_mode == DEBUGGER_MODE_INACTIVE )
@@ -179,7 +225,7 @@
if( type == DEBUGGER_BREAKPOINT_TYPE_TIME ) {
int error;
- error = event_add( value.tstates, EVENT_TYPE_BREAKPOINT );
+ error = event_add( value.time.tstates, debugger_breakpoint_event );
if( error ) return error;
}
@@ -203,16 +249,18 @@
if( breakpoint_check( bp, type, value ) ) {
debugger_mode = DEBUGGER_MODE_HALTED;
- return 1;
+ debugger_command_evaluate( bp->commands );
}
}
- return 0;
+ break;
case DEBUGGER_MODE_HALTED: return 1;
}
- return 0; /* Keep gcc happy */
+
+ /* Debugger mode could have been reset by a breakpoint command */
+ return ( debugger_mode == DEBUGGER_MODE_HALTED );
}
static int
@@ -296,6 +344,25 @@
return buffer;
}
+int
+debugger_breakpoint_trigger( debugger_breakpoint *bp )
+{
+ if( bp->ignore ) { bp->ignore--; return 0; }
+
+ if( bp->condition && !debugger_expression_evaluate( bp->condition ) )
+ return 0;
+
+ if( bp->life == DEBUGGER_BREAKPOINT_LIFE_ONESHOT ) {
+ debugger_breakpoints = g_slist_remove( debugger_breakpoints, bp );
+ free( bp );
+ }
+
+ if( bp->type == DEBUGGER_BREAKPOINT_TYPE_TIME )
+ bp->value.time.triggered = 1;
+
+ return 1;
+}
+
/* Check whether 'bp' should trigger if we're looking for a breakpoint
of 'type' with parameter 'value'. Returns non-zero if we should trigger */
static int
@@ -332,7 +399,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.time.triggered || bp->value.time.tstates > tstates ) return 0;
break;
default:
@@ -341,17 +408,7 @@
}
- if( bp->ignore ) { bp->ignore--; return 0; }
-
- if( bp->condition && !debugger_expression_evaluate( bp->condition ) )
- return 0;
-
- if( bp->life == DEBUGGER_BREAKPOINT_LIFE_ONESHOT ) {
- debugger_breakpoints = g_slist_remove( debugger_breakpoints, bp );
- free( bp );
- }
-
- return 1;
+ return debugger_breakpoint_trigger( bp );
}
struct remove_t {
@@ -378,7 +435,7 @@
struct remove_t remove;
- remove.tstates = bp->value.tstates;
+ remove.tstates = bp->value.time.tstates;
remove.done = 0;
event_foreach( remove_time, &remove );
@@ -424,9 +481,9 @@
if( remove->done ) return;
- if( event->type == EVENT_TYPE_BREAKPOINT &&
+ if( event->type == debugger_breakpoint_event &&
event->tstates == remove->tstates ) {
- event->type = EVENT_TYPE_NULL;
+ event->type = event_type_null;
remove->done = 1;
}
}
@@ -447,7 +504,7 @@
found++;
- free( ptr->data );
+ free_breakpoint( ptr->data, NULL );
debugger_breakpoints = g_slist_remove( debugger_breakpoints, ptr->data );
if( debugger_mode == DEBUGGER_MODE_ACTIVE && !debugger_breakpoints )
@@ -503,7 +560,24 @@
{
debugger_breakpoint *bp = data;
+ switch( bp->type ) {
+ case DEBUGGER_BREAKPOINT_TYPE_EVENT:
+ free( bp->value.event.type );
+ free( bp->value.event.detail );
+ break;
+
+ case DEBUGGER_BREAKPOINT_TYPE_EXECUTE:
+ case DEBUGGER_BREAKPOINT_TYPE_READ:
+ case DEBUGGER_BREAKPOINT_TYPE_WRITE:
+ case DEBUGGER_BREAKPOINT_TYPE_PORT_READ:
+ case DEBUGGER_BREAKPOINT_TYPE_PORT_WRITE:
+ case DEBUGGER_BREAKPOINT_TYPE_TIME:
+ /* No action needed */
+ break;
+ }
+
if( bp->condition ) debugger_expression_delete( bp->condition );
+ if( bp->commands ) free( bp->commands );
free( bp );
}
@@ -531,11 +605,29 @@
if( bp->condition ) debugger_expression_delete( bp->condition );
- bp->condition = condition;
+ if( condition ) {
+ bp->condition = debugger_expression_copy( condition );
+ if( !bp->condition ) return 1;
+ } else {
+ bp->condition = NULL;
+ }
return 0;
}
+int
+debugger_breakpoint_set_commands( size_t id, const char *commands )
+{
+ debugger_breakpoint *bp = get_breakpoint_by_id( id );
+ if( !bp ) return 1;
+
+ free( bp->commands );
+ bp->commands = strdup( commands );
+ if( !bp->commands ) return 1;
+
+ return 0;
+}
+
/* Add events corresponding to all the time events to happen during
this frame */
int
@@ -550,6 +642,15 @@
{
debugger_breakpoint *bp = data;
- if( bp->type == DEBUGGER_BREAKPOINT_TYPE_TIME )
- event_add( bp->value.tstates, EVENT_TYPE_BREAKPOINT );
+ if( bp->type == DEBUGGER_BREAKPOINT_TYPE_TIME ) {
+ bp->value.time.triggered = 0;
+ event_add( bp->value.time.tstates, debugger_breakpoint_event );
+ }
}
+
+void
+debugger_breakpoint_time_fn( libspectrum_dword tstates, int type GCC_UNUSED,
+ void *user_data GCC_UNUSED )
+{
+ debugger_check( DEBUGGER_BREAKPOINT_TYPE_TIME, 0 );
+}
Modified: vendor/fuse-emulator/current/fuse/debugger/breakpoint.h
===================================================================
--- vendor/fuse-emulator/current/fuse/debugger/breakpoint.h 2008-05-10 23:53:25 UTC (rev 531)
+++ vendor/fuse-emulator/current/fuse/debugger/breakpoint.h 2008-09-28 12:26:43 UTC (rev 532)
@@ -1,7 +1,7 @@
/* breakpoint.h: a debugger breakpoint
- Copyright (c) 2002-2004 Philip Kendall
+ Copyright (c) 2002-2008 Philip Kendall
- $Id: breakpoint.h 2889 2007-05-26 17:45:08Z zubzero $
+ $Id: breakpoint.h 3662 2008-06-09 11:19:29Z 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
@@ -34,6 +34,7 @@
DEBUGGER_BREAKPOINT_TYPE_PORT_READ,
DEBUGGER_BREAKPOINT_TYPE_PORT_WRITE,
DEBUGGER_BREAKPOINT_TYPE_TIME,
+ DEBUGGER_BREAKPOINT_TYPE_EVENT,
} debugger_breakpoint_type;
extern const char *debugger_breakpoint_type_text[];
@@ -71,11 +72,22 @@
} debugger_breakpoint_port;
+typedef struct debugger_breakpoint_time {
+ libspectrum_dword tstates;
+ int triggered;
+} debugger_breakpoint_time;
+
+typedef struct debugger_event_t {
+ char *type;
+ char *detail;
+} debugger_event_t;
+
typedef union debugger_breakpoint_value {
debugger_breakpoint_address address;
debugger_breakpoint_port port;
- libspectrum_dword tstates;
+ debugger_breakpoint_time time;
+ debugger_event_t event;
} debugger_breakpoint_value;
@@ -92,6 +104,9 @@
debugger_breakpoint_life life;
debugger_expression *condition; /* Conditional expression to activate this
breakpoint */
+
+ char *commands;
+
} debugger_breakpoint;
/* The current breakpoints */
@@ -118,6 +133,12 @@
size_t ignore, debugger_breakpoint_life life, debugger_expression *condition
);
+int
+debugger_breakpoint_add_event(
+ debugger_breakpoint_type type, const char *type_string, const char *detail,
+ size_t ignore, debugger_breakpoint_life life, debugger_expression *condition
+);
+
/* Add events corresponding to all the time breakpoints to happen
during this frame */
int debugger_add_time_events( void );
Modified: vendor/fuse-emulator/current/fuse/debugger/command.c
===================================================================
--- vendor/fuse-emulator/current/fuse/debugger/command.c 2008-05-10 23:53:25 UTC (rev 531)
+++ vendor/fuse-emulator/current/fuse/debugger/command.c 2008-09-28 12:26:43 UTC (rev 532)
@@ -1,7 +1,7 @@
/* command.c: Parse a debugger command
- Copyright (c) 2002 Philip Kendall
+ Copyright (c) 2002-2008 Philip Kendall
- $Id: command.c 3115 2007-08-19 02:49:14Z fredm $
+ $Id: command.c 3631 2008-05-26 12:22:29Z 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,6 +31,7 @@
#include "debugger.h"
#include "debugger_internals.h"
+#include "mempool.h"
#include "ui/ui.h"
#include "z80/z80.h"
#include "z80/z80_macros.h"
@@ -64,6 +65,9 @@
/* Parse the command */
yyparse();
+ /* And free any memory we allocated while parsing */
+ mempool_free( debugger_memory_pool );
+
ui_debugger_update();
return 0;
Modified: vendor/fuse-emulator/current/fuse/debugger/commandl.l
===================================================================
--- vendor/fuse-emulator/current/fuse/debugger/commandl.l 2008-05-10 23:53:25 UTC (rev 531)
+++ vendor/fuse-emulator/current/fuse/debugger/commandl.l 2008-09-28 12:26:43 UTC (rev 532)
@@ -1,7 +1,7 @@
/* commandl.l: Debugger command lexical scanner
- Copyright (c) 2002 Philip Kendall
+ Copyright (c) 2002-2008 Philip Kendall
- $Id: commandl.l 3503 2008-01-30 14:58:55Z pak21 $
+ $Id: commandl.l 3712 2008-07-06 11:45:24Z 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,6 +31,7 @@
#include "debugger.h"
#include "debugger_internals.h"
+#include "mempool.h"
#include "commandy.h"
@@ -39,23 +40,29 @@
if( !debugger_command_input( buf, &result, max_size ) ) result = YY_NULL; \
}
+#define YY_NO_INPUT
+
%}
-DIGIT [0-9]
-HEX [0-9a-f]
+ID [a-z][a-z0-9]+
%option caseless
+%s COMMANDSTATE1
+%x COMMANDSTATE2
+
%%
ba|bas|base { return BASE; }
br|bre|brea|break|breakp|breakpo|breakpoi|breakpoin|breakpoint { return BREAK;}
co|con|cont|contin|continu|continue { return CONTINUE; }
+com|comm|comma|comman|command|commands { BEGIN(COMMANDSTATE1); return COMMANDS; }
cond|condi|condit|conditi|conditio|condition { return CONDITION; }
cl|cle|clea|clear { return CLEAR; }
del|dele|delet|delete { return DEBUGGER_DELETE; }
di|dis|disa|disas|disass|disasse|disassm|disassmb|diasassmbl|disassemble {
return DISASSEMBLE; }
+ev|eve|even|event { return EVENT; }
ex|exi|exit { return EXIT; }
fi|fin|fini|finis|finish { return FINISH; }
if { return IF; }
@@ -64,6 +71,7 @@
o|ou|out { return DEBUGGER_OUT; } /* Different name to avoid clashing
with OUT from z80/z80_macros.h */
p|po|por|port { return PORT; }
+pr|pri|prin|print { return DEBUGGER_PRINT; }
r|re|rea|read { return READ; }
se|set { return SET; }
s|st|ste|step { return STEP; }
@@ -119,16 +127,36 @@
":" { return ':'; }
-${HEX}+ { yylval.integer = strtol( yytext+1, NULL, 16 );
+$[[:xdigit:]]+ { yylval.integer = strtol( yytext+1, NULL, 16 );
+ if( YY_START == COMMANDSTATE1 ) BEGIN( COMMANDSTATE2 );
return NUMBER; }
-0x{HEX}+ { yylval.integer = strtol( yytext+2, NULL, 16 );
+0x[[:xdigit:]]+ { yylval.integer = strtol( yytext+2, NULL, 16 );
+ if( YY_START == COMMANDSTATE1 ) BEGIN( COMMANDSTATE2 );
return NUMBER; }
-{DIGIT}+ { yylval.integer = atoi( yytext ); return NUMBER; }
+[[:digit:]]+ { yylval.integer = atoi( yytext );
+ if( YY_START == COMMANDSTATE1 ) BEGIN( COMMANDSTATE2 );
+ return NUMBER; }
-[cdrx]{DIGIT}+ { yylval.integer = debugger_page_hash( yytext ); return PAGE; }
+[cdrx][[:digit:]]+ { yylval.integer = debugger_page_hash( yytext ); return PAGE; }
-[ \n]+ /* Swallow whitespace */
+{ID} { yylval.string = mempool_strdup( debugger_memory_pool, yytext ); return STRING; }
+${ID} { yylval.string = mempool_strdup( debugger_memory_pool, yytext + 1 ); return VARIABLE; }
+\n { return '\n'; }
+
+[ ]+ /* Swallow whitespace */
+
. { if( 0 ) unput( '\0' ); /* Prevent warning about yyunput
being defined and not used */
return DEBUGGER_ERROR; }
+
+ /* Debugger command parsing */
+
+<COMMANDSTATE2>{
+
+end { BEGIN(INITIAL); return DEBUGGER_END; }
+
+[^\n]* { yylval.string = mempool_strdup( debugger_memory_pool, yytext ); return STRING; }
+\n { return '\n'; }
+
+}
Modified: vendor/fuse-emulator/current/fuse/debugger/commandy.y
===================================================================
--- vendor/fuse-emulator/current/fuse/debugger/commandy.y 2008-05-10 23:53:25 UTC (rev 531)
+++ vendor/fuse-emulator/current/fuse/debugger/commandy.y 2008-09-28 12:26:43 UTC (rev 532)
@@ -1,7 +1,7 @@
/* commandy.y: Parse a debugger command
- Copyright (c) 2002-2004 Philip Kendall
+ Copyright (c) 2002-2008 Philip Kendall
- $Id: commandy.y 3503 2008-01-30 14:58:55Z pak21 $
+ $Id: commandy.y 3657 2008-06-08 15:04: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
@@ -33,6 +33,7 @@
#include "debugger.h"
#include "debugger_internals.h"
+#include "mempool.h"
#include "ui/ui.h"
#include "z80/z80.h"
#include "z80/z80_macros.h"
@@ -48,6 +49,8 @@
int reg;
libspectrum_dword integer;
+ char *string;
+
debugger_breakpoint_type bptype;
debugger_breakpoint_life bplife;
struct { int value1; libspectrum_word value2; } pair;
@@ -56,6 +59,8 @@
}
+%debug
+
/* Tokens as returned from the Flex scanner (commandl.l) */
/* Some tokens are named DEBUGGER_* to avoid clashes with <windows.h> */
@@ -71,10 +76,13 @@
%token BREAK
%token TBREAK
%token CLEAR
+%token COMMANDS
%token CONDITION
%token CONTINUE
%token DEBUGGER_DELETE
%token DISASSEMBLE
+%token DEBUGGER_END
+%token EVENT
%token EXIT
%token FINISH
%token IF
@@ -82,6 +90,7 @@
%token NEXT
%token DEBUGGER_OUT
%token PORT
+%token DEBUGGER_PRINT
%token READ
%token SET
%token STEP
@@ -93,6 +102,9 @@
%token <integer> NUMBER
+%token <string> STRING
+%token <string> VARIABLE
+
%token DEBUGGER_ERROR
/* Derived types */
@@ -110,6 +122,9 @@
%type <exp> expressionornull
%type <exp> expression;
+%type <string> debuggercommand
+%type <string> debuggercommands
+
/* Operator precedences */
/* Low precedence */
@@ -132,6 +147,7 @@
input: /* empty */
| command
| error
+ | input '\n' command
;
command: BASE number { debugger_output_base = $2; }
@@ -149,7 +165,12 @@
debugger_breakpoint_add_time( DEBUGGER_BREAKPOINT_TYPE_TIME,
$3, 0, $1, $4 );
}
+ | breakpointlife EVENT STRING ':' STRING optionalcondition {
+ debugger_breakpoint_add_event( DEBUGGER_BREAKPOINT_TYPE_EVENT,
+ $3, $5, 0, $1, $6 );
+ }
| CLEAR numberorpc { debugger_breakpoint_clear( $2 ); }
+ | COMMANDS number '\n' debuggercommands DEBUGGER_END { debugger_breakpoint_set_commands( $2, $4 ); }
| CONDITION NUMBER expressionornull {
debugger_breakpoint_set_condition( $2, $3 );
}
@@ -164,8 +185,10 @@
}
| NEXT { debugger_next(); }
| DEBUGGER_OUT number NUMBER { debugger_port_write( $2, $3 ); }
+ | DEBUGGER_PRINT number { printf( "0x%x\n", $2 ); }
| SET NUMBER number { debugger_poke( $2, $3 ); }
| SET DEBUGGER_REGISTER number { debugger_register_set( $2, $3 ); }
+ | SET VARIABLE number { debugger_variable_set( $2, $3 ); }
| STEP { debugger_step(); }
;
@@ -204,66 +227,77 @@
number: expression { $$ = debugger_expression_evaluate( $1 ); }
;
-expression: NUMBER { $$ = debugger_expression_new_number( $1 );
+expression: NUMBER { $$ = debugger_expression_new_number( $1, debugger_memory_pool );
if( !$$ ) YYABORT;
}
- | DEBUGGER_REGISTER { $$ = debugger_expression_new_register( $1 );
+ | DEBUGGER_REGISTER { $$ = debugger_expression_new_register( $1, debugger_memory_pool );
if( !$$ ) YYABORT;
}
+ | VARIABLE { $$ = debugger_expression_new_variable( $1, debugger_memory_pool );
+ if( !$$ ) YYABORT;
+ }
| '(' expression ')' { $$ = $2; }
| '+' expression %prec NEGATE { $$ = $2; }
| '-' expression %prec NEGATE {
- $$ = debugger_expression_new_unaryop( '-', $2 );
+ $$ = debugger_expression_new_unaryop( '-', $2, debugger_memory_pool );
if( !$$ ) YYABORT;
}
| NEGATE expression {
- ...
[truncated message content] |
|
From: <fr...@us...> - 2008-11-03 11:44:47
|
Revision: 537
http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=537&view=rev
Author: fredm
Date: 2008-11-03 11:44:43 +0000 (Mon, 03 Nov 2008)
Log Message:
-----------
Load . into vendor/fuse-emulator/current.
Modified Paths:
--------------
vendor/fuse-emulator/current/fuse/ChangeLog
vendor/fuse-emulator/current/fuse/README
vendor/fuse-emulator/current/fuse/compat/unix/file.c
vendor/fuse-emulator/current/fuse/configure.in
vendor/fuse-emulator/current/fuse/disk/fdd.c
vendor/fuse-emulator/current/fuse/disk/upd_fdc.c
vendor/fuse-emulator/current/fuse/fuse.c
vendor/fuse-emulator/current/fuse/hacking/ChangeLog
vendor/fuse-emulator/current/fuse/man/fuse.1
vendor/fuse-emulator/current/fuse/menu.c
vendor/fuse-emulator/current/fuse/rzx.c
vendor/fuse-emulator/current/fuse/settings.dat
vendor/fuse-emulator/current/fuse/ui/options.dat
vendor/fuse-emulator/current/fuse/ui/win32/win32internals.h
vendor/fuse-emulator/current/fuse/ui/win32/win32joystick.c
vendor/fuse-emulator/current/fuse/ui/win32/win32joystick.h
vendor/fuse-emulator/current/fuse/ui/win32/win32ui.c
vendor/fuse-emulator/current/fuse/z80/tests/README
vendor/fuse-emulator/current/fuse-utils/ChangeLog
vendor/fuse-emulator/current/fuse-utils/hacking/ChangeLog
vendor/fuse-emulator/current/fusetest/fusetest.asm
vendor/fuse-emulator/current/fusetest/tests.asm
vendor/fuse-emulator/current/libspectrum/ChangeLog
vendor/fuse-emulator/current/libspectrum/README
vendor/fuse-emulator/current/libspectrum/doc/libspectrum.txt
vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog
vendor/fuse-emulator/current/libspectrum/libspectrum.h.in
vendor/fuse-emulator/current/libspectrum/rzx.c
vendor/fuse-emulator/current/libspectrum/sna.c
vendor/fuse-emulator/current/libspectrum/tap.c
vendor/fuse-emulator/current/libspectrum/tape_block.c
vendor/fuse-emulator/current/libspectrum/test/test.c
vendor/fuse-emulator/current/libspectrum/tzx_read.c
vendor/fuse-emulator/current/libspectrum/tzx_write.c
vendor/fuse-emulator/current/libspectrum/warajevo_read.c
vendor/fuse-emulator/current/libspectrum/z80.c
Added Paths:
-----------
vendor/fuse-emulator/current/libspectrum/test/empty.z80
Modified: vendor/fuse-emulator/current/fuse/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse/ChangeLog 2008-10-28 13:18:28 UTC (rev 536)
+++ vendor/fuse-emulator/current/fuse/ChangeLog 2008-11-03 11:44:43 UTC (rev 537)
@@ -1,3 +1,54 @@
+2008-11-?? Philip Kendall <phi...@sh...>
+
+ * Fuse 0.10.0 released
+
+ * New upd765 FDC emulation; all known +3 DSK images now work (Gergely
+ Szasz; thanks to Simon Owen for expert technical advice).
+ * Loading acceleration (Philip Kendall).
+ * Automatic saves while using RZX recording (Philip Kendall).
+ * Many improvements to Win32 UI (mostly Marek Januszewski).
+ * Improved widget UI, with look and feel borrowed from that in FuseX
+ (Fredrick Meunier; thanks, crabfists).
+
+ * Emulation core improvements:
+ * New --late-timings option to emulate machines with 1 tstate
+ later timings (Philip Kendall)
+ * Reading from the 128K's memory control port causes that byte to
+ be written back to the port (Philip Kendall; thanks, Marat
+ Fayzullin).
+ * NMI causes Z80 to unHALT (Philip Kendall; thanks, Simon Owen).
+ * Emulate C, H and P/V flags on repeated IO instructions (Philip
+ Kendall).
+ * Fix crash when using Interface 1 on unoptimised Fuse builds
+ (Philip Kendall).
+
+ * Debugger improvements:
+ * Debugger events to allow the debugger to stop when various
+ Spectrum-level events happen (Philip Kendall).
+ * Allow debugger commands to be run when a breakpoint is hit.
+ No UI for this at present, but can be set from the command line.
+ (Philip Kendall).
+ * Command to exit emulator (Philip Kendall).
+ * Make time breakpoints work properly when more than one is present
+ (Philip Kendall).
+
+ * Miscellaneous improvements:
+ * Loader detection now works with the Digital Integration loader
+ (Philip Kendall).
+ * New HQ2X and HQ3x scalers (Gergely Szasz).
+ * Revert Pentagon 128 to being the "base" machine without extra
+ ROMs (Fredrick Meunier).
+ * Updated +3e ROMs (Fredrick Meunier; thanks, Garry Lancaster).
+ * Allow DivIDE, custom ROMs, Kempston mouse status and Simple 8-bit
+ IDE interface to be saved in snapshots (Fredrick Meunier).
+ * Better (but probably not perfect) TS2068 contention (Philip
+ Kendall).
+ * OpenSolaris compilation fixes (Fredrick Meunier; thanks, Andrew
+ Owen).
+ * C89 compatibility fixes (Fredrick Meunier; thanks, sweetlilmr).
+ * Remove GTK+'s build explicit dependency on Xlib (Philip Kendall).
+ * Minor AmigaOS improvements (Chris Young).
+
2008-01-05 Philip Kendall <phi...@sh...>
* Fuse 0.9.0 released
@@ -878,4 +929,4 @@
* Version 0.1.0 released.
-$Id: ChangeLog 3482 2008-01-07 12:32:26Z pak21 $
+$Id: ChangeLog 3787 2008-10-22 19:10:25Z pak21 $
Modified: vendor/fuse-emulator/current/fuse/README
===================================================================
--- vendor/fuse-emulator/current/fuse/README 2008-10-28 13:18:28 UTC (rev 536)
+++ vendor/fuse-emulator/current/fuse/README 2008-11-03 11:44:43 UTC (rev 537)
@@ -5,8 +5,9 @@
unsurprisingly, an emulator of the ZX Spectrum (a popular 1980s home
computer, especially in the UK) for Unix. However, it has now also
been ported to Mac OS X, which may or may not count as a Unix variant
-depending on your advocacy position and emulates some of the
-better-known ZX Spectrum clones as well.
+depending on your advocacy position and Windows which definitely isn't
+a Unix variant. Fuse also emulates some of the better-known ZX Spectrum
+clones as well.
What Fuse does have:
@@ -15,7 +16,7 @@
Pentagon 128, "512" (Pentagon 128 with extra memory) and 1024 and
Scorpion ZS 256 emulation.
* Runs at true Speccy speed on any computer you're likely to try it on.
-* Support for loading from .tzx files.
+* Support for loading from .tzx files, including accelerated loading.
* Sound (on systems supporting the Open Sound System, SDL, or OpenBSD/
Solaris's /dev/audio).
* Emulation of most of the common joysticks used on the Spectrum
@@ -151,4 +152,4 @@
Philip Kendall <phi...@sh...>
5 January 2008
-$Id: README 3718 2008-07-19 12:29:41Z pak21 $
+$Id: README 3801 2008-10-31 16:22:13Z pak21 $
Modified: vendor/fuse-emulator/current/fuse/compat/unix/file.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/unix/file.c 2008-10-28 13:18:28 UTC (rev 536)
+++ vendor/fuse-emulator/current/fuse/compat/unix/file.c 2008-11-03 11:44:43 UTC (rev 537)
@@ -1,7 +1,7 @@
/* file.c: File-related compatibility routines
Copyright (c) 2008 Philip Kendall
- $Id: file.c 3722 2008-07-22 03:12:28Z specu $
+ $Id: file.c 3776 2008-10-06 00:49:45Z 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
@@ -48,7 +48,7 @@
compat_file_open( const char *path, int write )
{
int flags = write ? O_WRONLY | O_CREAT | O_BINARY : O_RDONLY | O_BINARY;
- return open( path, flags );
+ return open( path, flags, 0666 );
}
off_t
Modified: vendor/fuse-emulator/current/fuse/configure.in
===================================================================
--- vendor/fuse-emulator/current/fuse/configure.in 2008-10-28 13:18:28 UTC (rev 536)
+++ vendor/fuse-emulator/current/fuse/configure.in 2008-11-03 11:44:43 UTC (rev 537)
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-dnl $Id: configure.in 3756 2008-08-24 13:41:23Z specu $
+dnl $Id: configure.in 3796 2008-10-28 20:44:45Z specu $
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
@@ -380,7 +380,7 @@
dnl Check if libsamplerate is available
AC_MSG_CHECKING(whether libsamplerate support requested)
AC_ARG_WITH(libsamplerate,
- [ --without-libsamplerate use libsamplerate],
+ [ --without-libsamplerate don't use libsamplerate],
if test "$withval" = no; then libsamplerate=no; else libsamplerate=yes; fi,
libsamplerate=yes)
AC_MSG_RESULT($libsamplerate)
Modified: vendor/fuse-emulator/current/fuse/disk/fdd.c
===================================================================
--- vendor/fuse-emulator/current/fuse/disk/fdd.c 2008-10-28 13:18:28 UTC (rev 536)
+++ vendor/fuse-emulator/current/fuse/disk/fdd.c 2008-11-03 11:44:43 UTC (rev 537)
@@ -1,7 +1,7 @@
/* fdd.c: Routines for emulating floppy disk drives
Copyright (c) 2007 Gergely Szasz
- $Id: fdd.c 3681 2008-06-16 09:40:29Z pak21 $
+ $Id: fdd.c 3802 2008-11-02 17:06:41Z 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
@@ -165,7 +165,7 @@
machine_current->timings.processor_speed / 10,
motor_event, d );
} else {
- event_add_with_data( tstates + 2 * /* 1 revolution */
+ event_add_with_data( tstates + 3 * /* 1.5 revolution */
machine_current->timings.processor_speed / 10,
motor_event, d );
}
Modified: vendor/fuse-emulator/current/fuse/disk/upd_fdc.c
===================================================================
--- vendor/fuse-emulator/current/fuse/disk/upd_fdc.c 2008-10-28 13:18:28 UTC (rev 536)
+++ vendor/fuse-emulator/current/fuse/disk/upd_fdc.c 2008-11-03 11:44:43 UTC (rev 537)
@@ -1,7 +1,7 @@
/* upd_fdc.c: NEC floppy disk controller emulation
Copyright (c) 2007 Gergely Szasz
- $Id: upd_fdc.c 3723 2008-07-22 07:49:06Z pak21 $
+ $Id: upd_fdc.c 3802 2008-11-02 17:06:41Z 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
@@ -187,7 +187,7 @@
UPD_FDC_ST1_NO_DATA );
f->id_mark = UPD_FDC_AM_NONE;
i = f->rev;
- while( i == f->rev ) {
+ while( i == f->rev && d->fdd.ready ) {
fdd_read_write_data( &d->fdd, FDD_READ ); if( d->fdd.index ) f->rev--;
crc_preset( f );
if( f->mf ) { /* double density (MFM) */
@@ -242,6 +242,7 @@
return 0; /* found and OK */
}
}
+ if(!d->fdd.ready) f->rev = 0;
f->status_register[1] |= UPD_FDC_ST1_MISSING_AM | UPD_FDC_ST1_NO_DATA; /*FIXME _NO_DATA? */
return 2; /* not found */
}
Modified: vendor/fuse-emulator/current/fuse/fuse.c
===================================================================
--- vendor/fuse-emulator/current/fuse/fuse.c 2008-10-28 13:18:28 UTC (rev 536)
+++ vendor/fuse-emulator/current/fuse/fuse.c 2008-11-03 11:44:43 UTC (rev 537)
@@ -1,7 +1,7 @@
/* fuse.c: The Free Unix Spectrum Emulator
Copyright (c) 1999-2008 Philip Kendall
- $Id: fuse.c 3718 2008-07-19 12:29:41Z pak21 $
+ $Id: fuse.c 3797 2008-10-29 12:04:34Z 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
@@ -751,6 +751,10 @@
set from memory for the text output */
printer_end();
+ /* also required before memory is deallocated on Fuse for OS X where
+ settings need to look up machine names etc. */
+ settings_end();
+
psg_end();
rzx_end();
debugger_end();
@@ -774,8 +778,6 @@
widget_end();
#endif /* #ifdef USE_WIDGET */
- settings_end();
-
libspectrum_creator_free( fuse_creator );
return 0;
Modified: vendor/fuse-emulator/current/fuse/hacking/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse/hacking/ChangeLog 2008-10-28 13:18:28 UTC (rev 536)
+++ vendor/fuse-emulator/current/fuse/hacking/ChangeLog 2008-11-03 11:44:43 UTC (rev 537)
@@ -2895,3 +2895,29 @@
rollback.rc,select_template.rc}: Win32: Changed style for all dialogs
to make those dialogs show on the taskbar, converted
select_template.rc from DOS to UNIX (Marek).
+20081006 compat/unix/file.c: make sure mode is specified when opening a file
+ for writing (fixes bug #2146742) (thanks, Cygnus) (Fred).
+20081021 z80/tests/README: small documentation update (patch #2183257)
+ (Matthew Westcott).
+20081021 ChangeLog: update for 0.10.0 release.
+20081022 menu.c,rzx.c,settings.dat,ui/options.dat: support for autosaves
+ when using RZX recording.
+20081024 man/fuse.1: update. Still TODO: debugger updates.
+20081024 man/fuse.1: debugger updates.
+20081024 man/fuse.1: minor update for disk formats and compressed disk images
+ (Fred).
+20081028 configure.in: Fixed a typo in the configure script
+ (was '--without-libsamplerate use libsamplerate') (Marek).
+20081029 fuse.c: move up settings_end to happen just after printer_end for
+ similar reasons - on OS X settings_end refers to machine and other
+ entries, so must be complete before deallocating the machine arrays
+ (Fred).
+20081031 README: small update for 0.10.0.
+20081102 disk/{fdd.c,upd_fdc.c}: stop hang if asked for index hole when disk
+ motor is off, and change spindown time so that The Running Man disk
+ works (bug #2212424) (Gergely Szasz; thanks, Mark Woodmass).
+20081102 ui/win32/win32ui.c: Win32: Made ui_error_specific function work
+ similarly to the gtk ui equivalent (Marek).
+20081102 ui/win32/{win32ui.c,win32internals.h,win32joystick.[ch}: Win32:
+ Implemented joystick handling using mmsystem API (and tested using PPJoy
+ joystick emulator, hope it works with real hardware) (Marek).
Modified: vendor/fuse-emulator/current/fuse/man/fuse.1
===================================================================
--- vendor/fuse-emulator/current/fuse/man/fuse.1 2008-10-28 13:18:28 UTC (rev 536)
+++ vendor/fuse-emulator/current/fuse/man/fuse.1 2008-11-03 11:44:43 UTC (rev 537)
@@ -80,6 +80,17 @@
.\" the options list is in alphabetical order by long option name (or
.\" short option name if none).
.\"
+.I \-\-accelerate\-loader
+.RS
+Specify whether Fuse should attempt to accelerate tape loaders by "short
+circuiting" the loading loop. This will in general speed up loading, but
+may cause some loaders to fail. (Enabled by default, but you can use
+.RI ` \-\-no\-accelerate\-loader '
+to disable). The same as the General Options dialog's
+.I "Accelerate loaders"
+option.
+.RE
+.PP
.I \-\-aspect\-hint
.RS
Specify whether the GTK+ and Xlib user interfaces should `hint' to the
@@ -115,6 +126,14 @@
option.
.RE
.PP
+.I \-\-beeper\-stereo
+.RS
+Specify whether fake stereo should be added to the emulation of the
+Spectrum beeper. Same as the Sound Options dialog's
+.I "Beeper pseudo-stereo"
+option.
+.RE
+.PP
.I \-\-beta128
.RS
Emulate a Beta 128 interface. Same as the Peripherals Options dialog's
@@ -122,12 +141,9 @@
option.
.RE
.PP
-.I \-\-beeper\-stereo
.RS
-Specify whether fake stereo should be added to the emulation of the
-Spectrum beeper. Same as the Sound Options dialog's
-.I "Beeper pseudo-stereo"
-option.
+.I \-\-betadisk
+Specify a Betadisk image to load.
.RE
.PP
.I \-\-bw\-tv
@@ -178,6 +194,15 @@
option.
.RE
.PP
+.I "\-\-debugger\-command string"
+.RS
+Specify a debugger command to be run before emulator startup. This can
+be used to set breakpoints or the like. Currently, this is the only
+method to input multi-line debugger commands. (See the
+.B "MONITOR/DEBUGGER"
+section for more information).
+.RE
+.PP
.I "\-\-detect\-loader"
.RS
Specify whether Fuse should attempt to detect when the tape is being
@@ -189,12 +214,42 @@
option.
.RE
.PP
+.I \-\-divide
+.RS
+Emulate the DivIDE interface. The same as the Peripherals Options
+dialog's
+.I "DivIDE interface"
+option.
+.RE
+.PP
+.I "\-\-divide\-masterfile file"
+.br
+.I "\-\-divide\-slavefile file"
+.RS
+Specify an IDE image to be loaded into the DivIDE's emulated master
+and slave drives respectively.
+.RE
+.PP
+.I \-\-divide\-write\-protect
+.RS
+Specify that the emulated DivIDE's write protect jumper should be
+considered set. The same as the Peripherals Options dialog's
+.I "DivIDE write protect"
+option.
+.RE
+.PP
.I "\-\-dock file"
.RS
Insert the specified file into the emulated Timex 2068 variant dock;
also select the TC2068 on startup if available.
.RE
.PP
+.I "\-\-doublescan\-mode"
+.RS
+Specify the the framebuffer UI should attempt to use a double scan mode
+(where each line is displayed twice).
+.RE
+.PP
.I "\-\-embed\-snapshot"
.RS
Specify whether a snapshot should be embedded in an RZX file when
@@ -291,7 +346,9 @@
.PP
.I \-\-interface2
.RS
-Emulate a Sinclair Interface II. Same as the Peripherals Options dialog's
+Emulate a Sinclair Interface II. (Enabled by default, but you can use
+.RI ` \-\-no\-interface2 '
+to disable). Same as the Peripherals Options dialog's
.I "Interface II"
option.
.RE
@@ -326,6 +383,16 @@
.RI ` /dev/js1 "'."
.RE
.PP
+.I \-\-joystick-prompt
+.RS
+If this option is specified, Fuse Fuse will prompt you which form of
+joystick emulation you wish to use when loading a snapshot. No prompt
+will be issued if the configuration in the snapshot matches what you
+are currently using. The same as the General Options dialog's
+.I "Snap joystick prompt"
+option.
+.RE
+.PP
.I \-\-kempston
.RS
Emulate a Kempston joystick. Same as the Peripherals Options dialog's
@@ -340,6 +407,16 @@
option.
.RE
.PP
+.I \-\-late\-timings
+.RS
+It has been observed that some real Spectrums run such that the screen
+is rendered one tstate later than on other real hardware. This option
+specifies that Fuse should emulate such a machine. Same as the General
+Options dialog's
+.I "Late timings"
+option.
+.RE
+.PP
.I \-\-loading\-sound
.RS
Specify whether the sound made while tapes are loading should be
@@ -576,6 +653,16 @@
options.
.RE
.PP
+.I \-\-rzx-autosaves
+.RS
+Specify that, while recording an RZX file, Fuse should automatically add
+a snapshot to the recording stream every 5 seconds. (Default to on, but
+you can use
+.RI ` \-\-no-rzx-autosaves '
+to disable). Same as the RZX Options dialog's "Create autosaves" option;
+see there for more details.
+.RE
+.PP
.I \-\-separation
.RS
Give stereo separation of the 128's AY sound channels. Same as the
@@ -1453,7 +1540,15 @@
to connect to the joystick interface enabled in the snapshot unless it
already matches your current configuration.
.RE
+.PP
+.I "Late timings"
+.RS
+If selected, Fuse will cause all screen-related timings (for example,
+when the screen is rendered and when memory contention occurs) to be
+one tstate later than "normal", an effect which is present on some real
+hardware.
.RE
+.RE
.PP
.I "Options, Sound..."
.RS
@@ -1677,6 +1772,20 @@
aborts). Note that any changed settings only apply to the
currently-running Fuse.
.PP
+.I "Create autosaves"
+.RS
+If this option is selected, Fuse will add a snapshot into the recording
+stream every 5 seconds while creating an RZX file, thus enabling the
+rollback facilities to be used without having to explicitly add
+snapshots into the stream. Older snapshots will be pruned from the
+stream to keep the file size and number of snapshots down: each snapshot
+up to 15 seconds will be kept, then one snapshot every 15 seconds until
+one minute, then one snapshot every minute until 5 minutes, and then one
+snapshot every 5 minutes. Note that this "pruning" applies only to
+automatically inserted snapshots: snapshots manually inserted into the
+stream will never be pruned.
+.RE
+.PP
.I "Compress RZX data"
.RS
If this option is selected, and
@@ -1960,11 +2069,11 @@
.RS
Another Russian clone of the Spectrum. Some details can be found
at
-.IR "http://www.worldofspectrum.org/rusfaq/index.html" , like all the
-Russian clones they they have built in 3.5" disk drives, accessed via
-the Beta 128 disk interface and TR-DOS (the Technology Research Disk
-Operating System). The most important distinction from the Pentagon
-128k and similar machines is the display timing details.
+.IR "http://www.worldofspectrum.org/rusfaq/index.html" ,
+like all the Russian clones they they have built in 3.5" disk drives,
+accessed via the Beta 128 disk interface and TR-DOS (the Technology
+Research Disk Operating System). The most important distinction from
+the Pentagon 128k and similar machines is the display timing details.
.RE
.PP
.I "Spectrum SE"
@@ -2899,11 +3008,65 @@
.RS
Set a breakpoint to occur
.I time
-tstates after the start of the current frame, assuming
+tstates after the start of the every frame, assuming
.I condition
evaluates true (if one is given).
.RE
.PP
+br{eakpoint} ev{ent}
+.IR area : detail " [" condition ]
+.RS
+Set a breakpoint to occur when the event specified by
+.IR area : detail
+occurs and
+.I condition
+evaluates to true. The events which can be caught are:
+.PP
+divide:page
+.br
+divide:unpage
+.RS
+The DivIDE interface is paged into or out of memory respectively
+.RE
+.br
+if1:page
+.br
+if1:unpage
+.RS
+The Interface 1 shadow ROM is paged into or out of memory
+.RE
+.br
+rzx:end
+.RS
+An RZX recording finishes playing
+.RE
+.br
+tape:play
+.br
+tape:stop
+.RS
+The emulated tape starts or stops playing
+.RE
+.br
+zxcf:page
+.br
+zxcf:unpage
+.RS
+The ZXCF interface is paged into or out of memory
+.RE
+.br
+zxatasp:page
+.br
+zxatasp:unpage
+.RS
+The ZXATASP interface is paged into or out of memory
+.RE
+.PP
+In all cases, the event can be specified as
+.IR area :*
+to catch all events from that area.
+.RE
+.PP
cl{ear}
.RI [ address ]
.RS
@@ -2914,6 +3077,25 @@
is omitted. Port read/write breakpoints are unaffected.
.RE
.PP
+com{mmands}
+.I id <newline>
+.br
+.I <debugger command> <newline>
+.br
+.I <debugger command> <newline>
+.br
+.I ...
+.br
+end
+.RS
+Set things such that the specified debugger commands will be
+automatically executed when breakpoint
+.I id
+is triggered. There is currently no user interface for entering
+multi-line debugger commands, so the only way to specify this command is
+on the command-line via the \-\-debugger\-command option.
+.RE
+.PP
cond{ition}
.IR "id " [ condition ]
.RS
@@ -2950,6 +3132,11 @@
.IR address .
.RE
.PP
+ex{it}
+.RS
+Exit the emulator immediately.
+.RE
+.PP
fi{nish}
.RS
Exit from the current CALL or equivalent. This isn't infallible: it
@@ -3217,8 +3404,9 @@
.RE
.PP
.I .SAD
+.I .SDF
.RS
-For compatibility with SAM Coup\('e disk images using this format.
+For compatibility with SAM Coup\('e disk images using these formats.
Note that SAM Coup\('e `.DSK' images share the same format as `.MGT'.
.RE
.PP
@@ -3251,11 +3439,6 @@
.I http://www.cpc-emu.org/linux/cpcemu_e.txt
.RE
.PP
-.I .SDF
-.RS
-TODO
-.RE
-.PP
Fuse supports most of them for writing:
.I .UDI .FDI .MGT .IMG .SAD .TRD .SCL .DSK
(only the old CPC format).
@@ -3285,9 +3468,7 @@
or
.IR gzip (3)
just as if they were uncompressed.
-.I libdsk
-provides an equivalent functionality for +3 images if available,
-but there is currently no support for reading compressed +D or Beta
+There is currently no support for reading compressed +3, +D or Beta
disk images.
.\"
.\"------------------------------------------------------------------
@@ -3319,7 +3500,8 @@
.PP
The libao file output devices not work properly with the GTK+ UI.
No error reporting, but the created file does not contain any sound data.
-If you use a `weak' machine alsa09 make a lot of click and pop with
+If you use a `weak' machine alsa09 makes a lot of clicks and pops and
+will output
.RI ` "ALSA: underrun, at least 0ms." '
error messages.
.\"
Modified: vendor/fuse-emulator/current/fuse/menu.c
===================================================================
--- vendor/fuse-emulator/current/fuse/menu.c 2008-10-28 13:18:28 UTC (rev 536)
+++ vendor/fuse-emulator/current/fuse/menu.c 2008-11-03 11:44:43 UTC (rev 537)
@@ -1,7 +1,7 @@
/* menu.c: general menu callbacks
Copyright (c) 2004-2005 Philip Kendall
- $Id: menu.c 3714 2008-07-06 18:10:29Z fredm $
+ $Id: menu.c 3787 2008-10-22 19:10:25Z 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
@@ -93,7 +93,7 @@
error = snapshot_copy_to( snap );
if( error ) { libspectrum_snap_free( snap ); return; }
- libspectrum_rzx_add_snap( rzx, snap );
+ libspectrum_rzx_add_snap( rzx, snap, 0 );
libspectrum_rzx_start_input( rzx, tstates );
}
Modified: vendor/fuse-emulator/current/fuse/rzx.c
===================================================================
--- vendor/fuse-emulator/current/fuse/rzx.c 2008-10-28 13:18:28 UTC (rev 536)
+++ vendor/fuse-emulator/current/fuse/rzx.c 2008-11-03 11:44:43 UTC (rev 537)
@@ -1,7 +1,7 @@
/* rzx.c: .rzx files
Copyright (c) 2002-2003 Philip Kendall
- $Id: rzx.c 3703 2008-06-30 20:36:11Z pak21 $
+ $Id: rzx.c 3787 2008-10-22 19:10:25Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -58,6 +58,9 @@
/* The number of bytes read via IN during the current frame */
size_t rzx_in_count;
+/* The number of frames we've recorded in this RZX file */
+static size_t autosave_frame_count;
+
/* And the values of those bytes */
libspectrum_byte *rzx_in_bytes;
@@ -95,6 +98,9 @@
a competition mode RZX file */
static const float SPEED_TOLERANCE = 5;
+/* How often will we create an autosave file */
+static const size_t AUTOSAVE_INTERVAL = 5 * 50;
+
/* Debugger events */
static const char *event_type_string = "rzx";
static const char *end_event_detail_string = "end";
@@ -152,7 +158,7 @@
return 1;
}
- error = libspectrum_rzx_add_snap( rzx, snap );
+ error = libspectrum_rzx_add_snap( rzx, snap, 0 );
if( error ) {
libspectrum_snap_free( snap );
return error;
@@ -160,13 +166,12 @@
}
- /* Put an input recording block into the RZX file */
libspectrum_rzx_start_input( rzx, tstates );
- /* Start the count of instruction fetches here */
- counter_reset(); rzx_in_count = 0;
+ counter_reset();
+ rzx_in_count = 0;
+ autosave_frame_count = 0;
- /* Note that we're recording */
rzx_recording = 1;
ui_menu_activate( UI_MENU_ITEM_RECORDING, 1 );
@@ -366,6 +371,80 @@
return 0;
}
+typedef struct prune_info_t {
+ libspectrum_rzx_iterator it;
+ size_t frames;
+} prune_info_t;
+
+static void
+autosave_prune( void )
+{
+ GArray *autosaves = g_array_new( FALSE, FALSE, sizeof( prune_info_t ) );
+ libspectrum_rzx_iterator it;
+ size_t i, frames = 0;
+
+ for( it = libspectrum_rzx_iterator_begin( rzx );
+ it;
+ it = libspectrum_rzx_iterator_next( it ) ) {
+
+ libspectrum_rzx_block_id id = libspectrum_rzx_iterator_get_type( it );
+
+ switch( id ) {
+
+ case LIBSPECTRUM_RZX_INPUT_BLOCK:
+ frames += libspectrum_rzx_iterator_get_frames( it ); break;
+
+ case LIBSPECTRUM_RZX_SNAPSHOT_BLOCK:
+ if( libspectrum_rzx_iterator_snap_is_automatic( it ) ) {
+ prune_info_t info = { it, frames };
+ g_array_append_val( autosaves, info );
+ }
+ break;
+
+ default:
+ break;
+ }
+ }
+
+ /* Convert 'time from start' into 'time before now' */
+ for( i = 0; i < autosaves->len; i++ ) {
+ prune_info_t *info = &( g_array_index( autosaves, prune_info_t, i ) );
+ info->frames = frames - info->frames;
+ }
+
+ for( i = autosaves->len - 1; i > 0; i-- ) {
+ prune_info_t save1 = g_array_index( autosaves, prune_info_t, i ),
+ save2 = g_array_index( autosaves, prune_info_t, i - 1 );
+
+ if( ( save1.frames == 15 * 50 ||
+ save1.frames == 60 * 50 ||
+ save1.frames == 300 * 50 ) &&
+ save2.frames < 2 * save1.frames
+ )
+ /* FIXME: could possibly merge adjacent IRBs here */
+ libspectrum_rzx_iterator_delete( rzx, save1.it );
+ }
+
+ g_array_set_size( autosaves, 0 );
+}
+
+static void
+autosave_frame( void )
+{
+ libspectrum_snap *snap;
+
+ if( ++autosave_frame_count % AUTOSAVE_INTERVAL ) return;
+
+ snap = libspectrum_snap_alloc();
+ snapshot_copy_to( snap );
+
+ libspectrum_rzx_stop_input( rzx );
+ libspectrum_rzx_add_snap( rzx, snap, 1 );
+ libspectrum_rzx_start_input( rzx, tstates );
+
+ autosave_prune();
+}
+
static int recording_frame( void )
{
libspectrum_error error;
@@ -395,6 +474,8 @@
}
+ if( settings_current.rzx_autosaves ) autosave_frame();
+
return 0;
}
Modified: vendor/fuse-emulator/current/fuse/settings.dat
===================================================================
--- vendor/fuse-emulator/current/fuse/settings.dat 2008-10-28 13:18:28 UTC (rev 536)
+++ vendor/fuse-emulator/current/fuse/settings.dat 2008-11-03 11:44:43 UTC (rev 537)
@@ -1,7 +1,7 @@
# settings.dat: configuration options for Fuse
# Copyright (c) 2002-2008 Philip Kendall
-# $Id: settings.dat 3751 2008-08-19 15:46:09Z specu $
+# $Id: settings.dat 3787 2008-10-22 19:10:25Z 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
@@ -112,6 +112,7 @@
competition_mode, boolean, 0
competition_code, numeric, 0
embed_snapshot, boolean, 1
+rzx_autosaves, boolean, 1
snapshot, string, NULL, 's'
tape_file, string, NULL, 't', tape, tapefile
Modified: vendor/fuse-emulator/current/fuse/ui/options.dat
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/options.dat 2008-10-28 13:18:28 UTC (rev 536)
+++ vendor/fuse-emulator/current/fuse/ui/options.dat 2008-11-03 11:44:43 UTC (rev 537)
@@ -48,6 +48,7 @@
rzx
RZX Options
+Checkbox, Create (a)utosaves, rzx_autosaves, INPUT_KEY_a
Checkbox, (C)ompress RZX data, rzx_compression, INPUT_KEY_c
Checkbox, C(o)mpetition mode, competition_mode, INPUT_KEY_o
Entry, Co(m)petition code, competition_code, INPUT_KEY_m, 8,
Modified: vendor/fuse-emulator/current/fuse/ui/win32/win32internals.h
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/win32/win32internals.h 2008-10-28 13:18:28 UTC (rev 536)
+++ vendor/fuse-emulator/current/fuse/ui/win32/win32internals.h 2008-11-03 11:44:43 UTC (rev 537)
@@ -1,7 +1,7 @@
/* win32internals.h: stuff internal to the Win32 UI
Copyright (c) 2004 Marek Januszewski
- $Id: win32internals.h 3768 2008-09-07 01:33:19Z specu $
+ $Id: win32internals.h 3804 2008-11-03 04:21:02Z specu $
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,6 +31,10 @@
#include <commdlg.h>
#include <shellapi.h>
+/* FIXME: this should be included as part of windows.h, but is not
+ because WIN32_LEAN_AND_MEAN is defined along the way somewhere */
+#include <mmsystem.h>
+
#include <libspectrum.h>
#define ID_STATUSBAR 900
Modified: vendor/fuse-emulator/current/fuse/ui/win32/win32joystick.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/win32/win32joystick.c 2008-10-28 13:18:28 UTC (rev 536)
+++ vendor/fuse-emulator/current/fuse/ui/win32/win32joystick.c 2008-11-03 11:44:43 UTC (rev 537)
@@ -1,7 +1,7 @@
/* gtkjoystick.c: Joystick emulation
Copyright (c) 2003-2008 Darren Salt, Philip Kendall, Marek Januszewski
- $Id: win32joystick.c 3751 2008-08-19 15:46:09Z specu $
+ $Id: win32joystick.c 3804 2008-11-03 04:21:02Z specu $
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,17 +27,12 @@
#include <config.h>
-#if !defined USE_JOYSTICK || defined HAVE_JSW_H
-#include "../uijoystick.c"
-#else
- /* FIXME: implement win32 joystick using mmsystem, not jsw */
-#endif
-
#include <tchar.h>
#include <windows.h>
#include "fuse.h"
#include "joystick.h"
+#include "input.h"
#include "keyboard.h"
#include "menu.h"
#include "settings.h"
@@ -45,6 +40,126 @@
#include "win32joystick.h"
+#if !defined USE_JOYSTICK || defined HAVE_JSW_H
+
+#include "../uijoystick.c"
+
+#else /* #if !defined USE_JOYSTICK || defined HAVE_JSW_H */
+
+/* Functions to handle Joystick events */
+#include "ui/ui.h"
+#include "ui/uijoystick.h"
+
+static void do_axis( int which, WORD value,
+ input_key negative, input_key positive );
+
+int
+ui_joystick_init( void )
+{
+ int retval;
+ JOYINFO joyinfo;
+
+ retval = joyGetNumDevs();
+
+ if( retval >= 2 ) {
+
+ retval = 2;
+
+ if( joyGetPos( JOYSTICKID2, &joyinfo ) == JOYERR_UNPLUGGED ) {
+ ui_error( UI_ERROR_ERROR, "failed to initialise joystick 2" );
+ return 0;
+ }
+ }
+
+ if( retval > 0 ) {
+
+ if( joyGetPos( JOYSTICKID1, &joyinfo ) == JOYERR_UNPLUGGED ) {
+ ui_error( UI_ERROR_ERROR, "failed to initialise joystick 1" );
+ return 0;
+ }
+ }
+
+ return retval;
+}
+
+void
+ui_joystick_poll( void )
+{
+ /* No action needed; joysticks already handled by the Window messages
+ sent by mmsystem */
+}
+
+void
+win32joystick_buttonevent( int which_joystick, int button_down,
+ unsigned int wParam )
+{
+ input_event_t event;
+ int button = 0;
+
+ if( wParam & JOY_BUTTON1 ) button = INPUT_JOYSTICK_FIRE_1;
+ else if( wParam & JOY_BUTTON2 ) button = INPUT_JOYSTICK_FIRE_2;
+ else if( wParam & JOY_BUTTON3 ) button = INPUT_JOYSTICK_FIRE_3;
+ else if( wParam & JOY_BUTTON4 ) button = INPUT_JOYSTICK_FIRE_4;
+ else if( wParam & JOY_BUTTON5 ) button = INPUT_JOYSTICK_FIRE_5;
+ else if( wParam & JOY_BUTTON6 ) button = INPUT_JOYSTICK_FIRE_6;
+ else if( wParam & JOY_BUTTON7 ) button = INPUT_JOYSTICK_FIRE_7;
+ else if( wParam & JOY_BUTTON8 ) button = INPUT_JOYSTICK_FIRE_8;
+ else if( wParam & JOY_BUTTON9 ) button = INPUT_JOYSTICK_FIRE_9;
+ else if( wParam & JOY_BUTTON10 ) button = INPUT_JOYSTICK_FIRE_10;
+ else return; /* Fuse supports up to 10 joystick buttons */
+
+ event.types.joystick.which = which_joystick;
+ event.type = button_down
+ ? INPUT_EVENT_JOYSTICK_PRESS : INPUT_EVENT_JOYSTICK_RELEASE;
+ event.types.joystick.button = button;
+ input_event( &event );
+}
+
+void
+win32joystick_move( int which_joystick, unsigned short pos_x,
+ unsigned short pos_y )
+{
+ do_axis( which_joystick, pos_x,
+ INPUT_JOYSTICK_LEFT, INPUT_JOYSTICK_RIGHT );
+ do_axis( which_joystick, pos_y,
+ INPUT_JOYSTICK_UP, INPUT_JOYSTICK_DOWN );
+}
+
+static void
+do_axis( int which, WORD value, input_key negative, input_key positive )
+{
+ input_event_t event1, event2;
+
+ event1.types.joystick.which = event2.types.joystick.which = which;
+
+ event1.types.joystick.button = negative;
+ event2.types.joystick.button = positive;
+
+ /* MS Windows sends a value between 0 and 65535, hopefully those will work */
+ if( value > 49152 ) {
+ event1.type = INPUT_EVENT_JOYSTICK_RELEASE;
+ event2.type = INPUT_EVENT_JOYSTICK_PRESS;
+ } else if( value < 16384 ) {
+ event1.type = INPUT_EVENT_JOYSTICK_PRESS;
+ event2.type = INPUT_EVENT_JOYSTICK_RELEASE;
+ } else {
+ event1.type = INPUT_EVENT_JOYSTICK_RELEASE;
+ event2.type = INPUT_EVENT_JOYSTICK_RELEASE;
+ }
+
+ input_event( &event1 );
+ input_event( &event2 );
+}
+
+void
+ui_joystick_end( void )
+{
+ /* Initialization and unitialization is handled by MS Windows */
+}
+
+#endif /* #if !defined USE_JOYSTICK || defined HAVE_JSW_H */
+
+/* Win32 UI functions to handle Joystick options menus */
struct button_info {
int *setting;
TCHAR name[80];
Modified: vendor/fuse-emulator/current/fuse/ui/win32/win32joystick.h
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/win32/win32joystick.h 2008-10-28 13:18:28 UTC (rev 536)
+++ vendor/fuse-emulator/current/fuse/ui/win32/win32joystick.h 2008-11-03 11:44:43 UTC (rev 537)
@@ -1,7 +1,7 @@
/* win32joystick.h: Joystick emulation
Copyright (c) 2008 Marek Januszewski
- $Id: win32joystick.h 3588 2008-03-27 17:48:10Z zubzero $
+ $Id: win32joystick.h 3804 2008-11-03 04:21:02Z specu $
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
@@ -62,3 +62,15 @@
#define IDC_JOYSTICKS_BUTTON_BUTTON10 ( IDC_JOYSTICKS_BUTTON_BUTTON9 + 1 )
#define IDR_JOYSTICKS_POPUP ( IDC_JOYSTICKS_BUTTON_BUTTON10 + 1 )
+
+/*
+ win32joystick_buttonevent parameters:
+ which_joystick = 0 => JOYSTICK1
+ which_joystick = 1 => JOYSTICK2
+ button_down = 1 => button pressed
+ button_down = 0 => button released
+*/
+void win32joystick_buttonevent( int which_joystick, int button_down,
+ unsigned int wParam );
+void win32joystick_move( int which_joystick,
+ unsigned short pos_x, unsigned short pos_y );
Modified: vendor/fuse-emulator/current/fuse/ui/win32/win32ui.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/win32/win32ui.c 2008-10-28 13:18:28 UTC (rev 536)
+++ vendor/fuse-emulator/current/fuse/ui/win32/win32ui.c 2008-11-03 11:44:43 UTC (rev 537)
@@ -1,7 +1,7 @@
/* win32ui.c: Win32 routines for dealing with the user interface
Copyright (c) 2003-2007 Marek Januszewski, Philip Kendall, Stuart Brady
- $Id: win32ui.c 3768 2008-09-07 01:33:19Z specu $
+ $Id: win32ui.c 3804 2008-11-03 04:21:02Z specu $
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
@@ -28,6 +28,7 @@
#include "debugger/debugger.h"
#include "display.h"
#include "fuse.h"
+#include "joystick.h"
#include "keyboard.h"
#include "menu.h"
#include "menu_data.h"
@@ -40,9 +41,9 @@
#include "tape.h"
#include "timer/timer.h"
#include "ui/ui.h"
-#include "ui/uijoystick.h"
#include "utils.h"
#include "win32internals.h"
+#include "win32joystick.h"
/* fuse_hPrevInstance is needed only to register window class */
static HINSTANCE fuse_hPrevInstance;
@@ -120,6 +121,20 @@
fuse_window_proc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam )
{
switch( msg ) {
+
+#if defined USE_JOYSTICK && !defined HAVE_JSW_H
+
+ case WM_CREATE:
+ if( joysticks_supported > 0 )
+ if( joySetCapture( hWnd, JOYSTICKID1, 0, FALSE ) )
+ ui_error( UI_ERROR_ERROR, "Couldn't start capture for joystick 1" );
+ if( joysticks_supported > 1 )
+ if( joySetCapture( hWnd, JOYSTICKID2, 0, FALSE ) )
+ ui_error( UI_ERROR_ERROR, "Couldn't start capture for joystick 2" );
+ break;
+
+#endif /* if defined USE_JOYSTICK && !defined HAVE_JSW_H */
+
case WM_COMMAND:
if( ! handle_menu( LOWORD( wParam ), hWnd ) )
return 0;
@@ -228,8 +243,36 @@
else if( LOWORD( wParam ) == WA_INACTIVE )
return win32ui_lose_focus( hWnd, wParam, lParam );
break;
+
+#if defined USE_JOYSTICK && !defined HAVE_JSW_H
+
+ case MM_JOY1BUTTONDOWN:
+ win32joystick_buttonevent( 0, 1, wParam );
+ break;
+
+ case MM_JOY1BUTTONUP:
+ win32joystick_buttonevent( 0, 0, wParam );
+ break;
+
+ case MM_JOY2BUTTONDOWN:
+ win32joystick_buttonevent( 1, 1, wParam );
+ break;
+
+ case MM_JOY2BUTTONUP:
+ win32joystick_buttonevent( 1, 0, wParam );
+ break;
+
+ case MM_JOY1MOVE:
+ win32joystick_move( 0, LOWORD( lParam ), HIWORD( lParam ) );
+ break;
+
+ case MM_JOY2MOVE:
+ win32joystick_move( 1, LOWORD( lParam ), HIWORD( lParam ) );
+ break;
+
+#endif /* if defined USE_JOYSTICK && !defined HAVE_JSW_H */
+
}
-
return( DefWindowProc( hWnd, msg, wParam, lParam ) );
}
@@ -362,33 +405,27 @@
int
ui_error_specific( ui_error_level severity, const char *message )
{
- /* finish - can ui be not initialized? */
- HWND hWnd;
+ /* If we don't have a UI yet, we can't output widgets */
+ if( !display_ui_initialised ) return 0;
- fuse_emulation_pause();
-
- hWnd = GetActiveWindow();
-
switch( severity ) {
case UI_ERROR_INFO:
- MessageBox( hWnd, message, "Fuse - Info", MB_ICONINFORMATION | MB_OK );
+ MessageBox( fuse_hWnd, message, "Fuse - Info", MB_ICONINFORMATION | MB_OK );
break;
case UI_ERROR_WARNING:
- MessageBox( hWnd, message, "Fuse - Warning", MB_ICONWARNING | MB_OK );
+ MessageBox( fuse_hWnd, message, "Fuse - Warning", MB_ICONWARNING | MB_OK );
break;
case UI_ERROR_ERROR:
- MessageBox( hWnd, message, "Fuse - Error", MB_ICONERROR | MB_OK );
+ MessageBox( fuse_hWnd, message, "Fuse - Error", MB_ICONERROR | MB_OK );
break;
default:
- MessageBox( hWnd, message, "Fuse - (Unknown Error Level)",
+ MessageBox( fuse_hWnd, message, "Fuse - (Unknown Error Level)",
MB_ICONINFORMATION | MB_OK );
break;
}
- fuse_emulation_unpause();
-
return 0;
}
@@ -644,25 +681,6 @@
return UI_CONFIRM_JOYSTICK_NONE;
}
-int
-ui_joystick_init( void )
-{
- STUB;
- return 0;
-}
-
-void
-ui_joystick_end( void )
-{
- STUB;
-}
-
-void
-ui_joystick_poll( void )
-{
- /* STUB; */
-}
-
/*
* Font code
*/
Modified: vendor/fuse-emulator/current/fuse/z80/tests/README
===================================================================
--- vendor/fuse-emulator/current/fuse/z80/tests/README 2008-10-28 13:18:28 UTC (rev 536)
+++ vendor/fuse-emulator/current/fuse/z80/tests/README 2008-11-03 11:44:43 UTC (rev 537)
@@ -8,10 +8,12 @@
<arbitrary test description>
AF BC DE HL AF' BC' DE' HL' IX IY SP PC
-I R IFF1 IFF2 <halted> <tstates>
+I R IFF1 IFF2 IM <halted> <tstates>
<halted> specifies whether the Z80 is halted.
-<tstates> specifies the number of tstates to run the test for.
+<tstates> specifies the number of tstates to run the test for, in
+ decimal; the number actually executed may be higher, as the final
+ instruction is allowed to complete.
Then followed by lines specifying the initial memory setup. Each has
the format:
Modified: vendor/fuse-emulator/current/fuse-utils/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/ChangeLog 2008-10-28 13:18:28 UTC (rev 536)
+++ vendor/fuse-emulator/current/fuse-utils/ChangeLog 2008-11-03 11:44:43 UTC (rev 537)
@@ -1,3 +1,23 @@
+2008-11-?? Philip Kendall <phi...@sh...>
+
+ * Version 0.10.0 released
+
+ * audio2tape can now recognise standard ROM loaders (Fredrick
+ Meunier).
+
+ * tzxlist now outputs block and tape lengths (Fredrick Meunier).
+
+ * snap2tzx: add 0.1s pause between blocks to ensure a gap between
+ edges (Fredrick Meunier).
+
+ * tapeconv: add options for embedding metadata into the created
+ file (Fredrick Meunier).
+
+ * tape2wav: ensure pulses do not get rounded down inappropriately
+ (Fredrick Meunier).
+
+ * Allow building without libaudiofile (José Manuel Ferrer Ortiz).
+
2008-01-05 Philip Kendall <phi...@sh...>
* Version 0.9.0 released
Modified: vendor/fuse-emulator/current/fuse-utils/hacking/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/hacking/ChangeLog 2008-10-28 13:18:28 UTC (rev 536)
+++ vendor/fuse-emulator/current/fuse-utils/hacking/ChangeLog 2008-11-03 11:44:43 UTC (rev 537)
@@ -254,3 +254,4 @@
were enabled (Fred).
20080922 importer/soundfile.cc: initialise frequency table to 0 (Fred).
20080928 tzxlist.c: add block and tape lengths to output (Fred).
+20081027 ChangeLog: bring up to date.
Modified: vendor/fuse-emulator/current/fusetest/fusetest.asm
===================================================================
--- vendor/fuse-emulator/current/fusetest/fusetest.asm 2008-10-28 13:18:28 UTC (rev 536)
+++ vendor/fuse-emulator/current/fusetest/fusetest.asm 2008-11-03 11:44:43 UTC (rev 537)
@@ -168,6 +168,9 @@
defb 'DAA', 0
defw daatest
+ defb 'OUTI', 0
+ defw outitest
+
defb 'LDIR', 0
defw ldirtest
Modified: vendor/fuse-emulator/current/fusetest/tests.asm
===================================================================
--- vendor/fuse-emulator/current/fusetest/tests.asm 2008-10-28 13:18:28 UTC (rev 536)
+++ vendor/fuse-emulator/current/fusetest/tests.asm 2008-11-03 11:44:43 UTC (rev 537)
@@ -44,6 +44,33 @@
ret
ENDP
+; Check the behaviour of the undocumented flags after OUTI (revision 3634)
+
+outitest
+PROC
+ ld de, _data
+ ld hl, 0x40fd
+ ld a, (hl)
+ ld (de), a
+ ld a, 0x12
+ ld (hl), a
+ ld bc, 0x01fe
+ outi
+ push af
+ ld a, 0x07
+ out (c), a
+ ld a, (de)
+ dec hl
+ ld (hl), a
+ pop bc
+ ld a, c
+ ld b, 0x00
+ cp 0x55
+ ret
+
+_data defb 0x00
+ENDP
+
; Check the behaviour of LDIR at contended memory boundary (revision 2841).
ldirtest
Modified: vendor/fuse-emulator/current/libspectrum/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/libspectrum/ChangeLog 2008-10-28 13:18:28 UTC (rev 536)
+++ vendor/fuse-emulator/current/libspectrum/ChangeLog 2008-11-03 11:44:43 UTC (rev 537)
@@ -1,3 +1,47 @@
+2008-11-?? Philip Kendall <phi...@sh...>
+
+ * libspectrum 0.5.0 released.
+
+ * Memory management change: memory allocation functions now abort
+ on failure. Leads to simpler code both internally and for
+ users of the library (Philip Kendall).
+
+ * Support for tape acceleration (Philip Kendall)
+
+ * IDE improvements to allow DivIDE to support FATware (Philip
+ Kendall; thanks, http://www.dusky.sk/zxs/)
+
+ * New API to deal with flagging automatic snapshots in RZX files
+ (Philip Kendall).
+
+ * New function to get length (time) of a tape block (Philip Kendall,
+ Fredrick Meunier).
+
+ * 128K SNA files are now treated as being for the Pentagon 128
+ rather than the Spectrum 128 (Fredrick Meunier)
+
+ * SNA files now written out correctly (Philip Kendall).
+
+ * Handle MDR write protection flag correctly (Philip Kendall)
+
+ * Allow MDR images with bad checksums to load (the error will
+ be handled by the If1 ROM) (Gergely Szasz)
+
+ * Support saving custom ROMs in SZX snapshots (Fredrick Meunier,
+ Stuart Brady)
+
+ * Support for DivIDE, Kempston mouse and the simple IDE interface
+ in SZX snapshots (Fredrick Meunier)
+
+ * Allow building without libgcrypt (Stuart Brady)
+
+ * Amiga and MorphOS compilation fixes (Chris Young, Q-Master)
+
+ * Don't produce empty libraries to fix build process on
+ OpenSolaris (Fredrick Meunier)
+
+ * Remove deprecated functions (Fredrick Meunier).
+
2008-01-05 Philip Kendall <phi...@sh...>
* libspectrum 0.4.0 released.
@@ -225,5 +269,5 @@
* libspectrum separated from Fuse just before the 0.5.0 release of
Fuse; see Fuse's ChangeLog for changes up to this point
-$Id: ChangeLog 3480 2008-01-07 12:19:50Z pak21 $
+$Id: ChangeLog 3791 2008-10-27 20:20:40Z pak21 $
Modified: vendor/fuse-emulator/current/libspectrum/README
===================================================================
--- vendor/fuse-emulator/current/libspectrum/README 2008-10-28 13:18:28 UTC (rev 536)
+++ vendor/fuse-emulator/current/libspectrum/README 2008-11-03 11:44:43 UTC (rev 537)
@@ -42,14 +42,14 @@
http://fuse-emulator.sourceforge.net/libspectrum.php
-Compiling from CVS
-------------------
+Compiling from Subversion
+-------------------------
-If you're using version of libspectrum from CVS rather than one of the
-released tarballs, you'll need to run `autogen.sh' before running
-'configure' for the first time.
+If you're using version of libspectrum from Subversion rather than one
+of the released tarballs, you'll need to run `autogen.sh' before
+running 'configure' for the first time.
Philip Kendall <phi...@sh...>
5 January 2008
-$Id: README 3480 2008-01-07 12:19:50Z pak21 $
+$Id: README 3795 2008-10-27 21:02:43Z pak21 $
Modified: vendor/fuse-emulator/current/libspectrum/doc/libspectrum.txt
===================================================================
--- vendor/fuse-emulator/current/libspectrum/doc/libspectrum.txt 2008-10-28 13:18:28 UTC (rev 536)
+++ vendor/fuse-emulator/current/libspectrum/doc/libspectrum.txt 2008-11-03 11:44:43 UTC (rev 537)
@@ -61,9 +61,9 @@
libspectrum_error libspectrum_init( void )
This routine must be called before any other libspectrum routines,
-other than `libspectrum_version' and `libspectrum_check_version' to
-initialise the library. If it isn't called, undefined behaviour may
-result.
+other than `libspectrum_version', `libspectrum_check_version' and
+`libspectrum_mem_set_vtable' to initialise the library. If it isn't
+called, undefined behaviour may result.
const char *libspectrum_version( void )
@@ -83,6 +83,34 @@
returns non-zero if the libspectrum version in use is at least
`version' or zero if it is not.
+Memory handling
+===============
+
+By default, libspectrum will use the standard library's malloc(),
+calloc(), realloc() and free() for memory handling, but wrapped so that
+they are "strong" (they will either succeed or abort the program). It is
+possible to replace these with custom allocation routines if you wish.
+
+typedef void* (*libspectrum_malloc_fn_t)( size_t size );
+typedef void* (*libspectrum_calloc_fn_t)( size_t nmemb, size_t size );
+typedef void* (*libspectrum_realloc_fn_t)( void *ptr, size_t size );
+typedef void (*libspectrum_free_fn_t)( void *ptr );
+
+typedef struct libspectrum_mem_vtable_t {
+ libspectrum_malloc_fn_t malloc;
+ libspectrum_calloc_fn_t calloc;
+ libspectrum_realloc_fn_t realloc;
+ libspectrum_free_fn_t free;
+} libspectrum_mem_vtable_t;
+
+void libspectrum_mem_set_vtable( libspectrum_mem_vtable_t *table )
+
+Set the memory handling routines to be those specified by `table'. This
+function may *not* be called after libspectrum_init() has been called.
+Note that libspectrum will ensure that the memory allocators are still
+strong, and will abort the program if any of the allocators returns
+NULL.
+
Error handling
==============
@@ -391,7 +419,7 @@
libspectrum provides a `libspectrum_creator' structure to store this
information.
-libspectrum_error libspectrum_creator_alloc( libspectrum_creator **creator )
+libspectrum_creator* libspectrum_creator_alloc( void )
Allocate a new `libspectrum_creator' structure.
@@ -451,7 +479,7 @@
`libspectrum_snap' structure, which can be accessed via the following
routines:
-libspectrum_error libspectrum_snap_alloc( libspectrum_snap **snap )
+libspectrum_snap* libspectrum_snap_alloc( void )
Allocate a new libspectrum_snap structure.
@@ -695,34 +723,6 @@
The only formats for which serialisation is supported are .sna, .szx
and .z80.
-Deprecated snapshot routines
-----------------------------
-
-There are also three format-specific functions. However, *these
-functions are deprecated and should not be used in new code*:
-
-libspectrum_error libspectrum_sna_read( libspectrum_snap *snap,
- const libspectrum_byte *buffer,
- size_t buffer_length )
-
-Take the .sna snapshot of length `buffer_length' bytes at `buffer' and
-convert it to a `libspectrum_snap' structure.
-
-libspectrum_error libspectrum_z80_read( libspectrum_snap *snap,
- const libspectrum_byte *buffer,
- size_t buffer_length )
-
-Similarly for a .z80 snapshot.
-
-libspectrum_error libspectrum_z80_write( libspectrum_byte **buffer,
- size_t *length,
- libspectrum_snap *snap )
-
-Take the snapshot in `snap' and serialise it into a .z80 file at
-'*buffer'. On entry, '*buffer' is assumed to be allocated '*length'
-bytes, and will grow if necessary; if '*length' is zero, '*buffer' can
-be uninitialised on entry.
-
Tape functions
==============
@@ -732,7 +732,7 @@
The routines for dealing with tapes are:
-libspectrum_error libspectrum_tape_alloc( libspectrum_tape **tape )
+libspectrum_tape* libspectrum_tape_alloc( void )
Allocate a new libspectrum_tape object.
@@ -793,6 +793,10 @@
forced high at this edge
LIBSPECTRUM_TAPE_FLAGS_NO_EDGE This "edge" isn't really an edge and doesn't
change the input signal from the tape.
+LIBSPECTRUM_TAPE_FLAGS_LENGTH_SHORT This edge is a "short" edge; used
+ for loader acceleration
+LIBSPECTRUM_TAPE_FLAGS_LENGTH_LONG This edge is a "long" edge; again
+ used for loader acceleration
int libspectrum_tape_present( libspectrum_tape *tape )
@@ -809,12 +813,27 @@
Set the current block on the tape to be the `n'th block and initialise
it. Again, the first block on the tape is block 0.
-libspectrum_error
+void
libspectrum_tape_append_block( libspectrum_tape *tape,
libspectrum_tape_block *block )
Append `block' to `tape'.
+void
+libspectrum_tape_remove_block( libspectrum_tape *tape,
+ libspectrum_tape_iterator it )
+
+Remove the block pointed to by `it' (see the "Tape iterators" section)
+from the tape.
+
+libspectrum_error
+libspectrum_tape_insert_block( libspectrum_tape *tape,
+ libspectrum_tape_block *block,
+ size_t position )
+
+Insert `block' into `tape` in position `position', where position 0
+would make the new block the first block on the tape.
+
libspectrum_tape_block*
libspectrum_tape_current_block( libspectrum_tape *tape )
@@ -832,50 +851,6 @@
Move the tape along so it points to the next block, initialise that
block and return it.
-Deprecated tape routines
-------------------------
-
-*These functions are deprecated and should not be used in new code*:
-
-libspectrum_error
-libspectrum_tap_read( libspectrum_tape *tape, const libspectrum_byte *buffer,
- const size_t length )
-
-Form a tape object in `tape' from the .tap file of `length' bytes
-starting at `buffer'. This routine deals with the `normal' (Z80-style)
-.tap files, not with Warajevo .tap files.
-
-libspectrum_error
-libspectrum_tap_write( libspectrum_byte **buffer, size_t *length,
- libspectrum_tape *tape )
-
-Attempt to convert the tape in `tape' to a .tap file in `*buffer', which
-has previously been allocated `*length' bytes by user code. The .tap
-format can handle only standard speed loading blocks; a best guess
-attempt will be made to convert other blocks, but the resultant .tap
-file probably won't work.
-
-libspectrum_error
-libspectrum_tzx_read( libspectrum_tape *tape, const libspectrum_byte *buffer,
- const size_t length )
-
-Just as `libspectrum_tap_read', but for .tzx format files.
-
-libspectrum_error
-libspectrum_tzx_write( libspectrum_byte **buffer, size_t *length,
- libspectrum_tape *tape )
-
-Just as `libspectrum_tap_write', but for .tzx files. The conversion to
-.tzx format is not lossy as it is with converting to .tap.
-
-libspectrum_error
-libspectrum_warajevo_read( libspectrum_tape *tape,
- const libspectrum_byte *buffer,
- const size_t length )
-
-Just as `libspectrum_tap_read', but for Warajevo-style .tap files.
-There is no currently no function to write a Warajevo-style .tap file.
-
Tape iterators
--------------
@@ -946,9 +921,8 @@
The basic routines for dealing with tape blocks are:
-libspectrum_error
-libspectrum_tape_block_alloc( libspectrum_tape_block **block,
- libspectrum_tape_type type )
+libspectrum_tape_block*
+libspectrum_tape_block_alloc( libspectrum_tape_type type )
Allocate a new tape block of `type'.
@@ -994,6 +968,11 @@
Returns 1 if the block consists solely of metadata (comments, etc.) or
0 if it contains real data.
+libspectrum_dword
+libspectrum_tape_block_length( libspectrum_tape_block *block )
+
+Returns the length (in tstates) of this block
+
The `get' and `set' functions follow the same pattern as for the
snapshot routines: the `get' functions are like
@@ -1160,7 +1139,7 @@
All input recording routines are accessed through the opaque
`libspectrum_rzx' structure.
-libspectrum_error libspectrum_rzx_alloc( libspectrum_rzx **rzx )
+libspectrum_rzx* libspectrum_rzx_alloc( void )
Allocate a new input recording object.
@@ -1169,7 +1148,7 @@
Free the memory used by an input recording object as allocated by
`libspectrum_rzx_alloc'.
-libspectrum_error
+void
libspectrum_rzx_start_input( libspectrum_rzx *rzx, libspectrum_dword tstates )
Start an input recording block int the object.
@@ -1179,9 +1158,13 @@
Stop the current input recording block.
libspectrum_error
-libspectrum_rzx_add_snap( libspectrum_rzx *rzx, libspectrum_snap *snap )
+libspectrum_rzx_add_snap( libspectrum_rzx *rzx, libspectrum_snap *snap,
+ int automatic )
-Add `snap' to the input recording at this point.
+Add `snap' to the input recording at this point. `automatic' can be used
+to indicate whether this block was automatically added by the calling
+program (non-zero) or explicitly requested by the user (zero) and then
+fetched with libspectrum_rzx_iterator_snap_is_automatic() (see below).
libspectrum_error
libspectrum_rzx_rollback( libspectrum_rzx *rzx, libspectrum_snap **snap )
@@ -1298,6 +1281,13 @@
Get the snapshot pointed to by `it'. If `it' does not point to a snapshot,
NULL is returned.
+int
+libspectrum_rzx_iterator_snap_is_automatic( libspectrum_rzx_iterator it )
+
+Returns non-zero if `it' points to a snap which has its "automatic" flag
+(see libspectrum_rzx_add_snap()) set to true, or false if it doesn't (or
+if `it' doesn't point to a snapshot).
+
Input recording iterators
-------------------------
@@ -1466,8 +1456,8 @@
Routines for handling images of microdrive cartridges. As usual, these
are accessed through an opaque structure, libspectrum_microdrive.
-libspectrum_error
-libspectrum_microdrive_alloc( libspectrum_microdrive **microdrive )
+libspectrum_microdrive*
+libspectrum_microdrive_alloc( void )
Allocate a microdrive structure.
@@ -1516,7 +1506,7 @@
libspectrum_error
libspectrum_microdrive_mdr_read( libspectrum_microdrive *microdrive,
libspectrum_byte *buffer, size_t length )
-libspectrum_error
+void
libspectrum_microdrive_mdr_write( const libspectrum_microdrive *microdrive,
libspectrum_byte **buffer, size_t *length )
@@ -1566,7 +1556,7 @@
The actual routines for handling dock files:
-libspectrum_error libspectrum_dck_alloc( libspectrum_dck **dck )
+libspectrum_dck* libspectrum_dck_alloc( void )
Allocate a dock structure.
@@ -1592,9 +1582,8 @@
images are not handled entirely in memory as are the other file types,
but require a real file.
-libspectrum_error
-libspectrum_ide_alloc( libspectrum_ide_channel **chn,
- libspectrum_ide_database databus )
+libspectrum_ide_channel*
+libspectrum_ide_alloc( libspectrum_ide_databus databus )
Allocate a new IDE channel in `*chn' of type `databus'. `databus' can
take the following values:
@@ -1677,4 +1666,4 @@
Write `data' to register `reg' of the IDE channel `chn'.
-$Id: libspectrum.txt 3608 2008-04-25 01:59:46Z fredm $
+$Id: libspectrum.txt 3793 2008-10-27 20:55:47Z pak21 $
Modified: vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog 2008-10-28 13:18:28 UTC (rev 536)
+++ vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog 2008-11-03 11:44:43 UTC (rev 537)
@@ -677,3 +677,18 @@
function to get block length.
20080928 internals.h,tape.c,tape_block.[ch],test/test.c: extend timing support
to raw data blocks, RLE pulse blocks and the block o' doom (Fred).
+20081020 tape_block.c: remove warning.
+20081021 sna.c,test/{empty.z80,test.c}: SP wasn't being decremented and
+ could have been written to freed memory.
+20081021 libspectrum.h.in,sna.c,tap.c,tzx_read.c,tzx_write.c,warajevo_read.c,
+ z80.c: remove deprecated functions libspectrum_sna_read(...
[truncated message content] |
|
From: <fr...@us...> - 2009-06-27 13:00:53
|
Revision: 599
http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=599&view=rev
Author: fredm
Date: 2009-06-27 12:46:44 +0000 (Sat, 27 Jun 2009)
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/ay.c
vendor/fuse-emulator/current/fuse/ay.h
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/file.c
vendor/fuse-emulator/current/fuse/compat/unix/osname.c
vendor/fuse-emulator/current/fuse/compat/unix/paths.c
vendor/fuse-emulator/current/fuse/compat/unix/timer.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/osname.c
vendor/fuse-emulator/current/fuse/compat/win32/paths.c
vendor/fuse-emulator/current/fuse/compat/win32/timer.c
vendor/fuse-emulator/current/fuse/compat.h
vendor/fuse-emulator/current/fuse/configure.in
vendor/fuse-emulator/current/fuse/debugger/event.c
vendor/fuse-emulator/current/fuse/debugger/variable.c
vendor/fuse-emulator/current/fuse/disk/beta.c
vendor/fuse-emulator/current/fuse/disk/beta.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/disk/plusd.c
vendor/fuse-emulator/current/fuse/disk/plusd.h
vendor/fuse-emulator/current/fuse/disk/upd_fdc.c
vendor/fuse-emulator/current/fuse/display.c
vendor/fuse-emulator/current/fuse/display.h
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/Makefile.am
vendor/fuse-emulator/current/fuse/hacking/cvs-tags
vendor/fuse-emulator/current/fuse/hacking/timer.txt
vendor/fuse-emulator/current/fuse/ide/divide.c
vendor/fuse-emulator/current/fuse/ide/divide.h
vendor/fuse-emulator/current/fuse/ide/ide.c
vendor/fuse-emulator/current/fuse/ide/ide.h
vendor/fuse-emulator/current/fuse/ide/simpleide.c
vendor/fuse-emulator/current/fuse/ide/simpleide.h
vendor/fuse-emulator/current/fuse/ide/zxatasp.c
vendor/fuse-emulator/current/fuse/ide/zxatasp.h
vendor/fuse-emulator/current/fuse/ide/zxcf.c
vendor/fuse-emulator/current/fuse/ide/zxcf.h
vendor/fuse-emulator/current/fuse/input.c
vendor/fuse-emulator/current/fuse/joystick.c
vendor/fuse-emulator/current/fuse/joystick.h
vendor/fuse-emulator/current/fuse/kempmouse.c
vendor/fuse-emulator/current/fuse/keysyms.pl
vendor/fuse-emulator/current/fuse/loader.c
vendor/fuse-emulator/current/fuse/machine.c
vendor/fuse-emulator/current/fuse/machines/pentagon.c
vendor/fuse-emulator/current/fuse/machines/pentagon1024.c
vendor/fuse-emulator/current/fuse/machines/pentagon512.c
vendor/fuse-emulator/current/fuse/machines/scorpion.c
vendor/fuse-emulator/current/fuse/machines/spec128.c
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/man/fuse.1
vendor/fuse-emulator/current/fuse/memory.c
vendor/fuse-emulator/current/fuse/memory.h
vendor/fuse-emulator/current/fuse/mempool.c
vendor/fuse-emulator/current/fuse/mempool.h
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/menu_data.pl
vendor/fuse-emulator/current/fuse/periph.c
vendor/fuse-emulator/current/fuse/periph.h
vendor/fuse-emulator/current/fuse/perl/cpp-perl.pl
vendor/fuse-emulator/current/fuse/rzx.c
vendor/fuse-emulator/current/fuse/scld.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/coreaudiosound.c
vendor/fuse-emulator/current/fuse/sound/sdlsound.c
vendor/fuse-emulator/current/fuse/sound.cpp
vendor/fuse-emulator/current/fuse/sound.h
vendor/fuse-emulator/current/fuse/spectrum.c
vendor/fuse-emulator/current/fuse/tape.c
vendor/fuse-emulator/current/fuse/timer/Makefile.am
vendor/fuse-emulator/current/fuse/timer/sdl.c
vendor/fuse-emulator/current/fuse/timer/timer.c
vendor/fuse-emulator/current/fuse/timer/timer.h
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/gtk/Makefile.am
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/gtkdisplay.c
vendor/fuse-emulator/current/fuse/ui/gtk/gtkinternals.h
vendor/fuse-emulator/current/fuse/ui/gtk/gtkui.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/pokefinder.c
vendor/fuse-emulator/current/fuse/ui/options.dat
vendor/fuse-emulator/current/fuse/ui/scaler/scaler_hq2x.c
vendor/fuse-emulator/current/fuse/ui/scaler/scaler_hq3x.c
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/svgaui.c
vendor/fuse-emulator/current/fuse/ui/ui.h
vendor/fuse-emulator/current/fuse/ui/uijoystick.c
vendor/fuse-emulator/current/fuse/ui/widget/Makefile.am
vendor/fuse-emulator/current/fuse/ui/widget/debugger.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-header.pl
vendor/fuse-emulator/current/fuse/ui/widget/options.pl
vendor/fuse-emulator/current/fuse/ui/widget/query.c
vendor/fuse-emulator/current/fuse/ui/widget/select.c
vendor/fuse-emulator/current/fuse/ui/widget/text.c
vendor/fuse-emulator/current/fuse/ui/widget/widget.c
vendor/fuse-emulator/current/fuse/ui/widget/widget.h
vendor/fuse-emulator/current/fuse/ui/widget/widget_internals.h
vendor/fuse-emulator/current/fuse/ui/win32/Makefile.am
vendor/fuse-emulator/current/fuse/ui/win32/confirm.c
vendor/fuse-emulator/current/fuse/ui/win32/debugger.c
vendor/fuse-emulator/current/fuse/ui/win32/fileselector.c
vendor/fuse-emulator/current/fuse/ui/win32/icons/Makefile.am
vendor/fuse-emulator/current/fuse/ui/win32/memorybrowser.c
vendor/fuse-emulator/current/fuse/ui/win32/memorybrowser.h
vendor/fuse-emulator/current/fuse/ui/win32/memorybrowser.rc
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/pokefinder.c
vendor/fuse-emulator/current/fuse/ui/win32/rollback.c
vendor/fuse-emulator/current/fuse/ui/win32/rollback.h
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/roms.h
vendor/fuse-emulator/current/fuse/ui/win32/roms.rc
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/ula.c
vendor/fuse-emulator/current/fuse/utils.c
vendor/fuse-emulator/current/fuse/utils.h
vendor/fuse-emulator/current/fuse/z80/coretest.c
vendor/fuse-emulator/current/fuse/z80/z80.c
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/README
vendor/fuse-emulator/current/fuse-utils/audio2tape.cc
vendor/fuse-emulator/current/fuse-utils/configure.in
vendor/fuse-emulator/current/fuse-utils/converter/romloader.cc
vendor/fuse-emulator/current/fuse-utils/converter/romloaderstate.h
vendor/fuse-emulator/current/fuse-utils/hacking/ChangeLog
vendor/fuse-emulator/current/fuse-utils/hacking/cvs-tags
vendor/fuse-emulator/current/fuse-utils/importer/interpolator.h
vendor/fuse-emulator/current/fuse-utils/importer/soundfile.cc
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/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/tape2wav.c
vendor/fuse-emulator/current/fusetest/Makefile
vendor/fuse-emulator/current/fusetest/README
vendor/fuse-emulator/current/fusetest/contention.asm
vendor/fuse-emulator/current/fusetest/first.asm
vendor/fuse-emulator/current/fusetest/framelength.asm
vendor/fuse-emulator/current/fusetest/fusetest.asm
vendor/fuse-emulator/current/fusetest/guessmachine.asm
vendor/fuse-emulator/current/fusetest/sync.asm
vendor/fuse-emulator/current/fusetest/tests.asm
vendor/fuse-emulator/current/gdos-tools/configure.in
vendor/fuse-emulator/current/gdos-tools/hacking/ChangeLog
vendor/fuse-emulator/current/libgdos/configure.in
vendor/fuse-emulator/current/libgdos/hacking/ChangeLog
vendor/fuse-emulator/current/libspectrum/AUTHORS
vendor/fuse-emulator/current/libspectrum/ChangeLog
vendor/fuse-emulator/current/libspectrum/Makefile.am
vendor/fuse-emulator/current/libspectrum/README
vendor/fuse-emulator/current/libspectrum/accessor.pl
vendor/fuse-emulator/current/libspectrum/configure.in
vendor/fuse-emulator/current/libspectrum/doc/cvs-tags
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/myglib/gslist.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/tape.c
vendor/fuse-emulator/current/libspectrum/tape_block.c
vendor/fuse-emulator/current/libspectrum/test/Makefile.am
vendor/fuse-emulator/current/libspectrum/timings.c
vendor/fuse-emulator/current/libspectrum/tzx_write.c
vendor/fuse-emulator/current/libspectrum/warajevo_read.c
vendor/fuse-emulator/current/libspectrum/z80.c
vendor/fuse-emulator/current/website/fuse.php
vendor/fuse-emulator/current/website/libspectrum.php
Added Paths:
-----------
vendor/fuse-emulator/current/fuse/compat/unix/dir.c
vendor/fuse-emulator/current/fuse/compat/wii/dir.c
vendor/fuse-emulator/current/fuse/compat/wii/osname.c
vendor/fuse-emulator/current/fuse/compat/wii/paths.c
vendor/fuse-emulator/current/fuse/compat/wii/timer.c
vendor/fuse-emulator/current/fuse/fuller.c
vendor/fuse-emulator/current/fuse/fuller.h
vendor/fuse-emulator/current/fuse/ide/Makefile.am
vendor/fuse-emulator/current/fuse/melodik.c
vendor/fuse-emulator/current/fuse/melodik.h
vendor/fuse-emulator/current/fuse/sound/Blip_Buffer.cpp
vendor/fuse-emulator/current/fuse/sound/Blip_Buffer.h
vendor/fuse-emulator/current/fuse/sound/wiisound.c
vendor/fuse-emulator/current/fuse/timer/native.c
vendor/fuse-emulator/current/fuse/ui/wii/
vendor/fuse-emulator/current/fuse/ui/wii/Makefile.am
vendor/fuse-emulator/current/fuse/ui/wii/wiidisplay.c
vendor/fuse-emulator/current/fuse/ui/wii/wiidisplay.h
vendor/fuse-emulator/current/fuse/ui/wii/wiijoystick.c
vendor/fuse-emulator/current/fuse/ui/wii/wiikeyboard.c
vendor/fuse-emulator/current/fuse/ui/wii/wiikeyboard.h
vendor/fuse-emulator/current/fuse/ui/wii/wiikeysyms.h
vendor/fuse-emulator/current/fuse/ui/wii/wiimouse.c
vendor/fuse-emulator/current/fuse/ui/wii/wiimouse.h
vendor/fuse-emulator/current/fuse/ui/wii/wiiui.c
vendor/fuse-emulator/current/fuse/ui/win32/installer/
vendor/fuse-emulator/current/fuse/ui/win32/installer/Makefile.am
vendor/fuse-emulator/current/fuse/ui/win32/installer/fuse.nsi
vendor/fuse-emulator/current/fuse-utils/converter/romloaderstate.cc
vendor/fuse-emulator/current/fusetest/findcontention.asm
vendor/fuse-emulator/current/fusetest/findcontention.dot
vendor/fuse-emulator/current/fusetest/testcontention.asm
Removed Paths:
-------------
vendor/fuse-emulator/current/debian/lib765/
vendor/fuse-emulator/current/debian/libdsk/
vendor/fuse-emulator/current/fuse/compat/wii/file.c
Modified: vendor/fuse-emulator/current/fuse/AUTHORS
===================================================================
--- vendor/fuse-emulator/current/fuse/AUTHORS 2009-06-27 12:33:22 UTC (rev 598)
+++ vendor/fuse-emulator/current/fuse/AUTHORS 2009-06-27 12:46:44 UTC (rev 599)
@@ -41,6 +41,8 @@
* Gergely Szasz: Interface I/microdrive emulation, the 'movie' code and the
ao sound driver.
+* Bjoern Giesler: the original Wii port.
+
* Philip Kendall: everything else.
-$Id: AUTHORS 2433 2004-11-28 21:58:44Z pak21 $
+$Id: AUTHORS 3944 2009-01-10 18:17:04Z pak21 $
Modified: vendor/fuse-emulator/current/fuse/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse/ChangeLog 2009-06-27 12:33:22 UTC (rev 598)
+++ vendor/fuse-emulator/current/fuse/ChangeLog 2009-06-27 12:46:44 UTC (rev 599)
@@ -1,5 +1,15 @@
-2008-11-?? Philip Kendall <phi...@sh...>
+2008-12-10 Philip Kendall <phi...@sh...>
+ * Fuse 0.10.0.1 released
+
+ * Writing files would not truncate the file at the correct point,
+ leading to corrupt files when overwriting an existing file
+ (Philip Kendall; thanks, Matthew Westcott).
+
+ * Distribute ui/fb/fbmouse.h (Fredrick Meunier; thanks, rkd77).
+
+2008-12-03 Philip Kendall <phi...@sh...>
+
* Fuse 0.10.0 released
* New upd765 FDC emulation; all known +3 DSK images now work (Gergely
@@ -16,6 +26,8 @@
* Reading from the 128K's memory control port causes that byte to
be written back to the port (Philip Kendall; thanks, Marat
Fayzullin).
+ * Reading the AY data port on the +2A/+3 is the same as reading
+ the register port (Philip Kendall; thanks, Mark Woodmass).
* NMI causes Z80 to unHALT (Philip Kendall; thanks, Simon Owen).
* Emulate C, H and P/V flags on repeated IO instructions (Philip
Kendall).
@@ -929,4 +941,4 @@
* Version 0.1.0 released.
-$Id: ChangeLog 3787 2008-10-22 19:10:25Z pak21 $
+$Id: ChangeLog 3900 2008-12-10 19:31:31Z pak21 $
Modified: vendor/fuse-emulator/current/fuse/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/Makefile.am 2009-06-27 12:33:22 UTC (rev 598)
+++ vendor/fuse-emulator/current/fuse/Makefile.am 2009-06-27 12:46:44 UTC (rev 599)
@@ -1,7 +1,7 @@
# Process this file with automake to produce Makefile.in
-## Copyright (c) 1999-2008 Philip Kendall
+## Copyright (c) 1999-2009 Philip Kendall
-## $Id: Makefile.am 3617 2008-05-17 08:09:47Z pak21 $
+## $Id: Makefile.am 4032 2009-06-10 11:09:44Z 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
@@ -29,6 +29,7 @@
debugger \
disk \
hacking \
+ ide \
lib \
machines \
man \
@@ -44,6 +45,7 @@
DIST_SUBDIRS = debugger \
disk \
hacking \
+ ide \
lib \
machines \
man \
@@ -59,10 +61,9 @@
fuse_SOURCES = ay.c \
dck.c \
display.c \
- divide.c \
event.c \
+ fuller.c \
fuse.c \
- ide.c \
if1.c \
if2.c \
input.c \
@@ -71,6 +72,7 @@
keyboard.c \
loader.c \
machine.c \
+ melodik.c \
memory.c \
mempool.c \
menu.c \
@@ -83,19 +85,16 @@
scld.c \
screenshot.c \
settings.c \
- simpleide.c \
slt.c \
snapshot.c \
- sound.c \
+ sound.cpp \
spectrum.c \
tape.c \
ui.c \
uidisplay.c \
ula.c \
utils.c \
- windres.rc \
- zxatasp.c \
- zxcf.c
+ windres.rc
if COMPAT_DIRNAME
fuse_SOURCES += compat/dirname.c
@@ -113,36 +112,42 @@
fuse_LDADD = debugger/libdebugger.a \
@UI_LIBS@ \
+debugger/libdebugger.a \
+disk/libdisk.a \
+ide/libide.a \
machines/libmachines.a \
-disk/libdisk.a \
pokefinder/libpokefinder.a \
sound/libsound.a \
+timer/libtimer.a \
ui/scaler/libscaler.a \
unittests/libunittests.a \
-debugger/libdebugger.a \
-timer/libtimer.a \
z80/libz80.a \
@LIBSPEC_LIBS@ \
@GLIB_LIBS@ \
@PNG_LIBS@ \
@SOUND_LIBS@ \
-@SAMPLERATE_LIBS@ \
@SDL_LIBS@ \
@X_LIBS@ \
@XML_LIBS@ \
compat/@COMPAT_OSNAME@/libcompatos.a \
@WINDRES_OBJ@
-fuse_DEPENDENCIES = @UI_LIBS@ \
- disk/libdisk.a \
- debugger/libdebugger.a \
- machines/libmachines.a \
- sound/libsound.a \
- unittests/libunittests.a\
- z80/libz80.a \
- @WINDRES_OBJ@
+fuse_DEPENDENCIES = debugger/libdebugger.a \
+@UI_LIBS@ \
+debugger/libdebugger.a \
+disk/libdisk.a \
+ide/libide.a \
+machines/libmachines.a \
+pokefinder/libpokefinder.a \
+sound/libsound.a \
+timer/libtimer.a \
+ui/scaler/libscaler.a \
+unittests/libunittests.a \
+z80/libz80.a \
+compat/@COMPAT_OSNAME@/libcompatos.a \
+@WINDRES_OBJ@
-BUILT_SOURCES = settings.c settings.h
+BUILT_SOURCES = options.h settings.c settings.h
windres.o: windres.rc winfuse.ico
@WINDRES@ -I$(srcdir) -I. $(srcdir)/windres.rc windres.o
@@ -153,18 +158,25 @@
settings.h: settings-header.pl settings.dat
@PERL@ -I$(srcdir)/perl $(srcdir)/settings-header.pl $(srcdir)/settings.dat > $@.tmp && mv $@.tmp $@
+if WIDGET
+options.h: $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/@WIDGET@/options-header.pl $(srcdir)/ui/options.dat $(srcdir)/perl/Fuse.pm $(srcdir)/perl/Fuse/Dialog.pm
+ @PERL@ $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/options.dat | @PERL@ -I$(srcdir)/perl $(srcdir)/ui/@WIDGET@/options-header.pl - public > $@.tmp && mv $@.tmp $@
+else
+options.h: $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/@UI@/options-header.pl $(srcdir)/ui/options.dat $(srcdir)/perl/Fuse.pm $(srcdir)/perl/Fuse/Dialog.pm
+ @PERL@ $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/options.dat | @PERL@ -I$(srcdir)/perl $(srcdir)/ui/@UI@/options-header.pl - public > $@.tmp && mv $@.tmp $@
+endif
+
INCLUDES = @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@ \
-@XML_CFLAGS@ @SAMPLERATE_CFLAGS@ -DFUSEDATADIR="\"${pkgdatadir}\"" @SDL_CFLAGS@
+@XML_CFLAGS@ -DFUSEDATADIR="\"${pkgdatadir}\"" @SDL_CFLAGS@
noinst_HEADERS = ay.h \
bitmap.h \
compat.h \
dck.h \
display.h \
- divide.h \
event.h \
+ fuller.h \
fuse.h \
- ide.h \
if1.h \
if2.h \
input.h \
@@ -172,7 +184,9 @@
kempmouse.h \
loader.h \
machine.h \
+ melodik.h \
memory.h \
+ mempool.h \
menu.h \
module.h \
periph.h \
@@ -180,7 +194,6 @@
rzx.h \
screenshot.h \
settings.h \
- simpleide.h \
slt.h \
snapshot.h \
sound.h \
@@ -188,12 +201,11 @@
tape.h \
utils.h \
joystick.h \
+ options.h \
printer.h \
profile.h \
scld.h \
- ula.h \
- zxatasp.h \
- zxcf.h
+ ula.h
EXTRA_DIST = AUTHORS \
README \
@@ -207,7 +219,8 @@
settings.dat \
winfuse.ico
-CLEANFILES = settings.c \
+CLEANFILES = options.h \
+ settings.c \
settings.h
AM_CPPFLAGS =
Modified: vendor/fuse-emulator/current/fuse/README
===================================================================
--- vendor/fuse-emulator/current/fuse/README 2009-06-27 12:33:22 UTC (rev 598)
+++ vendor/fuse-emulator/current/fuse/README 2009-06-27 12:46:44 UTC (rev 599)
@@ -1,5 +1,5 @@
-The Free Unix Spectrum Emulator (Fuse) 0.9.0
-============================================
+The Free Unix Spectrum Emulator (Fuse) 0.10.0.1
+===============================================
Fuse (the Free Unix Spectrum Emulator) was originally, and somewhat
unsurprisingly, an emulator of the ZX Spectrum (a popular 1980s home
@@ -55,8 +55,6 @@
* libpng: the ability to save screenshots
* libxml2: the ability to load and save Fuse's current configuration
* zlib: support for compressed RZX files
- * samplerate: support for better beeper sound quality; get it from
- http://www.mega-nerd.com/SRC/
If you've used Fuse prior to version 0.5.0, note that the external
utilities (tzxlist, etc) are now available separately from Fuse
@@ -123,6 +121,36 @@
The native Cocoa port by Fredrick Meunier <fr...@sp...> comes as
a set of Xcode projects for libgcrypt, libspectrum and Fuse itself.
+Building the Wii version of Fuse
+--------------------------------
+
+You'll need to have the standard Wii homebrew toolchain installed; see
+eg <http://wiibrew.org/wiki/DevkitPro> for some information on setting
+this up.
+
+After that, make sure the dev tools are in your path (export
+PATH=$PATH:$DEVKITPPC/bin) and that a Wii version of libspectrum has been
+built and installed.
+
+Then, use this configure line:
+
+./configure --target=powerpc-gekko --host=powerpc-gekko \
+ --with-wii \
+ --without-libxml2 --without-libiconv --without-gpm \
+ --without-x --without-glib \
+ CFLAGS="-g -I$DEVKITPPC/include -I$DEVKITPRO/libogc/include" \
+ LDFLAGS="-g -mrvl -mcpu=750 -meabi -mhard-float \
+ -Wl,-Map,fuse.elf.map -L$DEVKITPPC/lib \
+ -L$DEVKITPRO/libogc/lib/wii" \
+ LIBS="-lfat -lwiiuse -lbte -logc -lm"
+
+Finally, to build, use this line:
+
+EXEEXT=".elf" make -e
+
+This should build fuse.elf, which you can run on your Wii via the usual
+methods.
+
Closing comments
----------------
@@ -150,6 +178,6 @@
( http://www.worldofspectrum.org/faq/index.html ) first!
Philip Kendall <phi...@sh...>
-5 January 2008
+10 December 2008
-$Id: README 3801 2008-10-31 16:22:13Z pak21 $
+$Id: README 4021 2009-05-29 13:39:51Z fredm $
Modified: vendor/fuse-emulator/current/fuse/ay.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ay.c 2009-06-27 12:33:22 UTC (rev 598)
+++ vendor/fuse-emulator/current/fuse/ay.c 2009-06-27 12:46:44 UTC (rev 599)
@@ -1,7 +1,7 @@
/* ay.c: AY-8-3912 routines
- Copyright (c) 1999-2004 Philip Kendall
+ Copyright (c) 1999-2009 Philip Kendall
- $Id: ay.c 3494 2008-01-15 16:37:50Z pak21 $
+ $Id: ay.c 4030 2009-06-07 14:38:38Z 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
@@ -131,22 +131,26 @@
if( current == 14 ) printer_serial_write( b );
}
-static void
-ay_from_snapshot( libspectrum_snap *snap )
+void
+ay_state_from_snapshot( libspectrum_snap *snap )
{
size_t i;
- if( machine_current->capabilities & LIBSPECTRUM_MACHINE_CAPABILITY_AY ) {
+ ay_registerport_write( 0xfffd,
+ libspectrum_snap_out_ay_registerport( snap ) );
- ay_registerport_write( 0xfffd,
- libspectrum_snap_out_ay_registerport( snap ) );
+ for( i = 0; i < AY_REGISTERS; i++ ) {
+ machine_current->ay.registers[i] =
+ libspectrum_snap_ay_registers( snap, i );
+ sound_ay_write( i, machine_current->ay.registers[i], 0 );
+ }
+}
- for( i = 0; i < AY_REGISTERS; i++ ) {
- machine_current->ay.registers[i] =
- libspectrum_snap_ay_registers( snap, i );
- sound_ay_write( i, machine_current->ay.registers[i], 0 );
- }
-
+static void
+ay_from_snapshot( libspectrum_snap *snap )
+{
+ if( machine_current->capabilities & LIBSPECTRUM_MACHINE_CAPABILITY_AY ) {
+ ay_state_from_snapshot( snap );
}
}
Modified: vendor/fuse-emulator/current/fuse/ay.h
===================================================================
--- vendor/fuse-emulator/current/fuse/ay.h 2009-06-27 12:33:22 UTC (rev 598)
+++ vendor/fuse-emulator/current/fuse/ay.h 2009-06-27 12:46:44 UTC (rev 599)
@@ -1,7 +1,7 @@
/* ay.h: AY-8-3912 routines
- Copyright (c) 1999-2004 Philip Kendall
+ Copyright (c) 1999-2009 Philip Kendall
- $Id: ay.h 2993 2007-06-17 13:54:49Z pak21 $
+ $Id: ay.h 4030 2009-06-07 14:38:38Z 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
@@ -42,4 +42,6 @@
void ay_dataport_write( libspectrum_word port, libspectrum_byte b );
+void ay_state_from_snapshot( libspectrum_snap *snap );
+
#endif /* #ifndef FUSE_AY_H */
Modified: vendor/fuse-emulator/current/fuse/compat/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/Makefile.am 2009-06-27 12:33:22 UTC (rev 598)
+++ vendor/fuse-emulator/current/fuse/compat/Makefile.am 2009-06-27 12:46:44 UTC (rev 599)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2003-2007 Philip Kendall
-## $Id: Makefile.am 3283 2007-11-09 12:21:06Z fredm $
+## $Id: Makefile.am 3944 2009-01-10 18:17:04Z 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,6 +26,7 @@
DIST_SUBDIRS += compat/amiga \
compat/morphos \
compat/unix \
+ compat/wii \
compat/win32
EXTRA_fuse_SOURCES += compat/dirname.c \
Modified: vendor/fuse-emulator/current/fuse/compat/amiga/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/amiga/Makefile.am 2009-06-27 12:33:22 UTC (rev 598)
+++ vendor/fuse-emulator/current/fuse/compat/amiga/Makefile.am 2009-06-27 12:46:44 UTC (rev 599)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2007-2008 Philip Kendall
-## $Id: Makefile.am 3687 2008-06-23 11:55:23Z pak21 $
+## $Id: Makefile.am 3935 2009-01-07 12:55:13Z pak21 $
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -27,8 +27,10 @@
noinst_LIBRARIES = libcompatos.a
-libcompatos_a_SOURCES = ../unix/file.c \
+libcompatos_a_SOURCES = ../unix/dir.c \
+ ../unix/file.c \
osname.c \
- paths.c
+ paths.c \
+ ../unix/timer.c
INCLUDES = @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@
Modified: vendor/fuse-emulator/current/fuse/compat/amiga/paths.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/amiga/paths.c 2009-06-27 12:33:22 UTC (rev 598)
+++ vendor/fuse-emulator/current/fuse/compat/amiga/paths.c 2009-06-27 12:46:44 UTC (rev 599)
@@ -1,7 +1,7 @@
/* paths.c: Path-related compatibility routines
Copyright (c) 1999-2007 Philip Kendall
- $Id: paths.c 3578 2008-03-22 20:51:36Z zubzero $
+ $Id: paths.c 3843 2008-11-19 21:27:03Z 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
@@ -42,6 +42,5 @@
int
compat_is_absolute_path( const char *path )
{
- /* Is this correct? */
- return path[0] == '/';
+ return strchr(path,':');
}
Modified: vendor/fuse-emulator/current/fuse/compat/morphos/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/morphos/Makefile.am 2009-06-27 12:33:22 UTC (rev 598)
+++ vendor/fuse-emulator/current/fuse/compat/morphos/Makefile.am 2009-06-27 12:46:44 UTC (rev 599)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2007-2008 Philip Kendall
-## $Id: Makefile.am 3687 2008-06-23 11:55:23Z pak21 $
+## $Id: Makefile.am 3935 2009-01-07 12:55:13Z pak21 $
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -27,8 +27,10 @@
noinst_LIBRARIES = libcompatos.a
-libcompatos_a_SOURCES = ../unix/file.c \
+libcompatos_a_SOURCES = ../unix/dir.c \
+ ../unix/file.c \
osname.c \
- ../amiga/paths.c
+ ../amiga/paths.c \
+ ../unix/timer.c
INCLUDES = @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@
Modified: vendor/fuse-emulator/current/fuse/compat/morphos/osname.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/morphos/osname.c 2009-06-27 12:33:22 UTC (rev 598)
+++ vendor/fuse-emulator/current/fuse/compat/morphos/osname.c 2009-06-27 12:46:44 UTC (rev 599)
@@ -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 3139 2007-09-03 10:27:57Z fredm $
+ $Id: osname.c 3922 2008-12-31 19:01:31Z 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
Modified: vendor/fuse-emulator/current/fuse/compat/unix/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/unix/Makefile.am 2009-06-27 12:33:22 UTC (rev 598)
+++ vendor/fuse-emulator/current/fuse/compat/unix/Makefile.am 2009-06-27 12:46:44 UTC (rev 599)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2007-2008 Philip Kendall
-## $Id: Makefile.am 3687 2008-06-23 11:55:23Z pak21 $
+## $Id: Makefile.am 3935 2009-01-07 12:55:13Z pak21 $
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -27,8 +27,10 @@
noinst_LIBRARIES = libcompatos.a
-libcompatos_a_SOURCES = file.c \
+libcompatos_a_SOURCES = dir.c \
+ file.c \
osname.c \
- paths.c
+ paths.c \
+ timer.c
INCLUDES = @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@
Added: vendor/fuse-emulator/current/fuse/compat/unix/dir.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/unix/dir.c (rev 0)
+++ vendor/fuse-emulator/current/fuse/compat/unix/dir.c 2009-06-27 12:46:44 UTC (rev 599)
@@ -0,0 +1,63 @@
+/* dir.c: Directory-related compatibility routines
+ Copyright (c) 2009 Philip Kendall
+
+ $Id: dir.c 3945 2009-01-10 18:44:42Z 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:
+
+ E-mail: phi...@sh...
+
+*/
+
+#include <config.h>
+
+#include <errno.h>
+#include <string.h>
+
+#include "compat.h"
+
+compat_dir
+compat_opendir( const char *path )
+{
+ return opendir( path );
+}
+
+compat_dir_result_t
+compat_readdir( compat_dir directory, char *name, size_t length )
+{
+ compat_dir_result_t r;
+ struct dirent *dirent;
+
+ errno = 0;
+ dirent = readdir( directory );
+
+ if( dirent ) {
+ r = COMPAT_DIR_RESULT_OK;
+ strncpy( name, dirent->d_name, length );
+ name[ length - 1 ] = 0;
+ } else {
+ r = ( errno == 0 ? COMPAT_DIR_RESULT_END : COMPAT_DIR_RESULT_ERROR );
+ }
+
+ return r;
+}
+
+int
+compat_closedir( compat_dir directory )
+{
+ return closedir( directory );
+}
Modified: vendor/fuse-emulator/current/fuse/compat/unix/file.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/unix/file.c 2009-06-27 12:33:22 UTC (rev 598)
+++ vendor/fuse-emulator/current/fuse/compat/unix/file.c 2009-06-27 12:46:44 UTC (rev 599)
@@ -1,7 +1,7 @@
/* file.c: File-related compatibility routines
Copyright (c) 2008 Philip Kendall
- $Id: file.c 3776 2008-10-06 00:49:45Z fredm $
+ $Id: file.c 4040 2009-06-27 09:32:42Z 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
@@ -33,22 +33,15 @@
#include <unistd.h>
#include "compat.h"
+#include "utils.h"
#include "ui/ui.h"
-/* Certain brain damaged operating systems (DOS/Windows) treat text
- and binary files different in open(2) and need to be given the
- O_BINARY flag to tell them it's a binary file */
-#ifndef O_BINARY
-#define O_BINARY 0
-#endif /* #ifndef O_BINARY */
+const compat_fd COMPAT_FILE_OPEN_FAILED = NULL;
-const compat_fd COMPAT_FILE_OPEN_FAILED = -1;
-
compat_fd
compat_file_open( const char *path, int write )
{
- int flags = write ? O_WRONLY | O_CREAT | O_BINARY : O_RDONLY | O_BINARY;
- return open( path, flags, 0666 );
+ return fopen( path, write ? "w" : "r" );
}
off_t
@@ -56,7 +49,7 @@
{
struct stat file_info;
- if( fstat( fd, &file_info ) ) {
+ if( fstat( fileno( fd ), &file_info ) ) {
ui_error( UI_ERROR_ERROR, "couldn't stat file: %s", strerror( errno ) );
return -1;
}
@@ -67,15 +60,11 @@
int
compat_file_read( compat_fd fd, utils_file *file )
{
- ssize_t bytes = read( fd, file->buffer, file->length );
+ size_t bytes = fread( file->buffer, 1, file->length, fd );
if( bytes != file->length ) {
- if( bytes == -1 ) {
- ui_error( UI_ERROR_ERROR, "error reading file: %s", strerror( errno ) );
- } else {
- ui_error( UI_ERROR_ERROR,
- "error reading file: expected %ld bytes, but read only %ld",
- (unsigned long)file->length, (unsigned long)bytes );
- }
+ ui_error( UI_ERROR_ERROR,
+ "error reading file: expected %lu bytes, but read only %lu",
+ file->length, bytes );
return 1;
}
@@ -85,15 +74,11 @@
int
compat_file_write( compat_fd fd, const unsigned char *buffer, size_t length )
{
- ssize_t bytes = write( fd, buffer, length );
+ size_t bytes = fwrite( buffer, 1, length, fd );
if( bytes != length ) {
- if( bytes == -1 ) {
- ui_error( UI_ERROR_ERROR, "error writing file: %s", strerror( errno ) );
- } else {
- ui_error( UI_ERROR_ERROR,
- "error writing file: expected %ld bytes, but wrote only %ld",
- (unsigned long)length, (unsigned long)bytes );
- }
+ ui_error( UI_ERROR_ERROR,
+ "error writing file: expected %lu bytes, but wrote only %lu",
+ length, bytes );
return 1;
}
@@ -103,5 +88,5 @@
int
compat_file_close( compat_fd fd )
{
- return close( fd );
+ return fclose( fd );
}
Modified: vendor/fuse-emulator/current/fuse/compat/unix/osname.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/unix/osname.c 2009-06-27 12:33:22 UTC (rev 598)
+++ vendor/fuse-emulator/current/fuse/compat/unix/osname.c 2009-06-27 12:46:44 UTC (rev 599)
@@ -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 3626 2008-05-23 10:30:30Z pak21 $
+ $Id: osname.c 3922 2008-12-31 19:01:31Z 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
Modified: vendor/fuse-emulator/current/fuse/compat/unix/paths.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/unix/paths.c 2009-06-27 12:33:22 UTC (rev 598)
+++ vendor/fuse-emulator/current/fuse/compat/unix/paths.c 2009-06-27 12:46:44 UTC (rev 599)
@@ -1,7 +1,7 @@
/* paths.c: Path-related compatibility routines
Copyright (c) 1999-2007 Philip Kendall
- $Id: paths.c 3253 2007-10-26 02:02:17Z zubzero $
+ $Id: paths.c 3922 2008-12-31 19:01:31Z 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
Modified: vendor/fuse-emulator/current/fuse/compat/unix/timer.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/unix/timer.c 2009-06-27 12:33:22 UTC (rev 598)
+++ vendor/fuse-emulator/current/fuse/compat/unix/timer.c 2009-06-27 12:46:44 UTC (rev 599)
@@ -1,7 +1,7 @@
-/* unix.c: UNIX speed routines for Fuse
- Copyright (c) 1999-2007 Philip Kendall, Marek Januszewski, Fredrick Meunier
+/* timer.c: UNIX speed routines for Fuse
+ Copyright (c) 1999-2008 Philip Kendall, Marek Januszewski, Fredrick Meunier
- $Id: unix.c 3115 2007-08-19 02:49:14Z fredm $
+ $Id: timer.c 3982 2009-02-11 12:00:22Z 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
@@ -27,46 +27,29 @@
#include <errno.h>
#include <string.h>
+#include <sys/time.h>
#include <unistd.h>
-#include "timer.h"
+#include "compat.h"
#include "ui/ui.h"
-int
-timer_get_real_time( timer_type *real_time )
+double
+compat_timer_get_time( void )
{
+ struct timeval tv;
int error;
- error = gettimeofday( real_time, NULL );
+ error = gettimeofday( &tv, NULL );
if( error ) {
- ui_error( UI_ERROR_ERROR, "error getting time: %s", strerror( errno ) );
- return 1;
+ ui_error( UI_ERROR_ERROR, "%s: error getting time: %s", __func__, strerror( errno ) );
+ return -1;
}
- return 0;
+ return tv.tv_sec + tv.tv_usec / 1000000.0;
}
-float
-timer_get_time_difference( timer_type *a, timer_type *b )
-{
- return ( a->tv_sec - b->tv_sec ) + ( a->tv_usec - b->tv_usec ) / 1000000.0;
-}
-
void
-timer_add_time_difference( timer_type *a, long msec )
+compat_timer_sleep( int ms )
{
- a->tv_usec += msec * 1000;
- if( a->tv_usec >= 1000000 ) {
- a->tv_usec -= 1000000;
- a->tv_sec += 1;
- } else if( a->tv_usec < 0 ) {
- a->tv_usec += 1000000;
- a->tv_sec -= 1;
- }
-}
-
-void
-timer_sleep_ms( int ms )
-{
usleep( ms * 1000 );
}
Modified: vendor/fuse-emulator/current/fuse/compat/wii/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/wii/Makefile.am 2009-06-27 12:33:22 UTC (rev 598)
+++ vendor/fuse-emulator/current/fuse/compat/wii/Makefile.am 2009-06-27 12:46:44 UTC (rev 599)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2007-2008 Philip Kendall
-## $Id: Makefile.am 3687 2008-06-23 11:55:23Z pak21 $
+## $Id: Makefile.am 4040 2009-06-27 09:32:42Z 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
@@ -27,8 +27,10 @@
noinst_LIBRARIES = libcompatos.a
-libcompatos_a_SOURCES = file.c \
+libcompatos_a_SOURCES = dir.c \
+ ../unix/file.c \
osname.c \
- paths.c
+ paths.c \
+ timer.c
INCLUDES = @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@
Added: vendor/fuse-emulator/current/fuse/compat/wii/dir.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/wii/dir.c (rev 0)
+++ vendor/fuse-emulator/current/fuse/compat/wii/dir.c 2009-06-27 12:46:44 UTC (rev 599)
@@ -0,0 +1,50 @@
+/* dir.c: Directory-related compatibility routines
+ Copyright (c) 2009 Philip Kendall
+
+ $Id: dir.c 3945 2009-01-10 18:44:42Z 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:
+
+ E-mail: phi...@sh...
+
+*/
+
+#include <config.h>
+
+#include "compat.h"
+
+compat_dir
+compat_opendir( const char *path )
+{
+ return diropen( path );
+}
+
+compat_dir_result_t
+compat_readdir( compat_dir directory, char *path, size_t length )
+{
+ struct stat fstat;
+
+ int done = dirnext( directory, path, &fstat );
+
+ return done ? COMPAT_DIR_RESULT_END : COMPAT_DIR_RESULT_OK;
+}
+
+int
+compat_closedir( compat_dir directory )
+{
+ return dirclose( directory );
+}
Deleted: vendor/fuse-emulator/current/fuse/compat/wii/file.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/wii/file.c 2009-06-27 12:33:22 UTC (rev 598)
+++ vendor/fuse-emulator/current/fuse/compat/wii/file.c 2009-06-27 12:46:44 UTC (rev 599)
@@ -1,90 +0,0 @@
-/* file.c: File-related compatibility routines
- Copyright (c) 2008 Philip Kendall
-
- $Id: file.c 3688 2008-06-23 18:17:56Z pak21 $
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- 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:
-
- E-mail: phi...@sh...
-
-*/
-
-#include <config.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-#include "compat.h"
-#include "ui/ui.h"
-
-const compat_fd COMPAT_FILE_OPEN_FAILED = NULL;
-
-compat_fd
-compat_file_open( const char *path, int write )
-{
- return fopen( path, write ? "w" : "r" );
-}
-
-off_t
-compat_file_get_length( compat_fd fd )
-{
- struct stat file_info;
-
- if( fstat( fileno( fd ), &file_info ) ) {
- ui_error( UI_ERROR_ERROR, "couldn't stat file: %s", strerror( errno ) );
- return -1;
- }
-
- return file_info.st_size;
-}
-
-int
-compat_file_read( compat_fd fd, utils_file *file )
-{
- size_t bytes = fread( file->buffer, 1, file->length, fd );
- if( bytes != file->length ) {
- ui_error( UI_ERROR_ERROR,
- "error reading file: expected %d bytes, but read only %d",
- file->length, bytes );
- return 1;
- }
-
- return 0;
-}
-
-int
-compat_file_write( compat_fd fd, const unsigned char *buffer, size_t length )
-{
- size_t bytes = fwrite( buffer, 1, length, fd );
- if( bytes != length ) {
- ui_error( UI_ERROR_ERROR,
- "error writing file: expected %d bytes, but wrote only %d",
- length, bytes );
- return 1;
- }
-
- return 0;
-}
-
-int
-compat_file_close( compat_fd fd )
-{
- return fclose( fd );
-}
Added: vendor/fuse-emulator/current/fuse/compat/wii/osname.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/wii/osname.c (rev 0)
+++ vendor/fuse-emulator/current/fuse/compat/wii/osname.c 2009-06-27 12:46:44 UTC (rev 599)
@@ -0,0 +1,39 @@
+/* osname.c: Get a representation of the OS we're running on
+ Copyright (c) 1999-2009 Philip Kendall, Bjoern Giesler
+
+ $Id: osname.c 3945 2009-01-10 18:44:42Z 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:
+
+ E-mail: phi...@sh...
+
+*/
+
+#include <config.h>
+
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "ui/ui.h"
+
+int
+compat_osname( char *buffer, size_t length )
+{
+ snprintf(buffer, length, "Wii");
+ return 0;
+}
Added: vendor/fuse-emulator/current/fuse/compat/wii/paths.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/wii/paths.c (rev 0)
+++ vendor/fuse-emulator/current/fuse/compat/wii/paths.c 2009-06-27 12:46:44 UTC (rev 599)
@@ -0,0 +1,54 @@
+/* paths.c: Path-related compatibility routines
+ Copyright (c) 1999-2009 Philip Kendall, Bjoern Giesler
+
+ $Id: paths.c 3970 2009-01-19 03:47:02Z specu $
+
+ 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:
+
+ E-mail: phi...@sh...
+
+*/
+
+#include <config.h>
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "compat.h"
+
+const char*
+compat_get_temp_path( void )
+{
+ return "/tmp";
+}
+
+const char*
+compat_get_home_path( void )
+{
+ return "sd:/apps/fuse";
+}
+
+int
+compat_is_absolute_path( const char *path )
+{
+ if(strlen(path) >= 1 && path[0] == '/')
+ return 1;
+ if(strlen(path) >= strlen("fat:/") &&
+ strncmp(path, "fat:/", strlen("fat:/")) == 0)
+ return 1;
+ return 0;
+}
Added: vendor/fuse-emulator/current/fuse/compat/wii/timer.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/wii/timer.c (rev 0)
+++ vendor/fuse-emulator/current/fuse/compat/wii/timer.c 2009-06-27 12:46:44 UTC (rev 599)
@@ -0,0 +1,57 @@
+/* unix.c: UNIX speed routines for Fuse
+ Copyright (c) 1999-2007 Philip Kendall, Marek Januszewski, Fredrick Meunier
+
+ $Id: timer.c 3944 2009-01-10 18:17:04Z 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
+ 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:
+
+ E-mail: phi...@sh...
+
+*/
+
+#include <config.h>
+
+#include <errno.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "compat.h"
+#include "ui/ui.h"
+
+/* FIXME: where should we get this prototype from? */
+extern int clock_gettime(struct timespec *tp);
+
+double
+compat_timer_get_time( void )
+{
+ int error;
+ struct timespec tp;
+
+ error = clock_gettime(&tp);
+ if( error ) {
+ ui_error( UI_ERROR_ERROR, "%s: error getting time: %s", __func__, strerror( errno ) );
+ return -1;
+ }
+
+ return tp.tv_sec + tp.tv_nsec / 1000000000.0;
+}
+
+void
+compat_timer_sleep( int ms )
+{
+ usleep( ms * 1000 );
+}
Modified: vendor/fuse-emulator/current/fuse/compat/win32/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/win32/Makefile.am 2009-06-27 12:33:22 UTC (rev 598)
+++ vendor/fuse-emulator/current/fuse/compat/win32/Makefile.am 2009-06-27 12:46:44 UTC (rev 599)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2007-2008 Philip Kendall
-## $Id: Makefile.am 3687 2008-06-23 11:55:23Z pak21 $
+## $Id: Makefile.am 3935 2009-01-07 12:55:13Z pak21 $
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -27,8 +27,10 @@
noinst_LIBRARIES = libcompatos.a
-libcompatos_a_SOURCES = ../unix/file.c \
+libcompatos_a_SOURCES = ../unix/dir.c \
+ ../unix/file.c \
osname.c \
- paths.c
+ paths.c \
+ timer.c
INCLUDES = @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@
Modified: vendor/fuse-emulator/current/fuse/compat/win32/osname.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/win32/osname.c 2009-06-27 12:33:22 UTC (rev 598)
+++ vendor/fuse-emulator/current/fuse/compat/win32/osname.c 2009-06-27 12:46:44 UTC (rev 599)
@@ -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 3315 2007-11-20 03:01:59Z zubzero $
+ $Id: osname.c 3922 2008-12-31 19:01:31Z 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
Modified: vendor/fuse-emulator/current/fuse/compat/win32/paths.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/win32/paths.c 2009-06-27 12:33:22 UTC (rev 598)
+++ vendor/fuse-emulator/current/fuse/compat/win32/paths.c 2009-06-27 12:46:44 UTC (rev 599)
@@ -1,7 +1,7 @@
/* paths.c: Path-related compatibility routines
Copyright (c) 1999-2007 Philip Kendall
- $Id: paths.c 3253 2007-10-26 02:02:17Z zubzero $
+ $Id: paths.c 3922 2008-12-31 19:01:31Z 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
Modified: vendor/fuse-emulator/current/fuse/compat/win32/timer.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/win32/timer.c 2009-06-27 12:33:22 UTC (rev 598)
+++ vendor/fuse-emulator/current/fuse/compat/win32/timer.c 2009-06-27 12:46:44 UTC (rev 599)
@@ -1,7 +1,7 @@
-/* win32.c: Win32 speed routines for Fuse
- Copyright (c) 1999-2007 Philip Kendall, Marek Januszewski, Fredrick Meunier
+/* timer.c: Win32 speed routines for Fuse
+ Copyright (c) 1999-2008 Philip Kendall, Marek Januszewski, Fredrick Meunier
- $Id: win32.c 3087 2007-07-31 19:08:50Z zubzero $
+ $Id: timer.c 3951 2009-01-12 18:09:42Z specu $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -25,30 +25,18 @@
#include <config.h>
-#include "timer.h"
+#include <windows.h>
-int
-timer_get_real_time( timer_type *real_time )
-{
- *real_time = GetTickCount();
+#include "compat.h"
- return 0;
-}
-
-float
-timer_get_time_difference( timer_type *a, timer_type *b )
+double
+compat_timer_get_time( void )
{
- return ( (long)*a - (long)*b ) / 1000.0;
+ return GetTickCount() / 1000.0;
}
void
-timer_add_time_difference( timer_type *a, long msec )
+compat_timer_sleep( int ms )
{
- *a += msec;
-}
-
-void
-timer_sleep_ms( int ms )
-{
Sleep( ms );
}
Modified: vendor/fuse-emulator/current/fuse/compat.h
===================================================================
--- vendor/fuse-emulator/current/fuse/compat.h 2009-06-27 12:33:22 UTC (rev 598)
+++ vendor/fuse-emulator/current/fuse/compat.h 2009-06-27 12:46:44 UTC (rev 599)
@@ -1,7 +1,7 @@
/* compat.h: various compatibility bits
Copyright (c) 2003-2008 Philip Kendall
- $Id: compat.h 3687 2008-06-23 11:55:23Z pak21 $
+ $Id: compat.h 4040 2009-06-27 09:32:42Z 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
@@ -26,10 +26,11 @@
#ifndef FUSE_COMPAT_H
#define FUSE_COMPAT_H
+#include <stdio.h>
+#include <dirent.h>
#include <stdlib.h>
+#include <sys/types.h>
-#include <utils.h>
-
/* Remove the gcc-specific incantations if we're not using gcc */
#ifdef __GNUC__
@@ -54,7 +55,7 @@
#endif /* #ifndef HAVE_GETOPT_LONG */
#ifndef HAVE_MKSTEMP
-int mkstemp( char *template );
+int mkstemp( char *templ );
#endif /* #ifndef HAVE_MKSTEMP */
/* That which separates components in a path name */
@@ -66,24 +67,52 @@
#define FUSE_DIR_SEP_STR "/"
#endif
+#ifndef PATH_MAX
+#define PATH_MAX 1024
+#endif
+
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 );
+typedef FILE* compat_fd;
+
#ifndef UI_WII
-typedef int compat_fd;
+typedef DIR* compat_dir;
#else /* #ifndef UI_WII */
-typedef FILE* compat_fd;
+typedef DIR_ITER* compat_dir;
#endif /* #ifndef UI_WII */
extern const compat_fd COMPAT_FILE_OPEN_FAILED;
+/* File handling */
+
+struct utils_file;
+
compat_fd compat_file_open( const char *path, int write );
off_t compat_file_get_length( compat_fd fd );
-int compat_file_read( compat_fd fd, utils_file *file );
+int compat_file_read( compat_fd fd, struct utils_file *file );
int compat_file_write( compat_fd fd, const unsigned char *buffer,
size_t length );
int compat_file_close( compat_fd fd );
+/* Directory handling */
+
+typedef enum compat_dir_result_t {
+ COMPAT_DIR_RESULT_OK,
+ COMPAT_DIR_RESULT_END,
+ COMPAT_DIR_RESULT_ERROR,
+} compat_dir_result_t;
+
+compat_dir compat_opendir( const char *path );
+compat_dir_result_t compat_readdir( compat_dir directory, char *name,
+ size_t length );
+int compat_closedir( compat_dir directory );
+
+/* Timing routines */
+
+double compat_timer_get_time( void );
+void compat_timer_sleep( int ms );
+
#endif /* #ifndef FUSE_COMPAT_H */
Modified: vendor/fuse-emulator/current/fuse/configure.in
===================================================================
--- vendor/fuse-emulator/current/fuse/configure.in 2009-06-27 12:33:22 UTC (rev 598)
+++ vendor/fuse-emulator/current/fuse/configure.in 2009-06-27 12:46:44 UTC (rev 599)
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-dnl $Id: configure.in 3796 2008-10-28 20:44:45Z specu $
+dnl $Id: configure.in 4028 2009-05-31 13:15:52Z fredm $
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
@@ -24,10 +24,11 @@
AC_CANONICAL_SYSTEM
dnl Use automake to produce `Makefile.in'
-AM_INIT_AUTOMAKE(fuse, 0.9.0)
+AM_INIT_AUTOMAKE(fuse, 0.10.0.1)
dnl Checks for programs.
AC_PROG_CC
+AC_PROG_CXX
AC_PROG_RANLIB
AC_PATH_PROG(PERL, perl)
AC_SUBST(PERL)
@@ -92,7 +93,7 @@
AC_MSG_RESULT($win32)
if test "$win32" = yes; then
AC_CHECK_HEADER(windows.h,
- LIBS="$LIBS -mwindows -lcomctl32";
+ LIBS="$LIBS -mwindows -lcomctl32 -lwinmm";
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])
@@ -148,6 +149,38 @@
fi
fi
+dnl Look for Wii interface (default = 0)
+if test -z "$UI"; then
+ AC_MSG_CHECKING(whether Wii UI requested)
+ AC_ARG_WITH(wii,
+ [ --with-wii use Wii FB for user interface],
+ if test "$withval" = no; then wii=no; else wii=yes; fi,
+ wii=no)
+ AC_MSG_RESULT($wii)
+ if test "$wii" = yes; then
+ AC_DEFINE([UI_WII], 1, [Defined if Wii UI in use])
+ AC_DEFINE([USE_WIDGET], 1, [Defined if we're using a widget-based UI])
+ AC_DEFINE([USE_JOYSTICK], 1, [Defined if we're using hardware joysticks])
+ UI=wii; WIDGET=widget;
+ UI_LIBS="ui/wii/libuiwii.a ui/widget/libwidget.a"
+ target_os=wii
+ dnl Look for libgpm (default=yes)
+ AC_MSG_CHECKING(whether gpm requested)
+ AC_ARG_WITH(gpm,
+ [ --without-gpm don't use libgpm for e.g. Kempston mouse],
+ if test "$withval" = no; then gpm=no; else gpm=yes; fi,
+ gpm=yes)
+ AC_MSG_RESULT($gpm)
+ dnl Note: we use libdl to get libgpm at runtime
+ if test "$gpm" = yes; then
+ AC_CHECK_HEADER(gpm.h,
+ UI_LIBS="$UI_LIBS -ldl";
+ AC_DEFINE([HAVE_GPM_H], 1, [Defined if gpm in use]),
+ AC_MSG_ERROR([libgpm not found]))
+ fi
+ fi
+fi
+
dnl Look for SDL (default=no)
if test -z "$UI"; then
AC_MSG_CHECKING(whether SDL UI requested)
@@ -227,6 +260,7 @@
AC_SUBST(UI)
AC_SUBST(UI_LIBS)
AC_SUBST(WIDGET)
+AM_CONDITIONAL(WIDGET, test x$WIDGET != x)
# If we're not using GTK+, must either find glib or use the replacement...
[truncated message content] |
|
From: <fr...@us...> - 2009-08-01 14:02:06
|
Revision: 608
http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=608&view=rev
Author: fredm
Date: 2009-08-01 14:01:53 +0000 (Sat, 01 Aug 2009)
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/README
vendor/fuse-emulator/current/fuse/disk/Makefile.am
vendor/fuse-emulator/current/fuse/disk/beta.c
vendor/fuse-emulator/current/fuse/disk/disk.c
vendor/fuse-emulator/current/fuse/disk/fdd.c
vendor/fuse-emulator/current/fuse/disk/plusd.c
vendor/fuse-emulator/current/fuse/disk/wd_fdc.c
vendor/fuse-emulator/current/fuse/disk/wd_fdc.h
vendor/fuse-emulator/current/fuse/fuse.c
vendor/fuse-emulator/current/fuse/hacking/ChangeLog
vendor/fuse-emulator/current/fuse/ide/divide.c
vendor/fuse-emulator/current/fuse/ide/divide.h
vendor/fuse-emulator/current/fuse/ide/ide.c
vendor/fuse-emulator/current/fuse/ide/ide.h
vendor/fuse-emulator/current/fuse/ide/simpleide.c
vendor/fuse-emulator/current/fuse/ide/simpleide.h
vendor/fuse-emulator/current/fuse/ide/zxatasp.c
vendor/fuse-emulator/current/fuse/ide/zxatasp.h
vendor/fuse-emulator/current/fuse/ide/zxcf.c
vendor/fuse-emulator/current/fuse/ide/zxcf.h
vendor/fuse-emulator/current/fuse/machines/pentagon1024.c
vendor/fuse-emulator/current/fuse/machines/spec128.c
vendor/fuse-emulator/current/fuse/machines/spec16.c
vendor/fuse-emulator/current/fuse/machines/spec48.c
vendor/fuse-emulator/current/fuse/machines/spec_se.c
vendor/fuse-emulator/current/fuse/machines/specplus2.c
vendor/fuse-emulator/current/fuse/machines/tc2048.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/roms/Makefile.am
vendor/fuse-emulator/current/fuse/settings.dat
vendor/fuse-emulator/current/fuse/tape.c
vendor/fuse-emulator/current/fuse/ui/options.dat
vendor/fuse-emulator/current/fuse/ui/ui.h
vendor/fuse-emulator/current/fuse/ui.c
vendor/fuse-emulator/current/fuse/utils.c
vendor/fuse-emulator/current/fuse/z80/coretest.c
vendor/fuse-emulator/current/fuse/z80/z80_checks.h
vendor/fuse-emulator/current/fuse/z80/z80_ops.c
vendor/fuse-emulator/current/libspectrum/accessor.pl
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/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/z80.c
Added Paths:
-----------
vendor/fuse-emulator/current/fuse/disk/opus.c
vendor/fuse-emulator/current/fuse/disk/opus.h
vendor/fuse-emulator/current/fuse/roms/opus.rom
Modified: vendor/fuse-emulator/current/fuse/AUTHORS
===================================================================
--- vendor/fuse-emulator/current/fuse/AUTHORS 2009-08-01 00:40:53 UTC (rev 607)
+++ vendor/fuse-emulator/current/fuse/AUTHORS 2009-08-01 14:01:53 UTC (rev 608)
@@ -9,8 +9,8 @@
* Ian Collier: the original ZX Printer emulation (for xz80).
-* John Elliott: for lib765, which provides Fuse's emulation of the +3's
- FDC, and libdsk which provides support for more disk image formats:
+* John Elliott: for lib765, which provided Fuse's original emulation of the
+ +3's FDC, and libdsk which provided support for more disk image formats:
see http://www.seasip.demon.co.uk/Unix/LibDsk/
* Darren Salt: the original versions of the code for +3 emulation,
@@ -34,15 +34,20 @@
* Marek Januszewski: Some patches making Fuse much closer to compiling under
Win32, and fixing up the GTK+ 2.0 interface.
-* Stuart Brady: for the Scorpion emulation and HP-UX sound support.
+* Stuart Brady: for the Scorpion, +D interface emulation and HP-UX sound
+ support.
* Garry Lancaster: the simple 8-bit IDE, ZXATASP and ZXCF support.
-* Gergely Szasz: Interface I/microdrive emulation, the 'movie' code and the
- ao sound driver.
+* Gergely Szasz: +3, +D, Opus and Interface I/microdrive emulation, the 'movie'
+ code and the ao sound driver.
* Bjoern Giesler: the original Wii port.
+* Shay Green: the Blip_Buffer band pass filter for beeper and AY output.
+
+* Michael D Wynne: the Opus Discovery emulation (for EightyOne).
+
* Philip Kendall: everything else.
-$Id: AUTHORS 3944 2009-01-10 18:17:04Z pak21 $
+$Id: AUTHORS 4060 2009-07-30 13:21:38Z fredm $
Modified: vendor/fuse-emulator/current/fuse/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse/ChangeLog 2009-08-01 00:40:53 UTC (rev 607)
+++ vendor/fuse-emulator/current/fuse/ChangeLog 2009-08-01 14:01:53 UTC (rev 608)
@@ -1,3 +1,43 @@
+2009-xx-xx Philip Kendall <phi...@sh...>
+
+ * Fuse ?.??.? released
+
+ FIXME: Just a start, mostly changes visible on Fuse for OS X at the
+ moment
+ * Add Opus Discovery disk interface support (Gergely Szasz and Fredrick
+ Meunier).
+ * Wii support.
+ * Many improvements to Win32 UI (Marek Januszewski).
+ * Add support for flipping disk images in single sided drives (Gergely
+ Szasz).
+ * Add support for automatically merging both both disk images where
+ they are in separate files named with the text [Ss]ide[ _][abAB12]
+ (Gergely Szasz).
+ * Switch to using Blip_Buffer (by Shay Green) for improved beeper and
+ AY output (Fredrick Meunier).
+ * Allow beeper and AY volumes to be set (Fredrick Meunier).
+ * Enable Beta 128 interface in 48K and TC2048 machines (thanks,
+ Omikron) (Fredrick Meunier).
+ * Add emulation of the Fuller Audio Box (Stuart Brady and Fredrick
+ Meunier).
+ * Allow sound to run from 2% speed up (Fredrick Meunier).
+ * Add emulation of the Melodik and similar 48K-compatible AY interfaces
+ that use the 128K sound ports (Fredrick Meunier).
+ * Add support for Pentagon 1024SL v2.2 16 colour mode (Fredrick
+ Meunier).
+
+ * Miscellaneous improvements:
+ * Preformat new disks on +3 to allow the format command on +3 to work
+ (Gergely Szasz).
+ * Support non-standard TRD images with 41-83 tracks per side (Gergely
+ Szasz).
+ * Allow user to swap Kempston mouse buttons as some combinations of
+ physical hardware and Spectrum software make it hard to use the
+ standard mapping e.g. right clicking and moving the cursor on Mac
+ notebooks (thanks, Andrew Owen) (Fredrick Meunier).
+ * Fixes for speed estimation (Gergely Szasz).
+ * Fix border colour in Timex HiRes screenshots (Fredrick Meunier).
+
2008-12-10 Philip Kendall <phi...@sh...>
* Fuse 0.10.0.1 released
@@ -941,4 +981,4 @@
* Version 0.1.0 released.
-$Id: ChangeLog 3900 2008-12-10 19:31:31Z pak21 $
+$Id: ChangeLog 4060 2009-07-30 13:21:38Z fredm $
Modified: vendor/fuse-emulator/current/fuse/README
===================================================================
--- vendor/fuse-emulator/current/fuse/README 2009-08-01 00:40:53 UTC (rev 607)
+++ vendor/fuse-emulator/current/fuse/README 2009-08-01 14:01:53 UTC (rev 608)
@@ -25,7 +25,7 @@
* Support for the RZX input recording file format, including
rollback and 'competition mode'.
* Emulation of the DivIDE, Interface I, Kempston mouse, Spectrum +3e,
- ZXATASP, ZXCF, Beta 128 and +D interfaces.
+ ZXATASP, ZXCF, Beta 128, Opus Discovery and +D interfaces.
Help! <xyz> doesn't work
------------------------
@@ -180,4 +180,4 @@
Philip Kendall <phi...@sh...>
10 December 2008
-$Id: README 4021 2009-05-29 13:39:51Z fredm $
+$Id: README 4060 2009-07-30 13:21:38Z fredm $
Modified: vendor/fuse-emulator/current/fuse/disk/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/disk/Makefile.am 2009-08-01 00:40:53 UTC (rev 607)
+++ vendor/fuse-emulator/current/fuse/disk/Makefile.am 2009-08-01 14:01:53 UTC (rev 608)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2007 Stuart Brady
-## $Id: Makefile.am 3584 2008-03-25 10:27:30Z fredm $
+## $Id: Makefile.am 4060 2009-07-30 13:21:38Z 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
@@ -33,6 +33,7 @@
crc.c \
disk.c \
fdd.c \
+ opus.c \
plusd.c \
upd_fdc.c \
wd_fdc.c
@@ -41,6 +42,7 @@
crc.h \
disk.h \
fdd.h \
+ opus.h \
plusd.h \
upd_fdc.h \
wd_fdc.h
Modified: vendor/fuse-emulator/current/fuse/disk/beta.c
===================================================================
--- vendor/fuse-emulator/current/fuse/disk/beta.c 2009-08-01 00:40:53 UTC (rev 607)
+++ vendor/fuse-emulator/current/fuse/disk/beta.c 2009-08-01 14:01:53 UTC (rev 608)
@@ -1,7 +1,7 @@
/* beta.c: Routines for handling the Beta disk interface
Copyright (c) 2004-2008 Stuart Brady
- $Id: beta.c 4029 2009-06-05 13:50:55Z fredm $
+ $Id: beta.c 4060 2009-07-30 13:21:38Z 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
@@ -708,6 +708,11 @@
1 ) )
return;
+ /* ignore drive count for now, there will be an issue with loading snaps where
+ drives have been disabled
+ libspectrum_snap_beta_drive_count( snap )
+ */
+
beta_fdc->direction = libspectrum_snap_beta_direction( snap );
beta_cr_write ( 0x001f, 0 );
@@ -723,6 +728,7 @@
int attached;
wd_fdc *f = beta_fdc;
libspectrum_byte *buffer;
+ int drive_count = 0;
if( !periph_beta128_active ) return;
@@ -745,6 +751,12 @@
libspectrum_snap_set_beta_custom_rom( snap, 1 );
}
+ drive_count++; /* Drive A is not removable */
+ if( option_enumerate_diskoptions_drive_beta128b_type() > 0 ) drive_count++;
+ if( option_enumerate_diskoptions_drive_beta128c_type() > 0 ) drive_count++;
+ if( option_enumerate_diskoptions_drive_beta128d_type() > 0 ) drive_count++;
+ libspectrum_snap_set_beta_drive_count( snap, drive_count );
+
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 ) );
Modified: vendor/fuse-emulator/current/fuse/disk/disk.c
===================================================================
--- vendor/fuse-emulator/current/fuse/disk/disk.c 2009-08-01 00:40:53 UTC (rev 607)
+++ vendor/fuse-emulator/current/fuse/disk/disk.c 2009-08-01 14:01:53 UTC (rev 608)
@@ -1,7 +1,7 @@
/* disk.c: Routines for handling disk images
Copyright (c) 2007 Gergely Szasz
- $Id: disk.c 4037 2009-06-13 13:28:42Z fredm $
+ $Id: disk.c 4061 2009-07-30 23:37:29Z 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
@@ -252,6 +252,7 @@
#define DISK_MFM_VARI 16
#define DISK_DDAM 32
#define DISK_CORRUPT_SECTOR 64
+#define DISK_UNFORMATTED_TRACK 128
static int
guess_track_geom( disk_t *d, int head, int track, int *sector_base,
@@ -295,7 +296,7 @@
static int
check_disk_geom( disk_t *d, int *sector_base, int *sectors,
- int *seclen, int *mfm )
+ int *seclen, int *mfm, int *unf )
{
int h, t, s, slen, sbase, m;
int r = 0;
@@ -306,6 +307,7 @@
*sectors = -1;
*seclen = -1;
*mfm = -1;
+ *unf = -1;
for( t = 0; t < d->cylinders; t++ ) {
for( h = 0; h < d->sides; h++ ) {
r |= guess_track_geom( d, h, t, &sbase, &s, &slen, &m );
@@ -317,6 +319,12 @@
*seclen = slen;
if( *mfm == -1 )
*mfm = m;
+ if( sbase == -1 ) { /* unformatted */
+ if( *unf == -1 && h > 0 ) *unf = -2;
+ if( *unf == -1 ) *unf = t;
+ continue;
+ }
+ if( *unf > -1 ) *unf = -2;
if( sbase != *sector_base ) {
r |= DISK_SBASE_VARI;
if( sbase < *sector_base )
@@ -338,6 +346,11 @@
}
}
}
+ if( *unf == -2 ) {
+ r |= DISK_UNFORMATTED_TRACK;
+ *unf = -1;
+ }
+
return r;
}
@@ -569,6 +582,7 @@
#define NO_INTERLEAVE 1
#define INTERLEAVE_2 2
+#define INTERLEAVE_OPUS 13
#define NO_PREINDEX 0
#define PREINDEX 1
@@ -593,15 +607,18 @@
idx = d->i;
pos = i = 0;
for( s = sector_base; s < sector_base + sectors; s++ ) {
- d->i = idx + ( pos + i ) * slen;
+ d->i = idx + pos * slen;
if( id_add( d, head, track, s, sector_length >> 8, gap, CRC_OK ) )
return 1;
if( data_add( d, buffer, NULL, sector_length, NO_DDAM, gap, CRC_OK, autofill ) )
return 1;
pos += interleave;
- if( pos >= sectors ) {
- pos = 0;
- i++;
+ if( pos >= sectors ) { /* wrap around */
+ pos -= sectors;
+ if( pos <= i ) { /* we fill this pos already */
+ pos++; /* skip one more pos */
+ i++;
+ }
}
}
d->i = idx + sectors * slen;
@@ -783,14 +800,16 @@
}
static int
-open_mgt_img( buffer_t *buffer, disk_t *d )
+open_img_mgt_opd( buffer_t *buffer, disk_t *d )
{
int i, j, sectors, seclen;
buffer->index = 0;
/* guess geometry of disk:
- * 2*80*10*512, 1*80*10*512 or 1*40*10*512 */
+ * 2*80*10*512, 1*80*10*512, 1*40*10*512, 1*40*18*256, 1*80*18*256,
+ * 2*80*18*256
+ */
if( buffer->file.length == 2*80*10*512 ) {
d->sides = 2; d->cylinders = 80; sectors = 10; seclen = 512;
} else if( buffer->file.length == 1*80*10*512 ) {
@@ -799,6 +818,14 @@
d->sides = 1; d->cylinders = 80; sectors = 10; seclen = 512;
} else if( buffer->file.length == 1*40*10*512 ) {
d->sides = 1; d->cylinders = 40; sectors = 10; seclen = 512;
+ } else if( buffer->file.length == 1*40*18*256 ) {
+ d->sides = 1; d->cylinders = 40; sectors = 18; seclen = 256;
+ } else if( buffer->file.length == 1*80*18*256 ) {
+ /* we cannot distinguish between a single sided 80 track image
+ * and a double sided 40 track image (2*40*18*256) */
+ d->sides = 1; d->cylinders = 80; sectors = 18; seclen = 256;
+ } else if( buffer->file.length == 2*80*18*256 ) {
+ d->sides = 2; d->cylinders = 80; sectors = 18; seclen = 256;
} else {
return d->status = DISK_GEOM;
}
@@ -816,11 +843,14 @@
return d->status = DISK_GEOM;
}
}
- } else { /* MGT alt */
- for( i = 0; i < d->sides * d->cylinders; i++ ) {
- if( trackgen( d, buffer, i % 2, i / 2, 1, sectors, seclen,
- NO_PREINDEX, GAP_MGT_PLUSD, NO_INTERLEAVE, NO_AUTOFILL ) )
- return d->status = DISK_GEOM;
+ } else { /* MGT / OPD alt */
+ for( i = 0; i < d->cylinders; i++ ) {
+ for( j = 0; j < d->sides; j++ ) {
+ if( trackgen( d, buffer, j, i, d->type == DISK_MGT ? 1 : 0, sectors, seclen,
+ NO_PREINDEX, GAP_MGT_PLUSD,
+ d->type == DISK_MGT ? NO_INTERLEAVE : INTERLEAVE_OPUS, NO_AUTOFILL ) )
+ return d->status = DISK_GEOM;
+ }
}
}
@@ -1072,7 +1102,7 @@
plus3_fix = CPC_ISSUE_NONE;
}
trlen += seclen;
- if( seclen == 0x80 ) /* every 128byte length sector padded */
+ if( seclen % 0x100 ) /* every? 128/384/...byte length sector padded */
sector_pad++;
}
if( i < 84 ) {
@@ -1106,6 +1136,7 @@
preindex_add( d, gap );
postindex_add( d, gap );
+ sector_pad = 0;
for( j = 0; j < hdrb[0x15]; j++ ) { /* each sector */
seclen = d->type == DISK_ECPC ? hdrb[ 0x1e + 8 * j ] + /* data length in sector */
256 * hdrb[ 0x1f + 8 * j ]
@@ -1169,10 +1200,11 @@
/* ( ( N * len ) / len - 1 ) * len */
}
}
- if( seclen == 0x80 ) /* every 128byte length sector padded */
- buffer->index += 0x80;
+ if( seclen % 0x100 ) /* every? 128/384/...byte length sector padded */
+ sector_pad++;
}
gap4_add( d, gap );
+ buffer->index += sector_pad * 0x80;
}
return d->status = DISK_OK;
}
@@ -1504,11 +1536,13 @@
d->type = DISK_UDI;
open_udi( &buffer, d );
break;
+ case LIBSPECTRUM_ID_DISK_OPD:
+ d->type = DISK_OPD;
case LIBSPECTRUM_ID_DISK_MGT:
- d->type = DISK_MGT;
+ if( d->type == DISK_TYPE_NONE) d->type = DISK_MGT;
case LIBSPECTRUM_ID_DISK_IMG:
if( d->type == DISK_TYPE_NONE) d->type = DISK_IMG;
- open_mgt_img( &buffer, d );
+ open_img_mgt_opd( &buffer, d );
break;
case LIBSPECTRUM_ID_DISK_SAD:
d->type = DISK_SAD;
@@ -1733,25 +1767,31 @@
}
static int
-write_img_mgt( FILE *file, disk_t *d )
+write_img_mgt_opd( FILE *file, disk_t *d )
{
- int i, j, sbase, sectors, seclen, mfm;
+ int i, j, sbase, sectors, seclen, mfm, cyl;
- if( check_disk_geom( d, &sbase, §ors, &seclen, &mfm ) ||
- sbase != 1 || seclen != 2 || sectors != 10 )
+ if( check_disk_geom( d, &sbase, §ors, &seclen, &mfm, &cyl ) ||
+ ( d->type != DISK_OPD && ( sbase != 1 || seclen != 2 || sectors != 10 ) ) ||
+ ( d->type == DISK_OPD && ( sbase != 0 || seclen != 1 || sectors != 18 ) ) )
return d->status = DISK_GEOM;
+ if( cyl == -1 ) cyl = d->cylinders;
+ if( cyl != 40 && cyl != 80 )
+ return d->status = DISK_GEOM;
+
if( d->type == DISK_IMG ) { /* out-out */
for( j = 0; j < d->sides; j++ ) {
- for( i = 0; i < d->cylinders; i++ ) {
+ for( i = 0; i < cyl; i++ ) {
if( savetrack( d, file, j, i, 1, sectors, seclen ) )
return d->status = DISK_GEOM;
}
}
} else { /* alt */
- for( i = 0; i < d->cylinders; i++ ) { /* MGT */
+ for( i = 0; i < cyl; i++ ) { /* MGT */
for( j = 0; j < d->sides; j++ ) {
- if( savetrack( d, file, j, i, 1, sectors, seclen ) )
+ if( savetrack( d, file, j, i, d->type == DISK_MGT ? 1 : 0,
+ sectors, seclen ) )
return d->status = DISK_GEOM;
}
}
@@ -1762,12 +1802,14 @@
static int
write_trd( FILE *file, disk_t *d )
{
- int i, j, sbase, sectors, seclen, mfm;
+ int i, j, sbase, sectors, seclen, mfm, cyl;
- if( check_disk_geom( d, &sbase, §ors, &seclen, &mfm ) ||
+ if( check_disk_geom( d, &sbase, §ors, &seclen, &mfm, &cyl ) ||
sbase != 1 || seclen != 1 || sectors != 16 )
return d->status = DISK_GEOM;
- for( i = 0; i < d->cylinders; i++ ) {
+
+ if( cyl == -1 ) cyl = d->cylinders;
+ for( i = 0; i < cyl; i++ ) {
for( j = 0; j < d->sides; j++ ) {
if( savetrack( d, file, j, i, 1, sectors, seclen ) )
return d->status = DISK_GEOM;
@@ -1779,21 +1821,22 @@
static int
write_sad( FILE *file, disk_t *d )
{
- int i, j, sbase, sectors, seclen, mfm;
+ int i, j, sbase, sectors, seclen, mfm, cyl;
- if( check_disk_geom( d, &sbase, §ors, &seclen, &mfm ) || sbase != 1 )
+ if( check_disk_geom( d, &sbase, §ors, &seclen, &mfm, &cyl ) || sbase != 1 )
return d->status = DISK_GEOM;
+ if( cyl == -1 ) cyl = d->cylinders;
memcpy( head, "Aley's disk backup", 18 );
head[18] = d->sides;
- head[19] = d->cylinders;
+ head[19] = cyl;
head[20] = sectors;
head[21] = seclen * 4;
if( fwrite( head, 22, 1, file ) != 1 ) /* SAD head */
return d->status = DISK_WRPART;
for( j = 0; j < d->sides; j++ ) { /* OUT-OUT */
- for( i = 0; i < d->cylinders; i++ ) {
+ for( i = 0; i < cyl; i++ ) {
if( savetrack( d, file, j, i, 1, sectors, seclen ) )
return d->status = DISK_GEOM;
}
@@ -1894,19 +1937,21 @@
static int
write_cpc( FILE *file, disk_t *d )
{
- int i, j, k, sbase, sectors, seclen, mfm;
+ int i, j, k, sbase, sectors, seclen, mfm, cyl;
int h, t, s, b;
size_t len;
- i = check_disk_geom( d, &sbase, §ors, &seclen, &mfm );
+ i = check_disk_geom( d, &sbase, §ors, &seclen, &mfm, &cyl );
if( i & DISK_SECLEN_VARI || i & DISK_SPT_VARI )
return d->status = DISK_GEOM;
if( i & DISK_MFM_VARI )
mfm = -1;
+ if( cyl == -1 ) cyl = d->cylinders;
+
memset( head, 0, 256 );
memcpy( head, "MV - CPCEMU Disk-File\r\nDisk-Info\r\n", 34 );
- head[0x30] = d->cylinders;
+ head[0x30] = cyl;
head[0x31] = d->sides;
len = sectors * ( 0x80 << seclen ) + 256;
head[0x32] = len & 0xff;
@@ -1916,7 +1961,7 @@
memset( head, 0, 256 );
memcpy( head, "Track-Info\r\n", 12 );
- for( i = 0; i < d->cylinders; i++ ) {
+ for( i = 0; i < cyl; i++ ) {
for( j = 0; j < d->sides; j++ ) {
d->track = d->data + ( ( d->sides * i + j ) * d->tlen );
d->clocks = d->track + d->bpt;
@@ -1952,11 +1997,11 @@
static int
write_scl( FILE *file, disk_t *d )
{
- int i, j, k, l, t, s, sbase, sectors, seclen, mfm, del;
+ int i, j, k, l, t, s, sbase, sectors, seclen, mfm, del, cyl;
int entries;
libspectrum_dword sum = 597; /* sum of "SINCLAIR" */
- if( check_disk_geom( d, &sbase, §ors, &seclen, &mfm ) ||
+ if( check_disk_geom( d, &sbase, §ors, &seclen, &mfm, &cyl ) ||
sbase != 1 || seclen != 1 || sectors != 16 )
return d->status = DISK_GEOM;
@@ -2071,7 +2116,9 @@
{
int i, j, k, del, rev;
int h, t, s, b;
+ char str[17];
+ str[16] = '\0';
fprintf( file, "DISK tracks log!\n" );
fprintf( file, "Sides: %d, cylinders: %d\n", d->sides, d->cylinders );
for( j = 0; j < d->cylinders; j++ ) { /* ALT :) */
@@ -2110,9 +2157,11 @@
if( !( k % 16 ) )
fprintf( file, "0x%08x:", k );
fprintf( file, " 0x%02x", d->track[ d->i ] );
+ str[ k & 0x0f ] = d->track[ d->i ] >= 32 &&
+ d->track[ d->i ] < 127 ? d->track[ d->i ] : '.';
k++;
if( !( k % 16 ) )
- fprintf( file, "\n" );
+ fprintf( file, " | %s\n", str );
d->i++;
if( d->i >= d->bpt ) {
d->i = 0;
@@ -2170,6 +2219,8 @@
d->type = DISK_CPC; /* ALT side */
else if( !strcasecmp( ext, ".mgt" ) )
d->type = DISK_MGT; /* ALT side */
+ else if( !strcasecmp( ext, ".opd" ) || !strcasecmp( ext, ".opu" ) )
+ d->type = DISK_OPD; /* ALT side */
else if( !strcasecmp( ext, ".img" ) ) /* out-out */
d->type = DISK_IMG;
else if( !strcasecmp( ext, ".trd" ) ) /* ALT */
@@ -2192,7 +2243,8 @@
break;
case DISK_IMG:
case DISK_MGT:
- write_img_mgt( file, d );
+ case DISK_OPD:
+ write_img_mgt_opd( file, d );
break;
case DISK_TRD:
write_trd( file, d );
Modified: vendor/fuse-emulator/current/fuse/disk/fdd.c
===================================================================
--- vendor/fuse-emulator/current/fuse/disk/fdd.c 2009-08-01 00:40:53 UTC (rev 607)
+++ vendor/fuse-emulator/current/fuse/disk/fdd.c 2009-08-01 14:01:53 UTC (rev 608)
@@ -1,7 +1,7 @@
/* fdd.c: Routines for emulating floppy disk drives
Copyright (c) 2007 Gergely Szasz
- $Id: fdd.c 4012 2009-04-16 12:42:14Z fredm $
+ $Id: fdd.c 4045 2009-07-10 13:11:12Z 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
@@ -131,6 +131,7 @@
fdd_init( fdd_t *d, fdd_type_t type, int heads, int cyls, int reinit )
{
int upsidedown = d->upsidedown;
+ int selected = d->selected;
disk_t *disk = d->disk;
d->fdd_heads = d->fdd_cylinders = d->c_head = d->c_cylinder = 0;
@@ -148,6 +149,7 @@
d->auto_geom = 1;
d->fdd_heads = heads;
d->fdd_cylinders = cyls;
+ if( reinit ) d->selected = selected;
if( reinit && disk ) {
fdd_unload( d );
fdd_load( d, disk, upsidedown );
Added: vendor/fuse-emulator/current/fuse/disk/opus.c
===================================================================
--- vendor/fuse-emulator/current/fuse/disk/opus.c (rev 0)
+++ vendor/fuse-emulator/current/fuse/disk/opus.c 2009-08-01 14:01:53 UTC (rev 608)
@@ -0,0 +1,725 @@
+/* opus.c: Routines for handling the Opus Discovery interface
+ Copyright (c) 1999-2009 Stuart Brady, Fredrick Meunier, Philip Kendall,
+ Dmitry Sanarin, Darren Salt, Michael D Wynne, Gergely Szasz
+
+ $Id: opus.c 4012 2009-04-16 12:42: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
+ 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...
+
+*/
+
+#include <config.h>
+
+#include <libspectrum.h>
+
+#include <string.h>
+
+#include "compat.h"
+#include "machine.h"
+#include "module.h"
+#include "opus.h"
+#include "printer.h"
+#include "settings.h"
+#include "ui/ui.h"
+#include "wd_fdc.h"
+#include "options.h" /* needed for get combo options */
+#include "z80/z80.h"
+
+#define DISK_TRY_MERGE(heads) ( option_enumerate_diskoptions_disk_try_merge() == 2 || \
+ ( option_enumerate_diskoptions_disk_try_merge() == 1 && heads == 1 ) )
+
+int opus_available = 0;
+int opus_active = 0;
+
+static int opus_index_pulse;
+
+static int index_event;
+
+#define OPUS_NUM_DRIVES 2
+
+static wd_fdc *opus_fdc;
+static wd_fdc_drive opus_drives[ OPUS_NUM_DRIVES ];
+
+static libspectrum_byte opus_ram[ 0x800 ];
+
+/* 6821 PIA internal registers */
+static libspectrum_byte data_reg_a, data_dir_a, control_a;
+static libspectrum_byte data_reg_b, data_dir_b, control_b;
+
+static void opus_reset( int hard_reset );
+static void opus_memory_map( void );
+static void opus_enabled_snapshot( libspectrum_snap *snap );
+static void opus_from_snapshot( libspectrum_snap *snap );
+static void opus_to_snapshot( libspectrum_snap *snap );
+static void opus_event_index( libspectrum_dword last_tstates, int type,
+ void *user_data );
+
+static module_info_t opus_module_info = {
+
+ opus_reset,
+ opus_memory_map,
+ opus_enabled_snapshot,
+ opus_from_snapshot,
+ opus_to_snapshot,
+
+};
+
+void
+opus_page( void )
+{
+ opus_active = 1;
+ machine_current->ram.romcs = 1;
+ machine_current->memory_map();
+}
+
+void
+opus_unpage( void )
+{
+ opus_active = 0;
+ machine_current->ram.romcs = 0;
+ machine_current->memory_map();
+}
+
+static void
+opus_memory_map( void )
+{
+ if( !opus_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
+opus_set_datarq( struct wd_fdc *f )
+{
+ event_add( 0, z80_nmi_event );
+}
+
+int
+opus_init( void )
+{
+ int i;
+ wd_fdc_drive *d;
+
+ opus_fdc = wd_fdc_alloc_fdc( WD1770, 0, WD_FLAG_OPUS );
+
+ for( i = 0; i < OPUS_NUM_DRIVES; i++ ) {
+ d = &opus_drives[ i ];
+ fdd_init( &d->fdd, FDD_SHUGART, 0, 0, 0 ); /* drive geometry 'autodetect' */
+ d->disk.flag = DISK_FLAG_NONE;
+ }
+
+ opus_fdc->current_drive = &opus_drives[ 0 ];
+ fdd_select( &opus_drives[ 0 ].fdd, 1 );
+ opus_fdc->dden = 1;
+ opus_fdc->set_intrq = NULL;
+ opus_fdc->reset_intrq = NULL;
+ opus_fdc->set_datarq = opus_set_datarq;
+ opus_fdc->reset_datarq = NULL;
+ opus_fdc->iface = NULL;
+
+ index_event = event_register( opus_event_index, "Opus index" );
+
+ module_register( &opus_module_info );
+
+ return 0;
+}
+
+static void
+opus_reset( int hard_reset )
+{
+ int i;
+ wd_fdc_drive *d;
+ const fdd_params_t *dt;
+
+ opus_active = 0;
+ opus_available = 0;
+
+ event_remove_type( index_event );
+
+ if( !periph_opus_active )
+ return;
+
+ machine_load_rom_bank( memory_map_romcs, 0, 0,
+ settings_current.rom_opus,
+ settings_default.rom_opus, 0x2000 );
+
+ memory_map_romcs[0].source = MEMORY_SOURCE_PERIPHERAL;
+
+ memory_map_romcs[1].page = opus_ram;
+ memory_map_romcs[1].source = MEMORY_SOURCE_PERIPHERAL;
+
+ machine_current->ram.romcs = 0;
+
+ memory_map_romcs[ 0 ].writable = 0;
+ memory_map_romcs[ 1 ].writable = 1;
+
+ data_reg_a = 0;
+ data_dir_a = 0;
+ control_a = 0;
+ data_reg_b = 0;
+ data_dir_b = 0;
+ control_b = 0;
+
+ opus_available = 1;
+ opus_index_pulse = 0;
+
+ if( hard_reset )
+ memset( opus_ram, 0, 0x800 );
+
+ wd_fdc_master_reset( opus_fdc );
+
+ for( i = 0; i < OPUS_NUM_DRIVES; i++ ) {
+ d = &opus_drives[ i ];
+
+ d->index_pulse = 0;
+ d->index_interrupt = 0;
+ }
+
+ /* We can eject disks only if they are currently present */
+ dt = &fdd_params[ option_enumerate_diskoptions_drive_opus1_type() + 1 ]; /* +1 => there is no `Disabled' */
+ fdd_init( &opus_drives[ OPUS_DRIVE_1 ].fdd, FDD_SHUGART,
+ dt->heads, dt->cylinders, 1 );
+ ui_menu_activate( UI_MENU_ITEM_MEDIA_DISK_OPUS_1, dt->enabled );
+ ui_menu_activate( UI_MENU_ITEM_MEDIA_DISK_OPUS_1_EJECT,
+ opus_drives[ OPUS_DRIVE_1 ].fdd.loaded );
+ ui_menu_activate( UI_MENU_ITEM_MEDIA_DISK_OPUS_1_FLIP_SET,
+ !opus_drives[ OPUS_DRIVE_1 ].fdd.upsidedown );
+ ui_menu_activate( UI_MENU_ITEM_MEDIA_DISK_OPUS_1_WP_SET,
+ !opus_drives[ OPUS_DRIVE_1 ].fdd.wrprot );
+
+
+ dt = &fdd_params[ option_enumerate_diskoptions_drive_opus2_type() ];
+ fdd_init( &opus_drives[ OPUS_DRIVE_2 ].fdd, dt->enabled ? FDD_SHUGART : FDD_TYPE_NONE,
+ dt->heads, dt->cylinders, 1 );
+ ui_menu_activate( UI_MENU_ITEM_MEDIA_DISK_OPUS_2, dt->enabled );
+ ui_menu_activate( UI_MENU_ITEM_MEDIA_DISK_OPUS_2_EJECT,
+ opus_drives[ OPUS_DRIVE_2 ].fdd.loaded );
+ ui_menu_activate( UI_MENU_ITEM_MEDIA_DISK_OPUS_2_FLIP_SET,
+ !opus_drives[ OPUS_DRIVE_2 ].fdd.upsidedown );
+ ui_menu_activate( UI_MENU_ITEM_MEDIA_DISK_OPUS_2_WP_SET,
+ !opus_drives[ OPUS_DRIVE_2 ].fdd.wrprot );
+
+
+ opus_fdc->current_drive = &opus_drives[ 0 ];
+ fdd_select( &opus_drives[ 0 ].fdd, 1 );
+ machine_current->memory_map();
+ opus_event_index( 0, index_event, NULL );
+
+ ui_statusbar_update( UI_STATUSBAR_ITEM_DISK, UI_STATUSBAR_STATE_INACTIVE );
+}
+
+void
+opus_end( void )
+{
+ opus_available = 0;
+}
+
+/*
+ * opus_6821_access( reg, data, dir )
+ *
+ * reg - register to access:
+ *
+ * data - if dir = 1 the value being written else ignored
+ *
+ * dir - direction of data. 0 = read, 1 = write
+ *
+ * returns: value of register if dir = 0 else 0
+ *
+ * Mostly borrowed from EightyOne - A Windows ZX80/81/clone emulator
+ */
+
+static libspectrum_byte
+opus_6821_access( libspectrum_byte reg, libspectrum_byte data,
+ libspectrum_byte dir )
+{
+ int drive, side;
+ int i;
+
+ switch( reg & 0x03 ) {
+ case 0:
+ if( dir ) {
+ if( control_a & 0x04 ) {
+ data_reg_a = data;
+
+ drive = ( data & 0x02 ) == 2 ? 1 : 0;
+ side = ( data & 0x10 )>>4 ? 1 : 0;
+
+ for( i = 0; i < OPUS_NUM_DRIVES; i++ ) {
+ fdd_set_head( &opus_drives[ i ].fdd, side );
+ }
+
+ fdd_select( &opus_drives[ (!drive) ].fdd, 0 );
+ fdd_select( &opus_drives[ drive ].fdd, 1 );
+
+ if( opus_fdc->current_drive != &opus_drives[ drive ] ) {
+ if( opus_fdc->current_drive->fdd.motoron ) { /* swap motoron */
+ fdd_motoron( &opus_drives[ (!drive) ].fdd, 0 );
+ fdd_motoron( &opus_drives[ drive ].fdd, 1 );
+ }
+ opus_fdc->current_drive = &opus_drives[ drive ];
+ }
+ } else {
+ data_dir_a = data;
+ }
+ } else {
+ if( control_a & 0x04 ) {
+ /* printer never busy (bit 6) */
+ data_reg_a &= ~0x40;
+ return data_reg_a;
+ } else {
+ return data_dir_a;
+ }
+ }
+ break;
+ case 1:
+ if( dir ) {
+ control_a = data;
+ } else {
+ /* Always return bit 6 set to ACK parallel port actions */
+ return control_a | 0x40;
+ }
+ break;
+ case 2:
+ if( dir ) {
+ if( control_b & 0x04 ) {
+ data_reg_b = data;
+ printer_parallel_write( 0x00, data );
+ /* Don't worry about emulating the strobes from the ROM, they are
+ all bound up with checking current printer busy status which we
+ don't emulate, so just send the char now */
+ printer_parallel_strobe_write( 0 );
+ printer_parallel_strobe_write( 1 );
+ printer_parallel_strobe_write( 0 );
+ } else {
+ data_dir_b = data;
+ }
+ } else {
+ if( control_b & 0x04 ) {
+ return data_reg_b;
+ } else {
+ return data_dir_b;
+ }
+ }
+ break;
+ case 3:
+ if( dir ) {
+ control_b = data;
+ } else {
+ return control_b;
+ }
+ break;
+ }
+
+ return 0;
+}
+
+int
+opus_disk_insert( opus_drive_number which, const char *filename,
+ int autoload )
+{
+ int error;
+ wd_fdc_drive *d;
+ const fdd_params_t *dt;
+
+ if( which >= OPUS_NUM_DRIVES ) {
+ ui_error( UI_ERROR_ERROR, "opus_disk_insert: unknown drive %d",
+ which );
+ fuse_abort();
+ }
+
+ d = &opus_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( opus_disk_eject( which, 0 ) ) return 0;
+ }
+
+ if( filename ) {
+ error = disk_open( &d->disk, filename, 0, DISK_TRY_MERGE( d->fdd.fdd_heads ) );
+ if( error != DISK_OK ) {
+ ui_error( UI_ERROR_ERROR, "Failed to open disk image: %s",
+ disk_strerror( error ) );
+ return 1;
+ }
+ } else {
+ switch( which ) {
+ case 0:
+ /* +1 => there is no `Disabled' */
+ dt = &fdd_params[ option_enumerate_diskoptions_drive_opus1_type() + 1 ];
+ break;
+ case 1:
+ default:
+ dt = &fdd_params[ option_enumerate_diskoptions_drive_opus2_type() ];
+ break;
+ }
+ error = disk_new( &d->disk, dt->heads, dt->cylinders, DISK_DENS_AUTO, DISK_UDI );
+ if( error != DISK_OK ) {
+ ui_error( UI_ERROR_ERROR, "Failed to create disk image: %s",
+ disk_strerror( error ) );
+ return 1;
+ }
+ }
+
+ fdd_load( &d->fdd, &d->disk, 0 );
+
+ /* Set the 'eject' item active */
+ switch( which ) {
+ case OPUS_DRIVE_1:
+ ui_menu_activate( UI_MENU_ITEM_MEDIA_DISK_OPUS_1_EJECT, 1 );
+ ui_menu_activate( UI_MENU_ITEM_MEDIA_DISK_OPUS_1_FLIP_SET,
+ !opus_drives[ OPUS_DRIVE_1 ].fdd.upsidedown );
+ ui_menu_activate( UI_MENU_ITEM_MEDIA_DISK_OPUS_1_WP_SET,
+ !opus_drives[ OPUS_DRIVE_1 ].fdd.wrprot );
+ break;
+ case OPUS_DRIVE_2:
+ ui_menu_activate( UI_MENU_ITEM_MEDIA_DISK_OPUS_2_EJECT, 1 );
+ ui_menu_activate( UI_MENU_ITEM_MEDIA_DISK_OPUS_2_FLIP_SET,
+ !opus_drives[ OPUS_DRIVE_2 ].fdd.upsidedown );
+ ui_menu_activate( UI_MENU_ITEM_MEDIA_DISK_OPUS_2_WP_SET,
+ !opus_drives[ OPUS_DRIVE_2 ].fdd.wrprot );
+ break;
+ }
+
+ if( filename && autoload ) {
+ /* XXX */
+ }
+
+ return 0;
+}
+
+int
+opus_disk_eject( opus_drive_number which, int write )
+{
+ wd_fdc_drive *d;
+
+ if( which >= OPUS_NUM_DRIVES )
+ return 1;
+
+ d = &opus_drives[ which ];
+
+ if( d->disk.type == DISK_TYPE_NONE )
+ return 0;
+
+ if( write ) {
+
+ if( ui_opus_disk_write( which ) ) return 1;
+
+ } else {
+
+ if( d->disk.dirty ) {
+
+ ui_confirm_save_t confirm = ui_confirm_save(
+ "Disk in Opus Discovery drive %c has been modified.\n"
+ "Do you want to save it?",
+ which == OPUS_DRIVE_1 ? '1' : '2'
+ );
+
+ switch( confirm ) {
+
+ case UI_CONFIRM_SAVE_SAVE:
+ if( ui_opus_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 OPUS_DRIVE_1:
+ ui_menu_activate( UI_MENU_ITEM_MEDIA_DISK_OPUS_1_EJECT, 0 );
+ break;
+ case OPUS_DRIVE_2:
+ ui_menu_activate( UI_MENU_ITEM_MEDIA_DISK_OPUS_2_EJECT, 0 );
+ break;
+ }
+ return 0;
+}
+
+int
+opus_disk_flip( opus_drive_number which, int flip )
+{
+ wd_fdc_drive *d;
+
+ if( which >= OPUS_NUM_DRIVES )
+ return 1;
+
+ d = &opus_drives[ which ];
+
+ if( !d->fdd.loaded )
+ return 1;
+
+ fdd_flip( &d->fdd, flip );
+
+ /* Update the 'write flip' menu item */
+ switch( which ) {
+ case OPUS_DRIVE_1:
+ ui_menu_activate( UI_MENU_ITEM_MEDIA_DISK_OPUS_1_FLIP_SET,
+ !opus_drives[ OPUS_DRIVE_1 ].fdd.upsidedown );
+ break;
+ case OPUS_DRIVE_2:
+ ui_menu_activate( UI_MENU_ITEM_MEDIA_DISK_OPUS_2_FLIP_SET,
+ !opus_drives[ OPUS_DRIVE_2 ].fdd.upsidedown );
+ break;
+ }
+ return 0;
+}
+
+int
+opus_disk_writeprotect( opus_drive_number which, int wrprot )
+{
+ wd_fdc_drive *d;
+
+ if( which >= OPUS_NUM_DRIVES )
+ return 1;
+
+ d = &opus_drives[ which ];
+
+ if( !d->fdd.loaded )
+ return 1;
+
+ fdd_wrprot( &d->fdd, wrprot );
+
+ /* Update the 'write protect' menu item */
+ switch( which ) {
+ case OPUS_DRIVE_1:
+ ui_menu_activate( UI_MENU_ITEM_MEDIA_DISK_OPUS_1_WP_SET,
+ !opus_drives[ OPUS_DRIVE_1 ].fdd.wrprot );
+ break;
+ case OPUS_DRIVE_2:
+ ui_menu_activate( UI_MENU_ITEM_MEDIA_DISK_OPUS_2_WP_SET,
+ !opus_drives[ OPUS_DRIVE_2 ].fdd.wrprot );
+ break;
+ }
+ return 0;
+}
+
+int
+opus_disk_write( opus_drive_number which, const char *filename )
+{
+ wd_fdc_drive *d = &opus_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;
+}
+
+fdd_t *
+opus_get_fdd( opus_drive_number which )
+{
+ return &( opus_drives[ which ].fdd );
+}
+
+static void
+opus_event_index( libspectrum_dword last_tstates, int type GCC_UNUSED,
+ void *user_data GCC_UNUSED )
+{
+ int next_tstates;
+ int i;
+
+ opus_index_pulse = !opus_index_pulse;
+ for( i = 0; i < OPUS_NUM_DRIVES; i++ ) {
+ wd_fdc_drive *d = &opus_drives[ i ];
+
+ d->index_pulse = opus_index_pulse;
+ if( !opus_index_pulse && d->index_interrupt ) {
+ wd_fdc_set_intrq( opus_fdc );
+ d->index_interrupt = 0;
+ }
+ }
+ next_tstates = ( opus_index_pulse ? 10 : 190 ) *
+ machine_current->timings.processor_speed / 1000;
+ event_add( last_tstates + next_tstates, index_event );
+}
+
+libspectrum_byte
+opus_read( libspectrum_word address )
+{
+ libspectrum_byte data = 0xff;
+
+ if( address >= 0x3800 ) data = 0xff; /* Undefined on Opus */
+ else if( address >= 0x3000 ) /* 6821 PIA */
+ data = opus_6821_access( address, 0, 0 );
+ else if( address >= 0x2800 ) { /* WD1770 FDC */
+ switch( address & 0x03 ) {
+ case 0:
+ data = wd_fdc_sr_read( opus_fdc );
+ break;
+ case 1:
+ data = wd_fdc_tr_read( opus_fdc );
+ break;
+ case 2:
+ data = wd_fdc_sec_read( opus_fdc );
+ break;
+ case 3:
+ data = wd_fdc_dr_read( opus_fdc );
+ break;
+ }
+ }
+
+ return data;
+}
+
+void
+opus_write( libspectrum_word address, libspectrum_byte b )
+{
+ if( address < 0x2000 ) return;
+ if( address >= 0x3800 ) return;
+
+ if( address >= 0x3000 ) {
+ opus_6821_access( address, b, 1 );
+ } else if( address >= 0x2800 ) {
+ switch( address & 0x03 ) {
+ case 0:
+ wd_fdc_cr_write( opus_fdc, b );
+ break;
+ case 1:
+ wd_fdc_tr_write( opus_fdc, b );
+ break;
+ case 2:
+ wd_fdc_sec_write( opus_fdc, b );
+ break;
+ case 3:
+ wd_fdc_dr_write( opus_fdc, b );
+ break;
+ }
+ }
+}
+
+static libspectrum_byte *
+alloc_and_copy_page( libspectrum_byte* source_page )
+{
+ libspectrum_byte *buffer;
+ buffer = malloc( MEMORY_PAGE_SIZE );
+ if( !buffer ) {
+ ui_error( UI_ERROR_ERROR, "Out of memory at %s:%d", __FILE__,
+ __LINE__ );
+ return 0;
+ }
+
+ memcpy( buffer, source_page, MEMORY_PAGE_SIZE );
+ return buffer;
+}
+
+static void
+opus_enabled_snapshot( libspectrum_snap *snap )
+{
+ if( libspectrum_snap_opus_active( snap ) )
+ settings_current.opus = 1;
+}
+
+static void
+opus_from_snapshot( libspectrum_snap *snap )
+{
+ if( !libspectrum_snap_opus_active( snap ) ) return;
+
+ if( libspectrum_snap_opus_custom_rom( snap ) &&
+ libspectrum_snap_opus_rom( snap, 0 ) &&
+ machine_load_rom_bank_from_buffer(
+ memory_map_romcs, 0, 0,
+ libspectrum_snap_opus_rom( snap, 0 ),
+ MEMORY_PAGE_SIZE,
+ 1 ) )
+ return;
+
+ if( libspectrum_snap_opus_ram( snap, 0 ) ) {
+ memcpy( opus_ram,
+ libspectrum_snap_opus_ram( snap, 0 ), 0x800 );
+ }
+
+ /* ignore drive count for now, there will be an issue with loading snaps where
+ drives have been disabled
+ libspectrum_snap_opus_drive_count( snap )
+ */
+
+ opus_fdc->direction = libspectrum_snap_opus_direction( snap );
+
+ wd_fdc_cr_write ( opus_fdc, libspectrum_snap_opus_status ( snap ) );
+ wd_fdc_tr_write ( opus_fdc, libspectrum_snap_opus_track ( snap ) );
+ wd_fdc_sec_write( opus_fdc, libspectrum_snap_opus_sector ( snap ) );
+ wd_fdc_dr_write ( opus_fdc, libspectrum_snap_opus_data ( snap ) );
+ data_reg_a = libspectrum_snap_opus_data_reg_a( snap );
+ data_dir_a = libspectrum_snap_opus_data_dir_a( snap );
+ control_a = libspectrum_snap_opus_control_a ( snap );
+ data_reg_b = libspectrum_snap_opus_data_reg_b( snap );
+ data_dir_b = libspectrum_snap_opus_data_dir_b( snap );
+ control_b = libspectrum_snap_opus_control_b ( snap );
+
+ if( libspectrum_snap_opus_paged( snap ) ) {
+ opus_page();
+ } else {
+ opus_unpage();
+ }
+}
+
+static void
+opus_to_snapshot( libspectrum_snap *snap GCC_UNUSED )
+{
+ libspectrum_byte *buffer;
+ int drive_count = 0;
+
+ if( !periph_opus_active ) return;
+
+ libspectrum_snap_set_opus_active( snap, 1 );
+
+ buffer = alloc_and_copy_page( memory_map_romcs[0].page );
+ if( !buffer ) return;
+ libspectrum_snap_set_opus_rom( snap, 0, buffer );
+ if( memory_map_romcs[0].source == MEMORY_SOURCE_CUSTOMROM )
+ libspectrum_snap_set_opus_custom_rom( snap, 1 );
+
+ buffer = alloc_and_copy_page( opus_ram );
+ if( !buffer ) return;
+ libspectrum_snap_set_opus_ram( snap, 0, buffer );
+
+ drive_count++; /* Drive 1 is not removable */
+ if( option_enumerate_diskoptions_drive_opus2_type() > 0 ) drive_count++;
+ libspectrum_snap_set_opus_drive_count( snap, drive_count );
+
+ libspectrum_snap_set_opus_paged ( snap, opus_active );
+ libspectrum_snap_set_opus_direction ( snap, opus_fdc->direction );
+ libspectrum_snap_set_opus_status ( snap, opus_fdc->status_register );
+ libspectrum_snap_set_opus_track ( snap, opus_fdc->track_register );
+ libspectrum_snap_set_opus_sector ( snap, opus_fdc->sector_register );
+ libspectrum_snap_set_opus_data ( snap, opus_fdc->data_register );
+ libspectrum_snap_set_opus_data_reg_a( snap, data_reg_a );
+ libspectrum_snap_set_opus_data_dir_a( snap, data_dir_a );
+ libspectrum_snap_set_opus_control_a ( snap, control_a );
+ libspectrum_snap_set_opus_data_reg_b( snap, data_reg_b );
+ libspectrum_snap_set_opus_data_dir_b( snap, data_dir_b );
+ libspectrum_snap_set_opus_control_b ( snap, control_b );
+}
Added: vendor/fuse-emulator/current/fuse/disk/opus.h
===================================================================
--- vendor/fuse-emulator/current/fuse/disk/opus.h (rev 0)
+++ vendor/fuse-emulator/current/fuse/disk/opus.h 2009-08-01 14:01:53 UTC (rev 608)
@@ -0,0 +1,65 @@
+/* opus.h: Routines for handling the Opus Discovery interface
+ Copyright (c) 2005-2009 Stuart Brady, Fredrick Meunier
+
+ $Id: opus.h 4012 2009-04-16 12:42: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
+ 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_OPUS_H
+#define FUSE_OPUS_H
+
+#include <config.h>
+
+typedef enum opus_drive_number {
+ OPUS_DRIVE_1 = 0,
+ OPUS_DRIVE_2,
+} opus_drive_number;
+
+#include <libspectrum.h>
+
+#include "periph.h"
+#include "disk/fdd.h"
+
+extern int opus_available; /* Is the Opus available for use? */
+extern int opus_active; /* Opus enabled? */
+
+int opus_init( void );
+void opus_end( void );
+
+void opus_page( void );
+void opus_unpage( void );
+
+libspectrum_byte opus_read( libspectrum_word address );
+void opus_write( libspectrum_word address, libspectrum_byte b );
+
+libspectrum_byte opus_joy_read( libspectrum_word port, int *attached );
+
+int opus_disk_insert( opus_drive_number which, const char *filename,
+ int autoload );
+int opus_disk_eject( opus_drive_number which, int write );
+int opus_disk_write( opus_drive_number which, const char *filename );
+int opus_disk_flip( opus_drive_number which, int flip );
+int opus_disk_writeprotect( opus_drive_number which, int wrprot );
+fdd_t *opus_get_fdd( opus_drive_number which );
+
+#endif /* #ifndef FUSE_OPUS_H */
Modified: vendor/fuse-emulator/current/fuse/disk/plusd.c
===================================================================
--- vendor/fuse-emulator/current/fuse/disk/plusd.c 2009-08-01 00:40:53 UTC (rev 607)
+++ vendor/fuse-emulator/current/fuse/disk/plusd.c 2009-08-01 14:01:53 UTC (rev 608)
@@ -2,7 +2,7 @@
Copyright (c) 1999-2007 Stuart Brady, Fredrick Meunier, Philip Kendall,
Dmitry Sanarin, Darren Salt
- $Id: plusd.c 4012 2009-04-16 12:42:14Z fredm $
+ $Id: plusd.c 4060 2009-07-30 13:21:38Z 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
@@ -654,8 +654,13 @@
libspectrum_snap_plusd_ram( snap, 0 ), 0x2000 );
}
- plusd_fdc->direction = libspectrum_snap_beta_direction( snap );
+ /* ignore drive count for now, there will be an issue with loading snaps where
+ drives have been disabled
+ libspectrum_snap_plusd_drive_count( snap )
+ */
+ plusd_fdc->direction = libspectrum_snap_plusd_direction( snap );
+
plusd_cr_write ( 0x00e3, libspectrum_snap_plusd_status ( snap ) );
plusd_tr_write ( 0x00eb, libspectrum_snap_plusd_track ( snap ) );
plusd_sec_write( 0x00f3, libspectrum_snap_plusd_sector ( snap ) );
@@ -673,6 +678,7 @@
plusd_to_snapshot( libspectrum_snap *snap GCC_UNUSED )
{
libspectrum_byte *buffer;
+ int drive_count = 0;
if( !periph_plusd_active ) return;
@@ -688,6 +694,10 @@
if( !buffer ) return;
libspectrum_snap_set_plusd_ram( snap, 0, buffer );
+ drive_count++; /* Drive 1 is not removable */
+ if( option_enumerate_diskoptions_drive_plusd2_type() > 0 ) drive_count++;
+ libspectrum_snap_set_plusd_drive_count( snap, drive_count );
+
libspectrum_snap_set_plusd_paged ( snap, plusd_active );
libspectrum_snap_set_plusd_direction( snap, plusd_fdc->direction );
libspectrum_snap_set_plusd_status( snap, plusd_fdc->status_register );
Modified: vendor/fuse-emulator/current/fuse/disk/wd_fdc.c
===================================================================
--- vendor/fuse-emulator/current/fuse/disk/wd_fdc.c 2009-08-01 00:40:53 UTC (rev 607)
+++ vendor/fuse-emulator/current/fuse/disk/wd_fdc.c 2009-08-01 14:01:53 UTC (rev 608)
@@ -2,7 +2,7 @@
Copyright (c) 2002-2007 Stuart Brady, Fredrick Meunier, Philip Kendall,
Dmitry Sanarin, Gergely Szasz
- $Id: wd_fdc.c 3681 2008-06-16 09:40:29Z pak21 $
+ $Id: wd_fdc.c 4060 2009-07-30 13:21:38Z 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
@@ -74,6 +74,12 @@
f->spin_cycles = 0;
f->direction = 0;
f->head_load = 0;
+ if( d ) {
+ if( f->flags & WD_FLAG_BETA128 )
+ fdd_motoron( &d->fdd, 0 );
+ else
+ fdd_head_load( &d->fdd, 0 );
+ }
f->read_id = 0;
if( f->hlt_time > 0 ) f->hlt = 0;
f->intrq = 0;
@@ -214,14 +220,14 @@
wd_fdc_drive *d = f->current_drive;
f->id_mark = WD_FDC_AM_NONE;
-
+
if( f->rev <= 0 )
return 1;
while( i == f->rev ) {
crc_preset( f );
if( f->dden ) { /* double density (MFM) */
- fdd_read_write_data( &d->fdd, FDD_READ );
+ fdd_read_write_data( &d->fdd, FDD_READ );
if( d->fdd.index ) f->rev--;
crc_add(f, d);
if( d->fdd.data == 0xffa1 ) {
@@ -391,7 +397,7 @@
{
int i;
f->read_id = 1;
-
+
event_remove_type( fdc_event );
if( f->id_mark == WD_FDC_AM_NONE ) {
while( f->rev ) {
@@ -438,8 +444,8 @@
}
if( f->head_load )
f->status_register |= WD_FDC_SR_SPINUP;
- /* when set, it indicates head is loaded and enganged.
- This bit is logical "and" of HLD and "HLT" signals. */
+ /* when set, it indicates head is loaded and enganged.
+ This bit is logical "and" of HLD and "HLT" signals. */
}
if( d->fdd.tr00 )
@@ -504,6 +510,7 @@
type_i_verify:
if( b & 0x04 ) {
+
if( f->type == WD1773 || f->type == FD1793 ) {
f->head_load = 1;
event_remove_type( motor_off_event );
@@ -513,22 +520,27 @@
fdd_head_load( &f->current_drive->fdd, 1 );
event_remove_type( fdc_event );
event_add_with_data( tstates + 15 * /* 15ms */
- machine_current->timings.processor_speed / 1000,
+ machine_current->timings.processor_speed / 1000,
fdc_event, f );
statusbar_update( 1 );
}
+ f->state = WD_FDC_STATE_VERIFY;
+
if( ( f->type == WD1770 || f->type == WD1772 ) &&
!( f->status_register & WD_FDC_SR_MOTORON ) ) {
f->status_register |= WD_FDC_SR_MOTORON;
+ fdd_motoron( &f->current_drive->fdd, 1 );
statusbar_update( 1 );
delay = 6 * 200;
event_remove_type( fdc_event );
event_add_with_data( tstates + 12 * /* 6 revolution 6 * 200 / 1000 */
- machine_current->timings.processor_speed / 10,
+ machine_current->timings.processor_speed / 10,
fdc_event, f );
+ return;
}
- f->state = WD_FDC_STATE_VERIFY;
+
+ wd_fdc_seek_verify( f );
return;
}
@@ -771,23 +783,27 @@
statusbar_update( 0 );
return;
}
-
+
if( ( f->type == WD1773 || f->type == FD1793 ) &&
f->hlt_time > 0 && f->head_load && !f->hlt )
f->hlt = 1;
if( ( ( f->type == WD1770 || f->type == WD1772 ) &&
- ( f->status_register & WD_FDC_SR_MOTORON ) ) ||
+ ( f->status_register & WD_FDC_SR_MOTORON ) &&
+ f->status_type == WD_FDC_STATUS_TYPE1 ) ||
( ( f->type == WD1773 || f->type == FD1793 ) &&
( f->state == WD_FDC_STATE_SEEK ||
f->state == WD_FDC_STATE_SEEK_DELAY ) &&
f->head_load ) ) {
f->status_register |= WD_FDC_SR_SPINUP;
}
-
+
if( f->read_id ) {
if( f->state == WD_FDC_STATE_VERIFY )
wd_fdc_seek_verify_read_id( f );
+ else if( ( f->state == WD_FDC_STATE_READ || f->state == WD_FDC_STATE_WRITE ) &&
+ f->datarq )
+ f->datarq = 0, wd_fdc_set_datarq( f );
else if( f->state == WD_FDC_STATE_READ || f->state == WD_FDC_STATE_WRITE )
wd_fdc_type_ii_seek( f );
else if( f->state == WD_FDC_STATE_READID )
@@ -796,8 +812,16 @@
wd_fdc_type_i( f );
else if( f->state == WD_FDC_STATE_VERIFY )
wd_fdc_seek_verify( f );
+ else if( ( f->state == WD_FDC_STATE_READ || f->state == WD_FDC_STATE_WRITE ) &&
+ f->datarq )
+ f->datarq = 0, wd_fdc_set_datarq( f );
else if( f->state == WD_FDC_STATE_READ || f->state == WD_FDC_STATE_WRITE )
wd_fdc_type_ii( f );
+ else if( ( f->state == WD_FDC_STATE_READTRACK ||
+ f->state == WD_FDC_STATE_READID ||
+ f->state == WD_FDC_STATE_WRITETRACK ) &&
+ f->datarq )
+ f->datarq = 0, wd_fdc_set_datarq( f );
else if( f->state == WD_FDC_STATE_READTRACK ||
f->state == WD_FDC_STATE_READID ||
f->state == WD_FDC_STATE_WRITETRACK )
@@ -986,6 +1010,10 @@
{
wd_fdc_drive *d = f->current_drive;
+ if( f->flags & WD_FLAG_OPUS &&
+ f->status_register & WD_FDC_SR_BUSY )
+ event_remove_type( fdc_event );
+
if( f->state == WD_FDC_STATE_READ ) {
f->data_offset++; /* count read bytes */
fdd_read_write_data( &d->fdd, FDD_READ ); crc_add(f, d); /* read a byte */
@@ -1072,6 +1100,12 @@
wd_fdc_reset_datarq( f );
}
}
+ if( ( f->flags & WD_FLAG_OPUS ) &&
+ ( f->status_register & WD_FDC_SR_BUSY ) ) { /* we need a next datarq */
+ event_add_with_data( tstates + 30 * /* 30 us delay */
+ machine_current->timings.processor_speed / 1000000,
+ fdc_event, f );
+ }
return f->data_register;
}
@@ -1153,4 +1187,11 @@
wd_fdc_reset_datarq( f );
}
}
+ if( ( f->flags & WD_FLAG_OPUS ) &&
+ f->status_register & WD_FDC_SR_BUSY ) { /* we need a next datarq */
+// wd_fdc_reset_datarq( f );
+ event_add_with_data( tstates + 30 * /* 30 us delay */
+ machine_current->timings.processor_speed / 1000000,
+ fdc_event, f );
+ }
}
Modified: vendor/fuse-emulator/current/fuse/disk/wd_fdc.h
===================================================================
--- vendor/fuse-emulator/current/fuse/disk/wd_fdc.h 2009-08-01 00:40:53 UTC (rev 607)
+++ vendor/fuse-emulator/current/fuse/disk/wd_fdc.h 2009-08-01 14:01:53 UTC (rev 608)
@@ -2,7 +2,7 @@
Copyright (c) 2003-2007 Stuart Brady, Fredrick Meunier, Philip Kendall,
Gergely Szasz
- $Id: wd_fdc.h 3681 2008-06-16 09:40:29Z pak21 $
+ $Id: wd_fdc.h 4060 2009-07-30 13:21:38Z 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
@@ -47,6 +47,7 @@
static const int WD_FLAG_NONE = 0;
static const int WD_FLAG_BETA128 = 1<<0; /* Beta128 connects HLD output pin to READY input pin and
MOTOR ON pin on FDD interface */
+static const int WD_FLAG_OPUS = 1<<1; /* Opus Discovery need `datarq' line for every byte */
typedef enum wd_type_t {
WD1773 = 0, /* WD1773 */
@@ -70,7 +71,7 @@
wd_fdc_drive *current_drive;
wd_type_t type; /* WD1770, WD1772, WD1773 */
-
+
int rates[ 4 ];
int spin_cycles;
fdd_dir_t direction; /* 0 = spindlewards, 1 = rimwards */
Modified: vendor/fuse-emulator/current/fuse/fuse.c
===================================================================
--- vendor/fuse-emulator/current/fuse/fuse.c 2009-08-01 00:40:53 UTC (rev 607)
+++ vendor/fuse-emulator/current/fuse/fuse.c 2009-08-01 14:01:53 UTC (rev 608)
@@ -1,7 +1,7 @@
/* fuse.c: The Free Unix Spectrum Emulator
Copyright (c) 1999-2009 Philip Kendall
- $Id: fuse.c 4032 2009-06-10 11:09:44Z fredm $
+ $Id: fuse.c 4060 2009-07-30 13:21:38Z 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
@@ -111,6 +111,7 @@
typedef struct start_files_t {
const char *disk_plus3;
+ const char *disk_opus;
const char *disk_plusd;
const char *disk_beta;
const char *dock;
@@ -278,6 +279,7 @@
if( rzx_init() ) return 1;
if( psg_init() ) return 1;
if( beta_init() ) return 1;
+ if( opus_init() ) return 1;
if( plusd_init() ) return 1;
if( fdd_init_events() ) return 1;
if( simpleide_init() ) return 1;
@@ -483,6 +485,7 @@
setup_start_files( start_files_t *start_files )
{
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_beta = settings_current.betadisk_file;
start_files->dock = settings_current.dck_file;
@@ -570,6 +573,9 @@
case LIBSPECTRUM_CLASS_DISK_PLUS3:
start_files->disk_plus3 = filename; break;
+ case LIBSPECTRUM_CLASS_DISK_OPUS:
+ start_files->disk_opus = filename; break;
+
case LIBSPECTRUM_CLASS_DISK_PLUSD:
start_files->disk_plusd = filename; break;
@@ -590,6 +596,8 @@
start_files->disk_beta = filename;
else if( periph_plusd_active )
start_files->disk_plusd = filename;
+ else if( periph_opus_active )
+ start_files->disk_opus = filename;
}
break;
@@ -689,6 +697,11 @@
if( error ) return error;
}
+ if( start_files->disk_opus ) {
+ error = utils_open_file( start_files->disk_opus, autoload, NULL );
+ if( error ) return error;
+ }
+
if( start_files->disk_beta ) {
error = utils_open_file( start_files->disk_beta, autoload, NULL );
if( error ) return error;
@@ -802,6 +815,7 @@
zxcf_end();
if1_end();
divide_end();
+ opus_end();
plusd_end();
machine_end();
Modified: vendor/fuse-emulator/current/fuse/hacking/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse/hacking/ChangeLog 2009-08-01 00:40:53 UTC (rev 607)
+++ vendor/fuse-emulator/current/fuse/hacking/ChangeLog 2009-08-01 14:01:53 UTC (rev 608)
@@ -3164,3 +3164,21 @@
UNIX file compat routines to use the C standard file I/O, switch Wii
to use the UNIX file routines (patch #2808481) (Gergely Szasz).
20090627 display.c: mark pentagon_16c_get_colour as inline and static (Fred).
+20090706 machines/pentagon1024.c: initialise memory port before doing
+ periph_update as that triggers a memory map call (Fred).
+20090707 AUTHORS: Add Shay Green (Fred).
+20090707 ChangeLog: chuck in a few entries as we go, mostly OS X port visible
+ items at the moment (Fred).
+20090710 disk/{fdd.c,wd_fdc.c}: save disk selected status over reset and
+ reset motor or head when resetting WD FDC to fix Mr Gluck ROM handling
+ on reset with a disk present (patch #2819220) (Gergely Szasz).
+20090730 AUTHORS,ChangeLog,README,
+ disk/{Makefile.am,beta.c,disk.c,opus.[ch],plusd.c,wd_fdc.[ch]},fuse.c,
+ machines/{spec128.c,spec16.c,spec48.c,spec_se.c,specplus2.c,tc2048.c},
+ man/fuse.1,memory.c,menu.[ch],menu_data.dat,periph.[ch],
+ roms/Makefile.am,roms/opus.rom,settings.dat,tape.c,ui.c,ui/options.dat,
+ ui/sdl/sdldisplay.c,ui/ui.h,utils.c,z80/coretest.c,z80/z80_checks.h,
+ z80/z80_ops.c: add Opus Discovery support (patch #2823760) (Gergely
+ Szasz and Fredrick Meunier).
+20090731 disk/disk.c: tweak sector padding to fix ATC+Techonicn Ted.dsk Opus
+ disk (thanks, Simon Owen) (Gergely Szasz).
Modified: vendor/fuse-emulator/current/fuse/ide/divide.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ide/divide.c 2009-08-01 00:40:53 UTC (rev 607)
+++ vendor/fuse-emulator/current/fuse/ide/divide.c 2009-08-01 14:01:53 UTC (rev 608)
@@ -1,7 +1,7 @@
/* divide.c: DivIDE interface routines
Copyright (c) 2005-2008 Matthew Westcott, Philip Kendall
- $Id: divide.c 3944 2009-01-10 18:17:04Z pak21 $
+ $Id: divide.c 4060 2009-07-30 13:21:38Z 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/ide/divide.h
===================================================================
--- vendor/fuse-emulator/current/fuse/ide/divide.h 2009-08-01 00:40:53 UTC (rev 607)
+++ vendor/fuse-emulator/current/fuse/ide/divide.h 2009-0...
[truncated message content] |
|
From: <fr...@us...> - 2010-05-24 12:04:31
|
Revision: 637
http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=637&view=rev
Author: fredm
Date: 2010-05-24 12:04:23 +0000 (Mon, 24 May 2010)
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/README
vendor/fuse-emulator/current/fuse/compat/unix/file.c
vendor/fuse-emulator/current/fuse/compat/wii/paths.c
vendor/fuse-emulator/current/fuse/compat.h
vendor/fuse-emulator/current/fuse/configure.in
vendor/fuse-emulator/current/fuse/debugger/command.c
vendor/fuse-emulator/current/fuse/debugger/commandl.l
vendor/fuse-emulator/current/fuse/debugger/debugger_internals.h
vendor/fuse-emulator/current/fuse/debugger/disassemble.c
vendor/fuse-emulator/current/fuse/disk/beta.c
vendor/fuse-emulator/current/fuse/disk/beta.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/disk/opus.c
vendor/fuse-emulator/current/fuse/disk/plusd.c
vendor/fuse-emulator/current/fuse/disk/upd_fdc.c
vendor/fuse-emulator/current/fuse/disk/upd_fdc.h
vendor/fuse-emulator/current/fuse/display.c
vendor/fuse-emulator/current/fuse/fuse.c
vendor/fuse-emulator/current/fuse/hacking/ChangeLog
vendor/fuse-emulator/current/fuse/ide/divide.c
vendor/fuse-emulator/current/fuse/ide/zxatasp.c
vendor/fuse-emulator/current/fuse/ide/zxcf.c
vendor/fuse-emulator/current/fuse/if1.c
vendor/fuse-emulator/current/fuse/if2.c
vendor/fuse-emulator/current/fuse/input.c
vendor/fuse-emulator/current/fuse/input.h
vendor/fuse-emulator/current/fuse/keyboard.c
vendor/fuse-emulator/current/fuse/keysyms.dat
vendor/fuse-emulator/current/fuse/keysyms.pl
vendor/fuse-emulator/current/fuse/machines/pentagon.c
vendor/fuse-emulator/current/fuse/machines/pentagon1024.c
vendor/fuse-emulator/current/fuse/machines/pentagon512.c
vendor/fuse-emulator/current/fuse/machines/scorpion.c
vendor/fuse-emulator/current/fuse/machines/specplus3.c
vendor/fuse-emulator/current/fuse/machines/specplus3.h
vendor/fuse-emulator/current/fuse/man/fuse.1
vendor/fuse-emulator/current/fuse/memory.c
vendor/fuse-emulator/current/fuse/memory.h
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/printer.c
vendor/fuse-emulator/current/fuse/rzx.c
vendor/fuse-emulator/current/fuse/settings-header.pl
vendor/fuse-emulator/current/fuse/settings.dat
vendor/fuse-emulator/current/fuse/settings.pl
vendor/fuse-emulator/current/fuse/sound/Makefile.am
vendor/fuse-emulator/current/fuse/sound/coreaudiosound.c
vendor/fuse-emulator/current/fuse/sound.c
vendor/fuse-emulator/current/fuse/tape.c
vendor/fuse-emulator/current/fuse/ui/fb/fbkeyboard.c
vendor/fuse-emulator/current/fuse/ui/fb/fbui.c
vendor/fuse-emulator/current/fuse/ui/gtk/gtkkeyboard.c
vendor/fuse-emulator/current/fuse/ui/gtk/gtkui.c
vendor/fuse-emulator/current/fuse/ui/gtk/picture.c
vendor/fuse-emulator/current/fuse/ui/options.dat
vendor/fuse-emulator/current/fuse/ui/sdl/sdldisplay.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/svgadisplay.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/widget/browse.c
vendor/fuse-emulator/current/fuse/ui/widget/debugger.c
vendor/fuse-emulator/current/fuse/ui/widget/error.c
vendor/fuse-emulator/current/fuse/ui/widget/filesel.c
vendor/fuse-emulator/current/fuse/ui/widget/memory.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/widget/picture.c
vendor/fuse-emulator/current/fuse/ui/widget/pokefinder.c
vendor/fuse-emulator/current/fuse/ui/widget/query.c
vendor/fuse-emulator/current/fuse/ui/widget/roms.c
vendor/fuse-emulator/current/fuse/ui/widget/select.c
vendor/fuse-emulator/current/fuse/ui/widget/text.c
vendor/fuse-emulator/current/fuse/ui/widget/widget.c
vendor/fuse-emulator/current/fuse/ui/widget/widget.h
vendor/fuse-emulator/current/fuse/ui/wii/wiidisplay.c
vendor/fuse-emulator/current/fuse/ui/wii/wiikeyboard.c
vendor/fuse-emulator/current/fuse/ui/wii/wiiui.c
vendor/fuse-emulator/current/fuse/ui/win32/confirm.c
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/ui/win32/picture.c
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/xkeyboard.c
vendor/fuse-emulator/current/fuse/ui/xlib/xui.c
vendor/fuse-emulator/current/fuse/ui.c
vendor/fuse-emulator/current/fuse/ula.c
vendor/fuse-emulator/current/fuse/utils.c
vendor/fuse-emulator/current/fuse/windres.rc
vendor/fuse-emulator/current/fuse/z80/z80.c
vendor/fuse-emulator/current/fuse-utils/Makefile.am
vendor/fuse-emulator/current/fuse-utils/compat.h
vendor/fuse-emulator/current/fuse-utils/configure.in
vendor/fuse-emulator/current/fuse-utils/converter/romloader.cc
vendor/fuse-emulator/current/fuse-utils/hacking/ChangeLog
vendor/fuse-emulator/current/fuse-utils/importer/soundfile.cc
vendor/fuse-emulator/current/fuse-utils/snap2tzx.c
vendor/fuse-emulator/current/fuse-utils/utils.c
vendor/fuse-emulator/current/fusetest/Makefile
vendor/fuse-emulator/current/libspectrum/dck.c
vendor/fuse-emulator/current/libspectrum/dll.c
vendor/fuse-emulator/current/libspectrum/generate.pl.in
vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog
vendor/fuse-emulator/current/libspectrum/internals.h
vendor/fuse-emulator/current/libspectrum/libspectrum.h.in
vendor/fuse-emulator/current/libspectrum/make-perl.c
vendor/fuse-emulator/current/libspectrum/myglib/ghash.c
vendor/fuse-emulator/current/libspectrum/plusd.c
vendor/fuse-emulator/current/libspectrum/rzx.c
vendor/fuse-emulator/current/libspectrum/snapshot.c
vendor/fuse-emulator/current/libspectrum/szx.c
vendor/fuse-emulator/current/libspectrum/tape.c
vendor/fuse-emulator/current/libspectrum/warajevo_read.c
vendor/fuse-emulator/current/libspectrum/wav.c
Added Paths:
-----------
vendor/fuse-emulator/current/fuse/rectangle.c
vendor/fuse-emulator/current/fuse/rectangle.h
vendor/fuse-emulator/current/fuse/sound/blipbuffer.c
vendor/fuse-emulator/current/fuse/sound/blipbuffer.h
vendor/fuse-emulator/current/fuse-utils/compat/
vendor/fuse-emulator/current/fuse-utils/compat/amiga/
vendor/fuse-emulator/current/fuse-utils/compat/amiga/Makefile.am
vendor/fuse-emulator/current/fuse-utils/compat/amiga/basename.c
vendor/fuse-emulator/current/fuse-utils/compat/amiga/osname.c
vendor/fuse-emulator/current/fuse-utils/compat/unix/
vendor/fuse-emulator/current/fuse-utils/compat/unix/Makefile.am
vendor/fuse-emulator/current/fuse-utils/compat/unix/basename.c
vendor/fuse-emulator/current/fuse-utils/compat/unix/osname.c
vendor/fuse-emulator/current/fusetest/iocontention.asm
Removed Paths:
-------------
vendor/fuse-emulator/current/fuse/sound/Blip_Buffer.cpp
vendor/fuse-emulator/current/fuse/sound/Blip_Buffer.h
Modified: vendor/fuse-emulator/current/fuse/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse/ChangeLog 2010-05-24 11:59:18 UTC (rev 636)
+++ vendor/fuse-emulator/current/fuse/ChangeLog 2010-05-24 12:04:23 UTC (rev 637)
@@ -1,13 +1,13 @@
-2009-xx-xx Philip Kendall <phi...@sh...>
+2010-xx-xx Philip Kendall <phi...@sh...>
- * Fuse ?.??.? released
+ * Fuse 0.11.0 released
- FIXME: Just a start, mostly changes visible on Fuse for OS X at the
- moment
* Add Opus Discovery disk interface support (Gergely Szasz and Fredrick
Meunier).
- * Wii support.
- * Many improvements to Win32 UI (Marek Januszewski).
+ * Wii support (Bjoern Giesler, Philip Kendall, Marek Januszewski).
+ * Many improvements to Win32 UI, including an installer (Marek
+ Januszewski).
+ * Support weak data in +3 disk images (Gergely Szasz).
* Add support for flipping disk images in single sided drives (Gergely
Szasz).
* Add support for automatically merging both both disk images where
@@ -25,6 +25,16 @@
that use the 128K sound ports (Fredrick Meunier).
* Add support for Pentagon 1024SL v2.2 16 colour mode (Fredrick
Meunier).
+ * Implement GTK+ drag and drop support (Dmitry Semyonov).
+ * Better support for international keyboards (Michal Jurica).
+ * Allow svgalib UI to use full range of bit depths and scalers (Gergely
+ Szasz).
+ * Allow GTK+ scalers to set window size in GTK+ UI (rkd77, Fredrick
+ Meunier).
+ * Allow selection of "TV speaker" or "beeper"-style sound output
+ (Fredrick Meunier)
+ * Allow hot-key switching between full-screen and windowed mode in
+ SDL UI (György Szombathelyi).
* Miscellaneous improvements:
* Preformat new disks on +3 to allow the format command on +3 to work
@@ -37,7 +47,51 @@
notebooks (thanks, Andrew Owen) (Fredrick Meunier).
* Fixes for speed estimation (Gergely Szasz).
* Fix border colour in Timex HiRes screenshots (Fredrick Meunier).
+ * Fix accelerated loaders when compiling with gcc 3.x (Carlos
+ Almeida, Alberto Garcia and Philip Kendall).
+ * Allow "combo" boxes in widget UI (Gergely Szasz).
+ * Allow Home and End keys to work in widget UI (Gergely Szasz).
+ * Fix poke finder passing the wrong page to the debugger (Marek
+ Januszewski).
+ * Ensure joystick code always activates fire buttons correctly
+ (thanks, anonymous user)
+ * Don't fire joystick fire button events unless they've actually
+ changed (Fredrick Meunier; thanks, Phil Reynolds).
+ * Make svgalib UI use event interface rather than polling (thanks,
+ anonymous user).
+ * Ensure empty XML elements can't cause a segfault (thanks,
+ anonymous user).
+ * Tweak sector padding to fix Opus ATC+Technician Ted.dsk (Gergely
+ Szasz; thanks, Simon Owen).
+ * Z80 NMI should take some time (Fredrick Meunier).
+ * Ensure netbooks always recognise the enter key (Fredrick Meunier;
+ thanks, Marce).
+ * Add a --without-png option to configure for Gentoo (José Manuel
+ Ferrer Ortiz)
+ * Many other things I forgot. If you contributed something and would
+ like to be mentioned here, please mail me.
+
+2009-01-14 Philip Kendall <phi...@sh...>
+
+ * Fuse 0.10.0.2 released
+
+ * Make loader acceleration work on all compilers (Philip Kendall;
+ thanks, Carlos Almeida, Alberto Garcia and Alexander Yurchenko).
+
+ * Make the "Don't Save" option in the widget UI do the right thing
+ (Frederick Meunier).
+
+ * Allow both +3 disk drives to be used at once (Gergely Szasz).
+
+ * Allow both +D disk drives to be used at once (Gergely Szasz).
+
+ * Make .dsk code handle missing newline on "Track-Info" header
+ (Gergely Szasz; thanks, Simon Owen).
+
+ * Remove unnecessary 'use' directive when building widget options
+ header file; fixes some build issues (Frederick Meunier)
+
2008-12-10 Philip Kendall <phi...@sh...>
* Fuse 0.10.0.1 released
@@ -981,4 +1035,4 @@
* Version 0.1.0 released.
-$Id: ChangeLog 4060 2009-07-30 13:21:38Z fredm $
+$Id: ChangeLog 4134 2010-05-21 13:16:19Z fredm $
Modified: vendor/fuse-emulator/current/fuse/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/Makefile.am 2010-05-24 11:59:18 UTC (rev 636)
+++ vendor/fuse-emulator/current/fuse/Makefile.am 2010-05-24 12:04:23 UTC (rev 637)
@@ -1,7 +1,7 @@
# Process this file with automake to produce Makefile.in
## Copyright (c) 1999-2009 Philip Kendall
-## $Id: Makefile.am 4032 2009-06-10 11:09:44Z fredm $
+## $Id: Makefile.am 4112 2010-01-08 11:03:43Z 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
@@ -81,13 +81,14 @@
printer.c \
profile.c \
psg.c \
+ rectangle.c \
rzx.c \
scld.c \
screenshot.c \
settings.c \
slt.c \
snapshot.c \
- sound.cpp \
+ sound.c \
spectrum.c \
tape.c \
ui.c \
@@ -149,8 +150,8 @@
BUILT_SOURCES = options.h settings.c settings.h
-windres.o: windres.rc winfuse.ico
- @WINDRES@ -I$(srcdir) -I. $(srcdir)/windres.rc windres.o
+windres.o: windres.rc winfuse.ico ui/win32/*.rc
+ @WINDRES@ -I$(srcdir) -I. $(srcdir)/windres.rc @LIBSPEC_CFLAGS@ @CPPFLAGS@ windres.o
settings.c: settings.pl settings.dat
@PERL@ -I$(srcdir)/perl $(srcdir)/settings.pl $(srcdir)/settings.dat > $@.tmp && mv $@.tmp $@
@@ -191,6 +192,7 @@
module.h \
periph.h \
psg.h \
+ rectangle.h \
rzx.h \
screenshot.h \
settings.h \
Modified: vendor/fuse-emulator/current/fuse/README
===================================================================
--- vendor/fuse-emulator/current/fuse/README 2010-05-24 11:59:18 UTC (rev 636)
+++ vendor/fuse-emulator/current/fuse/README 2010-05-24 12:04:23 UTC (rev 637)
@@ -1,4 +1,4 @@
-The Free Unix Spectrum Emulator (Fuse) 0.10.0.1
+The Free Unix Spectrum Emulator (Fuse) 0.10.0.2
===============================================
Fuse (the Free Unix Spectrum Emulator) was originally, and somewhat
@@ -111,9 +111,9 @@
Once you've got Fuse configured and built, read the man page :-)
-Note that if you're using version of Fuse from CVS rather than one of
-the released tarballs, you'll need to run `autogen.sh' before running
-'configure' for the first time.
+Note that if you're using version of Fuse from Subversion rather than
+one of the released tarballs, you'll need to run `autogen.sh' before
+running 'configure' for the first time.
Building the OS X version of Fuse
---------------------------------
@@ -138,7 +138,7 @@
--with-wii \
--without-libxml2 --without-libiconv --without-gpm \
--without-x --without-glib \
- CFLAGS="-g -I$DEVKITPPC/include -I$DEVKITPRO/libogc/include" \
+ CFLAGS="-g -I$DEVKITPPC/include -I$DEVKITPRO/libogc/include -DGEKKO" \
LDFLAGS="-g -mrvl -mcpu=750 -meabi -mhard-float \
-Wl,-Map,fuse.elf.map -L$DEVKITPPC/lib \
-L$DEVKITPRO/libogc/lib/wii" \
@@ -151,6 +151,42 @@
This should build fuse.elf, which you can run on your Wii via the usual
methods.
+Building the Win32 version of Fuse on Linux
+--------------------------------
+
+You'll need to have the standard MinGW programming tool set. e.g. on Debian
+`apt-get install mingw32 mingw-binutils mingw32-runtime'
+ <http://www.mingw.org/>
+
+First, have to compile libspectrum:
+
+./configure --host=i586-mingw32msvc --without-libaudiofile --without-zlib \
+ --without-libgcrypt --without-bzip2 --without-glib --prefix=`pwd`
+make install
+
+This should compile libspectrum without any external lib, and `install' into the
+source directory. All of the external libs needed by libspectrum and fuse
+compile with successfully with MingGW environment - in case of problems
+with compiling any of the libs please refer to the lib's homepage for help.
+
+Then, compile fuse:
+
+./configure --host=i586-mingw32msvc --without-glib --prefix=`pwd` \
+ --with-libspectrum-prefix=`pwd`/../libspectrum --with-win32 \
+ --without-libxml2 --without-x
+make
+
+You have to use the real path of libspectrum with `--with-libspectrum-prefix='.
+This should build `fuse.exe' without any external lib, but you can run it on
+Windows or Linux (with Wine).
+
+Note: you need `libspectrum-7.dll' and the `roms' directory and the `lib'
+ directory to `fuse' run perfectly. You may copy this file and directories
+ into that directory where `fuse.exe' exists. On windows you may need to
+ copy all files from `lib/uncompressed' into `lib'.
+ With wine you need `fltmgr.sys' in Windows `system32' directory. (e.g.:
+ ~/.wine/c_drive/windows/system32).
+
Closing comments
----------------
@@ -178,6 +214,6 @@
( http://www.worldofspectrum.org/faq/index.html ) first!
Philip Kendall <phi...@sh...>
-10 December 2008
+14 January 2009
-$Id: README 4060 2009-07-30 13:21:38Z fredm $
+$Id: README 4132 2010-05-20 12:06:53Z fredm $
Modified: vendor/fuse-emulator/current/fuse/compat/unix/file.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/unix/file.c 2010-05-24 11:59:18 UTC (rev 636)
+++ vendor/fuse-emulator/current/fuse/compat/unix/file.c 2010-05-24 12:04:23 UTC (rev 637)
@@ -1,7 +1,7 @@
/* file.c: File-related compatibility routines
Copyright (c) 2008 Philip Kendall
- $Id: file.c 4040 2009-06-27 09:32:42Z fredm $
+ $Id: file.c 4072 2009-08-31 15:42:26Z specu $
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,7 +41,7 @@
compat_fd
compat_file_open( const char *path, int write )
{
- return fopen( path, write ? "w" : "r" );
+ return fopen( path, write ? "wb" : "rb" );
}
off_t
Modified: vendor/fuse-emulator/current/fuse/compat/wii/paths.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/wii/paths.c 2010-05-24 11:59:18 UTC (rev 636)
+++ vendor/fuse-emulator/current/fuse/compat/wii/paths.c 2010-05-24 12:04:23 UTC (rev 637)
@@ -1,7 +1,7 @@
/* paths.c: Path-related compatibility routines
Copyright (c) 1999-2009 Philip Kendall, Bjoern Giesler
- $Id: paths.c 3970 2009-01-19 03:47:02Z specu $
+ $Id: paths.c 4065 2009-08-13 18:33:21Z specu $
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,5 +50,8 @@
if(strlen(path) >= strlen("fat:/") &&
strncmp(path, "fat:/", strlen("fat:/")) == 0)
return 1;
+ if(strlen(path) >= strlen("sd:/") &&
+ strncmp(path, "sd:/", strlen("sd:/")) == 0)
+ return 1;
return 0;
}
Modified: vendor/fuse-emulator/current/fuse/compat.h
===================================================================
--- vendor/fuse-emulator/current/fuse/compat.h 2010-05-24 11:59:18 UTC (rev 636)
+++ vendor/fuse-emulator/current/fuse/compat.h 2010-05-24 12:04:23 UTC (rev 637)
@@ -1,7 +1,7 @@
/* compat.h: various compatibility bits
Copyright (c) 2003-2008 Philip Kendall
- $Id: compat.h 4040 2009-06-27 09:32:42Z fredm $
+ $Id: compat.h 4068 2009-08-30 19:30:19Z specu $
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
@@ -78,11 +78,11 @@
typedef FILE* compat_fd;
-#ifndef UI_WII
+#ifndef GEKKO
typedef DIR* compat_dir;
-#else /* #ifndef UI_WII */
+#else /* #ifndef GEKKO */
typedef DIR_ITER* compat_dir;
-#endif /* #ifndef UI_WII */
+#endif /* #ifndef GEKKO */
extern const compat_fd COMPAT_FILE_OPEN_FAILED;
Modified: vendor/fuse-emulator/current/fuse/configure.in
===================================================================
--- vendor/fuse-emulator/current/fuse/configure.in 2010-05-24 11:59:18 UTC (rev 636)
+++ vendor/fuse-emulator/current/fuse/configure.in 2010-05-24 12:04:23 UTC (rev 637)
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-dnl $Id: configure.in 4028 2009-05-31 13:15:52Z fredm $
+dnl $Id: configure.in 4132 2010-05-20 12:06:53Z fredm $
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
@@ -24,11 +24,10 @@
AC_CANONICAL_SYSTEM
dnl Use automake to produce `Makefile.in'
-AM_INIT_AUTOMAKE(fuse, 0.10.0.1)
+AM_INIT_AUTOMAKE(fuse, 0.10.0.2)
dnl Checks for programs.
AC_PROG_CC
-AC_PROG_CXX
AC_PROG_RANLIB
AC_PATH_PROG(PERL, perl)
AC_SUBST(PERL)
@@ -308,10 +307,7 @@
ac_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $LIBSPEC_CFLAGS"
AC_TRY_COMPILE([#include <libspectrum.h>],[
-void test()
-{
int test = LIBSPECTRUM_SUPPORTS_ZLIB_COMPRESSION;
-}
],
AUTOLOAD_SNAPS=compressed; AC_MSG_RESULT(yes),
AUTOLOAD_SNAPS=uncompressed; AC_MSG_RESULT(no))
@@ -348,33 +344,41 @@
lib/tape_ts2068.szx])
dnl Check if a version of libpng which supplies png_write_png is available
-AC_PATH_PROG([LIBPNG_CONFIG], [libpng-config])
-if test -n "$LIBPNG_CONFIG"; then
- PNG_CFLAGS=`libpng-config --cflags`
- PNG_LIBS=`libpng-config --ldflags`
- PNG_LIBS=`echo " $PNG_LIBS" | sed 's/ -l[[^ ]][[^ ]]*//g'`
-fi
+AC_MSG_CHECKING(whether PNG support requested)
+AC_ARG_WITH(png,
+[ --without-png don't use libpng],
+if test "$withval" = no; then libpng=no; else libpng=yes; fi,
+libpng=yes)
+AC_MSG_RESULT($libpng)
+if test "$libpng" = yes; then
+ AC_PATH_PROG([LIBPNG_CONFIG], [libpng-config])
+ if test -n "$LIBPNG_CONFIG"; then
+ PNG_CFLAGS=`libpng-config --cflags`
+ PNG_LIBS=`libpng-config --ldflags`
+ PNG_LIBS=`echo " $PNG_LIBS" | sed 's/ -l[[^ ]][[^ ]]*//g'`
+ fi
-ac_save_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $PNG_CFLAGS"
-ac_save_LDFLAGS="$LDFLAGS"
-LDFLAGS="$PNG_LIBS $LDFLAGS"
+ ac_save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $PNG_CFLAGS"
+ ac_save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$PNG_LIBS $LDFLAGS"
-AC_CHECK_LIB( png, png_write_png,
- [AC_CHECK_HEADER(
- png.h,
- [AC_DEFINE([USE_LIBPNG], 1, [Defined if we're going to be using the installed libpng]) PNG_LIBS='-lpng -lm -lz'],
- [AC_CHECK_HEADERS(libpng/png.h,
- [CPPFLAGS="$ac_save_CPPFLAGS $PNG_CFLAGS/libpng"
- AC_DEFINE([USE_LIBPNG], 1, [Defined if we're going to be using the installed libpng]) PNG_LIBS='-lpng -lm -lz'],
- [AC_MSG_WARN(png.h not found - saving screenshots disabled)
- PNG_LIBS='']
+ AC_CHECK_LIB( png, png_write_png,
+ [AC_CHECK_HEADER(
+ png.h,
+ [AC_DEFINE([USE_LIBPNG], 1, [Defined if we're going to be using the installed libpng]) PNG_LIBS='-lpng -lm -lz'],
+ [AC_CHECK_HEADERS(libpng/png.h,
+ [CPPFLAGS="$ac_save_CPPFLAGS $PNG_CFLAGS/libpng"
+ AC_DEFINE([USE_LIBPNG], 1, [Defined if we're going to be using the installed libpng]) PNG_LIBS='-lpng -lm -lz'],
+ [AC_MSG_WARN(png.h not found - saving screenshots disabled)
+ PNG_LIBS='']
+ )],
)],
- )],
- [AC_MSG_WARN(png_write_png not found - saving screenshots disabled)
- PNG_LIBS='']
-)
-AC_SUBST(PNG_LIBS)
+ [AC_MSG_WARN(png_write_png not found - saving screenshots disabled)
+ PNG_LIBS='']
+ )
+ AC_SUBST(PNG_LIBS)
+fi
LDFLAGS="$ac_save_LDFLAGS"
@@ -554,7 +558,7 @@
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))
+ AC_WARN(libxml2 not found - config file will use ini format))
fi
dnl Work out which timer routines to use
Modified: vendor/fuse-emulator/current/fuse/debugger/command.c
===================================================================
--- vendor/fuse-emulator/current/fuse/debugger/command.c 2010-05-24 11:59:18 UTC (rev 636)
+++ vendor/fuse-emulator/current/fuse/debugger/command.c 2010-05-24 12:04:23 UTC (rev 637)
@@ -1,7 +1,7 @@
/* command.c: Parse a debugger command
Copyright (c) 2002-2008 Philip Kendall
- $Id: command.c 3631 2008-05-26 12:22:29Z pak21 $
+ $Id: command.c 4125 2010-05-06 22:18:50Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: vendor/fuse-emulator/current/fuse/debugger/commandl.l
===================================================================
--- vendor/fuse-emulator/current/fuse/debugger/commandl.l 2010-05-24 11:59:18 UTC (rev 636)
+++ vendor/fuse-emulator/current/fuse/debugger/commandl.l 2010-05-24 12:04:23 UTC (rev 637)
@@ -1,7 +1,7 @@
/* commandl.l: Debugger command lexical scanner
Copyright (c) 2002-2008 Philip Kendall
- $Id: commandl.l 3712 2008-07-06 11:45:24Z pak21 $
+ $Id: commandl.l 4130 2010-05-18 12:06:19Z 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
@@ -37,7 +37,9 @@
#define YY_INPUT(buf,result,max_size) \
{ \
- if( !debugger_command_input( buf, &result, max_size ) ) result = YY_NULL; \
+ int retval; \
+ if( !debugger_command_input( buf, &retval, max_size ) ) retval = YY_NULL; \
+ result = (yy_size_t)retval; \
}
#define YY_NO_INPUT
Modified: vendor/fuse-emulator/current/fuse/debugger/debugger_internals.h
===================================================================
--- vendor/fuse-emulator/current/fuse/debugger/debugger_internals.h 2010-05-24 11:59:18 UTC (rev 636)
+++ vendor/fuse-emulator/current/fuse/debugger/debugger_internals.h 2010-05-24 12:04:23 UTC (rev 637)
@@ -1,7 +1,7 @@
/* debugger_internals.h: The internals of Fuse's monitor/debugger
Copyright (c) 2002-2008 Philip Kendall
- $Id: debugger_internals.h 3681 2008-06-16 09:40:29Z pak21 $
+ $Id: debugger_internals.h 4125 2010-05-06 22:18:50Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: vendor/fuse-emulator/current/fuse/debugger/disassemble.c
===================================================================
--- vendor/fuse-emulator/current/fuse/debugger/disassemble.c 2010-05-24 11:59:18 UTC (rev 636)
+++ vendor/fuse-emulator/current/fuse/debugger/disassemble.c 2010-05-24 12:04:23 UTC (rev 637)
@@ -1,7 +1,7 @@
/* disassemble.c: Fuse's disassembler
Copyright (c) 2002-2003 Darren Salt, Philip Kendall
- $Id: disassemble.c 3115 2007-08-19 02:49:14Z fredm $
+ $Id: disassemble.c 4087 2009-09-02 13:42:00Z 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
@@ -161,7 +161,7 @@
case 0x00: case 0x08:
if( b <= 0x08 ) {
- snprintf( buffer, buflen, opcode_00xxx000[ b >> 3 ] ); *length = 1;
+ snprintf( buffer, buflen, "%s", opcode_00xxx000[ b >> 3 ] ); *length = 1;
} else {
get_offset( buffer2, 40, address + 2, readbyte_internal( address + 1 ) );
snprintf( buffer, buflen, "%s%s", opcode_00xxx000[ b >> 3 ], buffer2 );
@@ -540,7 +540,7 @@
break;
case 0x07: case 0x0f:
- snprintf( buffer, buflen, opcode_01xxx111[ ( b >> 3 ) & 0x07 ] );
+ snprintf( buffer, buflen, "%s", opcode_01xxx111[ ( b >> 3 ) & 0x07 ] );
*length = 1;
break;
@@ -560,7 +560,7 @@
snprintf( buffer, buflen, "NOPD" ); *length = 1; *length = 1;
} else {
/* Note: 0xbc to 0xbf already removed */
- snprintf( buffer, buflen, opcode_101xxxxx[ b & 0x1f ] ); *length = 1;
+ snprintf( buffer, buflen, "%s", opcode_101xxxxx[ b & 0x1f ] ); *length = 1;
}
}
@@ -713,7 +713,7 @@
return 1;
} else {
const char *regs[] = { "B", "C", "D", "E", "H", "L", "(HL)", "A" };
- snprintf( buffer, buflen, regs[i] );
+ snprintf( buffer, buflen, "%s", regs[i] );
return 0;
}
}
Modified: vendor/fuse-emulator/current/fuse/disk/beta.c
===================================================================
--- vendor/fuse-emulator/current/fuse/disk/beta.c 2010-05-24 11:59:18 UTC (rev 636)
+++ vendor/fuse-emulator/current/fuse/disk/beta.c 2010-05-24 12:04:23 UTC (rev 637)
@@ -1,7 +1,7 @@
/* beta.c: Routines for handling the Beta disk interface
Copyright (c) 2004-2008 Stuart Brady
- $Id: beta.c 4060 2009-07-30 13:21:38Z fredm $
+ $Id: beta.c 4131 2010-05-19 10:52:37Z 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
@@ -58,6 +58,9 @@
#define DISK_TRY_MERGE(heads) ( option_enumerate_diskoptions_disk_try_merge() == 2 || \
( option_enumerate_diskoptions_disk_try_merge() == 1 && heads == 1 ) )
+/* Two 8Kb memory chunks accessible by the Z80 when /ROMCS is low */
+memory_page beta_memory_map_romcs[2];
+
int beta_available = 0;
int beta_active = 0;
int beta_builtin = 0;
@@ -124,8 +127,8 @@
{
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 ];
+ memory_map_read[0] = memory_map_write[0] = beta_memory_map_romcs[0];
+ memory_map_read[1] = memory_map_write[1] = beta_memory_map_romcs[1];
}
static void
@@ -150,7 +153,7 @@
for( i = 0; i < BETA_NUM_DRIVES; i++ ) {
d = &beta_drives[ i ];
- fdd_init( &d->fdd, FDD_SHUGART, 0, 0, 0 ); /* drive geometry 'autodetect' */
+ fdd_init( &d->fdd, FDD_SHUGART, NULL, 0 ); /* drive geometry 'autodetect' */
d->disk.flag = DISK_FLAG_NONE;
}
beta_select_drive( 0 );
@@ -165,6 +168,7 @@
if( index_event == -1 ) return 1;
module_register( &beta_module_info );
+ for( i = 0; i < 2; i++ ) beta_memory_map_romcs[i].bank = MEMORY_BANK_ROMCS;
return 0;
}
@@ -199,15 +203,15 @@
}
if( !beta_builtin ) {
- machine_load_rom_bank( memory_map_romcs, 0, 0,
+ machine_load_rom_bank( beta_memory_map_romcs, 0, 0,
settings_current.rom_beta128,
settings_default.rom_beta128, 0x4000 );
- memory_map_romcs[ 0 ].writable = 0;
- memory_map_romcs[ 1 ].writable = 0;
+ beta_memory_map_romcs[ 0 ].writable = 0;
+ beta_memory_map_romcs[ 1 ].writable = 0;
- memory_map_romcs[0].source = MEMORY_SOURCE_PERIPHERAL;
- memory_map_romcs[1].source = MEMORY_SOURCE_PERIPHERAL;
+ beta_memory_map_romcs[0].source = MEMORY_SOURCE_PERIPHERAL;
+ beta_memory_map_romcs[1].source = MEMORY_SOURCE_PERIPHERAL;
beta_active = 0;
@@ -225,8 +229,7 @@
/* We can eject disks only if they are currently present */
dt = &fdd_params[ option_enumerate_diskoptions_drive_beta128a_type() + 1 ]; /* +1 => there is no `Disabled' */
- fdd_init( &beta_drives[ BETA_DRIVE_A ].fdd, FDD_SHUGART,
- dt->heads, dt->cylinders, 1 );
+ fdd_init( &beta_drives[ BETA_DRIVE_A ].fdd, FDD_SHUGART, dt, 1 );
ui_menu_activate( UI_MENU_ITEM_MEDIA_DISK_BETA_A, dt->enabled );
ui_menu_activate( UI_MENU_ITEM_MEDIA_DISK_BETA_A_EJECT,
beta_drives[ BETA_DRIVE_A ].fdd.loaded );
@@ -237,8 +240,7 @@
dt = &fdd_params[ option_enumerate_diskoptions_drive_beta128b_type() ];
- fdd_init( &beta_drives[ BETA_DRIVE_B ].fdd, dt->enabled ? FDD_SHUGART : FDD_TYPE_NONE,
- dt->heads, dt->cylinders, 1 );
+ fdd_init( &beta_drives[ BETA_DRIVE_B ].fdd, dt->enabled ? FDD_SHUGART : FDD_TYPE_NONE, dt, 1 );
ui_menu_activate( UI_MENU_ITEM_MEDIA_DISK_BETA_B, dt->enabled );
ui_menu_activate( UI_MENU_ITEM_MEDIA_DISK_BETA_B_FLIP_SET,
!beta_drives[ BETA_DRIVE_B ].fdd.upsidedown );
@@ -249,8 +251,7 @@
dt = &fdd_params[ option_enumerate_diskoptions_drive_beta128c_type() ];
- fdd_init( &beta_drives[ BETA_DRIVE_C ].fdd, dt->enabled ? FDD_SHUGART : FDD_TYPE_NONE,
- dt->heads, dt->cylinders, 1 );
+ fdd_init( &beta_drives[ BETA_DRIVE_C ].fdd, dt->enabled ? FDD_SHUGART : FDD_TYPE_NONE, dt, 1 );
ui_menu_activate( UI_MENU_ITEM_MEDIA_DISK_BETA_C, dt->enabled );
ui_menu_activate( UI_MENU_ITEM_MEDIA_DISK_BETA_C_FLIP_SET,
!beta_drives[ BETA_DRIVE_C ].fdd.upsidedown );
@@ -261,8 +262,7 @@
dt = &fdd_params[ option_enumerate_diskoptions_drive_beta128d_type() ];
- fdd_init( &beta_drives[ BETA_DRIVE_D ].fdd, dt->enabled ? FDD_SHUGART : FDD_TYPE_NONE,
- dt->heads, dt->cylinders, 1 );
+ fdd_init( &beta_drives[ BETA_DRIVE_D ].fdd, dt->enabled ? FDD_SHUGART : FDD_TYPE_NONE, dt, 1 );
ui_menu_activate( UI_MENU_ITEM_MEDIA_DISK_BETA_D, dt->enabled );
ui_menu_activate( UI_MENU_ITEM_MEDIA_DISK_BETA_D_FLIP_SET,
!beta_drives[ BETA_DRIVE_D ].fdd.upsidedown );
@@ -702,7 +702,7 @@
if( libspectrum_snap_beta_custom_rom( snap ) &&
libspectrum_snap_beta_rom( snap, 0 ) &&
machine_load_rom_bank_from_buffer(
- memory_map_romcs, 0, 0,
+ beta_memory_map_romcs, 0, 0,
libspectrum_snap_beta_rom( snap, 0 ),
MEMORY_PAGE_SIZE * 2,
1 ) )
@@ -734,7 +734,7 @@
libspectrum_snap_set_beta_active( snap, 1 );
- if( memory_map_romcs[0].source == MEMORY_SOURCE_CUSTOMROM ) {
+ if( beta_memory_map_romcs[0].source == MEMORY_SOURCE_CUSTOMROM ) {
size_t rom_length = MEMORY_PAGE_SIZE * 2;
buffer = malloc( rom_length );
@@ -743,8 +743,8 @@
return;
}
- memcpy( buffer, memory_map_romcs[0].page, MEMORY_PAGE_SIZE );
- memcpy( buffer + MEMORY_PAGE_SIZE, memory_map_romcs[1].page,
+ memcpy( buffer, beta_memory_map_romcs[0].page, MEMORY_PAGE_SIZE );
+ memcpy( buffer + MEMORY_PAGE_SIZE, beta_memory_map_romcs[1].page,
MEMORY_PAGE_SIZE );
libspectrum_snap_set_beta_rom( snap, 0, buffer );
Modified: vendor/fuse-emulator/current/fuse/disk/beta.h
===================================================================
--- vendor/fuse-emulator/current/fuse/disk/beta.h 2010-05-24 11:59:18 UTC (rev 636)
+++ vendor/fuse-emulator/current/fuse/disk/beta.h 2010-05-24 12:04:23 UTC (rev 637)
@@ -1,7 +1,7 @@
/* beta.h: Routines for handling the Beta disk interface
Copyright (c) 2003-2004 Fredrick Meunier, Philip Kendall
- $Id: beta.h 4029 2009-06-05 13:50:55Z fredm $
+ $Id: beta.h 4099 2009-10-22 10:59:02Z 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
@@ -30,6 +30,7 @@
#include <libspectrum.h>
+#include "memory.h"
#include "periph.h"
#include "disk/fdd.h"
@@ -37,6 +38,9 @@
extern int beta_active; /* Is the Beta disk interface enabled? */
extern int beta_builtin; /* Is the Beta disk interface built-in? */
+/* Two 8Kb memory chunks accessible by the Z80 when /ROMCS is low */
+extern memory_page beta_memory_map_romcs[2];
+
extern libspectrum_word beta_pc_mask; /* Bits to mask in PC for enable check */
extern libspectrum_word beta_pc_value; /* Value to compare masked PC against */
Modified: vendor/fuse-emulator/current/fuse/disk/disk.c
===================================================================
--- vendor/fuse-emulator/current/fuse/disk/disk.c 2010-05-24 11:59:18 UTC (rev 636)
+++ vendor/fuse-emulator/current/fuse/disk/disk.c 2010-05-24 12:04:23 UTC (rev 637)
@@ -1,7 +1,7 @@
/* disk.c: Routines for handling disk images
- Copyright (c) 2007 Gergely Szasz
+ Copyright (c) 2007-2010 Gergely Szasz
- $Id: disk.c 4061 2009-07-30 23:37:29Z fredm $
+ $Id: disk.c 4114 2010-01-15 13:45:51Z 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
@@ -53,7 +53,7 @@
"Cannot close file", /* DISK_CLOSE */
"Cannot write disk image", /* DISK_WRFILE */
"Partially written file", /* DISK_WRPART */
-
+
"Unknown error code" /* DISK_LAST_ERROR */
};
@@ -135,7 +135,7 @@
id_read( disk_t *d, int *head, int *track, int *sector, int *length )
{
int a1mark = 0;
-
+
while( d->i < d->bpt ) {
if( d->track[ d->i ] == 0xa1 &&
bitmap_test( d->clocks, d->i ) ) { /* 0xa1 with clock */
@@ -210,9 +210,8 @@
{
int s;
int del;
-
- d->track = d->data + ( ( d->sides * track + head ) * d->tlen );
- d->clocks = d->track + d->bpt;
+
+ DISK_SET_TRACK( d, head, track );
d->i = 0;
for( s = sector_base; s < sector_base + sectors; s++ ) {
if( id_seek( d, s ) ) {
@@ -232,9 +231,8 @@
{
int h, t, s, seclen;
int del;
-
- d->track = d->data + ( ( d->sides * track + head ) * d->tlen );
- d->clocks = d->track + d->bpt;
+
+ DISK_SET_TRACK( d, head, track );
d->i = 0;
while( id_read( d, &h, &t, &s, &seclen ) ) {
if( datamark_read( d, &del ) ) { /* write data if we have data */
@@ -253,6 +251,8 @@
#define DISK_DDAM 32
#define DISK_CORRUPT_SECTOR 64
#define DISK_UNFORMATTED_TRACK 128
+#define DISK_FM_DATA 256
+#define DISK_WEAK_DATA 512
static int
guess_track_geom( disk_t *d, int head, int track, int *sector_base,
@@ -266,8 +266,7 @@
*seclen = -1;
*mfm = -1;
- d->track = d->data + ( d->sides * track + head ) * d->tlen;
- d->clocks = d->track + d->bpt;
+ DISK_SET_TRACK( d, head, track );
d->i = 0;
while( id_read( d, &h, &t, &s, &sl ) ) {
if( *sector_base == -1 )
@@ -294,6 +293,31 @@
return r;
}
+static void
+update_tracks_mode( disk_t *d )
+{
+ int i, j, bpt;
+ int mfm, fm, weak;
+
+ for( i = 0; i < d->cylinders * d->sides; i++ ) {
+ DISK_SET_TRACK_IDX( d, i );
+ mfm = 0, fm = 0, weak = 0;
+ bpt = d->track[-3] + 256 * d->track[-2];
+ for( j = DISK_CLEN( bpt ) - 1; j >= 0; j-- ) {
+ mfm |= ~d->fm[j];
+ fm |= d->fm[j];
+ weak |= d->weak[j];
+ }
+ if( mfm && !fm ) d->track[-1] = 0x00;
+ if( !mfm && fm ) d->track[-1] = 0x01;
+ if( mfm && fm ) d->track[-1] = 0x02;
+ if( weak ) {
+ d->track[-1] |= 0x80;
+ d->have_weak = 1;
+ }
+ }
+}
+
static int
check_disk_geom( disk_t *d, int *sector_base, int *sectors,
int *seclen, int *mfm, int *unf )
@@ -301,7 +325,7 @@
int h, t, s, slen, sbase, m;
int r = 0;
- d->track = d->data; d->clocks = d->track + d->bpt;
+ DISK_SET_TRACK_IDX( d, 0 );
d->i = 0;
*sector_base = -1;
*sectors = -1;
@@ -310,6 +334,9 @@
*unf = -1;
for( t = 0; t < d->cylinders; t++ ) {
for( h = 0; h < d->sides; h++ ) {
+ r |= ( d->track[-1] & 0x80 ) ? DISK_WEAK_DATA : 0;
+ r |= ( d->track[-1] & 0x03 ) == 0x02 ? DISK_MFM_VARI : 0;
+ r |= ( d->track[-1] & 0x03 ) == 0x01 ? DISK_FM_DATA : 0;
r |= guess_track_geom( d, h, t, &sbase, &s, &slen, &m );
if( *sector_base == -1 )
*sector_base = sbase;
@@ -512,7 +539,7 @@
/* if 'buffer' == NULL, then copy data bytes from 'data' */
static int
data_add( disk_t *d, buffer_t *buffer, unsigned char *data, int len, int ddam,
- int gaptype, int crc_error, int autofill )
+ int gaptype, int crc_error, int autofill, int *start_data )
{
int length;
libspectrum_word crc = 0xffff;
@@ -532,6 +559,7 @@
if( d->i + len + 2 >= d->bpt ) /* too many data bytes */
return 1;
/*------------------------------ data ------------------------------*/
+ if( start_data != NULL ) *start_data = d->i; /* record data start position */
if( buffer == NULL ) {
memcpy( d->track + d->i, data, len );
length = len;
@@ -580,6 +608,19 @@
return len;
}
+static int
+calc_lenid( int sector_length )
+{
+ int id = 0;
+
+ while( sector_length > 0x80 ) {
+ id++;
+ sector_length >>= 1;
+ }
+
+ return id;
+}
+
#define NO_INTERLEAVE 1
#define INTERLEAVE_2 2
#define INTERLEAVE_OPUS 13
@@ -597,8 +638,7 @@
int idx;
d->i = 0;
- d->track = d->data + ( ( d->sides * track + head ) * d->tlen );
- d->clocks = d->track + d->bpt;
+ DISK_SET_TRACK( d, head, track );
if( preindex && preindex_add( d, gap ) )
return 1;
if( postindex_add( d, gap ) )
@@ -608,9 +648,9 @@
pos = i = 0;
for( s = sector_base; s < sector_base + sectors; s++ ) {
d->i = idx + pos * slen;
- if( id_add( d, head, track, s, sector_length >> 8, gap, CRC_OK ) )
+ if( id_add( d, head, track, s, calc_lenid( sector_length ), gap, CRC_OK ) )
return 1;
- if( data_add( d, buffer, NULL, sector_length, NO_DDAM, gap, CRC_OK, autofill ) )
+ if( data_add( d, buffer, NULL, sector_length, NO_DDAM, gap, CRC_OK, autofill, NULL ) )
return 1;
pos += interleave;
if( pos >= sectors ) { /* wrap around */
@@ -672,8 +712,8 @@
}
if( d->bpt > 0 )
- d->tlen = d->bpt + d->bpt / 8 + ( d->bpt % 8 ? 1 : 0 );
- dlen = d->sides * d->cylinders * d->tlen; /* track len with clock marks */
+ d->tlen = 4 + d->bpt + 3 * DISK_CLEN( d->bpt );
+ dlen = d->sides * d->cylinders * d->tlen; /* track len with clock and other marks */
if( ( d->data = calloc( 1, dlen ) ) == NULL )
return d->status = DISK_MEM;
@@ -739,11 +779,221 @@
if( d->sides < 1 || d->sides > 2 || \
d->cylinders < 1 || d->cylinders > 85 ) return d->status = DISK_GEOM
+#ifdef LIBSPECTRUM_SUPPORTS_ZLIB_COMPRESSION
static int
+udi_read_compressed( const libspectrum_byte *buffer,
+ size_t compr_size, size_t uncompr_size,
+ libspectrum_byte **data, size_t *data_size )
+{
+ libspectrum_error error;
+ libspectrum_byte *tmp;
+ size_t olength = uncompr_size;
+
+ tmp = NULL;
+
+ error = libspectrum_zlib_inflate( buffer, compr_size, &tmp, &olength );
+ if( error ) {
+ if( *data ) free( *data );
+ *data_size = 0;
+ return error;
+ }
+ if( *data_size < uncompr_size ) {
+ *data = libspectrum_realloc( *data, uncompr_size );
+ *data_size = uncompr_size;
+ }
+ memcpy( *data, tmp, uncompr_size );
+ libspectrum_free( tmp );
+
+ return 0;
+}
+
+static int
+udi_write_compressed( const libspectrum_byte *buffer,
+ size_t uncompr_size, size_t *compr_size,
+ libspectrum_byte **data, size_t *data_size )
+{
+ libspectrum_error error;
+ libspectrum_byte *tmp;
+
+ tmp = NULL;
+ error = libspectrum_zlib_compress( buffer, uncompr_size,
+ &tmp, compr_size );
+ if( error ) return error;
+
+ if( *data_size < *compr_size ) {
+ *data = libspectrum_realloc( *data, *compr_size );
+ *data_size = *compr_size;
+ }
+ memcpy( *data, tmp, *compr_size );
+ libspectrum_free( tmp );
+
+ return LIBSPECTRUM_ERROR_NONE;
+}
+#endif /* #ifdef LIBSPECTRUM_SUPPORTS_ZLIB_COMPRESSION */
+
+static void
+udi_pack_tracks( disk_t *d )
+{
+ int i, tlen, clen, ttyp;
+ libspectrum_byte *tmp;
+
+ for( i = 0; i < d->sides * d->cylinders; i++ ) {
+ DISK_SET_TRACK_IDX( d, i );
+ tmp = d->track;
+ ttyp = tmp[-1];
+ tlen = tmp[-3] + 256 * tmp[-2];
+ clen = DISK_CLEN( tlen );
+ tmp += tlen;
+ /* copy clock if needed */
+ if( tmp != d->clocks )
+ memcpy( tmp, d->clocks, clen );
+ if( ttyp == 0x00 || ttyp == 0x01 ) continue;
+ tmp += clen;
+ if( ttyp & 0x02 ) { /* copy FM marks */
+ if( tmp != d->fm )
+ memcpy( tmp, d->fm, clen );
+ tmp += clen;
+ }
+ if( ! ( ttyp & 0x80 ) ) continue;
+ if( tmp != d->weak ) /* copy WEAK marks*/
+ memcpy( tmp, d->weak, clen );
+ }
+}
+
+static void
+udi_unpack_tracks( disk_t *d )
+{
+ int i, tlen, clen, ttyp;
+ libspectrum_byte *tmp;
+ libspectrum_byte mask[] = { 0xff, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe };
+
+ for( i = 0; i < d->sides * d->cylinders; i++ ) {
+ DISK_SET_TRACK_IDX( d, i );
+ tmp = d->track;
+ ttyp = tmp[-1];
+ tlen = tmp[-3] + 256 * tmp[-2];
+ clen = DISK_CLEN( tlen );
+ tmp += tlen;
+ if( ttyp & 0x80 ) tmp += clen;
+ if( ttyp & 0x02 ) tmp += clen;
+ if( ( ttyp & 0x80 ) ) { /* copy WEAK marks*/
+ if( tmp != d->weak )
+ memcpy( d->weak, tmp, clen );
+ tmp -= clen;
+ } else { /* clear WEAK marks*/
+ memset( d->weak, 0, clen );
+ }
+ if( ttyp & 0x02 ) { /* copy FM marks */
+ if( tmp != d->fm )
+ memcpy( d->fm, tmp, clen );
+ tmp -= clen;
+ } else { /* set/clear FM marks*/
+ memset( d->fm, ttyp & 0x01 ? 0xff : 0, clen );
+ if( tlen % 8 ) { /* adjust last byte */
+ d->fm[clen - 1] &= mask[ tlen % 8 ];
+ }
+ }
+ /* copy clock if needed */
+ if( tmp != d->clocks )
+ memcpy( d->clocks, tmp, clen );
+ }
+}
+
+/* calculate track len from type, if type eq. 0x00/0x01/0x02/0x80/0x81/0x82
+ !!! not for 0x83 nor 0xf0 !!!
+*/
+#define UDI_TLEN( type, bpt ) ( ( bpt ) + DISK_CLEN( bpt ) * ( 1 + \
+ ( type & 0x02 ? 1 : 0 ) + \
+ ( type & 0x80 ? 1 : 0 ) ) )
+
+static int
+udi_uncompress_tracks( disk_t *d )
+{
+ int i;
+ libspectrum_byte *data = NULL;
+#ifdef LIBSPECTRUM_SUPPORTS_ZLIB_COMPRESSION
+ size_t data_size = 0;
+ int bpt, tlen, clen, ttyp;
+#endif /* #ifdef LIBSPECTRUM_SUPPORTS_ZLIB_COMPRESSION */
+
+ for( i = 0; i < d->sides * d->cylinders; i++ ) {
+ DISK_SET_TRACK_IDX( d, i );
+ if( d->track[-1] != 0xf0 ) continue; /* if not compressed */
+
+#ifndef LIBSPECTRUM_SUPPORTS_ZLIB_COMPRESSION
+ /* if libspectrum cannot support */
+ return d->status = DISK_UNSUP;
+#else /* #ifndef LIBSPECTRUM_SUPPORTS_ZLIB_COMPRESSION */
+ clen = d->track[-3] + 256 * d->track[-2] + 1;
+ ttyp = d->track[0]; /* compressed track type */
+ bpt = d->track[1] + 256 * d->track[2]; /* compressed track len... */
+ tlen = UDI_TLEN( ttyp, bpt );
+ d->track[-1] = ttyp;
+ d->track[-3] = d->track[1];
+ d->track[-2] = d->track[2];
+ if( udi_read_compressed( d->track + 3, clen, tlen, &data, &data_size ) ) {
+ if( data ) libspectrum_free( data );
+ return d->status = DISK_UNSUP;
+ }
+ memcpy( d->track, data, tlen ); /* read track */
+#endif /* #ifndef LIBSPECTRUM_SUPPORTS_ZLIB_COMPRESSION */
+ }
+ if( data ) libspectrum_free( data );
+ return DISK_OK;
+}
+
+#ifdef LIBSPECTRUM_SUPPORTS_ZLIB_COMPRESSION
+static int
+udi_compress_tracks( disk_t *d )
+{
+ int i, tlen;
+ libspectrum_byte *data = NULL;
+ size_t clen, data_size = 0;
+
+ for( i = 0; i < d->sides * d->cylinders; i++ ) {
+ DISK_SET_TRACK_IDX( d, i );
+ if( d->track[-1] == 0xf0 ) continue; /* already compressed??? */
+
+ tlen = UDI_TLEN( d->track[-1], d->track[-3] + 256 * d->track[-2] );
+ /* if fail to compress, skip ... */
+ if( udi_write_compressed( d->track, tlen, &clen, &data, &data_size ) ||
+ clen < 1 ) continue;
+ /* if compression too large, skip... */
+ if( clen > 65535 || clen >= tlen ) continue;
+ d->track[0] = d->track[-1]; /* track type... */
+ d->track[1] = d->track[-3]; /* compressed track len... */
+ d->track[2] = d->track[-2]; /* compressed track len... */
+ memcpy( d->track + 3, data, clen ); /* read track */
+ clen--;
+ d->track[-1] = 0xf0;
+ d->track[-3] = clen & 0xff;
+ d->track[-2] = ( clen >> 8 ) & 0xff;
+ }
+ if( data ) libspectrum_free( data );
+ return DISK_OK;
+}
+#endif /* #ifdef LIBSPECTRUM_SUPPORTS_ZLIB_COMPRESSION */
+
+static int
open_udi( buffer_t *buffer, disk_t *d )
{
- int i, j, bpt;
+ int i, bpt, ttyp, tlen, error;
+ size_t clen, eof;
+ libspectrum_dword crc;
+ crc = ~(libspectrum_dword) 0;
+
+ /* check file length */
+ eof = buff[4] + 256 * buff[5] + 65536 * buff[6] + 16777216 * buff[7];
+ if( eof != buffer->file.length - 4 )
+ return d->status = DISK_OPEN;
+ /* check CRC32 */
+ for( i = 0; i < eof; i++ )
+ crc = crc_udi( crc, buff[i] );
+ if( crc != buff[eof] + 256 * buff[eof + 1] + 65536 * buff[eof + 2] +
+ 16777216 * buff[eof + 3] )
+ return d->status = DISK_OPEN;
+
d->sides = buff[10] + 1;
d->cylinders = buff[9] + 1;
GEOM_CHECK;
@@ -752,15 +1002,35 @@
d->bpt = 0;
/* scan file for the longest track */
- for( i = 0; i < d->sides * d->cylinders; i++ ) {
+ for( i = 0; buffer->index < eof; i++ ) {
if( buffavail( buffer ) < 3 )
return d->status = DISK_OPEN;
- if( buff[0] != 0x00 )
+ ttyp = buff[0];
+ if( ttyp != 0x00 && ttyp != 0x01 && ttyp != 0x02 && ttyp != 0x80 &&
+ ttyp != 0x81 && ttyp != 0x82 && ttyp != 0x83 && ttyp != 0xf0 )
return d->status = DISK_UNSUP;
- bpt = buff[1] + 256 * buff[2]; /* current track len... */
+
+ /* if libspectrum cannot suppot*/
+#ifndef LIBSPECTRUM_SUPPORTS_ZLIB_COMPRESSION
+ if( ttyp == 0xf0 ) d->status = DISK_UNSUP;
+#endif /* #ifndef LIBSPECTRUM_SUPPORTS_ZLIB_COMPRESSION */
+ if( ttyp == 0x83 ) { /* multiple read */
+ if( i == 0 ) return d->status = DISK_GEOM; /* cannot be first track */
+ i--; bpt = 0; /* not a real track */
+ tlen = buff[1] + 256 * buff[2]; /* current track len... */
+ tlen = ( tlen & 0xfff8 ) * ( tlen & 0x07 );
+ } else if( ttyp == 0xf0 ) { /* compressed track */
+ if( buffavail( buffer ) < 7 )
+ return d->status = DISK_OPEN;
+ bpt = buff[4] + 256 * buff[5];
+ tlen = 7 + buff[1] + 256 * buff[2];
+ } else {
+ bpt = buff[1] + 256 * buff[2]; /* current track len... */
+ tlen = 3 + UDI_TLEN( ttyp, bpt );
+ }
if( bpt > d->bpt )
d->bpt = bpt;
- if( buffseek( buffer, 3 + bpt + bpt / 8 + ( bpt % 8 ? 1 : 0 ), SEEK_CUR ) == -1 )
+ if( buffseek( buffer, tlen, SEEK_CUR ) == -1 )
return d->status = DISK_OPEN;
}
@@ -768,33 +1038,46 @@
return d->status = DISK_GEOM;
bpt = d->bpt; /* save the maximal value */
- d->tlen = bpt + bpt / 8 + ( bpt % 8 ? 1 : 0 );
+ d->tlen = 3 + bpt + 3 * DISK_CLEN( bpt );
d->bpt = 0; /* we know exactly the track len... */
if( disk_alloc( d ) != DISK_OK )
return d->status;
d->bpt = bpt; /* restore the maximal byte per track */
buffer->index = 16;
- d->track = d->data;
- for( i = 0; i < d->sides * d->cylinders; i++ ) {
+ for( i = 0; buffer->index < eof; i++ ) {
+ DISK_SET_TRACK_IDX( d, i );
+ ttyp = buff[0];
bpt = buff[1] + 256 * buff[2]; /* current track len... */
- buffer->index += 3;
+ clen = DISK_CLEN( bpt );
+
+ memset( d->track, d->bpt, 0x4e ); /* fillup */
/* read track + clocks */
- if( d->bpt == bpt ) { /* if udi track length equal with the maximal track length */
- buffread( d->track, bpt + bpt / 8 + ( bpt % 8 ? 1 : 0 ), buffer );
+ if( ttyp == 0x83 ) { /* multiple read */
+ i--; /* not a real track */
+ DISK_SET_TRACK_IDX( d, i ); /* back to previouse track */
+ d->weak += buff[3] + 256 * buff[4]; /* add offset to weak */
+ tlen = ( buff[1] + 256 * buff[2] ) >> 3; /* weak len in bytes */
+ for( tlen--; tlen >= 0; tlen-- )
+ d->weak[tlen] = 0xff;
+ tlen = buff[1] + 256 * buff[2]; /* current track len... */
+ tlen = ( tlen & 0xfff8 ) * ( tlen & 0x07 );
+ buffseek( buffer, tlen, SEEK_CUR );
} else {
- buffread( d->track, bpt, buffer ); /* first the data */
- d->track += bpt;
- for( j = d->bpt - bpt; j > 0; j--, d->track++ )
- *d->track = 0x4e; /* fill track data with 0x4e */
- buffread( d->track, bpt / 8 + ( bpt % 8 ? 1 : 0 ), buffer );
- d->track += bpt / 8 + ( bpt % 8 ? 1 : 0 );
- for( j = ( d->bpt / 8 + ( d->bpt % 8 ? 1 : 0 ) ) -
- ( bpt / 8 + ( bpt % 8 ? 1 : 0 ) ); j > 0; j--, d->track++ )
- *d->track = 0x00; /* fill the clocks with 0x00 */
+ if( ttyp == 0xf0 ) /* compressed */
+ tlen = bpt + 4;
+ else
+ tlen = UDI_TLEN( ttyp, bpt );
+ d->track[-1] = ttyp;
+ d->track[-3] = buff[1];
+ d->track[-2] = buff[2];
+ buffer->index += 3;
+ buffread( d->track, tlen, buffer ); /* first read data */
}
- d->track += d->tlen;
}
+ error = udi_uncompress_tracks( d );
+ if( error ) return error;
+ udi_unpack_tracks( d );
return d->status = DISK_OK;
}
@@ -990,12 +1273,11 @@
buffread( head, 7, buffer ); /* 7 = track head */
track_offset = head[0x00] + 256 * head[0x01] +
65536 * head[0x02] + 16777216 * head[0x03];
- d->track = d->data + i * d->tlen; d->clocks = d->track + d->bpt;
+ DISK_SET_TRACK_IDX( d, i );
d->i = 0;
if( preindex )
preindex_add( d, gap );
postindex_add( d, gap );
- bpt = 0;
for( j = 0; j < head[0x06]; j++ ) {
if( j % 35 == 0 ) { /* if we have more than 35 sector in a track,
we have to seek back to the next sector
@@ -1012,7 +1294,7 @@
data_add( d, buffer, NULL, ( head[ 0x0b + 7 * ( j % 35 ) ] & 0x3f ) == 0 ?
-1 : 0x80 << head[ 0x0a + 7 * ( j % 35 ) ],
head[ 0x0b + 7 * ( j % 35 ) ] & 0x80 ? DDAM : NO_DDAM,
- gap, CRC_OK, NO_AUTOFILL );
+ gap, CRC_OK, NO_AUTOFILL, NULL );
}
head_offset += 7 + 7 * head[0x06];
gap4_add( d, gap );
@@ -1020,6 +1302,28 @@
return d->status = DISK_OK;
}
+static void
+cpc_set_weak_range( disk_t *d, int idx, buffer_t *buffer, int n, int len )
+{
+ int i, j, first = -1, last = -1;
+ libspectrum_byte *t, *w;
+
+ t = d->track + idx;
+ w = buffer->file.buffer + buffer->index;
+
+ for( i = 0; i < len; i++, t++, w++ ) {
+ for( j = 0; j < n - 1; j ++ ) {
+ if( *t != w[j * len] ) {
+ if( first == -1 ) first = idx + i;
+ last = idx + i;
+ }
+ }
+ }
+ for( ; first <= last; first++ ) {
+ bitmap_set( d->weak, first );
+ }
+}
+
#define CPC_ISSUE_NONE 0
#define CPC_ISSUE_1 1
#define CPC_ISSUE_2 2
@@ -1030,7 +1334,7 @@
static int
open_cpc( buffer_t *buffer, disk_t *d, int preindex )
{
- int i, j, seclen, idlen, gap, sector_pad;
+ int i, j, seclen, idlen, gap, sector_pad, idx;
int bpt, max_bpt = 0, trlen;
int fix[84], plus3_fix;
unsigned char *hdrb;
@@ -1122,7 +1426,7 @@
if( disk_alloc( d ) != DISK_OK )
return d->status;
- d->track = d->data; d->clocks = d->track + d->bpt;
+ DISK_SET_TRACK_IDX( d, 0 );
buffer->index = 256; /* rewind to first track */
for( i = 0; i < d->sides*d->cylinders; i++ ) {
hdrb = buff;
@@ -1130,7 +1434,7 @@
gap = (unsigned char)hdrb[0x16] == 0xff ? GAP_MINIMAL_FM : GAP_MINIMAL_MFM;
i = hdrb[0x10] * d->sides + hdrb[0x11]; /* adjust track No. */
- d->track = d->data + i * d->tlen; d->clocks = d->track + d->bpt;
+ DISK_SET_TRACK_IDX( d, i );
d->i = 0;
if( preindex)
preindex_add( d, gap );
@@ -1158,7 +1462,7 @@
data_add( d, buffer, NULL, seclen,
hdrb[ 0x1d + 8 * j ] & 0x40 ? DDAM : NO_DDAM, gap,
hdrb[ 0x1c + 8 * j ] & 0x20 && hdrb[ 0x1d + 8 * j ] & 0x20 ?
- CRC_ERROR : CRC_OK, 0x00 );
+ CRC_ERROR : CRC_OK, 0x00, NULL );
} else if( i < 84 && fix[i] == CPC_ISSUE_2 && j == 0 ) { /* 6144, 10x512 */
datamark_add( d, hdrb[ 0x1d + 8 * j ] & 0x40 ? DDAM : NO_DDAM, gap );
gap_add( d, 2, gap );
@@ -1167,13 +1471,13 @@
data_add( d, buffer, NULL, 128,
hdrb[ 0x1d + 8 * j ] & 0x40 ? DDAM : NO_DDAM, gap,
hdrb[ 0x1c + 8 * j ] & 0x20 && hdrb[ 0x1d + 8 * j ] & 0x20 ?
- CRC_ERROR : CRC_OK, 0x00 );
+ CRC_ERROR : CRC_OK, 0x00, NULL );
buffer->index += seclen - 128;
} else if( i < 84 && fix[i] == CPC_ISSUE_4 ) { /* Nx8192 (max 6384 byte ) */
data_add( d, buffer, NULL, 6384,
hdrb[ 0x1d + 8 * j ] & 0x40 ? DDAM : NO_DDAM, gap,
hdrb[ 0x1c + 8 * j ] & 0x20 && hdrb[ 0x1d + 8 * j ] & 0x20 ?
- CRC_ERROR : CRC_OK, 0x00 );
+ CRC_ERROR : CRC_OK, 0x00, NULL );
buffer->index += seclen - 6384;
} else if( i < 84 && fix[i] == CPC_ISSUE_5 ) { /* 9x512 */
/* 512 256 512 256 512 256 512 256 512 */
@@ -1181,22 +1485,22 @@
data_add( d, NULL, buff, 512,
hdrb[ 0x1d + 8 * j ] & 0x40 ? DDAM : NO_DDAM, gap,
hdrb[ 0x1c + 8 * j ] & 0x20 && hdrb[ 0x1d + 8 * j ] & 0x20 ?
- CRC_ERROR : CRC_OK, 0x00 );
+ CRC_ERROR : CRC_OK, 0x00, NULL );
buffer->index += idlen;
} else {
data_add( d, buffer, NULL, idlen,
hdrb[ 0x1d + 8 * j ] & 0x40 ? DDAM : NO_DDAM, gap,
hdrb[ 0x1c + 8 * j ] & 0x20 && hdrb[ 0x1d + 8 * j ] & 0x20 ?
- CRC_ERROR : CRC_OK, 0x00 );
+ CRC_ERROR : CRC_OK, 0x00, NULL );
}
} else {
data_add( d, buffer, NULL, seclen > idlen ? idlen : seclen,
hdrb[ 0x1d + 8 * j ] & 0x40 ? DDAM : NO_DDAM, gap,
hdrb[ 0x1c + 8 * j ] & 0x20 && hdrb[ 0x1d + 8 * j ] & 0x20 ?
- CRC_ERROR : CRC_OK, 0x00 );
+ CRC_ERROR : CRC_OK, 0x00, &idx );
if( seclen > idlen ) { /* weak sector with multiple copy */
- buffer->index +=( seclen / ( 0x80 << hdrb[ 0x1b + 8 * j ] ) - 1 ) *
- ( 0x80 << hdrb[ 0x1b + 8 * j ] );
+ cpc_set_weak_range( d, idx, buffer, seclen / idlen, idlen );
+ buffer->index += ( seclen / idlen - 1 ) * idlen;
/* ( ( N * len ) / len - 1 ) * len */
}
}
@@ -1236,8 +1540,7 @@
return d->status = DISK_GEOM; /* too many file */
buffer->index = 9; /* read SCL entries */
- d->track = d->data; /* track 0 */
- d->clocks = d->track + d->bpt;
+ DISK_SET_TRACK_IDX( d, 0 );
d->i = 0;
postindex_add( d, GAP_TRDOS );
scl_i = d->i; /* the position of first sector */
@@ -1266,7 +1569,7 @@
if( j == 256 ) { /* one sector ready */
d->i = scl_i + ( ( s - 1 ) % 8 * 2 + ( s - 1 ) / 8 ) * seclen; /* 1 9 2 10 3 ... */
id_add( d, 0, 0, s, SECLEN_256, GAP_TRDOS, CRC_OK );
- data_add( d, NULL, head, 256, NO_DDAM, GAP_TRDOS, CRC_OK, NO_AUTOFILL );
+ data_add( d, NULL, head, 256, NO_DDAM, GAP_TRDOS, CRC_OK, NO_AUTOFILL, NULL );
memset( head, 0, 256 );
s++;
j = 0;
@@ -1276,7 +1579,7 @@
if( j != 0 ) { /* we have to add this sector */
d->i = scl_i + ( ( s - 1 ) % 8 * 2 + ( s - 1 ) / 8 ) * seclen; /* 1 9 2 10 3 ... */
id_add( d, 0, 0, s, SECLEN_256, GAP_TRDOS, CRC_OK );
- data_add( d, NULL, head, 256, NO_DDAM, GAP_TRDOS, CRC_OK, NO_AUTOFILL );
+ data_add( d, NULL, head, 256, NO_DDAM, GAP_TRDOS, CRC_OK, NO_AUTOFILL, NULL );
s++;
}
/* and add empty sectors up to No. 16 */
@@ -1296,7 +1599,7 @@
head[244] = scl_deleted; /* number of deleted files */
memcpy( head + 245, "FUSE-SCL", 8 );
}
- data_add( d, NULL, head, 256, NO_DDAM, GAP_TRDOS, CRC_OK, NO_AUTOFILL );
+ data_add( d, NULL, head, 256, NO_DDAM, GAP_TRDOS, CRC_OK, NO_AUTOFILL, NULL );
if( s == 9 )
memset( head, 0, 256 ); /* clear sector data... */
}
@@ -1346,7 +1649,6 @@
return d->status = DISK_OPEN;
if( buff[1] + 1 > d->cylinders ) /* find the biggest cylinder number */
d->cylinders = buff[1] + 1;
- bpt = 0;
sector_offset = track_offset + 4;
mfm = buff[2] & 0x80 ? 0 : 1; /* 0x80 == 1 => SD track */
bpt = postindex_len( d, mfm_old || mfm ? GAP_MINIMAL_FM : GAP_MINIMAL_MFM ) +
@@ -1382,15 +1684,14 @@
if( disk_alloc( d ) != DISK_OK )
return d->status;
- d->track = d->data; d->clocks = d->track + d->bpt;
+ DISK_SET_TRACK_IDX( d, 0 );
buffer->index = data_offset; /* first track header */
while( 1 ) {
if( ( sectors = buff[0] ) == 255 ) /* sector number 255 => end of tracks */
break;
- d->track = d->data + ( d->sides * buff[1] + ( buff[2] & 0x01 ) ) * d->tlen;
- d->clocks = d->track + d->bpt;
+ DISK_SET_TRACK( d, ( buff[2] & 0x01 ), buff[1] );
d->i = 0;
/* later teledisk -> if buff[2] & 0x80 -> FM track */
gap = mfm_old || buff[2] & 0x80 ? GAP_MINIMAL_FM : GAP_MINIMAL_MFM;
@@ -1418,7 +1719,7 @@
return d->status = DISK_OPEN;
}
if( data_add( d, buffer, NULL, hdrb[6] + 256 * hdrb[7] - 1,
- hdrb[4] & 0x04 ? DDAM : NO_DDAM, gap, CRC_OK, NO_AUTOFILL ) ) {
+ hdrb[4] & 0x04 ? DDAM : NO_DDAM, gap, CRC_OK, NO_AUTOFILL, NULL ) ) {
if( uncomp_buff )
free( uncomp_buff );
return d->status = DISK_OPEN;
@@ -1443,7 +1744,7 @@
i += 2 * ( hdrb[9] + 256 * hdrb[10] );
}
if( data_add( d, NULL, uncomp_buff, hdrb[6] + 256 * hdrb[7] - 1,
- hdrb[4] & 0x04 ? DDAM : NO_DDAM, gap, CRC_OK, NO_AUTOFILL ) ) {
+ hdrb[4] & 0x04 ? DDAM : NO_DDAM, gap, CRC_OK, NO_AUTOFILL, NULL ) ) {
free( uncomp_buff );
return d->status = DISK_OPEN;
}
@@ -1482,7 +1783,7 @@
}
}
if( data_add( d, NULL, uncomp_...
[truncated message content] |
|
From: <fr...@us...> - 2010-10-07 11:32:05
|
Revision: 648
http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=648&view=rev
Author: fredm
Date: 2010-10-07 11:31:54 +0000 (Thu, 07 Oct 2010)
Log Message:
-----------
Load . into vendor/fuse-emulator/current.
Modified Paths:
--------------
vendor/fuse-emulator/current/fuse/ChangeLog
vendor/fuse-emulator/current/fuse/README
vendor/fuse-emulator/current/fuse/configure.in
vendor/fuse-emulator/current/fuse/disk/beta.c
vendor/fuse-emulator/current/fuse/disk/disk.c
vendor/fuse-emulator/current/fuse/fuse.c
vendor/fuse-emulator/current/fuse/hacking/ChangeLog
vendor/fuse-emulator/current/fuse/ide/divide.c
vendor/fuse-emulator/current/fuse/ide/divide.h
vendor/fuse-emulator/current/fuse/ide/ide.c
vendor/fuse-emulator/current/fuse/ide/ide.h
vendor/fuse-emulator/current/fuse/ide/simpleide.c
vendor/fuse-emulator/current/fuse/ide/simpleide.h
vendor/fuse-emulator/current/fuse/ide/zxatasp.c
vendor/fuse-emulator/current/fuse/ide/zxatasp.h
vendor/fuse-emulator/current/fuse/ide/zxcf.c
vendor/fuse-emulator/current/fuse/ide/zxcf.h
vendor/fuse-emulator/current/fuse/lib/Makefile.am
vendor/fuse-emulator/current/fuse/lib/compressed/disk_plus3.szx
vendor/fuse-emulator/current/fuse/lib/compressed/tape_128.szx
vendor/fuse-emulator/current/fuse/lib/compressed/tape_16.szx
vendor/fuse-emulator/current/fuse/lib/compressed/tape_2048.szx
vendor/fuse-emulator/current/fuse/lib/compressed/tape_2068.szx
vendor/fuse-emulator/current/fuse/lib/compressed/tape_48.szx
vendor/fuse-emulator/current/fuse/lib/compressed/tape_pentagon.szx
vendor/fuse-emulator/current/fuse/lib/compressed/tape_plus2.szx
vendor/fuse-emulator/current/fuse/lib/compressed/tape_plus2a.szx
vendor/fuse-emulator/current/fuse/lib/compressed/tape_plus3.szx
vendor/fuse-emulator/current/fuse/lib/compressed/tape_plus3e.szx
vendor/fuse-emulator/current/fuse/lib/compressed/tape_scorpion.szx
vendor/fuse-emulator/current/fuse/lib/compressed/tape_se.szx
vendor/fuse-emulator/current/fuse/lib/compressed/tape_ts2068.szx
vendor/fuse-emulator/current/fuse/lib/uncompressed/disk_plus3.szx
vendor/fuse-emulator/current/fuse/lib/uncompressed/tape_128.szx
vendor/fuse-emulator/current/fuse/lib/uncompressed/tape_16.szx
vendor/fuse-emulator/current/fuse/lib/uncompressed/tape_2048.szx
vendor/fuse-emulator/current/fuse/lib/uncompressed/tape_2068.szx
vendor/fuse-emulator/current/fuse/lib/uncompressed/tape_48.szx
vendor/fuse-emulator/current/fuse/lib/uncompressed/tape_pentagon.szx
vendor/fuse-emulator/current/fuse/lib/uncompressed/tape_plus2.szx
vendor/fuse-emulator/current/fuse/lib/uncompressed/tape_plus2a.szx
vendor/fuse-emulator/current/fuse/lib/uncompressed/tape_plus3.szx
vendor/fuse-emulator/current/fuse/lib/uncompressed/tape_plus3e.szx
vendor/fuse-emulator/current/fuse/lib/uncompressed/tape_scorpion.szx
vendor/fuse-emulator/current/fuse/lib/uncompressed/tape_se.szx
vendor/fuse-emulator/current/fuse/lib/uncompressed/tape_ts2068.szx
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/man/fuse.1
vendor/fuse-emulator/current/fuse/menu.c
vendor/fuse-emulator/current/fuse/menu.h
vendor/fuse-emulator/current/fuse/rzx.c
vendor/fuse-emulator/current/fuse/rzx.h
vendor/fuse-emulator/current/fuse/settings.pl
vendor/fuse-emulator/current/fuse/sound/coreaudiosound.c
vendor/fuse-emulator/current/fuse/tape.c
vendor/fuse-emulator/current/fuse/ui/gtk/gtkdisplay.c
vendor/fuse-emulator/current/fuse/ui/gtk/gtkkeyboard.c
vendor/fuse-emulator/current/fuse/ui/gtk/gtkui.c
vendor/fuse-emulator/current/fuse/ui/gtk/statusbar.c
vendor/fuse-emulator/current/fuse/ui/gtk/stock.c
vendor/fuse-emulator/current/fuse/ui/win32/installer/fuse.nsi
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/windres.rc
vendor/fuse-emulator/current/fuse-utils/Makefile.am
vendor/fuse-emulator/current/fuse-utils/acinclude.m4
vendor/fuse-emulator/current/fuse-utils/configure.in
vendor/fuse-emulator/current/fuse-utils/converter/romloader.cc
vendor/fuse-emulator/current/fuse-utils/hacking/ChangeLog
vendor/fuse-emulator/current/fuse-utils/man/snapconv.1
vendor/fuse-emulator/current/fuse-utils/man/tzxlist.1
vendor/fuse-emulator/current/fuse-utils/raw2hdf.c
vendor/fuse-emulator/current/fuse-utils/snapconv.c
vendor/fuse-emulator/current/fuse-utils/tzxlist.c
vendor/fuse-emulator/current/libspectrum/ChangeLog
vendor/fuse-emulator/current/libspectrum/Makefile.am
vendor/fuse-emulator/current/libspectrum/README
vendor/fuse-emulator/current/libspectrum/configure.in
vendor/fuse-emulator/current/libspectrum/doc/libspectrum.txt
vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog
vendor/fuse-emulator/current/libspectrum/libspectrum.c
vendor/fuse-emulator/current/libspectrum/libspectrum.h.in
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_block.c
vendor/fuse-emulator/current/libspectrum/test/test.c
vendor/fuse-emulator/current/libspectrum/timings.c
vendor/fuse-emulator/current/libspectrum/z80.c
Added Paths:
-----------
vendor/fuse-emulator/current/fuse/lib/compressed/tape_48_ntsc.szx
vendor/fuse-emulator/current/fuse/lib/uncompressed/tape_48_ntsc.szx
vendor/fuse-emulator/current/fuse/machines/spec48_ntsc.c
vendor/fuse-emulator/current/fuse-utils/config.rpath
vendor/fuse-emulator/current/libspectrum/test/empty.szx
vendor/fuse-emulator/current/libspectrum/test/plus3.z80
vendor/fuse-emulator/current/libspectrum/windres.rc
Modified: vendor/fuse-emulator/current/fuse/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse/ChangeLog 2010-09-28 11:58:20 UTC (rev 647)
+++ vendor/fuse-emulator/current/fuse/ChangeLog 2010-10-07 11:31:54 UTC (rev 648)
@@ -1,6 +1,6 @@
-2010-xx-xx Philip Kendall <phi...@sh...>
+2010-10-xx Philip Kendall <phi...@sh...>
- * Fuse 0.11.0 released
+ * Fuse 1.0.0 released.
* Add Opus Discovery disk interface support (Gergely Szasz and Fredrick
Meunier).
@@ -8,6 +8,8 @@
* Many improvements to Win32 UI, including an installer (Marek
Januszewski).
* Support weak data in +3 disk images (Gergely Szasz).
+ * NTSC Spectrum support (Philip Kendall, with thanks to Claudio
+ Bernet).
* Add support for flipping disk images in single sided drives (Gergely
Szasz).
* Add support for automatically merging both both disk images where
@@ -47,8 +49,6 @@
notebooks (thanks, Andrew Owen) (Fredrick Meunier).
* Fixes for speed estimation (Gergely Szasz).
* Fix border colour in Timex HiRes screenshots (Fredrick Meunier).
- * Fix accelerated loaders when compiling with gcc 3.x (Carlos
- Almeida, Alberto Garcia and Philip Kendall).
* Allow "combo" boxes in widget UI (Gergely Szasz).
* Allow Home and End keys to work in widget UI (Gergely Szasz).
* Fix poke finder passing the wrong page to the debugger (Marek
@@ -1035,4 +1035,4 @@
* Version 0.1.0 released.
-$Id: ChangeLog 4134 2010-05-21 13:16:19Z fredm $
+$Id: ChangeLog 4165 2010-09-30 21:55:05Z pak21 $
Modified: vendor/fuse-emulator/current/fuse/README
===================================================================
--- vendor/fuse-emulator/current/fuse/README 2010-09-28 11:58:20 UTC (rev 647)
+++ vendor/fuse-emulator/current/fuse/README 2010-10-07 11:31:54 UTC (rev 648)
@@ -1,5 +1,5 @@
-The Free Unix Spectrum Emulator (Fuse) 0.10.0.2
-===============================================
+The Free Unix Spectrum Emulator (Fuse) 1.0.0
+============================================
Fuse (the Free Unix Spectrum Emulator) was originally, and somewhat
unsurprisingly, an emulator of the ZX Spectrum (a popular 1980s home
@@ -209,11 +209,11 @@
and the Fuse project page on SourceForge,
http://sourceforge.net/projects/fuse-emulator/
-If you're interested in more general Speccy related discussions, visit
-the Usenet group 'comp.sys.sinclair', but do read the FAQ
-( http://www.worldofspectrum.org/faq/index.html ) first!
+For Spectrum discussions not directly related to Fuse, visit either the
+Usenet newsgroup `comp.sys.sinclair' or the World of Spectrum forums
+<http://www.worldofspectrum.org/forums/>.
Philip Kendall <phi...@sh...>
-14 January 2009
+FIXME October 2010
-$Id: README 4132 2010-05-20 12:06:53Z fredm $
+$Id: README 4172 2010-10-03 22:51:59Z pak21 $
Modified: vendor/fuse-emulator/current/fuse/configure.in
===================================================================
--- vendor/fuse-emulator/current/fuse/configure.in 2010-09-28 11:58:20 UTC (rev 647)
+++ vendor/fuse-emulator/current/fuse/configure.in 2010-10-07 11:31:54 UTC (rev 648)
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-dnl $Id: configure.in 4132 2010-05-20 12:06:53Z fredm $
+dnl $Id: configure.in 4175 2010-10-06 10:44:19Z fredm $
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
@@ -23,8 +23,10 @@
AM_CONFIG_HEADER(config.h)
AC_CANONICAL_SYSTEM
+define(FUSE_VERSION, [0.10.0.2])
+
dnl Use automake to produce `Makefile.in'
-AM_INIT_AUTOMAKE(fuse, 0.10.0.2)
+AM_INIT_AUTOMAKE(fuse, FUSE_VERSION)
dnl Checks for programs.
AC_PROG_CC
@@ -40,8 +42,10 @@
AC_SUBST(WINDRES)
if test "$WINDRES" != no; then
WINDRES_OBJ="windres.o"
+ AC_DEFINE([VERSION_WIN32], [translit(FUSE_VERSION, [.], [,])], [Define version information for win32 executable])
fi
AC_SUBST(WINDRES_OBJ)
+AM_SUBST_NOTMAKE(WINDRES_OBJ)
dnl Generate commandy.h
YFLAGS="$YFLAGS -d"
@@ -247,7 +251,11 @@
fi
dnl Check for the MIT-SHM extension
- AC_CHECK_HEADERS( X11/extensions/XShm.h )
+ AC_CHECK_HEADERS( X11/extensions/XShm.h,,,[[
+ #include <sys/ipc.h>
+ #include <sys/shm.h>
+ #include <X11/Xlib.h>
+ ]])
AC_CHECK_LIB( Xext, XShmAttach, LIBS="$LIBS -lXext" )
AC_DEFINE([UI_X], 1, [Defined if Xlib UI in use])
Modified: vendor/fuse-emulator/current/fuse/disk/beta.c
===================================================================
--- vendor/fuse-emulator/current/fuse/disk/beta.c 2010-09-28 11:58:20 UTC (rev 647)
+++ vendor/fuse-emulator/current/fuse/disk/beta.c 2010-10-07 11:31:54 UTC (rev 648)
@@ -1,7 +1,7 @@
/* beta.c: Routines for handling the Beta disk interface
Copyright (c) 2004-2008 Stuart Brady
- $Id: beta.c 4131 2010-05-19 10:52:37Z fredm $
+ $Id: beta.c 4147 2010-08-19 12:25:15Z 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
@@ -65,6 +65,8 @@
int beta_active = 0;
int beta_builtin = 0;
+static libspectrum_byte beta_system_register; /* FDC system register */
+
libspectrum_word beta_pc_mask;
libspectrum_word beta_pc_value;
@@ -365,6 +367,8 @@
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;
+
+ beta_system_register = b;
}
libspectrum_byte
@@ -725,7 +729,6 @@
void
beta_to_snapshot( libspectrum_snap *snap )
{
- int attached;
wd_fdc *f = beta_fdc;
libspectrum_byte *buffer;
int drive_count = 0;
@@ -759,9 +762,9 @@
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_status( snap, f->status_register );
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 ) );
+ libspectrum_snap_set_beta_system( snap, beta_system_register );
}
Modified: vendor/fuse-emulator/current/fuse/disk/disk.c
===================================================================
--- vendor/fuse-emulator/current/fuse/disk/disk.c 2010-09-28 11:58:20 UTC (rev 647)
+++ vendor/fuse-emulator/current/fuse/disk/disk.c 2010-10-07 11:31:54 UTC (rev 648)
@@ -1,7 +1,7 @@
/* disk.c: Routines for handling disk images
Copyright (c) 2007-2010 Gergely Szasz
- $Id: disk.c 4114 2010-01-15 13:45:51Z fredm $
+ $Id: disk.c 4141 2010-07-19 11:30:21Z 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
@@ -102,6 +102,8 @@
size_t index;
} buffer_t;
+void disk_update_tlens( disk_t *d );
+
const char *
disk_strerror( int error )
{
@@ -742,6 +744,7 @@
d->wrprot = 0;
d->dirty = 0;
+ disk_update_tlens( d );
return d->status = DISK_OK;
}
Modified: vendor/fuse-emulator/current/fuse/fuse.c
===================================================================
--- vendor/fuse-emulator/current/fuse/fuse.c 2010-09-28 11:58:20 UTC (rev 647)
+++ vendor/fuse-emulator/current/fuse/fuse.c 2010-10-07 11:31:54 UTC (rev 648)
@@ -1,7 +1,7 @@
/* fuse.c: The Free Unix Spectrum Emulator
- Copyright (c) 1999-2009 Philip Kendall
+ Copyright (c) 1999-2010 Philip Kendall and others
- $Id: fuse.c 4109 2009-12-27 06:15:10Z fredm $
+ $Id: fuse.c 4165 2010-09-30 21:55:05Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -393,7 +393,7 @@
printf( "\n" );
fuse_show_version();
printf(
- "Copyright (c) 1999-2009 Philip Kendall and others; see the file\n"
+ "Copyright (c) 1999-2010 Philip Kendall and others; see the file\n"
"'AUTHORS' for more details.\n"
"\n"
"For help, please mail <fus...@li...> or use\n"
@@ -638,7 +638,7 @@
static int
do_start_files( start_files_t *start_files )
{
- int autoload, error, i;
+ int autoload, error, i, check_snapshot;
/* Can't do both input recording and playback */
if( start_files->playback && start_files->recording ) {
@@ -783,7 +783,8 @@
/* Input recordings */
if( start_files->playback ) {
- error = utils_open_file( start_files->playback, autoload, NULL );
+ check_snapshot = start_files->snapshot ? 0 : 1;
+ error = rzx_start_playback( start_files->playback, check_snapshot );
if( error ) return error;
}
Modified: vendor/fuse-emulator/current/fuse/hacking/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse/hacking/ChangeLog 2010-09-28 11:58:20 UTC (rev 647)
+++ vendor/fuse-emulator/current/fuse/hacking/ChangeLog 2010-10-07 11:31:54 UTC (rev 648)
@@ -3299,3 +3299,55 @@
changes from 0.10.0.2 onto trunk (Fred).
20100521 ChangeLog: remove duplicate entry (Fred).
20100522 sound.c: allow a little more treble in the TV Speaker mode (Fred).
+20100527 sound/coreaudiosound.c: add some casts in output statements to avoid
+ annoying warnings about format mismatches (Fred).
+20100530 ChangeLog: remove another duplicate entry (Fred).
+20100627 ui/gtk/gtkdisplay.c: ensure an appropriate scaler is selected when
+ the Fuse window is resized by the user.
+20100719 disk/disk.c: set track lengths when inserting a new disk (fixes bug
+ #3031299) (Gergely Szasz).
+20100819 disk/beta.c: correct writing of status and system regeisters to
+ snapshots (Patrik Rak).
+20100825 machine.c,machines/{Makefile.am,machines.h},tape.c: reintegrate
+ NTSC Spectrum branch.
+20100831 lib/[un]compressed/{disk_plus3.szx,tape_128.szx,tape_16.szx,
+ tape_2048.szx,tape_2068.szx,tape_48.szx,tape_pentagon.szx,
+ tape_plus2.szx,tape_plus2a.szx,tape_plus3.szx,tape_plus3e.szx,
+ tape_scorpion.szx,tape_se.szx,tape_ts2068.szx}: swap A and F and A'
+ and F' registers in autoload snapshots which were written when
+ libspectrum still suffered from bug #2857419 (fixes bug #3040262)
+ (thanks, Gergely Szasz) (Fred).
+20100831 machines/spec48_ntsc.c: add some more peripherals and add display
+ setup code (Fred).
+20100901 lib/{[un]compressed/tape_48_ntsc.szx,Makefile.am}: add autoload
+ snapshot for NTSC Spectrum (Fred).
+20100905 tape.c: remove obsolete reference to munmap (Fred).
+20100909 settings.pl: remove the 80 character limit in ini file settings
+ names+values and change 256 char path lengths to MAX_PATH (patch
+ #3013768) (Gergely Szasz).
+20100912 menu.c,rzx.[ch]: query for an initial snapshot when opening a rzx file
+ which doesn't have one as is common in competition mode rzx files
+ (patch #3054536) (Sergio Baldovi).
+20100912 configure.in,windres.rc: enhancements to Windows version encoding
+ (patch #3061430) (Sergio Baldovi).
+20100913 fuse.c,menu.[ch],rzx.[ch],utils.[ch]: extend RZX playback handling of
+ files without initial embedded snapshots to cover File->Open, the
+ command line and some miscellaneous RZX playback initialisation bugs
+ (more from patch #3054536) (Sergio Baldovi).
+20100919 ui/win32/installer/fuse.nsi: windows installer improvements; correct
+ uninstall registry key, parameterise installation directory path, add
+ version information fields, optionally register file types, make start
+ menu shortcuts optional and add desktop shortcut (patch #3069264)
+ (Sergio Baldovi).
+20100930 ChangeLog,fuse.c,man/fuse.1,README: first updates for a "1.0" release.
+20101002 lib/{compressed,uncompressed}/*.szx: update libspectrum signature in
+ each file so we know they don't have the A-F swap bug.
+20101003 README: small update to mention WoS forums.
+20101006 configure.in: update header check for XShm.h (patch #3081497) (Gergely
+ Szasz).
+20101006 ui/gtk/{gtkkeyboard.c,gtkui.c,statusbar.c,stock.c}: use F1 as shortcut to
+ open menus, set window dialogs as transient for the main window and set a
+ fixed width for the emulation speed display (patch #3081729) (Sergio
+ Baldovi).
+20101007 ui.c: don't close a disk or mdr if a write fails (patch #3058156) (thanks,
+ Crisis) (Gergely Szasz).
Modified: vendor/fuse-emulator/current/fuse/ide/divide.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ide/divide.c 2010-09-28 11:58:20 UTC (rev 647)
+++ vendor/fuse-emulator/current/fuse/ide/divide.c 2010-10-07 11:31:54 UTC (rev 648)
@@ -1,7 +1,7 @@
/* divide.c: DivIDE interface routines
Copyright (c) 2005-2008 Matthew Westcott, Philip Kendall
- $Id: divide.c 4099 2009-10-22 10:59:02Z fredm $
+ $Id: divide.c 4148 2010-08-25 21:20:50Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: vendor/fuse-emulator/current/fuse/ide/divide.h
===================================================================
--- vendor/fuse-emulator/current/fuse/ide/divide.h 2010-09-28 11:58:20 UTC (rev 647)
+++ vendor/fuse-emulator/current/fuse/ide/divide.h 2010-10-07 11:31:54 UTC (rev 648)
@@ -1,7 +1,7 @@
/* divide.h: DivIDE interface routines
Copyright (c) 2005 Matthew Westcott
- $Id: divide.h 4060 2009-07-30 13:21:38Z fredm $
+ $Id: divide.h 4148 2010-08-25 21:20:50Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: vendor/fuse-emulator/current/fuse/ide/ide.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ide/ide.c 2010-09-28 11:58:20 UTC (rev 647)
+++ vendor/fuse-emulator/current/fuse/ide/ide.c 2010-10-07 11:31:54 UTC (rev 648)
@@ -1,7 +1,7 @@
/* ide.c: Generic routines shared between the various IDE devices
Copyright (c) 2005 Philip Kendall
- $Id: ide.c 4060 2009-07-30 13:21:38Z fredm $
+ $Id: ide.c 4148 2010-08-25 21:20:50Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: vendor/fuse-emulator/current/fuse/ide/ide.h
===================================================================
--- vendor/fuse-emulator/current/fuse/ide/ide.h 2010-09-28 11:58:20 UTC (rev 647)
+++ vendor/fuse-emulator/current/fuse/ide/ide.h 2010-10-07 11:31:54 UTC (rev 648)
@@ -1,7 +1,7 @@
/* ide.h: Generic routines shared between the various IDE devices
Copyright (c) 2005 Philip Kendall
- $Id: ide.h 4060 2009-07-30 13:21:38Z fredm $
+ $Id: ide.h 4148 2010-08-25 21:20:50Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: vendor/fuse-emulator/current/fuse/ide/simpleide.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ide/simpleide.c 2010-09-28 11:58:20 UTC (rev 647)
+++ vendor/fuse-emulator/current/fuse/ide/simpleide.c 2010-10-07 11:31:54 UTC (rev 648)
@@ -3,7 +3,7 @@
2004 Philip Kendall,
2008 Fredrick Meunier
- $Id: simpleide.c 4060 2009-07-30 13:21:38Z fredm $
+ $Id: simpleide.c 4148 2010-08-25 21:20:50Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: vendor/fuse-emulator/current/fuse/ide/simpleide.h
===================================================================
--- vendor/fuse-emulator/current/fuse/ide/simpleide.h 2010-09-28 11:58:20 UTC (rev 647)
+++ vendor/fuse-emulator/current/fuse/ide/simpleide.h 2010-10-07 11:31:54 UTC (rev 648)
@@ -1,7 +1,7 @@
/* simpleide.h: Simple 8-bit IDE interface routines
Copyright (c) 2003-2004 Garry Lancaster
- $Id: simpleide.h 4060 2009-07-30 13:21:38Z fredm $
+ $Id: simpleide.h 4148 2010-08-25 21:20:50Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: vendor/fuse-emulator/current/fuse/ide/zxatasp.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ide/zxatasp.c 2010-09-28 11:58:20 UTC (rev 647)
+++ vendor/fuse-emulator/current/fuse/ide/zxatasp.c 2010-10-07 11:31:54 UTC (rev 648)
@@ -1,7 +1,7 @@
/* zxatasp.c: ZXATASP interface routines
Copyright (c) 2003-2008 Garry Lancaster and Philip Kendall
- $Id: zxatasp.c 4099 2009-10-22 10:59:02Z fredm $
+ $Id: zxatasp.c 4148 2010-08-25 21:20:50Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: vendor/fuse-emulator/current/fuse/ide/zxatasp.h
===================================================================
--- vendor/fuse-emulator/current/fuse/ide/zxatasp.h 2010-09-28 11:58:20 UTC (rev 647)
+++ vendor/fuse-emulator/current/fuse/ide/zxatasp.h 2010-10-07 11:31:54 UTC (rev 648)
@@ -2,7 +2,7 @@
Copyright (c) 2003-2004 Garry Lancaster,
2004 Philip Kendall
- $Id: zxatasp.h 4060 2009-07-30 13:21:38Z fredm $
+ $Id: zxatasp.h 4148 2010-08-25 21:20:50Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: vendor/fuse-emulator/current/fuse/ide/zxcf.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ide/zxcf.c 2010-09-28 11:58:20 UTC (rev 647)
+++ vendor/fuse-emulator/current/fuse/ide/zxcf.c 2010-10-07 11:31:54 UTC (rev 648)
@@ -1,7 +1,7 @@
/* zxcf.c: ZXCF interface routines
Copyright (c) 2003-2008 Garry Lancaster and Philip Kendall
- $Id: zxcf.c 4099 2009-10-22 10:59:02Z fredm $
+ $Id: zxcf.c 4148 2010-08-25 21:20:50Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: vendor/fuse-emulator/current/fuse/ide/zxcf.h
===================================================================
--- vendor/fuse-emulator/current/fuse/ide/zxcf.h 2010-09-28 11:58:20 UTC (rev 647)
+++ vendor/fuse-emulator/current/fuse/ide/zxcf.h 2010-10-07 11:31:54 UTC (rev 648)
@@ -2,7 +2,7 @@
Copyright (c) 2003-2004 Garry Lancaster,
2004 Philip Kendall
- $Id: zxcf.h 4060 2009-07-30 13:21:38Z fredm $
+ $Id: zxcf.h 4148 2010-08-25 21:20:50Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: vendor/fuse-emulator/current/fuse/lib/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/lib/Makefile.am 2010-09-28 11:58:20 UTC (rev 647)
+++ vendor/fuse-emulator/current/fuse/lib/Makefile.am 2010-10-07 11:31:54 UTC (rev 648)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 1999-2004 Philip Kendall
-## $Id: Makefile.am 3150 2007-09-05 14:05:00Z pak21 $
+## $Id: Makefile.am 4154 2010-08-31 14:14:34Z 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
@@ -33,6 +33,7 @@
@AUTOLOAD_SNAPS@/tape_2048.szx \
@AUTOLOAD_SNAPS@/tape_2068.szx \
@AUTOLOAD_SNAPS@/tape_48.szx \
+ @AUTOLOAD_SNAPS@/tape_48_ntsc.szx \
@AUTOLOAD_SNAPS@/tape_plus2.szx \
@AUTOLOAD_SNAPS@/tape_plus2a.szx \
@AUTOLOAD_SNAPS@/tape_plus3.szx \
@@ -51,6 +52,7 @@
compressed/tape_2048.szx \
compressed/tape_2068.szx \
compressed/tape_48.szx \
+ compressed/tape_48_ntsc.szx \
compressed/tape_plus2.szx \
compressed/tape_plus2a.szx \
compressed/tape_plus3.szx \
@@ -65,6 +67,7 @@
uncompressed/tape_2048.szx \
uncompressed/tape_2068.szx \
uncompressed/tape_48.szx \
+ uncompressed/tape_48_ntsc.szx \
uncompressed/tape_plus2.szx \
uncompressed/tape_plus2a.szx \
uncompressed/tape_plus3.szx \
Modified: vendor/fuse-emulator/current/fuse/lib/compressed/disk_plus3.szx
===================================================================
(Binary files differ)
Modified: vendor/fuse-emulator/current/fuse/lib/compressed/tape_128.szx
===================================================================
(Binary files differ)
Modified: vendor/fuse-emulator/current/fuse/lib/compressed/tape_16.szx
===================================================================
(Binary files differ)
Modified: vendor/fuse-emulator/current/fuse/lib/compressed/tape_2048.szx
===================================================================
(Binary files differ)
Modified: vendor/fuse-emulator/current/fuse/lib/compressed/tape_2068.szx
===================================================================
(Binary files differ)
Modified: vendor/fuse-emulator/current/fuse/lib/compressed/tape_48.szx
===================================================================
(Binary files differ)
Added: vendor/fuse-emulator/current/fuse/lib/compressed/tape_48_ntsc.szx
===================================================================
(Binary files differ)
Property changes on: vendor/fuse-emulator/current/fuse/lib/compressed/tape_48_ntsc.szx
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: vendor/fuse-emulator/current/fuse/lib/compressed/tape_pentagon.szx
===================================================================
(Binary files differ)
Modified: vendor/fuse-emulator/current/fuse/lib/compressed/tape_plus2.szx
===================================================================
(Binary files differ)
Modified: vendor/fuse-emulator/current/fuse/lib/compressed/tape_plus2a.szx
===================================================================
(Binary files differ)
Modified: vendor/fuse-emulator/current/fuse/lib/compressed/tape_plus3.szx
===================================================================
(Binary files differ)
Modified: vendor/fuse-emulator/current/fuse/lib/compressed/tape_plus3e.szx
===================================================================
(Binary files differ)
Modified: vendor/fuse-emulator/current/fuse/lib/compressed/tape_scorpion.szx
===================================================================
(Binary files differ)
Modified: vendor/fuse-emulator/current/fuse/lib/compressed/tape_se.szx
===================================================================
(Binary files differ)
Modified: vendor/fuse-emulator/current/fuse/lib/compressed/tape_ts2068.szx
===================================================================
(Binary files differ)
Modified: vendor/fuse-emulator/current/fuse/lib/uncompressed/disk_plus3.szx
===================================================================
(Binary files differ)
Modified: vendor/fuse-emulator/current/fuse/lib/uncompressed/tape_128.szx
===================================================================
(Binary files differ)
Modified: vendor/fuse-emulator/current/fuse/lib/uncompressed/tape_16.szx
===================================================================
(Binary files differ)
Modified: vendor/fuse-emulator/current/fuse/lib/uncompressed/tape_2048.szx
===================================================================
(Binary files differ)
Modified: vendor/fuse-emulator/current/fuse/lib/uncompressed/tape_2068.szx
===================================================================
(Binary files differ)
Modified: vendor/fuse-emulator/current/fuse/lib/uncompressed/tape_48.szx
===================================================================
(Binary files differ)
Added: vendor/fuse-emulator/current/fuse/lib/uncompressed/tape_48_ntsc.szx
===================================================================
(Binary files differ)
Property changes on: vendor/fuse-emulator/current/fuse/lib/uncompressed/tape_48_ntsc.szx
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: vendor/fuse-emulator/current/fuse/lib/uncompressed/tape_pentagon.szx
===================================================================
(Binary files differ)
Modified: vendor/fuse-emulator/current/fuse/lib/uncompressed/tape_plus2.szx
===================================================================
(Binary files differ)
Modified: vendor/fuse-emulator/current/fuse/lib/uncompressed/tape_plus2a.szx
===================================================================
(Binary files differ)
Modified: vendor/fuse-emulator/current/fuse/lib/uncompressed/tape_plus3.szx
===================================================================
(Binary files differ)
Modified: vendor/fuse-emulator/current/fuse/lib/uncompressed/tape_plus3e.szx
===================================================================
(Binary files differ)
Modified: vendor/fuse-emulator/current/fuse/lib/uncompressed/tape_scorpion.szx
===================================================================
(Binary files differ)
Modified: vendor/fuse-emulator/current/fuse/lib/uncompressed/tape_se.szx
===================================================================
(Binary files differ)
Modified: vendor/fuse-emulator/current/fuse/lib/uncompressed/tape_ts2068.szx
===================================================================
(Binary files differ)
Modified: vendor/fuse-emulator/current/fuse/machine.c
===================================================================
--- vendor/fuse-emulator/current/fuse/machine.c 2010-09-28 11:58:20 UTC (rev 647)
+++ vendor/fuse-emulator/current/fuse/machine.c 2010-10-07 11:31:54 UTC (rev 648)
@@ -1,7 +1,7 @@
/* machine.c: Routines for handling the various machine types
Copyright (c) 1999-2008 Philip Kendall
- $Id: machine.c 3937 2009-01-07 14:02:30Z pak21 $
+ $Id: machine.c 4148 2010-08-25 21:20:50Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -69,6 +69,8 @@
if (error ) return error;
error = machine_add_machine( spec48_init );
if (error ) return error;
+ error = machine_add_machine( spec48_ntsc_init );
+ if (error ) return error;
error = machine_add_machine( spec128_init );
if (error ) return error;
error = machine_add_machine( specplus2_init );
Modified: vendor/fuse-emulator/current/fuse/machines/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/machines/Makefile.am 2010-09-28 11:58:20 UTC (rev 647)
+++ vendor/fuse-emulator/current/fuse/machines/Makefile.am 2010-10-07 11:31:54 UTC (rev 648)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2004 Philip Kendall
-## $Id: Makefile.am 3341 2007-11-26 14:48:01Z zubzero $
+## $Id: Makefile.am 4148 2010-08-25 21:20:50Z pak21 $
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -36,6 +36,7 @@
spec128.c \
spec16.c \
spec48.c \
+ spec48_ntsc.c \
specplus2.c \
spec_se.c \
specplus2a.c \
Modified: vendor/fuse-emulator/current/fuse/machines/machines.h
===================================================================
--- vendor/fuse-emulator/current/fuse/machines/machines.h 2010-09-28 11:58:20 UTC (rev 647)
+++ vendor/fuse-emulator/current/fuse/machines/machines.h 2010-10-07 11:31:54 UTC (rev 648)
@@ -1,7 +1,7 @@
/* machines.h: machine specific routines
Copyright (c) 1999-2004 Philip Kendall
- $Id: machines.h 3341 2007-11-26 14:48:01Z zubzero $
+ $Id: machines.h 4148 2010-08-25 21:20:50Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -36,6 +36,7 @@
int pentagon1024_init( fuse_machine_info *machine );
int spec16_init( fuse_machine_info *machine );
+int spec48_ntsc_init( fuse_machine_info *machine );
int spec_se_init( fuse_machine_info *machine );
int specplus2_init( fuse_machine_info *machine );
int specplus2a_init( fuse_machine_info *machine );
Added: vendor/fuse-emulator/current/fuse/machines/spec48_ntsc.c
===================================================================
--- vendor/fuse-emulator/current/fuse/machines/spec48_ntsc.c (rev 0)
+++ vendor/fuse-emulator/current/fuse/machines/spec48_ntsc.c 2010-10-07 11:31:54 UTC (rev 648)
@@ -0,0 +1,103 @@
+/* spec48_ntsc.c: NTSC Spectrum 48K specific routines
+ Copyright (c) 1999-2009 Philip Kendall
+
+ $Id: spec48.c 3566 2008-03-18 12:59: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
+ 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:
+
+ E-mail: phi...@sh...
+
+*/
+
+#include <config.h>
+
+#include <stdio.h>
+
+#include <libspectrum.h>
+
+#include "joystick.h"
+#include "machine.h"
+#include "memory.h"
+#include "periph.h"
+#include "printer.h"
+#include "settings.h"
+#include "spec48.h"
+#include "spectrum.h"
+#include "ula.h"
+#include "if1.h"
+
+static int spec48_ntsc_reset( void );
+
+static const periph_t peripherals[] = {
+ { 0x0001, 0x0000, ula_read, ula_write },
+ { 0x0004, 0x0000, printer_zxp_read, printer_zxp_write },
+ { 0x00e0, 0x0000, joystick_kempston_read, NULL },
+};
+
+static const size_t peripherals_count =
+ sizeof( peripherals ) / sizeof( periph_t );
+
+int spec48_ntsc_init( fuse_machine_info *machine )
+{
+ machine->machine = LIBSPECTRUM_MACHINE_48_NTSC;
+ machine->id = "48_ntsc";
+
+ machine->reset = spec48_ntsc_reset;
+
+ machine->timex = 0;
+ machine->ram.port_from_ula = spec48_port_from_ula;
+ machine->ram.contend_delay = spectrum_contend_delay_65432100;
+ machine->ram.contend_delay_no_mreq = spectrum_contend_delay_65432100;
+
+ machine->unattached_port = spectrum_unattached_port;
+
+ machine->shutdown = NULL;
+
+ machine->memory_map = spec48_memory_map;
+
+ return 0;
+
+}
+
+static int
+spec48_ntsc_reset( void )
+{
+ int error;
+
+ error = machine_load_rom( 0, 0, settings_current.rom_48,
+ settings_default.rom_48, 0x4000 );
+ if( error ) return error;
+
+ error = periph_setup( peripherals, peripherals_count );
+ if( error ) return error;
+ periph_setup_kempston( PERIPH_PRESENT_OPTIONAL );
+ periph_setup_interface1( PERIPH_PRESENT_OPTIONAL );
+ periph_setup_interface2( PERIPH_PRESENT_OPTIONAL );
+ periph_setup_opus( PERIPH_PRESENT_OPTIONAL );
+ periph_setup_plusd( PERIPH_PRESENT_OPTIONAL );
+ periph_setup_beta128( PERIPH_PRESENT_OPTIONAL );
+ periph_setup_fuller( PERIPH_PRESENT_OPTIONAL );
+ periph_setup_melodik( PERIPH_PRESENT_OPTIONAL );
+ periph_update();
+
+ memory_current_screen = 5;
+ memory_screen_mask = 0xffff;
+
+ spec48_common_display_setup();
+
+ return spec48_common_reset();
+}
Modified: vendor/fuse-emulator/current/fuse/man/fuse.1
===================================================================
--- vendor/fuse-emulator/current/fuse/man/fuse.1 2010-09-28 11:58:20 UTC (rev 647)
+++ vendor/fuse-emulator/current/fuse/man/fuse.1 2010-10-07 11:31:54 UTC (rev 648)
@@ -1,7 +1,7 @@
.\" -*- nroff -*-
.\"
.\" fuse.1: Fuse man page
-.\" Copyright (c) 2001-2008 Russell Marks, Philip Kendall, Darren Salt,
+.\" Copyright (c) 2001-2010 Russell Marks, Philip Kendall, Darren Salt,
.\" Fredrick Meunier, Stuart Brady
.\"
.\" This program is free software; you can redistribute it and/or modify
@@ -23,7 +23,7 @@
.\" E-mail: phi...@sh...
.\"
.\"
-.TH fuse 1 "14th January, 2009" "Version 0.10.0.2" "Emulators"
+.TH fuse 1 "FIXME October, 2010" "Version 1.0.0" "Emulators"
.\"
.\"------------------------------------------------------------------
.\"
Modified: vendor/fuse-emulator/current/fuse/menu.c
===================================================================
--- vendor/fuse-emulator/current/fuse/menu.c 2010-09-28 11:58:20 UTC (rev 647)
+++ vendor/fuse-emulator/current/fuse/menu.c 2010-10-07 11:31:54 UTC (rev 648)
@@ -1,7 +1,7 @@
/* menu.c: general menu callbacks
Copyright (c) 2004-2005 Philip Kendall
- $Id: menu.c 4109 2009-12-27 06:15:10Z fredm $
+ $Id: menu.c 4159 2010-09-13 11:51:13Z 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
@@ -136,13 +136,13 @@
recording = ui_get_open_filename( "Fuse - Start Replay" );
if( !recording ) { fuse_emulation_unpause(); return; }
- rzx_start_playback( recording );
+ rzx_start_playback( recording, 1 );
free( recording );
display_refresh_all();
- ui_menu_activate( UI_MENU_ITEM_RECORDING, 1 );
+ if( rzx_playback ) ui_menu_activate( UI_MENU_ITEM_RECORDING, 1 );
fuse_emulation_unpause();
}
@@ -839,20 +839,6 @@
}
int
-menu_open_snap( void )
-{
- char *filename;
- int error;
-
- filename = ui_get_open_filename( "Fuse - Load Snapshot" );
- if( !filename ) return -1;
-
- error = snapshot_read( filename );
- free( filename );
- return error;
-}
-
-int
menu_check_media_changed( void )
{
int confirm, i;
Modified: vendor/fuse-emulator/current/fuse/menu.h
===================================================================
--- vendor/fuse-emulator/current/fuse/menu.h 2010-09-28 11:58:20 UTC (rev 647)
+++ vendor/fuse-emulator/current/fuse/menu.h 2010-10-07 11:31:54 UTC (rev 648)
@@ -1,7 +1,7 @@
/* menu.h: general menu callbacks
Copyright (c) 2004 Philip Kendall
- $Id: menu.h 4101 2009-11-13 12:54:28Z fredm $
+ $Id: menu.h 4159 2010-09-13 11:51:13Z 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
@@ -105,8 +105,6 @@
MENU_CALLBACK( menu_media_ide_zxcf_upload );
MENU_CALLBACK( menu_media_ide_divide_writeprotect );
-int menu_open_snap( void );
-
/*
* Things to be defined elsewhere
*/
Modified: vendor/fuse-emulator/current/fuse/rzx.c
===================================================================
--- vendor/fuse-emulator/current/fuse/rzx.c 2010-09-28 11:58:20 UTC (rev 647)
+++ vendor/fuse-emulator/current/fuse/rzx.c 2010-10-07 11:31:54 UTC (rev 648)
@@ -1,7 +1,7 @@
/* rzx.c: .rzx files
Copyright (c) 2002-2003 Philip Kendall
- $Id: rzx.c 4085 2009-09-02 13:24:48Z fredm $
+ $Id: rzx.c 4159 2010-09-13 11:51:13Z 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
@@ -37,7 +37,6 @@
#include "event.h"
#include "fuse.h"
#include "machine.h"
-#include "menu.h"
#include "rzx.h"
#include "settings.h"
#include "snapshot.h"
@@ -234,10 +233,45 @@
return 0;
}
-int rzx_start_playback( const char *filename )
+libspectrum_snap*
+rzx_get_initial_snapshot( void )
{
+ libspectrum_rzx_iterator it;
+
+ for( it = libspectrum_rzx_iterator_begin( rzx );
+ it;
+ it = libspectrum_rzx_iterator_next( it ) ) {
+
+ libspectrum_rzx_block_id id = libspectrum_rzx_iterator_get_type( it );
+
+ switch( id ) {
+
+ case LIBSPECTRUM_RZX_INPUT_BLOCK:
+ /* If we get this then there can't have been an initial snap to start
+ from */
+ return NULL;
+ break;
+
+ case LIBSPECTRUM_RZX_SNAPSHOT_BLOCK:
+ /* Got initial snap */
+ return libspectrum_rzx_iterator_get_snap( it );
+ break;
+
+ default:
+ continue;
+
+ }
+
+ }
+
+ return NULL;
+}
+
+int rzx_start_playback( const char *filename, int check_snapshot )
+{
utils_file file;
libspectrum_error libspec_error; int error;
+ libspectrum_snap* snap;
if( rzx_recording ) return 1;
@@ -257,6 +291,14 @@
return 1;
}
+ snap = rzx_get_initial_snapshot();
+ if( !snap && check_snapshot ) {
+ /* We need to load an external snapshot. Could be skipped if the snapshot
+ is preloaded from command line */
+ error = utils_open_snap();
+ if( error ) return error;
+ }
+
error = start_playback( rzx );
if( error ) {
libspectrum_rzx_free( rzx );
@@ -270,6 +312,7 @@
rzx_start_playback_from_buffer( const unsigned char *buffer, size_t length )
{
int error;
+ libspectrum_snap* snap;
if( rzx_recording ) return 0;
@@ -278,6 +321,15 @@
error = libspectrum_rzx_read( rzx, buffer, length );
if( error ) return error;
+ snap = rzx_get_initial_snapshot();
+ if( !snap ) {
+ error = utils_open_snap();
+ if( error ) {
+ libspectrum_rzx_free( rzx );
+ return error;
+ }
+ }
+
error = start_playback( rzx );
if( error ) {
libspectrum_rzx_free( rzx );
Modified: vendor/fuse-emulator/current/fuse/rzx.h
===================================================================
--- vendor/fuse-emulator/current/fuse/rzx.h 2010-09-28 11:58:20 UTC (rev 647)
+++ vendor/fuse-emulator/current/fuse/rzx.h 2010-10-07 11:31:54 UTC (rev 648)
@@ -1,7 +1,7 @@
/* rzx.h: .rzx files
Copyright (c) 2002-2003 Philip Kendall
- $Id: rzx.h 3681 2008-06-16 09:40:29Z pak21 $
+ $Id: rzx.h 4159 2010-09-13 11:51:13Z 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
@@ -64,7 +64,7 @@
int rzx_start_recording( const char *filename, int embed_snapshot );
int rzx_stop_recording( void );
-int rzx_start_playback( const char *filename );
+int rzx_start_playback( const char *filename, int check_snapshot );
int
rzx_start_playback_from_buffer( const unsigned char *buffer, size_t length );
Modified: vendor/fuse-emulator/current/fuse/settings.pl
===================================================================
--- vendor/fuse-emulator/current/fuse/settings.pl 2010-09-28 11:58:20 UTC (rev 647)
+++ vendor/fuse-emulator/current/fuse/settings.pl 2010-10-07 11:31:54 UTC (rev 648)
@@ -3,7 +3,7 @@
# settings.pl: generate settings.c from settings.dat
# Copyright (c) 2002-2005 Philip Kendall
-# $Id: settings.pl 4096 2009-10-07 08:43:00Z fredm $
+# $Id: settings.pl 4156 2010-09-09 13:01:38Z 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
@@ -166,14 +166,14 @@
static int
read_config_file( settings_info *settings )
{
- const char *home; char path[256];
+ const char *home; char path[ PATH_MAX ];
struct stat stat_info;
xmlDocPtr doc;
home = compat_get_home_path(); if( !home ) return 1;
- snprintf( path, 256, "%s/%s", home, CONFIG_FILE_NAME );
+ snprintf( path, PATH_MAX, "%s/%s", home, CONFIG_FILE_NAME );
/* See if the file exists; if doesn't, it's not a problem */
if( stat( path, &stat_info ) ) {
@@ -275,13 +275,13 @@
int
settings_write_config( settings_info *settings )
{
- const char *home; char path[256], buffer[80];
+ const char *home; char path[ PATH_MAX ], buffer[80];
xmlDocPtr doc; xmlNodePtr root;
home = compat_get_home_path(); if( !home ) return 1;
- snprintf( path, 256, "%s/%s", home, CONFIG_FILE_NAME );
+ snprintf( path, PATH_MAX, "%s/%s", home, CONFIG_FILE_NAME );
/* Create the XML document */
doc = xmlNewDoc( (const xmlChar*)"1.0" );
@@ -329,7 +329,7 @@
static int
read_config_file( settings_info *settings )
{
- const char *home; char path[256];
+ const char *home; char path[ PATH_MAX ];
struct stat stat_info;
int error;
@@ -337,7 +337,7 @@
home = compat_get_home_path(); if( !home ) return 1;
- snprintf( path, 256, "%s/%s", home, CONFIG_FILE_NAME );
+ snprintf( path, PATH_MAX, "%s/%s", home, CONFIG_FILE_NAME );
/* See if the file exists; if doesn't, it's not a problem */
if( stat( path, &stat_info ) ) {
@@ -363,139 +363,158 @@
return 0;
}
-/* special_trim() trims that are characters less then equal than space (32).
- This will eliminate extra tabs, \r (if line ends with \r\n, or \n\r),
- and spaces (if someone edits the config with external editor),
- both leading and trailing.
- */
-static void
-special_trim( char string[80] ) {
+static int
+settings_var( settings_info *settings, unsigned char *name, unsigned char *last,
+ int **val_int, char ***val_char, unsigned char **next )
+{
+ unsigned char* cpos;
+ size_t n;
- size_t trim_pos;
+ *val_int = NULL;
+ *val_char = NULL;
- /* Trim leading chars */
- trim_pos = 0;
- while( string[ trim_pos ] && ( string[ trim_pos ] <= 32 ) )
- trim_pos++;
- if( trim_pos > 0 )
- strcpy( string, &string[ trim_pos ] );
-
- /* Trim trailing chars */
- trim_pos = strlen( string );
- while( ( --trim_pos > 0 ) && ( string[ trim_pos ] <= 32 ) ) {
- string[ trim_pos ] = '\0';
+ *next = name;
+ while( name < last && ( *name == ' ' || *name == '\t' || *name == '\r' ||
+ *name == '\n' ) ) {
+ *next = ++name; /* seek to first char */
}
-}
+ cpos = name;
-static int
-parse_ini( utils_file *file, settings_info *settings )
-{
- unsigned char* current_pos;
- char setting_name[80], setting_value[80];
- size_t chars_copied;
-
- current_pos = file->buffer;
+ while( cpos < last && ( *cpos != '=' && *cpos != ' ' && *cpos != '\t' &&
+ *cpos != '\r' && *cpos != '\n' ) ) cpos++;
+ *next = cpos;
+ n = cpos - name; /* length of name */
- /* Read until the end of file */
- while( current_pos < file->buffer + file->length ) {
+ while( *next < last && **next != '=' ) { /* search for '=' */
+ if( **next != ' ' && **next != '\t' && **next != '\r' && **next != '\n' )
+ return 1; /* error in value */
+ (*next)++;
+ }
+ if( *next < last) (*next)++; /* set after '=' */
+/* ui_error( UI_ERROR_WARNING, "Config: (%5s): ", name ); */
- /* Safely copy the text to setting_name, delimted by "=", until \n or eof */
- chars_copied = 0;
- while( ( current_pos < file->buffer + file->length )
- && ( *current_pos != '\n' ) && ( *current_pos != '=' )
- && ( chars_copied < 79 ) ) { /* leave one char for \0 */
- setting_name[ chars_copied ] = *current_pos;
- current_pos++;
- chars_copied++;
- }
- setting_name[ chars_copied ] = '\0';
-
- if( *current_pos != '=' ) {
- /* line misses the "=" delimiter, skip to next line */
- current_pos++;
- continue;
- }
-
- /* Safely copy the text to setting_value, until \n or eof */
- current_pos++;
- chars_copied = 0;
- while( ( current_pos < file->buffer + file->length )
- && ( *current_pos != '\n' )
- && ( chars_copied < 79 ) ) { /* leave one char for \0 */
- setting_value[ chars_copied ] = *current_pos;
- current_pos++;
- chars_copied++;
- }
- setting_value[ chars_copied ] = '\0';
-
- current_pos++;
-
- special_trim( setting_name );
- special_trim( setting_value );
-
CODE
-
+my %type = ('null' => 0, 'boolean' => 1, 'numeric' => 1, 'string' => 2 );
foreach my $name ( sort keys %options ) {
+ my $len = length $options{$name}->{configfile};
- my $type = $options{$name}->{type};
-
- if( $type eq 'boolean' or $type eq 'numeric' ) {
-
- print << "CODE";
- if( !strcmp( setting_name, "$options{$name}->{configfile}" ) ) {
- settings->$name = atoi( setting_value );
- } else
+ print << "CODE";
+ if( n == $len && !strncmp( (const char *)name, "$options{$name}->{configfile}", n ) ) {
CODE
-
- } elsif( $type eq 'string' ) {
-
- print << "CODE";
- if( !strcmp( setting_name, "$options{$name}->{configfile}" ) ) {
- free( settings->$name );
- settings->$name = strdup( setting_value );
- } else
+ print " *val_int = \&settings->$name;\n" if( $options{$name}->{type} eq 'boolean' or $options{$name}->{type} eq 'numeric' );
+ print " *val_char = \&settings->$name;\n" if( $options{$name}->{type} eq 'string' );
+ print "/* *val_null = \&settings->$name; */\n" if( $options{$name}->{type} eq 'null' );
+ print << "CODE";
+ return 0;
+ }
CODE
+}
+ print << "CODE";
+ return 1;
+}
- } elsif( $type eq 'null' ) {
+static int
+parse_ini( utils_file *file, settings_info *settings )
+{
+ unsigned char *cpos, *cpos_new;
+ int *val_int;
+ char **val_char;
- print << "CODE";
- if( !strcmp( setting_name, "$options{$name}->{configfile}" ) ) {
- /* Do nothing */
- } else
-CODE
+ cpos = file->buffer;
- } else {
- die "Unknown setting type `$type'";
+ /* Read until the end of file */
+ while( cpos < file->buffer + file->length ) {
+ if( settings_var( settings, cpos, file->buffer + file->length, &val_int,
+ &val_char, &cpos_new ) ) {
+ /* error in name or something else ... */
+ cpos = cpos_new + 1;
+ ui_error( UI_ERROR_WARNING,
+ "Unknown and/or invalid setting '%s' in config file", cpos );
+ continue;
}
-}
+ cpos = cpos_new;
+ if( val_int ) {
+ *val_int = atoi( (char *)cpos );
+ while( cpos < file->buffer + file->length &&
+ ( *cpos != '\\0' && *cpos != '\\r' && *cpos != '\\n' ) ) cpos++;
+ } else if( val_char ) {
+ char *value = (char *)cpos;
+ size_t n = 0;
+ while( cpos < file->buffer + file->length &&
+ ( *cpos != '\\0' && *cpos != '\\r' && *cpos != '\\n' ) ) cpos++;
+ n = (char *)cpos - value;
+ if( n > 0 ) {
+ if( *val_char != NULL ) {
+ free( *val_char );
+ *val_char = NULL;
+ }
+ *val_char = malloc( n + 1 );
+ if( ! *val_char ) {
+ ui_error( UI_ERROR_WARNING, "Out of memory!" );
+ return 1;
+ }
+ (*val_char)[n] = '\\0';
+ memcpy( *val_char, value, n );
+ }
+ }
+ /* skip 'new line' like chars */
+ while( ( cpos < ( file->buffer + file->length ) ) &&
+ ( *cpos == '\\r' || *cpos == '\\n' ) ) cpos++;
+CODE
print hashline( __LINE__ ), << 'CODE';
- if( !strcmp( setting_name, "text" ) ) {
- /* Do nothing */
- } else {
- ui_error( UI_ERROR_WARNING, "Unknown setting '%s' in config file",
- setting_name );
- }
}
return 0;
}
+static int
+settings_file_write( compat_fd fd, const char *buffer, size_t length )
+{
+ return compat_file_write( fd, (const unsigned char *)buffer, length );
+}
+
+static int
+settings_string_write( compat_fd doc, const char* name, const char* config )
+{
+ if( config != NULL &&
+ ( settings_file_write( doc, name, strlen( name ) ) ||
+ settings_file_write( doc, "=", 1 ) ||
+ settings_file_write( doc, config, strlen( config ) ) ||
+ settings_file_write( doc, "\n", 1 ) ) )
+ return 1;
+ return 0;
+}
+
+static int
+settings_boolean_write( compat_fd doc, const char* name, int config )
+{
+ return settings_string_write( doc, name, config ? "1" : "0" );
+}
+
+static int
+settings_numeric_write( compat_fd doc, const char* name, int config )
+{
+ char buffer[80];
+ snprintf( buffer, sizeof( buffer ), "%d", config );
+ return settings_string_write( doc, name, buffer );
+}
+
int
settings_write_config( settings_info *settings )
{
- const char *home; char path[256], buffer[80];
+ const char *home; char path[ PATH_MAX ];
compat_fd doc;
home = compat_get_home_path(); if( !home ) return 1;
- snprintf( path, 256, "%s/%s", home, CONFIG_FILE_NAME );
+ snprintf( path, PATH_MAX, "%s/%s", home, CONFIG_FILE_NAME );
doc = compat_file_open( path, 1 );
if( doc == COMPAT_FILE_OPEN_FAILED ) {
ui_error( UI_ERROR_ERROR, "couldn't open `%s' for writing: %s\n",
- path, strerror( errno ) );
+ path, strerror( errno ) );
return 1;
}
@@ -504,38 +523,28 @@
foreach my $name ( sort keys %options ) {
my $type = $options{$name}->{type};
+ my $len = length "$options{$name}->{configfile}";
if( $type eq 'boolean' ) {
print << "CODE";
- snprintf( buffer, 80, "%s=%s\\n", "$options{$name}->{configfile}", settings->$name ? "1" : "0" );
- if( compat_file_write( doc, ( const unsigned char * ) buffer,
- strlen( buffer ) > 80 ? 80 : strlen( buffer ) ) ) {
- compat_file_close( doc );
- return 1;
- }
+ if( settings_boolean_write( doc, "$options{$name}->{configfile}",
+ settings->$name ) )
+ goto error;
CODE
} elsif( $type eq 'string' ) {
print << "CODE";
- if( settings->$name ) {
- snprintf( buffer, 80, "%s=%s\\n", "$options{$name}->{configfile}", settings->$name );
- if( compat_file_write( doc, ( const unsigned char * ) buffer,
- strlen( buffer ) > 80 ? 80 : strlen( buffer ) ) ) {
- compat_file_close( doc );
- return 1;
- }
- }
+ if( settings_string_write( doc, "$options{$name}->{configfile}",
+ settings->$name ) )
+ goto error;
CODE
} elsif( $type eq 'numeric' ) {
print << "CODE";
- snprintf( buffer, 80, "%s=%d\\n", "$options{$name}->{configfile}", settings->$name );
- if( compat_file_write( doc, ( const unsigned char * ) buffer,
- strlen( buffer ) > 80 ? 80 : strlen( buffer ) ) ) {
- compat_file_close( doc );
- return 1;
- }
+ if( settings_numeric_write( doc, "$options{$name}->{configfile}",
+ settings->$name ) )
+ goto error;
CODE
} elsif( $type eq 'null' ) {
@@ -550,6 +559,10 @@
compat_file_close( doc );
return 0;
+error:
+ compat_file_close( doc );
+
+ return 1;
}
#endif /* #ifdef HAVE_LIB_XML2 */
Modified: vendor/fuse-emulator/current/fuse/sound/coreaudiosound.c
===================================================================
--- vendor/fuse-emulator/current/fuse/sound/coreaudiosound.c 2010-09-28 11:58:20 UTC (rev 647)
+++ vendor/fuse-emulator/current/fuse/sound/coreaudiosound.c 2010-10-07 11:31:54 UTC (rev 648)
@@ -73,8 +73,8 @@
0, NULL, &count, device);
if ( err != kAudioHardwareNoError && device != kAudioObjectUnknown ) {
ui_error( UI_ERROR_ERROR,
- "get kAudioHardwarePropertyDefaultOutputDevice error %d",
- err );
+ "get kAudioHardwarePropertyDefaultOutputDevice error %ld",
+ (long)err );
return 1;
}
@@ -100,8 +100,8 @@
rate);
if ( err != kAudioHardwareNoError ) {
ui_error( UI_ERROR_ERROR,
- "get kAudioDevicePropertyNominalSampleRate error %d",
- err );
+ "get kAudioDevicePropertyNominalSampleRate error %ld",
+ (long)err );
return 1;
}
@@ -150,7 +150,7 @@
err = OpenAComponent( comp, &gOutputUnit );
if( comp == NULL ) {
- ui_error( UI_ERROR_ERROR, "OpenAComponent=%d", err );
+ ui_error( UI_ERROR_ERROR, "OpenAComponent=%ld", (long)err );
return 1;
}
@@ -166,7 +166,7 @@
&input,
sizeof( input ) );
if( err ) {
- ui_error( UI_ERROR_ERROR, "AudioUnitSetProperty-CB=%d", err );
+ ui_error( UI_ERROR_ERROR, "AudioUnitSetProperty-CB=%ld", (long)err );
return 1;
}
@@ -177,13 +177,14 @@
&deviceFormat,
sizeof( AudioStreamBasicDescription ) );
if( err ) {
- ui_error( UI_ERROR_ERROR, "AudioUnitSetProperty-SF=%4.4s, %d", (char*)&err, err );
+ ui_error( UI_ERROR_ERROR, "AudioUnitSetProperty-SF=%4.4s, %ld", (char*)&err,
+ (long)err );
return 1;
}
err = AudioUnitInitialize( gOutputUnit );
if( err ) {
- ui_error( UI_ERROR_ERROR, "AudioUnitInitialize=%d", err );
+ ui_error( UI_ERROR_ERROR, "AudioUnitInitialize=%ld", (long)err );
return 1;
}
@@ -224,7 +225,7 @@
err = AudioUnitUninitialize( gOutputUnit );
if( err ) {
- printf( "AudioUnitUninitialize=%d", err );
+ printf( "AudioUnitUninitialize=%ld", (long)err );
}
CloseComponent( gOutputUnit );
@@ -263,7 +264,7 @@
default device */
OSStatus err = AudioOutputUnitStart( gOutputUnit );
if( err ) {
- ui_error( UI_ERROR_ERROR, "AudioOutputUnitStart=%d", err );
+ ui_error( UI_ERROR_ERROR, "AudioOutputUnitStart=%ld", (long)err );
return;
}
Modified: vendor/fuse-emulator/current/fuse/tape.c
===================================================================
--- vendor/fuse-emulator/current/fuse/tape.c 2010-09-28 11:58:20 UTC (rev 647)
+++ vendor/fuse-emulator/current/fuse/tape.c 2010-10-07 11:31:54 UTC (rev 648)
@@ -1,7 +1,7 @@
/* tape.c: tape handling routines
Copyright (c) 1999-2008 Philip Kendall, Darren Salt, Witold Filipczyk
- $Id: tape.c 4086 2009-09-02 13:27:22Z fredm $
+ $Id: tape.c 4155 2010-09-05 11:58:37Z 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
@@ -198,7 +198,7 @@
if( error ) { utils_close_file( &snap ); return error; }
if( utils_close_file( &snap ) ) {
- ui_error( UI_ERROR_ERROR, "Couldn't munmap '%s': %s", filename,
+ ui_error( UI_ERROR_ERROR, "Couldn't close '%s': %s", filename,
strerror( errno ) );
return 1;
}
@@ -564,6 ...
[truncated message content] |
|
From: <fr...@us...> - 2010-10-18 10:33:16
|
Revision: 654
http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=654&view=rev
Author: fredm
Date: 2010-10-18 10:33:08 +0000 (Mon, 18 Oct 2010)
Log Message:
-----------
Load . into vendor/fuse-emulator/current.
Modified Paths:
--------------
vendor/fuse-emulator/current/fuse/configure.in
vendor/fuse-emulator/current/fuse/disk/beta.c
vendor/fuse-emulator/current/fuse/disk/disk.c
vendor/fuse-emulator/current/fuse/disk/disk.h
vendor/fuse-emulator/current/fuse/disk/opus.c
vendor/fuse-emulator/current/fuse/disk/plusd.c
vendor/fuse-emulator/current/fuse/hacking/ChangeLog
vendor/fuse-emulator/current/fuse/if1.c
vendor/fuse-emulator/current/fuse/machines/specplus3.c
vendor/fuse-emulator/current/fuse/man/fuse.1
vendor/fuse-emulator/current/fuse/menu.c
vendor/fuse-emulator/current/fuse/menu_data.dat
vendor/fuse-emulator/current/fuse/ui/gtk/gtkdisplay.c
vendor/fuse-emulator/current/fuse/ui/ui.h
vendor/fuse-emulator/current/fuse/ui/widget/query.c
vendor/fuse-emulator/current/fuse/ui.c
vendor/fuse-emulator/current/libspectrum/configure.in
vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog
Modified: vendor/fuse-emulator/current/fuse/configure.in
===================================================================
--- vendor/fuse-emulator/current/fuse/configure.in 2010-10-16 09:47:07 UTC (rev 653)
+++ vendor/fuse-emulator/current/fuse/configure.in 2010-10-18 10:33:08 UTC (rev 654)
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-dnl $Id: configure.in 4175 2010-10-06 10:44:19Z fredm $
+dnl $Id: configure.in 4181 2010-10-10 10:28:09Z fredm $
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
@@ -42,7 +42,11 @@
AC_SUBST(WINDRES)
if test "$WINDRES" != no; then
WINDRES_OBJ="windres.o"
- AC_DEFINE([VERSION_WIN32], [translit(FUSE_VERSION, [.], [,])], [Define version information for win32 executable])
+ define(FUSE_FULL_VERSION,
+ [ifelse(translit(FUSE_VERSION, [0-9]), [.], [FUSE_VERSION[.0.0]],
+ translit(FUSE_VERSION, [0-9]), [..], [FUSE_VERSION[.0]],
+ [FUSE_VERSION])])dnl
+ AC_DEFINE([VERSION_WIN32], [translit(FUSE_FULL_VERSION, [.], [,])], [Define version information for win32 executable])
fi
AC_SUBST(WINDRES_OBJ)
AM_SUBST_NOTMAKE(WINDRES_OBJ)
Modified: vendor/fuse-emulator/current/fuse/disk/beta.c
===================================================================
--- vendor/fuse-emulator/current/fuse/disk/beta.c 2010-10-16 09:47:07 UTC (rev 653)
+++ vendor/fuse-emulator/current/fuse/disk/beta.c 2010-10-18 10:33:08 UTC (rev 654)
@@ -1,7 +1,7 @@
/* beta.c: Routines for handling the Beta disk interface
Copyright (c) 2004-2008 Stuart Brady
- $Id: beta.c 4147 2010-08-19 12:25:15Z fredm $
+ $Id: beta.c 4180 2010-10-09 12:59:37Z 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
@@ -564,25 +564,28 @@
}
int
-beta_disk_eject( beta_drive_number which, int write )
+beta_disk_eject( beta_drive_number which, int saveas )
{
wd_fdc_drive *d;
char drive;
-
+
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;
+ if( saveas ) { /* 1 -> save as.., 2 -> save */
+
+ if( d->disk.filename == NULL ) saveas = 1;
+ if( ui_beta_disk_write( which, 2 - saveas ) ) return 1;
+ d->disk.dirty = 0;
+ return 0;
+
} else {
-
+
if( d->disk.dirty ) {
ui_confirm_save_t confirm;
@@ -603,7 +606,7 @@
switch( confirm ) {
case UI_CONFIRM_SAVE_SAVE:
- if( ui_beta_disk_write( which ) ) return 1;
+ if( beta_disk_eject( which, 2 ) ) return 1; /* first save */
break;
case UI_CONFIRM_SAVE_DONTSAVE: break;
@@ -641,6 +644,7 @@
int error;
d->disk.type = DISK_TYPE_NONE;
+ if( filename == NULL ) filename = d->disk.filename; /* write over original file */
error = disk_write( &d->disk, filename );
if( error != DISK_OK ) {
@@ -649,6 +653,10 @@
return 1;
}
+ if( d->disk.filename && strcmp( filename, d->disk.filename ) ) {
+ free( d->disk.filename );
+ d->disk.filename = strdup( filename );
+ }
return 0;
}
Modified: vendor/fuse-emulator/current/fuse/disk/disk.c
===================================================================
--- vendor/fuse-emulator/current/fuse/disk/disk.c 2010-10-16 09:47:07 UTC (rev 653)
+++ vendor/fuse-emulator/current/fuse/disk/disk.c 2010-10-18 10:33:08 UTC (rev 654)
@@ -1,7 +1,7 @@
/* disk.c: Routines for handling disk images
Copyright (c) 2007-2010 Gergely Szasz
- $Id: disk.c 4141 2010-07-19 11:30:21Z fredm $
+ $Id: disk.c 4180 2010-10-09 12:59:37Z 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
@@ -675,6 +675,10 @@
free( d->data );
d->data = NULL;
}
+ if( d->filename != NULL ) {
+ free( d->filename );
+ d->filename = NULL;
+ }
d->type = DISK_TYPE_NONE;
}
@@ -728,6 +732,7 @@
disk_new( disk_t *d, int sides, int cylinders,
disk_dens_t density, disk_type_t type )
{
+ d->filename = NULL;
if( density < DISK_DENS_AUTO || density > DISK_HD || /* unknown density */
type <= DISK_TYPE_NONE || type >= DISK_TYPE_LAST || /* unknown type */
sides < 1 || sides > 2 || /* 1 or 2 side */
@@ -1903,6 +1908,7 @@
d->dirty = 0;
disk_update_tlens( d );
update_tracks_mode( d );
+ d->filename = strdup( filename );
return d->status = DISK_OK;
}
@@ -1972,6 +1978,7 @@
int l, g = 0, pos = 0;
disk_t d1, d2;
+ d->filename = NULL;
if( filename == NULL || *filename == '\0' )
return d->status = DISK_OPEN;
Modified: vendor/fuse-emulator/current/fuse/disk/disk.h
===================================================================
--- vendor/fuse-emulator/current/fuse/disk/disk.h 2010-10-16 09:47:07 UTC (rev 653)
+++ vendor/fuse-emulator/current/fuse/disk/disk.h 2010-10-18 10:33:08 UTC (rev 654)
@@ -1,7 +1,7 @@
/* fdd.h: Header for handling raw disk images
Copyright (c) 2007-2010 Gergely Szasz
- $Id: disk.h 4114 2010-01-15 13:45:51Z fredm $
+ $Id: disk.h 4180 2010-10-09 12:59:37Z 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
@@ -87,6 +87,7 @@
} disk_dens_t;
typedef struct disk_t {
+ char *filename; /* original filename */
int sides; /* 1 or 2 */
int cylinders; /* tracks per side */
int bpt; /* bytes per track */
Modified: vendor/fuse-emulator/current/fuse/disk/opus.c
===================================================================
--- vendor/fuse-emulator/current/fuse/disk/opus.c 2010-10-16 09:47:07 UTC (rev 653)
+++ vendor/fuse-emulator/current/fuse/disk/opus.c 2010-10-18 10:33:08 UTC (rev 654)
@@ -410,7 +410,7 @@
}
int
-opus_disk_eject( opus_drive_number which, int write )
+opus_disk_eject( opus_drive_number which, int saveas )
{
wd_fdc_drive *d;
@@ -422,9 +422,12 @@
if( d->disk.type == DISK_TYPE_NONE )
return 0;
- if( write ) {
+ if( saveas ) { /* 1 -> save as.., 2 -> save */
- if( ui_opus_disk_write( which ) ) return 1;
+ if( d->disk.filename == NULL ) saveas = 1;
+ if( ui_opus_disk_write( which, 2 - saveas ) ) return 1;
+ d->disk.dirty = 0;
+ return 0;
} else {
@@ -439,7 +442,7 @@
switch( confirm ) {
case UI_CONFIRM_SAVE_SAVE:
- if( ui_opus_disk_write( which ) ) return 1;
+ if( opus_disk_eject( which, 2 ) ) return 1; /* first save */
break;
case UI_CONFIRM_SAVE_DONTSAVE: break;
@@ -529,6 +532,7 @@
int error;
d->disk.type = DISK_TYPE_NONE;
+ if( filename == NULL ) filename = d->disk.filename; /* write over original file */
error = disk_write( &d->disk, filename );
if( error != DISK_OK ) {
@@ -537,6 +541,10 @@
return 1;
}
+ if( d->disk.filename && strcmp( filename, d->disk.filename ) ) {
+ free( d->disk.filename );
+ d->disk.filename = strdup( filename );
+ }
return 0;
}
Modified: vendor/fuse-emulator/current/fuse/disk/plusd.c
===================================================================
--- vendor/fuse-emulator/current/fuse/disk/plusd.c 2010-10-16 09:47:07 UTC (rev 653)
+++ vendor/fuse-emulator/current/fuse/disk/plusd.c 2010-10-18 10:33:08 UTC (rev 654)
@@ -2,7 +2,7 @@
Copyright (c) 1999-2007 Stuart Brady, Fredrick Meunier, Philip Kendall,
Dmitry Sanarin, Darren Salt
- $Id: plusd.c 4131 2010-05-19 10:52:37Z fredm $
+ $Id: plusd.c 4180 2010-10-09 12:59:37Z 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
@@ -457,7 +457,7 @@
}
int
-plusd_disk_eject( plusd_drive_number which, int write )
+plusd_disk_eject( plusd_drive_number which, int saveas )
{
wd_fdc_drive *d;
@@ -469,9 +469,12 @@
if( d->disk.type == DISK_TYPE_NONE )
return 0;
- if( write ) {
+ if( saveas ) { /* 1 -> save as.., 2 -> save */
- if( ui_plusd_disk_write( which ) ) return 1;
+ if( d->disk.filename == NULL ) saveas = 1;
+ if( ui_plusd_disk_write( which, 2 - saveas ) ) return 1;
+ d->disk.dirty = 0;
+ return 0;
} else {
@@ -486,7 +489,7 @@
switch( confirm ) {
case UI_CONFIRM_SAVE_SAVE:
- if( ui_plusd_disk_write( which ) ) return 1;
+ if( plusd_disk_eject( which, 2 ) ) return 1; /* first save */
break;
case UI_CONFIRM_SAVE_DONTSAVE: break;
@@ -569,13 +572,15 @@
return 0;
}
+/***TODO most part of the next routine could be move to a common place... */
int
plusd_disk_write( plusd_drive_number which, const char *filename )
{
wd_fdc_drive *d = &plusd_drives[ which ];
int error;
-
+
d->disk.type = DISK_TYPE_NONE;
+ if( filename == NULL ) filename = d->disk.filename; /* write over original file */
error = disk_write( &d->disk, filename );
if( error != DISK_OK ) {
@@ -583,6 +588,10 @@
disk_strerror( error ) );
return 1;
}
+ if( d->disk.filename && strcmp( filename, d->disk.filename ) ) {
+ free( d->disk.filename );
+ d->disk.filename = strdup( filename );
+ }
return 0;
}
Modified: vendor/fuse-emulator/current/fuse/hacking/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse/hacking/ChangeLog 2010-10-16 09:47:07 UTC (rev 653)
+++ vendor/fuse-emulator/current/fuse/hacking/ChangeLog 2010-10-18 10:33:08 UTC (rev 654)
@@ -3345,9 +3345,19 @@
20101003 README: small update to mention WoS forums.
20101006 configure.in: update header check for XShm.h (patch #3081497) (Gergely
Szasz).
-20101006 ui/gtk/{gtkkeyboard.c,gtkui.c,statusbar.c,stock.c}: use F1 as shortcut to
- open menus, set window dialogs as transient for the main window and set a
- fixed width for the emulation speed display (patch #3081729) (Sergio
- Baldovi).
-20101007 ui.c: don't close a disk or mdr if a write fails (patch #3058156) (thanks,
- Crisis) (Gergely Szasz).
+20101006 ui/gtk/{gtkkeyboard.c,gtkui.c,statusbar.c,stock.c}: use F1 as shortcut
+ to open menus, set window dialogs as transient for the main window and
+ set a fixed width for the emulation speed display (patch #3081729)
+ (Sergio Baldovi).
+20101007 ui.c: don't close a disk or mdr if a write fails (patch #3058156)
+ (thanks, Crisis) (Gergely Szasz).
+20101007 ui/widget/query.c: fix colour of dialog Cancel entry and correct action
+ returned when cancel is selected (patch #3083619) (Gergely Szasz).
+20101009 disk/{beta.c,disk.[ch],opus.c,plusd.c},if1.c,machines/specplus3.c,
+ man/fuse.1,menu.c,menu_data.dat,ui.c,ui/ui.h: change "Eject and write"
+ menu items to "Save" and "Save as" (patch #3083639) (Gergely Szasz).
+20101010 configure.in: pad version number for Win32 if needed (patch #3084574)
+ (Sergio Baldovi).
+20101011 ui/gtk/gtkdisplay.c: resize window when machine selection switches
+ between Timex and non-Timex modes (fixes bug #3084862) (thanks, Phil)
+ (Fred).
Modified: vendor/fuse-emulator/current/fuse/if1.c
===================================================================
--- vendor/fuse-emulator/current/fuse/if1.c 2010-10-16 09:47:07 UTC (rev 653)
+++ vendor/fuse-emulator/current/fuse/if1.c 2010-10-18 10:33:08 UTC (rev 654)
@@ -1,7 +1,7 @@
/* if1.c: Interface I handling routines
Copyright (c) 2004-2008 Gergely Szasz, Philip Kendall
- $Id: if1.c 4099 2009-10-22 10:59:02Z fredm $
+ $Id: if1.c 4180 2010-10-09 12:59:37Z 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
@@ -64,6 +64,7 @@
typedef struct microdrive_t {
utils_file file;
+ char *filename; /* old filename */
int inserted;
int modified;
int motor_on;
@@ -1052,6 +1053,7 @@
libspectrum_byte len;
long int i;
+ mdr->filename = NULL;
if( settings_current.mdr_random_len ) { /* Random length */
len = 171 + ( ( rand() >> 2 ) + ( rand() >> 2 ) +
( rand() >> 2 ) + ( rand() >> 2 ) )
@@ -1135,6 +1137,7 @@
mdr->inserted = 1;
mdr->modified = 0;
+ mdr->filename = strdup( filename );
/* we assume formatted cartridges */
for( i = libspectrum_microdrive_cartridge_len( mdr->cartridge );
i > 0; i-- )
@@ -1146,7 +1149,7 @@
}
int
-if1_mdr_eject( int which, int write )
+if1_mdr_eject( int which, int saveas )
{
microdrive_t *mdr;
@@ -1158,9 +1161,12 @@
if( !mdr->inserted )
return 0;
- if( write ) {
+ if( saveas ) { /* 1 -> save as.., 2 -> save */
- if( ui_mdr_write( which ) ) return 1;
+ if( mdr->filename == NULL ) saveas = 1;
+ if( ui_mdr_write( which, 2 - saveas ) ) return 1;
+ mdr->modified = 0;
+ return 0;
} else {
@@ -1175,7 +1181,7 @@
switch( confirm ) {
case UI_CONFIRM_SAVE_SAVE:
- if( ui_mdr_write( which ) ) return 1;
+ if( if1_mdr_eject( which, 2 ) ) return 1; /* first save */
break;
case UI_CONFIRM_SAVE_DONTSAVE: break;
@@ -1186,7 +1192,11 @@
}
mdr->inserted = 0;
-
+ if( mdr->filename != NULL ) {
+ free( mdr->filename );
+ mdr->filename = NULL;
+ }
+
update_menu( UMENU_MDRV1 + which );
return 0;
}
@@ -1198,10 +1208,16 @@
libspectrum_microdrive_mdr_write( mdr->cartridge, &mdr->file.buffer,
&mdr->file.length );
-
+
+ if( filename == NULL ) filename = mdr->filename; /* Write over the original file */
+
if( utils_write_file( filename, mdr->file.buffer, mdr->file.length ) )
return 1;
+ if( mdr->filename && strcmp( filename, mdr->filename ) ) {
+ free( mdr->filename );
+ mdr->filename = strdup( filename );
+ }
return 0;
}
Modified: vendor/fuse-emulator/current/fuse/machines/specplus3.c
===================================================================
--- vendor/fuse-emulator/current/fuse/machines/specplus3.c 2010-10-16 09:47:07 UTC (rev 653)
+++ vendor/fuse-emulator/current/fuse/machines/specplus3.c 2010-10-18 10:33:08 UTC (rev 654)
@@ -1,7 +1,7 @@
/* specplus3.c: Spectrum +2A/+3 specific routines
Copyright (c) 1999-2007 Philip Kendall, Darren Salt
- $Id: specplus3.c 4131 2010-05-19 10:52:37Z fredm $
+ $Id: specplus3.c 4180 2010-10-09 12:59:37Z 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
@@ -452,7 +452,7 @@
break;
}
error = disk_new( &d->disk, dt->heads, dt->cylinders, DISK_DENS_AUTO, DISK_UDI );
- disk_preformat( &d->disk ); /* pre-format disk for +3 */
+ disk_preformat( &d->disk ); /* pre-format disk for +3 */
if( error != DISK_OK ) {
ui_error( UI_ERROR_ERROR, "Failed to create disk image: %s",
disk_strerror( error ) );
@@ -488,7 +488,7 @@
}
int
-specplus3_disk_eject( specplus3_drive_number which, int write )
+specplus3_disk_eject( specplus3_drive_number which, int saveas )
{
upd_fdc_drive *d;
@@ -500,9 +500,12 @@
if( d->disk.type == DISK_TYPE_NONE )
return 0;
- if( write ) {
+ if( saveas ) { /* 1 -> save as.., 2 -> save */
- if( ui_plus3_disk_write( which ) ) return 1;
+ if( d->disk.filename == NULL ) saveas = 1;
+ if( ui_plus3_disk_write( which, 2 - saveas ) ) return 1; /* save as... */
+ d->disk.dirty = 0;
+ return 0;
} else {
@@ -517,7 +520,7 @@
switch( confirm ) {
case UI_CONFIRM_SAVE_SAVE:
- if( ui_plus3_disk_write( which ) ) return 1;
+ if( specplus3_disk_eject( which, 2 ) ) return 1; /* first save it...*/
break;
case UI_CONFIRM_SAVE_DONTSAVE: break;
@@ -605,8 +608,9 @@
{
upd_fdc_drive *d = &specplus3_drives[ which ];
int error;
-
+
d->disk.type = DISK_TYPE_NONE;
+ if( filename == NULL ) filename = d->disk.filename; /* write over original file */
error = disk_write( &d->disk, filename );
if( error != DISK_OK ) {
@@ -615,6 +619,10 @@
return 1;
}
+ if( d->disk.filename && strcmp( filename, d->disk.filename ) ) {
+ free( d->disk.filename );
+ d->disk.filename = strdup( filename );
+ }
return 0;
}
Modified: vendor/fuse-emulator/current/fuse/man/fuse.1
===================================================================
--- vendor/fuse-emulator/current/fuse/man/fuse.1 2010-10-16 09:47:07 UTC (rev 653)
+++ vendor/fuse-emulator/current/fuse/man/fuse.1 2010-10-18 10:33:08 UTC (rev 654)
@@ -2327,8 +2327,7 @@
active from the
.I "Options, Peripherals"
menu. Note that any changes to the Microdrive image will not be
-written to the file on disk until the appropriate `eject and write'
-option is used.
+written to the file on disk until the appropriate save option is used.
.RE
.PP
.I "Media, Interface I, Microdrive 1, Insert New"
@@ -2349,12 +2348,17 @@
modified, you will be asked as to whether you want any changes saved.
.RE
.PP
-.I "Media, Interface I, Microdrive 1, Eject and write..."
+.I "Media, Interface I, Microdrive 1, Save"
.RS
-Write the Microdrive image in Microdrive 1 to a file, and then eject
-the image. You will be prompted for a filename.
+Save the Microdrive image in Microdrive 1.
.RE
.PP
+.I "Media, Interface I, Microdrive 1, Save as..."
+.RS
+Write the Microdrive image in Microdrive 1 to a file. You will be
+prompted for a filename.
+.RE
+.PP
.I "Media, Interface I, Microdrive 1, Write protect, Enable"
.RS
Enable the write protect tab for the image in Microdrive 1.
@@ -2415,23 +2419,28 @@
.PP
.I "Media, Disk, +3, Drive A:, Insert..."
.RS
-Select a disk-image file to read/write in the +3's emulated drive
+Insert a disk-image file to read/write in the +3's emulated drive
A:.
.RE
.PP
.I "Media, Disk, +3, Drive A:, Eject"
.RS
-Deselect the disk image currently in the +3's emulated drive A: \- or
+Eject the disk image currently in the +3's emulated drive A: \- or
from the emulated machine's perspective, eject it. Note that any
changes made to the image will not be saved.
.RE
.PP
-.I "Media, Disk, +3, Drive A:, Eject and write..."
+.I "Media, Disk, +3, Drive A:, Save"
.RS
-Deselect the disk image currently in the +3's drive A: and write the
-current state of the disk to a file. You will be prompted for a filename.
+Save the disk image currently in the +3's drive A:.
.RE
.PP
+.I "Media, Disk, +3, Drive A:, Save as..."
+.RS
+Save the current state of the disk image currently in the +3's
+drive A: to a file. You will be prompted for a filename.
+.RE
+.PP
.I "Media, Disk, +3, Drive B:, Insert..."
.RS
As above, but for the +3's drive B:. Fuse emulates drive B: as a
@@ -2443,11 +2452,16 @@
As above, but for drive B:.
.RE
.PP
-.I "Media, Disk, +3, Drive B:, Eject and write"
+.I "Media, Disk, +3, Drive B:, Save"
.RS
As above, but for drive B:.
.RE
.PP
+.I "Media, Disk, +3, Drive B:, Save as..."
+.RS
+As above, but for drive B:.
+.RE
+.PP
.I "Media, Disk, Beta, Drive A:, Insert New"
.RS
Insert a new (unformatted) disk into the emulated Beta drive A:.
@@ -2457,7 +2471,9 @@
.br
.I "Media, Disk, Beta, Drive A:, Eject"
.br
-.I "Media, Disk, Beta, Drive A:, Eject and write..."
+.I "Media, Disk, Beta, Drive A:, Save"
+.br
+.I "Media, Disk, Beta, Drive A:, Save as..."
.RS
As above, but for the emulated Beta disk drive A:.
.RE
@@ -2487,8 +2503,10 @@
.br
.I "Media, Disk, Opus, Drive 1, Eject"
.br
-.I "Media, Disk, Opus, Drive 1, Eject and write..."
+.I "Media, Disk, Opus, Drive 1, Save"
.br
+.I "Media, Disk, Opus, Drive 1, Save as..."
+.br
.I "Media, Disk, Opus, Drive 1, Write protect, Enable"
.br
.I "Media, Disk, Opus, Drive 1, Write protect, Disable"
@@ -2504,8 +2522,10 @@
.br
.I "Media, Disk, +D, Drive 1, Eject"
.br
-.I "Media, Disk, +D, Drive 1, Eject and write..."
+.I "Media, Disk, +D, Drive 1, Save"
.br
+.I "Media, Disk, +D, Drive 1, Save as..."
+.br
.I "Media, Disk, +D, Drive 1, Write protect, Enable"
.br
.I "Media, Disk, +D, Drive 1, Write protect, Disable"
Modified: vendor/fuse-emulator/current/fuse/menu.c
===================================================================
--- vendor/fuse-emulator/current/fuse/menu.c 2010-10-16 09:47:07 UTC (rev 653)
+++ vendor/fuse-emulator/current/fuse/menu.c 2010-10-18 10:33:08 UTC (rev 654)
@@ -1,7 +1,7 @@
/* menu.c: general menu callbacks
Copyright (c) 2004-2005 Philip Kendall
- $Id: menu.c 4159 2010-09-13 11:51:13Z fredm $
+ $Id: menu.c 4180 2010-10-09 12:59:37Z 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
@@ -435,32 +435,39 @@
fuse_emulation_unpause();
}
+/*
+1. menu_media_eject
+2. xxx_disk_eject
+2.a. ui_xxx_disk_write( save )
+2.b. ui_xxx_disk_write( saveas )
+[2.c. ui_xxx_disk_eject( save )]
+*/
MENU_CALLBACK_WITH_ACTION( menu_media_eject )
{
- int which, write, type;
+ int which, saveas, type;
ui_widget_finish();
action--;
which = action & 0x00f;
type = ( action & 0x0f0 ) >> 4;
- write = !!( action & 0x100 );
+ saveas = ( action & 0xf00 ) >> 8; /* 0 -> eject, 1 -> save as, 2 -> save */
switch( type ) {
case 0:
- specplus3_disk_eject( which, write );
+ specplus3_disk_eject( which, saveas );
break;
case 1:
- beta_disk_eject( which, write );
+ beta_disk_eject( which, saveas );
break;
case 2:
- plusd_disk_eject( which, write );
+ plusd_disk_eject( which, saveas );
break;
case 3:
- if1_mdr_eject( which, write );
+ if1_mdr_eject( which, saveas );
break;
case 4:
- opus_disk_eject( which, write );
+ opus_disk_eject( which, saveas );
break;
}
}
Modified: vendor/fuse-emulator/current/fuse/menu_data.dat
===================================================================
--- vendor/fuse-emulator/current/fuse/menu_data.dat 2010-10-16 09:47:07 UTC (rev 653)
+++ vendor/fuse-emulator/current/fuse/menu_data.dat 2010-10-18 10:33:08 UTC (rev 654)
@@ -1,7 +1,7 @@
# menu_data.dat: Menu structure for Fuse
# Copyright (c) 2004 Philip Kendall
-# $Id: menu_data.dat 4101 2009-11-13 12:54:28Z fredm $
+# $Id: menu_data.dat 4180 2010-10-09 12:59:37Z 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
@@ -143,7 +143,8 @@
Media/Interface I/Microdrive 1/Insert _New, Item,, menu_media_insert_new,, 0x31
Media/Interface I/Microdrive 1/_Insert..., Item,, menu_media_insert,, 0x31
Media/Interface I/Microdrive 1/_Eject, Item,, menu_media_eject,, 0x031
-Media/Interface I/Microdrive 1/Eject and _write..., Item,, menu_media_eject,, 0x131
+Media/Interface I/Microdrive 1/_Save, Item,, menu_media_eject,, 0x231
+Media/Interface I/Microdrive 1/Save _As..., Item,, menu_media_eject,, 0x131
Media/Interface I/Microdrive 1/Write _protect, Branch
Media/Interface I/Microdrive 1/Write protect/_Enable, Item,, menu_media_writeprotect,, 0x131
Media/Interface I/Microdrive 1/Write protect/_Disable, Item,, menu_media_writeprotect,, 0x031
@@ -152,7 +153,8 @@
Media/Interface I/Microdrive 2/Insert _New, Item,, menu_media_insert_new,, 0x32
Media/Interface I/Microdrive 2/_Insert..., Item,, menu_media_insert,, 0x32
Media/Interface I/Microdrive 2/_Eject, Item,, menu_media_eject,, 0x032
-Media/Interface I/Microdrive 2/Eject and _write..., Item,, menu_media_eject,, 0x132
+Media/Interface I/Microdrive 2/_Save, Item,, menu_media_eject,, 0x232
+Media/Interface I/Microdrive 2/Save _As..., Item,, menu_media_eject,, 0x132
Media/Interface I/Microdrive 2/Write _protect, Branch
Media/Interface I/Microdrive 2/Write protect/_Enable, Item,, menu_media_writeprotect,, 0x132
Media/Interface I/Microdrive 2/Write protect/_Disable, Item,, menu_media_writeprotect,, 0x032
@@ -161,7 +163,8 @@
Media/Interface I/Microdrive 3/Insert _New, Item,, menu_media_insert_new,, 0x33
Media/Interface I/Microdrive 3/_Insert..., Item,, menu_media_insert,, 0x33
Media/Interface I/Microdrive 3/_Eject, Item,, menu_media_eject,, 0x033
-Media/Interface I/Microdrive 3/Eject and _write..., Item,, menu_media_eject,, 0x133
+Media/Interface I/Microdrive 3/_Save, Item,, menu_media_eject,, 0x233
+Media/Interface I/Microdrive 3/Save _As..., Item,, menu_media_eject,, 0x133
Media/Interface I/Microdrive 3/Write _protect, Branch
Media/Interface I/Microdrive 3/Write protect/_Enable, Item,, menu_media_writeprotect,, 0x133
Media/Interface I/Microdrive 3/Write protect/_Disable, Item,, menu_media_writeprotect,, 0x033
@@ -170,7 +173,8 @@
Media/Interface I/Microdrive 4/Insert _New, Item,, menu_media_insert_new,, 0x34
Media/Interface I/Microdrive 4/_Insert..., Item,, menu_media_insert,, 0x34
Media/Interface I/Microdrive 4/_Eject, Item,, menu_media_eject,, 0x034
-Media/Interface I/Microdrive 4/Eject and _write..., Item,, menu_media_eject,, 0x134
+Media/Interface I/Microdrive 4/_Save, Item,, menu_media_eject,, 0x234
+Media/Interface I/Microdrive 4/Save _As..., Item,, menu_media_eject,, 0x134
Media/Interface I/Microdrive 4/Write _protect, Branch
Media/Interface I/Microdrive 4/Write protect/_Enable, Item,, menu_media_writeprotect,, 0x134
Media/Interface I/Microdrive 4/Write protect/_Disable, Item,, menu_media_writeprotect,, 0x034
@@ -179,7 +183,8 @@
Media/Interface I/Microdrive 5/Insert _New, Item,, menu_media_insert_new,, 0x35
Media/Interface I/Microdrive 5/_Insert..., Item,, menu_media_insert,, 0x35
Media/Interface I/Microdrive 5/_Eject, Item,, menu_media_eject,, 0x035
-Media/Interface I/Microdrive 5/Eject and _write..., Item,, menu_media_eject,, 0x135
+Media/Interface I/Microdrive 5/_Save, Item,, menu_media_eject,, 0x235
+Media/Interface I/Microdrive 5/Save _As..., Item,, menu_media_eject,, 0x135
Media/Interface I/Microdrive 5/Write _protect, Branch
Media/Interface I/Microdrive 5/Write protect/_Enable, Item,, menu_media_writeprotect,, 0x135
Media/Interface I/Microdrive 5/Write protect/_Disable, Item,, menu_media_writeprotect,, 0x035
@@ -188,7 +193,8 @@
Media/Interface I/Microdrive 6/Insert _New, Item,, menu_media_insert_new,, 0x36
Media/Interface I/Microdrive 6/_Insert..., Item,, menu_media_insert,, 0x36
Media/Interface I/Microdrive 6/_Eject, Item,, menu_media_eject,, 0x036
-Media/Interface I/Microdrive 6/Eject and _write..., Item,, menu_media_eject,, 0x136
+Media/Interface I/Microdrive 6/_Save, Item,, menu_media_eject,, 0x236
+Media/Interface I/Microdrive 6/Save _As..., Item,, menu_media_eject,, 0x136
Media/Interface I/Microdrive 6/Write _protect, Branch
Media/Interface I/Microdrive 6/Write protect/_Enable, Item,, menu_media_writeprotect,, 0x136
Media/Interface I/Microdrive 6/Write protect/_Disable, Item,, menu_media_writeprotect,, 0x036
@@ -197,7 +203,8 @@
Media/Interface I/Microdrive 7/Insert _New, Item,, menu_media_insert_new,, 0x37
Media/Interface I/Microdrive 7/_Insert..., Item,, menu_media_insert,, 0x37
Media/Interface I/Microdrive 7/_Eject, Item,, menu_media_eject,, 0x037
-Media/Interface I/Microdrive 7/Eject and _write..., Item,, menu_media_eject,, 0x137
+Media/Interface I/Microdrive 7/_Save, Item,, menu_media_eject,, 0x237
+Media/Interface I/Microdrive 7/Save _As..., Item,, menu_media_eject,, 0x137
Media/Interface I/Microdrive 7/Write _protect, Branch
Media/Interface I/Microdrive 7/Write protect/_Enable, Item,, menu_media_writeprotect,, 0x137
Media/Interface I/Microdrive 7/Write protect/_Disable, Item,, menu_media_writeprotect,, 0x037
@@ -206,7 +213,8 @@
Media/Interface I/Microdrive 8/Insert _New, Item,, menu_media_insert_new,, 0x38
Media/Interface I/Microdrive 8/_Insert..., Item,, menu_media_insert,, 0x38
Media/Interface I/Microdrive 8/_Eject, Item,, menu_media_eject,, 0x038
-Media/Interface I/Microdrive 8/Eject and _write..., Item,, menu_media_eject,, 0x138
+Media/Interface I/Microdrive 8/_Save, Item,, menu_media_eject,, 0x238
+Media/Interface I/Microdrive 8/Save _As..., Item,, menu_media_eject,, 0x138
Media/Interface I/Microdrive 8/Write _protect, Branch
Media/Interface I/Microdrive 8/Write protect/_Enable, Item,, menu_media_writeprotect,, 0x138
Media/Interface I/Microdrive 8/Write protect/_Disable, Item,, menu_media_writeprotect,, 0x038
@@ -230,7 +238,8 @@
Media/Disk/+3/Drive A:/Insert _New, Item,, menu_media_insert_new,, 0x01
Media/Disk/+3/Drive A:/_Insert..., Item,, menu_media_insert,, 0x01
Media/Disk/+3/Drive A:/_Eject, Item,, menu_media_eject,, 0x01
-Media/Disk/+3/Drive A:/Eject and _write..., Item,, menu_media_eject,, 0x101
+Media/Disk/+3/Drive A:/_Save, Item,, menu_media_eject,, 0x201
+Media/Disk/+3/Drive A:/Save _As..., Item,, menu_media_eject,, 0x101
Media/Disk/+3/Drive A:/_Flip disk, Branch
Media/Disk/+3/Drive A:/Flip disk/Turn _upside down, Item,, menu_media_flip,, 0x101
Media/Disk/+3/Drive A:/Flip disk/Turn _back, Item,, menu_media_flip,, 0x001
@@ -241,7 +250,8 @@
Media/Disk/+3/Drive B:/Insert _New, Item,, menu_media_insert_new,, 0x02
Media/Disk/+3/Drive B:/_Insert..., Item,, menu_media_insert,, 0x02
Media/Disk/+3/Drive B:/_Eject, Item,, menu_media_eject,, 0x02
-Media/Disk/+3/Drive B:/Eject and _write..., Item,, menu_media_eject,, 0x102
+Media/Disk/+3/Drive B:/_Save, Item,, menu_media_eject,, 0x202
+Media/Disk/+3/Drive B:/Save _As..., Item,, menu_media_eject,, 0x102
Media/Disk/+3/Drive B:/_Flip disk, Branch
Media/Disk/+3/Drive B:/Flip disk/Turn _upside down, Item,, menu_media_flip,, 0x102
Media/Disk/+3/Drive B:/Flip disk/Turn _back, Item,, menu_media_flip,, 0x002
@@ -254,7 +264,8 @@
Media/Disk/Beta/Drive A:/Insert _New, Item,, menu_media_insert_new,, 0x11
Media/Disk/Beta/Drive A:/_Insert..., Item,, menu_media_insert,, 0x11
Media/Disk/Beta/Drive A:/_Eject, Item,, menu_media_eject,, 0x11
-Media/Disk/Beta/Drive A:/Eject and _write..., Item,, menu_media_eject,, 0x111
+Media/Disk/Beta/Drive A:/_Save, Item,, menu_media_eject,, 0x211
+Media/Disk/Beta/Drive A:/Save _As..., Item,, menu_media_eject,, 0x111
Media/Disk/Beta/Drive A:/_Flip disk, Branch
Media/Disk/Beta/Drive A:/Flip disk/Turn _upside down, Item,, menu_media_flip,, 0x111
Media/Disk/Beta/Drive A:/Flip disk/Turn _back, Item,, menu_media_flip,, 0x011
@@ -265,7 +276,8 @@
Media/Disk/Beta/Drive B:/Insert _New, Item,, menu_media_insert_new,, 0x12
Media/Disk/Beta/Drive B:/_Insert..., Item,, menu_media_insert,, 0x12
Media/Disk/Beta/Drive B:/_Eject, Item,, menu_media_eject,, 0x012
-Media/Disk/Beta/Drive B:/Eject and _write..., Item,, menu_media_eject,, 0x112
+Media/Disk/Beta/Drive B:/_Save, Item,, menu_media_eject,, 0x212
+Media/Disk/Beta/Drive B:/Save _As..., Item,, menu_media_eject,, 0x112
Media/Disk/Beta/Drive B:/_Flip disk, Branch
Media/Disk/Beta/Drive B:/Flip disk/Turn _upside down, Item,, menu_media_flip,, 0x112
Media/Disk/Beta/Drive B:/Flip disk/Turn _back, Item,, menu_media_flip,, 0x012
@@ -276,7 +288,8 @@
Media/Disk/Beta/Drive C:/Insert _New, Item,, menu_media_insert_new,, 0x13
Media/Disk/Beta/Drive C:/_Insert..., Item,, menu_media_insert,, 0x13
Media/Disk/Beta/Drive C:/_Eject, Item,, menu_media_eject,, 0x013
-Media/Disk/Beta/Drive C:/Eject and _write..., Item,, menu_media_eject,, 0x113
+Media/Disk/Beta/Drive C:/_Save, Item,, menu_media_eject,, 0x213
+Media/Disk/Beta/Drive C:/Save _As..., Item,, menu_media_eject,, 0x113
Media/Disk/Beta/Drive C:/_Flip disk, Branch
Media/Disk/Beta/Drive C:/Flip disk/Turn _upside down, Item,, menu_media_flip,, 0x113
Media/Disk/Beta/Drive C:/Flip disk/Turn _back, Item,, menu_media_flip,, 0x013
@@ -287,7 +300,8 @@
Media/Disk/Beta/Drive D:/Insert _New, Item,, menu_media_insert_new,, 0x14
Media/Disk/Beta/Drive D:/_Insert..., Item,, menu_media_insert,, 0x14
Media/Disk/Beta/Drive D:/_Eject, Item,, menu_media_eject,, 0x014
-Media/Disk/Beta/Drive D:/Eject and _write..., Item,, menu_media_eject,, 0x114
+Media/Disk/Beta/Drive D:/_Save, Item,, menu_media_eject,, 0x214
+Media/Disk/Beta/Drive D:/Save _As..., Item,, menu_media_eject,, 0x114
Media/Disk/Beta/Drive D:/_Flip disk, Branch
Media/Disk/Beta/Drive D:/Flip disk/Turn _upside down, Item,, menu_media_flip,, 0x114
Media/Disk/Beta/Drive D:/Flip disk/Turn _back, Item,, menu_media_flip,, 0x014
@@ -300,7 +314,8 @@
Media/Disk/+D/Drive 1/Insert _New, Item,, menu_media_insert_new,, 0x21
Media/Disk/+D/Drive 1/_Insert..., Item,, menu_media_insert,, 0x21
Media/Disk/+D/Drive 1/_Eject, Item,, menu_media_eject,, 0x021
-Media/Disk/+D/Drive 1/Eject and _write..., Item,, menu_media_eject,, 0x121
+Media/Disk/+D/Drive 1/_Save, Item,, menu_media_eject,, 0x221
+Media/Disk/+D/Drive 1/Save _As..., Item,, menu_media_eject,, 0x121
Media/Disk/+D/Drive 1/_Flip disk, Branch
Media/Disk/+D/Drive 1/Flip disk/Turn _upside down, Item,, menu_media_flip,, 0x121
Media/Disk/+D/Drive 1/Flip disk/Turn _back, Item,, menu_media_flip,, 0x021
@@ -311,7 +326,8 @@
Media/Disk/+D/Drive 2/Insert _New, Item,, menu_media_insert_new,, 0x22
Media/Disk/+D/Drive 2/_Insert..., Item,, menu_media_insert,, 0x22
Media/Disk/+D/Drive 2/_Eject, Item,, menu_media_eject,, 0x022
-Media/Disk/+D/Drive 2/Eject and _write..., Item,, menu_media_eject,, 0x122
+Media/Disk/+D/Drive 2/_Save, Item,, menu_media_eject,, 0x222
+Media/Disk/+D/Drive 2/Save _As..., Item,, menu_media_eject,, 0x122
Media/Disk/+D/Drive 2/_Flip disk, Branch
Media/Disk/+D/Drive 2/Flip disk/Turn _upside down, Item,, menu_media_flip,, 0x122
Media/Disk/+D/Drive 2/Flip disk/Turn _back, Item,, menu_media_flip,, 0x022
@@ -324,7 +340,8 @@
Media/Disk/Opus/Drive 1/Insert _New, Item,, menu_media_insert_new,, 0x41
Media/Disk/Opus/Drive 1/_Insert..., Item,, menu_media_insert,, 0x41
Media/Disk/Opus/Drive 1/_Eject, Item,, menu_media_eject,, 0x041
-Media/Disk/Opus/Drive 1/Eject and _write..., Item,, menu_media_eject,, 0x141
+Media/Disk/Opus/Drive 1/_Save, Item,, menu_media_eject,, 0x241
+Media/Disk/Opus/Drive 1/Save _As..., Item,, menu_media_eject,, 0x141
Media/Disk/Opus/Drive 1/_Flip disk, Branch
Media/Disk/Opus/Drive 1/Flip disk/Turn _upside down, Item,, menu_media_flip,, 0x141
Media/Disk/Opus/Drive 1/Flip disk/Turn _back, Item,, menu_media_flip,, 0x041
@@ -335,7 +352,8 @@
Media/Disk/Opus/Drive 2/Insert _New, Item,, menu_media_insert_new,, 0x42
Media/Disk/Opus/Drive 2/_Insert..., Item,, menu_media_insert,, 0x42
Media/Disk/Opus/Drive 2/_Eject, Item,, menu_media_eject,, 0x042
-Media/Disk/Opus/Drive 2/Eject and _write..., Item,, menu_media_eject,, 0x142
+Media/Disk/Opus/Drive 2/_Save, Item,, menu_media_eject,, 0x242
+Media/Disk/Opus/Drive 2/Save _As..., Item,, menu_media_eject,, 0x142
Media/Disk/Opus/Drive 2/_Flip disk, Branch
Media/Disk/Opus/Drive 2/Flip disk/Turn _upside down, Item,, menu_media_flip,, 0x142
Media/Disk/Opus/Drive 2/Flip disk/Turn _back, Item,, menu_media_flip,, 0x042
Modified: vendor/fuse-emulator/current/fuse/ui/gtk/gtkdisplay.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/gtk/gtkdisplay.c 2010-10-16 09:47:07 UTC (rev 653)
+++ vendor/fuse-emulator/current/fuse/ui/gtk/gtkdisplay.c 2010-10-18 10:33:08 UTC (rev 654)
@@ -1,7 +1,7 @@
/* gtkdisplay.c: GTK+ routines for dealing with the Speccy screen
Copyright (c) 2000-2005 Philip Kendall
- $Id: gtkdisplay.c 4139 2010-06-27 13:18:07Z pak21 $
+ $Id: gtkdisplay.c 4182 2010-10-11 12:24:13Z 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
@@ -97,6 +97,7 @@
static int init_colours( void );
static void gtkdisplay_area(int x, int y, int width, int height);
static void register_scalers( int force_scaler );
+static void gtkdisplay_load_gfx_mode( void );
/* Callbacks */
@@ -168,6 +169,8 @@
if ( scaler_select_scaler( current_scaler ) )
scaler_select_scaler( SCALER_NORMAL );
+ gtkdisplay_load_gfx_mode();
+
display_ui_initialised = 1;
return 0;
@@ -231,9 +234,13 @@
if( force_scaler ) {
switch( gtkdisplay_current_size ) {
- case 1: scaler = SCALER_NORMAL; break;
- case 2: scaler = SCALER_DOUBLESIZE; break;
- case 3: scaler = SCALER_TRIPLESIZE; break;
+ case 1: scaler = machine_current->timex ? SCALER_HALF : SCALER_NORMAL;
+ break;
+ case 2: scaler = machine_current->timex ? SCALER_NORMAL : SCALER_DOUBLESIZE;
+ break;
+ case 3: scaler = machine_current->timex ? SCALER_TIMEX1_5X :
+ SCALER_TRIPLESIZE;
+ break;
}
}
@@ -299,55 +306,11 @@
int
uidisplay_hotswap_gfx_mode( void )
{
- GdkGeometry geometry;
- GdkWindowHints hints;
- float scale;
-
fuse_emulation_pause();
- scale = scaler_get_scaling_factor( current_scaler );
+ /* Setup the new GFX mode */
+ gtkdisplay_load_gfx_mode();
- hints = GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE |
- GDK_HINT_BASE_SIZE | GDK_HINT_RESIZE_INC;
-
- geometry.min_width = DISPLAY_ASPECT_WIDTH;
- geometry.min_height = DISPLAY_SCREEN_HEIGHT;
- geometry.max_width = 3 * DISPLAY_ASPECT_WIDTH;
- geometry.max_height = 3 * DISPLAY_SCREEN_HEIGHT;
- geometry.base_width = scale * image_width;
- geometry.base_height = scale * image_height;
- geometry.width_inc = DISPLAY_ASPECT_WIDTH;
- geometry.height_inc = DISPLAY_SCREEN_HEIGHT;
-
- if( settings_current.aspect_hint ) {
- hints |= GDK_HINT_ASPECT;
- if( settings_current.strict_aspect_hint ) {
- geometry.min_aspect = geometry.max_aspect =
- (float)DISPLAY_ASPECT_WIDTH / DISPLAY_SCREEN_HEIGHT;
- } else {
- geometry.min_aspect = 1.2;
- geometry.max_aspect = 1.5;
- }
- }
-
- gtk_window_set_geometry_hints( GTK_WINDOW( gtkui_window ),
- GTK_WIDGET( gtkui_drawing_area ),
- &geometry, hints );
-
- gtk_window_set_default_size( GTK_WINDOW( gtkui_window ),
- scale * image_width, scale * image_height );
-
- gtk_drawing_area_size( GTK_DRAWING_AREA( gtkui_drawing_area ),
- scale * image_width, scale * image_height );
-
- drawing_area_resize( scale * image_width, scale * image_height, 0 );
-
- gtk_window_resize( GTK_WINDOW( gtkui_window ), scale * image_width,
- scale * image_height );
-
- /* Redraw the entire screen... */
- display_refresh_all();
-
fuse_emulation_unpause();
return 0;
@@ -465,3 +428,54 @@
drawing_area_resize( event->configure.width, event->configure.height, 1 );
return TRUE;
}
+
+static void
+gtkdisplay_load_gfx_mode( void )
+{
+ GdkGeometry geometry;
+ GdkWindowHints hints;
+ float scale;
+
+ scale = scaler_get_scaling_factor( current_scaler );
+
+ hints = GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE |
+ GDK_HINT_BASE_SIZE | GDK_HINT_RESIZE_INC;
+
+ geometry.min_width = DISPLAY_ASPECT_WIDTH;
+ geometry.min_height = DISPLAY_SCREEN_HEIGHT;
+ geometry.max_width = 3 * DISPLAY_ASPECT_WIDTH;
+ geometry.max_height = 3 * DISPLAY_SCREEN_HEIGHT;
+ geometry.base_width = scale * image_width;
+ geometry.base_height = scale * image_height;
+ geometry.width_inc = DISPLAY_ASPECT_WIDTH;
+ geometry.height_inc = DISPLAY_SCREEN_HEIGHT;
+
+ if( settings_current.aspect_hint ) {
+ hints |= GDK_HINT_ASPECT;
+ if( settings_current.strict_aspect_hint ) {
+ geometry.min_aspect = geometry.max_aspect =
+ (float)DISPLAY_ASPECT_WIDTH / DISPLAY_SCREEN_HEIGHT;
+ } else {
+ geometry.min_aspect = 1.2;
+ geometry.max_aspect = 1.5;
+ }
+ }
+
+ gtk_window_set_geometry_hints( GTK_WINDOW( gtkui_window ),
+ GTK_WIDGET( gtkui_drawing_area ),
+ &geometry, hints );
+
+ gtk_window_set_default_size( GTK_WINDOW( gtkui_window ),
+ scale * image_width, scale * image_height );
+
+ gtk_drawing_area_size( GTK_DRAWING_AREA( gtkui_drawing_area ),
+ scale * image_width, scale * image_height );
+
+ drawing_area_resize( scale * image_width, scale * image_height, 0 );
+
+ gtk_window_resize( GTK_WINDOW( gtkui_window ), scale * image_width,
+ scale * image_height );
+
+ /* Redraw the entire screen... */
+ display_refresh_all();
+}
Modified: vendor/fuse-emulator/current/fuse/ui/ui.h
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/ui.h 2010-10-16 09:47:07 UTC (rev 653)
+++ vendor/fuse-emulator/current/fuse/ui/ui.h 2010-10-18 10:33:08 UTC (rev 654)
@@ -1,7 +1,7 @@
/* ui.h: General UI event handling routines
Copyright (c) 2000-2004 Philip Kendall
- $Id: ui.h 4128 2010-05-18 11:20:47Z fredm $
+ $Id: ui.h 4180 2010-10-09 12:59:37Z 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
@@ -115,11 +115,11 @@
int ui_tape_write( void );
/* Write a +3, Beta or +D disk out */
-int ui_plus3_disk_write( specplus3_drive_number which );
-int ui_beta_disk_write( beta_drive_number which );
-int ui_opus_disk_write( opus_drive_number which );
-int ui_plusd_disk_write( plusd_drive_number which );
-int ui_mdr_write( int which );
+int ui_plus3_disk_write( specplus3_drive_number which, int saveas );
+int ui_beta_disk_write( beta_drive_number which, int saveas );
+int ui_opus_disk_write( opus_drive_number which, int saveas );
+int ui_plusd_disk_write( plusd_drive_number which, int saveas );
+int ui_mdr_write( int which, int saveas );
/* Get a rollback point from the given list */
int ui_get_rollback_point( GSList *points );
Modified: vendor/fuse-emulator/current/fuse/ui/widget/query.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/widget/query.c 2010-10-16 09:47:07 UTC (rev 653)
+++ vendor/fuse-emulator/current/fuse/ui/widget/query.c 2010-10-18 10:33:08 UTC (rev 654)
@@ -1,7 +1,7 @@
/* query.c: The query widgets
Copyright (c) 2004-2008 Darren Salt, Fredrick Meunier
- $Id: query.c 4103 2009-11-21 10:16:36Z fredm $
+ $Id: query.c 4179 2010-10-08 10:05:55Z 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
@@ -62,7 +62,7 @@
static widget_query_entry query_save[] = {
{ "\012S\001ave", 0, INPUT_KEY_s, widget_save_click },
{ "\012D\001on't save", 1, INPUT_KEY_d, widget_dont_save_click },
- { "\010C\001ancel", 2, INPUT_KEY_c, widget_cancel_click },
+ { "\012C\001ancel", 2, INPUT_KEY_c, widget_cancel_click },
{ NULL }
};
@@ -87,7 +87,7 @@
static void
widget_cancel_click( void )
{
- widget_query.save = UI_CONFIRM_SAVE_DONTSAVE;
+ widget_query.save = UI_CONFIRM_SAVE_CANCEL;
}
static void
Modified: vendor/fuse-emulator/current/fuse/ui.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ui.c 2010-10-16 09:47:07 UTC (rev 653)
+++ vendor/fuse-emulator/current/fuse/ui.c 2010-10-18 10:33:08 UTC (rev 654)
@@ -1,7 +1,7 @@
/* ui.c: User interface routines, but those which are independent of any UI
Copyright (c) 2002 Philip Kendall
- $Id: ui.c 4177 2010-10-07 09:34:31Z fredm $
+ $Id: ui.c 4180 2010-10-09 12:59:37Z 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
@@ -238,7 +238,8 @@
{ UI_MENU_ITEM_MEDIA_IF1_M1_EJECT,
"/Media/Interface I/Microdrive 1/Eject",
- "/Media/Interface I/Microdrive 1/Eject and write...", 0,
+ "/Media/Interface I/Microdrive 1/Save As...", 0,
+ "/Media/Interface I/Microdrive 1/Save", 0,
"/Media/Interface I/Microdrive 1/Write protect", 0 },
{ UI_MENU_ITEM_MEDIA_IF1_M1_WP_SET,
@@ -247,7 +248,8 @@
{ UI_MENU_ITEM_MEDIA_IF1_M2_EJECT,
"/Media/Interface I/Microdrive 2/Eject",
- "/Media/Interface I/Microdrive 2/Eject and write...", 0,
+ "/Media/Interface I/Microdrive 2/Save As...", 0,
+ "/Media/Interface I/Microdrive 2/Save", 0,
"/Media/Interface I/Microdrive 2/Write protect", 0 },
{ UI_MENU_ITEM_MEDIA_IF1_M2_WP_SET,
@@ -256,7 +258,8 @@
{ UI_MENU_ITEM_MEDIA_IF1_M3_EJECT,
"/Media/Interface I/Microdrive 3/Eject",
- "/Media/Interface I/Microdrive 3/Eject and write...", 0,
+ "/Media/Interface I/Microdrive 3/Save As...", 0,
+ "/Media/Interface I/Microdrive 3/Save", 0,
"/Media/Interface I/Microdrive 3/Write protect", 0 },
{ UI_MENU_ITEM_MEDIA_IF1_M3_WP_SET,
@@ -265,7 +268,8 @@
{ UI_MENU_ITEM_MEDIA_IF1_M4_EJECT,
"/Media/Interface I/Microdrive 4/Eject",
- "/Media/Interface I/Microdrive 4/Eject and write...", 0,
+ "/Media/Interface I/Microdrive 4/Save As...", 0,
+ "/Media/Interface I/Microdrive 4/Save", 0,
"/Media/Interface I/Microdrive 4/Write protect", 0 },
{ UI_MENU_ITEM_MEDIA_IF1_M4_WP_SET,
@@ -274,7 +278,8 @@
{ UI_MENU_ITEM_MEDIA_IF1_M5_EJECT,
"/Media/Interface I/Microdrive 5/Eject",
- "/Media/Interface I/Microdrive 5/Eject and write...", 0,
+ "/Media/Interface I/Microdrive 5/Save As...", 0,
+ "/Media/Interface I/Microdrive 5/Save", 0,
"/Media/Interface I/Microdrive 5/Write protect", 0 },
{ UI_MENU_ITEM_MEDIA_IF1_M5_WP_SET,
@@ -283,7 +288,8 @@
{ UI_MENU_ITEM_MEDIA_IF1_M6_EJECT,
"/Media/Interface I/Microdrive 6/Eject",
- "/Media/Interface I/Microdrive 6/Eject and write...", 0,
+ "/Media/Interface I/Microdrive 6/Save As...", 0,
+ "/Media/Interface I/Microdrive 6/Save", 0,
"/Media/Interface I/Microdrive 6/Write protect", 0 },
{ UI_MENU_ITEM_MEDIA_IF1_M6_WP_SET,
@@ -292,7 +298,8 @@
{ UI_MENU_ITEM_MEDIA_IF1_M7_EJECT,
"/Media/Interface I/Microdrive 7/Eject",
- "/Media/Interface I/Microdrive 7/Eject and write...", 0,
+ "/Media/Interface I/Microdrive 7/Save As...", 0,
+ "/Media/Interface I/Microdrive 7/Save", 0,
"/Media/Interface I/Microdrive 7/Write protect", 0 },
{ UI_MENU_ITEM_MEDIA_IF1_M7_WP_SET,
@@ -301,7 +308,8 @@
{ UI_MENU_ITEM_MEDIA_IF1_M8_EJECT,
"/Media/Interface I/Microdrive 8/Eject",
- "/Media/Interface I/Microdrive 8/Eject and write...", 0,
+ "/Media/Interface I/Microdrive 8/Save As...", 0,
+ "/Media/Interface I/Microdrive 8/Save", 0,
"/Media/Interface I/Microdrive 8/Write protect", 0 },
{ UI_MENU_ITEM_MEDIA_IF1_M8_WP_SET,
@@ -328,7 +336,8 @@
{ UI_MENU_ITEM_MEDIA_DISK_PLUS3_A_EJECT,
"/Media/Disk/+3/Drive A:/Eject",
- "/Media/Disk/+3/Drive A:/Eject and write...", 0,
+ "/Media/Disk/+3/Drive A:/Save As...", 0,
+ "/Media/Disk/+3/Drive A:/Save", 0,
"/Media/Disk/+3/Drive A:/Flip disk", 0,
"/Media/Disk/+3/Drive A:/Write protect", 0 },
@@ -344,7 +353,8 @@
{ UI_MENU_ITEM_MEDIA_DISK_PLUS3_B_EJECT,
"/Media/Disk/+3/Drive B:/Eject",
- "/Media/Disk/+3/Drive B:/Eject and write...", 0,
+ "/Media/Disk/+3/Drive B:/Save As...", 0,
+ "/Media/Disk/+3/Drive B:/Save", 0,
"/Media/Disk/+3/Drive B:/Flip disk", 0,
"/Media/Disk/+3/Drive B:/Write protect", 0 },
@@ -362,7 +372,8 @@
{ UI_MENU_ITEM_MEDIA_DISK_BETA_A_EJECT,
"/Media/Disk/Beta/Drive A:/Eject",
- "/Media/Disk/Beta/Drive A:/Eject and write...", 0,
+ "/Media/Disk/Beta/Drive A:/Save As...", 0,
+ "/Media/Disk/Beta/Drive A:/Save", 0,
"/Media/Disk/Beta/Drive A:/Flip disk", 0,
"/Media/Disk/Beta/Drive A:/Write protect", 0 },
@@ -378,7 +389,8 @@
{ UI_MENU_ITEM_MEDIA_DISK_BETA_B_EJECT,
"/Media/Disk/Beta/Drive B:/Eject",
- "/Media/Disk/Beta/Drive B:/Eject and write...", 0,
+ "/Media/Disk/Beta/Drive B:/Save As...", 0,
+ "/Media/Disk/Beta/Drive B:/Save", 0,
"/Media/Disk/Beta/Drive B:/Flip disk", 0,
"/Media/Disk/Beta/Drive B:/Write protect", 0 },
@@ -394,7 +406,8 @@
{ UI_MENU_ITEM_MEDIA_DISK_BETA_C_EJECT,
"/Media/Disk/Beta/Drive C:/Eject",
- "/Media/Disk/Beta/Drive C:/Eject and write...", 0,
+ "/Media/Disk/Beta/Drive C:/Save As...", 0,
+ "/Media/Disk/Beta/Drive C:/Save", 0,
"/Media/Disk/Beta/Drive C:/Flip disk", 0,
"/Media/Disk/Beta/Drive C:/Write protect", 0 },
@@ -410,7 +423,8 @@
{ UI_MENU_ITEM_MEDIA_DISK_BETA_D_EJECT,
"/Media/Disk/Beta/Drive D:/Eject",
- "/Media/Disk/Beta/Drive D:/Eject and write...", 0,
+ "/Media/Disk/Beta/Drive D:/Save As...", 0,
+ "/Media/Disk/Beta/Drive D:/Save", 0,
"/Media/Disk/Beta/Drive D:/Flip disk", 0,
"/Media/Disk/Beta/Drive D:/Write protect", 0 },
@@ -428,7 +442,8 @@
{ UI_MENU_ITEM_MEDIA_DISK_PLUSD_1_EJECT,
"/Media/Disk/+D/Drive 1/Eject",
- "/Media/Disk/+D/Drive 1/Eject and write...", 0,
+ "/Media/Disk/+D/Drive 1/Save As...", 0,
+ "/Media/Disk/+D/Drive 1/Save", 0,
"/Media/Disk/+D/Drive 1/Flip disk", 0,
"/Media/Disk/+D/Drive 1/Write protect", 0 },
@@ -444,7 +459,8 @@
{ UI_MENU_ITEM_MEDIA_DISK_PLUSD_2_EJECT,
"/Media/Disk/+D/Drive 2/Eject",
- "/Media/Disk/+D/Drive 2/Eject and write...", 0,
+ "/Media/Disk/+D/Drive 2/Save As...", 0,
+ "/Media/Disk/+D/Drive 2/Save", 0,
"/Media/Disk/+D/Drive 2/Flip disk", 0,
"/Media/Disk/+D/Drive 2/Write protect", 0 },
@@ -462,7 +478,8 @@
{ UI_MENU_ITEM_MEDIA_DISK_OPUS_1_EJECT,
"/Media/Disk/Opus/Drive 1/Eject",
- "/Media/Disk/Opus/Drive 1/Eject and write...", 0,
+ "/Media/Disk/Opus/Drive 1/Save As...", 0,
+ "/Media/Disk/Opus/Drive 1/Save", 0,
"/Media/Disk/Opus/Drive 1/Flip disk", 0,
"/Media/Disk/Opus/Drive 1/Write protect", 0 },
@@ -478,7 +495,8 @@
{ UI_MENU_ITEM_MEDIA_DISK_OPUS_2_EJECT,
"/Media/Disk/Opus/Drive 2/Eject",
- "/Media/Disk/Opus/Drive 2/Eject and write...", 0,
+ "/Media/Disk/Opus/Drive 2/Save As...", 0,
+ "/Media/Disk/Opus/Drive 2/Save", 0,
"/Media/Disk/Opus/Drive 2/Flip disk", 0,
"/Media/Disk/Opus/Drive 2/Write protect", 0 },
@@ -641,10 +659,10 @@
}
int
-ui_plus3_disk_write( specplus3_drive_number which )
+ui_plus3_disk_write( specplus3_drive_number which, int saveas )
{
int err;
- char drive, *filename, title[80];
+ char drive, *filename = NULL, title[80];
switch( which ) {
case SPECPLUS3_DRIVE_A: drive = 'A'; break;
@@ -656,12 +674,13 @@
snprintf( title, 80, "Fuse - Write +3 Disk %c:", drive );
- filename = ui_get_save_filename( title );
- if( !filename ) { fuse_emulation_unpause(); return 1; }
-
+ if( saveas ) {
+ filename = ui_get_save_filename( title );
+ if( !filename ) { fuse_emulation_unpause(); return 1; }
+ }
err = specplus3_disk_write( which, filename );
- free( filename );
+ if( saveas ) free( filename );
fuse_emulation_unpause();
@@ -669,10 +688,10 @@
}
int
-ui_beta_disk_write( beta_drive_number which )
+ui_beta_disk_write( beta_drive_number which, int saveas )
{
int err;
- char drive, *filename, title[80];
+ char drive, *filename = NULL, title[80];
switch( which ) {
case BETA_DRIVE_A: drive = 'A'; break;
@@ -686,12 +705,14 @@
snprintf( title, 80, "Fuse - Write Beta Disk %c:", drive );
- filename = ui_get_save_filename( title );
- if( !filename ) { fuse_emulation_unpause(); return 1; }
+ if( saveas ) {
+ filename = ui_get_save_filename( title );
+ if( !filename ) { fuse_emulation_unpause(); return 1; }
+ }
err = beta_disk_write( which, filename );
- free( filename );
+ if( saveas ) free( filename );
fuse_emulation_unpause();
@@ -699,10 +720,10 @@
}
int
-ui_opus_disk_write( opus_drive_number which )
+ui_opus_disk_write( opus_drive_number which, int saveas )
{
int err;
- char drive, *filename, title[80];
+ char drive, *filename = NULL, title[80];
switch( which ) {
case OPUS_DRIVE_1: drive = '1'; break;
@@ -714,12 +735,14 @@
snprintf( title, 80, "Fuse - Write Opus Disk %c", drive );
- filename = ui_get_save_filename( title );
- if( !filename ) { fuse_emulation_unpause(); return 1; }
+ if( saveas ) {
+ filename = ui_get_save_filename( title );
+ if( !filename ) { fuse_emulation_unpause(); return 1; }
+ }
err = opus_disk_write( which, filename );
- free( filename );
+ if( saveas ) free( filename );
fuse_emulation_unpause();
@@ -727,10 +750,10 @@
}
int
-ui_plusd_disk_write( plusd_drive_number which )
+ui_plusd_disk_write( plusd_drive_number which, int saveas )
{
int err;
- char drive, *filename, title[80];
+ char drive, *filename = NULL, title[80];
switch( which ) {
case PLUSD_DRIVE_1: drive = '1'; break;
@@ -742,12 +765,14 @@
snprintf( title, 80, "Fuse - Write +D Disk %c", drive );
- filename = ui_get_save_filename( title );
- if( !filename ) { fuse_emulation_unpause(); return 1; }
+ if( saveas ) {
+ filename = ui_get_save_filename( title );
+ if( !filename ) { fuse_emulation_unpause(); return 1; }
+ }
err = plusd_disk_write( which, filename );
- free( filename );
+ if( saveas ) free( filename );
fuse_emulation_unpause();
@@ -755,21 +780,23 @@
}
int
-ui_mdr_write( int which )
+ui_mdr_write( int which, int saveas )
{
int err;
- char *filename, title[80];
+ char *filename = NULL, title[80];
fuse_emulation_pause();
snprintf( title, 80, "Fuse - Write Microdrive Cartridge %i", which + 1 );
- filename = ui_get_save_filename( title );
- if( !filename ) { fuse_emulation_unpause(); return 1; }
+ if( saveas ) {
+ filename = ui_get_save_filename( title );
+ if( !filename ) { fuse_emulation_unpause(); return 1; }
+ }
err = if1_mdr_write( which, filename );
- free( filename );
+ if( saveas ) free( filename );
fuse_emulation_unpause();
Modified: vendor/fuse-emulator/current/libspectrum/configure.in
===================================================================
--- vendor/fuse-emulator/current/libspectrum/configure.in 2010-10-16 09:47:07 UTC (rev 653)
+++ vendor/fuse-emulator/current/libspectrum/configure.in 2010-10-18 10:33:08 UTC (rev 654)
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
dnl Copyright (c) 1999-2008 Philip Kendall
-dnl $Id: configure.in 4167 2010-10-02 12:08:34Z pak21 $
+dnl $Id: configure.in 4181 2010-10-10 10:28:09Z fredm $
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
@@ -59,7 +59,11 @@
if test "$WINDRES" != no; then
WINDRES_OBJ="windres.o"
WINDRES_LDFLAGS="-Xlinker windres.o"
- AC_DEFINE([VERSION_WIN32], [translit(LIBSPECTRUM_VERSION, [.], [,])[,0]], [Define version information for win32 dll library])
+ define(LIBSPECTRUM_FULL_VERSION,
+ [ifelse(translit(LIBSPECTRUM_VERSION, [0-9]), [.], [LIBSPECTRUM_VERSION[.0.0]],
+ translit(LIBSPECTRUM_VERSION, [0-9]), [..], [LIBSPECTRUM_VERSION[.0]],
+ [LIBSPECTRUM_VERSION])])dnl
+ AC_DEFINE([VERSION_WIN32], [translit(LIBSPECTRUM_FULL_VERSION, [.], [,])], [Define version information for win32 dll library])
fi
AC_SUBST(WINDRES_OBJ)
AM_SUBST_NOTMAKE(WINDRES_OBJ)
Modified: vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog 2010-10-16 09:47:07 UTC (rev 653)
+++ vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog 2010-10-18 10:33:08 UTC (rev 654)
@@ -785,3 +785,5 @@
libspectrum version number so we know that new files are written
without the bug.
20101003 szx.c,test/{empty.szx,test.c}: we also need to swap A' and F'.
+20101010 configure.in: pad version number for Win32 if needed (patch #3084574)
+ (Sergio Baldovi).
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2010-12-07 12:35:31
|
Revision: 658
http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=658&view=rev
Author: fredm
Date: 2010-12-07 12:35:24 +0000 (Tue, 07 Dec 2010)
Log Message:
-----------
Load . into vendor/fuse-emulator/current.
Modified Paths:
--------------
vendor/fuse-emulator/current/fuse/hacking/ChangeLog
vendor/fuse-emulator/current/fuse/man/fuse.1
vendor/fuse-emulator/current/fuse/memory.c
vendor/fuse-emulator/current/fuse/ui/fb/fbdisplay.c
vendor/fuse-emulator/current/fuse-utils/Makefile.am
vendor/fuse-emulator/current/fuse-utils/hacking/ChangeLog
vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog
vendor/fuse-emulator/current/libspectrum/warajevo_read.c
Modified: vendor/fuse-emulator/current/fuse/hacking/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse/hacking/ChangeLog 2010-10-19 11:21:18 UTC (rev 657)
+++ vendor/fuse-emulator/current/fuse/hacking/ChangeLog 2010-12-07 12:35:24 UTC (rev 658)
@@ -3361,3 +3361,12 @@
20101011 ui/gtk/gtkdisplay.c: resize window when machine selection switches
between Timex and non-Timex modes (fixes bug #3084862) (thanks, Phil)
(Fred).
+20101025 memory.c: writable_roms preference shouldn't affect the 16K machine
+ "empty" page (thanks, Andrew Owen) (Fred).
+20101029 man/fuse.1: some updates to bring things a bit more up to date (Fred).
+20101102 man/fuse.1: remove reference to fixed issue in RZX playback command
+ line ordering (patch #3100707) (Sergio Baldovi).
+20101129 ui/fb/fbdisplay.c: only call fbdisplay_end() when display is
+ initialised (fixes bug #3119382) (rkd77).
+20101203 ui/fb/fbdisplay.c: improve fb colour handling and initialise scaler
+ system (fixes bugs #3124787 and #3124788) (rkd77).
Modified: vendor/fuse-emulator/current/fuse/man/fuse.1
===================================================================
--- vendor/fuse-emulator/current/fuse/man/fuse.1 2010-10-19 11:21:18 UTC (rev 657)
+++ vendor/fuse-emulator/current/fuse/man/fuse.1 2010-12-07 12:35:24 UTC (rev 658)
@@ -54,10 +54,12 @@
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 disk images are supported when
-emulating a +3, TRD and SCL disk images are supported when emulating
-a Pentagon or Scorpion and DCK cartridge images are supported when
-emulating a Timex 2068 variant. Interface II ROM cartridges are also
+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,
+Pentagon or Scorpion machines as well as the +D, Opus Discovery and
+Beta 128 interfaces. DCK cartridge images are supported when
+emulating a Timex 2068 variant. Interface II ROM cartridges are also
supported.
.PP
Finally, there is also support for reading and writing the RZX input recording
@@ -435,6 +437,7 @@
a 48K Spectrum. The available options are
.IR 16 ,
.IR 48 ,
+.IR 48_ntsc,
.IR 128 ,
.IR plus2 ,
.IR plus2a ,
@@ -445,8 +448,9 @@
.IR pentagon ,
.IR pentagon512 ,
.IR pentagon1024 ,
+.IR scorpion
and
-.IR scorpion .
+.IR se .
.RE
.PP
.I "\-\-melodik"
@@ -1669,9 +1673,9 @@
.RE
.PP
.I "AY volume"
+.RS
+Sets the relative volume of the AY-3-8912 chip from a range of 0-100%.
.RE
-Sets the relative volume of the AY-3-8912 chip from a range of 0-100%.
-.RS
.PP
.I "Beeper volume"
.RS
@@ -2104,6 +2108,12 @@
of RAM respectively.
.RE
.PP
+.I "Spectrum 48K (NTSC)"
+.RS
+The NTSC 48K machine released in limited numbers in parts of South
+America.
+.RE
+.PP
.I "Spectrum 128K"
.RS
The 128K machine as released by Sinclair in 1985 (Spain) or 1986 (UK).
@@ -3494,13 +3504,16 @@
.\"
.SH BETA 128 EMULATION
.PP
-Fuse supports .SCL and .TRD images in its Pentagon and Scorpion
+Fuse supports Betadisk emulation in its Pentagon and Scorpion
emulation, and also under 48K, TC2048, 128K and +2 (but not +2A)
emulation if the
.I Beta 128 interface
option from the
.I "Options, Peripherals..."
dialog is enabled.
+See the
+.B "DISK FILE FORMATS"
+section for mode details on supported disk file formats.
.\"
.\"------------------------------------------------------------------
.\"
@@ -3508,7 +3521,9 @@
.PP
By default, Fuse emulates the Opus Discovery interface with the optional 2k RAM
expansion and a second 40 track single sided disk drive.
-Fuse supports .OPD and .OPU images in its Opus Discovery emulation. The Opus
+See the
+.B "DISK FILE FORMATS"
+section for mode details on supported disk file formats. The Opus
Discovery's printer port is also emulated for output only. (See the
.B "PRINTER EMULATION"
section for more details.) The Opus Discovery may only be
@@ -3519,7 +3534,9 @@
.\"
.SH +D EMULATION
.PP
-Fuse supports .MGT and .IMG images in its +D emulation. The +D's
+Fuse supports emulating the +D disk and printer interface. See the
+.B "DISK FILE FORMATS"
+section for mode details on supported disk file formats. The +D's
printer port is emulated. (See the
.B "PRINTER EMULATION"
section for more details.) The +D may only be
@@ -3674,13 +3691,6 @@
Selecting a startup filter doesn't work properly with user interfaces
other than SDL and GTK+.
.PP
-Attempting to replay an RZX file without an embedded snapshot from the
-command-line doesn't work if you do `./fuse
-.IR "rzxfile snapshot" '.
-`./fuse
-.IR "snapshot rzxfile" '
-does work though, so use that instead.
-.PP
Changing virtual consoles when using SVGAlib for joystick support
causes Fuse to exit. If this is a problem, compile Fuse with the
.RI ` \-\-disable\-ui\-joystick '
Modified: vendor/fuse-emulator/current/fuse/memory.c
===================================================================
--- vendor/fuse-emulator/current/fuse/memory.c 2010-10-19 11:21:18 UTC (rev 657)
+++ vendor/fuse-emulator/current/fuse/memory.c 2010-12-07 12:35:24 UTC (rev 658)
@@ -1,7 +1,7 @@
/* memory.c: Routines for accessing memory
Copyright (c) 1999-2004 Philip Kendall
- $Id: memory.c 4099 2009-10-22 10:59:02Z fredm $
+ $Id: memory.c 4186 2010-10-25 10:29:45Z 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
@@ -276,7 +276,9 @@
if( opus_active && address >= 0x2800 && address < 0x3800 ) {
opus_write( address, b );
- } else if( mapping->writable || settings_current.writable_roms ) {
+ } else if( mapping->writable ||
+ (mapping->bank != MEMORY_BANK_NONE &&
+ settings_current.writable_roms) ) {
libspectrum_word offset = address & 0x1fff;
libspectrum_byte *memory = mapping->page;
Modified: vendor/fuse-emulator/current/fuse/ui/fb/fbdisplay.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/fb/fbdisplay.c 2010-10-19 11:21:18 UTC (rev 657)
+++ vendor/fuse-emulator/current/fuse/ui/fb/fbdisplay.c 2010-12-07 12:35:24 UTC (rev 658)
@@ -2,7 +2,7 @@
Copyright (c) 2000-2003 Philip Kendall, Matan Ziv-Av, Darren Salt,
Witold Filipczyk
- $Id: fbdisplay.c 3992 2009-03-29 11:28:17Z fredm $
+ $Id: fbdisplay.c 4205 2010-12-03 10:39:39Z 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
@@ -27,6 +27,7 @@
#include <config.h>
#include <errno.h>
+#include <math.h>
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
@@ -66,7 +67,7 @@
/* Are we in a Timex display mode? */
static int hires;
-static int register_scalers( void );
+static void register_scalers( void );
/* probably 0rrrrrgggggbbbbb */
static short rgbs[16], greys[16];
@@ -77,6 +78,7 @@
static struct fb_fix_screeninfo fixed;
static struct fb_var_screeninfo orig_display, display;
static int got_orig_display = 0;
+static int changed_palette = 0;
unsigned long fb_resolution; /* == xres << 16 | yres */
#define FB_RES(X,Y) ((X) << 16 | (Y))
@@ -127,20 +129,20 @@
{ 320, 240, 80000, 40, 28, 9, 2, 20, 3, 0, 1 }, ** 320x240-60 60.310 M tall
{ 320, 240, 55555, 52, 16, 12, 0, 28, 2, 0, 1 }, ** 320x240-85 85.177 M
*/
+
+static unsigned short red16[256], green16[256], blue16[256], transp16[256];
+static struct fb_cmap orig_cmap = {0, 256, red16, green16, blue16, transp16};
+
static int fb_set_mode( void );
int uidisplay_init( int width, int height )
{
- int error;
-
hires = ( width == 640 ? 1 : 0 );
- scaler_register_clear();
-
image_width = width; image_height = height;
image_scale = width / DISPLAY_ASPECT_WIDTH;
- error = register_scalers(); if( error ) return error;
+ register_scalers();
display_ui_initialised = 1;
@@ -149,20 +151,40 @@
return 0;
}
-static int
+static void
register_scalers( void )
{
- return 0;
+ scaler_register_clear();
+ scaler_select_bitformat( 565 ); /* 16bit always */
+ scaler_register( SCALER_NORMAL );
}
+static void
+linear_palette(struct fb_cmap *p_cmap)
+{
+ int i;
+ int rcols = 1 << display.red.length;
+ int gcols = 1 << display.green.length;
+ int bcols = 1 << display.blue.length;
+
+ for (i = 0; i < rcols; i++)
+ p_cmap->red[i] = (65535 / (rcols - 1)) * i;
+
+ for (i = 0; i < gcols; i++)
+ p_cmap->green[i] = (65535 / (gcols - 1)) * i;
+
+ for (i = 0; i < bcols; i++)
+ p_cmap->blue[i] = (65535 / (bcols - 1)) * i;
+}
+
int fbdisplay_init(void)
{
int i;
const char *dev;
- static libspectrum_word paldata[20] = { 0, 0xbbbb, 0xffff };
- static const struct fb_cmap fb_cmap = {
- 0, 20, paldata, paldata, paldata, NULL
+ static libspectrum_word r16[256], g16[256], b16[256];
+ static struct fb_cmap fb_cmap = {
+ 0, 256, r16, g16, b16, NULL
};
dev = getenv( DEVICE_VARIABLE );
@@ -187,32 +209,41 @@
fputs( "\x1B[H\x1B[J", stdout ); /* clear tty */
memset( gm, 0, display.xres_virtual * display.yres_virtual * 2 );
- for( i = 0; i < 16; i++ ) {
- int v = ( i & 8 ) ? 2 : 1;
- rgbs[i] = ( ( i & 1 ) ? v << display.blue.offset : 0 )
- | ( ( i & 2 ) ? v << display.red.offset : 0 )
- | ( ( i & 4 ) ? v << display.green.offset : 0 );
- v = ( i & 8 ) ? 15 : 11;
- paldata[i+4] = ( ( (i & 1) ? v * 7471 : 0) /* 0.114 */
- + ( (i & 2) ? v * 19595 : 0) /* 0.299 */
- + ( (i & 4) ? v * 38469 : 0) /* 0.587 */
- ) / 15;
- greys[i] = (i + 4) << display.blue.offset
- | (i + 4) << display.red.offset
- | (i + 4) << display.green.offset;
- }
-
display.activate = FB_ACTIVATE_NOW;
- if( ioctl( fb_fd, FBIOPUT_VSCREENINFO, &display ) ||
- ioctl( fb_fd, FBIOPUTCMAP, &fb_cmap ) ) {
+ if( ioctl( fb_fd, FBIOPUT_VSCREENINFO, &display ) ) {
fprintf( stderr, "%s: couldn't set mode for framebuffer device '%s'\n",
fuse_progname, dev );
return 1;
}
- ioctl( fb_fd, FBIOGET_VSCREENINFO, &display );
+ ioctl( fb_fd, FBIOGET_VSCREENINFO, &display);
+ for( i = 0; i < 16; i++ ) {
+ int v = ( i & 8 ) ? 0xff : 0xbf;
+ int c;
+ rgbs[i] = ( ( i & 1 ) ? (v >> (8 - display.blue.length)) << display.blue.offset : 0 )
+ | ( ( i & 2 ) ? (v >> (8 - display.red.length)) << display.red.offset : 0 )
+ | ( ( i & 4 ) ? (v >> (8 - display.green.length)) << display.green.offset : 0 );
+
+ c = (( i & 1 ) ? (v * 0.114) : 0.0) +
+ (( i & 2) ? (v * 0.299) : 0.0) +
+ (( i & 4) ? (v * 0.587) : 0.0) + 0.5;
+ greys[i] = (c >> (8 - display.red.length) << display.red.offset)
+ | (c >> (8 - display.green.length) << display.green.offset)
+ | (c >> (8 - display.blue.length) << display.blue.offset);
+ }
+ linear_palette(&fb_cmap);
+
+ if (orig_display.bits_per_pixel == 8 || fixed.visual == FB_VISUAL_DIRECTCOLOR) {
+ ioctl( fb_fd, FBIOGETCMAP, &orig_cmap);
+ changed_palette = 1;
+ }
+ ioctl( fb_fd, FBIOGET_FSCREENINFO, &fixed);
+ if ( fixed.visual == FB_VISUAL_DIRECTCOLOR) {
+ ioctl( fb_fd, FBIOPUTCMAP, &fb_cmap );
+ }
sleep( 1 ); /* give the monitor time to sync before we start emulating */
+
fputs( "\x1B[?25l", stdout ); /* hide cursor */
fflush( stdout );
@@ -396,8 +427,6 @@
int
uidisplay_end( void )
{
- fbdisplay_end();
- display_ui_initialised = 0;
return 0;
}
@@ -405,7 +434,13 @@
fbdisplay_end( void )
{
if( fb_fd != -1 ) {
- if( got_orig_display ) ioctl( fb_fd, FBIOPUT_VSCREENINFO, &orig_display );
+ if( got_orig_display ) {
+ ioctl( fb_fd, FBIOPUT_VSCREENINFO, &orig_display );
+ if (changed_palette) {
+ ioctl( fb_fd, FBIOPUTCMAP, &orig_cmap);
+ changed_palette = 0;
+ }
+ }
close( fb_fd );
fb_fd = -1;
fputs( "\x1B[H\x1B[J\x1B[?25h", stdout ); /* clear screen, show cursor */
Modified: vendor/fuse-emulator/current/fuse-utils/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/Makefile.am 2010-10-19 11:21:18 UTC (rev 657)
+++ vendor/fuse-emulator/current/fuse-utils/Makefile.am 2010-12-07 12:35:24 UTC (rev 658)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 1999-2002 Philip Kendall
-## $Id: Makefile.am 4144 2010-08-06 13:44:35Z fredm $
+## $Id: Makefile.am 4208 2010-12-06 19:42:44Z 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
@@ -27,6 +27,11 @@
hacking \
man
+DIST_SUBDIRS = compat/amiga \
+ compat/unix \
+ hacking \
+ man
+
bin_PROGRAMS = createhdf \
listbasic \
profile2map \
Modified: vendor/fuse-emulator/current/fuse-utils/hacking/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/hacking/ChangeLog 2010-10-19 11:21:18 UTC (rev 657)
+++ vendor/fuse-emulator/current/fuse-utils/hacking/ChangeLog 2010-12-07 12:35:24 UTC (rev 658)
@@ -312,3 +312,5 @@
A and F being transposed.
20101007 raw2hdf.c: add missing default for version (fixes bug #3082566; thanks,
UB880D) (Fred).
+20101206 Makefile.am: remember to put all compat directories in the dist tarball
+ (thanks, kizmiaz).
Modified: vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog 2010-10-19 11:21:18 UTC (rev 657)
+++ vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog 2010-12-07 12:35:24 UTC (rev 658)
@@ -787,3 +787,4 @@
20101003 szx.c,test/{empty.szx,test.c}: we also need to swap A' and F'.
20101010 configure.in: pad version number for Win32 if needed (patch #3084574)
(Sergio Baldovi).
+20101130 warajevo_read.c: remove potential signedness problem.
Modified: vendor/fuse-emulator/current/libspectrum/warajevo_read.c
===================================================================
--- vendor/fuse-emulator/current/libspectrum/warajevo_read.c 2010-10-19 11:21:18 UTC (rev 657)
+++ vendor/fuse-emulator/current/libspectrum/warajevo_read.c 2010-12-07 12:35:24 UTC (rev 658)
@@ -2,7 +2,7 @@
Copyright (c) 2001, 2002 Philip Kendall, Darren Salt
Copyright (c) 2003 Fredrick Meunier
- $Id: warajevo_read.c 4118 2010-02-21 04:36:17Z fredm $
+ $Id: warajevo_read.c 4196 2010-11-30 18:45:18Z 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
@@ -150,17 +150,17 @@
static libspectrum_dword
lsb2dword( const libspectrum_byte *mem )
{
- return mem[0] +
- mem[1] * 0x100 +
- mem[2] * 0x10000 +
- mem[3] * 0x1000000 ;
+ return ( mem[0] << 0 ) |
+ ( mem[1] << 8 ) |
+ ( mem[2] << 16 ) |
+ ( mem[3] << 24 );
}
static libspectrum_word
lsb2word( const libspectrum_byte *mem )
{
- return mem[0] +
- mem[1] * 0x100 ;
+ return ( mem[0] << 0 ) |
+ ( mem[1] << 8 );
}
/* The main load function */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2010-12-17 11:05:26
|
Revision: 661
http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=661&view=rev
Author: fredm
Date: 2010-12-17 11:05:18 +0000 (Fri, 17 Dec 2010)
Log Message:
-----------
Load . into vendor/fuse-emulator/current.
Modified Paths:
--------------
vendor/fuse-emulator/current/fuse/ChangeLog
vendor/fuse-emulator/current/fuse/README
vendor/fuse-emulator/current/fuse/configure.in
vendor/fuse-emulator/current/fuse/hacking/ChangeLog
vendor/fuse-emulator/current/fuse/ide/divide.c
vendor/fuse-emulator/current/fuse/ide/divide.h
vendor/fuse-emulator/current/fuse/ide/ide.c
vendor/fuse-emulator/current/fuse/ide/ide.h
vendor/fuse-emulator/current/fuse/ide/simpleide.c
vendor/fuse-emulator/current/fuse/ide/simpleide.h
vendor/fuse-emulator/current/fuse/ide/zxatasp.c
vendor/fuse-emulator/current/fuse/ide/zxatasp.h
vendor/fuse-emulator/current/fuse/ide/zxcf.c
vendor/fuse-emulator/current/fuse/ide/zxcf.h
vendor/fuse-emulator/current/fuse/man/fuse.1
vendor/fuse-emulator/current/fuse-utils/ChangeLog
vendor/fuse-emulator/current/fuse-utils/README
vendor/fuse-emulator/current/fuse-utils/configure.in
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/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/libspectrum/ChangeLog
vendor/fuse-emulator/current/libspectrum/Makefile.am
vendor/fuse-emulator/current/libspectrum/README
vendor/fuse-emulator/current/libspectrum/configure.in
vendor/fuse-emulator/current/libspectrum/doc/libspectrum.3
vendor/fuse-emulator/current/libspectrum/doc/libspectrum.txt
vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog
vendor/fuse-emulator/current/libspectrum/test/Makefile.am
Modified: vendor/fuse-emulator/current/fuse/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse/ChangeLog 2010-12-08 11:29:46 UTC (rev 660)
+++ vendor/fuse-emulator/current/fuse/ChangeLog 2010-12-17 11:05:18 UTC (rev 661)
@@ -1,4 +1,4 @@
-2010-10-xx Philip Kendall <phi...@sh...>
+2010-12-16 Philip Kendall <phi...@sh...>
* Fuse 1.0.0 released.
@@ -1035,4 +1035,4 @@
* Version 0.1.0 released.
-$Id: ChangeLog 4165 2010-09-30 21:55:05Z pak21 $
+$Id: ChangeLog 4220 2010-12-17 10:54:29Z fredm $
Modified: vendor/fuse-emulator/current/fuse/README
===================================================================
--- vendor/fuse-emulator/current/fuse/README 2010-12-08 11:29:46 UTC (rev 660)
+++ vendor/fuse-emulator/current/fuse/README 2010-12-17 11:05:18 UTC (rev 661)
@@ -214,6 +214,6 @@
<http://www.worldofspectrum.org/forums/>.
Philip Kendall <phi...@sh...>
-FIXME October 2010
+16 December 2010
-$Id: README 4172 2010-10-03 22:51:59Z pak21 $
+$Id: README 4220 2010-12-17 10:54:29Z fredm $
Modified: vendor/fuse-emulator/current/fuse/configure.in
===================================================================
--- vendor/fuse-emulator/current/fuse/configure.in 2010-12-08 11:29:46 UTC (rev 660)
+++ vendor/fuse-emulator/current/fuse/configure.in 2010-12-17 11:05:18 UTC (rev 661)
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-dnl $Id: configure.in 4181 2010-10-10 10:28:09Z fredm $
+dnl $Id: configure.in 4220 2010-12-17 10:54:29Z fredm $
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@
AM_CONFIG_HEADER(config.h)
AC_CANONICAL_SYSTEM
-define(FUSE_VERSION, [0.10.0.2])
+define(FUSE_VERSION, [1.0.0])
dnl Use automake to produce `Makefile.in'
AM_INIT_AUTOMAKE(fuse, FUSE_VERSION)
Modified: vendor/fuse-emulator/current/fuse/hacking/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse/hacking/ChangeLog 2010-12-08 11:29:46 UTC (rev 660)
+++ vendor/fuse-emulator/current/fuse/hacking/ChangeLog 2010-12-17 11:05:18 UTC (rev 661)
@@ -3368,5 +3368,7 @@
line ordering (patch #3100707) (Sergio Baldovi).
20101129 ui/fb/fbdisplay.c: only call fbdisplay_end() when display is
initialised (fixes bug #3119382) (rkd77).
+20101129 ChangeLog,README,man/fuse.1: more 1.0 updates.
20101203 ui/fb/fbdisplay.c: improve fb colour handling and initialise scaler
system (fixes bugs #3124787 and #3124788) (rkd77).
+20101216 ChangeLog,README,configure.in,man/fuse.1: update for 1.0.0 release.
Modified: vendor/fuse-emulator/current/fuse/ide/divide.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ide/divide.c 2010-12-08 11:29:46 UTC (rev 660)
+++ vendor/fuse-emulator/current/fuse/ide/divide.c 2010-12-17 11:05:18 UTC (rev 661)
@@ -1,7 +1,7 @@
/* divide.c: DivIDE interface routines
Copyright (c) 2005-2008 Matthew Westcott, Philip Kendall
- $Id: divide.c 4148 2010-08-25 21:20:50Z pak21 $
+ $Id: divide.c 4220 2010-12-17 10:54:29Z 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/ide/divide.h
===================================================================
--- vendor/fuse-emulator/current/fuse/ide/divide.h 2010-12-08 11:29:46 UTC (rev 660)
+++ vendor/fuse-emulator/current/fuse/ide/divide.h 2010-12-17 11:05:18 UTC (rev 661)
@@ -1,7 +1,7 @@
/* divide.h: DivIDE interface routines
Copyright (c) 2005 Matthew Westcott
- $Id: divide.h 4148 2010-08-25 21:20:50Z pak21 $
+ $Id: divide.h 4220 2010-12-17 10:54:29Z 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/ide/ide.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ide/ide.c 2010-12-08 11:29:46 UTC (rev 660)
+++ vendor/fuse-emulator/current/fuse/ide/ide.c 2010-12-17 11:05:18 UTC (rev 661)
@@ -1,7 +1,7 @@
/* ide.c: Generic routines shared between the various IDE devices
Copyright (c) 2005 Philip Kendall
- $Id: ide.c 4148 2010-08-25 21:20:50Z pak21 $
+ $Id: ide.c 4220 2010-12-17 10:54:29Z 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/ide/ide.h
===================================================================
--- vendor/fuse-emulator/current/fuse/ide/ide.h 2010-12-08 11:29:46 UTC (rev 660)
+++ vendor/fuse-emulator/current/fuse/ide/ide.h 2010-12-17 11:05:18 UTC (rev 661)
@@ -1,7 +1,7 @@
/* ide.h: Generic routines shared between the various IDE devices
Copyright (c) 2005 Philip Kendall
- $Id: ide.h 4148 2010-08-25 21:20:50Z pak21 $
+ $Id: ide.h 4220 2010-12-17 10:54:29Z 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/ide/simpleide.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ide/simpleide.c 2010-12-08 11:29:46 UTC (rev 660)
+++ vendor/fuse-emulator/current/fuse/ide/simpleide.c 2010-12-17 11:05:18 UTC (rev 661)
@@ -3,7 +3,7 @@
2004 Philip Kendall,
2008 Fredrick Meunier
- $Id: simpleide.c 4148 2010-08-25 21:20:50Z pak21 $
+ $Id: simpleide.c 4220 2010-12-17 10:54:29Z 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/ide/simpleide.h
===================================================================
--- vendor/fuse-emulator/current/fuse/ide/simpleide.h 2010-12-08 11:29:46 UTC (rev 660)
+++ vendor/fuse-emulator/current/fuse/ide/simpleide.h 2010-12-17 11:05:18 UTC (rev 661)
@@ -1,7 +1,7 @@
/* simpleide.h: Simple 8-bit IDE interface routines
Copyright (c) 2003-2004 Garry Lancaster
- $Id: simpleide.h 4148 2010-08-25 21:20:50Z pak21 $
+ $Id: simpleide.h 4220 2010-12-17 10:54:29Z 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/ide/zxatasp.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ide/zxatasp.c 2010-12-08 11:29:46 UTC (rev 660)
+++ vendor/fuse-emulator/current/fuse/ide/zxatasp.c 2010-12-17 11:05:18 UTC (rev 661)
@@ -1,7 +1,7 @@
/* zxatasp.c: ZXATASP interface routines
Copyright (c) 2003-2008 Garry Lancaster and Philip Kendall
- $Id: zxatasp.c 4148 2010-08-25 21:20:50Z pak21 $
+ $Id: zxatasp.c 4220 2010-12-17 10:54:29Z 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/ide/zxatasp.h
===================================================================
--- vendor/fuse-emulator/current/fuse/ide/zxatasp.h 2010-12-08 11:29:46 UTC (rev 660)
+++ vendor/fuse-emulator/current/fuse/ide/zxatasp.h 2010-12-17 11:05:18 UTC (rev 661)
@@ -2,7 +2,7 @@
Copyright (c) 2003-2004 Garry Lancaster,
2004 Philip Kendall
- $Id: zxatasp.h 4148 2010-08-25 21:20:50Z pak21 $
+ $Id: zxatasp.h 4220 2010-12-17 10:54:29Z 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/ide/zxcf.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ide/zxcf.c 2010-12-08 11:29:46 UTC (rev 660)
+++ vendor/fuse-emulator/current/fuse/ide/zxcf.c 2010-12-17 11:05:18 UTC (rev 661)
@@ -1,7 +1,7 @@
/* zxcf.c: ZXCF interface routines
Copyright (c) 2003-2008 Garry Lancaster and Philip Kendall
- $Id: zxcf.c 4148 2010-08-25 21:20:50Z pak21 $
+ $Id: zxcf.c 4220 2010-12-17 10:54:29Z 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/ide/zxcf.h
===================================================================
--- vendor/fuse-emulator/current/fuse/ide/zxcf.h 2010-12-08 11:29:46 UTC (rev 660)
+++ vendor/fuse-emulator/current/fuse/ide/zxcf.h 2010-12-17 11:05:18 UTC (rev 661)
@@ -2,7 +2,7 @@
Copyright (c) 2003-2004 Garry Lancaster,
2004 Philip Kendall
- $Id: zxcf.h 4148 2010-08-25 21:20:50Z pak21 $
+ $Id: zxcf.h 4220 2010-12-17 10:54:29Z 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/man/fuse.1
===================================================================
--- vendor/fuse-emulator/current/fuse/man/fuse.1 2010-12-08 11:29:46 UTC (rev 660)
+++ vendor/fuse-emulator/current/fuse/man/fuse.1 2010-12-17 11:05:18 UTC (rev 661)
@@ -23,7 +23,7 @@
.\" E-mail: phi...@sh...
.\"
.\"
-.TH fuse 1 "FIXME October, 2010" "Version 1.0.0" "Emulators"
+.TH fuse 1 "16th December, 2010" "Version 1.0.0" "Emulators"
.\"
.\"------------------------------------------------------------------
.\"
Modified: vendor/fuse-emulator/current/fuse-utils/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/ChangeLog 2010-12-08 11:29:46 UTC (rev 660)
+++ vendor/fuse-emulator/current/fuse-utils/ChangeLog 2010-12-17 11:05:18 UTC (rev 661)
@@ -1,3 +1,23 @@
+2010-12-16 Philip Kendall <phi...@sh...>
+
+ * Version 1.0.0 released
+
+ * audio2tape
+ * work with stereo sound files (Fredrick Meunier; thanks,
+ Gilberto Almeida).
+ * don't crash on an empty ROM block (Fredrick Meunier).
+
+ * tzxlist
+ * print data from ROM header blocks (Fredrick Meunier).
+ * Assume non-ASCII characters are in Windows-1252 (Fredrick
+ Meunier).
+
+ * snapconv: add -f flag to fix .szx files written with old
+ versions of libspectrum (Fredrick Meunier).
+
+ * raw2hdf: ensure version data is always written (Fredrick
+ Meunier; thanks, UB880D).
+
2008-12-10 Philip Kendall <phi...@sh...>
* Version 0.10.0.1 released
Modified: vendor/fuse-emulator/current/fuse-utils/README
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/README 2010-12-08 11:29:46 UTC (rev 660)
+++ vendor/fuse-emulator/current/fuse-utils/README 2010-12-17 11:05:18 UTC (rev 661)
@@ -1,5 +1,5 @@
-The Fuse utilities version 0.10.0.1
-===================================
+The Fuse utilities version 1.0.0
+================================
The Fuse utilities are a few tools which may be of occasional use when
dealing with ZX Spectrum emulator files. They were originally
@@ -60,6 +60,6 @@
running 'configure' for the first time.
Philip Kendall <phi...@sh...>
-10 December 2008
+16 December 2010
-$Id: README 3901 2008-12-10 19:36:02Z pak21 $
+$Id: README 4220 2010-12-17 10:54:29Z fredm $
Modified: vendor/fuse-emulator/current/fuse-utils/configure.in
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/configure.in 2010-12-08 11:29:46 UTC (rev 660)
+++ vendor/fuse-emulator/current/fuse-utils/configure.in 2010-12-17 11:05:18 UTC (rev 661)
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-dnl $Id: configure.in 4144 2010-08-06 13:44:35Z fredm $
+dnl $Id: configure.in 4220 2010-12-17 10:54:29Z fredm $
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@
AM_CONFIG_HEADER(config.h)
dnl Use automake to produce `Makefile.in'
-AM_INIT_AUTOMAKE(fuse-utils, 0.10.0.1)
+AM_INIT_AUTOMAKE(fuse-utils, [1.0.0])
dnl Checks for programs.
AC_PROG_CC
Modified: vendor/fuse-emulator/current/fuse-utils/hacking/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/hacking/ChangeLog 2010-12-08 11:29:46 UTC (rev 660)
+++ vendor/fuse-emulator/current/fuse-utils/hacking/ChangeLog 2010-12-17 11:05:18 UTC (rev 661)
@@ -312,5 +312,8 @@
A and F being transposed.
20101007 raw2hdf.c: add missing default for version (fixes bug #3082566; thanks,
UB880D) (Fred).
+20101129 ChangeLog,README,man/*.1: updates for 1.0.
20101206 Makefile.am: remember to put all compat directories in the dist tarball
(thanks, kizmiaz).
+20101216 README,configure.in,man/*.1: updates for 1.0.0 release.
+20101216 ChangeLog: update date here as well.
Modified: vendor/fuse-emulator/current/fuse-utils/man/audio2tape.1
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/man/audio2tape.1 2010-12-08 11:29:46 UTC (rev 660)
+++ vendor/fuse-emulator/current/fuse-utils/man/audio2tape.1 2010-12-17 11:05:18 UTC (rev 661)
@@ -22,7 +22,7 @@
.\" E-mail: fr...@sp...
.\"
.\"
-.TH audio2tape 1 "10th December, 2008" "Version 0.10.0.1" "Emulators"
+.TH audio2tape 1 "16th December, 2010" "Version 1.0.0" "Emulators"
.\"
.\"------------------------------------------------------------------
.\"
Modified: vendor/fuse-emulator/current/fuse-utils/man/createhdf.1
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/man/createhdf.1 2010-12-08 11:29:46 UTC (rev 660)
+++ vendor/fuse-emulator/current/fuse-utils/man/createhdf.1 2010-12-17 11:05:18 UTC (rev 661)
@@ -22,7 +22,7 @@
.\" E-mail: phi...@sh...
.\"
.\"
-.TH createhdf 1 "10th December, 2008" "Version 0.10.0.1" "Emulators"
+.TH createhdf 1 "16th December, 2010" "Version 1.0.0" "Emulators"
.\"
.\"------------------------------------------------------------------
.\"
Modified: vendor/fuse-emulator/current/fuse-utils/man/fuse-utils.1
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/man/fuse-utils.1 2010-12-08 11:29:46 UTC (rev 660)
+++ vendor/fuse-emulator/current/fuse-utils/man/fuse-utils.1 2010-12-17 11:05:18 UTC (rev 661)
@@ -22,7 +22,7 @@
.\" E-mail: phi...@sh...
.\"
.\"
-.TH fuse\-utils 1 "10th December, 2008" "Version 0.10.0.1" "Emulators"
+.TH fuse\-utils 1 "16th December, 2010" "Version 1.0.0" "Emulators"
.\"
.\"------------------------------------------------------------------
.\"
Modified: vendor/fuse-emulator/current/fuse-utils/man/listbasic.1
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/man/listbasic.1 2010-12-08 11:29:46 UTC (rev 660)
+++ vendor/fuse-emulator/current/fuse-utils/man/listbasic.1 2010-12-17 11:05:18 UTC (rev 661)
@@ -22,7 +22,7 @@
.\" E-mail: phi...@sh...
.\"
.\"
-.TH listbasic 1 "10th December, 2008" "Version 0.10.0.1" "Emulators"
+.TH listbasic 1 "16th December, 2010" "Version 1.0.0" "Emulators"
.\"
.\"------------------------------------------------------------------
.\"
Modified: vendor/fuse-emulator/current/fuse-utils/man/profile2map.1
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/man/profile2map.1 2010-12-08 11:29:46 UTC (rev 660)
+++ vendor/fuse-emulator/current/fuse-utils/man/profile2map.1 2010-12-17 11:05:18 UTC (rev 661)
@@ -22,7 +22,7 @@
.\" E-mail: phi...@sh...
.\"
.\"
-.TH profile2map 1 "10th December, 2008" "Version 0.10.0.1" "Emulators"
+.TH profile2map 1 "16th December, 2010" "Version 1.0.0" "Emulators"
.\"
.\"------------------------------------------------------------------
.\"
Modified: vendor/fuse-emulator/current/fuse-utils/man/raw2hdf.1
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/man/raw2hdf.1 2010-12-08 11:29:46 UTC (rev 660)
+++ vendor/fuse-emulator/current/fuse-utils/man/raw2hdf.1 2010-12-17 11:05:18 UTC (rev 661)
@@ -22,7 +22,7 @@
.\" E-mail: phi...@sh...
.\"
.\"
-.TH raw2hdf 1 "10th December, 2008" "Version 0.10.0.1" "Emulators"
+.TH raw2hdf 1 "16th December, 2010" "Version 1.0.0" "Emulators"
.\"
.\"------------------------------------------------------------------
.\"
Modified: vendor/fuse-emulator/current/fuse-utils/man/rzxcheck.1
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/man/rzxcheck.1 2010-12-08 11:29:46 UTC (rev 660)
+++ vendor/fuse-emulator/current/fuse-utils/man/rzxcheck.1 2010-12-17 11:05:18 UTC (rev 661)
@@ -22,7 +22,7 @@
.\" E-mail: phi...@sh...
.\"
.\"
-.TH rzxcheck 1 "10th December, 2008" "Version 0.10.0.1" "Emulators"
+.TH rzxcheck 1 "16th December, 2010" "Version 1.0.0" "Emulators"
.\"
.\"------------------------------------------------------------------
.\"
Modified: vendor/fuse-emulator/current/fuse-utils/man/rzxdump.1
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/man/rzxdump.1 2010-12-08 11:29:46 UTC (rev 660)
+++ vendor/fuse-emulator/current/fuse-utils/man/rzxdump.1 2010-12-17 11:05:18 UTC (rev 661)
@@ -22,7 +22,7 @@
.\" E-mail: phi...@sh...
.\"
.\"
-.TH rzxdump 1 "10th December, 2008" "Version 0.10.0.1" "Emulators"
+.TH rzxdump 1 "16th December, 2010" "Version 1.0.0" "Emulators"
.\"
.\"------------------------------------------------------------------
.\"
Modified: vendor/fuse-emulator/current/fuse-utils/man/rzxtool.1
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/man/rzxtool.1 2010-12-08 11:29:46 UTC (rev 660)
+++ vendor/fuse-emulator/current/fuse-utils/man/rzxtool.1 2010-12-17 11:05:18 UTC (rev 661)
@@ -22,7 +22,7 @@
.\" E-mail: phi...@sh...
.\"
.\"
-.TH rzxtool 1 "10th December, 2008" "Version 0.10.0.1" "Emulators"
+.TH rzxtool 1 "16th December, 2010" "Version 1.0.0" "Emulators"
.\"
.\"------------------------------------------------------------------
.\"
Modified: vendor/fuse-emulator/current/fuse-utils/man/scl2trd.1
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/man/scl2trd.1 2010-12-08 11:29:46 UTC (rev 660)
+++ vendor/fuse-emulator/current/fuse-utils/man/scl2trd.1 2010-12-17 11:05:18 UTC (rev 661)
@@ -22,7 +22,7 @@
.\" E-mail: phi...@sh...
.\"
.\"
-.TH scl2trd 1 "10th December, 2008" "Version 0.10.0.1" "Emulators"
+.TH scl2trd 1 "16th December, 2010" "Version 1.0.0" "Emulators"
.\"
.\"------------------------------------------------------------------
.\"
Modified: vendor/fuse-emulator/current/fuse-utils/man/snap2tzx.1
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/man/snap2tzx.1 2010-12-08 11:29:46 UTC (rev 660)
+++ vendor/fuse-emulator/current/fuse-utils/man/snap2tzx.1 2010-12-17 11:05:18 UTC (rev 661)
@@ -22,7 +22,7 @@
.\" E-mail: phi...@sh...
.\"
.\"
-.TH snap2tzx 1 "10th December, 2008" "Version 0.10.0.1" "Emulators"
+.TH snap2tzx 1 "16th December, 2010" "Version 1.0.0" "Emulators"
.\"
.\"------------------------------------------------------------------
.\"
Modified: vendor/fuse-emulator/current/fuse-utils/man/snapconv.1
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/man/snapconv.1 2010-12-08 11:29:46 UTC (rev 660)
+++ vendor/fuse-emulator/current/fuse-utils/man/snapconv.1 2010-12-17 11:05:18 UTC (rev 661)
@@ -22,7 +22,7 @@
.\" E-mail: phi...@sh...
.\"
.\"
-.TH snapconv 1 "10th December, 2008" "Version 0.10.0.1" "Emulators"
+.TH snapconv 1 "16th December, 2010" "Version 1.0.0" "Emulators"
.\"
.\"------------------------------------------------------------------
.\"
Modified: vendor/fuse-emulator/current/fuse-utils/man/tape2wav.1
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/man/tape2wav.1 2010-12-08 11:29:46 UTC (rev 660)
+++ vendor/fuse-emulator/current/fuse-utils/man/tape2wav.1 2010-12-17 11:05:18 UTC (rev 661)
@@ -22,7 +22,7 @@
.\" E-mail: fr...@sp...
.\"
.\"
-.TH tape2wav 1 "10th December, 2008" "Version 0.10.0.1" "Emulators"
+.TH tape2wav 1 "16th December, 2010" "Version 1.0.0" "Emulators"
.\"
.\"------------------------------------------------------------------
.\"
Modified: vendor/fuse-emulator/current/fuse-utils/man/tapeconv.1
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/man/tapeconv.1 2010-12-08 11:29:46 UTC (rev 660)
+++ vendor/fuse-emulator/current/fuse-utils/man/tapeconv.1 2010-12-17 11:05:18 UTC (rev 661)
@@ -22,7 +22,7 @@
.\" E-mail: phi...@sh...
.\"
.\"
-.TH tapeconv 1 "10th December, 2008" "Version 0.10.0.1" "Emulators"
+.TH tapeconv 1 "16th December, 2010" "Version 1.0.0" "Emulators"
.\"
.\"------------------------------------------------------------------
.\"
Modified: vendor/fuse-emulator/current/fuse-utils/man/tzxlist.1
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/man/tzxlist.1 2010-12-08 11:29:46 UTC (rev 660)
+++ vendor/fuse-emulator/current/fuse-utils/man/tzxlist.1 2010-12-17 11:05:18 UTC (rev 661)
@@ -22,7 +22,7 @@
.\" E-mail: phi...@sh...
.\"
.\"
-.TH tzxlist 1 "10th December, 2008" "Version 0.10.0.1" "Emulators"
+.TH tzxlist 1 "16th December, 2010" "Version 1.0.0" "Emulators"
.\"
.\"------------------------------------------------------------------
.\"
Modified: vendor/fuse-emulator/current/libspectrum/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/libspectrum/ChangeLog 2010-12-08 11:29:46 UTC (rev 660)
+++ vendor/fuse-emulator/current/libspectrum/ChangeLog 2010-12-17 11:05:18 UTC (rev 661)
@@ -1,4 +1,4 @@
-2010-10-?? Philip Kendall <phi...@sh...>
+2010-12-16 Philip Kendall <phi...@sh...>
* libspectrum 1.0.0 released.
@@ -310,5 +310,5 @@
* libspectrum separated from Fuse just before the 0.5.0 release of
Fuse; see Fuse's ChangeLog for changes up to this point
-$Id: ChangeLog 4165 2010-09-30 21:55:05Z pak21 $
+$Id: ChangeLog 4220 2010-12-17 10:54:29Z fredm $
Modified: vendor/fuse-emulator/current/libspectrum/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/libspectrum/Makefile.am 2010-12-08 11:29:46 UTC (rev 660)
+++ vendor/fuse-emulator/current/libspectrum/Makefile.am 2010-12-17 11:05:18 UTC (rev 661)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2001-2004 Philip Kendall
-## $Id: Makefile.am 4158 2010-09-12 11:49:10Z fredm $
+## $Id: Makefile.am 4220 2010-12-17 10:54:29Z 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
@@ -58,7 +58,7 @@
zlib.c \
zxs.c
-libspectrum_la_LDFLAGS = -version-info 7:0:0 -no-undefined @WINDRES_LDFLAGS@
+libspectrum_la_LDFLAGS = -version-info 8:0:0 -no-undefined @WINDRES_LDFLAGS@
libspectrum_la_LIBADD = @AUDIOFILE_LIBS@ -lm
Modified: vendor/fuse-emulator/current/libspectrum/README
===================================================================
--- vendor/fuse-emulator/current/libspectrum/README 2010-12-08 11:29:46 UTC (rev 660)
+++ vendor/fuse-emulator/current/libspectrum/README 2010-12-17 11:05:18 UTC (rev 661)
@@ -67,6 +67,6 @@
Then, type "make" and if everything went well, "make install".
Philip Kendall <phi...@sh...>
-FIXME September 2010
+16 December 2010
-$Id: README 4165 2010-09-30 21:55:05Z pak21 $
+$Id: README 4220 2010-12-17 10:54:29Z fredm $
Modified: vendor/fuse-emulator/current/libspectrum/configure.in
===================================================================
--- vendor/fuse-emulator/current/libspectrum/configure.in 2010-12-08 11:29:46 UTC (rev 660)
+++ vendor/fuse-emulator/current/libspectrum/configure.in 2010-12-17 11:05:18 UTC (rev 661)
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
dnl Copyright (c) 1999-2008 Philip Kendall
-dnl $Id: configure.in 4181 2010-10-10 10:28:09Z fredm $
+dnl $Id: configure.in 4220 2010-12-17 10:54:29Z fredm $
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
@@ -24,7 +24,7 @@
AC_INIT(libspectrum.c)
AM_CONFIG_HEADER(config.h)
-define(LIBSPECTRUM_VERSION, [0.5.1])
+define(LIBSPECTRUM_VERSION, [1.0.0])
dnl Use automake to produce `Makefile.in'
AM_INIT_AUTOMAKE(libspectrum, LIBSPECTRUM_VERSION)
Modified: vendor/fuse-emulator/current/libspectrum/doc/libspectrum.3
===================================================================
--- vendor/fuse-emulator/current/libspectrum/doc/libspectrum.3 2010-12-08 11:29:46 UTC (rev 660)
+++ vendor/fuse-emulator/current/libspectrum/doc/libspectrum.3 2010-12-17 11:05:18 UTC (rev 661)
@@ -22,7 +22,7 @@
.\" E-mail: phi...@sh...
.\"
.\"
-.TH libspectrum 3 "3rd December, 2008" "Version 0.5.0" "Emulators"
+.TH libspectrum 3 "16th December, 2010" "Version 1.0.0" "Emulators"
.\"
.\"------------------------------------------------------------------
.\"
Modified: vendor/fuse-emulator/current/libspectrum/doc/libspectrum.txt
===================================================================
--- vendor/fuse-emulator/current/libspectrum/doc/libspectrum.txt 2010-12-08 11:29:46 UTC (rev 660)
+++ vendor/fuse-emulator/current/libspectrum/doc/libspectrum.txt 2010-12-17 11:05:18 UTC (rev 661)
@@ -1,4 +1,4 @@
-libspectrum 0.5.0
+libspectrum 1.0.0
=================
libspectrum is a fairly simple library designed to make the handling
@@ -166,6 +166,7 @@
LIBSPECTRUM_MACHINE_16 16K Spectrum
LIBSPECTRUM_MACHINE_48 48K Spectrum
+LIBSPECTRUM_MACHINE_48_NTSC NTSC version of 48K Spectrum
LIBSPECTRUM_MACHINE_128 (Original) 128K Spectrum
LIBSPECTRUM_MACHINE_PLUS2 Spectrum +2 (the grey one)
LIBSPECTRUM_MACHINE_PLUS2A Spectrum +2A (the black one)
@@ -1744,4 +1745,4 @@
Write `data' to register `reg' of the IDE channel `chn'.
-$Id: libspectrum.txt 4140 2010-07-11 13:02:58Z fredm $
+$Id: libspectrum.txt 4220 2010-12-17 10:54:29Z fredm $
Modified: vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog 2010-12-08 11:29:46 UTC (rev 660)
+++ vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog 2010-12-17 11:05:18 UTC (rev 661)
@@ -787,4 +787,10 @@
20101003 szx.c,test/{empty.szx,test.c}: we also need to swap A' and F'.
20101010 configure.in: pad version number for Win32 if needed (patch #3084574)
(Sergio Baldovi).
+20101129 ChangeLog,README,doc/libspectrum.{3,txt}: more 1.0 updates.
20101130 warajevo_read.c: remove potential signedness problem.
+20101130 Makefile.am,configure.in: bump version numbers for 1.0 release.
+20101216 README,configure.in,doc/libspectrum.3: bump version numbers and dates
+ for 1.0.0 release.
+20101216 ChangeLog: update date here as well.
+20101216 test/Makefile.am: ensure all test files are distributed.
Modified: vendor/fuse-emulator/current/libspectrum/test/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/libspectrum/test/Makefile.am 2010-12-08 11:29:46 UTC (rev 660)
+++ vendor/fuse-emulator/current/libspectrum/test/Makefile.am 2010-12-17 11:05:18 UTC (rev 661)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2007 Philip Kendall
-## $Id: Makefile.am 3832 2008-11-18 03:38:51Z fredm $
+## $Id: Makefile.am 4220 2010-12-17 10:54:29Z 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
@@ -44,6 +44,7 @@
test/complete-tzx.pl \
test/empty-drb.tzx \
test/empty.csw \
+ test/empty.szx \
test/empty.z80 \
test/invalid-archiveinfo.tzx \
test/invalid-custominfo.tzx \
@@ -57,6 +58,7 @@
test/loop.tzx \
test/loop2.tzx \
test/loopend.tzx \
+ test/plus3.z80 \
test/sp-2000.sna.gz \
test/sp-ffff.sna.gz \
test/turbo-zeropilot.tzx \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2011-04-02 12:18:59
|
Revision: 667
http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=667&view=rev
Author: fredm
Date: 2011-04-02 12:18:51 +0000 (Sat, 02 Apr 2011)
Log Message:
-----------
Load . into vendor/fuse-emulator/current.
Modified Paths:
--------------
vendor/fuse-emulator/current/fuse/ChangeLog
vendor/fuse-emulator/current/fuse/README
vendor/fuse-emulator/current/fuse/configure.in
vendor/fuse-emulator/current/fuse/debugger/breakpoint.c
vendor/fuse-emulator/current/fuse/fuse.c
vendor/fuse-emulator/current/fuse/hacking/ChangeLog
vendor/fuse-emulator/current/fuse/ide/divide.c
vendor/fuse-emulator/current/fuse/ide/divide.h
vendor/fuse-emulator/current/fuse/ide/ide.c
vendor/fuse-emulator/current/fuse/ide/ide.h
vendor/fuse-emulator/current/fuse/ide/simpleide.c
vendor/fuse-emulator/current/fuse/ide/simpleide.h
vendor/fuse-emulator/current/fuse/ide/zxatasp.c
vendor/fuse-emulator/current/fuse/ide/zxatasp.h
vendor/fuse-emulator/current/fuse/ide/zxcf.c
vendor/fuse-emulator/current/fuse/ide/zxcf.h
vendor/fuse-emulator/current/fuse/keysyms.pl
vendor/fuse-emulator/current/fuse/man/fuse.1
vendor/fuse-emulator/current/fuse/memory.c
vendor/fuse-emulator/current/fuse/roms/Makefile.am
vendor/fuse-emulator/current/fuse/ui/fb/fbdisplay.c
vendor/fuse-emulator/current/fuse/ui/widget/filesel.c
vendor/fuse-emulator/current/libspectrum/ChangeLog
vendor/fuse-emulator/current/libspectrum/Makefile.am
vendor/fuse-emulator/current/libspectrum/README
vendor/fuse-emulator/current/libspectrum/configure.in
vendor/fuse-emulator/current/libspectrum/doc/libspectrum.txt
vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog
vendor/fuse-emulator/current/libspectrum/test/Makefile.am
vendor/fuse-emulator/current/libspectrum/warajevo_read.c
Added Paths:
-----------
vendor/fuse-emulator/current/fuse/roms/README.copyright
Removed Paths:
-------------
vendor/fuse-emulator/current/fuse/roms/128p-0.rom
vendor/fuse-emulator/current/fuse/roms/128p-1.rom
vendor/fuse-emulator/current/fuse/roms/256s-0.rom
vendor/fuse-emulator/current/fuse/roms/256s-1.rom
vendor/fuse-emulator/current/fuse/roms/256s-2.rom
vendor/fuse-emulator/current/fuse/roms/256s-3.rom
vendor/fuse-emulator/current/fuse/roms/gluck.rom
vendor/fuse-emulator/current/fuse/roms/if1-1.rom
vendor/fuse-emulator/current/fuse/roms/if1-2.rom
vendor/fuse-emulator/current/fuse/roms/opus.rom
vendor/fuse-emulator/current/fuse/roms/trdos.rom
Modified: vendor/fuse-emulator/current/fuse/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse/ChangeLog 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/fuse/ChangeLog 2011-04-02 12:18:51 UTC (rev 667)
@@ -1,3 +1,19 @@
+2011-04-01 Philip Kendall <phi...@sh...>
+
+ * Fuse 1.0.0.1a released.
+
+ * Remove all ROMs for which there isn't explicit permission to
+ distribute (Philip Kendall).
+
+2011-01-12 Philip Kendall <phi...@sh...>
+
+ * Fuse 1.0.0.1 released.
+
+ * Fix temporary breakpoints on platforms using replacement Glib
+ (Fredrick Meunier, Sergio Baldovi; thanks, Chris Cowley)
+ * Ensure Amiga port can load files (Chris Young)
+ * Fix SVGAlib compilation (rkd77)
+
2010-12-16 Philip Kendall <phi...@sh...>
* Fuse 1.0.0 released.
@@ -1035,4 +1051,4 @@
* Version 0.1.0 released.
-$Id: ChangeLog 4220 2010-12-17 10:54:29Z fredm $
+$Id: ChangeLog 4331 2011-04-01 07:47:06Z pak21 $
Modified: vendor/fuse-emulator/current/fuse/README
===================================================================
--- vendor/fuse-emulator/current/fuse/README 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/fuse/README 2011-04-02 12:18:51 UTC (rev 667)
@@ -1,5 +1,5 @@
-The Free Unix Spectrum Emulator (Fuse) 1.0.0
-============================================
+The Free Unix Spectrum Emulator (Fuse) 1.0.0.1a
+===============================================
Fuse (the Free Unix Spectrum Emulator) was originally, and somewhat
unsurprisingly, an emulator of the ZX Spectrum (a popular 1980s home
@@ -214,6 +214,6 @@
<http://www.worldofspectrum.org/forums/>.
Philip Kendall <phi...@sh...>
-16 December 2010
+28 March 2011
-$Id: README 4220 2010-12-17 10:54:29Z fredm $
+$Id: README 4329 2011-03-27 22:26:07Z pak21 $
Modified: vendor/fuse-emulator/current/fuse/configure.in
===================================================================
--- vendor/fuse-emulator/current/fuse/configure.in 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/fuse/configure.in 2011-04-02 12:18:51 UTC (rev 667)
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-dnl $Id: configure.in 4220 2010-12-17 10:54:29Z fredm $
+dnl $Id: configure.in 4329 2011-03-27 22:26:07Z pak21 $
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@
AM_CONFIG_HEADER(config.h)
AC_CANONICAL_SYSTEM
-define(FUSE_VERSION, [1.0.0])
+define(FUSE_VERSION, [1.0.0.1a])
dnl Use automake to produce `Makefile.in'
AM_INIT_AUTOMAKE(fuse, FUSE_VERSION)
Modified: vendor/fuse-emulator/current/fuse/debugger/breakpoint.c
===================================================================
--- vendor/fuse-emulator/current/fuse/debugger/breakpoint.c 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/fuse/debugger/breakpoint.c 2011-04-02 12:18:51 UTC (rev 667)
@@ -1,7 +1,7 @@
/* breakpoint.c: a debugger breakpoint
Copyright (c) 2002-2008 Philip Kendall
- $Id: breakpoint.c 3685 2008-06-21 12:37:24Z pak21 $
+ $Id: breakpoint.c 4239 2011-01-01 15:41:13Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -237,19 +237,26 @@
debugger_check( debugger_breakpoint_type type, libspectrum_dword value )
{
GSList *ptr; debugger_breakpoint *bp;
+ GSList *ptr_next;
switch( debugger_mode ) {
case DEBUGGER_MODE_INACTIVE: return 0;
case DEBUGGER_MODE_ACTIVE:
- for( ptr = debugger_breakpoints; ptr; ptr = ptr->next ) {
+ for( ptr = debugger_breakpoints; ptr; ptr = ptr_next ) {
bp = ptr->data;
+ ptr_next = ptr->next;
if( breakpoint_check( bp, type, value ) ) {
- debugger_mode = DEBUGGER_MODE_HALTED;
- debugger_command_evaluate( bp->commands );
+ debugger_mode = DEBUGGER_MODE_HALTED;
+ debugger_command_evaluate( bp->commands );
+
+ if( bp->life == DEBUGGER_BREAKPOINT_LIFE_ONESHOT ) {
+ debugger_breakpoints = g_slist_remove( debugger_breakpoints, bp );
+ free( bp );
+ }
}
}
@@ -352,11 +359,6 @@
if( bp->condition && !debugger_expression_evaluate( bp->condition ) )
return 0;
- if( bp->life == DEBUGGER_BREAKPOINT_LIFE_ONESHOT ) {
- debugger_breakpoints = g_slist_remove( debugger_breakpoints, bp );
- free( bp );
- }
-
if( bp->type == DEBUGGER_BREAKPOINT_TYPE_TIME )
bp->value.time.triggered = 1;
Modified: vendor/fuse-emulator/current/fuse/fuse.c
===================================================================
--- vendor/fuse-emulator/current/fuse/fuse.c 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/fuse/fuse.c 2011-04-02 12:18:51 UTC (rev 667)
@@ -1,7 +1,7 @@
/* fuse.c: The Free Unix Spectrum Emulator
Copyright (c) 1999-2010 Philip Kendall and others
- $Id: fuse.c 4165 2010-09-30 21:55:05Z pak21 $
+ $Id: fuse.c 4329 2011-03-27 22:26:07Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -393,7 +393,7 @@
printf( "\n" );
fuse_show_version();
printf(
- "Copyright (c) 1999-2010 Philip Kendall and others; see the file\n"
+ "Copyright (c) 1999-2011 Philip Kendall and others; see the file\n"
"'AUTHORS' for more details.\n"
"\n"
"For help, please mail <fus...@li...> or use\n"
Modified: vendor/fuse-emulator/current/fuse/hacking/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse/hacking/ChangeLog 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/fuse/hacking/ChangeLog 2011-04-02 12:18:51 UTC (rev 667)
@@ -3372,3 +3372,22 @@
20101203 ui/fb/fbdisplay.c: improve fb colour handling and initialise scaler
system (fixes bugs #3124787 and #3124788) (rkd77).
20101216 ChangeLog,README,configure.in,man/fuse.1: update for 1.0.0 release.
+20101217 keysyms.pl: fix SVGAlib compilation (rkd77).
+20101229 debugger/breakpoint.c: don't free temporary breakpoint until after we have run
+ it (fixes bug #3084862) (thanks, Chris Cowley) (Fred).
+20101230 debugger/breakpoint.c: stop evaluating breakpoints when we have hit a
+ temporary breakpoint (really fixes bug #3084862) (patch #3142840)
+ (Sergio Baldovi).
+20110101 debugger/breakpoint.c: evaluate all breakpoints again, but store the
+ next breakpoint before deleteing the current one from the list
+ (really really fixes bug #3084862) (thanks, Phil) (Fred).
+20110109 ui/widget/filesel.c: make Amiga work again (Chris Young).
+20110112 ChangeLog,README,configure.in,man/fuse.1: updates for 1.0.0.1 release.
+20110327 man/fuse.1,roms/{128p-[01].rom,256s-[0123].rom,Makefile.am,
+ README.copyright,gluck.rom,if1-[12].rom,opus.rom,trdos.rom,
+ Makefile.am}: remove ROMs that there is no formal permission to
+ distribute.
+20110327 roms/Makefile.am: distribute README.copyright.
+20110327 ChangeLog,README,configure.in,fuse.c,man/fuse.1: updates for 1.0.0.1a
+ release.
+20110401 ChangeLog,man/fuse.1: didn't manage to release this earlier.
Modified: vendor/fuse-emulator/current/fuse/ide/divide.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ide/divide.c 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/fuse/ide/divide.c 2011-04-02 12:18:51 UTC (rev 667)
@@ -1,7 +1,7 @@
/* divide.c: DivIDE interface routines
Copyright (c) 2005-2008 Matthew Westcott, Philip Kendall
- $Id: divide.c 4220 2010-12-17 10:54:29Z fredm $
+ $Id: divide.c 4225 2010-12-17 20:14:40Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: vendor/fuse-emulator/current/fuse/ide/divide.h
===================================================================
--- vendor/fuse-emulator/current/fuse/ide/divide.h 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/fuse/ide/divide.h 2011-04-02 12:18:51 UTC (rev 667)
@@ -1,7 +1,7 @@
/* divide.h: DivIDE interface routines
Copyright (c) 2005 Matthew Westcott
- $Id: divide.h 4220 2010-12-17 10:54:29Z fredm $
+ $Id: divide.h 4225 2010-12-17 20:14:40Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: vendor/fuse-emulator/current/fuse/ide/ide.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ide/ide.c 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/fuse/ide/ide.c 2011-04-02 12:18:51 UTC (rev 667)
@@ -1,7 +1,7 @@
/* ide.c: Generic routines shared between the various IDE devices
Copyright (c) 2005 Philip Kendall
- $Id: ide.c 4220 2010-12-17 10:54:29Z fredm $
+ $Id: ide.c 4225 2010-12-17 20:14:40Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: vendor/fuse-emulator/current/fuse/ide/ide.h
===================================================================
--- vendor/fuse-emulator/current/fuse/ide/ide.h 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/fuse/ide/ide.h 2011-04-02 12:18:51 UTC (rev 667)
@@ -1,7 +1,7 @@
/* ide.h: Generic routines shared between the various IDE devices
Copyright (c) 2005 Philip Kendall
- $Id: ide.h 4220 2010-12-17 10:54:29Z fredm $
+ $Id: ide.h 4225 2010-12-17 20:14:40Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: vendor/fuse-emulator/current/fuse/ide/simpleide.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ide/simpleide.c 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/fuse/ide/simpleide.c 2011-04-02 12:18:51 UTC (rev 667)
@@ -3,7 +3,7 @@
2004 Philip Kendall,
2008 Fredrick Meunier
- $Id: simpleide.c 4220 2010-12-17 10:54:29Z fredm $
+ $Id: simpleide.c 4225 2010-12-17 20:14:40Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: vendor/fuse-emulator/current/fuse/ide/simpleide.h
===================================================================
--- vendor/fuse-emulator/current/fuse/ide/simpleide.h 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/fuse/ide/simpleide.h 2011-04-02 12:18:51 UTC (rev 667)
@@ -1,7 +1,7 @@
/* simpleide.h: Simple 8-bit IDE interface routines
Copyright (c) 2003-2004 Garry Lancaster
- $Id: simpleide.h 4220 2010-12-17 10:54:29Z fredm $
+ $Id: simpleide.h 4225 2010-12-17 20:14:40Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: vendor/fuse-emulator/current/fuse/ide/zxatasp.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ide/zxatasp.c 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/fuse/ide/zxatasp.c 2011-04-02 12:18:51 UTC (rev 667)
@@ -1,7 +1,7 @@
/* zxatasp.c: ZXATASP interface routines
Copyright (c) 2003-2008 Garry Lancaster and Philip Kendall
- $Id: zxatasp.c 4220 2010-12-17 10:54:29Z fredm $
+ $Id: zxatasp.c 4225 2010-12-17 20:14:40Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: vendor/fuse-emulator/current/fuse/ide/zxatasp.h
===================================================================
--- vendor/fuse-emulator/current/fuse/ide/zxatasp.h 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/fuse/ide/zxatasp.h 2011-04-02 12:18:51 UTC (rev 667)
@@ -2,7 +2,7 @@
Copyright (c) 2003-2004 Garry Lancaster,
2004 Philip Kendall
- $Id: zxatasp.h 4220 2010-12-17 10:54:29Z fredm $
+ $Id: zxatasp.h 4225 2010-12-17 20:14:40Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: vendor/fuse-emulator/current/fuse/ide/zxcf.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ide/zxcf.c 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/fuse/ide/zxcf.c 2011-04-02 12:18:51 UTC (rev 667)
@@ -1,7 +1,7 @@
/* zxcf.c: ZXCF interface routines
Copyright (c) 2003-2008 Garry Lancaster and Philip Kendall
- $Id: zxcf.c 4220 2010-12-17 10:54:29Z fredm $
+ $Id: zxcf.c 4225 2010-12-17 20:14:40Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: vendor/fuse-emulator/current/fuse/ide/zxcf.h
===================================================================
--- vendor/fuse-emulator/current/fuse/ide/zxcf.h 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/fuse/ide/zxcf.h 2011-04-02 12:18:51 UTC (rev 667)
@@ -2,7 +2,7 @@
Copyright (c) 2003-2004 Garry Lancaster,
2004 Philip Kendall
- $Id: zxcf.h 4220 2010-12-17 10:54:29Z fredm $
+ $Id: zxcf.h 4225 2010-12-17 20:14:40Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: vendor/fuse-emulator/current/fuse/keysyms.pl
===================================================================
--- vendor/fuse-emulator/current/fuse/keysyms.pl 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/fuse/keysyms.pl 2011-04-02 12:18:51 UTC (rev 667)
@@ -4,7 +4,7 @@
# Copyright (c) 2000-2007 Philip Kendall, Matan Ziv-Av, Russell Marks,
# Fredrick Meunier, Catalin Mihaila, Stuart Brady
-# $Id: keysyms.pl 4103 2009-11-21 10:16:36Z fredm $
+# $Id: keysyms.pl 4225 2010-12-17 20:14:40Z pak21 $
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -203,6 +203,7 @@
Down => 'CURSORBLOCKDOWN',
Up => 'CURSORBLOCKUP',
Right => 'CURSORBLOCKRIGHT',
+ KP_Enter => 'KEYPADENTER',
},
function => \&svga_keysym,
},
Modified: vendor/fuse-emulator/current/fuse/man/fuse.1
===================================================================
--- vendor/fuse-emulator/current/fuse/man/fuse.1 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/fuse/man/fuse.1 2011-04-02 12:18:51 UTC (rev 667)
@@ -1,7 +1,7 @@
.\" -*- nroff -*-
.\"
.\" fuse.1: Fuse man page
-.\" Copyright (c) 2001-2010 Russell Marks, Philip Kendall, Darren Salt,
+.\" Copyright (c) 2001-2011 Russell Marks, Philip Kendall, Darren Salt,
.\" Fredrick Meunier, Stuart Brady
.\"
.\" This program is free software; you can redistribute it and/or modify
@@ -23,7 +23,7 @@
.\" E-mail: phi...@sh...
.\"
.\"
-.TH fuse 1 "16th December, 2010" "Version 1.0.0" "Emulators"
+.TH fuse 1 "1st April, 2011" "Version 1.0.0.1a" "Emulators"
.\"
.\"------------------------------------------------------------------
.\"
@@ -670,7 +670,9 @@
.RI ( plusd.rom ),
and the TR-DOS ROM for Beta 128 emulation with the 48K, TC2048, 128K or +2
.RI ( trdos.rom ).
-The names in brackets denote the defaults.
+The names in brackets denote the defaults. Note that not all these ROMs
+are supplied with Fuse - you must supply your own copies of those which
+are not.
.RE
.PP
.I \-\-no\-rs232\-handshake
Modified: vendor/fuse-emulator/current/fuse/memory.c
===================================================================
--- vendor/fuse-emulator/current/fuse/memory.c 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/fuse/memory.c 2011-04-02 12:18:51 UTC (rev 667)
@@ -1,7 +1,7 @@
/* memory.c: Routines for accessing memory
Copyright (c) 1999-2004 Philip Kendall
- $Id: memory.c 4186 2010-10-25 10:29:45Z fredm $
+ $Id: memory.c 4207 2010-12-05 10:01:23Z fredm $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Deleted: vendor/fuse-emulator/current/fuse/roms/128p-0.rom
===================================================================
(Binary files differ)
Deleted: vendor/fuse-emulator/current/fuse/roms/128p-1.rom
===================================================================
(Binary files differ)
Deleted: vendor/fuse-emulator/current/fuse/roms/256s-0.rom
===================================================================
(Binary files differ)
Deleted: vendor/fuse-emulator/current/fuse/roms/256s-1.rom
===================================================================
(Binary files differ)
Deleted: vendor/fuse-emulator/current/fuse/roms/256s-2.rom
===================================================================
(Binary files differ)
Deleted: vendor/fuse-emulator/current/fuse/roms/256s-3.rom
===================================================================
(Binary files differ)
Modified: vendor/fuse-emulator/current/fuse/roms/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/roms/Makefile.am 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/fuse/roms/Makefile.am 2011-04-02 12:18:51 UTC (rev 667)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 1999-2001 Philip Kendall
-## $Id: Makefile.am 4060 2009-07-30 13:21:38Z fredm $
+## $Id: Makefile.am 4328 2011-03-27 22:19:27Z pak21 $
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -25,18 +25,14 @@
ROMS = 128-0.rom 128-1.rom \
48.rom \
- opus.rom \
plus2-0.rom plus2-1.rom \
plus3-0.rom plus3-1.rom plus3-2.rom plus3-3.rom \
plus3e-0.rom plus3e-1.rom plus3e-2.rom plus3e-3.rom \
tc2048.rom \
tc2068-0.rom tc2068-1.rom \
- gluck.rom 128p-0.rom 128p-1.rom trdos.rom \
- 256s-0.rom 256s-1.rom 256s-2.rom 256s-3.rom \
se-0.rom se-1.rom \
- if1-1.rom if1-2.rom \
plusd.rom
pkgdata_DATA = $(ROMS)
-EXTRA_DIST = $(ROMS)
+EXTRA_DIST = $(ROMS) README.copyright
Added: vendor/fuse-emulator/current/fuse/roms/README.copyright
===================================================================
--- vendor/fuse-emulator/current/fuse/roms/README.copyright (rev 0)
+++ vendor/fuse-emulator/current/fuse/roms/README.copyright 2011-04-02 12:18:51 UTC (rev 667)
@@ -0,0 +1,47 @@
+Note that the files in this directory are _not_ covered by the GNU GPL.
+
+The following licenses apply:
+
+128-0.rom
+128-1.rom
+48.rom
+plus2-0.rom
+plus2-1.rom
+plus3-0.rom
+plus3-1.rom
+plus3-2.rom
+plus3-3.rom
+tc2048.rom
+
+These are copyright Amstrad, who allow distribution of the ROMs but
+retain the copyright. You may not sell the ROMs or embed the ROMs in
+hardware, although it is allowed to sell a product which contains the
+ROMs, so long as the charge is being made for the product, not for the
+ROMs themselves. See
+<http://groups.google.com/group/comp.sys.amstrad.8bit/msg/c092cc4d4943131e>
+for more details.
+
+tc2068-0.rom
+tc2068-1.rom
+
+These are derived from Amstrad code, so the above statement applies. The
+modifications made by Timex are in the public domain.
+
+plus3e-0.rom
+plus3e-1.rom
+plus3e-2.rom
+plus3e-3.rom
+
+These are derived from Amstrad code, so the above statement applies. The
+modifications are copyright Garry Lancaster.
+
+se-0.rom
+se-1.rom
+
+These are derived from Amstrad code, so the above statement applies. The
+modifications are by Andrew Owen and are subject to the same conditions.
+
+plusd.rom
+
+This is copyright Datel Microelectronics, who allow distribution. See
+<http://www.shadowmagic.org.uk/spectrum/datel.html> for details.
Deleted: vendor/fuse-emulator/current/fuse/roms/gluck.rom
===================================================================
(Binary files differ)
Deleted: vendor/fuse-emulator/current/fuse/roms/if1-1.rom
===================================================================
(Binary files differ)
Deleted: vendor/fuse-emulator/current/fuse/roms/if1-2.rom
===================================================================
(Binary files differ)
Deleted: vendor/fuse-emulator/current/fuse/roms/opus.rom
===================================================================
(Binary files differ)
Deleted: vendor/fuse-emulator/current/fuse/roms/trdos.rom
===================================================================
(Binary files differ)
Modified: vendor/fuse-emulator/current/fuse/ui/fb/fbdisplay.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/fb/fbdisplay.c 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/fuse/ui/fb/fbdisplay.c 2011-04-02 12:18:51 UTC (rev 667)
@@ -2,7 +2,7 @@
Copyright (c) 2000-2003 Philip Kendall, Matan Ziv-Av, Darren Salt,
Witold Filipczyk
- $Id: fbdisplay.c 4205 2010-12-03 10:39:39Z fredm $
+ $Id: fbdisplay.c 4206 2010-12-03 11:59:23Z fredm $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: vendor/fuse-emulator/current/fuse/ui/widget/filesel.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/widget/filesel.c 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/fuse/ui/widget/filesel.c 2011-04-02 12:18:51 UTC (rev 667)
@@ -2,7 +2,7 @@
Copyright (c) 2001-2005 Matan Ziv-Av, Philip Kendall, Russell Marks,
Marek Januszewski
- $Id: filesel.c 4103 2009-11-21 10:16:36Z fredm $
+ $Id: filesel.c 4246 2011-01-09 20:47:53Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -64,6 +64,9 @@
int err = 0;
+
+char *amiga_asl( char *title, BOOL is_saving );
+
#endif /* ifdef AMIGA */
struct widget_dirent **widget_filenames; /* Filenames in the current
@@ -145,13 +148,21 @@
char *
ui_get_open_filename( const char *title )
{
+#if !defined AMIGA && !defined __MORPHOS__
return widget_get_filename( title, 0 );
+#else
+ return amiga_asl( title, FALSE );
+#endif
}
char *
ui_get_save_filename( const char *title )
{
+#if !defined AMIGA && !defined __MORPHOS__
return widget_get_filename( title, 1 );
+#else
+ return amiga_asl( title, TRUE );
+#endif
}
static int widget_add_filename( int *allocated, int *number,
@@ -207,8 +218,8 @@
}
#if defined AMIGA || defined __MORPHOS__
-static char *
-amiga_asl( char *title ) {
+char *
+amiga_asl( char *title, BOOL is_saving ) {
char *filename;
struct FileRequester *filereq;
@@ -499,8 +510,7 @@
/* Show all the filenames */
widget_print_all_filenames( widget_filenames, widget_numfiles,
top_left_file, current_file, directory );
-#else /* ifndef AMIGA */
- amiga_asl(title);
+
#endif /* ifndef AMIGA */
return 0;
Modified: vendor/fuse-emulator/current/libspectrum/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/libspectrum/ChangeLog 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/libspectrum/ChangeLog 2011-04-02 12:18:51 UTC (rev 667)
@@ -310,5 +310,5 @@
* libspectrum separated from Fuse just before the 0.5.0 release of
Fuse; see Fuse's ChangeLog for changes up to this point
-$Id: ChangeLog 4220 2010-12-17 10:54:29Z fredm $
+$Id: ChangeLog 4212 2010-12-16 21:36:50Z pak21 $
Modified: vendor/fuse-emulator/current/libspectrum/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/libspectrum/Makefile.am 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/libspectrum/Makefile.am 2011-04-02 12:18:51 UTC (rev 667)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2001-2004 Philip Kendall
-## $Id: Makefile.am 4220 2010-12-17 10:54:29Z fredm $
+## $Id: Makefile.am 4222 2010-12-17 18:56:50Z pak21 $
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -53,6 +53,7 @@
tzx_write.c \
warajevo_read.c \
wav.c \
+ windres.rc \
z80.c \
z80em.c \
zlib.c \
Modified: vendor/fuse-emulator/current/libspectrum/README
===================================================================
--- vendor/fuse-emulator/current/libspectrum/README 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/libspectrum/README 2011-04-02 12:18:51 UTC (rev 667)
@@ -69,4 +69,4 @@
Philip Kendall <phi...@sh...>
16 December 2010
-$Id: README 4220 2010-12-17 10:54:29Z fredm $
+$Id: README 4210 2010-12-16 21:34:52Z pak21 $
Modified: vendor/fuse-emulator/current/libspectrum/configure.in
===================================================================
--- vendor/fuse-emulator/current/libspectrum/configure.in 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/libspectrum/configure.in 2011-04-02 12:18:51 UTC (rev 667)
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
dnl Copyright (c) 1999-2008 Philip Kendall
-dnl $Id: configure.in 4220 2010-12-17 10:54:29Z fredm $
+dnl $Id: configure.in 4210 2010-12-16 21:34:52Z pak21 $
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
Modified: vendor/fuse-emulator/current/libspectrum/doc/libspectrum.txt
===================================================================
--- vendor/fuse-emulator/current/libspectrum/doc/libspectrum.txt 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/libspectrum/doc/libspectrum.txt 2011-04-02 12:18:51 UTC (rev 667)
@@ -1745,4 +1745,4 @@
Write `data' to register `reg' of the IDE channel `chn'.
-$Id: libspectrum.txt 4220 2010-12-17 10:54:29Z fredm $
+$Id: libspectrum.txt 4193 2010-11-29 20:29:25Z pak21 $
Modified: vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog 2011-04-02 12:18:51 UTC (rev 667)
@@ -794,3 +794,5 @@
for 1.0.0 release.
20101216 ChangeLog: update date here as well.
20101216 test/Makefile.am: ensure all test files are distributed.
+20101217 Makefile.am: mark windres.rc as a source file so it is distributed
+ (thanks, Guesser).
Modified: vendor/fuse-emulator/current/libspectrum/test/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/libspectrum/test/Makefile.am 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/libspectrum/test/Makefile.am 2011-04-02 12:18:51 UTC (rev 667)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2007 Philip Kendall
-## $Id: Makefile.am 4220 2010-12-17 10:54:29Z fredm $
+## $Id: Makefile.am 4218 2010-12-16 21:56:33Z pak21 $
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
Modified: vendor/fuse-emulator/current/libspectrum/warajevo_read.c
===================================================================
--- vendor/fuse-emulator/current/libspectrum/warajevo_read.c 2011-04-02 11:51:55 UTC (rev 666)
+++ vendor/fuse-emulator/current/libspectrum/warajevo_read.c 2011-04-02 12:18:51 UTC (rev 667)
@@ -2,7 +2,7 @@
Copyright (c) 2001, 2002 Philip Kendall, Darren Salt
Copyright (c) 2003 Fredrick Meunier
- $Id: warajevo_read.c 4196 2010-11-30 18:45:18Z pak21 $
+ $Id: warajevo_read.c 4197 2010-11-30 18:48:20Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2012-02-15 12:43:25
|
Revision: 685
http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=685&view=rev
Author: fredm
Date: 2012-02-15 12:43:10 +0000 (Wed, 15 Feb 2012)
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/bitmap.h
vendor/fuse-emulator/current/fuse/compat/amiga/Makefile.am
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/file.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/timer.c
vendor/fuse-emulator/current/fuse/compat.h
vendor/fuse-emulator/current/fuse/configure.in
vendor/fuse-emulator/current/fuse/debugger/breakpoint.c
vendor/fuse-emulator/current/fuse/debugger/breakpoint.h
vendor/fuse-emulator/current/fuse/debugger/commandl.l
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/event.c
vendor/fuse-emulator/current/fuse/display.c
vendor/fuse-emulator/current/fuse/event.c
vendor/fuse-emulator/current/fuse/fuse.c
vendor/fuse-emulator/current/fuse/hacking/ChangeLog
vendor/fuse-emulator/current/fuse/hacking/tc2048_tech_notes.txt
vendor/fuse-emulator/current/fuse/input.c
vendor/fuse-emulator/current/fuse/keyboard.c
vendor/fuse-emulator/current/fuse/keysyms.pl
vendor/fuse-emulator/current/fuse/machine.c
vendor/fuse-emulator/current/fuse/machine.h
vendor/fuse-emulator/current/fuse/machines/Makefile.am
vendor/fuse-emulator/current/fuse/machines/pentagon.c
vendor/fuse-emulator/current/fuse/machines/pentagon.h
vendor/fuse-emulator/current/fuse/machines/pentagon1024.c
vendor/fuse-emulator/current/fuse/machines/pentagon512.c
vendor/fuse-emulator/current/fuse/machines/scorpion.c
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/spec48_ntsc.c
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.c
vendor/fuse-emulator/current/fuse/memory.h
vendor/fuse-emulator/current/fuse/mempool.c
vendor/fuse-emulator/current/fuse/mempool.h
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/ay.c
vendor/fuse-emulator/current/fuse/peripherals/ay.h
vendor/fuse-emulator/current/fuse/peripherals/dck.c
vendor/fuse-emulator/current/fuse/peripherals/dck.h
vendor/fuse-emulator/current/fuse/peripherals/disk/Makefile.am
vendor/fuse-emulator/current/fuse/peripherals/disk/beta.c
vendor/fuse-emulator/current/fuse/peripherals/disk/beta.h
vendor/fuse-emulator/current/fuse/peripherals/disk/crc.c
vendor/fuse-emulator/current/fuse/peripherals/disk/disk.c
vendor/fuse-emulator/current/fuse/peripherals/disk/fdd.c
vendor/fuse-emulator/current/fuse/peripherals/disk/opus.c
vendor/fuse-emulator/current/fuse/peripherals/disk/opus.h
vendor/fuse-emulator/current/fuse/peripherals/disk/plusd.c
vendor/fuse-emulator/current/fuse/peripherals/disk/plusd.h
vendor/fuse-emulator/current/fuse/peripherals/disk/upd_fdc.c
vendor/fuse-emulator/current/fuse/peripherals/disk/upd_fdc.h
vendor/fuse-emulator/current/fuse/peripherals/disk/wd_fdc.c
vendor/fuse-emulator/current/fuse/peripherals/disk/wd_fdc.h
vendor/fuse-emulator/current/fuse/peripherals/fuller.c
vendor/fuse-emulator/current/fuse/peripherals/fuller.h
vendor/fuse-emulator/current/fuse/peripherals/ide/Makefile.am
vendor/fuse-emulator/current/fuse/peripherals/ide/divide.c
vendor/fuse-emulator/current/fuse/peripherals/ide/divide.h
vendor/fuse-emulator/current/fuse/peripherals/ide/ide.c
vendor/fuse-emulator/current/fuse/peripherals/ide/ide.h
vendor/fuse-emulator/current/fuse/peripherals/ide/simpleide.c
vendor/fuse-emulator/current/fuse/peripherals/ide/simpleide.h
vendor/fuse-emulator/current/fuse/peripherals/ide/zxatasp.c
vendor/fuse-emulator/current/fuse/peripherals/ide/zxatasp.h
vendor/fuse-emulator/current/fuse/peripherals/ide/zxcf.c
vendor/fuse-emulator/current/fuse/peripherals/ide/zxcf.h
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/joystick.c
vendor/fuse-emulator/current/fuse/peripherals/joystick.h
vendor/fuse-emulator/current/fuse/peripherals/kempmouse.c
vendor/fuse-emulator/current/fuse/peripherals/kempmouse.h
vendor/fuse-emulator/current/fuse/peripherals/melodik.c
vendor/fuse-emulator/current/fuse/peripherals/melodik.h
vendor/fuse-emulator/current/fuse/peripherals/printer.c
vendor/fuse-emulator/current/fuse/peripherals/printer.h
vendor/fuse-emulator/current/fuse/peripherals/scld.c
vendor/fuse-emulator/current/fuse/peripherals/scld.h
vendor/fuse-emulator/current/fuse/peripherals/ula.c
vendor/fuse-emulator/current/fuse/peripherals/ula.h
vendor/fuse-emulator/current/fuse/pokefinder/Makefile.am
vendor/fuse-emulator/current/fuse/roms/Makefile.am
vendor/fuse-emulator/current/fuse/roms/README.copyright
vendor/fuse-emulator/current/fuse/rzx.c
vendor/fuse-emulator/current/fuse/screenshot.c
vendor/fuse-emulator/current/fuse/screenshot.h
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.c
vendor/fuse-emulator/current/fuse/sound.h
vendor/fuse-emulator/current/fuse/spectrum.c
vendor/fuse-emulator/current/fuse/tape.c
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/fbui.c
vendor/fuse-emulator/current/fuse/ui/gtk/Makefile.am
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/gtkinternals.h
vendor/fuse-emulator/current/fuse/ui/gtk/gtkjoystick.c
vendor/fuse-emulator/current/fuse/ui/gtk/gtkui.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/statusbar.c
vendor/fuse-emulator/current/fuse/ui/options.dat
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/sdlui.c
vendor/fuse-emulator/current/fuse/ui/svga/svgajoystick.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/widget/Makefile.am
vendor/fuse-emulator/current/fuse/ui/widget/debugger.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-header.pl
vendor/fuse-emulator/current/fuse/ui/widget/options.pl
vendor/fuse-emulator/current/fuse/ui/widget/pokefinder.c
vendor/fuse-emulator/current/fuse/ui/widget/widget.c
vendor/fuse-emulator/current/fuse/ui/widget/widget.h
vendor/fuse-emulator/current/fuse/ui/widget/widget_internals.h
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/debugger.rc
vendor/fuse-emulator/current/fuse/ui/win32/installer/fuse.nsi
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/ui/win32/picture.c
vendor/fuse-emulator/current/fuse/ui/win32/pokefinder.c
vendor/fuse-emulator/current/fuse/ui/win32/pokefinder.rc
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/win32internals.h
vendor/fuse-emulator/current/fuse/ui/win32/win32joystick.c
vendor/fuse-emulator/current/fuse/ui/win32/win32joystick.rc
vendor/fuse-emulator/current/fuse/ui/win32/win32ui.c
vendor/fuse-emulator/current/fuse/ui/xlib/xdisplay.c
vendor/fuse-emulator/current/fuse/ui/xlib/xjoystick.c
vendor/fuse-emulator/current/fuse/ui.c
vendor/fuse-emulator/current/fuse/unittests/unittests.c
vendor/fuse-emulator/current/fuse/unittests/unittests.h
vendor/fuse-emulator/current/fuse/utils.c
vendor/fuse-emulator/current/fuse/utils.h
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_checks.h
vendor/fuse-emulator/current/fuse/z80/z80_ops.c
vendor/fuse-emulator/current/fuse-utils/audio2tape.h
vendor/fuse-emulator/current/fuse-utils/compat.h
vendor/fuse-emulator/current/fuse-utils/configure.in
vendor/fuse-emulator/current/fuse-utils/hacking/ChangeLog
vendor/fuse-emulator/current/fuse-utils/man/profile2map.1
vendor/fuse-emulator/current/fuse-utils/man/tape2wav.1
vendor/fuse-emulator/current/fuse-utils/man/tzxlist.1
vendor/fuse-emulator/current/fuse-utils/snap2tzx.c
vendor/fuse-emulator/current/fuse-utils/tape2wav.c
vendor/fuse-emulator/current/fuse-utils/tzxlist.c
vendor/fuse-emulator/current/libspectrum/ChangeLog
vendor/fuse-emulator/current/libspectrum/Makefile.am
vendor/fuse-emulator/current/libspectrum/README
vendor/fuse-emulator/current/libspectrum/accessor.pl
vendor/fuse-emulator/current/libspectrum/configure.in
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/internals.h
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/myglib/garray.c
vendor/fuse-emulator/current/libspectrum/myglib/ghash.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/tap.c
vendor/fuse-emulator/current/libspectrum/tape.c
vendor/fuse-emulator/current/libspectrum/tape_accessors.txt
vendor/fuse-emulator/current/libspectrum/tape_block.c
vendor/fuse-emulator/current/libspectrum/tape_block.h
vendor/fuse-emulator/current/libspectrum/test/Makefile.am
vendor/fuse-emulator/current/libspectrum/test/test.c
vendor/fuse-emulator/current/libspectrum/test/test15.c
vendor/fuse-emulator/current/libspectrum/tzx_read.c
vendor/fuse-emulator/current/libspectrum/tzx_write.c
vendor/fuse-emulator/current/libspectrum/warajevo_read.c
vendor/fuse-emulator/current/libspectrum/wav.c
vendor/fuse-emulator/current/libspectrum/z80.c
vendor/fuse-emulator/current/website/fuse.php
vendor/fuse-emulator/current/website/libspectrum.php
vendor/fuse-emulator/current/website/screens/f-nongtk.png
Added Paths:
-----------
vendor/fuse-emulator/current/fuse/compat/unix/tuntap.c
vendor/fuse-emulator/current/fuse/machines/machines_periph.c
vendor/fuse-emulator/current/fuse/machines/machines_periph.h
vendor/fuse-emulator/current/fuse/peripherals/Makefile.am
vendor/fuse-emulator/current/fuse/peripherals/disk/disciple.c
vendor/fuse-emulator/current/fuse/peripherals/disk/disciple.h
vendor/fuse-emulator/current/fuse/peripherals/nic/
vendor/fuse-emulator/current/fuse/peripherals/nic/Makefile.am
vendor/fuse-emulator/current/fuse/peripherals/nic/enc28j60.c
vendor/fuse-emulator/current/fuse/peripherals/nic/enc28j60.h
vendor/fuse-emulator/current/fuse/peripherals/speccyboot.c
vendor/fuse-emulator/current/fuse/peripherals/speccyboot.h
vendor/fuse-emulator/current/fuse/peripherals/specdrum.c
vendor/fuse-emulator/current/fuse/peripherals/specdrum.h
vendor/fuse-emulator/current/fuse/pokefinder/pokemem.c
vendor/fuse-emulator/current/fuse/pokefinder/pokemem.h
vendor/fuse-emulator/current/fuse/roms/speccyboot-1.4.rom
vendor/fuse-emulator/current/fuse/ui/gtk/pokemem.c
vendor/fuse-emulator/current/fuse/ui/widget/pokemem.c
vendor/fuse-emulator/current/fuse/ui/win32/about.c
vendor/fuse-emulator/current/fuse/ui/win32/about.h
vendor/fuse-emulator/current/fuse/ui/win32/about.rc
vendor/fuse-emulator/current/fuse/ui/win32/fuse.manifest.in
vendor/fuse-emulator/current/fuse/ui/win32/hyperlinks.c
vendor/fuse-emulator/current/fuse/ui/win32/hyperlinks.h
vendor/fuse-emulator/current/fuse/ui/win32/pokemem.c
vendor/fuse-emulator/current/fuse/ui/win32/pokemem.h
vendor/fuse-emulator/current/fuse/ui/win32/pokemem.rc
vendor/fuse-emulator/current/fuse-utils/compat/win32/
vendor/fuse-emulator/current/fuse-utils/compat/win32/Makefile.am
vendor/fuse-emulator/current/fuse-utils/compat/win32/osname.c
vendor/fuse-emulator/current/libspectrum/pzx_read.c
vendor/fuse-emulator/current/libspectrum/utilities.c
Modified: vendor/fuse-emulator/current/fuse/AUTHORS
===================================================================
--- vendor/fuse-emulator/current/fuse/AUTHORS 2012-02-15 12:32:32 UTC (rev 684)
+++ vendor/fuse-emulator/current/fuse/AUTHORS 2012-02-15 12:43:10 UTC (rev 685)
@@ -48,6 +48,8 @@
* Michael D Wynne: the Opus Discovery emulation (for EightyOne).
+* Patrik Persson: the SpeccyBoot Ethernet emulation.
+
* Philip Kendall: everything else.
-$Id: AUTHORS 4060 2009-07-30 13:21:38Z fredm $
+$Id: AUTHORS 4237 2010-12-31 19:31:26Z pak21 $
Modified: vendor/fuse-emulator/current/fuse/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse/ChangeLog 2012-02-15 12:32:32 UTC (rev 684)
+++ vendor/fuse-emulator/current/fuse/ChangeLog 2012-02-15 12:43:10 UTC (rev 685)
@@ -1,19 +1,3 @@
-2011-04-01 Philip Kendall <phi...@sh...>
-
- * Fuse 1.0.0.1a released.
-
- * Remove all ROMs for which there isn't explicit permission to
- distribute (Philip Kendall).
-
-2011-01-12 Philip Kendall <phi...@sh...>
-
- * Fuse 1.0.0.1 released.
-
- * Fix temporary breakpoints on platforms using replacement Glib
- (Fredrick Meunier, Sergio Baldovi; thanks, Chris Cowley)
- * Ensure Amiga port can load files (Chris Young)
- * Fix SVGAlib compilation (rkd77)
-
2010-12-16 Philip Kendall <phi...@sh...>
* Fuse 1.0.0 released.
@@ -602,7 +586,7 @@
* Graphics filters: essentially arbitrary filters which can be
applied to the Spectrum's screen to give scanlines, smoothing
- and all sorts of other possiblities (mostly Fredrick Meunier
+ and all sorts of other possibilities (mostly Fredrick Meunier
and Philip Kendall; based on the same feature in ScummVM).
* Transparent monitor/debugger (Philip Kendall).
@@ -701,7 +685,7 @@
* Put the keyboard help in a separate window when using the GTK+
UI (Philip Kendall).
- * Changable emulation speed (Philip Kendall).
+ * Changeable emulation speed (Philip Kendall).
* Change to lib765 0.3.0 for Mac OS X compatibility
(Frederick Meunier).
@@ -1051,4 +1035,4 @@
* Version 0.1.0 released.
-$Id: ChangeLog 4331 2011-04-01 07:47:06Z pak21 $
+$Id: ChangeLog 4409 2011-05-01 10:47:07Z zubzero $
Modified: vendor/fuse-emulator/current/fuse/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/Makefile.am 2012-02-15 12:32:32 UTC (rev 684)
+++ vendor/fuse-emulator/current/fuse/Makefile.am 2012-02-15 12:43:10 UTC (rev 685)
@@ -1,7 +1,7 @@
# Process this file with automake to produce Makefile.in
## Copyright (c) 1999-2009 Philip Kendall
-## $Id: Makefile.am 4112 2010-01-08 11:03:43Z fredm $
+## $Id: Makefile.am 4288 2011-02-03 21:06:22Z 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
@@ -27,12 +27,11 @@
SUBDIRS = @COMPAT_SUBDIR@ \
debugger \
- disk \
hacking \
- ide \
lib \
machines \
man \
+ peripherals \
perl \
pokefinder \
roms \
@@ -43,12 +42,11 @@
z80
DIST_SUBDIRS = debugger \
- disk \
hacking \
- ide \
lib \
machines \
man \
+ peripherals \
perl \
pokefinder \
roms \
@@ -58,32 +56,22 @@
unittests \
z80
-fuse_SOURCES = ay.c \
- dck.c \
- display.c \
+fuse_SOURCES = display.c \
event.c \
- fuller.c \
fuse.c \
- if1.c \
- if2.c \
input.c \
- joystick.c \
- kempmouse.c \
keyboard.c \
loader.c \
machine.c \
- melodik.c \
memory.c \
mempool.c \
menu.c \
module.c \
periph.c \
- printer.c \
profile.c \
psg.c \
rectangle.c \
rzx.c \
- scld.c \
screenshot.c \
settings.c \
slt.c \
@@ -93,7 +81,6 @@
tape.c \
ui.c \
uidisplay.c \
- ula.c \
utils.c \
windres.rc
@@ -114,9 +101,11 @@
fuse_LDADD = debugger/libdebugger.a \
@UI_LIBS@ \
debugger/libdebugger.a \
-disk/libdisk.a \
-ide/libide.a \
machines/libmachines.a \
+peripherals/libperipherals.a \
+peripherals/disk/libdisk.a \
+peripherals/ide/libide.a \
+peripherals/nic/libnic.a \
pokefinder/libpokefinder.a \
sound/libsound.a \
timer/libtimer.a \
@@ -136,9 +125,11 @@
fuse_DEPENDENCIES = debugger/libdebugger.a \
@UI_LIBS@ \
debugger/libdebugger.a \
-disk/libdisk.a \
-ide/libide.a \
machines/libmachines.a \
+peripherals/libperipherals.a \
+peripherals/disk/libdisk.a \
+peripherals/ide/libide.a \
+peripherals/nic/libnic.a \
pokefinder/libpokefinder.a \
sound/libsound.a \
timer/libtimer.a \
@@ -170,22 +161,15 @@
INCLUDES = @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@ \
@XML_CFLAGS@ -DFUSEDATADIR="\"${pkgdatadir}\"" @SDL_CFLAGS@
-noinst_HEADERS = ay.h \
- bitmap.h \
+noinst_HEADERS = bitmap.h \
compat.h \
- dck.h \
display.h \
event.h \
- fuller.h \
fuse.h \
- if1.h \
- if2.h \
input.h \
keyboard.h \
- kempmouse.h \
loader.h \
machine.h \
- melodik.h \
memory.h \
mempool.h \
menu.h \
@@ -202,12 +186,8 @@
spectrum.h \
tape.h \
utils.h \
- joystick.h \
options.h \
- printer.h \
- profile.h \
- scld.h \
- ula.h
+ profile.h
EXTRA_DIST = AUTHORS \
README \
Modified: vendor/fuse-emulator/current/fuse/README
===================================================================
--- vendor/fuse-emulator/current/fuse/README 2012-02-15 12:32:32 UTC (rev 684)
+++ vendor/fuse-emulator/current/fuse/README 2012-02-15 12:43:10 UTC (rev 685)
@@ -1,5 +1,5 @@
-The Free Unix Spectrum Emulator (Fuse) 1.0.0.1a
-===============================================
+The Free Unix Spectrum Emulator (Fuse) 1.0.0
+============================================
Fuse (the Free Unix Spectrum Emulator) was originally, and somewhat
unsurprisingly, an emulator of the ZX Spectrum (a popular 1980s home
@@ -90,7 +90,7 @@
replacements for all the routines used by Fuse.
Another useful option is `--with-local-prefix=DIRECTORY' which allows
-you to specify that you have some the the libraries needed by Fuse in
+you to specify that you have some of the libraries needed by Fuse in
`<DIRECTORY>/lib' and the necessary header files in
`<DIRECTORY>/include'. If you specify the `--prefix' option to tell
Fuse to install itself somewhere other than in /usr/local, that
@@ -214,6 +214,6 @@
<http://www.worldofspectrum.org/forums/>.
Philip Kendall <phi...@sh...>
-28 March 2011
+16 December 2010
-$Id: README 4329 2011-03-27 22:26:07Z pak21 $
+$Id: README 4410 2011-05-01 10:51:21Z zubzero $
Modified: vendor/fuse-emulator/current/fuse/bitmap.h
===================================================================
--- vendor/fuse-emulator/current/fuse/bitmap.h 2012-02-15 12:32:32 UTC (rev 684)
+++ vendor/fuse-emulator/current/fuse/bitmap.h 2012-02-15 12:43:10 UTC (rev 685)
@@ -1,7 +1,7 @@
/* bitmap.h: Bitmap routines
Copyright (c) 2007 Stuart Brady
- $Id: bitmap.h 3218 2007-10-21 23:25:23Z zubzero $
+ $Id: bitmap.h 4343 2011-04-04 19:32: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
@@ -21,7 +21,7 @@
Philip: phi...@sh...
- Stuart: sd...@nt...
+ Stuart: stu...@gm...
*/
Modified: vendor/fuse-emulator/current/fuse/compat/amiga/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/amiga/Makefile.am 2012-02-15 12:32:32 UTC (rev 684)
+++ vendor/fuse-emulator/current/fuse/compat/amiga/Makefile.am 2012-02-15 12:43:10 UTC (rev 685)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2007-2008 Philip Kendall
-## $Id: Makefile.am 3935 2009-01-07 12:55:13Z pak21 $
+## $Id: Makefile.am 4237 2010-12-31 19:31:26Z 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,6 +31,7 @@
../unix/file.c \
osname.c \
paths.c \
- ../unix/timer.c
+ ../unix/timer.c \
+ ../unix/tuntap.c
INCLUDES = @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@
Modified: vendor/fuse-emulator/current/fuse/compat/morphos/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/morphos/Makefile.am 2012-02-15 12:32:32 UTC (rev 684)
+++ vendor/fuse-emulator/current/fuse/compat/morphos/Makefile.am 2012-02-15 12:43:10 UTC (rev 685)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2007-2008 Philip Kendall
-## $Id: Makefile.am 3935 2009-01-07 12:55:13Z pak21 $
+## $Id: Makefile.am 4237 2010-12-31 19:31:26Z 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,6 +31,7 @@
../unix/file.c \
osname.c \
../amiga/paths.c \
- ../unix/timer.c
+ ../unix/timer.c \
+ ../unix/tuntap.c
INCLUDES = @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 2012-02-15 12:32:32 UTC (rev 684)
+++ vendor/fuse-emulator/current/fuse/compat/unix/Makefile.am 2012-02-15 12:43:10 UTC (rev 685)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2007-2008 Philip Kendall
-## $Id: Makefile.am 3935 2009-01-07 12:55:13Z pak21 $
+## $Id: Makefile.am 4237 2010-12-31 19:31:26Z 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,6 +31,7 @@
file.c \
osname.c \
paths.c \
- timer.c
+ timer.c \
+ tuntap.c
INCLUDES = @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@
Modified: vendor/fuse-emulator/current/fuse/compat/unix/file.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/unix/file.c 2012-02-15 12:32:32 UTC (rev 684)
+++ vendor/fuse-emulator/current/fuse/compat/unix/file.c 2012-02-15 12:43:10 UTC (rev 685)
@@ -1,7 +1,7 @@
/* file.c: File-related compatibility routines
Copyright (c) 2008 Philip Kendall
- $Id: file.c 4072 2009-08-31 15:42:26Z specu $
+ $Id: file.c 4534 2011-08-11 12:59:47Z 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
@@ -90,3 +90,9 @@
{
return fclose( fd );
}
+
+int
+compat_file_exists( const char *path )
+{
+ return ( access( path, R_OK ) != -1 );
+}
Added: vendor/fuse-emulator/current/fuse/compat/unix/tuntap.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/unix/tuntap.c (rev 0)
+++ vendor/fuse-emulator/current/fuse/compat/unix/tuntap.c 2012-02-15 12:43:10 UTC (rev 685)
@@ -0,0 +1,70 @@
+/* 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 $
+
+ 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:
+
+ E-mail: phi...@sh...
+
+*/
+
+#include "config.h"
+
+#include <fcntl.h>
+#include <string.h>
+#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"
+
+int
+compat_get_tap( const char *interface_name )
+{
+ 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 {
+ struct ifreq ifr;
+ memset( &ifr, 0, sizeof( ifr ) );
+ ifr.ifr_flags = IFF_TAP | IFF_NO_PI;
+ strncpy( ifr.ifr_name, interface_name, IFNAMSIZ );
+
+ if ( ioctl( fd, TUNSETIFF, (void *) &ifr ) < 0 ) {
+ ui_error( UI_ERROR_ERROR, "couldn't select TAP interface '%s'",
+ ifr.ifr_name );
+ }
+ }
+
+#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 2012-02-15 12:32:32 UTC (rev 684)
+++ vendor/fuse-emulator/current/fuse/compat/wii/Makefile.am 2012-02-15 12:43:10 UTC (rev 685)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2007-2008 Philip Kendall
-## $Id: Makefile.am 4040 2009-06-27 09:32:42Z fredm $
+## $Id: Makefile.am 4237 2010-12-31 19:31:26Z 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,6 +31,7 @@
../unix/file.c \
osname.c \
paths.c \
- timer.c
+ timer.c \
+ ../unix/tuntap.c
INCLUDES = @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 2012-02-15 12:32:32 UTC (rev 684)
+++ vendor/fuse-emulator/current/fuse/compat/win32/Makefile.am 2012-02-15 12:43:10 UTC (rev 685)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2007-2008 Philip Kendall
-## $Id: Makefile.am 3935 2009-01-07 12:55:13Z pak21 $
+## $Id: Makefile.am 4237 2010-12-31 19:31:26Z 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,6 +31,7 @@
../unix/file.c \
osname.c \
paths.c \
- timer.c
+ timer.c \
+ ../unix/tuntap.c
INCLUDES = @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@
Modified: vendor/fuse-emulator/current/fuse/compat/win32/timer.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/win32/timer.c 2012-02-15 12:32:32 UTC (rev 684)
+++ vendor/fuse-emulator/current/fuse/compat/win32/timer.c 2012-02-15 12:43:10 UTC (rev 685)
@@ -1,7 +1,7 @@
/* timer.c: Win32 speed routines for Fuse
Copyright (c) 1999-2008 Philip Kendall, Marek Januszewski, Fredrick Meunier
- $Id: timer.c 3951 2009-01-12 18:09:42Z specu $
+ $Id: timer.c 4365 2011-04-14 00:38:54Z 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
Modified: vendor/fuse-emulator/current/fuse/compat.h
===================================================================
--- vendor/fuse-emulator/current/fuse/compat.h 2012-02-15 12:32:32 UTC (rev 684)
+++ vendor/fuse-emulator/current/fuse/compat.h 2012-02-15 12:43:10 UTC (rev 685)
@@ -1,7 +1,7 @@
/* compat.h: various compatibility bits
Copyright (c) 2003-2008 Philip Kendall
- $Id: compat.h 4068 2009-08-30 19:30:19Z specu $
+ $Id: compat.h 4534 2011-08-11 12:59:47Z 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
@@ -96,6 +96,7 @@
int compat_file_write( compat_fd fd, const unsigned char *buffer,
size_t length );
int compat_file_close( compat_fd fd );
+int compat_file_exists( const char *path );
/* Directory handling */
@@ -115,4 +116,8 @@
double compat_timer_get_time( void );
void compat_timer_sleep( int ms );
+/* TUN/TAP handling */
+
+int compat_get_tap( const char *interface_name );
+
#endif /* #ifndef FUSE_COMPAT_H */
Modified: vendor/fuse-emulator/current/fuse/configure.in
===================================================================
--- vendor/fuse-emulator/current/fuse/configure.in 2012-02-15 12:32:32 UTC (rev 684)
+++ vendor/fuse-emulator/current/fuse/configure.in 2012-02-15 12:43:10 UTC (rev 685)
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-dnl $Id: configure.in 4329 2011-03-27 22:26:07Z pak21 $
+dnl $Id: configure.in 4617 2012-01-03 11:47:27Z fredm $
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@
AM_CONFIG_HEADER(config.h)
AC_CANONICAL_SYSTEM
-define(FUSE_VERSION, [1.0.0.1a])
+define(FUSE_VERSION, [1.0.0])
dnl Use automake to produce `Makefile.in'
AM_INIT_AUTOMAKE(fuse, FUSE_VERSION)
@@ -38,18 +38,27 @@
AC_PROG_LIBTOOL
dnl Check for Win32 resource tool
-AC_CHECK_TOOL(WINDRES, windres, no)
-AC_SUBST(WINDRES)
-if test "$WINDRES" != no; then
- WINDRES_OBJ="windres.o"
- define(FUSE_FULL_VERSION,
- [ifelse(translit(FUSE_VERSION, [0-9]), [.], [FUSE_VERSION[.0.0]],
- translit(FUSE_VERSION, [0-9]), [..], [FUSE_VERSION[.0]],
- [FUSE_VERSION])])dnl
- AC_DEFINE([VERSION_WIN32], [translit(FUSE_FULL_VERSION, [.], [,])], [Define version information for win32 executable])
+AC_MSG_CHECKING(whether to use windres)
+AC_ARG_WITH(windres,
+[ --without-windres don't use windres],
+if test "$withval" = no; then windres=no; else windres=yes; fi,
+windres=yes)
+AC_MSG_RESULT($windres)
+if test "$windres" = yes; then
+ AC_CHECK_TOOL(WINDRES, windres, no)
+ AC_SUBST(WINDRES)
+ if test "$WINDRES" != no; then
+ WINDRES_OBJ="windres.o"
+ define(FUSE_FULL_VERSION,
+ [ifelse(translit(FUSE_VERSION, [0-9]), [.], [FUSE_VERSION[.0.0]],
+ translit(FUSE_VERSION, [0-9]), [..], [FUSE_VERSION[.0]],
+ [FUSE_VERSION])])dnl
+ AC_DEFINE([VERSION_WIN32], [translit(FUSE_FULL_VERSION, [.], [,])], [Define version information for win32 executable])
+ FUSE_FULL[]_VERSION=FUSE_FULL_VERSION
+ AC_SUBST(FUSE_FULL[]_VERSION)
+ fi
fi
AC_SUBST(WINDRES_OBJ)
-AM_SUBST_NOTMAKE(WINDRES_OBJ)
dnl Generate commandy.h
YFLAGS="$YFLAGS -d"
@@ -66,7 +75,8 @@
strings.h \
sys/soundcard.h \
sys/audio.h \
- sys/audioio.h
+ sys/audioio.h \
+ zlib.h
)
dnl Checks for typedefs, structures, and compiler characteristics.
@@ -217,9 +227,9 @@
gtk=yes)
AC_MSG_RESULT($gtk)
if test "$gtk" = yes; then
- AM_PATH_GTK_2_0(2.0.0,
+ AM_PATH_GTK_2_0(2.18.0,
AC_DEFINE([UI_GTK], 1,
- [Defined if GTK+ UI (either 1.2 or 2.x) is in use])
+ [Defined if GTK+ UI 2.x is in use])
AC_DEFINE([HAVE_LIB_GLIB], 1, [Defined if we've got glib])
UI=gtk; UI_LIBS="ui/gtk/libuigtk.la",
AC_MSG_WARN([GTK+ not found. Reverting to Xlib]))
@@ -283,21 +293,12 @@
glib=yes)
AC_MSG_RESULT($glib)
if test "$glib" = yes; then
- glib2=no
AM_PATH_GLIB_2_0(
- 2.0.0,
- glib2=yes
+ 2.20.0,
AC_DEFINE([HAVE_LIB_GLIB], 1, [Defined if we've got glib])
LIBS="$LIBS `pkg-config --libs glib-2.0`",
+ AC_MSG_WARN(glib not found - using libspectrum's replacement)
)
- if test "$glib2" = no; then
- AM_PATH_GLIB(
- 1.2.0,
- AC_DEFINE([HAVE_LIB_GLIB], 1, [Defined if we've got glib])
- LIBS="$LIBS `glib-config --libs`",
- AC_MSG_WARN(glib not found - using libspectrum's replacement)
- )
- fi
fi
fi
@@ -367,33 +368,35 @@
if test -n "$LIBPNG_CONFIG"; then
PNG_CFLAGS=`libpng-config --cflags`
PNG_LIBS=`libpng-config --ldflags`
- PNG_LIBS=`echo " $PNG_LIBS" | sed 's/ -l[[^ ]][[^ ]]*//g'`
+ AC_DEFINE([USE_LIBPNG], 1, [Defined if we're going to be using the installed libpng])
+ else
+ ac_save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $PNG_CFLAGS"
+ ac_save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$PNG_LIBS $LDFLAGS"
+
+ AC_CHECK_LIB( png, png_write_png,
+ [AC_CHECK_HEADER(
+ png.h,
+ [AC_DEFINE([USE_LIBPNG], 1, [Defined if we're going to be using the installed libpng]) PNG_LIBS='-lpng -lm -lz'],
+ [AC_CHECK_HEADERS(libpng/png.h,
+ [CPPFLAGS="$ac_save_CPPFLAGS $PNG_CFLAGS/libpng"
+ AC_DEFINE([USE_LIBPNG], 1, [Defined if we're going to be using the installed libpng]) PNG_LIBS='-lpng -lm -lz'],
+ [AC_MSG_WARN(png.h not found - saving screenshots disabled)
+ PNG_LIBS='']
+ )],
+ )],
+ [AC_MSG_WARN(png_write_png not found - saving screenshots disabled)
+ PNG_LIBS='']
+ )
+
+ CPPFLAGS="$ac_save_CPPFLAGS"
+ LDFLAGS="$ac_save_LDFLAGS"
fi
- ac_save_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $PNG_CFLAGS"
- ac_save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$PNG_LIBS $LDFLAGS"
-
- AC_CHECK_LIB( png, png_write_png,
- [AC_CHECK_HEADER(
- png.h,
- [AC_DEFINE([USE_LIBPNG], 1, [Defined if we're going to be using the installed libpng]) PNG_LIBS='-lpng -lm -lz'],
- [AC_CHECK_HEADERS(libpng/png.h,
- [CPPFLAGS="$ac_save_CPPFLAGS $PNG_CFLAGS/libpng"
- AC_DEFINE([USE_LIBPNG], 1, [Defined if we're going to be using the installed libpng]) PNG_LIBS='-lpng -lm -lz'],
- [AC_MSG_WARN(png.h not found - saving screenshots disabled)
- PNG_LIBS='']
- )],
- )],
- [AC_MSG_WARN(png_write_png not found - saving screenshots disabled)
- PNG_LIBS='']
- )
AC_SUBST(PNG_LIBS)
fi
-LDFLAGS="$ac_save_LDFLAGS"
-
dnl Check if a version of libasound which supplies pcm is available
AC_MSG_CHECKING(whether ALSA requested)
AC_ARG_WITH(alsa,
@@ -535,16 +538,40 @@
dnl Libraries such as svgalib provide their own joystick code.
AC_MSG_CHECKING([whether to use $UI's joystick support])
AC_ARG_ENABLE(ui-joystick,
- [ --enable-ui-joystick use UI-specific joystick code (where supported)],
+ AS_HELP_STRING([--disable-ui-joystick], [use libjsw joystick code (where supported)]),
if test "$enableval" = no; then libjsw=yes; else libjsw=no; fi,
libjsw=no)
if test "$libjsw" = yes; then
- AC_MSG_RESULT([no, use libjsw])
+ AC_MSG_RESULT([no, use libjsw])
else
- AC_MSG_RESULT(yes)
- AC_DEFINE([USE_JOYSTICK], 1, [Defined if we're using hardware joysticks])
+ AC_MSG_RESULT(yes)
+ AC_DEFINE([USE_JOYSTICK], 1, [Defined if we're using hardware joysticks])
fi
;;
+ gtk|xlib)
+ dnl These UIs could use SDL library for handling joysticks
+ AC_MSG_CHECKING([whether to use $UI's joystick support])
+ AC_ARG_ENABLE(ui-joystick,
+ AS_HELP_STRING([--disable-ui-joystick], [use libjsw joystick code (where supported)]),
+ if test "$enableval" = no; then libjsw=yes; else libjsw=no; fi,
+ libjsw=no)
+ if test "$libjsw" = yes; then
+ AC_MSG_RESULT([no, use libjsw])
+ else
+ AC_MSG_RESULT(yes)
+ SDL_VERSION=1.2.4
+ AM_PATH_SDL($SDL_VERSION,
+ LIBS="$LIBS `sdl-config --libs`"
+ CPPFLAGS="$CPPFLAGS `sdl-config --cflags`"
+ AC_DEFINE([USE_JOYSTICK], 1, [Defined if we're using hardware joysticks]),
+ AC_MSG_WARN([SDL version $SDL_VERSION not found - joystick support disabled]))
+ fi
+ ;;
+ wii)
+ dnl Wii UI check this elsewhere
+ AC_MSG_RESULT(yes)
+ libjsw=no
+ ;;
*)
dnl Our only option is libjsw.
libjsw=yes
@@ -584,6 +611,24 @@
fi
AC_SUBST(TIMER_LIBADD)
+dnl See if Linux TAP devices are supported
+AC_MSG_CHECKING(whether Linux TAP devices are supported)
+ac_save_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $LIBSPEC_CFLAGS"
+AC_TRY_COMPILE([
+ #include <linux/if_tun.h>
+ #include <net/if.h>
+ #include <sys/ioctl.h>
+ ],[
+ int test1 = IFF_TAP | IFF_NO_PI;
+ int test2 = TUNSETIFF;
+ ],
+ AC_DEFINE([LINUX_TAP], 1, [Define to 1 if Linux TAP devices are supported.])
+ AC_MSG_RESULT(yes),
+ AC_MSG_RESULT(no))
+
+CPPFLAGS="$ac_save_CPPFLAGS"
+
dnl Work out which standard routines we're missing
AC_MSG_CHECKING(which standard routines we're missing)
missing_routines=''
@@ -679,12 +724,14 @@
compat/wii/Makefile \
compat/win32/Makefile \
debugger/Makefile \
-disk/Makefile \
hacking/Makefile \
-ide/Makefile \
lib/Makefile \
machines/Makefile \
man/Makefile \
+peripherals/Makefile \
+peripherals/disk/Makefile \
+peripherals/ide/Makefile \
+peripherals/nic/Makefile \
perl/Makefile \
perl/Fuse/Makefile \
pokefinder/Makefile \
@@ -699,6 +746,7 @@
ui/sdl/Makefile \
ui/scaler/Makefile \
ui/widget/Makefile \
+ui/win32/fuse.manifest \
ui/win32/Makefile \
ui/win32/icons/Makefile \
ui/win32/installer/Makefile \
Modified: vendor/fuse-emulator/current/fuse/debugger/breakpoint.c
===================================================================
--- vendor/fuse-emulator/current/fuse/debugger/breakpoint.c 2012-02-15 12:32:32 UTC (rev 684)
+++ vendor/fuse-emulator/current/fuse/debugger/breakpoint.c 2012-02-15 12:43:10 UTC (rev 685)
@@ -1,7 +1,7 @@
/* breakpoint.c: a debugger breakpoint
- Copyright (c) 2002-2008 Philip Kendall
+ Copyright (c) 2002-2011 Philip Kendall
- $Id: breakpoint.c 4239 2011-01-01 15:41:13Z pak21 $
+ $Id: breakpoint.c 4415 2011-05-01 22:51:43Z 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
@@ -79,9 +79,9 @@
/* Add a breakpoint */
int
-debugger_breakpoint_add_address( debugger_breakpoint_type type, int page,
- libspectrum_word offset, size_t ignore,
- debugger_breakpoint_life life,
+debugger_breakpoint_add_address( debugger_breakpoint_type type, int source,
+ int page, libspectrum_word offset,
+ size_t ignore, debugger_breakpoint_life life,
debugger_expression *condition )
{
debugger_breakpoint_value value;
@@ -98,6 +98,7 @@
fuse_abort();
}
+ value.address.source = source;
value.address.page = page;
value.address.offset = offset;
@@ -270,87 +271,30 @@
return ( debugger_mode == DEBUGGER_MODE_HALTED );
}
-static int
-encode_bank_and_page( debugger_breakpoint_type type, libspectrum_word address )
+static memory_page*
+get_page( debugger_breakpoint_type type, libspectrum_word address )
{
- memory_page *read_write, *page;
- breakpoint_page_offset offset;
+ memory_page *page;
switch( type ) {
case DEBUGGER_BREAKPOINT_TYPE_EXECUTE:
case DEBUGGER_BREAKPOINT_TYPE_READ:
- read_write = memory_map_read;
+ page = memory_map_read;
break;
case DEBUGGER_BREAKPOINT_TYPE_WRITE:
- read_write = memory_map_write;
+ page = memory_map_write;
break;
default:
ui_error( UI_ERROR_ERROR,
- "encode_bank_and_page: unexpected breakpoint type %d", type );
- return -1;
- }
-
- page = &read_write[ address >> 13 ];
-
- switch( page->bank ) {
- case MEMORY_BANK_HOME:
- offset = page->writable ? BREAKPOINT_PAGE_RAM : BREAKPOINT_PAGE_ROM;
- break;
- case MEMORY_BANK_DOCK: offset = BREAKPOINT_PAGE_DOCK; break;
- case MEMORY_BANK_EXROM: offset = BREAKPOINT_PAGE_EXROM; break;
- case MEMORY_BANK_ROMCS: offset = BREAKPOINT_PAGE_ROMCS; break;
- default: return -1;
- }
-
- return offset + page->page_num;
-}
-
-int
-debugger_page_hash( const char *text )
-{
- int offset;
-
- switch( tolower( (unsigned char)text[0] ) ) {
-
- case 'c': offset = BREAKPOINT_PAGE_ROMCS; break;
- case 'd': offset = BREAKPOINT_PAGE_DOCK; break;
- case 'r': offset = BREAKPOINT_PAGE_ROM; break;
- case 'x': offset = BREAKPOINT_PAGE_EXROM; break;
-
- default:
- ui_error( UI_ERROR_ERROR,
- "%s:debugger_page_hash: unknown page letter '%c'", __FILE__,
- text[0] );
+ "%s:get_page: unexpected breakpoint type %d", __FILE__, type );
fuse_abort();
}
- offset += atoi( &text[1] );
-
- return offset;
+ return page;
}
-char*
-debugger_breakpoint_decode_page( char *buffer, size_t n, int page )
-{
- if( page >= BREAKPOINT_PAGE_ROMCS ) {
- snprintf( buffer, n, "C%d", page - BREAKPOINT_PAGE_ROMCS );
- } else if( page >= BREAKPOINT_PAGE_EXROM ) {
- snprintf( buffer, n, "X%d", page - BREAKPOINT_PAGE_EXROM );
- } else if( page >= BREAKPOINT_PAGE_DOCK ) {
- snprintf( buffer, n, "D%d", page - BREAKPOINT_PAGE_DOCK );
- } else if( page >= BREAKPOINT_PAGE_ROM ) {
- snprintf( buffer, n, "R%d", page - BREAKPOINT_PAGE_ROM );
- } else if( page >= BREAKPOINT_PAGE_RAM ) {
- snprintf( buffer, n, "%d", page - BREAKPOINT_PAGE_RAM );
- } else {
- snprintf( buffer, n, "[Unknown page %d]", page );
- }
-
- return buffer;
-}
-
int
debugger_breakpoint_trigger( debugger_breakpoint *bp )
{
@@ -371,8 +315,6 @@
breakpoint_check( debugger_breakpoint *bp, debugger_breakpoint_type type,
libspectrum_dword value )
{
- int page;
-
if( bp->type != type ) return 0;
switch( type ) {
@@ -381,15 +323,15 @@
case DEBUGGER_BREAKPOINT_TYPE_READ:
case DEBUGGER_BREAKPOINT_TYPE_WRITE:
- page = bp->value.address.page;
-
- /* If page == -1, value must match exactly; otherwise, the page and
- the offset must match */
- if( page == -1 ) {
+ /* If source == memory_source_any, value must match exactly; otherwise,
+ the source, page and offset must match */
+ if( bp->value.address.source == memory_source_any ) {
if( bp->value.address.offset != value ) return 0;
} else {
- if( page != encode_bank_and_page( type, value ) ) return 0;
- if( bp->value.address.offset != ( value & 0x3fff ) ) return 0;
+ memory_page *page = get_page( type, value );
+ if( bp->value.address.source != page->source ||
+ bp->value.address.page != page->page_num ||
+ bp->value.address.offset != ( value & 0x3fff ) ) return 0;
}
break;
@@ -536,7 +478,7 @@
return 1;
/* Ignore all page-specific breakpoints */
- if( bp->value.address.page != -1 ) return 1;
+ if( bp->value.address.source != memory_source_any ) return 1;
return bp->value.address.offset - address;
}
Modified: vendor/fuse-emulator/current/fuse/debugger/breakpoint.h
===================================================================
--- vendor/fuse-emulator/current/fuse/debugger/breakpoint.h 2012-02-15 12:32:32 UTC (rev 684)
+++ vendor/fuse-emulator/current/fuse/debugger/breakpoint.h 2012-02-15 12:43:10 UTC (rev 685)
@@ -1,7 +1,7 @@
/* breakpoint.h: a debugger breakpoint
- Copyright (c) 2002-2008 Philip Kendall
+ Copyright (c) 2002-2011 Philip Kendall
- $Id: breakpoint.h 3662 2008-06-09 11:19:29Z pak21 $
+ $Id: breakpoint.h 4415 2011-05-01 22:51:43Z 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,6 +26,8 @@
#ifndef FUSE_DEBUGGER_BREAKPOINT_H
#define FUSE_DEBUGGER_BREAKPOINT_H
+#include "memory.h"
+
/* Types of breakpoint */
typedef enum debugger_breakpoint_type {
DEBUGGER_BREAKPOINT_TYPE_EXECUTE,
@@ -51,20 +53,20 @@
typedef struct debugger_breakpoint_address {
+ /* Which memory device we are interested in. memory_source_any for an
+ absolute address */
+ int source;
+
+ /* The page number from the source we are interested in. Not used for
+ MEMORY_SOURCE_ANY */
int page;
+
+ /* The offset within the page, or the absolute address for
+ MEMORY_SOURCE_ANY */
libspectrum_word offset;
} debugger_breakpoint_address;
-/* Offsets used to encode various bank types in the above 'page' variable */
-typedef enum breakpoint_page_offset {
- BREAKPOINT_PAGE_RAM = 0,
- BREAKPOINT_PAGE_ROM = 32,
- BREAKPOINT_PAGE_DOCK = 40,
- BREAKPOINT_PAGE_EXROM = 48,
- BREAKPOINT_PAGE_ROMCS = 56,
-} breakpoint_page_offset;
-
typedef struct debugger_breakpoint_port {
libspectrum_word port;
@@ -117,7 +119,7 @@
/* Add a new breakpoint */
int
debugger_breakpoint_add_address(
- debugger_breakpoint_type type, int page, libspectrum_word offset,
+ debugger_breakpoint_type type, int source, int page, libspectrum_word offset,
size_t ignore, debugger_breakpoint_life life, debugger_expression *condition
);
@@ -143,7 +145,4 @@
during this frame */
int debugger_add_time_events( void );
-char*
-debugger_breakpoint_decode_page( char *buffer, size_t n, int page );
-
#endif /* #ifndef FUSE_DEBUGGER_BREAKPOINT_H */
Modified: vendor/fuse-emulator/current/fuse/debugger/commandl.l
===================================================================
--- vendor/fuse-emulator/current/fuse/debugger/commandl.l 2012-02-15 12:32:32 UTC (rev 684)
+++ vendor/fuse-emulator/current/fuse/debugger/commandl.l 2012-02-15 12:43:10 UTC (rev 685)
@@ -1,7 +1,7 @@
/* commandl.l: Debugger command lexical scanner
Copyright (c) 2002-2008 Philip Kendall
- $Id: commandl.l 4130 2010-05-18 12:06:19Z fredm $
+ $Id: commandl.l 4415 2011-05-01 22:51:43Z 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
@@ -139,8 +139,6 @@
if( YY_START == COMMANDSTATE1 ) BEGIN( COMMANDSTATE2 );
return NUMBER; }
-[cdrx][[:digit:]]+ { yylval.integer = debugger_page_hash( yytext ); return PAGE; }
-
{ID} { yylval.string = mempool_strdup( debugger_memory_pool, yytext ); return STRING; }
${ID} { yylval.string = mempool_strdup( debugger_memory_pool, yytext + 1 ); return VARIABLE; }
Modified: vendor/fuse-emulator/current/fuse/debugger/commandy.y
===================================================================
--- vendor/fuse-emulator/current/fuse/debugger/commandy.y 2012-02-15 12:32:32 UTC (rev 684)
+++ vendor/fuse-emulator/current/fuse/debugger/commandy.y 2012-02-15 12:43:10 UTC (rev 685)
@@ -1,7 +1,7 @@
/* commandy.y: Parse a debugger command
- Copyright (c) 2002-2008 Philip Kendall
+ Copyright (c) 2002-2011 Philip Kendall
- $Id: commandy.y 3657 2008-06-08 15:04:37Z pak21 $
+ $Id: commandy.y 4415 2011-05-01 22:51:43Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -53,7 +53,8 @@
debugger_breakpoint_type bptype;
debugger_breakpoint_life bplife;
- struct { int value1; libspectrum_word value2; } pair;
+ struct { libspectrum_word mask, value; } port;
+ struct { int source; int page; int offset; } location;
debugger_expression* exp;
@@ -97,7 +98,6 @@
%token TIME
%token WRITE
-%token <integer> PAGE
%token <reg> DEBUGGER_REGISTER
%token <integer> NUMBER
@@ -111,8 +111,8 @@
%type <bplife> breakpointlife
%type <bptype> breakpointtype
-%type <integer> pageornumber
-%type <pair> breakpointpair
+%type <port> breakpointport
+%type <location> breakpointlocation
%type <bptype> portbreakpointtype
%type <integer> numberorpc
%type <integer> number
@@ -151,15 +151,14 @@
;
command: BASE number { debugger_output_base = $2; }
- | breakpointlife breakpointtype breakpointpair optionalcondition {
- debugger_breakpoint_add_address( $2, $3.value1, $3.value2, 0, $1,
- $4 );
+ | breakpointlife breakpointtype breakpointlocation optionalcondition {
+ debugger_breakpoint_add_address( $2, $3.source, $3.page, $3.offset,
+ 0, $1, $4 );
}
- | breakpointlife PORT portbreakpointtype breakpointpair optionalcondition {
- int mask; libspectrum_word port;
- mask = $4.value1; port = $4.value2;
- if( mask == -1 ) mask = ( port < 0x100 ? 0x00ff : 0xffff );
- debugger_breakpoint_add_port( $3, port, mask, 0, $1, $5 );
+ | breakpointlife PORT portbreakpointtype breakpointport optionalcondition {
+ int mask = $4.mask;
+ if( mask == 0 ) mask = ( $4.value < 0x100 ? 0x00ff : 0xffff );
+ debugger_breakpoint_add_port( $3, $4.value, mask, 0, $1, $5 );
}
| breakpointlife TIME number optionalcondition {
debugger_breakpoint_add_time( DEBUGGER_BREAKPOINT_TYPE_TIME,
@@ -201,12 +200,22 @@
| WRITE { $$ = DEBUGGER_BREAKPOINT_TYPE_WRITE; }
;
-breakpointpair: numberorpc { $$.value1 = -1; $$.value2 = $1; }
- | pageornumber ':' number { $$.value1 = $1; $$.value2 = $3; }
+breakpointport: number { $$.mask = 0; $$.value = $1; }
+ | number ':' number { $$.mask = $1; $$.value = $3; }
;
-pageornumber: PAGE { $$ = $1; }
- | number { $$ = $1; }
+breakpointlocation: numberorpc { $$.source = memory_source_any; $$.offset = $1; }
+ | STRING ':' number ':' number {
+ $$.source = memory_source_find( $1 );
+ if( $$.source == -1 ) {
+ char buffer[80];
+ snprintf( buffer, 80, "unknown memory source \"%s\"", $1 );
+ yyerror( buffer );
+ YYERROR;
+ }
+ $$.page = $3;
+ $$.offset = $5;
+ }
portbreakpointtype: READ { $$ = DEBUGGER_BREAKPOINT_TYPE_PORT_READ; }
| WRITE { $$ = DEBUGGER_BREAKPOINT_TYPE_PORT_WRITE; }
Modified: vendor/fuse-emulator/current/fuse/debugger/debugger.c
===================================================================
--- vendor/fuse-emulator/current/fuse/debugger/debugger.c 2012-02-15 12:32:32 UTC (rev 684)
+++ vendor/fuse-emulator/current/fuse/debugger/debugger.c 2012-02-15 12:43:10 UTC (rev 685)
@@ -1,7 +1,7 @@
/* debugger.c: Fuse's monitor/debugger
- Copyright (c) 2002-2008 Philip Kendall
+ Copyright (c) 2002-2011 Philip Kendall
- $Id: debugger.c 3686 2008-06-21 14:33:22Z pak21 $
+ $Id: debugger.c 4540 2011-09-05 12:31:18Z 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
@@ -87,6 +87,8 @@
debugger_end( void )
{
debugger_breakpoint_remove_all();
+ debugger_event_end();
+
return 0;
}
@@ -116,9 +118,10 @@
debugger_disassemble( NULL, 0, &length, PC );
/* And add a breakpoint after that */
- debugger_breakpoint_add_address( DEBUGGER_BREAKPOINT_TYPE_EXECUTE, -1,
- PC + length, 0,
- DEBUGGER_BREAKPOINT_LIFE_ONESHOT, NULL );
+ debugger_breakpoint_add_address(
+ DEBUGGER_BREAKPOINT_TYPE_EXECUTE, memory_source_any, 0, PC + length, 0,
+ DEBUGGER_BREAKPOINT_LIFE_ONESHOT, NULL
+ );
debugger_run();
@@ -146,7 +149,7 @@
target = readbyte_internal( SP ) + 0x100 * readbyte_internal( SP+1 );
if( debugger_breakpoint_add_address(
- DEBUGGER_BREAKPOINT_TYPE_EXECUTE, -1, target, 0,
+ DEBUGGER_BREAKPOINT_TYPE_EXECUTE, memory_source_any, 0, target, 0,
DEBUGGER_BREAKPOINT_LIFE_ONESHOT, NULL
)
)
Modified: vendor/fuse-emulator/current/fuse/debugger/debugger_internals.h
===================================================================
--- vendor/fuse-emulator/current/fuse/debugger/debugger_internals.h 2012-02-15 12:32:32 UTC (rev 684)
+++ vendor/fuse-emulator/current/fuse/debugger/debugger_internals.h 2012-02-15 12:43:10 UTC (rev 685)
@@ -1,7 +1,7 @@
/* debugger_internals.h: The internals of Fuse's monitor/debugger
- Copyright (c) 2002-2008 Philip Kendall
+ Copyright (c) 2002-2011 Philip Kendall
- $Id: debugger_internals.h 4125 2010-05-06 22:18:50Z pak21 $
+ $Id: debugger_internals.h 4540 2011-09-05 12:31:18Z 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
@@ -59,7 +59,6 @@
/* Utility functions called by the flex scanner */
int debugger_command_input( char *buf, int *result, int max_size );
-int debugger_page_hash( const char *text );
int yylex( void );
void yyerror( const char *s );
@@ -102,6 +101,7 @@
int debugger_event_init( void );
int debugger_event_is_registered( const char *type, const char *detail );
+void debugger_event_end( void );
/* Variables handling */
Modified: vendor/fuse-emulator/current/fuse/debugger/disassemble.c
===================================================================
--- vendor/fuse-emulator/current/fuse/debugger/disassemble.c 2012-02-15 12:32:32 UTC (rev 684)
+++ vendor/fuse-emulator/current/fuse/debugger/disassemble.c 2012-02-15 12:43:10 UTC (rev 685)
@@ -1,7 +1,7 @@
/* disassemble.c: Fuse's disassembler
Copyright (c) 2002-2003 Darren Salt, Philip Kendall
- $Id: disassemble.c 4087 2009-09-02 13:42:00Z fredm $
+ $Id: disassemble.c 4547 2011-09-27 11:50:15Z 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
@@ -531,7 +531,11 @@
break;
case 0x05: case 0x0d:
- snprintf( buffer, buflen, "RETN" ); *length = 1;
+ if( b == 0x4d ) {
+ snprintf( buffer, buflen, "RETI" ); *length = 1;
+ } else {
+ snprintf( buffer, buflen, "RETN" ); *length = 1;
+ }
break;
case 0x06: case 0x0e:
Modified: vendor/fuse-emulator/current/fuse/debugger/event.c
===================================================================
--- vendor/fuse-emulator/current/fuse/debugger/event.c 2012-02-15 12:32:32 UTC (rev 684)
+++ vendor/fuse-emulator/current/fuse/debugger/event.c 2012-02-15 12:43:10 UTC (rev 685)
@@ -1,7 +1,7 @@
/* event.c: Debugger events
Copyright (c) 2008 Philip Kendall
- $Id: event.c 3922 2008-12-31 19:01:31Z zubzero $
+ $Id: event.c 4540 2011-09-05 12:31:18Z 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
@@ -116,3 +116,22 @@
}
}
}
+
+/* Tidy-up function called at end of emulation */
+void
+debugger_event_end( void )
+{
+ int i;
+ debugger_event_t event;
+
+ if( !registered_events ) return;
+
+ for( i = 0; i < registered_events->len; i++ ) {
+ event = g_array_index( registered_events, debugger_event_t, i );
+ free( event.detail );
+ free( event.type );
+ }
+
+ g_array_free( registered_events, TRUE );
+ registered_events = NULL;
+}
Modified: vendor/fuse-emulator/current/fuse/display.c
===================================================================
--- vendor/fuse-emulator/current/fuse/display.c 2012-02-15 12:32:32 UTC (rev 684)
+++ vendor/fuse-emulator/current/fuse/display.c 2012-02-15 12:43:10 UTC (rev 685)
@@ -2,7 +2,7 @@
Copyright (c) 1999-2006 Philip Kendall, Thomas Harte, Witold Filipczyk
and Fredrick Meunier
- $Id: display.c 4105 2009-12-15 10:15:43Z fredm $
+ $Id: display.c 4288 2011-02-03 21:06:22Z 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
@@ -35,13 +35,13 @@
#include "event.h"
#include "fuse.h"
#include "machine.h"
+#include "peripherals/scld.h"
#include "rectangle.h"
#include "screenshot.h"
#include "settings.h"
#include "spectrum.h"
#include "ui/ui.h"
#include "ui/uidisplay.h"
-#include "scld.h"
/* Set once we have initialised the UI */
int display_ui_initialised = 0;
Modified: vendor/fuse-emulator/current/fuse/event.c
===================================================================
--- vendor/fuse-emulator/current/fuse/event.c 2012-02-15 12:32:32 UTC (rev 684)
+++ vendor/fuse-emulator/current/fuse/event.c 2012-02-15 12:43:10 UTC (rev 685)
@@ -1,7 +1,7 @@
/* event.c: Routines needed for dealing with the event list
Copyright (c) 2000-2008 Philip Kendall
- $Id: event.c 3912 2008-12-15 05:10:21Z pak21 $
+ $Id: event.c 4540 2011-09-05 12:31:18Z 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
@@ -264,9 +264,27 @@
return g_array_index( registered_events, event_descriptor_t, type ).description;
}
+void
+registered_events_free( void )
+{
+ int i;
+ event_descriptor_t descriptor;
+
+ if( !registered_events ) return;
+
+ for( i = 0; i < registered_events->len; i++ ) {
+ descriptor = g_array_index( registered_events, event_...
[truncated message content] |
|
From: <fr...@us...> - 2012-11-24 06:50:13
|
Revision: 710
http://sourceforge.net/p/fuse-for-macosx/code/710
Author: fredm
Date: 2012-11-24 06:50:08 +0000 (Sat, 24 Nov 2012)
Log Message:
-----------
Load . into vendor/fuse-emulator/current.
Modified Paths:
--------------
vendor/fuse-emulator/current/fuse/Makefile.am
vendor/fuse-emulator/current/fuse/README
vendor/fuse-emulator/current/fuse/compat/unix/Makefile.am
vendor/fuse-emulator/current/fuse/compat/unix/file.c
vendor/fuse-emulator/current/fuse/compat/win32/Makefile.am
vendor/fuse-emulator/current/fuse/compat.h
vendor/fuse-emulator/current/fuse/configure.in
vendor/fuse-emulator/current/fuse/debugger/breakpoint.c
vendor/fuse-emulator/current/fuse/debugger/command.c
vendor/fuse-emulator/current/fuse/debugger/debugger.c
vendor/fuse-emulator/current/fuse/debugger/debugger.h
vendor/fuse-emulator/current/fuse/debugger/debugger_internals.h
vendor/fuse-emulator/current/fuse/debugger/event.c
vendor/fuse-emulator/current/fuse/debugger/expression.c
vendor/fuse-emulator/current/fuse/debugger/variable.c
vendor/fuse-emulator/current/fuse/display.c
vendor/fuse-emulator/current/fuse/display.h
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/Makefile.am
vendor/fuse-emulator/current/fuse/lib/Makefile.am
vendor/fuse-emulator/current/fuse/machine.c
vendor/fuse-emulator/current/fuse/machine.h
vendor/fuse-emulator/current/fuse/machines/machines_periph.c
vendor/fuse-emulator/current/fuse/machines/pentagon.c
vendor/fuse-emulator/current/fuse/machines/pentagon1024.c
vendor/fuse-emulator/current/fuse/machines/pentagon512.c
vendor/fuse-emulator/current/fuse/machines/scorpion.c
vendor/fuse-emulator/current/fuse/machines/spec128.c
vendor/fuse-emulator/current/fuse/machines/spec16.c
vendor/fuse-emulator/current/fuse/machines/spec48.c
vendor/fuse-emulator/current/fuse/machines/spec48_ntsc.c
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/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.c
vendor/fuse-emulator/current/fuse/memory.h
vendor/fuse-emulator/current/fuse/mempool.c
vendor/fuse-emulator/current/fuse/mempool.h
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/Makefile.am
vendor/fuse-emulator/current/fuse/peripherals/ay.c
vendor/fuse-emulator/current/fuse/peripherals/ay.h
vendor/fuse-emulator/current/fuse/peripherals/dck.c
vendor/fuse-emulator/current/fuse/peripherals/disk/beta.c
vendor/fuse-emulator/current/fuse/peripherals/disk/beta.h
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/fdd.c
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/opus.h
vendor/fuse-emulator/current/fuse/peripherals/disk/plusd.c
vendor/fuse-emulator/current/fuse/peripherals/disk/plusd.h
vendor/fuse-emulator/current/fuse/peripherals/disk/upd_fdc.c
vendor/fuse-emulator/current/fuse/peripherals/disk/upd_fdc.h
vendor/fuse-emulator/current/fuse/peripherals/disk/wd_fdc.c
vendor/fuse-emulator/current/fuse/peripherals/disk/wd_fdc.h
vendor/fuse-emulator/current/fuse/peripherals/fuller.c
vendor/fuse-emulator/current/fuse/peripherals/fuller.h
vendor/fuse-emulator/current/fuse/peripherals/ide/divide.c
vendor/fuse-emulator/current/fuse/peripherals/ide/divide.h
vendor/fuse-emulator/current/fuse/peripherals/ide/ide.c
vendor/fuse-emulator/current/fuse/peripherals/ide/ide.h
vendor/fuse-emulator/current/fuse/peripherals/ide/simpleide.c
vendor/fuse-emulator/current/fuse/peripherals/ide/simpleide.h
vendor/fuse-emulator/current/fuse/peripherals/ide/zxatasp.c
vendor/fuse-emulator/current/fuse/peripherals/ide/zxatasp.h
vendor/fuse-emulator/current/fuse/peripherals/ide/zxcf.c
vendor/fuse-emulator/current/fuse/peripherals/ide/zxcf.h
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/kempmouse.h
vendor/fuse-emulator/current/fuse/peripherals/melodik.c
vendor/fuse-emulator/current/fuse/peripherals/melodik.h
vendor/fuse-emulator/current/fuse/peripherals/nic/Makefile.am
vendor/fuse-emulator/current/fuse/peripherals/printer.c
vendor/fuse-emulator/current/fuse/peripherals/printer.h
vendor/fuse-emulator/current/fuse/peripherals/scld.c
vendor/fuse-emulator/current/fuse/peripherals/scld.h
vendor/fuse-emulator/current/fuse/peripherals/speccyboot.c
vendor/fuse-emulator/current/fuse/peripherals/speccyboot.h
vendor/fuse-emulator/current/fuse/peripherals/specdrum.c
vendor/fuse-emulator/current/fuse/peripherals/specdrum.h
vendor/fuse-emulator/current/fuse/peripherals/ula.c
vendor/fuse-emulator/current/fuse/peripherals/ula.h
vendor/fuse-emulator/current/fuse/pokefinder/pokefinder.c
vendor/fuse-emulator/current/fuse/pokefinder/pokefinder.h
vendor/fuse-emulator/current/fuse/pokefinder/pokemem.c
vendor/fuse-emulator/current/fuse/profile.c
vendor/fuse-emulator/current/fuse/profile.h
vendor/fuse-emulator/current/fuse/psg.c
vendor/fuse-emulator/current/fuse/psg.h
vendor/fuse-emulator/current/fuse/rzx.c
vendor/fuse-emulator/current/fuse/rzx.h
vendor/fuse-emulator/current/fuse/screenshot.c
vendor/fuse-emulator/current/fuse/screenshot.h
vendor/fuse-emulator/current/fuse/settings-header.pl
vendor/fuse-emulator/current/fuse/settings.dat
vendor/fuse-emulator/current/fuse/settings.pl
vendor/fuse-emulator/current/fuse/slt.c
vendor/fuse-emulator/current/fuse/slt.h
vendor/fuse-emulator/current/fuse/snapshot.c
vendor/fuse-emulator/current/fuse/sound/aosound.c
vendor/fuse-emulator/current/fuse/sound/coreaudiosound.c
vendor/fuse-emulator/current/fuse/sound/sdlsound.c
vendor/fuse-emulator/current/fuse/sound.c
vendor/fuse-emulator/current/fuse/sound.h
vendor/fuse-emulator/current/fuse/spectrum.c
vendor/fuse-emulator/current/fuse/spectrum.h
vendor/fuse-emulator/current/fuse/tape.c
vendor/fuse-emulator/current/fuse/tape.h
vendor/fuse-emulator/current/fuse/timer/timer.c
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/gtkdisplay.c
vendor/fuse-emulator/current/fuse/ui/gtk/gtkinternals.h
vendor/fuse-emulator/current/fuse/ui/gtk/gtkjoystick.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.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/pokemem.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/stock.c
vendor/fuse-emulator/current/fuse/ui/options.dat
vendor/fuse-emulator/current/fuse/ui/scaler/scaler.c
vendor/fuse-emulator/current/fuse/ui/scaler/scalers.c
vendor/fuse-emulator/current/fuse/ui/ui.h
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/widget/pokefinder.c
vendor/fuse-emulator/current/fuse/ui/widget/pokemem.c
vendor/fuse-emulator/current/fuse/ui/widget/roms.c
vendor/fuse-emulator/current/fuse/ui/widget/widget.c
vendor/fuse-emulator/current/fuse/ui/widget/widget.h
vendor/fuse-emulator/current/fuse/ui/win32/binary.c
vendor/fuse-emulator/current/fuse/ui/win32/debugger.c
vendor/fuse-emulator/current/fuse/ui/win32/debugger.rc
vendor/fuse-emulator/current/fuse/ui/win32/fileselector.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/options.pl
vendor/fuse-emulator/current/fuse/ui/win32/picture.c
vendor/fuse-emulator/current/fuse/ui/win32/pokefinder.c
vendor/fuse-emulator/current/fuse/ui/win32/roms.c
vendor/fuse-emulator/current/fuse/ui/win32/win32internals.h
vendor/fuse-emulator/current/fuse/ui/win32/win32ui.c
vendor/fuse-emulator/current/fuse/ui/xlib/xdisplay.c
vendor/fuse-emulator/current/fuse/ui/xlib/xui.c
vendor/fuse-emulator/current/fuse/ui.c
vendor/fuse-emulator/current/fuse/unittests/unittests.c
vendor/fuse-emulator/current/fuse/unittests/unittests.h
vendor/fuse-emulator/current/fuse/utils.c
vendor/fuse-emulator/current/fuse/utils.h
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_checks.h
vendor/fuse-emulator/current/fuse/z80/z80_macros.h
vendor/fuse-emulator/current/fuse/z80/z80_ops.c
vendor/fuse-emulator/current/fuse-utils/Makefile.am
vendor/fuse-emulator/current/fuse-utils/configure.in
vendor/fuse-emulator/current/fuse-utils/hacking/ChangeLog
vendor/fuse-emulator/current/fuse-utils/man/Makefile.am
vendor/fuse-emulator/current/fuse-utils/rzxtool.c
vendor/fuse-emulator/current/fuse-utils/scl2trd.c
vendor/fuse-emulator/current/fuse-utils/snap2tzx.c
vendor/fuse-emulator/current/libspectrum/accessor.pl
vendor/fuse-emulator/current/libspectrum/csw.c
vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog
vendor/fuse-emulator/current/libspectrum/make-perl.c
vendor/fuse-emulator/current/libspectrum/snap_accessors.txt
vendor/fuse-emulator/current/libspectrum/snapshot.c
vendor/fuse-emulator/current/libspectrum/szx.c
Added Paths:
-----------
vendor/fuse-emulator/current/fuse/compat/unix/socket.c
vendor/fuse-emulator/current/fuse/compat/win32/socket.c
vendor/fuse-emulator/current/fuse/data/
vendor/fuse-emulator/current/fuse/data/Makefile.am
vendor/fuse-emulator/current/fuse/data/fuse.desktop.in
vendor/fuse-emulator/current/fuse/data/fuse.xml.in
vendor/fuse-emulator/current/fuse/data/icons/
vendor/fuse-emulator/current/fuse/data/icons/128x128/
vendor/fuse-emulator/current/fuse/data/icons/128x128/application-x-spectrum.png
vendor/fuse-emulator/current/fuse/data/icons/128x128/fuse.png
vendor/fuse-emulator/current/fuse/data/icons/16x16/
vendor/fuse-emulator/current/fuse/data/icons/16x16/application-x-spectrum.png
vendor/fuse-emulator/current/fuse/data/icons/16x16/fuse.png
vendor/fuse-emulator/current/fuse/data/icons/256x256/
vendor/fuse-emulator/current/fuse/data/icons/256x256/application-x-spectrum.png
vendor/fuse-emulator/current/fuse/data/icons/256x256/fuse.png
vendor/fuse-emulator/current/fuse/data/icons/32x32/
vendor/fuse-emulator/current/fuse/data/icons/32x32/application-x-spectrum.png
vendor/fuse-emulator/current/fuse/data/icons/32x32/fuse.png
vendor/fuse-emulator/current/fuse/data/icons/48x48/
vendor/fuse-emulator/current/fuse/data/icons/48x48/application-x-spectrum.png
vendor/fuse-emulator/current/fuse/data/icons/48x48/fuse.png
vendor/fuse-emulator/current/fuse/data/icons/64x64/
vendor/fuse-emulator/current/fuse/data/icons/64x64/application-x-spectrum.png
vendor/fuse-emulator/current/fuse/data/icons/64x64/fuse.png
vendor/fuse-emulator/current/fuse/hacking/peripheral_tests.txt
vendor/fuse-emulator/current/fuse/hacking/spectranet.txt
vendor/fuse-emulator/current/fuse/hacking/valgrind.supp
vendor/fuse-emulator/current/fuse/lib/tests/
vendor/fuse-emulator/current/fuse/lib/tests/fatware-success.hdf.bz2
vendor/fuse-emulator/current/fuse/lib/tests/idedos-success.hdf.bz2
vendor/fuse-emulator/current/fuse/lib/tests/success.mdr
vendor/fuse-emulator/current/fuse/lib/tests/success.mgt.bz2
vendor/fuse-emulator/current/fuse/lib/tests/success.opd
vendor/fuse-emulator/current/fuse/lib/tests/success.udi
vendor/fuse-emulator/current/fuse/movie.c
vendor/fuse-emulator/current/fuse/movie.h
vendor/fuse-emulator/current/fuse/movie_tables.h
vendor/fuse-emulator/current/fuse/peripherals/flash/
vendor/fuse-emulator/current/fuse/peripherals/flash/Makefile.am
vendor/fuse-emulator/current/fuse/peripherals/flash/am29f010.c
vendor/fuse-emulator/current/fuse/peripherals/flash/am29f010.h
vendor/fuse-emulator/current/fuse/peripherals/nic/w5100.c
vendor/fuse-emulator/current/fuse/peripherals/nic/w5100.h
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/spectranet.c
vendor/fuse-emulator/current/fuse/peripherals/spectranet.h
vendor/fuse-emulator/current/fuse-utils/compat/getopt.c
vendor/fuse-emulator/current/fuse-utils/compat/getopt.h
vendor/fuse-emulator/current/fuse-utils/compat/getopt1.c
vendor/fuse-emulator/current/fuse-utils/fmfconv.c
vendor/fuse-emulator/current/fuse-utils/fmfconv.h
vendor/fuse-emulator/current/fuse-utils/fmfconv_aiff.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/fmfconv_ppm.c
vendor/fuse-emulator/current/fuse-utils/fmfconv_scr.c
vendor/fuse-emulator/current/fuse-utils/fmfconv_wav.c
vendor/fuse-emulator/current/fuse-utils/fmfconv_yuv.c
vendor/fuse-emulator/current/fuse-utils/man/fmfconv.1
vendor/fuse-emulator/current/fuse-utils/movie_tables.h
Modified: vendor/fuse-emulator/current/fuse/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/Makefile.am 2012-11-23 12:25:10 UTC (rev 709)
+++ vendor/fuse-emulator/current/fuse/Makefile.am 2012-11-24 06:50:08 UTC (rev 710)
@@ -1,7 +1,7 @@
# Process this file with automake to produce Makefile.in
## Copyright (c) 1999-2009 Philip Kendall
-## $Id: Makefile.am 4288 2011-02-03 21:06:22Z pak21 $
+## $Id: Makefile.am 4674 2012-02-20 11:03:58Z 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
@@ -26,6 +26,7 @@
bin_PROGRAMS = fuse
SUBDIRS = @COMPAT_SUBDIR@ \
+ data \
debugger \
hacking \
lib \
@@ -41,7 +42,8 @@
unittests \
z80
-DIST_SUBDIRS = debugger \
+DIST_SUBDIRS = data \
+ debugger \
hacking \
lib \
machines \
@@ -66,6 +68,7 @@
memory.c \
mempool.c \
menu.c \
+ movie.c \
module.c \
periph.c \
profile.c \
@@ -104,6 +107,7 @@
machines/libmachines.a \
peripherals/libperipherals.a \
peripherals/disk/libdisk.a \
+peripherals/flash/libflash.a \
peripherals/ide/libide.a \
peripherals/nic/libnic.a \
pokefinder/libpokefinder.a \
@@ -128,6 +132,7 @@
machines/libmachines.a \
peripherals/libperipherals.a \
peripherals/disk/libdisk.a \
+peripherals/flash/libflash.a \
peripherals/ide/libide.a \
peripherals/nic/libnic.a \
pokefinder/libpokefinder.a \
@@ -173,6 +178,8 @@
memory.h \
mempool.h \
menu.h \
+ movie.h \
+ movie_tables.h \
module.h \
periph.h \
psg.h \
Modified: vendor/fuse-emulator/current/fuse/README
===================================================================
--- vendor/fuse-emulator/current/fuse/README 2012-11-23 12:25:10 UTC (rev 709)
+++ vendor/fuse-emulator/current/fuse/README 2012-11-24 06:50:08 UTC (rev 710)
@@ -64,6 +64,8 @@
* Either the native port by Fredrick Meunier, or the original version
will compile on OS X 10.3 (Panther) or later.
+* On Mac OS X Lion you will need to use clang as gcc-llvm-4.2.1 fails to
+ correctly compile z80_ops.c.
Windows
@@ -216,4 +218,4 @@
Philip Kendall <phi...@sh...>
16 December 2010
-$Id: README 4410 2011-05-01 10:51:21Z zubzero $
+$Id: README 4624 2012-01-09 20:59:35Z pak21 $
Modified: vendor/fuse-emulator/current/fuse/compat/unix/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/unix/Makefile.am 2012-11-23 12:25:10 UTC (rev 709)
+++ vendor/fuse-emulator/current/fuse/compat/unix/Makefile.am 2012-11-24 06:50:08 UTC (rev 710)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2007-2008 Philip Kendall
-## $Id: Makefile.am 4237 2010-12-31 19:31:26Z pak21 $
+## $Id: Makefile.am 4624 2012-01-09 20:59:35Z 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,6 +31,7 @@
file.c \
osname.c \
paths.c \
+ socket.c \
timer.c \
tuntap.c
Modified: vendor/fuse-emulator/current/fuse/compat/unix/file.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/unix/file.c 2012-11-23 12:25:10 UTC (rev 709)
+++ vendor/fuse-emulator/current/fuse/compat/unix/file.c 2012-11-24 06:50:08 UTC (rev 710)
@@ -1,7 +1,7 @@
/* file.c: File-related compatibility routines
Copyright (c) 2008 Philip Kendall
- $Id: file.c 4534 2011-08-11 12:59:47Z fredm $
+ $Id: file.c 4624 2012-01-09 20:59:35Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -64,7 +64,7 @@
if( bytes != file->length ) {
ui_error( UI_ERROR_ERROR,
"error reading file: expected %lu bytes, but read only %lu",
- file->length, bytes );
+ (unsigned long)file->length, (unsigned long)bytes );
return 1;
}
@@ -78,7 +78,7 @@
if( bytes != length ) {
ui_error( UI_ERROR_ERROR,
"error writing file: expected %lu bytes, but wrote only %lu",
- length, bytes );
+ (unsigned long)length, (unsigned long)bytes );
return 1;
}
Added: vendor/fuse-emulator/current/fuse/compat/unix/socket.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/unix/socket.c (rev 0)
+++ vendor/fuse-emulator/current/fuse/compat/unix/socket.c 2012-11-24 06:50:08 UTC (rev 710)
@@ -0,0 +1,118 @@
+/* socket.c: Socket-related compatibility routines
+ Copyright (c) 2011 Philip Kendall
+
+ $Id$
+
+ 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:
+
+ E-mail: phi...@sh...
+
+*/
+
+#include <config.h>
+
+#include <errno.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "compat.h"
+#include "fuse.h"
+#include "ui/ui.h"
+
+const compat_socket_t compat_socket_invalid = -1;
+const int compat_socket_EBADF = EBADF;
+
+struct compat_socket_selfpipe_t {
+ int read_fd;
+ int write_fd;
+};
+
+void
+compat_socket_networking_init( void )
+{
+ /* No action necessary */
+}
+
+void
+compat_socket_networking_end( void )
+{
+ /* No action necessary */
+}
+
+int
+compat_socket_close( compat_socket_t fd )
+{
+ return close( fd );
+}
+
+int compat_socket_get_error( void )
+{
+ return errno;
+}
+
+const char *
+compat_socket_get_strerror( void )
+{
+ return strerror( errno );
+}
+
+compat_socket_selfpipe_t* compat_socket_selfpipe_alloc( void )
+{
+ int error;
+ int pipefd[2];
+
+ compat_socket_selfpipe_t *self = malloc( sizeof( *self ) );
+ if( !self ) {
+ ui_error( UI_ERROR_ERROR, "%s: %d: out of memory", __FILE__, __LINE__ );
+ fuse_abort();
+ }
+
+ error = pipe( pipefd );
+ if( error ) {
+ ui_error( UI_ERROR_ERROR, "%s: %d: error %d creating pipe", __FILE__, __LINE__, error );
+ fuse_abort();
+ }
+
+ self->read_fd = pipefd[0];
+ self->write_fd = pipefd[1];
+
+ return self;
+}
+
+void compat_socket_selfpipe_free( compat_socket_selfpipe_t *self )
+{
+ close( self->read_fd );
+ close( self->write_fd );
+ free( self );
+}
+
+compat_socket_t compat_socket_selfpipe_get_read_fd( compat_socket_selfpipe_t *self )
+{
+ return self->read_fd;
+}
+
+void compat_socket_selfpipe_wake( compat_socket_selfpipe_t *self )
+{
+ const char dummy = 0;
+ write( self->write_fd, &dummy, 1 );
+}
+
+void compat_socket_selfpipe_discard_data( compat_socket_selfpipe_t *self )
+{
+ char bitbucket;
+ read( self->read_fd, &bitbucket, 1 );
+}
Modified: vendor/fuse-emulator/current/fuse/compat/win32/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/win32/Makefile.am 2012-11-23 12:25:10 UTC (rev 709)
+++ vendor/fuse-emulator/current/fuse/compat/win32/Makefile.am 2012-11-24 06:50:08 UTC (rev 710)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2007-2008 Philip Kendall
-## $Id: Makefile.am 4237 2010-12-31 19:31:26Z pak21 $
+## $Id: Makefile.am 4624 2012-01-09 20:59:35Z 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,6 +31,7 @@
../unix/file.c \
osname.c \
paths.c \
+ socket.c \
timer.c \
../unix/tuntap.c
Added: vendor/fuse-emulator/current/fuse/compat/win32/socket.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/win32/socket.c (rev 0)
+++ vendor/fuse-emulator/current/fuse/compat/win32/socket.c 2012-11-24 06:50:08 UTC (rev 710)
@@ -0,0 +1,241 @@
+/* socket.c: Socket-related compatibility routines
+ Copyright (c) 2011 Sergio Baldoví, Philip Kendall
+
+ $Id$
+
+ 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:
+
+ E-mail: phi...@sh...
+
+*/
+
+#include <config.h>
+
+#include <winsock2.h>
+#include <ws2tcpip.h>
+
+#include "compat.h"
+#include "fuse.h"
+#include "ui/ui.h"
+
+const compat_socket_t compat_socket_invalid = INVALID_SOCKET;
+const int compat_socket_EBADF = WSAENOTSOCK;
+
+struct compat_socket_selfpipe_t {
+ SOCKET self_socket;
+ libspectrum_word port;
+};
+
+int
+compat_socket_close( compat_socket_t fd )
+{
+ return closesocket( fd );
+}
+
+int compat_socket_get_error( void )
+{
+ return WSAGetLastError();
+}
+
+const char *
+compat_socket_get_strerror( void )
+{
+ static TCHAR buffer[256];
+ TCHAR *ptr;
+ DWORD msg_size;
+
+ /* get description of last winsock error */
+ msg_size = FormatMessage(
+ FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
+ NULL, WSAGetLastError(),
+ MAKELANGID( LANG_NEUTRAL, SUBLANG_DEFAULT ),
+ buffer, sizeof( buffer ) / sizeof( TCHAR ), NULL );
+
+ if( !msg_size ) return NULL;
+
+ /* skip 'new line' like chars */
+ for( ptr = buffer; *ptr; ptr++ ) {
+ if( ( *ptr == '\r' ) || ( *ptr == '\n' ) ) {
+ *ptr = '\0';
+ break;
+ }
+ }
+
+ return (const char *)buffer;
+}
+
+static int
+selfpipe_test( compat_socket_selfpipe_t *self )
+{
+ fd_set readfds;
+ int active;
+ struct timeval tv = { 1, 0 };
+
+ /* Send testing packet */
+ compat_socket_selfpipe_wake( self );
+
+ /* Safe reading from control socket */
+ FD_ZERO( &readfds );
+ FD_SET( self->self_socket, &readfds );
+ active = select( 0, &readfds, NULL, NULL, &tv );
+ if( active == 0 || active == compat_socket_invalid ) {
+ return -1;
+ }
+
+ /* Discard testing packet */
+ if( FD_ISSET( self->self_socket, &readfds ) ) {
+ compat_socket_selfpipe_discard_data( self );
+ }
+
+ return 0;
+}
+
+compat_socket_selfpipe_t *
+compat_socket_selfpipe_alloc( void )
+{
+ unsigned long mode = 1;
+ struct sockaddr_in sa;
+ socklen_t sa_len = sizeof(sa);
+
+ compat_socket_selfpipe_t *self = malloc( sizeof( *self ) );
+ if( !self ) {
+ ui_error( UI_ERROR_ERROR, "%s: %d: out of memory", __FILE__, __LINE__ );
+ fuse_abort();
+ }
+
+ self->self_socket = socket( AF_INET, SOCK_DGRAM, IPPROTO_UDP );
+ if( self->self_socket == compat_socket_invalid ) {
+ ui_error( UI_ERROR_ERROR,
+ "%s: %d: failed to open socket; errno %d: %s\n",
+ __FILE__, __LINE__, compat_socket_get_error(),
+ compat_socket_get_strerror() );
+ fuse_abort();
+ }
+
+ /* Set nonblocking mode */
+ if( ioctlsocket( self->self_socket, FIONBIO, &mode ) == -1 ) {
+ ui_error( UI_ERROR_ERROR,
+ "%s: %d: failed to set socket nonblocking; errno %d: %s\n",
+ __FILE__, __LINE__, compat_socket_get_error(),
+ compat_socket_get_strerror() );
+ fuse_abort();
+ }
+
+ memset( &sa, 0, sizeof(sa) );
+ sa.sin_family = AF_INET;
+ sa.sin_addr.s_addr = htonl( INADDR_LOOPBACK );
+
+ if( bind( self->self_socket, (struct sockaddr*)&sa, sizeof(sa) ) == -1 ) {
+ ui_error( UI_ERROR_ERROR,
+ "%s: %d: failed to bind socket; errno %d: %s\n",
+ __FILE__, __LINE__, compat_socket_get_error(),
+ compat_socket_get_strerror() );
+ fuse_abort();
+ }
+
+ /* Get ephemeral port number */
+ if( getsockname( self->self_socket, (struct sockaddr *)&sa, &sa_len ) == -1 ) {
+ ui_error( UI_ERROR_ERROR,
+ "%s: %d: failed to get socket name; errno %d: %s\n",
+ __FILE__, __LINE__, compat_socket_get_error(),
+ compat_socket_get_strerror() );
+ fuse_abort();
+ }
+
+ self->port = ntohs( sa.sin_port );
+
+ /* Test communications in order to detect blocking firewalls */
+ if( selfpipe_test( self ) == -1 ) {
+ ui_error( UI_ERROR_ERROR,
+ "Networking: failed to test internal communications" );
+ fuse_abort();
+ }
+
+ return self;
+}
+
+void
+compat_socket_selfpipe_free( compat_socket_selfpipe_t *self )
+{
+ compat_socket_close( self->self_socket );
+ free( self );
+}
+
+compat_socket_t
+compat_socket_selfpipe_get_read_fd( compat_socket_selfpipe_t *self )
+{
+ return self->self_socket;
+}
+
+void
+compat_socket_selfpipe_wake( compat_socket_selfpipe_t *self )
+{
+ struct sockaddr_in sa;
+
+ memset( &sa, 0, sizeof(sa) );
+ sa.sin_family = AF_INET;
+ sa.sin_addr.s_addr = htonl( INADDR_LOOPBACK );
+ sa.sin_port = htons( self->port );
+
+ sendto( self->self_socket, NULL, 0, 0, (struct sockaddr*)&sa, sizeof(sa) );
+}
+
+void
+compat_socket_selfpipe_discard_data( compat_socket_selfpipe_t *self )
+{
+ ssize_t bytes_read;
+ struct sockaddr_in sa;
+ socklen_t sa_length = sizeof(sa);
+ static char bitbucket[0x100];
+
+ do {
+ /* Socket is non blocking, so we can do this safely */
+ bytes_read = recvfrom( self->self_socket, bitbucket, sizeof( bitbucket ),
+ 0, (struct sockaddr*)&sa, &sa_length );
+ } while( bytes_read != -1 );
+}
+
+
+void
+compat_socket_networking_init( void )
+{
+ WORD wVersionRequested;
+ WSADATA wsaData;
+ int error;
+
+ wVersionRequested = MAKEWORD( 2, 2 );
+ error = WSAStartup( wVersionRequested, &wsaData );
+ if( error ) {
+ ui_error( UI_ERROR_ERROR, "%s:%d: error %d from WSAStartup()", __FILE__,
+ __LINE__, error );
+ fuse_abort();
+ }
+
+ if( LOBYTE( wsaData.wVersion ) != 2 || HIBYTE( wsaData.wVersion ) != 2 ) {
+ ui_error( UI_ERROR_ERROR,
+ "%s:%d: unexpected version 0x%02x from WSAStartup()",
+ __FILE__, __LINE__, wsaData.wVersion );
+ fuse_abort();
+ }
+}
+
+void
+compat_socket_networking_end( void )
+{
+ WSACleanup();
+}
+
Modified: vendor/fuse-emulator/current/fuse/compat.h
===================================================================
--- vendor/fuse-emulator/current/fuse/compat.h 2012-11-23 12:25:10 UTC (rev 709)
+++ vendor/fuse-emulator/current/fuse/compat.h 2012-11-24 06:50:08 UTC (rev 710)
@@ -1,7 +1,7 @@
/* compat.h: various compatibility bits
Copyright (c) 2003-2008 Philip Kendall
- $Id: compat.h 4534 2011-08-11 12:59:47Z fredm $
+ $Id: compat.h 4648 2012-01-22 19:57:35Z 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,6 +31,10 @@
#include <stdlib.h>
#include <sys/types.h>
+#ifdef WIN32
+#include <winsock2.h>
+#endif
+
/* Remove the gcc-specific incantations if we're not using gcc */
#ifdef __GNUC__
@@ -120,4 +124,30 @@
int compat_get_tap( const char *interface_name );
+/* Socket handling */
+
+#ifndef WIN32
+typedef int compat_socket_t;
+#else /* #ifndef WIN32 */
+typedef SOCKET compat_socket_t;
+#endif
+
+extern const compat_socket_t compat_socket_invalid;
+extern const int compat_socket_EBADF;
+
+void compat_socket_networking_init( void );
+void compat_socket_networking_end( void );
+
+int compat_socket_close( compat_socket_t fd );
+int compat_socket_get_error( void );
+const char *compat_socket_get_strerror( void );
+
+typedef struct compat_socket_selfpipe_t compat_socket_selfpipe_t;
+
+compat_socket_selfpipe_t* compat_socket_selfpipe_alloc( void );
+void compat_socket_selfpipe_free( compat_socket_selfpipe_t *self );
+compat_socket_t compat_socket_selfpipe_get_read_fd( compat_socket_selfpipe_t *self );
+void compat_socket_selfpipe_wake( compat_socket_selfpipe_t *self );
+void compat_socket_selfpipe_discard_data( compat_socket_selfpipe_t *self );
+
#endif /* #ifndef FUSE_COMPAT_H */
Modified: vendor/fuse-emulator/current/fuse/configure.in
===================================================================
--- vendor/fuse-emulator/current/fuse/configure.in 2012-11-23 12:25:10 UTC (rev 709)
+++ vendor/fuse-emulator/current/fuse/configure.in 2012-11-24 06:50:08 UTC (rev 710)
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-dnl $Id: configure.in 4617 2012-01-03 11:47:27Z fredm $
+dnl $Id: configure.in 4674 2012-02-20 11:03:58Z fredm $
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
@@ -110,7 +110,7 @@
AC_MSG_RESULT($win32)
if test "$win32" = yes; then
AC_CHECK_HEADER(windows.h,
- LIBS="$LIBS -mwindows -lcomctl32 -lwinmm";
+ LIBS="$LIBS -mwindows -lcomctl32 -lwinmm -lpthread -lws2_32";
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])
@@ -322,10 +322,11 @@
AC_TRY_COMPILE([#include <libspectrum.h>],[
int test = LIBSPECTRUM_SUPPORTS_ZLIB_COMPRESSION;
],
- AUTOLOAD_SNAPS=compressed; AC_MSG_RESULT(yes),
- AUTOLOAD_SNAPS=uncompressed; AC_MSG_RESULT(no))
+ AUTOLOAD_SNAPS=compressed; LIBSPEC_HAVE_ZLIB=yes; AC_MSG_RESULT(yes),
+ AUTOLOAD_SNAPS=uncompressed; LIBSPEC_HAVE_ZLIB=""; AC_MSG_RESULT(no))
CPPFLAGS="$ac_save_CPPFLAGS"
AC_SUBST(AUTOLOAD_SNAPS)
+AC_SUBST(LIBSPEC_HAVE_ZLIB)
AC_LINK_FILES([
lib/"$AUTOLOAD_SNAPS"/disk_plus3.szx
lib/"$AUTOLOAD_SNAPS"/tape_128.szx
@@ -356,6 +357,44 @@
lib/tape_se.szx
lib/tape_ts2068.szx])
+dnl Check whether to use zlib (the UNIX version is called z, Win32 zdll)
+AC_MSG_CHECKING(whether to use zlib)
+AC_ARG_WITH(zlib,
+[ --without-zlib don't use zlib],
+if test "$withval" = no; then zlib=no; else zlib=yes; fi,
+zlib=yes)
+AC_MSG_RESULT($zlib)
+if test "$zlib" = yes; then
+ AC_CHECK_HEADERS(
+ zlib.h,
+ AC_SEARCH_LIBS(compress2, z zdll)
+ )
+fi
+
+dnl Check if supplied libspectrum has support for bz2 compressed files
+AC_MSG_CHECKING(whether libspectrum supports compressed bz2 files)
+ac_save_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $LIBSPEC_CFLAGS"
+AC_TRY_COMPILE([#include <libspectrum.h>],[
+ int test = LIBSPECTRUM_SUPPORTS_BZ2_COMPRESSION;
+],
+ LIBSPEC_HAVE_BZ2=yes; AC_MSG_RESULT(yes),
+ LIBSPEC_HAVE_BZ2=""; AC_MSG_RESULT(no))
+CPPFLAGS="$ac_save_CPPFLAGS"
+AC_SUBST(LIBSPEC_HAVE_BZ2)
+
+dnl Check if supplied libspectrum has support for wav files
+AC_MSG_CHECKING(whether libspectrum supports wav files)
+ac_save_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $LIBSPEC_CFLAGS"
+AC_TRY_COMPILE([#include <libspectrum.h>],[
+ int test = LIBSPECTRUM_SUPPORTS_AUDIOFILE;
+],
+ LIBSPEC_HAVE_AUDIOFILE=yes; AC_MSG_RESULT(yes),
+ LIBSPEC_HAVE_AUDIOFILE=""; AC_MSG_RESULT(no))
+CPPFLAGS="$ac_save_CPPFLAGS"
+AC_SUBST(LIBSPEC_HAVE_AUDIOFILE)
+
dnl Check if a version of libpng which supplies png_write_png is available
AC_MSG_CHECKING(whether PNG support requested)
AC_ARG_WITH(png,
@@ -681,6 +720,29 @@
AC_SUBST(COMPAT_SUBDIR)
AC_SUBST(COMPAT_OSNAME)
+dnl Decide whether to install desktop and mime files
+AC_ARG_ENABLE(desktop-integration,
+AS_HELP_STRING([--enable-desktop-integration], [add menu entry and file associations]),
+if test "$enableval" = yes; then desktopintegration=yes; else desktopintegration=no; fi,
+desktdesktopintegration=no)
+AC_MSG_CHECKING(whether to install desktop file)
+AC_MSG_RESULT($desktopintegration)
+AM_CONDITIONAL(DESKTOP_INTEGRATION, test "$desktopintegration" = yes)
+AC_CHECK_PROGS(GTK_UPDATE_ICON_CACHE,gtk-update-icon-cache,true)
+
+dnl Where to install the desktop and mime files
+AC_ARG_WITH(desktop-dir,
+AS_HELP_STRING([--with-desktop-dir=DIR], [location of desktop files (default=datadir)]),
+if test "$withval" = no; then desktopdir=no; else desktopdir=yes; fi,
+desktopdir=no)
+if test "$desktopdir" = yes; then
+ DESKTOP_DATADIR=$with_desktop_dir
+else
+ DESKTOP_DATADIR="$datadir"
+fi
+AM_CONDITIONAL(DESKTOP_DATADIR, test "$desktopdir" == yes)
+AC_SUBST(DESKTOP_DATADIR)
+
dnl Do we want the low memory compile?
AC_MSG_CHECKING(whether low memory compile requested)
AC_ARG_ENABLE(smallmem,
@@ -723,6 +785,7 @@
compat/unix/Makefile \
compat/wii/Makefile \
compat/win32/Makefile \
+data/Makefile \
debugger/Makefile \
hacking/Makefile \
lib/Makefile \
@@ -732,6 +795,7 @@
peripherals/disk/Makefile \
peripherals/ide/Makefile \
peripherals/nic/Makefile \
+peripherals/flash/Makefile \
perl/Makefile \
perl/Fuse/Makefile \
pokefinder/Makefile \
Added: vendor/fuse-emulator/current/fuse/data/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/data/Makefile.am (rev 0)
+++ vendor/fuse-emulator/current/fuse/data/Makefile.am 2012-11-24 06:50:08 UTC (rev 710)
@@ -0,0 +1,116 @@
+## Process this file with automake to produce Makefile.in
+## Copyright (c) 2011 Philip Kendall
+
+## $Id: Makefile.am 4674 2012-02-20 11:03:58Z 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
+## 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:
+##
+## E-mail: phi...@sh...
+
+AUTOMAKE_OPTIONS = foreign
+
+if DESKTOP_INTEGRATION
+
+fusemimedir = $(DESKTOP_DATADIR)/mime/packages
+fusemime_DATA = fuse.xml
+
+appdatadir = $(DESKTOP_DATADIR)/applications
+appdata_DATA = fuse.desktop
+
+iconsdatadir = $(DESKTOP_DATADIR)/icons/hicolor
+icons16dir = $(iconsdatadir)/16x16/apps
+icons32dir = $(iconsdatadir)/32x32/apps
+icons48dir = $(iconsdatadir)/48x48/apps
+icons64dir = $(iconsdatadir)/64x64/apps
+icons128dir = $(iconsdatadir)/128x128/apps
+icons256dir = $(iconsdatadir)/256x256/apps
+
+dist_icons16_DATA = icons/16x16/fuse.png
+dist_icons32_DATA = icons/32x32/fuse.png
+dist_icons48_DATA = icons/48x48/fuse.png
+dist_icons64_DATA = icons/64x64/fuse.png
+dist_icons128_DATA = icons/128x128/fuse.png
+dist_icons256_DATA = icons/256x256/fuse.png
+
+mimeicons16dir = $(iconsdatadir)/16x16/mimetypes
+mimeicons32dir = $(iconsdatadir)/32x32/mimetypes
+mimeicons48dir = $(iconsdatadir)/48x48/mimetypes
+mimeicons64dir = $(iconsdatadir)/64x64/mimetypes
+mimeicons128dir = $(iconsdatadir)/128x128/mimetypes
+mimeicons256dir = $(iconsdatadir)/256x256/mimetypes
+
+dist_mimeicons16_DATA = icons/16x16/application-x-spectrum.png
+dist_mimeicons32_DATA = icons/32x32/application-x-spectrum.png
+dist_mimeicons48_DATA = icons/48x48/application-x-spectrum.png
+dist_mimeicons64_DATA = icons/64x64/application-x-spectrum.png
+dist_mimeicons128_DATA = icons/128x128/application-x-spectrum.png
+dist_mimeicons256_DATA = icons/256x256/application-x-spectrum.png
+
+# Generate fuse.xml according to libspectrum capabilities
+fuse.xml: fuse.xml.in
+ if test -z "$(LIBSPEC_HAVE_AUDIOFILE)"; then \
+ mime_audiofile='/LIBSPECTRUM_HAVE_AUDIOFILE_BEGIN/,/LIBSPECTRUM_HAVE_AUDIOFILE_END/d'; \
+ else \
+ mime_audiofile='/LIBSPECTRUM_HAVE_AUDIOFILE/d'; \
+ fi; \
+ if test -z "$(LIBSPEC_HAVE_ZLIB)"; then \
+ mime_zlib='/LIBSPECTRUM_HAVE_ZLIB_BEGIN/,/LIBSPECTRUM_HAVE_ZLIB_END/d'; \
+ else \
+ mime_zlib='/LIBSPECTRUM_HAVE_ZLIB/d'; \
+ fi; \
+ if test -z "$(LIBSPEC_HAVE_BZ2)"; then \
+ mime_bz2='/LIBSPECTRUM_HAVE_BZ2_BEGIN/,/LIBSPECTRUM_HAVE_BZ2_END/d'; \
+ else \
+ mime_bz2='/LIBSPECTRUM_HAVE_BZ2/d'; \
+ fi; \
+ $(SED) -e "$$mime_audiofile" -e "$$mime_zlib" -e "$$mime_bz2" < fuse.xml.in > $@
+
+# Generate fuse.desktop from fuse.xml to keep mime types list in sync
+fuse.desktop: fuse.desktop.in $(srcdir)/fuse.xml
+ list=`$(SED) -e '/<mime-type/ s/.*<mime-type type="\(.*\)">.*/\1;/' -e t -e d < $(srcdir)/fuse.xml | tr -d '\n'` && \
+ $(SED) -e "s|@MIME_TYPES@|$$list|" < fuse.desktop.in > $@
+
+update-database-cache:
+ if test -z "$(DESTDIR)"; then \
+ update-desktop-database $(DESKTOP_DATADIR)/applications; \
+ update-mime-database $(DESKTOP_DATADIR)/mime; \
+ touch --no-create $(iconsdatadir); \
+ $(GTK_UPDATE_ICON_CACHE) -t ${iconsdatadir}; \
+ fi
+
+install-data-hook: update-database-cache
+
+uninstall-hook: update-database-cache
+
+validate: fuse.desktop
+ ( dfvalidate=`which desktop-file-validate`; \
+ if test x$$dfvalidate != x && test -x $$dfvalidate; then \
+ $$dfvalidate $< || ( echo "* $< INVALID *"; exit 1 ) \
+ fi )
+
+dist-hook: validate
+
+endif
+
+EXTRA_DIST = \
+ fuse.desktop.in \
+ fuse.xml.in
+
+CLEANFILES = \
+ fuse.desktop \
+ fuse.xml
+
Added: vendor/fuse-emulator/current/fuse/data/fuse.desktop.in
===================================================================
--- vendor/fuse-emulator/current/fuse/data/fuse.desktop.in (rev 0)
+++ vendor/fuse-emulator/current/fuse/data/fuse.desktop.in 2012-11-24 06:50:08 UTC (rev 710)
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Categories=Game;Emulator;GNOME;GTK;
+Name=Fuse Spectrum Emulator
+Comment=Emulator of the 1980s ZX Spectrum home computer and its various clones
+MimeType=@MIME_TYPES@
+Exec=fuse %f
+Icon=fuse
+
Added: vendor/fuse-emulator/current/fuse/data/fuse.xml.in
===================================================================
--- vendor/fuse-emulator/current/fuse/data/fuse.xml.in (rev 0)
+++ vendor/fuse-emulator/current/fuse/data/fuse.xml.in 2012-11-24 06:50:08 UTC (rev 710)
@@ -0,0 +1,284 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
+ <mime-type type="audio/x-spectrum-csw">
+ <comment>ZX Spectrum audio</comment>
+ <magic>
+ <match type="string" offset="0" value="Compressed Square Wave\x1a"/>
+ </magic>
+ <icon name="application-x-spectrum"/>
+ <glob pattern="*.csw"/>
+ </mime-type>
+ <mime-type type="application/x-spectrum-dck">
+ <comment>ZX Spectrum cartridge</comment>
+ <icon name="application-x-spectrum"/>
+ <glob pattern="*.dck"/>
+ </mime-type>
+ <mime-type type="application/x-spectrum-dsk">
+ <comment>ZX Spectrum disk</comment>
+ <magic>
+ <match type="string" offset="0" value="MV - CPCEMU Disk-File\x0d\x0aDisk-Info\x0d\x0a"/>
+ <match type="string" offset="0" value="EXTENDED CPC DSK File\x0d\x0aDisk-Info\x0d\x0a"/>
+ </magic>
+ <icon name="application-x-spectrum"/>
+ <glob pattern="*.dsk"/>
+ </mime-type>
+ <mime-type type="application/x-spectrum-fdi">
+ <comment>ZX Spectrum disk</comment>
+ <magic>
+ <match type="string" offset="0" value="FDI"/>
+ </magic>
+ <icon name="application-x-spectrum"/>
+ <glob pattern="*.fdi"/>
+ </mime-type>
+ <mime-type type="application/x-spectrum-hdf">
+ <comment>ZX Spectrum harddisk</comment>
+ <magic>
+ <match type="string" offset="0" value="RS-IDE\x1a"/>
+ </magic>
+ <icon name="application-x-spectrum"/>
+ <glob pattern="*.hdf"/>
+ </mime-type>
+ <mime-type type="application/x-spectrum-img">
+ <comment>ZX Spectrum disk</comment>
+ <icon name="application-x-spectrum"/>
+ <glob pattern="*.img"/>
+ </mime-type>
+ <mime-type type="application/x-spectrum-ltp">
+ <comment>ZX Spectrum tape</comment>
+ <icon name="application-x-spectrum"/>
+ <glob pattern="*.ltp"/>
+ </mime-type>
+ <mime-type type="application/x-spectrum-mdr">
+ <comment>ZX Spectrum microdrive</comment>
+ <icon name="application-x-spectrum"/>
+ <glob pattern="*.mdr"/>
+ </mime-type>
+ <mime-type type="application/x-spectrum-mgt">
+ <comment>ZX Spectrum disk</comment>
+ <icon name="application-x-spectrum"/>
+ <glob pattern="*.mgt"/>
+ </mime-type>
+ <mime-type type="application/x-spectrum-mgtsnp">
+ <comment>ZX Spectrum snapshot</comment>
+ <icon name="application-x-spectrum"/>
+ <glob pattern="*.mgtsnp"/>
+ </mime-type>
+ <mime-type type="application/x-spectrum-opd">
+ <comment>ZX Spectrum disk</comment>
+ <icon name="application-x-spectrum"/>
+ <glob pattern="*.opd"/>
+ </mime-type>
+ <mime-type type="application/x-spectrum-opu">
+ <comment>ZX Spectrum disk</comment>
+ <icon name="application-x-spectrum"/>
+ <glob pattern="*.opu"/>
+ </mime-type>
+ <mime-type type="application/x-spectrum-pzx">
+ <comment>ZX Spectrum tape</comment>
+ <magic>
+ <match type="string" offset="0" value="PZXT"/>
+ </magic>
+ <icon name="application-x-spectrum"/>
+ <glob pattern="*.pzx"/>
+ </mime-type>
+ <mime-type type="application/x-spectrum-raw">
+ <comment>ZX Spectrum tape</comment>
+ <magic>
+ <match type="string" offset="0" value="\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0Raw tape sample"/>
+ </magic>
+ <icon name="application-x-spectrum"/>
+ <glob pattern="*.raw"/>
+ </mime-type>
+ <mime-type type="application/x-spectrum-rom">
+ <comment>ZX Spectrum cartridge</comment>
+ <icon name="application-x-spectrum"/>
+ <glob pattern="*.rom"/>
+ </mime-type>
+ <mime-type type="application/x-spectrum-rzx">
+ <comment>ZX Spectrum action replay</comment>
+ <magic>
+ <match type="string" offset="0" value="RZX!"/>
+ </magic>
+ <icon name="application-x-spectrum"/>
+ <glob pattern="*.rzx"/>
+ </mime-type>
+ <mime-type type="application/x-spectrum-sad">
+ <comment>ZX Spectrum disk</comment>
+ <magic>
+ <match type="string" offset="0" value="Aley's disk backup"/>
+ </magic>
+ <icon name="application-x-spectrum"/>
+ <glob pattern="*.sad"/>
+ </mime-type>
+ <mime-type type="application/x-spectrum-scl">
+ <comment>ZX Spectrum disk</comment>
+ <magic>
+ <match type="string" offset="0" value="SINCLAIR"/>
+ </magic>
+ <icon name="application-x-spectrum"/>
+ <glob pattern="*.scl"/>
+ </mime-type>
+ <mime-type type="application/x-spectrum-slt">
+ <comment>ZX Spectrum snapshot</comment>
+ <icon name="application-x-spectrum"/>
+ <glob pattern="*.slt"/>
+ </mime-type>
+ <mime-type type="application/x-spectrum-sna">
+ <comment>ZX Spectrum snapshot</comment>
+ <icon name="application-x-spectrum"/>
+ <glob pattern="*.sna"/>
+ <glob pattern="*.snapshot"/>
+ </mime-type>
+ <mime-type type="application/x-spectrum-snp">
+ <comment>ZX Spectrum snapshot</comment>
+ <icon name="application-x-spectrum"/>
+ <glob pattern="*.snp"/>
+ </mime-type>
+ <mime-type type="application/x-spectrum-sp">
+ <comment>ZX Spectrum snapshot</comment>
+ <icon name="application-x-spectrum"/>
+ <glob pattern="*.sp"/>
+ </mime-type>
+ <mime-type type="application/x-spectrum-spc">
+ <comment>ZX Spectrum tape</comment>
+ <icon name="application-x-spectrum"/>
+ <glob pattern="*.spc"/>
+ </mime-type>
+ <mime-type type="application/x-spectrum-sta">
+ <comment>ZX Spectrum tape</comment>
+ <icon name="application-x-spectrum"/>
+ <glob pattern="*.sta"/>
+ </mime-type>
+ <mime-type type="application/x-spectrum-szx">
+ <comment>ZX Spectrum snapshot</comment>
+ <magic>
+ <match type="string" offset="0" value="ZXST"/>
+ </magic>
+ <icon name="application-x-spectrum"/>
+ <glob pattern="*.szx"/>
+ <glob pattern="*.zx-state"/>
+ </mime-type>
+ <mime-type type="application/x-spectrum-td0">
+ <comment>ZX Spectrum disk</comment>
+ <magic>
+ <match type="string" offset="0" value="TD"/>
+ <match type="string" offset="0" value="td"/>
+ </magic>
+ <icon name="application-x-spectrum"/>
+ <glob pattern="*.td0"/>
+ </mime-type>
+ <mime-type type="application/x-spectrum-tap">
+ <comment>ZX Spectrum tape</comment>
+ <icon name="application-x-spectrum"/>
+ <glob pattern="*.tap"/>
+ </mime-type>
+ <mime-type type="application/x-spectrum-trd">
+ <comment>ZX Spectrum disk</comment>
+ <magic>
+ <match type="string" offset="0" value="SINCLAIR"/>
+ </magic>
+ <icon name="application-x-spectrum"/>
+ <glob pattern="*.trd"/>
+ </mime-type>
+ <mime-type type="application/x-spectrum-tzx">
+ <comment>ZX Spectrum tape</comment>
+ <magic>
+ <match type="string" offset="0" value="ZXTape!\x1a"/>
+ </magic>
+ <icon name="application-x-spectrum"/>
+ <glob pattern="*.tzx"/>
+ </mime-type>
+ <mime-type type="application/x-spectrum-udi">
+ <comment>ZX Spectrum disk</comment>
+ <magic>
+ <match type="string" offset="0" value="UDI!"/>
+ </magic>
+ <icon name="application-x-spectrum"/>
+ <glob pattern="*.udi"/>
+ </mime-type>
+ <mime-type type="application/x-spectrum-z80">
+ <comment>ZX Spectrum snapshot</comment>
+ <icon name="application-x-spectrum"/>
+ <glob pattern="*.z80"/>
+ </mime-type>
+ <mime-type type="application/x-spectrum-zxs">
+ <comment>ZX Spectrum snapshot</comment>
+ <magic>
+ <match type="string" offset="0" value="SNAP"/>
+ </magic>
+ <icon name="application-x-spectrum"/>
+ <glob pattern="*.zxs"/>
+ </mime-type>
+ ##LIBSPECTRUM_HAVE_AUDIOFILE_BEGIN##
+ <mime-type type="audio/x-spectrum-wav">
+ <comment>ZX Spectrum audio</comment>
+ <magic priority="20">
+ <match value="WAVE" type="string" offset="8"/>
+ <match value="WAV " type="string" offset="8"/>
+ </magic>
+ <glob pattern="*.wav"/>
+ </mime-type>
+ ##LIBSPECTRUM_HAVE_AUDIOFILE_END##
+ ##LIBSPECTRUM_HAVE_ZLIB_BEGIN##
+ <mime-type type="application/x-spectrum-compressed">
+ <comment>ZX Spectrum compressed</comment>
+ <icon name="application-x-spectrum"/>
+ <glob pattern="*.csw.gz"/>
+ <glob pattern="*.dck.gz"/>
+ <glob pattern="*.hdf.gz"/>
+ <glob pattern="*.mdr.gz"/>
+ <glob pattern="*.mgtsnp.gz"/>
+ <glob pattern="*.ltp.gz"/>
+ <glob pattern="*.pzx.gz"/>
+ <glob pattern="*.raw.gz"/>
+ <glob pattern="*.rom.gz"/>
+ <glob pattern="*.rzx.gz"/>
+ <glob pattern="*.slt.gz"/>
+ <glob pattern="*.sna.gz"/>
+ <glob pattern="*.snapshot.gz"/>
+ <glob pattern="*.snp.gz"/>
+ <glob pattern="*.sp.gz"/>
+ <glob pattern="*.spc.gz"/>
+ <glob pattern="*.sta.gz"/>
+ <glob pattern="*.szx.gz"/>
+ <glob pattern="*.tap.gz"/>
+ <glob pattern="*.tzx.gz"/>
+ ##LIBSPECTRUM_HAVE_AUDIOFILE_BEGIN##
+ <glob pattern="*.wav.gz"/>
+ ##LIBSPECTRUM_HAVE_AUDIOFILE_END##
+ <glob pattern="*.z80.gz"/>
+ <glob pattern="*.zxs.gz"/>
+ </mime-type>
+ ##LIBSPECTRUM_HAVE_ZLIB_END##
+ ##LIBSPECTRUM_HAVE_BZ2_BEGIN##
+ <mime-type type="application/x-spectrum-compressed-bz2">
+ <comment>ZX Spectrum compressed</comment>
+ <icon name="application-x-spectrum"/>
+ <glob pattern="*.csw.bz2"/>
+ <glob pattern="*.dck.bz2"/>
+ <glob pattern="*.hdf.bz2"/>
+ <glob pattern="*.mdr.bz2"/>
+ <glob pattern="*.mgtsnp.bz2"/>
+ <glob pattern="*.ltp.bz2"/>
+ <glob pattern="*.pzx.bz2"/>
+ <glob pattern="*.raw.bz2"/>
+ <glob pattern="*.rom.bz2"/>
+ <glob pattern="*.rzx.bz2"/>
+ <glob pattern="*.slt.bz2"/>
+ <glob pattern="*.sna.bz2"/>
+ <glob pattern="*.snapshot.bz2"/>
+ <glob pattern="*.snp.bz2"/>
+ <glob pattern="*.sp.bz2"/>
+ <glob pattern="*.spc.bz2"/>
+ <glob pattern="*.sta.bz2"/>
+ <glob pattern="*.szx.bz2"/>
+ <glob pattern="*.tap.bz2"/>
+ <glob pattern="*.tzx.bz2"/>
+ ##LIBSPECTRUM_HAVE_AUDIOFILE_BEGIN##
+ <glob pattern="*.wav.bz2"/>
+ ##LIBSPECTRUM_HAVE_AUDIOFILE_END##
+ <glob pattern="*.z80.bz2"/>
+ <glob pattern="*.zxs.bz2"/>
+ </mime-type>
+ ##LIBSPECTRUM_HAVE_BZ2_END##
+</mime-info>
Added: vendor/fuse-emulator/current/fuse/data/icons/128x128/application-x-spectrum.png
===================================================================
(Binary files differ)
Property changes on: vendor/fuse-emulator/current/fuse/data/icons/128x128/application-x-spectrum.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: vendor/fuse-emulator/current/fuse/data/icons/128x128/fuse.png
===================================================================
(Binary files differ)
Property changes on: vendor/fuse-emulator/current/fuse/data/icons/128x128/fuse.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: vendor/fuse-emulator/current/fuse/data/icons/16x16/application-x-spectrum.png
===================================================================
(Binary files differ)
Property changes on: vendor/fuse-emulator/current/fuse/data/icons/16x16/application-x-spectrum.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: vendor/fuse-emulator/current/fuse/data/icons/16x16/fuse.png
===================================================================
(Binary files differ)
Property changes on: vendor/fuse-emulator/current/fuse/data/icons/16x16/fuse.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: vendor/fuse-emulator/current/fuse/data/icons/256x256/application-x-spectrum.png
===================================================================
(Binary files differ)
Property changes on: vendor/fuse-emulator/current/fuse/data/icons/256x256/application-x-spectrum.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: vendor/fuse-emulator/current/fuse/data/icons/256x256/fuse.png
===================================================================
(Binary files differ)
Property changes on: vendor/fuse-emulator/current/fuse/data/icons/256x256/fuse.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: vendor/fuse-emulator/current/fuse/data/icons/32x32/application-x-spectrum.png
===================================================================
(Binary files differ)
Property changes on: vendor/fuse-emulator/current/fuse/data/icons/32x32/application-x-spectrum.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: vendor/fuse-emulator/current/fuse/data/icons/32x32/fuse.png
===================================================================
(Binary files differ)
Property changes on: vendor/fuse-emulator/current/fuse/data/icons/32x32/fuse.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: vendor/fuse-emulator/current/fuse/data/icons/48x48/application-x-spectrum.png
===================================================================
(Binary files differ)
Property changes on: vendor/fuse-emulator/current/fuse/data/icons/48x48/application-x-spectrum.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: vendor/fuse-emulator/current/fuse/data/icons/48x48/fuse.png
===================================================================
(Binary files differ)
Property changes on: vendor/fuse-emulator/current/fuse/data/icons/48x48/fuse.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: vendor/fuse-emulator/current/fuse/data/icons/64x64/application-x-spectrum.png
===================================================================
(Binary files differ)
Property changes on: vendor/fuse-emulator/current/fuse/data/icons/64x64/application-x-spectrum.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: vendor/fuse-emulator/current/fuse/data/icons/64x64/fuse.png
===================================================================
(Binary files differ)
Property changes on: vendor/fuse-emulator/current/fuse/data/icons/64x64/fuse.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: vendor/fuse-emulator/current/fuse/debugger/breakpoint.c
===================================================================
--- vendor/fuse-emulator/current/fuse/debugger/breakpoint.c 2012-11-23 12:25:10 UTC (rev 709)
+++ vendor/fuse-emulator/current/fuse/debugger/breakpoint.c 2012-11-24 06:50:08 UTC (rev 710)
@@ -1,7 +1,7 @@
/* breakpoint.c: a debugger breakpoint
Copyright (c) 2002-2011 Philip Kendall
- $Id: breakpoint.c 4415 2011-05-01 22:51:43Z pak21 $
+ $Id: breakpoint.c 4641 2012-01-21 13:42:51Z 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
@@ -35,6 +35,7 @@
#include "fuse.h"
#include "memory.h"
#include "ui/ui.h"
+#include "utils.h"
/* The current breakpoints */
GSList *debugger_breakpoints;
@@ -177,13 +178,8 @@
}
value.event.detail = NULL;
- value.event.type = strdup( type_string );
- value.event.detail = strdup( detail );
- if( !value.event.type || !value.event.detail ) {
- free( value.event.type );
- free( value.event.detail );
- return 1;
- }
+ value.event.type = utils_safe_strdup( type_string );
+ value.event.detail = utils_safe_strdup( detail );
return breakpoint_add( type, value, ignore, life, condition );
}
@@ -197,8 +193,8 @@
bp = malloc( sizeof( *bp ) );
if( !bp ) {
- ui_error( UI_ERROR_ERROR, "Out of memory at %s:%d", __FILE__, __LINE__ );
- return 1;
+ ui_error( UI_ERROR_ERROR, "out of memory at %s:%d", __FILE__, __LINE__ );
+ fuse_abort();
}
bp->id = next_breakpoint_id++; bp->type = type;
@@ -223,13 +219,9 @@
/* If this was a timed breakpoint, set an event to stop emulation
at that point */
- if( type == DEBUGGER_BREAKPOINT_TYPE_TIME ) {
- int error;
+ if( type == DEBUGGER_BREAKPOINT_TYPE_TIME )
+ event_add( value.time.tstates, debugger_breakpoint_event );
- error = event_add( value.time.tstates, debugger_breakpoint_event );
- if( error ) return error;
- }
-
return 0;
}
@@ -274,16 +266,16 @@
static memory_page*
get_page( debugger_breakpoint_type type, libspectrum_word address )
{
- memory_page *page;
+ memory_page *bank;
switch( type ) {
case DEBUGGER_BREAKPOINT_TYPE_EXECUTE:
case DEBUGGER_BREAKPOINT_TYPE_READ:
- page = memory_map_read;
+ bank = memory_map_read;
break;
case DEBUGGER_BREAKPOINT_TYPE_WRITE:
- page = memory_map_write;
+ bank = memory_map_write;
break;
default:
@@ -292,7 +284,7 @@
fuse_abort();
}
- return page;
+ return &bank[ address >> MEMORY_PAGE_SIZE_LOGARITHM ];
}
int
@@ -566,8 +558,7 @@
if( !bp ) return 1;
free( bp->commands );
- bp->commands = strdup( commands );
- if( !bp->commands ) return 1;
+ bp->commands = utils_safe_strdup( commands );
return 0;
}
Modified: vendor/fuse-emulator/current/fuse/debugger/command.c
===================================================================
--- vendor/fuse-emulator/current/fuse/debugger/command.c 2012-11-23 12:25:10 UTC (rev 709)
+++ vendor/fuse-emulator/current/fuse/debugger/command.c 2012-11-24 06:50:08 UTC (rev 710)
@@ -1,7 +1,7 @@
/* command.c: Parse a debugger command
Copyright (c) 2002-2008 Philip Kendall
- $Id: command.c 4125 2010-05-06 22:18:50Z pak21 $
+ $Id: command.c 4633 2012-01-19 23:26: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
@@ -33,6 +33,7 @@
#include "debugger_internals.h"
#include "mempool.h"
#include "ui/ui.h"
+#include "utils.h"
#include "z80/z80.h"
#include "z80/z80_macros.h"
@@ -46,18 +47,14 @@
in...
[truncated message content] |
|
From: <fr...@us...> - 2012-12-05 21:19:14
|
Revision: 714
http://sourceforge.net/p/fuse-for-macosx/code/714
Author: fredm
Date: 2012-12-05 21:19:12 +0000 (Wed, 05 Dec 2012)
Log Message:
-----------
To prepare to load . into vendor/fuse-emulator/current, perform 4
renames.
* vendor/fuse-emulator/current/fuse-utils/configure.ac: Renamed from
vendor/fuse-emulator/current/fuse-utils/configure.in.
* vendor/fuse-emulator/current/fuse/configure.ac: Renamed from
vendor/fuse-emulator/current/fuse/configure.in.
* vendor/fuse-emulator/current/libspectrum/configure.ac: Renamed from
vendor/fuse-emulator/current/libspectrum/configure.in.
* vendor/fuse-emulator/current/fuse/ui/win32/installer/fuse.nsi.in:
Renamed from
vendor/fuse-emulator/current/fuse/ui/win32/installer/fuse.nsi.
Added Paths:
-----------
vendor/fuse-emulator/current/fuse/configure.ac
vendor/fuse-emulator/current/fuse/ui/win32/installer/fuse.nsi.in
vendor/fuse-emulator/current/fuse-utils/configure.ac
vendor/fuse-emulator/current/libspectrum/configure.ac
Removed Paths:
-------------
vendor/fuse-emulator/current/fuse/configure.in
vendor/fuse-emulator/current/fuse/ui/win32/installer/fuse.nsi
vendor/fuse-emulator/current/fuse-utils/configure.in
vendor/fuse-emulator/current/libspectrum/configure.in
Copied: vendor/fuse-emulator/current/fuse/configure.ac (from rev 713, vendor/fuse-emulator/current/fuse/configure.in)
===================================================================
--- vendor/fuse-emulator/current/fuse/configure.ac (rev 0)
+++ vendor/fuse-emulator/current/fuse/configure.ac 2012-12-05 21:19:12 UTC (rev 714)
@@ -0,0 +1,820 @@
+dnl Process this file with autoconf to produce a configure script.
+dnl $Id: configure.in 4674 2012-02-20 11:03:58Z fredm $
+
+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
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License along
+dnl with this program; if not, write to the Free Software Foundation, Inc.,
+dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+dnl
+dnl Author contact information:
+dnl
+dnl E-mail: phi...@sh...
+
+AC_INIT(fuse.c)
+AM_CONFIG_HEADER(config.h)
+AC_CANONICAL_SYSTEM
+
+define(FUSE_VERSION, [1.0.0])
+
+dnl Use automake to produce `Makefile.in'
+AM_INIT_AUTOMAKE(fuse, FUSE_VERSION)
+
+dnl Checks for programs.
+AC_PROG_CC
+AC_PROG_RANLIB
+AC_PATH_PROG(PERL, perl)
+AC_SUBST(PERL)
+AM_PROG_LEX
+AC_PROG_YACC
+AC_PROG_LIBTOOL
+
+dnl Check for Win32 resource tool
+AC_MSG_CHECKING(whether to use windres)
+AC_ARG_WITH(windres,
+[ --without-windres don't use windres],
+if test "$withval" = no; then windres=no; else windres=yes; fi,
+windres=yes)
+AC_MSG_RESULT($windres)
+if test "$windres" = yes; then
+ AC_CHECK_TOOL(WINDRES, windres, no)
+ AC_SUBST(WINDRES)
+ if test "$WINDRES" != no; then
+ WINDRES_OBJ="windres.o"
+ define(FUSE_FULL_VERSION,
+ [ifelse(translit(FUSE_VERSION, [0-9]), [.], [FUSE_VERSION[.0.0]],
+ translit(FUSE_VERSION, [0-9]), [..], [FUSE_VERSION[.0]],
+ [FUSE_VERSION])])dnl
+ AC_DEFINE([VERSION_WIN32], [translit(FUSE_FULL_VERSION, [.], [,])], [Define version information for win32 executable])
+ FUSE_FULL[]_VERSION=FUSE_FULL_VERSION
+ AC_SUBST(FUSE_FULL[]_VERSION)
+ fi
+fi
+AC_SUBST(WINDRES_OBJ)
+
+dnl Generate commandy.h
+YFLAGS="$YFLAGS -d"
+AC_SUBST(YFLAGS)
+
+dnl Check for big endianness
+AC_C_BIGENDIAN
+
+dnl Checks for header files.
+AC_HEADER_STDC
+AC_CHECK_HEADERS(
+ libgen.h \
+ siginfo.h \
+ strings.h \
+ sys/soundcard.h \
+ sys/audio.h \
+ sys/audioio.h \
+ zlib.h
+)
+
+dnl Checks for typedefs, structures, and compiler characteristics.
+AC_C_CONST
+AC_INLINE
+
+dnl Checks for library functions.
+AC_CHECK_FUNCS(dirname geteuid getopt_long mkstemp fsync)
+
+dnl Allow the user to say that various libraries are in one place
+AC_ARG_WITH(local-prefix,
+[ --with-local-prefix=PFX local libraries installed in PFX (optional)],
+CPPFLAGS="$CPPFLAGS -I$withval/include"; LDFLAGS="$LDFLAGS -L$withval/lib",
+if test "$prefix" != "NONE"; then
+ CPPFLAGS="$CPPFLAGS -I$prefix/include"; LDFLAGS="$LDFLAGS -L$prefix/lib"
+fi)
+
+dnl Select a user interface
+
+dnl Try various UI options; set the `ui' variable when we've got one
+dnl we like, and then don't look at the other options
+
+AC_PATH_XTRA
+
+dnl Look for Win32 UI (default=no)
+AC_MSG_CHECKING(whether Win32 UI requested)
+AC_ARG_WITH(win32,
+[ --with-win32 use Win32 for user interface],
+if test "$withval" = no; then win32=no; else win32=yes; fi,
+win32=no)
+AC_MSG_RESULT($win32)
+if test "$win32" = yes; then
+ AC_CHECK_HEADER(windows.h,
+ LIBS="$LIBS -mwindows -lcomctl32 -lwinmm -lpthread -lws2_32";
+ 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])
+ UI=win32; UI_LIBS="ui/win32/libuiwin32.a",
+ AC_MSG_ERROR([Win32 UI not found]))
+fi
+
+dnl Look for svgalib (default=no)
+AC_MSG_CHECKING(whether svgalib UI requested)
+AC_ARG_WITH(svgalib,
+[ --with-svgalib use svgalib for user interface],
+if test "$withval" = no; then svgalib=no; else svgalib=yes; fi,
+svgalib=no)
+AC_MSG_RESULT($svgalib)
+if test "$svgalib" = yes; then
+ AC_CHECK_HEADER(vga.h,
+ LIBS="$LIBS -lvga";
+ AC_DEFINE([UI_SVGA], 1, [Defined if svgalib UI in use])
+ AC_DEFINE([USE_WIDGET], 1,
+ [Defined if we're using a widget-based UI])
+ UI=svga; WIDGET=widget;
+ UI_LIBS="ui/svga/libuisvga.a ui/widget/libwidget.a",
+ AC_MSG_ERROR([svgalib not found]))
+fi
+
+dnl Look for framebuffer interface for SA1110 (default=no)
+if test -z "$UI"; then
+ AC_MSG_CHECKING(whether framebuffer UI requested)
+ AC_ARG_WITH(fb,
+ [ --with-fb use framebuffer for user interface],
+ if test "$withval" = no; then fb=no; else fb=yes; fi,
+ fb=no)
+ AC_MSG_RESULT($fb)
+ if test "$fb" = yes; then
+ AC_DEFINE([UI_FB], 1, [Defined if framebuffer UI in use])
+ AC_DEFINE([USE_WIDGET], 1, [Defined if we're using a widget-based UI])
+ UI=fb; WIDGET=widget;
+ UI_LIBS="ui/fb/libuifb.a ui/widget/libwidget.a"
+ dnl Look for libgpm (default=yes)
+ AC_MSG_CHECKING(whether gpm requested)
+ AC_ARG_WITH(gpm,
+ [ --without-gpm don't use libgpm for e.g. Kempston mouse],
+ if test "$withval" = no; then gpm=no; else gpm=yes; fi,
+ gpm=yes)
+ AC_MSG_RESULT($gpm)
+ dnl Note: we use libdl to get libgpm at runtime
+ if test "$gpm" = yes; then
+ AC_CHECK_HEADER(gpm.h,
+ UI_LIBS="$UI_LIBS -ldl";
+ AC_DEFINE([HAVE_GPM_H], 1, [Defined if gpm in use]),
+ AC_MSG_ERROR([libgpm not found]))
+ fi
+ fi
+fi
+
+dnl Look for Wii interface (default = 0)
+if test -z "$UI"; then
+ AC_MSG_CHECKING(whether Wii UI requested)
+ AC_ARG_WITH(wii,
+ [ --with-wii use Wii FB for user interface],
+ if test "$withval" = no; then wii=no; else wii=yes; fi,
+ wii=no)
+ AC_MSG_RESULT($wii)
+ if test "$wii" = yes; then
+ AC_DEFINE([UI_WII], 1, [Defined if Wii UI in use])
+ AC_DEFINE([USE_WIDGET], 1, [Defined if we're using a widget-based UI])
+ AC_DEFINE([USE_JOYSTICK], 1, [Defined if we're using hardware joysticks])
+ UI=wii; WIDGET=widget;
+ UI_LIBS="ui/wii/libuiwii.a ui/widget/libwidget.a"
+ target_os=wii
+ dnl Look for libgpm (default=yes)
+ AC_MSG_CHECKING(whether gpm requested)
+ AC_ARG_WITH(gpm,
+ [ --without-gpm don't use libgpm for e.g. Kempston mouse],
+ if test "$withval" = no; then gpm=no; else gpm=yes; fi,
+ gpm=yes)
+ AC_MSG_RESULT($gpm)
+ dnl Note: we use libdl to get libgpm at runtime
+ if test "$gpm" = yes; then
+ AC_CHECK_HEADER(gpm.h,
+ UI_LIBS="$UI_LIBS -ldl";
+ AC_DEFINE([HAVE_GPM_H], 1, [Defined if gpm in use]),
+ AC_MSG_ERROR([libgpm not found]))
+ fi
+ fi
+fi
+
+dnl Look for SDL (default=no)
+if test -z "$UI"; then
+ AC_MSG_CHECKING(whether SDL UI requested)
+ AC_ARG_WITH(sdl,
+ [ --with-sdl use SDL for user interface],
+ if test "$withval" = no; then sdl=no; else sdl=yes; fi,
+ sdl=no)
+ AC_MSG_RESULT($sdl)
+ if test "$sdl" = yes; then
+ SDL_VERSION=1.2.4
+ AM_PATH_SDL($SDL_VERSION,
+ AC_DEFINE([UI_SDL], 1, [Defined if the SDL UI in use])
+ AC_DEFINE([USE_WIDGET], 1,
+ [Defined if we're using a widget-based UI])
+ UI=sdl; WIDGET=widget;
+ UI_LIBS="ui/sdl/libuisdl.a ui/widget/libwidget.a",
+ AC_MSG_ERROR([SDL version $SDL_VERSION not found]))
+ fi
+fi
+
+dnl Look for GTK+ (default=yes)
+if test -z "$UI"; then
+ AC_MSG_CHECKING(whether GTK+ UI requested)
+ AC_ARG_WITH(gtk,
+ [ --without-gtk don't use GTK+ for user interface],
+ if test "$withval" = no; then gtk=no; else gtk=yes; fi,
+ gtk=yes)
+ AC_MSG_RESULT($gtk)
+ if test "$gtk" = yes; then
+ AM_PATH_GTK_2_0(2.18.0,
+ AC_DEFINE([UI_GTK], 1,
+ [Defined if GTK+ UI 2.x is in use])
+ AC_DEFINE([HAVE_LIB_GLIB], 1, [Defined if we've got glib])
+ UI=gtk; UI_LIBS="ui/gtk/libuigtk.la",
+ AC_MSG_WARN([GTK+ not found. Reverting to Xlib]))
+ fi
+fi
+
+if test "$UI" = gtk; then
+ AC_PATH_XTRA
+fi
+
+dnl Look for Xlib UI (default=yes)
+if test -z "$UI"; then
+ if test "$with_x" = no; then
+ AC_MSG_ERROR([Please specify --with-svgalib or --with-fb, not --without-x.])
+ fi
+ AC_PATH_XTRA
+ CFLAGS="$CFLAGS $X_CFLAGS";
+ LDFLAGS="$LDFLAGS $X_LIBS";
+ LIBS="$LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS";
+
+ dnl This apparently needed for SVR4 systems to link correctly
+ dnl Basically the same as a part of AC_PATH_XTRA, but using `gethostname'
+ dnl instead of `gethostbyname'.
+ dnl Thanks to Erik Kunze for pointing out this problem
+ AC_CHECK_FUNC(gethostname)
+ if test $ac_cv_func_gethostname = no; then
+ AC_CHECK_LIB(nsl, gethostname, X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl")
+ fi
+ AC_CHECK_FUNC(connect)
+ if test $ac_cv_func_connect = no; then
+ AC_CHECK_LIB(socket, connect, X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS", ,
+ $X_EXTRA_LIBS)
+ fi
+
+ dnl Check for the MIT-SHM extension
+ AC_CHECK_HEADERS( X11/extensions/XShm.h,,,[[
+ #include <sys/ipc.h>
+ #include <sys/shm.h>
+ #include <X11/Xlib.h>
+ ]])
+ AC_CHECK_LIB( Xext, XShmAttach, LIBS="$LIBS -lXext" )
+
+ AC_DEFINE([UI_X], 1, [Defined if Xlib UI in use])
+ UI=xlib; WIDGET=widget;
+ AC_DEFINE([USE_WIDGET], 1, [Defined if we're using a widget-based UI])
+ UI_LIBS="ui/xlib/libuixlib.a ui/widget/libwidget.a"
+fi
+
+AC_SUBST(UI)
+AC_SUBST(UI_LIBS)
+AC_SUBST(WIDGET)
+AM_CONDITIONAL(WIDGET, test x$WIDGET != x)
+
+# If we're not using GTK+, must either find glib or use the replacement
+# (as supplied by libspectrum)
+if test "$UI" != gtk; then
+ AC_MSG_CHECKING(whether to use glib)
+ AC_ARG_WITH(glib,
+ [ --without-glib don't use glib],
+ if test "$withval" = no; then glib=no; else glib=yes; fi,
+ glib=yes)
+ AC_MSG_RESULT($glib)
+ if test "$glib" = yes; then
+ AM_PATH_GLIB_2_0(
+ 2.20.0,
+ AC_DEFINE([HAVE_LIB_GLIB], 1, [Defined if we've got glib])
+ LIBS="$LIBS `pkg-config --libs glib-2.0`",
+ AC_MSG_WARN(glib not found - using libspectrum's replacement)
+ )
+ fi
+fi
+
+dnl Check that libspectrum is available
+AC_ARG_WITH(libspectrum-prefix,
+[ --with-libspectrum-prefix=PFX where libspectrum is installed (optional)],
+LIBSPEC_CFLAGS=-I$withval/include; LIBSPEC_LIBS=-L$withval/lib,
+LIBSPEC_CFLAGS=""; LIBSPEC_LIBS="")
+ac_save_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $LIBSPEC_CFLAGS $GTK_CFLAGS $GLIB_CFLAGS"
+AC_CHECK_HEADERS(libspectrum.h,LIBSPEC_LIBS="$LIBSPEC_LIBS -lspectrum",
+ AC_MSG_ERROR(Sorry - I need libspectrum to be available))
+CPPFLAGS="$ac_save_CPPFLAGS"
+AC_SUBST(LIBSPEC_CFLAGS)
+AC_SUBST(LIBSPEC_LIBS)
+
+dnl Check if supplied libspectrum has support for compressed szx files
+AC_MSG_CHECKING(whether libspectrum supports compressed szx snaps)
+ac_save_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $LIBSPEC_CFLAGS"
+AC_TRY_COMPILE([#include <libspectrum.h>],[
+ int test = LIBSPECTRUM_SUPPORTS_ZLIB_COMPRESSION;
+],
+ AUTOLOAD_SNAPS=compressed; LIBSPEC_HAVE_ZLIB=yes; AC_MSG_RESULT(yes),
+ AUTOLOAD_SNAPS=uncompressed; LIBSPEC_HAVE_ZLIB=""; AC_MSG_RESULT(no))
+CPPFLAGS="$ac_save_CPPFLAGS"
+AC_SUBST(AUTOLOAD_SNAPS)
+AC_SUBST(LIBSPEC_HAVE_ZLIB)
+AC_LINK_FILES([
+ lib/"$AUTOLOAD_SNAPS"/disk_plus3.szx
+ lib/"$AUTOLOAD_SNAPS"/tape_128.szx
+ lib/"$AUTOLOAD_SNAPS"/tape_16.szx
+ lib/"$AUTOLOAD_SNAPS"/tape_2048.szx
+ lib/"$AUTOLOAD_SNAPS"/tape_2068.szx
+ lib/"$AUTOLOAD_SNAPS"/tape_48.szx
+ lib/"$AUTOLOAD_SNAPS"/tape_plus2.szx
+ lib/"$AUTOLOAD_SNAPS"/tape_plus2a.szx
+ lib/"$AUTOLOAD_SNAPS"/tape_plus3.szx
+ lib/"$AUTOLOAD_SNAPS"/tape_plus3e.szx
+ lib/"$AUTOLOAD_SNAPS"/tape_pentagon.szx
+ lib/"$AUTOLOAD_SNAPS"/tape_scorpion.szx
+ lib/"$AUTOLOAD_SNAPS"/tape_se.szx
+ lib/"$AUTOLOAD_SNAPS"/tape_ts2068.szx],
+ [lib/disk_plus3.szx
+ lib/tape_128.szx
+ lib/tape_16.szx
+ lib/tape_2048.szx
+ lib/tape_2068.szx
+ lib/tape_48.szx
+ lib/tape_plus2.szx
+ lib/tape_plus2a.szx
+ lib/tape_plus3.szx
+ lib/tape_plus3e.szx
+ lib/tape_pentagon.szx
+ lib/tape_scorpion.szx
+ lib/tape_se.szx
+ lib/tape_ts2068.szx])
+
+dnl Check whether to use zlib (the UNIX version is called z, Win32 zdll)
+AC_MSG_CHECKING(whether to use zlib)
+AC_ARG_WITH(zlib,
+[ --without-zlib don't use zlib],
+if test "$withval" = no; then zlib=no; else zlib=yes; fi,
+zlib=yes)
+AC_MSG_RESULT($zlib)
+if test "$zlib" = yes; then
+ AC_CHECK_HEADERS(
+ zlib.h,
+ AC_SEARCH_LIBS(compress2, z zdll)
+ )
+fi
+
+dnl Check if supplied libspectrum has support for bz2 compressed files
+AC_MSG_CHECKING(whether libspectrum supports compressed bz2 files)
+ac_save_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $LIBSPEC_CFLAGS"
+AC_TRY_COMPILE([#include <libspectrum.h>],[
+ int test = LIBSPECTRUM_SUPPORTS_BZ2_COMPRESSION;
+],
+ LIBSPEC_HAVE_BZ2=yes; AC_MSG_RESULT(yes),
+ LIBSPEC_HAVE_BZ2=""; AC_MSG_RESULT(no))
+CPPFLAGS="$ac_save_CPPFLAGS"
+AC_SUBST(LIBSPEC_HAVE_BZ2)
+
+dnl Check if supplied libspectrum has support for wav files
+AC_MSG_CHECKING(whether libspectrum supports wav files)
+ac_save_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $LIBSPEC_CFLAGS"
+AC_TRY_COMPILE([#include <libspectrum.h>],[
+ int test = LIBSPECTRUM_SUPPORTS_AUDIOFILE;
+],
+ LIBSPEC_HAVE_AUDIOFILE=yes; AC_MSG_RESULT(yes),
+ LIBSPEC_HAVE_AUDIOFILE=""; AC_MSG_RESULT(no))
+CPPFLAGS="$ac_save_CPPFLAGS"
+AC_SUBST(LIBSPEC_HAVE_AUDIOFILE)
+
+dnl Check if a version of libpng which supplies png_write_png is available
+AC_MSG_CHECKING(whether PNG support requested)
+AC_ARG_WITH(png,
+[ --without-png don't use libpng],
+if test "$withval" = no; then libpng=no; else libpng=yes; fi,
+libpng=yes)
+AC_MSG_RESULT($libpng)
+if test "$libpng" = yes; then
+ AC_PATH_PROG([LIBPNG_CONFIG], [libpng-config])
+ if test -n "$LIBPNG_CONFIG"; then
+ PNG_CFLAGS=`libpng-config --cflags`
+ PNG_LIBS=`libpng-config --ldflags`
+ AC_DEFINE([USE_LIBPNG], 1, [Defined if we're going to be using the installed libpng])
+ else
+ ac_save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $PNG_CFLAGS"
+ ac_save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$PNG_LIBS $LDFLAGS"
+
+ AC_CHECK_LIB( png, png_write_png,
+ [AC_CHECK_HEADER(
+ png.h,
+ [AC_DEFINE([USE_LIBPNG], 1, [Defined if we're going to be using the installed libpng]) PNG_LIBS='-lpng -lm -lz'],
+ [AC_CHECK_HEADERS(libpng/png.h,
+ [CPPFLAGS="$ac_save_CPPFLAGS $PNG_CFLAGS/libpng"
+ AC_DEFINE([USE_LIBPNG], 1, [Defined if we're going to be using the installed libpng]) PNG_LIBS='-lpng -lm -lz'],
+ [AC_MSG_WARN(png.h not found - saving screenshots disabled)
+ PNG_LIBS='']
+ )],
+ )],
+ [AC_MSG_WARN(png_write_png not found - saving screenshots disabled)
+ PNG_LIBS='']
+ )
+
+ CPPFLAGS="$ac_save_CPPFLAGS"
+ LDFLAGS="$ac_save_LDFLAGS"
+ fi
+
+ AC_SUBST(PNG_LIBS)
+fi
+
+dnl Check if a version of libasound which supplies pcm is available
+AC_MSG_CHECKING(whether ALSA requested)
+AC_ARG_WITH(alsa,
+[ --without-alsa don't use libasound (ALSA)],
+if test "$withval" = no; then libasound=no; else libasound=yes; fi,
+libasound=yes)
+AC_MSG_RESULT($libasound)
+if test "$libasound" = yes; then
+ AC_CHECK_LIB( asound, snd_pcm_hw_params_set_period_size_near,
+ [AC_CHECK_HEADER(
+ alsa/asoundlib.h,
+ [alsa_available=yes],
+ [AC_MSG_WARN(alsa/asoundlib.h not found - no ALSA output)]
+ )],
+ [AC_MSG_WARN(snd_pcm_hw_params_set_period_size_near not found - no ALSA output)]
+ )
+fi
+
+dnl Check if a version of libao which supplies ao_open_live is available
+AC_MSG_CHECKING(whether libao requested)
+AC_ARG_WITH(libao,
+[ --with-libao use libao for sound output],
+if test "$withval" = no; then libao=no; else libao=yes; fi,
+libao=no)
+AC_MSG_RESULT($libao)
+if test "$libao" = yes; then
+ AC_CHECK_LIB( ao, ao_open_live,
+ [AC_CHECK_HEADER(
+ ao/ao.h,
+ [ao_available=yes],
+ [AC_MSG_WARN(ao/ao.h not found - no libao sound output)]
+ )],
+ [AC_MSG_WARN(ao_open_live not found - no libao sound output)]
+ )
+fi
+
+dnl Check if DirectSound is available
+AC_CHECK_HEADER(
+ dsound.h,
+ [dxsound_available=yes],
+ [AC_MSG_WARN(dsound.h not found - no DirectSound output)],
+ [#define DIRECTSOUND_VERSION 0x0700]
+)
+
+dnl Check if MS Windows Multimedia API sound is available
+AC_CHECK_HEADER(
+ mmsystem.h,
+ [win32sound_available=yes],
+ [AC_MSG_WARN(mmsystem.h not found - no MS Windows Multimedia API sound output)],
+ [#include <windows.h>]
+)
+
+dnl Check if CoreAudio is available
+AC_CHECK_HEADER(
+ CoreAudio/AudioHardware.h,
+ [coreaudio_available=yes],
+ [AC_MSG_WARN(CoreAudio/AudioHardware.h not found - no CoreAudio sound output)]
+)
+
+dnl
+dnl Decide which sound routines to use
+dnl
+
+AC_MSG_CHECKING(which sound routines to use)
+if test "$UI" = sdl; then
+ SOUND_LIBADD='sdlsound.$(OBJEXT)' SOUND_LIBS='' sound_fifo=yes
+ AC_MSG_RESULT(SDL)
+elif test "$dxsound_available" = yes; then
+ SOUND_LIBADD='dxsound.$(OBJEXT)' SOUND_LIBS='-ldsound -lole32 -ldxguid'
+ AC_MSG_RESULT(DirectX)
+ AC_DEFINE([DIRECTSOUND_VERSION], 0x0700, [DirectX 7 or higher is required])
+elif test "$win32sound_available" = yes; then
+ SOUND_LIBADD='win32sound.$(OBJEXT)' SOUND_LIBS='-lwinmm'
+ AC_MSG_RESULT(win32sound)
+elif test "$alsa_available" = yes; then
+ SOUND_LIBADD='alsasound.$(OBJEXT)' SOUND_LIBS='-lasound'
+ AC_MSG_RESULT(ALSA)
+elif test "$ao_available" = yes; then
+ SOUND_LIBADD='aosound.$(OBJEXT)' SOUND_LIBS='-lao'
+ AC_MSG_RESULT(libao)
+elif test "$ac_cv_header_dsound_h" = yes; then
+ # Later selection between these two
+ SOUND_LIBADD='sunsound.$(OBJEXT) hpsound.$(OBJEXT)' SOUND_LIBS=''
+ AC_MSG_RESULT(Solaris or HP/UX)
+elif test "$ac_cv_header_sys_soundcard_h" = yes; then
+ SOUND_LIBADD='osssound.$(OBJEXT)' SOUND_LIBS=''
+ AC_MSG_RESULT(OSS)
+elif test "$ac_cv_header_sys_audioio_h" = yes; then
+ dnl OpenBSD
+ SOUND_LIBADD='sunsound.$(OBJEXT)' SOUND_LIBS=''
+ AC_MSG_RESULT(OpenBSD)
+elif test "$coreaudio_available" = yes; then
+ SOUND_LIBADD='coreaudiosound.$(OBJEXT)' SOUND_LIBS='-framework CoreAudio -framework AudioUnit -framework CoreServices' sound_fifo=yes
+ AC_MSG_RESULT(CoreAudio)
+elif test "$wii" = yes; then
+ SOUND_LIBADD='wiisound.$(OBJEXT)' SOUND_LIBS='' sound_fifo=yes
+ AC_MSG_RESULT(Wii)
+else
+ SOUND_LIBADD='nullsound.$(OBJEXT)' SOUND_LIBS=''
+ AC_MSG_RESULT(none)
+ AC_DEFINE([NO_SOUND], 1, [Defined if no sound code is present])
+fi
+
+if test "$sound_fifo" = yes; then
+ dnl Strange construct used here as += doesn't seem to work on OS X
+ SOUND_LIBADD="$SOUND_LIBADD"' sfifo.$(OBJEXT)'
+ AC_DEFINE([SOUND_FIFO], 1, [Defined if the sound code uses a fifo])
+fi
+
+AC_SUBST(SOUND_LIBADD)
+AC_SUBST(SOUND_LIBS)
+
+dnl Are we supplying the ROMs or relying on another package?
+AC_MSG_CHECKING(where to find the Spectrum ROM images)
+AC_ARG_WITH(roms-dir,
+ [ --with-roms-dir=DIR location of the Spectrum ROM images],
+ ,
+ unset withval
+)
+if test "$withval" = ""; then
+ echo 'we supply them'
+else
+ echo "$withval"
+ AC_DEFINE_UNQUOTED(ROMSDIR, "$withval", [Location of the ROM images])
+fi
+
+AC_MSG_CHECKING(whether hardware joystick support requested)
+ AC_ARG_WITH(joystick,
+ [ --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)
+if test "$stick" = yes; then
+ dnl We prefer to use UI-specific joystick code. (Default.)
+ dnl If there is none, or you override this here, we use libjsw.
+ dnl (svgalib appears to dislike switched joysticks on the parallel port...)
+ case "$UI" in
+ svga|sdl|win32)
+ dnl Libraries such as svgalib provide their own joystick code.
+ AC_MSG_CHECKING([whether to use $UI's joystick support])
+ AC_ARG_ENABLE(ui-joystick,
+ AS_HELP_STRING([--disable-ui-joystick], [use libjsw joystick code (where supported)]),
+ if test "$enableval" = no; then libjsw=yes; else libjsw=no; fi,
+ libjsw=no)
+ if test "$libjsw" = yes; then
+ AC_MSG_RESULT([no, use libjsw])
+ else
+ AC_MSG_RESULT(yes)
+ AC_DEFINE([USE_JOYSTICK], 1, [Defined if we're using hardware joysticks])
+ fi
+ ;;
+ gtk|xlib)
+ dnl These UIs could use SDL library for handling joysticks
+ AC_MSG_CHECKING([whether to use $UI's joystick support])
+ AC_ARG_ENABLE(ui-joystick,
+ AS_HELP_STRING([--disable-ui-joystick], [use libjsw joystick code (where supported)]),
+ if test "$enableval" = no; then libjsw=yes; else libjsw=no; fi,
+ libjsw=no)
+ if test "$libjsw" = yes; then
+ AC_MSG_RESULT([no, use libjsw])
+ else
+ AC_MSG_RESULT(yes)
+ SDL_VERSION=1.2.4
+ AM_PATH_SDL($SDL_VERSION,
+ LIBS="$LIBS `sdl-config --libs`"
+ CPPFLAGS="$CPPFLAGS `sdl-config --cflags`"
+ AC_DEFINE([USE_JOYSTICK], 1, [Defined if we're using hardware joysticks]),
+ AC_MSG_WARN([SDL version $SDL_VERSION not found - joystick support disabled]))
+ fi
+ ;;
+ wii)
+ dnl Wii UI check this elsewhere
+ AC_MSG_RESULT(yes)
+ libjsw=no
+ ;;
+ *)
+ dnl Our only option is libjsw.
+ libjsw=yes
+ ;;
+ esac
+ if test "$libjsw" = yes; then
+ dnl Look for libjsw. If missing, use QAOP<space>.
+ AC_CHECK_HEADERS(jsw.h,
+ LIBS="$LIBS -ljsw";
+ AC_DEFINE([USE_JOYSTICK], 1,
+ [Defined if we're using hardware joysticks]),
+ AC_MSG_WARN(jsw.h not found - joystick support disabled))
+ fi
+fi
+
+dnl See if libxml2 is available (for the config file handling)
+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 will use ini format))
+fi
+
+dnl Work out which timer routines to use
+AC_MSG_CHECKING(which timer routines to use)
+if test "$UI" = sdl; then
+ TIMER_LIBADD='sdl.$(OBJEXT)'
+ AC_MSG_RESULT(SDL)
+else
+ TIMER_LIBADD='native.$(OBJEXT)'
+ AC_MSG_RESULT(native)
+fi
+AC_SUBST(TIMER_LIBADD)
+
+dnl See if Linux TAP devices are supported
+AC_MSG_CHECKING(whether Linux TAP devices are supported)
+ac_save_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $LIBSPEC_CFLAGS"
+AC_TRY_COMPILE([
+ #include <linux/if_tun.h>
+ #include <net/if.h>
+ #include <sys/ioctl.h>
+ ],[
+ int test1 = IFF_TAP | IFF_NO_PI;
+ int test2 = TUNSETIFF;
+ ],
+ AC_DEFINE([LINUX_TAP], 1, [Define to 1 if Linux TAP devices are supported.])
+ AC_MSG_RESULT(yes),
+ AC_MSG_RESULT(no))
+
+CPPFLAGS="$ac_save_CPPFLAGS"
+
+dnl Work out which standard routines we're missing
+AC_MSG_CHECKING(which standard routines we're missing)
+missing_routines=''
+if test "$ac_cv_func_dirname" = no; then
+ missing_routines="$missing_routines"'dirname '
+fi
+AM_CONDITIONAL(COMPAT_DIRNAME, test "$ac_cv_func_dirname" = no)
+if test "$ac_cv_func_getopt_long" = no; then
+ case "$target_os" in
+ amigaos|morphos)
+ dnl Our getopt_long replacement doesn't work, so don't use it
+ ;;
+ *)
+ compat_getopt=yes
+ missing_routines="$missing_routines"'getopt_long '
+ ;;
+ esac
+fi
+AM_CONDITIONAL(COMPAT_GETOPT, test "$compat_getopt" = yes)
+if test "$ac_cv_func_mkstemp" = no; then
+ missing_routines="$missing_routines"'mkstemp '
+fi
+AM_CONDITIONAL(COMPAT_MKSTEMP, test "$ac_cv_func_mkstemp" = no)
+if test "x$missing_routines" = x; then
+ missing_routines='(none)'
+fi
+AC_MSG_RESULT($missing_routines)
+
+dnl Work out which compatibility routines to use
+AC_MSG_CHECKING(which compatibility routines to use)
+case "$target_os" in
+ amigaos)
+ COMPAT_OSNAME='amiga'
+ ;;
+ morphos)
+ COMPAT_OSNAME='morphos'
+ ;;
+ mingw32*)
+ COMPAT_OSNAME='win32'
+ ;;
+ wii)
+ COMPAT_OSNAME='wii'
+ ;;
+ *)
+ COMPAT_OSNAME='unix'
+ ;;
+esac
+AC_MSG_RESULT($COMPAT_OSNAME)
+COMPAT_SUBDIR="compat/$COMPAT_OSNAME"
+AC_SUBST(COMPAT_SUBDIR)
+AC_SUBST(COMPAT_OSNAME)
+
+dnl Decide whether to install desktop and mime files
+AC_ARG_ENABLE(desktop-integration,
+AS_HELP_STRING([--enable-desktop-integration], [add menu entry and file associations]),
+if test "$enableval" = yes; then desktopintegration=yes; else desktopintegration=no; fi,
+desktdesktopintegration=no)
+AC_MSG_CHECKING(whether to install desktop file)
+AC_MSG_RESULT($desktopintegration)
+AM_CONDITIONAL(DESKTOP_INTEGRATION, test "$desktopintegration" = yes)
+AC_CHECK_PROGS(GTK_UPDATE_ICON_CACHE,gtk-update-icon-cache,true)
+
+dnl Where to install the desktop and mime files
+AC_ARG_WITH(desktop-dir,
+AS_HELP_STRING([--with-desktop-dir=DIR], [location of desktop files (default=datadir)]),
+if test "$withval" = no; then desktopdir=no; else desktopdir=yes; fi,
+desktopdir=no)
+if test "$desktopdir" = yes; then
+ DESKTOP_DATADIR=$with_desktop_dir
+else
+ DESKTOP_DATADIR="$datadir"
+fi
+AM_CONDITIONAL(DESKTOP_DATADIR, test "$desktopdir" == yes)
+AC_SUBST(DESKTOP_DATADIR)
+
+dnl Do we want the low memory compile?
+AC_MSG_CHECKING(whether low memory compile requested)
+AC_ARG_ENABLE(smallmem,
+[ --enable-smallmem low memory compile needed],
+if test "$enableval" = yes; then
+ smallmem=yes;
+else
+ smallmem=no;
+fi,
+smallmem=no)
+if test "$smallmem" = no; then
+ AC_DEFINE([HAVE_ENOUGH_MEMORY], 1, [Defined if we've got enough memory to compile z80_ops.c])
+fi
+AC_MSG_RESULT($smallmem)
+
+dnl Do we want lots of warning messages?
+AC_MSG_CHECKING(whether lots of warnings requested)
+AC_ARG_ENABLE(warnings,
+[ --enable-warnings give lots of warnings if using gcc],
+if test "$enableval" = yes; then
+ warnings=yes;
+else
+ warnings=no;
+fi,
+warnings=no)
+AC_MSG_RESULT($warnings)
+
+dnl If it appears we're using gcc as our compiler, turn on warnings
+if test "$ac_cv_prog_gcc" = yes; then
+ CFLAGS="$CFLAGS -Wall"
+ dnl And possibly lots of warnings
+ if test "$warnings" = yes; then
+ CFLAGS="$CFLAGS -Wstrict-prototypes -Wmissing-prototypes -Winline -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Waggregate-return -W -Wsign-compare"
+ fi
+fi
+
+AC_OUTPUT(Makefile \
+compat/amiga/Makefile \
+compat/morphos/Makefile \
+compat/unix/Makefile \
+compat/wii/Makefile \
+compat/win32/Makefile \
+data/Makefile \
+debugger/Makefile \
+hacking/Makefile \
+lib/Makefile \
+machines/Makefile \
+man/Makefile \
+peripherals/Makefile \
+peripherals/disk/Makefile \
+peripherals/ide/Makefile \
+peripherals/nic/Makefile \
+peripherals/flash/Makefile \
+perl/Makefile \
+perl/Fuse/Makefile \
+pokefinder/Makefile \
+roms/Makefile \
+sound/Makefile \
+timer/Makefile \
+ui/Makefile \
+ui/fb/Makefile \
+ui/wii/Makefile \
+ui/gtk/Makefile \
+ui/svga/Makefile \
+ui/sdl/Makefile \
+ui/scaler/Makefile \
+ui/widget/Makefile \
+ui/win32/fuse.manifest \
+ui/win32/Makefile \
+ui/win32/icons/Makefile \
+ui/win32/installer/Makefile \
+ui/xlib/Makefile \
+unittests/Makefile \
+z80/Makefile \
+z80/tests/Makefile)
Deleted: vendor/fuse-emulator/current/fuse/configure.in
===================================================================
--- vendor/fuse-emulator/current/fuse/configure.in 2012-12-05 12:44:59 UTC (rev 713)
+++ vendor/fuse-emulator/current/fuse/configure.in 2012-12-05 21:19:12 UTC (rev 714)
@@ -1,820 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-dnl $Id: configure.in 4674 2012-02-20 11:03:58Z fredm $
-
-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
-dnl the Free Software Foundation; either version 2 of the License, or
-dnl (at your option) any later version.
-dnl
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-dnl GNU General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU General Public License along
-dnl with this program; if not, write to the Free Software Foundation, Inc.,
-dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-dnl
-dnl Author contact information:
-dnl
-dnl E-mail: phi...@sh...
-
-AC_INIT(fuse.c)
-AM_CONFIG_HEADER(config.h)
-AC_CANONICAL_SYSTEM
-
-define(FUSE_VERSION, [1.0.0])
-
-dnl Use automake to produce `Makefile.in'
-AM_INIT_AUTOMAKE(fuse, FUSE_VERSION)
-
-dnl Checks for programs.
-AC_PROG_CC
-AC_PROG_RANLIB
-AC_PATH_PROG(PERL, perl)
-AC_SUBST(PERL)
-AM_PROG_LEX
-AC_PROG_YACC
-AC_PROG_LIBTOOL
-
-dnl Check for Win32 resource tool
-AC_MSG_CHECKING(whether to use windres)
-AC_ARG_WITH(windres,
-[ --without-windres don't use windres],
-if test "$withval" = no; then windres=no; else windres=yes; fi,
-windres=yes)
-AC_MSG_RESULT($windres)
-if test "$windres" = yes; then
- AC_CHECK_TOOL(WINDRES, windres, no)
- AC_SUBST(WINDRES)
- if test "$WINDRES" != no; then
- WINDRES_OBJ="windres.o"
- define(FUSE_FULL_VERSION,
- [ifelse(translit(FUSE_VERSION, [0-9]), [.], [FUSE_VERSION[.0.0]],
- translit(FUSE_VERSION, [0-9]), [..], [FUSE_VERSION[.0]],
- [FUSE_VERSION])])dnl
- AC_DEFINE([VERSION_WIN32], [translit(FUSE_FULL_VERSION, [.], [,])], [Define version information for win32 executable])
- FUSE_FULL[]_VERSION=FUSE_FULL_VERSION
- AC_SUBST(FUSE_FULL[]_VERSION)
- fi
-fi
-AC_SUBST(WINDRES_OBJ)
-
-dnl Generate commandy.h
-YFLAGS="$YFLAGS -d"
-AC_SUBST(YFLAGS)
-
-dnl Check for big endianness
-AC_C_BIGENDIAN
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(
- libgen.h \
- siginfo.h \
- strings.h \
- sys/soundcard.h \
- sys/audio.h \
- sys/audioio.h \
- zlib.h
-)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_INLINE
-
-dnl Checks for library functions.
-AC_CHECK_FUNCS(dirname geteuid getopt_long mkstemp fsync)
-
-dnl Allow the user to say that various libraries are in one place
-AC_ARG_WITH(local-prefix,
-[ --with-local-prefix=PFX local libraries installed in PFX (optional)],
-CPPFLAGS="$CPPFLAGS -I$withval/include"; LDFLAGS="$LDFLAGS -L$withval/lib",
-if test "$prefix" != "NONE"; then
- CPPFLAGS="$CPPFLAGS -I$prefix/include"; LDFLAGS="$LDFLAGS -L$prefix/lib"
-fi)
-
-dnl Select a user interface
-
-dnl Try various UI options; set the `ui' variable when we've got one
-dnl we like, and then don't look at the other options
-
-AC_PATH_XTRA
-
-dnl Look for Win32 UI (default=no)
-AC_MSG_CHECKING(whether Win32 UI requested)
-AC_ARG_WITH(win32,
-[ --with-win32 use Win32 for user interface],
-if test "$withval" = no; then win32=no; else win32=yes; fi,
-win32=no)
-AC_MSG_RESULT($win32)
-if test "$win32" = yes; then
- AC_CHECK_HEADER(windows.h,
- LIBS="$LIBS -mwindows -lcomctl32 -lwinmm -lpthread -lws2_32";
- 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])
- UI=win32; UI_LIBS="ui/win32/libuiwin32.a",
- AC_MSG_ERROR([Win32 UI not found]))
-fi
-
-dnl Look for svgalib (default=no)
-AC_MSG_CHECKING(whether svgalib UI requested)
-AC_ARG_WITH(svgalib,
-[ --with-svgalib use svgalib for user interface],
-if test "$withval" = no; then svgalib=no; else svgalib=yes; fi,
-svgalib=no)
-AC_MSG_RESULT($svgalib)
-if test "$svgalib" = yes; then
- AC_CHECK_HEADER(vga.h,
- LIBS="$LIBS -lvga";
- AC_DEFINE([UI_SVGA], 1, [Defined if svgalib UI in use])
- AC_DEFINE([USE_WIDGET], 1,
- [Defined if we're using a widget-based UI])
- UI=svga; WIDGET=widget;
- UI_LIBS="ui/svga/libuisvga.a ui/widget/libwidget.a",
- AC_MSG_ERROR([svgalib not found]))
-fi
-
-dnl Look for framebuffer interface for SA1110 (default=no)
-if test -z "$UI"; then
- AC_MSG_CHECKING(whether framebuffer UI requested)
- AC_ARG_WITH(fb,
- [ --with-fb use framebuffer for user interface],
- if test "$withval" = no; then fb=no; else fb=yes; fi,
- fb=no)
- AC_MSG_RESULT($fb)
- if test "$fb" = yes; then
- AC_DEFINE([UI_FB], 1, [Defined if framebuffer UI in use])
- AC_DEFINE([USE_WIDGET], 1, [Defined if we're using a widget-based UI])
- UI=fb; WIDGET=widget;
- UI_LIBS="ui/fb/libuifb.a ui/widget/libwidget.a"
- dnl Look for libgpm (default=yes)
- AC_MSG_CHECKING(whether gpm requested)
- AC_ARG_WITH(gpm,
- [ --without-gpm don't use libgpm for e.g. Kempston mouse],
- if test "$withval" = no; then gpm=no; else gpm=yes; fi,
- gpm=yes)
- AC_MSG_RESULT($gpm)
- dnl Note: we use libdl to get libgpm at runtime
- if test "$gpm" = yes; then
- AC_CHECK_HEADER(gpm.h,
- UI_LIBS="$UI_LIBS -ldl";
- AC_DEFINE([HAVE_GPM_H], 1, [Defined if gpm in use]),
- AC_MSG_ERROR([libgpm not found]))
- fi
- fi
-fi
-
-dnl Look for Wii interface (default = 0)
-if test -z "$UI"; then
- AC_MSG_CHECKING(whether Wii UI requested)
- AC_ARG_WITH(wii,
- [ --with-wii use Wii FB for user interface],
- if test "$withval" = no; then wii=no; else wii=yes; fi,
- wii=no)
- AC_MSG_RESULT($wii)
- if test "$wii" = yes; then
- AC_DEFINE([UI_WII], 1, [Defined if Wii UI in use])
- AC_DEFINE([USE_WIDGET], 1, [Defined if we're using a widget-based UI])
- AC_DEFINE([USE_JOYSTICK], 1, [Defined if we're using hardware joysticks])
- UI=wii; WIDGET=widget;
- UI_LIBS="ui/wii/libuiwii.a ui/widget/libwidget.a"
- target_os=wii
- dnl Look for libgpm (default=yes)
- AC_MSG_CHECKING(whether gpm requested)
- AC_ARG_WITH(gpm,
- [ --without-gpm don't use libgpm for e.g. Kempston mouse],
- if test "$withval" = no; then gpm=no; else gpm=yes; fi,
- gpm=yes)
- AC_MSG_RESULT($gpm)
- dnl Note: we use libdl to get libgpm at runtime
- if test "$gpm" = yes; then
- AC_CHECK_HEADER(gpm.h,
- UI_LIBS="$UI_LIBS -ldl";
- AC_DEFINE([HAVE_GPM_H], 1, [Defined if gpm in use]),
- AC_MSG_ERROR([libgpm not found]))
- fi
- fi
-fi
-
-dnl Look for SDL (default=no)
-if test -z "$UI"; then
- AC_MSG_CHECKING(whether SDL UI requested)
- AC_ARG_WITH(sdl,
- [ --with-sdl use SDL for user interface],
- if test "$withval" = no; then sdl=no; else sdl=yes; fi,
- sdl=no)
- AC_MSG_RESULT($sdl)
- if test "$sdl" = yes; then
- SDL_VERSION=1.2.4
- AM_PATH_SDL($SDL_VERSION,
- AC_DEFINE([UI_SDL], 1, [Defined if the SDL UI in use])
- AC_DEFINE([USE_WIDGET], 1,
- [Defined if we're using a widget-based UI])
- UI=sdl; WIDGET=widget;
- UI_LIBS="ui/sdl/libuisdl.a ui/widget/libwidget.a",
- AC_MSG_ERROR([SDL version $SDL_VERSION not found]))
- fi
-fi
-
-dnl Look for GTK+ (default=yes)
-if test -z "$UI"; then
- AC_MSG_CHECKING(whether GTK+ UI requested)
- AC_ARG_WITH(gtk,
- [ --without-gtk don't use GTK+ for user interface],
- if test "$withval" = no; then gtk=no; else gtk=yes; fi,
- gtk=yes)
- AC_MSG_RESULT($gtk)
- if test "$gtk" = yes; then
- AM_PATH_GTK_2_0(2.18.0,
- AC_DEFINE([UI_GTK], 1,
- [Defined if GTK+ UI 2.x is in use])
- AC_DEFINE([HAVE_LIB_GLIB], 1, [Defined if we've got glib])
- UI=gtk; UI_LIBS="ui/gtk/libuigtk.la",
- AC_MSG_WARN([GTK+ not found. Reverting to Xlib]))
- fi
-fi
-
-if test "$UI" = gtk; then
- AC_PATH_XTRA
-fi
-
-dnl Look for Xlib UI (default=yes)
-if test -z "$UI"; then
- if test "$with_x" = no; then
- AC_MSG_ERROR([Please specify --with-svgalib or --with-fb, not --without-x.])
- fi
- AC_PATH_XTRA
- CFLAGS="$CFLAGS $X_CFLAGS";
- LDFLAGS="$LDFLAGS $X_LIBS";
- LIBS="$LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS";
-
- dnl This apparently needed for SVR4 systems to link correctly
- dnl Basically the same as a part of AC_PATH_XTRA, but using `gethostname'
- dnl instead of `gethostbyname'.
- dnl Thanks to Erik Kunze for pointing out this problem
- AC_CHECK_FUNC(gethostname)
- if test $ac_cv_func_gethostname = no; then
- AC_CHECK_LIB(nsl, gethostname, X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl")
- fi
- AC_CHECK_FUNC(connect)
- if test $ac_cv_func_connect = no; then
- AC_CHECK_LIB(socket, connect, X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS", ,
- $X_EXTRA_LIBS)
- fi
-
- dnl Check for the MIT-SHM extension
- AC_CHECK_HEADERS( X11/extensions/XShm.h,,,[[
- #include <sys/ipc.h>
- #include <sys/shm.h>
- #include <X11/Xlib.h>
- ]])
- AC_CHECK_LIB( Xext, XShmAttach, LIBS="$LIBS -lXext" )
-
- AC_DEFINE([UI_X], 1, [Defined if Xlib UI in use])
- UI=xlib; WIDGET=widget;
- AC_DEFINE([USE_WIDGET], 1, [Defined if we're using a widget-based UI])
- UI_LIBS="ui/xlib/libuixlib.a ui/widget/libwidget.a"
-fi
-
-AC_SUBST(UI)
-AC_SUBST(UI_LIBS)
-AC_SUBST(WIDGET)
-AM_CONDITIONAL(WIDGET, test x$WIDGET != x)
-
-# If we're not using GTK+, must either find glib or use the replacement
-# (as supplied by libspectrum)
-if test "$UI" != gtk; then
- AC_MSG_CHECKING(whether to use glib)
- AC_ARG_WITH(glib,
- [ --without-glib don't use glib],
- if test "$withval" = no; then glib=no; else glib=yes; fi,
- glib=yes)
- AC_MSG_RESULT($glib)
- if test "$glib" = yes; then
- AM_PATH_GLIB_2_0(
- 2.20.0,
- AC_DEFINE([HAVE_LIB_GLIB], 1, [Defined if we've got glib])
- LIBS="$LIBS `pkg-config --libs glib-2.0`",
- AC_MSG_WARN(glib not found - using libspectrum's replacement)
- )
- fi
-fi
-
-dnl Check that libspectrum is available
-AC_ARG_WITH(libspectrum-prefix,
-[ --with-libspectrum-prefix=PFX where libspectrum is installed (optional)],
-LIBSPEC_CFLAGS=-I$withval/include; LIBSPEC_LIBS=-L$withval/lib,
-LIBSPEC_CFLAGS=""; LIBSPEC_LIBS="")
-ac_save_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $LIBSPEC_CFLAGS $GTK_CFLAGS $GLIB_CFLAGS"
-AC_CHECK_HEADERS(libspectrum.h,LIBSPEC_LIBS="$LIBSPEC_LIBS -lspectrum",
- AC_MSG_ERROR(Sorry - I need libspectrum to be available))
-CPPFLAGS="$ac_save_CPPFLAGS"
-AC_SUBST(LIBSPEC_CFLAGS)
-AC_SUBST(LIBSPEC_LIBS)
-
-dnl Check if supplied libspectrum has support for compressed szx files
-AC_MSG_CHECKING(whether libspectrum supports compressed szx snaps)
-ac_save_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $LIBSPEC_CFLAGS"
-AC_TRY_COMPILE([#include <libspectrum.h>],[
- int test = LIBSPECTRUM_SUPPORTS_ZLIB_COMPRESSION;
-],
- AUTOLOAD_SNAPS=compressed; LIBSPEC_HAVE_ZLIB=yes; AC_MSG_RESULT(yes),
- AUTOLOAD_SNAPS=uncompressed; LIBSPEC_HAVE_ZLIB=""; AC_MSG_RESULT(no))
-CPPFLAGS="$ac_save_CPPFLAGS"
-AC_SUBST(AUTOLOAD_SNAPS)
-AC_SUBST(LIBSPEC_HAVE_ZLIB)
-AC_LINK_FILES([
- lib/"$AUTOLOAD_SNAPS"/disk_plus3.szx
- lib/"$AUTOLOAD_SNAPS"/tape_128.szx
- lib/"$AUTOLOAD_SNAPS"/tape_16.szx
- lib/"$AUTOLOAD_SNAPS"/tape_2048.szx
- lib/"$AUTOLOAD_SNAPS"/tape_2068.szx
- lib/"$AUTOLOAD_SNAPS"/tape_48.szx
- lib/"$AUTOLOAD_SNAPS"/tape_plus2.szx
- lib/"$AUTOLOAD_SNAPS"/tape_plus2a.szx
- lib/"$AUTOLOAD_SNAPS"/tape_plus3.szx
- lib/"$AUTOLOAD_SNAPS"/tape_plus3e.szx
- lib/"$AUTOLOAD_SNAPS"/tape_pentagon.szx
- lib/"$AUTOLOAD_SNAPS"/tape_scorpion.szx
- lib/"$AUTOLOAD_SNAPS"/tape_se.szx
- lib/"$AUTOLOAD_SNAPS"/tape_ts2068.szx],
- [lib/disk_plus3.szx
- lib/tape_128.szx
- lib/tape_16.szx
- lib/tape_2048.szx
- lib/tape_2068.szx
- lib/tape_48.szx
- lib/tape_plus2.szx
- lib/tape_plus2a.szx
- lib/tape_plus3.szx
- lib/tape_plus3e.szx
- lib/tape_pentagon.szx
- lib/tape_scorpion.szx
- lib/tape_se.szx
- lib/tape_ts2068.szx])
-
-dnl Check whether to use zlib (the UNIX version is called z, Win32 zdll)
-AC_MSG_CHECKING(whether to use zlib)
-AC_ARG_WITH(zlib,
-[ --without-zlib don't use zlib],
-if test "$withval" = no; then zlib=no; else zlib=yes; fi,
-zlib=yes)
-AC_MSG_RESULT($zlib)
-if test "$zlib" = yes; then
- AC_CHECK_HEADERS(
- zlib.h,
- AC_SEARCH_LIBS(compress2, z zdll)
- )
-fi
-
-dnl Check if supplied libspectrum has support for bz2 compressed files
-AC_MSG_CHECKING(whether libspectrum supports compressed bz2 files)
-ac_save_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $LIBSPEC_CFLAGS"
-AC_TRY_COMPILE([#include <libspectrum.h>],[
- int test = LIBSPECTRUM_SUPPORTS_BZ2_COMPRESSION;
-],
- LIBSPEC_HAVE_BZ2=yes; AC_MSG_RESULT(yes),
- LIBSPEC_HAVE_BZ2=""; AC_MSG_RESULT(no))
-CPPFLAGS="$ac_save_CPPFLAGS"
-AC_SUBST(LIBSPEC_HAVE_BZ2)
-
-dnl Check if supplied libspectrum has support for wav files
-AC_MSG_CHECKING(whether libspectrum supports wav files)
-ac_save_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $LIBSPEC_CFLAGS"
-AC_TRY_COMPILE([#include <libspectrum.h>],[
- int test = LIBSPECTRUM_SUPPORTS_AUDIOFILE;
-],
- LIBSPEC_HAVE_AUDIOFILE=yes; AC_MSG_RESULT(yes),
- LIBSPEC_HAVE_AUDIOFILE=""; AC_MSG_RESULT(no))
-CPPFLAGS="$ac_save_CPPFLAGS"
-AC_SUBST(LIBSPEC_HAVE_AUDIOFILE)
-
-dnl Check if a version of libpng which supplies png_write_png is available
-AC_MSG_CHECKING(whether PNG support requested)
-AC_ARG_WITH(png,
-[ --without-png don't use libpng],
-if test "$withval" = no; then libpng=no; else libpng=yes; fi,
-libpng=yes)
-AC_MSG_RESULT($libpng)
-if test "$libpng" = yes; then
- AC_PATH_PROG([LIBPNG_CONFIG], [libpng-config])
- if test -n "$LIBPNG_CONFIG"; then
- PNG_CFLAGS=`libpng-config --cflags`
- PNG_LIBS=`libpng-config --ldflags`
- AC_DEFINE([USE_LIBPNG], 1, [Defined if we're going to be using the installed libpng])
- else
- ac_save_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $PNG_CFLAGS"
- ac_save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$PNG_LIBS $LDFLAGS"
-
- AC_CHECK_LIB( png, png_write_png,
- [AC_CHECK_HEADER(
- png.h,
- [AC_DEFINE([USE_LIBPNG], 1, [Defined if we're going to be using the installed libpng]) PNG_LIBS='-lpng -lm -lz'],
- [AC_CHECK_HEADERS(libpng/png.h,
- [CPPFLAGS="$ac_save_CPPFLAGS $PNG_CFLAGS/libpng"
- AC_DEFINE([USE_LIBPNG], 1, [Defined if we're going to be using the installed libpng]) PNG_LIBS='-lpng -lm -lz'],
- [AC_MSG_WARN(png.h not found - saving screenshots disabled)
- PNG_LIBS='']
- )],
- )],
- [AC_MSG_WARN(png_write_png not found - saving screenshots disabled)
- PNG_LIBS='']
- )
-
- CPPFLAGS="$ac_save_CPPFLAGS"
- LDFLAGS="$ac_save_LDFLAGS"
- fi
-
- AC_SUBST(PNG_LIBS)
-fi
-
-dnl Check if a version of libasound which supplies pcm is available
-AC_MSG_CHECKING(whether ALSA requested)
-AC_ARG_WITH(alsa,
-[ --without-alsa don't use libasound (ALSA)],
-if test "$withval" = no; then libasound=no; else libasound=yes; fi,
-libasound=yes)
-AC_MSG_RESULT($libasound)
-if test "$libasound" = yes; then
- AC_CHECK_LIB( asound, snd_pcm_hw_params_set_period_size_near,
- [AC_CHECK_HEADER(
- alsa/asoundlib.h,
- [alsa_available=yes],
- [AC_MSG_WARN(alsa/asoundlib.h not found - no ALSA output)]
- )],
- [AC_MSG_WARN(snd_pcm_hw_params_set_period_size_near not found - no ALSA output)]
- )
-fi
-
-dnl Check if a version of libao which supplies ao_open_live is available
-AC_MSG_CHECKING(whether libao requested)
-AC_ARG_WITH(libao,
-[ --with-libao use libao for sound output],
-if test "$withval" = no; then libao=no; else libao=yes; fi,
-libao=no)
-AC_MSG_RESULT($libao)
-if test "$libao" = yes; then
- AC_CHECK_LIB( ao, ao_open_live,
- [AC_CHECK_HEADER(
- ao/ao.h,
- [ao_available=yes],
- [AC_MSG_WARN(ao/ao.h not found - no libao sound output)]
- )],
- [AC_MSG_WARN(ao_open_live not found - no libao sound output)]
- )
-fi
-
-dnl Check if DirectSound is available
-AC_CHECK_HEADER(
- dsound.h,
- [dxsound_available=yes],
- [AC_MSG_WARN(dsound.h not found - no DirectSound output)],
- [#define DIRECTSOUND_VERSION 0x0700]
-)
-
-dnl Check if MS Windows Multimedia API sound is available
-AC_CHECK_HEADER(
- mmsystem.h,
- [win32sound_available=yes],
- [AC_MSG_WARN(mmsystem.h not found - no MS Windows Multimedia API sound output)],
- [#include <windows.h>]
-)
-
-dnl Check if CoreAudio is available
-AC_CHECK_HEADER(
- CoreAudio/AudioHardware.h,
- [coreaudio_available=yes],
- [AC_MSG_WARN(CoreAudio/AudioHardware.h not found - no CoreAudio sound output)]
-)
-
-dnl
-dnl Decide which sound routines to use
-dnl
-
-AC_MSG_CHECKING(which sound routines to use)
-if test "$UI" = sdl; then
- SOUND_LIBADD='sdlsound.$(OBJEXT)' SOUND_LIBS='' sound_fifo=yes
- AC_MSG_RESULT(SDL)
-elif test "$dxsound_available" = yes; then
- SOUND_LIBADD='dxsound.$(OBJEXT)' SOUND_LIBS='-ldsound -lole32 -ldxguid'
- AC_MSG_RESULT(DirectX)
- AC_DEFINE([DIRECTSOUND_VERSION], 0x0700, [DirectX 7 or higher is required])
-elif test "$win32sound_available" = yes; then
- SOUND_LIBADD='win32sound.$(OBJEXT)' SOUND_LIBS='-lwinmm'
- AC_MSG_RESULT(win32sound)
-elif test "$alsa_available" = yes; then
- SOUND_LIBADD='alsasound.$(OBJEXT)' SOUND_LIBS='-lasound'
- AC_MSG_RESULT(ALSA)
-elif test "$ao_available" = yes; then
- SOUND_LIBADD='aosound.$(OBJEXT)' SOUND_LIBS='-lao'
- AC_MSG_RESULT(libao)
-elif test "$ac_cv_header_dsound_h" = yes; then
- # Later selection between these two
- SOUND_LIBADD='sunsound.$(OBJEXT) hpsound.$(OBJEXT)' SOUND_LIBS=''
- AC_MSG_RESULT(Solaris or HP/UX)
-elif test "$ac_cv_header_sys_soundcard_h" = yes; then
- SOUND_LIBADD='osssound.$(OBJEXT)' SOUND_LIBS=''
- AC_MSG_RESULT(OSS)
-elif test "$ac_cv_header_sys_audioio_h" = yes; then
- dnl OpenBSD
- SOUND_LIBADD='sunsound.$(OBJEXT)' SOUND_LIBS=''
- AC_MSG_RESULT(OpenBSD)
-elif test "$coreaudio_available" = yes; then
- SOUND_LIBADD='coreaudiosound.$(OBJEXT)' SOUND_LIBS='-framework CoreAudio -framework AudioUnit -framework CoreServices' sound_fifo=yes
- AC_MSG_RESULT(CoreAudio)
-elif test "$wii" = yes; then
- SOUND_LIBADD='wiisound.$(OBJEXT)' SOUND_LIBS='' sound_fifo=yes
- AC_MSG_RESULT(Wii)
-else
- SOUND_LIBADD='nullsound.$(OBJEXT)' SOUND_LIBS=''
- AC_MSG_RESULT(none)
- AC_DEFINE([NO_SOUND], 1, [Defined if no sound code is present])
-fi
-
-if test "$sound_fifo" = yes; then
- dnl Strange construct used here as += doesn't seem to work on OS X
- SOUND_LIBADD="$SOUND_LIBADD"' sfifo.$(OBJEXT)'
- AC_DEFINE([SOUND_FIFO], 1, [Defined if the sound code uses a fifo])
-fi
-
-AC_SUBST(SOUND_LIBADD)
-AC_SUBST(SOUND_LIBS)
-
-dnl Are we supplying the ROMs or relying on another package?
-AC_MSG_CHECKING(where to find the Spectrum ROM images)
-AC_ARG_WITH(roms-dir,
- [ --with-roms-dir=DIR location of the Spectrum ROM images],
- ,
- unset withval
-)
-if test "$withval" = ""; then
- echo 'we supply them'
-else
- echo "$withval"
- AC_DEFINE_UNQUOTED(ROMSDIR, "$withval", [Location of the ROM images])
-fi
-
-AC_MSG_CHECKING(whether hardware joystick support requested)
- AC_ARG_WITH(joystick,
- [ --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)
-if test "$stick" = yes; then
- dnl We prefer to use UI-specific joystick code. (Default.)
- dnl If there is none, or you override this here, we use libjsw.
- dnl (svgalib appears to dislike switched joysticks on the parallel port...)
- case "$UI" in
- svga|sdl|win32)
- dnl Libraries such as svgalib provide their own joystick code.
- AC_MSG_CHECKING([whether to use $UI's joystick support])
- AC_ARG_ENABLE(ui-joystick,
- AS_HELP_STRING([--disable-ui-joystick], [use libjsw joystick code (where supported)]),
- if test "$enableval" = no; then libjsw=yes; else libjsw=no; fi,
- libjsw=no)
- if test "$libjsw" = yes; then
- AC_MSG_RESULT([no, use libjsw])
- else
- AC_MSG_RESULT(yes)
- AC_DEFINE([USE_JOYSTICK], 1, [Defined if we're using hardware joysticks])
- fi
- ;;
- gtk|xlib)
- dnl These UIs could use SDL library for handling joysticks
- AC_MSG_CHECKING([whether to use $UI's joystick support])
- AC_ARG_ENABLE(ui-joystick,
- AS_HELP_STRING([--disable-ui-joystick], [use libjsw joystick code (where supported)]),
- if test "$enableval" = no; then libjsw=yes; else libjsw=no; fi,
- libjsw=no)
- if test "$libjsw" = yes; then
- AC_MSG_RESULT([no, use libjsw])
- else
- AC_MSG_RESULT(yes)
- SDL_VERSION=1.2.4
- AM_PATH_SDL($SDL_VERSION,
- LIBS="$LIBS `sdl-config --libs`"
- CPPFLAGS="$CPPFLAGS `sdl-config --cflags`"
- AC_DEFINE([USE_JOYSTICK], 1, [Defined if we're using hardware joysticks]),
- AC_MSG_WARN([SDL version $SDL_VERSION not found - joystick support disabled]))
- fi
- ;;
- wii)
- dnl Wii UI check this elsewhere
- AC_MSG_RESULT(yes)
- libjsw=no
- ;;
- *)
- dnl Our only option is libjsw.
- libjsw=yes
- ;;
- esac
- if test "$libjsw" = yes; then
- dnl Look for libjsw. If missing, use QAOP<space>.
- AC_CHECK_HEADERS(jsw.h,
- LIBS="$LIBS -ljsw";
- AC_DEFINE([USE_JOYSTICK], 1,
- [Defined if we're using hardware joysticks]),
- AC_MSG_WARN(jsw.h not found - joystick support disabled))
- fi
-fi
-
-dnl See if libxml2 is available (for the config file handling)
-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 will use ini format))
-fi
-
-dnl Work out which timer routines to use
-AC_MSG_CHECKING(which timer routines to use)
-if test "$UI" = sdl; then
- TIMER_LIBADD='sdl.$(OBJEXT)'
- AC_MSG_RESULT(SDL)
-else
- TIMER_LIBADD='native.$(OBJEXT)'
- AC_MSG_RESULT(native)
-fi
-AC_SUBST(TIMER_LIBADD)
-
-dnl See if Linux TAP devices are supported
-AC_MSG_CHECKING(whether Linux TAP devices are supported)
-ac_save_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $LIBSPEC_CFLAGS"
-AC_TRY_COMPILE([
- #include <linux/if_tun.h>
- #include <net/if.h>
- #include <sys/ioctl.h>
- ],[
- int test1 = IFF_TAP | IFF_NO_PI;
- int test2 = TUNSETIFF;
- ],
- AC_DEFINE([LINUX_TAP], 1, [Define to 1 if Linux TAP devices are supported.])
- AC_MSG_RESULT(yes),
- AC_MSG_RESULT(no))
-
-CPPFLAGS="$ac_save_CPPFLAGS"
-
-dnl Work out which standard routines we're missing
-AC_MSG_CHECKING(which standard routines we're missing)
-missing_routines=''
-if test "$ac_cv_func_dirname" = no; then
- missing_routines="$missing_routines"'dirname '
-fi
-AM_CONDITIONAL(COMPAT_DIRNAME, test "$ac_cv_func_dirname" = no)
-if test "$ac_cv_func_getopt_long" = no; then
- case "$target_os" in
- amigaos|morphos)
- dnl Our getopt_long replacement doesn't work, so don't use it
- ;;
- *)
- compat_getopt=yes
- missing_routines="$missing_routines"'getopt_long '
- ;;
- esac
-fi
-AM_CONDITIONAL(COMPAT_GETOPT, test "$compat_getopt" = yes)
-if test "$ac_cv_func_mkstemp" = no; then
- missing_routines="$missing_routines"'mkstemp '
-fi
-AM_CONDITIONAL(COMPAT_MKSTEMP, test "$ac_cv_func_mkstemp" = no)
-if test "x$missing_routines" = x; then
- missing_routines='(none)'
-fi
-AC_MSG_RESULT($missing_routines)
-
-dnl Work out which compatibility routines to use
-AC_MSG_CHECKING(which compatibility routines to use)
-case "$target_os" in
- amigaos)
- COMPAT_OSNAME='amiga'
- ;;
- morphos)
- COMPAT_OSNAME='morphos'
- ;;
- mingw32*)
- COMPAT_OSNAME='win32'
- ;;
- wii)
- COMPAT_OSNAME='wii'
- ;;
- *)
- COMPAT_OSNAME='unix'
- ;;
-esac
-AC_MSG_RESULT($COMPAT_OSNAME)
-COMPAT_SUBDIR="compat/$COMPAT_OSNAME"
-AC_SUBST(COMPAT_SUBDIR)
-AC_SUBST(COMPAT_OSNAME)
-
-dnl Decide whether to install desktop and mime files
-AC_ARG_ENABLE(desktop-integration,
-AS_HELP_STRING([--enable-desktop-integration], [add menu entry and file associations]),
-if test "$enableval" = yes; then desktopintegration=yes; else desktopintegration=no; fi,
-desktdesktopintegration=no)
-AC_MSG_CHECKING(whether to install desktop file)
-AC_MSG_RESULT($desktopintegration)
-AM_CONDITIONAL(DESKTOP_INTEGRATION, test "$desktopintegration" = yes)
-AC_CHECK_PROGS(GTK_UPDATE_ICON_CACHE,gtk-update-icon-cache,true)
-
-dnl Where to install the desktop and mime files
-AC_ARG_WITH(desktop-dir,
-AS_HELP_STRING([--with-desktop-dir=DIR], [location of desktop files (default=datadir)]),
-if test "$withval" = no; then desktopdir=no; else desktopdir=yes; fi,
-desktopdir=no)
-if test "$desktopdir" = yes; then
- DESKTOP_DATADIR=$with_desktop_dir
-else
- DESKTOP_DATADIR="$datadir"
-fi
-AM_CONDITIONAL(DESKTOP_DATADIR, test "$desktopdir" == yes)
-AC_SUBST(DESKTOP_DATADIR)
-
-dnl Do we want the low memory compile?
-AC_MSG_CHECKING(whether low memory compile requested)
-AC_ARG_ENABLE(smallmem,
-[ --enable-smallmem low memory compile needed],
-if test "$enableval" = yes; then
- smallmem=yes;
-else
- smallmem=no;
-fi,
-smallmem=no)
-if test "$smallmem" = no; then
- AC_DEFINE([HAVE_ENOUGH_MEMORY], 1, [Defined if we've got enough memory to compile z80_ops.c])
-fi
-AC_MSG_RESULT($smallmem)
-
-dnl Do we want lots of warning messages?
-AC_MSG_CHECKING(whether lots of warnings requested)
-AC_ARG_ENABLE(warnings,
-[ --enable-warnings give lots of warnings if using gcc],
-if test "$enableval" = yes; then
- warnings=yes;
-else
- warnings=no;
-fi,
-warnings=no)
-AC_MSG_RESULT($warnings)
-
-dnl If it appears we're using gcc as our compiler, turn on warnings
-if test "$ac_cv_prog_gcc" = yes; then
- CFLAGS="$CFLAGS -Wall"
- dnl And possibly lots of warnings
- if test "$warnings" = yes; then
- CFLAGS="$CFLAGS -Wstrict-prototypes -Wmissing-prototypes -Winline -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Waggregate-return -W -Wsign-compare"
- fi
-fi
-
-AC_OUTPUT(Makefile \
-compat/amiga/Makefile \
-compat/morphos/Makefile \
-compat/unix/Makefile \
-compat/wii/Makefile \
-compat/win32/Makefile \
-data/Makefile \
-debugger/Makefile \
-hacking/Makefile \
-lib/Makefile \
-machines/Makefile \
-man/Makefile \
-peripherals/Makefile \
-peripherals/disk/Makefile \
-peripherals/ide/Makefile \
-peripherals/nic/Makefile \
-peripherals/flash/Makefile \
-perl/Makefile \
-perl/Fuse/Makefile \
-pokefinder/Makefile \
-roms/Makefile \
-sound/Makefile \
-timer/Makefile \
-ui/Makefile \
-ui/fb/Makefile \
-ui/wii/Makefile \
-ui/gtk/Makefile \
-ui/svga/Makefile \
-ui/sdl/Makefile \
-ui/scaler/Makefile \
-ui/widget/Makefile \
-ui/win32/fuse.manifest \
-ui/win32/Makefile \
-ui/win32/icons/Makefile \
-ui/win32/installer/Makefile \
-ui/xlib/Makefile \
-unittests/Makefile \
-z80/Makefile \
-z80/tests/Makefile)
Deleted: vendor/fuse-emulator/current/fuse/ui/win32/installer/fuse.nsi
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/win32/installer/fuse.nsi 2012-12-05 12:44:59 UTC (rev 713)
+++ vendor/fuse-emulator/current/fuse/ui/win32/installer/fuse.nsi 2012-12-05 21:19:12 UTC (rev 714)
@@ -1,386 +0,0 @@
-## NSIS (nsis.sf.net) script to produce installer for win32 platform
-## Copyright (c) 2009 Marek Januszewski
-
-## $Id$
-
-## 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:
-##
-## E-mail: phi...@sh...
-
-!define FUSE_VERSION "1.0.0.1" ; can contain letters like -RC1
-!define FUSE_FULL_VERSION "1.0.0.1" ; must contain four numeric tokens
-!define DISPLAY_NAME "Free Unix Spectrum Emulator (Fuse) ${FUSE_VERSION}"
-!define SETUP_FILENAME "fuse-${FUSE_VERSION}-setup"
-!define SETUP_FILE "${SETUP_FILENAME}.exe"
-!define HKLM_REG_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\Fuse"
-!define PROG_ID "Fuse.Files.1"
-
-;Include Modern UI
-!include "MUI2.nsh"
-!include "Sections.nsh"
-!include "Util.nsh"
-
-;--------------------------------
-;General
-
-Name "${DISPLAY_NAME}"
-outFile "${SETUP_FILE}"
-Caption "${DISPLAY_NAME}"
-
-installDir "$PROGRAMFILES\Fuse"
-
-; [Additional Installer Settings ]
-XPStyle on
-SetCompress force
-SetCompressor lzma
-
-;--------------------------------
-;Interface Settings
-
- !define MUI_ABORTWARNING
-
-;--------------------------------
-;Pages
-
- !insertmacro MUI_PAGE_LICENSE "COPYING"
- !define MUI_COMPONENTSPAGE_SMALLDESC
- !insertmacro MUI_PAGE_COMPONENTS
- !insertmacro MUI_PAGE_DIRECTORY
- !insertmacro MUI_PAGE_INSTFILES
- !define MUI_FINISHPAGE_RUN "$INSTDIR\fuse.exe"
- !define MUI_FINISHPAGE_NOREBOOTSUPPORT
- !insertmacro MUI_PAGE_FINISH
-
- !insertmacro MUI_UNPAGE_CONFIRM
- !insertmacro MUI_UNPAGE_INSTFILES
- !define MUI_FINISHPAGE_SHOWREADME_CHECKED
- !define MUI_FINISHPAGE_SHOWREADME ""
- !define MUI_FINISHPAGE_SHOWREADME_TEXT "Delete configuration file"
- !define MUI_FINISHPAGE_SHOWREADME_FUNCTION un.DeleteConfigFile
- !insertmacro MUI_UNPAGE_FINISH
-
-;--------------------------------
-;Languages
-
- !insertmacro MUI_LANGUAGE "English"
-
-;--------------------------------
-;Version Information
-
- VIProductVersion ${FUSE_FULL_VERSION}
- VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" ""
- VIAddVersionKey /LANG=${LANG_ENGLISH} "InternalName" "${SETUP_FILENAME}"
- VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "Copyright (c) 1999-2011 Philip Kendall and others; see the file 'AUTHORS' for more details."
- VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "Fuse"
- VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${FUSE_VERSION}"
- VIAddVersionKey /LANG=${LANG_ENGLISH} "OriginalFilename" "${SETUP_FILE}"
- VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "Fuse - the Free Unix Spectrum Emulator"
- VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "${FUSE_VE...
[truncated message content] |
|
From: <fr...@us...> - 2012-12-05 21:20:57
|
Revision: 715
http://sourceforge.net/p/fuse-for-macosx/code/715
Author: fredm
Date: 2012-12-05 21:20:47 +0000 (Wed, 05 Dec 2012)
Log Message:
-----------
Load . into vendor/fuse-emulator/current.
Modified Paths:
--------------
vendor/fuse-emulator/current/fuse/Makefile.am
vendor/fuse-emulator/current/fuse/README
vendor/fuse-emulator/current/fuse/autogen.sh
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/unix/Makefile.am
vendor/fuse-emulator/current/fuse/compat/unix/paths.c
vendor/fuse-emulator/current/fuse/compat/unix/socket.c
vendor/fuse-emulator/current/fuse/compat/wii/Makefile.am
vendor/fuse-emulator/current/fuse/compat/wii/paths.c
vendor/fuse-emulator/current/fuse/compat/win32/Makefile.am
vendor/fuse-emulator/current/fuse/compat/win32/paths.c
vendor/fuse-emulator/current/fuse/compat/win32/socket.c
vendor/fuse-emulator/current/fuse/compat.h
vendor/fuse-emulator/current/fuse/configure.ac
vendor/fuse-emulator/current/fuse/data/fuse.xml.in
vendor/fuse-emulator/current/fuse/debugger/Makefile.am
vendor/fuse-emulator/current/fuse/debugger/command.c
vendor/fuse-emulator/current/fuse/debugger/commandl.l
vendor/fuse-emulator/current/fuse/debugger/debugger.c
vendor/fuse-emulator/current/fuse/debugger/debugger_internals.h
vendor/fuse-emulator/current/fuse/debugger/variable.c
vendor/fuse-emulator/current/fuse/display.c
vendor/fuse-emulator/current/fuse/event.c
vendor/fuse-emulator/current/fuse/fuse.c
vendor/fuse-emulator/current/fuse/fuse.h
vendor/fuse-emulator/current/fuse/hacking/ChangeLog
vendor/fuse-emulator/current/fuse/input.h
vendor/fuse-emulator/current/fuse/keyboard.c
vendor/fuse-emulator/current/fuse/keyboard.h
vendor/fuse-emulator/current/fuse/keysyms.dat
vendor/fuse-emulator/current/fuse/keysyms.pl
vendor/fuse-emulator/current/fuse/machine.c
vendor/fuse-emulator/current/fuse/machines/Makefile.am
vendor/fuse-emulator/current/fuse/machines/machines_periph.h
vendor/fuse-emulator/current/fuse/machines/pentagon.c
vendor/fuse-emulator/current/fuse/machines/spec_se.c
vendor/fuse-emulator/current/fuse/machines/tc2048.c
vendor/fuse-emulator/current/fuse/machines/tc2068.c
vendor/fuse-emulator/current/fuse/machines/ts2068.c
vendor/fuse-emulator/current/fuse/man/fuse.1
vendor/fuse-emulator/current/fuse/memory.c
vendor/fuse-emulator/current/fuse/memory.h
vendor/fuse-emulator/current/fuse/mempool.c
vendor/fuse-emulator/current/fuse/menu.c
vendor/fuse-emulator/current/fuse/menu.h
vendor/fuse-emulator/current/fuse/menu_data.pl
vendor/fuse-emulator/current/fuse/module.c
vendor/fuse-emulator/current/fuse/module.h
vendor/fuse-emulator/current/fuse/movie.c
vendor/fuse-emulator/current/fuse/movie.h
vendor/fuse-emulator/current/fuse/movie_tables.h
vendor/fuse-emulator/current/fuse/periph.c
vendor/fuse-emulator/current/fuse/periph.h
vendor/fuse-emulator/current/fuse/peripherals/Makefile.am
vendor/fuse-emulator/current/fuse/peripherals/dck.c
vendor/fuse-emulator/current/fuse/peripherals/disk/Makefile.am
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/opus.c
vendor/fuse-emulator/current/fuse/peripherals/disk/opus.h
vendor/fuse-emulator/current/fuse/peripherals/disk/plusd.c
vendor/fuse-emulator/current/fuse/peripherals/flash/Makefile.am
vendor/fuse-emulator/current/fuse/peripherals/flash/am29f010.c
vendor/fuse-emulator/current/fuse/peripherals/flash/am29f010.h
vendor/fuse-emulator/current/fuse/peripherals/ide/Makefile.am
vendor/fuse-emulator/current/fuse/peripherals/if1.c
vendor/fuse-emulator/current/fuse/peripherals/nic/Makefile.am
vendor/fuse-emulator/current/fuse/peripherals/nic/enc28j60.c
vendor/fuse-emulator/current/fuse/peripherals/nic/enc28j60.h
vendor/fuse-emulator/current/fuse/peripherals/nic/w5100.c
vendor/fuse-emulator/current/fuse/peripherals/nic/w5100.h
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/scld.c
vendor/fuse-emulator/current/fuse/peripherals/scld.h
vendor/fuse-emulator/current/fuse/peripherals/speccyboot.c
vendor/fuse-emulator/current/fuse/peripherals/speccyboot.h
vendor/fuse-emulator/current/fuse/peripherals/specdrum.h
vendor/fuse-emulator/current/fuse/peripherals/spectranet.c
vendor/fuse-emulator/current/fuse/peripherals/spectranet.h
vendor/fuse-emulator/current/fuse/pokefinder/Makefile.am
vendor/fuse-emulator/current/fuse/pokefinder/pokemem.c
vendor/fuse-emulator/current/fuse/pokefinder/pokemem.h
vendor/fuse-emulator/current/fuse/rectangle.c
vendor/fuse-emulator/current/fuse/rzx.c
vendor/fuse-emulator/current/fuse/settings.pl
vendor/fuse-emulator/current/fuse/slt.c
vendor/fuse-emulator/current/fuse/snapshot.c
vendor/fuse-emulator/current/fuse/sound/Makefile.am
vendor/fuse-emulator/current/fuse/sound/coreaudiosound.c
vendor/fuse-emulator/current/fuse/sound.c
vendor/fuse-emulator/current/fuse/tape.c
vendor/fuse-emulator/current/fuse/tape.h
vendor/fuse-emulator/current/fuse/timer/Makefile.am
vendor/fuse-emulator/current/fuse/ui/fb/Makefile.am
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/gtkdisplay.c
vendor/fuse-emulator/current/fuse/ui/gtk/gtkinternals.h
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/pixmaps.c
vendor/fuse-emulator/current/fuse/ui/gtk/pokefinder.c
vendor/fuse-emulator/current/fuse/ui/gtk/pokemem.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/gtk/stock.c
vendor/fuse-emulator/current/fuse/ui/options.dat
vendor/fuse-emulator/current/fuse/ui/scaler/Makefile.am
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/sdlkeyboard.c
vendor/fuse-emulator/current/fuse/ui/svga/Makefile.am
vendor/fuse-emulator/current/fuse/ui/widget/Makefile.am
vendor/fuse-emulator/current/fuse/ui/widget/fuse.font.sbf
vendor/fuse-emulator/current/fuse/ui/widget/menu.c
vendor/fuse-emulator/current/fuse/ui/widget/options-header.pl
vendor/fuse-emulator/current/fuse/ui/widget/pokemem.c
vendor/fuse-emulator/current/fuse/ui/widget/text.c
vendor/fuse-emulator/current/fuse/ui/widget/widget.c
vendor/fuse-emulator/current/fuse/ui/wii/Makefile.am
vendor/fuse-emulator/current/fuse/ui/win32/Makefile.am
vendor/fuse-emulator/current/fuse/ui/win32/about.c
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/debugger.c
vendor/fuse-emulator/current/fuse/ui/win32/installer/fuse.nsi.in
vendor/fuse-emulator/current/fuse/ui/win32/options-header.pl
vendor/fuse-emulator/current/fuse/ui/win32/pokemem.c
vendor/fuse-emulator/current/fuse/ui/win32/win32display.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/xkeyboard.c
vendor/fuse-emulator/current/fuse/ui.c
vendor/fuse-emulator/current/fuse/unittests/Makefile.am
vendor/fuse-emulator/current/fuse/utils.c
vendor/fuse-emulator/current/fuse/utils.h
vendor/fuse-emulator/current/fuse/windres.rc
vendor/fuse-emulator/current/fuse/z80/Makefile.am
vendor/fuse-emulator/current/fuse-utils/Makefile.am
vendor/fuse-emulator/current/fuse-utils/audio2tape.h
vendor/fuse-emulator/current/fuse-utils/autogen.sh
vendor/fuse-emulator/current/fuse-utils/compat/amiga/Makefile.am
vendor/fuse-emulator/current/fuse-utils/compat/unix/Makefile.am
vendor/fuse-emulator/current/fuse-utils/compat/win32/Makefile.am
vendor/fuse-emulator/current/fuse-utils/compat/win32/osname.c
vendor/fuse-emulator/current/fuse-utils/configure.ac
vendor/fuse-emulator/current/fuse-utils/fmfconv.c
vendor/fuse-emulator/current/fuse-utils/fmfconv.h
vendor/fuse-emulator/current/fuse-utils/fmfconv_aiff.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/fmfconv_ppm.c
vendor/fuse-emulator/current/fuse-utils/fmfconv_scr.c
vendor/fuse-emulator/current/fuse-utils/fmfconv_wav.c
vendor/fuse-emulator/current/fuse-utils/fmfconv_yuv.c
vendor/fuse-emulator/current/fuse-utils/hacking/ChangeLog
vendor/fuse-emulator/current/fuse-utils/movie_tables.h
vendor/fuse-emulator/current/fuse-utils/profile2map.c
vendor/fuse-emulator/current/fuse-utils/rzxdump.c
vendor/fuse-emulator/current/fuse-utils/snap2tzx.c
vendor/fuse-emulator/current/fuse-utils/tapeconv.c
vendor/fuse-emulator/current/libspectrum/Makefile.am
vendor/fuse-emulator/current/libspectrum/autogen.sh
vendor/fuse-emulator/current/libspectrum/configure.ac
vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog
vendor/fuse-emulator/current/libspectrum/internals.h
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/memory.c
vendor/fuse-emulator/current/libspectrum/myglib/garray.c
vendor/fuse-emulator/current/libspectrum/myglib/ghash.c
vendor/fuse-emulator/current/libspectrum/myglib/gslist.c
vendor/fuse-emulator/current/libspectrum/szx.c
vendor/fuse-emulator/current/libspectrum/windres.rc
Added Paths:
-----------
vendor/fuse-emulator/current/fuse/INSTALL
vendor/fuse-emulator/current/fuse/compat/linux/
vendor/fuse-emulator/current/fuse/compat/linux/Makefile.am
vendor/fuse-emulator/current/fuse/compat/linux/paths.c
vendor/fuse-emulator/current/fuse/m4/
vendor/fuse-emulator/current/fuse/m4/ax_pthread.m4
vendor/fuse-emulator/current/fuse/m4/glib-2.0.m4
vendor/fuse-emulator/current/fuse/m4/gtk-2.0.m4
vendor/fuse-emulator/current/fuse/m4/libxml.m4
vendor/fuse-emulator/current/fuse/m4/pkg.m4
vendor/fuse-emulator/current/fuse/m4/sdl.m4
vendor/fuse-emulator/current/fuse/ui/gtk/gtkcompat.c
vendor/fuse-emulator/current/fuse/ui/gtk/gtkcompat.h
vendor/fuse-emulator/current/fuse/ui/xlib/xstatusbar.pl
vendor/fuse-emulator/current/fuse-utils/m4/
vendor/fuse-emulator/current/fuse-utils/m4/audiofile.m4
vendor/fuse-emulator/current/fuse-utils/m4/glib-1.0.m4
vendor/fuse-emulator/current/fuse-utils/m4/glib-2.0.m4
vendor/fuse-emulator/current/fuse-utils/m4/iconv.m4
vendor/fuse-emulator/current/libspectrum/m4/
vendor/fuse-emulator/current/libspectrum/m4/audiofile.m4
Removed Paths:
-------------
vendor/fuse-emulator/current/fuse/acinclude.m4
vendor/fuse-emulator/current/fuse/ui/win32/installer/Makefile.am
vendor/fuse-emulator/current/fuse-utils/acinclude.m4
vendor/fuse-emulator/current/libspectrum/acinclude.m4
Added: vendor/fuse-emulator/current/fuse/INSTALL
===================================================================
--- vendor/fuse-emulator/current/fuse/INSTALL (rev 0)
+++ vendor/fuse-emulator/current/fuse/INSTALL 2012-12-05 21:20:47 UTC (rev 715)
@@ -0,0 +1,165 @@
+Building Fuse
+-------------
+
+To compile Fuse (see below for instructions for other ports):
+
+$ ./configure
+
+There are now some options you can give to configure; `configure
+--help' will list them all, but the most important are:
+
+--with-fb Use the framebuffer interface, rather than GTK+.
+--with-sdl Use the SDL interface, rather than GTK+.
+--with-svgalib Use the SVGAlib interface.
+--without-gtk Use the plain Xlib interface.
+
+If glib is installed on your system, Fuse will use this for a couple
+of things; however, it isn't necessary as libspectrum provides
+replacements for all the routines used by Fuse.
+
+Another useful option is `--with-local-prefix=DIRECTORY' which allows
+you to specify that you have some of the libraries needed by Fuse in
+`<DIRECTORY>/lib' and the necessary header files in
+`<DIRECTORY>/include'. If you specify the `--prefix' option to tell
+Fuse to install itself somewhere other than in /usr/local, that
+directory will automatically be searched as well.
+
+Then just:
+
+$ make
+
+and then
+
+$ make install
+
+if you want to place Fuse into the main directories on your system
+(under /usr/local by default, although you can change this with the
+--prefix argument to 'configure'). You'll probably need to be root to
+do this bit.
+
+Once you've got Fuse configured and built, read the man page :-)
+
+Note that if you're using version of Fuse from Subversion rather than
+one of the released tarballs, you'll need to run `autogen.sh' before
+running 'configure' for the first time.
+
+Building the OS X version of Fuse
+---------------------------------
+
+The native Cocoa port by Fredrick Meunier <fr...@sp...> comes as
+a set of Xcode projects for libgcrypt, libspectrum and Fuse itself.
+
+Building the Wii version of Fuse
+--------------------------------
+
+You'll need to have the standard Wii homebrew toolchain installed; see
+eg <http://wiibrew.org/wiki/DevkitPro> for some information on setting
+this up.
+
+After that, make sure the dev tools are in your path (export
+PATH=$PATH:$DEVKITPPC/bin) and that a Wii version of libspectrum has been
+built and installed.
+
+Then, use this configure line:
+
+./configure --target=powerpc-gekko --host=powerpc-gekko \
+ --with-wii \
+ --without-libxml2 --without-libiconv --without-gpm \
+ --without-x --without-glib \
+ CFLAGS="-g -I$DEVKITPPC/include -I$DEVKITPRO/libogc/include -DGEKKO" \
+ LDFLAGS="-g -mrvl -mcpu=750 -meabi -mhard-float \
+ -Wl,-Map,fuse.elf.map -L$DEVKITPPC/lib \
+ -L$DEVKITPRO/libogc/lib/wii" \
+ LIBS="-lfat -lwiiuse -lbte -logc -lm"
+
+Finally, to build, use this line:
+
+EXEEXT=".elf" make -e
+
+This should build fuse.elf, which you can run on your Wii via the usual
+methods.
+
+Building the Win32 version of Fuse
+----------------------------------
+
+You'll need to have the MinGW <http://www.mingw.org> or MinGW-w64 toolchain
+<http://mingw-w64.sourceforge.net>, e.g., on Debian:
+`apt-get install mingw32 mingw32-binutils mingw32-runtime'
+
+On Windows, besides the former toolchain, you'll need an environment that
+includes a collection of Unix tools, like MSYS <http://www.mingw.org> or
+Cygwin <http://cygwin.com>.
+
+The next examples build libspectrum and Fuse without any external library for
+the sake of clarity, but all these libraries successfully compile with MingGW
+environment - in case of problems with compiling any of the libs please refer to
+the lib's homepage for help.
+
+1) On Linux, first have to compile libspectrum:
+
+./configure --host=i586-mingw32msvc --without-libaudiofile --without-zlib \
+ --without-libgcrypt --without-bzip2 --without-glib --prefix=`pwd`
+make install
+
+This should `install' into the source directory.
+
+Then, compile Fuse:
+
+./configure --host=i586-mingw32msvc --without-glib --prefix=`pwd` \
+ --with-libspectrum-prefix=`pwd`/../libspectrum --with-win32 \
+ --without-libxml2 --without-zlib --without-png --without-x
+make
+
+You have to use the real path of libspectrum with `--with-libspectrum-prefix='.
+This should build `fuse.exe' without any external lib, but you can run it on
+Windows or Linux (with Wine).
+
+With wine you need `fltmgr.sys' in Windows `system32' directory. (e.g.:
+~/.wine/c_drive/windows/system32).
+
+2) On Windows, using MSYS + MinGW toolchain, first build libspectrum:
+
+./configure --without-glib --without-libaudiofile --without-libgcrypt \
+ --without-zlib --without-bzip2 --prefix=/usr/local
+make install
+
+Then, build Fuse:
+
+./configure --with-win32 --without-glib --without-libxml2 --without-zlib \
+ --without-png --prefix=/usr/local
+make
+
+3) On Windows, using Cygwin + MinGW toolchain, first build libspectrum:
+
+./configure --build=i686-pc-cygwin --host=i686-pc-mingw32 --without-glib \
+ --without-libaudiofile --without-libgcrypt --without-zlib \
+ --without-bzip2 --prefix=/usr/local/i686-pc
+make install
+
+Then, build Fuse:
+
+./configure --build=i686-pc-cygwin --host=i686-pc-mingw32 --with-win32 \
+ --without-glib --without-libxml2 --without-zlib --without-png \
+ --prefix=/usr/local/i686-pc
+make
+
+Note: you need `libspectrum-8.dll' and the `roms' directory and the `lib'
+ directory to `fuse' run perfectly. You may copy this file and directories
+ into that directory where `fuse.exe' exists. On Windows you may need to
+ copy all files from `lib/uncompressed' into `lib'. Alternatively, you could
+ run this rule:
+
+ make install-win32 DESTDIR=/path/to/Fuse
+
+ If you are planning to distribute Windows binaries with third parties on a
+ regular basis, maybe you will find the next rules quite useful:
+
+ make dist-win32-zip
+ make dist-win32-7z
+ make dist-win32-exe
+
+ Additional tools are required for the former rules: Info-Zip, p7zip and NSIS,
+ respectively. That will make a temporary subdirectory (fuse-VERSION-win32)
+ in the build directory and then will create a package.
+
+$Id: INSTALL 4763 2012-11-16 11:01:59Z fredm $
Modified: vendor/fuse-emulator/current/fuse/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/Makefile.am 2012-12-05 21:19:12 UTC (rev 714)
+++ vendor/fuse-emulator/current/fuse/Makefile.am 2012-12-05 21:20:47 UTC (rev 715)
@@ -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-2009 Philip Kendall
-## $Id: Makefile.am 4674 2012-02-20 11:03:58Z fredm $
+## $Id: Makefile.am 4770 2012-11-23 22:59:48Z 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
@@ -23,6 +23,8 @@
AUTOMAKE_OPTIONS = foreign
+ACLOCAL_AMFLAGS = -I m4
+
bin_PROGRAMS = fuse
SUBDIRS = @COMPAT_SUBDIR@ \
@@ -84,8 +86,7 @@
tape.c \
ui.c \
uidisplay.c \
- utils.c \
- windres.rc
+ utils.c
if COMPAT_DIRNAME
fuse_SOURCES += compat/dirname.c
@@ -99,6 +100,10 @@
fuse_SOURCES += compat/mkstemp.c
endif
+if COMPAT_WIN32
+fuse_SOURCES += windres.rc
+endif
+
EXTRA_fuse_SOURCES = windres.rc
fuse_LDADD = debugger/libdebugger.a \
@@ -163,7 +168,7 @@
@PERL@ $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/options.dat | @PERL@ -I$(srcdir)/perl $(srcdir)/ui/@UI@/options-header.pl - public > $@.tmp && mv $@.tmp $@
endif
-INCLUDES = @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@ \
+AM_CPPFLAGS = @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@ \
@XML_CFLAGS@ -DFUSEDATADIR="\"${pkgdatadir}\"" @SDL_CFLAGS@
noinst_HEADERS = bitmap.h \
@@ -197,10 +202,16 @@
profile.h
EXTRA_DIST = AUTHORS \
+ INSTALL \
README \
THANKS \
keysyms.dat \
keysyms.pl \
+ m4/glib-2.0.m4 \
+ m4/gtk-2.0.m4 \
+ m4/libxml.m4 \
+ m4/pkg.m4 \
+ m4/sdl.m4 \
menu_data.dat \
menu_data.pl \
settings.pl \
@@ -212,6 +223,102 @@
settings.c \
settings.h
-AM_CPPFLAGS =
+include compat/Makefile.am
-include compat/Makefile.am
+if COMPAT_WIN32
+
+package_win32=$(PACKAGE)-$(PACKAGE_VERSION)-win32
+top_win32dir=$(top_builddir)/$(package_win32)
+
+install-win32: all
+ test -n "$(DESTDIR)" || { echo "ERROR: set DESTDIR path"; exit 1; }
+ $(MKDIR_P) $(DESTDIR)/roms/ || exit 1
+ $(MKDIR_P) $(DESTDIR)/lib/ || exit 1
+ cp $(top_srcdir)/roms/*.rom $(DESTDIR)/roms
+ cp $(top_srcdir)/roms/README.copyright $(DESTDIR)/roms
+ cp $(top_srcdir)/lib/*.bmp $(DESTDIR)/lib
+ cp $(top_srcdir)/lib/*.scr $(DESTDIR)/lib
+ cp $(top_builddir)/lib/*.szx $(DESTDIR)/lib
+# Copy fuse executable (we should manually copy the required libraries)
+ cp $(top_builddir)/.libs/fuse$(EXEEXT) $(DESTDIR) || \
+ cp $(top_builddir)/fuse$(EXEEXT) $(DESTDIR)
+# Get text files
+ for file in AUTHORS COPYING README; \
+ do cp "$(top_srcdir)/$$file" "$(DESTDIR)/$$file.txt"; \
+ done
+# Get manuals
+ if test -n "$(MAN2HTML)"; then \
+ $(MAN2HTML) -r $(top_srcdir)/man/fuse.1 | sed '1d' > $(DESTDIR)/fuse.html; \
+ else \
+ test -z "$(GROFF)" || $(GROFF) -Thtml -man $(top_srcdir)/man/fuse.1 > $(DESTDIR)/fuse.html; \
+ fi
+# Convert to DOS line endings
+ test -z "$(UNIX2DOS)" || find $(DESTDIR) -type f \( -name "*.txt" -or -name "*.html" -or -name "*.copyright" \) -exec $(UNIX2DOS) {} \;
+
+install-win32-strip: install-win32
+ test -z "$(STRIP)" || $(STRIP) $(DESTDIR)/fuse$(EXEEXT)
+
+dist-win32-dir:
+ $(MAKE) DESTDIR="$(top_win32dir)" install-win32-strip
+
+dist-win32-zip: dist-win32-dir
+ rm -f -- $(top_builddir)/$(package_win32).zip
+ rm -f -- $(top_builddir)/$(package_win32).zip.sha1
+ test -n "$(top_win32dir)" || exit 1
+ @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; }
+ cd $(top_win32dir) && \
+ zip -q -9 -r $(abs_top_builddir)/$(package_win32).zip .
+ -sha1sum $(top_builddir)/$(package_win32).zip > $(top_builddir)/$(package_win32).zip.sha1 && \
+ { test -z "$(UNIX2DOS)" || $(UNIX2DOS) $(top_builddir)/$(package_win32).zip.sha1; }
+
+dist-win32-7z: dist-win32-dir
+ rm -f -- $(top_builddir)/$(package_win32).7z
+ rm -f -- $(top_builddir)/$(package_win32).7z.sha1
+ test -n "$(top_win32dir)" || exit 1
+ @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; }
+ cd $(top_win32dir) && \
+ 7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on -bd $(abs_top_builddir)/$(package_win32).7z .
+ -sha1sum $(top_builddir)/$(package_win32).7z > $(top_builddir)/$(package_win32).7z.sha1 && \
+ { test -z "$(UNIX2DOS)" || $(UNIX2DOS) $(top_builddir)/$(package_win32).7z.sha1; }
+
+dist-win32-exe: dist-win32-dir
+ rm -f -- $(top_builddir)/$(package_win32)-setup.exe
+ rm -f -- $(top_builddir)/$(package_win32)-setup.exe.sha1
+ test -n "$(top_win32dir)" || exit 1
+ @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 \
+ MAKENSIS="makensis"; \
+ elif [ -x "/c/Program Files/NSIS/makensis" ]; then \
+ MAKENSIS="/c/Program\ Files/NSIS/makensis"; \
+ elif [ -x "/cygdrive/c/Program Files/NSIS/makensis" ]; then \
+ MAKENSIS="/cygdrive/c/Program\ Files/NSIS/makensis"; \
+ else \
+ echo 'ERROR: cannot locate makensis tool'; exit 1; \
+ fi; \
+ cd $(top_win32dir); \
+ eval "$$MAKENSIS -V2 -NOCD $(abs_top_builddir)/ui/win32/installer/fuse.nsi"
+ 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; }
+
+dist-win32: dist-win32-zip dist-win32-7z dist-win32-exe
+
+distclean-win32:
+ if test -d "$(top_builddir)/$(package_win32)"; then \
+ rm -rf -- "$(top_builddir)/$(package_win32)"; \
+ fi
+ rm -f -- $(top_builddir)/$(package_win32).zip
+ rm -f -- $(top_builddir)/$(package_win32).zip.sha1
+ rm -f -- $(top_builddir)/$(package_win32).7z
+ rm -f -- $(top_builddir)/$(package_win32).7z.sha1
+ rm -f -- $(top_builddir)/$(package_win32)-setup.exe
+ rm -f -- $(top_builddir)/$(package_win32)-setup.exe.sha1
+
+.PHONY: install-win32 install-win32-strip dist-win32 dist-win32-dir \
+ dist-win32-zip dist-win32-7z dist-win32-exe distclean-win32
+
+endif
Modified: vendor/fuse-emulator/current/fuse/README
===================================================================
--- vendor/fuse-emulator/current/fuse/README 2012-12-05 21:19:12 UTC (rev 714)
+++ vendor/fuse-emulator/current/fuse/README 2012-12-05 21:20:47 UTC (rev 715)
@@ -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/forum/?group_id=91293>.
+<http://sourceforge.net/projects/fuse-emulator/forums>.
What you'll need to run Fuse
----------------------------
@@ -69,126 +69,15 @@
Windows
-* The Win32 and SDL UIs can be used under Windows, but the Win32 UI is
- incomplete.
+* The Win32 and SDL UIs can be used under Windows.
+* pthreads-win32 library will give the ability to use posix threads, needed by
+ some peripherals.
Building Fuse
-------------
-To compile Fuse (see below for instructions for the OS X native port):
+See the file `INSTALL' for more detailed information.
-$ ./configure
-
-There are now some options you can give to configure; `configure
---help' will list them all, but the most important are:
-
---with-fb Use the framebuffer interface, rather than GTK+.
---with-sdl Use the SDL interface, rather than GTK+.
---with-svgalib Use the SVGAlib interface.
---without-gtk Use the plain Xlib interface.
-
-If glib is installed on your system, Fuse will use this for a couple
-of things; however, it isn't necessary as libspectrum provides
-replacements for all the routines used by Fuse.
-
-Another useful option is `--with-local-prefix=DIRECTORY' which allows
-you to specify that you have some of the libraries needed by Fuse in
-`<DIRECTORY>/lib' and the necessary header files in
-`<DIRECTORY>/include'. If you specify the `--prefix' option to tell
-Fuse to install itself somewhere other than in /usr/local, that
-directory will automatically be searched as well.
-
-Then just:
-
-$ make
-
-and then
-
-$ make install
-
-if you want to place Fuse into the main directories on your system
-(under /usr/local by default, although you can change this with the
---prefix argument to 'configure'). You'll probably need to be root to
-do this bit.
-
-Once you've got Fuse configured and built, read the man page :-)
-
-Note that if you're using version of Fuse from Subversion rather than
-one of the released tarballs, you'll need to run `autogen.sh' before
-running 'configure' for the first time.
-
-Building the OS X version of Fuse
----------------------------------
-
-The native Cocoa port by Fredrick Meunier <fr...@sp...> comes as
-a set of Xcode projects for libgcrypt, libspectrum and Fuse itself.
-
-Building the Wii version of Fuse
---------------------------------
-
-You'll need to have the standard Wii homebrew toolchain installed; see
-eg <http://wiibrew.org/wiki/DevkitPro> for some information on setting
-this up.
-
-After that, make sure the dev tools are in your path (export
-PATH=$PATH:$DEVKITPPC/bin) and that a Wii version of libspectrum has been
-built and installed.
-
-Then, use this configure line:
-
-./configure --target=powerpc-gekko --host=powerpc-gekko \
- --with-wii \
- --without-libxml2 --without-libiconv --without-gpm \
- --without-x --without-glib \
- CFLAGS="-g -I$DEVKITPPC/include -I$DEVKITPRO/libogc/include -DGEKKO" \
- LDFLAGS="-g -mrvl -mcpu=750 -meabi -mhard-float \
- -Wl,-Map,fuse.elf.map -L$DEVKITPPC/lib \
- -L$DEVKITPRO/libogc/lib/wii" \
- LIBS="-lfat -lwiiuse -lbte -logc -lm"
-
-Finally, to build, use this line:
-
-EXEEXT=".elf" make -e
-
-This should build fuse.elf, which you can run on your Wii via the usual
-methods.
-
-Building the Win32 version of Fuse on Linux
---------------------------------
-
-You'll need to have the standard MinGW programming tool set. e.g. on Debian
-`apt-get install mingw32 mingw-binutils mingw32-runtime'
- <http://www.mingw.org/>
-
-First, have to compile libspectrum:
-
-./configure --host=i586-mingw32msvc --without-libaudiofile --without-zlib \
- --without-libgcrypt --without-bzip2 --without-glib --prefix=`pwd`
-make install
-
-This should compile libspectrum without any external lib, and `install' into the
-source directory. All of the external libs needed by libspectrum and fuse
-compile with successfully with MingGW environment - in case of problems
-with compiling any of the libs please refer to the lib's homepage for help.
-
-Then, compile fuse:
-
-./configure --host=i586-mingw32msvc --without-glib --prefix=`pwd` \
- --with-libspectrum-prefix=`pwd`/../libspectrum --with-win32 \
- --without-libxml2 --without-x
-make
-
-You have to use the real path of libspectrum with `--with-libspectrum-prefix='.
-This should build `fuse.exe' without any external lib, but you can run it on
-Windows or Linux (with Wine).
-
-Note: you need `libspectrum-7.dll' and the `roms' directory and the `lib'
- directory to `fuse' run perfectly. You may copy this file and directories
- into that directory where `fuse.exe' exists. On windows you may need to
- copy all files from `lib/uncompressed' into `lib'.
- With wine you need `fltmgr.sys' in Windows `system32' directory. (e.g.:
- ~/.wine/c_drive/windows/system32).
-
Closing comments
----------------
@@ -218,4 +107,4 @@
Philip Kendall <phi...@sh...>
16 December 2010
-$Id: README 4624 2012-01-09 20:59:35Z pak21 $
+$Id: README 4763 2012-11-16 11:01:59Z fredm $
Deleted: vendor/fuse-emulator/current/fuse/acinclude.m4
===================================================================
--- vendor/fuse-emulator/current/fuse/acinclude.m4 2012-12-05 21:19:12 UTC (rev 714)
+++ vendor/fuse-emulator/current/fuse/acinclude.m4 2012-12-05 21:20:47 UTC (rev 715)
@@ -1,1227 +0,0 @@
-# Configure paths for GLIB
-# Owen Taylor 97-11-3
-
-# Taken from Glib 1.2.10 by PAK 2004/07/06
-
-dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or
-dnl gthread is specified in MODULES, pass to glib-config
-dnl
-AC_DEFUN([AM_PATH_GLIB],
-[dnl
-dnl Get the cflags and libraries from the glib-config script
-dnl
-AC_ARG_WITH(glib-prefix,[ --with-glib-prefix=PFX Prefix where GLIB is installed (optional)],
- glib_config_prefix="$withval", glib_config_prefix="")
-AC_ARG_WITH(glib-exec-prefix,[ --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)],
- glib_config_exec_prefix="$withval", glib_config_exec_prefix="")
-AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and run a test GLIB program],
- , enable_glibtest=yes)
-
- if test x$glib_config_exec_prefix != x ; then
- glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix"
- if test x${GLIB_CONFIG+set} != xset ; then
- GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config
- fi
- fi
- if test x$glib_config_prefix != x ; then
- glib_config_args="$glib_config_args --prefix=$glib_config_prefix"
- if test x${GLIB_CONFIG+set} != xset ; then
- GLIB_CONFIG=$glib_config_prefix/bin/glib-config
- fi
- fi
-
- for module in . $4
- do
- case "$module" in
- gmodule)
- glib_config_args="$glib_config_args gmodule"
- ;;
- gthread)
- glib_config_args="$glib_config_args gthread"
- ;;
- esac
- done
-
- AC_PATH_PROG(GLIB_CONFIG, glib-config, no)
- min_glib_version=ifelse([$1], ,0.99.7,$1)
- AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
- no_glib=""
- if test "$GLIB_CONFIG" = "no" ; then
- no_glib=yes
- else
- GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags`
- GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs`
- glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
- glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
- glib_config_micro_version=`$GLIB_CONFIG $glib_config_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
- if test "x$enable_glibtest" = "xyes" ; then
- ac_save_CFLAGS="$CFLAGS"
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $GLIB_CFLAGS"
- LIBS="$GLIB_LIBS $LIBS"
-dnl
-dnl Now check if the installed GLIB is sufficiently new. (Also sanity
-dnl checks the results of glib-config to some extent
-dnl
- rm -f conf.glibtest
- AC_TRY_RUN([
-#include <glib.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int
-main ()
-{
- int major, minor, micro;
- char *tmp_version;
-
- system ("touch conf.glibtest");
-
- /* HP/UX 9 (%@#!) writes to sscanf strings */
- tmp_version = g_strdup("$min_glib_version");
- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
- printf("%s, bad version string\n", "$min_glib_version");
- exit(1);
- }
-
- if ((glib_major_version != $glib_config_major_version) ||
- (glib_minor_version != $glib_config_minor_version) ||
- (glib_micro_version != $glib_config_micro_version))
- {
- printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n",
- $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
- glib_major_version, glib_minor_version, glib_micro_version);
- printf ("*** was found! If glib-config was correct, then it is best\n");
- printf ("*** to remove the old version of GLIB. You may also be able to fix the error\n");
- printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
- printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
- printf("*** required on your system.\n");
- printf("*** If glib-config was wrong, set the environment variable GLIB_CONFIG\n");
- printf("*** to point to the correct copy of glib-config, and remove the file config.cache\n");
- printf("*** before re-running configure\n");
- }
- else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
- (glib_minor_version != GLIB_MINOR_VERSION) ||
- (glib_micro_version != GLIB_MICRO_VERSION))
- {
- printf("*** GLIB header files (version %d.%d.%d) do not match\n",
- GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
- printf("*** library (version %d.%d.%d)\n",
- glib_major_version, glib_minor_version, glib_micro_version);
- }
- else
- {
- if ((glib_major_version > major) ||
- ((glib_major_version == major) && (glib_minor_version > minor)) ||
- ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
- {
- return 0;
- }
- else
- {
- printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
- glib_major_version, glib_minor_version, glib_micro_version);
- printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
- major, minor, micro);
- printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
- printf("***\n");
- printf("*** If you have already installed a sufficiently new version, this error\n");
- printf("*** probably means that the wrong copy of the glib-config shell script is\n");
- printf("*** being found. The easiest way to fix this is to remove the old version\n");
- printf("*** of GLIB, but you can also set the GLIB_CONFIG environment to point to the\n");
- printf("*** correct copy of glib-config. (In this case, you will have to\n");
- printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
- printf("*** so that the correct libraries are found at run-time))\n");
- }
- }
- return 1;
-}
-],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- if test "x$no_glib" = x ; then
- AC_MSG_RESULT(yes)
- ifelse([$2], , :, [$2])
- else
- AC_MSG_RESULT(no)
- if test "$GLIB_CONFIG" = "no" ; then
- echo "*** The glib-config script installed by GLIB could not be found"
- echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in"
- echo "*** your path, or set the GLIB_CONFIG environment variable to the"
- echo "*** full path to glib-config."
- else
- if test -f conf.glibtest ; then
- :
- else
- echo "*** Could not run GLIB test program, checking why..."
- CFLAGS="$CFLAGS $GLIB_CFLAGS"
- LIBS="$LIBS $GLIB_LIBS"
- AC_TRY_LINK([
-#include <glib.h>
-#include <stdio.h>
-], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
- [ echo "*** The test program compiled, but did not run. This usually means"
- echo "*** that the run-time linker is not finding GLIB or finding the wrong"
- echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
- echo "*** to the installed location Also, make sure you have run ldconfig if that"
- echo "*** is required on your system"
- echo "***"
- echo "*** If you have an old version installed, it is best to remove it, although"
- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
- echo "***"
- echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
- echo "*** came with the system with the command"
- echo "***"
- echo "*** rpm --erase --nodeps gtk gtk-devel" ],
- [ echo "*** The test program failed to compile or link. See the file config.log for the"
- echo "*** exact error that occured. This usually means GLIB was incorrectly installed"
- echo "*** or that you have moved GLIB since it was installed. In the latter case, you"
- echo "*** may want to edit the glib-config script: $GLIB_CONFIG" ])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- GLIB_CFLAGS=""
- GLIB_LIBS=""
- ifelse([$3], , :, [$3])
- fi
- AC_SUBST(GLIB_CFLAGS)
- AC_SUBST(GLIB_LIBS)
- rm -f conf.glibtest
-])
-
-# Configure paths for GLIB
-# Owen Taylor 1997-2001
-
-# Taken from Glib 2.4.2 by PAK 2004/07/06
-
-dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or
-dnl gthread is specified in MODULES, pass to pkg-config
-dnl
-AC_DEFUN([AM_PATH_GLIB_2_0],
-[dnl
-dnl Get the cflags and libraries from pkg-config
-dnl
-AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program],
- , enable_glibtest=yes)
-
- pkg_config_args=glib-2.0
- for module in . $4
- do
- case "$module" in
- gmodule)
- pkg_config_args="$pkg_config_args gmodule-2.0"
- ;;
- gobject)
- pkg_config_args="$pkg_config_args gobject-2.0"
- ;;
- gthread)
- pkg_config_args="$pkg_config_args gthread-2.0"
- ;;
- esac
- done
-
- AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-
- no_glib=""
-
- if test x$PKG_CONFIG != xno ; then
- if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then
- :
- else
- echo *** pkg-config too old; version 0.7 or better required.
- no_glib=yes
- PKG_CONFIG=no
- fi
- else
- no_glib=yes
- fi
-
- min_glib_version=ifelse([$1], ,2.0.0,$1)
- AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
-
- if test x$PKG_CONFIG != xno ; then
- ## don't try to run the test against uninstalled libtool libs
- if $PKG_CONFIG --uninstalled $pkg_config_args; then
- echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH"
- enable_glibtest=no
- fi
-
- if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then
- :
- else
- no_glib=yes
- fi
- fi
-
- if test x"$no_glib" = x ; then
- GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
- GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0`
- GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
-
- GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args`
- GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args`
- glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
- glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
- glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
- if test "x$enable_glibtest" = "xyes" ; then
- ac_save_CFLAGS="$CFLAGS"
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $GLIB_CFLAGS"
- LIBS="$GLIB_LIBS $LIBS"
-dnl
-dnl Now check if the installed GLIB is sufficiently new. (Also sanity
-dnl checks the results of pkg-config to some extent)
-dnl
- rm -f conf.glibtest
- AC_TRY_RUN([
-#include <glib.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int
-main ()
-{
- int major, minor, micro;
- char *tmp_version;
-
- system ("touch conf.glibtest");
-
- /* HP/UX 9 (%@#!) writes to sscanf strings */
- tmp_version = g_strdup("$min_glib_version");
- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
- printf("%s, bad version string\n", "$min_glib_version");
- exit(1);
- }
-
- if ((glib_major_version != $glib_config_major_version) ||
- (glib_minor_version != $glib_config_minor_version) ||
- (glib_micro_version != $glib_config_micro_version))
- {
- printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n",
- $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
- glib_major_version, glib_minor_version, glib_micro_version);
- printf ("*** was found! If pkg-config was correct, then it is best\n");
- printf ("*** to remove the old version of GLib. You may also be able to fix the error\n");
- printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
- printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
- printf("*** required on your system.\n");
- printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
- printf("*** to point to the correct configuration files\n");
- }
- else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
- (glib_minor_version != GLIB_MINOR_VERSION) ||
- (glib_micro_version != GLIB_MICRO_VERSION))
- {
- printf("*** GLIB header files (version %d.%d.%d) do not match\n",
- GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
- printf("*** library (version %d.%d.%d)\n",
- glib_major_version, glib_minor_version, glib_micro_version);
- }
- else
- {
- if ((glib_major_version > major) ||
- ((glib_major_version == major) && (glib_minor_version > minor)) ||
- ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
- {
- return 0;
- }
- else
- {
- printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
- glib_major_version, glib_minor_version, glib_micro_version);
- printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
- major, minor, micro);
- printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
- printf("***\n");
- printf("*** If you have already installed a sufficiently new version, this error\n");
- printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
- printf("*** being found. The easiest way to fix this is to remove the old version\n");
- printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n");
- printf("*** correct copy of pkg-config. (In this case, you will have to\n");
- printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
- printf("*** so that the correct libraries are found at run-time))\n");
- }
- }
- return 1;
-}
-],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- if test "x$no_glib" = x ; then
- AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version))
- ifelse([$2], , :, [$2])
- else
- AC_MSG_RESULT(no)
- if test "$PKG_CONFIG" = "no" ; then
- echo "*** A new enough version of pkg-config was not found."
- echo "*** See http://www.freedesktop.org/software/pkgconfig/"
- else
- if test -f conf.glibtest ; then
- :
- else
- echo "*** Could not run GLIB test program, checking why..."
- ac_save_CFLAGS="$CFLAGS"
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $GLIB_CFLAGS"
- LIBS="$LIBS $GLIB_LIBS"
- AC_TRY_LINK([
-#include <glib.h>
-#include <stdio.h>
-], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
- [ echo "*** The test program compiled, but did not run. This usually means"
- echo "*** that the run-time linker is not finding GLIB or finding the wrong"
- echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
- echo "*** to the installed location Also, make sure you have run ldconfig if that"
- echo "*** is required on your system"
- echo "***"
- echo "*** If you have an old version installed, it is best to remove it, although"
- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
- [ echo "*** The test program failed to compile or link. See the file config.log for the"
- echo "*** exact error that occured. This usually means GLIB is incorrectly installed."])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- GLIB_CFLAGS=""
- GLIB_LIBS=""
- GLIB_GENMARSHAL=""
- GOBJECT_QUERY=""
- GLIB_MKENUMS=""
- ifelse([$3], , :, [$3])
- fi
- AC_SUBST(GLIB_CFLAGS)
- AC_SUBST(GLIB_LIBS)
- AC_SUBST(GLIB_GENMARSHAL)
- AC_SUBST(GOBJECT_QUERY)
- AC_SUBST(GLIB_MKENUMS)
- rm -f conf.glibtest
-])
-
-# Configure paths for GTK+
-# Owen Taylor 97-11-3
-
-# Taken from GTK+ 1.2.10 by PAK 2004/07/06
-
-dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
-dnl
-AC_DEFUN([AM_PATH_GTK],
-[dnl
-dnl Get the cflags and libraries from the gtk-config script
-dnl
-AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)],
- gtk_config_prefix="$withval", gtk_config_prefix="")
-AC_ARG_WITH(gtk-exec-prefix,[ --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)],
- gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="")
-AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run a test GTK program],
- , enable_gtktest=yes)
-
- for module in . $4
- do
- case "$module" in
- gthread)
- gtk_config_args="$gtk_config_args gthread"
- ;;
- esac
- done
-
- if test x$gtk_config_exec_prefix != x ; then
- gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
- if test x${GTK_CONFIG+set} != xset ; then
- GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
- fi
- fi
- if test x$gtk_config_prefix != x ; then
- gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
- if test x${GTK_CONFIG+set} != xset ; then
- GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
- fi
- fi
-
- AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
- min_gtk_version=ifelse([$1], ,0.99.7,$1)
- AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
- no_gtk=""
- if test "$GTK_CONFIG" = "no" ; then
- no_gtk=yes
- else
- GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
- GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
- gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
- gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
- gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
- if test "x$enable_gtktest" = "xyes" ; then
- ac_save_CFLAGS="$CFLAGS"
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $GTK_CFLAGS"
- LIBS="$GTK_LIBS $LIBS"
-dnl
-dnl Now check if the installed GTK is sufficiently new. (Also sanity
-dnl checks the results of gtk-config to some extent
-dnl
- rm -f conf.gtktest
- AC_TRY_RUN([
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int
-main ()
-{
- int major, minor, micro;
- char *tmp_version;
-
- system ("touch conf.gtktest");
-
- /* HP/UX 9 (%@#!) writes to sscanf strings */
- tmp_version = g_strdup("$min_gtk_version");
- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
- printf("%s, bad version string\n", "$min_gtk_version");
- exit(1);
- }
-
- if ((gtk_major_version != $gtk_config_major_version) ||
- (gtk_minor_version != $gtk_config_minor_version) ||
- (gtk_micro_version != $gtk_config_micro_version))
- {
- printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
- $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
- gtk_major_version, gtk_minor_version, gtk_micro_version);
- printf ("*** was found! If gtk-config was correct, then it is best\n");
- printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
- printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
- printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
- printf("*** required on your system.\n");
- printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
- printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
- printf("*** before re-running configure\n");
- }
-#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
- else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
- (gtk_minor_version != GTK_MINOR_VERSION) ||
- (gtk_micro_version != GTK_MICRO_VERSION))
- {
- printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
- GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
- printf("*** library (version %d.%d.%d)\n",
- gtk_major_version, gtk_minor_version, gtk_micro_version);
- }
-#endif /* defined (GTK_MAJOR_VERSION) ... */
- else
- {
- if ((gtk_major_version > major) ||
- ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
- ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
- {
- return 0;
- }
- else
- {
- printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
- gtk_major_version, gtk_minor_version, gtk_micro_version);
- printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
- major, minor, micro);
- printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
- printf("***\n");
- printf("*** If you have already installed a sufficiently new version, this error\n");
- printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
- printf("*** being found. The easiest way to fix this is to remove the old version\n");
- printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
- printf("*** correct copy of gtk-config. (In this case, you will have to\n");
- printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
- printf("*** so that the correct libraries are found at run-time))\n");
- }
- }
- return 1;
-}
-],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- if test "x$no_gtk" = x ; then
- AC_MSG_RESULT(yes)
- ifelse([$2], , :, [$2])
- else
- AC_MSG_RESULT(no)
- if test "$GTK_CONFIG" = "no" ; then
- echo "*** The gtk-config script installed by GTK could not be found"
- echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
- echo "*** your path, or set the GTK_CONFIG environment variable to the"
- echo "*** full path to gtk-config."
- else
- if test -f conf.gtktest ; then
- :
- else
- echo "*** Could not run GTK test program, checking why..."
- CFLAGS="$CFLAGS $GTK_CFLAGS"
- LIBS="$LIBS $GTK_LIBS"
- AC_TRY_LINK([
-#include <gtk/gtk.h>
-#include <stdio.h>
-], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
- [ echo "*** The test program compiled, but did not run. This usually means"
- echo "*** that the run-time linker is not finding GTK or finding the wrong"
- echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
- echo "*** to the installed location Also, make sure you have run ldconfig if that"
- echo "*** is required on your system"
- echo "***"
- echo "*** If you have an old version installed, it is best to remove it, although"
- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
- echo "***"
- echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
- echo "*** came with the system with the command"
- echo "***"
- echo "*** rpm --erase --nodeps gtk gtk-devel" ],
- [ echo "*** The test program failed to compile or link. See the file config.log for the"
- echo "*** exact error that occured. This usually means GTK was incorrectly installed"
- echo "*** or that you have moved GTK since it was installed. In the latter case, you"
- echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- GTK_CFLAGS=""
- GTK_LIBS=""
- ifelse([$3], , :, [$3])
- fi
- AC_SUBST(GTK_CFLAGS)
- AC_SUBST(GTK_LIBS)
- rm -f conf.gtktest
-])
-
-# Configure paths for GTK+
-# Owen Taylor 1997-2001
-
-# Taken from GTK+ 2.4.3 by PAK 2004/07/06
-
-dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES,
-dnl pass to pkg-config
-dnl
-AC_DEFUN([AM_PATH_GTK_2_0],
-[dnl
-dnl Get the cflags and libraries from pkg-config
-dnl
-AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and run a test GTK+ program],
- , enable_gtktest=yes)
-
- pkg_config_args=gtk+-2.0
- for module in . $4
- do
- case "$module" in
- gthread)
- pkg_config_args="$pkg_config_args gthread-2.0"
- ;;
- esac
- done
-
- no_gtk=""
-
- AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-
- if test x$PKG_CONFIG != xno ; then
- if pkg-config --atleast-pkgconfig-version 0.7 ; then
- :
- else
- echo "*** pkg-config too old; version 0.7 or better required."
- no_gtk=yes
- PKG_CONFIG=no
- fi
- else
- no_gtk=yes
- fi
-
- min_gtk_version=ifelse([$1], ,2.0.0,$1)
- AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version)
-
- if test x$PKG_CONFIG != xno ; then
- ## don't try to run the test against uninstalled libtool libs
- if $PKG_CONFIG --uninstalled $pkg_config_args; then
- echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
- enable_gtktest=no
- fi
-
- if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then
- :
- else
- no_gtk=yes
- fi
- fi
-
- if test x"$no_gtk" = x ; then
- GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
- GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
- gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
- gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
- gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
- if test "x$enable_gtktest" = "xyes" ; then
- ac_save_CFLAGS="$CFLAGS"
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $GTK_CFLAGS"
- LIBS="$GTK_LIBS $LIBS"
-dnl
-dnl Now check if the installed GTK+ is sufficiently new. (Also sanity
-dnl checks the results of pkg-config to some extent)
-dnl
- rm -f conf.gtktest
- AC_TRY_RUN([
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int
-main ()
-{
- int major, minor, micro;
- char *tmp_version;
-
- system ("touch conf.gtktest");
-
- /* HP/UX 9 (%@#!) writes to sscanf strings */
- tmp_version = g_strdup("$min_gtk_version");
- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
- printf("%s, bad version string\n", "$min_gtk_version");
- exit(1);
- }
-
- if ((gtk_major_version != $gtk_config_major_version) ||
- (gtk_minor_version != $gtk_config_minor_version) ||
- (gtk_micro_version != $gtk_config_micro_version))
- {
- printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
- $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
- gtk_major_version, gtk_minor_version, gtk_micro_version);
- printf ("*** was found! If pkg-config was correct, then it is best\n");
- printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
- printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
- printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
- printf("*** required on your system.\n");
- printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
- printf("*** to...
[truncated message content] |
|
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] |
|
From: <fr...@us...> - 2013-05-18 11:04:20
|
Revision: 745
http://sourceforge.net/p/fuse-for-macosx/code/745
Author: fredm
Date: 2013-05-18 11:04:17 +0000 (Sat, 18 May 2013)
Log Message:
-----------
Load . into vendor/fuse-emulator/current.
Modified Paths:
--------------
vendor/fuse-emulator/current/fuse/hacking/ChangeLog
vendor/fuse-emulator/current/fuse/machines/machines_periph.c
vendor/fuse-emulator/current/fuse/machines/spec128.h
vendor/fuse-emulator/current/fuse/machines/specplus2.c
vendor/fuse-emulator/current/fuse/man/fuse.1
vendor/fuse-emulator/current/fuse/peripherals/ay.c
vendor/fuse-emulator/current/fuse/peripherals/disk/beta.c
vendor/fuse-emulator/current/fuse/peripherals/disk/opus.c
vendor/fuse-emulator/current/fuse/peripherals/disk/opus.h
vendor/fuse-emulator/current/fuse/peripherals/fuller.c
vendor/fuse-emulator/current/fuse/peripherals/ide/divide.h
vendor/fuse-emulator/current/fuse/peripherals/ide/simpleide.c
vendor/fuse-emulator/current/fuse/peripherals/if1.c
vendor/fuse-emulator/current/fuse/peripherals/if2.c
vendor/fuse-emulator/current/fuse/peripherals/joystick.c
vendor/fuse-emulator/current/fuse/peripherals/kempmouse.c
vendor/fuse-emulator/current/fuse/peripherals/kempmouse.h
vendor/fuse-emulator/current/fuse/peripherals/melodik.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/specdrum.h
vendor/fuse-emulator/current/fuse/peripherals/spectranet.c
vendor/fuse-emulator/current/fuse/peripherals/ula.c
vendor/fuse-emulator/current/fuse/settings-header.pl
vendor/fuse-emulator/current/fuse/sound.c
vendor/fuse-emulator/current/fuse/unittests/unittests.c
vendor/fuse-emulator/current/fuse-utils/hacking/ChangeLog
Modified: vendor/fuse-emulator/current/fuse/hacking/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse/hacking/ChangeLog 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/hacking/ChangeLog 2013-05-18 11:04:17 UTC (rev 745)
@@ -4456,8 +4456,27 @@
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
+ sdl/sdljoystick.c,uijoystick.c,widget/menu.c}: allow up to 15 joystick
+ buttons to be defined to accommodate 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).
+20130420 peripherals/spectranet.c: allow disabling Spectranet code (more from
+ bug #259) (Sergio).
+20130501 sound.c: don't try to enable right channel for Specdrum unless stereo
+ mode is set (fixes bug #294) (thanks, mcleod_ideafix and Sergio)
+ (Fred).
+20130501 man/fuse.1: add %cfgnew step in Spectranet initialisation steps
+ (thanks, smogit and Guesser) (Fred).
+20130505 peripherals/{disk/opus.h,specdrum.h}: add missing subversion properties
+ (Sergio).
+20130505 machines/{spec128.h,specplus2.c},peripherals/{disk/opus.h,ide/divide.h,
+ kempmouse.h,specdrum.h},settings-header.pl: remove and relocate some
+ header inclusions (Sergio).
+20130505 unittests/unittests.c: add missing header (Sergio).
+20130505 peripherals/{ay.c,fuller.c,if1.c,if2.c,joystick.c,kempmouse.c,
+ machines_periph.c,melodik.c,printer.c,scld.c,speccyboot.c,specdrum.c,
+ ula.c},peripherals/disk/{beta.c,opus.c}, peripherals/ide/simpleide.c:
+ complete some missing field initializers (Sergio).
+20130505 peripherals/if1.c: put braces around empty body in ‘do’ statements
+ (Sergio).
Modified: vendor/fuse-emulator/current/fuse/machines/machines_periph.c
===================================================================
--- vendor/fuse-emulator/current/fuse/machines/machines_periph.c 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/machines/machines_periph.c 2013-05-18 11:04:17 UTC (rev 745)
@@ -1,7 +1,7 @@
/* machines_periph.c: various machine-specific peripherals
Copyright (c) 2011 Philip Kendall
- $Id: machines_periph.c 4624 2012-01-09 20:59:35Z pak21 $
+ $Id: machines_periph.c 4926 2013-05-05 07:58:18Z 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
@@ -49,7 +49,9 @@
static const periph_t spec128_memory = {
NULL,
- spec128_memory_ports
+ spec128_memory_ports,
+ 0,
+ NULL
};
static const periph_port_t plus3_memory_ports[] = {
@@ -60,7 +62,9 @@
static const periph_t plus3_memory = {
NULL,
- plus3_memory_ports
+ plus3_memory_ports,
+ 0,
+ NULL
};
static const periph_port_t upd765_ports[] = {
@@ -71,7 +75,9 @@
static const periph_t upd765 = {
NULL,
- upd765_ports
+ upd765_ports,
+ 0,
+ NULL
};
static const periph_port_t se_memory_ports[] = {
@@ -81,7 +87,9 @@
static const periph_t se_memory = {
NULL,
- se_memory_ports
+ se_memory_ports,
+ 0,
+ NULL
};
static const periph_port_t tc2068_ay_ports[] = {
@@ -92,7 +100,9 @@
static const periph_t tc2068_ay = {
NULL,
- tc2068_ay_ports
+ tc2068_ay_ports,
+ 0,
+ NULL
};
static const periph_port_t beta128_pentagon_ports[] = {
@@ -106,7 +116,9 @@
static const periph_t beta128_pentagon = {
NULL,
- beta128_pentagon_ports
+ beta128_pentagon_ports,
+ 0,
+ NULL
};
static const periph_port_t beta128_pentagon_late_ports[] = {
@@ -120,7 +132,9 @@
static const periph_t beta128_pentagon_late = {
NULL,
- beta128_pentagon_late_ports
+ beta128_pentagon_late_ports,
+ 0,
+ NULL
};
static const periph_port_t pentagon1024_memory_ports[] = {
@@ -131,7 +145,9 @@
static const periph_t pentagon1024_memory = {
NULL,
- pentagon1024_memory_ports
+ pentagon1024_memory_ports,
+ 0,
+ NULL
};
void
Modified: vendor/fuse-emulator/current/fuse/machines/spec128.h
===================================================================
--- vendor/fuse-emulator/current/fuse/machines/spec128.h 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/machines/spec128.h 2013-05-18 11:04:17 UTC (rev 745)
@@ -1,7 +1,7 @@
/* spec128.h: Spectrum 128K specific routines
Copyright (c) 1999-2004 Philip Kendall
- $Id: spec128.h 4277 2011-01-24 22:01:43Z pak21 $
+ $Id: spec128.h 4924 2013-05-05 07:40:02Z 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
@@ -29,7 +29,6 @@
#include <libspectrum.h>
#include "machine.h"
-#include "periph.h"
int spec128_init( fuse_machine_info *machine );
int spec128_common_reset( int contention );
Modified: vendor/fuse-emulator/current/fuse/machines/specplus2.c
===================================================================
--- vendor/fuse-emulator/current/fuse/machines/specplus2.c 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/machines/specplus2.c 2013-05-18 11:04:17 UTC (rev 745)
@@ -1,7 +1,7 @@
/* specplus2.c: Spectrum +2 specific routines
Copyright (c) 1999-2011 Philip Kendall
- $Id: specplus2.c 4638 2012-01-21 12:52:14Z fredm $
+ $Id: specplus2.c 4924 2013-05-05 07:40:02Z 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
@@ -32,6 +32,7 @@
#include "machine.h"
#include "machines_periph.h"
#include "machines.h"
+#include "periph.h"
#include "peripherals/disk/beta.h"
#include "settings.h"
#include "spec128.h"
Modified: vendor/fuse-emulator/current/fuse/man/fuse.1
===================================================================
--- vendor/fuse-emulator/current/fuse/man/fuse.1 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/man/fuse.1 2013-05-18 11:04:17 UTC (rev 745)
@@ -3740,7 +3740,11 @@
starting with \(lqAlioth Spectranet\(rq and ending with the Spectranet's IP
address (which will be 255.255.255.255 at this stage).
.PP
-If you see all that, trigger an NMI (the Machine / NMI menu option)
+If you see all that, type the following command:
+.PP
+%cfgnew
+.PP
+Which will show the standard 0 OK, 0:1 at the bottom of the screen. Now trigger an NMI (the Machine / NMI menu option)
and you should get a white on blue Spectranet NMI menu with five
options.
.PP
Modified: vendor/fuse-emulator/current/fuse/peripherals/ay.c
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/ay.c 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/peripherals/ay.c 2013-05-18 11:04:17 UTC (rev 745)
@@ -1,7 +1,7 @@
/* ay.c: AY-8-3912 routines
Copyright (c) 1999-2009 Philip Kendall
- $Id: ay.c 4640 2012-01-21 13:26:35Z pak21 $
+ $Id: ay.c 4926 2013-05-05 07:58:18Z 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
@@ -66,7 +66,9 @@
static periph_t ay_periph = {
NULL,
- ay_ports
+ ay_ports,
+ 0,
+ NULL
};
static periph_port_t ay_ports_plus3[] = {
@@ -77,7 +79,9 @@
static periph_t ay_periph_plus3 = {
NULL,
- ay_ports_plus3
+ ay_ports_plus3,
+ 0,
+ NULL
};
static periph_port_t ay_ports_full_decode[] = {
@@ -88,7 +92,9 @@
static periph_t ay_periph_full_decode = {
NULL,
- ay_ports_full_decode
+ ay_ports_full_decode,
+ 0,
+ NULL
};
static periph_port_t ay_ports_timex[] = {
@@ -99,7 +105,9 @@
static periph_t ay_periph_timex = {
NULL,
- ay_ports_timex
+ ay_ports_timex,
+ 0,
+ NULL
};
void
Modified: vendor/fuse-emulator/current/fuse/peripherals/disk/beta.c
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/disk/beta.c 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/peripherals/disk/beta.c 2013-05-18 11:04:17 UTC (rev 745)
@@ -1,7 +1,7 @@
/* beta.c: Routines for handling the Beta disk interface
Copyright (c) 2004-2011 Stuart Brady, Philip Kendall
- $Id: beta.c 4906 2013-03-10 11:21:37Z fredm $
+ $Id: beta.c 4926 2013-05-05 07:58:18Z 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
@@ -92,7 +92,8 @@
static const periph_t beta_peripheral = {
&settings_current.beta128,
beta_ports,
- 1
+ 1,
+ NULL
};
static void beta_reset( int hard_reset );
Modified: vendor/fuse-emulator/current/fuse/peripherals/disk/opus.c
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/disk/opus.c 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/peripherals/disk/opus.c 2013-05-18 11:04:17 UTC (rev 745)
@@ -2,7 +2,7 @@
Copyright (c) 1999-2011 Stuart Brady, Fredrick Meunier, Philip Kendall,
Dmitry Sanarin, Darren Salt, Michael D Wynne, Gergely Szasz
- $Id: opus.c 4906 2013-03-10 11:21:37Z fredm $
+ $Id: opus.c 4926 2013-05-05 07:58:18Z 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
@@ -102,7 +102,8 @@
static const periph_t opus_periph = {
&settings_current.opus,
NULL,
- 1
+ 1,
+ NULL
};
void
Modified: vendor/fuse-emulator/current/fuse/peripherals/disk/opus.h
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/disk/opus.h 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/peripherals/disk/opus.h 2013-05-18 11:04:17 UTC (rev 745)
@@ -1,7 +1,7 @@
/* opus.h: Routines for handling the Opus Discovery interface
Copyright (c) 2005-2009 Stuart Brady, Fredrick Meunier
- $Id$
+ $Id: opus.h 4924 2013-05-05 07:40:02Z 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
@@ -30,16 +30,15 @@
#include <config.h>
+#include <libspectrum.h>
+
+#include "fdd.h"
+
typedef enum opus_drive_number {
OPUS_DRIVE_1 = 0,
OPUS_DRIVE_2,
} opus_drive_number;
-#include <libspectrum.h>
-
-#include "periph.h"
-#include "fdd.h"
-
extern int opus_available; /* Is the Opus available for use? */
extern int opus_active; /* Opus enabled? */
Modified: vendor/fuse-emulator/current/fuse/peripherals/fuller.c
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/fuller.c 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/peripherals/fuller.c 2013-05-18 11:04:17 UTC (rev 745)
@@ -1,7 +1,7 @@
/* fuller.c: Routines for handling the Fuller Box
Copyright (c) 2007-2011 Stuart Brady, Fredrick Meunier, Philip Kendall
- $Id: fuller.c 4906 2013-03-10 11:21:37Z fredm $
+ $Id: fuller.c 4926 2013-05-05 07:58:18Z 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
@@ -59,7 +59,8 @@
static const periph_t fuller_periph = {
&settings_current.fuller,
fuller_ports,
- 1
+ 1,
+ NULL
};
static void
Modified: vendor/fuse-emulator/current/fuse/peripherals/ide/divide.h
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/ide/divide.h 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/peripherals/ide/divide.h 2013-05-18 11:04:17 UTC (rev 745)
@@ -1,7 +1,7 @@
/* divide.h: DivIDE interface routines
Copyright (c) 2005 Matthew Westcott
- $Id: divide.h 4664 2012-02-12 11:51:01Z fredm $
+ $Id: divide.h 4924 2013-05-05 07:40:02Z 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
@@ -27,7 +27,6 @@
#define FUSE_DIVIDE_H
#include <libspectrum.h>
-#include "periph.h"
/* Whether DivIDE is currently paged in */
extern int divide_active;
Modified: vendor/fuse-emulator/current/fuse/peripherals/ide/simpleide.c
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/ide/simpleide.c 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/peripherals/ide/simpleide.c 2013-05-18 11:04:17 UTC (rev 745)
@@ -3,7 +3,7 @@
2004 Philip Kendall,
2008 Fredrick Meunier
- $Id: simpleide.c 4906 2013-03-10 11:21:37Z fredm $
+ $Id: simpleide.c 4926 2013-05-05 07:58:18Z 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
@@ -51,7 +51,8 @@
static const periph_t simpleide_periph = {
&settings_current.simpleide_active,
simpleide_ports,
- 1
+ 1,
+ NULL
};
static libspectrum_ide_channel *simpleide_idechn;
Modified: vendor/fuse-emulator/current/fuse/peripherals/if1.c
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/if1.c 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/peripherals/if1.c 2013-05-18 11:04:17 UTC (rev 745)
@@ -1,7 +1,7 @@
/* if1.c: Interface 1 handling routines
Copyright (c) 2004-2011 Gergely Szasz, Philip Kendall
- $Id: if1.c 4906 2013-03-10 11:21:37Z fredm $
+ $Id: if1.c 4927 2013-05-05 08:05:11Z 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
@@ -221,7 +221,8 @@
static const periph_t if1_periph = {
&settings_current.interface1,
if1_ports,
- 1
+ 1,
+ NULL
};
/* Memory source */
@@ -897,8 +898,8 @@
if( settings_current.rs232_handshake &&
if1_ula.fd_t != -1 && if1_ula.cts != val ) {
char data = val ? 0x03 : 0x02;
- do ; while( write( if1_ula.fd_t, "", 1 ) != 1 );
- do ; while( write( if1_ula.fd_t, &data, 1 ) != 1 );
+ do {} while( write( if1_ula.fd_t, "", 1 ) != 1 );
+ do {} while( write( if1_ula.fd_t, &data, 1 ) != 1 );
}
if1_ula.cts = val;
@@ -947,15 +948,15 @@
if( if1_ula.count_out == -1 ) {
if1_ula.count_out = 13;
if1_ula.data_out = '?';
- do ; while( write( if1_ula.fd_t, "", 1 ) != 1 );
+ do {} while( write( if1_ula.fd_t, "", 1 ) != 1 );
}
if( if1_ula.count_out == 13 ) {
/* Here is the output routine */
if( if1_ula.data_out == 0x00 ) {
if1_ula.data_out = '*';
- do ; while( write( if1_ula.fd_t, "", 1 ) != 1 );
+ do {} while( write( if1_ula.fd_t, "", 1 ) != 1 );
}
- do ; while( write( if1_ula.fd_t, &if1_ula.data_out, 1 ) != 1 );
+ do {} while( write( if1_ula.fd_t, &if1_ula.data_out, 1 ) != 1 );
if1_ula.count_out = 0;
}
if1_ula.rx = val & 0x01; /* set rx */
@@ -970,7 +971,7 @@
*/
if1_ula.net = ( val & 0x01 ) ? 0 : 1; /* set rx */
lseek( if1_ula.fd_net, 0, SEEK_SET ); /* we save only the state of the wire*/
- do ; while( write( if1_ula.fd_net, &if1_ula.net, 1 ) == -1 );
+ do {} while( write( if1_ula.fd_net, &if1_ula.net, 1 ) == -1 );
#ifdef HAVE_FSYNC
fsync( if1_ula.fd_net );
#endif /* #ifdef HAVE_FSYNC */
@@ -988,7 +989,7 @@
/* lseek( if1_ula.fd_net, 0, SEEK_SET ); start a packet */
/* first we send the station number */
- do ; while( write( if1_ula.fd_net, &if1_ula.net_data, 1 ) == -1 );
+ do {} while( write( if1_ula.fd_net, &if1_ula.net_data, 1 ) == -1 );
#ifdef HAVE_FSYNC
fsync( if1_ula.fd_net );
#endif /* #ifdef HAVE_FSYNC */
Modified: vendor/fuse-emulator/current/fuse/peripherals/if2.c
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/if2.c 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/peripherals/if2.c 2013-05-18 11:04:17 UTC (rev 745)
@@ -1,7 +1,7 @@
/* if2.c: Interface 2 cartridge handling routines
Copyright (c) 2003-2011 Darren Salt, Fredrick Meunier, Philip Kendall
- $Id: if2.c 4872 2013-02-02 20:54:33Z fredm $
+ $Id: if2.c 4926 2013-05-05 07:58:18Z 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
@@ -65,6 +65,8 @@
static const periph_t if2_periph = {
&settings_current.interface2,
+ NULL,
+ 0,
NULL
};
Modified: vendor/fuse-emulator/current/fuse/peripherals/joystick.c
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/joystick.c 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/peripherals/joystick.c 2013-05-18 11:04:17 UTC (rev 745)
@@ -1,7 +1,7 @@
/* joystick.c: Joystick emulation support
Copyright (c) 2001-2011 Russell Marks, Darren Salt, Philip Kendall
- $Id: joystick.c 4299 2011-02-08 22:24:30Z pak21 $
+ $Id: joystick.c 4926 2013-05-05 07:58:18Z 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,9 @@
static const periph_t kempston_strict_periph = {
&settings_current.joy_kempston,
- kempston_strict_decoding
+ kempston_strict_decoding,
+ 0,
+ NULL
};
static const periph_port_t kempston_loose_decoding[] = {
@@ -114,7 +116,9 @@
static const periph_t kempston_loose_periph = {
&settings_current.joy_kempston,
- kempston_loose_decoding
+ kempston_loose_decoding,
+ 0,
+ NULL
};
/* Init/shutdown functions. Errors aren't important here */
Modified: vendor/fuse-emulator/current/fuse/peripherals/kempmouse.c
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/kempmouse.c 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/peripherals/kempmouse.c 2013-05-18 11:04:17 UTC (rev 745)
@@ -1,7 +1,7 @@
/* kempmouse.c: Kempston mouse emulation
Copyright (c) 2004-2008 Darren Salt, Fredrick Meunier
- $Id: kempmouse.c 4906 2013-03-10 11:21:37Z fredm $
+ $Id: kempmouse.c 4926 2013-05-05 07:58:18Z 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
@@ -73,7 +73,8 @@
static const periph_t kempmouse_periph = {
&settings_current.kempston_mouse,
kempmouse_ports,
- 1
+ 1,
+ NULL
};
void
Modified: vendor/fuse-emulator/current/fuse/peripherals/kempmouse.h
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/kempmouse.h 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/peripherals/kempmouse.h 2013-05-18 11:04:17 UTC (rev 745)
@@ -1,7 +1,7 @@
/* kempmouse.h: Kempston mouse emulation
Copyright (c) 2004-2008 Darren Salt, Fredrick Meunier
- $Id: kempmouse.h 4640 2012-01-21 13:26:35Z pak21 $
+ $Id: kempmouse.h 4924 2013-05-05 07:40:02Z 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
@@ -26,9 +26,6 @@
#ifndef FUSE_KEMPMOUSE_H
#define FUSE_KEMPMOUSE_H
-#include <libspectrum.h>
-#include "periph.h"
-
void kempmouse_init( void );
void kempmouse_update( int dx, int dy, int button, int down );
Modified: vendor/fuse-emulator/current/fuse/peripherals/melodik.c
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/melodik.c 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/peripherals/melodik.c 2013-05-18 11:04:17 UTC (rev 745)
@@ -1,7 +1,7 @@
/* melodik.c: Routines for handling the Melodik interface
Copyright (c) 2009-2011 Fredrick Meunier, Philip Kendall
- $Id: melodik.c 4906 2013-03-10 11:21:37Z fredm $
+ $Id: melodik.c 4926 2013-05-05 07:58:18Z 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
@@ -57,7 +57,8 @@
static const periph_t melodik_periph = {
&settings_current.melodik,
melodik_ports,
- 1
+ 1,
+ NULL
};
static void
Modified: vendor/fuse-emulator/current/fuse/peripherals/printer.c
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/printer.c 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/peripherals/printer.c 2013-05-18 11:04:17 UTC (rev 745)
@@ -1,7 +1,7 @@
/* printer.c: Printer support
Copyright (c) 2001-2004 Ian Collier, Russell Marks, Philip Kendall
- $Id: printer.c 4906 2013-03-10 11:21:37Z fredm $
+ $Id: printer.c 4926 2013-05-05 07:58:18Z 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
@@ -91,7 +91,8 @@
static const periph_t printer_zxp_periph = {
&settings_current.zxprinter,
printer_zxp_ports,
- 1
+ 1,
+ NULL
};
static const periph_port_t printer_zxp_ports_full_decode[] = {
@@ -101,7 +102,9 @@
static const periph_t printer_zxp_periph_full_decode = {
&settings_current.zxprinter,
- printer_zxp_ports_full_decode
+ printer_zxp_ports_full_decode,
+ 0,
+ NULL
};
static const periph_port_t printer_parallel_ports[] = {
@@ -111,7 +114,9 @@
static const periph_t printer_parallel_periph = {
&settings_current.printer,
- printer_parallel_ports
+ printer_parallel_ports,
+ 0,
+ NULL
};
static void printer_zxp_init(void)
Modified: vendor/fuse-emulator/current/fuse/peripherals/scld.c
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/scld.c 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/peripherals/scld.c 2013-05-18 11:04:17 UTC (rev 745)
@@ -1,7 +1,7 @@
/* scld.c: Routines for handling the Timex SCLD
Copyright (c) 2002-2011 Fredrick Meunier, Philip Kendall, Witold Filipczyk
- $Id: scld.c 4872 2013-02-02 20:54:33Z fredm $
+ $Id: scld.c 4926 2013-05-05 07:58:18Z 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
@@ -76,7 +76,9 @@
static const periph_t scld_periph = {
NULL,
- scld_ports
+ scld_ports,
+ 0,
+ NULL
};
void
Modified: vendor/fuse-emulator/current/fuse/peripherals/speccyboot.c
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/speccyboot.c 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/peripherals/speccyboot.c 2013-05-18 11:04:17 UTC (rev 745)
@@ -3,7 +3,7 @@
Copyright (c) 2009-2011 Patrik Persson, Philip Kendall
- $Id: speccyboot.c 4906 2013-03-10 11:21:37Z fredm $
+ $Id: speccyboot.c 4926 2013-05-05 07:58:18Z 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
@@ -75,7 +75,8 @@
static const periph_t speccyboot_periph = {
&settings_current.speccyboot,
speccyboot_ports,
- 1
+ 1,
+ NULL
};
/* ---------------------------------------------------------------------------
Modified: vendor/fuse-emulator/current/fuse/peripherals/specdrum.c
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/specdrum.c 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/peripherals/specdrum.c 2013-05-18 11:04:17 UTC (rev 745)
@@ -1,7 +1,7 @@
/* specdrum.c: Routines for handling the Specdrum Drum Kit
Copyright (c) 2011 Jon Mitchell
- $Id: specdrum.c 4906 2013-03-10 11:21:37Z fredm $
+ $Id: specdrum.c 4926 2013-05-05 07:58:18Z 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
@@ -59,7 +59,8 @@
static const periph_t specdrum_periph = {
&settings_current.specdrum,
specdrum_ports,
- 1
+ 1,
+ NULL
};
void
Modified: vendor/fuse-emulator/current/fuse/peripherals/specdrum.h
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/specdrum.h 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/peripherals/specdrum.h 2013-05-18 11:04:17 UTC (rev 745)
@@ -1,7 +1,7 @@
/* specdrum.h: Routines for handling the Specdrum Drum Kit
Copyright (c) 2011 Jon Mitchell
- $Id$
+ $Id: specdrum.h 4924 2013-05-05 07:40:02Z 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
@@ -30,8 +30,6 @@
#include <libspectrum.h>
-#include "periph.h"
-
typedef struct specdrum_info {
int specdrum_present; /* SpecDrum present */
libspectrum_signed_byte specdrum_dac; /* Current byte in the SpecDrum 8bit DAC */
Modified: vendor/fuse-emulator/current/fuse/peripherals/spectranet.c
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/spectranet.c 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/peripherals/spectranet.c 2013-05-18 11:04:17 UTC (rev 745)
@@ -1,7 +1,7 @@
/* spectranet.c: Spectranet emulation
Copyright (c) 2011-2013 Philip Kendall
- $Id: spectranet.c 4906 2013-03-10 11:21:37Z fredm $
+ $Id: spectranet.c 4919 2013-04-20 07:47:56Z 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
@@ -521,10 +521,26 @@
}
void
+spectranet_nmi( void )
+{
+}
+
+void
spectranet_unpage( void )
{
}
+void
+spectranet_retn( void )
+{
+}
+
+int
+spectranet_nmi_flipflop( void )
+{
+ return 0;
+}
+
libspectrum_byte
spectranet_w5100_read( memory_page *page GCC_UNUSED,
libspectrum_word address GCC_UNUSED )
Modified: vendor/fuse-emulator/current/fuse/peripherals/ula.c
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/ula.c 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/peripherals/ula.c 2013-05-18 11:04:17 UTC (rev 745)
@@ -1,7 +1,7 @@
/* ula.c: ULA routines
Copyright (c) 1999-2011 Philip Kendall, Darren Salt
- $Id: ula.c 4640 2012-01-21 13:26:35Z pak21 $
+ $Id: ula.c 4926 2013-05-05 07:58:18Z 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
@@ -71,7 +71,9 @@
static const periph_t ula_periph = {
NULL,
- ula_ports
+ ula_ports,
+ 0,
+ NULL
};
static const periph_port_t ula_ports_full_decode[] = {
@@ -81,7 +83,9 @@
static const periph_t ula_periph_full_decode = {
NULL,
- ula_ports_full_decode
+ ula_ports_full_decode,
+ 0,
+ NULL
};
void
Modified: vendor/fuse-emulator/current/fuse/settings-header.pl
===================================================================
--- vendor/fuse-emulator/current/fuse/settings-header.pl 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/settings-header.pl 2013-05-18 11:04:17 UTC (rev 745)
@@ -3,7 +3,7 @@
# settings-header.pl: generate settings.h from settings.dat
# Copyright (c) 2002-2003 Philip Kendall
-# $Id: settings-header.pl 4633 2012-01-19 23:26:10Z pak21 $
+# $Id: settings-header.pl 4924 2013-05-05 07:40:02Z 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
@@ -64,13 +64,13 @@
/* This file is autogenerated from settings.dat by settings-header.pl.
Do not edit unless you know what will happen! */
+#ifndef FUSE_SETTINGS_H
+#define FUSE_SETTINGS_H
+
#include <config.h>
#include <sys/types.h>
-#ifndef FUSE_SETTINGS_H
-#define FUSE_SETTINGS_H
-
typedef struct settings_info {
CODE
Modified: vendor/fuse-emulator/current/fuse/sound.c
===================================================================
--- vendor/fuse-emulator/current/fuse/sound.c 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/sound.c 2013-05-18 11:04:17 UTC (rev 745)
@@ -2,7 +2,7 @@
Copyright (c) 2000-2012 Russell Marks, Matan Ziv-Av, Philip Kendall,
Fredrick Meunier, Patrik Rak
- $Id: sound.c 4785 2012-12-07 23:56:40Z sbaldovi $
+ $Id: sound.c 4921 2013-05-01 12:37:07Z 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
@@ -275,12 +275,6 @@
blip_synth_set_output( ay_c_synth, left_buf );
}
- right_specdrum_synth = new_Blip_Synth();
- blip_synth_set_volume( right_specdrum_synth,
- sound_get_volume( settings_current.volume_specdrum ) );
- blip_synth_set_output( right_specdrum_synth, right_buf );
- blip_synth_set_treble_eq( right_specdrum_synth, treble );
-
sound_enabled = sound_enabled_ever = 1;
sound_channels = ( sound_stereo_ay != SOUND_STEREO_AY_NONE ? 2 : 1 );
Modified: vendor/fuse-emulator/current/fuse/unittests/unittests.c
===================================================================
--- vendor/fuse-emulator/current/fuse/unittests/unittests.c 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/unittests/unittests.c 2013-05-18 11:04:17 UTC (rev 745)
@@ -1,7 +1,7 @@
/* unittests.c: unit testing framework for Fuse
Copyright (c) 2008-2011 Philip Kendall
- $Id: unittests.c 4822 2012-12-29 18:57:33Z pak21 $
+ $Id: unittests.c 4925 2013-05-05 07:54:35Z 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
@@ -30,6 +30,7 @@
#include "fuse.h"
#include "machine.h"
#include "mempool.h"
+#include "periph.h"
#include "peripherals/disk/beta.h"
#include "peripherals/disk/disciple.h"
#include "peripherals/disk/opus.h"
Modified: vendor/fuse-emulator/current/fuse-utils/hacking/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/hacking/ChangeLog 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse-utils/hacking/ChangeLog 2013-05-18 11:04:17 UTC (rev 745)
@@ -409,6 +409,6 @@
20130223 fmfconv_ff.c: use the same encoder on later stages (Sergio).
20130223 fmfconv.c: force mpeg4 video encoder for youtube profile and don't
force AAC audio encoder for ipod profile (Sergio).
-201300407 converter/{romloader.cc,romloader.h}: include read and computed
- checksum (thanks, Ivan Shmakov) (Fred).
-201300407 converter/romloader.cc: print flag byte (thanks, Ivan Shmakov) (Fred).
+20130407 converter/{romloader.cc,romloader.h}: include read and computed
+ checksum (thanks, Ivan Shmakov) (Fred).
+20130407 converter/romloader.cc: print flag byte (thanks, Ivan Shmakov) (Fred).
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2013-05-18 13:41:02
|
Revision: 748
http://sourceforge.net/p/fuse-for-macosx/code/748
Author: fredm
Date: 2013-05-18 13:40:59 +0000 (Sat, 18 May 2013)
Log Message:
-----------
Load . into vendor/fuse-emulator/current.
Modified Paths:
--------------
vendor/fuse-emulator/current/fuse/ChangeLog
vendor/fuse-emulator/current/fuse/README
vendor/fuse-emulator/current/fuse/hacking/ChangeLog
vendor/fuse-emulator/current/fuse/man/fuse.1
vendor/fuse-emulator/current/libspectrum/ChangeLog
vendor/fuse-emulator/current/libspectrum/Makefile.am
vendor/fuse-emulator/current/libspectrum/README
vendor/fuse-emulator/current/libspectrum/doc/libspectrum.3
vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog
Modified: vendor/fuse-emulator/current/fuse/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse/ChangeLog 2013-05-18 11:45:11 UTC (rev 747)
+++ vendor/fuse-emulator/current/fuse/ChangeLog 2013-05-18 13:40:59 UTC (rev 748)
@@ -1,4 +1,4 @@
-201?-??-?? Philip Kendall <phi...@sh...>
+2013-05-18 Philip Kendall <phi...@sh...>
* Fuse 1.1.0 released.
@@ -1094,4 +1094,4 @@
* Version 0.1.0 released.
-$Id: ChangeLog 4879 2013-02-12 00:36:01Z zubzero $
+$Id: ChangeLog 4944 2013-05-16 20:55:22Z pak21 $
Modified: vendor/fuse-emulator/current/fuse/README
===================================================================
--- vendor/fuse-emulator/current/fuse/README 2013-05-18 11:45:11 UTC (rev 747)
+++ vendor/fuse-emulator/current/fuse/README 2013-05-18 13:40:59 UTC (rev 748)
@@ -25,7 +25,7 @@
* Support for the RZX input recording file format, including
rollback and 'competition mode'.
* Emulation of the DivIDE, Interface 1, Kempston mouse, Spectrum +3e,
- ZXATASP, ZXCF, Beta 128, Opus Discovery and +D interfaces.
+ ZXATASP, ZXCF, Beta 128, Opus Discovery, +D and DISCiPLE interfaces.
Help! <xyz> doesn't work
------------------------
@@ -105,6 +105,6 @@
<http://www.worldofspectrum.org/forums/>.
Philip Kendall <phi...@sh...>
-?? ???? 2012
+18th May, 2013
-$Id: README 4846 2013-01-03 09:14:29Z zubzero $
+$Id: README 4958 2013-05-18 13:07:46Z zubzero $
Modified: vendor/fuse-emulator/current/fuse/hacking/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse/hacking/ChangeLog 2013-05-18 11:45:11 UTC (rev 747)
+++ vendor/fuse-emulator/current/fuse/hacking/ChangeLog 2013-05-18 13:40:59 UTC (rev 748)
@@ -4480,3 +4480,7 @@
complete some missing field initializers (Sergio).
20130505 peripherals/if1.c: put braces around empty body in ‘do’ statements
(Sergio).
+20130516 man/fuse.1: update date and version for 1.1 release.
+20130516 ChangeLog: update date in main changelog.
+20130517 README: update date for 1.1 release.
+20130518 README: mention DISCiPLE support (Stuart).
Modified: vendor/fuse-emulator/current/fuse/man/fuse.1
===================================================================
--- vendor/fuse-emulator/current/fuse/man/fuse.1 2013-05-18 11:45:11 UTC (rev 747)
+++ vendor/fuse-emulator/current/fuse/man/fuse.1 2013-05-18 13:40:59 UTC (rev 748)
@@ -1,7 +1,7 @@
.\" -*- nroff -*-
.\"
.\" fuse.1: Fuse man page
-.\" Copyright (c) 2001-2010 Russell Marks, Philip Kendall, Darren Salt,
+.\" Copyright (c) 2001-2013 Russell Marks, Philip Kendall, Darren Salt,
.\" Fredrick Meunier, Stuart Brady
.\"
.\" This program is free software; you can redistribute it and/or modify
@@ -23,7 +23,7 @@
.\" E-mail: phi...@sh...
.\"
.\"
-.TH fuse 1 "??th ????, 201?" "Version 1.1.0" "Emulators"
+.TH fuse 1 "18th May, 2013" "Version 1.1.0" "Emulators"
.\"
.\"------------------------------------------------------------------
.\"
Modified: vendor/fuse-emulator/current/libspectrum/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/libspectrum/ChangeLog 2013-05-18 11:45:11 UTC (rev 747)
+++ vendor/fuse-emulator/current/libspectrum/ChangeLog 2013-05-18 13:40:59 UTC (rev 748)
@@ -1,4 +1,4 @@
-201?-??-?? Philip Kendall <phi...@sh...>
+2013-05-18 Philip Kendall <phi...@sh...>
* libspectrum 1.1.0 released.
@@ -333,5 +333,5 @@
* libspectrum separated from Fuse just before the 0.5.0 release of
Fuse; see Fuse's ChangeLog for changes up to this point
-$Id: ChangeLog 4801 2012-12-26 10:55:01Z fredm $
+$Id: ChangeLog 4948 2013-05-16 21:00:24Z pak21 $
Modified: vendor/fuse-emulator/current/libspectrum/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/libspectrum/Makefile.am 2013-05-18 11:45:11 UTC (rev 747)
+++ vendor/fuse-emulator/current/libspectrum/Makefile.am 2013-05-18 13:40:59 UTC (rev 748)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
-## Copyright (c) 2001-2004 Philip Kendall
+## Copyright (c) 2001-2013 Philip Kendall
-## $Id: Makefile.am 4757 2012-11-07 11:14:48Z fredm $
+## $Id: Makefile.am 4935 2013-05-16 19:43:50Z pak21 $
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -63,7 +63,7 @@
zlib.c \
zxs.c
-libspectrum_la_LDFLAGS = -version-info 8:0:0 -no-undefined @WINDRES_LDFLAGS@
+libspectrum_la_LDFLAGS = -version-info 9:0:0 -no-undefined @WINDRES_LDFLAGS@
libspectrum_la_LIBADD = @AUDIOFILE_LIBS@ @GLIB_LIBS@ -lm
Modified: vendor/fuse-emulator/current/libspectrum/README
===================================================================
--- vendor/fuse-emulator/current/libspectrum/README 2013-05-18 11:45:11 UTC (rev 747)
+++ vendor/fuse-emulator/current/libspectrum/README 2013-05-18 13:40:59 UTC (rev 748)
@@ -67,6 +67,6 @@
Then, type "make" and if everything went well, "make install".
Philip Kendall <phi...@sh...>
-?? ??? 201?
+18th May, 2013
-$Id: README 4801 2012-12-26 10:55:01Z fredm $
+$Id: README 4951 2013-05-17 18:48:41Z pak21 $
Modified: vendor/fuse-emulator/current/libspectrum/doc/libspectrum.3
===================================================================
--- vendor/fuse-emulator/current/libspectrum/doc/libspectrum.3 2013-05-18 11:45:11 UTC (rev 747)
+++ vendor/fuse-emulator/current/libspectrum/doc/libspectrum.3 2013-05-18 13:40:59 UTC (rev 748)
@@ -1,7 +1,7 @@
.\" -*- nroff -*-
.\"
.\" libspectrum.3: libspectrum summary
-.\" Copyright (c) 2004-2008 Philip Kendall
+.\" Copyright (c) 2004-2013 Philip Kendall
.\"
.\" This program is free software; you can redistribute it and/or modify
.\" it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@
.\" E-mail: phi...@sh...
.\"
.\"
-.TH libspectrum 3 "16th December, 2010" "Version 1.0.0" "Emulators"
+.TH libspectrum 3 "18th May, 2013" "Version 1.1.0" "Emulators"
.\"
.\"------------------------------------------------------------------
.\"
Modified: vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog 2013-05-18 11:45:11 UTC (rev 747)
+++ vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog 2013-05-18 13:40:59 UTC (rev 748)
@@ -942,3 +942,7 @@
patch #305).
20130307 accessor.pl,snap_accessors.txt,szx.c: implement Spectranet's "suppress
NMI" flipflop (bug #259).
+20130516 Makefile.am: update library version number for 1.1 release.
+20130516 doc/libspectrum.3: update version number and date for 1.1 release.
+20130516 ChangeLog: update date in main changelog.
+20130517 README: update one more date for the 1.1 release.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2013-05-19 11:10:26
|
Revision: 751
http://sourceforge.net/p/fuse-for-macosx/code/751
Author: fredm
Date: 2013-05-19 11:10:23 +0000 (Sun, 19 May 2013)
Log Message:
-----------
Load . into vendor/fuse-emulator/current.
Modified Paths:
--------------
vendor/fuse-emulator/current/fuse/hacking/ChangeLog
vendor/fuse-emulator/current/fuse/periph.c
vendor/fuse-emulator/current/fuse/periph.h
vendor/fuse-emulator/current/fuse/perl/Fuse/Dialog.pm
vendor/fuse-emulator/current/fuse/settings-header.pl
vendor/fuse-emulator/current/fuse/settings.pl
vendor/fuse-emulator/current/fuse/ui/gtk/binary.c
vendor/fuse-emulator/current/fuse/ui/gtk/confirm.c
vendor/fuse-emulator/current/fuse/ui/gtk/gtkinternals.h
vendor/fuse-emulator/current/fuse/ui/gtk/gtkjoystick.c
vendor/fuse-emulator/current/fuse/ui/gtk/gtkui.c
vendor/fuse-emulator/current/fuse/ui/gtk/options.pl
vendor/fuse-emulator/current/fuse/ui/gtk/pokemem.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/stock.c
vendor/fuse-emulator/current/fuse/ui/options.dat
vendor/fuse-emulator/current/fuse/ui/widget/options.pl
vendor/fuse-emulator/current/fuse/ui/widget/roms.c
vendor/fuse-emulator/current/fuse/ui/win32/options.pl
vendor/fuse-emulator/current/libspectrum/doc/libspectrum.txt
vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog
Modified: vendor/fuse-emulator/current/fuse/hacking/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse/hacking/ChangeLog 2013-05-19 10:36:47 UTC (rev 750)
+++ vendor/fuse-emulator/current/fuse/hacking/ChangeLog 2013-05-19 11:10:23 UTC (rev 751)
@@ -4480,7 +4480,17 @@
complete some missing field initializers (Sergio).
20130505 peripherals/if1.c: put braces around empty body in ‘do’ statements
(Sergio).
+20130512 ui/win32/options.pl: refactor options dialogs to split *_init and
+ *_done functions out of *_proc function (Sergio).
+20130513 settings-header.pl,settings.pl: change settings_defaults(),
+ settings_copy() and settings_copy_internal() to void functions (Fred).
+20130513 ui/widget/{options.pl,roms.c}: change settings_copy() to void function
+ on widget UIs (Sergio).
20130516 man/fuse.1: update date and version for 1.1 release.
20130516 ChangeLog: update date in main changelog.
+20130517 periph.[c|h],perl/Fuse/Dialog.pm,ui/gtk/{binary.c,confirm.c,
+ gtkinternals.h,gtkjoystick.c,gtkui.c,options.pl,pokemem.c,rollback.c,
+ roms.c,stock.c},ui/options.dat,ui/win32/options.pl: display
+ confirmation dialogue for reset due to peripheral changes (Sergio).
20130517 README: update date for 1.1 release.
20130518 README: mention DISCiPLE support (Stuart).
Modified: vendor/fuse-emulator/current/fuse/periph.c
===================================================================
--- vendor/fuse-emulator/current/fuse/periph.c 2013-05-19 10:36:47 UTC (rev 750)
+++ vendor/fuse-emulator/current/fuse/periph.c 2013-05-19 11:10:23 UTC (rev 751)
@@ -1,7 +1,7 @@
/* periph.c: code for handling peripherals
Copyright (c) 2005-2011 Philip Kendall
- $Id: periph.c 4906 2013-03-10 11:21:37Z fredm $
+ $Id: periph.c 4962 2013-05-19 05:25:15Z 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
@@ -169,6 +169,28 @@
*needs_hard_reset;
}
+/* Work out whether a peripheral needs a hard reset without (de)activate */
+static void
+get_hard_reset( gpointer key, gpointer value, gpointer user_data )
+{
+ periph_private_t *private = value;
+ int active = 0;
+ int *machine_hard_reset = (int *)user_data;
+ int periph_hard_reset = 0;
+
+ switch ( private->present ) {
+ case PERIPH_PRESENT_NEVER: active = 0; break;
+ case PERIPH_PRESENT_OPTIONAL:
+ active = private->periph->option ? *(private->periph->option) : 0; break;
+ case PERIPH_PRESENT_ALWAYS: active = 1; break;
+ }
+
+ periph_hard_reset = ( private && ( private->active != active ) &&
+ private->periph->hard_reset );
+
+ *machine_hard_reset = ( periph_hard_reset || *machine_hard_reset );
+}
+
/* Free the memory used by a peripheral-port response pair */
static void
free_peripheral( gpointer data, gpointer user_data GCC_UNUSED )
@@ -426,6 +448,17 @@
}
}
+int
+periph_postcheck( void )
+{
+ int needs_hard_reset = 0;
+
+ /* Detect if a hard reset is needed without (de)activating peripherals */
+ g_hash_table_foreach( peripherals, get_hard_reset, &needs_hard_reset );
+
+ return needs_hard_reset;
+}
+
/* Register debugger page/unpage events for a peripheral */
void
periph_register_paging_events( const char *type_string, int *page_event,
Modified: vendor/fuse-emulator/current/fuse/periph.h
===================================================================
--- vendor/fuse-emulator/current/fuse/periph.h 2013-05-19 10:36:47 UTC (rev 750)
+++ vendor/fuse-emulator/current/fuse/periph.h 2013-05-19 11:10:23 UTC (rev 751)
@@ -1,7 +1,7 @@
/* periph.h: code for handling peripherals
Copyright (c) 2004-2011 Philip Kendall
- $Id: periph.h 4906 2013-03-10 11:21:37Z fredm $
+ $Id: periph.h 4962 2013-05-19 05:25:15Z 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
@@ -154,6 +154,8 @@
void periph_posthook( void );
+int periph_postcheck( void );
+
/* Register debugger page/unpage events for a peripheral */
void periph_register_paging_events( const char *type_string, int *page_event,
int *unpage_event );
Modified: vendor/fuse-emulator/current/fuse/perl/Fuse/Dialog.pm
===================================================================
--- vendor/fuse-emulator/current/fuse/perl/Fuse/Dialog.pm 2013-05-19 10:36:47 UTC (rev 750)
+++ vendor/fuse-emulator/current/fuse/perl/Fuse/Dialog.pm 2013-05-19 11:10:23 UTC (rev 751)
@@ -1,7 +1,7 @@
# Fuse::Dialog: routines for creating Fuse dialog boxes
# Copyright (c) 2003-2005 Philip Kendall
-# $Id: Dialog.pm 2889 2007-05-26 17:45:08Z zubzero $
+# $Id: Dialog.pm 4962 2013-05-19 05:25:15Z 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
@@ -49,6 +49,7 @@
my( $name, $title, @widgets ) = split /\n/;
my @widget_data;
+ my $postcheck;
my $posthook;
foreach( @widgets ) {
@@ -56,6 +57,11 @@
my( $widget_type, $text, $value, $key, $data1, $data2 ) =
split /\s*,\s*/;
+ if( lc $widget_type eq 'postcheck' ) {
+ $postcheck = $text;
+ next;
+ }
+
if( lc $widget_type eq 'posthook' ) {
$posthook = $text;
next;
@@ -72,6 +78,7 @@
push @dialogs, { name => $name,
title => $title,
+ postcheck => $postcheck,
posthook => $posthook,
widgets => \@widget_data };
}
Modified: vendor/fuse-emulator/current/fuse/settings-header.pl
===================================================================
--- vendor/fuse-emulator/current/fuse/settings-header.pl 2013-05-19 10:36:47 UTC (rev 750)
+++ vendor/fuse-emulator/current/fuse/settings-header.pl 2013-05-19 11:10:23 UTC (rev 751)
@@ -3,7 +3,7 @@
# settings-header.pl: generate settings.h from settings.dat
# Copyright (c) 2002-2003 Philip Kendall
-# $Id: settings-header.pl 4924 2013-05-05 07:40:02Z sbaldovi $
+# $Id: settings-header.pl 4961 2013-05-19 05:17:30Z 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
@@ -102,8 +102,8 @@
extern settings_info settings_default;
int settings_init( int *first_arg, int argc, char **argv );
-int settings_defaults( settings_info *settings );
-int settings_copy( settings_info *dest, settings_info *src );
+void settings_defaults( settings_info *settings );
+void settings_copy( settings_info *dest, settings_info *src );
#define SETTINGS_ROM_COUNT 30
char **settings_get_rom_setting( settings_info *settings, size_t which );
Modified: vendor/fuse-emulator/current/fuse/settings.pl
===================================================================
--- vendor/fuse-emulator/current/fuse/settings.pl 2013-05-19 10:36:47 UTC (rev 750)
+++ vendor/fuse-emulator/current/fuse/settings.pl 2013-05-19 11:10:23 UTC (rev 751)
@@ -3,7 +3,7 @@
# settings.pl: generate settings.c from settings.dat
# Copyright (c) 2002-2005 Philip Kendall
-# $Id: settings.pl 4841 2013-01-02 01:55:24Z zubzero $
+# $Id: settings.pl 4961 2013-05-19 05:17:30Z 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
@@ -130,7 +130,7 @@
static int settings_command_line( settings_info *settings, int *first_arg,
int argc, char **argv );
-static int settings_copy_internal( settings_info *dest, settings_info *src );
+static void settings_copy_internal( settings_info *dest, settings_info *src );
/* Called on emulator startup */
int
@@ -138,11 +138,7 @@
{
int error;
- error = settings_defaults( &settings_current );
- if( error ) {
- ui_error( UI_ERROR_ERROR, "out of memory at %s:%d", __FILE__, __LINE__ );
- return error;
- }
+ settings_defaults( &settings_current );
error = read_config_file( &settings_current );
if( error ) return error;
@@ -154,9 +150,9 @@
}
/* Fill the settings structure with sensible defaults */
-int settings_defaults( settings_info *settings )
+void settings_defaults( settings_info *settings )
{
- return settings_copy_internal( settings, &settings_default );
+ settings_copy_internal( settings, &settings_default );
}
#ifdef HAVE_LIB_XML2
@@ -684,7 +680,7 @@
}
/* Copy one settings object to another */
-static int
+static void
settings_copy_internal( settings_info *dest, settings_info *src )
{
settings_free( dest );
@@ -708,15 +704,13 @@
}
print hashline( __LINE__ ), << 'CODE';
-
- return 0;
}
/* Copy one settings object to another */
-int settings_copy( settings_info *dest, settings_info *src )
+void settings_copy( settings_info *dest, settings_info *src )
{
- if( settings_defaults( dest ) ) return 1;
- return settings_copy_internal( dest, src );
+ settings_defaults( dest );
+ settings_copy_internal( dest, src );
}
char **
Modified: vendor/fuse-emulator/current/fuse/ui/gtk/binary.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/gtk/binary.c 2013-05-19 10:36:47 UTC (rev 750)
+++ vendor/fuse-emulator/current/fuse/ui/gtk/binary.c 2013-05-19 11:10:23 UTC (rev 751)
@@ -1,7 +1,7 @@
/* binary.c: GTK+ routines to load/save chunks of binary data
Copyright (c) 2003-2005 Philip Kendall
- $Id: binary.c 4908 2013-03-10 22:13:57Z sbaldovi $
+ $Id: binary.c 4962 2013-05-19 05:25:15Z 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
@@ -146,7 +146,7 @@
/* Command buttons */
gtkstock_create_ok_cancel( info->dialog, NULL, info->activate_data, info,
- NULL );
+ DEFAULT_DESTROY, DEFAULT_DESTROY );
}
void
Modified: vendor/fuse-emulator/current/fuse/ui/gtk/confirm.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/gtk/confirm.c 2013-05-19 10:36:47 UTC (rev 750)
+++ vendor/fuse-emulator/current/fuse/ui/gtk/confirm.c 2013-05-19 11:10:23 UTC (rev 751)
@@ -1,7 +1,7 @@
/* confirm.c: Confirmation dialog box
Copyright (c) 2000-2003 Philip Kendall, Russell Marks
- $Id: confirm.c 4723 2012-07-08 13:26:15Z fredm $
+ $Id: confirm.c 4962 2013-05-19 05:25:15Z 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
@@ -60,7 +60,7 @@
gtk_box_pack_start( GTK_BOX( content_area ), label, TRUE, TRUE, 5 );
gtkstock_create_ok_cancel( dialog, NULL, G_CALLBACK( set_confirmed ),
- &confirm, NULL );
+ &confirm, DEFAULT_DESTROY, DEFAULT_DESTROY );
gtk_widget_show_all( dialog );
gtk_main();
Modified: vendor/fuse-emulator/current/fuse/ui/gtk/gtkinternals.h
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/gtk/gtkinternals.h 2013-05-19 10:36:47 UTC (rev 750)
+++ vendor/fuse-emulator/current/fuse/ui/gtk/gtkinternals.h 2013-05-19 11:10:23 UTC (rev 751)
@@ -1,7 +1,7 @@
/* gtkinternals.h: stuff internal to the GTK+ UI
Copyright (c) 2003-2005 Philip Kendall
- $Id: gtkinternals.h 4723 2012-07-08 13:26:15Z fredm $
+ $Id: gtkinternals.h 4962 2013-05-19 05:25:15Z 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
@@ -108,7 +108,8 @@
GtkAccelGroup *accel,
/* for OK button -> */ GCallback action,
gpointer actiondata,
- /* for both buttons -> */ GCallback destroy );
+ /* for both buttons -> */ GCallback destroy_ok,
+ GCallback destroy_cancel );
GtkAccelGroup* gtkstock_create_close( GtkWidget *widget, GtkAccelGroup *accel,
GCallback destroy,
gboolean esconly );
Modified: vendor/fuse-emulator/current/fuse/ui/gtk/gtkjoystick.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/gtk/gtkjoystick.c 2013-05-19 10:36:47 UTC (rev 750)
+++ vendor/fuse-emulator/current/fuse/ui/gtk/gtkjoystick.c 2013-05-19 11:10:23 UTC (rev 751)
@@ -1,7 +1,7 @@
/* gtkjoystick.c: Joystick emulation
Copyright (c) 2003-2004 Darren Salt, Philip Kendall
- $Id: gtkjoystick.c 4915 2013-04-07 05:32:09Z fredm $
+ $Id: gtkjoystick.c 4962 2013-05-19 05:25:15Z 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
@@ -231,7 +231,7 @@
g_object_unref( model );
gtkstock_create_ok_cancel( dialog, NULL, G_CALLBACK( joystick_done ),
- &info, NULL );
+ &info, DEFAULT_DESTROY, DEFAULT_DESTROY );
gtk_widget_show_all( dialog );
gtk_main();
Modified: vendor/fuse-emulator/current/fuse/ui/gtk/gtkui.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/gtk/gtkui.c 2013-05-19 10:36:47 UTC (rev 750)
+++ vendor/fuse-emulator/current/fuse/ui/gtk/gtkui.c 2013-05-19 11:10:23 UTC (rev 751)
@@ -1,7 +1,7 @@
/* gtkui.c: GTK+ routines for dealing with the user interface
Copyright (c) 2000-2005 Philip Kendall, Russell Marks
- $Id: gtkui.c 4740 2012-10-10 12:48:21Z fredm $
+ $Id: gtkui.c 4962 2013-05-19 05:25:15Z 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
@@ -456,8 +456,9 @@
/* Create and add the actions buttons to the dialog box */
gtkstock_create_ok_cancel( dialog.dialog, NULL,
- G_CALLBACK( menu_options_filter_done ),
- (gpointer) &dialog, NULL );
+ G_CALLBACK( menu_options_filter_done ),
+ (gpointer) &dialog, DEFAULT_DESTROY,
+ DEFAULT_DESTROY );
gtk_widget_show_all( dialog.dialog );
@@ -589,8 +590,9 @@
/* Create and add the actions buttons to the dialog box */
gtkstock_create_ok_cancel( dialog.dialog, NULL,
- G_CALLBACK( menu_machine_select_done ),
- (gpointer) &dialog, NULL );
+ G_CALLBACK( menu_machine_select_done ),
+ (gpointer) &dialog, DEFAULT_DESTROY,
+ DEFAULT_DESTROY );
gtk_widget_show_all( dialog.dialog );
@@ -749,8 +751,9 @@
/* Create and add the actions buttons to the dialog box */
gtkstock_create_ok_cancel( dialog.dialog, NULL,
- G_CALLBACK( confirm_joystick_done ),
- (gpointer) &dialog, NULL );
+ G_CALLBACK( confirm_joystick_done ),
+ (gpointer) &dialog, DEFAULT_DESTROY,
+ DEFAULT_DESTROY );
gtk_widget_show_all( dialog.dialog );
Modified: vendor/fuse-emulator/current/fuse/ui/gtk/options.pl
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/gtk/options.pl 2013-05-19 10:36:47 UTC (rev 750)
+++ vendor/fuse-emulator/current/fuse/ui/gtk/options.pl 2013-05-19 11:10:23 UTC (rev 751)
@@ -1,9 +1,9 @@
#!/usr/bin/perl -w
# options.pl: generate options dialog boxes
-# $Id: options.pl 4723 2012-07-08 13:26:15Z fredm $
+# $Id: options.pl 4962 2013-05-19 05:25:15Z sbaldovi $
-# Copyright (c) 2002-2004 Philip Kendall
+# Copyright (c) 2002-2013 Philip Kendall
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -36,14 +36,14 @@
my %combo_default;
print Fuse::GPL( 'options.c: options dialog boxes',
- '2001-2004 Philip Kendall' ) . << "CODE";
+ '2001-2013 Philip Kendall' ) . << "CODE";
/* This file is autogenerated from options.dat by options.pl.
Do not edit unless you know what you\'re doing! */
#include <config.h>
-#ifdef UI_GTK /* Use this file iff we're using GTK+ */
+#ifdef UI_GTK /* Use this file if we're using GTK+ */
#include <stdio.h>
#include <stdlib.h>
@@ -65,8 +65,9 @@
static int
option_enumerate_combo( const char **options, char *value, guint count,
- int def ) {
- int i;
+ int def )
+{
+ guint i;
if( value != NULL ) {
for( i = 0; i < count; i++) {
if( !strcmp( value, options[ i ] ) )
@@ -126,11 +127,12 @@
}
print << "CODE";
int
-option_enumerate_$_->{name}_$widget->{value}( void ) {
+option_enumerate_$_->{name}_$widget->{value}( void )
+{
return option_enumerate_combo( $_->{name}_$widget->{value}_combo,
- settings_current.$widget->{value},
- $_->{name}_$widget->{value}_combo_count,
- $combo_default{$widget->{value}} );
+ settings_current.$widget->{value},
+ $_->{name}_$widget->{value}_combo_count,
+ $combo_default{$widget->{value}} );
}
CODE
@@ -171,7 +173,7 @@
dialog.$widget->{value} =
gtk_check_button_new_with_label( "$text" );
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( dialog.$widget->{value} ),
- settings_current.$widget->{value} );
+ settings_current.$widget->{value} );
gtk_container_add( GTK_CONTAINER( content_area ), dialog.$widget->{value} );
CODE
@@ -187,7 +189,7 @@
gchar buffer[80];
gtk_box_pack_start( GTK_BOX( content_area ), frame, TRUE, TRUE, 0 );
-
+
gtk_container_set_border_width( GTK_CONTAINER( hbox ), 4 );
gtk_container_add( GTK_CONTAINER( frame ), hbox );
@@ -210,7 +212,7 @@
GtkWidget *hbox = gtk_box_new( GTK_ORIENTATION_HORIZONTAL, 0 );
GtkWidget *combo = gtk_combo_box_text_new();
GtkWidget *text = gtk_label_new( "$text" );
- int i;
+ guint i;
gtk_box_pack_start( GTK_BOX( hbox ), text, FALSE, FALSE, 5 );
text = gtk_label_new( " " );
@@ -244,8 +246,8 @@
print << "CODE";
/* Create the OK and Cancel buttons */
gtkstock_create_ok_cancel( dialog.dialog, NULL,
- G_CALLBACK( menu_options_$_->{name}_done ),
- (gpointer) &dialog, NULL );
+ G_CALLBACK( menu_options_$_->{name}_done ),
+ (gpointer) &dialog, NULL, DEFAULT_DESTROY );
/* Display the window */
gtk_widget_show_all( dialog.dialog );
@@ -265,6 +267,18 @@
CODE
+ if( $_->{postcheck} ) {
+
+ print << "CODE";
+ /* Get a copy of current settings */
+ settings_info original_settings;
+ memset( &original_settings, 0, sizeof( settings_info ) );
+ settings_copy( &original_settings, &settings_current );
+
+CODE
+
+ }
+
foreach my $widget ( @{ $_->{widgets} } ) {
if( $widget->{type} eq "Checkbox" ) {
@@ -286,7 +300,7 @@
print << "CODE";
free( settings_current.$widget->{value} );
settings_current.$widget->{value} = utils_safe_strdup( $_->{name}_$widget->{value}_combo[
- gtk_combo_box_get_active( GTK_COMBO_BOX( ptr->$widget->{value} ) ) ] );
+ gtk_combo_box_get_active( GTK_COMBO_BOX( ptr->$widget->{value} ) ) ] );
CODE
} else {
@@ -294,6 +308,26 @@
}
}
+ if( $_->{postcheck} ) {
+
+ print << "CODE";
+ int needs_hard_reset = $_->{postcheck}();
+
+ /* Confirm reset */
+ if( needs_hard_reset && !gtkui_confirm("Some options need to reset the machine. Reset?" ) ) {
+
+ /* Cancel new settings */
+ settings_copy( &settings_current, &original_settings );
+ settings_free( &original_settings );
+ return;
+ }
+
+ settings_free( &original_settings );
+
+CODE
+
+ }
+
print << "CODE";
gtk_widget_destroy( ptr->dialog );
@@ -307,6 +341,7 @@
gtk_main_quit();
}
+
CODE
}
Modified: vendor/fuse-emulator/current/fuse/ui/gtk/pokemem.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/gtk/pokemem.c 2013-05-19 10:36:47 UTC (rev 750)
+++ vendor/fuse-emulator/current/fuse/ui/gtk/pokemem.c 2013-05-19 11:10:23 UTC (rev 751)
@@ -1,7 +1,7 @@
/* pokemem.c: GTK+ interface that handles pok files
Copyright (c) 2011 Philip Kendall, Sergio Baldoví
- $Id: pokemem.c 4769 2012-11-22 12:42:08Z fredm $
+ $Id: pokemem.c 4962 2013-05-19 05:25:15Z 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
@@ -182,6 +182,7 @@
gtkstock_create_ok_cancel( dialog, accel_group,
G_CALLBACK( pokemem_update_list ),
(gpointer) &dialog,
+ G_CALLBACK( pokemem_close ),
G_CALLBACK( pokemem_close ) );
gtk_accel_group_disconnect_key( accel_group, GDK_KEY_Return, 0 );
Modified: vendor/fuse-emulator/current/fuse/ui/gtk/rollback.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/gtk/rollback.c 2013-05-19 10:36:47 UTC (rev 750)
+++ vendor/fuse-emulator/current/fuse/ui/gtk/rollback.c 2013-05-19 11:10:23 UTC (rev 751)
@@ -1,7 +1,7 @@
/* rollback.c: select a rollback point
Copyright (c) 2004 Philip Kendall
- $Id: rollback.c 4708 2012-05-25 12:14:50Z fredm $
+ $Id: rollback.c 4962 2013-05-19 05:25:15Z 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
@@ -100,7 +100,7 @@
list = create_rollback_list();
gtkstock_create_ok_cancel( dialog, NULL, G_CALLBACK( select_row ), list,
- NULL );
+ DEFAULT_DESTROY, DEFAULT_DESTROY );
content_area = gtk_dialog_get_content_area( GTK_DIALOG( dialog ) );
gtk_box_pack_start( GTK_BOX( content_area ), list, TRUE, TRUE, 0 );
Modified: vendor/fuse-emulator/current/fuse/ui/gtk/roms.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/gtk/roms.c 2013-05-19 10:36:47 UTC (rev 750)
+++ vendor/fuse-emulator/current/fuse/ui/gtk/roms.c 2013-05-19 11:10:23 UTC (rev 751)
@@ -1,7 +1,7 @@
/* roms.c: ROM selector dialog box
Copyright (c) 2003-2004 Philip Kendall
- $Id: roms.c 4723 2012-07-08 13:26:15Z fredm $
+ $Id: roms.c 4962 2013-05-19 05:25:15Z 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
@@ -75,7 +75,7 @@
/* Create the OK and Cancel buttons */
gtkstock_create_ok_cancel( dialog, NULL, G_CALLBACK( roms_done ), &info,
- NULL );
+ DEFAULT_DESTROY, DEFAULT_DESTROY );
/* And the current values of each of the ROMs */
vbox = GTK_BOX( gtk_dialog_get_content_area( GTK_DIALOG( dialog ) ) );
Modified: vendor/fuse-emulator/current/fuse/ui/gtk/stock.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/gtk/stock.c 2013-05-19 10:36:47 UTC (rev 750)
+++ vendor/fuse-emulator/current/fuse/ui/gtk/stock.c 2013-05-19 11:10:23 UTC (rev 751)
@@ -1,7 +1,7 @@
/* stock.c: 'standard' GTK+ widgets etc
Copyright (c) 2004 Darren Salt, Philip Kendall
- $Id: stock.c 4723 2012-07-08 13:26:15Z fredm $
+ $Id: stock.c 4962 2013-05-19 05:25:15Z 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
@@ -147,14 +147,15 @@
GtkAccelGroup*
gtkstock_create_ok_cancel( GtkWidget *widget, GtkAccelGroup *accel,
- GCallback action, gpointer actiondata,
- GCallback destroy )
+ GCallback action, gpointer actiondata,
+ GCallback destroy_ok, GCallback destroy_cancel )
{
gtkstock_button btn[] = {
{ GTK_STOCK_CANCEL, NULL, NULL, NULL, 0, 0, 0, 0 },
{ GTK_STOCK_OK, NULL, NULL, NULL, 0, 0, 0, 0 },
};
- btn[1].destroy = btn[0].destroy = destroy ? destroy : DEFAULT_DESTROY;
+ btn[0].destroy = destroy_cancel ? destroy_cancel : NULL;
+ btn[1].destroy = destroy_ok ? destroy_ok : NULL;
btn[1].action = action;
btn[1].actiondata = actiondata;
Modified: vendor/fuse-emulator/current/fuse/ui/options.dat
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/options.dat 2013-05-19 10:36:47 UTC (rev 750)
+++ vendor/fuse-emulator/current/fuse/ui/options.dat 2013-05-19 11:10:23 UTC (rev 751)
@@ -46,6 +46,7 @@
Checkbox, Spectra(n)et, spectranet, INPUT_KEY_n
Checkbox, Spe(c)tranet disable, spectranet_disable, INPUT_KEY_c
#endif
+Postcheck, periph_postcheck
Posthook, periph_posthook
peripherals_disk
@@ -63,6 +64,7 @@
Checkbox, (B)eta 128 interface, beta128, INPUT_KEY_b
Checkbox, Beta 128 (a)uto-boot in 48K machines, beta128_48boot, INPUT_KEY_a
Checkbox, (O)pus Discovery interface, opus, INPUT_KEY_o
+Postcheck, periph_postcheck
Posthook, periph_posthook
rzx
Modified: vendor/fuse-emulator/current/fuse/ui/widget/options.pl
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/widget/options.pl 2013-05-19 10:36:47 UTC (rev 750)
+++ vendor/fuse-emulator/current/fuse/ui/widget/options.pl 2013-05-19 11:10:23 UTC (rev 751)
@@ -3,7 +3,7 @@
# options.pl: generate options dialog boxes
# Copyright (c) 2001-2008 Philip Kendall, Fredrick Meunier
-# $Id: options.pl 4913 2013-03-25 11:00:51Z fredm $
+# $Id: options.pl 4961 2013-05-19 05:17:30Z 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
@@ -363,11 +363,9 @@
int
widget_options_finish( widget_finish_state finished )
{
- int error = 0;
-
/* If we exited normally, actually set the options */
if( finished == WIDGET_FINISHED_OK ) {
- error = settings_copy( &settings_current, &widget_options_settings );
+ settings_copy( &settings_current, &widget_options_settings );
/* Bring the peripherals list into sync with the new options */
periph_posthook();
/* make the needed UI changes */
@@ -375,7 +373,6 @@
}
settings_free( &widget_options_settings );
memset( &widget_options_settings, 0, sizeof( settings_info ) );
- if( error ) return error;
return 0;
}
@@ -434,8 +431,7 @@
if( !widget_$_->{name}_running ) { /* we want to copy settings, only when start up */
highlight_line = 0;
/* Get a copy of the current settings */
- error = settings_copy( &widget_options_settings, &settings_current );
- if( error ) { settings_free( &widget_options_settings ); return error; }
+ settings_copy( &widget_options_settings, &settings_current );
widget_$_->{name}_running = 1;
}
Modified: vendor/fuse-emulator/current/fuse/ui/widget/roms.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/widget/roms.c 2013-05-19 10:36:47 UTC (rev 750)
+++ vendor/fuse-emulator/current/fuse/ui/widget/roms.c 2013-05-19 11:10:23 UTC (rev 751)
@@ -1,7 +1,7 @@
/* roms.c: select ROMs widget
Copyright (c) 2003-2004 Philip Kendall
- $Id: roms.c 4633 2012-01-19 23:26:10Z pak21 $
+ $Id: roms.c 4961 2013-05-19 05:17:30Z 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
@@ -44,7 +44,7 @@
int
widget_roms_draw( void *data )
{
- int i, error;
+ int i;
char buffer[32];
char key[] = "\x0A ";
@@ -59,11 +59,7 @@
ui_error( UI_ERROR_ERROR, "out of memory at %s:%d", __FILE__, __LINE__ );
return 1;
}
- error = settings_copy( widget_settings, &settings_current );
- if( error ) {
- settings_free( widget_settings ); free( widget_settings );
- return error;
- }
+ settings_copy( widget_settings, &settings_current );
info->initialised = 1;
}
@@ -158,11 +154,8 @@
int
widget_roms_finish( widget_finish_state finished )
{
- int error;
-
if( finished == WIDGET_FINISHED_OK ) {
- error = settings_copy( &settings_current, widget_settings );
- if( error ) return error;
+ settings_copy( &settings_current, widget_settings );
}
settings_free( widget_settings ); free( widget_settings );
Modified: vendor/fuse-emulator/current/fuse/ui/win32/options.pl
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/win32/options.pl 2013-05-19 10:36:47 UTC (rev 750)
+++ vendor/fuse-emulator/current/fuse/ui/win32/options.pl 2013-05-19 11:10:23 UTC (rev 751)
@@ -1,9 +1,9 @@
#!/usr/bin/perl -w
# options.pl: generate options dialog boxes
-# $Id: options.pl 4643 2012-01-21 16:12:10Z pak21 $
+# $Id: options.pl 4962 2013-05-19 05:25:15Z sbaldovi $
-# Copyright (c) 2001-2007 Philip Kendall, Marek Januszewski, Stuart Brady
+# Copyright (c) 2001-2013 Philip Kendall, Marek Januszewski, Stuart Brady
# 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
@@ -35,14 +35,14 @@
my @dialogs = Fuse::Dialog::read( shift @ARGV );
print Fuse::GPL( 'options.c: options dialog boxes',
- '2001-2009 Philip Kendall, Marek Januszewski, Stuart Brady' ) . << "CODE";
+ '2001-2013 Philip Kendall, Marek Januszewski, Stuart Brady' ) . << "CODE";
/* This file is autogenerated from options.dat by options.pl.
Do not edit unless you know what you\'re doing! */
#include <config.h>
-#ifdef UI_WIN32 /* Use this file iff we're using WIN32 */
+#ifdef UI_WIN32 /* Use this file if we're using WIN32 */
#include <libspectrum.h>
@@ -57,7 +57,7 @@
static int
option_enumerate_combo( const char **options, char *value, int count,
- int def ) {
+ int def ) {
int i;
if( value != NULL ) {
for( i = 0; i < count; i++) {
@@ -120,9 +120,9 @@
int
option_enumerate_$_->{name}_$widget->{value}( void ) {
return option_enumerate_combo( $_->{name}_$widget->{value}_combo,
- settings_current.$widget->{value},
- $_->{name}_$widget->{value}_combo_count,
- $combo_default{$widget->{value}} );
+ settings_current.$widget->{value},
+ $_->{name}_$widget->{value}_combo_count,
+ $combo_default{$widget->{value}} );
}
CODE
@@ -134,67 +134,54 @@
my $optname = uc( "OPT_$_->{name}" );
print << "CODE";
-static BOOL CALLBACK
-menu_options_$_->{name}_proc( HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam )
+static void
+menu_options_$_->{name}_init( HWND hwndDlg )
{
char buffer[80];
int i;
-
+
i = 0;
- buffer[0] = '\\0'; /* Shut gcc up */
-
- switch( msg )
- {
- case WM_INITDIALOG:
- {
- /* FIXME: save the handle returned by LoadIcon() in win32ui.c */
- SendMessage( hwndDlg, WM_SETICON, ICON_SMALL,
- (LPARAM)LoadIcon( fuse_hInstance, "win32_icon" ) );
+ buffer[0] = '\\0'; /* Shut gcc up */
- /* initialize the controls with current settings */
-
- /* FIXME split *_init and *_done functions out of *_proc function */
CODE
-
foreach my $widget ( @{ $_->{widgets} } ) {
my $type = $widget->{type};
if( $type eq "Checkbox" ) {
my $idcname = uc( "$widget->{value}" );
print << "CODE";
- SendDlgItemMessage( hwndDlg, IDC_${optname}_${idcname}, BM_SETCHECK,
- settings_current.$widget->{value} ? BST_CHECKED : BST_UNCHECKED, 0 );
+ SendDlgItemMessage( hwndDlg, IDC_${optname}_${idcname}, BM_SETCHECK,
+ settings_current.$widget->{value} ? BST_CHECKED : BST_UNCHECKED, 0 );
CODE
} elsif( $widget->{type} eq "Entry" ) {
my $idcname = uc( "$widget->{value}" );
print << "CODE";
- /* FIXME This is asuming SendDlgItemMessage is not UNICODE */
- snprintf( buffer, 80, "%d", settings_current.$widget->{value} );
- SendDlgItemMessage( hwndDlg, IDC_${optname}_${idcname}, WM_SETTEXT,
- 0, (LPARAM) buffer );
+ /* FIXME This is asuming SendDlgItemMessage is not UNICODE */
+ snprintf( buffer, 80, "%d", settings_current.$widget->{value} );
+ SendDlgItemMessage( hwndDlg, IDC_${optname}_${idcname}, WM_SETTEXT,
+ 0, (LPARAM) buffer );
CODE
} elsif( $type eq "Combo" ) {
my $idcname = uc( "$widget->{value}" );
print << "CODE";
- for( i = 0; i < $_->{name}_$widget->{value}_combo_count; i++ ) {
- /* FIXME This is asuming SendDlgItemMessage is not UNICODE */
- SendDlgItemMessage( hwndDlg, IDC_${optname}_${idcname}, CB_ADDSTRING,
- 0, (LPARAM) $_->{name}_$widget->{value}_combo[i] );
+ for( i = 0; i < $_->{name}_$widget->{value}_combo_count; i++ ) {
+ /* FIXME This is asuming SendDlgItemMessage is not UNICODE */
+ SendDlgItemMessage( hwndDlg, IDC_${optname}_${idcname}, CB_ADDSTRING,
+ 0, (LPARAM) $_->{name}_$widget->{value}_combo[i] );
+ }
+ SendDlgItemMessage( hwndDlg, IDC_${optname}_${idcname}, CB_SETCURSEL,
+ (LPARAM) $combo_default{$widget->{value}}, 0 );
+ if( settings_current.$widget->{value} != NULL ) {
+ for( i = 0; i < $_->{name}_$widget->{value}_combo_count; i++ ) {
+ if( !strcmp( settings_current.$widget->{value},
+ $_->{name}_$widget->{value}_combo[i] ) ) {
+ SendDlgItemMessage( hwndDlg, IDC_${optname}_${idcname},
+ CB_SETCURSEL, i, 0 );
}
- SendDlgItemMessage( hwndDlg, IDC_${optname}_${idcname}, CB_SETCURSEL,
- (LPARAM) $combo_default{$widget->{value}}, 0 );
- if( settings_current.$widget->{value} != NULL ) {
- for( i = 0; i < $_->{name}_$widget->{value}_combo_count; i++ ) {
- if( !strcmp( settings_current.$widget->{value},
- $_->{name}_$widget->{value}_combo[i] ) ) {
- SendDlgItemMessage( hwndDlg, IDC_${optname}_${idcname},
- CB_SETCURSEL, i, 0 );
- }
- }
- }
-
+ }
+ }
CODE
} else {
die "Unknown type `$type'";
@@ -202,16 +189,29 @@
}
print << "CODE";
- return FALSE;
+}
+
+static void
+menu_options_$_->{name}_done( HWND hwndDlg )
+{
+ char buffer[80];
+
+ buffer[0] = '\\0'; /* Shut gcc up */
+
+CODE
+
+ if( $_->{postcheck} ) {
+
+ print << "CODE";
+ /* Get a copy of current settings */
+ settings_info original_settings;
+ memset( &original_settings, 0, sizeof( settings_info ) );
+ settings_copy( &original_settings, &settings_current );
+
+CODE
+
}
- case WM_COMMAND:
- switch( LOWORD( wParam ) )
- {
- case IDOK:
- {
- /* Read the controls and apply the settings */
-CODE
foreach my $widget ( @{ $_->{widgets} } ) {
my $type = $widget->{type};
@@ -219,25 +219,26 @@
my $idcname = uc( "$widget->{value}" );
print << "CODE";
- settings_current.$widget->{value} =
- IsDlgButtonChecked( hwndDlg, IDC_${optname}_${idcname} );
+ settings_current.$widget->{value} =
+ IsDlgButtonChecked( hwndDlg, IDC_${optname}_${idcname} );
CODE
} elsif( $widget->{type} eq "Entry" ) {
my $idcname = uc( "$widget->{value}" );
print << "CODE";
- /* FIXME This is asuming SendDlgItemMessage is not UNICODE */
- SendDlgItemMessage( hwndDlg, IDC_${optname}_${idcname}, WM_GETTEXT, 80, (LPARAM) buffer );
- settings_current.$widget->{value} = atoi( buffer );
+ /* FIXME This is asuming SendDlgItemMessage is not UNICODE */
+ SendDlgItemMessage( hwndDlg, IDC_${optname}_${idcname}, WM_GETTEXT,
+ 80, (LPARAM) buffer );
+ settings_current.$widget->{value} = atoi( buffer );
CODE
} elsif( $widget->{type} eq "Combo" ) {
my $idcname = uc( "$widget->{value}" );
print << "CODE";
- free( settings_current.$widget->{value} );
- settings_current.$widget->{value} =
- utils_safe_strdup( $_->{name}_$widget->{value}_combo[
- SendDlgItemMessage( hwndDlg, IDC_${optname}_${idcname}, CB_GETCURSEL, 0, 0 ) ] );
+ free( settings_current.$widget->{value} );
+ settings_current.$widget->{value} =
+ utils_safe_strdup( $_->{name}_$widget->{value}_combo[
+ SendDlgItemMessage( hwndDlg, IDC_${optname}_${idcname}, CB_GETCURSEL, 0, 0 ) ] );
CODE
} else {
@@ -245,21 +246,70 @@
}
}
- print " $_->{posthook}();\n\n" if $_->{posthook};
+ if( $_->{postcheck} ) {
+ print << "CODE";
+ int needs_hard_reset = $_->{postcheck}();
+
+ /* Confirm reset */
+ if( needs_hard_reset ) {
+ ShowWindow( hwndDlg, SW_HIDE );
+
+ if( !win32ui_confirm("Some options need to reset the machine. Reset?" ) ) {
+ /* Cancel new settings */
+ settings_copy( &settings_current, &original_settings );
+ settings_free( &original_settings );
+
+ ShowWindow( hwndDlg, SW_SHOW );
+ return;
+ }
+ }
+
+ settings_free( &original_settings );
+
+CODE
+ }
+
+ print " $_->{posthook}();\n\n" if $_->{posthook};
+
print << "CODE";
- win32statusbar_set_visibility( settings_current.statusbar );
- display_refresh_all();
+ win32statusbar_set_visibility( settings_current.statusbar );
+ display_refresh_all();
- EndDialog( hwndDlg, 0 );
+ EndDialog( hwndDlg, 0 );
+}
+
+static BOOL CALLBACK
+menu_options_$_->{name}_proc( HWND hwndDlg, UINT msg, WPARAM wParam GCC_UNUSED,
+ LPARAM lParam GCC_UNUSED )
+{
+ switch( msg )
+ {
+ case WM_INITDIALOG:
+ {
+ /* FIXME: save the handle returned by LoadIcon() in win32ui.c */
+ SendMessage( hwndDlg, WM_SETICON, ICON_SMALL,
+ (LPARAM)LoadIcon( fuse_hInstance, "win32_icon" ) );
+
+ /* initialize the controls with current settings */
+ menu_options_$_->{name}_init( hwndDlg );
+
+ return TRUE;
+ }
+
+ case WM_COMMAND:
+ switch( LOWORD( wParam ) )
+ {
+ case IDOK:
+ /* Read the controls and apply the settings */
+ menu_options_$_->{name}_done( hwndDlg );
return 0;
- }
case IDCANCEL:
EndDialog( hwndDlg, 0 );
return 0;
- }
- break;
+ }
+ break;
case WM_CLOSE:
EndDialog( hwndDlg, 0 );
@@ -270,7 +320,7 @@
}
void
-menu_options_$_->{name}( int action )
+menu_options_$_->{name}( int action GCC_UNUSED )
{
fuse_emulation_pause();
Modified: vendor/fuse-emulator/current/libspectrum/doc/libspectrum.txt
===================================================================
--- vendor/fuse-emulator/current/libspectrum/doc/libspectrum.txt 2013-05-19 10:36:47 UTC (rev 750)
+++ vendor/fuse-emulator/current/libspectrum/doc/libspectrum.txt 2013-05-19 11:10:23 UTC (rev 751)
@@ -1,4 +1,4 @@
-libspectrum 1.0.0
+libspectrum 1.1.0
=================
libspectrum is a fairly simple library designed to make the handling
@@ -1826,4 +1826,4 @@
Write `data' to register `reg' of the IDE channel `chn'.
-$Id: libspectrum.txt 4860 2013-01-26 11:33:25Z fredm $
+$Id: libspectrum.txt 4964 2013-05-19 05:30:32Z sbaldovi $
Modified: vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog 2013-05-19 10:36:47 UTC (rev 750)
+++ vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog 2013-05-19 11:10:23 UTC (rev 751)
@@ -946,3 +946,4 @@
20130516 doc/libspectrum.3: update version number and date for 1.1 release.
20130516 ChangeLog: update date in main changelog.
20130517 README: update one more date for the 1.1 release.
+20130518 doc/libspectrum.txt: update version number for 1.1 release (Sergio).
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2013-05-25 03:45:42
|
Revision: 754
http://sourceforge.net/p/fuse-for-macosx/code/754
Author: fredm
Date: 2013-05-25 03:45:38 +0000 (Sat, 25 May 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/configure.ac
vendor/fuse-emulator/current/fuse/hacking/ChangeLog
vendor/fuse-emulator/current/fuse/hacking/Makefile.am
vendor/fuse-emulator/current/fuse/lib/Makefile.am
vendor/fuse-emulator/current/fuse/man/fuse.1
vendor/fuse-emulator/current/fuse/peripherals/ide/divide.c
vendor/fuse-emulator/current/fuse/peripherals/ide/divide.h
vendor/fuse-emulator/current/fuse/peripherals/ide/ide.c
vendor/fuse-emulator/current/fuse/peripherals/ide/ide.h
vendor/fuse-emulator/current/fuse/peripherals/ide/simpleide.c
vendor/fuse-emulator/current/fuse/peripherals/ide/simpleide.h
vendor/fuse-emulator/current/fuse/peripherals/ide/zxatasp.c
vendor/fuse-emulator/current/fuse/peripherals/ide/zxatasp.h
vendor/fuse-emulator/current/fuse/peripherals/ide/zxcf.c
vendor/fuse-emulator/current/fuse/peripherals/ide/zxcf.h
vendor/fuse-emulator/current/fuse/sound/Makefile.am
vendor/fuse-emulator/current/fuse/ui/gtk/gtkui.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/widget/query.c
vendor/fuse-emulator/current/fuse/ui/widget/widget.c
vendor/fuse-emulator/current/fuse/ui/widget/widget_internals.h
vendor/fuse-emulator/current/fuse/ui/wii/Makefile.am
vendor/fuse-emulator/current/fuse/ui/win32/win32ui.c
vendor/fuse-emulator/current/libspectrum/ChangeLog
vendor/fuse-emulator/current/libspectrum/Makefile.am
vendor/fuse-emulator/current/libspectrum/README
vendor/fuse-emulator/current/libspectrum/configure.ac
vendor/fuse-emulator/current/libspectrum/doc/libspectrum.3
vendor/fuse-emulator/current/libspectrum/doc/libspectrum.txt
vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog
Modified: vendor/fuse-emulator/current/fuse/AUTHORS
===================================================================
--- vendor/fuse-emulator/current/fuse/AUTHORS 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/AUTHORS 2013-05-25 03:45:38 UTC (rev 754)
@@ -34,6 +34,8 @@
* Marek Januszewski: Some patches making Fuse much closer to compiling under
Win32, and fixing up the GTK+ 2.0 interface.
+* Sergio Baldoví: improvements to the Win32 UI.
+
* Stuart Brady: for the Scorpion, +D interface emulation and HP-UX sound
support.
@@ -52,4 +54,4 @@
* Philip Kendall: everything else.
-$Id: AUTHORS 4835 2012-12-31 15:35:45Z zubzero $
+$Id: AUTHORS 4972 2013-05-19 16:46:43Z zubzero $
Modified: vendor/fuse-emulator/current/fuse/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse/ChangeLog 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/ChangeLog 2013-05-25 03:45:38 UTC (rev 754)
@@ -1,5 +1,14 @@
-2013-05-18 Philip Kendall <phi...@sh...>
+2013-05-24 Philip Kendall <phi...@sh...>
+ * Fuse 1.1.1 released.
+
+ * Distribute PORTING,hacking/valgrind.supp,sound/wiisound.c,
+ tests/success.{mgt.bz2,opd} and ui/wii/wiimouse.h (Stuart Brady).
+ * Add ChangeLog entries for 1.0.0.1 and 1.0.0.1a (Fredrick Meunier).
+ * Release correct version of source files.
+
+2013-05-19 Philip Kendall <phi...@sh...>
+
* Fuse 1.1.0 released.
* Remove ROMs that there is no formal permission to distribute.
@@ -57,6 +66,22 @@
* Various other minor bugfixes.
+2011-04-01 Philip Kendall <phi...@sh...>
+
+ * Fuse 1.0.0.1a released.
+
+ * Remove all ROMs for which there isn't explicit permission to
+ distribute (Philip Kendall).
+
+2011-01-12 Philip Kendall <phi...@sh...>
+
+ * Fuse 1.0.0.1 released.
+
+ * Fix temporary breakpoints on platforms using replacement Glib
+ (Fredrick Meunier, Sergio Baldovi; thanks, Chris Cowley)
+ * Ensure Amiga port can load files (Chris Young)
+ * Fix SVGAlib compilation (rkd77)
+
2010-12-16 Philip Kendall <phi...@sh...>
* Fuse 1.0.0 released.
@@ -1094,4 +1119,4 @@
* Version 0.1.0 released.
-$Id: ChangeLog 4944 2013-05-16 20:55:22Z pak21 $
+$Id: ChangeLog 4995 2013-05-24 19:54:19Z zubzero $
Modified: vendor/fuse-emulator/current/fuse/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/Makefile.am 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/Makefile.am 2013-05-25 03:45:38 UTC (rev 754)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 1999-2009 Philip Kendall
-## $Id: Makefile.am 4782 2012-12-02 22:49:57Z sbaldovi $
+## $Id: Makefile.am 4980 2013-05-21 12:37:51Z 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
@@ -203,6 +203,7 @@
EXTRA_DIST = AUTHORS \
INSTALL \
+ PORTING \
README \
THANKS \
keysyms.dat \
Modified: vendor/fuse-emulator/current/fuse/README
===================================================================
--- vendor/fuse-emulator/current/fuse/README 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/README 2013-05-25 03:45:38 UTC (rev 754)
@@ -1,4 +1,4 @@
-The Free Unix Spectrum Emulator (Fuse) 1.1.0
+The Free Unix Spectrum Emulator (Fuse) 1.1.1
============================================
Fuse (the Free Unix Spectrum Emulator) was originally, and somewhat
@@ -105,6 +105,6 @@
<http://www.worldofspectrum.org/forums/>.
Philip Kendall <phi...@sh...>
-18th May, 2013
+24th May, 2013
-$Id: README 4958 2013-05-18 13:07:46Z zubzero $
+$Id: README 4995 2013-05-24 19:54:19Z zubzero $
Modified: vendor/fuse-emulator/current/fuse/configure.ac
===================================================================
--- vendor/fuse-emulator/current/fuse/configure.ac 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/configure.ac 2013-05-25 03:45:38 UTC (rev 754)
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-dnl $Id: configure.ac 4898 2013-02-25 22:20:54Z pak21 $
+dnl $Id: configure.ac 4995 2013-05-24 19:54:19Z 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
@@ -20,12 +20,12 @@
dnl E-mail: phi...@sh...
dnl Package version
-m4_define([fuse_version], [1.1.0])
+m4_define([fuse_version], [1.1.1])
dnl Product full version
m4_define([fuse_major_version], [1])
m4_define([fuse_minor_version], [1])
-m4_define([fuse_micro_version], [0])
+m4_define([fuse_micro_version], [1])
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])
Modified: vendor/fuse-emulator/current/fuse/hacking/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse/hacking/ChangeLog 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/hacking/ChangeLog 2013-05-25 03:45:38 UTC (rev 754)
@@ -3401,6 +3401,7 @@
everything else (fixes bug #3084862) (thanks, Phil) (Fred).
20110104 nic: add .deps and Makefile to the ignore property (Fred).
20110109 ui/widget/filesel.c: make Amiga work again (Chris Young).
+20110112 ChangeLog,README,configure.in,man/fuse.1: updates for 1.0.0.1 release.
20110113 ui/win32/installer/fuse.nsi: windows installer improvements; optionally
delete configuration file (fuse.cfg) on uninstall, silently uninstall
previous version if reinstalling to the same folder, include AUTHORS
@@ -3552,8 +3553,11 @@
Makefile.am}: remove ROMs that there is no formal permission to
distribute.
20110327 roms/Makefile.am: distribute README.copyright.
+20110327 ChangeLog,README,configure.in,fuse.c,man/fuse.1: updates for 1.0.0.1a
+ release.
20110328 configure.in: allow the user to say they do not want to use windres
(works around bug #3248008; thanks, Cygnus).
+20110401 ChangeLog,man/fuse.1: didn't manage to release this earlier.
20110401 peripherals/disk/{opus,plusd}.c: remove incorrect use of GCC_UNUSED
(Stuart).
20110401 fuse.c,ui/{gtk/gtkui.c,widget/menu.c},windres.rc: update copyright
@@ -4494,3 +4498,23 @@
confirmation dialogue for reset due to peripheral changes (Sergio).
20130517 README: update date for 1.1 release.
20130518 README: mention DISCiPLE support (Stuart).
+20130518 ui/widget/options.pl: display confirmation dialogue for reset due to
+ peripheral changes (Stuart).
+20130518 ui/widget/options.pl: update peripherals list when a machine reset is
+ not needed (Sergio).
+20130519 ui/widget/{query.c,widget.c,widget_internals.h}: display confirmation
+ messages (Stuart).
+20130519 ui/widget/{options.pl,query.c}: choose no/cancel upon pressing escape
+ for all all confirmation dialogues, and remove workaround for this
+ from peripheral reset confirmation dialogue (Stuart).
+20130519 ui/{gtk/gtkui.c,widget/menu.c,win32/win32ui.c}: use different
+ confirmation messages for hard and soft resets (Stuart).
+20130519 ChangeLog,README,man/fuse.1: update date for 1.1 release (Stuart).
+20130519 AUTHOR,man/fuse.1: Add Sergio Baldoví (Stuart).
+20130519 lib/Makefile.am: distribute tests/success.{mgt.bz2,opd} (Stuart).
+20130519 Makefile.am,hacking/Makefile.am,sound/Makefile.am,ui/wii/Makefile.am:
+ distribute PORTING,hacking/valgrind.supp,sound/wiisound.c,
+ ui/wii/wiimouse.h (Stuart).
+20130524 ChangeLog,README: updates for a "1.1.1" release (Fred).
+20130524 ChangeLog,README,configure.ac,man/fuse.1: fill in date and bump
+ version number (Stuart).
Modified: vendor/fuse-emulator/current/fuse/hacking/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/hacking/Makefile.am 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/hacking/Makefile.am 2013-05-25 03:45:38 UTC (rev 754)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2002-2011 Philip Kendall
-## $Id: Makefile.am 4663 2012-02-11 12:48:36Z fredm $
+## $Id: Makefile.am 4980 2013-05-21 12:37:51Z 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
@@ -33,4 +33,5 @@
spectranet.txt \
tc2048_tech_notes.txt \
timer.txt \
- ui.txt
+ ui.txt \
+ valgrind.supp
Modified: vendor/fuse-emulator/current/fuse/lib/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/lib/Makefile.am 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/lib/Makefile.am 2013-05-25 03:45:38 UTC (rev 754)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 1999-2004 Philip Kendall
-## $Id: Makefile.am 4624 2012-01-09 20:59:35Z pak21 $
+## $Id: Makefile.am 4980 2013-05-21 12:37:51Z 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
@@ -64,6 +64,8 @@
tests/fatware-success.hdf.bz2 \
tests/idedos-success.hdf.bz2 \
tests/success.mdr \
+ tests/success.mgt.bz2 \
+ tests/success.opd \
tests/success.udi \
uncompressed/disk_plus3.szx \
uncompressed/tape_128.szx \
Modified: vendor/fuse-emulator/current/fuse/man/fuse.1
===================================================================
--- vendor/fuse-emulator/current/fuse/man/fuse.1 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/man/fuse.1 2013-05-25 03:45:38 UTC (rev 754)
@@ -23,7 +23,7 @@
.\" E-mail: phi...@sh...
.\"
.\"
-.TH fuse 1 "18th May, 2013" "Version 1.1.0" "Emulators"
+.TH fuse 1 "24th May, 2013" "Version 1.1.1" "Emulators"
.\"
.\"------------------------------------------------------------------
.\"
@@ -4779,6 +4779,8 @@
Marek Januszewski wrote various bits of code to make Fuse work under
Win32, including the DirectDraw user interface.
.PP
+Sergio Baldov\('i made many improvements to the Win32 UI.
+.PP
Stuart Brady wrote the DISCiPLE and +D emulation, Scorpion emulation
and the HP-UX sound code.
.PP
Modified: vendor/fuse-emulator/current/fuse/peripherals/ide/divide.c
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/ide/divide.c 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/peripherals/ide/divide.c 2013-05-25 03:45:38 UTC (rev 754)
@@ -1,7 +1,7 @@
/* divide.c: DivIDE interface routines
Copyright (c) 2005-2008 Matthew Westcott, Philip Kendall
- $Id: divide.c 4906 2013-03-10 11:21:37Z fredm $
+ $Id: divide.c 4972 2013-05-19 16:46:43Z 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
Modified: vendor/fuse-emulator/current/fuse/peripherals/ide/divide.h
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/ide/divide.h 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/peripherals/ide/divide.h 2013-05-25 03:45:38 UTC (rev 754)
@@ -1,7 +1,7 @@
/* divide.h: DivIDE interface routines
Copyright (c) 2005 Matthew Westcott
- $Id: divide.h 4924 2013-05-05 07:40:02Z sbaldovi $
+ $Id: divide.h 4972 2013-05-19 16:46:43Z 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
Modified: vendor/fuse-emulator/current/fuse/peripherals/ide/ide.c
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/ide/ide.c 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/peripherals/ide/ide.c 2013-05-25 03:45:38 UTC (rev 754)
@@ -1,7 +1,7 @@
/* ide.c: Generic routines shared between the various IDE devices
Copyright (c) 2005 Philip Kendall
- $Id: ide.c 4664 2012-02-12 11:51:01Z fredm $
+ $Id: ide.c 4972 2013-05-19 16:46:43Z 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
Modified: vendor/fuse-emulator/current/fuse/peripherals/ide/ide.h
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/ide/ide.h 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/peripherals/ide/ide.h 2013-05-25 03:45:38 UTC (rev 754)
@@ -1,7 +1,7 @@
/* ide.h: Generic routines shared between the various IDE devices
Copyright (c) 2005 Philip Kendall
- $Id: ide.h 4664 2012-02-12 11:51:01Z fredm $
+ $Id: ide.h 4972 2013-05-19 16:46:43Z 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
Modified: vendor/fuse-emulator/current/fuse/peripherals/ide/simpleide.c
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/ide/simpleide.c 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/peripherals/ide/simpleide.c 2013-05-25 03:45:38 UTC (rev 754)
@@ -3,7 +3,7 @@
2004 Philip Kendall,
2008 Fredrick Meunier
- $Id: simpleide.c 4926 2013-05-05 07:58:18Z sbaldovi $
+ $Id: simpleide.c 4972 2013-05-19 16:46:43Z 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
Modified: vendor/fuse-emulator/current/fuse/peripherals/ide/simpleide.h
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/ide/simpleide.h 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/peripherals/ide/simpleide.h 2013-05-25 03:45:38 UTC (rev 754)
@@ -1,7 +1,7 @@
/* simpleide.h: Simple 8-bit IDE interface routines
Copyright (c) 2003-2004 Garry Lancaster
- $Id: simpleide.h 4664 2012-02-12 11:51:01Z fredm $
+ $Id: simpleide.h 4972 2013-05-19 16:46:43Z 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
Modified: vendor/fuse-emulator/current/fuse/peripherals/ide/zxatasp.c
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/ide/zxatasp.c 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/peripherals/ide/zxatasp.c 2013-05-25 03:45:38 UTC (rev 754)
@@ -1,7 +1,7 @@
/* zxatasp.c: ZXATASP interface routines
Copyright (c) 2003-2008 Garry Lancaster and Philip Kendall
- $Id: zxatasp.c 4906 2013-03-10 11:21:37Z fredm $
+ $Id: zxatasp.c 4972 2013-05-19 16:46:43Z 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
Modified: vendor/fuse-emulator/current/fuse/peripherals/ide/zxatasp.h
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/ide/zxatasp.h 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/peripherals/ide/zxatasp.h 2013-05-25 03:45:38 UTC (rev 754)
@@ -2,7 +2,7 @@
Copyright (c) 2003-2004 Garry Lancaster,
2004 Philip Kendall
- $Id: zxatasp.h 4664 2012-02-12 11:51:01Z fredm $
+ $Id: zxatasp.h 4972 2013-05-19 16:46:43Z 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
Modified: vendor/fuse-emulator/current/fuse/peripherals/ide/zxcf.c
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/ide/zxcf.c 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/peripherals/ide/zxcf.c 2013-05-25 03:45:38 UTC (rev 754)
@@ -1,7 +1,7 @@
/* zxcf.c: ZXCF interface routines
Copyright (c) 2003-2008 Garry Lancaster and Philip Kendall
- $Id: zxcf.c 4906 2013-03-10 11:21:37Z fredm $
+ $Id: zxcf.c 4972 2013-05-19 16:46:43Z 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
Modified: vendor/fuse-emulator/current/fuse/peripherals/ide/zxcf.h
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/ide/zxcf.h 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/peripherals/ide/zxcf.h 2013-05-25 03:45:38 UTC (rev 754)
@@ -2,7 +2,7 @@
Copyright (c) 2003-2004 Garry Lancaster,
2004 Philip Kendall
- $Id: zxcf.h 4664 2012-02-12 11:51:01Z fredm $
+ $Id: zxcf.h 4972 2013-05-19 16:46:43Z 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
Modified: vendor/fuse-emulator/current/fuse/sound/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/sound/Makefile.am 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/sound/Makefile.am 2013-05-25 03:45:38 UTC (rev 754)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2004 Philip Kendall
-## $Id: Makefile.am 4743 2012-10-10 13:20:50Z fredm $
+## $Id: Makefile.am 4980 2013-05-21 12:37:51Z 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
@@ -41,6 +41,7 @@
sdlsound.c \
sfifo.c \
sunsound.c \
+ wiisound.c \
win32sound.c
libsound_a_LIBADD = $(SOUND_LIBADD)
Modified: vendor/fuse-emulator/current/fuse/ui/gtk/gtkui.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/gtk/gtkui.c 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/ui/gtk/gtkui.c 2013-05-25 03:45:38 UTC (rev 754)
@@ -1,7 +1,7 @@
/* gtkui.c: GTK+ routines for dealing with the user interface
Copyright (c) 2000-2005 Philip Kendall, Russell Marks
- $Id: gtkui.c 4962 2013-05-19 05:25:15Z sbaldovi $
+ $Id: gtkui.c 4968 2013-05-19 16:11: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
@@ -536,8 +536,12 @@
menu_machine_reset( GtkAction *gtk_action GCC_UNUSED, guint action )
{
int hard_reset = action;
+ const char *message = "Reset?";
- if( gtkui_confirm( "Reset?" ) && machine_reset( hard_reset ) ) {
+ if( hard_reset )
+ message = "Hard reset?";
+
+ if( gtkui_confirm( message ) && machine_reset( hard_reset ) ) {
ui_error( UI_ERROR_ERROR, "couldn't reset machine: giving up!" );
/* FIXME: abort() seems a bit extreme here, but it'll do for now */
Modified: vendor/fuse-emulator/current/fuse/ui/widget/menu.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/widget/menu.c 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/ui/widget/menu.c 2013-05-25 03:45:38 UTC (rev 754)
@@ -1,7 +1,7 @@
/* menu.c: general menu widget
Copyright (c) 2001-2006 Philip Kendall
- $Id: menu.c 4915 2013-04-07 05:32:09Z fredm $
+ $Id: menu.c 4968 2013-05-19 16:11: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
@@ -584,12 +584,18 @@
void
menu_machine_reset( int action )
{
- if( widget_do( WIDGET_TYPE_QUERY, "Reset machine?" ) ||
+ int hard_reset = action;
+ const char *message = "Reset?";
+
+ if( hard_reset )
+ message = "Hard reset?";
+
+ if( widget_do( WIDGET_TYPE_QUERY, message ) ||
!widget_query.confirm )
return;
widget_end_all( WIDGET_FINISHED_OK );
- machine_reset( action );
+ machine_reset( hard_reset );
}
void
Modified: vendor/fuse-emulator/current/fuse/ui/widget/options.pl
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/widget/options.pl 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/ui/widget/options.pl 2013-05-25 03:45:38 UTC (rev 754)
@@ -1,9 +1,9 @@
#!/usr/bin/perl -w
# options.pl: generate options dialog boxes
-# Copyright (c) 2001-2008 Philip Kendall, Fredrick Meunier
+# Copyright (c) 2001-2013 Philip Kendall, Fredrick Meunier
-# $Id: options.pl 4961 2013-05-19 05:17:30Z sbaldovi $
+# $Id: options.pl 4969 2013-05-19 16:21:14Z 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
@@ -37,7 +37,7 @@
my @dialogs = Fuse::Dialog::read( shift @ARGV );
print Fuse::GPL( 'options.c: options dialog boxes',
- '2001-2004 Philip Kendall' ) . << "CODE";
+ '2001-2013 Philip Kendall' ) . << "CODE";
/* This file is autogenerated from options.dat by options.pl.
Do not edit unless you know what you\'re doing! */
@@ -363,11 +363,35 @@
int
widget_options_finish( widget_finish_state finished )
{
+ int error;
+
/* If we exited normally, actually set the options */
if( finished == WIDGET_FINISHED_OK ) {
+ /* Get a copy of current settings */
+ settings_info original_settings;
+ memset( &original_settings, 0, sizeof( settings_info ) );
+ settings_copy( &original_settings, &settings_current );
+
+ /* Apply new options */
settings_copy( &settings_current, &widget_options_settings );
- /* Bring the peripherals list into sync with the new options */
- periph_posthook();
+
+ int needs_hard_reset = periph_postcheck();
+
+ if( needs_hard_reset ) {
+ error = widget_do( WIDGET_TYPE_QUERY,
+ "Some options need to reset the machine. Reset?" );
+ if( !error && !widget_query.confirm )
+ settings_copy( &settings_current, &original_settings );
+ else
+ periph_posthook();
+ }
+ else {
+ /* Bring the peripherals list into sync with the new options */
+ periph_posthook();
+ }
+
+ settings_free( &original_settings );
+
/* make the needed UI changes */
uidisplay_hotswap_gfx_mode();
}
Modified: vendor/fuse-emulator/current/fuse/ui/widget/query.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/widget/query.c 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/ui/widget/query.c 2013-05-25 03:45:38 UTC (rev 754)
@@ -1,7 +1,7 @@
/* query.c: The query widgets
Copyright (c) 2004-2008 Darren Salt, Fredrick Meunier
- $Id: query.c 4179 2010-10-08 10:05:55Z fredm $
+ $Id: query.c 4968 2013-05-19 16:11: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
@@ -30,6 +30,7 @@
#include <string.h>
#include "fuse.h"
+#include "utils.h"
#include "widget_internals.h"
widget_query_t widget_query;
@@ -104,12 +105,15 @@
static size_t highlight_line = 0;
+static char **message_lines;
+static size_t num_message_lines;
+
static void
widget_query_line_draw( int left_edge, int width, struct widget_query_entry *menu,
const char *label )
{
int colour = WIDGET_COLOUR_BACKGROUND;
- int y = menu->index * 8 + 24;
+ int y = (menu->index + num_message_lines) * 8 + 24;
if( menu->index == highlight_line ) colour = WIDGET_COLOUR_HIGHLIGHT;
widget_rectangle( left_edge*8+1, y, width*8-2, 1*8, colour );
@@ -121,10 +125,12 @@
const int query_vert_external_margin = 8;
static int
-widget_calculate_query_width( const char *title, widget_query_entry *menu )
+widget_calculate_query_width( const char *title, widget_query_entry *menu,
+ char **lines, int num_lines )
{
widget_query_entry *ptr;
int max_width=0;
+ int i;
if (!menu) {
return 64;
@@ -139,17 +145,34 @@
max_width = total_width;
}
+ for( i=0; i<num_lines; i++) {
+ int total_width = widget_stringwidth( lines[i] )+2*8;
+
+ if( total_width > max_width )
+ max_width = total_width;
+ }
+
return ( max_width + query_vert_external_margin * 2 ) / 8;
}
static int
-internal_query_draw( widget_query_entry *query, int save, const char *data )
+internal_query_draw( widget_query_entry *query, int save, const char *message )
{
widget_query_entry *ptr;
size_t height = 0;
- int menu_width = widget_calculate_query_width( title, query );
+ int menu_width;
int menu_left_edge_x;
+ int i;
+ if( split_message( message, &message_lines, &num_message_lines, 28 ) ) {
+ return 1;
+ }
+
+ menu_width = widget_calculate_query_width( title, query, message_lines,
+ num_message_lines );
+
+ height = num_message_lines;
+
/* How many options do we have? */
for( ptr = query; ptr->text; ptr++ )
height ++;
@@ -161,6 +184,11 @@
widget_printstring( menu_left_edge_x*8+2, 16, WIDGET_COLOUR_TITLE, title );
+ for( i=0; i<num_message_lines; i++ ) {
+ widget_printstring( menu_left_edge_x*8+8, i*8+24,
+ WIDGET_COLOUR_FOREGROUND, message_lines[i] );
+ }
+
for( ptr = query; ptr->text; ptr++ ) {
widget_query_line_draw( menu_left_edge_x, menu_width, ptr, ptr->text );
}
@@ -174,6 +202,7 @@
widget_query_draw( void *data )
{
highlight_line = 0;
+ widget_query.confirm = 0;
return internal_query_draw( query_confirm, 0, (const char *) data );
}
@@ -181,6 +210,7 @@
widget_query_save_draw( void *data )
{
highlight_line = 0;
+ widget_query.save = UI_CONFIRM_SAVE_CANCEL;
return internal_query_draw( query_save, 1, (const char *) data );
}
@@ -191,7 +221,8 @@
int new_highlight_line = 0;
int cursor_pressed = 0;
widget_query_entry *ptr;
- int menu_width = widget_calculate_query_width( title, query );
+ int menu_width = widget_calculate_query_width( title, query, message_lines,
+ num_message_lines );
int menu_left_edge_x = DISPLAY_WIDTH_COLS/2-menu_width/2;
switch( key ) {
@@ -282,3 +313,15 @@
sizeof(query_save)/sizeof(widget_query_entry),
key );
}
+
+int
+widget_query_finish( widget_finish_state finished )
+{
+ int i;
+ for( i=0; i<num_message_lines; i++ ) {
+ free( message_lines[i] );
+ }
+ free( message_lines );
+
+ return 0;
+}
Modified: vendor/fuse-emulator/current/fuse/ui/widget/widget.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/widget/widget.c 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/ui/widget/widget.c 2013-05-25 03:45:38 UTC (rev 754)
@@ -1,7 +1,7 @@
/* widget.c: Simple dialog boxes for all user interfaces.
Copyright (c) 2001-2005 Matan Ziv-Av, Philip Kendall, Russell Marks
- $Id: widget.c 4697 2012-05-07 02:28:52Z fredm $
+ $Id: widget.c 4968 2013-05-19 16:11: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
@@ -692,8 +692,8 @@
{ widget_roms_draw, widget_roms_finish, widget_roms_keyhandler },
{ widget_peripherals_general_draw, widget_options_finish, widget_peripherals_general_keyhandler },
{ widget_peripherals_disk_draw, widget_options_finish, widget_peripherals_disk_keyhandler },
- { widget_query_draw, NULL, widget_query_keyhandler },
- { widget_query_save_draw,NULL, widget_query_save_keyhandler },
+ { widget_query_draw, widget_query_finish, widget_query_keyhandler },
+ { widget_query_save_draw,widget_query_finish, widget_query_save_keyhandler },
{ widget_diskoptions_draw, widget_options_finish, widget_diskoptions_keyhandler },
};
Modified: vendor/fuse-emulator/current/fuse/ui/widget/widget_internals.h
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/widget/widget_internals.h 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/ui/widget/widget_internals.h 2013-05-25 03:45:38 UTC (rev 754)
@@ -1,7 +1,7 @@
/* widget_internals.h: Functions internal to the widget code
Copyright (c) 2001-2005 Matan Ziv-Av, Philip Kendall
- $Id: widget_internals.h 4543 2011-09-19 01:46:48Z fredm $
+ $Id: widget_internals.h 4968 2013-05-19 16:11: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
@@ -259,6 +259,7 @@
void widget_query_keyhandler( input_key key );
int widget_query_save_draw( void *data );
void widget_query_save_keyhandler( input_key key );
+int widget_query_finish( widget_finish_state finished );
/* The widgets actually available */
Modified: vendor/fuse-emulator/current/fuse/ui/wii/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/wii/Makefile.am 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/ui/wii/Makefile.am 2013-05-25 03:45:38 UTC (rev 754)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2001-2009 Philip Kendall, Bjoern Giesler
-## $Id: Makefile.am 4743 2012-10-10 13:20:50Z fredm $
+## $Id: Makefile.am 4980 2013-05-21 12:37:51Z 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
@@ -43,6 +43,7 @@
noinst_HEADERS = wiidisplay.h \
wiikeyboard.h \
- wiikeysyms.h
+ wiikeysyms.h \
+ wiimouse.h
CLEANFILES = keysyms.c
Modified: vendor/fuse-emulator/current/fuse/ui/win32/win32ui.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/win32/win32ui.c 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/ui/win32/win32ui.c 2013-05-25 03:45:38 UTC (rev 754)
@@ -1,7 +1,7 @@
/* win32ui.c: Win32 routines for dealing with the user interface
Copyright (c) 2003-2007 Marek Januszewski, Philip Kendall, Stuart Brady
- $Id: win32ui.c 4849 2013-01-03 23:27:39Z sbaldovi $
+ $Id: win32ui.c 4968 2013-05-19 16:11: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
@@ -564,8 +564,12 @@
menu_machine_reset( int action )
{
int hard_reset = action;
+ const char *message = "Reset?";
+
+ if( hard_reset )
+ message = "Hard reset?";
- if( win32ui_confirm( "Reset?" ) && machine_reset( hard_reset ) ) {
+ if( win32ui_confirm( message ) && machine_reset( hard_reset ) ) {
ui_error( UI_ERROR_ERROR, "couldn't reset machine: giving up!" );
/* FIXME: abort() seems a bit extreme here, but it'll do for now */
Modified: vendor/fuse-emulator/current/libspectrum/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/libspectrum/ChangeLog 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/libspectrum/ChangeLog 2013-05-25 03:45:38 UTC (rev 754)
@@ -1,3 +1,10 @@
+2013-05-24 Philip Kendall <phi...@sh...>
+
+ * libspectrum 1.1.1 released.
+
+ * Decreased libtool version to allow binaries built against
+ libspectrum 1.0.0 to run with libspectrum 1.1.1.
+
2013-05-18 Philip Kendall <phi...@sh...>
* libspectrum 1.1.0 released.
@@ -333,5 +340,5 @@
* libspectrum separated from Fuse just before the 0.5.0 release of
Fuse; see Fuse's ChangeLog for changes up to this point
-$Id: ChangeLog 4948 2013-05-16 21:00:24Z pak21 $
+$Id: ChangeLog 4994 2013-05-24 19:52:37Z zubzero $
Modified: vendor/fuse-emulator/current/libspectrum/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/libspectrum/Makefile.am 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/libspectrum/Makefile.am 2013-05-25 03:45:38 UTC (rev 754)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2001-2013 Philip Kendall
-## $Id: Makefile.am 4935 2013-05-16 19:43:50Z pak21 $
+## $Id: Makefile.am 4985 2013-05-24 17:27:14Z 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
@@ -63,7 +63,7 @@
zlib.c \
zxs.c
-libspectrum_la_LDFLAGS = -version-info 9:0:0 -no-undefined @WINDRES_LDFLAGS@
+libspectrum_la_LDFLAGS = -version-info 9:0:1 -no-undefined @WINDRES_LDFLAGS@
libspectrum_la_LIBADD = @AUDIOFILE_LIBS@ @GLIB_LIBS@ -lm
Modified: vendor/fuse-emulator/current/libspectrum/README
===================================================================
--- vendor/fuse-emulator/current/libspectrum/README 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/libspectrum/README 2013-05-25 03:45:38 UTC (rev 754)
@@ -1,4 +1,4 @@
-libspectrum 1.1.0
+libspectrum 1.1.1
=================
libspectrum is a library which is designed to make the input and
@@ -67,6 +67,6 @@
Then, type "make" and if everything went well, "make install".
Philip Kendall <phi...@sh...>
-18th May, 2013
+24th May, 2013
-$Id: README 4951 2013-05-17 18:48:41Z pak21 $
+$Id: README 4992 2013-05-24 19:49:15Z zubzero $
Modified: vendor/fuse-emulator/current/libspectrum/configure.ac
===================================================================
--- vendor/fuse-emulator/current/libspectrum/configure.ac 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/libspectrum/configure.ac 2013-05-25 03:45:38 UTC (rev 754)
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
dnl Copyright (c) 1999-2012 Philip Kendall
-dnl $Id: configure.ac 4847 2013-01-03 09:16:15Z zubzero $
+dnl $Id: configure.ac 4986 2013-05-24 19:03:20Z 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
@@ -22,12 +22,12 @@
dnl E-mail: phi...@sh...
dnl Package version
-m4_define([libspectrum_version], [1.1.0])
+m4_define([libspectrum_version], [1.1.1])
dnl Product full version
m4_define([libspectrum_major_version], [1])
m4_define([libspectrum_minor_version], [1])
-m4_define([libspectrum_micro_version], [0])
+m4_define([libspectrum_micro_version], [1])
m4_define([libspectrum_nano_version], [0])
m4_define([libspectrum_full_version],
[libspectrum_major_version.libspectrum_minor_version.libspectrum_micro_version.libspectrum_nano_version])
Modified: vendor/fuse-emulator/current/libspectrum/doc/libspectrum.3
===================================================================
--- vendor/fuse-emulator/current/libspectrum/doc/libspectrum.3 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/libspectrum/doc/libspectrum.3 2013-05-25 03:45:38 UTC (rev 754)
@@ -22,7 +22,7 @@
.\" E-mail: phi...@sh...
.\"
.\"
-.TH libspectrum 3 "18th May, 2013" "Version 1.1.0" "Emulators"
+.TH libspectrum 3 "24th May, 2013" "Version 1.1.1" "Emulators"
.\"
.\"------------------------------------------------------------------
.\"
Modified: vendor/fuse-emulator/current/libspectrum/doc/libspectrum.txt
===================================================================
--- vendor/fuse-emulator/current/libspectrum/doc/libspectrum.txt 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/libspectrum/doc/libspectrum.txt 2013-05-25 03:45:38 UTC (rev 754)
@@ -1,4 +1,4 @@
-libspectrum 1.1.0
+libspectrum 1.1.1
=================
libspectrum is a fairly simple library designed to make the handling
@@ -1826,4 +1826,4 @@
Write `data' to register `reg' of the IDE channel `chn'.
-$Id: libspectrum.txt 4964 2013-05-19 05:30:32Z sbaldovi $
+$Id: libspectrum.txt 4986 2013-05-24 19:03:20Z zubzero $
Modified: vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog 2013-05-25 03:45:38 UTC (rev 754)
@@ -947,3 +947,9 @@
20130516 ChangeLog: update date in main changelog.
20130517 README: update one more date for the 1.1 release.
20130518 doc/libspectrum.txt: update version number for 1.1 release (Sergio).
+20130524 Makefile.am: update libtool age to support binaries built against
+ libspectrum 1.0.0 (Stuart).
+20130524 ChangeLog,README,configure.ac,doc/libspectrum.{3,txt},
+ hacking/ChangeLog: updates for a "1.1.1" release (Stuart).
+20130524 doc/libspectrum,README: further updates for 1.1.1(Stuart).
+20130524 ChangeLog: fill in date (Stuart).
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2016-05-24 14:16:42
|
Revision: 796
http://sourceforge.net/p/fuse-for-macosx/code/796
Author: fredm
Date: 2016-05-24 14:16:36 +0000 (Tue, 24 May 2016)
Log Message:
-----------
Set vendor svn:eol-style and svn:keywords properties to match vendor source.
Modified Paths:
--------------
vendor/fuse-emulator/current/fuse/bitmap.h
vendor/fuse-emulator/current/fuse/compat/amiga/osname.c
vendor/fuse-emulator/current/fuse/compat/amiga/paths.c
vendor/fuse-emulator/current/fuse/compat/linux/paths.c
vendor/fuse-emulator/current/fuse/compat/morphos/osname.c
vendor/fuse-emulator/current/fuse/compat/unix/dir.c
vendor/fuse-emulator/current/fuse/compat/unix/file.c
vendor/fuse-emulator/current/fuse/compat/unix/osname.c
vendor/fuse-emulator/current/fuse/compat/unix/paths.c
vendor/fuse-emulator/current/fuse/compat/unix/socket.c
vendor/fuse-emulator/current/fuse/compat/unix/timer.c
vendor/fuse-emulator/current/fuse/compat/unix/tuntap.c
vendor/fuse-emulator/current/fuse/compat/wii/dir.c
vendor/fuse-emulator/current/fuse/compat/wii/osname.c
vendor/fuse-emulator/current/fuse/compat/wii/paths.c
vendor/fuse-emulator/current/fuse/compat/wii/timer.c
vendor/fuse-emulator/current/fuse/compat/win32/osname.c
vendor/fuse-emulator/current/fuse/compat/win32/paths.c
vendor/fuse-emulator/current/fuse/compat/win32/socket.c
vendor/fuse-emulator/current/fuse/compat/win32/timer.c
vendor/fuse-emulator/current/fuse/compat.h
vendor/fuse-emulator/current/fuse/debugger/breakpoint.c
vendor/fuse-emulator/current/fuse/debugger/breakpoint.h
vendor/fuse-emulator/current/fuse/debugger/command.c
vendor/fuse-emulator/current/fuse/debugger/debugger.c
vendor/fuse-emulator/current/fuse/debugger/debugger.h
vendor/fuse-emulator/current/fuse/debugger/debugger_internals.h
vendor/fuse-emulator/current/fuse/debugger/disassemble.c
vendor/fuse-emulator/current/fuse/debugger/event.c
vendor/fuse-emulator/current/fuse/debugger/expression.c
vendor/fuse-emulator/current/fuse/debugger/variable.c
vendor/fuse-emulator/current/fuse/display.c
vendor/fuse-emulator/current/fuse/display.h
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/fuse.h
vendor/fuse-emulator/current/fuse/input.c
vendor/fuse-emulator/current/fuse/input.h
vendor/fuse-emulator/current/fuse/keyboard.c
vendor/fuse-emulator/current/fuse/keyboard.h
vendor/fuse-emulator/current/fuse/loader.c
vendor/fuse-emulator/current/fuse/loader.h
vendor/fuse-emulator/current/fuse/machine.c
vendor/fuse-emulator/current/fuse/machine.h
vendor/fuse-emulator/current/fuse/machines/machines.h
vendor/fuse-emulator/current/fuse/machines/machines_periph.c
vendor/fuse-emulator/current/fuse/machines/machines_periph.h
vendor/fuse-emulator/current/fuse/machines/pentagon.c
vendor/fuse-emulator/current/fuse/machines/pentagon.h
vendor/fuse-emulator/current/fuse/machines/pentagon1024.c
vendor/fuse-emulator/current/fuse/machines/pentagon512.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/spec48_ntsc.c
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/memory.c
vendor/fuse-emulator/current/fuse/memory.h
vendor/fuse-emulator/current/fuse/mempool.c
vendor/fuse-emulator/current/fuse/mempool.h
vendor/fuse-emulator/current/fuse/menu.c
vendor/fuse-emulator/current/fuse/menu.h
vendor/fuse-emulator/current/fuse/module.c
vendor/fuse-emulator/current/fuse/module.h
vendor/fuse-emulator/current/fuse/movie.c
vendor/fuse-emulator/current/fuse/movie.h
vendor/fuse-emulator/current/fuse/movie_tables.h
vendor/fuse-emulator/current/fuse/periph.c
vendor/fuse-emulator/current/fuse/periph.h
vendor/fuse-emulator/current/fuse/peripherals/ay.c
vendor/fuse-emulator/current/fuse/peripherals/ay.h
vendor/fuse-emulator/current/fuse/peripherals/dck.c
vendor/fuse-emulator/current/fuse/peripherals/dck.h
vendor/fuse-emulator/current/fuse/peripherals/disk/beta.c
vendor/fuse-emulator/current/fuse/peripherals/disk/beta.h
vendor/fuse-emulator/current/fuse/peripherals/disk/crc.c
vendor/fuse-emulator/current/fuse/peripherals/disk/crc.h
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.c
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/opus.h
vendor/fuse-emulator/current/fuse/peripherals/disk/plusd.c
vendor/fuse-emulator/current/fuse/peripherals/disk/plusd.h
vendor/fuse-emulator/current/fuse/peripherals/disk/upd_fdc.c
vendor/fuse-emulator/current/fuse/peripherals/disk/upd_fdc.h
vendor/fuse-emulator/current/fuse/peripherals/disk/wd_fdc.c
vendor/fuse-emulator/current/fuse/peripherals/disk/wd_fdc.h
vendor/fuse-emulator/current/fuse/peripherals/flash/am29f010.c
vendor/fuse-emulator/current/fuse/peripherals/flash/am29f010.h
vendor/fuse-emulator/current/fuse/peripherals/fuller.c
vendor/fuse-emulator/current/fuse/peripherals/fuller.h
vendor/fuse-emulator/current/fuse/peripherals/ide/divide.c
vendor/fuse-emulator/current/fuse/peripherals/ide/divide.h
vendor/fuse-emulator/current/fuse/peripherals/ide/ide.c
vendor/fuse-emulator/current/fuse/peripherals/ide/ide.h
vendor/fuse-emulator/current/fuse/peripherals/ide/simpleide.c
vendor/fuse-emulator/current/fuse/peripherals/ide/simpleide.h
vendor/fuse-emulator/current/fuse/peripherals/ide/zxatasp.c
vendor/fuse-emulator/current/fuse/peripherals/ide/zxatasp.h
vendor/fuse-emulator/current/fuse/peripherals/ide/zxcf.c
vendor/fuse-emulator/current/fuse/peripherals/ide/zxcf.h
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/joystick.c
vendor/fuse-emulator/current/fuse/peripherals/joystick.h
vendor/fuse-emulator/current/fuse/peripherals/kempmouse.c
vendor/fuse-emulator/current/fuse/peripherals/kempmouse.h
vendor/fuse-emulator/current/fuse/peripherals/melodik.c
vendor/fuse-emulator/current/fuse/peripherals/melodik.h
vendor/fuse-emulator/current/fuse/peripherals/nic/enc28j60.c
vendor/fuse-emulator/current/fuse/peripherals/nic/enc28j60.h
vendor/fuse-emulator/current/fuse/peripherals/nic/w5100.c
vendor/fuse-emulator/current/fuse/peripherals/nic/w5100.h
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/printer.h
vendor/fuse-emulator/current/fuse/peripherals/scld.c
vendor/fuse-emulator/current/fuse/peripherals/scld.h
vendor/fuse-emulator/current/fuse/peripherals/speccyboot.c
vendor/fuse-emulator/current/fuse/peripherals/speccyboot.h
vendor/fuse-emulator/current/fuse/peripherals/specdrum.c
vendor/fuse-emulator/current/fuse/peripherals/specdrum.h
vendor/fuse-emulator/current/fuse/peripherals/spectranet.c
vendor/fuse-emulator/current/fuse/peripherals/spectranet.h
vendor/fuse-emulator/current/fuse/peripherals/ula.c
vendor/fuse-emulator/current/fuse/peripherals/ula.h
vendor/fuse-emulator/current/fuse/pokefinder/pokefinder.c
vendor/fuse-emulator/current/fuse/pokefinder/pokefinder.h
vendor/fuse-emulator/current/fuse/pokefinder/pokemem.c
vendor/fuse-emulator/current/fuse/pokefinder/pokemem.h
vendor/fuse-emulator/current/fuse/profile.c
vendor/fuse-emulator/current/fuse/profile.h
vendor/fuse-emulator/current/fuse/psg.c
vendor/fuse-emulator/current/fuse/psg.h
vendor/fuse-emulator/current/fuse/rectangle.c
vendor/fuse-emulator/current/fuse/rectangle.h
vendor/fuse-emulator/current/fuse/rzx.c
vendor/fuse-emulator/current/fuse/rzx.h
vendor/fuse-emulator/current/fuse/screenshot.c
vendor/fuse-emulator/current/fuse/screenshot.h
vendor/fuse-emulator/current/fuse/slt.c
vendor/fuse-emulator/current/fuse/slt.h
vendor/fuse-emulator/current/fuse/snapshot.c
vendor/fuse-emulator/current/fuse/snapshot.h
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/sunsound.c
vendor/fuse-emulator/current/fuse/sound/wiisound.c
vendor/fuse-emulator/current/fuse/sound/win32sound.c
vendor/fuse-emulator/current/fuse/sound.c
vendor/fuse-emulator/current/fuse/sound.h
vendor/fuse-emulator/current/fuse/spectrum.c
vendor/fuse-emulator/current/fuse/spectrum.h
vendor/fuse-emulator/current/fuse/tape.c
vendor/fuse-emulator/current/fuse/tape.h
vendor/fuse-emulator/current/fuse/timer/native.c
vendor/fuse-emulator/current/fuse/timer/sdl.c
vendor/fuse-emulator/current/fuse/timer/timer.c
vendor/fuse-emulator/current/fuse/timer/timer.h
vendor/fuse-emulator/current/fuse/ui/fb/fbdisplay.c
vendor/fuse-emulator/current/fuse/ui/fb/fbdisplay.h
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/fbkeyboard.h
vendor/fuse-emulator/current/fuse/ui/fb/fbmouse.c
vendor/fuse-emulator/current/fuse/ui/fb/fbmouse.h
vendor/fuse-emulator/current/fuse/ui/fb/fbui.c
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/gtkcompat.c
vendor/fuse-emulator/current/fuse/ui/gtk/gtkcompat.h
vendor/fuse-emulator/current/fuse/ui/gtk/gtkdisplay.c
vendor/fuse-emulator/current/fuse/ui/gtk/gtkinternals.h
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/picture.c
vendor/fuse-emulator/current/fuse/ui/gtk/pixmaps.c
vendor/fuse-emulator/current/fuse/ui/gtk/pokefinder.c
vendor/fuse-emulator/current/fuse/ui/gtk/pokemem.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/gtk/stock.c
vendor/fuse-emulator/current/fuse/ui/scaler/scaler.c
vendor/fuse-emulator/current/fuse/ui/scaler/scaler_hq2x.c
vendor/fuse-emulator/current/fuse/ui/scaler/scaler_hq3x.c
vendor/fuse-emulator/current/fuse/ui/scaler/scaler_internals.h
vendor/fuse-emulator/current/fuse/ui/scaler/scalers.c
vendor/fuse-emulator/current/fuse/ui/sdl/sdldisplay.c
vendor/fuse-emulator/current/fuse/ui/sdl/sdldisplay.h
vendor/fuse-emulator/current/fuse/ui/sdl/sdljoystick.c
vendor/fuse-emulator/current/fuse/ui/sdl/sdljoystick.h
vendor/fuse-emulator/current/fuse/ui/sdl/sdlkeyboard.c
vendor/fuse-emulator/current/fuse/ui/sdl/sdlkeyboard.h
vendor/fuse-emulator/current/fuse/ui/sdl/sdlui.c
vendor/fuse-emulator/current/fuse/ui/svga/svgadisplay.c
vendor/fuse-emulator/current/fuse/ui/svga/svgadisplay.h
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/svgakeyboard.h
vendor/fuse-emulator/current/fuse/ui/svga/svgaui.c
vendor/fuse-emulator/current/fuse/ui/ui.h
vendor/fuse-emulator/current/fuse/ui/uidisplay.h
vendor/fuse-emulator/current/fuse/ui/uijoystick.c
vendor/fuse-emulator/current/fuse/ui/uijoystick.h
vendor/fuse-emulator/current/fuse/ui/widget/browse.c
vendor/fuse-emulator/current/fuse/ui/widget/debugger.c
vendor/fuse-emulator/current/fuse/ui/widget/error.c
vendor/fuse-emulator/current/fuse/ui/widget/filesel.c
vendor/fuse-emulator/current/fuse/ui/widget/memory.c
vendor/fuse-emulator/current/fuse/ui/widget/menu.c
vendor/fuse-emulator/current/fuse/ui/widget/picture.c
vendor/fuse-emulator/current/fuse/ui/widget/pokefinder.c
vendor/fuse-emulator/current/fuse/ui/widget/pokemem.c
vendor/fuse-emulator/current/fuse/ui/widget/query.c
vendor/fuse-emulator/current/fuse/ui/widget/roms.c
vendor/fuse-emulator/current/fuse/ui/widget/select.c
vendor/fuse-emulator/current/fuse/ui/widget/text.c
vendor/fuse-emulator/current/fuse/ui/widget/widget.c
vendor/fuse-emulator/current/fuse/ui/widget/widget.h
vendor/fuse-emulator/current/fuse/ui/widget/widget_internals.h
vendor/fuse-emulator/current/fuse/ui/wii/wiidisplay.c
vendor/fuse-emulator/current/fuse/ui/wii/wiidisplay.h
vendor/fuse-emulator/current/fuse/ui/wii/wiijoystick.c
vendor/fuse-emulator/current/fuse/ui/wii/wiikeyboard.c
vendor/fuse-emulator/current/fuse/ui/wii/wiikeyboard.h
vendor/fuse-emulator/current/fuse/ui/wii/wiikeysyms.h
vendor/fuse-emulator/current/fuse/ui/wii/wiimouse.c
vendor/fuse-emulator/current/fuse/ui/wii/wiimouse.h
vendor/fuse-emulator/current/fuse/ui/wii/wiiui.c
vendor/fuse-emulator/current/fuse/ui/win32/about.c
vendor/fuse-emulator/current/fuse/ui/win32/about.h
vendor/fuse-emulator/current/fuse/ui/win32/binary.c
vendor/fuse-emulator/current/fuse/ui/win32/binary.h
vendor/fuse-emulator/current/fuse/ui/win32/browse.c
vendor/fuse-emulator/current/fuse/ui/win32/browse.h
vendor/fuse-emulator/current/fuse/ui/win32/confirm.c
vendor/fuse-emulator/current/fuse/ui/win32/debugger.c
vendor/fuse-emulator/current/fuse/ui/win32/debugger.h
vendor/fuse-emulator/current/fuse/ui/win32/fileselector.c
vendor/fuse-emulator/current/fuse/ui/win32/hyperlinks.c
vendor/fuse-emulator/current/fuse/ui/win32/hyperlinks.h
vendor/fuse-emulator/current/fuse/ui/win32/memorybrowser.c
vendor/fuse-emulator/current/fuse/ui/win32/memorybrowser.h
vendor/fuse-emulator/current/fuse/ui/win32/picture.c
vendor/fuse-emulator/current/fuse/ui/win32/picture.h
vendor/fuse-emulator/current/fuse/ui/win32/pokefinder.c
vendor/fuse-emulator/current/fuse/ui/win32/pokefinder.h
vendor/fuse-emulator/current/fuse/ui/win32/pokemem.c
vendor/fuse-emulator/current/fuse/ui/win32/pokemem.h
vendor/fuse-emulator/current/fuse/ui/win32/rollback.c
vendor/fuse-emulator/current/fuse/ui/win32/rollback.h
vendor/fuse-emulator/current/fuse/ui/win32/roms.c
vendor/fuse-emulator/current/fuse/ui/win32/roms.h
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/win32internals.h
vendor/fuse-emulator/current/fuse/ui/win32/win32joystick.c
vendor/fuse-emulator/current/fuse/ui/win32/win32joystick.h
vendor/fuse-emulator/current/fuse/ui/win32/win32keyboard.c
vendor/fuse-emulator/current/fuse/ui/win32/win32mouse.c
vendor/fuse-emulator/current/fuse/ui/win32/win32ui.c
vendor/fuse-emulator/current/fuse/ui/xlib/xdisplay.c
vendor/fuse-emulator/current/fuse/ui/xlib/xdisplay.h
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/xkeyboard.h
vendor/fuse-emulator/current/fuse/ui/xlib/xui.c
vendor/fuse-emulator/current/fuse/ui/xlib/xui.h
vendor/fuse-emulator/current/fuse/ui.c
vendor/fuse-emulator/current/fuse/uidisplay.c
vendor/fuse-emulator/current/fuse/unittests/unittests.c
vendor/fuse-emulator/current/fuse/unittests/unittests.h
vendor/fuse-emulator/current/fuse/utils.c
vendor/fuse-emulator/current/fuse/utils.h
vendor/fuse-emulator/current/fuse/z80/coretest.c
vendor/fuse-emulator/current/fuse/z80/z80.h
vendor/fuse-emulator/current/fuse/z80/z80_macros.h
vendor/fuse-emulator/current/fuse/z80/z80_ops.c
vendor/fuse-emulator/current/libspectrum/bzip2.c
vendor/fuse-emulator/current/libspectrum/creator.c
vendor/fuse-emulator/current/libspectrum/crypto.c
vendor/fuse-emulator/current/libspectrum/csw.c
vendor/fuse-emulator/current/libspectrum/dck.c
vendor/fuse-emulator/current/libspectrum/dll.c
vendor/fuse-emulator/current/libspectrum/ide.c
vendor/fuse-emulator/current/libspectrum/internals.h
vendor/fuse-emulator/current/libspectrum/libspectrum.c
vendor/fuse-emulator/current/libspectrum/make-perl.c
vendor/fuse-emulator/current/libspectrum/memory.c
vendor/fuse-emulator/current/libspectrum/microdrive.c
vendor/fuse-emulator/current/libspectrum/myglib/garray.c
vendor/fuse-emulator/current/libspectrum/myglib/ghash.c
vendor/fuse-emulator/current/libspectrum/myglib/gslist.c
vendor/fuse-emulator/current/libspectrum/plusd.c
vendor/fuse-emulator/current/libspectrum/pzx_read.c
vendor/fuse-emulator/current/libspectrum/rzx.c
vendor/fuse-emulator/current/libspectrum/sna.c
vendor/fuse-emulator/current/libspectrum/snapshot.c
vendor/fuse-emulator/current/libspectrum/snp.c
vendor/fuse-emulator/current/libspectrum/sp.c
vendor/fuse-emulator/current/libspectrum/symbol_table.c
vendor/fuse-emulator/current/libspectrum/szx.c
vendor/fuse-emulator/current/libspectrum/tap.c
vendor/fuse-emulator/current/libspectrum/tape.c
vendor/fuse-emulator/current/libspectrum/tape_block.c
vendor/fuse-emulator/current/libspectrum/tape_block.h
vendor/fuse-emulator/current/libspectrum/timings.c
vendor/fuse-emulator/current/libspectrum/tzx_read.c
vendor/fuse-emulator/current/libspectrum/tzx_write.c
vendor/fuse-emulator/current/libspectrum/utilities.c
vendor/fuse-emulator/current/libspectrum/warajevo_read.c
vendor/fuse-emulator/current/libspectrum/wav.c
vendor/fuse-emulator/current/libspectrum/z80.c
vendor/fuse-emulator/current/libspectrum/z80em.c
vendor/fuse-emulator/current/libspectrum/zlib.c
vendor/fuse-emulator/current/libspectrum/zxs.c
Property Changed:
----------------
vendor/fuse-emulator/current/fuse/bitmap.h
vendor/fuse-emulator/current/fuse/compat/amiga/osname.c
vendor/fuse-emulator/current/fuse/compat/amiga/paths.c
vendor/fuse-emulator/current/fuse/compat/dirname.c
vendor/fuse-emulator/current/fuse/compat/getopt.c
vendor/fuse-emulator/current/fuse/compat/getopt.h
vendor/fuse-emulator/current/fuse/compat/getopt1.c
vendor/fuse-emulator/current/fuse/compat/linux/paths.c
vendor/fuse-emulator/current/fuse/compat/mkstemp.c
vendor/fuse-emulator/current/fuse/compat/morphos/osname.c
vendor/fuse-emulator/current/fuse/compat/unix/dir.c
vendor/fuse-emulator/current/fuse/compat/unix/file.c
vendor/fuse-emulator/current/fuse/compat/unix/osname.c
vendor/fuse-emulator/current/fuse/compat/unix/paths.c
vendor/fuse-emulator/current/fuse/compat/unix/socket.c
vendor/fuse-emulator/current/fuse/compat/unix/timer.c
vendor/fuse-emulator/current/fuse/compat/unix/tuntap.c
vendor/fuse-emulator/current/fuse/compat/wii/dir.c
vendor/fuse-emulator/current/fuse/compat/wii/osname.c
vendor/fuse-emulator/current/fuse/compat/wii/paths.c
vendor/fuse-emulator/current/fuse/compat/wii/timer.c
vendor/fuse-emulator/current/fuse/compat/win32/osname.c
vendor/fuse-emulator/current/fuse/compat/win32/paths.c
vendor/fuse-emulator/current/fuse/compat/win32/socket.c
vendor/fuse-emulator/current/fuse/compat/win32/timer.c
vendor/fuse-emulator/current/fuse/compat.h
vendor/fuse-emulator/current/fuse/debugger/breakpoint.c
vendor/fuse-emulator/current/fuse/debugger/breakpoint.h
vendor/fuse-emulator/current/fuse/debugger/command.c
vendor/fuse-emulator/current/fuse/debugger/debugger.c
vendor/fuse-emulator/current/fuse/debugger/debugger.h
vendor/fuse-emulator/current/fuse/debugger/debugger_internals.h
vendor/fuse-emulator/current/fuse/debugger/disassemble.c
vendor/fuse-emulator/current/fuse/debugger/event.c
vendor/fuse-emulator/current/fuse/debugger/expression.c
vendor/fuse-emulator/current/fuse/debugger/variable.c
vendor/fuse-emulator/current/fuse/display.c
vendor/fuse-emulator/current/fuse/display.h
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/fuse.h
vendor/fuse-emulator/current/fuse/input.c
vendor/fuse-emulator/current/fuse/input.h
vendor/fuse-emulator/current/fuse/keyboard.c
vendor/fuse-emulator/current/fuse/keyboard.h
vendor/fuse-emulator/current/fuse/loader.c
vendor/fuse-emulator/current/fuse/loader.h
vendor/fuse-emulator/current/fuse/machine.c
vendor/fuse-emulator/current/fuse/machine.h
vendor/fuse-emulator/current/fuse/machines/machines.h
vendor/fuse-emulator/current/fuse/machines/machines_periph.c
vendor/fuse-emulator/current/fuse/machines/machines_periph.h
vendor/fuse-emulator/current/fuse/machines/pentagon.c
vendor/fuse-emulator/current/fuse/machines/pentagon.h
vendor/fuse-emulator/current/fuse/machines/pentagon1024.c
vendor/fuse-emulator/current/fuse/machines/pentagon512.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/spec48_ntsc.c
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/memory.c
vendor/fuse-emulator/current/fuse/memory.h
vendor/fuse-emulator/current/fuse/mempool.c
vendor/fuse-emulator/current/fuse/mempool.h
vendor/fuse-emulator/current/fuse/menu.c
vendor/fuse-emulator/current/fuse/menu.h
vendor/fuse-emulator/current/fuse/module.c
vendor/fuse-emulator/current/fuse/module.h
vendor/fuse-emulator/current/fuse/movie.c
vendor/fuse-emulator/current/fuse/movie.h
vendor/fuse-emulator/current/fuse/movie_tables.h
vendor/fuse-emulator/current/fuse/periph.c
vendor/fuse-emulator/current/fuse/periph.h
vendor/fuse-emulator/current/fuse/peripherals/ay.c
vendor/fuse-emulator/current/fuse/peripherals/ay.h
vendor/fuse-emulator/current/fuse/peripherals/dck.c
vendor/fuse-emulator/current/fuse/peripherals/dck.h
vendor/fuse-emulator/current/fuse/peripherals/disk/beta.c
vendor/fuse-emulator/current/fuse/peripherals/disk/beta.h
vendor/fuse-emulator/current/fuse/peripherals/disk/crc.c
vendor/fuse-emulator/current/fuse/peripherals/disk/crc.h
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.c
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/opus.h
vendor/fuse-emulator/current/fuse/peripherals/disk/plusd.c
vendor/fuse-emulator/current/fuse/peripherals/disk/plusd.h
vendor/fuse-emulator/current/fuse/peripherals/disk/upd_fdc.c
vendor/fuse-emulator/current/fuse/peripherals/disk/upd_fdc.h
vendor/fuse-emulator/current/fuse/peripherals/disk/wd_fdc.c
vendor/fuse-emulator/current/fuse/peripherals/disk/wd_fdc.h
vendor/fuse-emulator/current/fuse/peripherals/flash/am29f010.c
vendor/fuse-emulator/current/fuse/peripherals/flash/am29f010.h
vendor/fuse-emulator/current/fuse/peripherals/fuller.c
vendor/fuse-emulator/current/fuse/peripherals/fuller.h
vendor/fuse-emulator/current/fuse/peripherals/ide/divide.c
vendor/fuse-emulator/current/fuse/peripherals/ide/divide.h
vendor/fuse-emulator/current/fuse/peripherals/ide/ide.c
vendor/fuse-emulator/current/fuse/peripherals/ide/ide.h
vendor/fuse-emulator/current/fuse/peripherals/ide/simpleide.c
vendor/fuse-emulator/current/fuse/peripherals/ide/simpleide.h
vendor/fuse-emulator/current/fuse/peripherals/ide/zxatasp.c
vendor/fuse-emulator/current/fuse/peripherals/ide/zxatasp.h
vendor/fuse-emulator/current/fuse/peripherals/ide/zxcf.c
vendor/fuse-emulator/current/fuse/peripherals/ide/zxcf.h
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/joystick.c
vendor/fuse-emulator/current/fuse/peripherals/joystick.h
vendor/fuse-emulator/current/fuse/peripherals/kempmouse.c
vendor/fuse-emulator/current/fuse/peripherals/kempmouse.h
vendor/fuse-emulator/current/fuse/peripherals/melodik.c
vendor/fuse-emulator/current/fuse/peripherals/melodik.h
vendor/fuse-emulator/current/fuse/peripherals/nic/enc28j60.c
vendor/fuse-emulator/current/fuse/peripherals/nic/enc28j60.h
vendor/fuse-emulator/current/fuse/peripherals/nic/w5100.c
vendor/fuse-emulator/current/fuse/peripherals/nic/w5100.h
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/printer.h
vendor/fuse-emulator/current/fuse/peripherals/scld.c
vendor/fuse-emulator/current/fuse/peripherals/scld.h
vendor/fuse-emulator/current/fuse/peripherals/speccyboot.c
vendor/fuse-emulator/current/fuse/peripherals/speccyboot.h
vendor/fuse-emulator/current/fuse/peripherals/specdrum.c
vendor/fuse-emulator/current/fuse/peripherals/specdrum.h
vendor/fuse-emulator/current/fuse/peripherals/spectranet.c
vendor/fuse-emulator/current/fuse/peripherals/spectranet.h
vendor/fuse-emulator/current/fuse/peripherals/ula.c
vendor/fuse-emulator/current/fuse/peripherals/ula.h
vendor/fuse-emulator/current/fuse/pokefinder/pokefinder.c
vendor/fuse-emulator/current/fuse/pokefinder/pokefinder.h
vendor/fuse-emulator/current/fuse/pokefinder/pokemem.c
vendor/fuse-emulator/current/fuse/pokefinder/pokemem.h
vendor/fuse-emulator/current/fuse/profile.c
vendor/fuse-emulator/current/fuse/profile.h
vendor/fuse-emulator/current/fuse/psg.c
vendor/fuse-emulator/current/fuse/psg.h
vendor/fuse-emulator/current/fuse/rectangle.c
vendor/fuse-emulator/current/fuse/rectangle.h
vendor/fuse-emulator/current/fuse/rzx.c
vendor/fuse-emulator/current/fuse/rzx.h
vendor/fuse-emulator/current/fuse/screenshot.c
vendor/fuse-emulator/current/fuse/screenshot.h
vendor/fuse-emulator/current/fuse/slt.c
vendor/fuse-emulator/current/fuse/slt.h
vendor/fuse-emulator/current/fuse/snapshot.c
vendor/fuse-emulator/current/fuse/snapshot.h
vendor/fuse-emulator/current/fuse/sound/alsasound.c
vendor/fuse-emulator/current/fuse/sound/aosound.c
vendor/fuse-emulator/current/fuse/sound/blipbuffer.c
vendor/fuse-emulator/current/fuse/sound/blipbuffer.h
vendor/fuse-emulator/current/fuse/sound/coreaudiosound.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/sfifo.h
vendor/fuse-emulator/current/fuse/sound/sunsound.c
vendor/fuse-emulator/current/fuse/sound/wiisound.c
vendor/fuse-emulator/current/fuse/sound/win32sound.c
vendor/fuse-emulator/current/fuse/sound.c
vendor/fuse-emulator/current/fuse/sound.h
vendor/fuse-emulator/current/fuse/spectrum.c
vendor/fuse-emulator/current/fuse/spectrum.h
vendor/fuse-emulator/current/fuse/tape.c
vendor/fuse-emulator/current/fuse/tape.h
vendor/fuse-emulator/current/fuse/timer/native.c
vendor/fuse-emulator/current/fuse/timer/sdl.c
vendor/fuse-emulator/current/fuse/timer/timer.c
vendor/fuse-emulator/current/fuse/timer/timer.h
vendor/fuse-emulator/current/fuse/ui/fb/fbdisplay.c
vendor/fuse-emulator/current/fuse/ui/fb/fbdisplay.h
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/fbkeyboard.h
vendor/fuse-emulator/current/fuse/ui/fb/fbmouse.c
vendor/fuse-emulator/current/fuse/ui/fb/fbmouse.h
vendor/fuse-emulator/current/fuse/ui/fb/fbui.c
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/gtkcompat.c
vendor/fuse-emulator/current/fuse/ui/gtk/gtkcompat.h
vendor/fuse-emulator/current/fuse/ui/gtk/gtkdisplay.c
vendor/fuse-emulator/current/fuse/ui/gtk/gtkinternals.h
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/picture.c
vendor/fuse-emulator/current/fuse/ui/gtk/pixmaps.c
vendor/fuse-emulator/current/fuse/ui/gtk/pokefinder.c
vendor/fuse-emulator/current/fuse/ui/gtk/pokemem.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/gtk/stock.c
vendor/fuse-emulator/current/fuse/ui/scaler/scaler.c
vendor/fuse-emulator/current/fuse/ui/scaler/scaler.h
vendor/fuse-emulator/current/fuse/ui/scaler/scaler_hq2x.c
vendor/fuse-emulator/current/fuse/ui/scaler/scaler_hq3x.c
vendor/fuse-emulator/current/fuse/ui/scaler/scaler_internals.h
vendor/fuse-emulator/current/fuse/ui/scaler/scalers.c
vendor/fuse-emulator/current/fuse/ui/sdl/sdldisplay.c
vendor/fuse-emulator/current/fuse/ui/sdl/sdldisplay.h
vendor/fuse-emulator/current/fuse/ui/sdl/sdljoystick.c
vendor/fuse-emulator/current/fuse/ui/sdl/sdljoystick.h
vendor/fuse-emulator/current/fuse/ui/sdl/sdlkeyboard.c
vendor/fuse-emulator/current/fuse/ui/sdl/sdlkeyboard.h
vendor/fuse-emulator/current/fuse/ui/sdl/sdlui.c
vendor/fuse-emulator/current/fuse/ui/svga/svgadisplay.c
vendor/fuse-emulator/current/fuse/ui/svga/svgadisplay.h
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/svgakeyboard.h
vendor/fuse-emulator/current/fuse/ui/svga/svgaui.c
vendor/fuse-emulator/current/fuse/ui/ui.h
vendor/fuse-emulator/current/fuse/ui/uidisplay.h
vendor/fuse-emulator/current/fuse/ui/uijoystick.c
vendor/fuse-emulator/current/fuse/ui/uijoystick.h
vendor/fuse-emulator/current/fuse/ui/widget/browse.c
vendor/fuse-emulator/current/fuse/ui/widget/debugger.c
vendor/fuse-emulator/current/fuse/ui/widget/error.c
vendor/fuse-emulator/current/fuse/ui/widget/filesel.c
vendor/fuse-emulator/current/fuse/ui/widget/memory.c
vendor/fuse-emulator/current/fuse/ui/widget/menu.c
vendor/fuse-emulator/current/fuse/ui/widget/picture.c
vendor/fuse-emulator/current/fuse/ui/widget/pokefinder.c
vendor/fuse-emulator/current/fuse/ui/widget/pokemem.c
vendor/fuse-emulator/current/fuse/ui/widget/query.c
vendor/fuse-emulator/current/fuse/ui/widget/roms.c
vendor/fuse-emulator/current/fuse/ui/widget/select.c
vendor/fuse-emulator/current/fuse/ui/widget/text.c
vendor/fuse-emulator/current/fuse/ui/widget/widget.c
vendor/fuse-emulator/current/fuse/ui/widget/widget.h
vendor/fuse-emulator/current/fuse/ui/widget/widget_internals.h
vendor/fuse-emulator/current/fuse/ui/wii/wiidisplay.c
vendor/fuse-emulator/current/fuse/ui/wii/wiidisplay.h
vendor/fuse-emulator/current/fuse/ui/wii/wiijoystick.c
vendor/fuse-emulator/current/fuse/ui/wii/wiikeyboard.c
vendor/fuse-emulator/current/fuse/ui/wii/wiikeyboard.h
vendor/fuse-emulator/current/fuse/ui/wii/wiikeysyms.h
vendor/fuse-emulator/current/fuse/ui/wii/wiimouse.c
vendor/fuse-emulator/current/fuse/ui/wii/wiimouse.h
vendor/fuse-emulator/current/fuse/ui/wii/wiiui.c
vendor/fuse-emulator/current/fuse/ui/win32/about.c
vendor/fuse-emulator/current/fuse/ui/win32/about.h
vendor/fuse-emulator/current/fuse/ui/win32/binary.c
vendor/fuse-emulator/current/fuse/ui/win32/binary.h
vendor/fuse-emulator/current/fuse/ui/win32/browse.c
vendor/fuse-emulator/current/fuse/ui/win32/browse.h
vendor/fuse-emulator/current/fuse/ui/win32/confirm.c
vendor/fuse-emulator/current/fuse/ui/win32/debugger.c
vendor/fuse-emulator/current/fuse/ui/win32/debugger.h
vendor/fuse-emulator/current/fuse/ui/win32/fileselector.c
vendor/fuse-emulator/current/fuse/ui/win32/hyperlinks.c
vendor/fuse-emulator/current/fuse/ui/win32/hyperlinks.h
vendor/fuse-emulator/current/fuse/ui/win32/memorybrowser.c
vendor/fuse-emulator/current/fuse/ui/win32/memorybrowser.h
vendor/fuse-emulator/current/fuse/ui/win32/picture.c
vendor/fuse-emulator/current/fuse/ui/win32/picture.h
vendor/fuse-emulator/current/fuse/ui/win32/pokefinder.c
vendor/fuse-emulator/current/fuse/ui/win32/pokefinder.h
vendor/fuse-emulator/current/fuse/ui/win32/pokemem.c
vendor/fuse-emulator/current/fuse/ui/win32/pokemem.h
vendor/fuse-emulator/current/fuse/ui/win32/rollback.c
vendor/fuse-emulator/current/fuse/ui/win32/rollback.h
vendor/fuse-emulator/current/fuse/ui/win32/roms.c
vendor/fuse-emulator/current/fuse/ui/win32/roms.h
vendor/fuse-emulator/current/fuse/ui/win32/select_template.h
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/win32internals.h
vendor/fuse-emulator/current/fuse/ui/win32/win32joystick.c
vendor/fuse-emulator/current/fuse/ui/win32/win32joystick.h
vendor/fuse-emulator/current/fuse/ui/win32/win32keyboard.c
vendor/fuse-emulator/current/fuse/ui/win32/win32mouse.c
vendor/fuse-emulator/current/fuse/ui/win32/win32ui.c
vendor/fuse-emulator/current/fuse/ui/xlib/xdisplay.c
vendor/fuse-emulator/current/fuse/ui/xlib/xdisplay.h
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/xkeyboard.h
vendor/fuse-emulator/current/fuse/ui/xlib/xui.c
vendor/fuse-emulator/current/fuse/ui/xlib/xui.h
vendor/fuse-emulator/current/fuse/ui.c
vendor/fuse-emulator/current/fuse/uidisplay.c
vendor/fuse-emulator/current/fuse/unittests/unittests.c
vendor/fuse-emulator/current/fuse/unittests/unittests.h
vendor/fuse-emulator/current/fuse/utils.c
vendor/fuse-emulator/current/fuse/utils.h
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_checks.h
vendor/fuse-emulator/current/fuse/z80/z80_macros.h
vendor/fuse-emulator/current/fuse/z80/z80_ops.c
vendor/fuse-emulator/current/libspectrum/bzip2.c
vendor/fuse-emulator/current/libspectrum/creator.c
vendor/fuse-emulator/current/libspectrum/crypto.c
vendor/fuse-emulator/current/libspectrum/csw.c
vendor/fuse-emulator/current/libspectrum/dck.c
vendor/fuse-emulator/current/libspectrum/dll.c
vendor/fuse-emulator/current/libspectrum/ide.c
vendor/fuse-emulator/current/libspectrum/internals.h
vendor/fuse-emulator/current/libspectrum/libspectrum.c
vendor/fuse-emulator/current/libspectrum/make-perl.c
vendor/fuse-emulator/current/libspectrum/memory.c
vendor/fuse-emulator/current/libspectrum/microdrive.c
vendor/fuse-emulator/current/libspectrum/myglib/garray.c
vendor/fuse-emulator/current/libspectrum/myglib/ghash.c
vendor/fuse-emulator/current/libspectrum/myglib/gslist.c
vendor/fuse-emulator/current/libspectrum/plusd.c
vendor/fuse-emulator/current/libspectrum/pzx_read.c
vendor/fuse-emulator/current/libspectrum/rzx.c
vendor/fuse-emulator/current/libspectrum/sna.c
vendor/fuse-emulator/current/libspectrum/snapshot.c
vendor/fuse-emulator/current/libspectrum/snp.c
vendor/fuse-emulator/current/libspectrum/sp.c
vendor/fuse-emulator/current/libspectrum/symbol_table.c
vendor/fuse-emulator/current/libspectrum/szx.c
vendor/fuse-emulator/current/libspectrum/tap.c
vendor/fuse-emulator/current/libspectrum/tape.c
vendor/fuse-emulator/current/libspectrum/tape_block.c
vendor/fuse-emulator/current/libspectrum/tape_block.h
vendor/fuse-emulator/current/libspectrum/test/edges.c
vendor/fuse-emulator/current/libspectrum/test/test.c
vendor/fuse-emulator/current/libspectrum/test/test.h
vendor/fuse-emulator/current/libspectrum/test/test15.c
vendor/fuse-emulator/current/libspectrum/timings.c
vendor/fuse-emulator/current/libspectrum/tzx_read.c
vendor/fuse-emulator/current/libspectrum/tzx_write.c
vendor/fuse-emulator/current/libspectrum/utilities.c
vendor/fuse-emulator/current/libspectrum/warajevo_read.c
vendor/fuse-emulator/current/libspectrum/wav.c
vendor/fuse-emulator/current/libspectrum/z80.c
vendor/fuse-emulator/current/libspectrum/z80em.c
vendor/fuse-emulator/current/libspectrum/zlib.c
vendor/fuse-emulator/current/libspectrum/zxs.c
Modified: vendor/fuse-emulator/current/fuse/bitmap.h
===================================================================
--- vendor/fuse-emulator/current/fuse/bitmap.h 2016-05-24 14:04:16 UTC (rev 795)
+++ vendor/fuse-emulator/current/fuse/bitmap.h 2016-05-24 14:16:36 UTC (rev 796)
@@ -1,7 +1,7 @@
/* bitmap.h: Bitmap routines
Copyright (c) 2007 Stuart Brady
- $Id: bitmap.h 4343 2011-04-04 19:32:23Z zubzero $
+ $Id$
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
Property changes on: vendor/fuse-emulator/current/fuse/bitmap.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: vendor/fuse-emulator/current/fuse/compat/amiga/osname.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/amiga/osname.c 2016-05-24 14:04:16 UTC (rev 795)
+++ vendor/fuse-emulator/current/fuse/compat/amiga/osname.c 2016-05-24 14:16:36 UTC (rev 796)
@@ -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 3578 2008-03-22 20:51:36Z zubzero $
+ $Id$
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
Property changes on: vendor/fuse-emulator/current/fuse/compat/amiga/osname.c
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: vendor/fuse-emulator/current/fuse/compat/amiga/paths.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/amiga/paths.c 2016-05-24 14:04:16 UTC (rev 795)
+++ vendor/fuse-emulator/current/fuse/compat/amiga/paths.c 2016-05-24 14:16:36 UTC (rev 796)
@@ -1,7 +1,7 @@
/* paths.c: Path-related compatibility routines
Copyright (c) 1999-2012 Philip Kendall
- $Id: paths.c 4738 2012-10-03 13:15:31Z fredm $
+ $Id$
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
Property changes on: vendor/fuse-emulator/current/fuse/compat/amiga/paths.c
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/compat/dirname.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/dirname.c 2016-05-24 14:04:16 UTC (rev 795)
+++ vendor/fuse-emulator/current/fuse/compat/dirname.c 2016-05-24 14:16:36 UTC (rev 796)
Property changes on: vendor/fuse-emulator/current/fuse/compat/dirname.c
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/compat/getopt.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/getopt.c 2016-05-24 14:04:16 UTC (rev 795)
+++ vendor/fuse-emulator/current/fuse/compat/getopt.c 2016-05-24 14:16:36 UTC (rev 796)
Property changes on: vendor/fuse-emulator/current/fuse/compat/getopt.c
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/compat/getopt.h
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/getopt.h 2016-05-24 14:04:16 UTC (rev 795)
+++ vendor/fuse-emulator/current/fuse/compat/getopt.h 2016-05-24 14:16:36 UTC (rev 796)
Property changes on: vendor/fuse-emulator/current/fuse/compat/getopt.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/compat/getopt1.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/getopt1.c 2016-05-24 14:04:16 UTC (rev 795)
+++ vendor/fuse-emulator/current/fuse/compat/getopt1.c 2016-05-24 14:16:36 UTC (rev 796)
Property changes on: vendor/fuse-emulator/current/fuse/compat/getopt1.c
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: vendor/fuse-emulator/current/fuse/compat/linux/paths.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/linux/paths.c 2016-05-24 14:04:16 UTC (rev 795)
+++ vendor/fuse-emulator/current/fuse/compat/linux/paths.c 2016-05-24 14:16:36 UTC (rev 796)
@@ -1,7 +1,7 @@
/* paths.c: Path-related compatibility routines
Copyright (c) 2012 Philip Kendall
- $Id: paths.c 4739 2012-10-10 12:14:56Z fredm $
+ $Id$
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
Property changes on: vendor/fuse-emulator/current/fuse/compat/linux/paths.c
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/compat/mkstemp.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/mkstemp.c 2016-05-24 14:04:16 UTC (rev 795)
+++ vendor/fuse-emulator/current/fuse/compat/mkstemp.c 2016-05-24 14:16:36 UTC (rev 796)
Property changes on: vendor/fuse-emulator/current/fuse/compat/mkstemp.c
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: vendor/fuse-emulator/current/fuse/compat/morphos/osname.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/morphos/osname.c 2016-05-24 14:04:16 UTC (rev 795)
+++ vendor/fuse-emulator/current/fuse/compat/morphos/osname.c 2016-05-24 14:16:36 UTC (rev 796)
@@ -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 3922 2008-12-31 19:01:31Z zubzero $
+ $Id$
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
Property changes on: vendor/fuse-emulator/current/fuse/compat/morphos/osname.c
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: vendor/fuse-emulator/current/fuse/compat/unix/dir.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/unix/dir.c 2016-05-24 14:04:16 UTC (rev 795)
+++ vendor/fuse-emulator/current/fuse/compat/unix/dir.c 2016-05-24 14:16:36 UTC (rev 796)
@@ -1,7 +1,7 @@
/* dir.c: Directory-related compatibility routines
Copyright (c) 2009 Philip Kendall
- $Id: dir.c 3945 2009-01-10 18:44:42Z zubzero $
+ $Id$
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
Property changes on: vendor/fuse-emulator/current/fuse/compat/unix/dir.c
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: vendor/fuse-emulator/current/fuse/compat/unix/file.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/unix/file.c 2016-05-24 14:04:16 UTC (rev 795)
+++ vendor/fuse-emulator/current/fuse/compat/unix/file.c 2016-05-24 14:16:36 UTC (rev 796)
@@ -1,7 +1,7 @@
/* file.c: File-related compatibility routines
Copyright (c) 2008 Philip Kendall
- $Id: file.c 4624 2012-01-09 20:59:35Z pak21 $
+ $Id$
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
Property changes on: vendor/fuse-emulator/current/fuse/compat/unix/file.c
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: vendor/fuse-emulator/current/fuse/compat/unix/osname.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/unix/osname.c 2016-05-24 14:04:16 UTC (rev 795)
+++ vendor/fuse-emulator/current/fuse/compat/unix/osname.c 2016-05-24 14:16:36 UTC (rev 796)
@@ -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 3922 2008-12-31 19:01:31Z zubzero $
+ $Id$
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
Property changes on: vendor/fuse-emulator/current/fuse/compat/unix/osname.c
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: vendor/fuse-emulator/current/fuse/compat/unix/paths.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/unix/paths.c 2016-05-24 14:04:16 UTC (rev 795)
+++ vendor/fuse-emulator/current/fuse/compat/unix/paths.c 2016-05-24 14:16:36 UTC (rev 796)
@@ -1,7 +1,7 @@
/* paths.c: Path-related compatibility routines
Copyright (c) 1999-2012 Philip Kendall
- $Id: paths.c 4738 2012-10-03 13:15:31Z fredm $
+ $Id$
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
Property changes on: vendor/fuse-emulator/current/fuse/compat/unix/paths.c
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: vendor/fuse-emulator/current/fuse/compat/unix/socket.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/unix/socket.c 2016-05-24 14:04:16 UTC (rev 795)
+++ vendor/fuse-emulator/current/fuse/compat/unix/socket.c 2016-05-24 14:16:36 UTC (rev 796)
@@ -1,7 +1,7 @@
/* socket.c: Socket-related compatibility routines
Copyright (c) 2011-2012 Philip Kendall
- $Id: socket.c 4828 2012-12-30 19:43:37Z pak21 $
+ $Id$
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
Property changes on: vendor/fuse-emulator/current/fuse/compat/unix/socket.c
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: vendor/fuse-emulator/current/fuse/compat/unix/timer.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/unix/timer.c 2016-05-24 14:04:16 UTC (rev 795)
+++ vendor/fuse-emulator/current/fuse/compat/unix/timer.c 2016-05-24 14:16:36 UTC (rev 796)
@@ -1,7 +1,7 @@
/* timer.c: UNIX speed routines for Fuse
Copyright (c) 1999-2008 Philip Kendall, Marek Januszewski, Fredrick Meunier
- $Id: timer.c 3982 2009-02-11 12:00:22Z fredm $
+ $Id$
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
Property changes on: vendor/fuse-emulator/current/fuse/compat/unix/timer.c
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: vendor/fuse-emulator/current/fuse/compat/unix/tuntap.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/unix/tuntap.c 2016-05-24 14:04:16 UTC (rev 795)
+++ vendor/fuse-emulator/current/fuse/compat/unix/tuntap.c 2016-05-24 14:16:36 UTC (rev 796)
@@ -1,7 +1,7 @@
/* tuntap.c: TUN/TAP compatability layer
Copyright (c) 2009-2010 Patrik Persson, Philip Kendall
- $Id: tuntap.c 4898 2013-02-25 22:20:54Z pak21 $
+ $Id$
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
Property changes on: vendor/fuse-emulator/current/fuse/compat/unix/tuntap.c
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: vendor/fuse-emulator/current/fuse/compat/wii/dir.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/wii/dir.c 2016-05-24 14:04:16 UTC (rev 795)
+++ vendor/fuse-emulator/current/fuse/compat/wii/dir.c 2016-05-24 14:16:36 UTC (rev 796)
@@ -1,7 +1,7 @@
/* dir.c: Directory-related compatibility routines
Copyright (c) 2009 Philip Kendall
- $Id: dir.c 3945 2009-01-10 18:44:42Z zubzero $
+ $Id$
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
Property changes on: vendor/fuse-emulator/current/fuse/compat/wii/dir.c
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: vendor/fuse-emulator/current/fuse/compat/wii/osname.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/wii/osname.c 2016-05-24 14:04:16 UTC (rev 795)
+++ vendor/fuse-emulator/current/fuse/compat/wii/osname.c 2016-05-24 14:16:36 UTC (rev 796)
@@ -1,7 +1,7 @@
/* osname.c: Get a representation of the OS we're running on
Copyright (c) 1999-2009 Philip Kendall, Bjoern Giesler
- $Id: osname.c 3945 2009-01-10 18:44:42Z zubzero $
+ $Id$
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
Property changes on: vendor/fuse-emulator/current/fuse/compat/wii/osname.c
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: vendor/fuse-emulator/current/fuse/compat/wii/paths.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/wii/paths.c 2016-05-24 14:04:16 UTC (rev 795)
+++ vendor/fuse-emulator/current/fuse/compat/wii/paths.c 2016-05-24 14:16:36 UTC (rev 796)
@@ -1,7 +1,7 @@
/* paths.c: Path-related compatibility routines
Copyright (c) 1999-2012 Philip Kendall, Bjoern Giesler
- $Id: paths.c 4738 2012-10-03 13:15:31Z fredm $
+ $Id$
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
Property changes on: vendor/fuse-emulator/current/fuse/compat/wii/paths.c
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: vendor/fuse-emulator/current/fuse/compat/wii/timer.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/wii/timer.c 2016-05-24 14:04:16 UTC (rev 795)
+++ vendor/fuse-emulator/current/fuse/compat/wii/timer.c 2016-05-24 14:16:36 UTC (rev 796)
@@ -1,7 +1,7 @@
/* unix.c: UNIX speed routines for Fuse
Copyright (c) 1999-2007 Philip Kendall, Marek Januszewski, Fredrick Meunier
- $Id: timer.c 3944 2009-01-10 18:17:04Z pak21 $
+ $Id$
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
Property changes on: vendor/fuse-emulator/current/fuse/compat/wii/timer.c
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: vendor/fuse-emulator/current/fuse/compat/win32/osname.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/win32/osname.c 2016-05-24 14:04:16 UTC (rev 795)
+++ vendor/fuse-emulator/current/fuse/compat/win32/osname.c 2016-05-24 14:16:36 UTC (rev 796)
@@ -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 3922 2008-12-31 19:01:31Z zubzero $
+ $Id$
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
Property changes on: vendor/fuse-emulator/current/fuse/compat/win32/osname.c
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: vendor/fuse-emulator/current/fuse/compat/win32/paths.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/win32/paths.c 2016-05-24 14:04:16 UTC (rev 795)
+++ vendor/fuse-emulator/current/fuse/compat/win32/paths.c 2016-05-24 14:16:36 UTC (rev 796)
@@ -1,7 +1,7 @@
/* paths.c: Path-related compatibility routines
Copyright (c) 1999-2012 Philip Kendall
- $Id: paths.c 4882 2013-02-15 23:47:37Z sbaldovi $
+ $Id$
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
Property changes on: vendor/fuse-emulator/current/fuse/compat/win32/paths.c
__________...
[truncated message content] |
|
From: <fr...@us...> - 2016-05-24 14:22:17
|
Revision: 797
http://sourceforge.net/p/fuse-for-macosx/code/797
Author: fredm
Date: 2016-05-24 14:22:14 +0000 (Tue, 24 May 2016)
Log Message:
-----------
Set more vendor svn:eol-style and svn:keywords properties to match vendor
source.
Property Changed:
----------------
vendor/fuse-emulator/current/fuse/AUTHORS
vendor/fuse-emulator/current/fuse/COPYING
vendor/fuse-emulator/current/fuse/ChangeLog
vendor/fuse-emulator/current/fuse/INSTALL
vendor/fuse-emulator/current/fuse/Makefile.am
vendor/fuse-emulator/current/fuse/PORTING
vendor/fuse-emulator/current/fuse/README
vendor/fuse-emulator/current/fuse/THANKS
vendor/fuse-emulator/current/fuse/autogen.sh
vendor/fuse-emulator/current/fuse/compat/Makefile.am
vendor/fuse-emulator/current/fuse/compat/amiga/Makefile.am
vendor/fuse-emulator/current/fuse/compat/linux/Makefile.am
vendor/fuse-emulator/current/fuse/compat/morphos/Makefile.am
vendor/fuse-emulator/current/fuse/compat/unix/Makefile.am
vendor/fuse-emulator/current/fuse/compat/wii/Makefile.am
vendor/fuse-emulator/current/fuse/compat/win32/Makefile.am
vendor/fuse-emulator/current/fuse/configure.ac
vendor/fuse-emulator/current/fuse/data/Makefile.am
vendor/fuse-emulator/current/fuse/debugger/Makefile.am
vendor/fuse-emulator/current/fuse/hacking/Makefile.am
vendor/fuse-emulator/current/fuse/keysyms.dat
vendor/fuse-emulator/current/fuse/keysyms.pl
vendor/fuse-emulator/current/fuse/lib/Makefile.am
vendor/fuse-emulator/current/fuse/machines/Makefile.am
vendor/fuse-emulator/current/fuse/man/Makefile.am
vendor/fuse-emulator/current/fuse/menu_data.dat
vendor/fuse-emulator/current/fuse/menu_data.pl
vendor/fuse-emulator/current/fuse/peripherals/Makefile.am
vendor/fuse-emulator/current/fuse/peripherals/disk/Makefile.am
vendor/fuse-emulator/current/fuse/peripherals/flash/Makefile.am
vendor/fuse-emulator/current/fuse/peripherals/ide/Makefile.am
vendor/fuse-emulator/current/fuse/peripherals/nic/Makefile.am
vendor/fuse-emulator/current/fuse/perl/Fuse/Makefile.am
vendor/fuse-emulator/current/fuse/perl/Makefile.am
vendor/fuse-emulator/current/fuse/perl/cpp-perl.pl
vendor/fuse-emulator/current/fuse/pokefinder/Makefile.am
vendor/fuse-emulator/current/fuse/roms/Makefile.am
vendor/fuse-emulator/current/fuse/settings-header.pl
vendor/fuse-emulator/current/fuse/settings.dat
vendor/fuse-emulator/current/fuse/settings.pl
vendor/fuse-emulator/current/fuse/sound/Makefile.am
vendor/fuse-emulator/current/fuse/timer/Makefile.am
vendor/fuse-emulator/current/fuse/ui/Makefile.am
vendor/fuse-emulator/current/fuse/ui/fb/Makefile.am
vendor/fuse-emulator/current/fuse/ui/gtk/Makefile.am
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/options.dat
vendor/fuse-emulator/current/fuse/ui/scaler/Makefile.am
vendor/fuse-emulator/current/fuse/ui/sdl/Makefile.am
vendor/fuse-emulator/current/fuse/ui/svga/Makefile.am
vendor/fuse-emulator/current/fuse/ui/widget/Makefile.am
vendor/fuse-emulator/current/fuse/ui/widget/mkfusefont.pl
vendor/fuse-emulator/current/fuse/ui/widget/options-header.pl
vendor/fuse-emulator/current/fuse/ui/widget/options.pl
vendor/fuse-emulator/current/fuse/ui/wii/Makefile.am
vendor/fuse-emulator/current/fuse/ui/win32/Makefile.am
vendor/fuse-emulator/current/fuse/ui/win32/icons/Makefile.am
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/ui/xlib/Makefile.am
vendor/fuse-emulator/current/fuse/ui/xlib/xstatusbar.pl
vendor/fuse-emulator/current/fuse/unittests/Makefile.am
vendor/fuse-emulator/current/fuse/windres.rc
vendor/fuse-emulator/current/fuse/z80/Makefile.am
vendor/fuse-emulator/current/fuse/z80/opcodes_base.dat
vendor/fuse-emulator/current/fuse/z80/opcodes_cb.dat
vendor/fuse-emulator/current/fuse/z80/opcodes_ddfd.dat
vendor/fuse-emulator/current/fuse/z80/opcodes_ddfdcb.dat
vendor/fuse-emulator/current/fuse/z80/opcodes_ed.dat
vendor/fuse-emulator/current/fuse/z80/tests/Makefile.am
vendor/fuse-emulator/current/fuse/z80/z80.pl
vendor/fuse-emulator/current/libspectrum/AUTHORS
vendor/fuse-emulator/current/libspectrum/COPYING
vendor/fuse-emulator/current/libspectrum/ChangeLog
vendor/fuse-emulator/current/libspectrum/Makefile.am
vendor/fuse-emulator/current/libspectrum/README
vendor/fuse-emulator/current/libspectrum/THANKS
vendor/fuse-emulator/current/libspectrum/accessor.pl
vendor/fuse-emulator/current/libspectrum/autogen.sh
vendor/fuse-emulator/current/libspectrum/configure.ac
vendor/fuse-emulator/current/libspectrum/doc/Makefile.am
vendor/fuse-emulator/current/libspectrum/generate.pl.in
vendor/fuse-emulator/current/libspectrum/hacking/Makefile.am
vendor/fuse-emulator/current/libspectrum/libspectrum.h.in
vendor/fuse-emulator/current/libspectrum/libspectrum.qpg.in
vendor/fuse-emulator/current/libspectrum/myglib/Makefile.am
vendor/fuse-emulator/current/libspectrum/snap_accessors.txt
vendor/fuse-emulator/current/libspectrum/tape_accessors.pl
vendor/fuse-emulator/current/libspectrum/tape_accessors.txt
vendor/fuse-emulator/current/libspectrum/tape_set.pl
vendor/fuse-emulator/current/libspectrum/test/Makefile.am
vendor/fuse-emulator/current/libspectrum/test/complete-tzx.pl
vendor/fuse-emulator/current/libspectrum/windres.rc
Index: vendor/fuse-emulator/current/fuse/AUTHORS
===================================================================
--- vendor/fuse-emulator/current/fuse/AUTHORS 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/AUTHORS 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/AUTHORS
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/COPYING
===================================================================
--- vendor/fuse-emulator/current/fuse/COPYING 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/COPYING 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/COPYING
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse/ChangeLog 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/ChangeLog 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/ChangeLog
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/INSTALL
===================================================================
--- vendor/fuse-emulator/current/fuse/INSTALL 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/INSTALL 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/INSTALL
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/PORTING
===================================================================
--- vendor/fuse-emulator/current/fuse/PORTING 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/PORTING 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/PORTING
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/README
===================================================================
--- vendor/fuse-emulator/current/fuse/README 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/README 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/README
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/THANKS
===================================================================
--- vendor/fuse-emulator/current/fuse/THANKS 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/THANKS 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/THANKS
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/autogen.sh
===================================================================
--- vendor/fuse-emulator/current/fuse/autogen.sh 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/autogen.sh 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/autogen.sh
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/compat/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/compat/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/compat/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/compat/amiga/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/amiga/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/compat/amiga/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/compat/amiga/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/compat/linux/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/linux/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/compat/linux/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/compat/linux/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/compat/morphos/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/morphos/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/compat/morphos/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/compat/morphos/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/compat/unix/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/unix/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/compat/unix/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/compat/unix/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/compat/wii/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/wii/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/compat/wii/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/compat/wii/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/compat/win32/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/win32/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/compat/win32/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/compat/win32/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/configure.ac
===================================================================
--- vendor/fuse-emulator/current/fuse/configure.ac 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/configure.ac 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/configure.ac
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/data/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/data/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/data/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/data/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/debugger/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/debugger/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/debugger/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/debugger/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/hacking/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/hacking/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/hacking/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/hacking/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/keysyms.dat
===================================================================
--- vendor/fuse-emulator/current/fuse/keysyms.dat 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/keysyms.dat 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/keysyms.dat
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/keysyms.pl
===================================================================
--- vendor/fuse-emulator/current/fuse/keysyms.pl 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/keysyms.pl 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/keysyms.pl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/lib/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/lib/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/lib/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/lib/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/machines/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/machines/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/machines/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/machines/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/man/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/man/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/man/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/man/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/menu_data.dat
===================================================================
--- vendor/fuse-emulator/current/fuse/menu_data.dat 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/menu_data.dat 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/menu_data.dat
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/menu_data.pl
===================================================================
--- vendor/fuse-emulator/current/fuse/menu_data.pl 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/menu_data.pl 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/menu_data.pl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/peripherals/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/peripherals/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/peripherals/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/peripherals/disk/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/disk/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/peripherals/disk/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/peripherals/disk/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/peripherals/flash/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/flash/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/peripherals/flash/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/peripherals/flash/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/peripherals/ide/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/ide/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/peripherals/ide/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/peripherals/ide/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/peripherals/nic/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/nic/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/peripherals/nic/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/peripherals/nic/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/perl/Fuse/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/perl/Fuse/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/perl/Fuse/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/perl/Fuse/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/perl/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/perl/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/perl/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/perl/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/perl/cpp-perl.pl
===================================================================
--- vendor/fuse-emulator/current/fuse/perl/cpp-perl.pl 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/perl/cpp-perl.pl 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/perl/cpp-perl.pl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/pokefinder/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/pokefinder/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/pokefinder/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/pokefinder/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/roms/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/roms/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/roms/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/roms/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/settings-header.pl
===================================================================
--- vendor/fuse-emulator/current/fuse/settings-header.pl 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/settings-header.pl 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/settings-header.pl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/settings.dat
===================================================================
--- vendor/fuse-emulator/current/fuse/settings.dat 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/settings.dat 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/settings.dat
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/settings.pl
===================================================================
--- vendor/fuse-emulator/current/fuse/settings.pl 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/settings.pl 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/settings.pl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/sound/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/sound/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/sound/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/sound/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/timer/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/timer/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/timer/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/timer/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/ui/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/ui/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/ui/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/ui/fb/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/fb/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/ui/fb/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/ui/fb/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/ui/gtk/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/gtk/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/ui/gtk/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/ui/gtk/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/ui/gtk/options-header.pl
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/gtk/options-header.pl 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/ui/gtk/options-header.pl 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/ui/gtk/options-header.pl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/ui/gtk/options.pl
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/gtk/options.pl 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/ui/gtk/options.pl 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/ui/gtk/options.pl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/ui/options.dat
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/options.dat 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/ui/options.dat 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/ui/options.dat
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/ui/scaler/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/scaler/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/ui/scaler/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/ui/scaler/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/ui/sdl/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/sdl/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/ui/sdl/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/ui/sdl/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/ui/svga/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/svga/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/ui/svga/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/ui/svga/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/ui/widget/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/widget/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/ui/widget/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/ui/widget/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/ui/widget/mkfusefont.pl
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/widget/mkfusefont.pl 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/ui/widget/mkfusefont.pl 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/ui/widget/mkfusefont.pl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/ui/widget/options-header.pl
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/widget/options-header.pl 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/ui/widget/options-header.pl 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/ui/widget/options-header.pl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/ui/widget/options.pl
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/widget/options.pl 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/ui/widget/options.pl 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/ui/widget/options.pl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/ui/wii/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/wii/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/ui/wii/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/ui/wii/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/ui/win32/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/win32/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/ui/win32/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/ui/win32/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/ui/win32/icons/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/win32/icons/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/ui/win32/icons/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/ui/win32/icons/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/ui/win32/options-header.pl
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/win32/options-header.pl 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/ui/win32/options-header.pl 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/ui/win32/options-header.pl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/ui/win32/options-resource.pl
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/win32/options-resource.pl 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/ui/win32/options-resource.pl 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/ui/win32/options-resource.pl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/ui/win32/options.pl
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/win32/options.pl 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/ui/win32/options.pl 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/ui/win32/options.pl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/ui/xlib/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/xlib/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/ui/xlib/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/ui/xlib/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/ui/xlib/xstatusbar.pl
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/xlib/xstatusbar.pl 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/ui/xlib/xstatusbar.pl 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/ui/xlib/xstatusbar.pl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/unittests/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/unittests/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/unittests/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/unittests/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/windres.rc
===================================================================
--- vendor/fuse-emulator/current/fuse/windres.rc 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/windres.rc 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/windres.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/z80/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/z80/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/z80/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/z80/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/z80/opcodes_base.dat
===================================================================
--- vendor/fuse-emulator/current/fuse/z80/opcodes_base.dat 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/z80/opcodes_base.dat 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/z80/opcodes_base.dat
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/z80/opcodes_cb.dat
===================================================================
--- vendor/fuse-emulator/current/fuse/z80/opcodes_cb.dat 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/z80/opcodes_cb.dat 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/z80/opcodes_cb.dat
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/z80/opcodes_ddfd.dat
===================================================================
--- vendor/fuse-emulator/current/fuse/z80/opcodes_ddfd.dat 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/z80/opcodes_ddfd.dat 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/z80/opcodes_ddfd.dat
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/z80/opcodes_ddfdcb.dat
===================================================================
--- vendor/fuse-emulator/current/fuse/z80/opcodes_ddfdcb.dat 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/z80/opcodes_ddfdcb.dat 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/z80/opcodes_ddfdcb.dat
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/z80/opcodes_ed.dat
===================================================================
--- vendor/fuse-emulator/current/fuse/z80/opcodes_ed.dat 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/z80/opcodes_ed.dat 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/z80/opcodes_ed.dat
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/z80/tests/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/z80/tests/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/z80/tests/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/z80/tests/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/z80/z80.pl
===================================================================
--- vendor/fuse-emulator/current/fuse/z80/z80.pl 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/z80/z80.pl 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/z80/z80.pl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/libspectrum/AUTHORS
===================================================================
--- vendor/fuse-emulator/current/libspectrum/AUTHORS 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/libspectrum/AUTHORS 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/libspectrum/AUTHORS
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/libspectrum/COPYING
===================================================================
--- vendor/fuse-emulator/current/libspectrum/COPYING 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/libspectrum/COPYING 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/libspectrum/COPYING
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/libspectrum/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/libspectrum/ChangeLog 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/libspectrum/ChangeLog 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/libspectrum/ChangeLog
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/libspectrum/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/libspectrum/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/libspectrum/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/libspectrum/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/libspectrum/README
===================================================================
--- vendor/fuse-emulator/current/libspectrum/README 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/libspectrum/README 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/libspectrum/README
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/libspectrum/THANKS
===================================================================
--- vendor/fuse-emulator/current/libspectrum/THANKS 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/libspectrum/THANKS 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/libspectrum/THANKS
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/libspectrum/accessor.pl
===================================================================
--- vendor/fuse-emulator/current/libspectrum/accessor.pl 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/libspectrum/accessor.pl 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/libspectrum/accessor.pl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/libspectrum/autogen.sh
===================================================================
--- vendor/fuse-emulator/current/libspectrum/autogen.sh 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/libspectrum/autogen.sh 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/libspectrum/autogen.sh
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/libspectrum/configure.ac
===================================================================
--- vendor/fuse-emulator/current/libspectrum/configure.ac 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/libspectrum/configure.ac 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/libspectrum/configure.ac
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/libspectrum/doc/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/libspectrum/doc/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/libspectrum/doc/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/libspectrum/doc/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/libspectrum/generate.pl.in
===================================================================
--- vendor/fuse-emulator/current/libspectrum/generate.pl.in 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/libspectrum/generate.pl.in 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/libspectrum/generate.pl.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/libspectrum/hacking/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/libspectrum/hacking/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/libspectrum/hacking/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/libspectrum/hacking/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/libspectrum/libspectrum.h.in
===================================================================
--- vendor/fuse-emulator/current/libspectrum/libspectrum.h.in 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/libspectrum/libspectrum.h.in 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/libspectrum/libspectrum.h.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/libspectrum/libspectrum.qpg.in
===================================================================
--- vendor/fuse-emulator/current/libspectrum/libspectrum.qpg.in 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/libspectrum/libspectrum.qpg.in 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/libspectrum/libspectrum.qpg.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/libspectrum/myglib/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/libspectrum/myglib/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/libspectrum/myglib/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/libspectrum/myglib/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/libspectrum/snap_accessors.txt
===================================================================
--- vendor/fuse-emulator/current/libspectrum/snap_accessors.txt 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/libspectrum/snap_accessors.txt 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/libspectrum/snap_accessors.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/libspectrum/tape_accessors.pl
===================================================================
--- vendor/fuse-emulator/current/libspectrum/tape_accessors.pl 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/libspectrum/tape_accessors.pl 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/libspectrum/tape_accessors.pl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/libspectrum/tape_accessors.txt
===================================================================
--- vendor/fuse-emulator/current/libspectrum/tape_accessors.txt 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/libspectrum/tape_accessors.txt 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/libspectrum/tape_accessors.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/libspectrum/tape_set.pl
===================================================================
--- vendor/fuse-emulator/current/libspectrum/tape_set.pl 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/libspectrum/tape_set.pl 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/libspectrum/tape_set.pl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/libspectrum/test/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/libspectrum/test/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/libspectrum/test/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/libspectrum/test/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/libspectrum/test/complete-tzx.pl
===================================================================
--- vendor/fuse-emulator/current/libspectrum/test/complete-tzx.pl 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/libspectrum/test/complete-tzx.pl 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/libspectrum/test/complete-tzx.pl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/libspectrum/windres.rc
===================================================================
--- vendor/fuse-emulator/current/libspectrum/windres.rc 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/libspectrum/windres.rc 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/libspectrum/windres.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2016-05-24 14:23:58
|
Revision: 798
http://sourceforge.net/p/fuse-for-macosx/code/798
Author: fredm
Date: 2016-05-24 14:23:56 +0000 (Tue, 24 May 2016)
Log Message:
-----------
Set more vendor svn:eol-style and svn:keywords properties to match vendor
source.
Property Changed:
----------------
vendor/fuse-emulator/current/fuse/m4/ax_pthread.m4
vendor/fuse-emulator/current/fuse/m4/glib-2.0.m4
vendor/fuse-emulator/current/fuse/m4/gtk-2.0.m4
vendor/fuse-emulator/current/fuse/m4/libxml.m4
vendor/fuse-emulator/current/fuse/m4/pkg.m4
vendor/fuse-emulator/current/fuse/m4/sdl.m4
vendor/fuse-emulator/current/fuse-utils/m4/audiofile.m4
vendor/fuse-emulator/current/fuse-utils/m4/glib-1.0.m4
vendor/fuse-emulator/current/fuse-utils/m4/glib-2.0.m4
vendor/fuse-emulator/current/fuse-utils/m4/iconv.m4
vendor/fuse-emulator/current/libspectrum/m4/audiofile.m4
Index: vendor/fuse-emulator/current/fuse/m4/ax_pthread.m4
===================================================================
--- vendor/fuse-emulator/current/fuse/m4/ax_pthread.m4 2016-05-24 14:22:14 UTC (rev 797)
+++ vendor/fuse-emulator/current/fuse/m4/ax_pthread.m4 2016-05-24 14:23:56 UTC (rev 798)
Property changes on: vendor/fuse-emulator/current/fuse/m4/ax_pthread.m4
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/m4/glib-2.0.m4
===================================================================
--- vendor/fuse-emulator/current/fuse/m4/glib-2.0.m4 2016-05-24 14:22:14 UTC (rev 797)
+++ vendor/fuse-emulator/current/fuse/m4/glib-2.0.m4 2016-05-24 14:23:56 UTC (rev 798)
Property changes on: vendor/fuse-emulator/current/fuse/m4/glib-2.0.m4
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/m4/gtk-2.0.m4
===================================================================
--- vendor/fuse-emulator/current/fuse/m4/gtk-2.0.m4 2016-05-24 14:22:14 UTC (rev 797)
+++ vendor/fuse-emulator/current/fuse/m4/gtk-2.0.m4 2016-05-24 14:23:56 UTC (rev 798)
Property changes on: vendor/fuse-emulator/current/fuse/m4/gtk-2.0.m4
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/m4/libxml.m4
===================================================================
--- vendor/fuse-emulator/current/fuse/m4/libxml.m4 2016-05-24 14:22:14 UTC (rev 797)
+++ vendor/fuse-emulator/current/fuse/m4/libxml.m4 2016-05-24 14:23:56 UTC (rev 798)
Property changes on: vendor/fuse-emulator/current/fuse/m4/libxml.m4
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/m4/pkg.m4
===================================================================
--- vendor/fuse-emulator/current/fuse/m4/pkg.m4 2016-05-24 14:22:14 UTC (rev 797)
+++ vendor/fuse-emulator/current/fuse/m4/pkg.m4 2016-05-24 14:23:56 UTC (rev 798)
Property changes on: vendor/fuse-emulator/current/fuse/m4/pkg.m4
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/m4/sdl.m4
===================================================================
--- vendor/fuse-emulator/current/fuse/m4/sdl.m4 2016-05-24 14:22:14 UTC (rev 797)
+++ vendor/fuse-emulator/current/fuse/m4/sdl.m4 2016-05-24 14:23:56 UTC (rev 798)
Property changes on: vendor/fuse-emulator/current/fuse/m4/sdl.m4
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse-utils/m4/audiofile.m4
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/m4/audiofile.m4 2016-05-24 14:22:14 UTC (rev 797)
+++ vendor/fuse-emulator/current/fuse-utils/m4/audiofile.m4 2016-05-24 14:23:56 UTC (rev 798)
Property changes on: vendor/fuse-emulator/current/fuse-utils/m4/audiofile.m4
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse-utils/m4/glib-1.0.m4
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/m4/glib-1.0.m4 2016-05-24 14:22:14 UTC (rev 797)
+++ vendor/fuse-emulator/current/fuse-utils/m4/glib-1.0.m4 2016-05-24 14:23:56 UTC (rev 798)
Property changes on: vendor/fuse-emulator/current/fuse-utils/m4/glib-1.0.m4
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse-utils/m4/glib-2.0.m4
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/m4/glib-2.0.m4 2016-05-24 14:22:14 UTC (rev 797)
+++ vendor/fuse-emulator/current/fuse-utils/m4/glib-2.0.m4 2016-05-24 14:23:56 UTC (rev 798)
Property changes on: vendor/fuse-emulator/current/fuse-utils/m4/glib-2.0.m4
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse-utils/m4/iconv.m4
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/m4/iconv.m4 2016-05-24 14:22:14 UTC (rev 797)
+++ vendor/fuse-emulator/current/fuse-utils/m4/iconv.m4 2016-05-24 14:23:56 UTC (rev 798)
Property changes on: vendor/fuse-emulator/current/fuse-utils/m4/iconv.m4
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/libspectrum/m4/audiofile.m4
===================================================================
--- vendor/fuse-emulator/current/libspectrum/m4/audiofile.m4 2016-05-24 14:22:14 UTC (rev 797)
+++ vendor/fuse-emulator/current/libspectrum/m4/audiofile.m4 2016-05-24 14:23:56 UTC (rev 798)
Property changes on: vendor/fuse-emulator/current/libspectrum/m4/audiofile.m4
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2016-05-24 14:25:29
|
Revision: 799
http://sourceforge.net/p/fuse-for-macosx/code/799
Author: fredm
Date: 2016-05-24 14:25:27 +0000 (Tue, 24 May 2016)
Log Message:
-----------
Set more vendor svn:eol-style and svn:keywords properties to match vendor
source.
Property Changed:
----------------
vendor/fuse-emulator/current/fuse/man/fuse.1
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/gdos-tools/man/gdos-tools.1
Index: vendor/fuse-emulator/current/fuse/man/fuse.1
===================================================================
--- vendor/fuse-emulator/current/fuse/man/fuse.1 2016-05-24 14:23:56 UTC (rev 798)
+++ vendor/fuse-emulator/current/fuse/man/fuse.1 2016-05-24 14:25:27 UTC (rev 799)
Property changes on: vendor/fuse-emulator/current/fuse/man/fuse.1
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse-utils/man/audio2tape.1
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/man/audio2tape.1 2016-05-24 14:23:56 UTC (rev 798)
+++ vendor/fuse-emulator/current/fuse-utils/man/audio2tape.1 2016-05-24 14:25:27 UTC (rev 799)
Property changes on: vendor/fuse-emulator/current/fuse-utils/man/audio2tape.1
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse-utils/man/createhdf.1
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/man/createhdf.1 2016-05-24 14:23:56 UTC (rev 798)
+++ vendor/fuse-emulator/current/fuse-utils/man/createhdf.1 2016-05-24 14:25:27 UTC (rev 799)
Property changes on: vendor/fuse-emulator/current/fuse-utils/man/createhdf.1
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse-utils/man/fmfconv.1
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/man/fmfconv.1 2016-05-24 14:23:56 UTC (rev 798)
+++ vendor/fuse-emulator/current/fuse-utils/man/fmfconv.1 2016-05-24 14:25:27 UTC (rev 799)
Property changes on: vendor/fuse-emulator/current/fuse-utils/man/fmfconv.1
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse-utils/man/fuse-utils.1
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/man/fuse-utils.1 2016-05-24 14:23:56 UTC (rev 798)
+++ vendor/fuse-emulator/current/fuse-utils/man/fuse-utils.1 2016-05-24 14:25:27 UTC (rev 799)
Property changes on: vendor/fuse-emulator/current/fuse-utils/man/fuse-utils.1
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse-utils/man/listbasic.1
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/man/listbasic.1 2016-05-24 14:23:56 UTC (rev 798)
+++ vendor/fuse-emulator/current/fuse-utils/man/listbasic.1 2016-05-24 14:25:27 UTC (rev 799)
Property changes on: vendor/fuse-emulator/current/fuse-utils/man/listbasic.1
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse-utils/man/profile2map.1
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/man/profile2map.1 2016-05-24 14:23:56 UTC (rev 798)
+++ vendor/fuse-emulator/current/fuse-utils/man/profile2map.1 2016-05-24 14:25:27 UTC (rev 799)
Property changes on: vendor/fuse-emulator/current/fuse-utils/man/profile2map.1
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse-utils/man/raw2hdf.1
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/man/raw2hdf.1 2016-05-24 14:23:56 UTC (rev 798)
+++ vendor/fuse-emulator/current/fuse-utils/man/raw2hdf.1 2016-05-24 14:25:27 UTC (rev 799)
Property changes on: vendor/fuse-emulator/current/fuse-utils/man/raw2hdf.1
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse-utils/man/rzxcheck.1
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/man/rzxcheck.1 2016-05-24 14:23:56 UTC (rev 798)
+++ vendor/fuse-emulator/current/fuse-utils/man/rzxcheck.1 2016-05-24 14:25:27 UTC (rev 799)
Property changes on: vendor/fuse-emulator/current/fuse-utils/man/rzxcheck.1
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse-utils/man/rzxdump.1
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/man/rzxdump.1 2016-05-24 14:23:56 UTC (rev 798)
+++ vendor/fuse-emulator/current/fuse-utils/man/rzxdump.1 2016-05-24 14:25:27 UTC (rev 799)
Property changes on: vendor/fuse-emulator/current/fuse-utils/man/rzxdump.1
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse-utils/man/rzxtool.1
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/man/rzxtool.1 2016-05-24 14:23:56 UTC (rev 798)
+++ vendor/fuse-emulator/current/fuse-utils/man/rzxtool.1 2016-05-24 14:25:27 UTC (rev 799)
Property changes on: vendor/fuse-emulator/current/fuse-utils/man/rzxtool.1
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse-utils/man/scl2trd.1
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/man/scl2trd.1 2016-05-24 14:23:56 UTC (rev 798)
+++ vendor/fuse-emulator/current/fuse-utils/man/scl2trd.1 2016-05-24 14:25:27 UTC (rev 799)
Property changes on: vendor/fuse-emulator/current/fuse-utils/man/scl2trd.1
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse-utils/man/snap2tzx.1
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/man/snap2tzx.1 2016-05-24 14:23:56 UTC (rev 798)
+++ vendor/fuse-emulator/current/fuse-utils/man/snap2tzx.1 2016-05-24 14:25:27 UTC (rev 799)
Property changes on: vendor/fuse-emulator/current/fuse-utils/man/snap2tzx.1
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse-utils/man/snapconv.1
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/man/snapconv.1 2016-05-24 14:23:56 UTC (rev 798)
+++ vendor/fuse-emulator/current/fuse-utils/man/snapconv.1 2016-05-24 14:25:27 UTC (rev 799)
Property changes on: vendor/fuse-emulator/current/fuse-utils/man/snapconv.1
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse-utils/man/tape2wav.1
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/man/tape2wav.1 2016-05-24 14:23:56 UTC (rev 798)
+++ vendor/fuse-emulator/current/fuse-utils/man/tape2wav.1 2016-05-24 14:25:27 UTC (rev 799)
Property changes on: vendor/fuse-emulator/current/fuse-utils/man/tape2wav.1
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse-utils/man/tapeconv.1
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/man/tapeconv.1 2016-05-24 14:23:56 UTC (rev 798)
+++ vendor/fuse-emulator/current/fuse-utils/man/tapeconv.1 2016-05-24 14:25:27 UTC (rev 799)
Property changes on: vendor/fuse-emulator/current/fuse-utils/man/tapeconv.1
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse-utils/man/tzxlist.1
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/man/tzxlist.1 2016-05-24 14:23:56 UTC (rev 798)
+++ vendor/fuse-emulator/current/fuse-utils/man/tzxlist.1 2016-05-24 14:25:27 UTC (rev 799)
Property changes on: vendor/fuse-emulator/current/fuse-utils/man/tzxlist.1
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/gdos-tools/man/gdos-tools.1
===================================================================
--- vendor/fuse-emulator/current/gdos-tools/man/gdos-tools.1 2016-05-24 14:23:56 UTC (rev 798)
+++ vendor/fuse-emulator/current/gdos-tools/man/gdos-tools.1 2016-05-24 14:25:27 UTC (rev 799)
Property changes on: vendor/fuse-emulator/current/gdos-tools/man/gdos-tools.1
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2016-05-24 14:56:53
|
Revision: 801
http://sourceforge.net/p/fuse-for-macosx/code/801
Author: fredm
Date: 2016-05-24 14:56:49 +0000 (Tue, 24 May 2016)
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/INSTALL
vendor/fuse-emulator/current/fuse/Makefile.am
vendor/fuse-emulator/current/fuse/README
vendor/fuse-emulator/current/fuse/THANKS
vendor/fuse-emulator/current/fuse/autogen.sh
vendor/fuse-emulator/current/fuse/bitmap.h
vendor/fuse-emulator/current/fuse/compat/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/win32/osname.c
vendor/fuse-emulator/current/fuse/compat/win32/socket.c
vendor/fuse-emulator/current/fuse/compat.h
vendor/fuse-emulator/current/fuse/configure.ac
vendor/fuse-emulator/current/fuse/data/Makefile.am
vendor/fuse-emulator/current/fuse/data/fuse.desktop.in
vendor/fuse-emulator/current/fuse/data/fuse.xml.in
vendor/fuse-emulator/current/fuse/data/win32/installer.nsi.in
vendor/fuse-emulator/current/fuse/debugger/Makefile.am
vendor/fuse-emulator/current/fuse/debugger/breakpoint.c
vendor/fuse-emulator/current/fuse/debugger/breakpoint.h
vendor/fuse-emulator/current/fuse/debugger/command.c
vendor/fuse-emulator/current/fuse/debugger/commandl.l
vendor/fuse-emulator/current/fuse/debugger/commandy.y
vendor/fuse-emulator/current/fuse/debugger/debugger.h
vendor/fuse-emulator/current/fuse/debugger/debugger_internals.h
vendor/fuse-emulator/current/fuse/debugger/disassemble.c
vendor/fuse-emulator/current/fuse/debugger/event.c
vendor/fuse-emulator/current/fuse/debugger/expression.c
vendor/fuse-emulator/current/fuse/debugger/variable.c
vendor/fuse-emulator/current/fuse/display.c
vendor/fuse-emulator/current/fuse/event.c
vendor/fuse-emulator/current/fuse/fuse.c
vendor/fuse-emulator/current/fuse/fuse.h
vendor/fuse-emulator/current/fuse/hacking/ChangeLog
vendor/fuse-emulator/current/fuse/hacking/Makefile.am
vendor/fuse-emulator/current/fuse/hacking/peripheral_tests.txt
vendor/fuse-emulator/current/fuse/keyboard.c
vendor/fuse-emulator/current/fuse/keysyms.pl
vendor/fuse-emulator/current/fuse/lib/Makefile.am
vendor/fuse-emulator/current/fuse/m4/ax_pthread.m4
vendor/fuse-emulator/current/fuse/m4/pkg.m4
vendor/fuse-emulator/current/fuse/machine.c
vendor/fuse-emulator/current/fuse/machines/Makefile.am
vendor/fuse-emulator/current/fuse/machines/machines_periph.c
vendor/fuse-emulator/current/fuse/machines/pentagon.c
vendor/fuse-emulator/current/fuse/machines/pentagon.h
vendor/fuse-emulator/current/fuse/machines/spec16.c
vendor/fuse-emulator/current/fuse/machines/spec_se.c
vendor/fuse-emulator/current/fuse/machines/specplus3.c
vendor/fuse-emulator/current/fuse/machines/specplus3.h
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/Makefile.am
vendor/fuse-emulator/current/fuse/man/fuse.1
vendor/fuse-emulator/current/fuse/memory.c
vendor/fuse-emulator/current/fuse/memory.h
vendor/fuse-emulator/current/fuse/mempool.c
vendor/fuse-emulator/current/fuse/mempool.h
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/menu_data.pl
vendor/fuse-emulator/current/fuse/movie.c
vendor/fuse-emulator/current/fuse/periph.c
vendor/fuse-emulator/current/fuse/periph.h
vendor/fuse-emulator/current/fuse/peripherals/Makefile.am
vendor/fuse-emulator/current/fuse/peripherals/ay.c
vendor/fuse-emulator/current/fuse/peripherals/ay.h
vendor/fuse-emulator/current/fuse/peripherals/dck.c
vendor/fuse-emulator/current/fuse/peripherals/disk/beta.c
vendor/fuse-emulator/current/fuse/peripherals/disk/beta.h
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.c
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/opus.h
vendor/fuse-emulator/current/fuse/peripherals/disk/plusd.c
vendor/fuse-emulator/current/fuse/peripherals/disk/plusd.h
vendor/fuse-emulator/current/fuse/peripherals/disk/upd_fdc.c
vendor/fuse-emulator/current/fuse/peripherals/disk/upd_fdc.h
vendor/fuse-emulator/current/fuse/peripherals/disk/wd_fdc.c
vendor/fuse-emulator/current/fuse/peripherals/disk/wd_fdc.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/ide.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/joystick.c
vendor/fuse-emulator/current/fuse/peripherals/joystick.h
vendor/fuse-emulator/current/fuse/peripherals/kempmouse.c
vendor/fuse-emulator/current/fuse/peripherals/melodik.c
vendor/fuse-emulator/current/fuse/peripherals/nic/enc28j60.c
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/scld.h
vendor/fuse-emulator/current/fuse/peripherals/speccyboot.c
vendor/fuse-emulator/current/fuse/peripherals/speccyboot.h
vendor/fuse-emulator/current/fuse/peripherals/specdrum.c
vendor/fuse-emulator/current/fuse/peripherals/specdrum.h
vendor/fuse-emulator/current/fuse/peripherals/spectranet.c
vendor/fuse-emulator/current/fuse/peripherals/spectranet.h
vendor/fuse-emulator/current/fuse/peripherals/ula.c
vendor/fuse-emulator/current/fuse/perl/Fuse/Dialog.pm
vendor/fuse-emulator/current/fuse/perl/Makefile.am
vendor/fuse-emulator/current/fuse/pokefinder/Makefile.am
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/se-0.rom
vendor/fuse-emulator/current/fuse/roms/se-1.rom
vendor/fuse-emulator/current/fuse/rzx.c
vendor/fuse-emulator/current/fuse/rzx.h
vendor/fuse-emulator/current/fuse/screenshot.c
vendor/fuse-emulator/current/fuse/settings-header.pl
vendor/fuse-emulator/current/fuse/settings.dat
vendor/fuse-emulator/current/fuse/settings.pl
vendor/fuse-emulator/current/fuse/slt.c
vendor/fuse-emulator/current/fuse/sound/Makefile.am
vendor/fuse-emulator/current/fuse/sound/aosound.c
vendor/fuse-emulator/current/fuse/sound/blipbuffer.h
vendor/fuse-emulator/current/fuse/sound/sdlsound.c
vendor/fuse-emulator/current/fuse/sound/win32sound.c
vendor/fuse-emulator/current/fuse/sound.c
vendor/fuse-emulator/current/fuse/sound.h
vendor/fuse-emulator/current/fuse/spectrum.c
vendor/fuse-emulator/current/fuse/tape.c
vendor/fuse-emulator/current/fuse/tape.h
vendor/fuse-emulator/current/fuse/timer/Makefile.am
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/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/gtkcompat.c
vendor/fuse-emulator/current/fuse/ui/gtk/gtkcompat.h
vendor/fuse-emulator/current/fuse/ui/gtk/gtkdisplay.c
vendor/fuse-emulator/current/fuse/ui/gtk/gtkinternals.h
vendor/fuse-emulator/current/fuse/ui/gtk/gtkjoystick.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.pl
vendor/fuse-emulator/current/fuse/ui/gtk/pokefinder.c
vendor/fuse-emulator/current/fuse/ui/gtk/pokemem.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/gtk/stock.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/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/ui.h
vendor/fuse-emulator/current/fuse/ui/uijoystick.c
vendor/fuse-emulator/current/fuse/ui/uijoystick.h
vendor/fuse-emulator/current/fuse/ui/widget/Makefile.am
vendor/fuse-emulator/current/fuse/ui/widget/debugger.c
vendor/fuse-emulator/current/fuse/ui/widget/error.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/mkfusefont.pl
vendor/fuse-emulator/current/fuse/ui/widget/options.pl
vendor/fuse-emulator/current/fuse/ui/widget/pokefinder.c
vendor/fuse-emulator/current/fuse/ui/widget/pokemem.c
vendor/fuse-emulator/current/fuse/ui/widget/query.c
vendor/fuse-emulator/current/fuse/ui/widget/roms.c
vendor/fuse-emulator/current/fuse/ui/widget/select.c
vendor/fuse-emulator/current/fuse/ui/widget/text.c
vendor/fuse-emulator/current/fuse/ui/widget/widget.c
vendor/fuse-emulator/current/fuse/ui/widget/widget.h
vendor/fuse-emulator/current/fuse/ui/widget/widget_internals.h
vendor/fuse-emulator/current/fuse/ui/wii/Makefile.am
vendor/fuse-emulator/current/fuse/ui/win32/Makefile.am
vendor/fuse-emulator/current/fuse/ui/win32/browse.c
vendor/fuse-emulator/current/fuse/ui/win32/debugger.c
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/fileselector.c
vendor/fuse-emulator/current/fuse/ui/win32/options-resource.pl
vendor/fuse-emulator/current/fuse/ui/win32/options.pl
vendor/fuse-emulator/current/fuse/ui/win32/pokefinder.c
vendor/fuse-emulator/current/fuse/ui/win32/pokemem.c
vendor/fuse-emulator/current/fuse/ui/win32/rollback.c
vendor/fuse-emulator/current/fuse/ui/win32/roms.c
vendor/fuse-emulator/current/fuse/ui/win32/win32joystick.c
vendor/fuse-emulator/current/fuse/ui/win32/win32joystick.h
vendor/fuse-emulator/current/fuse/ui/win32/win32joystick.rc
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/xstatusbar.pl
vendor/fuse-emulator/current/fuse/ui/xlib/xui.c
vendor/fuse-emulator/current/fuse/ui.c
vendor/fuse-emulator/current/fuse/unittests/Makefile.am
vendor/fuse-emulator/current/fuse/unittests/unittests.c
vendor/fuse-emulator/current/fuse/unittests/unittests.h
vendor/fuse-emulator/current/fuse/utils.c
vendor/fuse-emulator/current/fuse/windres.rc
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.h
vendor/fuse-emulator/current/fuse/z80/z80.pl
vendor/fuse-emulator/current/fuse/z80/z80_checks.h
vendor/fuse-emulator/current/fuse/z80/z80_macros.h
vendor/fuse-emulator/current/fuse/z80/z80_ops.c
vendor/fuse-emulator/current/libspectrum/ChangeLog
vendor/fuse-emulator/current/libspectrum/Makefile.am
vendor/fuse-emulator/current/libspectrum/README
vendor/fuse-emulator/current/libspectrum/accessor.pl
vendor/fuse-emulator/current/libspectrum/autogen.sh
vendor/fuse-emulator/current/libspectrum/bzip2.c
vendor/fuse-emulator/current/libspectrum/configure.ac
vendor/fuse-emulator/current/libspectrum/creator.c
vendor/fuse-emulator/current/libspectrum/crypto.c
vendor/fuse-emulator/current/libspectrum/csw.c
vendor/fuse-emulator/current/libspectrum/dck.c
vendor/fuse-emulator/current/libspectrum/doc/libspectrum.3
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/ide.c
vendor/fuse-emulator/current/libspectrum/internals.h
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/memory.c
vendor/fuse-emulator/current/libspectrum/microdrive.c
vendor/fuse-emulator/current/libspectrum/plusd.c
vendor/fuse-emulator/current/libspectrum/pzx_read.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/sp.c
vendor/fuse-emulator/current/libspectrum/szx.c
vendor/fuse-emulator/current/libspectrum/tap.c
vendor/fuse-emulator/current/libspectrum/tape.c
vendor/fuse-emulator/current/libspectrum/tape_block.c
vendor/fuse-emulator/current/libspectrum/test/Makefile.am
vendor/fuse-emulator/current/libspectrum/test/test.c
vendor/fuse-emulator/current/libspectrum/timings.c
vendor/fuse-emulator/current/libspectrum/tzx_read.c
vendor/fuse-emulator/current/libspectrum/tzx_write.c
vendor/fuse-emulator/current/libspectrum/warajevo_read.c
vendor/fuse-emulator/current/libspectrum/wav.c
vendor/fuse-emulator/current/libspectrum/z80.c
vendor/fuse-emulator/current/libspectrum/z80em.c
vendor/fuse-emulator/current/libspectrum/zlib.c
vendor/fuse-emulator/current/libspectrum/zxs.c
Added Paths:
-----------
vendor/fuse-emulator/current/fuse/data/shell-completion/
vendor/fuse-emulator/current/fuse/data/shell-completion/bash/
vendor/fuse-emulator/current/fuse/data/shell-completion/bash/fuse
vendor/fuse-emulator/current/fuse/data/shell-completion/diff_options.sh
vendor/fuse-emulator/current/fuse/data/win32/distribution.mk
vendor/fuse-emulator/current/fuse/hacking/code_beautifiers.txt
vendor/fuse-emulator/current/fuse/hacking/uncrustify.cfg
vendor/fuse-emulator/current/fuse/lib/tests/success.d80.bz2
vendor/fuse-emulator/current/fuse/m4/ax_create_stdint_h.m4
vendor/fuse-emulator/current/fuse/peripherals/disk/didaktik.c
vendor/fuse-emulator/current/fuse/peripherals/disk/didaktik.h
vendor/fuse-emulator/current/fuse/peripherals/usource.c
vendor/fuse-emulator/current/fuse/peripherals/usource.h
vendor/fuse-emulator/current/fuse/svg.c
vendor/fuse-emulator/current/fuse/svg.h
vendor/fuse-emulator/current/fuse/ui/uimedia.h
vendor/fuse-emulator/current/fuse/uimedia.c
vendor/fuse-emulator/current/libspectrum/m4/ax_create_stdint_h.m4
vendor/fuse-emulator/current/libspectrum/m4/pkg.m4
Removed Paths:
-------------
vendor/fuse-emulator/current/fuse/compat/amiga/Makefile.am
vendor/fuse-emulator/current/fuse/compat/linux/Makefile.am
vendor/fuse-emulator/current/fuse/compat/morphos/Makefile.am
vendor/fuse-emulator/current/fuse/compat/unix/Makefile.am
vendor/fuse-emulator/current/fuse/compat/wii/Makefile.am
vendor/fuse-emulator/current/fuse/compat/win32/Makefile.am
vendor/fuse-emulator/current/fuse/peripherals/disk/Makefile.am
vendor/fuse-emulator/current/fuse/peripherals/flash/Makefile.am
vendor/fuse-emulator/current/fuse/peripherals/ide/Makefile.am
vendor/fuse-emulator/current/fuse/peripherals/nic/Makefile.am
vendor/fuse-emulator/current/fuse/perl/Fuse/Makefile.am
vendor/fuse-emulator/current/fuse/ui/win32/icons/Makefile.am
vendor/fuse-emulator/current/fuse/ui/win32/installer/
vendor/fuse-emulator/current/fuse/z80/tests/Makefile.am
Modified: vendor/fuse-emulator/current/fuse/AUTHORS
===================================================================
--- vendor/fuse-emulator/current/fuse/AUTHORS 2016-05-24 14:32:41 UTC (rev 800)
+++ vendor/fuse-emulator/current/fuse/AUTHORS 2016-05-24 14:56:49 UTC (rev 801)
@@ -11,7 +11,7 @@
* John Elliott: for lib765, which provided Fuse's original emulation of the
+3's FDC, and libdsk which provided support for more disk image formats:
- see http://www.seasip.demon.co.uk/Unix/LibDsk/
+ see http://www.seasip.info/Unix/LibDsk/index.html
* Darren Salt: the original versions of the code for +3 emulation,
SLT support, MITSHM support (for the Xlib UI), TZX raw data blocks,
@@ -41,8 +41,8 @@
* Garry Lancaster: the simple 8-bit IDE, ZXATASP and ZXCF support.
-* Gergely Szasz: +3, +D, Opus and Interface 1/Microdrive emulation, the 'movie'
- code and the ao sound driver.
+* Gergely Szasz: +3, +D, Opus, Didaktik 80 and Interface 1/Microdrive emulation,
+ the 'movie' code and the ALSO and ao sound drivers.
* Bjoern Giesler: the original Wii port.
@@ -54,4 +54,4 @@
* Philip Kendall: everything else.
-$Id: AUTHORS 4972 2013-05-19 16:46:43Z zubzero $
+$Id: AUTHORS 5357 2016-02-23 23:43:54Z sbaldovi $
Modified: vendor/fuse-emulator/current/fuse/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse/ChangeLog 2016-05-24 14:32:41 UTC (rev 800)
+++ vendor/fuse-emulator/current/fuse/ChangeLog 2016-05-24 14:56:49 UTC (rev 801)
@@ -1,3 +1,172 @@
+2016-??-?? Philip Kendall <phi...@sh...>
+
+ * Fuse 1.2.0 released.
+
+ * New features:
+ * Add Currah µSource emulation (Stuart Brady).
+ * Add Didaktik 80/40 emulation (Gergely Szasz).
+ * Capture BASIC video functions to SVG file (Stefano Bodrato).
+ * Support bash completion (Sergio Baldoví).
+
+ * Emulation core improvements:
+ * Allow continuing RZX recordings if there is a final snapshot in the
+ RZX (Sergio Baldoví).
+ * Fix the prune function on RZX rollback (Sergio Baldoví).
+ * Fix loading of EDSK files with Sector Offset block (Sergio Baldoví).
+ * Fix speech in Cobra's Arc - Medium Case.tzx when loaded with tape
+ traps enabled (thanks, zx81 and Sergio Baldoví) (Fredrick Meunier).
+ * Migrate disk "index event" handling to the FDD layer and have the
+ FDC layer use it for their STATUS registers (Gergely Szasz).
+ * Set AF, AF' and SP to 0xffff on reset (Stuart Brady).
+ * Leave most registers unchanged on a soft reset (Stuart Brady).
+ * Emulate interrupt and NMI timings more precisely (Stuart Brady).
+ * Emulate NMOS and CMOS Z80 variants (Stuart Brady).
+ * Switch to 2KB page size (Stuart Brady).
+ * Implement WD2797 emulation (Gergely Szasz).
+ * Skip tape traps if VERIFY is requested (UB880D).
+ * Fix inaccurate output when AY envelopes are used (Matthew Westcott
+ and Fredrick Meunier)
+ * Fix some peripherals activation when loading snapshots (Sergio
+ Baldoví).
+ * Fix loading sound with some custom loaders (Fredrick Meunier).
+ * Centralise the "Disk icon" update code to the FDD layer (Gergely
+ Szasz).
+ * Check if data blocks are headers for handling PZX files (Fredrick
+ Meunier).
+ * Correct display of pulses in PZX pulse block for tape browser
+ (Fredrick Meunier).
+ * Fix disk image corruption after saving UDI files (Sergio Baldoví).
+ * Check ready status after loading a disk into floppy disk drive
+ (thanks, John Elliott) (Sergio Baldoví).
+ * Fix overlapped SEEK commands (Sergio Baldoví).
+ * Fix length of data returned by READ_DIAG (thanks, Fredrick Meunier)
+ (Sergio Baldoví).
+
+ * Machine specific improvements:
+ * The Timex SCLD is contended in all of the home, Dock and Exrom banks
+ in the 0x4000 - 0x7FFF range (thanks, rga24 from WoS) (Fredrick
+ Meunier).
+ * Clear all Opus RAM on hard reset (Stuart Brady).
+ * Ensure the ZX Printer does not require a hard reset to enable
+ (thanks, RMartins) (Fredrick Meunier).
+ * Fix timing of events when emulating Scorpion (Stuart Brady).
+ * Ensure we have successfully selected a Pentagon or a Timex machine
+ before inserting their media (Fredrick Meunier).
+ * Fix Beta 128 type II commands (thanks, windale and BogDan Vatra)
+ (Sergio Baldoví).
+ * Don't enable the Beta 128 interface when loading a snapshot on a
+ machine with Beta built-in (thanks, windale and BogDan Vatra)
+ (Fredrick Meunier).
+ * Lock port +3 1FFDh if paging is disabled (Brian Ruthven and Fredrick
+ Meunier).
+ * Spectranet: fix segfault in error handling when setting SO_REUSEADDR
+ (Stuart Brady).
+ * Prefer Scorpion to Pentagon when loading SCL/TRD disks for better
+ timing compatibility (part of feature request #90) (thanks, windale)
+ (Sergio Baldoví).
+ * Update SE ROMs to v4.07 (thanks, Andrew Owen) (Sergio Baldoví).
+
+ * Debugger improvements:
+ * Fix disassembly of LD (HL), LD (IX) and LD (IY) (BogDan Vatra).
+ * Add I and R register setting and getting to the debugger (Sergio
+ Baldoví).
+ * Show the status of the halted flag in the debugger (Stuart Brady).
+ * Fix time breakpoints later than a frame in the future (Sergio
+ Baldoví).
+ * Timex EXROM and Dock text was truncated in the debugger UI (thanks,
+ Andrew Owen and Sergio Baldoví) (Fredrick Meunier).
+ * Don't trap on breakpoints whilst halted (Stuart Brady).
+ * Win32: relocate halted flag and set monospaced font (Sergio
+ Baldoví).
+ * Fix memory issues when removing a matched breakpoint (Tom Seddon).
+ * Signal the UI when the breakpoints list is changed (BogDan Vatra).
+ * Document IF token for conditional expressions in debugger section
+ (thanks, TK90XFan) (Sergio Baldoví).
+ * Fix documentation of address syntax used in debugger section
+ (Sergio Baldoví).
+ * Allow debugger to dereference memory locations (Philip Kendall).
+
+ * Miscellaneous improvements:
+ * Remove warnings in aosound (Rene Ladan).
+ * Fix save tape traps with SE ROM (Andrew Owen and Fredrick Meunier).
+ * Don't ignore the return code from setuid() (Sergio Baldoví).
+ * Fix condition used in --with-desktop-dir option (thanks, wiz)
+ (Sergio Baldoví).
+ * Fix uninitialised keyboard button settings in GTK UI (UB880D).
+ * Fix pause when minimising Fuse on Windows (Sergio Baldoví).
+ * Generic FDD UI handling cleanup (Alex Badea).
+ * Remove unused macros on disk peripherals (Sergio Baldoví).
+ * Fix bad prototypes for activate signal on GTK UI (Sergio Baldoví).
+ * Ensure exiting on GTK UI when there are active breakpoints (Sergio
+ Baldoví).
+ * Improve scrolling of disassembly list on Win32 UI (Sergio Baldoví).
+ * Make mousewheel scrolling on memory browser GTK+ 3.4 compatible and
+ keep the selected row (Sergio Baldoví).
+ * Ignore unused-but-set-variable warnings for option dialogs on Win32
+ UI (Sergio Baldoví).
+ * Link to autoload snapshot for NTSC Spectrum (Sergio Baldoví).
+ * Fix desktop integration rules to cope with VPATH builds (Sergio
+ Baldoví).
+ * Modernise autoconf support (Sergio Baldoví Baldoví).
+ * Use unzipped tapes for peripheral tests (thanks, Phil Reynolds)
+ (Sergio Baldoví).
+ * Fix empty list in pokefinder on GTK+ 3 (Sergio Baldoví).
+ * Prefer GTK+ 3 to GTK+ 2 (Sergio Baldoví).
+ * Abort start if we can't drop root privileges (Fredrick Meunier).
+ * Use real GLib if and only if libspectrum does and make GTK+ UI
+ depend on real GLib (Stuart Brady).
+ * Split tape/Microdrive options into a new Media Options dialogue
+ (Stuart Brady).
+ * Fix memory leak in joystick UI (Sergio Baldoví).
+ * Don't show an error when rewinding an empty tape (Sergio Baldoví).
+ * GTK UI: clear out row mark in tape browser when selecting another
+ block (Sergio Baldoví).
+ * Add missing const qualifiers and casts (Stuart and Sergio Baldoví).
+ * Split Select ROMs menu into Machines and Peripherals (Gergely
+ Szasz).
+ * Only try to load the fallback ROM if it is different to the standard
+ one (Fredrick Meunier).
+ * Use PATH_MAX instead of FILENAME_MAX as our standard compatibility
+ define (thanks, Brian Ruthven) (Fredrick Meunier).
+ * WidgetUI: Fix build on Solaris (thanks, Brian Ruthven) (Fredrick
+ Meunier).
+ * Fix C89 compilation (Adrien Destugues).
+ * Standardise the number of joystick buttons across UIs (UB880D).
+ * Add static to functions where appropriate (Stuart Brady).
+ * Track port attachment for each data bus line (Stuart Brady).
+ * Switch to using non-recursive makefile (thanks, Stuart Brady)
+ (Sergio Baldoví).
+ * Move Windows resources that are UI-independent to data/win32
+ (Sergio Baldoví).
+ * Fix segfault due to inconsistent SETUP_CHECK() and CHECK() ordering
+ (UB880D; thanks, Guesser).
+ * Rename 'Interface I' to 'Interface 1' (thanks, Stuart Brady) (Sergio
+ Baldoví).
+ * Win32: fix compilation with mingwrt 4.0+ (Kirben).
+ * Replace various deprecated GTK+ functions: gtk_widget_modify_font,
+ GtkStock, gtk_tree_view_set_rules_hint(),
+ deprecated gdk_cursor_new() (Sergio Baldoví).
+ * Remove obsolete gtk_window_set_wmclass (Sergio Baldoví).
+ * Update URLs in documentation (Sergio Baldoví).
+ * Win32 UI: fix compilation with MinGW-w64 toolchain (lordhoto).
+ * Fix the build of SDL UI on Windows (Sergio Baldoví).
+ * Use compat_file_exists() instead of stat() in read_config_file() and
+ utils_find_file_path() (BogDan Vatra).
+ * Fix fdd_strerror() reading past the end of the fdd_error array
+ (BogDan Vatra).
+ * Use tape traps if we are using a custom ROM if the instructions at
+ the entry points have been preserved (thanks, Alberto Garcia)
+ (Fredrick Meunier).
+ * GTK+ and Win32 UI: add file filters in open/save dialogs (thanks,
+ Crisis) (Sergio Baldoví).
+ * Don't show hidden files/directories in the file selector on Widget
+ UIs (Sergio Baldoví).
+ * Remember filename when saving a recently formatted disk (Sergio
+ Baldoví).
+ * GTK UI: Change the resizing method for GTK+ UI for better
+ compatibility with GTK+ 3.20+ (thanks, Alberto Garcia) (Sergio
+ Baldoví).
+
2013-05-24 Philip Kendall <phi...@sh...>
* Fuse 1.1.1 released.
@@ -1119,4 +1288,4 @@
* Version 0.1.0 released.
-$Id: ChangeLog 4995 2013-05-24 19:54:19Z zubzero $
+$Id: ChangeLog 5519 2016-05-23 19:15:02Z pak21 $
Modified: vendor/fuse-emulator/current/fuse/INSTALL
===================================================================
--- vendor/fuse-emulator/current/fuse/INSTALL 2016-05-24 14:32:41 UTC (rev 800)
+++ vendor/fuse-emulator/current/fuse/INSTALL 2016-05-24 14:56:49 UTC (rev 801)
@@ -64,8 +64,7 @@
./configure --target=powerpc-gekko --host=powerpc-gekko \
--with-wii \
- --without-libxml2 --without-libiconv --without-gpm \
- --without-x --without-glib \
+ --without-libxml2 --without-libiconv --without-gpm --without-x \
CFLAGS="-g -I$DEVKITPPC/include -I$DEVKITPRO/libogc/include -DGEKKO" \
LDFLAGS="-g -mrvl -mcpu=750 -meabi -mhard-float \
-Wl,-Map,fuse.elf.map -L$DEVKITPPC/lib \
@@ -82,8 +81,8 @@
Building the Win32 version of Fuse
----------------------------------
-You'll need to have the MinGW <http://www.mingw.org> or MinGW-w64 toolchain
-<http://mingw-w64.sourceforge.net>, e.g., on Debian:
+You'll need to have the MinGW <http://www.mingw.org/> or Mingw-w64 toolchain
+<http://mingw-w64.org/>, e.g., on Debian:
`apt-get install mingw32 mingw32-binutils mingw32-runtime'
On Windows, besides the former toolchain, you'll need an environment that
@@ -91,21 +90,21 @@
Cygwin <http://cygwin.com>.
The next examples build libspectrum and Fuse without any external library for
-the sake of clarity, but all these libraries successfully compile with MingGW
+the sake of clarity, but all these libraries successfully compile with a MinGW
environment - in case of problems with compiling any of the libs please refer to
the lib's homepage for help.
1) On Linux, first have to compile libspectrum:
./configure --host=i586-mingw32msvc --without-libaudiofile --without-zlib \
- --without-libgcrypt --without-bzip2 --without-glib --prefix=`pwd`
+ --without-libgcrypt --without-bzip2 --with-fake-glib --prefix=`pwd`
make install
This should `install' into the source directory.
Then, compile Fuse:
-./configure --host=i586-mingw32msvc --without-glib --prefix=`pwd` \
+./configure --host=i586-mingw32msvc --prefix=`pwd` \
--with-libspectrum-prefix=`pwd`/../libspectrum --with-win32 \
--without-libxml2 --without-zlib --without-png --without-x
make
@@ -119,28 +118,28 @@
2) On Windows, using MSYS + MinGW toolchain, first build libspectrum:
-./configure --without-glib --without-libaudiofile --without-libgcrypt \
+./configure --with-fake-glib --without-libaudiofile --without-libgcrypt \
--without-zlib --without-bzip2 --prefix=/usr/local
make install
Then, build Fuse:
-./configure --with-win32 --without-glib --without-libxml2 --without-zlib \
- --without-png --prefix=/usr/local
+./configure --with-win32 --without-libxml2 --without-zlib --without-png \
+ --prefix=/usr/local
make
-3) On Windows, using Cygwin + MinGW toolchain, first build libspectrum:
+3) On Windows, using Cygwin + Mingw-w64 toolchain, first build libspectrum:
-./configure --build=i686-pc-cygwin --host=i686-pc-mingw32 --without-glib \
+./configure --build=i686-pc-cygwin --host=i686-w64-mingw32 --with-fake-glib \
--without-libaudiofile --without-libgcrypt --without-zlib \
- --without-bzip2 --prefix=/usr/local/i686-pc
+ --without-bzip2 --prefix=/usr/local/i686-w64-mingw32
make install
Then, build Fuse:
-./configure --build=i686-pc-cygwin --host=i686-pc-mingw32 --with-win32 \
- --without-glib --without-libxml2 --without-zlib --without-png \
- --prefix=/usr/local/i686-pc
+./configure --build=i686-pc-cygwin --host=i686-w64-mingw32 --without-libxml2 \
+ --without-zlib --without-png --with-win32 \
+ --prefix=/usr/local/i686-w64-mingw32
make
Note: you need `libspectrum-8.dll' and the `roms' directory and the `lib'
@@ -162,4 +161,4 @@
respectively. That will make a temporary subdirectory (fuse-VERSION-win32)
in the build directory and then will create a package.
-$Id: INSTALL 4763 2012-11-16 11:01:59Z fredm $
+$Id: INSTALL 5407 2016-04-25 21:59:53Z sbaldovi $
Modified: vendor/fuse-emulator/current/fuse/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/Makefile.am 2016-05-24 14:32:41 UTC (rev 800)
+++ vendor/fuse-emulator/current/fuse/Makefile.am 2016-05-24 14:56:49 UTC (rev 801)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
-## Copyright (c) 1999-2009 Philip Kendall
+## Copyright (c) 1999-2015 Philip Kendall
-## $Id: Makefile.am 5003 2013-05-26 16:24:03Z sbaldovi $
+## $Id: Makefile.am 5434 2016-05-01 04:22:45Z 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
@@ -21,45 +21,12 @@
##
## E-mail: phi...@sh...
-AUTOMAKE_OPTIONS = foreign
-
ACLOCAL_AMFLAGS = -I m4
bin_PROGRAMS = fuse
-SUBDIRS = @COMPAT_SUBDIR@ \
- data \
- debugger \
- hacking \
- lib \
- machines \
- man \
- peripherals \
- perl \
- pokefinder \
- roms \
- sound \
- timer \
- ui \
- unittests \
- z80
+noinst_PROGRAMS =
-DIST_SUBDIRS = data \
- debugger \
- hacking \
- lib \
- machines \
- man \
- peripherals \
- perl \
- pokefinder \
- roms \
- sound \
- timer \
- ui \
- unittests \
- z80
-
fuse_SOURCES = display.c \
event.c \
fuse.c \
@@ -83,94 +50,49 @@
snapshot.c \
sound.c \
spectrum.c \
+ svg.c \
tape.c \
ui.c \
uidisplay.c \
+ uimedia.c \
utils.c
-if COMPAT_DIRNAME
-fuse_SOURCES += compat/dirname.c
-endif
+fuse_LDADD = \
+ $(PTHREAD_LIBS) \
+ $(LIBSPEC_LIBS) \
+ $(GTK_LIBS) \
+ $(GLIB_LIBS) \
+ $(PNG_LIBS) \
+ $(SDL_LIBS) \
+ $(X_LIBS) \
+ $(XML_LIBS)
-if COMPAT_GETOPT
-fuse_SOURCES += compat/getopt.c compat/getopt1.c
-endif
+fuse_DEPENDENCIES =
-if COMPAT_MKSTEMP
-fuse_SOURCES += compat/mkstemp.c
-endif
+EXTRA_fuse_SOURCES =
-if COMPAT_WIN32
-fuse_SOURCES += windres.rc
-endif
-
-EXTRA_fuse_SOURCES = windres.rc
-
-fuse_LDADD = debugger/libdebugger.a \
-@UI_LIBS@ \
-debugger/libdebugger.a \
-machines/libmachines.a \
-peripherals/libperipherals.a \
-peripherals/disk/libdisk.a \
-peripherals/flash/libflash.a \
-peripherals/ide/libide.a \
-peripherals/nic/libnic.a \
-pokefinder/libpokefinder.a \
-sound/libsound.a \
-timer/libtimer.a \
-ui/scaler/libscaler.a \
-unittests/libunittests.a \
-z80/libz80.a \
-@LIBSPEC_LIBS@ \
-@GLIB_LIBS@ \
-@PNG_LIBS@ \
-@SOUND_LIBS@ \
-@SDL_LIBS@ \
-@X_LIBS@ \
-@XML_LIBS@ \
-compat/@COMPAT_OSNAME@/libcompatos.a \
-@WINDRES_OBJ@
-
-fuse_DEPENDENCIES = debugger/libdebugger.a \
-@UI_LIBS@ \
-debugger/libdebugger.a \
-machines/libmachines.a \
-peripherals/libperipherals.a \
-peripherals/disk/libdisk.a \
-peripherals/flash/libflash.a \
-peripherals/ide/libide.a \
-peripherals/nic/libnic.a \
-pokefinder/libpokefinder.a \
-sound/libsound.a \
-timer/libtimer.a \
-ui/scaler/libscaler.a \
-unittests/libunittests.a \
-z80/libz80.a \
-compat/@COMPAT_OSNAME@/libcompatos.a \
-@WINDRES_OBJ@
-
BUILT_SOURCES = options.h settings.c settings.h
-windres.o: windres.rc winfuse.ico ui/win32/*.rc
- @WINDRES@ -I$(srcdir) -I. $(srcdir)/windres.rc @LIBSPEC_CFLAGS@ @CPPFLAGS@ windres.o
-
settings.c: settings.pl settings.dat
- @PERL@ -I$(srcdir)/perl $(srcdir)/settings.pl $(srcdir)/settings.dat > $@.tmp && mv $@.tmp $@
+ $(AM_V_GEN)$(PERL) -I$(srcdir)/perl $(srcdir)/settings.pl $(srcdir)/settings.dat > $@.tmp && mv $@.tmp $@
settings.h: settings-header.pl settings.dat
- @PERL@ -I$(srcdir)/perl $(srcdir)/settings-header.pl $(srcdir)/settings.dat > $@.tmp && mv $@.tmp $@
+ $(AM_V_GEN)$(PERL) -I$(srcdir)/perl $(srcdir)/settings-header.pl $(srcdir)/settings.dat > $@.tmp && mv $@.tmp $@
-if WIDGET
-options.h: $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/@WIDGET@/options-header.pl $(srcdir)/ui/options.dat $(srcdir)/perl/Fuse.pm $(srcdir)/perl/Fuse/Dialog.pm
- @PERL@ $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/options.dat | @PERL@ -I$(srcdir)/perl $(srcdir)/ui/@WIDGET@/options-header.pl - public > $@.tmp && mv $@.tmp $@
-else
-options.h: $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/@UI@/options-header.pl $(srcdir)/ui/options.dat $(srcdir)/perl/Fuse.pm $(srcdir)/perl/Fuse/Dialog.pm
- @PERL@ $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/options.dat | @PERL@ -I$(srcdir)/perl $(srcdir)/ui/@UI@/options-header.pl - public > $@.tmp && mv $@.tmp $@
-endif
+options.h: $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/@OPTIONS_DIR@/options-header.pl $(srcdir)/ui/options.dat $(srcdir)/perl/Fuse.pm $(srcdir)/perl/Fuse/Dialog.pm
+ $(AM_V_GEN)$(PERL) $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/options.dat | $(PERL) -I$(srcdir)/perl $(srcdir)/ui/@OPTIONS_DIR@/options-header.pl - public > $@.tmp && mv $@.tmp $@
-AM_CPPFLAGS = @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@ \
-@XML_CFLAGS@ -DFUSEDATADIR="\"${pkgdatadir}\"" @SDL_CFLAGS@
+AM_CPPFLAGS = \
+ $(GLIB_CFLAGS) \
+ $(GTK_CFLAGS) \
+ $(LIBSPEC_CFLAGS) \
+ $(XML_CFLAGS) \
+ -DFUSEDATADIR="\"${pkgdatadir}\"" \
+ $(SDL_CFLAGS) \
+ $(PNG_CFLAGS)
+AM_CFLAGS = $(WARN_CFLAGS) $(PTHREAD_CFLAGS)
+
noinst_HEADERS = bitmap.h \
compat.h \
display.h \
@@ -196,6 +118,7 @@
snapshot.h \
sound.h \
spectrum.h \
+ svg.h \
tape.h \
utils.h \
options.h \
@@ -208,6 +131,7 @@
THANKS \
keysyms.dat \
keysyms.pl \
+ m4/ax_pthread.m4 \
m4/glib-2.0.m4 \
m4/gtk-2.0.m4 \
m4/libxml.m4 \
@@ -215,115 +139,54 @@
m4/sdl.m4 \
menu_data.dat \
menu_data.pl \
+ settings.dat \
settings.pl \
- settings-header.pl \
- settings.dat \
- winfuse.ico
+ settings-header.pl
CLEANFILES = options.h \
settings.c \
settings.h
-include compat/Makefile.am
+DISTCLEANFILES =
-if COMPAT_WIN32
+pkgdata_DATA =
-package_win32=$(PACKAGE)-$(PACKAGE_VERSION)-win32
-top_win32dir=$(top_builddir)/$(package_win32)
-install-win32: all
- test -n "$(DESTDIR)" || { echo "ERROR: set DESTDIR path"; exit 1; }
- $(MKDIR_P) $(DESTDIR)/roms/ || exit 1
- $(MKDIR_P) $(DESTDIR)/lib/ || exit 1
- cp $(top_srcdir)/roms/*.rom $(DESTDIR)/roms
- cp $(top_srcdir)/roms/README.copyright $(DESTDIR)/roms
- cp $(top_srcdir)/lib/*.bmp $(DESTDIR)/lib
- cp $(top_srcdir)/lib/*.scr $(DESTDIR)/lib
- cp $(top_builddir)/lib/*.szx $(DESTDIR)/lib
-# Copy fuse executable (we should manually copy the required libraries)
- cp $(top_builddir)/.libs/fuse$(EXEEXT) $(DESTDIR) || \
- cp $(top_builddir)/fuse$(EXEEXT) $(DESTDIR)
-# Get text files
- for file in AUTHORS ChangeLog COPYING README; \
- do cp "$(top_srcdir)/$$file" "$(DESTDIR)/$$file.txt"; \
- done
-# Get manuals
- if test -n "$(MAN2HTML)"; then \
- $(MAN2HTML) -r $(top_srcdir)/man/fuse.1 | sed '1d' > $(DESTDIR)/fuse.html; \
- else \
- test -z "$(GROFF)" || $(GROFF) -Thtml -man $(top_srcdir)/man/fuse.1 > $(DESTDIR)/fuse.html; \
- fi
-# Convert to DOS line endings
- test -z "$(UNIX2DOS)" || find $(DESTDIR) -type f \( -name "*.txt" -or -name "*.html" -or -name "*.copyright" \) -exec $(UNIX2DOS) {} \;
+## Resources for Windows executables
+if COMPAT_WIN32
-install-win32-strip: install-win32
- test -z "$(STRIP)" || $(STRIP) $(DESTDIR)/fuse$(EXEEXT)
+fuse_SOURCES += windres.rc
+fuse_LDADD += windres.o
+fuse_DEPENDENCIES += windres.o
-dist-win32-dir:
- $(MAKE) DESTDIR="$(top_win32dir)" install-win32-strip
+windres.o: windres.rc data/win32/winfuse.ico data/win32/fuse.manifest $(ui_win32_res)
+ $(AM_V_GEN)$(WINDRES) -I$(srcdir) -I. $(srcdir)/windres.rc $(LIBSPEC_CFLAGS) $(CPPFLAGS) windres.o
-dist-win32-zip: dist-win32-dir
- rm -f -- $(top_builddir)/$(package_win32).zip
- rm -f -- $(top_builddir)/$(package_win32).zip.sha1
- test -n "$(top_win32dir)" || exit 1
- @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; }
- cd $(top_win32dir) && \
- zip -q -9 -r $(abs_top_builddir)/$(package_win32).zip .
- -sha1sum $(top_builddir)/$(package_win32).zip > $(top_builddir)/$(package_win32).zip.sha1 && \
- { test -z "$(UNIX2DOS)" || $(UNIX2DOS) $(top_builddir)/$(package_win32).zip.sha1; }
+endif
-dist-win32-7z: dist-win32-dir
- rm -f -- $(top_builddir)/$(package_win32).7z
- rm -f -- $(top_builddir)/$(package_win32).7z.sha1
- test -n "$(top_win32dir)" || exit 1
- @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; }
- cd $(top_win32dir) && \
- 7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on -bd $(abs_top_builddir)/$(package_win32).7z .
- -sha1sum $(top_builddir)/$(package_win32).7z > $(top_builddir)/$(package_win32).7z.sha1 && \
- { test -z "$(UNIX2DOS)" || $(UNIX2DOS) $(top_builddir)/$(package_win32).7z.sha1; }
-dist-win32-exe: dist-win32-dir
- rm -f -- $(top_builddir)/$(package_win32)-setup.exe
- rm -f -- $(top_builddir)/$(package_win32)-setup.exe.sha1
- test -n "$(top_win32dir)" || exit 1
- @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
- @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"; \
- elif [ -x "/cygdrive/c/Program Files/NSIS/makensis" ]; then \
- MAKENSIS="/cygdrive/c/Program\ Files/NSIS/makensis"; \
- 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 $$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; }
-
-dist-win32: dist-win32-zip dist-win32-7z dist-win32-exe
-
-distclean-win32:
- if test -d "$(top_builddir)/$(package_win32)"; then \
- rm -rf -- "$(top_builddir)/$(package_win32)"; \
- fi
- rm -f -- $(top_builddir)/$(package_win32).zip
- rm -f -- $(top_builddir)/$(package_win32).zip.sha1
- rm -f -- $(top_builddir)/$(package_win32).7z
- rm -f -- $(top_builddir)/$(package_win32).7z.sha1
- rm -f -- $(top_builddir)/$(package_win32)-setup.exe
- rm -f -- $(top_builddir)/$(package_win32)-setup.exe.sha1
-
-.PHONY: install-win32 install-win32-strip dist-win32 dist-win32-dir \
- dist-win32-zip dist-win32-7z dist-win32-exe distclean-win32
-
-endif
+include compat/Makefile.am
+include data/Makefile.am
+include debugger/Makefile.am
+include hacking/Makefile.am
+include lib/Makefile.am
+include machines/Makefile.am
+include man/Makefile.am
+include peripherals/Makefile.am
+include perl/Makefile.am
+include pokefinder/Makefile.am
+include roms/Makefile.am
+include sound/Makefile.am
+include timer/Makefile.am
+include ui/Makefile.am
+include ui/fb/Makefile.am
+include ui/gtk/Makefile.am
+include ui/scaler/Makefile.am
+include ui/sdl/Makefile.am
+include ui/svga/Makefile.am
+include ui/widget/Makefile.am
+include ui/wii/Makefile.am
+include ui/win32/Makefile.am
+include ui/xlib/Makefile.am
+include unittests/Makefile.am
+include z80/Makefile.am
Modified: vendor/fuse-emulator/current/fuse/README
===================================================================
--- vendor/fuse-emulator/current/fuse/README 2016-05-24 14:32:41 UTC (rev 800)
+++ vendor/fuse-emulator/current/fuse/README 2016-05-24 14:56:49 UTC (rev 801)
@@ -1,4 +1,4 @@
-The Free Unix Spectrum Emulator (Fuse) 1.1.1
+The Free Unix Spectrum Emulator (Fuse) 1.2.0
============================================
Fuse (the Free Unix Spectrum Emulator) was originally, and somewhat
@@ -25,7 +25,8 @@
* Support for the RZX input recording file format, including
rollback and 'competition mode'.
* Emulation of the DivIDE, Interface 1, Kempston mouse, Spectrum +3e,
- ZXATASP, ZXCF, Beta 128, Opus Discovery, +D and DISCiPLE interfaces.
+ ZXATASP, ZXCF, Beta 128, Opus Discovery, +D, DISCiPLE and Didaktik 80/40
+ interfaces.
Help! <xyz> doesn't work
------------------------
@@ -107,4 +108,4 @@
Philip Kendall <phi...@sh...>
24th May, 2013
-$Id: README 4995 2013-05-24 19:54:19Z zubzero $
+$Id: README 5403 2016-04-25 13:10:53Z fredm $
Modified: vendor/fuse-emulator/current/fuse/THANKS
===================================================================
--- vendor/fuse-emulator/current/fuse/THANKS 2016-05-24 14:32:41 UTC (rev 800)
+++ vendor/fuse-emulator/current/fuse/THANKS 2016-05-24 14:56:49 UTC (rev 801)
@@ -29,7 +29,7 @@
you've got an Amiga, you may well like to check out Ian's Spectrum
Emulator, ASp: http://www.lasernet.plus.com/asp.html
-* Shawn Hargreaves: for Allegro (http://alleg.sourceforge.net/)
+* Shawn Hargreaves: for Allegro (http://liballeg.org/)
(again, used by previous versions of Fuse for the graphical display)
* Steven Harrison: for helping track down why the SDL sound routines
@@ -44,7 +44,7 @@
emulations (see `AUTHORS')
* Gerton Lunter: his wonderful z80
- (ftp://ftp.worldofspectrum.org/pub/sinclair/emulators/pc/dos/z80-400.zip)
+ (http://www.worldofspectrum.org/pub/sinclair/emulators/pc/windows/z80-400.zip)
got me started on this emulation lark all those years ago...
* Anders Holmberg: for reporting a bug in the z80 v1.45 load routines. Anders
@@ -102,4 +102,4 @@
* Matan Ziv-Av: for various bits of code (see `AUTHORS')
-$Id: THANKS 4882 2013-02-15 23:47:37Z sbaldovi $
+$Id: THANKS 5357 2016-02-23 23:43:54Z sbaldovi $
Modified: vendor/fuse-emulator/current/fuse/autogen.sh
===================================================================
--- vendor/fuse-emulator/current/fuse/autogen.sh 2016-05-24 14:32:41 UTC (rev 800)
+++ vendor/fuse-emulator/current/fuse/autogen.sh 2016-05-24 14:56:49 UTC (rev 801)
@@ -2,8 +2,9 @@
# autogen.sh: autotools invocation
# Copyright (c) 2004 Philip Kendall
+# Copyright (c) 2014 Sergio Baldoví
-# $Id: autogen.sh 4749 2012-10-15 11:22:31Z fredm $
+# $Id: autogen.sh 5434 2016-05-01 04:22:45Z 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
@@ -28,7 +29,9 @@
aclocal -I m4
# Mac OS X: Use glibtoolize instead
-libtoolize --automake
+(glibtoolize --version) < /dev/null > /dev/null 2>&1 && LIBTOOLIZE=glibtoolize \
+ || LIBTOOLIZE=libtoolize
+$LIBTOOLIZE --automake
autoheader
automake --add-missing
autoconf
Modified: vendor/fuse-emulator/current/fuse/bitmap.h
===================================================================
--- vendor/fuse-emulator/current/fuse/bitmap.h 2016-05-24 14:32:41 UTC (rev 800)
+++ vendor/fuse-emulator/current/fuse/bitmap.h 2016-05-24 14:56:49 UTC (rev 801)
@@ -1,5 +1,5 @@
/* bitmap.h: Bitmap routines
- Copyright (c) 2007 Stuart Brady
+ Copyright (c) 2007-2015 Stuart Brady
$Id$
@@ -28,19 +28,19 @@
#ifndef FUSE_BITMAP_H
#define FUSE_BITMAP_H
-inline static void
+static inline void
bitmap_set( libspectrum_byte *b, const size_t n )
{
b[ n / 8 ] |= ( 1 << ( n % 8 ) );
}
-inline static void
+static inline void
bitmap_reset( libspectrum_byte *b, const size_t n )
{
b[ n / 8 ] &= ~( 1 << ( n % 8 ) );
}
-inline static int
+static inline int
bitmap_test( const libspectrum_byte *b, const size_t n )
{
return b[ n / 8 ] & ( 1 << ( n % 8 ) );
Modified: vendor/fuse-emulator/current/fuse/compat/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/Makefile.am 2016-05-24 14:32:41 UTC (rev 800)
+++ vendor/fuse-emulator/current/fuse/compat/Makefile.am 2016-05-24 14:56:49 UTC (rev 801)
@@ -1,7 +1,8 @@
## Process this file with automake to produce Makefile.in
-## Copyright (c) 2003-2012 Philip Kendall
+## Copyright (c) 2003-2013 Philip Kendall
+## Copyright (c) 2015 Sergio Baldoví
-## $Id: Makefile.am 4738 2012-10-03 13:15:31Z fredm $
+## $Id: Makefile.am 5434 2016-05-01 04:22:45Z 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
@@ -21,18 +22,93 @@
##
## E-mail: phi...@sh...
-AM_CPPFLAGS += -I$(srcdir)/compat
+noinst_HEADERS += compat/getopt.h
-DIST_SUBDIRS += compat/amiga \
- compat/linux \
- compat/morphos \
- compat/unix \
- compat/wii \
- compat/win32
+if COMPAT_DIRNAME
+fuse_SOURCES += compat/dirname.c
+endif
-EXTRA_fuse_SOURCES += compat/dirname.c \
- compat/getopt.c \
- compat/getopt1.c \
- compat/mkstemp.c
+if COMPAT_GETOPT
+fuse_SOURCES += compat/getopt.c compat/getopt1.c
+endif
-noinst_HEADERS += compat/getopt.h
+if COMPAT_MKSTEMP
+fuse_SOURCES += compat/mkstemp.c
+endif
+
+## Amiga routines
+if COMPAT_AMIGA
+fuse_SOURCES += \
+ compat/unix/dir.c \
+ compat/unix/file.c \
+ compat/amiga/osname.c \
+ compat/amiga/paths.c \
+ compat/unix/timer.c
+endif
+
+## Linux routines
+if COMPAT_LINUX
+fuse_SOURCES += \
+ compat/unix/dir.c \
+ compat/unix/file.c \
+ compat/unix/osname.c \
+ compat/linux/paths.c \
+ compat/unix/timer.c
+
+if HAVE_SOCKETS
+fuse_SOURCES += compat/unix/socket.c
+endif
+endif
+
+## Morphos routines
+if COMPAT_MORPHOS
+fuse_SOURCES += \
+ compat/unix/dir.c \
+ compat/unix/file.c \
+ compat/morphos/osname.c \
+ compat/amiga/paths.c \
+ compat/unix/timer.c
+endif
+
+## Unix routines
+if COMPAT_UNIX
+fuse_SOURCES += \
+ compat/unix/dir.c \
+ compat/unix/file.c \
+ compat/unix/osname.c \
+ compat/unix/paths.c \
+ compat/unix/timer.c
+
+if HAVE_SOCKETS
+fuse_SOURCES += compat/unix/socket.c
+endif
+endif
+
+## Wii routines
+if COMPAT_WII
+fuse_SOURCES += \
+ compat/wii/dir.c \
+ compat/unix/file.c \
+ compat/wii/osname.c \
+ compat/wii/paths.c \
+ compat/wii/timer.c
+endif
+
+## Windows routines
+if COMPAT_WIN32
+fuse_SOURCES += \
+ compat/unix/dir.c \
+ compat/unix/file.c \
+ compat/win32/osname.c \
+ compat/win32/paths.c \
+ compat/win32/timer.c
+
+if HAVE_SOCKETS
+fuse_SOURCES += compat/win32/socket.c
+endif
+endif
+
+## SpeccyBoot routines
+if HAVE_TUNTAP
+fuse_SOURCES += compat/unix/tuntap.c
+endif
Deleted: vendor/fuse-emulator/current/fuse/compat/amiga/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/amiga/Makefile.am 2016-05-24 14:32:41 UTC (rev 800)
+++ vendor/fuse-emulator/current/fuse/compat/amiga/Makefile.am 2016-05-24 14:56:49 UTC (rev 801)
@@ -1,41 +0,0 @@
-## Process this file with automake to produce Makefile.in
-## Copyright (c) 2007-2012 Philip Kendall
-
-## $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
-## 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:
-##
-## E-mail: phi...@sh...
-
-AUTOMAKE_OPTIONS = foreign
-
-AM_CPPFLAGS = -I$(srcdir)/../..
-
-noinst_LIBRARIES = libcompatos.a
-
-libcompatos_a_SOURCES = ../unix/dir.c \
- ../unix/file.c \
- osname.c \
- paths.c \
- ../unix/timer.c
-
-if HAVE_TUNTAP
-libcompatos_a_SOURCES += ../unix/tuntap.c
-endif
-
-AM_CPPFLAGS += @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@ \
--DFUSEDATADIR="\"${pkgdatadir}\""
Deleted: vendor/fuse-emulator/current/fuse/compat/linux/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/linux/Makefile.am 2016-05-24 14:32:41 UTC (rev 800)
+++ vendor/fuse-emulator/current/fuse/compat/linux/Makefile.am 2016-05-24 14:56:49 UTC (rev 801)
@@ -1,45 +0,0 @@
-## Process this file with automake to produce Makefile.in
-## Copyright (c) 2012 Philip Kendall
-
-## $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
-## 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:
-##
-## E-mail: phi...@sh...
-
-AUTOMAKE_OPTIONS = foreign
-
-AM_CPPFLAGS = -I$(srcdir)/../..
-
-noinst_LIBRARIES = libcompatos.a
-
-libcompatos_a_SOURCES = ../unix/dir.c \
- ../unix/file.c \
- ../unix/osname.c \
- paths.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}\""
Deleted: vendor/fuse-emulator/current/fuse/compat/morphos/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/morphos/Makefile.am 2016-05-24 14:32:41 UTC (rev 800)
+++ vendor/fuse-emulator/current/fuse/compat/morphos/Makefile.am 2016-05-24 14:56:49 UTC (rev 801)
@@ -1,40 +0,0 @@
-## Process this file with automake to produce Makefile.in
-## Copyright (c) 2007-2008 Philip Kendall
-
-## $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
-## 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:
-##
-## E-mail: phi...@sh...
-
-AUTOMAKE_OPTIONS = foreign
-
-AM_CPPFLAGS = -I$(srcdir)/../..
-
-noinst_LIBRARIES = libcompatos.a
-
-libcompatos_a_SOURCES = ../unix/dir.c \
- ../unix/file.c \
- osname.c \
- ../amiga/paths.c \
- ../unix/timer.c
-
-if HAVE_TUNTAP
-libcompatos_a_SOURCES += ../unix/tuntap.c
-endif
-
-AM_CPPFLAGS += @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@
Deleted: vendor/fuse-emulator/current/fuse/compat/unix/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/unix/Makefile.am 2016-05-24 14:32:41 UTC (rev 800)
+++ vendor/fuse-emulator/current/fuse/compat/unix/Makefile.am 2016-05-24 14:56:49 UTC (rev 801)
@@ -1,45 +0,0 @@
-## Process this file with automake to produce Makefile.in
-## Copyright (c) 2007-2012 Philip Kendall
-
-## $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
-## 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:
-##
-## E-mail: phi...@sh...
-
-AUTOMAKE_OPTIONS = foreign
-
-AM_CPPFLAGS = -I$(srcdir)/../..
-
-noinst_LIBRARIES = libcompatos.a
-
-libcompatos_a_SOURCES = dir.c \
- file.c \
- osname.c \
- paths.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 2016-05-24 14:32:41 UTC (rev 800)
+++ vendor/fuse-emulator/current/fuse/compat/unix/socket.c 2016-05-24 14:56:49 UTC (rev 801)
@@ -1,5 +1,5 @@
/* socket.c: Socket-related compatibility routines
- Copyright (c) 2011-2012 Philip Kendall
+ Copyright (c) 2011-2015 Philip Kendall
$Id$
@@ -75,11 +75,8 @@
int error;
int pipefd[2];
- compat_socket_selfpipe_t *self = malloc( sizeof( *self ) );
- if( !self ) {
- ui_error( UI_ERROR_ERROR, "%s: %d: out of memory", __FILE__, __LINE__ );
- fuse_abort();
- }
+ compat_socket_selfpipe_t *self =
+ libspectrum_new( compat_socket_selfpipe_t, 1 );
error = pipe( pipefd );
if( error ) {
@@ -97,7 +94,7 @@
{
close( self->read_fd );
close( self->write_fd );
- free( self );
+ libspectrum_free( self );
}
compat_socket_t compat_socket_selfpipe_get_read_fd( compat_socket_selfpipe...
[truncated message content] |
|
From: <fr...@us...> - 2016-06-06 13:23:21
|
Revision: 805
http://sourceforge.net/p/fuse-for-macosx/code/805
Author: fredm
Date: 2016-06-06 13:23:18 +0000 (Mon, 06 Jun 2016)
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/configure.ac
vendor/fuse-emulator/current/fuse/data/shell-completion/bash/fuse
vendor/fuse-emulator/current/fuse/debugger/commandl.l
vendor/fuse-emulator/current/fuse/debugger/commandy.y
vendor/fuse-emulator/current/fuse/debugger/event.c
vendor/fuse-emulator/current/fuse/debugger/expression.c
vendor/fuse-emulator/current/fuse/fuse.c
vendor/fuse-emulator/current/fuse/hacking/ChangeLog
vendor/fuse-emulator/current/fuse/lib/Makefile.am
vendor/fuse-emulator/current/fuse/man/fuse.1
vendor/fuse-emulator/current/fuse/menu.c
vendor/fuse-emulator/current/fuse/rzx.c
vendor/fuse-emulator/current/fuse/svg.c
vendor/fuse-emulator/current/fuse/svg.h
vendor/fuse-emulator/current/fuse/tape.c
vendor/fuse-emulator/current/fuse/ui/fb/Makefile.am
vendor/fuse-emulator/current/fuse/ui/gtk/Makefile.am
vendor/fuse-emulator/current/fuse/ui/sdl/Makefile.am
vendor/fuse-emulator/current/fuse/ui/svga/Makefile.am
vendor/fuse-emulator/current/fuse/ui/ui.h
vendor/fuse-emulator/current/fuse/ui/widget/Makefile.am
vendor/fuse-emulator/current/fuse/ui/wii/Makefile.am
vendor/fuse-emulator/current/fuse/ui/win32/Makefile.am
vendor/fuse-emulator/current/fuse/ui/xlib/Makefile.am
vendor/fuse-emulator/current/fuse/z80/Makefile.am
vendor/fuse-emulator/current/fuse/z80/z80.c
vendor/fuse-emulator/current/fuse/z80/z80_ops.c
vendor/fuse-emulator/current/libspectrum/ChangeLog
vendor/fuse-emulator/current/libspectrum/README
vendor/fuse-emulator/current/libspectrum/configure.ac
vendor/fuse-emulator/current/libspectrum/doc/libspectrum.3
vendor/fuse-emulator/current/libspectrum/doc/libspectrum.txt
vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog
Modified: vendor/fuse-emulator/current/fuse/AUTHORS
===================================================================
--- vendor/fuse-emulator/current/fuse/AUTHORS 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/AUTHORS 2016-06-06 13:23:18 UTC (rev 805)
@@ -42,7 +42,7 @@
* Garry Lancaster: the simple 8-bit IDE, ZXATASP and ZXCF support.
* Gergely Szasz: +3, +D, Opus, Didaktik 80 and Interface 1/Microdrive emulation,
- the 'movie' code and the ALSO and ao sound drivers.
+ the 'movie' code and the ALSA and ao sound drivers.
* Bjoern Giesler: the original Wii port.
@@ -54,4 +54,4 @@
* Philip Kendall: everything else.
-$Id: AUTHORS 5357 2016-02-23 23:43:54Z sbaldovi $
+$Id: AUTHORS 5569 2016-06-01 11:12:38Z fredm $
Modified: vendor/fuse-emulator/current/fuse/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse/ChangeLog 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/ChangeLog 2016-06-06 13:23:18 UTC (rev 805)
@@ -1,4 +1,4 @@
-2016-??-?? Philip Kendall <phi...@sh...>
+2016-06-06 Philip Kendall <phi...@sh...>
* Fuse 1.2.0 released.
@@ -12,46 +12,51 @@
* Allow continuing RZX recordings if there is a final snapshot in the
RZX (Sergio Baldoví).
* Fix the prune function on RZX rollback (Sergio Baldoví).
+ * Use SZX format for the initial snapshot in RZX files (Sergio
+ Baldoví).
* Fix loading of EDSK files with Sector Offset block (Sergio Baldoví).
- * Fix speech in Cobra's Arc - Medium Case.tzx when loaded with tape
- traps enabled (thanks, zx81 and Sergio Baldoví) (Fredrick Meunier).
* Migrate disk "index event" handling to the FDD layer and have the
FDC layer use it for their STATUS registers (Gergely Szasz).
- * Set AF, AF' and SP to 0xffff on reset (Stuart Brady).
- * Leave most registers unchanged on a soft reset (Stuart Brady).
- * Emulate interrupt and NMI timings more precisely (Stuart Brady).
- * Emulate NMOS and CMOS Z80 variants (Stuart Brady).
- * Switch to 2KB page size (Stuart Brady).
* Implement WD2797 emulation (Gergely Szasz).
- * Skip tape traps if VERIFY is requested (UB880D).
- * Fix inaccurate output when AY envelopes are used (Matthew Westcott
- and Fredrick Meunier)
- * Fix some peripherals activation when loading snapshots (Sergio
- Baldoví).
- * Fix loading sound with some custom loaders (Fredrick Meunier).
* Centralise the "Disk icon" update code to the FDD layer (Gergely
Szasz).
- * Check if data blocks are headers for handling PZX files (Fredrick
- Meunier).
- * Correct display of pulses in PZX pulse block for tape browser
- (Fredrick Meunier).
* Fix disk image corruption after saving UDI files (Sergio Baldoví).
* Check ready status after loading a disk into floppy disk drive
(thanks, John Elliott) (Sergio Baldoví).
* Fix overlapped SEEK commands (Sergio Baldoví).
* Fix length of data returned by READ_DIAG (thanks, Fredrick Meunier)
(Sergio Baldoví).
+ * Fix writing .td0 format disk files (Sergio Baldoví).
+ * Fix speech in Cobra's Arc - Medium Case.tzx when loaded with tape
+ traps enabled (thanks, zx81 and Sergio Baldoví) (Fredrick Meunier).
+ * Skip tape traps if VERIFY is requested (UB880D).
+ * Fix loading sound with some custom loaders (Fredrick Meunier).
+ * Check if data blocks are headers for handling PZX files (Fredrick
+ Meunier).
+ * Correct display of pulses in PZX pulse block for tape browser
+ (Fredrick Meunier).
+ * Set AF, AF' and SP to 0xffff on reset (Stuart Brady).
+ * Leave most registers unchanged on a soft reset (Stuart Brady).
+ * Emulate interrupt and NMI timings more precisely (Stuart Brady).
+ * Emulate NMOS and CMOS Z80 variants (Stuart Brady).
+ * Switch to 2KB page size (Stuart Brady).
+ * Fix inaccurate output when AY envelopes are used (Matthew Westcott
+ and Fredrick Meunier).
+ * Fix some peripherals activation when loading snapshots (Sergio
+ Baldoví).
* Machine specific improvements:
- * The Timex SCLD is contended in all of the home, Dock and Exrom banks
- in the 0x4000 - 0x7FFF range (thanks, rga24 from WoS) (Fredrick
- Meunier).
+ * The address range 0x4000 - 0x7FFF is contended on the TS2068 in the
+ home, Dock and Exrom banks (thanks, Richard Atkinson). It is assumed
+ that this is the same for other Timex models (Fredrick Meunier).
* Clear all Opus RAM on hard reset (Stuart Brady).
* Ensure the ZX Printer does not require a hard reset to enable
(thanks, RMartins) (Fredrick Meunier).
* Fix timing of events when emulating Scorpion (Stuart Brady).
* Ensure we have successfully selected a Pentagon or a Timex machine
before inserting their media (Fredrick Meunier).
+ * Prefer Scorpion to Pentagon when loading SCL/TRD disks for better
+ timing compatibility (thanks, windale) (Sergio Baldoví).
* Fix Beta 128 type II commands (thanks, windale and BogDan Vatra)
(Sergio Baldoví).
* Don't enable the Beta 128 interface when loading a snapshot on a
@@ -61,10 +66,7 @@
Meunier).
* Spectranet: fix segfault in error handling when setting SO_REUSEADDR
(Stuart Brady).
- * Prefer Scorpion to Pentagon when loading SCL/TRD disks for better
- timing compatibility (part of feature request #90) (thanks, windale)
- (Sergio Baldoví).
- * Update SE ROMs to v4.07 (thanks, Andrew Owen) (Sergio Baldoví).
+ * Update SE ROMs to v4.07 (thanks, Andrew Owen) (Sergio Baldoví).
* Debugger improvements:
* Fix disassembly of LD (HL), LD (IX) and LD (IY) (BogDan Vatra).
@@ -75,7 +77,6 @@
Baldoví).
* Timex EXROM and Dock text was truncated in the debugger UI (thanks,
Andrew Owen and Sergio Baldoví) (Fredrick Meunier).
- * Don't trap on breakpoints whilst halted (Stuart Brady).
* Win32: relocate halted flag and set monospaced font (Sergio
Baldoví).
* Fix memory issues when removing a matched breakpoint (Tom Seddon).
@@ -85,6 +86,11 @@
* Fix documentation of address syntax used in debugger section
(Sergio Baldoví).
* Allow debugger to dereference memory locations (Philip Kendall).
+ * Allow strings with escaped spaces in the debugger (Sergio Baldoví).
+ * Make wildcard event breakpoints work (thanks, Sergio Baldoví)
+ (Philip Kendall).
+ * Protect divide expression from a divide by zero exception (Fredrick
+ Meunier).
* Miscellaneous improvements:
* Remove warnings in aosound (Rene Ladan).
@@ -107,7 +113,7 @@
* Link to autoload snapshot for NTSC Spectrum (Sergio Baldoví).
* Fix desktop integration rules to cope with VPATH builds (Sergio
Baldoví).
- * Modernise autoconf support (Sergio Baldoví Baldoví).
+ * Modernise autoconf support (Sergio Baldoví).
* Use unzipped tapes for peripheral tests (thanks, Phil Reynolds)
(Sergio Baldoví).
* Fix empty list in pokefinder on GTK+ 3 (Sergio Baldoví).
@@ -121,7 +127,8 @@
* Don't show an error when rewinding an empty tape (Sergio Baldoví).
* GTK UI: clear out row mark in tape browser when selecting another
block (Sergio Baldoví).
- * Add missing const qualifiers and casts (Stuart and Sergio Baldoví).
+ * Add missing const qualifiers and casts (Stuart Brady and Sergio
+ Baldoví).
* Split Select ROMs menu into Machines and Peripherals (Gergely
Szasz).
* Only try to load the fallback ROM if it is different to the standard
@@ -159,11 +166,11 @@
(Fredrick Meunier).
* GTK+ and Win32 UI: add file filters in open/save dialogs (thanks,
Crisis) (Sergio Baldoví).
- * Don't show hidden files/directories in the file selector on Widget
+ * Don't show hidden files/directories in the file selector on Widget
UIs (Sergio Baldoví).
- * Remember filename when saving a recently formatted disk (Sergio
+ * Remember filename when saving a recently formatted disk (Sergio
Baldoví).
- * GTK UI: Change the resizing method for GTK+ UI for better
+ * GTK UI: Change the resizing method for GTK+ UI for better
compatibility with GTK+ 3.20+ (thanks, Alberto Garcia) (Sergio
Baldoví).
@@ -1288,4 +1295,4 @@
* Version 0.1.0 released.
-$Id: ChangeLog 5519 2016-05-23 19:15:02Z pak21 $
+$Id: ChangeLog 5594 2016-06-06 10:46:46Z fredm $
Modified: vendor/fuse-emulator/current/fuse/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/Makefile.am 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/Makefile.am 2016-06-06 13:23:18 UTC (rev 805)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 1999-2015 Philip Kendall
-## $Id: Makefile.am 5434 2016-05-01 04:22:45Z fredm $
+## $Id: Makefile.am 5537 2016-05-29 06:17:00Z 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
@@ -131,6 +131,7 @@
THANKS \
keysyms.dat \
keysyms.pl \
+ m4/ax_create_stdint_h.m4 \
m4/ax_pthread.m4 \
m4/glib-2.0.m4 \
m4/gtk-2.0.m4 \
Modified: vendor/fuse-emulator/current/fuse/README
===================================================================
--- vendor/fuse-emulator/current/fuse/README 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/README 2016-06-06 13:23:18 UTC (rev 805)
@@ -24,9 +24,11 @@
* 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 1, Kempston mouse, Spectrum +3e,
- ZXATASP, ZXCF, Beta 128, Opus Discovery, +D, DISCiPLE and Didaktik 80/40
+* Emulation of the Currah µSource, DivIDE, Fuller audio box, Interface 1,
+ Kempston mouse, SpecDrum, Spectrum +3e, ZXATASP and ZXCF interfaces.
+* Emulation of the Beta 128, +D, Didaktik 80/40, DISCiPLE and Opus Discovery
interfaces.
+* Emulation of the Spectranet and SpeccyBoot interfaces.
Help! <xyz> doesn't work
------------------------
@@ -106,6 +108,6 @@
<http://www.worldofspectrum.org/forums/>.
Philip Kendall <phi...@sh...>
-24th May, 2013
+6th June, 2016
-$Id: README 5403 2016-04-25 13:10:53Z fredm $
+$Id: README 5594 2016-06-06 10:46:46Z fredm $
Modified: vendor/fuse-emulator/current/fuse/configure.ac
===================================================================
--- vendor/fuse-emulator/current/fuse/configure.ac 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/configure.ac 2016-06-06 13:23:18 UTC (rev 805)
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-dnl $Id: configure.ac 5500 2016-05-21 05:38:43Z fredm $
+dnl $Id: configure.ac 5594 2016-06-06 10:46:46Z fredm $
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
@@ -31,7 +31,7 @@
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-2013 Philip Kendall and others"])
+m4_define([fuse_copyright], ["(c) 1999-2016 Philip Kendall and others"])
m4_define([fuse_url], [http://fuse-emulator.sourceforge.net/])
m4_define([fuse_bugreport], [http://sourceforge.net/p/fuse-emulator/bugs/])
Modified: vendor/fuse-emulator/current/fuse/data/shell-completion/bash/fuse
===================================================================
--- vendor/fuse-emulator/current/fuse/data/shell-completion/bash/fuse 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/data/shell-completion/bash/fuse 2016-06-06 13:23:18 UTC (rev 805)
@@ -1,6 +1,5 @@
-#!/bin/bash
+# fuse: bash completion for fuse-emulator
-# fuse: bash completion for fuse-emulator
# Copyright (c) 2015 Sergio Baldoví
# This program is free software; you can redistribute it and/or modify
@@ -51,7 +50,7 @@
case $prev in
--betadisk|--discipledisk|--didaktik80disk|--opusdisk| \
--plus3disk|--plusddisk)
- _filedir '@(d40|D40|d80|D80|dsk|DSK|img|IMG|fdi|FDI|mgt|MGT|opd|OPD|opu|OPU|sad|SAD|scl|SCL|td0|TD0|udi|UDI)'
+ _filedir '@(d40|D40|d80|D80|dsk|DSK|img|IMG|fdi|FDI|mgt|MGT|opd|OPD|opu|OPU|sad|SAD|scl|SCL|td0|TD0|trd|TRD|udi|UDI)'
return 0
;;
--disk-try-merge)
@@ -222,7 +221,6 @@
--no-movie-stop-after-rzx --no-opus --no-pal-tv2x
--no-plus3-detect-speedlock --no-plusd --no-printer
--no-raw-s-net --no-rs232-handshake
- --no-rs232-rx --no-rs232-tx
--no-rzx-autosaves --no-simpleide --no-slt --no-sound
--no-sound-force-8bit --no-speccyboot --no-specdrum
--no-spectranet --no-spectranet-disable --no-statusbar
@@ -258,7 +256,7 @@
--zxatasp-write-protect --zxcf --zxcf-cffile --zxcf-upload
--zxprinter' -- "$cur" ) )
else
- _filedir '@(csw|CSW|ltp|LTP|pzx|PZX|spc|SPC|sta|STA|tap|TAP|tzx|TZX|wav|WAV|slt|SLT|sna?(pshot)|SNA?(PSHOT)|?(mgt)snp|?(MGT)SNP|sp|SP|szx|SZX|z80|Z80|zxs|ZXS|d40|D40|d80|D80|dsk|DSK|img|IMG|fdi|FDI|mgt|MGT|opd|OPD|opu|OPU|sad|SAD|scl|SCL|td0|TD0|udi|UDI|rzx|RZX|dck|DCK|hdf|HDF|mdr|MDR)'
+ _filedir '@(csw|CSW|ltp|LTP|pzx|PZX|spc|SPC|sta|STA|tap|TAP|tzx|TZX|wav|WAV|slt|SLT|sna?(pshot)|SNA?(PSHOT)|?(mgt)snp|?(MGT)SNP|sp|SP|szx|SZX|z80|Z80|zxs|ZXS|d40|D40|d80|D80|dsk|DSK|img|IMG|fdi|FDI|mgt|MGT|opd|OPD|opu|OPU|sad|SAD|scl|SCL|td0|TD0|trd|TRD|udi|UDI|rzx|RZX|dck|DCK|hdf|HDF|mdr|MDR)'
fi
} &&
complete -F _fuse -o filenames fuse
Modified: vendor/fuse-emulator/current/fuse/debugger/commandl.l
===================================================================
--- vendor/fuse-emulator/current/fuse/debugger/commandl.l 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/debugger/commandl.l 2016-06-06 13:23:18 UTC (rev 805)
@@ -2,7 +2,7 @@
Copyright (c) 2002-2013 Philip Kendall
Copyright (c) 2015 Sergio Baldoví
- $Id: commandl.l 5518 2016-05-23 19:12:31Z pak21 $
+ $Id: commandl.l 5539 2016-05-29 10:49:51Z 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
@@ -47,7 +47,7 @@
%}
-ID [a-z][a-z0-9]+
+ID [a-z]([a-z0-9]|\\[ ])+
%option caseless
@@ -124,8 +124,8 @@
"+" { return '+'; }
"-" { return '-'; }
-"*" { yylval.token = '*'; return TIMES_DIVIDE; }
-"/" { yylval.token = '/'; return TIMES_DIVIDE; }
+"*" { return '*'; }
+"/" { return '/'; }
"&" { return '&'; }
"^" { return '^'; }
@@ -146,7 +146,20 @@
if( YY_START == COMMANDSTATE1 ) BEGIN( COMMANDSTATE2 );
return NUMBER; }
-{ID} { yylval.string = mempool_strdup( debugger_memory_pool, yytext ); return STRING; }
+{ID} { char *dest, *source;
+ yylval.string = mempool_malloc( debugger_memory_pool, strlen( yytext ) + 1 );
+ /* remove escape characters */
+ dest = yylval.string;
+ source = yytext;
+ while( *source ) {
+ if( *source != '\\' ) {
+ *dest++ = *source;
+ }
+ source++;
+ }
+ *dest = '\0';
+ return STRING; }
+
${ID} { yylval.string = mempool_strdup( debugger_memory_pool, yytext + 1 ); return VARIABLE; }
\n { return '\n'; }
Modified: vendor/fuse-emulator/current/fuse/debugger/commandy.y
===================================================================
--- vendor/fuse-emulator/current/fuse/debugger/commandy.y 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/debugger/commandy.y 2016-06-06 13:23:18 UTC (rev 805)
@@ -2,7 +2,7 @@
Copyright (c) 2002-2015 Philip Kendall
Copyright (c) 2015 Sergio Baldoví
- $Id: commandy.y 5518 2016-05-23 19:12:31Z pak21 $
+ $Id: commandy.y 5539 2016-05-29 10:49:51Z 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
@@ -72,7 +72,6 @@
%token <token> COMPARISON /* < > <= >= */
%token <token> EQUALITY /* == != */
%token <token> NEGATE /* ! ~ */
-%token <token> TIMES_DIVIDE /* * / */
%token BASE
%token BREAK
@@ -138,7 +137,7 @@
%left EQUALITY
%left COMPARISON
%left '+' '-'
-%left TIMES_DIVIDE
+%left '*' '/'
%right NEGATE /* Unary minus, unary plus, !, ~ */
/* High precedence */
@@ -169,6 +168,10 @@
debugger_breakpoint_add_event( DEBUGGER_BREAKPOINT_TYPE_EVENT,
$3, $5, 0, $1, $6 );
}
+ | breakpointlife EVENT STRING ':' '*' optionalcondition {
+ debugger_breakpoint_add_event( DEBUGGER_BREAKPOINT_TYPE_EVENT,
+ $3, "*", 0, $1, $6 );
+ }
| CLEAR numberorpc { debugger_breakpoint_clear( $2 ); }
| COMMANDS number '\n' debuggercommands DEBUGGER_END { debugger_breakpoint_set_commands( $2, $4 ); }
| CONDITION NUMBER expressionornull {
@@ -268,10 +271,14 @@
$$ = debugger_expression_new_binaryop( '-', $1, $3, debugger_memory_pool );
if( !$$ ) YYABORT;
}
- | expression TIMES_DIVIDE expression {
- $$ = debugger_expression_new_binaryop( $2, $1, $3, debugger_memory_pool );
+ | expression '*' expression {
+ $$ = debugger_expression_new_binaryop( '*', $1, $3, debugger_memory_pool );
if( !$$ ) YYABORT;
}
+ | expression '/' expression {
+ $$ = debugger_expression_new_binaryop( '/', $1, $3, debugger_memory_pool );
+ if( !$$ ) YYABORT;
+ }
| expression EQUALITY expression {
$$ = debugger_expression_new_binaryop( $2, $1, $3, debugger_memory_pool );
if( !$$ ) YYABORT;
Modified: vendor/fuse-emulator/current/fuse/debugger/event.c
===================================================================
--- vendor/fuse-emulator/current/fuse/debugger/event.c 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/debugger/event.c 2016-06-06 13:23:18 UTC (rev 805)
@@ -65,6 +65,7 @@
{
if( strcasecmp( type, event->type ) ) return 0;
if( strcmp( detail, "*" ) == 0 ) return 1;
+ if( strcmp( event->detail, "*" ) == 0 ) return 1;
return strcasecmp( detail, event->detail ) == 0;
}
Modified: vendor/fuse-emulator/current/fuse/debugger/expression.c
===================================================================
--- vendor/fuse-emulator/current/fuse/debugger/expression.c 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/debugger/expression.c 2016-06-06 13:23:18 UTC (rev 805)
@@ -367,8 +367,14 @@
case '*': return debugger_expression_evaluate( binary->op1 ) *
debugger_expression_evaluate( binary->op2 );
- case '/': return debugger_expression_evaluate( binary->op1 ) /
- debugger_expression_evaluate( binary->op2 );
+ case '/': {
+ libspectrum_dword op2 = debugger_expression_evaluate( binary->op2 );
+ if( op2 == 0 ) {
+ ui_error( UI_ERROR_ERROR, "divide by 0" );
+ return 0;
+ }
+ return debugger_expression_evaluate( binary->op1 ) / op2;
+ }
case DEBUGGER_TOKEN_EQUAL_TO:
return debugger_expression_evaluate( binary->op1 ) ==
Modified: vendor/fuse-emulator/current/fuse/fuse.c
===================================================================
--- vendor/fuse-emulator/current/fuse/fuse.c 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/fuse.c 2016-06-06 13:23:18 UTC (rev 805)
@@ -617,13 +617,11 @@
start_files->disk_beta = filename; break;
case LIBSPECTRUM_CLASS_DISK_GENERIC:
- if( machine_current->machine == LIBSPECTRUM_MACHINE_PLUS3 ||
- machine_current->machine == LIBSPECTRUM_MACHINE_PLUS2A )
+ if( machine_current->capabilities &
+ LIBSPECTRUM_MACHINE_CAPABILITY_PLUS3_DISK )
start_files->disk_plus3 = filename;
- else if( machine_current->machine == LIBSPECTRUM_MACHINE_PENT ||
- machine_current->machine == LIBSPECTRUM_MACHINE_PENT512 ||
- machine_current->machine == LIBSPECTRUM_MACHINE_PENT1024 ||
- machine_current->machine == LIBSPECTRUM_MACHINE_SCORP )
+ else if( machine_current->capabilities &
+ LIBSPECTRUM_MACHINE_CAPABILITY_TRDOS_DISK )
start_files->disk_beta = filename;
else {
if( periph_is_active( PERIPH_TYPE_BETA128 ) )
Modified: vendor/fuse-emulator/current/fuse/hacking/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse/hacking/ChangeLog 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/hacking/ChangeLog 2016-06-06 13:23:18 UTC (rev 805)
@@ -5097,7 +5097,7 @@
20160503 peripherals/usource.c: add support for Currah uSource snapshots (patch
#363) (Fred and Sergio).
20160503 z80/z80c: complete revert accurate emulation of the HALT instruction
- in [r5160] as it causes [bugs:#316] and there is no current resolution
+ in [r5160] as it causes [bugs:#329] and there is no current resolution
(Fred).
20160508 peripherals/disk/beta.c: don't enable the Beta128 interface when
loading a snapshot on a machine with Beta built-in (fixes bug #342)
@@ -5163,3 +5163,56 @@
format (Sergio).
20160523 compat.h,settings.pl: use Windows line endings for plain text settings
(Sergio).
+20160524 rzx.c: use SZX format for the initial snapshot in RZX files (more from
+ bug #304) (Sergio).
+20160526 debugger/commandl.l,man/fuse.1: allow strings with escaped spaces in
+ the debugger (bug #337) (Sergio).
+20160528 ChangeLog: add even more recent changes (Fred).
+20160529 Makefile.am,lib/Makefile.am,z80/Makefile.am: distribute
+ m4/ax_create_stdint_h.m4,lib/tests/success.d80.bz2 and z80/tests/README
+ (Sergio).
+20160529 debugger/{commandl.l,commandy.y,event.c}: make wildcard events work
+ (fixes bug #349) (thanks, Sergio) (Phil).
+20160529 ChangeLog: add even more recent changes (Fred).
+20160529 README,man/fuse.1: update release dates (Fred).
+20160529 configure.ac: mark release as 1.2.0-pre1 (Fred).
+20160530 configure.ac: update more copyright dates (Sergio).
+20160530 z80/z80_ops.c: revert don't trap on breakpoints whilst halted in
+ [r5171] as it contributes to [bugs:#329] and there is no current
+ resolution (thanks, Guesser) (Fred).
+20160530 ChangeLog: remove reference to trap on breakpoints (Fred).
+20160530 ChangeLog: try to gather changes to related areas (Fred).
+20160531 svg.[hc],menu.c: tidy up svg_capture_mode (Fred).
+20160531 ui/ui.h: remove prototypes for obsolete functions (Fred).
+20160531 rzx.c: remove local arguments shadowing globals (Fred).
+20160531 z80/z80.c: remove local argument shadowing global (Fred).
+20160531 svg.c: don't declare svg_capture_mode when we don't have libxml2
+ (Fred).
+20160601 ChangeLog: fix typos (Fred).
+20160601 man/fuse.1: fix typo (Fred).
+20160601 menu.c,rzx.c: always report an error if we fail to continue a RZX
+ (Fred).
+20160601 fuse.c: use capabilities to decide whether a machine with a suitable
+ disk interface is currently running (Fred).
+20160601 AUTHORS: fix typo (Fred).
+20160602 ChangeLog: add Richard's full name, and tweak description as per
+ his advice (Phil).
+20160603 ChangeLog: fix spacing (Sergio).
+20160604 data/shell-completion/bash/fuse: add TRD file extension to bash
+ completion and remove wrong options (Sergio).
+20160604 data/shell-completion/bash/fuse: remove shebang in bash completion. The
+ script is meant to be sourced, not executed (Sergio).
+20160604 README: update list of supported interfaces (Sergio).
+20160604 debugger/expression.c: avoid doing divide by zero in debugger
+ expressions (fixes bug #350) (Fred).
+20160604 tape.c: fix use of tape traps if VERIFY is requested (thanks, Alberto
+ Garcia) (more from patch #337) (Fred).
+20160606 ui/{fb,gtk,sdl,svga,widget,wii,win32,xlib}/Makefile.am,z80/Makefile.am:
+ fix VPATH builds without dependency tracking (patch #368) (Alberto
+ Garcia).
+20160606 ChangeLog: add more recent changes (Sergio).
+20160606 ChangeLog: elaborate a bit more on the changes to contended memory for
+ Timex models (Fuse has changed all of them to follow the TS2068)
+ (Fred).
+20160606 ChangeLog,README,configure.ac,man/fuse.1: update release dates and mark
+ this release as 1.2.0 (Fred).
Modified: vendor/fuse-emulator/current/fuse/lib/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/lib/Makefile.am 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/lib/Makefile.am 2016-06-06 13:23:18 UTC (rev 805)
@@ -2,7 +2,7 @@
## Copyright (c) 1999-2004 Philip Kendall
## Copyright (c) 2015 Sergio Baldoví
-## $Id: Makefile.am 5434 2016-05-01 04:22:45Z fredm $
+## $Id: Makefile.am 5537 2016-05-29 06:17:00Z 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
@@ -82,6 +82,7 @@
lib_tests = \
lib/tests/fatware-success.hdf.bz2 \
lib/tests/idedos-success.hdf.bz2 \
+ lib/tests/success.d80.bz2 \
lib/tests/success.mdr \
lib/tests/success.mgt.bz2 \
lib/tests/success.opd \
Modified: vendor/fuse-emulator/current/fuse/man/fuse.1
===================================================================
--- vendor/fuse-emulator/current/fuse/man/fuse.1 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/man/fuse.1 2016-06-06 13:23:18 UTC (rev 805)
@@ -23,7 +23,7 @@
.\" E-mail: phi...@sh...
.\"
.\"
-.TH fuse 1 "24th May, 2013" "Version 1.2.0" "Emulators"
+.TH fuse 1 "6th June, 2016" "Version 1.2.0" "Emulators"
.\"
.\"------------------------------------------------------------------
.\"
@@ -4537,10 +4537,10 @@
.RI ` ROM '
sources (e.g. offset 0x1234 in ROM\ 1 is specified as
.RI ` ROM:1:0x1234 "')."
-Another available sources are:
+Other available sources are:
.RI ` Betadisk "',"
-.RI ` "Didaktik RAM" "',"
-.RI ` "Didaktik ROM" "',"
+.RI ` "Didaktik 80 RAM" "',"
+.RI ` "Didaktik 80 ROM" "',"
.RI ` "DISCiPLE RAM" "',"
.RI ` "DISCiPLE ROM" "',"
.RI ` "DivIDE EPROM" "',"
@@ -4554,9 +4554,12 @@
.RI ` Spectranet "',"
.RI ` "Timex Dock" "',"
.RI ` "Timex EXROM" "',"
+.RI ` uSource "',"
.RI ` ZXATASP '
and
.RI ` ZXCF "'."
+Please, note that spaces in memory sources should be escaped, e.g.,
+`break Didaktik\\\ 80\\\ ROM:0:0x1234'.
The 48K machines are treated as having a permanent
mapping of page\ 5 at 0x4000, page\ 2 at 0x8000 and page\ 0 at 0xC000;
the 16K\ Spectrum is treated as having page\ 5 at 0x4000 and no page at
Modified: vendor/fuse-emulator/current/fuse/menu.c
===================================================================
--- vendor/fuse-emulator/current/fuse/menu.c 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/menu.c 2016-06-06 13:23:18 UTC (rev 805)
@@ -771,8 +771,7 @@
if( !filename ) { fuse_emulation_unpause(); return; }
ui_menu_activate( UI_MENU_ITEM_FILE_SVG_CAPTURE, 1 );
- svg_capture_mode = SVG_CAPTURE_LINES;
- svg_startcapture( filename );
+ svg_startcapture( filename, SVG_CAPTURE_LINES );
fuse_emulation_unpause();
}
@@ -791,8 +790,7 @@
if( !filename ) { fuse_emulation_unpause(); return; }
ui_menu_activate( UI_MENU_ITEM_FILE_SVG_CAPTURE, 1 );
- svg_capture_mode = SVG_CAPTURE_DOTS;
- svg_startcapture( filename );
+ svg_startcapture( filename, SVG_CAPTURE_DOTS );
fuse_emulation_unpause();
}
@@ -920,6 +918,7 @@
MENU_CALLBACK( menu_file_recording_continuerecording )
{
char *rzx_filename;
+ int error;
if( rzx_playback || rzx_recording ) return;
@@ -928,8 +927,12 @@
rzx_filename = ui_get_open_filename( "Fuse - Continue Recording" );
if( !rzx_filename ) { fuse_emulation_unpause(); return; }
- rzx_continue_recording( rzx_filename );
+ error = rzx_continue_recording( rzx_filename );
+ if( error != LIBSPECTRUM_ERROR_NONE ) {
+ ui_error( UI_ERROR_WARNING, "RZX file cannot be continued" );
+ }
+
libspectrum_free( rzx_filename );
fuse_emulation_unpause();
Modified: vendor/fuse-emulator/current/fuse/rzx.c
===================================================================
--- vendor/fuse-emulator/current/fuse/rzx.c 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/rzx.c 2016-06-06 13:23:18 UTC (rev 805)
@@ -109,8 +109,8 @@
int end_event;
-static int start_playback( libspectrum_rzx *rzx );
-static void start_recording( libspectrum_rzx *rzx, int competition_mode );
+static int start_playback( libspectrum_rzx *from_rzx );
+static void start_recording( libspectrum_rzx *to_rzx, int competition_mode );
static int recording_frame( void );
static int playback_frame( void );
static int counter_reset( void );
@@ -133,7 +133,7 @@
}
static int
-rzx_add_snap( libspectrum_rzx *rzx, int automatic )
+rzx_add_snap( libspectrum_rzx *to_rzx, int automatic )
{
int error;
libspectrum_snap *snap = libspectrum_snap_alloc();
@@ -144,7 +144,7 @@
return error;
}
- error = libspectrum_rzx_add_snap( rzx, snap, automatic );
+ error = libspectrum_rzx_add_snap( to_rzx, snap, automatic );
if( error ) {
libspectrum_snap_free( snap );
return error;
@@ -208,7 +208,7 @@
length = 0;
buffer = NULL;
libspec_error = libspectrum_rzx_write(
- &buffer, &length, rzx, LIBSPECTRUM_ID_UNKNOWN, fuse_creator,
+ &buffer, &length, rzx, LIBSPECTRUM_ID_SNAPSHOT_SZX, fuse_creator,
settings_current.rzx_compression, rzx_competition_mode ? &rzx_key : NULL
);
if( libspec_error != LIBSPECTRUM_ERROR_NONE ) {
@@ -335,12 +335,12 @@
}
static int
-start_playback( libspectrum_rzx *rzx )
+start_playback( libspectrum_rzx *from_rzx )
{
int error;
libspectrum_snap *snap;
- error = libspectrum_rzx_start_playback( rzx, 0, &snap );
+ error = libspectrum_rzx_start_playback( from_rzx, 0, &snap );
if( error ) return error;
if( snap ) {
@@ -354,8 +354,8 @@
/* Add a sentinel event to prevent tstates overrun (bug #1057471) */
event_add( RZX_SENTINEL_TIME, sentinel_event );
- tstates = libspectrum_rzx_tstates( rzx );
- rzx_instruction_count = libspectrum_rzx_instructions( rzx );
+ tstates = libspectrum_rzx_tstates( from_rzx );
+ rzx_instruction_count = libspectrum_rzx_instructions( from_rzx );
rzx_playback = 1;
counter_reset();
@@ -408,9 +408,9 @@
}
static void
-start_recording( libspectrum_rzx *rzx, int competition_mode )
+start_recording( libspectrum_rzx *to_rzx, int competition_mode )
{
- libspectrum_rzx_start_input( rzx, tstates );
+ libspectrum_rzx_start_input( to_rzx, tstates );
counter_reset();
rzx_in_count = 0;
@@ -471,7 +471,6 @@
error = snapshot_copy_from( snap );
if( error ) return error;
} else {
- ui_error( UI_ERROR_WARNING, "RZX file cannot be continued" );
libspectrum_free( rzx_filename );
libspectrum_rzx_free( rzx );
return 1;
@@ -515,7 +514,7 @@
length = 0;
buffer = NULL;
libspec_error = libspectrum_rzx_write(
- &buffer, &length, rzx, LIBSPECTRUM_ID_UNKNOWN, fuse_creator,
+ &buffer, &length, rzx, LIBSPECTRUM_ID_SNAPSHOT_SZX, fuse_creator,
settings_current.rzx_compression, rzx_competition_mode ? &rzx_key : NULL
);
if( libspec_error != LIBSPECTRUM_ERROR_NONE ) {
@@ -751,13 +750,13 @@
}
static GSList*
-get_rollback_list( libspectrum_rzx *rzx )
+get_rollback_list( libspectrum_rzx *from_rzx )
{
libspectrum_rzx_iterator it;
GSList *rollback_points;
size_t frames;
- it = libspectrum_rzx_iterator_begin( rzx );
+ it = libspectrum_rzx_iterator_begin( from_rzx );
rollback_points = NULL;
frames = 0;
Modified: vendor/fuse-emulator/current/fuse/svg.c
===================================================================
--- vendor/fuse-emulator/current/fuse/svg.c 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/svg.c 2016-06-06 13:23:18 UTC (rev 805)
@@ -3,7 +3,7 @@
Copyright (c) 2014 Stefano Bodrato
Portions taken from svgwrite.c, (c) J.J. Green 2005
- $Id: svg.c 5385 2016-04-24 11:52:46Z fredm $
+ $Id: svg.c 5563 2016-05-31 12:59:48Z 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
@@ -50,11 +50,10 @@
#define BUFSZ 128
int svg_capture_active = 0;
-int svg_capture_mode = SVG_CAPTURE_LINES;
-
#ifdef HAVE_LIB_XML2
+static svg_capture_type svg_capture_mode = SVG_CAPTURE_LINES;
static char *svg_fname;
static char *svg_fnameroot;
@@ -315,11 +314,14 @@
+/* some init, open file (name)*/
void
-svg_startcapture( const char *name ) /* some init, open file (name)*/
+svg_startcapture( const char *name, svg_capture_type mode )
{
if( !svg_capture_active ) {
+ svg_capture_mode = mode;
+
if( name == NULL || *name == '\0' )
name = "fuse";
@@ -638,7 +640,7 @@
if( ( machine_current->machine == LIBSPECTRUM_MACHINE_TS2068 ) ||
( machine_current->machine == LIBSPECTRUM_MACHINE_TC2068 ) ) {
- if( ( svg_capture_mode == SVG_CAPTURE_DOTS) && ( z80.pc.w == 0x263e ) )
+ if( ( svg_capture_mode == SVG_CAPTURE_DOTS ) && ( z80.pc.w == 0x263e ) )
svg_capture_draw();
if( ( svg_capture_mode == SVG_CAPTURE_LINES ) &&
Modified: vendor/fuse-emulator/current/fuse/svg.h
===================================================================
--- vendor/fuse-emulator/current/fuse/svg.h 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/svg.h 2016-06-06 13:23:18 UTC (rev 805)
@@ -3,7 +3,7 @@
Copyright (c) 2014 Stefano Bodrato
Portions taken from svgwrite.c, (c) J.J. Green 2005
- $Id: svg.h 5314 2015-08-23 22:27:39Z sbaldovi $
+ $Id: svg.h 5559 2016-05-31 11:14:00Z 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
@@ -30,16 +30,15 @@
extern int svg_capture_active; /* SVG capture enabled? */
-extern void svg_startcapture( const char *name );
+typedef enum svg_capture_type {
+ SVG_CAPTURE_DOTS,
+ SVG_CAPTURE_LINES,
+} svg_capture_type;
-extern void svg_stopcapture( void );
+void svg_startcapture( const char *name, svg_capture_type mode );
+void svg_stopcapture( void );
void svg_capture( void );
void svg_capture_end( void );
-#define SVG_CAPTURE_DOTS 1
-#define SVG_CAPTURE_LINES 2
-
-extern int svg_capture_mode; /* SVG capture enabled? */
-
#endif /* #ifndef FUSE_SVG_H */
Modified: vendor/fuse-emulator/current/fuse/tape.c
===================================================================
--- vendor/fuse-emulator/current/fuse/tape.c 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/tape.c 2016-06-06 13:23:18 UTC (rev 805)
@@ -364,12 +364,6 @@
return -1;
}
- /* Verify? For now don't run the traps in that situation */
- if( !(F_ & FLAG_C) ) {
- tape_play( 1 );
- return -1;
- }
-
/* We don't properly handle the case of partial loading, so don't run
the traps in that situation */
if( libspectrum_tape_block_data_length( block ) != DE + 2 ) {
@@ -413,7 +407,7 @@
trap_load_block( libspectrum_tape_block *block )
{
libspectrum_byte parity, *data;
- int i = 0, length, read;
+ int i = 0, length, read, verify;
/* On exit:
* A = calculated parity byte if parity checked, else 0 (CHECKME)
@@ -447,6 +441,7 @@
return 0;
}
+ verify = !(F_ & FLAG_C);
i = A_; /* i = A' (flag byte) */
AF_ = 0x0145;
A = 0;
@@ -462,20 +457,20 @@
L = data[read - 1];
/* Loading or verifying determined by the carry flag of F' */
- if( F_ & FLAG_C ) {
+ if( verify ) { /* verifying */
for( i = 0; i < read; i++ ) {
parity ^= data[i];
- writebyte_internal( IX+i, data[i] );
- }
- } else { /* verifying */
- for( i = 0; i < read; i++ ) {
- parity ^= data[i];
if( data[i] != readbyte_internal(IX+i) ) {
/* Verification failure */
L = data[i];
goto error_ret;
}
}
+ } else {
+ for( i = 0; i < read; i++ ) {
+ parity ^= data[i];
+ writebyte_internal( IX+i, data[i] );
+ }
}
/* At this point, i == number of bytes actually read or verified */
Modified: vendor/fuse-emulator/current/fuse/ui/fb/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/fb/Makefile.am 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/ui/fb/Makefile.am 2016-06-06 13:23:18 UTC (rev 805)
@@ -2,7 +2,7 @@
## Copyright (c) 2001-2004 Philip Kendall
## Copyright (c) 2015 Sergio Baldoví
-## $Id: Makefile.am 5434 2016-05-01 04:22:45Z fredm $
+## $Id: Makefile.am 5589 2016-06-05 22:14:19Z 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
@@ -47,4 +47,5 @@
ui_fb_built = ui/fb/keysyms.c
ui/fb/keysyms.c: $(srcdir)/keysyms.pl $(srcdir)/keysyms.dat
+ @$(MKDIR_P) ui/fb
$(AM_V_GEN)$(PERL) -I$(srcdir)/perl $(srcdir)/keysyms.pl fb $(srcdir)/keysyms.dat > $@.tmp && mv $@.tmp $@
Modified: vendor/fuse-emulator/current/fuse/ui/gtk/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/gtk/Makefile.am 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/ui/gtk/Makefile.am 2016-06-06 13:23:18 UTC (rev 805)
@@ -2,7 +2,7 @@
## Copyright (c) 2001-2004 Philip Kendall
## Copyright (c) 2015 Sergio Baldoví
-## $Id: Makefile.am 5434 2016-05-01 04:22:45Z fredm $
+## $Id: Makefile.am 5589 2016-06-05 22:14:19Z 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
@@ -77,16 +77,21 @@
ui/gtk/options-header.pl
ui/gtk/keysyms.c: $(srcdir)/keysyms.pl $(srcdir)/keysyms.dat
+ @$(MKDIR_P) ui/gtk
$(AM_V_GEN)$(PERL) -I$(srcdir)/perl $(srcdir)/keysyms.pl gtk $(srcdir)/keysyms.dat > $@.tmp && mv $@.tmp $@
ui/gtk/menu_data.c: $(srcdir)/perl/cpp-perl.pl $(srcdir)/menu_data.pl $(srcdir)/menu_data.dat config.h
+ @$(MKDIR_P) ui/gtk
$(AM_V_GEN)$(PERL) $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/menu_data.dat | $(PERL) -I$(srcdir)/perl $(srcdir)/menu_data.pl gtk c > $@.tmp && mv $@.tmp $@
ui/gtk/menu_data.ui: $(srcdir)/perl/cpp-perl.pl $(srcdir)/menu_data.pl $(srcdir)/menu_data.dat config.h
+ @$(MKDIR_P) ui/gtk
$(AM_V_GEN)$(PERL) $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/menu_data.dat | $(PERL) -I$(srcdir)/perl $(srcdir)/menu_data.pl gtk ui > $@.tmp && mv $@.tmp $@
ui/gtk/options.c: $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/gtk/options.pl $(srcdir)/ui/options.dat $(srcdir)/perl/Fuse.pm $(srcdir)/perl/Fuse/Dialog.pm
+ @$(MKDIR_P) ui/gtk
$(AM_V_GEN)$(PERL) $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/options.dat | $(PERL) -I$(srcdir)/perl $(srcdir)/ui/gtk/options.pl - > $@.tmp && mv $@.tmp $@
ui/gtk/options_internals.h: $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/gtk/options-header.pl $(srcdir)/ui/options.dat $(srcdir)/perl/Fuse.pm $(srcdir)/perl/Fuse/Dialog.pm
+ @$(MKDIR_P) ui/gtk
$(AM_V_GEN)$(PERL) $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/options.dat | $(PERL) -I$(srcdir)/perl $(srcdir)/ui/gtk/options-header.pl - > $@.tmp && mv $@.tmp $@
Modified: vendor/fuse-emulator/current/fuse/ui/sdl/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/sdl/Makefile.am 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/ui/sdl/Makefile.am 2016-06-06 13:23:18 UTC (rev 805)
@@ -2,7 +2,7 @@
## Copyright (c) 2001-2004 Philip Kendall
## Copyright (c) 2015 Sergio Baldoví
-## $Id: Makefile.am 5434 2016-05-01 04:22:45Z fredm $
+## $Id: Makefile.am 5589 2016-06-05 22:14:19Z 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
@@ -46,4 +46,5 @@
ui_sdl_built = ui/sdl/keysyms.c
ui/sdl/keysyms.c: $(srcdir)/keysyms.pl $(srcdir)/keysyms.dat
+ @$(MKDIR_P) ui/sdl
$(AM_V_GEN)$(PERL) -I$(srcdir)/perl $(srcdir)/keysyms.pl sdl $(srcdir)/keysyms.dat > $@.tmp && mv $@.tmp $@
Modified: vendor/fuse-emulator/current/fuse/ui/svga/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/svga/Makefile.am 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/ui/svga/Makefile.am 2016-06-06 13:23:18 UTC (rev 805)
@@ -2,7 +2,7 @@
## Copyright (c) 2001-2004 Philip Kendall
## Copyright (c) 2015 Sergio Baldoví
-## $Id: Makefile.am 5434 2016-05-01 04:22:45Z fredm $
+## $Id: Makefile.am 5589 2016-06-05 22:14:19Z 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
@@ -45,4 +45,5 @@
ui_svga_built = ui/svga/keysyms.c
ui/svga/keysyms.c: $(srcdir)/keysyms.pl $(srcdir)/keysyms.dat
+ @$(MKDIR_P) ui/svga
$(AM_V_GEN)$(PERL) -I$(srcdir)/perl $(srcdir)/keysyms.pl svga $(srcdir)/keysyms.dat > $@.tmp && mv $@.tmp $@
Modified: vendor/fuse-emulator/current/fuse/ui/ui.h
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/ui.h 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/ui/ui.h 2016-06-06 13:23:18 UTC (rev 805)
@@ -121,12 +121,6 @@
/* Write the current tape out */
int ui_tape_write( void );
-/* Write a +3, Beta or +D disk out */
-int ui_plus3_disk_write( specplus3_drive_number which, int saveas );
-int ui_beta_disk_write( beta_drive_number which, int saveas );
-int ui_opus_disk_write( opus_drive_number which, int saveas );
-int ui_plusd_disk_write( plusd_drive_number which, int saveas );
-int ui_disciple_disk_write( disciple_drive_number which, int saveas );
int ui_mdr_write( int which, int saveas );
/* Get a rollback point from the given list */
Modified: vendor/fuse-emulator/current/fuse/ui/widget/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/widget/Makefile.am 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/ui/widget/Makefile.am 2016-06-06 13:23:18 UTC (rev 805)
@@ -2,7 +2,7 @@
## Copyright (c) 2001,2002 Philip Kendall
## Copyright (c) 2015 Sergio Baldoví
-## $Id: Makefile.am 5434 2016-05-01 04:22:45Z fredm $
+## $Id: Makefile.am 5589 2016-06-05 22:14:19Z 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
@@ -68,13 +68,17 @@
ui/widget/options-header.pl
ui/widget/menu_data.c: $(srcdir)/perl/cpp-perl.pl $(srcdir)/menu_data.dat $(srcdir)/menu_data.pl config.h
+ @$(MKDIR_P) ui/widget
$(AM_V_GEN)$(PERL) $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/menu_data.dat | $(PERL) -I$(srcdir)/perl $(srcdir)/menu_data.pl widget > $@.tmp && mv $@.tmp $@
ui/widget/options.c: $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/widget/options.pl $(srcdir)/ui/options.dat $(srcdir)/perl/Fuse.pm $(srcdir)/perl/Fuse/Dialog.pm
+ @$(MKDIR_P) ui/widget
$(AM_V_GEN)$(PERL) $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/options.dat | $(PERL) -I$(srcdir)/perl $(srcdir)/ui/widget/options.pl - > $@.tmp && mv $@.tmp $@
ui/widget/options_internals.h: $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/widget/options-header.pl $(srcdir)/ui/options.dat $(srcdir)/perl/Fuse.pm $(srcdir)/perl/Fuse/Dialog.pm
+ @$(MKDIR_P) ui/widget
$(AM_V_GEN)$(PERL) $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/options.dat | $(PERL) -I$(srcdir)/perl $(srcdir)/ui/widget/options-header.pl - > $@.tmp && mv $@.tmp $@
ui/widget/fuse.font: $(srcdir)/ui/widget/mkfusefont.pl $(srcdir)/ui/widget/fuse.font.sbf
+ @$(MKDIR_P) ui/widget
$(AM_V_GEN)$(PERL) $(srcdir)/ui/widget/mkfusefont.pl $(srcdir)/ui/widget/fuse.font.sbf > $@.tmp && mv $@.tmp $@
Modified: vendor/fuse-emulator/current/fuse/ui/wii/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/wii/Makefile.am 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/ui/wii/Makefile.am 2016-06-06 13:23:18 UTC (rev 805)
@@ -2,7 +2,7 @@
## Copyright (c) 2001-2009 Philip Kendall, Bjoern Giesler
## Copyright (c) 2015 Sergio Baldoví
-## $Id: Makefile.am 5434 2016-05-01 04:22:45Z fredm $
+## $Id: Makefile.am 5589 2016-06-05 22:14:19Z 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
@@ -48,4 +48,5 @@
ui_wii_built = ui/wii/keysyms.c
ui/wii/keysyms.c: $(srcdir)/keysyms.pl $(srcdir)/keysyms.dat
+ @$(MKDIR_P) ui/wii
$(AM_V_GEN)$(PERL) -I$(srcdir)/perl $(srcdir)/keysyms.pl wii $(srcdir)/keysyms.dat > $@.tmp && mv $@.tmp $@
Modified: vendor/fuse-emulator/current/fuse/ui/win32/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/win32/Makefile.am 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/ui/win32/Makefile.am 2016-06-06 13:23:18 UTC (rev 805)
@@ -2,7 +2,7 @@
## Copyright (c) 2001-2008 Philip Kendall
## Copyright (c) 2015 Sergio Baldoví
-## $Id: Makefile.am 5434 2016-05-01 04:22:45Z fredm $
+## $Id: Makefile.am 5589 2016-06-05 22:14:19Z 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
@@ -118,22 +118,29 @@
$(ui_win32_rc_files)
ui/win32/keysyms.c: $(srcdir)/keysyms.pl $(srcdir)/keysyms.dat
+ @$(MKDIR_P) ui/win32
$(AM_V_GEN)$(PERL) -I$(srcdir)/perl $(srcdir)/keysyms.pl win32 $(srcdir)/keysyms.dat > $@.tmp && mv $@.tmp $@
ui/win32/menu_data.c: $(srcdir)/perl/cpp-perl.pl $(srcdir)/menu_data.pl $(srcdir)/menu_data.dat config.h
+ @$(MKDIR_P) ui/win32
$(AM_V_GEN)$(PERL) $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/menu_data.dat | $(PERL) -I$(srcdir)/perl $(srcdir)/menu_data.pl win32 c > $@.tmp && mv $@.tmp $@
ui/win32/menu_data.h: $(srcdir)/perl/cpp-perl.pl $(srcdir)/menu_data.pl $(srcdir)/menu_data.dat config.h
+ @$(MKDIR_P) ui/win32
$(AM_V_GEN)$(PERL) $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/menu_data.dat | $(PERL) -I$(srcdir)/perl $(srcdir)/menu_data.pl win32 h > $@.tmp && mv $@.tmp $@
ui/win32/menu_data.rc: $(srcdir)/perl/cpp-perl.pl $(srcdir)/menu_data.pl $(srcdir)/menu_data.dat config.h
+ @$(MKDIR_P) ui/win32
$(AM_V_GEN)$(PERL) $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/menu_data.dat | $(PERL) -I$(srcdir)/perl $(srcdir)/menu_data.pl win32 rc > $@.tmp && mv $@.tmp $@
ui/win32/options.c: $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/win32/options.pl $(srcdir)/ui/options.dat $(srcdir)/perl/Fuse.pm $(srcdir)/perl/Fuse/Dialog.pm
+ @$(MKDIR_P) ui/win32
$(AM_V_GEN)$(PERL) $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/options.dat | $(PERL) -I$(srcdir)/perl $(srcdir)/ui/win32/options.pl - > $@.tmp && mv $@.tmp $@
ui/win32/options_internals.h: $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/win32/options-header.pl $(srcdir)/ui/options.dat $(srcdir)/perl/Fuse.pm $(srcdir)/perl/Fuse/Dialog.pm
+ @$(MKDIR_P) ui/win32
$(AM_V_GEN)$(PERL) $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/options.dat | $(PERL) -I$(srcdir)/perl $(srcdir)/ui/win32/options-header.pl - > $@.tmp && mv $@.tmp $@
ui/win32/options.rc: $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/win32/options-resource.pl $(srcdir)/ui/options.dat $(srcdir)/perl/Fuse.pm $(srcdir)/perl/Fuse/Dialog.pm
+ @$(MKDIR_P) ui/win32
$(AM_V_GEN)$(PERL) $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/options.dat | $(PERL) -I$(srcdir)/perl $(srcdir)/ui/win32/options-resource.pl - > $@.tmp && mv $@.tmp $@
Modified: vendor/fuse-emulator/current/fuse/ui/xlib/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/xlib/Makefile.am 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/ui/xlib/Makefile.am 2016-06-06 13:23:18 UTC (rev 805)
@@ -2,7 +2,7 @@
## Copyright (c) 2001-2004 Philip Kendall
## Copyright (c) 2015 Sergio Baldoví
-## $Id: Makefile.am 5434 2016-05-01 04:22:45Z fredm $
+## $Id: Makefile.am 5589 2016-06-05 22:14:19Z 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
@@ -55,7 +55,9 @@
ui/xlib/xstatusbar.pl
ui/xlib/keysyms.c: $(srcdir)/keysyms.pl $(srcdir)/keysyms.dat
+ @$(MKDIR_P) ui/xlib
$(AM_V_GEN)$(PERL) -I$(srcdir)/perl $(srcdir)/keysyms.pl x $(srcdir)/keysyms.dat > $@.tmp && mv $@.tmp $@
ui/xlib/xpixmaps.c: ui/xlib/xstatusbar.pl $(srcdir)/ui/gtk/pixmaps.c
+ @$(MKDIR_P) ui/xlib
$(AM_V_GEN)$(PERL) -I$(srcdir)/perl $(srcdir)/ui/xlib/xstatusbar.pl $(srcdir)/ui/gtk/pixmaps.c > $@.tmp && mv $@.tmp $@
Modified: vendor/fuse-emulator/current/fuse/z80/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/z80/Makefile.am 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/z80/Makefile.am 2016-06-06 13:23:18 UTC (rev 805)
@@ -2,7 +2,7 @@
## Copyright (c) 2001-2003 Philip Kendall
## Copyright (c) 2015-2016 Sergio Baldoví
-## $Id: Makefile.am 5434 2016-05-01 04:22:45Z fredm $
+## $Id: Makefile.am 5589 2016-06-05 22:14:19Z 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
@@ -34,18 +34,23 @@
z80/z80_ed.c
z80/opcodes_base.c: $(srcdir)/z80/z80.pl $(srcdir)/z80/opcodes_base.dat
+ @$(MKDIR_P) z80
$(AM_V_GEN)$(PERL) -I$(srcdir)/perl $(srcdir)/z80/z80.pl $(srcdir)/z80/opcodes_base.dat > $@.tmp && mv $@.tmp $@
z80/z80_cb.c: $(srcdir)/z80/z80.pl $(srcdir)/z80/opcodes_cb.dat
+ @$(MKDIR_P) z80
$(AM_V_GEN)$(PERL) -I$(srcdir)/perl $(srcdir)/z80/z80.pl $(srcdir)/z80/opcodes_cb.dat > $@.tmp && mv $@.tmp $@
z80/z80_ddfd.c: $(srcdir)/z80/z80.pl $(srcdir)/z80/opcodes_ddfd.dat
+ @$(MKDIR_P) z80
$(AM_V_GEN)$(PERL) -I$(srcdir)/perl $(srcdir)/z80/z80.pl $(srcdir)/z80/opcodes_ddfd.dat > $@.tmp && mv $@.tmp $@
z80/z80_ddfdcb.c: $(srcdir)/z80/z80.pl $(srcdir)/z80/opcodes_ddfd.dat
+ @$(MKDIR_P) z80
$(AM_V_GEN)$(PERL) -I$(srcdir)/perl $(srcdir)/z80/z80.pl $(srcdir)/z80/opcodes_ddfdcb.dat > $@.tmp && mv $@.tmp $@
z80/z80_ed.c: $(srcdir)/z80/z80.pl $(srcdir)/z80/opcodes_ed.dat
+ @$(MKDIR_P) z80
$(AM_V_GEN)$(PERL) -I$(srcdir)/perl $(srcdir)/z80/z80.pl $(srcdir)/z80/opcodes_ed.dat > $@.tmp && mv $@.tmp $@
noinst_HEADERS += \
@@ -54,8 +59,9 @@
z80/z80_macros.h
EXTRA_DIST += \
+ z80/tests/README \
+ z80/tests/tests.expected \
z80/tests/tests.in \
- z80/tests/tests.expected \
z80/opcodes_base.c \
z80/opcodes_base.dat \
z80/opcodes_cb.dat \
Modified: vendor/fuse-emulator/current/fuse/z80/z80.c
===================================================================
--- vendor/fuse-emulator/current/fuse/z80/z80.c 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/z80/z80.c 2016-06-06 13:23:18 UTC (rev 805)
@@ -84,7 +84,8 @@
};
static void
-z80_interrupt_event_fn( libspectrum_dword tstates, int type, void *user_data )
+z80_interrupt_event_fn( libspectrum_dword event_tstates, int type,
+ void *user_data )
{
/* Retriggered interrupt; firstly, ignore if we're doing RZX playback
as all interrupts are generated by the RZX code */
Modified: vendor/fuse-emulator/current/fuse/z80/z80_ops.c
===================================================================
--- vendor/fuse-emulator/current/fuse/z80/z80_ops.c 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/z80/z80_ops.c 2016-06-06 13:23:18 UTC (rev 805)
@@ -161,7 +161,7 @@
/* Check if the debugger should become active at this point */
CHECK( debugger, debugger_mode != DEBUGGER_MODE_INACTIVE )
- if( !z80.halted && debugger_check( DEBUGGER_BREAKPOINT_TYPE_EXECUTE, PC ) )
+ if( debugger_check( DEBUGGER_BREAKPOINT_TYPE_EXECUTE, PC ) )
debugger_trap();
END_CHECK
Modified: vendor/fuse-emulator/current/libspectrum/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/libspectrum/ChangeLog 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/libspectrum/ChangeLog 2016-06-06 13:23:18 UTC (rev 805)
@@ -1,4 +1,4 @@
-2016-??-?? Philip Kendall <phi...@sh...>
+2016-06-06 Philip Kendall <phi...@sh...>
* libspectrum 1.2.0 released.
@@ -34,7 +34,7 @@
* Add pkg.m4 for PKG_CHECK_MODULES in case the platform doesn't have
pkg-config installed (Sergio Baldoví).
* Enable silent rules for perl and windres commands (Sergio Baldoví).
- * Allow for the inital_level of PZX data blocks to have the default
+ * Allow for the initial_level of PZX data blocks to have the default
value (Fredrick Meunier).
2013-05-24 Philip Kendall <phi...@sh...>
@@ -379,5 +379,5 @@
* libspectrum separated from Fuse just before the 0.5.0 release of
Fuse; see Fuse's ChangeLog for changes up to this point
-$Id: ChangeLog 5413 2016-04-27 11:50:17Z fredm $
+$Id: ChangeLog 5592 2016-06-06 10:37:02Z fredm $
Modified: vendor/fuse-emulator/current/libspectrum/README
===================================================================
--- vendor/fuse-emulator/current/libspectrum/README 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/libspectrum/README 2016-06-06 13:23:18 UTC (rev 805)
@@ -67,6 +67,6 @@
Then, type "make" and if everything went well, "make install".
Philip Kendall <phi...@sh...>
-24th May, 2013
+6th June, 2016
-$Id: README 5428 2016-04-30 07:03:25Z sbaldovi $
+$Id: README 5592 2016-06-06 10:37:02Z fredm $
Modified: vendor/fuse-emulator/current/libspectrum/configure.ac
===================================================================
--- vendor/fuse-emulator/current/libspectrum/configure.ac 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/libspectrum/configure.ac 2016-06-06 13:23:18 UTC (rev 805)
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
dnl Copyright (c) 1999-2013 Philip Kendall
-dnl $Id: configure.ac 5422 2016-04-29 12:54:59Z fredm $
+dnl $Id: configure.ac 5592 2016-06-06 10:37:02Z fredm $
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
Modified: vendor/fuse-emulator/current/libspectrum/doc/libspectrum.3
===================================================================
--- vendor/fuse-emulator/current/libspectrum/doc/libspectrum.3 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/libspectrum/doc/libspectrum.3 2016-06-06 13:23:18 UTC (rev 805)
@@ -22,7 +22,7 @@
.\" E-mail: phi...@sh...
.\"
.\"
-.TH libspectrum 3 "24th May, 2013" "Version 1.2.0" "Emulators"
+.TH libspectrum 3 "6th June, 2016" "Version 1.2.0" "Emulators"
.\"
.\"------------------------------------------------------------------
.\"
Modified: vendor/fuse-emulator/current/libspectrum/doc/libspectrum.txt
===================================================================
--- vendor/fuse-emulator/current/libspectrum/doc/libspectrum.txt 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/libspectrum/doc/libspectrum.txt 2016-06-06 13:23:18 UTC (rev 805)
@@ -10,8 +10,8 @@
* Tape images: .tzx, .tap, .spc, .sta and .ltp (read/write) and
.pzx, Warajevo .tap, Z80Em and CSW version 1 (read only).
* Input recordings: .rzx (read/write).
-* Disk images: .dsk (both plain and extended), .fdi, .sad, .scl, .td0,
- .trd and .udi (identification only).
+* Disk images: .dsk (both plain and extended), .d40, .d80, .fdi, .img, .mgt,
+ .opd, .sad, .scl, .td0, .trd and .udi (identification only).
* Timex cartridges: .dck (read only).
* IDE hard disk images: .hdf (read/write).
* Microdrive cartridge images: .mdr (read/write).
@@ -1867,4 +1867,4 @@
Write `data' to register `reg' of the IDE channel `chn'.
-$Id: libspectrum.txt 5486 2016-05-14 12:39:37Z fredm $
+$Id: libspectrum.txt 5552 2016-05-29 22:08:09Z sbaldovi $
Modified: vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog 2016-06-06 13:23:18 UTC (rev 805)
@@ -1067,3 +1067,8 @@
(patch #364) (Fred).
20160521 szx.c: reset uncompressed size when loading Op...
[truncated message content] |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X