Thread: [Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx: [375] branches/fusegl
Brought to you by:
fredm
Menu
▾
▴
fuse-for-macosx-commits
|
From: <fr...@us...> - 2007-06-10 13:58:19
|
Revision: 375
http://svn.sourceforge.net/fuse-for-macosx/?rev=375&view=rev
Author: fredm
Date: 2007-06-10 06:58:18 -0700 (Sun, 10 Jun 2007)
Log Message:
-----------
Merge up to trunk r369.
Modified Paths:
--------------
branches/fusegl/FuseImporter/FuseImporter.xcodeproj/project.pbxproj
branches/fusegl/FuseImporter/LibspectrumMetadataImporter.m
branches/fusegl/FuseImporter/libspectrum.h
branches/fusegl/fuse/ChangeLog
branches/fusegl/fuse/Makefile.am
branches/fusegl/fuse/README
branches/fusegl/fuse/autogen.sh
branches/fusegl/fuse/ay.c
branches/fusegl/fuse/ay.h
branches/fusegl/fuse/compat/Makefile.am
branches/fusegl/fuse/compat/dirname.c
branches/fusegl/fuse/compat.h
branches/fusegl/fuse/configure.in
branches/fusegl/fuse/dck.c
branches/fusegl/fuse/dck.h
branches/fusegl/fuse/debugger/Makefile.am
branches/fusegl/fuse/debugger/breakpoint.c
branches/fusegl/fuse/debugger/breakpoint.h
branches/fusegl/fuse/debugger/command.c
branches/fusegl/fuse/debugger/commandl.l
branches/fusegl/fuse/debugger/commandy.y
branches/fusegl/fuse/debugger/debugger.c
branches/fusegl/fuse/debugger/debugger.h
branches/fusegl/fuse/debugger/debugger_internals.h
branches/fusegl/fuse/debugger/disassemble.c
branches/fusegl/fuse/debugger/expression.c
branches/fusegl/fuse/display.c
branches/fusegl/fuse/display.h
branches/fusegl/fuse/divide.c
branches/fusegl/fuse/divide.h
branches/fusegl/fuse/event.c
branches/fusegl/fuse/event.h
branches/fusegl/fuse/fuse.cpp
branches/fusegl/fuse/fuse.h
branches/fusegl/fuse/fusepb/Credits.html
branches/fusegl/fuse/fusepb/English.lproj/InfoPlist.strings
branches/fusegl/fuse/fusepb/Info-Fuse.plist
branches/fusegl/fuse/fusepb/nibs/Preferences.nib/info.nib
branches/fusegl/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib
branches/fusegl/fuse/fusepb/resources/Fuse Help/html/about.html
branches/fusegl/fuse/fusepb/resources/Fuse Help/html/changelog.html
branches/fusegl/fuse/fusepb/resources/Fuse Help/html/filters.html
branches/fusegl/fuse/fusepb/resources/Fuse Help/html/preferences.html
branches/fusegl/fuse/fusepb/resources/Fuse Help/html/tocstart.html
branches/fusegl/fuse/fusepb/settings_cocoa.h
branches/fusegl/fuse/hacking/ChangeLog
branches/fusegl/fuse/hacking/Makefile.am
branches/fusegl/fuse/hacking/cvs-tags
branches/fusegl/fuse/ide.c
branches/fusegl/fuse/ide.h
branches/fusegl/fuse/if1.c
branches/fusegl/fuse/if1.h
branches/fusegl/fuse/if2.c
branches/fusegl/fuse/if2.h
branches/fusegl/fuse/input.c
branches/fusegl/fuse/input.h
branches/fusegl/fuse/joystick.c
branches/fusegl/fuse/joystick.h
branches/fusegl/fuse/keyboard.c
branches/fusegl/fuse/keyboard.h
branches/fusegl/fuse/keysyms.dat
branches/fusegl/fuse/keysyms.pl
branches/fusegl/fuse/lib/Makefile.am
branches/fusegl/fuse/loader.c
branches/fusegl/fuse/loader.h
branches/fusegl/fuse/machine.c
branches/fusegl/fuse/machine.h
branches/fusegl/fuse/machines/Makefile.am
branches/fusegl/fuse/machines/machines.h
branches/fusegl/fuse/machines/pentagon.c
branches/fusegl/fuse/machines/scorpion.c
branches/fusegl/fuse/machines/scorpion.h
branches/fusegl/fuse/machines/spec128.c
branches/fusegl/fuse/machines/spec128.h
branches/fusegl/fuse/machines/spec16.c
branches/fusegl/fuse/machines/spec48.c
branches/fusegl/fuse/machines/spec48.h
branches/fusegl/fuse/machines/spec_se.c
branches/fusegl/fuse/machines/specplus2.c
branches/fusegl/fuse/machines/specplus2a.c
branches/fusegl/fuse/machines/specplus3.c
branches/fusegl/fuse/machines/specplus3.h
branches/fusegl/fuse/machines/specplus3e.c
branches/fusegl/fuse/machines/tc2048.c
branches/fusegl/fuse/machines/tc2068.c
branches/fusegl/fuse/machines/tc2068.h
branches/fusegl/fuse/machines/ts2068.c
branches/fusegl/fuse/man/Makefile.am
branches/fusegl/fuse/man/fuse.1
branches/fusegl/fuse/memory.c
branches/fusegl/fuse/memory.h
branches/fusegl/fuse/menu.c
branches/fusegl/fuse/menu.h
branches/fusegl/fuse/menu_data.c
branches/fusegl/fuse/menu_data.pl
branches/fusegl/fuse/periph.c
branches/fusegl/fuse/periph.h
branches/fusegl/fuse/perl/Fuse/Dialog.pm
branches/fusegl/fuse/perl/Fuse/Makefile.am
branches/fusegl/fuse/perl/Fuse.pm
branches/fusegl/fuse/perl/Makefile.am
branches/fusegl/fuse/perl/cpp-perl.pl
branches/fusegl/fuse/pokefinder/Makefile.am
branches/fusegl/fuse/pokefinder/pokefinder.c
branches/fusegl/fuse/pokefinder/pokefinder.h
branches/fusegl/fuse/printer.c
branches/fusegl/fuse/printer.h
branches/fusegl/fuse/profile.c
branches/fusegl/fuse/profile.h
branches/fusegl/fuse/psg.c
branches/fusegl/fuse/psg.h
branches/fusegl/fuse/roms/Makefile.am
branches/fusegl/fuse/rzx.c
branches/fusegl/fuse/rzx.h
branches/fusegl/fuse/scld.c
branches/fusegl/fuse/screenshot.c
branches/fusegl/fuse/screenshot.h
branches/fusegl/fuse/settings-header.pl
branches/fusegl/fuse/settings.dat
branches/fusegl/fuse/settings.pl
branches/fusegl/fuse/simpleide.c
branches/fusegl/fuse/slt.c
branches/fusegl/fuse/slt.h
branches/fusegl/fuse/snapshot.c
branches/fusegl/fuse/snapshot.h
branches/fusegl/fuse/sound/Makefile.am
branches/fusegl/fuse/sound/aosound.c
branches/fusegl/fuse/sound/dxsound.c
branches/fusegl/fuse/sound/lowlevel.h
branches/fusegl/fuse/sound/sdlsound.c
branches/fusegl/fuse/sound.c
branches/fusegl/fuse/sound.h
branches/fusegl/fuse/spectrum.c
branches/fusegl/fuse/spectrum.h
branches/fusegl/fuse/tape.c
branches/fusegl/fuse/tape.h
branches/fusegl/fuse/timer.c
branches/fusegl/fuse/timer.h
branches/fusegl/fuse/trdos.c
branches/fusegl/fuse/trdos.h
branches/fusegl/fuse/ui/Makefile.am
branches/fusegl/fuse/ui/aalib/Makefile.am
branches/fusegl/fuse/ui/aalib/aalibdisplay.c
branches/fusegl/fuse/ui/aalib/aalibkeyboard.c
branches/fusegl/fuse/ui/aalib/aalibkeyboard.h
branches/fusegl/fuse/ui/aalib/aalibui.c
branches/fusegl/fuse/ui/aalib/aalibui.h
branches/fusegl/fuse/ui/aalib/error.c
branches/fusegl/fuse/ui/cocoa/cocoadisplay.m
branches/fusegl/fuse/ui/fb/Makefile.am
branches/fusegl/fuse/ui/fb/fbdisplay.c
branches/fusegl/fuse/ui/fb/fbdisplay.h
branches/fusegl/fuse/ui/fb/fbjoystick.c
branches/fusegl/fuse/ui/fb/fbkeyboard.c
branches/fusegl/fuse/ui/fb/fbkeyboard.h
branches/fusegl/fuse/ui/fb/fbui.c
branches/fusegl/fuse/ui/ggi/Makefile.am
branches/fusegl/fuse/ui/ggi/ggi_internals.h
branches/fusegl/fuse/ui/ggi/ggidisplay.c
branches/fusegl/fuse/ui/ggi/ggikeyboard.c
branches/fusegl/fuse/ui/ggi/ggiui.c
branches/fusegl/fuse/ui/gtk/Makefile.am
branches/fusegl/fuse/ui/gtk/binary.c
branches/fusegl/fuse/ui/gtk/browse.c
branches/fusegl/fuse/ui/gtk/confirm.c
branches/fusegl/fuse/ui/gtk/debugger.c
branches/fusegl/fuse/ui/gtk/fileselector.c
branches/fusegl/fuse/ui/gtk/gtkdisplay.c
branches/fusegl/fuse/ui/gtk/gtkinternals.h
branches/fusegl/fuse/ui/gtk/gtkjoystick.c
branches/fusegl/fuse/ui/gtk/gtkkeyboard.c
branches/fusegl/fuse/ui/gtk/gtkui.c
branches/fusegl/fuse/ui/gtk/memory.c
branches/fusegl/fuse/ui/gtk/options-header.pl
branches/fusegl/fuse/ui/gtk/options.pl
branches/fusegl/fuse/ui/gtk/picture.c
branches/fusegl/fuse/ui/gtk/pixmaps.c
branches/fusegl/fuse/ui/gtk/pokefinder.c
branches/fusegl/fuse/ui/gtk/rollback.c
branches/fusegl/fuse/ui/gtk/roms.c
branches/fusegl/fuse/ui/gtk/statusbar.c
branches/fusegl/fuse/ui/gtk/stock.c
branches/fusegl/fuse/ui/options.dat
branches/fusegl/fuse/ui/scaler/Makefile.am
branches/fusegl/fuse/ui/scaler/scaler.c
branches/fusegl/fuse/ui/scaler/scaler.h
branches/fusegl/fuse/ui/scaler/scaler_internals.h
branches/fusegl/fuse/ui/scaler/scalers.cpp
branches/fusegl/fuse/ui/sdl/Makefile.am
branches/fusegl/fuse/ui/sdl/sdldisplay.c
branches/fusegl/fuse/ui/sdl/sdldisplay.h
branches/fusegl/fuse/ui/sdl/sdljoystick.c
branches/fusegl/fuse/ui/sdl/sdljoystick.h
branches/fusegl/fuse/ui/sdl/sdlkeyboard.c
branches/fusegl/fuse/ui/sdl/sdlkeyboard.h
branches/fusegl/fuse/ui/sdl/sdlui.c
branches/fusegl/fuse/ui/svga/Makefile.am
branches/fusegl/fuse/ui/svga/svgadisplay.c
branches/fusegl/fuse/ui/svga/svgadisplay.h
branches/fusegl/fuse/ui/svga/svgajoystick.c
branches/fusegl/fuse/ui/svga/svgakeyboard.c
branches/fusegl/fuse/ui/svga/svgakeyboard.h
branches/fusegl/fuse/ui/svga/svgaui.c
branches/fusegl/fuse/ui/ui.h
branches/fusegl/fuse/ui/uidisplay.h
branches/fusegl/fuse/ui/uijoystick.c
branches/fusegl/fuse/ui/uijoystick.h
branches/fusegl/fuse/ui/win32/Makefile.am
branches/fusegl/fuse/ui/win32/debugger.c
branches/fusegl/fuse/ui/win32/debugger.h
branches/fusegl/fuse/ui/win32/debugger.rc
branches/fusegl/fuse/ui/win32/error.c
branches/fusegl/fuse/ui/win32/keysyms.c
branches/fusegl/fuse/ui/win32/menu_data.c
branches/fusegl/fuse/ui/win32/menu_data.h
branches/fusegl/fuse/ui/win32/menu_data.rc
branches/fusegl/fuse/ui/win32/pokefinder.c
branches/fusegl/fuse/ui/win32/pokefinder.h
branches/fusegl/fuse/ui/win32/pokefinder.rc
branches/fusegl/fuse/ui/win32/statusbar.c
branches/fusegl/fuse/ui/win32/win32display.c
branches/fusegl/fuse/ui/win32/win32display.h
branches/fusegl/fuse/ui/win32/win32internals.h
branches/fusegl/fuse/ui/win32/win32keyboard.c
branches/fusegl/fuse/ui/win32/win32keyboard.h
branches/fusegl/fuse/ui/win32/win32ui.c
branches/fusegl/fuse/ui/win32/win32ui.rc
branches/fusegl/fuse/ui/xlib/Makefile.am
branches/fusegl/fuse/ui/xlib/xdisplay.c
branches/fusegl/fuse/ui/xlib/xdisplay.h
branches/fusegl/fuse/ui/xlib/xerror.c
branches/fusegl/fuse/ui/xlib/xjoystick.c
branches/fusegl/fuse/ui/xlib/xkeyboard.c
branches/fusegl/fuse/ui/xlib/xkeyboard.h
branches/fusegl/fuse/ui/xlib/xui.c
branches/fusegl/fuse/ui/xlib/xui.h
branches/fusegl/fuse/ui.c
branches/fusegl/fuse/uidisplay.c
branches/fusegl/fuse/ula.c
branches/fusegl/fuse/ula.h
branches/fusegl/fuse/utils.c
branches/fusegl/fuse/utils.h
branches/fusegl/fuse/widget/Makefile.am
branches/fusegl/fuse/widget/browse.c
branches/fusegl/fuse/widget/debugger.c
branches/fusegl/fuse/widget/error.c
branches/fusegl/fuse/widget/filesel.c
branches/fusegl/fuse/widget/menu.c
branches/fusegl/fuse/widget/options-header.pl
branches/fusegl/fuse/widget/options.pl
branches/fusegl/fuse/widget/picture.c
branches/fusegl/fuse/widget/roms.c
branches/fusegl/fuse/widget/select.c
branches/fusegl/fuse/widget/text.c
branches/fusegl/fuse/widget/widget.c
branches/fusegl/fuse/widget/widget.h
branches/fusegl/fuse/widget/widget_internals.h
branches/fusegl/fuse/z80/Makefile.am
branches/fusegl/fuse/z80/coretest.c
branches/fusegl/fuse/z80/harness.pl
branches/fusegl/fuse/z80/tests/Makefile.am
branches/fusegl/fuse/z80/z80.c
branches/fusegl/fuse/z80/z80.h
branches/fusegl/fuse/z80/z80.pl
branches/fusegl/fuse/z80/z80_macros.h
branches/fusegl/fuse/z80/z80_ops.c
branches/fusegl/fuse/zxatasp.c
branches/fusegl/fuse/zxatasp.h
branches/fusegl/fuse/zxcf.c
branches/fusegl/fuse/zxcf.h
branches/fusegl/libspectrum/libspectrum/ChangeLog
branches/fusegl/libspectrum/libspectrum/Makefile.am
branches/fusegl/libspectrum/libspectrum/README
branches/fusegl/libspectrum/libspectrum/accessor.pl
branches/fusegl/libspectrum/libspectrum/autogen.sh
branches/fusegl/libspectrum/libspectrum/bzip2.c
branches/fusegl/libspectrum/libspectrum/configure.in
branches/fusegl/libspectrum/libspectrum/creator.c
branches/fusegl/libspectrum/libspectrum/crypto.c
branches/fusegl/libspectrum/libspectrum/dck.c
branches/fusegl/libspectrum/libspectrum/dll.c
branches/fusegl/libspectrum/libspectrum/doc/Makefile.am
branches/fusegl/libspectrum/libspectrum/doc/cvs-tags
branches/fusegl/libspectrum/libspectrum/doc/libspectrum.3
branches/fusegl/libspectrum/libspectrum/doc/libspectrum.txt
branches/fusegl/libspectrum/libspectrum/hacking/ChangeLog
branches/fusegl/libspectrum/libspectrum/ide.c
branches/fusegl/libspectrum/libspectrum/internals.h
branches/fusegl/libspectrum/libspectrum/libspectrum.c
branches/fusegl/libspectrum/libspectrum/libspectrum.h.in
branches/fusegl/libspectrum/libspectrum/libspectrum.qpg.in
branches/fusegl/libspectrum/libspectrum/make-perl.c
branches/fusegl/libspectrum/libspectrum/microdrive.c
branches/fusegl/libspectrum/libspectrum/myglib/Makefile.am
branches/fusegl/libspectrum/libspectrum/myglib/ghash.c
branches/fusegl/libspectrum/libspectrum/myglib/gslist.c
branches/fusegl/libspectrum/libspectrum/plusd.c
branches/fusegl/libspectrum/libspectrum/rzx.c
branches/fusegl/libspectrum/libspectrum/sna.c
branches/fusegl/libspectrum/libspectrum/snap_accessors.txt
branches/fusegl/libspectrum/libspectrum/snapshot.c
branches/fusegl/libspectrum/libspectrum/snp.c
branches/fusegl/libspectrum/libspectrum/sp.c
branches/fusegl/libspectrum/libspectrum/szx.c
branches/fusegl/libspectrum/libspectrum/tap.c
branches/fusegl/libspectrum/libspectrum/tape.c
branches/fusegl/libspectrum/libspectrum/tape_accessors.pl
branches/fusegl/libspectrum/libspectrum/tape_accessors.txt
branches/fusegl/libspectrum/libspectrum/tape_block.c
branches/fusegl/libspectrum/libspectrum/tape_block.h
branches/fusegl/libspectrum/libspectrum/tape_set.pl
branches/fusegl/libspectrum/libspectrum/timings.c
branches/fusegl/libspectrum/libspectrum/tzx_read.c
branches/fusegl/libspectrum/libspectrum/tzx_write.c
branches/fusegl/libspectrum/libspectrum/warajevo_read.c
branches/fusegl/libspectrum/libspectrum/z80.c
branches/fusegl/libspectrum/libspectrum/zlib.c
branches/fusegl/libspectrum/libspectrum/zxs.c
branches/fusegl/libspectrum/libspectrum.h
branches/fusegl/libspectrum/libspectrum.xcodeproj/project.pbxproj
Added Paths:
-----------
branches/fusegl/fuse/fusepb/resources/Fuse Help/html/divide.html
branches/fusegl/libspectrum/libspectrum/symbol_table.c
Modified: branches/fusegl/FuseImporter/FuseImporter.xcodeproj/project.pbxproj
===================================================================
--- branches/fusegl/FuseImporter/FuseImporter.xcodeproj/project.pbxproj 2007-06-10 01:40:41 UTC (rev 374)
+++ branches/fusegl/FuseImporter/FuseImporter.xcodeproj/project.pbxproj 2007-06-10 13:58:18 UTC (rev 375)
@@ -11,6 +11,7 @@
8D5B49A804867FD3000E48DA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 8D5B49A704867FD3000E48DA /* InfoPlist.strings */; };
B60E533A0827207800F2C004 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = B60E53390827207800F2C004 /* main.m */; };
B60E533C082720EC00F2C004 /* GetMetadataForFile.m in Sources */ = {isa = PBXBuildFile; fileRef = B60E533B082720EC00F2C004 /* GetMetadataForFile.m */; };
+ B62C1CD00B761515000BA4E0 /* symbol_table.c in Sources */ = {isa = PBXBuildFile; fileRef = B62C1CCF0B761515000BA4E0 /* symbol_table.c */; };
B639B7930A6BB2C100927E24 /* z80em.c in Sources */ = {isa = PBXBuildFile; fileRef = B639B7920A6BB2C100927E24 /* z80em.c */; };
B6687E140A607F1D005D0FDE /* libspectrum.h.in in Resources */ = {isa = PBXBuildFile; fileRef = B6687E130A607F1D005D0FDE /* libspectrum.h.in */; };
B69709730827C03F00904D8F /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B69709720827C03F00904D8F /* Foundation.framework */; };
@@ -110,6 +111,7 @@
8D576317048677EA00EA77CD /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
B60E53390827207800F2C004 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
B60E533B082720EC00F2C004 /* GetMetadataForFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GetMetadataForFile.m; sourceTree = "<group>"; };
+ B62C1CCF0B761515000BA4E0 /* symbol_table.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = symbol_table.c; path = ../../libspectrum/libspectrum/symbol_table.c; sourceTree = "<group>"; };
B639B7920A6BB2C100927E24 /* z80em.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = z80em.c; path = ../../libspectrum/libspectrum/z80em.c; sourceTree = "<group>"; };
B6687E130A607F1D005D0FDE /* libspectrum.h.in */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = libspectrum.h.in; path = ../../libspectrum/libspectrum/libspectrum.h.in; sourceTree = "<group>"; };
B69709720827C03F00904D8F /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
@@ -243,6 +245,7 @@
B6BF2A0B0A5FFD0100D16624 /* snapshot.c */,
B6BF2A0C0A5FFD0100D16624 /* snp.c */,
B6BF2A0D0A5FFD0100D16624 /* sp.c */,
+ B62C1CCF0B761515000BA4E0 /* symbol_table.c */,
B6BF2A0E0A5FFD0100D16624 /* szx.c */,
B6BF2A0F0A5FFD0100D16624 /* tap.c */,
B6BF2A100A5FFD0100D16624 /* tape.c */,
@@ -388,6 +391,7 @@
B6BF2A340A5FFD0100D16624 /* zlib.c in Sources */,
B6BF2A350A5FFD0100D16624 /* zxs.c in Sources */,
B639B7930A6BB2C100927E24 /* z80em.c in Sources */,
+ B62C1CD00B761515000BA4E0 /* symbol_table.c in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Modified: branches/fusegl/FuseImporter/LibspectrumMetadataImporter.m
===================================================================
--- branches/fusegl/FuseImporter/LibspectrumMetadataImporter.m 2007-06-10 01:40:41 UTC (rev 374)
+++ branches/fusegl/FuseImporter/LibspectrumMetadataImporter.m 2007-06-10 13:58:18 UTC (rev 375)
@@ -363,6 +363,9 @@
case LIBSPECTRUM_TAPE_BLOCK_RLE_PULSE:
break;
+
+ case LIBSPECTRUM_TAPE_BLOCK_GENERALISED_DATA:
+ break;
default:
NSLog(@"LibspectrumMetadataImporter: (Sorry -- can't handle that kind of block. Skipping it)\n");
Modified: branches/fusegl/FuseImporter/libspectrum.h
===================================================================
--- branches/fusegl/FuseImporter/libspectrum.h 2007-06-10 01:40:41 UTC (rev 374)
+++ branches/fusegl/FuseImporter/libspectrum.h 2007-06-10 13:58:18 UTC (rev 375)
@@ -1,7 +1,7 @@
/* libspectrum.h: the library for dealing with ZX Spectrum emulator files
- Copyright (c) 2001-2006 Philip Kendall, Darren Salt, Fredrick Meunier
+ Copyright (c) 2001-2007 Philip Kendall, Darren Salt, Fredrick Meunier
- $Id: libspectrum.h.in,v 1.134 2006/08/12 13:09:23 pak21 Exp $
+ $Id: libspectrum.h.in,v 1.141 2007/02/02 16:35:42 pak21 Exp $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -19,8 +19,7 @@
Author contact information:
- E-mail: pak...@sr...
- Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England
+ E-mail: phi...@sh...
*/
@@ -267,7 +266,7 @@
LIBSPECTRUM_ID_HARDDISK_HDF, /* .hdf hard disk image */
LIBSPECTRUM_ID_CARTRIDGE_IF2, /* .rom Interface II cartridge image */
- /* Below here, present only in [FIXME] and later */
+ /* Below here, present only in 0.3.0 and later */
LIBSPECTRUM_ID_MICRODRIVE_MDR, /* .mdr microdrive cartridge */
LIBSPECTRUM_ID_TAPE_CSW, /* .csw tape image */
@@ -298,7 +297,7 @@
LIBSPECTRUM_CLASS_HARDDISK, /* A hard disk image */
LIBSPECTRUM_CLASS_CARTRIDGE_IF2, /* Interface II cartridges */
- /* Below here, present only in [FIXME] and later */
+ /* Below here, present only in 0.3.0 and later */
LIBSPECTRUM_CLASS_MICRODRIVE, /* Microdrive cartridges */
@@ -688,6 +687,8 @@
LIBSPECTRUM_TAPE_BLOCK_PURE_DATA,
LIBSPECTRUM_TAPE_BLOCK_RAW_DATA,
+ LIBSPECTRUM_TAPE_BLOCK_GENERALISED_DATA = 0x19,
+
LIBSPECTRUM_TAPE_BLOCK_PAUSE = 0x20,
LIBSPECTRUM_TAPE_BLOCK_GROUP_START,
LIBSPECTRUM_TAPE_BLOCK_GROUP_END,
@@ -715,6 +716,7 @@
} libspectrum_tape_type;
typedef struct libspectrum_tape_block libspectrum_tape_block;
+typedef struct libspectrum_tape_generalised_data_symbol_table libspectrum_tape_generalised_data_symbol_table;
/* Something to step through all the blocks in a tape */
typedef struct _GSList *libspectrum_tape_iterator;
@@ -723,6 +725,9 @@
extern const int WIN32_DLL LIBSPECTRUM_TAPE_FLAGS_BLOCK; /* End of block */
extern const int WIN32_DLL LIBSPECTRUM_TAPE_FLAGS_STOP; /* Stop tape */
extern const int WIN32_DLL LIBSPECTRUM_TAPE_FLAGS_STOP48; /* Stop tape if in 48K mode */
+extern const int WIN32_DLL LIBSPECTRUM_TAPE_FLAGS_NO_EDGE; /* Edge isn't really an edge */
+extern const int WIN32_DLL LIBSPECTRUM_TAPE_FLAGS_LEVEL_LOW; /* Set level low */
+extern const int WIN32_DLL LIBSPECTRUM_TAPE_FLAGS_LEVEL_HIGH; /* Set level high */
/* The states which a block can be in */
typedef enum libspectrum_tape_state_type {
@@ -769,12 +774,16 @@
libspectrum_error WIN32_DLL libspectrum_tape_block_set_bit1_length( libspectrum_tape_block *block, libspectrum_dword bit1_length );
size_t WIN32_DLL libspectrum_tape_block_bits_in_last_byte( libspectrum_tape_block *block );
libspectrum_error WIN32_DLL libspectrum_tape_block_set_bits_in_last_byte( libspectrum_tape_block *block, size_t bits_in_last_byte );
+size_t WIN32_DLL libspectrum_tape_block_bits_per_data_symbol( libspectrum_tape_block *block );
+libspectrum_error WIN32_DLL libspectrum_tape_block_set_bits_per_data_symbol( libspectrum_tape_block *block, size_t bits_per_data_symbol );
size_t WIN32_DLL libspectrum_tape_block_count( libspectrum_tape_block *block );
libspectrum_error WIN32_DLL libspectrum_tape_block_set_count( libspectrum_tape_block *block, size_t count );
libspectrum_byte WIN32_DLL * libspectrum_tape_block_data( libspectrum_tape_block *block );
libspectrum_error WIN32_DLL libspectrum_tape_block_set_data( libspectrum_tape_block *block, libspectrum_byte* data );
size_t WIN32_DLL libspectrum_tape_block_data_length( libspectrum_tape_block *block );
libspectrum_error WIN32_DLL libspectrum_tape_block_set_data_length( libspectrum_tape_block *block, size_t data_length );
+libspectrum_tape_generalised_data_symbol_table WIN32_DLL * libspectrum_tape_block_data_table( libspectrum_tape_block *block );
+libspectrum_error WIN32_DLL libspectrum_tape_block_set_data_table( libspectrum_tape_block *block, libspectrum_tape_generalised_data_symbol_table* data_table );
int WIN32_DLL libspectrum_tape_block_ids( libspectrum_tape_block *block, size_t idx );
libspectrum_error WIN32_DLL libspectrum_tape_block_set_ids( libspectrum_tape_block *block, int *ids );
int WIN32_DLL libspectrum_tape_block_offset( libspectrum_tape_block *block );
@@ -787,6 +796,12 @@
libspectrum_error WIN32_DLL libspectrum_tape_block_set_pilot_length( libspectrum_tape_block *block, libspectrum_dword pilot_length );
size_t WIN32_DLL libspectrum_tape_block_pilot_pulses( libspectrum_tape_block *block );
libspectrum_error WIN32_DLL libspectrum_tape_block_set_pilot_pulses( libspectrum_tape_block *block, size_t pilot_pulses );
+libspectrum_word WIN32_DLL libspectrum_tape_block_pilot_repeats( libspectrum_tape_block *block, size_t idx );
+libspectrum_error WIN32_DLL libspectrum_tape_block_set_pilot_repeats( libspectrum_tape_block *block, libspectrum_word *pilot_repeats );
+libspectrum_byte WIN32_DLL libspectrum_tape_block_pilot_symbols( libspectrum_tape_block *block, size_t idx );
+libspectrum_error WIN32_DLL libspectrum_tape_block_set_pilot_symbols( libspectrum_tape_block *block, libspectrum_byte *pilot_symbols );
+libspectrum_tape_generalised_data_symbol_table WIN32_DLL * libspectrum_tape_block_pilot_table( libspectrum_tape_block *block );
+libspectrum_error WIN32_DLL libspectrum_tape_block_set_pilot_table( libspectrum_tape_block *block, libspectrum_tape_generalised_data_symbol_table* pilot_table );
libspectrum_dword WIN32_DLL libspectrum_tape_block_pulse_length( libspectrum_tape_block *block );
libspectrum_error WIN32_DLL libspectrum_tape_block_set_pulse_length( libspectrum_tape_block *block, libspectrum_dword pulse_length );
libspectrum_dword WIN32_DLL libspectrum_tape_block_pulse_lengths( libspectrum_tape_block *block, size_t idx );
@@ -891,6 +906,8 @@
libspectrum_warajevo_read( libspectrum_tape *tape,
const libspectrum_byte *buffer, size_t length );
+/*** Routines for iterating through a tape ***/
+
libspectrum_tape_block WIN32_DLL *
libspectrum_tape_iterator_init( libspectrum_tape_iterator *iterator,
libspectrum_tape *tape );
@@ -898,6 +915,29 @@
libspectrum_tape_block WIN32_DLL *
libspectrum_tape_iterator_next( libspectrum_tape_iterator *iterator );
+/*** Routines for handling the TZX generalised data block symbol table
+ structure ***/
+
+typedef enum libspectrum_tape_generalised_data_symbol_edge_type {
+
+ LIBSPECTRUM_TAPE_GENERALISED_DATA_SYMBOL_EDGE = 0x00,
+ LIBSPECTRUM_TAPE_GENERALISED_DATA_SYMBOL_NO_EDGE,
+ LIBSPECTRUM_TAPE_GENERALISED_DATA_SYMBOL_LOW,
+ LIBSPECTRUM_TAPE_GENERALISED_DATA_SYMBOL_HIGH,
+
+} libspectrum_tape_generalised_data_symbol_edge_type;
+
+typedef struct libspectrum_tape_generalised_data_symbol libspectrum_tape_generalised_data_symbol;
+
+libspectrum_dword libspectrum_tape_generalised_data_symbol_table_symbols_in_block( const libspectrum_tape_generalised_data_symbol_table *table );
+libspectrum_byte libspectrum_tape_generalised_data_symbol_table_max_pulses( const libspectrum_tape_generalised_data_symbol_table *table );
+libspectrum_word libspectrum_tape_generalised_data_symbol_table_symbols_in_table( const libspectrum_tape_generalised_data_symbol_table *table );
+libspectrum_tape_generalised_data_symbol* libspectrum_tape_generalised_data_symbol_table_symbol( const libspectrum_tape_generalised_data_symbol_table *table, size_t which );
+
+libspectrum_tape_generalised_data_symbol_edge_type libspectrum_tape_generalised_data_symbol_type( const libspectrum_tape_generalised_data_symbol *symbol );
+libspectrum_word libspectrum_tape_generalised_data_symbol_pulse( const libspectrum_tape_generalised_data_symbol *symbol, size_t which );
+
+
/*
* Input recording routines
*/
@@ -972,19 +1012,7 @@
libspectrum_error WIN32_DLL libspectrum_rzx_alloc( libspectrum_rzx **rzx );
-/*** Routines for Z80Em raw tape format files ***/
-
-libspectrum_error
-libspectrum_z80em_read( libspectrum_tape *tape,
- const libspectrum_byte *buffer, size_t length );
-
-/*** Routines for CSW raw tape format files ***/
-
-libspectrum_error
-libspectrum_csw_read( libspectrum_tape *tape,
- const libspectrum_byte *buffer, size_t length );
-
-/* Something to step through all the blocks in a tape */
+/* Something to step through all the blocks in an input recording */
typedef struct _GSList *libspectrum_rzx_iterator;
/* The block types which can appear in RZX files */
@@ -1011,23 +1039,11 @@
size_t WIN32_DLL
libspectrum_rzx_iterator_get_frames( libspectrum_rzx_iterator it );
-/*** Routines for Z80Em and CSW raw tape files ***/
-
-libspectrum_error WIN32_DLL
-libspectrum_z80em_create( libspectrum_tape *tape,
- const libspectrum_byte *buffer,
- const size_t length );
-
-libspectrum_error WIN32_DLL
-libspectrum_csw_create( libspectrum_tape *tape,
- const libspectrum_byte *buffer, const size_t length );
-
/*
* Microdrive image handling routines
*/
typedef struct libspectrum_microdrive libspectrum_microdrive;
-typedef struct libspectrum_microdrive_block libspectrum_microdrive_block;
#define LIBSPECTRUM_MICRODRIVE_BLOCK_MAX 254
#define LIBSPECTRUM_MICRODRIVE_HEAD_LEN 15
@@ -1066,15 +1082,6 @@
libspectrum_microdrive_set_cartridge_len( libspectrum_microdrive *microdrive,
libspectrum_byte len );
-void WIN32_DLL
-libspectrum_microdrive_get_block( const libspectrum_microdrive *microdrive,
- libspectrum_byte which,
- libspectrum_microdrive_block *block );
-void WIN32_DLL
-libspectrum_microdrive_set_block( libspectrum_microdrive *microdrive,
- libspectrum_byte which,
- libspectrum_microdrive_block *block );
-
/* .mdr format routines */
int WIN32_DLL
Modified: branches/fusegl/fuse/ChangeLog
===================================================================
--- branches/fusegl/fuse/ChangeLog 2007-06-10 01:40:41 UTC (rev 374)
+++ branches/fusegl/fuse/ChangeLog 2007-06-10 13:58:18 UTC (rev 375)
@@ -1,30 +1,56 @@
-2005-??-?? Philip Kendall <pak...@sr...>
+2007-??-?? Philip Kendall <phi...@sh...>
+ * Fuse 0.8.0 released
+
* New features:
+ * Loader improvements: automatically run at full speed while
+ a loader is in progress and automatically start/stop the tape
+ when the start/end of a loader is detected (Philip Kendall).
* RZX 'rollback' support (Philip Kendall).
+ * DivIDE support (Matthew Westcott)
+ * Interface I and microdrive emulation (Gergely Szasz).
* TS2068 support (Fredrick Meunier).
- * Interface I and microdrive emulation (Gergely Szasz).
* Kempston mouse emulation (Darren Salt).
+ * TZX generalized data block (0x19) support (Philip Kendall).
+ * Much improved widget UI, including allowing selection of
+ filenames (Darren Salt, Gergely Szasz).
* Allow SDL full screen mode to be used (Darren Salt).
* Add the ability to save 'movies' as collections of screenshots
(Gergely Szasz).
* Widget pokefinder (Darren Salt).
* Add a simple code profiler (Philip Kendall).
* New libao sound driver (Gergely Szasz).
+ * New CoreAudio sound driver (Fredrick Meunier).
+ * New PALTV 1-3x and TV3x graphics scalers (Gergely Szasz).
* Emulation core improvements:
* Improved screen rendering code (now character accurate rather
- than line accurate) (Philip Kendall).
+ than line accurate) (...
[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