Update to Fuse 1.6.0

build/Makefile.common

@@ -27,6 +27,12 @@ SOURCES_C += $(CORE_DIR)/src/compat/paths.c
 SOURCES_C += $(CORE_DIR)/src/compat/sound.c
 SOURCES_C += $(CORE_DIR)/src/compat/timer.c
 SOURCES_C += $(CORE_DIR)/src/compat/ui.c
+#SOURCES_C += $(CORE_DIR)/src/compat/socket.c
+
+SOURCES_C += $(CORE_DIR)/src/fuse/getopt.c
+SOURCES_C += $(CORE_DIR)/src/fuse/getopt1.c
+
+SOURCES_C += $(CORE_DIR)/fuse/infrastructure/startup_manager.c
 
 SOURCES_C += $(CORE_DIR)/fuse/debugger/breakpoint.c
 SOURCES_C += $(CORE_DIR)/fuse/debugger/command.c
@@ -37,6 +43,7 @@ SOURCES_C += $(CORE_DIR)/fuse/debugger/disassemble.c
 SOURCES_C += $(CORE_DIR)/fuse/debugger/event.c
 SOURCES_C += $(CORE_DIR)/fuse/debugger/expression.c
 SOURCES_C += $(CORE_DIR)/fuse/debugger/variable.c
+SOURCES_C += $(CORE_DIR)/fuse/debugger/system_variable.c
 
 SOURCES_C += $(CORE_DIR)/fuse/machines/machines_periph.c
 SOURCES_C += $(CORE_DIR)/fuse/machines/pentagon.c
@@ -65,6 +72,8 @@ SOURCES_C += $(CORE_DIR)/fuse/peripherals/disk/opus.c
 SOURCES_C += $(CORE_DIR)/fuse/peripherals/disk/plusd.c
 SOURCES_C += $(CORE_DIR)/fuse/peripherals/disk/upd_fdc.c
 SOURCES_C += $(CORE_DIR)/fuse/peripherals/disk/wd_fdc.c
+SOURCES_C += $(CORE_DIR)/fuse/peripherals/disk/didaktik.c
+SOURCES_C += $(CORE_DIR)/fuse/peripherals/disk/trdos.c
 
 SOURCES_C += $(CORE_DIR)/fuse/peripherals/flash/am29f010.c
 
@@ -73,8 +82,13 @@ SOURCES_C += $(CORE_DIR)/fuse/peripherals/ide/ide.c
 SOURCES_C += $(CORE_DIR)/fuse/peripherals/ide/simpleide.c
 SOURCES_C += $(CORE_DIR)/fuse/peripherals/ide/zxatasp.c
 SOURCES_C += $(CORE_DIR)/fuse/peripherals/ide/zxcf.c
+SOURCES_C += $(CORE_DIR)/fuse/peripherals/ide/divmmc.c
+SOURCES_C += $(CORE_DIR)/fuse/peripherals/ide/divxxx.c
+SOURCES_C += $(CORE_DIR)/fuse/peripherals/ide/zxmmc.c
 
 #SOURCES_C += $(CORE_DIR)/fuse/peripherals/nic/enc28j60.c
+#SOURCES_C += $(CORE_DIR)/fuse/peripherals/nic/w5100.c
+#SOURCES_C += $(CORE_DIR)/fuse/peripherals/nic/w5100_socket.c
 
 SOURCES_C += $(CORE_DIR)/fuse/peripherals/ay.c
 SOURCES_C += $(CORE_DIR)/fuse/peripherals/dck.c
@@ -90,6 +104,10 @@ SOURCES_C += $(CORE_DIR)/fuse/peripherals/speccyboot.c
 SOURCES_C += $(CORE_DIR)/fuse/peripherals/specdrum.c
 SOURCES_C += $(CORE_DIR)/fuse/peripherals/spectranet.c
 SOURCES_C += $(CORE_DIR)/fuse/peripherals/ula.c
+SOURCES_C += $(CORE_DIR)/fuse/peripherals/multiface.c
+SOURCES_C += $(CORE_DIR)/fuse/peripherals/ttx2000s.c
+SOURCES_C += $(CORE_DIR)/fuse/peripherals/usource.c
+SOURCES_C += $(CORE_DIR)/fuse/peripherals/covox.c
 
 SOURCES_C += $(CORE_DIR)/fuse/pokefinder/pokefinder.c
 SOURCES_C += $(CORE_DIR)/fuse/pokefinder/pokemem.c
@@ -115,13 +133,16 @@ SOURCES_C += $(CORE_DIR)/fuse/ui/widget/roms.c
 SOURCES_C += $(CORE_DIR)/fuse/ui/widget/select.c
 SOURCES_C += $(CORE_DIR)/fuse/ui/widget/text.c
 SOURCES_C += $(CORE_DIR)/fuse/ui/widget/widget.c
+SOURCES_C += $(CORE_DIR)/fuse/ui/widget/about.c
+SOURCES_C += $(CORE_DIR)/fuse/ui/widget/binary.c
 
 SOURCES_C += $(CORE_DIR)/fuse/ui/scaler/scaler.c
 
 SOURCES_C += $(CORE_DIR)/fuse/unittests/unittests.c
 
 SOURCES_C += $(CORE_DIR)/fuse/z80/z80.c
 SOURCES_C += $(CORE_DIR)/fuse/z80/z80_ops.c
+SOURCES_C += $(CORE_DIR)/fuse/z80/z80_debugger_variables.c
 
 SOURCES_C += $(CORE_DIR)/fuse/display.c
 SOURCES_C += $(CORE_DIR)/fuse/event.c
@@ -130,7 +151,7 @@ SOURCES_C += $(CORE_DIR)/fuse/input.c
 SOURCES_C += $(CORE_DIR)/fuse/keyboard.c
 SOURCES_C += $(CORE_DIR)/fuse/loader.c
 SOURCES_C += $(CORE_DIR)/fuse/machine.c
-SOURCES_C += $(CORE_DIR)/fuse/memory.c
+SOURCES_C += $(CORE_DIR)/fuse/memory_pages.c
 SOURCES_C += $(CORE_DIR)/fuse/mempool.c
 SOURCES_C += $(CORE_DIR)/fuse/menu.c
 SOURCES_C += $(CORE_DIR)/fuse/movie.c
@@ -150,7 +171,11 @@ SOURCES_C += $(CORE_DIR)/fuse/tape.c
 SOURCES_C += $(CORE_DIR)/src/fuse/ui.c
 SOURCES_C += $(CORE_DIR)/fuse/uidisplay.c
 SOURCES_C += $(CORE_DIR)/src/fuse/utils.c
+SOURCES_C += $(CORE_DIR)/fuse/phantom_typist.c
+SOURCES_C += $(CORE_DIR)/fuse/uimedia.c
+SOURCES_C += $(CORE_DIR)/fuse/svg.c
 
+SOURCES_C += $(CORE_DIR)/libspectrum/buffer.c
 SOURCES_C += $(CORE_DIR)/libspectrum/bzip2.c
 SOURCES_C += $(CORE_DIR)/libspectrum/creator.c
 SOURCES_C += $(CORE_DIR)/libspectrum/crypto.c
@@ -189,6 +214,8 @@ SOURCES_C += $(CORE_DIR)/libspectrum/z80.c
 SOURCES_C += $(CORE_DIR)/libspectrum/z80em.c
 SOURCES_C += $(CORE_DIR)/libspectrum/zlib.c
 SOURCES_C += $(CORE_DIR)/libspectrum/zxs.c
+SOURCES_C += $(CORE_DIR)/libspectrum/mmc.c
+SOURCES_C += $(CORE_DIR)/libspectrum/zip.c
 
 SOURCES_C += $(CORE_DIR)/zlib/adler32.c
 SOURCES_C += $(CORE_DIR)/zlib/compress.c

fuse/.gitignore

@@ -0,0 +1,107 @@
+*~
+*.swp
+*.orig
+.DS_Store
+.vscode
+/aclocal.m4
+/autom4te.cache
+/compile
+/config.cache
+/config.guess
+/config.h
+/config.h.in
+/config.log
+/config.status
+/config.sub
+/configure
+/cscope.out
+/data/fuse.desktop
+/data/fuse.xml
+/data/shell-completion/bash.txt
+/data/shell-completion/man.txt
+/data/shell-completion/settings.txt
+/data/win32/fuse.manifest
+/data/win32/installer.nsi
+/debugger/commandl.c
+/debugger/commandy.c
+/debugger/commandy.h
+/depcomp
+.deps
+.dirstamp
+/fuse
+/fuse.dSYM
+/fuse.exe
+/.gdb_history
+/install-sh
+.libs
+/lib/*.szx
+/lib/tests/fatware-success.hdf
+/lib/tests/idedos-success.hdf
+/lib/tests/success.d80
+/lib/tests/success.mgt
+/libtool
+/ltmain.sh
+/m4/libtool.m4
+/m4/lt~obsolete.m4
+/m4/ltoptions.m4
+/m4/ltsugar.m4
+/m4/ltversion.m4
+/Makefile
+/Makefile.in
+/missing
+/mkinstalldirs
+*.o
+/options.h
+/roms/128p-0.rom
+/roms/128p-1.rom
+/roms/256s-0.rom
+/roms/256s-1.rom
+/roms/256s-2.rom
+/roms/256s-3.rom
+/roms/didaktik80.rom
+/roms/gluck.rom
+/roms/if1-2.rom
+/roms/opus.rom
+/roms/trdos.rom
+/roms/usource.rom
+/settings.c
+/settings.h
+/stamp-h
+/stamp-h1
+/stamp-h.in
+tags
+/ui/fb/keysyms.c
+/ui/gtk/keysyms.c
+/ui/gtk/menu_data.c
+/ui/gtk/menu_data.ui
+/ui/gtk/options.c
+/ui/gtk/options.h
+/ui/gtk/options_internals.h
+/ui/null/options.c
+/ui/sdl/keysyms.c
+/ui/svga/keysyms.c
+/ui/widget/fuse.font
+/ui/widget/menu_data.c
+/ui/widget/options.c
+/ui/widget/options.h
+/ui/widget/options_internals.h
+/ui/wii/keysyms.c
+/ui/win32/keysyms.c
+/ui/win32/menu_data.c
+/ui/win32/menu_data.h
+/ui/win32/menu_data.rc
+/ui/win32/options.c
+/ui/win32/options_internals.h
+/ui/win32/options.rc
+/ui/xlib/keysyms.c
+/ui/xlib/xpixmaps.c
+/ylwrap
+/z80/coretest
+/z80/coretest.exe
+/z80/coretest.out
+/z80/opcodes_base.c
+/z80/tests.actual
+/z80/z80_cb.c
+/z80/z80_ddfd.c
+/z80/z80_ddfdcb.c
+/z80/z80_ed.c

fuse/AUTHORS

@@ -11,7 +11,7 @@ Fuse has been brought to you by:
 
 * 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,
@@ -32,7 +32,7 @@ Fuse has been brought to you by:
 * Matthew Wescott: the AY logging code.
 
 * Marek Januszewski: Some patches making Fuse much closer to compiling under
-  Win32, and fixing up the GTK+ 2.0 interface.
+  Win32, and fixing up the GTK 2.0 interface.
 
 * Sergio Baldoví: improvements to the Win32 UI.
 
@@ -41,8 +41,8 @@ Fuse has been brought to you by:
 
 * 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 ALSA and ao sound drivers.
 
 * Bjoern Giesler: the original Wii port.
 
@@ -53,5 +53,3 @@ Fuse has been brought to you by:
 * Patrik Persson: the SpeccyBoot Ethernet emulation.
 
 * Philip Kendall: everything else.
-
-$Id: AUTHORS 4972 2013-05-19 16:46:43Z zubzero $