Thread: [Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx: [300] trunk
Brought to you by:
fredm
Menu
▾
▴
fuse-for-macosx-commits
|
From: <fr...@us...> - 2007-02-05 13:47:43
|
Revision: 300
http://svn.sourceforge.net/fuse-for-macosx/?rev=300&view=rev
Author: fredm
Date: 2007-02-05 05:47:35 -0800 (Mon, 05 Feb 2007)
Log Message:
-----------
Merge in vendor libspectrum 0.3.0-pre1 and Fuse 0.8.0-pre1 versions. Update
documentation and make adjustments to compensate for upstream changes.
Modified Paths:
--------------
trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj
trunk/FuseImporter/LibspectrumMetadataImporter.m
trunk/FuseImporter/libspectrum.h
trunk/fuse/ChangeLog
trunk/fuse/Makefile.am
trunk/fuse/README
trunk/fuse/autogen.sh
trunk/fuse/ay.c
trunk/fuse/ay.h
trunk/fuse/compat/Makefile.am
trunk/fuse/compat/dirname.c
trunk/fuse/compat.h
trunk/fuse/configure.in
trunk/fuse/dck.c
trunk/fuse/dck.h
trunk/fuse/debugger/Makefile.am
trunk/fuse/debugger/breakpoint.c
trunk/fuse/debugger/breakpoint.h
trunk/fuse/debugger/command.c
trunk/fuse/debugger/commandl.l
trunk/fuse/debugger/commandy.y
trunk/fuse/debugger/debugger.c
trunk/fuse/debugger/debugger.h
trunk/fuse/debugger/debugger_internals.h
trunk/fuse/debugger/disassemble.c
trunk/fuse/debugger/expression.c
trunk/fuse/display.c
trunk/fuse/display.h
trunk/fuse/divide.c
trunk/fuse/divide.h
trunk/fuse/event.c
trunk/fuse/event.h
trunk/fuse/fuse.cpp
trunk/fuse/fuse.h
trunk/fuse/fusepb/Credits.html
trunk/fuse/fusepb/English.lproj/InfoPlist.strings
trunk/fuse/fusepb/Info-Fuse.plist
trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib
trunk/fuse/fusepb/resources/Fuse Help/Fuse Help idx
trunk/fuse/fusepb/resources/Fuse Help/Fuse Help.helpindex
trunk/fuse/fusepb/resources/Fuse Help/html/about.html
trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html
trunk/fuse/fusepb/resources/Fuse Help/html/filters.html
trunk/fuse/fusepb/resources/Fuse Help/html/preferences.html
trunk/fuse/fusepb/resources/Fuse Help/html/tocstart.html
trunk/fuse/fusepb/settings_cocoa.h
trunk/fuse/hacking/ChangeLog
trunk/fuse/hacking/Makefile.am
trunk/fuse/hacking/cvs-tags
trunk/fuse/ide.c
trunk/fuse/ide.h
trunk/fuse/if1.c
trunk/fuse/if1.h
trunk/fuse/if2.c
trunk/fuse/if2.h
trunk/fuse/input.c
trunk/fuse/input.h
trunk/fuse/joystick.c
trunk/fuse/joystick.h
trunk/fuse/keyboard.c
trunk/fuse/keyboard.h
trunk/fuse/keysyms.dat
trunk/fuse/keysyms.pl
trunk/fuse/lib/Makefile.am
trunk/fuse/loader.c
trunk/fuse/loader.h
trunk/fuse/machine.c
trunk/fuse/machine.h
trunk/fuse/machines/Makefile.am
trunk/fuse/machines/machines.h
trunk/fuse/machines/pentagon.c
trunk/fuse/machines/scorpion.c
trunk/fuse/machines/scorpion.h
trunk/fuse/machines/spec128.c
trunk/fuse/machines/spec128.h
trunk/fuse/machines/spec16.c
trunk/fuse/machines/spec48.c
trunk/fuse/machines/spec48.h
trunk/fuse/machines/spec_se.c
trunk/fuse/machines/specplus2.c
trunk/fuse/machines/specplus2a.c
trunk/fuse/machines/specplus3.c
trunk/fuse/machines/specplus3.h
trunk/fuse/machines/specplus3e.c
trunk/fuse/machines/tc2048.c
trunk/fuse/machines/tc2068.c
trunk/fuse/machines/tc2068.h
trunk/fuse/machines/ts2068.c
trunk/fuse/man/Makefile.am
trunk/fuse/man/fuse.1
trunk/fuse/memory.c
trunk/fuse/memory.h
trunk/fuse/menu.c
trunk/fuse/menu.h
trunk/fuse/menu_data.c
trunk/fuse/menu_data.pl
trunk/fuse/periph.c
trunk/fuse/periph.h
trunk/fuse/perl/Fuse/Dialog.pm
trunk/fuse/perl/Fuse/Makefile.am
trunk/fuse/perl/Fuse.pm
trunk/fuse/perl/Makefile.am
trunk/fuse/perl/cpp-perl.pl
trunk/fuse/pokefinder/Makefile.am
trunk/fuse/pokefinder/pokefinder.c
trunk/fuse/pokefinder/pokefinder.h
trunk/fuse/printer.c
trunk/fuse/printer.h
trunk/fuse/profile.c
trunk/fuse/profile.h
trunk/fuse/psg.c
trunk/fuse/psg.h
trunk/fuse/roms/Makefile.am
trunk/fuse/rzx.c
trunk/fuse/rzx.h
trunk/fuse/scld.c
trunk/fuse/screenshot.c
trunk/fuse/screenshot.h
trunk/fuse/settings-header.pl
trunk/fuse/settings.dat
trunk/fuse/settings.pl
trunk/fuse/simpleide.c
trunk/fuse/slt.c
trunk/fuse/slt.h
trunk/fuse/snapshot.c
trunk/fuse/snapshot.h
trunk/fuse/sound/Makefile.am
trunk/fuse/sound/aosound.c
trunk/fuse/sound/dxsound.c
trunk/fuse/sound/lowlevel.h
trunk/fuse/sound/sdlsound.c
trunk/fuse/sound/sfifo.c
trunk/fuse/sound.c
trunk/fuse/sound.h
trunk/fuse/spectrum.c
trunk/fuse/spectrum.h
trunk/fuse/tape.c
trunk/fuse/tape.h
trunk/fuse/timer.c
trunk/fuse/timer.h
trunk/fuse/trdos.c
trunk/fuse/trdos.h
trunk/fuse/ui/Makefile.am
trunk/fuse/ui/aalib/Makefile.am
trunk/fuse/ui/aalib/aalibdisplay.c
trunk/fuse/ui/aalib/aalibkeyboard.c
trunk/fuse/ui/aalib/aalibkeyboard.h
trunk/fuse/ui/aalib/aalibui.c
trunk/fuse/ui/aalib/aalibui.h
trunk/fuse/ui/aalib/error.c
trunk/fuse/ui/fb/Makefile.am
trunk/fuse/ui/fb/fbdisplay.c
trunk/fuse/ui/fb/fbdisplay.h
trunk/fuse/ui/fb/fbjoystick.c
trunk/fuse/ui/fb/fbkeyboard.c
trunk/fuse/ui/fb/fbkeyboard.h
trunk/fuse/ui/fb/fbui.c
trunk/fuse/ui/ggi/Makefile.am
trunk/fuse/ui/ggi/ggi_internals.h
trunk/fuse/ui/ggi/ggidisplay.c
trunk/fuse/ui/ggi/ggikeyboard.c
trunk/fuse/ui/ggi/ggiui.c
trunk/fuse/ui/gtk/Makefile.am
trunk/fuse/ui/gtk/binary.c
trunk/fuse/ui/gtk/browse.c
trunk/fuse/ui/gtk/confirm.c
trunk/fuse/ui/gtk/debugger.c
trunk/fuse/ui/gtk/fileselector.c
trunk/fuse/ui/gtk/gtkdisplay.c
trunk/fuse/ui/gtk/gtkinternals.h
trunk/fuse/ui/gtk/gtkjoystick.c
trunk/fuse/ui/gtk/gtkkeyboard.c
trunk/fuse/ui/gtk/gtkui.c
trunk/fuse/ui/gtk/memory.c
trunk/fuse/ui/gtk/options-header.pl
trunk/fuse/ui/gtk/options.pl
trunk/fuse/ui/gtk/picture.c
trunk/fuse/ui/gtk/pixmaps.c
trunk/fuse/ui/gtk/pokefinder.c
trunk/fuse/ui/gtk/rollback.c
trunk/fuse/ui/gtk/roms.c
trunk/fuse/ui/gtk/statusbar.c
trunk/fuse/ui/gtk/stock.c
trunk/fuse/ui/options.dat
trunk/fuse/ui/scaler/Makefile.am
trunk/fuse/ui/scaler/scaler.c
trunk/fuse/ui/scaler/scaler.h
trunk/fuse/ui/scaler/scaler_internals.h
trunk/fuse/ui/scaler/scalers.cpp
trunk/fuse/ui/sdl/Makefile.am
trunk/fuse/ui/sdl/sdldisplay.c
trunk/fuse/ui/sdl/sdldisplay.h
trunk/fuse/ui/sdl/sdljoystick.c
trunk/fuse/ui/sdl/sdljoystick.h
trunk/fuse/ui/sdl/sdlkeyboard.c
trunk/fuse/ui/sdl/sdlkeyboard.h
trunk/fuse/ui/sdl/sdlui.c
trunk/fuse/ui/svga/Makefile.am
trunk/fuse/ui/svga/svgadisplay.c
trunk/fuse/ui/svga/svgadisplay.h
trunk/fuse/ui/svga/svgajoystick.c
trunk/fuse/ui/svga/svgakeyboard.c
trunk/fuse/ui/svga/svgakeyboard.h
trunk/fuse/ui/svga/svgaui.c
trunk/fuse/ui/ui.h
trunk/fuse/ui/uidisplay.h
trunk/fuse/ui/uijoystick.c
trunk/fuse/ui/uijoystick.h
trunk/fuse/ui/win32/Makefile.am
trunk/fuse/ui/win32/debugger.c
trunk/fuse/ui/win32/debugger.h
trunk/fuse/ui/win32/debugger.rc
trunk/fuse/ui/win32/error.c
trunk/fuse/ui/win32/keysyms.c
trunk/fuse/ui/win32/menu_data.c
trunk/fuse/ui/win32/menu_data.h
trunk/fuse/ui/win32/menu_data.rc
trunk/fuse/ui/win32/pokefinder.c
trunk/fuse/ui/win32/pokefinder.h
trunk/fuse/ui/win32/pokefinder.rc
trunk/fuse/ui/win32/statusbar.c
trunk/fuse/ui/win32/win32display.c
trunk/fuse/ui/win32/win32display.h
trunk/fuse/ui/win32/win32internals.h
trunk/fuse/ui/win32/win32keyboard.c
trunk/fuse/ui/win32/win32keyboard.h
trunk/fuse/ui/win32/win32ui.c
trunk/fuse/ui/win32/win32ui.rc
trunk/fuse/ui/xlib/Makefile.am
trunk/fuse/ui/xlib/xdisplay.c
trunk/fuse/ui/xlib/xdisplay.h
trunk/fuse/ui/xlib/xerror.c
trunk/fuse/ui/xlib/xjoystick.c
trunk/fuse/ui/xlib/xkeyboard.c
trunk/fuse/ui/xlib/xkeyboard.h
trunk/fuse/ui/xlib/xui.c
trunk/fuse/ui/xlib/xui.h
trunk/fuse/ui.c
trunk/fuse/uidisplay.c
trunk/fuse/ula.c
trunk/fuse/ula.h
trunk/fuse/utils.c
trunk/fuse/utils.h
trunk/fuse/widget/Makefile.am
trunk/fuse/widget/browse.c
trunk/fuse/widget/debugger.c
trunk/fuse/widget/error.c
trunk/fuse/widget/filesel.c
trunk/fuse/widget/menu.c
trunk/fuse/widget/options-header.pl
trunk/fuse/widget/options.pl
trunk/fuse/widget/picture.c
trunk/fuse/widget/roms.c
trunk/fuse/widget/select.c
trunk/fuse/widget/text.c
trunk/fuse/widget/widget.c
trunk/fuse/widget/widget.h
trunk/fuse/widget/widget_internals.h
trunk/fuse/z80/Makefile.am
trunk/fuse/z80/coretest.c
trunk/fuse/z80/harness.pl
trunk/fuse/z80/tests/Makefile.am
trunk/fuse/z80/z80.c
trunk/fuse/z80/z80.h
trunk/fuse/z80/z80.pl
trunk/fuse/z80/z80_macros.h
trunk/fuse/z80/z80_ops.c
trunk/fuse/zxatasp.c
trunk/fuse/zxatasp.h
trunk/fuse/zxcf.c
trunk/fuse/zxcf.h
trunk/libspectrum/libspectrum/ChangeLog
trunk/libspectrum/libspectrum/Makefile.am
trunk/libspectrum/libspectrum/README
trunk/libspectrum/libspectrum/accessor.pl
trunk/libspectrum/libspectrum/autogen.sh
trunk/libspectrum/libspectrum/bzip2.c
trunk/libspectrum/libspectrum/configure.in
trunk/libspectrum/libspectrum/creator.c
trunk/libspectrum/libspectrum/crypto.c
trunk/libspectrum/libspectrum/dck.c
trunk/libspectrum/libspectrum/dll.c
trunk/libspectrum/libspectrum/doc/Makefile.am
trunk/libspectrum/libspectrum/doc/cvs-tags
trunk/libspectrum/libspectrum/doc/libspectrum.3
trunk/libspectrum/libspectrum/doc/libspectrum.txt
trunk/libspectrum/libspectrum/hacking/ChangeLog
trunk/libspectrum/libspectrum/ide.c
trunk/libspectrum/libspectrum/internals.h
trunk/libspectrum/libspectrum/libspectrum.c
trunk/libspectrum/libspectrum/libspectrum.h.in
trunk/libspectrum/libspectrum/libspectrum.qpg.in
trunk/libspectrum/libspectrum/make-perl.c
trunk/libspectrum/libspectrum/microdrive.c
trunk/libspectrum/libspectrum/myglib/Makefile.am
trunk/libspectrum/libspectrum/myglib/ghash.c
trunk/libspectrum/libspectrum/myglib/gslist.c
trunk/libspectrum/libspectrum/plusd.c
trunk/libspectrum/libspectrum/rzx.c
trunk/libspectrum/libspectrum/sna.c
trunk/libspectrum/libspectrum/snap_accessors.txt
trunk/libspectrum/libspectrum/snapshot.c
trunk/libspectrum/libspectrum/snp.c
trunk/libspectrum/libspectrum/sp.c
trunk/libspectrum/libspectrum/szx.c
trunk/libspectrum/libspectrum/tap.c
trunk/libspectrum/libspectrum/tape.c
trunk/libspectrum/libspectrum/tape_accessors.pl
trunk/libspectrum/libspectrum/tape_accessors.txt
trunk/libspectrum/libspectrum/tape_block.c
trunk/libspectrum/libspectrum/tape_block.h
trunk/libspectrum/libspectrum/tape_set.pl
trunk/libspectrum/libspectrum/timings.c
trunk/libspectrum/libspectrum/tzx_read.c
trunk/libspectrum/libspectrum/tzx_write.c
trunk/libspectrum/libspectrum/warajevo_read.c
trunk/libspectrum/libspectrum/z80.c
trunk/libspectrum/libspectrum/zlib.c
trunk/libspectrum/libspectrum/zxs.c
trunk/libspectrum/libspectrum.h
trunk/libspectrum/libspectrum.xcodeproj/project.pbxproj
Added Paths:
-----------
trunk/fuse/fusepb/resources/Fuse Help/html/divide.html
trunk/fuse/sound/coreaudiosound.c
trunk/libspectrum/libspectrum/symbol_table.c
Modified: trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj
===================================================================
--- trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj 2007-02-04 11:19:24 UTC (rev 299)
+++ trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj 2007-02-05 13:47:35 UTC (rev 300)
@@ -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: trunk/FuseImporter/LibspectrumMetadataImporter.m
===================================================================
--- trunk/FuseImporter/LibspectrumMetadataImporter.m 2007-02-04 11:19:24 UTC (rev 299)
+++ trunk/FuseImporter/LibspectrumMetadataImporter.m 2007-02-05 13:47:35 UTC (rev 300)
@@ -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: trunk/FuseImporter/libspectrum.h
===================================================================
--- trunk/FuseImporter/libspectrum.h 2007-02-04 11:19:24 UTC (rev 299)
+++ trunk/FuseImporter/libspectrum.h 2007-02-05 13:47:35 UTC (rev 300)
@@ -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: trunk/fuse/ChangeLog
===================================================================
--- trunk/fuse/ChangeLog 2007-02-04 11:19:24 UTC (rev 299)
+++ trunk/fuse/ChangeLog 2007-02-05 13:47:35 UTC (rev 300)
@@ -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) (Philip Kendall, Fredrick Meunier).
+ * Corrections to write ordering and contention for EX (SP),HL,
+ EX (SP),IX and EX (SP),IY (Philip Kendall; thanks, Mark
+ Woodmass).
+ * Corrections to contention for OTIR and OTDR (Philip Kendall;
+ thanks, Mark Woodmass).
+ * IR contention (Philip Kendall; thanks, Mark Woodmass).
+ * Flag bits 3 and 5 are copied on all BIT instructions (Philip
+ Kendall; thanks, Mark Woodmass).
* Improved ULA emulation with respect to interrupt length
(thanks, Jon Needle, Ramsoft and Mark Woodmass) (Philip
Kendall).
+ * Fix timings of shifted no operation opcodes (Philip Kendall).
+ * An interrupt in IM 0 takes 13 tstates to acknowledge, not 12
+ (Philip Kendall).
* Improved speed control code (Fredrick Meunier).
* Miscellaneous:
- * Allow filenames to be selected from the widget UIs (Darren
- Salt).
* Add a 'save, don't save, cancel' confirmation dialog before any
changes to media are lost under the GTK+ UIs (Philip Kendall).
+ * On the Pentagon, page in the TR-DOS ROM on NMI, allowing the
+ snapshot function to work (Philip Kendall). On the Scorpion,
+ page in ROM 2, allowing the monitor to work (thanks, Erik
+ Kunze).
+ * Default snapshot format is now .szx rather than .z80 (Fredrick
+ Meunier)
* Store current joystick information in snapshots (Fredrick
Meunier).
* Optional use of doublescan modes in the framebuffer and
@@ -35,11 +61,8 @@
* Use stock button icons in the GTK+ 2.x UI (Darren Salt).
* Save/restore the 'issue 2 keyboard' flag from snapshots
(Philip Kendall).
- * Deactivate widget menu items when they are inappropriate
- (Darren Salt).
* Correctly quote '-' characters in the man page (needed for
UTF-8 environments) (Darren Salt, Stuart Brady).
- * Widget query confirmation dialog (Darren Salt).
* Use separate menus for controlling +3 and TR-DOS disks (Philip
Kendall).
* Fix behaviour of ZXATASP and ZXCF on reset (Garry Lancaster).
@@ -50,9 +73,13 @@
(Darren Salt).
* Various minor improvements to the framebuffer UI (Darren
Salt).
+ * Various fixes to allow compilation with gcc 4.x (Philip
+ Kendall).
- * Various other minor bugfixes (Fredrick Meunier, Philip Kendall,
- Mark Round, Darren Salt, Paul van der Laan).
+ * Various other minor bugfixes (Philip Kendall, Fredrick Meunier,
+ Jon Needle, Markus Oberhumer, Mark Round, Darren Salt, Gergely
+ Szasz, Paul van der Laan and other people to whom I apologise
+ for forgetting).
2004-07-16 Philip Kendall <pak...@sr...>
@@ -756,4 +783,4 @@
* Version 0.1.0 released.
-$Id: ChangeLog,v 1.42 2005/03/26 17:24:54 pak21 Exp $
+$Id: ChangeLog,v 1.46 2007/02/02 16:21:50 pak21 Exp $
Modified: trunk/fuse/Makefile.am
===================================================================
--- trunk/fuse/Makefile.am 2007-02-04 11:19:24 UTC (rev 299)
+++ trunk/fuse/Makefile.am 2007-02-05 13:47:35 UTC (rev 300)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright ...
[truncated message content] |
|
From: <fr...@us...> - 2007-06-10 00:25:56
|
Revision: 370
http://svn.sourceforge.net/fuse-for-macosx/?rev=370&view=rev
Author: fredm
Date: 2007-06-09 17:25:57 -0700 (Sat, 09 Jun 2007)
Log Message:
-----------
Merge up to r366 from Release-0_8_0 branch.
Modified Paths:
--------------
trunk/FuseImporter/libspectrum.h
trunk/bzip2/English.lproj/InfoPlist.strings
trunk/bzip2/Info.plist
trunk/bzip2/bzip2/CHANGES
trunk/bzip2/bzip2/LICENSE
trunk/bzip2/bzip2/Makefile
trunk/bzip2/bzip2/Makefile-libbz2_so
trunk/bzip2/bzip2/README
trunk/bzip2/bzip2/README.COMPILATION.PROBLEMS
trunk/bzip2/bzip2/README.XML.STUFF
trunk/bzip2/bzip2/blocksort.c
trunk/bzip2/bzip2/bz-fo.xsl
trunk/bzip2/bzip2/bzdiff
trunk/bzip2/bzip2/bzgrep
trunk/bzip2/bzip2/bzip2.1
trunk/bzip2/bzip2/bzip2.1.preformatted
trunk/bzip2/bzip2/bzip2.c
trunk/bzip2/bzip2/bzip2.txt
trunk/bzip2/bzip2/bzip2recover.c
trunk/bzip2/bzip2/bzlib.c
trunk/bzip2/bzip2/bzlib.h
trunk/bzip2/bzip2/bzlib_private.h
trunk/bzip2/bzip2/compress.c
trunk/bzip2/bzip2/crctable.c
trunk/bzip2/bzip2/decompress.c
trunk/bzip2/bzip2/dlltest.c
trunk/bzip2/bzip2/entities.xml
trunk/bzip2/bzip2/format.pl
trunk/bzip2/bzip2/huffman.c
trunk/bzip2/bzip2/manual.html
trunk/bzip2/bzip2/manual.pdf
trunk/bzip2/bzip2/manual.ps
trunk/bzip2/bzip2/manual.xml
trunk/bzip2/bzip2/mk251.c
trunk/bzip2/bzip2/randtable.c
trunk/bzip2/bzip2/spewG.c
trunk/bzip2/bzip2/unzcrash.c
trunk/bzip2/bzip2/words0
trunk/bzip2/bzip2/words2
trunk/bzip2/bzip2/words3
trunk/bzip2/bzip2/xmlproc.sh
trunk/fuse/ChangeLog
trunk/fuse/README
trunk/fuse/acinclude.m4
trunk/fuse/compat/mkstemp.c
trunk/fuse/configure.in
trunk/fuse/display.c
trunk/fuse/fuse.cpp
trunk/fuse/fusepb/English.lproj/InfoPlist.strings
trunk/fuse/fusepb/Info-Fuse.plist
trunk/fuse/fusepb/SDLMain.mm
trunk/fuse/fusepb/config.h
trunk/fuse/fusepb/controllers/DebuggerController.m
trunk/fuse/fusepb/controllers/FuseController.m
trunk/fuse/fusepb/controllers/RollbackController.m
trunk/fuse/fusepb/nibs/Debugger.nib/info.nib
trunk/fuse/fusepb/nibs/Debugger.nib/keyedobjects.nib
trunk/fuse/fusepb/nibs/Preferences.nib/info.nib
trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib
trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html
trunk/fuse/fusepb/resources/Fuse Help/html/divide.html
trunk/fuse/fusepb/resources/Fuse Help/html/tocstart.html
trunk/fuse/hacking/ChangeLog
trunk/fuse/hacking/cvs-tags
trunk/fuse/hacking/ui.txt
trunk/fuse/if1.c
trunk/fuse/joystick.c
trunk/fuse/lib/Makefile.am
trunk/fuse/machines/pentagon.c
trunk/fuse/machines/scorpion.c
trunk/fuse/machines/spec128.c
trunk/fuse/machines/spec16.c
trunk/fuse/machines/spec48.c
trunk/fuse/machines/spec_se.c
trunk/fuse/man/fuse.1
trunk/fuse/periph.c
trunk/fuse/printer.c
trunk/fuse/rzx.c
trunk/fuse/rzx.h
trunk/fuse/screenshot.c
trunk/fuse/settings.dat
trunk/fuse/snapshot.c
trunk/fuse/sound/aosound.c
trunk/fuse/sound/coreaudiosound.c
trunk/fuse/sound/sdlsound.c
trunk/fuse/sound.c
trunk/fuse/spectrum.c
trunk/fuse/spectrum.h
trunk/fuse/ui/fb/fbdisplay.c
trunk/fuse/ui/ggi/ggidisplay.c
trunk/fuse/ui/gtk/gtkdisplay.c
trunk/fuse/ui/gtk/gtkui.c
trunk/fuse/ui/scaler/scaler.c
trunk/fuse/ui/scaler/scalers.cpp
trunk/fuse/ui/sdl/sdldisplay.c
trunk/fuse/ui/svga/svgadisplay.c
trunk/fuse/ui/uidisplay.h
trunk/fuse/ui/win32/win32display.c
trunk/fuse/ui/xlib/xdisplay.c
trunk/fuse/ui.c
trunk/fuse/uidisplay.c
trunk/fuse/ula.c
trunk/fuse/ula.h
trunk/fuse/utils.c
trunk/fuse/widget/Makefile.am
trunk/fuse/widget/filesel.c
trunk/fuse/widget/menu.c
trunk/fuse/widget/pokefinder.c
trunk/libspectrum/Info.plist
trunk/libspectrum/libspectrum/ChangeLog
trunk/libspectrum/libspectrum/Makefile.am
trunk/libspectrum/libspectrum/README
trunk/libspectrum/libspectrum/acinclude.m4
trunk/libspectrum/libspectrum/configure.in
trunk/libspectrum/libspectrum/doc/cvs-tags
trunk/libspectrum/libspectrum/doc/libspectrum.3
trunk/libspectrum/libspectrum/doc/libspectrum.txt
trunk/libspectrum/libspectrum/hacking/ChangeLog
trunk/libspectrum/libspectrum/internals.h
trunk/libspectrum/libspectrum/libspectrum.h.in
trunk/libspectrum/libspectrum/rzx.c
trunk/libspectrum/libspectrum/tap.c
trunk/libspectrum/libspectrum/tzx_read.c
trunk/libspectrum/libspectrum/z80.c
trunk/libspectrum/libspectrum.h
trunk/libspectrum/libspectrum.xcodeproj/project.pbxproj
Added Paths:
-----------
trunk/fuse/fusepb/resources/Fuse Help/html/spotlight.html
trunk/libspectrum/libspectrum/hacking/.cvsignore
trunk/libspectrum/libspectrum/hacking/Makefile.am
Removed Paths:
-------------
trunk/bzip2/bzip2/Y2K_INFO
Modified: trunk/FuseImporter/libspectrum.h
===================================================================
--- trunk/FuseImporter/libspectrum.h 2007-05-15 12:45:49 UTC (rev 369)
+++ trunk/FuseImporter/libspectrum.h 2007-06-10 00:25:57 UTC (rev 370)
@@ -1,7 +1,7 @@
/* libspectrum.h: the library for dealing with ZX Spectrum emulator files
Copyright (c) 2001-2007 Philip Kendall, Darren Salt, Fredrick Meunier
- $Id: libspectrum.h.in,v 1.141 2007/02/02 16:35:42 pak21 Exp $
+ $Id: libspectrum.h.in,v 1.141.2.2 2007/05/09 20:08:07 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
@@ -929,13 +929,13 @@
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_dword WIN32_DLL libspectrum_tape_generalised_data_symbol_table_symbols_in_block( const libspectrum_tape_generalised_data_symbol_table *table );
+libspectrum_byte WIN32_DLL libspectrum_tape_generalised_data_symbol_table_max_pulses( const libspectrum_tape_generalised_data_symbol_table *table );
+libspectrum_word WIN32_DLL libspectrum_tape_generalised_data_symbol_table_symbols_in_table( const libspectrum_tape_generalised_data_symbol_table *table );
+libspectrum_tape_generalised_data_symbol* WIN32_DLL 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 );
+libspectrum_tape_generalised_data_symbol_edge_type WIN32_DLL libspectrum_tape_generalised_data_symbol_type( const libspectrum_tape_generalised_data_symbol *symbol );
+libspectrum_word WIN32_DLL libspectrum_tape_generalised_data_symbol_pulse( const libspectrum_tape_generalised_data_symbol *symbol, size_t which );
/*
@@ -967,7 +967,7 @@
libspectrum_rzx_start_playback( libspectrum_rzx *rzx, int which,
libspectrum_snap **snap );
libspectrum_error WIN32_DLL
-libspectrum_rzx_playback_frame( libspectrum_rzx *rzx, int *finished );
+libspectrum_rzx_playback_frame( libspectrum_rzx *rzx, int *finished, libspectrum_snap **snap );
libspectrum_error WIN32_DLL
libspectrum_rzx_playback( libspectrum_rzx *rzx, libspectrum_byte *byte );
Modified: trunk/bzip2/English.lproj/InfoPlist.strings
===================================================================
(Binary files differ)
Modified: trunk/bzip2/Info.plist
===================================================================
--- trunk/bzip2/Info.plist 2007-05-15 12:45:49 UTC (rev 369)
+++ trunk/bzip2/Info.plist 2007-06-10 00:25:57 UTC (rev 370)
@@ -17,7 +17,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>1.0.3</string>
+ <string>1.0.4</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
Modified: trunk/bzip2/bzip2/CHANGES
===================================================================
--- trunk/bzip2/bzip2/CHANGES 2007-05-15 12:45:49 UTC (rev 369)
+++ trunk/bzip2/bzip2/CHANGES 2007-06-10 00:25:57 UTC (rev 370)
@@ -1,5 +1,18 @@
+ ------------------------------------------------------------------
+ This file is part of bzip2/libbzip2, a program and library for
+ lossless, block-sorting data compression.
+ bzip2/libbzip2 version 1.0.4 of 20 December 2006
+ Copyright (C) 1996-2006 Julian Seward <js...@bz...>
+ Please read the WARNING, DISCLAIMER and PATENTS sections in the
+ README file.
+
+ This program is released under the terms of the license contained
+ in the file LICENSE.
+ ------------------------------------------------------------------
+
+
0.9.0
~~~~~
First version.
@@ -261,7 +274,7 @@
decompressor to crash, loop or access memory which does not
belong to it. If you are using bzip2 or the library to
decompress bitstreams from untrusted sources, an upgrade
- to 1.0.3 is recommended.
+ to 1.0.3 is recommended. This fixes CAN-2005-1260.
* The documentation has been converted to XML, from which html
and pdf can be derived.
@@ -273,3 +286,29 @@
* The BZ_NO_STDIO cpp symbol was not properly observed in 1.0.2.
This has been fixed.
+
+
+1.0.4 (20 Dec 06)
+~~~~~~~~~~~~~~~~~
+Fixes some minor bugs since the last version, 1.0.3.
+
+* Fix file permissions race problem (CAN-2005-0953).
+
+* Avoid possible segfault in BZ2_bzclose. From Coverity's NetBSD
+ scan.
+
+* 'const'/prototype cleanups in the C code.
+
+* Change default install location to /usr/local, and handle multiple
+ 'make install's without error.
+
+* Sanitise file names more carefully in bzgrep. Fixes CAN-2005-0758
+ to the extent that applies to bzgrep.
+
+* Use 'mktemp' rather than 'tempfile' in bzdiff.
+
+* Tighten up a couple of assertions in blocksort.c following automated
+ analysis.
+
+* Fix minor doc/comment bugs.
+
Modified: trunk/bzip2/bzip2/LICENSE
===================================================================
--- trunk/bzip2/bzip2/LICENSE 2007-05-15 12:45:49 UTC (rev 369)
+++ trunk/bzip2/bzip2/LICENSE 2007-06-10 00:25:57 UTC (rev 370)
@@ -1,6 +1,8 @@
+--------------------------------------------------------------------------
+
This program, "bzip2", the associated library "libbzip2", and all
-documentation, are copyright (C) 1996-2005 Julian R Seward. All
+documentation, are copyright (C) 1996-2006 Julian R Seward. All
rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -35,6 +37,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Julian Seward, Cambridge, UK.
-js...@ac...
-bzip2/libbzip2 version 1.0.3 of 15 February 2005
+js...@bz...
+bzip2/libbzip2 version 1.0.4 of 20 December 2006
+--------------------------------------------------------------------------
Modified: trunk/bzip2/bzip2/Makefile
===================================================================
--- trunk/bzip2/bzip2/Makefile 2007-05-15 12:45:49 UTC (rev 369)
+++ trunk/bzip2/bzip2/Makefile 2007-06-10 00:25:57 UTC (rev 370)
@@ -1,3 +1,16 @@
+# ------------------------------------------------------------------
+# This file is part of bzip2/libbzip2, a program and library for
+# lossless, block-sorting data compression.
+#
+# bzip2/libbzip2 version 1.0.4 of 20 December 2006
+# Copyright (C) 1996-2006 Julian Seward <js...@bz...>
+#
+# Please read the WARNING, DISCLAIMER and PATENTS sections in the
+# README file.
+#
+# This program is released under the terms of the license contained
+# in the file LICENSE.
+# ------------------------------------------------------------------
SHELL=/bin/sh
@@ -8,10 +21,10 @@
LDFLAGS=
BIGFILES=-D_FILE_OFFSET_BITS=64
-CFLAGS=-Wall -Winline -O -g $(BIGFILES)
+CFLAGS=-Wall -Winline -O2 -g $(BIGFILES)
# Where you want it installed when you do 'make install'
-PREFIX=/usr
+PREFIX=/usr/local
OBJS= blocksort.o \
@@ -77,14 +90,14 @@
cp -f libbz2.a $(PREFIX)/lib
chmod a+r $(PREFIX)/lib/libbz2.a
cp -f bzgrep $(PREFIX)/bin/bzgrep
- ln $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep
- ln $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep
+ ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep
+ ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep
chmod a+x $(PREFIX)/bin/bzgrep
cp -f bzmore $(PREFIX)/bin/bzmore
- ln $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless
+ ln -s -f $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless
chmod a+x $(PREFIX)/bin/bzmore
cp -f bzdiff $(PREFIX)/bin/bzdiff
- ln $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp
+ ln -s -f $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp
chmod a+x $(PREFIX)/bin/bzdiff
cp -f bzgrep.1 bzmore.1 bzdiff.1 $(PREFIX)/man/man1
chmod a+r $(PREFIX)/man/man1/bzgrep.1
@@ -124,10 +137,10 @@
distclean: clean
rm -f manual.ps manual.html manual.pdf
-DISTNAME=bzip2-1.0.3
+DISTNAME=bzip2-1.0.4
dist: check manual
rm -f $(DISTNAME)
- ln -sf . $(DISTNAME)
+ ln -s -f . $(DISTNAME)
tar cvf $(DISTNAME).tar \
$(DISTNAME)/blocksort.c \
$(DISTNAME)/huffman.c \
@@ -167,7 +180,6 @@
$(DISTNAME)/libbz2.dsp \
$(DISTNAME)/dlltest.dsp \
$(DISTNAME)/makefile.msc \
- $(DISTNAME)/Y2K_INFO \
$(DISTNAME)/unzcrash.c \
$(DISTNAME)/spewG.c \
$(DISTNAME)/mk251.c \
Modified: trunk/bzip2/bzip2/Makefile-libbz2_so
===================================================================
--- trunk/bzip2/bzip2/Makefile-libbz2_so 2007-05-15 12:45:49 UTC (rev 369)
+++ trunk/bzip2/bzip2/Makefile-libbz2_so 2007-06-10 00:25:57 UTC (rev 370)
@@ -1,15 +1,30 @@
# This Makefile builds a shared version of the library,
-# libbz2.so.1.0.3, with soname libbz2.so.1.0,
+# libbz2.so.1.0.4, with soname libbz2.so.1.0,
# at least on x86-Linux (RedHat 7.2),
# with gcc-2.96 20000731 (Red Hat Linux 7.1 2.96-98).
-# Please see the README file for some
-# important info about building the library like this.
+# Please see the README file for some important info
+# about building the library like this.
+# ------------------------------------------------------------------
+# This file is part of bzip2/libbzip2, a program and library for
+# lossless, block-sorting data compression.
+#
+# bzip2/libbzip2 version 1.0.4 of 20 December 2006
+# Copyright (C) 1996-2006 Julian Seward <js...@bz...>
+#
+# Please read the WARNING, DISCLAIMER and PATENTS sections in the
+# README file.
+#
+# This program is released under the terms of the license contained
+# in the file LICENSE.
+# ------------------------------------------------------------------
+
+
SHELL=/bin/sh
CC=gcc
BIGFILES=-D_FILE_OFFSET_BITS=64
-CFLAGS=-fpic -fPIC -Wall -Winline -O -g
+CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES)
OBJS= blocksort.o \
huffman.o \
@@ -20,13 +35,13 @@
bzlib.o
all: $(OBJS)
- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.3 $(OBJS)
- $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.3
+ $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.4 $(OBJS)
+ $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.4
rm -f libbz2.so.1.0
- ln -s libbz2.so.1.0.3 libbz2.so.1.0
+ ln -s libbz2.so.1.0.4 libbz2.so.1.0
clean:
- rm -f $(OBJS) bzip2.o libbz2.so.1.0.3 libbz2.so.1.0 bzip2-shared
+ rm -f $(OBJS) bzip2.o libbz2.so.1.0.4 libbz2.so.1.0 bzip2-shared
blocksort.o: blocksort.c
$(CC) $(CFLAGS) -c blocksort.c
Modified: trunk/bzip2/bzip2/README
===================================================================
--- trunk/bzip2/bzip2/README 2007-05-15 12:45:49 UTC (rev 369)
+++ trunk/bzip2/bzip2/README 2007-06-10 00:25:57 UTC (rev 370)
@@ -1,35 +1,50 @@
-This is the README for bzip2, a block-sorting file compressor, version
-1.0.3. This version is fully compatible with the previous public
-releases, versions 0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1 and 1.0.2.
+This is the README for bzip2/libzip2.
+This version is fully compatible with the previous public releases.
-bzip2-1.0.3 is distributed under a BSD-style license. For details,
-see the file LICENSE.
+------------------------------------------------------------------
+This file is part of bzip2/libbzip2, a program and library for
+lossless, block-sorting data compression.
+bzip2/libbzip2 version 1.0.4 of 20 December 2006
+Copyright (C) 1996-2006 Julian Seward <js...@bz...>
+
+Please read the WARNING, DISCLAIMER and PATENTS sections in this file.
+
+This program is released under the terms of the license contained
+in the file LICENSE.
+------------------------------------------------------------------
+
Complete documentation is available in Postscript form (manual.ps),
PDF (manual.pdf) or html (manual.html). A plain-text version of the
-manual page is available as bzip2.txt. A statement about Y2K issues
-is now included in the file Y2K_INFO.
+manual page is available as bzip2.txt.
HOW TO BUILD -- UNIX
-Type `make'. This builds the library libbz2.a and then the
-programs bzip2 and bzip2recover. Six self-tests are run.
-If the self-tests complete ok, carry on to installation:
+Type 'make'. This builds the library libbz2.a and then the programs
+bzip2 and bzip2recover. Six self-tests are run. If the self-tests
+complete ok, carry on to installation:
-To install in /usr/bin, /usr/lib, /usr/man and /usr/include, type
+To install in /usr/local/bin, /usr/local/lib, /usr/local/man and
+/usr/local/include, type
+
make install
-To install somewhere else, eg, /xxx/yyy/{bin,lib,man,include}, type
+
+To install somewhere else, eg, /xxx/yyy/{bin,lib,man,include}, type
+
make install PREFIX=/xxx/yyy
+
If you are (justifiably) paranoid and want to see what 'make install'
is going to do, you can first do
+
make -n install or
make -n install PREFIX=/xxx/yyy respectively.
-The -n instructs make to show the commands it would execute, but
-not actually execute them.
+The -n instructs make to show the commands it would execute, but not
+actually execute them.
+
HOW TO BUILD -- UNIX, shared library libbz2.so.
Do 'make -f Makefile-libbz2_so'. This Makefile seems to work for
@@ -49,23 +64,25 @@
bzCompress to BZ2_bzCompress, to avoid namespace pollution.
Unfortunately this means that the libbz2.so created by
Makefile-libbz2_so will not work with any program which used an older
-version of the library. Sorry. I do encourage library clients to
-make the effort to upgrade to use version 1.0, since it is both faster
-and more robust than previous versions.
+version of the library. I do encourage library clients to make the
+effort to upgrade to use version 1.0, since it is both faster and more
+robust than previous versions.
HOW TO BUILD -- Windows 95, NT, DOS, Mac, etc.
It's difficult for me to support compilation on all these platforms.
My approach is to collect binaries for these platforms, and put them
-on the master web page (http://sources.redhat.com/bzip2). Look there.
-However (FWIW), bzip2-1.0.X is very standard ANSI C and should compile
+on the master web site (http://www.bzip.org). Look there. However
+(FWIW), bzip2-1.0.X is very standard ANSI C and should compile
unmodified with MS Visual C. If you have difficulties building, you
might want to read README.COMPILATION.PROBLEMS.
At least using MS Visual C++ 6, you can build from the unmodified
sources by issuing, in a command shell:
+
nmake -f makefile.msc
+
(you may need to first run the MSVC-provided script VCVARS32.BAT
so as to set up paths to the MSVC tools correctly).
@@ -86,18 +103,19 @@
WARNING:
- This program (attempts to) compress data by performing several
- non-trivial transformations on it. Unless you are 100% familiar
- with *all* the algorithms contained herein, and with the
- consequences of modifying them, you should NOT meddle with the
- compression or decompression machinery. Incorrect changes can and
- very likely *will* lead to disastrous loss of data.
+ This program and library (attempts to) compress data by
+ performing several non-trivial transformations on it.
+ Unless you are 100% familiar with *all* the algorithms
+ contained herein, and with the consequences of modifying them,
+ you should NOT meddle with the compression or decompression
+ machinery. Incorrect changes can and very likely *will*
+ lead to disastrous loss of data.
DISCLAIMER:
I TAKE NO RESPONSIBILITY FOR ANY LOSS OF DATA ARISING FROM THE
- USE OF THIS PROGRAM, HOWSOEVER CAUSED.
+ USE OF THIS PROGRAM/LIBRARY, HOWSOEVER CAUSED.
Every compression of a file implies an assumption that the
compressed file can be decompressed to reproduce the original.
@@ -110,19 +128,18 @@
PROGRAM UNLESS YOU ARE PREPARED TO ACCEPT THE POSSIBILITY, HOWEVER
SMALL, THAT THE DATA WILL NOT BE RECOVERABLE.
- That is not to say this program is inherently unreliable. Indeed,
- I very much hope the opposite is true. bzip2 has been carefully
- constructed and extensively tested.
+ That is not to say this program is inherently unreliable.
+ Indeed, I very much hope the opposite is true. bzip2/libbzip2
+ has been carefully constructed and extensively tested.
PATENTS:
- To the best of my knowledge, bzip2 does not use any patented
- algorithms. However, I do not have the resources to carry out
- a patent search. Therefore I cannot give any guarantee of the
- above statement.
+ To the best of my knowledge, bzip2/libbzip2 does not use any
+ patented algorithms. However, I do not have the resources
+ to carry out a patent search. Therefore I cannot give any
+ guarantee of the above statement.
-End of legalities.
WHAT'S NEW IN 0.9.0 (as compared to 0.1pl2) ?
@@ -156,21 +173,23 @@
See the CHANGES file.
+WHAT'S NEW IN 1.0.4 ?
+ See the CHANGES file.
+
+
I hope you find bzip2 useful. Feel free to contact me at
js...@bz...
if you have any suggestions or queries. Many people mailed me with
comments, suggestions and patches after the releases of bzip-0.15,
-bzip-0.21, and bzip2 versions 0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1 and
-1.0.2, and the changes in bzip2 are largely a result of this feedback.
-I thank you for your comments.
+bzip-0.21, and bzip2 versions 0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1,
+1.0.2 and 1.0.3, and the changes in bzip2 are largely a result of this
+feedback. I thank you for your comments.
-At least for the time being, bzip2's "home" is (or can be reached via)
-http://www.bzip.org
+bzip2's "home" is http://www.bzip.org/
Julian Seward
js...@bz...
-
Cambridge, UK.
18 July 1996 (version 0.15)
@@ -183,3 +202,4 @@
5 May 2000 (bzip2, version 1.0pre8)
30 December 2001 (bzip2, version 1.0.2pre1)
15 February 2005 (bzip2, version 1.0.3)
+20 December 2006 (bzip2, version 1.0.4)
Modified: trunk/bzip2/bzip2/README.COMPILATION.PROBLEMS
===================================================================
--- trunk/bzip2/bzip2/README.COMPILATION.PROBLEMS 2007-05-15 12:45:49 UTC (rev 369)
+++ trunk/bzip2/bzip2/README.COMPILATION.PROBLEMS 2007-06-10 00:25:57 UTC (rev 370)
@@ -1,32 +1,47 @@
+------------------------------------------------------------------
+This file is part of bzip2/libbzip2, a program and library for
+lossless, block-sorting data compression.
-bzip2-1.0.3 should compile without problems on the vast majority of
+bzip2/libbzip2 version 1.0.4 of 20 December 2006
+Copyright (C) 1996-2006 Julian Seward <js...@bz...>
+
+Please read the WARNING, DISCLAIMER and PATENTS sections in the
+README file.
+
+This program is released under the terms of the license contained
+in the file LICENSE.
+------------------------------------------------------------------
+
+bzip2-1.0.4 should compile without problems on the vast majority of
platforms. Using the supplied Makefile, I've built and tested it
-myself for x86-linux and x86_64-linux. With makefile.msc, Visual C++
+myself for x86-linux and amd64-linux. With makefile.msc, Visual C++
6.0 and nmake, you can build a native Win32 version too. Large file
-support seems to work correctly on at least alpha-tru64unix and
-x86-cygwin32 (on Windows 2000).
+support seems to work correctly on at least on amd64-linux.
When I say "large file" I mean a file of size 2,147,483,648 (2^31)
bytes or above. Many older OSs can't handle files above this size,
but many newer ones can. Large files are pretty huge -- most files
you'll encounter are not Large Files.
-Earlier versions of bzip2 (0.1, 0.9.0, 0.9.5) compiled on a wide
-variety of platforms without difficulty, and I hope this version will
-continue in that tradition. However, in order to support large files,
-I've had to include the define -D_FILE_OFFSET_BITS=64 in the Makefile.
-This can cause problems.
+Early versions of bzip2 (0.1, 0.9.0, 0.9.5) compiled on a wide variety
+of platforms without difficulty, and I hope this version will continue
+in that tradition. However, in order to support large files, I've had
+to include the define -D_FILE_OFFSET_BITS=64 in the Makefile. This
+can cause problems.
The technique of adding -D_FILE_OFFSET_BITS=64 to get large file
support is, as far as I know, the Recommended Way to get correct large
file support. For more details, see the Large File Support
Specification, published by the Large File Summit, at
+
http://ftp.sas.com/standards/large.file
As a general comment, if you get compilation errors which you think
are related to large file support, try removing the above define from
the Makefile, ie, delete the line
+
BIGFILES=-D_FILE_OFFSET_BITS=64
+
from the Makefile, and do 'make clean ; make'. This will give you a
version of bzip2 without large file support, which, for most
applications, is probably not a problem.
@@ -37,3 +52,7 @@
large file support, if you are feeling paranoid. Be aware though that
any compilation problems which affect bzip2 will also affect spewG.c,
alas.
+
+AIX: I have reports that for large file support, you need to specify
+-D_LARGE_FILES rather than -D_FILE_OFFSET_BITS=64. I have not tested
+this myself.
Modified: trunk/bzip2/bzip2/README.XML.STUFF
===================================================================
--- trunk/bzip2/bzip2/README.XML.STUFF 2007-05-15 12:45:49 UTC (rev 369)
+++ trunk/bzip2/bzip2/README.XML.STUFF 2007-06-10 00:25:57 UTC (rev 370)
@@ -1,3 +1,17 @@
+ ----------------------------------------------------------------
+ This file is part of bzip2/libbzip2, a program and library for
+ lossless, block-sorting data compression.
+
+ bzip2/libbzip2 version 1.0.4 of 20 December 2006
+ Copyright (C) 1996-2006 Julian Seward <js...@bz...>
+
+ Please read the WARNING, DISCLAIMER and PATENTS sections in the
+ README file.
+
+ This program is released under the terms of the license contained
+ in the file LICENSE.
+ ----------------------------------------------------------------
+
The script xmlproc.sh takes an xml file as input,
and processes it to create .pdf, .html or .ps output.
It uses format.pl, a perl script to format <pre> blocks nicely,
@@ -9,16 +23,16 @@
Usage:
- xmlproc.sh -v manual.xml
+ ./xmlproc.sh -v manual.xml
Validates an xml file to ensure no dtd-compliance errors
- xmlproc.sh -html manual.xml
+ ./xmlproc.sh -html manual.xml
Output: manual.html
- xmlproc.sh -pdf manual.xml
+ ./xmlproc.sh -pdf manual.xml
Output: manual.pdf
- xmlproc.sh -ps manual.xml
+ ./xmlproc.sh -ps manual.xml
Output: manual.ps
Deleted: trunk/bzip2/bzip2/Y2K_INFO
===================================================================
--- trunk/bzip2/bzip2/Y2K_INFO 2007-05-15 12:45:49 UTC (rev 369)
+++ trunk/bzip2/bzip2/Y2K_INFO 2007-06-10 00:25:57 UTC (rev 370)
@@ -1,34 +0,0 @@
-
-Y2K status of bzip2 and libbzip2, versions 0.1, 0.9.0 and 0.9.5
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Informally speaking:
- bzip2 is a compression program built on top of libbzip2,
- a library which does the real work of compression and
- decompression. As far as I am aware, libbzip2 does not have
- any date-related code at all.
-
- bzip2 itself copies dates from source to destination files
- when compressing or decompressing, using the 'stat' and 'utime'
- UNIX system calls. It doesn't examine, manipulate or store the
- dates in any way. So as far as I can see, there shouldn't be any
- problem with bzip2 providing 'stat' and 'utime' work correctly
- on your system.
-
- On non-unix platforms (those for which BZ_UNIX in bzip2.c is
- not set to 1), bzip2 doesn't even do the date copying.
-
- Overall, informally speaking, I don't think bzip2 or libbzip2
- have a Y2K problem.
-
-Formally speaking:
- I am not prepared to offer you any assurance whatsoever
- regarding Y2K issues in my software. You alone assume the
- entire risk of using the software. The disclaimer of liability
- in the LICENSE file in the bzip2 source distribution continues
- to apply on this issue as with every other issue pertaining
- to the software.
-
-Julian Seward
-Cambridge, UK
-25 August 1999
Modified: trunk/bzip2/bzip2/blocksort.c
===================================================================
--- trunk/bzip2/bzip2/blocksort.c 2007-05-15 12:45:49 UTC (rev 369)
+++ trunk/bzip2/bzip2/blocksort.c 2007-06-10 00:25:57 UTC (rev 370)
@@ -4,68 +4,21 @@
/*--- blocksort.c ---*/
/*-------------------------------------------------------------*/
-/*--
- This file is a part of bzip2 and/or libbzip2, a program and
- library f...
[truncated message content] |
|
From: <fr...@us...> - 2007-06-10 15:44:13
|
Revision: 376
http://svn.sourceforge.net/fuse-for-macosx/?rev=376&view=rev
Author: fredm
Date: 2007-06-10 08:44:08 -0700 (Sun, 10 Jun 2007)
Log Message:
-----------
Merge in changes from fusegl branch (remove SDL use, use Cocoa and OpenGL for
graphics, mouse, keyboard)
Modified Paths:
--------------
trunk/FuseImporter/libspectrum.h
trunk/README
trunk/fuse/ChangeLog
trunk/fuse/README
trunk/fuse/TODO
trunk/fuse/compat.h
trunk/fuse/configure.in
trunk/fuse/display.c
trunk/fuse/event.c
trunk/fuse/event.h
trunk/fuse/fuse.cpp
trunk/fuse/fuse.h
trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
trunk/fuse/fusepb/FuseMenus.h
trunk/fuse/fusepb/FuseMenus.m
trunk/fuse/fusepb/Info-Fuse.plist
trunk/fuse/fusepb/config.h
trunk/fuse/fusepb/controllers/DebuggerController.m
trunk/fuse/fusepb/controllers/FuseController.h
trunk/fuse/fusepb/controllers/FuseController.m
trunk/fuse/fusepb/controllers/JoystickConfigurationController.m
trunk/fuse/fusepb/controllers/LoadBinaryController.m
trunk/fuse/fusepb/controllers/MemoryBrowserController.m
trunk/fuse/fusepb/controllers/PokeFinderController.m
trunk/fuse/fusepb/controllers/PreferencesController.h
trunk/fuse/fusepb/controllers/PreferencesController.m
trunk/fuse/fusepb/controllers/RollbackController.m
trunk/fuse/fusepb/controllers/SaveBinaryController.m
trunk/fuse/fusepb/controllers/TapeBrowserController.h
trunk/fuse/fusepb/controllers/TapeBrowserController.m
trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib
trunk/fuse/fusepb/thumbnail.h
trunk/fuse/fusepb/thumbnail.m
trunk/fuse/hacking/cvs-tags
trunk/fuse/if1.c
trunk/fuse/joystick.c
trunk/fuse/lib/Makefile.am
trunk/fuse/machine.c
trunk/fuse/machines/pentagon.c
trunk/fuse/machines/scorpion.c
trunk/fuse/machines/spec128.c
trunk/fuse/machines/spec16.c
trunk/fuse/machines/spec48.c
trunk/fuse/machines/spec_se.c
trunk/fuse/menu.h
trunk/fuse/periph.c
trunk/fuse/printer.c
trunk/fuse/rzx.c
trunk/fuse/screenshot.c
trunk/fuse/settings.dat
trunk/fuse/settings.pl
trunk/fuse/snapshot.c
trunk/fuse/sound/aosound.c
trunk/fuse/sound/coreaudiosound.c
trunk/fuse/sound/sdlsound.c
trunk/fuse/sound.c
trunk/fuse/spectrum.c
trunk/fuse/spectrum.h
trunk/fuse/ui/fb/fbdisplay.c
trunk/fuse/ui/ggi/ggidisplay.c
trunk/fuse/ui/gtk/gtkdisplay.c
trunk/fuse/ui/gtk/gtkui.c
trunk/fuse/ui/sdl/sdldisplay.c
trunk/fuse/ui/svga/svgadisplay.c
trunk/fuse/ui/uidisplay.h
trunk/fuse/ui/win32/win32display.c
trunk/fuse/ui/xlib/xdisplay.c
trunk/fuse/ui.c
trunk/fuse/uidisplay.c
trunk/fuse/ula.c
trunk/fuse/ula.h
trunk/fuse/utils.c
trunk/fuse/widget/Makefile.am
trunk/fuse/widget/filesel.c
trunk/fuse/widget/menu.c
trunk/libspectrum/libspectrum/ChangeLog
trunk/libspectrum/libspectrum/Makefile.am
trunk/libspectrum/libspectrum/configure.in
trunk/libspectrum/libspectrum/doc/libspectrum.txt
trunk/libspectrum/libspectrum/internals.h
trunk/libspectrum/libspectrum/libspectrum.h.in
trunk/libspectrum/libspectrum/rzx.c
trunk/libspectrum/libspectrum/tap.c
trunk/libspectrum/libspectrum/tzx_read.c
trunk/libspectrum/libspectrum/z80.c
trunk/libspectrum/libspectrum.h
Added Paths:
-----------
trunk/fuse/fusepb/content_arrays/HIDJoysticks.h
trunk/fuse/fusepb/content_arrays/HIDJoysticks.m
trunk/fuse/fusepb/main.h
trunk/fuse/fusepb/main.mm
trunk/fuse/fusepb/models/
trunk/fuse/fusepb/models/Emulator.h
trunk/fuse/fusepb/models/Emulator.m
trunk/fuse/fusepb/nibs/MainMenu.nib/
trunk/fuse/fusepb/nibs/MainMenu.nib/classes.nib
trunk/fuse/fusepb/nibs/MainMenu.nib/info.nib
trunk/fuse/fusepb/nibs/MainMenu.nib/keyedobjects.nib
trunk/fuse/fusepb/views/
trunk/fuse/fusepb/views/DisplayOpenGLView.h
trunk/fuse/fusepb/views/DisplayOpenGLView.m
trunk/fuse/ui/cocoa/
trunk/fuse/ui/cocoa/SDL_joystick/
trunk/fuse/ui/cocoa/SDL_joystick/SDL_joystick.c
trunk/fuse/ui/cocoa/SDL_joystick/SDL_joystick.h
trunk/fuse/ui/cocoa/SDL_joystick/SDL_joystick_c.h
trunk/fuse/ui/cocoa/SDL_joystick/SDL_sysjoystick.c
trunk/fuse/ui/cocoa/SDL_joystick/SDL_sysjoystick.h
trunk/fuse/ui/cocoa/cocoadisplay.h
trunk/fuse/ui/cocoa/cocoadisplay.m
trunk/fuse/ui/cocoa/cocoaerror.m
trunk/fuse/ui/cocoa/cocoajoystick.c
trunk/fuse/ui/cocoa/cocoascreenshot.h
trunk/fuse/ui/cocoa/cocoascreenshot.m
trunk/fuse/ui/cocoa/cocoastatusbar.m
trunk/fuse/ui/cocoa/cocoaui.h
trunk/fuse/ui/cocoa/cocoaui.m
trunk/fuse/ui/cocoa/keysyms.m
Removed Paths:
-------------
trunk/fuse/fusepb/SDLMain.h
trunk/fuse/fusepb/SDLMain.mm
trunk/fuse/fusepb/content_arrays/SDLJoysticks.h
trunk/fuse/fusepb/content_arrays/SDLJoysticks.m
trunk/fuse/fusepb/error.m
trunk/fuse/fusepb/keysyms.c
trunk/fuse/fusepb/models/Emulator.h
trunk/fuse/fusepb/models/Emulator.m
trunk/fuse/fusepb/nibs/MainMenu.nib/classes.nib
trunk/fuse/fusepb/nibs/MainMenu.nib/info.nib
trunk/fuse/fusepb/nibs/MainMenu.nib/keyedobjects.nib
trunk/fuse/fusepb/nibs/SDLMain.nib/
trunk/fuse/fusepb/sdlscreenshot.h
trunk/fuse/fusepb/sdlscreenshot.m
trunk/fuse/fusepb/sdlui.h
trunk/fuse/fusepb/views/DisplayOpenGLView.h
trunk/fuse/fusepb/views/DisplayOpenGLView.m
trunk/fuse/ui/cocoa/SDL_joystick/
trunk/fuse/ui/cocoa/SDL_joystick/SDL_joystick.c
trunk/fuse/ui/cocoa/SDL_joystick/SDL_joystick.h
trunk/fuse/ui/cocoa/SDL_joystick/SDL_joystick_c.h
trunk/fuse/ui/cocoa/SDL_joystick/SDL_sysjoystick.c
trunk/fuse/ui/cocoa/SDL_joystick/SDL_sysjoystick.h
trunk/fuse/ui/cocoa/cocoadisplay.h
trunk/fuse/ui/cocoa/cocoadisplay.m
trunk/fuse/ui/cocoa/cocoaerror.m
trunk/fuse/ui/cocoa/cocoajoystick.c
trunk/fuse/ui/cocoa/cocoascreenshot.h
trunk/fuse/ui/cocoa/cocoascreenshot.m
trunk/fuse/ui/cocoa/cocoastatusbar.m
trunk/fuse/ui/cocoa/cocoaui.h
trunk/fuse/ui/cocoa/cocoaui.m
trunk/fuse/ui/cocoa/keysyms.m
Modified: trunk/FuseImporter/libspectrum.h
===================================================================
--- trunk/FuseImporter/libspectrum.h 2007-06-10 13:58:18 UTC (rev 375)
+++ trunk/FuseImporter/libspectrum.h 2007-06-10 15:44:08 UTC (rev 376)
@@ -1,7 +1,7 @@
/* libspectrum.h: the library for dealing with ZX Spectrum emulator files
Copyright (c) 2001-2007 Philip Kendall, Darren Salt, Fredrick Meunier
- $Id: libspectrum.h.in,v 1.141.2.2 2007/05/09 20:08:07 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
Modified: trunk/README
===================================================================
--- trunk/README 2007-06-10 13:58:18 UTC (rev 375)
+++ trunk/README 2007-06-10 15:44:08 UTC (rev 376)
@@ -1,8 +1,7 @@
FUSE for Mac OS X Source Distribution
This is the source distribution of the Mac OS X version of Fuse. Full source is
-included for fuse and libspectrum, you will also need to download SDL (at least
-version 1.2.5, from <http://www.libsdl.org>).
+included for fuse and libspectrum.
Your Mac is expected to be running OS X 10.4 with the Xcode development
environment.
@@ -10,7 +9,6 @@
The directory structure is expected to be:
fuse/
FuseImporter
- SDL.framework
fuse
lib765
bzip2
@@ -18,8 +16,7 @@
libspectrum
Full build instructions:
-Uncompress the source package, cd into the directory created, and put the
-SDL.framework in place. Then:
+Uncompress the source package, and cd into the directory created. Then:
cd bzip2
xcodebuild -configuration Deployment
Modified: trunk/fuse/ChangeLog
===================================================================
--- trunk/fuse/ChangeLog 2007-06-10 13:58:18 UTC (rev 375)
+++ trunk/fuse/ChangeLog 2007-06-10 15:44:08 UTC (rev 376)
@@ -807,4 +807,4 @@
* Version 0.1.0 released.
-$Id: ChangeLog,v 1.46.2.2 2007/05/10 07:32:38 pak21 Exp $
+$Id: ChangeLog,v 1.46 2007/02/02 16:21:50 pak21 Exp $
Modified: trunk/fuse/README
===================================================================
--- trunk/fuse/README 2007-06-10 13:58:18 UTC (rev 375)
+++ trunk/fuse/README 2007-06-10 15:44:08 UTC (rev 376)
@@ -141,4 +141,4 @@
Philip Kendall <phi...@sh...>
11 May 2007
-$Id: README,v 1.40.2.3 2007/05/10 07:32:38 pak21 Exp $
+$Id: README,v 1.40 2007/02/02 16:21:50 pak21 Exp $
Modified: trunk/fuse/TODO
===================================================================
--- trunk/fuse/TODO 2007-06-10 13:58:18 UTC (rev 375)
+++ trunk/fuse/TODO 2007-06-10 15:44:08 UTC (rev 376)
@@ -1,3 +1,50 @@
TODO
+X Move Fuse to have a loop that runs a single frame at a time (will be callback
+ in threaded Cocoa GL UI)
+X Switch to Cocoa run loop for Fuse
+X Add GL renderer
+X Add native keyboard processing (removes SDL keyboard input dependency from
+ Fuse)
+X Add native CoreAudio sound processing (removes SDL sound dependency from Fuse)
+X Fix menus, preferences etc.
+X Add native mouse processing (removes SDL mouse input dependency from Fuse)
+X Make it possible to constrain Speccy image to "correct" aspect ratio
+X Restore fullscreen support
+X Fix scalers
+X Add support for bilinear etc. OpenGL filters
+X Add option to snap window size to 1x, 2x, 3x
+X Grab mouse in fullscreen mode
+X Move emulation to it's own object
+X Move emulation object to it's own thread and call main thread methods with
+ performSelectorOnMainThread:withObject:waitUntilDone:, call emulation thread
+ methods with DO when emulation is not paused, this should avoid sound glitches
+ when menus are selected or window is minimised
+X Fix screen updating during fastloading
+X Make sure that fuse_end is called somewhere on exit
+X Restore activity icons
+X Restore joystick processing (re-use SDL joystick input files from SDL)
+X Sort out remaining FuseController calls into emulator object/thread
+X Restore application level volume adjustment
+* Use double buffered texture (in cocoadisplay have screen 0 and 1 for use of
+ DisplayOpenGLView and flip between them on frame end), should also have a
+ mutex taken while DisplayOpenGLView changes and cocoadisplay flips to
+ prevent thread sync problems
+* Quit keyhandling when command key is pressed
+* Use sheets rather than modal dialogs (for Save As)
+* Put in latest hq[23]x filters (HQ2x_555 from ScummVM should do the trick)
+* Make border display optional
+* Figure out why minimise icon image is partially blanked when minimise starts
+* Allow Cmd-w to close as many operations as possible
+* Make activity icons transparent
+* Seperate out sound buffer interleaving code to allow for the use of hardware etc.
+ sound mixing
+* Add .WAV loader using audiofile
+* Shouldn't be able to load Interface II carts in Pentagon
+* Add volume option to standard fuse + a sound API method to set volume (or a
+ parameter to sound_lowlevel_init)
+* Save ROM into szx when using a non-default one
+* Randomise FRAMES sys var after autoload snapshot loaded in order to try and
+ get less deterministic program behaviour after load is complete
+
$Id: TODO,v 1.4 2004/03/02 13:38:08 pak21 Exp $
Modified: trunk/fuse/compat.h
===================================================================
--- trunk/fuse/compat.h 2007-06-10 13:58:18 UTC (rev 375)
+++ trunk/fuse/compat.h 2007-06-10 15:44:08 UTC (rev 376)
@@ -58,7 +58,7 @@
#endif /* #ifndef HAVE_GETOPT_LONG */
#ifndef HAVE_MKSTEMP
-int mkstemp( char *template );
+int mkstemp( char *tmpl );
#endif /* #ifndef HAVE_MKSTEMP */
#endif /* #ifndef FUSE_COMPAT_H */
Modified: trunk/fuse/configure.in
===================================================================
--- trunk/fuse/configure.in 2007-06-10 13:58:18 UTC (rev 375)
+++ trunk/fuse/configure.in 2007-06-10 15:44:08 UTC (rev 376)
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-dnl $Id: configure.in,v 1.155.2.3 2007/05/10 07:32:38 pak21 Exp $
+dnl $Id: configure.in,v 1.155 2007/02/02 16:21:50 pak21 Exp $
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: trunk/fuse/display.c
===================================================================
--- trunk/fuse/display.c 2007-06-10 13:58:18 UTC (rev 375)
+++ trunk/fuse/display.c 2007-06-10 15:44:08 UTC (rev 376)
@@ -2,7 +2,7 @@
Copyright (c) 1999-2006 Philip Kendall, Thomas Harte, Witold Filipczyk
and Fredrick Meunier
- $Id: display.c,v 1.59.2.1 2007/03/06 11:39:47 fredm Exp $
+ $Id: display.c,v 1.59 2007/02/02 16:21:50 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
@@ -38,8 +38,6 @@
#include "screenshot.h"
#include "settings.h"
#include "spectrum.h"
-#include "tape.h"
-#include "timer.h"
#include "ui/ui.h"
#include "ui/uidisplay.h"
#include "scld.h"
@@ -143,8 +141,6 @@
static int border_changes_last = 0;
static struct border_change_t *border_changes = NULL;
-static timer_type last_frame_time;
-
struct border_change_t *
alloc_change(void)
{
@@ -225,8 +221,6 @@
display_last_border = scld_last_dec.name.hires ?
display_hires_border : display_lores_border;
- error = timer_get_real_time( &last_frame_time ); if( error ) return error;
-
return 0;
}
@@ -662,8 +656,8 @@
else *x = 0;
}
-void
-display_update_critical( int x, int y )
+inline static void
+update_critical_internal( int x, int y )
{
int beam_x, beam_y;
@@ -690,6 +684,12 @@
copy_critical_region( beam_x, beam_y );
}
+void
+display_update_critical( int x, int y )
+{
+ update_critical_internal( x, y );
+}
+
/* Mark the 8-pixel chunk at (x,y) as maybe dirty and update the critical
region as appropriate */
inline static void
@@ -700,7 +700,7 @@
if( y > critical_region_y ||
( y == critical_region_y && x >= critical_region_x ) ) {
- display_update_critical( x, y );
+ update_critical_internal( x, y );
}
display_maybe_dirty[y] |= ( (libspectrum_dword)1 << x );
@@ -728,16 +728,7 @@
for( i = 0; i < 8; i++ ) display_dirty_chunk( x, y + i );
}
-/* Get the attributes for the eight pixels starting at
- ( (8*x) , y ) */
-static void
-display_get_attr( int x, int y,
- libspectrum_byte *ink, libspectrum_byte *paper )
-{
- display_parse_attr( display_get_attr_byte( x, y ), ink, paper );
-}
-
-void
+inline void
display_parse_attr( libspectrum_byte attr,
libspectrum_byte *ink, libspectrum_byte *paper )
{
@@ -750,7 +741,16 @@
}
}
+/* Get the attributes for the eight pixels starting at
+ ( (8*x) , y ) */
static void
+display_get_attr( int x, int y,
+ libspectrum_byte *ink, libspectrum_byte *paper )
+{
+ display_parse_attr( display_get_attr_byte( x, y ), ink, paper );
+}
+
+static void
push_border_change( int colour )
{
int beam_x, beam_y;
@@ -952,32 +952,14 @@
int
display_frame( void )
{
- timer_type current_time;
- float difference;
- int error;
-
- /* Copy all the critical region to display_image[] */
+ /* Copy all the critical region to the display */
copy_critical_region( DISPLAY_WIDTH_COLS, DISPLAY_HEIGHT - 1 );
critical_region_x = critical_region_y = 0;
- error = timer_get_real_time( ¤t_time ); if( error ) return error;
- difference = timer_get_time_difference( ¤t_time, &last_frame_time );
+ update_border();
+ update_dirty_rects();
+ update_ui_screen();
- /* don't bother updating the screen more than 25 times a second if we are
- fastloading a tape, or 50 times a second if we are running at more than 100%
- speed */
- if( ( !( settings_current.fastload && tape_is_playing() ) &&
- ( settings_current.emulation_speed == 100 || difference >= (1.0/50.0) ) ) ||
- ( settings_current.fastload && tape_is_playing() &&
- difference >= (1.0/25.0) ) ) {
-
- update_border();
- update_dirty_rects();
- update_ui_screen();
- last_frame_time = current_time;
-
- }
-
if( screenshot_movie_record == 1 ) {
snprintf( screenshot_movie_name, SCREENSHOT_MOVIE_FILE_MAX,
Modified: trunk/fuse/event.c
===================================================================
--- trunk/fuse/event.c 2007-06-10 13:58:18 UTC (rev 375)
+++ trunk/fuse/event.c 2007-06-10 15:44:08 UTC (rev 376)
@@ -52,6 +52,12 @@
/* When will the next event happen? */
libspectrum_dword event_next_event;
+/* We are at the end of a frame */
+int event_frame_end;
+
+/* We've had a timer event */
+int event_timer;
+
/* The actual list of events */
static GSList* event_list;
@@ -79,6 +85,8 @@
event_list=NULL;
event_free=NULL;
event_next_event=event_no_events;
+ event_frame_end=0;
+ event_timer=0;
return 0;
}
@@ -119,6 +127,53 @@
: a->type - b->type;
}
+/* Do a frame end event */
+void
+event_do_frame_end(void)
+{
+ if( rzx_playback ) event_force_events();
+ rzx_frame();
+ psg_frame();
+ spectrum_frame();
+ z80_interrupt();
+ ui_joystick_poll();
+ timer_estimate_speed();
+ debugger_add_time_events();
+ ui_event();
+ ui_error_frame();
+ event_frame_end=0;
+}
+
+/* Do a single frame */
+void
+event_do_frame(void)
+{
+ while( !event_frame_end ) {
+ z80_do_opcodes();
+ event_do_events();
+ }
+ event_do_frame_end();
+}
+
+/* Run until target_tstates */
+void
+event_do_timer( libspectrum_dword target_tstates )
+{
+ if( event_add( target_tstates + tstates, EVENT_TYPE_TIMER ) ) {
+ /* Some sort of dire error */
+ return;
+ }
+ event_timer=0;
+ while( !event_timer ) {
+ z80_do_opcodes();
+ event_do_events();
+ if( event_frame_end ) {
+ event_do_frame_end();
+ }
+ }
+ event_timer=0;
+}
+
/* Do all events which have passed */
int event_do_events(void)
{
@@ -141,20 +196,11 @@
case EVENT_TYPE_EDGE: tape_next_edge( ptr->tstates ); break;
case EVENT_TYPE_TIMER:
- timer_frame( ptr->tstates );
+ event_timer = 1;
break;
case EVENT_TYPE_FRAME:
- if( rzx_playback ) event_force_events();
- rzx_frame();
- psg_frame();
- spectrum_frame();
- z80_interrupt();
- ui_joystick_poll();
- timer_estimate_speed();
- debugger_add_time_events();
- ui_event();
- ui_error_frame();
+ event_frame_end = 1;
break;
case EVENT_TYPE_INTERRUPT:
Modified: trunk/fuse/event.h
===================================================================
--- trunk/fuse/event.h 2007-06-10 13:58:18 UTC (rev 375)
+++ trunk/fuse/event.h 2007-06-10 15:44:08 UTC (rev 376)
@@ -59,6 +59,9 @@
/* When will the next event happen? */
extern libspectrum_dword event_next_event;
+/* We are at the end of a frame */
+extern int event_frame_end;
+
/* Set up the event list */
int event_init(void);
@@ -68,6 +71,15 @@
/* Do all events which have passed */
int event_do_events(void);
+/* Do a frame end event */
+void event_do_frame_end(void);
+
+/* Do a single frame */
+void event_do_frame(void);
+
+/* Run until the next timer event */
+void event_do_timer( libspectrum_dword target_tstates );
+
/* Called at end of frame to reduce T-state count of all entries */
int event_frame( libspectrum_dword tstates_per_frame );
Modified: trunk/fuse/fuse.cpp
===================================================================
--- trunk/fuse/fuse.cpp 2007-06-10 13:58:18 UTC (rev 375)
+++ trunk/fuse/fuse.cpp 2007-06-10 15:44:08 UTC (rev 376)
@@ -1,7 +1,7 @@
/* fuse.c: The Free Unix Spectrum Emulator
Copyright (c) 1999-2007 Philip Kendall
- $Id: fuse.c,v 1.133.2.3 2007/04/11 09:39:32 pak21 Exp $
+ $Id: fuse.c,v 1.133 2007/02/02 16:21:51 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
@@ -82,7 +82,7 @@
}
/* What name were we called under? */
-char *fuse_progname;
+const char *fuse_progname;
/* Which directory were we started in? */
char fuse_directory[ PATH_MAX ];
@@ -119,8 +119,6 @@
} start_files_t;
-static int fuse_init(int argc, char **argv);
-
static int creator_init( void );
static void fuse_show_copyright(void);
static void fuse_show_version( void );
@@ -131,9 +129,7 @@
start_files_t *start_files );
static int do_start_files( start_files_t *start_files );
-static int fuse_end(void);
-
-int main(int argc, char **argv)
+int old_main(int argc, char **argv)
{
if(fuse_init(argc,argv)) {
fprintf(stderr,"%s: error initialising -- giving up!\n", fuse_progname);
@@ -144,8 +140,7 @@
settings_current.show_version ) return 0;
while( !fuse_exiting ) {
- z80_do_opcodes();
- event_do_events();
+ event_do_frame();
}
fuse_end();
@@ -154,7 +149,7 @@
}
-static int fuse_init(int argc, char **argv)
+int fuse_init(int argc, char **argv)
{
int error, first_arg;
char *start_scaler;
@@ -726,7 +721,7 @@
}
/* Tidy-up function called at end of emulation */
-static int fuse_end(void)
+int fuse_end(void)
{
/* Must happen before memory is deallocated as we read the character
set from memory for the text output */
Modified: trunk/fuse/fuse.h
===================================================================
--- trunk/fuse/fuse.h 2007-06-10 13:58:18 UTC (rev 375)
+++ trunk/fuse/fuse.h 2007-06-10 15:44:08 UTC (rev 376)
@@ -33,7 +33,7 @@
#include "compat.h"
-extern char *fuse_progname; /* argv[0] */
+extern const char *fuse_progname; /* argv[0] */
extern char fuse_directory[ PATH_MAX ]; /* The directory we started in */
extern int fuse_exiting; /* Shall we exit now? */
@@ -44,6 +44,11 @@
void fuse_abort( void ) GCC_NORETURN; /* Emergency shutdown */
+int fuse_init(int argc, char **argv);
+
+int fuse_end(void); /* Tidy-up function called at end of
+ emulation */
+
extern libspectrum_creator *fuse_creator; /* Creator information for file
formats which support this */
Modified: trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
===================================================================
--- trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2007-06-10 13:58:18 UTC (rev 375)
+++ trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2007-06-10 15:44:08 UTC (rev 376)
@@ -7,6 +7,8 @@
objects = {
/* Begin PBXBuildFile section */
+ B615BFE70B4261E50082D535 /* HIDJoysticks.h in Headers */ = {isa = PBXBuildFile; fileRef = B615BFE50B4261E50082D535 /* HIDJoysticks.h */; };
+ B615BFE80B4261E50082D535 /* HIDJoysticks.m in Sources */ = {isa = PBXBuildFile; fileRef = B615BFE60B4261E50082D535 /* HIDJoysticks.m */; };
B61F459309121DF100C8096C /* Fuse Help in CopyFiles */ = {isa = PBXBuildFile; fileRef = B6F905ED05CDA24300C2F10D /* Fuse Help */; };
B61F459409121DF100C8096C /* disk_plus3.szx in CopyFiles */ = {isa = PBXBuildFile; fileRef = B650C3F2076596C700DE7E81 /* disk_plus3.szx */; };
B61F459509121DF100C8096C /* tape_16.szx in CopyFiles */ = {isa = PBXBuildFile; fileRef = B650C3F4076596FD00DE7E81 /* tape_16.szx */; };
@@ -21,13 +23,9 @@
B61F459F09121DF100C8096C /* tape_scorpion.szx in CopyFiles */ = {isa = PBXBuildFile; fileRef = B650C40A0765988200DE7E81 /* tape_scorpion.szx */; };
B61F45A209121DF100C8096C /* spectrum.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = F541C04303963A9F01C2A5B9 /* spectrum.framework */; };
B61F45A309121DF100C8096C /* 765.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = F541C0750396490901C2A5B9 /* 765.framework */; };
- B61F45A409121DF100C8096C /* SDL.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = F50F65A003B2355701A804BA /* SDL.framework */; };
B61F45A609121DF100C8096C /* gcrypt.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = B6BA1A8B04E4F3290017354F /* gcrypt.framework */; };
B61F45A709121DF100C8096C /* libbz2.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = B6202BD105BD43D800A1EA8F /* libbz2.framework */; };
- B61F45A909121DF100C8096C /* SDLMain.h in Headers */ = {isa = PBXBuildFile; fileRef = F55985400389209A01A804BA /* SDLMain.h */; };
B61F45AA09121DF100C8096C /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = F5598598038921C501A804BA /* config.h */; };
- B61F45AB09121DF100C8096C /* sdldisplay.h in Headers */ = {isa = PBXBuildFile; fileRef = F55985A40389221501A804BA /* sdldisplay.h */; };
- B61F45AC09121DF100C8096C /* sdlkeyboard.h in Headers */ = {isa = PBXBuildFile; fileRef = F55985A60389221501A804BA /* sdlkeyboard.h */; };
B61F45AD09121DF100C8096C /* ui.h in Headers */ = {isa = PBXBuildFile; fileRef = F55985AD0389222701A804BA /* ui.h */; };
B61F45AE09121DF100C8096C /* uidisplay.h in Headers */ = {isa = PBXBuildFile; fileRef = F55985AE0389222701A804BA /* uidisplay.h */; };
B61F45AF09121DF100C8096C /* z80_macros.h in Headers */ = {isa = PBXBuildFile; fileRef = F55985B10389224001A804BA /* z80_macros.h */; };
@@ -61,9 +59,7 @@
B61F45CB09121DF100C8096C /* debugger.h in Headers */ = {isa = PBXBuildFile; fileRef = B68CB2C503DD920300A804BA /* debugger.h */; };
B61F45CC09121DF100C8096C /* DebuggerController.h in Headers */ = {isa = PBXBuildFile; fileRef = B632C6AE03E5368700A864FD /* DebuggerController.h */; };
B61F45CD09121DF100C8096C /* FuseMenus.h in Headers */ = {isa = PBXBuildFile; fileRef = B66EA7830401075300A864FD /* FuseMenus.h */; };
- B61F45CE09121DF100C8096C /* sdlscreenshot.h in Headers */ = {isa = PBXBuildFile; fileRef = B68D5B20041E085000A864FD /* sdlscreenshot.h */; };
B61F45CF09121DF100C8096C /* scaler_internals.h in Headers */ = {isa = PBXBuildFile; fileRef = B60A6A3A042BEECE00D41533 /* scaler_internals.h */; };
- B61F45D009121DF100C8096C /* sdljoystick.h in Headers */ = {isa = PBXBuildFile; fileRef = B6030027043363C900A864FD /* sdljoystick.h */; };
B61F45D109121DF100C8096C /* dck.h in Headers */ = {isa = PBXBuildFile; fileRef = B65E4C610445DB7D00A864FD /* dck.h */; };
B61F45D209121DF100C8096C /* psg.h in Headers */ = {isa = PBXBuildFile; fileRef = B6CA304D049CEC410037E9F2 /* psg.h */; };
B61F45D309121DF100C8096C /* compat.h in Headers */ = {isa = PBXBuildFile; fileRef = B6871C9D04AF7BEF00C24D83 /* compat.h */; };
@@ -74,7 +70,6 @@
B61F45D809121DF100C8096C /* pokefinder.h in Headers */ = {isa = PBXBuildFile; fileRef = B64586D3059BC04A00934482 /* pokefinder.h */; };
B61F45D909121DF100C8096C /* PokeFinderController.h in Headers */ = {isa = PBXBuildFile; fileRef = B62F3BCE059F5BF300A7009A /* PokeFinderController.h */; };
B61F45DA09121DF100C8096C /* utils.h in Headers */ = {isa = PBXBuildFile; fileRef = B6FD5C7A05A4F5B600A6C4FC /* utils.h */; };
- B61F45DB09121DF100C8096C /* sdlui.h in Headers */ = {isa = PBXBuildFile; fileRef = B627DAA705ACDF4E00609956 /* sdlui.h */; };
B61F45DC09121DF100C8096C /* MemoryBrowserController.h in Headers */ = {isa = PBXBuildFile; fileRef = B6D2989105B061CB00C2AA14 /* MemoryBrowserController.h */; };
B61F45DD09121DF100C8096C /* periph.h in Headers */ = {isa = PBXBuildFile; fileRef = B6C57E0105ECA05B0056F1D0 /* periph.h */; };
B61F45DE09121DF100C8096C /* breakpoint.h in Headers */ = {isa = PBXBuildFile; fileRef = B66050ED0606AAF500247454 /* breakpoint.h */; };
@@ -83,8 +78,6 @@
B61F45E109121DF100C8096C /* machines.h in Headers */ = {isa = PBXBuildFile; fileRef = B6AD8FEC06221FD500C70D75 /* machines.h */; };
B61F45E209121DF100C8096C /* simpleide.h in Headers */ = {isa = PBXBuildFile; fileRef = B6AD90560622B59200C70D75 /* simpleide.h */; };
B61F45E309121DF100C8096C /* if2.h in Headers */ = {isa = PBXBuildFile; fileRef = B621A11F062E92FB00F63DBC /* if2.h */; };
- B61F45E409121DF100C8096C /* hq2x.h in Headers */ = {isa = PBXBuildFile; fileRef = B6C8696A06561155003000A6 /* hq2x.h */; };
- B61F45E509121DF100C8096C /* hq3x.h in Headers */ = {isa = PBXBuildFile; fileRef = B6C8696B06561155003000A6 /* hq3x.h */; };
B61F45E609121DF100C8096C /* intern.h in Headers */ = {isa = PBXBuildFile; fileRef = B6C86978065611B3003000A6 /* intern.h */; };
B61F45E709121DF100C8096C /* zxatasp.h in Headers */ = {isa = PBXBuildFile; fileRef = B601847A065A586900B0BE59 /* zxatasp.h */; };
B61F45E809121DF100C8096C /* zxcf.h in Headers */ = {isa = PBXBuildFile; fileRef = B601847C065A586900B0BE59 /* zxcf.h */; };
@@ -101,7 +94,6 @@
B61F45F309121DF100C8096C /* MachineNameToIdTransformer.h in Headers */ = {isa = PBXBuildFile; fileRef = B67F3CC307EE0A130045339F /* MachineNameToIdTransformer.h */; };
B61F45F409121DF100C8096C /* CAMachines.h in Headers */ = {isa = PBXBuildFile; fileRef = B6CC82FF0800E408006EFFB9 /* CAMachines.h */; };
B61F45F509121DF100C8096C /* Joysticks.h in Headers */ = {isa = PBXBuildFile; fileRef = B6C740D90810BB0500AB170C /* Joysticks.h */; };
- B61F45F609121DF100C8096C /* SDLJoysticks.h in Headers */ = {isa = PBXBuildFile; fileRef = B6C741110810C4A500AB170C /* SDLJoysticks.h */; };
B61F45F709121DF100C8096C /* VolumeSliderToPrefTransformer.h in Headers */ = {isa = PBXBuildFile; fileRef = B66D6C9608115FC200FAE6F3 /* VolumeSliderToPrefTransformer.h */; };
B61F45F809121DF100C8096C /* ScalerNameToIdTransformer.h in Headers */ = {isa = PBXBuildFile; fileRef = B67F3C1407ED1C9D0045339F /* ScalerNameToIdTransformer.h */; };
B61F45F909121DF100C8096C /* profile.h in Headers */ = {isa = PBXBuildFile; fileRef = B6E811F1084B5117008CF718 /* profile.h */; };
@@ -117,7 +109,7 @@
B61F460709121DF100C8096C /* Preferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = B6BA6F0207B1E04200E44C8D /* Preferences.nib */; };
B61F460809121DF100C8096C /* Rollback.nib in Resources */ = {isa = PBXBuildFile; fileRef = B600ADA3077237920030FD05 /* Rollback.nib */; };
B61F460909121DF100C8096C /* SaveBinary.nib in Resources */ = {isa = PBXBuildFile; fileRef = B6F74F9A04B85B4F0059D51C /* SaveBinary.nib */; };
- B61F460A09121DF100C8096C /* SDLMain.nib in Resources */ = {isa = PBXBuildFile; fileRef = F5598546038920E401A804BA /* SDLMain.nib */; };
+ B61F460A09121D...
[truncated message content] |
|
From: <fr...@us...> - 2007-06-16 13:20:50
|
Revision: 382
http://svn.sourceforge.net/fuse-for-macosx/?rev=382&view=rev
Author: fredm
Date: 2007-06-16 06:20:50 -0700 (Sat, 16 Jun 2007)
Log Message:
-----------
Merge up to vendor r2957, still some local integration of new vendor
features required (record menu, hifi beeper at least).
Modified Paths:
--------------
trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj
trunk/FuseImporter/libspectrum.h
trunk/README
trunk/fuse/.cvsignore
trunk/fuse/AUTHORS
trunk/fuse/COPYING
trunk/fuse/Makefile.am
trunk/fuse/README
trunk/fuse/THANKS
trunk/fuse/TODO
trunk/fuse/acinclude.m4
trunk/fuse/autogen.sh
trunk/fuse/ay.c
trunk/fuse/ay.h
trunk/fuse/compat/.cvsignore
trunk/fuse/compat/Makefile.am
trunk/fuse/compat/dirname.c
trunk/fuse/compat/getopt.c
trunk/fuse/compat/getopt.h
trunk/fuse/compat/getopt1.c
trunk/fuse/compat/mkstemp.c
trunk/fuse/compat.h
trunk/fuse/configure.in
trunk/fuse/dck.c
trunk/fuse/dck.h
trunk/fuse/debugger/.cvsignore
trunk/fuse/debugger/Makefile.am
trunk/fuse/debugger/breakpoint.c
trunk/fuse/debugger/breakpoint.h
trunk/fuse/debugger/command.c
trunk/fuse/debugger/commandl.l
trunk/fuse/debugger/commandy.y
trunk/fuse/debugger/debugger.c
trunk/fuse/debugger/debugger.h
trunk/fuse/debugger/debugger_internals.h
trunk/fuse/debugger/disassemble.c
trunk/fuse/debugger/expression.c
trunk/fuse/display.c
trunk/fuse/display.h
trunk/fuse/divide.c
trunk/fuse/divide.h
trunk/fuse/event.c
trunk/fuse/event.h
trunk/fuse/fuse.cpp
trunk/fuse/fuse.h
trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
trunk/fuse/fusepb/Info-Fuse.plist
trunk/fuse/fusepb/config.h
trunk/fuse/fusepb/controllers/FuseController.m
trunk/fuse/fusepb/settings_cocoa.h
trunk/fuse/hacking/.cvsignore
trunk/fuse/hacking/ChangeLog
trunk/fuse/hacking/Makefile.am
trunk/fuse/hacking/coding_style.txt
trunk/fuse/hacking/cvs-tags
trunk/fuse/hacking/implementation_notes.txt
trunk/fuse/hacking/sound.txt
trunk/fuse/hacking/timer.txt
trunk/fuse/hacking/ui.txt
trunk/fuse/ide.c
trunk/fuse/ide.h
trunk/fuse/if1.c
trunk/fuse/if1.h
trunk/fuse/if2.c
trunk/fuse/if2.h
trunk/fuse/input.c
trunk/fuse/input.h
trunk/fuse/joystick.c
trunk/fuse/joystick.h
trunk/fuse/kempmouse.c
trunk/fuse/kempmouse.h
trunk/fuse/keyboard.c
trunk/fuse/keyboard.h
trunk/fuse/keysyms.dat
trunk/fuse/keysyms.pl
trunk/fuse/lib/.cvsignore
trunk/fuse/lib/Makefile.am
trunk/fuse/loader.c
trunk/fuse/loader.h
trunk/fuse/machine.c
trunk/fuse/machine.h
trunk/fuse/machines/.cvsignore
trunk/fuse/machines/Makefile.am
trunk/fuse/machines/machines.h
trunk/fuse/machines/pentagon.c
trunk/fuse/machines/scorpion.c
trunk/fuse/machines/scorpion.h
trunk/fuse/machines/spec128.c
trunk/fuse/machines/spec128.h
trunk/fuse/machines/spec16.c
trunk/fuse/machines/spec48.c
trunk/fuse/machines/spec48.h
trunk/fuse/machines/spec_se.c
trunk/fuse/machines/specplus2.c
trunk/fuse/machines/specplus2a.c
trunk/fuse/machines/specplus3.c
trunk/fuse/machines/specplus3.h
trunk/fuse/machines/specplus3e.c
trunk/fuse/machines/tc2048.c
trunk/fuse/machines/tc2068.c
trunk/fuse/machines/tc2068.h
trunk/fuse/machines/ts2068.c
trunk/fuse/man/.cvsignore
trunk/fuse/man/Makefile.am
trunk/fuse/man/fuse.1
trunk/fuse/memory.c
trunk/fuse/memory.h
trunk/fuse/menu.c
trunk/fuse/menu.h
trunk/fuse/menu_data.pl
trunk/fuse/periph.c
trunk/fuse/periph.h
trunk/fuse/perl/.cvsignore
trunk/fuse/perl/Fuse/.cvsignore
trunk/fuse/perl/Fuse/Dialog.pm
trunk/fuse/perl/Fuse/Makefile.am
trunk/fuse/perl/Fuse.pm
trunk/fuse/perl/Makefile.am
trunk/fuse/perl/cpp-perl.pl
trunk/fuse/pokefinder/.cvsignore
trunk/fuse/pokefinder/Makefile.am
trunk/fuse/pokefinder/pokefinder.c
trunk/fuse/pokefinder/pokefinder.h
trunk/fuse/printer.c
trunk/fuse/printer.h
trunk/fuse/profile.c
trunk/fuse/profile.h
trunk/fuse/psg.c
trunk/fuse/psg.h
trunk/fuse/roms/.cvsignore
trunk/fuse/roms/Makefile.am
trunk/fuse/rzx.c
trunk/fuse/rzx.h
trunk/fuse/scld.c
trunk/fuse/scld.h
trunk/fuse/screenshot.c
trunk/fuse/screenshot.h
trunk/fuse/settings-header.pl
trunk/fuse/settings.dat
trunk/fuse/settings.pl
trunk/fuse/simpleide.c
trunk/fuse/simpleide.h
trunk/fuse/slt.c
trunk/fuse/slt.h
trunk/fuse/snapshot.c
trunk/fuse/snapshot.h
trunk/fuse/sound/.cvsignore
trunk/fuse/sound/Makefile.am
trunk/fuse/sound/aosound.c
trunk/fuse/sound/coreaudiosound.c
trunk/fuse/sound/dxsound.c
trunk/fuse/sound/hpsound.c
trunk/fuse/sound/lowlevel.h
trunk/fuse/sound/nullsound.c
trunk/fuse/sound/osssound.c
trunk/fuse/sound/sdlsound.c
trunk/fuse/sound/sunsound.c
trunk/fuse/sound.c
trunk/fuse/sound.h
trunk/fuse/spectrum.c
trunk/fuse/spectrum.h
trunk/fuse/tape.c
trunk/fuse/tape.h
trunk/fuse/timer.c
trunk/fuse/timer.h
trunk/fuse/trdos.c
trunk/fuse/trdos.h
trunk/fuse/ui/.cvsignore
trunk/fuse/ui/Makefile.am
trunk/fuse/ui/fb/.cvsignore
trunk/fuse/ui/fb/Makefile.am
trunk/fuse/ui/fb/fbdisplay.c
trunk/fuse/ui/fb/fbdisplay.h
trunk/fuse/ui/fb/fbjoystick.c
trunk/fuse/ui/fb/fbkeyboard.c
trunk/fuse/ui/fb/fbkeyboard.h
trunk/fuse/ui/fb/fbmouse.c
trunk/fuse/ui/fb/fbmouse.h
trunk/fuse/ui/fb/fbui.c
trunk/fuse/ui/ggi/.cvsignore
trunk/fuse/ui/ggi/Makefile.am
trunk/fuse/ui/ggi/ggi_internals.h
trunk/fuse/ui/ggi/ggidisplay.c
trunk/fuse/ui/ggi/ggikeyboard.c
trunk/fuse/ui/ggi/ggiui.c
trunk/fuse/ui/gtk/.cvsignore
trunk/fuse/ui/gtk/Makefile.am
trunk/fuse/ui/gtk/binary.c
trunk/fuse/ui/gtk/browse.c
trunk/fuse/ui/gtk/confirm.c
trunk/fuse/ui/gtk/debugger.c
trunk/fuse/ui/gtk/fileselector.c
trunk/fuse/ui/gtk/gtkdisplay.c
trunk/fuse/ui/gtk/gtkinternals.h
trunk/fuse/ui/gtk/gtkjoystick.c
trunk/fuse/ui/gtk/gtkkeyboard.c
trunk/fuse/ui/gtk/gtkmouse.c
trunk/fuse/ui/gtk/gtkui.c
trunk/fuse/ui/gtk/memory.c
trunk/fuse/ui/gtk/options-header.pl
trunk/fuse/ui/gtk/options.pl
trunk/fuse/ui/gtk/picture.c
trunk/fuse/ui/gtk/pixmaps.c
trunk/fuse/ui/gtk/pokefinder.c
trunk/fuse/ui/gtk/rollback.c
trunk/fuse/ui/gtk/roms.c
trunk/fuse/ui/gtk/statusbar.c
trunk/fuse/ui/gtk/stock.c
trunk/fuse/ui/options.dat
trunk/fuse/ui/scaler/.cvsignore
trunk/fuse/ui/scaler/Makefile.am
trunk/fuse/ui/scaler/scaler.c
trunk/fuse/ui/scaler/scaler.h
trunk/fuse/ui/scaler/scaler_internals.h
trunk/fuse/ui/scaler/scalers.cpp
trunk/fuse/ui/sdl/.cvsignore
trunk/fuse/ui/sdl/Makefile.am
trunk/fuse/ui/sdl/sdldisplay.c
trunk/fuse/ui/sdl/sdldisplay.h
trunk/fuse/ui/sdl/sdljoystick.c
trunk/fuse/ui/sdl/sdljoystick.h
trunk/fuse/ui/sdl/sdlkeyboard.c
trunk/fuse/ui/sdl/sdlkeyboard.h
trunk/fuse/ui/sdl/sdlui.c
trunk/fuse/ui/svga/.cvsignore
trunk/fuse/ui/svga/Makefile.am
trunk/fuse/ui/svga/svgadisplay.c
trunk/fuse/ui/svga/svgadisplay.h
trunk/fuse/ui/svga/svgajoystick.c
trunk/fuse/ui/svga/svgakeyboard.c
trunk/fuse/ui/svga/svgakeyboard.h
trunk/fuse/ui/svga/svgaui.c
trunk/fuse/ui/ui.h
trunk/fuse/ui/uidisplay.h
trunk/fuse/ui/uijoystick.c
trunk/fuse/ui/uijoystick.h
trunk/fuse/ui/win32/.cvsignore
trunk/fuse/ui/win32/Makefile.am
trunk/fuse/ui/win32/debugger.c
trunk/fuse/ui/win32/debugger.h
trunk/fuse/ui/win32/debugger.rc
trunk/fuse/ui/win32/del_o.bat
trunk/fuse/ui/win32/error.c
trunk/fuse/ui/win32/keysyms.c
trunk/fuse/ui/win32/menu_data.c
trunk/fuse/ui/win32/menu_data.h
trunk/fuse/ui/win32/menu_data.rc
trunk/fuse/ui/win32/pokefinder.c
trunk/fuse/ui/win32/pokefinder.h
trunk/fuse/ui/win32/pokefinder.rc
trunk/fuse/ui/win32/statusbar.c
trunk/fuse/ui/win32/todo.txt
trunk/fuse/ui/win32/win32display.c
trunk/fuse/ui/win32/win32display.h
trunk/fuse/ui/win32/win32internals.h
trunk/fuse/ui/win32/win32keyboard.c
trunk/fuse/ui/win32/win32keyboard.h
trunk/fuse/ui/win32/win32ui.c
trunk/fuse/ui/win32/win32ui.rc
trunk/fuse/ui/xlib/.cvsignore
trunk/fuse/ui/xlib/Makefile.am
trunk/fuse/ui/xlib/xdisplay.c
trunk/fuse/ui/xlib/xdisplay.h
trunk/fuse/ui/xlib/xerror.c
trunk/fuse/ui/xlib/xjoystick.c
trunk/fuse/ui/xlib/xkeyboard.c
trunk/fuse/ui/xlib/xkeyboard.h
trunk/fuse/ui/xlib/xui.c
trunk/fuse/ui/xlib/xui.h
trunk/fuse/ui.c
trunk/fuse/uidisplay.c
trunk/fuse/ula.c
trunk/fuse/ula.h
trunk/fuse/utils.c
trunk/fuse/utils.h
trunk/fuse/widget/.cvsignore
trunk/fuse/widget/Makefile.am
trunk/fuse/widget/browse.c
trunk/fuse/widget/debugger.c
trunk/fuse/widget/error.c
trunk/fuse/widget/filesel.c
trunk/fuse/widget/memory.c
trunk/fuse/widget/menu.c
trunk/fuse/widget/mkfusefont.pl
trunk/fuse/widget/options-header.pl
trunk/fuse/widget/options.pl
trunk/fuse/widget/picture.c
trunk/fuse/widget/pokefinder.c
trunk/fuse/widget/query.c
trunk/fuse/widget/roms.c
trunk/fuse/widget/select.c
trunk/fuse/widget/text.c
trunk/fuse/widget/widget.c
trunk/fuse/widget/widget.h
trunk/fuse/widget/widget_internals.h
trunk/fuse/z80/.cvsignore
trunk/fuse/z80/Makefile.am
trunk/fuse/z80/coretest.c
trunk/fuse/z80/harness.pl
trunk/fuse/z80/opcodes_base.dat
trunk/fuse/z80/opcodes_cb.dat
trunk/fuse/z80/tests/.cvsignore
trunk/fuse/z80/tests/Makefile.am
trunk/fuse/z80/tests/ddcb40.out
trunk/fuse/z80/tests/ddcb41.out
trunk/fuse/z80/tests/ddcb42.out
trunk/fuse/z80/tests/ddcb44.out
trunk/fuse/z80/tests/ddcb45.out
trunk/fuse/z80/tests/ddcb46.out
trunk/fuse/z80/tests/ddcb47.out
trunk/fuse/z80/tests/ddcb48.out
trunk/fuse/z80/tests/ddcb49.out
trunk/fuse/z80/tests/ddcb4a.out
trunk/fuse/z80/tests/ddcb4b.out
trunk/fuse/z80/tests/ddcb4c.out
trunk/fuse/z80/tests/ddcb4d.out
trunk/fuse/z80/tests/ddcb50.out
trunk/fuse/z80/tests/ddcb51.out
trunk/fuse/z80/tests/ddcb52.out
trunk/fuse/z80/tests/ddcb53.out
trunk/fuse/z80/tests/ddcb54.out
trunk/fuse/z80/tests/ddcb55.out
trunk/fuse/z80/tests/ddcb56.out
trunk/fuse/z80/tests/ddcb58.out
trunk/fuse/z80/tests/ddcb5a.out
trunk/fuse/z80/tests/ddcb5d.out
trunk/fuse/z80/tests/ddcb5e.out
trunk/fuse/z80/tests/ddcb60.out
trunk/fuse/z80/tests/ddcb61.out
trunk/fuse/z80/tests/ddcb62.out
trunk/fuse/z80/tests/ddcb63.out
trunk/fuse/z80/tests/ddcb64.out
trunk/fuse/z80/tests/ddcb66.out
trunk/fuse/z80/tests/ddcb67.out
trunk/fuse/z80/tests/ddcb68.out
trunk/fuse/z80/tests/ddcb69.out
trunk/fuse/z80/tests/ddcb6a.out
trunk/fuse/z80/tests/ddcb6b.out
trunk/fuse/z80/tests/ddcb6d.out
trunk/fuse/z80/tests/ddcb6e.out
trunk/fuse/z80/tests/ddcb6f.out
trunk/fuse/z80/tests/ddcb70.out
trunk/fuse/z80/tests/ddcb73.out
trunk/fuse/z80/tests/ddcb75.out
trunk/fuse/z80/tests/ddcb76.out
trunk/fuse/z80/tests/ddcb78.out
trunk/fuse/z80/tests/ddcb79.out
trunk/fuse/z80/tests/ddcb7a.out
trunk/fuse/z80/tests/ddcb7b.out
trunk/fuse/z80/tests/ddcb7d.out
trunk/fuse/z80/tests/ddcb7e.out
trunk/fuse/z80/tests/ddcb7f.out
trunk/fuse/z80/tests/edb0.out
trunk/fuse/z80/tests/edb1.out
trunk/fuse/z80/tests/edb2.out
trunk/fuse/z80/tests/edb8.out
trunk/fuse/z80/tests/edb9.out
trunk/fuse/z80/tests/edba.out
trunk/fuse/z80/tests/fdcb40.out
trunk/fuse/z80/tests/fdcb41.out
trunk/fuse/z80/tests/fdcb42.out
trunk/fuse/z80/tests/fdcb43.out
trunk/fuse/z80/tests/fdcb44.out
trunk/fuse/z80/tests/fdcb45.out
trunk/fuse/z80/tests/fdcb46.out
trunk/fuse/z80/tests/fdcb47.out
trunk/fuse/z80/tests/fdcb48.out
trunk/fuse/z80/tests/fdcb4a.out
trunk/fuse/z80/tests/fdcb4c.out
trunk/fuse/z80/tests/fdcb4d.out
trunk/fuse/z80/tests/fdcb4e.out
trunk/fuse/z80/tests/fdcb50.out
trunk/fuse/z80/tests/fdcb51.out
trunk/fuse/z80/tests/fdcb52.out
trunk/fuse/z80/tests/fdcb53.out
trunk/fuse/z80/tests/fdcb54.out
trunk/fuse/z80/tests/fdcb55.out
trunk/fuse/z80/tests/fdcb56.out
trunk/fuse/z80/tests/fdcb57.out
trunk/fuse/z80/tests/fdcb58.out
trunk/fuse/z80/tests/fdcb5c.out
trunk/fuse/z80/tests/fdcb5e.out
trunk/fuse/z80/tests/fdcb60.out
trunk/fuse/z80/tests/fdcb61.out
trunk/fuse/z80/tests/fdcb62.out
trunk/fuse/z80/tests/fdcb63.out
trunk/fuse/z80/tests/fdcb64.out
trunk/fuse/z80/tests/fdcb66.out
trunk/fuse/z80/tests/fdcb67.out
trunk/fuse/z80/tests/fdcb69.out
trunk/fuse/z80/tests/fdcb6a.out
trunk/fuse/z80/tests/fdcb6c.out
trunk/fuse/z80/tests/fdcb6e.out
trunk/fuse/z80/tests/fdcb6f.out
trunk/fuse/z80/tests/fdcb70.out
trunk/fuse/z80/tests/fdcb71.out
trunk/fuse/z80/tests/fdcb72.out
trunk/fuse/z80/tests/fdcb74.out
trunk/fuse/z80/tests/fdcb76.out
trunk/fuse/z80/tests/fdcb79.out
trunk/fuse/z80/tests/fdcb7a.out
trunk/fuse/z80/tests/fdcb7b.out
trunk/fuse/z80/tests/fdcb7c.out
trunk/fuse/z80/tests/fdcb7d.out
trunk/fuse/z80/tests/fdcb7e.out
trunk/fuse/z80/tests/fdcb7f.out
trunk/fuse/z80/z80.c
trunk/fuse/z80/z80.h
trunk/fuse/z80/z80.pl
trunk/fuse/z80/z80_macros.h
trunk/fuse/z80/z80_ops.c
trunk/fuse/zxatasp.c
trunk/fuse/zxatasp.h
trunk/fuse/zxcf.c
trunk/fuse/zxcf.h
trunk/libspectrum/config.h
trunk/libspectrum/libspectrum/AUTHORS
trunk/libspectrum/libspectrum/COPYING
trunk/libspectrum/libspectrum/ChangeLog
trunk/libspectrum/libspectrum/Makefile.am
trunk/libspectrum/libspectrum/THANKS
trunk/libspectrum/libspectrum/TODO
trunk/libspectrum/libspectrum/accessor.pl
trunk/libspectrum/libspectrum/acinclude.m4
trunk/libspectrum/libspectrum/autogen.sh
trunk/libspectrum/libspectrum/bzip2.c
trunk/libspectrum/libspectrum/config.h.in
trunk/libspectrum/libspectrum/configure.in
trunk/libspectrum/libspectrum/creator.c
trunk/libspectrum/libspectrum/crypto.c
trunk/libspectrum/libspectrum/dck.c
trunk/libspectrum/libspectrum/dll.c
trunk/libspectrum/libspectrum/doc/.cvsignore
trunk/libspectrum/libspectrum/doc/Makefile.am
trunk/libspectrum/libspectrum/doc/cvs-tags
trunk/libspectrum/libspectrum/doc/libspectrum.3
trunk/libspectrum/libspectrum/doc/libspectrum.txt
trunk/libspectrum/libspectrum/hacking/.cvsignore
trunk/libspectrum/libspectrum/hacking/ChangeLog
trunk/libspectrum/libspectrum/hacking/Makefile.am
trunk/libspectrum/libspectrum/ide.c
trunk/libspectrum/libspectrum/internals.h
trunk/libspectrum/libspectrum/libspectrum.c
trunk/libspectrum/libspectrum/libspectrum.h.in
trunk/libspectrum/libspectrum/make-perl.c
trunk/libspectrum/libspectrum/microdrive.c
trunk/libspectrum/libspectrum/myglib/.cvsignore
trunk/libspectrum/libspectrum/myglib/Makefile.am
trunk/libspectrum/libspectrum/myglib/ghash.c
trunk/libspectrum/libspectrum/myglib/gslist.c
trunk/libspectrum/libspectrum/plusd.c
trunk/libspectrum/libspectrum/rzx.c
trunk/libspectrum/libspectrum/sna.c
trunk/libspectrum/libspectrum/snap_accessors.txt
trunk/libspectrum/libspectrum/snapshot.c
trunk/libspectrum/libspectrum/snp.c
trunk/libspectrum/libspectrum/sp.c
trunk/libspectrum/libspectrum/symbol_table.c
trunk/libspectrum/libspectrum/szx.c
trunk/libspectrum/libspectrum/tap.c
trunk/libspectrum/libspectrum/tape.c
trunk/libspectrum/libspectrum/tape_accessors.pl
trunk/libspectrum/libspectrum/tape_accessors.txt
trunk/libspectrum/libspectrum/tape_block.c
trunk/libspectrum/libspectrum/tape_block.h
trunk/libspectrum/libspectrum/tape_set.pl
trunk/libspectrum/libspectrum/timings.c
trunk/libspectrum/libspectrum/tzx_read.c
trunk/libspectrum/libspectrum/tzx_write.c
trunk/libspectrum/libspectrum/warajevo_read.c
trunk/libspectrum/libspectrum/z80.c
trunk/libspectrum/libspectrum/z80em.c
trunk/libspectrum/libspectrum/zlib.c
trunk/libspectrum/libspectrum/zxs.c
trunk/libspectrum/libspectrum.h
trunk/libspectrum/libspectrum.xcodeproj/project.pbxproj
Added Paths:
-----------
trunk/audiofile/
trunk/audiofile/Info.plist
trunk/audiofile/audiofile/
trunk/audiofile/audiofile.xcodeproj/
trunk/audiofile/audiofile.xcodeproj/project.pbxproj
trunk/audiofile/config.h
trunk/fuse/hacking/win32_todo.txt
trunk/fuse/menu_data.dat
trunk/fuse/sound/alsasound.c
trunk/fuse/ui/win32/icons/Makefile.am
trunk/fuse/windres.rc
trunk/fuse/z80/tests/27_1.in
trunk/fuse/z80/tests/27_1.out
trunk/libspectrum/libspectrum/csw.c
trunk/libspectrum/libspectrum/test/
trunk/libspectrum/libspectrum/wav.c
Removed Paths:
-------------
trunk/fuse/menu_data.c
Modified: trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj
===================================================================
--- trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj 2007-06-11 02:30:09 UTC (rev 381)
+++ trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj 2007-06-16 13:20:50 UTC (rev 382)
@@ -11,6 +11,8 @@
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 */; };
+ B61617260C1CE2980009ADF9 /* csw.c in Sources */ = {isa = PBXBuildFile; fileRef = B61617250C1CE2980009ADF9 /* csw.c */; };
+ B616172A0C1CE2A50009ADF9 /* wav.c in Sources */ = {isa = PBXBuildFile; fileRef = B61617290C1CE2A50009ADF9 /* wav.c */; };
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 */; };
@@ -111,6 +113,8 @@
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>"; };
+ B61617250C1CE2980009ADF9 /* csw.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = csw.c; path = ../../libspectrum/libspectrum/csw.c; sourceTree = "<group>"; };
+ B61617290C1CE2A50009ADF9 /* wav.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = wav.c; path = ../../libspectrum/libspectrum/wav.c; 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>"; };
@@ -233,6 +237,7 @@
B6BF29FF0A5FFD0100D16624 /* config.h */,
B6BF2A000A5FFD0100D16624 /* creator.c */,
B6BF2A010A5FFD0100D16624 /* crypto.c */,
+ B61617250C1CE2980009ADF9 /* csw.c */,
B6BF2A020A5FFD0100D16624 /* dck.c */,
B6BF2A030A5FFD0100D16624 /* ide.c */,
B6BF2A040A5FFD0100D16624 /* internals.h */,
@@ -255,6 +260,7 @@
B6BF2A140A5FFD0100D16624 /* tzx_read.c */,
B6BF2A150A5FFD0100D16624 /* tzx_write.c */,
B6BF2A160A5FFD0100D16624 /* warajevo_read.c */,
+ B61617290C1CE2A50009ADF9 /* wav.c */,
B6BF2A170A5FFD0100D16624 /* z80.c */,
B639B7920A6BB2C100927E24 /* z80em.c */,
B6BF2A180A5FFD0100D16624 /* zlib.c */,
@@ -392,6 +398,8 @@
B6BF2A350A5FFD0100D16624 /* zxs.c in Sources */,
B639B7930A6BB2C100927E24 /* z80em.c in Sources */,
B62C1CD00B761515000BA4E0 /* symbol_table.c in Sources */,
+ B61617260C1CE2980009ADF9 /* csw.c in Sources */,
+ B616172A0C1CE2A50009ADF9 /* wav.c in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -545,18 +553,21 @@
B6B0E30108CC65D5001D8411 /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
};
name = Development;
};
B6B0E30208CC65D5001D8411 /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
};
name = Deployment;
};
B6B0E30308CC65D5001D8411 /* Default */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
};
name = Default;
};
Modified: trunk/FuseImporter/libspectrum.h
===================================================================
--- trunk/FuseImporter/libspectrum.h 2007-06-11 02:30:09 UTC (rev 381)
+++ trunk/FuseImporter/libspectrum.h 2007-06-16 13:20:50 UTC (rev 382)
@@ -13,9 +13,9 @@
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 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:
@@ -272,6 +272,12 @@
LIBSPECTRUM_ID_TAPE_CSW, /* .csw tape image */
LIBSPECTRUM_ID_TAPE_Z80EM, /* Z80Em tape image */
+ /* Below here, present only in x.x.x and later */
+ LIBSPECTRUM_ID_TAPE_WAV, /* .wav tape image */
+
+ /* Amiga entry for improved compressed file support */
+ LIBSPECTRUM_ID_COMPRESSED_XFD, /* xfdmaster compressed file */
+
LIBSPECTRUM_ID_SCREEN_SCR, /* .scr screen file */
} libspectrum_id_t;
@@ -716,6 +722,7 @@
} libspectrum_tape_type;
typedef struct libspectrum_tape_block libspectrum_tape_block;
+typedef struct libspectrum_tape_block_state libspectrum_tape_block_state;
typedef struct libspectrum_tape_generalised_data_symbol_table libspectrum_tape_generalised_data_symbol_table;
/* Something to step through all the blocks in a tape */
@@ -756,7 +763,8 @@
libspectrum_tape_type type );
libspectrum_error WIN32_DLL
-libspectrum_tape_block_init( libspectrum_tape_block *block );
+libspectrum_tape_block_init( libspectrum_tape_block *block,
+ libspectrum_tape_block_state *state );
libspectrum_error WIN32_DLL
libspectrum_tape_block_description( char *buffer, size_t length,
@@ -804,10 +812,10 @@
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_scale( libspectrum_tape_block *block );
+libspectrum_error WIN32_DLL libspectrum_tape_block_set_scale( libspectrum_tape_block *block, libspectrum_dword scale );
libspectrum_dword WIN32_DLL libspectrum_tape_block_pulse_lengths( libspectrum_tape_block *block, size_t idx );
libspectrum_error WIN32_DLL libspectrum_tape_block_set_pulse_lengths( libspectrum_tape_block *block, libspectrum_dword *pulse_lengths );
-libspectrum_tape_state_type WIN32_DLL libspectrum_tape_block_state( libspectrum_tape_block *block );
-libspectrum_error WIN32_DLL libspectrum_tape_block_set_state( libspectrum_tape_block *block, libspectrum_tape_state_type state );
libspectrum_dword WIN32_DLL libspectrum_tape_block_sync1_length( libspectrum_tape_block *block );
libspectrum_error WIN32_DLL libspectrum_tape_block_set_sync1_length( libspectrum_tape_block *block, libspectrum_dword sync1_length );
libspectrum_dword WIN32_DLL libspectrum_tape_block_sync2_length( libspectrum_tape_block *block );
@@ -850,6 +858,15 @@
libspectrum_tape_block WIN32_DLL *
libspectrum_tape_current_block( libspectrum_tape *tape );
+/* Get the state of the active block on the tape */
+libspectrum_tape_state_type WIN32_DLL
+libspectrum_tape_state( libspectrum_tape *tape );
+
+/* Set the state of the active block on the tape */
+libspectrum_error WIN32_DLL
+libspectrum_tape_set_state( libspectrum_tape *tape,
+ libspectrum_tape_state_type state );
+
/* Peek at the next block on the tape */
libspectrum_tape_block WIN32_DLL *
libspectrum_tape_peek_next_block( libspectrum_tape *tape );
@@ -883,25 +900,36 @@
/*** Routines for .tap format files ***/
+/* DEPRECATED: use libspectrum_tape_read() instead */
+DEPRECATED
libspectrum_error WIN32_DLL
libspectrum_tap_read( libspectrum_tape *tape, const libspectrum_byte *buffer,
const size_t length );
+
+/* DEPRECATED: use libspectrum_tape_write() instead */
+DEPRECATED
libspectrum_error WIN32_DLL
libspectrum_tap_write( libspectrum_byte **buffer, size_t *length,
libspectrum_tape *tape );
/*** Routines for .tzx format files ***/
+/* DEPRECATED: use libspectrum_tape_read() instead */
+DEPRECATED
libspectrum_error WIN32_DLL
libspectrum_tzx_read( libspectrum_tape *tape, const libspectrum_byte *buffer,
const size_t length );
+/* DEPRECATED: use libspectrum_tape_write() instead */
+DEPRECATED
libspectrum_error WIN32_DLL
libspectrum_tzx_write( libspectrum_byte **buffer, size_t *length,
libspectrum_tape *tape );
/*** Routines for Warajevo .tap format files ***/
+/* DEPRECATED: use libspectrum_tape_read() instead */
+DEPRECATED
libspectrum_error WIN32_DLL
libspectrum_warajevo_read( libspectrum_tape *tape,
const libspectrum_byte *buffer, size_t length );
@@ -913,6 +941,9 @@
libspectrum_tape *tape );
libspectrum_tape_block WIN32_DLL *
+libspectrum_tape_iterator_current( libspectrum_tape_iterator iterator );
+
+libspectrum_tape_block WIN32_DLL *
libspectrum_tape_iterator_next( libspectrum_tape_iterator *iterator );
/*** Routines for handling the TZX generalised data block symbol table
Modified: trunk/README
===================================================================
--- trunk/README 2007-06-11 02:30:09 UTC (rev 381)
+++ trunk/README 2007-06-16 13:20:50 UTC (rev 382)
@@ -9,6 +9,7 @@
The directory structure is expected to be:
fuse/
FuseImporter
+ audiofile
fuse
lib765
bzip2
@@ -18,6 +19,9 @@
Full build instructions:
Uncompress the source package, and cd into the directory created. Then:
+cd audiofile
+xcodebuild -configuration Deployment
+cd ..
cd bzip2
xcodebuild -configuration Deployment
cd ..
Property changes on: trunk/audiofile
___________________________________________________________________
Name: svn:ignore
+ build
Added: trunk/audiofile/Info.plist
===================================================================
--- trunk/audiofile/Info.plist (rev 0)
+++ trunk/audiofile/Info.plist 2007-06-16 13:20:50 UTC (rev 382)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleExecutable</key>
+ <string></string>
+ <key>CFBundleGetInfoString</key>
+ <string></string>
+ <key>CFBundleIconFile</key>
+ <string></string>
+ <key>CFBundleIdentifier</key>
+ <string></string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundleName</key>
+ <string></string>
+ <key>CFBundlePackageType</key>
+ <string>FMWK</string>
+ <key>CFBundleShortVersionString</key>
+ <string></string>
+ <key>CFBundleSignature</key>
+ <string>????</string>
+ <key>CFBundleVersion</key>
+ <string>0.2.6</string>
+</dict>
+</plist>
Copied: trunk/audiofile/audiofile (from rev 381, vendor/audiofile/audiofile-0.2.6)
Added: trunk/audiofile/audiofile.xcodeproj/project.pbxproj
===================================================================
--- trunk/audiofile/audiofile.xcodeproj/project.pbxproj (rev 0)
+++ trunk/audiofile/audiofile.xcodeproj/project.pbxproj 2007-06-16 13:20:50 UTC (rev 382)
@@ -0,0 +1,582 @@
+// !$*UTF8*$!
+{
+ archiveVersion = 1;
+ classes = {
+ };
+ objectVersion = 42;
+ objects = {
+
+/* Begin PBXBuildFile section */
+ B623958E0C1CF586003B8E87 /* aes.c in Sources */ = {isa = PBXBuildFile; fileRef = 0000000000000000003A29E0 /* aes.c */; };
+ B623958F0C1CF586003B8E87 /* af_vfs.c in Sources */ = {isa = PBXBuildFile; fileRef = 0000000000000000003F7FC0 /* af_vfs.c */; };
+ B62395900C1CF586003B8E87 /* aiff.c in Sources */ = {isa = PBXBuildFile; fileRef = 0000000000000000003BA6D0 /* aiff.c */; };
+ B62395910C1CF586003B8E87 /* aiffwrite.c in Sources */ = {isa = PBXBuildFile; fileRef = 000000000000000000388830 /* aiffwrite.c */; };
+ B62395920C1CF586003B8E87 /* aupv.c in Sources */ = {is...
[truncated message content] |
|
From: <fr...@us...> - 2007-06-17 11:15:48
|
Revision: 385
http://svn.sourceforge.net/fuse-for-macosx/?rev=385&view=rev
Author: fredm
Date: 2007-06-17 04:15:49 -0700 (Sun, 17 Jun 2007)
Log Message:
-----------
Switch to DWARF debugging format.
Modified Paths:
--------------
trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj
trunk/audiofile/audiofile.xcodeproj/project.pbxproj
trunk/bzip2/libbz2.xcodeproj/project.pbxproj
trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
trunk/lib765/lib765.xcodeproj/project.pbxproj
trunk/libgcrypt/libgcrypt.xcodeproj/project.pbxproj
trunk/libspectrum/libspectrum.xcodeproj/project.pbxproj
Property Changed:
----------------
trunk/audiofile/audiofile.xcodeproj/
Modified: trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj
===================================================================
--- trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj 2007-06-17 01:41:07 UTC (rev 384)
+++ trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj 2007-06-17 11:15:49 UTC (rev 385)
@@ -553,6 +553,7 @@
B6B0E30108CC65D5001D8411 /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ DEBUG_INFORMATION_FORMAT = dwarf;
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
};
name = Development;
@@ -560,6 +561,7 @@
B6B0E30208CC65D5001D8411 /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ DEBUG_INFORMATION_FORMAT = dwarf;
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
};
name = Deployment;
@@ -567,6 +569,7 @@
B6B0E30308CC65D5001D8411 /* Default */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ DEBUG_INFORMATION_FORMAT = dwarf;
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
};
name = Default;
Property changes on: trunk/audiofile/audiofile.xcodeproj
___________________________________________________________________
Name: svn:ignore
+ *.mode1
*.pbxuser
Modified: trunk/audiofile/audiofile.xcodeproj/project.pbxproj
===================================================================
--- trunk/audiofile/audiofile.xcodeproj/project.pbxproj 2007-06-17 01:41:07 UTC (rev 384)
+++ trunk/audiofile/audiofile.xcodeproj/project.pbxproj 2007-06-17 11:15:49 UTC (rev 385)
@@ -394,6 +394,7 @@
i386,
ppc,
);
+ DEBUG_INFORMATION_FORMAT = dwarf;
FRAMEWORK_VERSION = 0.2.6;
MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
@@ -409,6 +410,7 @@
i386,
ppc,
);
+ DEBUG_INFORMATION_FORMAT = dwarf;
FRAMEWORK_VERSION = 0.2.6;
MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
@@ -424,6 +426,7 @@
i386,
ppc,
);
+ DEBUG_INFORMATION_FORMAT = dwarf;
FRAMEWORK_VERSION = 0.2.6;
MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
Modified: trunk/bzip2/libbz2.xcodeproj/project.pbxproj
===================================================================
--- trunk/bzip2/libbz2.xcodeproj/project.pbxproj 2007-06-17 01:41:07 UTC (rev 384)
+++ trunk/bzip2/libbz2.xcodeproj/project.pbxproj 2007-06-17 11:15:49 UTC (rev 385)
@@ -309,6 +309,7 @@
i386,
ppc,
);
+ DEBUG_INFORMATION_FORMAT = dwarf;
MACOSX_DEPLOYMENT_TARGET = 10.3;
MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
@@ -324,6 +325,7 @@
i386,
ppc,
);
+ DEBUG_INFORMATION_FORMAT = dwarf;
MACOSX_DEPLOYMENT_TARGET = 10.3;
MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
@@ -339,6 +341,7 @@
i386,
ppc,
);
+ DEBUG_INFORMATION_FORMAT = dwarf;
MACOSX_DEPLOYMENT_TARGET = 10.3;
MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
Modified: trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
===================================================================
--- trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2007-06-17 01:41:07 UTC (rev 384)
+++ trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2007-06-17 11:15:49 UTC (rev 385)
@@ -1677,6 +1677,7 @@
ppc,
);
DEAD_CODE_STRIPPING = YES;
+ DEBUG_INFORMATION_FORMAT = dwarf;
GCC_DYNAMIC_NO_PIC = YES;
GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
@@ -1694,6 +1695,8 @@
ppc,
);
DEAD_CODE_STRIPPING = YES;
+ DEBUG_INFORMATION_FORMAT = dwarf;
+ DEPLOYMENT_POSTPROCESSING = YES;
GCC_DYNAMIC_NO_PIC = YES;
GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
@@ -1711,6 +1714,7 @@
ppc,
);
DEAD_CODE_STRIPPING = YES;
+ DEBUG_INFORMATION_FORMAT = dwarf;
GCC_DYNAMIC_NO_PIC = YES;
GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
Modified: trunk/lib765/lib765.xcodeproj/project.pbxproj
===================================================================
--- trunk/lib765/lib765.xcodeproj/project.pbxproj 2007-06-17 01:41:07 UTC (rev 384)
+++ trunk/lib765/lib765.xcodeproj/project.pbxproj 2007-06-17 11:15:49 UTC (rev 385)
@@ -657,6 +657,7 @@
i386,
ppc,
);
+ DEBUG_INFORMATION_FORMAT = dwarf;
MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk;
@@ -671,6 +672,7 @@
i386,
ppc,
);
+ DEBUG_INFORMATION_FORMAT = dwarf;
MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk;
@@ -685,6 +687,7 @@
i386,
ppc,
);
+ DEBUG_INFORMATION_FORMAT = dwarf;
MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk;
Modified: trunk/libgcrypt/libgcrypt.xcodeproj/project.pbxproj
===================================================================
--- trunk/libgcrypt/libgcrypt.xcodeproj/project.pbxproj 2007-06-17 01:41:07 UTC (rev 384)
+++ trunk/libgcrypt/libgcrypt.xcodeproj/project.pbxproj 2007-06-17 11:15:49 UTC (rev 385)
@@ -553,6 +553,7 @@
i386,
ppc,
);
+ DEBUG_INFORMATION_FORMAT = dwarf;
MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk;
@@ -567,6 +568,7 @@
i386,
ppc,
);
+ DEBUG_INFORMATION_FORMAT = dwarf;
MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk;
@@ -581,6 +583,7 @@
i386,
ppc,
);
+ DEBUG_INFORMATION_FORMAT = dwarf;
MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk;
Modified: trunk/libspectrum/libspectrum.xcodeproj/project.pbxproj
===================================================================
--- trunk/libspectrum/libspectrum.xcodeproj/project.pbxproj 2007-06-17 01:41:07 UTC (rev 384)
+++ trunk/libspectrum/libspectrum.xcodeproj/project.pbxproj 2007-06-17 11:15:49 UTC (rev 385)
@@ -353,6 +353,7 @@
i386,
ppc,
);
+ DEBUG_INFORMATION_FORMAT = dwarf;
MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk;
@@ -367,6 +368,7 @@
i386,
ppc,
);
+ DEBUG_INFORMATION_FORMAT = dwarf;
MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk;
@@ -381,6 +383,7 @@
i386,
ppc,
);
+ DEBUG_INFORMATION_FORMAT = dwarf;
MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2007-06-29 12:55:32
|
Revision: 405
http://svn.sourceforge.net/fuse-for-macosx/?rev=405&view=rev
Author: fredm
Date: 2007-06-29 05:55:24 -0700 (Fri, 29 Jun 2007)
Log Message:
-----------
Merge up to vendor revision 3018.
Revision Links:
--------------
http://svn.sourceforge.net/fuse-for-macosx/?rev=3018&view=rev
Modified Paths:
--------------
trunk/FuseImporter/libspectrum.h
trunk/fuse/Makefile.am
trunk/fuse/ay.c
trunk/fuse/ay.h
trunk/fuse/configure.in
trunk/fuse/dck.c
trunk/fuse/divide.c
trunk/fuse/divide.h
trunk/fuse/event.c
trunk/fuse/event.h
trunk/fuse/fuse.cpp
trunk/fuse/fusepb/Credits.html
trunk/fuse/fusepb/English.lproj/InfoPlist.strings
trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
trunk/fuse/fusepb/Info-Fuse.plist
trunk/fuse/fusepb/controllers/FuseController.h
trunk/fuse/fusepb/controllers/FuseController.m
trunk/fuse/fusepb/controllers/PreferencesController.m
trunk/fuse/fusepb/models/Emulator.h
trunk/fuse/fusepb/models/Emulator.m
trunk/fuse/fusepb/nibs/MainMenu.nib/classes.nib
trunk/fuse/fusepb/nibs/MainMenu.nib/info.nib
trunk/fuse/fusepb/nibs/MainMenu.nib/keyedobjects.nib
trunk/fuse/fusepb/nibs/Preferences.nib/info.nib
trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib
trunk/fuse/fusepb/resources/Fuse Help/html/about.html
trunk/fuse/fusepb/resources/Fuse Help/html/compressed.html
trunk/fuse/fusepb/resources/Fuse Help/html/divide.html
trunk/fuse/fusepb/resources/Fuse Help/html/emulation.html
trunk/fuse/fusepb/resources/Fuse Help/html/filters.html
trunk/fuse/fusepb/resources/Fuse Help/html/mappings.html
trunk/fuse/fusepb/resources/Fuse Help/html/menus.html
trunk/fuse/fusepb/resources/Fuse Help/html/preferences.html
trunk/fuse/fusepb/resources/Fuse Help/html/printer.html
trunk/fuse/fusepb/resources/Fuse Help/html/spotlight.html
trunk/fuse/fusepb/resources/Fuse Help/html/tocstart.html
trunk/fuse/fusepb/views/DisplayOpenGLView.h
trunk/fuse/fusepb/views/DisplayOpenGLView.m
trunk/fuse/hacking/ChangeLog
trunk/fuse/if1.c
trunk/fuse/if1.h
trunk/fuse/if2.c
trunk/fuse/if2.h
trunk/fuse/joystick.c
trunk/fuse/joystick.h
trunk/fuse/keysyms.pl
trunk/fuse/machine.c
trunk/fuse/machine.h
trunk/fuse/machines/pentagon.c
trunk/fuse/machines/scorpion.c
trunk/fuse/machines/spec128.c
trunk/fuse/machines/spec16.c
trunk/fuse/machines/spec48.c
trunk/fuse/machines/spec_se.c
trunk/fuse/machines/specplus2.c
trunk/fuse/machines/specplus2a.c
trunk/fuse/machines/specplus3.c
trunk/fuse/machines/specplus3.h
trunk/fuse/machines/specplus3e.c
trunk/fuse/machines/tc2048.c
trunk/fuse/machines/tc2068.c
trunk/fuse/machines/ts2068.c
trunk/fuse/man/fuse.1
trunk/fuse/memory.c
trunk/fuse/memory.h
trunk/fuse/menu.c
trunk/fuse/menu_data.dat
trunk/fuse/periph.c
trunk/fuse/periph.h
trunk/fuse/printer.c
trunk/fuse/printer.h
trunk/fuse/roms/Makefile.am
trunk/fuse/rzx.c
trunk/fuse/rzx.h
trunk/fuse/scld.c
trunk/fuse/scld.h
trunk/fuse/settings.dat
trunk/fuse/simpleide.c
trunk/fuse/simpleide.h
trunk/fuse/slt.c
trunk/fuse/slt.h
trunk/fuse/snapshot.c
trunk/fuse/sound/alsasound.c
trunk/fuse/spectrum.c
trunk/fuse/spectrum.h
trunk/fuse/tape.c
trunk/fuse/trdos.c
trunk/fuse/trdos.h
trunk/fuse/ui/cocoa/cocoadisplay.h
trunk/fuse/ui/cocoa/cocoadisplay.m
trunk/fuse/ui/cocoa/cocoaerror.m
trunk/fuse/ui/cocoa/cocoajoystick.c
trunk/fuse/ui/cocoa/cocoascreenshot.h
trunk/fuse/ui/cocoa/cocoascreenshot.m
trunk/fuse/ui/cocoa/cocoastatusbar.m
trunk/fuse/ui/cocoa/cocoaui.h
trunk/fuse/ui/cocoa/cocoaui.m
trunk/fuse/ui/cocoa/keysyms.m
trunk/fuse/ui/gtk/gtkui.c
trunk/fuse/ui/options.dat
trunk/fuse/ui/svga/svgadisplay.c
trunk/fuse/ui/svga/svgakeyboard.c
trunk/fuse/ui/ui.h
trunk/fuse/ui/win32/win32ui.c
trunk/fuse/ui/xlib/xdisplay.c
trunk/fuse/ui/xlib/xui.c
trunk/fuse/ui.c
trunk/fuse/ula.c
trunk/fuse/ula.h
trunk/fuse/utils.c
trunk/fuse/widget/error.c
trunk/fuse/widget/memory.c
trunk/fuse/widget/menu.c
trunk/fuse/widget/options.pl
trunk/fuse/widget/pokefinder.c
trunk/fuse/widget/widget.c
trunk/fuse/widget/widget_internals.h
trunk/fuse/z80/coretest.c
trunk/fuse/z80/z80.c
trunk/fuse/z80/z80.h
trunk/fuse/z80/z80.pl
trunk/fuse/z80/z80_macros.h
trunk/fuse/z80/z80_ops.c
trunk/fuse/zxatasp.c
trunk/fuse/zxatasp.h
trunk/fuse/zxcf.c
trunk/fuse/zxcf.h
trunk/libspectrum/libspectrum/hacking/ChangeLog
trunk/libspectrum/libspectrum/libspectrum.c
trunk/libspectrum/libspectrum/libspectrum.h.in
trunk/libspectrum/libspectrum.h
Added Paths:
-----------
trunk/fuse/disk/
trunk/fuse/disk/Makefile.am
trunk/fuse/disk/plusd.c
trunk/fuse/disk/plusd.h
trunk/fuse/disk/wd1770.c
trunk/fuse/disk/wd1770.h
trunk/fuse/fusepb/resources/Fuse Help/html/plusd.html
trunk/fuse/module.c
trunk/fuse/module.h
trunk/fuse/roms/plusd.rom
Removed Paths:
-------------
trunk/fuse/disk/Makefile.am
trunk/fuse/disk/plusd.c
trunk/fuse/disk/plusd.h
trunk/fuse/disk/wd1770.c
trunk/fuse/disk/wd1770.h
Modified: trunk/FuseImporter/libspectrum.h
===================================================================
--- trunk/FuseImporter/libspectrum.h 2007-06-28 13:18:42 UTC (rev 404)
+++ trunk/FuseImporter/libspectrum.h 2007-06-29 12:55:24 UTC (rev 405)
@@ -1,7 +1,7 @@
/* libspectrum.h: the library for dealing with ZX Spectrum emulator files
Copyright (c) 2001-2007 Philip Kendall, Darren Salt, Fredrick Meunier
- $Id: libspectrum.h.in,v 1.141 2007/02/02 16:35:42 pak21 Exp $
+ $Id: libspectrum.h.in 3008 2007-06-17 18:54:58Z 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
@@ -274,10 +274,10 @@
/* Below here, present only in x.x.x and later */
LIBSPECTRUM_ID_TAPE_WAV, /* .wav tape image */
+ LIBSPECTRUM_ID_COMPRESSED_XFD, /* xfdmaster (Amiga) compressed file */
+ LIBSPECTRUM_ID_DISK_IMG, /* .img +D disk image */
+ LIBSPECTRUM_ID_DISK_MGT, /* .mgt +D disk image */
- /* Amiga entry for improved compressed file support */
- LIBSPECTRUM_ID_COMPRESSED_XFD, /* xfdmaster compressed file */
-
LIBSPECTRUM_ID_SCREEN_SCR, /* .scr screen file */
} libspectrum_id_t;
@@ -307,6 +307,10 @@
LIBSPECTRUM_CLASS_MICRODRIVE, /* Microdrive cartridges */
+ /* Below here, present only in x.x.x and later */
+
+ LIBSPECTRUM_CLASS_DISK_PLUSD, /* +D disk image */
+
LIBSPECTRUM_CLASS_SCREENSHOT, /* Screenshot */
} libspectrum_class_t;
Modified: trunk/fuse/Makefile.am
===================================================================
--- trunk/fuse/Makefile.am 2007-06-28 13:18:42 UTC (rev 404)
+++ trunk/fuse/Makefile.am 2007-06-29 12:55:24 UTC (rev 405)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 1999-2004 Philip Kendall
-## $Id: Makefile.am 2920 2007-06-02 02:06:05Z fredm $
+## $Id: Makefile.am 3007 2007-06-17 18:50:48Z zubzero $
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -27,6 +27,7 @@
SUBDIRS = compat \
debugger \
+ @DISK@ \
hacking \
lib \
machines \
@@ -41,6 +42,7 @@
DIST_SUBDIRS = compat \
debugger \
+ disk \
hacking \
lib \
machines \
@@ -70,6 +72,7 @@
machine.c \
memory.c \
menu.c \
+ module.c \
periph.c \
printer.c \
profile.c \
@@ -98,6 +101,7 @@
fuse_LDADD = debugger/libdebugger.a \
@UI_LIBS@ \
+@DISK_LIBS@ \
machines/libmachines.a \
pokefinder/libpokefinder.a \
sound/libsound.a \
@@ -119,11 +123,12 @@
@WINDRES_OBJ@
fuse_DEPENDENCIES = @UI_LIBS@ \
+ @DISK_LIBS@ \
debugger/libdebugger.a \
machines/libmachines.a \
sound/libsound.a \
- z80/libz80.a \
- @WINDRES_OBJ@
+ z80/libz80.a \
+ @WINDRES_OBJ@
BUILT_SOURCES = settings.c settings.h
@@ -156,6 +161,7 @@
machine.h \
memory.h \
menu.h \
+ module.h \
periph.h \
psg.h \
rzx.h \
Modified: trunk/fuse/ay.c
===================================================================
--- trunk/fuse/ay.c 2007-06-28 13:18:42 UTC (rev 404)
+++ trunk/fuse/ay.c 2007-06-29 12:55:24 UTC (rev 405)
@@ -1,7 +1,7 @@
/* ay.c: AY-8-3912 routines
Copyright (c) 1999-2004 Philip Kendall
- $Id: ay.c 2889 2007-05-26 17:45:08Z zubzero $
+ $Id: ay.c 2993 2007-06-17 13:54:49Z 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,7 @@
#include "compat.h"
#include "machine.h"
+#include "module.h"
#include "printer.h"
#include "psg.h"
#include "sound.h"
@@ -40,6 +41,26 @@
};
+static void ay_from_snapshot( libspectrum_snap *snap );
+static void ay_to_snapshot( libspectrum_snap *snap );
+
+static module_info_t ay_module_info = {
+
+ NULL,
+ NULL,
+ ay_from_snapshot,
+ ay_to_snapshot,
+
+};
+
+int
+ay_init( void )
+{
+ module_register( &ay_module_info );
+
+ return 0;
+}
+
/* What happens when the AY register port (traditionally 0xfffd on the 128K
machines) is read from */
libspectrum_byte
@@ -97,12 +118,12 @@
if( current == 14 ) printer_serial_write( b );
}
-int
-ay_from_snapshot( libspectrum_snap *snap, int capabilities )
+static void
+ay_from_snapshot( libspectrum_snap *snap )
{
size_t i;
- if( capabilities & LIBSPECTRUM_MACHINE_CAPABILITY_AY ) {
+ if( machine_current->capabilities & LIBSPECTRUM_MACHINE_CAPABILITY_AY ) {
ay_registerport_write( 0xfffd,
libspectrum_snap_out_ay_registerport( snap ) );
@@ -114,11 +135,9 @@
}
}
-
- return 0;
}
-int
+static void
ay_to_snapshot( libspectrum_snap *snap )
{
size_t i;
@@ -130,6 +149,4 @@
for( i = 0; i < AY_REGISTERS; i++ )
libspectrum_snap_set_ay_registers( snap, i,
machine_current->ay.registers[i] );
-
- return 0;
}
Modified: trunk/fuse/ay.h
===================================================================
--- trunk/fuse/ay.h 2007-06-28 13:18:42 UTC (rev 404)
+++ trunk/fuse/ay.h 2007-06-29 12:55:24 UTC (rev 405)
@@ -1,7 +1,7 @@
/* ay.h: AY-8-3912 routines
Copyright (c) 1999-2004 Philip Kendall
- $Id: ay.h 2889 2007-05-26 17:45:08Z zubzero $
+ $Id: ay.h 2993 2007-06-17 13:54:49Z 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,12 +35,11 @@
libspectrum_byte registers[ AY_REGISTERS ];
} ayinfo;
+int ay_init( void );
+
libspectrum_byte ay_registerport_read( libspectrum_word port, int *attached );
void ay_registerport_write( libspectrum_word port, libspectrum_byte b );
void ay_dataport_write( libspectrum_word port, libspectrum_byte b );
-int ay_from_snapshot( libspectrum_snap *snap, int capabilities );
-int ay_to_snapshot( libspectrum_snap *snap );
-
#endif /* #ifndef FUSE_AY_H */
Modified: trunk/fuse/configure.in
===================================================================
--- trunk/fuse/configure.in 2007-06-28 13:18:42 UTC (rev 404)
+++ trunk/fuse/configure.in 2007-06-29 12:55:24 UTC (rev 405)
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-dnl $Id: configure.in,v 1.155 2007/02/02 16:21:50 pak21 Exp $
+dnl $Id: configure.in 3007 2007-06-17 18:50:48Z 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
@@ -358,6 +358,14 @@
lib/tape_se.szx
lib/tape_ts2068.szx])
+dnl LibDsk/lib765 prefix
+AC_ARG_WITH(disk-prefix,
+[ --with-disk-prefix=PFX where the LibDsk and/or lib765 libraries are installed (optional)],
+DSK_CFLAGS=-I$withval/include; DSKLIBS=-L$withval/lib,
+DSK_CFLAGS=""; DSK_LIBS="")
+ac_save_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $DSK_CFLAGS"
+
dnl Do we want +3 disk support?
AC_MSG_CHECKING(whether +3 disk support requested)
AC_ARG_WITH(plus3-disk,
@@ -366,21 +374,27 @@
plus3disk=yes)
AC_MSG_RESULT($plus3disk)
if test "$plus3disk" = yes; then
- AC_ARG_WITH(plus3-disk-prefix,
- [ --with-plus3-disk-prefix=PFX where the +3 libraries are installed (optional)],
- DSK_CFLAGS=-I$withval/include; DSKLIBS=-L$withval/lib,
- DSK_CFLAGS=""; DSK_LIBS="")
- ac_save_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $DSK_CFLAGS"
AC_CHECK_HEADERS(765.h, DSKLIBS="$DSKLIBS -l765"; lib765=yes,
- AC_MSG_WARN(765.h not found - disk support disabled))
- if test "$lib765" = yes; then
- AC_CHECK_HEADERS(libdsk.h, DSKLIBS="$DSKLIBS -ldsk")
- fi
- CPPFLAGS="$ac_save_CPPFLAGS"
+ AC_MSG_WARN(765.h not found - +3 disk support disabled))
fi
+
+dnl Do we want LibDsk support?
+AC_ARG_WITH(libdsk,
+ [ --without-libdsk disable LibDsk support],
+ if test "$withval" = no; then libdsk=no; else libdsk=yes; fi,
+ libdsk=yes)
+AC_MSG_RESULT($libdsk)
+if test "$libdsk" = yes; then
+ AC_CHECK_HEADERS(libdsk.h, DSKLIBS="$DSKLIBS -ldsk";
+ DISK_LIBS="disk/libdisk.a"; DISK="disk",
+ AC_MSG_WARN(libdsk.h not found - LibDsk support disabled))
+fi
+
+CPPFLAGS="$ac_save_CPPFLAGS"
AC_SUBST(DSK_CFLAGS)
AC_SUBST(DSKLIBS)
+AC_SUBST(DISK_LIBS)
+AC_SUBST(DISK)
dnl Check if a version of libpng which supplies png_write_png is available
AC_CHECK_LIB( png, png_write_png,
@@ -568,6 +582,7 @@
AC_OUTPUT(Makefile \
compat/Makefile \
debugger/Makefile \
+disk/Makefile \
hacking/Makefile \
lib/Makefile \
machines/Makefile \
Modified: trunk/fuse/dck.c
===================================================================
--- trunk/fuse/dck.c 2007-06-28 13:18:42 UTC (rev 404)
+++ trunk/fuse/dck.c 2007-06-29 12:55:24 UTC (rev 405)
@@ -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 2889 2007-05-26 17:45:08Z zubzero $
+ $Id: dck.c 2995 2007-06-17 14:31:36Z 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
@@ -61,7 +61,7 @@
error = settings_set_string( &settings_current.dck_file, filename );
if( error ) return error;
- machine_reset();
+ machine_reset( 0 );
return 0;
}
@@ -82,7 +82,7 @@
ui_menu_activate( UI_MENU_ITEM_MEDIA_CARTRIDGE_DOCK_EJECT, 0 );
- machine_reset();
+ machine_reset( 0 );
}
int
Copied: trunk/fuse/disk (from rev 404, vendor/fuse-emulator/current/fuse/disk)
Deleted: trunk/fuse/disk/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/disk/Makefile.am 2007-06-28 13:18:42 UTC (rev 404)
+++ trunk/fuse/disk/Makefile.am 2007-06-29 12:55:24 UTC (rev 405)
@@ -1,34 +0,0 @@
-## Process this file with automake to produce Makefile.in
-## Copyright (c) 2007 Stuart Brady
-
-## $Id: Makefile.am 2889 2007-05-26 17:45:08Z 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...
-
-AUTOMAKE_OPTIONS = foreign
-
-noinst_LIBRARIES = libdisk.a
-
-INCLUDES = @LIBSPEC_CFLAGS@ @GTK_CFLAGS@ @GLIB_CFLAGS@
-
-libdisk_a_SOURCES = plusd.c \
- wd1770.c
-
-noinst_HEADERS = plusd.h \
- wd1770.h
Copied: trunk/fuse/disk/Makefile.am (from rev 404, vendor/fuse-emulator/current/fuse/disk/Makefile.am)
===================================================================
--- trunk/fuse/disk/Makefile.am (rev 0)
+++ trunk/fuse/disk/Makefile.am 2007-06-29 12:55:24 UTC (rev 405)
@@ -0,0 +1,34 @@
+## Process this file with automake to produce Makefile.in
+## Copyright (c) 2007 Stuart Brady
+
+## $Id: Makefile.am 2889 2007-05-26 17:45:08Z 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...
+
+AUTOMAKE_OPTIONS = foreign
+
+noinst_LIBRARIES = libdisk.a
+
+INCLUDES = @LIBSPEC_CFLAGS@ @GTK_CFLAGS@ @GLIB_CFLAGS@
+
+libdisk_a_SOURCES = plusd.c \
+ wd1770.c
+
+noinst_HEADERS = plusd.h \
+ wd1770.h
Deleted: trunk/fuse/disk/plusd.c
===================================================================
--- vendor/fuse-emulator/current/fuse/disk/plusd.c 2007-06-28 13:18:42 UTC (rev 404)
+++ trunk/fuse/disk/plusd.c 2007-06-29 12:55:24 UTC (rev 405)
@@ -1,571 +0,0 @@
-/* plusd.c: Routines for handling the +D interface
- Copyright (c) 1999-2007 Stuart Brady, Fredrick Meunier, Philip Kendall,
- Dmitry Sanarin, Darren Salt
-
- $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:
-
- Philip: phi...@sh...
-
- Stuart: sd...@nt...
-
-*/
-
-#include <config.h>
-
-#include <errno.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <string.h>
-#ifdef HAVE_STRINGS_H
-#include <strings.h> /* Needed for strncasecmp() on QNX6 */
-#endif /* #ifdef HAVE_STRINGS_H */
-#include <limits.h>
-#include <sys/stat.h>
-
-#include <libdsk.h>
-
-#include <libspectrum.h>
-
-#include "compat.h"
-#include "event.h"
-#include "machine.h"
-#include "module.h"
-#include "plusd.h"
-#include "printer.h"
-#include "settings.h"
-#include "ui/ui.h"
-#include "utils.h"
-#include "wd1770.h"
-#include "z80/z80.h"
-
-int plusd_available = 0;
-int plusd_active = 0;
-int plusd_index_pulse = 0;
-
-wd1770_fdc plusd_fdc;
-wd1770_drive plusd_drives[ PLUSD_NUM_DRIVES ];
-
-static const char *plusd_template = "fuse.plusd.XXXXXX";
-
-static void plusd_reset( int hard_reset );
-static void plusd_memory_map( void );
-static void plusd_from_snapshot( libspectrum_snap *snap );
-static void plusd_to_snapshot( libspectrum_snap *snap );
-
-static module_info_t plusd_module_info = {
-
- plusd_reset,
- plusd_memory_map,
- plusd_from_snapshot,
- plusd_to_snapshot,
-
-};
-
-void
-plusd_page( void )
-{
- plusd_active = 1;
- machine_current->ram.romcs = 1;
- machine_current->memory_map();
-}
-
-void
-plusd_unpage( void )
-{
- plusd_active = 0;
- machine_current->ram.romcs = 0;
- machine_current->memory_map();
-}
-
-static void
-plusd_memory_map( void )
-{
- if( !plusd_active ) return;
-
- memory_map_read[ 0 ] = memory_map_write[ 0 ] = memory_map_romcs[ 0 ];
- memory_map_read[ 1 ] = memory_map_write[ 1 ] = memory_map_ram[ 16 * 2 ];
-}
-
-void
-plusd_set_cmdint( wd1770_fdc *f )
-{
- z80_interrupt();
-}
-
-const periph_t plusd_peripherals[] = {
- /* ---- ---- 1110 0011 */
- { 0x00ff, 0x00e3, plusd_sr_read, plusd_cr_write },
- /* ---- ---- 1110 1011 */
- { 0x00ff, 0x00eb, plusd_tr_read, plusd_tr_write },
- /* ---- ---- 1111 0011 */
- { 0x00ff, 0x00f3, plusd_sec_read, plusd_sec_write },
- /* ---- ---- 1111 1011 */
- { 0x00ff, 0x00fb, plusd_dr_read, plusd_dr_write },
-
- /* ---- ---- 1110 1111 */
- { 0x00ff, 0x00ef, NULL, plusd_cn_write },
- /* ---- ---- 1110 0111 */
- { 0x00ff, 0x00e7, plusd_mem_read, plusd_mem_write },
- /* 0000 0000 1111 0111 */
- { 0x00ff, 0x00f7, plusd_printer_read, printer_parallel_write },
-};
-
-const size_t plusd_peripherals_count =
- sizeof( plusd_peripherals ) / sizeof( periph_t );
-
-int
-plusd_init( void )
-{
- int i;
- wd1770_drive *d;
-
- plusd_fdc.current_drive = &plusd_drives[ 0 ];
-
- for( i = 0; i < PLUSD_NUM_DRIVES; i++ ) {
- d = &plusd_drives[ i ];
-
- d->disk = NULL;
- d->filename[0] = '\0';
- }
-
- plusd_fdc.set_cmdint = &plusd_set_cmdint;
- plusd_fdc.reset_cmdint = NULL;
- plusd_fdc.set_datarq = NULL;
- plusd_fdc.reset_datarq = NULL;
- plusd_fdc.iface = NULL;
-
- plusd_fdc.rates[ 0 ] = 6;
- plusd_fdc.rates[ 1 ] = 12;
- plusd_fdc.rates[ 2 ] = 2;
- plusd_fdc.rates[ 3 ] = 3;
-
- module_register( &plusd_module_info );
-
- return 0;
-}
-
-static void
-plusd_reset( int hard_reset )
-{
- int i;
- wd1770_drive *d;
- wd1770_fdc *f = &plusd_fdc;
-
- plusd_available = 0;
-
- if( !periph_plusd_active )
- return;
-
- machine_load_rom_bank( memory_map_romcs, 0, 0,
- settings_default.rom_plusd,
- settings_current.rom_plusd, 0x2000 );
-
- memory_map_romcs[0].source = MEMORY_SOURCE_PERIPHERAL;
-
- machine_current->ram.romcs = 0;
-
- memory_map_romcs[ 0 ].writable = 0;
- memory_map_romcs[ 1 ].writable = 0;
- memory_map_ram[ 16 * 2 ].writable = 1;
-
- plusd_available = 1;
- plusd_active = 0;
- plusd_index_pulse = 0;
-
- if( hard_reset ) {
- for( i = 0; i < 8192; i++ ) {
- memory_map_ram[ 16 * 2 ].page[ i ] = 0;
- }
- }
-
- f->spin_cycles = 0;
- f->direction = 0;
-
- f->state = wd1770_state_none;
- f->status_type = wd1770_status_type1;
-
- f->status_register = 0;
- f->track_register = 0;
- f->sector_register = 0;
- f->data_register = 0;
-
- for( i = 0; i < PLUSD_NUM_DRIVES; i++ ) {
- d = &plusd_drives[ i ];
-
- d->index_pulse = 0;
- d->index_interrupt = 0;
- d->track = 0;
- d->side = 0;
- }
-
- f->status_register |= WD1770_SR_LOST; /* track 0 */
-
- /* We can eject disks only if they are currently present */
- ui_menu_activate( UI_MENU_ITEM_MEDIA_DISK_PLUSD_1_EJECT,
- !!plusd_drives[ PLUSD_DRIVE_1 ].disk );
- ui_menu_activate( UI_MENU_ITEM_MEDIA_DISK_PLUSD_2_EJECT,
- !!plusd_drives[ PLUSD_DRIVE_2 ].disk );
-
- plusd_fdc.current_drive = &plusd_drives[ 0 ];
- machine_current->memory_map();
- plusd_event_index( 0 );
-
- ui_statusbar_update( UI_STATUSBAR_ITEM_DISK, UI_STATUSBAR_STATE_INACTIVE );
-}
-
-void
-plusd_end( void )
-{
- plusd_available = 0;
-}
-
-libspectrum_byte
-plusd_sr_read( libspectrum_word port GCC_UNUSED, int *attached )
-{
- *attached = 1;
- return wd1770_sr_read( &plusd_fdc );
-}
-
-void
-plusd_cr_write( libspectrum_word port GCC_UNUSED, libspectrum_byte b )
-{
- wd1770_cr_write( &plusd_fdc, b );
-}
-
-libspectrum_byte
-plusd_tr_read( libspectrum_word port GCC_UNUSED, int *attached )
-{
- *attached = 1;
- return wd1770_tr_read( &plusd_fdc );
-}
-
-void
-plusd_tr_write( libspectrum_word port GCC_UNUSED, libspectrum_byte b )
-{
- wd1770_tr_write( &plusd_fdc, b );
-}
-
-libspectrum_byte
-plusd_sec_read( libspectrum_word port GCC_UNUSED, int *attached )
-{
- *attached = 1;
- return wd1770_sec_read( &plusd_fdc );
-}
-
-void
-plusd_sec_write( libspectrum_word port GCC_UNUSED, libspectrum_byte b )
-{
- wd1770_sec_write( &plusd_fdc, b );
-}
-
-libspectrum_byte
-plusd_dr_read( libspectrum_word port GCC_UNUSED, int *attached )
-{
- *attached = 1;
- return wd1770_dr_read( &plusd_fdc );
-}
-
-void
-plusd_dr_write( libspectrum_word port GCC_UNUSED, libspectrum_byte b )
-{
- wd1770_dr_write( &plusd_fdc, b );
-}
-
-void
-plusd_cn_write( libspectrum_word port GCC_UNUSED, libspectrum_byte b )
-{
- int drive, side;
- int i;
-
- drive = ( b & 0x03 ) == 2 ? 1 : 0;
- side = ( b & 0x80 ) ? 1 : 0;
-
- /* TODO: set current_drive to NULL when bits 0 and 1 of b are '00' or '11' */
- plusd_fdc.current_drive = &plusd_drives[ drive ];
-
- for( i = 0; i < PLUSD_NUM_DRIVES; i++ ) {
- plusd_drives[ i ].side = side;
- }
-
- printer_parallel_strobe_write( b & 0x40 );
-}
-
-libspectrum_byte
-plusd_mem_read( libspectrum_word port GCC_UNUSED, int *attached )
-{
- plusd_page();
- return 0;
-}
-
-void
-plusd_mem_write( libspectrum_word port GCC_UNUSED, libspectrum_byte b )
-{
- plusd_unpage();
-}
-
-libspectrum_byte
-plusd_printer_read( libspectrum_word port GCC_UNUSED, int *attached )
-{
- *attached = 1;
-
- /* bit 7 = busy. other bits high? */
-
- if(!settings_current.printer)
- return(0xff); /* no printer attached */
-
- return(0x7f); /* never busy */
-}
-
-int
-plusd_disk_insert_default_autoload( plusd_drive_number which,
- const char *filename )
-{
- return plusd_disk_insert( which, filename, settings_current.auto_load );
-}
-
-int
-plusd_disk_insert( plusd_drive_number which, const char *filename,
- int autoload )
-{
- int fd, error;
- char tempfilename[ PATH_MAX ];
- int israw = 0;
- dsk_format_t fmt;
- wd1770_drive *d;
- int l;
-
- if( which >= PLUSD_NUM_DRIVES ) {
- ui_error( UI_ERROR_ERROR, "plusd_disk_insert: unknown drive %d",
- which );
- fuse_abort();
- }
-
- d = &plusd_drives[ which ];
-
- /* Eject any disk already in the drive */
- if( d->disk ) {
- /* Abort the insert if we want to keep the current disk */
- if( plusd_disk_eject( which, 0 ) ) return 0;
- }
-
- /* Make a temporary copy of the disk file */
- error = utils_make_temp_file( &fd, tempfilename, filename, plusd_template );
- if( error ) return error;
- strcpy( d->filename, tempfilename );
-
- /* Determine the disk image format */
- l = strlen( filename );
- if( l >= 5 ) {
- if( !strcmp( filename + ( l - 4 ), ".dsk" ) ||
- !strcmp( filename + ( l - 4 ), ".mgt" ) ) {
- israw = 1;
- fmt = FMT_800K;
- } else if( !strcmp( filename + ( l - 4 ), ".img" ) ) {
- israw = 1;
- fmt = FMT_MGT800;
- }
- }
-
- /* And now insert the disk */
- if( israw ) {
-
- /* If the "logical" driver is not available, try the "raw" driver (unless
- * we're using FMT_MGT800, for which the raw driver will not work */
- if( dsk_open( &d->disk, tempfilename, "logical", NULL ) != DSK_ERR_OK &&
- ( fmt == FMT_MGT800 ||
- dsk_open( &d->disk, tempfilename, "raw", NULL ) != DSK_ERR_OK ) ) {
- ui_error( UI_ERROR_ERROR, "Failed to open disk image" );
- return 1;
- }
-
- if( dg_stdformat( &d->geom, fmt, NULL, NULL ) != DSK_ERR_OK ) {
- ui_error( UI_ERROR_ERROR, "Failed to set geometry for disk" );
- dsk_close( &d->disk );
- return 1;
- }
-
- } else {
-
- if( dsk_open( &d->disk, tempfilename, NULL, NULL ) != DSK_ERR_OK ) {
- ui_error( UI_ERROR_ERROR, "Failed to open disk image" );
- return 1;
- }
-
- if( dsk_getgeom( d->disk, &d->geom ) != DSK_ERR_OK ) {
- ui_error( UI_ERROR_ERROR, "Failed to determine geometry for disk" );
- dsk_close( &d->disk );
- return 1;
- }
-
- }
-
- /* Set the 'eject' item active */
- switch( which ) {
- case PLUSD_DRIVE_1:
- ui_menu_activate( UI_MENU_ITEM_MEDIA_DISK_PLUSD_1_EJECT, 1 );
- break;
- case PLUSD_DRIVE_2:
- ui_menu_activate( UI_MENU_ITEM_MEDIA_DISK_PLUSD_2_EJECT, 1 );
- break;
- }
-
- if( autoload ) {
- /* XXX */
- }
-
- return 0;
-}
-
-int
-plusd_disk_eject( plusd_drive_number which, int write )
-{
- wd1770_drive *d;
-
- if( which >= PLUSD_NUM_DRIVES )
- return 1;
-
- d = &plusd_drives[ which ];
-
- if( !d->disk )
- return 0;
-
- if( write ) {
-
- if( ui_plusd_disk_write( which ) ) return 1;
-
- } else {
-
- if( dsk_dirty( plusd_drives[which].disk ) ) {
-
- ui_confirm_save_t confirm = ui_confirm_save(
- "Disk has been modified.\nDo you want to save it?"
- );
-
- switch( confirm ) {
-
- case UI_CONFIRM_SAVE_SAVE:
- if( ui_plusd_disk_write( which ) ) return 1;
- break;
-
- case UI_CONFIRM_SAVE_DONTSAVE: break;
- case UI_CONFIRM_SAVE_CANCEL: return 1;
-
- }
- }
- }
-
- dsk_close( &d->disk );
- unlink( d->filename );
-
- /* Set the 'eject' item inactive */
- switch( which ) {
- case PLUSD_DRIVE_1:
- ui_menu_activate( UI_MENU_ITEM_MEDIA_DISK_PLUSD_1_EJECT, 0 );
- break;
- case PLUSD_DRIVE_2:
- ui_menu_activate( UI_MENU_ITEM_MEDIA_DISK_PLUSD_2_EJECT, 0 );
- break;
- }
- return 0;
-}
-
-int
-plusd_disk_write( plusd_drive_number which, const char *filename )
-{
- wd1770_drive *d = &plusd_drives[ which ];
- utils_file file;
- FILE *f;
- int error;
- size_t bytes_written;
-
- dsk_close( &d->disk );
-
- f = fopen( filename, "wb" );
- if( !f ) {
- ui_error( UI_ERROR_ERROR, "couldn't open '%s' for writing: %s", filename,
- strerror( errno ) );
- }
-
- error = utils_read_file( d->filename, &file );
- if( error ) { fclose( f ); return error; }
-
- bytes_written = fwrite( file.buffer, 1, file.length, f );
- if( bytes_written != file.length ) {
- ui_error( UI_ERROR_ERROR, "could write only %lu of %lu bytes to '%s'"...
[truncated message content] |
|
From: <fr...@us...> - 2007-07-01 02:20:49
|
Revision: 411
http://svn.sourceforge.net/fuse-for-macosx/?rev=411&view=rev
Author: fredm
Date: 2007-06-30 19:20:49 -0700 (Sat, 30 Jun 2007)
Log Message:
-----------
Add UTI entries for mgt disk images.
Modified Paths:
--------------
trunk/FuseImporter/Info.plist
trunk/fuse/fusepb/Info-Fuse.plist
Modified: trunk/FuseImporter/Info.plist
===================================================================
--- trunk/FuseImporter/Info.plist 2007-07-01 02:19:19 UTC (rev 410)
+++ trunk/FuseImporter/Info.plist 2007-07-01 02:20:49 UTC (rev 411)
@@ -21,6 +21,7 @@
<string>net.sourceforge.projects.fuse-emulator.csw</string>
<string>net.sourceforge.projects.fuse-emulator.hdf</string>
<string>net.sourceforge.projects.fuse-emulator.dsk</string>
+ <string>net.sourceforge.projects.fuse-emulator.mgt</string>
<string>net.sourceforge.projects.fuse-emulator.rzx</string>
<string>net.sourceforge.projects.fuse-emulator.scl</string>
<string>net.sourceforge.projects.fuse-emulator.scr</string>
@@ -170,6 +171,25 @@
<dict>
<key>UTTypeConformsTo</key>
<array>
+ <string>net.sourceforge.projects.fuse-emulator.MassStorage</string>
+ </array>
+ <key>UTTypeDescription</key>
+ <string>ZX Spectrum DISCiPLE/+D Disk Image</string>
+ <key>UTTypeIdentifier</key>
+ <string>net.sourceforge.projects.fuse-emulator.mgt</string>
+ <key>UTTypeReferenceURL</key>
+ <string>http://www.worldofspectrum.org/faq/reference/formats.htm</string>
+ <key>UTTypeTagSpecification</key>
+ <dict>
+ <key>public.filename-extension</key>
+ <array>
+ <string>mgt</string>
+ </array>
+ </dict>
+ </dict>
+ <dict>
+ <key>UTTypeConformsTo</key>
+ <array>
<string>public.audiovisual-content</string>
</array>
<key>UTTypeDescription</key>
Modified: trunk/fuse/fusepb/Info-Fuse.plist
===================================================================
--- trunk/fuse/fusepb/Info-Fuse.plist 2007-07-01 02:19:19 UTC (rev 410)
+++ trunk/fuse/fusepb/Info-Fuse.plist 2007-07-01 02:20:49 UTC (rev 411)
@@ -517,6 +517,25 @@
<dict>
<key>UTTypeConformsTo</key>
<array>
+ <string>net.sourceforge.projects.fuse-emulator.MassStorage</string>
+ </array>
+ <key>UTTypeDescription</key>
+ <string>ZX Spectrum DISCiPLE/+D Disk Image</string>
+ <key>UTTypeIdentifier</key>
+ <string>net.sourceforge.projects.fuse-emulator.mgt</string>
+ <key>UTTypeReferenceURL</key>
+ <string>http://www.worldofspectrum.org/faq/reference/formats.htm</string>
+ <key>UTTypeTagSpecification</key>
+ <dict>
+ <key>public.filename-extension</key>
+ <array>
+ <string>mgt</string>
+ </array>
+ </dict>
+ </dict>
+ <dict>
+ <key>UTTypeConformsTo</key>
+ <array>
<string>public.audiovisual-content</string>
</array>
<key>UTTypeDescription</key>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2007-07-05 11:48:03
|
Revision: 425
http://svn.sourceforge.net/fuse-for-macosx/?rev=425&view=rev
Author: fredm
Date: 2007-07-05 04:48:04 -0700 (Thu, 05 Jul 2007)
Log Message:
-----------
Merge up to vendor revision 3044.
Revision Links:
--------------
http://svn.sourceforge.net/fuse-for-macosx/?rev=3044&view=rev
Modified Paths:
--------------
trunk/fuse/ChangeLog
trunk/fuse/compat/getopt.c
trunk/fuse/compat/getopt1.c
trunk/fuse/compat.h
trunk/fuse/configure.in
trunk/fuse/debugger/breakpoint.c
trunk/fuse/debugger/commandl.l
trunk/fuse/debugger/commandy.y
trunk/fuse/debugger/expression.c
trunk/fuse/disk/plusd.c
trunk/fuse/disk/plusd.h
trunk/fuse/disk/wd1770.c
trunk/fuse/display.c
trunk/fuse/event.c
trunk/fuse/fuse.cpp
trunk/fuse/hacking/ChangeLog
trunk/fuse/hacking/implementation_notes.txt
trunk/fuse/hacking/input.txt
trunk/fuse/hacking/ui.txt
trunk/fuse/if1.c
trunk/fuse/machines/pentagon.c
trunk/fuse/machines/scorpion.c
trunk/fuse/machines/spec16.c
trunk/fuse/machines/spec48.c
trunk/fuse/machines/spec_se.c
trunk/fuse/machines/specplus2.c
trunk/fuse/machines/specplus2a.c
trunk/fuse/machines/specplus3.c
trunk/fuse/machines/specplus3e.c
trunk/fuse/machines/tc2048.c
trunk/fuse/machines/tc2068.c
trunk/fuse/memory.c
trunk/fuse/menu.h
trunk/fuse/pokefinder/pokefinder.c
trunk/fuse/pokefinder/pokefinder.h
trunk/fuse/printer.c
trunk/fuse/profile.c
trunk/fuse/screenshot.c
trunk/fuse/settings.pl
trunk/fuse/sound/sdlsound.c
trunk/fuse/spectrum.c
trunk/fuse/tape.c
trunk/fuse/timer.c
trunk/fuse/trdos.c
trunk/fuse/ui/gtk/browse.c
trunk/fuse/ui/gtk/fileselector.c
trunk/fuse/ui/gtk/gtkinternals.h
trunk/fuse/ui/gtk/gtkjoystick.c
trunk/fuse/ui/gtk/gtkkeyboard.c
trunk/fuse/ui/gtk/gtkui.c
trunk/fuse/ui/gtk/memory.c
trunk/fuse/ui/gtk/pokefinder.c
trunk/fuse/ui/gtk/rollback.c
trunk/fuse/ui/gtk/stock.c
trunk/fuse/ui/options.dat
trunk/fuse/ui/scaler/scalers.cpp
trunk/fuse/ui/sdl/sdlui.c
trunk/fuse/ui/xlib/xdisplay.c
trunk/fuse/ui/xlib/xdisplay.h
trunk/fuse/ui/xlib/xerror.c
trunk/fuse/ui/xlib/xui.c
trunk/fuse/utils.c
trunk/fuse/utils.h
trunk/fuse/widget/error.c
trunk/fuse/widget/filesel.c
trunk/fuse/widget/options.pl
trunk/fuse/widget/widget.c
trunk/fuse/z80/coretest.c
trunk/fuse/z80/z80.c
trunk/fuse/z80/z80_ops.c
trunk/fuse/zxatasp.c
trunk/fuse/zxcf.h
trunk/libspectrum/libspectrum/hacking/ChangeLog
trunk/libspectrum/libspectrum/libspectrum.c
trunk/libspectrum/libspectrum/make-perl.c
trunk/libspectrum/libspectrum/microdrive.c
trunk/libspectrum/libspectrum/rzx.c
trunk/libspectrum/libspectrum/tape.c
trunk/libspectrum/libspectrum/timings.c
Modified: trunk/fuse/ChangeLog
===================================================================
--- trunk/fuse/ChangeLog 2007-07-05 10:51:15 UTC (rev 424)
+++ trunk/fuse/ChangeLog 2007-07-05 11:48:04 UTC (rev 425)
@@ -398,7 +398,7 @@
* Fuse 0.5.1 released
* Separate out libspectrum (the file format handling) into its own
- library; changes occuring solely in libspectrum's code will not
+ library; changes occurring solely in libspectrum's code will not
be listed in this ChangeLog. For structural reasons, the glib
replacement code is also in libspectrum (Philip Kendall).
@@ -807,4 +807,4 @@
* Version 0.1.0 released.
-$Id: ChangeLog,v 1.46 2007/02/02 16:21:50 pak21 Exp $
+$Id: ChangeLog 3032 2007-06-28 22:48:54Z zubzero $
Modified: trunk/fuse/compat/getopt.c
===================================================================
--- trunk/fuse/compat/getopt.c 2007-07-05 10:51:15 UTC (rev 424)
+++ trunk/fuse/compat/getopt.c 2007-07-05 11:48:04 UTC (rev 425)
@@ -34,7 +34,7 @@
# include <config.h>
#endif
-#if !defined HAVE_GETOPT_LONG && !defined AMIGA
+#if !defined HAVE_GETOPT_LONG && !defined AMIGA && !defined __MORPHOS__
#if !defined __STDC__ || !__STDC__
/* This is a separate conditional since some stdc systems
Modified: trunk/fuse/compat/getopt1.c
===================================================================
--- trunk/fuse/compat/getopt1.c 2007-07-05 10:51:15 UTC (rev 424)
+++ trunk/fuse/compat/getopt1.c 2007-07-05 11:48:04 UTC (rev 425)
@@ -24,7 +24,7 @@
#include <config.h>
#endif
-#if !defined HAVE_GETOPT_LONG && !defined AMIGA
+#if !defined HAVE_GETOPT_LONG && !defined AMIGA && !defined __MORPHOS__
#ifdef _LIBC
# include <getopt.h>
Modified: trunk/fuse/compat.h
===================================================================
--- trunk/fuse/compat.h 2007-07-05 10:51:15 UTC (rev 424)
+++ trunk/fuse/compat.h 2007-07-05 11:48:04 UTC (rev 425)
@@ -1,7 +1,7 @@
-/* compat.h: various compatbility bits
+/* compat.h: various compatibility bits
Copyright (c) 2003 Philip Kendall
- $Id: compat.h 2935 2007-06-04 21:56:06Z fredm $
+ $Id: compat.h 3039 2007-07-03 12:17:27Z 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 @@
char *dirname( char *path );
#endif /* #ifndef HAVE_DIRNAME */
-#if !defined HAVE_GETOPT_LONG && !defined AMIGA
+#if !defined HAVE_GETOPT_LONG && !defined AMIGA && !defined __MORPHOS__
#include "compat/getopt.h"
#endif /* #ifndef HAVE_GETOPT_LONG */
Modified: trunk/fuse/configure.in
===================================================================
--- trunk/fuse/configure.in 2007-07-05 10:51:15 UTC (rev 424)
+++ trunk/fuse/configure.in 2007-07-05 11:48:04 UTC (rev 425)
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-dnl $Id: configure.in 3007 2007-06-17 18:50:48Z zubzero $
+dnl $Id: configure.in 3038 2007-07-01 15:32:03Z 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
@@ -192,42 +192,21 @@
dnl fi
dnl fi
-dnl Look for GTK+ 2.0 (default=yes unless --without-gtk); fall back to GTK+
-dnl 1.2 if not found
-if test "$with_gtk" = no; then gtk=no; else gtk=yes; fi
+dnl Look for GTK+ (default=yes)
if test -z "$UI"; then
- AC_MSG_CHECKING(whether GTK+ 2.x UI requested)
- AC_ARG_WITH(gtk2,
- [ --without-gtk2 don't use GTK+ 2.x library for user interface],
- if test "$withval" = no; then gtk2=no; else gtk2=yes; fi,
- gtk2="$gtk")
- AC_MSG_RESULT($gtk2)
- if test "$gtk2" = yes; then
- AM_PATH_GTK_2_0(2.0.0,
- AC_DEFINE([UI_GTK], 1,
- [Defined if GTK+ UI (either 1.2 or 2.x) is in use])
- AC_DEFINE([UI_GTK2], 1, [Defined if GTK+ 2.0 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+ 2.x not found. Reverting to GTK+ 1.2]))
- fi
-fi
-
-dnl Look for GTK+ 1.2 (default=yes); fall back to Xlib if not found
-if test -z "$UI"; then
- AC_MSG_CHECKING(whether GTK+ 1.2 UI requested)
+ AC_MSG_CHECKING(whether GTK+ UI requested)
AC_ARG_WITH(gtk,
- [ --without-gtk don't use GTK+ 1.2 library for user interface],
+ [ --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(1.2.0,
+ AM_PATH_GTK_2_0(2.0.0,
AC_DEFINE([UI_GTK], 1,
[Defined if GTK+ UI (either 1.2 or 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+ 1.2 not found. Reverting to Xlib UI]))
+ UI=gtk; UI_LIBS="ui/gtk/libuigtk.la",
+ AC_MSG_WARN([GTK+ not found. Reverting to Xlib]))
fi
fi
Modified: trunk/fuse/debugger/breakpoint.c
===================================================================
--- trunk/fuse/debugger/breakpoint.c 2007-07-05 10:51:15 UTC (rev 424)
+++ trunk/fuse/debugger/breakpoint.c 2007-07-05 11:48:04 UTC (rev 425)
@@ -1,7 +1,7 @@
/* breakpoint.c: a debugger breakpoint
Copyright (c) 2002-2004 Philip Kendall
- $Id: breakpoint.c 2889 2007-05-26 17:45:08Z zubzero $
+ $Id: breakpoint.c 3032 2007-06-28 22:48: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
@@ -41,7 +41,7 @@
/* The next breakpoint ID to use */
static size_t next_breakpoint_id;
-/* Textual represenations of the breakpoint types and lifetimes */
+/* Textual representations of the breakpoint types and lifetimes */
const char *debugger_breakpoint_type_text[] = {
"Execute", "Read", "Write", "Port Read", "Port Write", "Time",
};
Modified: trunk/fuse/debugger/commandl.l
===================================================================
--- trunk/fuse/debugger/commandl.l 2007-07-05 10:51:15 UTC (rev 424)
+++ trunk/fuse/debugger/commandl.l 2007-07-05 11:48:04 UTC (rev 425)
@@ -1,7 +1,7 @@
/* commandl.l: Debugger command lexical scanner
Copyright (c) 2002 Philip Kendall
- $Id: commandl.l 2889 2007-05-26 17:45:08Z zubzero $
+ $Id: commandl.l 3032 2007-06-28 22:48: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
@@ -97,12 +97,12 @@
"!=" { yylval.token = DEBUGGER_TOKEN_NOT_EQUAL_TO;
return EQUALITY; }
-"<" { yylval.token = '<'; return COMPARISION; }
-">" { yylval.token = '>'; return COMPARISION; }
+"<" { yylval.token = '<'; return COMPARISON; }
+">" { yylval.token = '>'; return COMPARISON; }
"<=" { yylval.token = DEBUGGER_TOKEN_LESS_THAN_OR_EQUAL_TO;
- return COMPARISION; }
+ return COMPARISON; }
">=" { yylval.token = DEBUGGER_TOKEN_GREATER_THAN_OR_EQUAL_TO;
- return COMPARISION; }
+ return COMPARISON; }
"+" { return '+'; }
"-" { return '-'; }
Modified: trunk/fuse/debugger/commandy.y
===================================================================
--- trunk/fuse/debugger/commandy.y 2007-07-05 10:51:15 UTC (rev 424)
+++ trunk/fuse/debugger/commandy.y 2007-07-05 11:48:04 UTC (rev 425)
@@ -1,7 +1,7 @@
/* commandy.y: Parse a debugger command
Copyright (c) 2002-2004 Philip Kendall
- $Id: commandy.y 2889 2007-05-26 17:45:08Z zubzero $
+ $Id: commandy.y 3032 2007-06-28 22:48: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
@@ -62,7 +62,7 @@
%token LOGICAL_OR /* || */
%token LOGICAL_AND /* && */
-%token <token> COMPARISION /* < > <= >= */
+%token <token> COMPARISON /* < > <= >= */
%token <token> EQUALITY /* == != */
%token <token> NEGATE /* ! ~ */
%token <token> TIMES_DIVIDE /* * / */
@@ -119,7 +119,7 @@
%left '^'
%left '&'
%left EQUALITY
-%left COMPARISION
+%left COMPARISON
%left '+' '-'
%left TIMES_DIVIDE
%right NEGATE /* Unary minus, unary plus, !, ~ */
@@ -234,7 +234,7 @@
$$ = debugger_expression_new_binaryop( $2, $1, $3 );
if( !$$ ) YYABORT;
}
- | expression COMPARISION expression {
+ | expression COMPARISON expression {
$$ = debugger_expression_new_binaryop( $2, $1, $3 );
if( !$$ ) YYABORT;
}
Modified: trunk/fuse/debugger/expression.c
===================================================================
--- trunk/fuse/debugger/expression.c 2007-07-05 10:51:15 UTC (rev 424)
+++ trunk/fuse/debugger/expression.c 2007-07-05 11:48:04 UTC (rev 425)
@@ -1,7 +1,7 @@
/* expression.c: A numeric expression
Copyright (c) 2003 Philip Kendall
- $Id: expression.c 2889 2007-05-26 17:45:08Z zubzero $
+ $Id: expression.c 3032 2007-06-28 22:48: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
@@ -50,7 +50,7 @@
PRECEDENCE_BITWISE_XOR,
PRECEDENCE_BITWISE_AND,
PRECEDENCE_EQUALITY,
- PRECEDENCE_COMPARISION,
+ PRECEDENCE_COMPARISON,
PRECEDENCE_ADDITION,
PRECEDENCE_MULTIPLICATION,
PRECEDENCE_NEGATE,
@@ -132,7 +132,7 @@
case '<': case '>':
case DEBUGGER_TOKEN_LESS_THAN_OR_EQUAL_TO:
case DEBUGGER_TOKEN_GREATER_THAN_OR_EQUAL_TO:
- return PRECEDENCE_COMPARISION;
+ return PRECEDENCE_COMPARISON;
default:
ui_error( UI_ERROR_ERROR, "unknown binary operator %d", operation );
@@ -534,7 +534,7 @@
case '+': case '*': return 0;
case '-': case '/': return 1;
- /* None of the comparision operators are associative due to them
+ /* None of the comparison operators are associative due to them
returning truth values */
case DEBUGGER_TOKEN_EQUAL_TO:
case DEBUGGER_TOKEN_NOT_EQUAL_TO:
Modified: trunk/fuse/disk/plusd.c
===================================================================
--- trunk/fuse/disk/plusd.c 2007-07-05 10:51:15 UTC (rev 424)
+++ trunk/fuse/disk/plusd.c 2007-07-05 11:48:04 UTC (rev 425)
@@ -56,13 +56,18 @@
#include "wd1770.h"
#include "z80/z80.h"
+static void plusd_set_cmdint( wd1770_fdc *f );
+
int plusd_available = 0;
int plusd_active = 0;
-int plusd_index_pulse = 0;
-wd1770_fdc plusd_fdc;
-wd1770_drive plusd_drives[ PLUSD_NUM_DRIVES ];
+static int plusd_index_pulse = 0;
+#define PLUSD_NUM_DRIVES 2
+
+static wd1770_fdc plusd_fdc;
+static wd1770_drive plusd_drives[ PLUSD_NUM_DRIVES ];
+
static const char *plusd_template = "fuse.plusd.XXXXXX";
static void plusd_reset( int hard_reset );
@@ -146,7 +151,7 @@
d->filename[0] = '\0';
}
- plusd_fdc.set_cmdint = &plusd_set_cmdint;
+ plusd_fdc.set_cmdint = plusd_set_cmdint;
plusd_fdc.reset_cmdint = NULL;
plusd_fdc.set_datarq = NULL;
plusd_fdc.reset_datarq = NULL;
@@ -311,6 +316,8 @@
libspectrum_byte
plusd_mem_read( libspectrum_word port GCC_UNUSED, int *attached )
{
+ /* should we set *attached = 1? */
+
plusd_page();
return 0;
}
@@ -349,6 +356,7 @@
char tempfilename[ PATH_MAX ];
int israw = 0;
dsk_format_t fmt;
+ dsk_err_t dsk_error;
wd1770_drive *d;
int l;
@@ -389,28 +397,39 @@
/* If the "logical" driver is not available, try the "raw" driver (unless
* we're using FMT_MGT800, for which the raw driver will not work */
- if( dsk_open( &d->disk, tempfilename, "logical", NULL ) != DSK_ERR_OK &&
+ dsk_error = dsk_open( &d->disk, tempfilename, "logical", NULL );
+ if( dsk_error != DSK_ERR_OK &&
( fmt == FMT_MGT800 ||
- dsk_open( &d->disk, tempfilename, "raw", NULL ) != DSK_ERR_OK ) ) {
- ui_error( UI_ERROR_ERROR, "Failed to open disk image" );
+ ( dsk_error = dsk_open( &d->disk, tempfilename, "raw", NULL ) ) !=
+ DSK_ERR_OK
+ )
+ ) {
+ ui_error( UI_ERROR_ERROR, "Failed to open disk image: %s",
+ dsk_strerror( dsk_error ) );
return 1;
}
- if( dg_stdformat( &d->geom, fmt, NULL, NULL ) != DSK_ERR_OK ) {
- ui_error( UI_ERROR_ERROR, "Failed to set geometry for disk" );
+ dsk_error = dg_stdformat( &d->geom, fmt, NULL, NULL );
+ if( dsk_error != DSK_ERR_OK ) {
+ ui_error( UI_ERROR_ERROR, "Failed to set geometry for disk: %s",
+ dsk_strerror( dsk_error ) );
dsk_close( &d->disk );
return 1;
}
} else {
- if( dsk_open( &d->disk, tempfilename, NULL, NULL ) != DSK_ERR_OK ) {
- ui_error( UI_ERROR_ERROR, "Failed to open disk image" );
+ dsk_error = dsk_open( &d->disk, tempfilename, NULL, NULL );
+ if( dsk_error != DSK_ERR_OK ) {
+ ui_error( UI_ERROR_ERROR, "Failed to open disk image: %s",
+ dsk_strerror( dsk_error ) );
return 1;
}
- if( dsk_getgeom( d->disk, &d->geom ) != DSK_ERR_OK ) {
- ui_error( UI_ERROR_ERROR, "Failed to determine geometry for disk" );
+ dsk_error = dsk_getgeom( d->disk, &d->geom );
+ if( dsk_error != DSK_ERR_OK ) {
+ ui_error( UI_ERROR_ERROR, "Failed to determine geometry for disk: %s",
+ dsk_strerror( dsk_error ) );
dsk_close( &d->disk );
return 1;
}
Modified: trunk/fuse/disk/plusd.h
===================================================================
--- trunk/fuse/disk/plusd.h 2007-07-05 10:51:15 UTC (rev 424)
+++ trunk/fuse/disk/plusd.h 2007-07-05 11:48:04 UTC (rev 425)
@@ -44,7 +44,6 @@
extern int plusd_available; /* Is the +D available for use? */
extern int plusd_active; /* +D enabled? */
-extern int plusd_index_pulse;
extern const periph_t plusd_peripherals[];
extern const size_t plusd_peripherals_count;
@@ -75,11 +74,6 @@
libspectrum_byte plusd_printer_read( libspectrum_word port, int *attached );
-extern wd1770_fdc plusd_fdc;
-
-#define PLUSD_NUM_DRIVES 2
-extern wd1770_drive plusd_drives[ PLUSD_NUM_DRIVES ];
-
int plusd_disk_insert( plusd_drive_number which, const char *filename,
int autoload );
int plusd_disk_insert_default_autoload( plusd_drive_number which,
Modified: trunk/fuse/disk/wd1770.c
===================================================================
--- trunk/fuse/disk/wd1770.c 2007-07-05 10:51:15 UTC (rev 424)
+++ trunk/fuse/disk/wd1770.c 2007-07-05 11:48:04 UTC (rev 425)
@@ -51,9 +51,11 @@
#include "wd1770.h"
#include "z80/z80.h"
-char secbuf[1024];
+static void statusbar_update( int busy );
-void
+static char secbuf[1024];
+
+static void
statusbar_update( int busy )
{
ui_statusbar_update( UI_STATUSBAR_ITEM_DISK,
Modified: trunk/fuse/display.c
===================================================================
--- trunk/fuse/display.c 2007-07-05 10:51:15 UTC (rev 424)
+++ trunk/fuse/display.c 2007-07-05 11:48:04 UTC (rev 425)
@@ -2,7 +2,7 @@
Copyright (c) 1999-2006 Philip Kendall, Thomas Harte, Witold Filipczyk
and Fredrick Meunier
- $Id: display.c,v 1.59 2007/02/02 16:21:50 pak21 Exp $
+ $Id: display.c 3043 2007-07-04 14:28:49Z 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
@@ -115,7 +115,7 @@
/* The last point at which we updated the screen display */
int critical_region_x = 0, critical_region_y = 0;
-/* The border colour changes which have occured in this frame */
+/* The border colour changes which have occurred in this frame */
struct border_change_t {
int x, y;
int colour;
@@ -141,7 +141,7 @@
static int border_changes_last = 0;
static struct border_change_t *border_changes = NULL;
-struct border_change_t *
+static struct border_change_t *
alloc_change(void)
{
static int border_changes_size = 0;
@@ -459,7 +459,7 @@
}
static void
-update_dirty_rects()
+update_dirty_rects( void )
{
int start, y, error;
@@ -773,7 +773,7 @@
/* Change border colour if the colour in use changes */
static void
-check_border_change()
+check_border_change( void )
{
if( scld_last_dec.name.hires &&
display_hires_border != display_last_border ) {
@@ -1063,13 +1063,13 @@
if( machine_current->timex ) {
int column = x >> 4;
+ scld mode_data;
y >>= 1;
index = column + y * DISPLAY_SCREEN_WIDTH_COLS;
data = display_last_screen[ index ] & 0xff;
data2 = (display_last_screen[ index ] & 0xff00)>>8;
- scld mode_data;
mode_data.byte = (display_last_screen[ index ] & 0xff0000)>>16;
if( mode_data.name.hires ) {
Modified: trunk/fuse/event.c
===================================================================
--- trunk/fuse/event.c 2007-07-05 10:51:15 UTC (rev 424)
+++ trunk/fuse/event.c 2007-07-05 11:48:04 UTC (rev 425)
@@ -1,7 +1,7 @@
/* event.c: Routines needed for dealing with the event list
Copyright (c) 2000-2004 Philip Kendall
- $Id: event.c 3007 2007-06-17 18:50:48Z zubzero $
+ $Id: event.c 3032 2007-06-28 22:48: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
@@ -64,7 +64,7 @@
/* An event ready to be reused */
static event_t *event_free;
-/* Comparision function so events stay in t-state order */
+/* Comparison function so events stay in t-state order */
static gint event_add_cmp( gconstpointer a, gconstpointer b );
/* User function for event_interrupt(...) */
@@ -117,7 +117,7 @@
return 0;
}
-/* Comparision function so events stay in t-state and event type order */
+/* Comparison function so events stay in t-state and event type order */
static gint
event_add_cmp( gconstpointer a1, gconstpointer b1 )
{
Modified: trunk/fuse/fuse.cpp
===================================================================
--- trunk/fuse/fuse.cpp 2007-07-05 10:51:15 UTC (rev 424)
+++ trunk/fuse/fuse.cpp 2007-07-05 11:48:04 UTC (rev 425)
@@ -1,7 +1,7 @@
/* fuse.c: The Free Unix Spectrum Emulator
Copyright (c) 1999-2007 Philip Kendall
- $Id: fuse.c 3007 2007-06-17 18:50:48Z zubzero $
+ $Id: fuse.c 3040 2007-07-03 14:14:00Z 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
@@ -312,21 +312,25 @@
for( i=0; i<4; i++ ) if( version[i] > 0xff ) version[i] = 0xff;
-#ifndef WIN32
+#if defined(__MORPHOS__)
+ snprintf(buf.sysname, __SYS_NMLN, "MorphOS");
+ snprintf(buf.release, __SYS_NMLN, "1.4.4");
+ snprintf(buf.machine, __SYS_NMLN, "Pegasos");
+#elif defined(WIN32) /* #if defined(__MORPHOS__) */
+ buf.dwOSVersionInfoSize = sizeof( buf );
+ sys_error = GetVersionEx( &buf );
+ if( sys_error == 0 ) {
+ ui_error( UI_ERROR_ERROR, "error getting system information." );
+ return 1;
+ }
+#else /* #if defined(__MORPHOS__) */
sys_error = uname( &buf );
if( sys_error == -1 ) {
ui_error( UI_ERROR_ERROR, "error getting system information: %s",
strerror( errno ) );
return 1;
}
-#else /* #ifndef WIN32 */
- buf.dwOSVersionInfoSize = sizeof( buf );
- sys_error = GetVersionEx( &buf );
- if( sys_error == 0 ) {
- ui_error( UI_ERROR_ERROR, "error getting system information." );
- return 1;
- }
-#endif /* #ifndef WIN32 */
+#endif /* #if defined(__MORPHOS__) */
error = libspectrum_creator_alloc( &fuse_creator ); if( error ) return error;
Modified: trunk/fuse/hacking/ChangeLog
===================================================================
--- trunk/fuse/hacking/ChangeLog 2007-07-05 10:51:15 UTC (rev 424)
+++ trunk/fuse/hacking/ChangeLog 2007-07-05 11:48:04 UTC (rev 425)
@@ -1874,3 +1874,47 @@
20070626 widget/options.pl: move widget posthook so that settings changes are
available in the uidisplay_hotswap_gfx call (fixes bug #1743318)
(Gergely Szasz).
+20070628 zxatasp.c: remove dead code (Stuart).
+20070628 machines/specplus3.c,trdos.c: use better variable names for temporary
+ disk image filenames (Stuart).
+20070628 display.c,zxcf.h: remove warnings with -Wstrict-prototypes (Stuart).
+20070628 machines/{pentagon.c,scorpion.c,spec16.c,spec48.c,spec_se.c,
+ specplus2a.c,tc2048.c},ui/scaler/scalers.c: remove "'static' is not at
+ beginning of declaration" warning with -Wextra (Stuart).
+20070628 menu.h,ui/gtk/gtkjoystick.c: fix menu_options_joysticks_select()'s
+ prototype (Stuart).
+20070628 pokefinder/pokefinder.[ch]: make pokefinder_{,im}possible's
+ declarations consistent with their definitions (Stuart).
+20070628 ui/gtk/memory.c: fix type of menu_machine_memorybrowser() in its
+ declaration for the GTK+ UI (Stuart).
+20070628 ui/gtk/memory.c: fix compilation (Stuart).
+20070628 ChangeLog,compat.h,debugger/{breakpoint.c,commandl.l,commandy.y,
+ expression.c},display.c,event.c,hacking/{implementation_notes.txt,
+ input.txt,ui.txt},if1.c,machines/tc2068.c,memory.c,printer.c,
+ spectrum.c,tape.c,ui/xlib/{xdisplay.h,xerror.c},utils.[ch],
+ z80/{coretest.c,z80.c,z80_ops.c}: fix misspellings (Stuart).
+20070629 widget/{widget.c,options.pl},ui/options.dat: move
+ uidisplay_hotswap_gfx_mode directly to widget_options_finish (more
+ from bug #1743318) (Gergely Szasz).
+20070630 ui/xlib/{xui.c,xdisplay.c}: allow the use of 3x scalers and add the
+ ability for the window to resize itself (more of bug #1686228) (Gergely
+ Szasz).
+20070630 ui/xlib/xdisplay.c: support more colour depths and more scalers (more
+ of bug #1686228) (Gergely Szasz).
+20070701 machines/specplus3.c: if we can't figure out the dirty state, only
+ write if requested to do so (Fred).
+20070701 disk/plusd.c: add some more information to errors in plusd_disk_insert
+ (Fred).
+20070701 configure.in,ui/gtk/{gtkkeyboard.c,gtkinternals.h,gtkui.c,stock.c}:
+ remove GTK+ 1.x UI. Outdated, and didn't link.
+20070703 utils.c,display.c,fuse.c,compat.h,widget/{filesel.c,error.c},
+ sound/sdlsound.c,compat/{getopt.c,getopt1.c},settings.pl,
+ ui/sdl/sdlui.c: patches for MorphOS (patch #1746269) (Q-Master).
+20070703 fuse.c: clean up #ifdefs (Stuart).
+20070704 z80/z80.c: don't page in the +D on startup (fixes bug #1746073)
+ (thanks, Fred) (Stuart).
+20070704 z80/coretest.c: remove dead code (Stuart).
+20070704 disk/{plusd.[ch],wd1770.c},display.c,if1.c,machines/{pentagon.c,
+ scorpion.c,specplus2.c,specplus2a.c,specplus3e.c},profile.c,
+ screenshot.c,timer.c,ui/gtk/{browse.c,fileselector.c,memory.c,
+ pokefinder.c,rollback.c}: various cleanups (Stuart).
Modified: trunk/fuse/hacking/implementation_notes.txt
===================================================================
--- trunk/fuse/hacking/implementation_notes.txt 2007-07-05 10:51:15 UTC (rev 424)
+++ trunk/fuse/hacking/implementation_notes.txt 2007-07-05 11:48:04 UTC (rev 425)
@@ -15,9 +15,9 @@
happens, at which point it deals with the `interesting' thing.
The question here is how do we know when something `interesting' has
-occured: the simple answer is that something interesting occurs when
+occurred: the simple answer is that something interesting occurs when
the `tstates' global variable (which counts tstates since the last
-interrupt occured) reaches `event_next_event'. It should be noted here
+interrupt occurred) reaches `event_next_event'. It should be noted here
that these events are purely a Fuse concept, and not related to any OS
feature.
@@ -44,7 +44,7 @@
===================
There are two stages to producing the Spectrum's screen on the
-emulating machine's screen: firstly, builiding an image of the
+emulating machine's screen: firstly, building an image of the
Spectrum's screen in memory, and then translating that image onto the
emulating machine's screen.
@@ -61,7 +61,7 @@
pixel represents one pixel on the Spectrum's screen (including 32
pixels of left and right border, and 24 pixels of top and bottom
border). For the Timex machines, this array is sized 640x480 to
-accomodate the hires modes and each Spectrum pixel is represented by
+accommodate the hires modes and each Spectrum pixel is represented by
two vertically adjacent pixels in the array (as the hires modes double
only the horizontal resolution, not the vertical resolution). In both
cases, the values in this array are the Spectrum colours (0 to 15).
@@ -120,4 +120,4 @@
(FIXME: write scalers.txt)
-$Id: implementation_notes.txt 2629 2006-08-06 10:41:54Z pak21 $
+$Id: implementation_notes.txt 3032 2007-06-28 22:48:54Z zubzero $
Modified: trunk/fuse/hacking/input.txt
===================================================================
--- trunk/fuse/hacking/input.txt 2007-07-05 10:51:15 UTC (rev 424)
+++ trunk/fuse/hacking/input.txt 2007-07-05 11:48:04 UTC (rev 425)
@@ -22,7 +22,7 @@
} input_event_t;
-The 'type' member specifies what sort of input has occured. The
+The 'type' member specifies what sort of input has occurred. The
following event types are supported:
* Key events
Modified: trunk/fuse/hacking/ui.txt
===================================================================
--- trunk/fuse/hacking/ui.txt 2007-07-05 10:51:15 UTC (rev 424)
+++ trunk/fuse/hacking/ui.txt 2007-07-05 11:48:04 UTC (rev 425)
@@ -1,7 +1,7 @@
Some brief instructions on adding another user interface to Fuse
================================================================
-Version: $Id: ui.txt 2830 2007-05-12 14:57:37Z pak21 $
+Version: $Id: ui.txt 3032 2007-06-28 22:48:54Z zubzero $
In order to add a new user interface (UI) to Fuse, you need to
implement:
@@ -21,7 +21,7 @@
* int ui_init( int *argc, char ***argv )
-Initalise all of the UI-specific bits except the display (keyboard, etc).
+Initialise all of the UI-specific bits except the display (keyboard, etc).
`argc' and `argv' are pointers to `argc' and `argv' as supplied to
`main()'.
@@ -51,7 +51,7 @@
* int uidisplay_init( int width, int height )
-Initalise all of the display-specific bits for a display of (preferred)
+Initialise all of the display-specific bits for a display of (preferred)
size `width' x `height' pixels; note that `width' and `height' refer
to the entire canvas on which the screen and emulated border is to be
drawn, not just the Spectrum's screen. This will be called each time
@@ -89,7 +89,7 @@
makes sense for Timex machines (as it drops even scanlines), and
you may only want to enable it when a Timex machine has been
enabled.
-Alteratively, if your emulator has a fixed display mode (say
+Alternatively, if your emulator has a fixed display mode (say
320x240), then you may want to only enable the scalers that will
generate a 320x240 screen (i.e. Normal1x for Sinclair/Amstrad
machines, and Half for Timex models).
Modified: trunk/fuse/if1.c
===================================================================
--- trunk/fuse/if1.c 2007-07-05 10:51:15 UTC (rev 424)
+++ trunk/fuse/if1.c 2007-07-05 11:48:04 UTC (rev 425)
@@ -1,7 +1,7 @@
/* if1.c: Interface I handling routines
Copyright (c) 2004-2007 Gergely Szasz, Philip Kendall
- $Id: if1.c 2995 2007-06-17 14:31:36Z pak21 $
+ $Id: if1.c 3043 2007-07-04 14:28:49Z 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
@@ -589,7 +589,7 @@
OK, the schematics offer a different interpretation, because if
...
[truncated message content] |
|
From: <fr...@us...> - 2007-07-28 03:39:38
|
Revision: 439
http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=439&view=rev
Author: fredm
Date: 2007-07-27 20:39:33 -0700 (Fri, 27 Jul 2007)
Log Message:
-----------
Merge up to vendor revision 3080.
Revision Links:
--------------
http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=3080&view=rev
Modified Paths:
--------------
trunk/fuse/ChangeLog
trunk/fuse/configure.in
trunk/fuse/disk/Makefile.am
trunk/fuse/disk/plusd.c
trunk/fuse/disk/plusd.h
trunk/fuse/disk/wd1770.c
trunk/fuse/disk/wd1770.h
trunk/fuse/divide.c
trunk/fuse/fusepb/English.lproj/InfoPlist.strings
trunk/fuse/fusepb/Info-Fuse.plist
trunk/fuse/fusepb/config.h
trunk/fuse/hacking/ChangeLog
trunk/fuse/if1.c
trunk/fuse/if2.c
trunk/fuse/joystick.c
trunk/fuse/kempmouse.c
trunk/fuse/keyboard.c
trunk/fuse/machines/specplus3.c
trunk/fuse/memory.c
trunk/fuse/module.c
trunk/fuse/module.h
trunk/fuse/periph.c
trunk/fuse/printer.c
trunk/fuse/scld.c
trunk/fuse/simpleide.c
trunk/fuse/sound/alsasound.c
trunk/fuse/sound/sfifo.c
trunk/fuse/tape.c
trunk/fuse/ui/ggi/ggi_internals.h
trunk/fuse/ui/ggi/ggidisplay.c
trunk/fuse/ui/ggi/ggikeyboard.c
trunk/fuse/ui/ggi/ggiui.c
trunk/fuse/ui/gtk/browse.c
trunk/fuse/ui/gtk/debugger.c
trunk/fuse/ui/gtk/gtkjoystick.c
trunk/fuse/ui/gtk/gtkmouse.c
trunk/fuse/ui/gtk/gtkui.c
trunk/fuse/ui/gtk/pokefinder.c
trunk/fuse/ui/gtk/rollback.c
trunk/fuse/ui/win32/debugger.c
trunk/fuse/ui/win32/error.c
trunk/fuse/ui/win32/icons/Makefile.am
trunk/fuse/ui/win32/menu_data.c
trunk/fuse/ui/win32/menu_data.h
trunk/fuse/ui/win32/menu_data.rc
trunk/fuse/ui/win32/statusbar.c
trunk/fuse/ui/win32/win32display.c
trunk/fuse/ui/win32/win32display.h
trunk/fuse/ui/win32/win32ui.c
trunk/fuse/utils.c
trunk/fuse/utils.h
trunk/fuse/z80/Makefile.am
trunk/fuse/z80/coretest.c
trunk/fuse/z80/tests/README
trunk/fuse/z80/z80.c
trunk/fuse/z80/z80_ops.c
trunk/fuse/zxatasp.c
trunk/fuse/zxcf.c
trunk/libspectrum/libspectrum/hacking/ChangeLog
trunk/libspectrum/libspectrum/libspectrum.c
trunk/libspectrum/libspectrum/szx.c
trunk/libspectrum/libspectrum/tape.c
trunk/libspectrum/libspectrum/tape_block.c
trunk/libspectrum/libspectrum/test/test.c
trunk/libspectrum/libspectrum/tzx_read.c
trunk/libspectrum/libspectrum/warajevo_read.c
trunk/libspectrum/libspectrum/wav.c
trunk/libspectrum/libspectrum/z80.c
Added Paths:
-----------
trunk/fuse/z80/tests/tests.expected
trunk/fuse/z80/tests/tests.in
trunk/libspectrum/libspectrum/test/empty-drb.tzx
trunk/libspectrum/libspectrum/test/invalid-archiveinfo.tzx
trunk/libspectrum/libspectrum/test/invalid-custominfo.tzx
trunk/libspectrum/libspectrum/test/invalid-gdb.tzx
trunk/libspectrum/libspectrum/test/invalid-hardwareinfo.tzx
trunk/libspectrum/libspectrum/test/invalid-warajevo-blockoffset.tap
trunk/libspectrum/libspectrum/test/invalid.gz
trunk/libspectrum/libspectrum/test/invalid.szx
trunk/libspectrum/libspectrum/test/loop.tzx
trunk/libspectrum/libspectrum/test/loopend.tzx
Removed Paths:
-------------
trunk/fuse/z80/harness.pl
trunk/fuse/z80/tests/00.in
trunk/fuse/z80/tests/00.out
trunk/fuse/z80/tests/01.in
trunk/fuse/z80/tests/01.out
trunk/fuse/z80/tests/02.in
trunk/fuse/z80/tests/02.out
trunk/fuse/z80/tests/03.in
trunk/fuse/z80/tests/03.out
trunk/fuse/z80/tests/04.in
trunk/fuse/z80/tests/04.out
trunk/fuse/z80/tests/05.in
trunk/fuse/z80/tests/05.out
trunk/fuse/z80/tests/06.in
trunk/fuse/z80/tests/06.out
trunk/fuse/z80/tests/07.in
trunk/fuse/z80/tests/07.out
trunk/fuse/z80/tests/08.in
trunk/fuse/z80/tests/08.out
trunk/fuse/z80/tests/09.in
trunk/fuse/z80/tests/09.out
trunk/fuse/z80/tests/0a.in
trunk/fuse/z80/tests/0a.out
trunk/fuse/z80/tests/0b.in
trunk/fuse/z80/tests/0b.out
trunk/fuse/z80/tests/0c.in
trunk/fuse/z80/tests/0c.out
trunk/fuse/z80/tests/0d.in
trunk/fuse/z80/tests/0d.out
trunk/fuse/z80/tests/0e.in
trunk/fuse/z80/tests/0e.out
trunk/fuse/z80/tests/0f.in
trunk/fuse/z80/tests/0f.out
trunk/fuse/z80/tests/10.in
trunk/fuse/z80/tests/10.out
trunk/fuse/z80/tests/11.in
trunk/fuse/z80/tests/11.out
trunk/fuse/z80/tests/12.in
trunk/fuse/z80/tests/12.out
trunk/fuse/z80/tests/13.in
trunk/fuse/z80/tests/13.out
trunk/fuse/z80/tests/14.in
trunk/fuse/z80/tests/14.out
trunk/fuse/z80/tests/15.in
trunk/fuse/z80/tests/15.out
trunk/fuse/z80/tests/16.in
trunk/fuse/z80/tests/16.out
trunk/fuse/z80/tests/17.in
trunk/fuse/z80/tests/17.out
trunk/fuse/z80/tests/18.in
trunk/fuse/z80/tests/18.out
trunk/fuse/z80/tests/19.in
trunk/fuse/z80/tests/19.out
trunk/fuse/z80/tests/1a.in
trunk/fuse/z80/tests/1a.out
trunk/fuse/z80/tests/1b.in
trunk/fuse/z80/tests/1b.out
trunk/fuse/z80/tests/1c.in
trunk/fuse/z80/tests/1c.out
trunk/fuse/z80/tests/1d.in
trunk/fuse/z80/tests/1d.out
trunk/fuse/z80/tests/1e.in
trunk/fuse/z80/tests/1e.out
trunk/fuse/z80/tests/1f.in
trunk/fuse/z80/tests/1f.out
trunk/fuse/z80/tests/20_1.in
trunk/fuse/z80/tests/20_1.out
trunk/fuse/z80/tests/20_2.in
trunk/fuse/z80/tests/20_2.out
trunk/fuse/z80/tests/21.in
trunk/fuse/z80/tests/21.out
trunk/fuse/z80/tests/22.in
trunk/fuse/z80/tests/22.out
trunk/fuse/z80/tests/23.in
trunk/fuse/z80/tests/23.out
trunk/fuse/z80/tests/24.in
trunk/fuse/z80/tests/24.out
trunk/fuse/z80/tests/25.in
trunk/fuse/z80/tests/25.out
trunk/fuse/z80/tests/26.in
trunk/fuse/z80/tests/26.out
trunk/fuse/z80/tests/27.in
trunk/fuse/z80/tests/27.out
trunk/fuse/z80/tests/27_1.in
trunk/fuse/z80/tests/27_1.out
trunk/fuse/z80/tests/28_1.in
trunk/fuse/z80/tests/28_1.out
trunk/fuse/z80/tests/28_2.in
trunk/fuse/z80/tests/28_2.out
trunk/fuse/z80/tests/29.in
trunk/fuse/z80/tests/29.out
trunk/fuse/z80/tests/2a.in
trunk/fuse/z80/tests/2a.out
trunk/fuse/z80/tests/2b.in
trunk/fuse/z80/tests/2b.out
trunk/fuse/z80/tests/2c.in
trunk/fuse/z80/tests/2c.out
trunk/fuse/z80/tests/2d.in
trunk/fuse/z80/tests/2d.out
trunk/fuse/z80/tests/2e.in
trunk/fuse/z80/tests/2e.out
trunk/fuse/z80/tests/2f.in
trunk/fuse/z80/tests/2f.out
trunk/fuse/z80/tests/30_1.in
trunk/fuse/z80/tests/30_1.out
trunk/fuse/z80/tests/30_2.in
trunk/fuse/z80/tests/30_2.out
trunk/fuse/z80/tests/31.in
trunk/fuse/z80/tests/31.out
trunk/fuse/z80/tests/32.in
trunk/fuse/z80/tests/32.out
trunk/fuse/z80/tests/33.in
trunk/fuse/z80/tests/33.out
trunk/fuse/z80/tests/34.in
trunk/fuse/z80/tests/34.out
trunk/fuse/z80/tests/35.in
trunk/fuse/z80/tests/35.out
trunk/fuse/z80/tests/36.in
trunk/fuse/z80/tests/36.out
trunk/fuse/z80/tests/37.in
trunk/fuse/z80/tests/37.out
trunk/fuse/z80/tests/37_1.in
trunk/fuse/z80/tests/37_1.out
trunk/fuse/z80/tests/37_2.in
trunk/fuse/z80/tests/37_2.out
trunk/fuse/z80/tests/37_3.in
trunk/fuse/z80/tests/37_3.out
trunk/fuse/z80/tests/38_1.in
trunk/fuse/z80/tests/38_1.out
trunk/fuse/z80/tests/38_2.in
trunk/fuse/z80/tests/38_2.out
trunk/fuse/z80/tests/39.in
trunk/fuse/z80/tests/39.out
trunk/fuse/z80/tests/3a.in
trunk/fuse/z80/tests/3a.out
trunk/fuse/z80/tests/3b.in
trunk/fuse/z80/tests/3b.out
trunk/fuse/z80/tests/3c.in
trunk/fuse/z80/tests/3c.out
trunk/fuse/z80/tests/3d.in
trunk/fuse/z80/tests/3d.out
trunk/fuse/z80/tests/3e.in
trunk/fuse/z80/tests/3e.out
trunk/fuse/z80/tests/3f.in
trunk/fuse/z80/tests/3f.out
trunk/fuse/z80/tests/40.in
trunk/fuse/z80/tests/40.out
trunk/fuse/z80/tests/41.in
trunk/fuse/z80/tests/41.out
trunk/fuse/z80/tests/42.in
trunk/fuse/z80/tests/42.out
trunk/fuse/z80/tests/43.in
trunk/fuse/z80/tests/43.out
trunk/fuse/z80/tests/44.in
trunk/fuse/z80/tests/44.out
trunk/fuse/z80/tests/45.in
trunk/fuse/z80/tests/45.out
trunk/fuse/z80/tests/46.in
trunk/fuse/z80/tests/46.out
trunk/fuse/z80/tests/47.in
trunk/fuse/z80/tests/47.out
trunk/fuse/z80/tests/48.in
trunk/fuse/z80/tests/48.out
trunk/fuse/z80/tests/49.in
trunk/fuse/z80/tests/49.out
trunk/fuse/z80/tests/4a.in
trunk/fuse/z80/tests/4a.out
trunk/fuse/z80/tests/4b.in
trunk/fuse/z80/tests/4b.out
trunk/fuse/z80/tests/4c.in
trunk/fuse/z80/tests/4c.out
trunk/fuse/z80/tests/4d.in
trunk/fuse/z80/tests/4d.out
trunk/fuse/z80/tests/4e.in
trunk/fuse/z80/tests/4e.out
trunk/fuse/z80/tests/4f.in
trunk/fuse/z80/tests/4f.out
trunk/fuse/z80/tests/50.in
trunk/fuse/z80/tests/50.out
trunk/fuse/z80/tests/51.in
trunk/fuse/z80/tests/51.out
trunk/fuse/z80/tests/52.in
trunk/fuse/z80/tests/52.out
trunk/fuse/z80/tests/53.in
trunk/fuse/z80/tests/53.out
trunk/fuse/z80/tests/54.in
trunk/fuse/z80/tests/54.out
trunk/fuse/z80/tests/55.in
trunk/fuse/z80/tests/55.out
trunk/fuse/z80/tests/56.in
trunk/fuse/z80/tests/56.out
trunk/fuse/z80/tests/57.in
trunk/fuse/z80/tests/57.out
trunk/fuse/z80/tests/58.in
trunk/fuse/z80/tests/58.out
trunk/fuse/z80/tests/59.in
trunk/fuse/z80/tests/59.out
trunk/fuse/z80/tests/5a.in
trunk/fuse/z80/tests/5a.out
trunk/fuse/z80/tests/5b.in
trunk/fuse/z80/tests/5b.out
trunk/fuse/z80/tests/5c.in
trunk/fuse/z80/tests/5c.out
trunk/fuse/z80/tests/5d.in
trunk/fuse/z80/tests/5d.out
trunk/fuse/z80/tests/5e.in
trunk/fuse/z80/tests/5e.out
trunk/fuse/z80/tests/5f.in
trunk/fuse/z80/tests/5f.out
trunk/fuse/z80/tests/60.in
trunk/fuse/z80/tests/60.out
trunk/fuse/z80/tests/61.in
trunk/fuse/z80/tests/61.out
trunk/fuse/z80/tests/62.in
trunk/fuse/z80/tests/62.out
trunk/fuse/z80/tests/63.in
trunk/fuse/z80/tests/63.out
trunk/fuse/z80/tests/64.in
trunk/fuse/z80/tests/64.out
trunk/fuse/z80/tests/65.in
trunk/fuse/z80/tests/65.out
trunk/fuse/z80/tests/66.in
trunk/fuse/z80/tests/66.out
trunk/fuse/z80/tests/67.in
trunk/fuse/z80/tests/67.out
trunk/fuse/z80/tests/68.in
trunk/fuse/z80/tests/68.out
trunk/fuse/z80/tests/69.in
trunk/fuse/z80/tests/69.out
trunk/fuse/z80/tests/6a.in
trunk/fuse/z80/tests/6a.out
trunk/fuse/z80/tests/6b.in
trunk/fuse/z80/tests/6b.out
trunk/fuse/z80/tests/6c.in
trunk/fuse/z80/tests/6c.out
trunk/fuse/z80/tests/6d.in
trunk/fuse/z80/tests/6d.out
trunk/fuse/z80/tests/6e.in
trunk/fuse/z80/tests/6e.out
trunk/fuse/z80/tests/6f.in
trunk/fuse/z80/tests/6f.out
trunk/fuse/z80/tests/70.in
trunk/fuse/z80/tests/70.out
trunk/fuse/z80/tests/71.in
trunk/fuse/z80/tests/71.out
trunk/fuse/z80/tests/72.in
trunk/fuse/z80/tests/72.out
trunk/fuse/z80/tests/73.in
trunk/fuse/z80/tests/73.out
trunk/fuse/z80/tests/74.in
trunk/fuse/z80/tests/74.out
trunk/fuse/z80/tests/75.in
trunk/fuse/z80/tests/75.out
trunk/fuse/z80/tests/76.in
trunk/fuse/z80/tests/76.out
trunk/fuse/z80/tests/77.in
trunk/fuse/z80/tests/77.out
trunk/fuse/z80/tests/78.in
trunk/fuse/z80/tests/78.out
trunk/fuse/z80/tests/79.in
trunk/fuse/z80/tests/79.out
trunk/fuse/z80/tests/7a.in
trunk/fuse/z80/tests/7a.out
trunk/fuse/z80/tests/7b.in
trunk/fuse/z80/tests/7b.out
trunk/fuse/z80/tests/7c.in
trunk/fuse/z80/tests/7c.out
trunk/fuse/z80/tests/7d.in
trunk/fuse/z80/tests/7d.out
trunk/fuse/z80/tests/7e.in
trunk/fuse/z80/tests/7e.out
trunk/fuse/z80/tests/7f.in
trunk/fuse/z80/tests/7f.out
trunk/fuse/z80/tests/80.in
trunk/fuse/z80/tests/80.out
trunk/fuse/z80/tests/81.in
trunk/fuse/z80/tests/81.out
trunk/fuse/z80/tests/82.in
trunk/fuse/z80/tests/82.out
trunk/fuse/z80/tests/83.in
trunk/fuse/z80/tests/83.out
trunk/fuse/z80/tests/84.in
trunk/fuse/z80/tests/84.out
trunk/fuse/z80/tests/85.in
trunk/fuse/z80/tests/85.out
trunk/fuse/z80/tests/86.in
trunk/fuse/z80/tests/86.out
trunk/fuse/z80/tests/87.in
trunk/fuse/z80/tests/87.out
trunk/fuse/z80/tests/88.in
trunk/fuse/z80/tests/88.out
trunk/fuse/z80/tests/89.in
trunk/fuse/z80/tests/89.out
trunk/fuse/z80/tests/8a.in
trunk/fuse/z80/tests/8a.out
trunk/fuse/z80/tests/8b.in
trunk/fuse/z80/tests/8b.out
trunk/fuse/z80/tests/8c.in
trunk/fuse/z80/tests/8c.out
trunk/fuse/z80/tests/8d.in
trunk/fuse/z80/tests/8d.out
trunk/fuse/z80/tests/8e.in
trunk/fuse/z80/tests/8e.out
trunk/fuse/z80/tests/8f.in
trunk/fuse/z80/tests/8f.out
trunk/fuse/z80/tests/90.in
trunk/fuse/z80/tests/90.out
trunk/fuse/z80/tests/91.in
trunk/fuse/z80/tests/91.out
trunk/fuse/z80/tests/92.in
trunk/fuse/z80/tests/92.out
trunk/fuse/z80/tests/93.in
trunk/fuse/z80/tests/93.out
trunk/fuse/z80/tests/94.in
trunk/fuse/z80/tests/94.out
trunk/fuse/z80/tests/95.in
trunk/fuse/z80/tests/95.out
trunk/fuse/z80/tests/96.in
trunk/fuse/z80/tests/96.out
trunk/fuse/z80/tests/97.in
trunk/fuse/z80/tests/97.out
trunk/fuse/z80/tests/98.in
trunk/fuse/z80/tests/98.out
trunk/fuse/z80/tests/99.in
trunk/fuse/z80/tests/99.out
trunk/fuse/z80/tests/9a.in
trunk/fuse/z80/tests/9a.out
trunk/fuse/z80/tests/9b.in
trunk/fuse/z80/tests/9b.out
trunk/fuse/z80/tests/9c.in
trunk/fuse/z80/tests/9c.out
trunk/fuse/z80/tests/9d.in
trunk/fuse/z80/tests/9d.out
trunk/fuse/z80/tests/9e.in
trunk/fuse/z80/tests/9e.out
trunk/fuse/z80/tests/9f.in
trunk/fuse/z80/tests/9f.out
trunk/fuse/z80/tests/a0.in
trunk/fuse/z80/tests/a0.out
trunk/fuse/z80/tests/a1.in
trunk/fuse/z80/tests/a1.out
trunk/fuse/z80/tests/a2.in
trunk/fuse/z80/tests/a2.out
trunk/fuse/z80/tests/a3.in
trunk/fuse/z80/tests/a3.out
trunk/fuse/z80/tests/a4.in
trunk/fuse/z80/tests/a4.out
trunk/fuse/z80/tests/a5.in
trunk/fuse/z80/tests/a5.out
trunk/fuse/z80/tests/a6.in
trunk/fuse/z80/tests/a6.out
trunk/fuse/z80/tests/a7.in
trunk/fuse/z80/tests/a7.out
trunk/fuse/z80/tests/a8.in
trunk/fuse/z80/tests/a8.out
trunk/fuse/z80/tests/a9.in
trunk/fuse/z80/tests/a9.out
trunk/fuse/z80/tests/aa.in
trunk/fuse/z80/tests/aa.out
trunk/fuse/z80/tests/ab.in
trunk/fuse/z80/tests/ab.out
trunk/fuse/z80/tests/ac.in
trunk/fuse/z80/tests/ac.out
trunk/fuse/z80/tests/ad.in
trunk/fuse/z80/tests/ad.out
trunk/fuse/z80/tests/ae.in
trunk/fuse/z80/tests/ae.out
trunk/fuse/z80/tests/af.in
trunk/fuse/z80/tests/af.out
trunk/fuse/z80/tests/b0.in
trunk/fuse/z80/tests/b0.out
trunk/fuse/z80/tests/b1.in
trunk/fuse/z80/tests/b1.out
trunk/fuse/z80/tests/b2.in
trunk/fuse/z80/tests/b2.out
trunk/fuse/z80/tests/b3.in
trunk/fuse/z80/tests/b3.out
trunk/fuse/z80/tests/b4.in
trunk/fuse/z80/tests/b4.out
trunk/fuse/z80/tests/b5.in
trunk/fuse/z80/tests/b5.out
trunk/fuse/z80/tests/b6.in
trunk/fuse/z80/tests/b6.out
trunk/fuse/z80/tests/b7.in
trunk/fuse/z80/tests/b7.out
trunk/fuse/z80/tests/b8.in
trunk/fuse/z80/tests/b8.out
trunk/fuse/z80/tests/b9.in
trunk/fuse/z80/tests/b9.out
trunk/fuse/z80/tests/ba.in
trunk/fuse/z80/tests/ba.out
trunk/fuse/z80/tests/bb.in
trunk/fuse/z80/tests/bb.out
trunk/fuse/z80/tests/bc.in
trunk/fuse/z80/tests/bc.out
trunk/fuse/z80/tests/bd.in
trunk/fuse/z80/tests/bd.out
trunk/fuse/z80/tests/be.in
trunk/fuse/z80/tests/be.out
trunk/fuse/z80/tests/bf.in
trunk/fuse/z80/tests/bf.out
trunk/fuse/z80/tests/c0_1.in
trunk/fuse/z80/tests/c0_1.out
trunk/fuse/z80/tests/c0_2.in
trunk/fuse/z80/tests/c0_2.out
trunk/fuse/z80/tests/c1.in
trunk/fuse/z80/tests/c1.out
trunk/fuse/z80/tests/c2_1.in
trunk/fuse/z80/tests/c2_1.out
trunk/fuse/z80/tests/c2_2.in
trunk/fuse/z80/tests/c2_2.out
trunk/fuse/z80/tests/c3.in
trunk/fuse/z80/tests/c3.out
trunk/fuse/z80/tests/c4_1.in
trunk/fuse/z80/tests/c4_1.out
trunk/fuse/z80/tests/c4_2.in
trunk/fuse/z80/tests/c4_2.out
trunk/fuse/z80/tests/c5.in
trunk/fuse/z80/tests/c5.out
trunk/fuse/z80/tests/c6.in
trunk/fuse/z80/tests/c6.out
trunk/fuse/z80/tests/c7.in
trunk/fuse/z80/tests/c7.out
trunk/fuse/z80/tests/c8_1.in
trunk/fuse/z80/tests/c8_1.out
trunk/fuse/z80/tests/c8_2.in
trunk/fuse/z80/tests/c8_2.out
trunk/fuse/z80/tests/c9.in
trunk/fuse/z80/tests/c9.out
trunk/fuse/z80/tests/ca_1.in
trunk/fuse/z80/tests/ca_1.out
trunk/fuse/z80/tests/ca_2.in
trunk/fuse/z80/tests/ca_2.out
trunk/fuse/z80/tests/cb00.in
trunk/fuse/z80/tests/cb00.out
trunk/fuse/z80/tests/cb01.in
trunk/fuse/z80/tests/cb01.out
trunk/fuse/z80/tests/cb02.in
trunk/fuse/z80/tests/cb02.out
trunk/fuse/z80/tests/cb03.in
trunk/fuse/z80/tests/cb03.out
trunk/fuse/z80/tests/cb04.in
trunk/fuse/z80/tests/cb04.out
trunk/fuse/z80/tests/cb05.in
trunk/fuse/z80/tests/cb05.out
trunk/fuse/z80/tests/cb06.in
trunk/fuse/z80/tests/cb06.out
trunk/fuse/z80/tests/cb07.in
trunk/fuse/z80/tests/cb07.out
trunk/fuse/z80/tests/cb08.in
trunk/fuse/z80/tests/cb08.out
trunk/fuse/z80/tests/cb09.in
trunk/fuse/z80/tests/cb09.out
trunk/fuse/z80/tests/cb0a.in
trunk/fuse/z80/tests/cb0a.out
trunk/fuse/z80/tests/cb0b.in
trunk/fuse/z80/tests/cb0b.out
trunk/fuse/z80/tests/cb0c.in
trunk/fuse/z80/tests/cb0c.out
trunk/fuse/z80/tests/cb0d.in
trunk/fuse/z80/tests/cb0d.out
trunk/fuse/z80/tests/cb0e.in
trunk/fuse/z80/tests/cb0e.out
trunk/fuse/z80/tests/cb0f.in
trunk/fuse/z80/tests/cb0f.out
trunk/fuse/z80/tests/cb10.in
trunk/fuse/z80/tests/cb10.out
trunk/fuse/z80/tests/cb11.in
trunk/fuse/z80/tests/cb11.out
trunk/fuse/z80/tests/cb12.in
trunk/fuse/z80/tests/cb12.out
trunk/fuse/z80/tests/cb13.in
trunk/fuse/z80/tests/cb13.out
trunk/fuse/z80/tests/cb14.in
trunk/fuse/z80/tests/cb14.out
trunk/fuse/z80/tests/cb15.in
trunk/fuse/z80/tests/cb15.out
trunk/fuse/z80/tests/cb16.in
trunk/fuse/z80/tests/cb16.out
trunk/fuse/z80/tests/cb17.in
trunk/fuse/z80/tests/cb17.out
trunk/fuse/z80/tests/cb18.in
trunk/fuse/z80/tests/cb18.out
trunk/fuse/z80/tests/cb19.in
trunk/fuse/z80/tests/cb19.out
trunk/fuse/z80/tests/cb1a.in
trunk/fuse/z80/tests/cb1a.out
trunk/fuse/z80/tests/cb1b.in
trunk/fuse/z80/tests/cb1b.out
trunk/fuse/z80/tests/cb1c.in
trunk/fuse/z80/tests/cb1c.out
trunk/fuse/z80/tests/cb1d.in
trunk/fuse/z80/tests/cb1d.out
trunk/fuse/z80/tests/cb1e.in
trunk/fuse/z80/tests/cb1e.out
trunk/fuse/z80/tests/cb1f.in
trunk/fuse/z80/tests/cb1f.out
trunk/fuse/z80/tests/cb20.in
trunk/fuse/z80/tests/cb20.out
trunk/fuse/z80/tests/cb21.in
trunk/fuse/z80/tests/cb21.out
trunk/fuse/z80/tests/cb22.in
trunk/fuse/z80/tests/cb22.out
trunk/fuse/z80/tests/cb23.in
trunk/fuse/z80/tests/cb23.out
trunk/fuse/z80/tests/cb24.in
trunk/fuse/z80/tests/cb24.out
trunk/fuse/z80/tests/cb25.in
trunk/fuse/z80/tests/cb25.out
trunk/fuse/z80/tests/cb26.in
trunk/fuse/z80/tests/cb26.out
trunk/fuse/z80/tests/cb27.in
trunk/fuse/z80/tests/cb27.out
trunk/fuse/z80/tests/cb28.in
trunk/fuse/z80/tests/cb28.out
trunk/fuse/z80/tests/cb29.in
trunk/fuse/z80/tests/cb29.out
trunk/fuse/z80/tests/cb2a.in
trunk/fuse/z80/tests/cb2a.out
trunk/fuse/z80/tests/cb2b.in
trunk/fuse/z80/tests/cb2b.out
trunk/fuse/z80/tests/cb2c.in
trunk/fuse/z80/tests/cb2c.out
trunk/fuse/z80/tests/cb2d.in
trunk/fuse/z80/tests/cb2d.out
trunk/fuse/z80/tests/cb2e.in
trunk/fuse/z80/tests/cb2e.out
trunk/fuse/z80/tests/cb2f.in
trunk/fuse/z80/tests/cb2f.out
trunk/fuse/z80/tests/cb30.in
trunk/fuse/z80/tests/cb30.out
trunk/fuse/z80/tests/cb31.in
trunk/fuse/z80/tests/cb31.out
trunk/fuse/z80/tests/cb32.in
trunk/fuse/z80/tests/cb32.out
trunk/fuse/z80/tests/cb33.in
trunk/fuse/z80/tests/cb33.out
trunk/fuse/z80/tests/cb34.in
trunk/fuse/z80/tests/cb34.out
trunk/fuse/z80/tests/cb35.in
trunk/fuse/z80/tests/cb35.out
trunk/fuse/z80/tests/cb36.in
trunk/fuse/z80/tests/cb36.out
trunk/fuse/z80/tests/cb37.in
trunk/fuse/z80/tests/cb37.out
trunk/fuse/z80/tests/cb38.in
trunk/fuse/z80/tests/cb38.out
trunk/fuse/z80/tests/cb39.in
trunk/fuse/z80/tests/cb39.out
trunk/fuse/z80/tests/cb3a.in
trunk/fuse/z80/tests/cb3a.out
trunk/fuse/z80/tests/cb3b.in
trunk/fuse/z80/tests/cb3b.out
trunk/fuse/z80/tests/cb3c.in
trunk/fuse/z80/tests/cb3c.out
trunk/fuse/z80/tests/cb3d.in
trunk/fuse/z80/tests/cb3d.out
trunk/fuse/z80/tests/cb3e.in
trunk/fuse/z80/tests/cb3e.out
trunk/fuse/z80/tests/cb3f.in
trunk/fuse/z80/tests/cb3f.out
trunk/fuse/z80/tests/cb40.in
trunk/fuse/z80/tests/cb40.out
trunk/fuse/z80/tests/cb41.in
trunk/fuse/z80/tests/cb41.out
trunk/fuse/z80/tests/cb42.in
trunk/fuse/z80/tests/cb42.out
trunk/fuse/z80/tests/cb43.in
trunk/fuse/z80/tests/cb43.out
trunk/fuse/z80/tests/cb44.in
trunk/fuse/z80/tests/cb44.out
trunk/fuse/z80/tests/cb45.in
trunk/fuse/z80/tests/cb45.out
trunk/fuse/z80/tests/cb46.in
trunk/fuse/z80/tests/cb46.out
trunk/fuse/z80/tests/cb47.in
trunk/fuse/z80/tests/cb47.out
trunk/fuse/z80/tests/cb47_1.in
trunk/fuse/z80/tests/cb47_1.out
trunk/fuse/z80/tests/cb48.in
trunk/fuse/z80/tests/cb48.out
trunk/fuse/z80/tests/cb49.in
trunk/fuse/z80/tests/cb49.out
trunk/fuse/z80/tests/cb4a.in
trunk/fuse/z80/tests/cb4a.out
trunk/fuse/z80/tests/cb4b.in
trunk/fuse/z80/tests/cb4b.out
trunk/fuse/z80/tests/cb4c.in
trunk/fuse/z80/tests/cb4c.out
trunk/fuse/z80/tests/cb4d.in
trunk/fuse/z80/tests/cb4d.out
trunk/fuse/z80/tests/cb4e.in
trunk/fuse/z80/tests/cb4e.out
trunk/fuse/z80/tests/cb4f.in
trunk/fuse/z80/tests/cb4f.out
trunk/fuse/z80/tests/cb4f_1.in
trunk/fuse/z80/tests/cb4f_1.out
trunk/fuse/z80/tests/cb50.in
trunk/fuse/z80/tests/cb50.out
trunk/fuse/z80/tests/cb51.in
trunk/fuse/z80/tests/cb51.out
trunk/fuse/z80/tests/cb52.in
trunk/fuse/z80/tests/cb52.out
trunk/fuse/z80/tests/cb53.in
trunk/fuse/z80/tests/cb53.out
trunk/fuse/z80/tests/cb54.in
trunk/fuse/z80/tests/cb54.out
trunk/fuse/z80/tests/cb55.in
trunk/fuse/z80/tests/cb55.out
trunk/fuse/z80/tests/cb56.in
trunk/fuse/z80/tests/cb56.out
trunk/fuse/z80/tests/cb57.in
trunk/fuse/z80/tests/cb57.out
trunk/fuse/z80/tests/cb57_1.in
trunk/fuse/z80/tests/cb57_1.out
trunk/fuse/z80/tests/cb58.in
trunk/fuse/z80/tests/cb58.out
trunk/fuse/z80/tests/cb59.in
trunk/fuse/z80/tests/cb59.out
trunk/fuse/z80/tests/cb5a.in
trunk/fuse/z80/tests/cb5a.out
trunk/fuse/z80/tests/cb5b.in
trunk/fuse/z80/tests/cb5b.out
trunk/fuse/z80/tests/cb5c.in
trunk/fuse/z80/tests/cb5c.out
trunk/fuse/z80/tests/cb5d.in
trunk/fuse/z80/tests/cb5d.out
trunk/fuse/z80/tests/cb5e.in
trunk/fuse/z80/tests/cb5e.out
trunk/fuse/z80/tests/cb5f.in
trunk/fuse/z80/tests/cb5f.out
trunk/fuse/z80/tests/cb5f_1.in
trunk/fuse/z80/tests/cb5f_1.out
trunk/fuse/z80/tests/cb60.in
trunk/fuse/z80/tests/cb60.out
trunk/fuse/z80/tests/cb61.in
trunk/fuse/z80/tests/cb61.out
trunk/fuse/z80/tests/cb62.in
trunk/fuse/z80/tests/cb62.out
trunk/fuse/z80/tests/cb63.in
trunk/fuse/z80/tests/cb63.out
trunk/fuse/z80/tests/cb64.in
trunk/fuse/z80/tests/cb64.out
trunk/fuse/z80/tests/cb65.in
trunk/fuse/z80/tests/cb65.out
trunk/fuse/z80/tests/cb66.in
trunk/fuse/z80/tests/cb66.out
trunk/fuse/z80/tests/cb67.in
trunk/fuse/z80/tests/cb67.out
trunk/fuse/z80/tests/cb67_1.in
trunk/fuse/z80/tests/cb67_1.out
trunk/fuse/z80/tests/cb68.in
trunk/fuse/z80/tests/cb68.out
trunk/fuse/z80/tests/cb69.in
trunk/fuse/z80/tests/cb69.out
trunk/fuse/z80/tests/cb6a.in
trunk/fuse/z80/tests/cb6a.out
trunk/fuse/z80/tests/cb6b.in
trunk/fuse/z80/tests/cb6b.out
trunk/fuse/z80/tests/cb6c.in
trunk/fuse/z80/tests/cb6c.out
trunk/fuse/z80/tests/cb6d.in
trunk/fuse/z80/tests/cb6d.out
trunk/fuse/z80/tests/cb6e.in
trunk/fuse/z80/tests/cb6e.out
trunk/fuse/z80/tests/cb6f.in
trunk/fuse/z80/tests/cb6f.out
trunk/fuse/z80/tests/cb6f_1.in
trunk/fuse/z80/tests/cb6f_1.out
trunk/fuse/z80/tests/cb70.in
trunk/fuse/z80/tests/cb70.out
trunk/fuse/z80/tests/cb71.in
trunk/fuse/z80/tests/cb71.out
trunk/fuse/z80/tests/cb72.in
trunk/fuse/z80/tests/cb72.out
trunk/fuse/z80/tests/cb73.in
trunk/fuse/z80/tests/cb73.out
trunk/fuse/z80/tests/cb74.in
trunk/fuse/z80/tests/cb74.out
trunk/fuse/z80/tests/cb75.in
trunk/fuse/z80/tests/cb75.out
trunk/fuse/z80/tests/cb76.in
trunk/fuse/z80/tests/cb76.out
trunk/fuse/z80/tests/cb77.in
trunk/fuse/z80/tests/cb77.out
trunk/fuse/z80/tests/cb77_1.in
trunk/fuse/z80/tests/cb77_1.out
trunk/fuse/z80/tests/cb78.in
trunk/fuse/z80/tests/cb78.out
trunk/fuse/z80/tests/cb79.in
trunk/fuse/z80/tests/cb79.out
trunk/fuse/z80/tests/cb7a.in
trunk/fuse/z80/tests/cb7a.out
trunk/fuse/z80/tests/cb7b.in
trunk/fuse/z80/tests/cb7b.out
trunk/fuse/z80/tests/cb7c.in
trunk/fuse/z80/tests/cb7c.out
trunk/fuse/z80/tests/cb7d.in
trunk/fuse/z80/tests/cb7d.out
trunk/fuse/z80/tests/cb7e.in
trunk/fuse/z80/tests/cb7e.out
trunk/fuse/z80/tests/cb7f.in
trunk/fuse/z80/tests/cb7f.out
trunk/fuse/z80/tests/cb7f_1.in
trunk/fuse/z80/tests/cb7f_1.out
trunk/fuse/z80/tests/cb80.in
trunk/fuse/z80/tests/cb80.out
trunk/fuse/z80/tests/cb81.in
trunk/fuse/z80/tests/cb81.out
trunk/fuse/z80/tests/cb82.in
trunk/fuse/z80/tests/cb82.out
trunk/fuse/z80/tests/cb83.in
trunk/fuse/z80/tests/cb83.out
trunk/fuse/z80/tests/cb84.in
trunk/fuse/z80/tests/cb84.out
trunk/fuse/z80/tests/cb85.in
trunk/fuse/z80/tests/cb85.out
trunk/fuse/z80/tests/cb86.in
trunk/fuse/z80/tests/cb86.out
trunk/fuse/z80/tests/cb87.in
trunk/fuse/z80/tests/cb87.out
trunk/fuse/z80/tests/cb88.in
trunk/fuse/z80/tests/cb88.out
trunk/fuse/z80/tests/cb89.in
trunk/fuse/z80/tests/cb89.out
trunk/fuse/z80/tests/cb8a.in
trunk/fuse/z80/tests/cb8a.out
trunk/fuse/z80/tests/cb8b.in
trunk/fuse/z80/tests/cb8b.out
trunk/fuse/z80/tests/cb8c.in
trunk/fuse/z80/tests/cb8c.out
trunk/fuse/z80/tests/cb8d.in
trunk/fuse/z80/tests/cb8d.out
trunk/fuse/z80/tests/cb8e.in
trunk/fuse/z80/tests/cb8e.out
trunk/fuse/z80/tests/cb8f.in
trunk/fuse/z80/tests/cb8f.out
trunk/fuse/z80/tests/cb90.in
trunk/fuse/z80/tests/cb90.out
trunk/fuse/z80/tests/cb91.in
trunk/fuse/z80/tests/cb91.out
trunk/fuse/z80/tests/cb92.in
trunk/fuse/z80/tests/cb92.out
trunk/fuse/z80/tests/cb93.in
trunk/fuse/z80/tests/cb93.out
trunk/fuse/z80/tests/cb94.in
trunk/fuse/z80/tests/cb94.out
trunk/fuse/z80/tests/cb95.in
trunk/fuse/z80/tests/cb95.out
trunk/fuse/z80/tests/cb96.in
trunk/fuse/z80/tests/cb96.out
trunk/fuse/z80/tests/cb97.in
trunk/fuse/z80/tests/cb97.out
trunk/fuse/z80/tests/cb98.in
trunk/fuse/z80/tests/cb98.out
trunk/fuse/z80/tests/cb99.in
trunk/fuse/z80/tests/cb99.out
trunk/fuse/z80/tests/cb9a.in
trunk/fuse/z80/tests/cb9a.out
trunk/fuse/z80/tests/cb9b.in
trunk/fuse/z80/tests/cb9b.out
trunk/fuse/z80/tests/cb9c.in
trunk/fuse/z80/tests/cb9c.out
trunk/fuse/z80/tests/cb9d.in
trunk/fuse/z80/tests/cb9d.out
trunk/fuse/z80/tests/cb9e.in
trunk/fuse/z80/tests/cb9e.out
trunk/fuse/z80/tests/cb9f.in
trunk/fuse/z80/tests/cb9f.out
trunk/fuse/z80/tests/cba0.in
trunk/fuse/z80/tests/cba0.out
trunk/fuse/z80/tests/cba1.in
trunk/fuse/z80/tests/cba1.out
trunk/fuse/z80/tests/cba2.in
trunk/fuse/z80/tests/cba2.out
trunk/fuse/z80/tests/cba3.in
trunk/fuse/z80/tests/cba3.out
trunk/fuse/z80/tests/cba4.in
trunk/fuse/z80/tests/cba4.out
trunk/fuse/z80/tests/cba5.in
trunk/fuse/z80/tests/cba5.out
trunk/fuse/z80/tests/cba6.in
trunk/fuse/z80/tests/cba6.out
trunk/fuse/z80/tests/cba7.in
trunk/fuse/z80/tests/cba7.out
trunk/fuse/z80/tests/cba8.in
trunk/fuse/z80/tests/cba8.out
trunk/fuse/z80/tests/cba9.in
trunk/fuse/z80/tests/cba9.out
trunk/fuse/z80/tests/cbaa.in
trunk/fuse/z80/tests/cbaa.out
trunk/fuse/z80/tests/cbab.in
trunk/fuse/z80/tests/cbab.out
trunk/fuse/z80/tests/cbac.in
trunk/fuse/z80/tests/cbac.out
trunk/fuse/z80/tests/cbad.in
trunk/fuse/z80/tests/cbad.out
trunk/fuse/z80/tests/cbae.in
trunk/fuse/z80/tests/cbae.out
trunk/fuse/z80/tests/cbaf.in
trunk/fuse/z80/tests/cbaf.out
trunk/fuse/z80/tests/cbb0.in
trunk/fuse/z80/tests/cbb0.out
trunk/fuse/z80/tests/cbb1.in
trunk/fuse/z80/tests/cbb1.out
trunk/fuse/z80/tests/cbb2.in
trunk/fuse/z80/tests/cbb2.out
trunk/fuse/z80/tests/cbb3.in
trunk/fuse/z80/tests/cbb3.out
trunk/fuse/z80/tests/cbb4.in
trunk/fuse/z80/tests/cbb4.out
trunk/fuse/z80/tests/cbb5.in
trunk/fuse/z80/tests/cbb5.out
trunk/fuse/z80/tests/cbb6.in
trunk/fuse/z80/tests/cbb6.out
trunk/fuse/z80/tests/cbb7.in
trunk/fuse/z80/tests/cbb7.out
trunk/fuse/z80/tests/cbb8.in
trunk/fuse/z80/tests/cbb8.out
trunk/fuse/z80/tests/cbb9.in
trunk/fuse/z80/tests/cbb9.out
trunk/fuse/z80/tests/cbba.in
trunk/fuse/z80/tests/cbba.out
trunk/fuse/z80/tests/cbbb.in
trunk/fuse/z80/tests/cbbb.out
trunk/fuse/z80/tests/cbbc.in
trunk/fuse/z80/tests/cbbc.out
trunk/fuse/z80/tests/cbbd.in
trunk/fuse/z80/tests/cbbd.out
trunk/fuse/z80/tests/cbbe.in
trunk/f...
[truncated message content] |
|
From: <fr...@us...> - 2007-11-09 23:10:34
|
Revision: 460
http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=460&view=rev
Author: fredm
Date: 2007-11-09 15:10:38 -0800 (Fri, 09 Nov 2007)
Log Message:
-----------
Move to XCode 2.5 and 10.4 target for all frameworks. Link to libbz2 in
/usr/lib instead of framework.
Modified Paths:
--------------
trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj
trunk/audiofile/audiofile.xcodeproj/project.pbxproj
trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
trunk/lib765/lib765.xcodeproj/project.pbxproj
trunk/libgcrypt/libgcrypt.xcodeproj/project.pbxproj
trunk/libspectrum/libspectrum.xcodeproj/project.pbxproj
Removed Paths:
-------------
trunk/bzip2/
Modified: trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj
===================================================================
--- trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj 2007-11-09 22:38:34 UTC (rev 459)
+++ trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj 2007-11-09 23:10:38 UTC (rev 460)
@@ -562,6 +562,7 @@
isa = XCBuildConfiguration;
buildSettings = {
DEBUG_INFORMATION_FORMAT = dwarf;
+ DEPLOYMENT_POSTPROCESSING = YES;
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
};
name = Deployment;
Modified: trunk/audiofile/audiofile.xcodeproj/project.pbxproj
===================================================================
--- trunk/audiofile/audiofile.xcodeproj/project.pbxproj 2007-11-09 22:38:34 UTC (rev 459)
+++ trunk/audiofile/audiofile.xcodeproj/project.pbxproj 2007-11-09 23:10:38 UTC (rev 460)
@@ -395,11 +395,9 @@
ppc,
);
DEBUG_INFORMATION_FORMAT = dwarf;
+ DEPLOYMENT_POSTPROCESSING = NO;
FRAMEWORK_VERSION = 0.2.6;
- MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
- MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
- SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk;
- SDKROOT_ppc = /Developer/SDKs/MacOSX10.3.9.sdk;
+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
};
name = Development;
};
@@ -411,11 +409,9 @@
ppc,
);
DEBUG_INFORMATION_FORMAT = dwarf;
+ DEPLOYMENT_POSTPROCESSING = YES;
FRAMEWORK_VERSION = 0.2.6;
- MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
- MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
- SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk;
- SDKROOT_ppc = /Developer/SDKs/MacOSX10.3.9.sdk;
+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
};
name = Deployment;
};
@@ -427,11 +423,9 @@
ppc,
);
DEBUG_INFORMATION_FORMAT = dwarf;
+ DEPLOYMENT_POSTPROCESSING = NO;
FRAMEWORK_VERSION = 0.2.6;
- MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
- MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
- SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk;
- SDKROOT_ppc = /Developer/SDKs/MacOSX10.3.9.sdk;
+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
};
name = Default;
};
Modified: trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
===================================================================
--- trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2007-11-09 22:38:34 UTC (rev 459)
+++ trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2007-11-09 23:10:38 UTC (rev 460)
@@ -24,7 +24,6 @@
B61F45A209121DF100C8096C /* spectrum.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = F541C04303963A9F01C2A5B9 /* spectrum.framework */; };
B61F45A309121DF100C8096C /* 765.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = F541C0750396490901C2A5B9 /* 765.framework */; };
B61F45A609121DF100C8096C /* gcrypt.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = B6BA1A8B04E4F3290017354F /* gcrypt.framework */; };
- B61F45A709121DF100C8096C /* libbz2.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = B6202BD105BD43D800A1EA8F /* libbz2.framework */; };
B61F45AA09121DF100C8096C /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = F5598598038921C501A804BA /* config.h */; };
B61F45AD09121DF100C8096C /* ui.h in Headers */ = {isa = PBXBuildFile; fileRef = F55985AD0389222701A804BA /* ui.h */; };
B61F45AE09121DF100C8096C /* uidisplay.h in Headers */ = {isa = PBXBuildFile; fileRef = F55985AE0389222701A804BA /* uidisplay.h */; };
@@ -234,7 +233,6 @@
B61F469D09121DF100C8096C /* spectrum.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F541C04303963A9F01C2A5B9 /* spectrum.framework */; };
B61F469E09121DF100C8096C /* 765.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F541C0750396490901C2A5B9 /* 765.framework */; };
B61F46A109121DF100C8096C /* gcrypt.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B6BA1A8B04E4F3290017354F /* gcrypt.framework */; };
- B61F46A209121DF100C8096C /* libbz2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B6202BD105BD43D800A1EA8F /* libbz2.framework */; };
B61F46A409121DF100C8096C /* FuseImporter.mdimporter in CopyFiles */ = {isa = PBXBuildFile; fileRef = B64FEA96084F8EC300879389 /* FuseImporter.mdimporter */; };
B6251C3E0C2EB24500BD5543 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B6251C3D0C2EB24500BD5543 /* QuartzCore.framework */; };
B63225EC0C66BA1300BB081B /* osname.c in Sources */ = {isa = PBXBuildFile; fileRef = B63225EB0C66BA1300BB081B /* osname.c */; };
@@ -356,7 +354,6 @@
B61F45A209121DF100C8096C /* spectrum.framework in CopyFiles */,
B61F45A309121DF100C8096C /* 765.framework in CopyFiles */,
B61F45A609121DF100C8096C /* gcrypt.framework in CopyFiles */,
- B61F45A709121DF100C8096C /* libbz2.framework in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -393,7 +390,6 @@
B619FC2E090D9BC200344F94 /* SavePanelAccessoryView.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = SavePanelAccessoryView.nib; path = nibs/SavePanelAccessoryView.nib; sourceTree = "<group>"; };
B61F46A909121DF100C8096C /* Info-Fuse.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "Info-Fuse.plist"; sourceTree = "<group>"; };
B61F46AA09121DF200C8096C /* Fuse.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Fuse.app; sourceTree = BUILT_PRODUCTS_DIR; };
- B6202BD105BD43D800A1EA8F /* libbz2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libbz2.framework; path = ../../bzip2/build/Deployment/libbz2.framework; sourceTree = SOURCE_ROOT; };
B621A11E062E92FB00F63DBC /* if2.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = if2.c; path = ../if2.c; sourceTree = SOURCE_ROOT; };
B621A11F062E92FB00F63DBC /* if2.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = if2.h; path = ../if2.h; sourceTree = SOURCE_ROOT; };
B6251C3D0C2EB24500BD5543 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = /System/Library/Frameworks/QuartzCore.framework; sourceTree = "<absolute>"; };
@@ -696,7 +692,6 @@
B61F469D09121DF100C8096C /* spectrum.framework in Frameworks */,
B61F469E09121DF100C8096C /* 765.framework in Frameworks */,
B61F46A109121DF100C8096C /* gcrypt.framework in Frameworks */,
- B61F46A209121DF100C8096C /* libbz2.framework in Frameworks */,
B64E2A170A6534A3006863D9 /* Carbon.framework in Frameworks */,
B6A6F0EE0B3D5F9E000B88E9 /* CoreAudio.framework in Frameworks */,
B6A6F0F30B3D602F000B88E9 /* AudioUnit.framework in Frameworks */,
@@ -733,7 +728,6 @@
F541C0750396490901C2A5B9 /* 765.framework */,
B6FA759C0C1D7507007F5A10 /* audiofile.framework */,
B6BA1A8B04E4F3290017354F /* gcrypt.framework */,
- B6202BD105BD43D800A1EA8F /* libbz2.framework */,
F541C04303963A9F01C2A5B9 /* spectrum.framework */,
);
name = "Linked Frameworks";
@@ -1814,7 +1808,7 @@
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
YACCFLAGS = "-d";
YACC_GENERATED_FILE_STEM = InputFileStem;
- ZERO_LINK = YES;
+ ZERO_LINK = NO;
};
name = Deployment;
};
@@ -1832,7 +1826,7 @@
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
YACCFLAGS = "-d";
YACC_GENERATED_FILE_STEM = InputFileStem;
- ZERO_LINK = YES;
+ ZERO_LINK = NO;
};
name = Default;
};
Modified: trunk/lib765/lib765.xcodeproj/project.pbxproj
===================================================================
--- trunk/lib765/lib765.xcodeproj/project.pbxproj 2007-11-09 22:38:34 UTC (rev 459)
+++ trunk/lib765/lib765.xcodeproj/project.pbxproj 2007-11-09 23:10:38 UTC (rev 460)
@@ -77,7 +77,6 @@
B69A008A0A5D3CEA00EEA5ED /* dskcheck.c in Sources */ = {isa = PBXBuildFile; fileRef = 00000000000000001641C410 /* dskcheck.c */; };
B69A008B0A5D3CEA00EEA5ED /* dskcmt.c in Sources */ = {isa = PBXBuildFile; fileRef = 00000000000000001641AD00 /* dskcmt.c */; };
B69A008C0A5D3CEA00EEA5ED /* dskerror.c in Sources */ = {isa = PBXBuildFile; fileRef = 00000000000000001641D480 /* dskerror.c */; };
- B69A008E0A5D3CEA00EEA5ED /* libbz2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B69AFFFA0A5D366300EEA5ED /* libbz2.framework */; };
B69A00D90A5D403300EEA5ED /* libdsk.h in Headers */ = {isa = PBXBuildFile; fileRef = B69A00D80A5D403300EEA5ED /* libdsk.h */; settings = {ATTRIBUTES = (Public, ); }; };
/* End PBXBuildFile section */
@@ -187,7 +186,6 @@
B69A00950A5D3CEA00EEA5ED /* 765.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = 765.framework; sourceTree = BUILT_PRODUCTS_DIR; };
B69A00D80A5D403300EEA5ED /* libdsk.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = libdsk.h; sourceTree = "<group>"; };
B69AFFCE0A5D343500EEA5ED /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
- B69AFFFA0A5D366300EEA5ED /* libbz2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libbz2.framework; path = ../bzip2/build/Deployment/libbz2.framework; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -195,7 +193,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- B69A008E0A5D3CEA00EEA5ED /* libbz2.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -374,7 +371,6 @@
B69A000C0A5D36D400EEA5ED /* Linked Frameworks */ = {
isa = PBXGroup;
children = (
- B69AFFFA0A5D366300EEA5ED /* libbz2.framework */,
);
name = "Linked Frameworks";
sourceTree = "<group>";
@@ -575,7 +571,10 @@
INSTALL_PATH = "@executable_path/../Frameworks";
LIBRARY_SEARCH_PATHS = "";
OTHER_CFLAGS = "";
- OTHER_LDFLAGS = "-lz";
+ OTHER_LDFLAGS = (
+ "-lbz2",
+ "-lz",
+ );
OTHER_LIBTOOL_FLAGS = "";
OTHER_REZFLAGS = "";
PRINCIPAL_CLASS = "";
@@ -616,7 +615,10 @@
INSTALL_PATH = "@executable_path/../Frameworks";
LIBRARY_SEARCH_PATHS = "";
OTHER_CFLAGS = "";
- OTHER_LDFLAGS = "-lz";
+ OTHER_LDFLAGS = (
+ "-lbz2",
+ "-lz",
+ );
OTHER_LIBTOOL_FLAGS = "";
OTHER_REZFLAGS = "";
PRINCIPAL_CLASS = "";
@@ -655,7 +657,10 @@
INSTALL_PATH = "@executable_path/../Frameworks";
LIBRARY_SEARCH_PATHS = "";
OTHER_CFLAGS = "";
- OTHER_LDFLAGS = "-lz";
+ OTHER_LDFLAGS = (
+ "-lbz2",
+ "-lz",
+ );
OTHER_LIBTOOL_FLAGS = "";
OTHER_REZFLAGS = "";
PRINCIPAL_CLASS = "";
@@ -674,10 +679,7 @@
ppc,
);
DEBUG_INFORMATION_FORMAT = dwarf;
- MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
- MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
- SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk;
- SDKROOT_ppc = /Developer/SDKs/MacOSX10.3.9.sdk;
+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
};
name = Development;
};
@@ -689,10 +691,8 @@
ppc,
);
DEBUG_INFORMATION_FORMAT = dwarf;
- MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
- MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
- SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk;
- SDKROOT_ppc = /Developer/SDKs/MacOSX10.3.9.sdk;
+ DEPLOYMENT_POSTPROCESSING = YES;
+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
};
name = Deployment;
};
@@ -704,10 +704,7 @@
ppc,
);
DEBUG_INFORMATION_FORMAT = dwarf;
- MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
- MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
- SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk;
- SDKROOT_ppc = /Developer/SDKs/MacOSX10.3.9.sdk;
+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
};
name = Default;
};
Modified: trunk/libgcrypt/libgcrypt.xcodeproj/project.pbxproj
===================================================================
--- trunk/libgcrypt/libgcrypt.xcodeproj/project.pbxproj 2007-11-09 22:38:34 UTC (rev 459)
+++ trunk/libgcrypt/libgcrypt.xcodeproj/project.pbxproj 2007-11-09 23:10:38 UTC (rev 460)
@@ -554,10 +554,7 @@
ppc,
);
DEBUG_INFORMATION_FORMAT = dwarf;
- MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
- MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
- SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk;
- SDKROOT_ppc = /Developer/SDKs/MacOSX10.3.9.sdk;
+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
};
name = Development;
};
@@ -569,10 +566,8 @@
ppc,
);
DEBUG_INFORMATION_FORMAT = dwarf;
- MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
- MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
- SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk;
- SDKROOT_ppc = /Developer/SDKs/MacOSX10.3.9.sdk;
+ DEPLOYMENT_POSTPROCESSING = YES;
+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
};
name = Deployment;
};
@@ -584,10 +579,7 @@
ppc,
);
DEBUG_INFORMATION_FORMAT = dwarf;
- MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
- MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
- SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk;
- SDKROOT_ppc = /Developer/SDKs/MacOSX10.3.9.sdk;
+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
};
name = Default;
};
Modified: trunk/libspectrum/libspectrum.xcodeproj/project.pbxproj
===================================================================
--- trunk/libspectrum/libspectrum.xcodeproj/project.pbxproj 2007-11-09 22:38:34 UTC (rev 459)
+++ trunk/libspectrum/libspectrum.xcodeproj/project.pbxproj 2007-11-09 23:10:38 UTC (rev 460)
@@ -40,7 +40,6 @@
B6CBAD6F0A5F3C2900F826D6 /* z80.c in Sources */ = {isa = PBXBuildFile; fileRef = 0000000000000000164148A0 /* z80.c */; };
B6CBAD700A5F3C2900F826D6 /* zlib.c in Sources */ = {isa = PBXBuildFile; fileRef = 0000000000000000164151D0 /* zlib.c */; };
B6CBAD710A5F3C2900F826D6 /* zxs.c in Sources */ = {isa = PBXBuildFile; fileRef = 000000000000000016415CE0 /* zxs.c */; };
- B6CBADA00A5F3E7C00F826D6 /* libbz2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B6CBAD9F0A5F3E7C00F826D6 /* libbz2.framework */; };
B6CBADB80A5F3F3400F826D6 /* gcrypt.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B6CBADB70A5F3F3400F826D6 /* gcrypt.framework */; };
B6CBAE240A5FDDE300F826D6 /* snap_accessors.txt in Sources */ = {isa = PBXBuildFile; fileRef = B6CBAE200A5FDDC700F826D6 /* snap_accessors.txt */; };
B6CBAE3A0A5FF42200F826D6 /* tape_accessors.txt in Sources */ = {isa = PBXBuildFile; fileRef = B6CBAE390A5FF42200F826D6 /* tape_accessors.txt */; };
@@ -122,7 +121,6 @@
B6BF2AA40A6005E800D16624 /* libspectrum.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = libspectrum.h; sourceTree = SOURCE_ROOT; };
B6CBAD780A5F3C2900F826D6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = Info.plist; sourceTree = "<group>"; };
B6CBAD790A5F3C2900F826D6 /* spectrum.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = spectrum.framework; sourceTree = BUILT_PRODUCTS_DIR; };
- B6CBAD9F0A5F3E7C00F826D6 /* libbz2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libbz2.framework; path = ../bzip2/build/Deployment/libbz2.framework; sourceTree = SOURCE_ROOT; };
B6CBADB70A5F3F3400F826D6 /* gcrypt.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = gcrypt.framework; path = ../libgcrypt/build/Deployment/gcrypt.framework; sourceTree = SOURCE_ROOT; };
B6CBAE200A5FDDC700F826D6 /* snap_accessors.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = snap_accessors.txt; sourceTree = "<group>"; };
B6CBAE390A5FF42200F826D6 /* tape_accessors.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = tape_accessors.txt; sourceTree = "<group>"; };
@@ -133,7 +131,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- B6CBADA00A5F3E7C00F826D6 /* libbz2.framework in Frameworks */,
B6CBADB80A5F3F3400F826D6 /* gcrypt.framework in Frameworks */,
B66F97CF0C1D70B9003CB91F /* audiofile.framework in Frameworks */,
);
@@ -225,7 +222,6 @@
children = (
B66F97CE0C1D70B9003CB91F /* audiofile.framework */,
B6CBADB70A5F3F3400F826D6 /* gcrypt.framework */,
- B6CBAD9F0A5F3E7C00F826D6 /* libbz2.framework */,
);
name = "Linked Frameworks";
sourceTree = "<group>";
@@ -354,10 +350,7 @@
ppc,
);
DEBUG_INFORMATION_FORMAT = dwarf;
- MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
- MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
- SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk;
- SDKROOT_ppc = /Developer/SDKs/MacOSX10.3.9.sdk;
+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
};
name = Development;
};
@@ -370,10 +363,7 @@
);
DEBUG_INFORMATION_FORMAT = dwarf;
DEPLOYMENT_POSTPROCESSING = YES;
- MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
- MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
- SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk;
- SDKROOT_ppc = /Developer/SDKs/MacOSX10.3.9.sdk;
+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
};
name = Deployment;
};
@@ -385,10 +375,7 @@
ppc,
);
DEBUG_INFORMATION_FORMAT = dwarf;
- MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
- MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
- SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk;
- SDKROOT_ppc = /Developer/SDKs/MacOSX10.3.9.sdk;
+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
};
name = Default;
};
@@ -428,6 +415,7 @@
INSTALL_PATH = "@executable_path/../Frameworks";
OTHER_CFLAGS = "-all_load";
OTHER_LDFLAGS = (
+ "-lbz2",
"-lz",
"-seg1addr",
0x10000000,
@@ -478,6 +466,7 @@
INSTALL_PATH = "@executable_path/../Frameworks";
OTHER_CFLAGS = "-all_load";
OTHER_LDFLAGS = (
+ "-lbz2",
"-lz",
"-seg1addr",
0x10000000,
@@ -526,6 +515,7 @@
INSTALL_PATH = "@executable_path/../Frameworks";
OTHER_CFLAGS = "-all_load";
OTHER_LDFLAGS = (
+ "-lbz2",
"-lz",
"-seg1addr",
0x10000000,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2007-11-16 23:49:15
|
Revision: 461
http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=461&view=rev
Author: fredm
Date: 2007-11-16 15:49:20 -0800 (Fri, 16 Nov 2007)
Log Message:
-----------
Merge up to vendor r3254.
Modified Paths:
--------------
trunk/FuseImporter/libspectrum.h
trunk/audiofile/audiofile.xcodeproj/project.pbxproj
trunk/fuse/ChangeLog
trunk/fuse/Makefile.am
trunk/fuse/ay.c
trunk/fuse/compat/Makefile.am
trunk/fuse/compat/amiga/Makefile.am
trunk/fuse/compat/amiga/paths.c
trunk/fuse/compat/morphos/Makefile.am
trunk/fuse/compat/morphos/osname.c
trunk/fuse/compat/unix/Makefile.am
trunk/fuse/compat/unix/osname.c
trunk/fuse/compat/unix/paths.c
trunk/fuse/compat/win32/Makefile.am
trunk/fuse/compat/win32/osname.c
trunk/fuse/compat/win32/paths.c
trunk/fuse/compat.h
trunk/fuse/configure.in
trunk/fuse/debugger/Makefile.am
trunk/fuse/debugger/breakpoint.c
trunk/fuse/debugger/command.c
trunk/fuse/debugger/commandy.y
trunk/fuse/debugger/debugger.c
trunk/fuse/debugger/debugger_internals.h
trunk/fuse/debugger/disassemble.c
trunk/fuse/debugger/expression.c
trunk/fuse/disk/Makefile.am
trunk/fuse/disk/plusd.c
trunk/fuse/disk/plusd.h
trunk/fuse/divide.c
trunk/fuse/event.c
trunk/fuse/event.h
trunk/fuse/fuse.cpp
trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
trunk/fuse/fusepb/Makefile
trunk/fuse/fusepb/controllers/FuseController.h
trunk/fuse/fusepb/controllers/FuseController.m
trunk/fuse/fusepb/models/Emulator.h
trunk/fuse/fusepb/models/Emulator.m
trunk/fuse/fusepb/nibs/MainMenu.nib/classes.nib
trunk/fuse/fusepb/nibs/MainMenu.nib/info.nib
trunk/fuse/fusepb/nibs/MainMenu.nib/keyedobjects.nib
trunk/fuse/fusepb/nibs/Preferences.nib/classes.nib
trunk/fuse/fusepb/nibs/Preferences.nib/info.nib
trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib
trunk/fuse/fusepb/views/DisplayOpenGLView.h
trunk/fuse/fusepb/views/DisplayOpenGLView.m
trunk/fuse/hacking/ChangeLog
trunk/fuse/hacking/cvs-tags
trunk/fuse/if1.c
trunk/fuse/if2.c
trunk/fuse/keyboard.h
trunk/fuse/keysyms.pl
trunk/fuse/lib/Makefile.am
trunk/fuse/machine.c
trunk/fuse/machines/Makefile.am
trunk/fuse/machines/machines.h
trunk/fuse/machines/pentagon.c
trunk/fuse/machines/scorpion.c
trunk/fuse/machines/scorpion.h
trunk/fuse/machines/spec128.c
trunk/fuse/machines/spec128.h
trunk/fuse/machines/spec16.c
trunk/fuse/machines/spec48.c
trunk/fuse/machines/spec48.h
trunk/fuse/machines/spec_se.c
trunk/fuse/machines/specplus2.c
trunk/fuse/machines/specplus2a.c
trunk/fuse/machines/specplus3.c
trunk/fuse/machines/specplus3.h
trunk/fuse/machines/specplus3e.c
trunk/fuse/machines/tc2048.c
trunk/fuse/machines/tc2068.c
trunk/fuse/machines/tc2068.h
trunk/fuse/machines/ts2068.c
trunk/fuse/man/fuse.1
trunk/fuse/memory.h
trunk/fuse/menu.c
trunk/fuse/menu_data.dat
trunk/fuse/menu_data.pl
trunk/fuse/periph.c
trunk/fuse/periph.h
trunk/fuse/pokefinder/Makefile.am
trunk/fuse/pokefinder/pokefinder.c
trunk/fuse/printer.c
trunk/fuse/profile.c
trunk/fuse/profile.h
trunk/fuse/roms/Makefile.am
trunk/fuse/roms/plus3e-0.rom
trunk/fuse/roms/plus3e-1.rom
trunk/fuse/roms/plus3e-2.rom
trunk/fuse/rzx.c
trunk/fuse/settings.dat
trunk/fuse/settings.pl
trunk/fuse/snapshot.c
trunk/fuse/sound/Makefile.am
trunk/fuse/sound/alsasound.c
trunk/fuse/sound/aosound.c
trunk/fuse/sound/dxsound.c
trunk/fuse/sound/hpsound.c
trunk/fuse/sound/nullsound.c
trunk/fuse/sound/osssound.c
trunk/fuse/sound/sdlsound.c
trunk/fuse/sound/sfifo.c
trunk/fuse/sound/sunsound.c
trunk/fuse/sound.c
trunk/fuse/spectrum.h
trunk/fuse/tape.c
trunk/fuse/timer/Makefile.am
trunk/fuse/timer/timer.c
trunk/fuse/timer/unix.c
trunk/fuse/ui/Makefile.am
trunk/fuse/ui/cocoa/cocoaui.m
trunk/fuse/ui/fb/Makefile.am
trunk/fuse/ui/fb/fbdisplay.c
trunk/fuse/ui/fb/fbjoystick.c
trunk/fuse/ui/fb/fbkeyboard.c
trunk/fuse/ui/fb/fbmouse.c
trunk/fuse/ui/fb/fbui.c
trunk/fuse/ui/gtk/Makefile.am
trunk/fuse/ui/gtk/binary.c
trunk/fuse/ui/gtk/browse.c
trunk/fuse/ui/gtk/confirm.c
trunk/fuse/ui/gtk/debugger.c
trunk/fuse/ui/gtk/fileselector.c
trunk/fuse/ui/gtk/gtkdisplay.c
trunk/fuse/ui/gtk/gtkjoystick.c
trunk/fuse/ui/gtk/gtkkeyboard.c
trunk/fuse/ui/gtk/gtkmouse.c
trunk/fuse/ui/gtk/gtkui.c
trunk/fuse/ui/gtk/memory.c
trunk/fuse/ui/gtk/options-header.pl
trunk/fuse/ui/gtk/options.pl
trunk/fuse/ui/gtk/picture.c
trunk/fuse/ui/gtk/pokefinder.c
trunk/fuse/ui/gtk/rollback.c
trunk/fuse/ui/gtk/roms.c
trunk/fuse/ui/gtk/statusbar.c
trunk/fuse/ui/options.dat
trunk/fuse/ui/scaler/Makefile.am
trunk/fuse/ui/scaler/scaler.c
trunk/fuse/ui/scaler/scalers.cpp
trunk/fuse/ui/sdl/Makefile.am
trunk/fuse/ui/sdl/sdldisplay.c
trunk/fuse/ui/sdl/sdljoystick.c
trunk/fuse/ui/sdl/sdlkeyboard.c
trunk/fuse/ui/sdl/sdlui.c
trunk/fuse/ui/svga/Makefile.am
trunk/fuse/ui/svga/svgadisplay.c
trunk/fuse/ui/svga/svgajoystick.c
trunk/fuse/ui/svga/svgakeyboard.c
trunk/fuse/ui/svga/svgaui.c
trunk/fuse/ui/ui.h
trunk/fuse/ui/uijoystick.c
trunk/fuse/ui/win32/Makefile.am
trunk/fuse/ui/win32/debugger.c
trunk/fuse/ui/win32/error.c
trunk/fuse/ui/win32/menu_data.c
trunk/fuse/ui/win32/menu_data.h
trunk/fuse/ui/win32/menu_data.rc
trunk/fuse/ui/win32/pokefinder.c
trunk/fuse/ui/win32/statusbar.c
trunk/fuse/ui/win32/win32display.c
trunk/fuse/ui/win32/win32display.h
trunk/fuse/ui/win32/win32internals.h
trunk/fuse/ui/win32/win32keyboard.c
trunk/fuse/ui/win32/win32ui.c
trunk/fuse/ui/xlib/Makefile.am
trunk/fuse/ui/xlib/xdisplay.c
trunk/fuse/ui/xlib/xerror.c
trunk/fuse/ui/xlib/xjoystick.c
trunk/fuse/ui/xlib/xkeyboard.c
trunk/fuse/ui/xlib/xui.c
trunk/fuse/ui.c
trunk/fuse/utils.c
trunk/fuse/utils.h
trunk/fuse/widget/Makefile.am
trunk/fuse/widget/browse.c
trunk/fuse/widget/debugger.c
trunk/fuse/widget/error.c
trunk/fuse/widget/filesel.c
trunk/fuse/widget/memory.c
trunk/fuse/widget/menu.c
trunk/fuse/widget/options.pl
trunk/fuse/widget/picture.c
trunk/fuse/widget/pokefinder.c
trunk/fuse/widget/query.c
trunk/fuse/widget/roms.c
trunk/fuse/widget/select.c
trunk/fuse/widget/text.c
trunk/fuse/widget/widget.c
trunk/fuse/widget/widget.h
trunk/fuse/widget/widget_internals.h
trunk/fuse/z80/Makefile.am
trunk/fuse/z80/coretest.c
trunk/fuse/z80/z80.c
trunk/fuse/z80/z80.pl
trunk/fuse/z80/z80_ops.c
trunk/libspectrum/libspectrum/ChangeLog
trunk/libspectrum/libspectrum/Makefile.am
trunk/libspectrum/libspectrum/configure.in
trunk/libspectrum/libspectrum/csw.c
trunk/libspectrum/libspectrum/doc/libspectrum.txt
trunk/libspectrum/libspectrum/generate.pl.in
trunk/libspectrum/libspectrum/hacking/ChangeLog
trunk/libspectrum/libspectrum/libspectrum.c
trunk/libspectrum/libspectrum/libspectrum.h.in
trunk/libspectrum/libspectrum/plusd.c
trunk/libspectrum/libspectrum/rzx.c
trunk/libspectrum/libspectrum/sna.c
trunk/libspectrum/libspectrum/szx.c
trunk/libspectrum/libspectrum/tape.c
trunk/libspectrum/libspectrum/test/Makefile.am
trunk/libspectrum/libspectrum/test/invalid-warajevo-blockoffset.tap
trunk/libspectrum/libspectrum/test/test.c
trunk/libspectrum/libspectrum/timings.c
trunk/libspectrum/libspectrum/z80.c
trunk/libspectrum/libspectrum.h
Added Paths:
-----------
trunk/fuse/bitmap.h
trunk/fuse/disk/beta.c
trunk/fuse/disk/beta.h
trunk/fuse/disk/crc.c
trunk/fuse/disk/crc.h
trunk/fuse/disk/disk.c
trunk/fuse/disk/disk.h
trunk/fuse/disk/fdd.c
trunk/fuse/disk/fdd.h
trunk/fuse/disk/wd_fdc.c
trunk/fuse/disk/wd_fdc.h
trunk/fuse/machines/pentagon1024.c
trunk/fuse/machines/pentagon512.c
trunk/fuse/roms/gluck.rom
trunk/fuse/ui/win32/options-header.pl
trunk/fuse/ui/win32/options-resource.pl
trunk/fuse/ui/win32/options.pl
trunk/fuse/z80/z80_checks.h
trunk/libspectrum/libspectrum/test/complete-tzx.pl
trunk/libspectrum/libspectrum/test/edges.c
trunk/libspectrum/libspectrum/test/jump.tzx
trunk/libspectrum/libspectrum/test/loop2.tzx
trunk/libspectrum/libspectrum/test/test.h
trunk/libspectrum/libspectrum/test/test15.c
Removed Paths:
-------------
trunk/fuse/disk/wd1770.c
trunk/fuse/disk/wd1770.h
trunk/fuse/trdos.c
trunk/fuse/trdos.h
trunk/fuse/ui/ggi/
Modified: trunk/FuseImporter/libspectrum.h
===================================================================
--- trunk/FuseImporter/libspectrum.h 2007-11-09 23:10:38 UTC (rev 460)
+++ trunk/FuseImporter/libspectrum.h 2007-11-16 23:49:20 UTC (rev 461)
@@ -1,7 +1,7 @@
/* libspectrum.h: the library for dealing with ZX Spectrum emulator files
Copyright (c) 2001-2007 Philip Kendall, Darren Salt, Fredrick Meunier
- $Id: libspectrum.h.in 3008 2007-06-17 18:54:58Z zubzero $
+ $Id: libspectrum.h.in 3237 2007-10-24 18:24:07Z 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
@@ -358,6 +358,9 @@
LIBSPECTRUM_MACHINE_TS2068,
+ LIBSPECTRUM_MACHINE_PENT512,
+ LIBSPECTRUM_MACHINE_PENT1024,
+
} libspectrum_machine;
const char* WIN32_DLL libspectrum_machine_name( libspectrum_machine type );
@@ -1064,6 +1067,10 @@
} libspectrum_rzx_block_id;
+void
+libspectrum_rzx_insert_snap( libspectrum_rzx *rzx, libspectrum_snap *snap,
+ int where );
+
libspectrum_rzx_iterator WIN32_DLL
libspectrum_rzx_iterator_begin( libspectrum_rzx *rzx );
libspectrum_rzx_iterator WIN32_DLL
@@ -1074,6 +1081,12 @@
size_t WIN32_DLL
libspectrum_rzx_iterator_get_frames( libspectrum_rzx_iterator it );
+void WIN32_DLL
+libspectrum_rzx_iterator_delete( libspectrum_rzx *rzx,
+ libspectrum_rzx_iterator it );
+libspectrum_snap* WIN32_DLL
+libspectrum_rzx_iterator_get_snap( libspectrum_rzx_iterator it );
+
/*
* Microdrive image handling routines
*/
Modified: trunk/audiofile/audiofile.xcodeproj/project.pbxproj
===================================================================
--- trunk/audiofile/audiofile.xcodeproj/project.pbxproj 2007-11-09 23:10:38 UTC (rev 460)
+++ trunk/audiofile/audiofile.xcodeproj/project.pbxproj 2007-11-16 23:49:20 UTC (rev 461)
@@ -397,6 +397,7 @@
DEBUG_INFORMATION_FORMAT = dwarf;
DEPLOYMENT_POSTPROCESSING = NO;
FRAMEWORK_VERSION = 0.2.6;
+ MACOSX_DEPLOYMENT_TARGET = 10.4;
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
};
name = Development;
@@ -411,6 +412,7 @@
DEBUG_INFORMATION_FORMAT = dwarf;
DEPLOYMENT_POSTPROCESSING = YES;
FRAMEWORK_VERSION = 0.2.6;
+ MACOSX_DEPLOYMENT_TARGET = 10.4;
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
};
name = Deployment;
@@ -425,6 +427,7 @@
DEBUG_INFORMATION_FORMAT = dwarf;
DEPLOYMENT_POSTPROCESSING = NO;
FRAMEWORK_VERSION = 0.2.6;
+ MACOSX_DEPLOYMENT_TARGET = 10.4;
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
};
name = Default;
Modified: trunk/fuse/ChangeLog
===================================================================
--- trunk/fuse/ChangeLog 2007-11-09 23:10:38 UTC (rev 460)
+++ trunk/fuse/ChangeLog 2007-11-16 23:49:20 UTC (rev 461)
@@ -4,15 +4,21 @@
* New features:
* Add +D disk interface support (Stuart Brady).
+ * New floppy disk controller emulation for +D and Beta disk
+ interface emulation (Gergely Szasz and Stuart Brady).
+ * Add Pentagon 512 and Pentagon 1024 emulation (Q-Master).
* Add Hi-Fi beeper for improved reproduction of multi-channel beeper
tunes (e.g. Fairlight 2, Wham - the Music Box) (Fredrick Meunier).
- * Add support for saving tape images without using tape traps (Fredrick
- Meunier).
+ * Add support for saving tape images without using tape traps
+ (Fredrick Meunier).
* Add support for loading from WAV tape images (Fredrick Meunier).
* Add support for saving CSW tape images and TZX direct recording
blocks (Fredrick Meunier).
- * Allow distinction between "soft" resets (activing the reset line on
- the Z80) and "hard" resets (pulling the power) (Philip Kendall).
+ * Allow distinction between "soft" resets (activating the reset line
+ on the Z80) and "hard" resets (pulling the power) (Philip Kendall).
+ * New ALSA sound driver (Gergely Szasz).
+ * AmigaOS support (Chris Young).
+ * MorphOS support (Q-Master).
* Emulation core improvements:
* Fix contention for LD?R, CP?R and IN?R (Philip Kendall; thanks,
@@ -23,6 +29,15 @@
* Separate out contention when MREQ isn't active, as the +2A/+3 ULA
applies contention only when MREQ is active (Philip Kendall).
+ * Miscellaneous:
+ * Removed the GTK 1.x UI (please note that GTK 2.x will remain
+ supported for the foreseeable future) (Philip Kendall).
+ * Enable Fuse to build in directories other than the source
+ directory itself (Philip Kendall).
+ * Updated X11 UI (Gergely Szasz).
+ * Updated Win32 UI (Stuart Brady).
+ * Man page fixes (Stuart Brady).
+
* Various other minor bugfixes.
2007-05-11 Philip Kendall <phi...@sh...>
@@ -486,7 +501,7 @@
* Changable emulation speed (Philip Kendall).
- * Change to lib765 0.3.0 for Mac OS X compatability
+ * Change to lib765 0.3.0 for Mac OS X compatibility
(Frederick Meunier).
* Reset the Timex's SCLD when loading snapshot (Philip Kendall,
@@ -602,8 +617,8 @@
* Add contention of memory and io ports. Should make multicolour
effects better (Philip Kendall).
- * Emulation of reading from unattached ports (eg #FF). Makes some
- more games (eg Sidewize) work (Philip Kendall).
+ * Emulation of reading from unattached ports (e.g. #FF). Makes some
+ more games (e.g. Sidewize) work (Philip Kendall).
* Add a keyboard picture -- see the Help menu (Philip Kendall,
Russell Marks).
@@ -663,12 +678,12 @@
* Various improvements to the widget dialog boxes: cursor keys,
Page Up, Page Down, Home and End all do what you would expect,
remove the use of `scandir' function to improve inter-Unix
- compatability, append `/' to directories to make them more
+ compatibility, append `/' to directories to make them more
obvious, stop the hangs if you tried to start a widget whilst
one was active. (Philip Kendall, Russell Marks).
* .z80 snapshots: deal with the case of the end marker being
- preceeded by 0x00 or 0x00 0xed (Philip Kendall).
+ preceded by 0x00 or 0x00 0xed (Philip Kendall).
* Lots of sound improvements (Russell Marks).
@@ -834,4 +849,4 @@
* Version 0.1.0 released.
-$Id: ChangeLog 3048 2007-07-07 13:26:48Z fredm $
+$Id: ChangeLog 3253 2007-10-26 02:02:17Z zubzero $
Modified: trunk/fuse/Makefile.am
===================================================================
--- trunk/fuse/Makefile.am 2007-11-09 23:10:38 UTC (rev 460)
+++ trunk/fuse/Makefile.am 2007-11-16 23:49:20 UTC (rev 461)
@@ -1,7 +1,7 @@
-## Process this file with automake to produce Makefile.in
+# Process this file with automake to produce Makefile.in
## Copyright (c) 1999-2004 Philip Kendall
-## $Id: Makefile.am 3091 2007-08-04 16:44:45Z pak21 $
+## $Id: Makefile.am 3218 2007-10-21 23:25:23Z zubzero $
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@
SUBDIRS = compat \
debugger \
- @DISK@ \
+ disk \
hacking \
lib \
machines \
@@ -52,6 +52,7 @@
pokefinder \
roms \
sound \
+ timer \
ui \
widget \
z80
@@ -88,7 +89,6 @@
sound.c \
spectrum.c \
tape.c \
- trdos.c \
ui.c \
uidisplay.c \
ula.c \
@@ -101,7 +101,7 @@
fuse_LDADD = debugger/libdebugger.a \
@UI_LIBS@ \
-@DISK_LIBS@ \
+disk/libdisk.a \
machines/libmachines.a \
pokefinder/libpokefinder.a \
sound/libsound.a \
@@ -118,11 +118,11 @@
@X_LIBS@ \
@XML_LIBS@ \
compat/libcompat.a \
-compat/unix/libcompatos.a \
+compat/@COMPAT_OSNAME@/libcompatos.a \
@WINDRES_OBJ@
fuse_DEPENDENCIES = @UI_LIBS@ \
- @DISK_LIBS@ \
+ disk/libdisk.a \
debugger/libdebugger.a \
machines/libmachines.a \
sound/libsound.a \
@@ -132,18 +132,19 @@
BUILT_SOURCES = settings.c settings.h
windres.o: windres.rc winfuse.ico
- @WINDRES@ windres.rc windres.o
+ @WINDRES@ -I$(srcdir) -I. $(srcdir)/windres.rc windres.o
settings.c: settings.pl settings.dat
- @PERL@ settings.pl settings.dat > settings.c
+ @PERL@ -I$(srcdir)/perl $(srcdir)/settings.pl $(srcdir)/settings.dat > $@.tmp && mv $@.tmp $@
settings.h: settings-header.pl settings.dat
- @PERL@ settings-header.pl settings.dat > settings.h
+ @PERL@ -I$(srcdir)/perl $(srcdir)/settings-header.pl $(srcdir)/settings.dat > $@.tmp && mv $@.tmp $@
INCLUDES = @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@ @DSK_CFLAGS@\
@XML_CFLAGS@ @SAMPLERATE_CFLAGS@ -DFUSEDATADIR="\"${pkgdatadir}\""
noinst_HEADERS = ay.h \
+ bitmap.h \
compat.h \
dck.h \
display.h \
@@ -172,7 +173,6 @@
sound.h \
spectrum.h \
tape.h \
- trdos.h \
utils.h \
joystick.h \
printer.h \
@@ -192,3 +192,6 @@
settings.pl \
settings-header.pl \
settings.dat
+
+CLEANFILES = settings.c \
+ settings.h
Modified: trunk/fuse/ay.c
===================================================================
--- trunk/fuse/ay.c 2007-11-09 23:10:38 UTC (rev 460)
+++ trunk/fuse/ay.c 2007-11-16 23:49:20 UTC (rev 461)
@@ -1,7 +1,7 @@
/* ay.c: AY-8-3912 routines
Copyright (c) 1999-2004 Philip Kendall
- $Id: ay.c 2993 2007-06-17 13:54:49Z pak21 $
+ $Id: ay.c 3213 2007-10-21 16:37:52Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -41,13 +41,14 @@
};
+static void ay_reset( int hard_reset );
static void ay_from_snapshot( libspectrum_snap *snap );
static void ay_to_snapshot( libspectrum_snap *snap );
static module_info_t ay_module_info = {
+ ay_reset,
NULL,
- NULL,
ay_from_snapshot,
ay_to_snapshot,
@@ -61,6 +62,15 @@
return 0;
}
+static void
+ay_reset( int hard_reset )
+{
+ ayinfo *ay = &machine_current->ay;
+
+ ay->current_register = 0;
+ memset( ay->registers, 0, sizeof( ay->registers ) );
+}
+
/* What happens when the AY register port (traditionally 0xfffd on the 128K
machines) is read from */
libspectrum_byte
Copied: trunk/fuse/bitmap.h (from rev 458, vendor/fuse-emulator/current/fuse/bitmap.h)
===================================================================
--- trunk/fuse/bitmap.h (rev 0)
+++ trunk/fuse/bitmap.h 2007-11-16 23:49:20 UTC (rev 461)
@@ -0,0 +1,49 @@
+/* bitmap.h: Bitmap routines
+ Copyright (c) 2007 Stuart Brady
+
+ $Id: bitmap.h 3218 2007-10-21 23:25:23Z zubzero $
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+ Author contact information:
+
+ Philip: phi...@sh...
+
+ Stuart: sd...@nt...
+
+*/
+
+#ifndef FUSE_BITMAP_H
+#define FUSE_BITMAP_H
+
+inline static void
+bitmap_set( libspectrum_byte *b, const size_t n )
+{
+ b[ n / 8 ] |= ( 1 << ( n % 8 ) );
+}
+
+inline static void
+bitmap_reset( libspectrum_byte *b, const size_t n )
+{
+ b[ n / 8 ] &= ~( 1 << ( n % 8 ) );
+}
+
+inline static int
+bitmap_test( const libspectrum_byte *b, const size_t n )
+{
+ return b[ n / 8 ] & ( 1 << ( n % 8 ) );
+}
+
+#endif /* #ifndef FUSE_BITMAP_H */
Modified: trunk/fuse/compat/Makefile.am
===================================================================
--- trunk/fuse/compat/Makefile.am 2007-11-09 23:10:38 UTC (rev 460)
+++ trunk/fuse/compat/Makefile.am 2007-11-16 23:49:20 UTC (rev 461)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2003-2007 Philip Kendall
-## $Id: Makefile.am 3091 2007-08-04 16:44:45Z pak21 $
+## $Id: Makefile.am 3115 2007-08-19 02:49:14Z fredm $
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -23,6 +23,8 @@
AUTOMAKE_OPTIONS = foreign
+AM_CPPFLAGS = -I$(srcdir)/..
+
SUBDIRS = @COMPAT_OSNAME@
DIST_SUBDIRS = amiga \
Modified: trunk/fuse/compat/amiga/Makefile.am
===================================================================
--- trunk/fuse/compat/amiga/Makefile.am 2007-11-09 23:10:38 UTC (rev 460)
+++ trunk/fuse/compat/amiga/Makefile.am 2007-11-16 23:49:20 UTC (rev 461)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2007 Philip Kendall
-## $Id: Makefile.am 3092 2007-08-04 19:20:58Z pak21 $
+## $Id: Makefile.am 3115 2007-08-19 02:49:14Z fredm $
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -23,6 +23,8 @@
AUTOMAKE_OPTIONS = foreign
+AM_CPPFLAGS = -I$(srcdir)/../..
+
noinst_LIBRARIES = libcompatos.a
libcompatos_a_SOURCES = ../unix/osname.c \
Modified: trunk/fuse/compat/amiga/paths.c
===================================================================
--- trunk/fuse/compat/amiga/paths.c 2007-11-09 23:10:38 UTC (rev 460)
+++ trunk/fuse/compat/amiga/paths.c 2007-11-16 23:49:20 UTC (rev 461)
@@ -1,7 +1,7 @@
-/* paths.c: Path-related compatability routines
+/* paths.c: Path-related compatibility routines
Copyright (c) 1999-2007 Philip Kendall
- $Id: paths.c 3092 2007-08-04 19:20:58Z pak21 $
+ $Id: paths.c 3253 2007-10-26 02:02:17Z zubzero $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -38,3 +38,10 @@
{
return "PROGDIR:settings";
}
+
+int
+compat_is_absolute_path( const char *path )
+{
+ /* Is this correct? */
+ return path[0] == '/';
+}
Modified: trunk/fuse/compat/morphos/Makefile.am
===================================================================
--- trunk/fuse/compat/morphos/Makefile.am 2007-11-09 23:10:38 UTC (rev 460)
+++ trunk/fuse/compat/morphos/Makefile.am 2007-11-16 23:49:20 UTC (rev 461)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2007 Philip Kendall
-## $Id: Makefile.am 3092 2007-08-04 19:20:58Z pak21 $
+## $Id: Makefile.am 3115 2007-08-19 02:49:14Z fredm $
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -23,6 +23,8 @@
AUTOMAKE_OPTIONS = foreign
+AM_CPPFLAGS = -I$(srcdir)/../..
+
noinst_LIBRARIES = libcompatos.a
libcompatos_a_SOURCES = osname.c \
Modified: trunk/fuse/compat/morphos/osname.c
===================================================================
--- trunk/fuse/compat/morphos/osname.c 2007-11-09 23:10:38 UTC (rev 460)
+++ trunk/fuse/compat/morphos/osname.c 2007-11-16 23:49:20 UTC (rev 461)
@@ -1,7 +1,7 @@
/* osname.c: Get a representation of the OS we're running on
Copyright (c) 1999-2007 Philip Kendall
- $Id: osname.c 3091 2007-08-04 16:44:45Z pak21 $
+ $Id: osname.c 3139 2007-09-03 10:27:57Z fredm $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -31,4 +31,6 @@
int compat_osname( char *buffer, size_t length )
{
snprintf( buffer, length, "%s %s %s", "MorphOS", "Pegasos", "1.4.4" );
+
+ return 0;
}
Modified: trunk/fuse/compat/unix/Makefile.am
===================================================================
--- trunk/fuse/compat/unix/Makefile.am 2007-11-09 23:10:38 UTC (rev 460)
+++ trunk/fuse/compat/unix/Makefile.am 2007-11-16 23:49:20 UTC (rev 461)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2007 Philip Kendall
-## $Id: Makefile.am 3092 2007-08-04 19:20:58Z pak21 $
+## $Id: Makefile.am 3115 2007-08-19 02:49:14Z fredm $
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -23,6 +23,8 @@
AUTOMAKE_OPTIONS = foreign
+AM_CPPFLAGS = -I$(srcdir)/../..
+
noinst_LIBRARIES = libcompatos.a
libcompatos_a_SOURCES = osname.c \
Modified: trunk/fuse/compat/unix/osname.c
===================================================================
--- trunk/fuse/compat/unix/osname.c 2007-11-09 23:10:38 UTC (rev 460)
+++ trunk/fuse/compat/unix/osname.c 2007-11-16 23:49:20 UTC (rev 461)
@@ -1,7 +1,7 @@
/* osname.c: Get a representation of the OS we're running on
Copyright (c) 1999-2007 Philip Kendall
- $Id: osname.c 3094 2007-08-05 14:20:15Z fredm $
+ $Id: osname.c 3115 2007-08-19 02:49:14Z fredm $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/fuse/compat/unix/paths.c
===================================================================
--- trunk/fuse/compat/unix/paths.c 2007-11-09 23:10:38 UTC (rev 460)
+++ trunk/fuse/compat/unix/paths.c 2007-11-16 23:49:20 UTC (rev 461)
@@ -1,7 +1,7 @@
-/* paths.c: Path-related compatability routines
+/* paths.c: Path-related compatibility routines
Copyright (c) 1999-2007 Philip Kendall
- $Id: paths.c 3092 2007-08-04 19:20:58Z pak21 $
+ $Id: paths.c 3253 2007-10-26 02:02:17Z zubzero $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -46,3 +46,9 @@
dir = getenv( "HOME" ); if( dir ) return dir;
return ".";
}
+
+int
+compat_is_absolute_path( const char *path )
+{
+ return path[0] == '/';
+}
Modified: trunk/fuse/compat/win32/Makefile.am
===================================================================
--- trunk/fuse/compat/win32/Makefile.am 2007-11-09 23:10:38 UTC (rev 460)
+++ trunk/fuse/compat/win32/Makefile.am 2007-11-16 23:49:20 UTC (rev 461)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2007 Philip Kendall
-## $Id: Makefile.am 3092 2007-08-04 19:20:58Z pak21 $
+## $Id: Makefile.am 3115 2007-08-19 02:49:14Z fredm $
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -23,6 +23,8 @@
AUTOMAKE_OPTIONS = foreign
+AM_CPPFLAGS = -I$(srcdir)/../..
+
noinst_LIBRARIES = libcompatos.a
libcompatos_a_SOURCES = osname.c \
Modified: trunk/fuse/compat/win32/osname.c
===================================================================
--- trunk/fuse/compat/win32/osname.c 2007-11-09 23:10:38 UTC (rev 460)
+++ trunk/fuse/compat/win32/osname.c 2007-11-16 23:49:20 UTC (rev 461)
@@ -1,7 +1,7 @@
/* osname.c: Get a representation of the OS we're running on
Copyright (c) 1999-2007 Philip Kendall
- $Id: osname.c 3091 2007-08-04 16:44:45Z pak21 $
+ $Id: osname.c 3163 2007-09-06 21:41:45Z zubzero $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -27,14 +27,17 @@
#include <windows.h>
+#include "ui/ui.h"
+
int compat_osname( char *osname, size_t length )
{
- OSVERSIONINFO buf;
- char *windows_name;
+ OSVERSIONINFO buf;
+ char *windows_name;
+ int error;
buf.dwOSVersionInfoSize = sizeof( buf );
- sys_error = GetVersionEx( &buf );
- if( sys_error == 0 ) {
+ error = GetVersionEx( &buf );
+ if( error == 0 ) {
ui_error( UI_ERROR_ERROR, "error getting system information." );
return 1;
}
@@ -46,9 +49,7 @@
default: windows_name = "unknown"; break;
}
- snprintf( osname, length,
- "gcrypt: %s\nlibspectrum: %s\nuname: Windows %s %d.%d build %d %s",
- gcrypt_version, libspectrum_version(),
+ snprintf( osname, length, "Windows %s %ld.%ld build %ld %s",
windows_name, buf.dwMajorVersion, buf.dwMinorVersion,
buf.dwBuildNumber, buf.szCSDVersion );
Modified: trunk/fuse/compat/win32/paths.c
===================================================================
--- trunk/fuse/compat/win32/paths.c 2007-11-09 23:10:38 UTC (rev 460)
+++ trunk/fuse/compat/win32/paths.c 2007-11-16 23:49:20 UTC (rev 461)
@@ -1,7 +1,7 @@
-/* paths.c: Path-related compatability routines
+/* paths.c: Path-related compatibility routines
Copyright (c) 1999-2007 Philip Kendall
- $Id: paths.c 3092 2007-08-04 19:20:58Z pak21 $
+ $Id: paths.c 3253 2007-10-26 02:02:17Z zubzero $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -50,3 +50,11 @@
dir = getenv( "WINDIR" ); if( dir ) return dir;
return ".";
}
+
+int
+compat_is_absolute_path( const char *path )
+{
+ if( path[0] == '\\' ) return 1;
+ if( path[0] && path[1] == ':' ) return 1;
+ return 0;
+}
Modified: trunk/fuse/compat.h
===================================================================
--- trunk/fuse/compat.h 2007-11-09 23:10:38 UTC (rev 460)
+++ trunk/fuse/compat.h 2007-11-16 23:49:20 UTC (rev 461)
@@ -1,7 +1,7 @@
/* compat.h: various compatibility bits
Copyright (c) 2003 Philip Kendall
- $Id: compat.h 3092 2007-08-04 19:20...
[truncated message content] |
|
From: <fr...@us...> - 2007-12-21 00:16:44
|
Revision: 466
http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=466&view=rev
Author: fredm
Date: 2007-12-20 16:16:49 -0800 (Thu, 20 Dec 2007)
Log Message:
-----------
Add QuickLook generator for Speccy-related files, thanks to James Weatherley for
JWSpectrumScreen that makes it all possible.
Modified Paths:
--------------
trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj
trunk/README
trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
Added Paths:
-----------
trunk/FuseGenerator/
trunk/FuseGenerator/English.lproj/
trunk/FuseGenerator/English.lproj/InfoPlist.strings
trunk/FuseGenerator/FuseGenerator.xcodeproj/
trunk/FuseGenerator/FuseGenerator.xcodeproj/project.pbxproj
trunk/FuseGenerator/GeneratePreviewForURL.m
trunk/FuseGenerator/GenerateThumbnailForURL.m
trunk/FuseGenerator/Info.plist
trunk/FuseGenerator/JWSpectrumScreen/
trunk/FuseGenerator/JWSpectrumScreen/AttributeBlock.h
trunk/FuseGenerator/JWSpectrumScreen/AttributeBlock.m
trunk/FuseGenerator/JWSpectrumScreen/AttributeBlockIterator.h
trunk/FuseGenerator/JWSpectrumScreen/AttributeBlockIterator.m
trunk/FuseGenerator/JWSpectrumScreen/AttributeBlockTimex.h
trunk/FuseGenerator/JWSpectrumScreen/AttributeBlockTimex.m
trunk/FuseGenerator/JWSpectrumScreen/AttributeBlockTimexHiRes.h
trunk/FuseGenerator/JWSpectrumScreen/AttributeBlockTimexHiRes.m
trunk/FuseGenerator/JWSpectrumScreen/AttributeManager.c
trunk/FuseGenerator/JWSpectrumScreen/AttributeManager.h
trunk/FuseGenerator/JWSpectrumScreen/ColourMacros.c
trunk/FuseGenerator/JWSpectrumScreen/ColourMacros.h
trunk/FuseGenerator/JWSpectrumScreen/English.lproj/
trunk/FuseGenerator/JWSpectrumScreen/English.lproj/InfoPlist.strings
trunk/FuseGenerator/JWSpectrumScreen/Info.plist
trunk/FuseGenerator/JWSpectrumScreen/JWSpectrumScreen.h
trunk/FuseGenerator/JWSpectrumScreen/JWSpectrumScreen.m
trunk/FuseGenerator/JWSpectrumScreen/JWSpectrumScreen.xcodeproj/
trunk/FuseGenerator/JWSpectrumScreen/JWSpectrumScreen.xcodeproj/project.pbxproj
trunk/FuseGenerator/JWSpectrumScreen/JWSpectrumScreenConstants.h
trunk/FuseGenerator/JWSpectrumScreen/JWSpectrumScreen_Prefix.pch
trunk/FuseGenerator/JWSpectrumScreen/PixelData.h
trunk/FuseGenerator/JWSpectrumScreen/README
trunk/FuseGenerator/LibspectrumSCRExtractor.h
trunk/FuseGenerator/LibspectrumSCRExtractor.m
trunk/FuseGenerator/config.h
trunk/FuseGenerator/generate.pl
trunk/FuseGenerator/libspectrum
trunk/FuseGenerator/libspectrum.h
trunk/FuseGenerator/main.c
Property changes on: trunk/FuseGenerator
___________________________________________________________________
Name: svn:ignore
+ build
Added: trunk/FuseGenerator/English.lproj/InfoPlist.strings
===================================================================
(Binary files differ)
Property changes on: trunk/FuseGenerator/English.lproj/InfoPlist.strings
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: trunk/FuseGenerator/FuseGenerator.xcodeproj
___________________________________________________________________
Name: svn:ignore
+ *.pbxuser
*.mode1v3
Added: trunk/FuseGenerator/FuseGenerator.xcodeproj/project.pbxproj
===================================================================
--- trunk/FuseGenerator/FuseGenerator.xcodeproj/project.pbxproj (rev 0)
+++ trunk/FuseGenerator/FuseGenerator.xcodeproj/project.pbxproj 2007-12-21 00:16:49 UTC (rev 466)
@@ -0,0 +1,553 @@
+// !$*UTF8*$!
+{
+ archiveVersion = 1;
+ classes = {
+ };
+ objectVersion = 44;
+ objects = {
+
+/* Begin PBXBuildFile section */
+ 2C05A19C06CAA52B00D84F6F /* GeneratePreviewForURL.m in Sources */ = {isa = PBXBuildFile; fileRef = 2C05A19B06CAA52B00D84F6F /* GeneratePreviewForURL.m */; };
+ 61E3BCFB0870B4F2002186A0 /* GenerateThumbnailForURL.m in Sources */ = {isa = PBXBuildFile; fileRef = 61E3BCFA0870B4F2002186A0 /* GenerateThumbnailForURL.m */; };
+ 8D576312048677EA00EA77CD /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 08FB77B6FE84183AC02AAC07 /* main.c */; settings = {ATTRIBUTES = (); }; };
+ 8D576314048677EA00EA77CD /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0AA1909FFE8422F4C02AAC07 /* CoreFoundation.framework */; };
+ 8D5B49A804867FD3000E48DA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 8D5B49A704867FD3000E48DA /* InfoPlist.strings */; };
+ B63944AB0D18B0430059DAA5 /* LibspectrumSCRExtractor.m in Sources */ = {isa = PBXBuildFile; fileRef = B63944A90D18B0430059DAA5 /* LibspectrumSCRExtractor.m */; };
+ B63944FB0D18C7C30059DAA5 /* tape_accessors.txt in Sources */ = {isa = PBXBuildFile; fileRef = B6D30B2E0D162B910036CC54 /* tape_accessors.txt */; };
+ B63944FC0D18C7C30059DAA5 /* snap_accessors.txt in Sources */ = {isa = PBXBuildFile; fileRef = B6D30B2C0D162B810036CC54 /* snap_accessors.txt */; };
+ B63945090D18CA120059DAA5 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B63945080D18CA120059DAA5 /* Cocoa.framework */; };
+ B6D30AE60D1627ED0036CC54 /* bzip2.c in Sources */ = {isa = PBXBuildFile; fileRef = B6D30AE50D1627ED0036CC54 /* bzip2.c */; };
+ B6D30AEC0D16280E0036CC54 /* creator.c in Sources */ = {isa = PBXBuildFile; fileRef = B6D30AE70D16280E0036CC54 /* creator.c */; };
+ B6D30AED0D16280E0036CC54 /* crypto.c in Sources */ = {isa = PBXBuildFile; fileRef = B6D30AE80D16280E0036CC54 /* crypto.c */; };
+ B6D30AEE0D16280E0036CC54 /* csw.c in Sources */ = {isa = PBXBuildFile; fileRef = B6D30AE90D16280E0036CC54 /* csw.c */; };
+ B6D30AEF0D16280E0036CC54 /* dck.c in Sources */ = {isa = PBXBuildFile; fileRef = B6D30AEA0D16280E0036CC54 /* dck.c */; };
+ B6D30AF40D1628470036CC54 /* ide.c in Sources */ = {isa = PBXBuildFile; fileRef = B6D30AF10D1628470036CC54 /* ide.c */; };
+ B6D30AF60D1628470036CC54 /* libspectrum.c in Sources */ = {isa = PBXBuildFile; fileRef = B6D30AF30D1628470036CC54 /* libspectrum.c */; };
+ B6D30AF80D16288A0036CC54 /* microdrive.c in Sources */ = {isa = PBXBuildFile; fileRef = B6D30AF70D16288A0036CC54 /* microdrive.c */; };
+ B6D30AFA0D1628A10036CC54 /* plusd.c in Sources */ = {isa = PBXBuildFile; fileRef = B6D30AF90D1628A10036CC54 /* plusd.c */; };
+ B6D30AFD0D1628DB0036CC54 /* rzx.c in Sources */ = {isa = PBXBuildFile; fileRef = B6D30AFB0D1628DB0036CC54 /* rzx.c */; };
+ B6D30AFE0D1628DB0036CC54 /* sna.c in Sources */ = {isa = PBXBuildFile; fileRef = B6D30AFC0D1628DB0036CC54 /* sna.c */; };
+ B6D30B060D1628F20036CC54 /* snapshot.c in Sources */ = {isa = PBXBuildFile; fileRef = B6D30AFF0D1628F20036CC54 /* snapshot.c */; };
+ B6D30B070D1628F20036CC54 /* snp.c in Sources */ = {isa = PBXBuildFile; fileRef = B6D30B000D1628F20036CC54 /* snp.c */; };
+ B6D30B080D1628F20036CC54 /* sp.c in Sources */ = {isa = PBXBuildFile; fileRef = B6D30B010D1628F20036CC54 /* sp.c */; };
+ B6D30B090D1628F20036CC54 /* symbol_table.c in Sources */ = {isa = PBXBuildFile; fileRef = B6D30B020D1628F20036CC54 /* symbol_table.c */; };
+ B6D30B0A0D1628F20036CC54 /* szx.c in Sources */ = {isa = PBXBuildFile; fileRef = B6D30B030D1628F20036CC54 /* szx.c */; };
+ B6D30B0B0D1628F20036CC54 /* tap.c in Sources */ = {isa = PBXBuildFile; fileRef = B6D30B040D1628F20036CC54 /* tap.c */; };
+ B6D30B0C0D1628F20036CC54 /* tape.c in Sources */ = {isa = PBXBuildFile; fileRef = B6D30B050D1628F20036CC54 /* tape.c */; };
+ B6D30B0F0D1629080036CC54 /* tape_block.c in Sources */ = {isa = PBXBuildFile; fileRef = B6D30B0D0D1629080036CC54 /* tape_block.c */; };
+ B6D30B120D16298C0036CC54 /* timings.c in Sources */ = {isa = PBXBuildFile; fileRef = B6D30B110D16298C0036CC54 /* timings.c */; };
+ B6D30B1B0D1629C20036CC54 /* tzx_read.c in Sources */ = {isa = PBXBuildFile; fileRef = B6D30B130D1629C20036CC54 /* tzx_read.c */; };
+ B6D30B1C0D1629C20036CC54 /* tzx_write.c in Sources */ = {isa = PBXBuildFile; fileRef = B6D30B140D1629C20036CC54 /* tzx_write.c */; };
+ B6D30B1D0D1629C20036CC54 /* warajevo_read.c in Sources */ = {isa = PBXBuildFile; fileRef = B6D30B150D1629C20036CC54 /* warajevo_read.c */; };
+ B6D30B1E0D1629C20036CC54 /* wav.c in Sources */ = {isa = PBXBuildFile; fileRef = B6D30B160D1629C20036CC54 /* wav.c */; };
+ B6D30B1F0D1629C20036CC54 /* z80.c in Sources */ = {isa = PBXBuildFile; fileRef = B6D30B170D1629C20036CC54 /* z80.c */; };
+ B6D30B200D1629C20036CC54 /* z80em.c in Sources */ = {isa = PBXBuildFile; fileRef = B6D30B180D1629C20036CC54 /* z80em.c */; };
+ B6D30B210D1629C20036CC54 /* zlib.c in Sources */ = {isa = PBXBuildFile; fileRef = B6D30B190D1629C20036CC54 /* zlib.c */; };
+ B6D30B220D1629C20036CC54 /* zxs.c in Sources */ = {isa = PBXBuildFile; fileRef = B6D30B1A0D1629C20036CC54 /* zxs.c */; };
+ B6D30B270D162A130036CC54 /* ghash.c in Sources */ = {isa = PBXBuildFile; fileRef = B6D30B250D162A130036CC54 /* ghash.c */; };
+ B6D30B280D162A130036CC54 /* gslist.c in Sources */ = {isa = PBXBuildFile; fileRef = B6D30B260D162A130036CC54 /* gslist.c */; };
+ B6D30B410D16533C0036CC54 /* AttributeBlock.m in Sources */ = {isa = PBXBuildFile; fileRef = B6D30B370D16533C0036CC54 /* AttributeBlock.m */; };
+ B6D30B430D16533C0036CC54 /* AttributeBlockIterator.m in Sources */ = {isa = PBXBuildFile; fileRef = B6D30B390D16533C0036CC54 /* AttributeBlockIterator.m */; };
+ B6D30B450D16533C0036CC54 /* AttributeBlockTimex.m in Sources */ = {isa = PBXBuildFile; fileRef = B6D30B3B0D16533C0036CC54 /* AttributeBlockTimex.m */; };
+ B6D30B470D16533C0036CC54 /* AttributeBlockTimexHiRes.m in Sources */ = {isa = PBXBuildFile; fileRef = B6D30B3D0D16533C0036CC54 /* AttributeBlockTimexHiRes.m */; };
+ B6D30B480D16533C0036CC54 /* AttributeManager.c in Sources */ = {isa = PBXBuildFile; fileRef = B6D30B3E0D16533C0036CC54 /* AttributeManager.c */; };
+ B6D30B4C0D1653510036CC54 /* ColourMacros.c in Sources */ = {isa = PBXBuildFile; fileRef = B6D30B4A0D1653510036CC54 /* ColourMacros.c */; };
+ B6D30B510D1653730036CC54 /* JWSpectrumScreen.m in Sources */ = {isa = PBXBuildFile; fileRef = B6D30B4F0D1653730036CC54 /* JWSpectrumScreen.m */; };
+ C86B05270671AA6E00DD9006 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C86B05260671AA6E00DD9006 /* CoreServices.framework */; };
+ F28CFBFD0A3EC0AF000ABFF5 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F28CFBFC0A3EC0AF000ABFF5 /* ApplicationServices.framework */; };
+ F28CFC030A3EC0C6000ABFF5 /* QuickLook.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F28CFC020A3EC0C6000ABFF5 /* QuickLook.framework */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXBuildRule section */
+ B6D30B300D162CCB0036CC54 /* PBXBuildRule */ = {
+ isa = PBXBuildRule;
+ compilerSpec = com.apple.compilers.proxy.script;
+ filePatterns = "*ape_accessors.txt";
+ fileType = pattern.proxy;
+ isEditable = 1;
+ outputFiles = (
+ "$(DERIVED_FILE_DIR)/$(INPUT_FILE_BASE).c",
+ "$(DERIVED_FILE_DIR)/tape_set.c",
+ );
+ script = "perl ${SRCROOT}/libspectrum/tape_accessors.pl ${INPUT_FILE_PATH} > ${DERIVED_FILE_DIR}/${INPUT_FILE_BASE}.c\nperl ${SRCROOT}/libspectrum/tape_set.pl ${INPUT_FILE_PATH} > ${DERIVED_FILE_DIR}/tape_set.c";
+ };
+ B6D30B310D162CCB0036CC54 /* PBXBuildRule */ = {
+ isa = PBXBuildRule;
+ compilerSpec = com.apple.compilers.proxy.script;
+ filePatterns = "*nap_accessors.txt";
+ fileType = pattern.proxy;
+ isEditable = 1;
+ outputFiles = (
+ "$(DERIVED_FILE_DIR)/$(INPUT_FILE_BASE).c",
+ );
+ script = "perl ${SRCROOT}/libspectrum/accessor.pl ${INPUT_FILE_PATH} > ${DERIVED_FILE_DIR}/${INPUT_FILE_BASE}.c";
+ };
+ B6D30B320D162CCB0036CC54 /* PBXBuildRule */ = {
+ isa = PBXBuildRule;
+ compilerSpec = com.apple.compilers.proxy.script;
+ filePatterns = "*ibspectrum.h.in";
+ fileType = pattern.proxy;
+ isEditable = 1;
+ outputFiles = (
+ "${SRCROOT}/libspectrum.h",
+ );
+ script = "perl -p ${SRCROOT}/generate.pl ${INPUT_FILE_PATH} > ${SRCROOT}/libspectrum.h";
+ };
+/* End PBXBuildRule section */
+
+/* Begin PBXFileReference section */
+ 089C167EFE841241C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+ 08FB77B6FE84183AC02AAC07 /* main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = main.c; sourceTree = "<group>"; };
+ 0AA1909FFE8422F4C02AAC07 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; };
+ 2C05A19B06CAA52B00D84F6F /* GeneratePreviewForURL.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratePreviewForURL.m; sourceTree = "<group>"; };
+ 61E3BCFA0870B4F2002186A0 /* GenerateThumbnailForURL.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = GenerateThumbnailForURL.m; sourceTree = "<group>"; };
+ 8D576316048677EA00EA77CD /* FuseGenerator.qlgenerator */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = FuseGenerator.qlgenerator; sourceTree = BUILT_PRODUCTS_DIR; };
+ 8D576317048677EA00EA77CD /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
+ B63944A80D18B0430059DAA5 /* LibspectrumSCRExtractor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LibspectrumSCRExtractor.h; sourceTree = "<group>"; };
+ B63944A90D18B0430059DAA5 /* LibspectrumSCRExtractor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LibspectrumSCRExtractor.m; sourceTree = "<group>"; };
+ B63944CB0D18C1CD0059DAA5 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = SOURCE_ROOT; };
+ B63945080D18CA120059DAA5 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
+ B6D30AE30D1627C90036CC54 /* libspectrum.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = libspectrum.h; path = ../libspectrum.h; sourceTree = "<group>"; };
+ B6D30AE50D1627ED0036CC54 /* bzip2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bzip2.c; sourceTree = "<group>"; };
+ B6D30AE70D16280E0036CC54 /* creator.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = creator.c; sourceTree = "<group>"; };
+ B6D30AE80D16280E0036CC54 /* crypto.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = crypto.c; sourceTree = "<group>"; };
+ B6D30AE90D16280E0036CC54 /* csw.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = csw.c; sourceTree = "<group>"; };
+ B6D30AEA0D16280E0036CC54 /* dck.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dck.c; sourceTree = "<group>"; };
+ B6D30AF10D1628470036CC54 /* ide.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ide.c; sourceTree = "<group>"; };
+ B6D30AF20D1628470036CC54 /* internals.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = internals.h; sourceTree = "<group>"; };
+ B6D30AF30D1628470036CC54 /* libspectrum.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = libspectrum.c; sourceTree = "<group>"; };
+ B6D30AF70D16288A0036CC54 /* microdrive.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = microdrive.c; sourceTree = "<group>"; };
+ B6D30AF90D1628A10036CC54 /* plusd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = plusd.c; sourceTree = "<group>"; };
+ B6D30AFB0D1628DB0036CC54 /* rzx.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rzx.c; sourceTree = "<group>"; };
+ B6D30AFC0D1628DB0036CC54 /* sna.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sna.c; sourceTree = "<group>"; };
+ B6D30AFF0D1628F20036CC54 /* snapshot.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = snapshot.c; sourceTree = "<group>"; };
+ B6D30B000D1628F20036CC54 /* snp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = snp.c; sourceTree = "<group>"; };
+ B6D30B010D1628F20036CC54 /* sp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sp.c; sourceTree = "<group>"; };
+ B6D30B020D1628F20036CC54 /* symbol_table.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = symbol_table.c; sourceTree = "<group>"; };
+ B6D30B030D1628F20036CC54 /* szx.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = szx.c; sourceTree = "<group>"; };
+ B6D30B040D1628F20036CC54 /* tap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tap.c; sourceTree = "<group>"; };
+ B6D30B050D1628F20036CC54 /* tape.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tape.c; sourceTree = "<group>"; };
+ B6D30B0D0D1629080036CC54 /* tape_block.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tape_block.c; sourceTree = "<group>"; };
+ B6D30B0E0D1629080036CC54 /* tape_block.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tape_block.h; sourceTree = "<group>"; };
+ B6D30B110D16298C0036CC54 /* timings.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = timings.c; sourceTree = "<group>"; };
+ B6D30B130D1629C20036CC54 /* tzx_read.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tzx_read.c; sourceTree = "<group>"; };
+ B6D30B140D1629C20036CC54 /* tzx_write.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tzx_write.c; sourceTree = "<group>"; };
+ B6D30B150D1629C20036CC54 /* warajevo_read.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = warajevo_read.c; sourceTree = "<group>"; };
+ B6D30B160D1629C20036CC54 /* wav.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = wav.c; sourceTree = "<group>"; };
+ B6D30B170D1629C20036CC54 /* z80.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = z80.c; sourceTree = "<group>"; };
+ B6D30B180D1629C20036CC54 /* z80em.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = z80em.c; sourceTree = "<group>"; };
+ B6D30B190D1629C20036CC54 /* zlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = zlib.c; sourceTree = "<group>"; };
+ B6D30B1A0D1629C20036CC54 /* zxs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = zxs.c; sourceTree = "<group>"; };
+ B6D30B250D162A130036CC54 /* ghash.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ghash.c; sourceTree = "<group>"; };
+ B6D30B260D162A130036CC54 /* gslist.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gslist.c; sourceTree = "<group>"; };
+ B6D30B2A0D162B720036CC54 /* libspectrum.h.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = libspectrum.h.in; sourceTree = "<group>"; };
+ B6D30B2C0D162B810036CC54 /* snap_accessors.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = snap_accessors.txt; sourceTree = "<group>"; };
+ B6D30B2E0D162B910036CC54 /* tape_accessors.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = tape_accessors.txt; sourceTree = "<group>"; };
+ B6D30B360D16533C0036CC54 /* AttributeBlock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AttributeBlock.h; path = JWSpectrumScreen/AttributeBlock.h; sourceTree = "<group>"; };
+ B6D30B370D16533C0036CC54 /* AttributeBlock.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AttributeBlock.m; path = JWSpectrumScreen/AttributeBlock.m; sourceTree = "<group>"; };
+ B6D30B380D16533C0036CC54 /* AttributeBlockIterator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AttributeBlockIterator.h; path = JWSpectrumScreen/AttributeBlockIterator.h; sourceTree = "<group>"; };
+ B6D30B390D16533C0036CC54 /* AttributeBlockIterator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AttributeBlockIterator.m; path = JWSpectrumScreen/AttributeBlockIterator.m; sourceTree = "<group>"; };
+ B6D30B3A0D16533C0036CC54 /* AttributeBlockTimex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AttributeBlockTimex.h; path = JWSpectrumScreen/AttributeBlockTimex.h; sourceTree = "<group>"; };
+ B6D30B3B0D16533C0036CC54 /* AttributeBlockTimex.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AttributeBlockTimex.m; path = JWSpectrumScreen/AttributeBlockTimex.m; sourceTree = "<group>"; };
+ B6D30B3C0D16533C0036CC54 /* AttributeBlockTimexHiRes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AttributeBlockTimexHiRes.h; path = JWSpectrumScreen/AttributeBlockTimexHiRes.h; sourceTree = "<group>"; };
+ B6D30B3D0D16533C0036CC54 /* AttributeBlockTimexHiRes.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AttributeBlockTimexHiRes.m; path = JWSpectrumScreen/AttributeBlockTimexHiRes.m; sourceTree = "<group>"; };
+ B6D30B3E0D16533C0036CC54 /* AttributeManager.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = AttributeManager.c; path = JWSpectrumScreen/AttributeManager.c; sourceTree = "<group>"; };
+ B6D30B3F0D16533C0036CC54 /* AttributeManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AttributeManager.h; path = JWSpectrumScreen/AttributeManager.h; sourceTree = "<group>"; };
+ B6D30B4A0D1653510036CC54 /* ColourMacros.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ColourMacros.c; path = JWSpectrumScreen/ColourMacros.c; sourceTree = "<group>"; };
+ B6D30B4B0D1653510036CC54 /* ColourMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ColourMacros.h; path = JWSpectrumScreen/ColourMacros.h; sourceTree = "<group>"; };
+ B6D30B4E0D1653730036CC54 /* JWSpectrumScreen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JWSpectrumScreen.h; path = JWSpectrumScreen/JWSpectrumScreen.h; sourceTree = "<group>"; };
+ B6D30B4F0D1653730036CC54 /* JWSpectrumScreen.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = JWSpectrumScreen.m; path = JWSpectrumScreen/JWSpectrumScreen.m; sourceTree = "<group>"; };
+ B6D30B520D1653920036CC54 /* JWSpectrumScreenConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JWSpectrumScreenConstants.h; path = JWSpectrumScreen/JWSpectrumScreenConstants.h; sourceTree = "<group>"; };
+ B6D30B530D1653920036CC54 /* PixelData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PixelData.h; path = JWSpectrumScreen/PixelData.h; sourceTree = "<group>"; };
+ C86B05260671AA6E00DD9006 /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = /System/Library/Frameworks/CoreServices.framework; sourceTree = "<absolute>"; };
+ F28CFBFC0A3EC0AF000ABFF5 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = "<absolute>"; };
+ F28CFC020A3EC0C6000ABFF5 /* QuickLook.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickLook.framework; path = /System/Library/Frameworks/QuickLook.framework; sourceTree = "<absolute>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+ 8D576313048677EA00EA77CD /* Frameworks */ = {
+ isa = PBXFrameworksBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ 8D576314048677EA00EA77CD /* CoreFoundation.framework in Frameworks */,
+ C86B05270671AA6E00DD9006 /* CoreServices.framework in Frameworks */,
+ F28CFBFD0A3EC0AF000ABFF5 /* ApplicationServices.framework in Frameworks */,
+ F28CFC030A3EC0C6000ABFF5 /* QuickLook.framework in Frameworks */,
+ B63945090D18CA120059DAA5 /* Cocoa.framework in Frameworks */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+ 089C166AFE841209C02AAC07 /* FuseGenerator */ = {
+ isa = PBXGroup;
+ children = (
+ 08FB77AFFE84173DC02AAC07 /* Source */,
+ 089C167CFE841241C02AAC07 /* Resources */,
+ 089C1671FE841209C02AAC07 /* External Frameworks and Libraries */,
+ 19C28FB6FE9D52B211CA2CBB /* Products */,
+ );
+ name = FuseGenerator;
+ sourceTree = "<group>";
+ };
+ 089C1671FE841209C02AAC07 /* External Frameworks and Libraries */ = {
+ isa = PBXGroup;
+ children = (
+ B63945080D18CA120059DAA5 /* Cocoa.framework */,
+ F28CFC020A3EC0C6000ABFF5 /* QuickLook.framework */,
+ F28CFBFC0A3EC0AF000ABFF5 /* ApplicationServices.framework */,
+ C86B05260671AA6E00DD9006 /* CoreServices.framework */,
+ 0AA1909FFE8422F4C02AAC07 /* CoreFoundation.framework */,
+ );
+ name = "External Frameworks and Libraries";
+ sourceTree = "<group>";
+ };
+ 089C167CFE841241C02AAC07 /* Resources */ = {
+ isa = PBXGroup;
+ children = (
+ 8D576317048677EA00EA77CD /* Info.plist */,
+ 8D5B49A704867FD3000E48DA /* InfoPlist.strings */,
+ );
+ name = Resources;
+ sourceTree = "<group>";
+ };
+ 08FB77AFFE84173DC02AAC07 /* Source */ = {
+ isa = PBXGroup;
+ children = (
+ B6D30B350D1653180036CC54 /* JWSpectrumScreen */,
+ B6D30AE20D16278E0036CC54 /* libspectrum */,
+ 61E3BCFA0870B4F2002186A0 /* GenerateThumbnailForURL.m */,
+ 2C05A19B06CAA52B00D84F6F /* GeneratePreviewForURL.m */,
+ 08FB77B6FE84183AC02AAC07 /* main.c */,
+ B63944A80D18B0430059DAA5 /* LibspectrumSCRExtractor.h */,
+ B63944A90D18B0430059DAA5 /* LibspectrumSCRExtractor.m */,
+ );
+ name = Source;
+ sourceTree = "<group>";
+ };
+ 19C28FB6FE9D52B211CA2CBB /* Products */ = {
+ isa = PBXGroup;
+ children = (
+ 8D576316048677EA00EA77CD /* FuseGenerator.qlgenerator */,
+ );
+ name = Products;
+ sourceTree = "<group>";
+ };
+ B6D30AE20D16278E0036CC54 /* libspectrum */ = {
+ isa = PBXGroup;
+ children = (
+ B6D30B230D1629DC0036CC54 /* myglib */,
+ B63944CB0D18C1CD0059DAA5 /* config.h */,
+ B6D30B2E0D162B910036CC54 /* tape_accessors.txt */,
+ B6D30B2C0D162B810036CC54 /* snap_accessors.txt */,
+ B6D30B2A0D162B720036CC54 /* libspectrum.h.in */,
+ B6D30AE50D1627ED0036CC54 /* bzip2.c */,
+ B6D30AE70D16280E0036CC54 /* creator.c */,
+ B6D30AE80D16280E0036CC54 /* crypto.c */,
+ B6D30AE90D16280E0036CC54 /* csw.c */,
+ B6D30AEA0D16280E0036CC54 /* dck.c */,
+ B6D30AF10D1628470036CC54 /* ide.c */,
+ B6D30AF20D1628470036CC54 /* internals.h */,
+ B6D30AF30D1628470036CC54 /* libspectrum.c */,
+ B6D30AE30D1627C90036CC54 /* libspectrum.h */,
+ B6D30AF70D16288A0036CC54 /* microdrive.c */,
+ B6D30AF90D1628A10036CC54 /* plusd.c */,
+ B6D30AFB0D1628DB0036CC54 /* rzx.c */,
+ B6D30AFC0D1628DB0036CC54 /* sna.c */,
+ B6D30AFF0D1628F20036CC54 /* snapshot.c */,
+ B6D30B000D1628F20036CC54 /* snp.c */,
+ B6D30B010D1628F20036CC54 /* sp.c */,
+ B6D30B020D1628F20036CC54 /* symbol_table.c */,
+ B6D30B030D1628F20036CC54 /* szx.c */,
+ B6D30B040D1628F20036CC54 /* tap.c */,
+ B6D30B050D1628F20036CC54 /* tape.c */,
+ B6D30B0D0D1629080036CC54 /* tape_block.c */,
+ B6D30B0E0D1629080036CC54 /* tape_block.h */,
+ B6D30B110D16298C0036CC54 /* timings.c */,
+ B6D30B130D1629C20036CC54 /* tzx_read.c */,
+ B6D30B140D1629C20036CC54 /* tzx_write.c */,
+ B6D30B150D1629C20036CC54 /* warajevo_read.c */,
+ B6D30B160D1629C20036CC54 /* wav.c */,
+ B6D30B170D1629C20036CC54 /* z80.c */,
+ B6D30B180D1629C20036CC54 /* z80em.c */,
+ B6D30B190D1629C20036CC54 /* zlib.c */,
+ B6D30B1A0D1629C20036CC54 /* zxs.c */,
+ );
+ path = libspectrum;
+ sourceTree = "<group>";
+ };
+ B6D30B230D1629DC0036CC54 /* myglib */ = {
+ isa = PBXGroup;
+ children = (
+ B6D30B250D162A130036CC54 /* ghash.c */,
+ B6D30B260D162A130036CC54 /* gslist.c */,
+ );
+ path = myglib;
+ sourceTree = "<group>";
+ };
+ B6D30B350D1653180036CC54 /* JWSpectrumScreen */ = {
+ isa = PBXGroup;
+ children = (
+ B6D30B360D16533C0036CC54 /* AttributeBlock.h */,
+ B6D30B370D16533C0036CC54 /* AttributeBlock.m */,
+ B6D30B380D16533C0036CC54 /* AttributeBlockIterator.h */,
+ B6D30B390D16533C0036CC54 /* AttributeBlockIterator.m */,
+ B6D30B3A0D16533C0036CC54 /* AttributeBlockTimex.h */,
+ B6D30B3B0D16533C0036CC54 /* AttributeBlockTimex.m */,
+ B6D30B3C0D16533C0036CC54 /* AttributeBlockTimexHiRes.h */,
+ B6D30B3D0D16533C0036CC54 /* AttributeBlockTimexHiRes.m */,
+ B6D30B3E0D16533C0036CC54 /* AttributeManager.c */,
+ B6D30B3F0D16533C0036CC54 /* AttributeManager.h */,
+ B6D30B4A0D1653...
[truncated message content] |
|
From: <fr...@us...> - 2008-02-14 13:00:31
|
Revision: 478
http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=478&view=rev
Author: fredm
Date: 2008-02-14 05:00:36 -0800 (Thu, 14 Feb 2008)
Log Message:
-----------
Merge up to vendor version 0.4.0.
Modified Paths:
--------------
trunk/FuseGenerator/libspectrum.h
trunk/FuseImporter/GetMetadataForFile.m
trunk/FuseImporter/LibspectrumMetadataImporter.m
trunk/FuseImporter/libspectrum.h
trunk/libspectrum/Info.plist
trunk/libspectrum/libspectrum/COPYING
trunk/libspectrum/libspectrum/ChangeLog
trunk/libspectrum/libspectrum/Makefile.am
trunk/libspectrum/libspectrum/README
trunk/libspectrum/libspectrum/accessor.pl
trunk/libspectrum/libspectrum/configure.in
trunk/libspectrum/libspectrum/csw.c
trunk/libspectrum/libspectrum/dll.c
trunk/libspectrum/libspectrum/doc/cvs-tags
trunk/libspectrum/libspectrum/doc/libspectrum.3
trunk/libspectrum/libspectrum/doc/libspectrum.txt
trunk/libspectrum/libspectrum/hacking/ChangeLog
trunk/libspectrum/libspectrum/internals.h
trunk/libspectrum/libspectrum/libspectrum.c
trunk/libspectrum/libspectrum/libspectrum.h.in
trunk/libspectrum/libspectrum/plusd.c
trunk/libspectrum/libspectrum/sna.c
trunk/libspectrum/libspectrum/snap_accessors.txt
trunk/libspectrum/libspectrum/snapshot.c
trunk/libspectrum/libspectrum/szx.c
trunk/libspectrum/libspectrum/tap.c
trunk/libspectrum/libspectrum/tape.c
trunk/libspectrum/libspectrum/tape_block.c
trunk/libspectrum/libspectrum/test/Makefile.am
trunk/libspectrum/libspectrum/test/test.c
trunk/libspectrum/libspectrum/timings.c
trunk/libspectrum/libspectrum/z80.c
trunk/libspectrum/libspectrum.h
trunk/libspectrum/libspectrum.xcodeproj/project.pbxproj
Added Paths:
-----------
trunk/libspectrum/libspectrum/test/empty.csw
trunk/libspectrum/libspectrum/test/sp-2000.sna.gz
trunk/libspectrum/libspectrum/test/sp-ffff.sna.gz
Modified: trunk/FuseGenerator/libspectrum.h
===================================================================
--- trunk/FuseGenerator/libspectrum.h 2008-02-14 12:08:29 UTC (rev 477)
+++ trunk/FuseGenerator/libspectrum.h 2008-02-14 13:00:36 UTC (rev 478)
@@ -1,7 +1,7 @@
/* libspectrum.h: the library for dealing with ZX Spectrum emulator files
Copyright (c) 2001-2007 Philip Kendall, Darren Salt, Fredrick Meunier
- $Id: libspectrum.h.in 3237 2007-10-24 18:24:07Z zubzero $
+ $Id: libspectrum.h.in 3426 2007-12-18 19:29:30Z 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
@@ -250,7 +250,7 @@
LIBSPECTRUM_ID_TAPE_WARAJEVO, /* Warajevo-style .tap tape image */
- LIBSPECTRUM_ID_SNAPSHOT_PLUSD, /* +D snapshot */
+ LIBSPECTRUM_ID_SNAPSHOT_PLUSD, /* DISCiPLE/+D snapshot */
LIBSPECTRUM_ID_SNAPSHOT_SP, /* .sp snapshot */
LIBSPECTRUM_ID_SNAPSHOT_SNP, /* .snp snapshot */
LIBSPECTRUM_ID_SNAPSHOT_ZXS, /* .zxs snapshot (zx32) */
@@ -272,11 +272,14 @@
LIBSPECTRUM_ID_TAPE_CSW, /* .csw tape image */
LIBSPECTRUM_ID_TAPE_Z80EM, /* Z80Em tape image */
- /* Below here, present only in x.x.x and later */
+ /* Below here, present only in 0.4.0 and later */
LIBSPECTRUM_ID_TAPE_WAV, /* .wav tape image */
+ LIBSPECTRUM_ID_TAPE_SPC, /* SP-style .spc tape image */
+ LIBSPECTRUM_ID_TAPE_STA, /* Speculator-style .sta tape image */
+ LIBSPECTRUM_ID_TAPE_LTP, /* Nuclear ZX-style .ltp tape image */
LIBSPECTRUM_ID_COMPRESSED_XFD, /* xfdmaster (Amiga) compressed file */
- LIBSPECTRUM_ID_DISK_IMG, /* .img +D disk image */
- LIBSPECTRUM_ID_DISK_MGT, /* .mgt +D disk image */
+ LIBSPECTRUM_ID_DISK_IMG, /* .img DISCiPLE/+D disk image */
+ LIBSPECTRUM_ID_DISK_MGT, /* .mgt DISCiPLE/+D disk image */
LIBSPECTRUM_ID_SCREEN_SCR, /* .scr screen file */
@@ -307,9 +310,9 @@
LIBSPECTRUM_CLASS_MICRODRIVE, /* Microdrive cartridges */
- /* Below here, present only in x.x.x and later */
+ /* Below here, present only in 0.4.0 and later */
- LIBSPECTRUM_CLASS_DISK_PLUSD, /* +D disk image */
+ LIBSPECTRUM_CLASS_DISK_PLUSD, /* DISCiPLE/+D disk image */
LIBSPECTRUM_CLASS_SCREENSHOT, /* Screenshot */
@@ -397,6 +400,11 @@
LIBSPECTRUM_MACHINE_CAPABILITY_SE_MEMORY; /* SE-style memory paging */
extern const int WIN32_DLL
LIBSPECTRUM_MACHINE_CAPABILITY_NTSC; /* NTSC display */
+extern const int WIN32_DLL
+LIBSPECTRUM_MACHINE_CAPABILITY_PENT512_MEMORY; /* Pentagon 512 memory paging */
+extern const int WIN32_DLL
+LIBSPECTRUM_MACHINE_CAPABILITY_PENT1024_MEMORY;
+ /* Pentagon 1024 memory paging */
/* Get the capabilities of a machine */
int WIN32_DLL libspectrum_machine_capabilities( libspectrum_machine type );
@@ -589,6 +597,20 @@
void WIN32_DLL libspectrum_snap_set_out_scld_hsr( libspectrum_snap *snap, libspectrum_byte out_scld_hsr );
libspectrum_byte WIN32_DLL libspectrum_snap_out_scld_dec( libspectrum_snap *snap );
void WIN32_DLL libspectrum_snap_set_out_scld_dec( libspectrum_snap *snap, libspectrum_byte out_scld_dec );
+int WIN32_DLL libspectrum_snap_interface1_active( libspectrum_snap *snap );
+void WIN32_DLL libspectrum_snap_set_interface1_active( libspectrum_snap *snap, int interface1_active );
+int WIN32_DLL libspectrum_snap_interface1_paged( libspectrum_snap *snap );
+void WIN32_DLL libspectrum_snap_set_interface1_paged( libspectrum_snap *snap, int interface1_paged );
+int WIN32_DLL libspectrum_snap_interface1_drive_count( libspectrum_snap *snap );
+void WIN32_DLL libspectrum_snap_set_interface1_drive_count( libspectrum_snap *snap, int interface1_drive_count );
+int WIN32_DLL libspectrum_snap_interface1_custom_rom( libspectrum_snap *snap );
+void WIN32_DLL libspectrum_snap_set_interface1_custom_rom( libspectrum_snap *snap, int interface1_custom_rom );
+libspectrum_byte WIN32_DLL * libspectrum_snap_interface1_rom( libspectrum_snap * snap, int idx );
+void WIN32_DLL libspectrum_snap_set_interface1_rom( libspectrum_snap *snap, int idx, libspectrum_byte* interface1_rom );
+size_t WIN32_DLL libspectrum_snap_interface1_rom_length( libspectrum_snap *snap, int idx );
+void WIN32_DLL libspectrum_snap_set_interface1_rom_length( libspectrum_snap *snap, int idx, size_t interface1_rom_length );
+int WIN32_DLL libspectrum_snap_beta_active( libspectrum_snap *snap );
+void WIN32_DLL libspectrum_snap_set_beta_active( libspectrum_snap *snap, int beta_active );
int WIN32_DLL libspectrum_snap_beta_paged( libspectrum_snap *snap );
void WIN32_DLL libspectrum_snap_set_beta_paged( libspectrum_snap *snap, int beta_paged );
int WIN32_DLL libspectrum_snap_beta_direction( libspectrum_snap *snap );
@@ -603,6 +625,28 @@
void WIN32_DLL libspectrum_snap_set_beta_data( libspectrum_snap *snap, libspectrum_byte beta_data );
libspectrum_byte WIN32_DLL libspectrum_snap_beta_status( libspectrum_snap *snap );
void WIN32_DLL libspectrum_snap_set_beta_status( libspectrum_snap *snap, libspectrum_byte beta_status );
+int WIN32_DLL libspectrum_snap_plusd_active( libspectrum_snap *snap );
+void WIN32_DLL libspectrum_snap_set_plusd_active( libspectrum_snap *snap, int plusd_active );
+int WIN32_DLL libspectrum_snap_plusd_paged( libspectrum_snap *snap );
+void WIN32_DLL libspectrum_snap_set_plusd_paged( libspectrum_snap *snap, int plusd_paged );
+int WIN32_DLL libspectrum_snap_plusd_custom_rom( libspectrum_snap *snap );
+void WIN32_DLL libspectrum_snap_set_plusd_custom_rom( libspectrum_snap *snap, int plusd_custom_rom );
+int WIN32_DLL libspectrum_snap_plusd_direction( libspectrum_snap *snap );
+void WIN32_DLL libspectrum_snap_set_plusd_direction( libspectrum_snap *snap, int plusd_direction );
+libspectrum_byte WIN32_DLL libspectrum_snap_plusd_control( libspectrum_snap *snap );
+void WIN32_DLL libspectrum_snap_set_plusd_control( libspectrum_snap *snap, libspectrum_byte plusd_control );
+libspectrum_byte WIN32_DLL libspectrum_snap_plusd_track( libspectrum_snap *snap );
+void WIN32_DLL libspectrum_snap_set_plusd_track( libspectrum_snap *snap, libspectrum_byte plusd_track );
+libspectrum_byte WIN32_DLL libspectrum_snap_plusd_sector( libspectrum_snap *snap );
+void WIN32_DLL libspectrum_snap_set_plusd_sector( libspectrum_snap *snap, libspectrum_byte plusd_sector );
+libspectrum_byte WIN32_DLL libspectrum_snap_plusd_data( libspectrum_snap *snap );
+void WIN32_DLL libspectrum_snap_set_plusd_data( libspectrum_snap *snap, libspectrum_byte plusd_data );
+libspectrum_byte WIN32_DLL libspectrum_snap_plusd_status( libspectrum_snap *snap );
+void WIN32_DLL libspectrum_snap_set_plusd_status( libspectrum_snap *snap, libspectrum_byte plusd_status );
+libspectrum_byte WIN32_DLL * libspectrum_snap_plusd_rom( libspectrum_snap *snap, int idx );
+void WIN32_DLL libspectrum_snap_set_plusd_rom( libspectrum_snap *snap, int idx, libspectrum_byte* plusd_rom );
+libspectrum_byte WIN32_DLL * libspectrum_snap_plusd_ram( libspectrum_snap *snap, int idx );
+void WIN32_DLL libspectrum_snap_set_plusd_ram( libspectrum_snap *snap, int idx, libspectrum_byte* plusd_ram );
libspectrum_byte WIN32_DLL * libspectrum_snap_pages( libspectrum_snap *snap, int idx );
void WIN32_DLL libspectrum_snap_set_pages( libspectrum_snap *snap, int idx, libspectrum_byte* pages );
libspectrum_byte WIN32_DLL * libspectrum_snap_slt( libspectrum_snap *snap, int idx );
Modified: trunk/FuseImporter/GetMetadataForFile.m
===================================================================
--- trunk/FuseImporter/GetMetadataForFile.m 2008-02-14 12:08:29 UTC (rev 477)
+++ trunk/FuseImporter/GetMetadataForFile.m 2008-02-14 13:00:36 UTC (rev 478)
@@ -41,24 +41,22 @@
CFStringRef contentTypeUTI,
CFStringRef pathToFile)
{
- Boolean error = FALSE;
+ Boolean error = FALSE;
NSAutoreleasePool *pool;
- LibspectrumMetadataImporter *mdi;
+ LibspectrumMetadataImporter *mdi;
- /* Don't assume that there is an autorelease pool around the calling of this function. */
+ /* Don't assume that there is an autorelease pool around the calling of this function. */
pool = [[NSAutoreleasePool alloc] init];
- mdi = [[LibspectrumMetadataImporter alloc] initWithFilename:(NSString*)pathToFile
- andAttributes:(NSMutableDictionary*)attributes];
+ mdi = [[[LibspectrumMetadataImporter alloc] initWithFilename:(NSString*)pathToFile
+ andAttributes:(NSMutableDictionary*)attributes] autorelease];
/* Pull any available metadata from the file at the specified path */
/* Return the attribute keys and attribute values in the dict */
/* Return TRUE if successful, FALSE if there was no data provided */
- error = [mdi processFile];
-
- [mdi release];
+ error = [mdi processFile];
- [pool release];
+ [pool release];
- return error;
+ return error;
}
\ No newline at end of file
Modified: trunk/FuseImporter/LibspectrumMetadataImporter.m
===================================================================
--- trunk/FuseImporter/LibspectrumMetadataImporter.m 2008-02-14 12:08:29 UTC (rev 477)
+++ trunk/FuseImporter/LibspectrumMetadataImporter.m 2008-02-14 13:00:36 UTC (rev 478)
@@ -154,6 +154,19 @@
}
}
+libspectrum_error
+libspectrum_importer_error_function( libspectrum_error error,
+ const char *format, va_list ap )
+{
+ char err_msg[256];
+
+ vsnprintf( err_msg, 256, format, ap );
+
+ NSLog(@"LibspectrumMetadataImporter: error `%s': %s\n", err_msg );
+
+ return LIBSPECTRUM_ERROR_NONE;
+}
+
@implementation LibspectrumMetadataImporter
- (BOOL)
@@ -389,7 +402,7 @@
process_snap2:(libspectrum_snap *)snap
{
int error = 0;
- NSMutableArray *peripherals = [NSMutableArray arrayWithCapacity:4];
+ NSMutableArray *peripherals = [NSMutableArray arrayWithCapacity:7];
if( !libspectrum_snap_issue2(snap) &&
(libspectrum_snap_machine(snap) == LIBSPECTRUM_MACHINE_48 ||
@@ -423,6 +436,10 @@
if( libspectrum_snap_zxcf_active( snap ) ) {
[peripherals addObject:[NSString stringWithString:@"ZXCF"]];
}
+ if( libspectrum_snap_interface1_active( snap ) ) {
+ [peripherals addObject:
+ [NSString stringWithString:@"Interface I"]];
+ }
if( libspectrum_snap_interface2_active( snap ) ) {
[peripherals addObject:
[NSString stringWithString:@"Interface II Cartridge"]];
@@ -431,6 +448,12 @@
libspectrum_snap_machine(snap) != LIBSPECTRUM_MACHINE_SE ) {
[peripherals addObject:[NSString stringWithString:@"Timex Dock Cartidge"]];
}
+ if( libspectrum_snap_beta_active( snap ) ) {
+ [peripherals addObject:[NSString stringWithString:@"Beta Disk"]];
+ }
+ if( libspectrum_snap_plusd_active( snap ) ) {
+ [peripherals addObject:[NSString stringWithString:@"+D Disk"]];
+ }
if( [peripherals count] ) {
[attributes setObject:peripherals
@@ -615,7 +638,10 @@
filename = aFile;
attributes = aDict;
-
+
+ libspectrum_init();
+ libspectrum_error_function = libspectrum_importer_error_function;
+
return self;
}
@@ -628,6 +654,8 @@
if( mmap_file( fsrep, &buffer, &length ) ) return NO;
+ //NSLog( @"LibspectrumMetadataImporter: processing `%s'\n", fsrep );
+
if( libspectrum_identify_file( &type, fsrep, buffer, length ) ) {
munmap( buffer, length );
return NO;
@@ -696,7 +724,7 @@
return NO;
}
- NSLog(@"returning: %d\n",retval);
+ //NSLog(@"returning: %d\n",retval);
return retval;
}
Modified: trunk/FuseImporter/libspectrum.h
===================================================================
--- trunk/FuseImporter/libspectrum.h 2008-02-14 12:08:29 UTC (rev 477)
+++ trunk/FuseImporter/libspectrum.h 2008-02-14 13:00:36 UTC (rev 478)
@@ -1,7 +1,7 @@
/* libspectrum.h: the library for dealing with ZX Spectrum emulator files
Copyright (c) 2001-2007 Philip Kendall, Darren Salt, Fredrick Meunier
- $Id: libspectrum.h.in 3237 2007-10-24 18:24:07Z zubzero $
+ $Id: libspectrum.h.in 3426 2007-12-18 19:29:30Z 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
@@ -250,7 +250,7 @@
LIBSPECTRUM_ID_TAPE_WARAJEVO, /* Warajevo-style .tap tape image */
- LIBSPECTRUM_ID_SNAPSHOT_PLUSD, /* +D snapshot */
+ LIBSPECTRUM_ID_SNAPSHOT_PLUSD, /* DISCiPLE/+D snapshot */
LIBSPECTRUM_ID_SNAPSHOT_SP, /* .sp snapshot */
LIBSPECTRUM_ID_SNAPSHOT_SNP, /* .snp snapshot */
LIBSPECTRUM_ID_SNAPSHOT_ZXS, /* .zxs snapshot (zx32) */
@@ -272,11 +272,14 @@
LIBSPECTRUM_ID_TAPE_CSW, /* .csw tape image */
LIBSPECTRUM_ID_TAPE_Z80EM, /* Z80Em tape image */
- /* Below here, present only in x.x.x and later */
+ /* Below here, present only in 0.4.0 and later */
LIBSPECTRUM_ID_TAPE_WAV, /* .wav tape image */
+ LIBSPECTRUM_ID_TAPE_SPC, /* SP-style .spc tape image */
+ LIBSPECTRUM_ID_TAPE_STA, /* Speculator-style .sta tape image */
+ LIBSPECTRUM_ID_TAPE_LTP, /* Nuclear ZX-style .ltp tape image */
LIBSPECTRUM_ID_COMPRESSED_XFD, /* xfdmaster (Amiga) compressed file */
- LIBSPECTRUM_ID_DISK_IMG, /* .img +D disk image */
- LIBSPECTRUM_ID_DISK_MGT, /* .mgt +D disk image */
+ LIBSPECTRUM_ID_DISK_IMG, /* .img DISCiPLE/+D disk image */
+ LIBSPECTRUM_ID_DISK_MGT, /* .mgt DISCiPLE/+D disk image */
LIBSPECTRUM_ID_SCREEN_SCR, /* .scr screen file */
@@ -307,9 +310,9 @@
LIBSPECTRUM_CLASS_MICRODRIVE, /* Microdrive cartridges */
- /* Below here, present only in x.x.x and later */
+ /* Below here, present only in 0.4.0 and later */
- LIBSPECTRUM_CLASS_DISK_PLUSD, /* +D disk image */
+ LIBSPECTRUM_CLASS_DISK_PLUSD, /* DISCiPLE/+D disk image */
LIBSPECTRUM_CLASS_SCREENSHOT, /* Screenshot */
@@ -397,6 +400,11 @@
LIBSPECTRUM_MACHINE_CAPABILITY_SE_MEMORY; /* SE-style memory paging */
extern const int WIN32_DLL
LIBSPECTRUM_MACHINE_CAPABILITY_NTSC; /* NTSC display */
+extern const int WIN32_DLL
+LIBSPECTRUM_MACHINE_CAPABILITY_PENT512_MEMORY; /* Pentagon 512 memory paging */
+extern const int WIN32_DLL
+LIBSPECTRUM_MACHINE_CAPABILITY_PENT1024_MEMORY;
+ /* Pentagon 1024 memory paging */
/* Get the capabilities of a machine */
int WIN32_DLL libspectrum_machine_capabilities( libspectrum_machine type );
@@ -589,6 +597,20 @@
void WIN32_DLL libspectrum_snap_set_out_scld_hsr( libspectrum_snap *snap, libspectrum_byte out_scld_hsr );
libspectrum_byte WIN32_DLL libspectrum_snap_out_scld_dec( libspectrum_snap *snap );
void WIN32_DLL libspectrum_snap_set_out_scld_dec( libspectrum_snap *snap, libspectrum_byte out_scld_dec );
+int WIN32_DLL libspectrum_snap_interface1_active( libspectrum_snap *snap );
+void WIN32_DLL libspectrum_snap_set_interface1_active( libspectrum_snap *snap, int interface1_active );
+int WIN32_DLL libspectrum_snap_interface1_paged( libspectrum_snap *snap );
+void WIN32_DLL libspectrum_snap_set_interface1_paged( libspectrum_snap *snap, int interface1_paged );
+int WIN32_DLL libspectrum_snap_interface1_drive_count( libspectrum_snap *snap );
+void WIN32_DLL libspectrum_snap_set_interface1_drive_count( libspectrum_snap *snap, int interface1_drive_count );
+int WIN32_DLL libspectrum_snap_interface1_custom_rom( libspectrum_snap *snap );
+void WIN32_DLL libspectrum_snap_set_interface1_custom_rom( libspectrum_snap *snap, int interface1_custom_rom );
+libspectrum_byte WIN32_DLL * libspectrum_snap_interface1_rom( libspectrum_snap * snap, int idx );
+void WIN32_DLL libspectrum_snap_set_interface1_rom( libspectrum_snap *snap, int idx, libspectrum_byte* interface1_rom );
+size_t WIN32_DLL libspectrum_snap_interface1_rom_length( libspectrum_snap *snap, int idx );
+void WIN32_DLL libspectrum_snap_set_interface1_rom_length( libspectrum_snap *snap, int idx, size_t interface1_rom_length );
+int WIN32_DLL libspectrum_snap_beta_active( libspectrum_snap *snap );
+void WIN32_DLL libspectrum_snap_set_beta_active( libspectrum_snap *snap, int beta_active );
int WIN32_DLL libspectrum_snap_beta_paged( libspectrum_snap *snap );
void WIN32_DLL libspectrum_snap_set_beta_paged( libspectrum_snap *snap, int beta_paged );
int WIN32_DLL libspectrum_snap_beta_direction( libspectrum_snap *snap );
@@ -603,6 +625,28 @@
void WIN32_DLL libspectrum_snap_set_beta_data( libspectrum_snap *snap, libspectrum_byte beta_data );
libspectrum_byte WIN32_DLL libspectrum_snap_beta_status( libspectrum_snap *snap );
void WIN32_DLL libspectrum_snap_set_beta_status( libspectrum_snap *snap, libspectrum_byte beta_status );
+int WIN32_DLL libspectrum_snap_plusd_active( libspectrum_snap *snap );
+void WIN32_DLL libspectrum_snap_set_plusd_active( libspectrum_snap *snap, int plusd_active );
+int WIN32_DLL libspectrum_snap_plusd_paged( libspectrum_snap *snap );
+void WIN32_DLL libspectrum_snap_set_plusd_paged( libspectrum_snap *snap, int plusd_paged );
+int WIN32_DLL libspectrum_snap_plusd_custom_rom( libspectrum_snap *snap );
+void WIN32_DLL libspectrum_snap_set_plusd_custom_rom( libspectrum_snap *snap, int plusd_custom_rom );
+int WIN32_DLL libspectrum_snap_plusd_direction( libspectrum_snap *snap );
+void WIN32_DLL libspectrum_snap_set_plusd_direction( libspectrum_snap *snap, int plusd_direction );
+libspectrum_byte WIN32_DLL libspectrum_snap_plusd_control( libspectrum_snap *snap );
+void WIN32_DLL libspectrum_snap_set_plusd_control( libspectrum_snap *snap, libspectrum_byte plusd_control );
+libspectrum_byte WIN32_DLL libspectrum_snap_plusd_track( libspectrum_snap *snap );
+void WIN32_DLL libspectrum_snap_set_plusd_track( libspectrum_snap *snap, libspectrum_byte plusd_track );
+libspectrum_byte WIN32_DLL libspectrum_snap_plusd_sector( libspectrum_snap *snap );
+void WIN32_DLL libspectrum_snap_set_plusd_sector( libspectrum_snap *snap, libspectrum_byte plusd_sector );
+libspectrum_byte WIN32_DLL libspectrum_snap_plusd_data( libspectrum_snap *snap );
+void WIN32_DLL libspectrum_snap_set_plusd_data( libspectrum_snap *snap, libspectrum_byte plusd_data );
+libspectrum_byte WIN32_DLL libspectrum_snap_plusd_status( libspectrum_snap *snap );
+void WIN32_DLL libspectrum_snap_set_plusd_status( libspectrum_snap *snap, libspectrum_byte plusd_status );
+libspectrum_byte WIN32_DLL * libspectrum_snap_plusd_rom( libspectrum_snap *snap, int idx );
+void WIN32_DLL libspectrum_snap_set_plusd_rom( libspectrum_snap *snap, int idx, libspectrum_byte* plusd_rom );
+libspectrum_byte WIN32_DLL * libspectrum_snap_plusd_ram( libspectrum_snap *snap, int idx );
+void WIN32_DLL libspectrum_snap_set_plusd_ram( libspectrum_snap *snap, int idx, libspectrum_byte* plusd_ram );
libspectrum_byte WIN32_DLL * libspectrum_snap_pages( libspectrum_snap *snap, int idx );
void WIN32_DLL libspectrum_snap_set_pages( libspectrum_snap *snap, int idx, libspectrum_byte* pages );
libspectrum_byte WIN32_DLL * libspectrum_snap_slt( libspectrum_snap *snap, int idx );
Modified: trunk/libspectrum/Info.plist
===================================================================
--- trunk/libspectrum/Info.plist 2008-02-14 12:08:29 UTC (rev 477)
+++ trunk/libspectrum/Info.plist 2008-02-14 13:00:36 UTC (rev 478)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
@@ -23,6 +23,6 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>0.3.0.1</string>
+ <string>0.4.0</string>
</dict>
</plist>
Modified: trunk/libspectrum/libspectrum/COPYING
===================================================================
--- trunk/libspectrum/libspectrum/COPYING 2008-02-14 12:08:29 UTC (rev 477)
+++ trunk/libspectrum/libspectrum/COPYING 2008-02-14 13:00:36 UTC (rev 478)
@@ -2,7 +2,7 @@
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Modified: trunk/libspectrum/libspectrum/ChangeLog
===================================================================
--- trunk/libspectrum/libspectrum/ChangeLog 2008-02-14 12:08:29 UTC (rev 477)
+++ trunk/libspectrum/libspectrum/ChangeLog 2008-02-14 13:00:36 UTC (rev 478)
@@ -1,3 +1,25 @@
+2008-01-05 Philip Kendall <phi...@sh...>
+
+ * libspectrum 0.4.0 released.
+
+ * Add support for loading from WAV files (Fredrick Meunier).
+
+ * Add support for CSW tape files (Fredrick Meunier).
+
+ * Tweak timings for TC2048 and TC2068 (Fredrick Meunier; thanks Philip
+ Kendall and Mark Woodmass).
+
+ * Add support for the +D in z80 and szx snapshots (Fredrick Meunier).
+
+ * Add Pentagon 512/1024 support (Q-Master).
+
+ * Allow Amiga version to decompress files with xfdmaster.library
+ (Chris Young).
+
+ * Allow MorphOS version to use xfdmaster.library (Q-Master).
+
+ * Various other bugfixes.
+
2007-05-11 Philip Kendall <phi...@sh...>
* libspectrum 0.3.0.1 released (bug fix release).
@@ -144,7 +166,7 @@
* Timing fixes for the TC2048 and TC2068 (Fredrick Meunier).
- * Fix reading of 128K .sna snapshots (Philip Kendall).
+ * Fix reading of 128K .sna snapshots (Philip Kendall).
* New capabilities for the Timex dock, and built-in Sinclair and
Kempston joysticks (Fredrick Meunier).
@@ -203,5 +225,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 3254 2007-10-26 02:07:45Z zubzero $
+$Id: ChangeLog 3467 2008-01-04 23:27:31Z zubzero $
Modified: trunk/libspectrum/libspectrum/Makefile.am
===================================================================
--- trunk/libspectrum/libspectrum/Makefile.am 2008-02-14 12:08:29 UTC (rev 477)
+++ trunk/libspectrum/libspectrum/Makefile.am 2008-02-14 13:00:36 UTC (rev 478)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2001-2004 Philip Kendall
-## $Id: Makefile.am 3171 2007-09-25 15:38:23Z pak21 $
+## $Id: Makefile.am 3426 2007-12-18 19:29:30Z 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
@@ -57,7 +57,7 @@
zlib.c \
zxs.c
-libspectrum_la_LDFLAGS = -version-info 5:1:0 -no-undefined
+libspectrum_la_LDFLAGS = -version-info 6:0:1 -no-undefined
libspectrum_la_LIBADD = myglib/libmyglib.la @AUDIOFILE_LIBS@ -lm
Modified: trunk/libspectrum/libspectrum/README
===================================================================
--- trunk/libspectrum/libspectrum/README 2008-02-14 12:08:29 UTC (rev 477)
+++ trunk/libspectrum/libspectrum/README 2008-02-14 13:00:36 UTC (rev 478)
@@ -1,5 +1,5 @@
-libspectrum 0.3.0.1
-===================
+libspectrum 0.4.0
+=================
libspectrum is a library which is designed to make the input and
output of ZX Spectrum emulator files slightly easier than it would be
@@ -10,8 +10,8 @@
* Snapshots: .z80, .szx, .sna (all read/write), .zxs, .sp., .snp and
+D snapshots (read only).
-* Tape images: .tzx, .tap (read/write) and Warajevo .tap, Z80Em and
- CSW version 1 (read only).
+* Tape images: .tzx, .tap, .spc, .sta and .ltp (read/write) and
+ Warajevo .tap, Z80Em and CSW version 1 (read only).
* Input recordings: .rzx (read/write).
* Timex cartridges: .dck (read only).
* IDE hard disk images: .hdf (read/write).
@@ -50,4 +50,6 @@
'configure' for the first time.
Philip Kendall <phi...@sh...>
-11 May 2007
+5 January 2008
+
+$Id: README 3467 2008-01-04 23:27:31Z zubzero $
Modified: trunk/libspectrum/libspectrum/accessor.pl
===================================================================
--- trunk/libspectrum/libspectrum/accessor.pl 2008-02-14 12:08:29 UTC (rev 477)
+++ trunk/libspectrum/libspectrum/accessor.pl 2008-02-14 13:00:36 UTC (rev 478)
@@ -3,7 +3,7 @@
# accessor.pl: generate accessor functions
# Copyright (c) 2003-2004 Philip Kendall
-# $Id: accessor.pl 2890 2007-05-26 19:31:43Z zubzero $
+# $Id: accessor.pl 3408 2007-12-05 01:45:24Z 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,7 +102,16 @@
/* Timex-specific bits */
libspectrum_byte out_scld_hsr, out_scld_dec;
+ /* Interface 1 status */
+ int interface1_active;
+ int interface1_paged;
+ int interface1_drive_count;
+ int interface1_custom_rom;
+ libspectrum_byte* interface1_rom[1];
+ size_t interface1_rom_length[1]; /* Length of the ROM */
+
/* Betadisk status */
+ int beta_active;
int beta_paged;
int beta_direction; /* FDC seek direction:
zero => towards lower cylinders (hubwards)
@@ -110,6 +119,18 @@
libspectrum_byte beta_system, beta_track, beta_sector, beta_data,
beta_status;
+ /* Plus D status */
+ int plusd_active;
+ int plusd_paged;
+ int plusd_custom_rom;
+ int plusd_direction; /* FDC seek direction:
+ zero => towards lower cylinders (hubwards)
+ non-zero => towards higher cylinders (rimwards) */
+ libspectrum_byte plusd_control, plusd_track, plusd_sector, plusd_data,
+ plusd_status;
+ libspectrum_byte *plusd_rom[1];
+ libspectrum_byte *plusd_ram[1];
+
/* ZXATASP status */
int zxatasp_active;
int zxatasp_upload;
Modified: trunk/libspectrum/libspectrum/configure.in
===================================================================
--- trunk/libspectrum/libspectrum/configure.in 2008-02-14 12:08:29 UTC (rev 477)
+++ trunk/libspectrum/libspectrum/configure.in 2008-02-14 13:00:36 UTC (rev 478)
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
dnl Copyright (c) 1999-2004 Philip Kendall
-dnl $Id: configure.in 3157 2007-09-05 18:37:08Z zubzero $
+dnl $Id: configure.in 3426 2007-12-18 19:29:30Z 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
@@ -25,7 +25,7 @@
AM_CONFIG_HEADER(config.h)
dnl Use automake to produce `Makefile.in'
-AM_INIT_AUTOMAKE(libspectrum, 0.3.0.1)
+AM_INIT_AUTOMAKE(libspectrum, 0.4.0)
dnl Checks for programs.
AC_PROG_CC
Modified: trunk/libspectrum/libspectrum/csw.c
===================================================================
--- trunk/libspectrum/libspectrum/csw.c 2008-02-14 12:08:29 UTC (rev 477)
+++ trunk/libspectrum/libspectrum/csw.c 2008-02-14 13:00:36 UTC (rev 478)
@@ -2,7 +2,7 @@
Copyright (c) 2002-2007 Darren Salt, Fredrick Meunier
Based on tap.c, copyright (c) 2001 Philip Kendall
- $Id: csw.c 3190 2007-10-06 02:58:38Z zubzero $
+ $Id: csw.c 3272 2007-11-01 11:03: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
@@ -108,22 +108,22 @@
return LIBSPECTRUM_ERROR_UNKNOWN;
}
+ if( !length ) goto csw_empty;
+
if( compressed ) {
/* Compressed data... */
#ifdef HAVE_ZLIB_H
csw_block->data = NULL;
csw_block->length = 0;
error = libspectrum_zlib_inflate( buffer, length, &csw_block->data,
- &csw_block->length );
+ &csw_block->length );
if( error != LIBSPECTRUM_ERROR_NONE ) return error;
#else
libspectrum_print_error( LIBSPECTRUM_ERROR_UNKNOWN,
- "zlib not available to decompress gzipped file" );
+ "zlib not available to decompress gzipped file" );
return LIBSPECTRUM_ERROR_UNKNOWN;
#endif
- }
- else
- {
+ } else {
/* Claim memory for the data (it's one big lump) */
csw_block->length = length;
csw_block->data = malloc( length );
@@ -163,6 +163,11 @@
libspectrum_print_error( LIBSPECTRUM_ERROR_CORRUPT,
"libspectrum_csw_read: not enough data in buffer" );
return LIBSPECTRUM_ERROR_CORRUPT;
+
+ csw_empty:
+ free( block );
+ /* Successful completion */
+ return LIBSPECTRUM_ERROR_NONE;
}
static libspectrum_dword
@@ -252,47 +257,47 @@
libspectrum_tape_block_...
[truncated message content] |
|
From: <fr...@us...> - 2008-02-17 22:06:59
|
Revision: 480
http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=480&view=rev
Author: fredm
Date: 2008-02-17 14:06:57 -0800 (Sun, 17 Feb 2008)
Log Message:
-----------
Add entries for newly-supported tape and snap formats.
Modified Paths:
--------------
trunk/FuseImporter/Info.plist
trunk/fuse/fusepb/Info-Fuse.plist
trunk/fuse/fusepb/controllers/FuseController.m
trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html
Modified: trunk/FuseImporter/Info.plist
===================================================================
--- trunk/FuseImporter/Info.plist 2008-02-17 02:02:27 UTC (rev 479)
+++ trunk/FuseImporter/Info.plist 2008-02-17 22:06:57 UTC (rev 480)
@@ -17,19 +17,23 @@
<string>net.sourceforge.projects.fuse-emulator.Tape</string>
<string>net.sourceforge.projects.fuse-emulator.MassStorage</string>
<string>net.sourceforge.projects.fuse-emulator.Cartridge</string>
+ <string>net.sourceforge.projects.fuse-emulator.csw</string>
<string>net.sourceforge.projects.fuse-emulator.dck</string>
- <string>net.sourceforge.projects.fuse-emulator.csw</string>
+ <string>net.sourceforge.projects.fuse-emulator.dsk</string>
<string>net.sourceforge.projects.fuse-emulator.hdf</string>
- <string>net.sourceforge.projects.fuse-emulator.dsk</string>
+ <string>net.sourceforge.projects.fuse-emulator.ltp</string>
<string>net.sourceforge.projects.fuse-emulator.mgt</string>
+ <string>net.sourceforge.projects.fuse-emulator.mgtsnp</string>
<string>net.sourceforge.projects.fuse-emulator.rzx</string>
<string>net.sourceforge.projects.fuse-emulator.scl</string>
<string>net.sourceforge.projects.fuse-emulator.scr</string>
<string>net.sourceforge.projects.fuse-emulator.slt</string>
<string>net.sourceforge.projects.fuse-emulator.sna</string>
+ <string>net.sourceforge.projects.fuse-emulator.snp</string>
<string>net.sourceforge.projects.fuse-emulator.sp</string>
+ <string>net.sourceforge.projects.fuse-emulator.spc</string>
+ <string>net.sourceforge.projects.fuse-emulator.sta</string>
<string>net.sourceforge.projects.fuse-emulator.szx</string>
- <string>net.sourceforge.projects.fuse-emulator.snp</string>
<string>net.sourceforge.projects.fuse-emulator.tap</string>
<string>net.sourceforge.projects.fuse-emulator.trd</string>
<string>net.sourceforge.projects.fuse-emulator.tzx</string>
@@ -445,6 +449,74 @@
</array>
</dict>
</dict>
+ <dict>
+ <key>UTTypeConformsTo</key>
+ <array>
+ <string>net.sourceforge.projects.fuse-emulator.Tape</string>
+ </array>
+ <key>UTTypeDescription</key>
+ <string>ZX Spectrum SPC Tape Image</string>
+ <key>UTTypeIdentifier</key>
+ <string>net.sourceforge.projects.fuse-emulator.spc</string>
+ <key>UTTypeTagSpecification</key>
+ <dict>
+ <key>public.filename-extension</key>
+ <array>
+ <string>spc</string>
+ </array>
+ </dict>
+ </dict>
+ <dict>
+ <key>UTTypeConformsTo</key>
+ <array>
+ <string>net.sourceforge.projects.fuse-emulator.Tape</string>
+ </array>
+ <key>UTTypeDescription</key>
+ <string>ZX Spectrum STA Tape Image</string>
+ <key>UTTypeIdentifier</key>
+ <string>net.sourceforge.projects.fuse-emulator.sta</string>
+ <key>UTTypeTagSpecification</key>
+ <dict>
+ <key>public.filename-extension</key>
+ <array>
+ <string>sta</string>
+ </array>
+ </dict>
+ </dict>
+ <dict>
+ <key>UTTypeConformsTo</key>
+ <array>
+ <string>net.sourceforge.projects.fuse-emulator.Tape</string>
+ </array>
+ <key>UTTypeDescription</key>
+ <string>ZX Spectrum LTP Tape Image</string>
+ <key>UTTypeIdentifier</key>
+ <string>net.sourceforge.projects.fuse-emulator.ltp</string>
+ <key>UTTypeTagSpecification</key>
+ <dict>
+ <key>public.filename-extension</key>
+ <array>
+ <string>ltp</string>
+ </array>
+ </dict>
+ </dict>
+ <dict>
+ <key>UTTypeConformsTo</key>
+ <array>
+ <string>net.sourceforge.projects.fuse-emulator.Snapshot</string>
+ </array>
+ <key>UTTypeDescription</key>
+ <string>ZX Spectrum +D Snapshot</string>
+ <key>UTTypeIdentifier</key>
+ <string>net.sourceforge.projects.fuse-emulator.mgtsnp</string>
+ <key>UTTypeTagSpecification</key>
+ <dict>
+ <key>public.filename-extension</key>
+ <array>
+ <string>mgtsnp</string>
+ </array>
+ </dict>
+ </dict>
</array>
</dict>
</plist>
Modified: trunk/fuse/fusepb/Info-Fuse.plist
===================================================================
--- trunk/fuse/fusepb/Info-Fuse.plist 2008-02-17 02:02:27 UTC (rev 479)
+++ trunk/fuse/fusepb/Info-Fuse.plist 2008-02-17 22:06:57 UTC (rev 480)
@@ -221,6 +221,23 @@
<dict>
<key>CFBundleTypeExtensions</key>
<array>
+ <string>wav</string>
+ <string>WAV</string>
+ </array>
+ <key>CFBundleTypeIconFile</key>
+ <string>blank</string>
+ <key>CFBundleTypeName</key>
+ <string>ZX Spectrum Tape Image</string>
+ <key>CFBundleTypeRole</key>
+ <string>Viewer</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>net.sourceforge.projects.fuse-emulator.wav</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeExtensions</key>
+ <array>
<string>raw</string>
<string>RAW</string>
</array>
@@ -289,6 +306,57 @@
<dict>
<key>CFBundleTypeExtensions</key>
<array>
+ <string>spc</string>
+ <string>SPC</string>
+ </array>
+ <key>CFBundleTypeIconFile</key>
+ <string>blank</string>
+ <key>CFBundleTypeName</key>
+ <string>ZX Spectrum Tape Image</string>
+ <key>CFBundleTypeRole</key>
+ <string>Viewer</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>net.sourceforge.projects.fuse-emulator.spc</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeExtensions</key>
+ <array>
+ <string>sta</string>
+ <string>STA</string>
+ </array>
+ <key>CFBundleTypeIconFile</key>
+ <string>blank</string>
+ <key>CFBundleTypeName</key>
+ <string>ZX Spectrum Tape Image</string>
+ <key>CFBundleTypeRole</key>
+ <string>Viewer</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>net.sourceforge.projects.fuse-emulator.sta</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeExtensions</key>
+ <array>
+ <string>ltp</string>
+ <string>LTP</string>
+ </array>
+ <key>CFBundleTypeIconFile</key>
+ <string>blank</string>
+ <key>CFBundleTypeName</key>
+ <string>ZX Spectrum Tape Image</string>
+ <key>CFBundleTypeRole</key>
+ <string>Viewer</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>net.sourceforge.projects.fuse-emulator.ltp</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeExtensions</key>
+ <array>
<string>z80</string>
<string>Z80</string>
</array>
@@ -344,6 +412,23 @@
<dict>
<key>CFBundleTypeExtensions</key>
<array>
+ <string>mgtsnp</string>
+ <string>MGTSNP</string>
+ </array>
+ <key>CFBundleTypeIconFile</key>
+ <string>blank</string>
+ <key>CFBundleTypeName</key>
+ <string>ZX Spectrum Snapshot</string>
+ <key>CFBundleTypeRole</key>
+ <string>Viewer</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>net.sourceforge.projects.fuse-emulator.mgtsnp</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeExtensions</key>
+ <array>
<string>img</string>
<string>IMG</string>
</array>
Modified: trunk/fuse/fusepb/controllers/FuseController.m
===================================================================
--- trunk/fuse/fusepb/controllers/FuseController.m 2008-02-17 02:02:27 UTC (rev 479)
+++ trunk/fuse/fusepb/controllers/FuseController.m 2008-02-17 22:06:57 UTC (rev 480)
@@ -162,9 +162,10 @@
NSArray *compressedFileTypes = [NSArray arrayWithObjects:@"gz", @"GZ",
@"bz2", @"BZ2", nil];
- snapFileTypes = [NSMutableArray arrayWithObjects:@"slt", @"SLT", @"sna",
- @"SNA", @"sp", @"SP", @"szx", @"SZX", @"snp", @"SNP",
- @"z80", @"Z80", @"zxs", @"ZXS", nil];
+ snapFileTypes = [NSMutableArray arrayWithObjects:@"mgtsnp", @"MGTSNP",
+ @"slt", @"SLT", @"sna", @"SNA", @"sp", @"SP", @"szx",
+ @"SZX", @"snp", @"SNP", @"z80", @"Z80", @"zxs", @"ZXS",
+ nil];
[snapFileTypes retain];
dckFileTypes = [NSMutableArray arrayWithObjects:@"dck", @"DCK", nil];
@@ -185,9 +186,9 @@
scrFileType = [NSMutableArray arrayWithObjects:@"scr", @"SCR", nil];
[scrFileType retain];
- tapeFileTypes = [NSMutableArray arrayWithObjects:@"tap", @"tzx", @"csw",
- @"raw", @"wav",@"TAP", @"TZX", @"CSW", @"RAW", @"WAV",
- nil];
+ tapeFileTypes = [NSMutableArray arrayWithObjects:@"csw", @"ltp", @"raw",
+ @"spc", @"sta", @"tap", @"tzx", @"wav", @"CSW", @"LTP",
+ @"RAW", @"SPC", @"STA", @"TAP", @"TZX", @"WAV", nil];
[tapeFileTypes retain];
plus3FileTypes = [NSMutableArray arrayWithObjects:@"dsk", @"DSK", nil];
Modified: trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html
===================================================================
--- trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html 2008-02-17 02:02:27 UTC (rev 479)
+++ trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html 2008-02-17 22:06:57 UTC (rev 480)
@@ -14,7 +14,7 @@
name="What's New In Fuse?" id="What's New In Fuse?"></a><!-- AppleSegDescription="This section describes the changes for version 0.8.0 of the Fuse emulator." --></font>
<div class="refsect1" xml:lang="en" lang="en">
<h2><font face="Lucida Grande,Helvetica,Arial">What's new in Fuse
-For Mac OS X 20070728</font></h2>
+For Mac OS X 20080217</font></h2>
<ul>
<li><font face="Lucida Grande,Helvetica,Arial">New
features:</font></li>
@@ -39,7 +39,7 @@
<li><font face="Lucida Grande,Helvetica,Arial">Add Hi-Fi beeper
option for improved reproduction of multi-channel beeper tunes (e.g.
Fairlight
-2, Wham - the Music Box) (Fredrick Meunier).</font></li>
+2 and Wham - the Music Box) (Fredrick Meunier).</font></li>
<li><font face="Lucida Grande,Helvetica,Arial">Add support for
saving tape images without using tape traps (Fredrick
Meunier).<br>
@@ -51,10 +51,15 @@
saving CSW tape
images and TZX
direct recording blocks (Fredrick Meunier).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Add support for
+loading from SPC, STA and LTP tape formats (Stuart Brady).<br>
+ </font></li>
<li><font face="Lucida Grande,Helvetica,Arial">Allow distinction
between "soft" resets (activing the reset line on the Z80) and "hard"
-resets (pulling the power) (Philip Kendall).<br>
- </font></li>
+resets (pulling the power) (Philip Kendall).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Add support for
+saving Interface I state information to z80 and szx snapshots (Fredrick
+Meunier).</font></li>
</ul>
</li>
<li><font face="Lucida Grande,Helvetica,Arial">Emulation core
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2008-05-04 09:11:08
|
Revision: 525
http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=525&view=rev
Author: fredm
Date: 2008-05-04 02:11:05 -0700 (Sun, 04 May 2008)
Log Message:
-----------
Add support for TZX custom screenshot and tape inlay blocks.
Modified Paths:
--------------
trunk/FuseGenerator/GeneratePreviewForURL.m
trunk/FuseGenerator/GenerateThumbnailForURL.m
trunk/FuseGenerator/LibspectrumSCRExtractor.h
trunk/FuseGenerator/LibspectrumSCRExtractor.m
trunk/fuse/TODO
Modified: trunk/FuseGenerator/GeneratePreviewForURL.m
===================================================================
--- trunk/FuseGenerator/GeneratePreviewForURL.m 2008-04-29 13:50:38 UTC (rev 524)
+++ trunk/FuseGenerator/GeneratePreviewForURL.m 2008-05-04 09:11:05 UTC (rev 525)
@@ -1,5 +1,5 @@
/* GeneratePreviewForURL.m: Extract preview from libspectrum-supported Spectrum files
- Copyright (c) 2005 Fredrick Meunier
+ Copyright (c) 2007-2008 Fredrick Meunier
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
#include <CoreFoundation/CoreFoundation.h>
#include <CoreServices/CoreServices.h>
#include <QuickLook/QuickLook.h>
+#include <QuickLook/QLGenerator.h>
#import "JWSpectrumScreen/JWSpectrumScreen.h"
#import "LibspectrumSCRExtractor.h"
@@ -36,42 +37,73 @@
OSStatus GeneratePreviewForURL(void *thisInterface, QLPreviewRequestRef preview, CFURLRef url, CFStringRef contentTypeUTI, CFDictionaryRef options)
{
- NSAutoreleasePool *pool;
- LibspectrumSCRExtractor *speccyFile;
+ NSAutoreleasePool *pool;
+ LibspectrumSCRExtractor *speccyFile;
- /* Don't assume that there is an autorelease pool around the calling of this function. */
- pool = [[NSAutoreleasePool alloc] init];
+ /* Don't assume that there is an autorelease pool around the calling of
+ this function. */
+ pool = [[NSAutoreleasePool alloc] init];
- speccyFile = [[[LibspectrumSCRExtractor alloc] initWithContentsOfURL:(NSURL*)url] autorelease];
+ speccyFile = [[[LibspectrumSCRExtractor alloc]
+ initWithContentsOfURL:(NSURL*)url] autorelease];
- JWSpectrumScreen* screen = [[[JWSpectrumScreen alloc] initFromData:[speccyFile scrData]] autorelease];
- NSBitmapImageRep* imageRep = [[screen imageRep] retain];
- NSSize canvasSize = [screen canvasSize];
-
- CGContextRef cgContext = QLPreviewRequestCreateContext(preview, *(CGSize *)&canvasSize, false, NULL);
- if(cgContext) {
- NSGraphicsContext* context = [NSGraphicsContext graphicsContextWithGraphicsPort:(void*)cgContext flipped:YES];
- if(context) {
- [NSGraphicsContext saveGraphicsState];
- [NSGraphicsContext setCurrentContext:context];
-
- // Now we're ready to draw using Cocoa.
- NSImage* image = [[[NSImage alloc] initWithSize:canvasSize] autorelease];
- [image addRepresentation:imageRep];
- NSRect imageRect = NSMakeRect(0.0, 0.0, canvasSize.width, canvasSize.height);
- [image drawAtPoint:NSMakePoint(0.0, 0.0)
- fromRect:imageRect
- operation:NSCompositeSourceOver
- fraction:1.0];
- [NSGraphicsContext restoreGraphicsState];
- }
- QLPreviewRequestFlushContext(preview, cgContext);
- CFRelease(cgContext);
- }
-
+ /* No preview for tapes, these are going to have inlays etc. which are more
+ like album art in mp3s than file previews IMO */
+ if( [speccyFile class] == LIBSPECTRUM_CLASS_TAPE ) {
[pool release];
+ return noErr;
+ }
- return noErr;
+ switch( [speccyFile image_type] ) {
+ case TYPE_SCR:
+ {
+ JWSpectrumScreen* screen =
+ [[[JWSpectrumScreen alloc] initFromData:[speccyFile scrData]]
+ autorelease];
+ NSBitmapImageRep* imageRep = [[screen imageRep] retain];
+ NSSize canvasSize = [screen canvasSize];
+
+ CGContextRef cgContext =
+ QLPreviewRequestCreateContext( preview, *(CGSize *)&canvasSize,
+ false, NULL );
+ if( cgContext ) {
+ NSGraphicsContext* context =
+ [NSGraphicsContext graphicsContextWithGraphicsPort:(void*)cgContext
+ flipped:YES];
+ if(context) {
+ [NSGraphicsContext saveGraphicsState];
+ [NSGraphicsContext setCurrentContext:context];
+
+ /* Now we're ready to draw using Cocoa. */
+ NSImage* image =
+ [[[NSImage alloc] initWithSize:canvasSize] autorelease];
+ [image addRepresentation:imageRep];
+ NSRect imageRect = NSMakeRect( 0.0, 0.0, canvasSize.width,
+ canvasSize.height );
+ [image drawAtPoint:NSMakePoint(0.0, 0.0)
+ fromRect:imageRect
+ operation:NSCompositeSourceOver
+ fraction:1.0];
+ [NSGraphicsContext restoreGraphicsState];
+ }
+ QLPreviewRequestFlushContext(preview, cgContext);
+ CFRelease(cgContext);
+ }
+ }
+ break;
+ case TYPE_IMAGEIO:
+ QLPreviewRequestSetDataRepresentation( preview,
+ (CFDataRef)[speccyFile scrData],
+ kUTTypeImage,
+ NULL );
+ break;
+ default:
+ break;
+ }
+
+ [pool release];
+
+ return noErr;
}
void CancelPreviewGeneration(void* thisInterface, QLPreviewRequestRef preview)
Modified: trunk/FuseGenerator/GenerateThumbnailForURL.m
===================================================================
--- trunk/FuseGenerator/GenerateThumbnailForURL.m 2008-04-29 13:50:38 UTC (rev 524)
+++ trunk/FuseGenerator/GenerateThumbnailForURL.m 2008-05-04 09:11:05 UTC (rev 525)
@@ -1,5 +1,5 @@
/* GenerateThumbnailForURL.m: Extract thumbnail from libspectrum-supported Spectrum files
- Copyright (c) 2005 Fredrick Meunier
+ Copyright (c) 2007-2008 Fredrick Meunier
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
#include <CoreFoundation/CoreFoundation.h>
#include <CoreServices/CoreServices.h>
#include <QuickLook/QuickLook.h>
+#include <QuickLook/QLGenerator.h>
#import "JWSpectrumScreen/JWSpectrumScreen.h"
#import "LibspectrumSCRExtractor.h"
@@ -36,44 +37,64 @@
OSStatus GenerateThumbnailForURL(void *thisInterface, QLThumbnailRequestRef thumbnail, CFURLRef url, CFStringRef contentTypeUTI, CFDictionaryRef options, CGSize maxSize)
{
- NSAutoreleasePool *pool;
- LibspectrumSCRExtractor *speccyFile;
+ NSAutoreleasePool *pool;
+ LibspectrumSCRExtractor *speccyFile;
- /* Don't assume that there is an autorelease pool around the calling of this function. */
- pool = [[NSAutoreleasePool alloc] init];
+ /* Don't assume that there is an autorelease pool around the calling of this
+ function. */
+ pool = [[NSAutoreleasePool alloc] init];
- speccyFile = [[[LibspectrumSCRExtractor alloc] initWithContentsOfURL:(NSURL*)url] autorelease];
+ speccyFile = [[[LibspectrumSCRExtractor alloc]
+ initWithContentsOfURL:(NSURL*)url] autorelease];
- if( [speccyFile scrData] ) {
- JWSpectrumScreen* screen = [[[JWSpectrumScreen alloc] initFromData:[speccyFile scrData]] autorelease];
- NSBitmapImageRep* imageRep = [[screen imageRep] retain];
- NSSize canvasSize = [screen canvasSize];
-
- CGContextRef cgContext = QLThumbnailRequestCreateContext(thumbnail, *(CGSize *)&canvasSize, false, NULL);
- if(cgContext) {
- NSGraphicsContext* context = [NSGraphicsContext graphicsContextWithGraphicsPort:(void*)cgContext flipped:YES];
- if(context) {
- [NSGraphicsContext saveGraphicsState];
- [NSGraphicsContext setCurrentContext:context];
-
- // Now we're ready to draw using Cocoa.
- NSImage* image = [[[NSImage alloc] initWithSize:canvasSize] autorelease];
- [image addRepresentation:imageRep];
- NSRect imageRect = NSMakeRect(0.0, 0.0, canvasSize.width, canvasSize.height);
- [image drawAtPoint:NSMakePoint(0.0, 0.0)
- fromRect:imageRect
- operation:NSCompositeSourceOver
- fraction:1.0];
- [NSGraphicsContext restoreGraphicsState];
- }
- QLThumbnailRequestFlushContext(thumbnail, cgContext);
- CFRelease(cgContext);
- }
+ switch( [speccyFile image_type] ) {
+ case TYPE_SCR:
+ {
+ JWSpectrumScreen* screen =
+ [[[JWSpectrumScreen alloc] initFromData:[speccyFile scrData]] autorelease];
+ NSBitmapImageRep* imageRep = [[screen imageRep] retain];
+ NSSize canvasSize = [screen canvasSize];
+
+ CGContextRef cgContext =
+ QLThumbnailRequestCreateContext( thumbnail, *(CGSize *)&canvasSize,
+ false, NULL );
+ if( cgContext ) {
+ NSGraphicsContext* context =
+ [NSGraphicsContext graphicsContextWithGraphicsPort:(void*)cgContext
+ flipped:YES];
+ if( context ) {
+ [NSGraphicsContext saveGraphicsState];
+ [NSGraphicsContext setCurrentContext:context];
+
+ // Now we're ready to draw using Cocoa.
+ NSImage* image =
+ [[[NSImage alloc] initWithSize:canvasSize] autorelease];
+ [image addRepresentation:imageRep];
+ NSRect imageRect =
+ NSMakeRect( 0.0, 0.0, canvasSize.width, canvasSize.height );
+ [image drawAtPoint:NSMakePoint(0.0, 0.0)
+ fromRect:imageRect
+ operation:NSCompositeSourceOver
+ fraction:1.0];
+ [NSGraphicsContext restoreGraphicsState];
+ }
+ QLThumbnailRequestFlushContext( thumbnail, cgContext );
+ CFRelease( cgContext );
+ }
}
-
- [pool release];
+ break;
+ case TYPE_IMAGEIO:
+ QLThumbnailRequestSetImageWithData( thumbnail,
+ (CFDataRef)[speccyFile scrData],
+ (CFDictionaryRef)[speccyFile scrOptions] );
+ break;
+ default:
+ break;
+ }
+
+ [pool release];
- return noErr;
+ return noErr;
}
void CancelThumbnailGeneration(void* thisInterface, QLThumbnailRequestRef thumbnail)
Modified: trunk/FuseGenerator/LibspectrumSCRExtractor.h
===================================================================
--- trunk/FuseGenerator/LibspectrumSCRExtractor.h 2008-04-29 13:50:38 UTC (rev 524)
+++ trunk/FuseGenerator/LibspectrumSCRExtractor.h 2008-05-04 09:11:05 UTC (rev 525)
@@ -26,9 +26,17 @@
#include <sys/types.h>
#include <libspectrum.h>
+typedef enum image_t {
+ TYPE_NONE,
+ TYPE_SCR,
+ TYPE_IMAGEIO,
+} image_t;
+
@interface LibspectrumSCRExtractor : NSObject {
NSString *filename;
NSData *scrData;
+ NSDictionary *scrOptions;
+ image_t image_type;
unsigned char *buffer;
size_t length;
libspectrum_id_t type;
@@ -38,6 +46,8 @@
- (libspectrum_class_t) class;
- (NSData*) scrData;
+- (NSDictionary*) scrOptions;
+- (image_t) image_type;
- (void) processFile;
Modified: trunk/FuseGenerator/LibspectrumSCRExtractor.m
===================================================================
--- trunk/FuseGenerator/LibspectrumSCRExtractor.m 2008-04-29 13:50:38 UTC (rev 524)
+++ trunk/FuseGenerator/LibspectrumSCRExtractor.m 2008-05-04 09:11:05 UTC (rev 525)
@@ -1,5 +1,5 @@
/* LibspectrumSCRExtractor.m: Extract SCR image from libspectrum-supported Spectrum files
- Copyright (c) 2007 Fredrick Meunier
+ Copyright (c) 2007-2008 Fredrick Meunier
This 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,193 +43,264 @@
static int
mmap_file( const char *filename, unsigned char **buffer, size_t *length )
{
- int fd; struct stat file_info;
-
- if( ( fd = open( filename, O_RDONLY ) ) == -1 ) {
- NSLog(@"LibspectrumSCRExtractor: couldn't open `%s': %s\n", filename,
- strerror( errno ) );
- return 1;
- }
+ int fd; struct stat file_info;
- if( fstat( fd, &file_info) ) {
- NSLog(@"LibspectrumSCRExtractor: couldn't stat `%s': %s\n", filename,
- strerror( errno ) );
- close(fd);
- return 1;
- }
+ if( ( fd = open( filename, O_RDONLY ) ) == -1 ) {
+ NSLog(@"LibspectrumSCRExtractor: couldn't open `%s': %s\n", filename,
+ strerror( errno ) );
+ return 1;
+ }
- (*length) = file_info.st_size;
+ if( fstat( fd, &file_info) ) {
+ NSLog(@"LibspectrumSCRExtractor: couldn't stat `%s': %s\n", filename,
+ strerror( errno ) );
+ close(fd);
+ return 1;
+ }
- (*buffer) = mmap( 0, *length, PROT_READ, MAP_SHARED, fd, 0 );
- if( (*buffer) == (void*)-1 ) {
- NSLog(@"LibspectrumSCRExtractor: couldn't mmap `%s': %s\n", filename,
- strerror( errno ) );
- close(fd);
- return 1;
- }
+ (*length) = file_info.st_size;
- if( close(fd) ) {
- NSLog(@"LibspectrumSCRExtractor: couldn't close `%s': %s\n", filename,
- strerror( errno ) );
- munmap( *buffer, *length );
- return 1;
- }
+ (*buffer) = mmap( 0, *length, PROT_READ, MAP_SHARED, fd, 0 );
+ if( (*buffer) == (void*)-1 ) {
+ NSLog(@"LibspectrumSCRExtractor: couldn't mmap `%s': %s\n", filename,
+ strerror( errno ) );
+ close(fd);
+ return 1;
+ }
- return 0;
+ if( close(fd) ) {
+ NSLog(@"LibspectrumSCRExtractor: couldn't close `%s': %s\n", filename,
+ strerror( errno ) );
+ munmap( *buffer, *length );
+ return 1;
+ }
+
+ return 0;
}
@implementation LibspectrumSCRExtractor
- (id)initWithContentsOfURL:(NSURL*)aURL
{
- const char *fileString;
- self = [super init];
-
- fileString = [[NSFileManager defaultManager] fileSystemRepresentationWithPath:[aURL path]];
- filename = [NSString stringWithUTF8String:fileString];
+ const char *fileString;
+ self = [super init];
- scrData = nil;
+ fileString = [[NSFileManager defaultManager] fileSystemRepresentationWithPath:[aURL path]];
+ filename = [NSString stringWithUTF8String:fileString];
- return self;
+ scrData = nil;
+ scrOptions = nil;
+
+ image_type = TYPE_NONE;
+
+ return self;
}
- (libspectrum_class_t) class
{
- return lsclass;
+ if(!scrData) { [self processFile]; }
+
+ return lsclass;
}
- (NSData*) scrData
{
- if(!scrData) {
- [self processFile];
- }
-
- return scrData;
+ if(!scrData) { [self processFile]; }
+
+ return scrData;
}
+- (NSDictionary*) scrOptions
+{
+ if(!scrData) { [self processFile]; }
+
+ return scrOptions;
+}
+
+- (image_t) image_type
+{
+ if(!scrData) { [self processFile]; }
+
+ return image_type;
+}
+
- (void) processFile
{
- if( mmap_file( [filename UTF8String], &buffer, &length ) ) return;
+ if( mmap_file( [filename UTF8String], &buffer, &length ) ) return;
- if( libspectrum_identify_file( &type, [filename UTF8String], buffer, length ) ) {
- munmap( buffer, length );
- return;
- }
+ if( libspectrum_identify_file_with_class( &type, &lsclass,
+ [filename UTF8String],
+ buffer, length ) ) {
+ munmap( buffer, length );
+ return;
+ }
- if( libspectrum_identify_class( &lsclass, type ) ) {
- munmap( buffer, length );
- return;
- }
+ switch( lsclass ) {
- switch( lsclass ) {
+ case LIBSPECTRUM_CLASS_UNKNOWN:
+ NSLog( @"LibspectrumSCRExtractor: couldn't identify `%s'\n", [filename UTF8String] );
+ break;
- case LIBSPECTRUM_CLASS_UNKNOWN:
- NSLog( @"LibspectrumSCRExtractor: couldn't identify `%s'\n", [filename UTF8String] );
- break;
+ case LIBSPECTRUM_CLASS_RECORDING:
+ [self process_rzx];
+ break;
- case LIBSPECTRUM_CLASS_RECORDING:
- [self process_rzx];
- break;
+ case LIBSPECTRUM_CLASS_SNAPSHOT:
+ [self process_snap];
+ break;
- case LIBSPECTRUM_CLASS_SNAPSHOT:
- [self process_snap];
- break;
+ case LIBSPECTRUM_CLASS_TAPE:
+ [self process_tape];
+ break;
- case LIBSPECTRUM_CLASS_TAPE:
- [self process_tape];
- break;
+ case LIBSPECTRUM_CLASS_SCREENSHOT:
+ [self process_scr];
+ break;
- case LIBSPECTRUM_CLASS_SCREENSHOT:
- [self process_scr];
- break;
+ case LIBSPECTRUM_CLASS_MICRODRIVE:
+ [self process_mdr];
+ break;
- case LIBSPECTRUM_CLASS_MICRODRIVE:
- [self process_mdr];
- break;
+ case LIBSPECTRUM_CLASS_DISK_PLUS3:
+ case LIBSPECTRUM_CLASS_DISK_TRDOS:
+ case LIBSPECTRUM_CLASS_HARDDISK:
+ case LIBSPECTRUM_CLASS_CARTRIDGE_TIMEX:
+ case LIBSPECTRUM_CLASS_CARTRIDGE_IF2:
+ break;
- case LIBSPECTRUM_CLASS_DISK_PLUS3:
- case LIBSPECTRUM_CLASS_DISK_TRDOS:
- case LIBSPECTRUM_CLASS_HARDDISK:
- case LIBSPECTRUM_CLASS_CARTRIDGE_TIMEX:
- case LIBSPECTRUM_CLASS_CARTRIDGE_IF2:
- break;
+ default:
+ NSLog(@"LibspectrumSCRExtractor: loadFile: unknown class %d!\n", type );
+ }
- default:
- NSLog(@"LibspectrumSCRExtractor: loadFile: unknown class %d!\n", type );
- }
-
- if( munmap( buffer, length ) == -1 ) {
- NSLog(@"LibspectrumSCRExtractor: couldn't munmap `%s': %s\n", [filename UTF8String],
- strerror( errno ) );
- return;
- }
+ if( munmap( buffer, length ) == -1 ) {
+ NSLog(@"LibspectrumSCRExtractor: couldn't munmap `%s': %s\n", [filename UTF8String],
+ strerror( errno ) );
+ return;
+ }
}
-// If a tape has a ROM header block for Bytes length 6192, location 16384 followed by
-// a ROM data block of 6192 bytes, use that as a SCR
+// If a tape has a ROM header block for Bytes length 6192, location 16384
+// followed by a ROM data block of 6192 bytes, use that as a SCR
+// Also have a look at turbo blocks as sometimes the timing is just a bit
+// different from the ROM values, but are otherwise identical
+// And finally look for TZX custom blocks with loading screens or tape inlays
- (void) process_tape
{
- int error = 0;
+ int error = 0;
- libspectrum_tape *tape;
- libspectrum_tape_iterator iterator;
- libspectrum_tape_block *block;
+ libspectrum_tape *tape;
+ libspectrum_tape_iterator iterator;
+ libspectrum_tape_block *block;
- int seen_scr_header = 0;
+ int seen_scr_header = 0;
- error = libspectrum_tape_alloc( &tape );
- if( error != LIBSPECTRUM_ERROR_NONE ) {
- return;
- }
+ error = libspectrum_tape_alloc( &tape );
+ if( error != LIBSPECTRUM_ERROR_NONE ) { return; }
- error = libspectrum_tape_read( tape, buffer, length, LIBSPECTRUM_ID_UNKNOWN,
- [filename UTF8String] );
- if( error ) { return; }
+ error = libspectrum_tape_read( tape, buffer, length, LIBSPECTRUM_ID_UNKNOWN,
+ [filename UTF8String] );
+ if( error ) { return; }
- block = libspectrum_tape_iterator_init( &iterator, tape );
+ block = libspectrum_tape_iterator_init( &iterator, tape );
- while( block ) {
-
- switch( libspectrum_tape_block_type( block ) ) {
+ while( block ) {
+
+ switch( libspectrum_tape_block_type( block ) ) {
- case LIBSPECTRUM_TAPE_BLOCK_ROM:
- /* See if this looks like a standard Spectrum screen and if so
- display it */
- if( seen_scr_header ) {
- // SCREEN$ is 6912 bytes plus flag and checksum
- if( libspectrum_tape_block_data_length( block ) == STANDARD_SCR_SIZE + 2 ) {
- libspectrum_byte *data = libspectrum_tape_block_data( block );
+ case LIBSPECTRUM_TAPE_BLOCK_ROM:
+ case LIBSPECTRUM_TAPE_BLOCK_TURBO:
+ /* See if this looks like a standard Spectrum screen and if so
+ display it if we haben't already assigned an image */
+ if( scrData ) continue;
- scrData = [NSData dataWithBytes:(const void *)(data+1) length:STANDARD_SCR_SIZE];
- goto done;
- } else {
- seen_scr_header = 0;
- }
- } else {
- // Header is 17 bytes plus flag and checksum
- if( libspectrum_tape_block_data_length( block ) == 19 ) {
- libspectrum_byte *data = libspectrum_tape_block_data( block );
+ if( seen_scr_header ) {
+ // SCREEN$ is 6912 bytes plus flag and checksum
+ if( libspectrum_tape_block_data_length( block ) ==
+ STANDARD_SCR_SIZE + 2 ) {
+ libspectrum_byte *data = libspectrum_tape_block_data( block );
- /* Flag byte is 0x00 for headers, type is 3 for CODE, length is 6912 */
- if( data[0] == 0x00 && data[1] == 0x03 &&
- ( data[12] + data[13] * 0x100 == STANDARD_SCR_SIZE ) ) {
- seen_scr_header = 1;
- }
- }
- }
- break;
+ scrData = [NSData dataWithBytes:(const void *)(data+1)
+ length:STANDARD_SCR_SIZE];
- default:
- seen_scr_header = 0;
- }
-
- block = libspectrum_tape_iterator_next( &iterator );
+ image_type = TYPE_SCR;
+ goto done;
+ } else {
+ seen_scr_header = 0;
+ }
+ } else {
+ // Header is 17 bytes plus flag and checksum
+ if( libspectrum_tape_block_data_length( block ) == 19 ) {
+ libspectrum_byte *data = libspectrum_tape_block_data( block );
+
+ /* Flag byte is 0x00 for headers, type is 3 for CODE, length is 6912 */
+ if( data[0] == 0x00 && data[1] == 0x03 &&
+ ( data[12] + data[13] * 0x100 == STANDARD_SCR_SIZE ) ) {
+ seen_scr_header = 1;
+ }
+ }
+ }
+ break;
+
+ case LIBSPECTRUM_TAPE_BLOCK_CUSTOM:
+ {
+ char* description = libspectrum_tape_block_text( block );
+ if( !description ) { continue; }
+
+ if( !scrData &&
+ strncmp( "Spectrum Screen ", description, 0x10 ) == 0 ) {
+ size_t data_length = libspectrum_tape_block_data_length( block );
+ libspectrum_byte *data = libspectrum_tape_block_data( block );
+ size_t scr_length = data_length - data[0] - 2;
+
+ if( scr_length == STANDARD_SCR_SIZE ||
+ scr_length == HICOLOUR_SCR_SIZE ||
+ scr_length == HIRES_SCR_SIZE ) {
+ scrData = [NSData dataWithBytes:(const void *)(data+data[0]+2)
+ length:scr_length];
+
+ image_type = TYPE_SCR;
+ }
+ } else if( strncmp( "Picture ", description, 0x10 ) == 0 ) {
+ size_t data_length = libspectrum_tape_block_data_length( block );
+ libspectrum_byte *data = libspectrum_tape_block_data( block );
+ size_t picture_length = data_length - data[1] - 2;
+
+ /* Image is an 'Inlay Card' and is in GIF or JPEG format */
+ if( data[1] == 0 && ( data[0] == 0 || data[0] == 1 ) ) {
+ id myValue = nil;
+
+ switch( data[0] ) {
+ case 0: myValue = (NSString*)kUTTypeGIF; break;
+ case 1: myValue = (NSString*)kUTTypeJPEG; break;
+ }
+
+ scrOptions =
+ [NSDictionary dictionaryWithObject:myValue
+ forKey:(NSString*)kCGImageSourceTypeIdentifierHint];
+
+ scrData = [NSData dataWithBytes:data + data[1] + 2
+ length:picture_length];
+
+ image_type = TYPE_IMAGEIO;
+
+ goto done;
+ }
+ }
+ }
+ break;
+
+ default:
+ seen_scr_header = 0;
}
+
+ block = libspectrum_tape_iterator_next( &iterator );
+ }
+
done:
- error = libspectrum_tape_free( tape );
- if( error ) { return; }
+ error = libspectrum_tape_free( tape );
+ if( error ) { return; }
}
// FIXME: Could look for first screen file on cart?
@@ -240,152 +311,152 @@
// Populate scrData directly
- (void) process_scr
{
- scrData = [NSData dataWithBytes:(const void *)buffer length:length];
+ scrData = [NSData dataWithBytes:(const void *)buffer length:length];
+ image_type = TYPE_SCR;
}
// Extract first snap then delegate to process_snap2
- (void) process_rzx
{
- int error = 0;
- libspectrum_rzx *rzx;
- libspectrum_snap *snap;
-
- error = libspectrum_rzx_alloc( &rzx ); if( error ) return;
+ int error = 0;
+ libspectrum_rzx *rzx;
+ libspectrum_snap *snap;
- error = libspectrum_rzx_read( rzx, buffer, length );
- if( error != LIBSPECTRUM_ERROR_NONE ) {
- return;
- }
+ error = libspectrum_rzx_alloc( &rzx ); if( error ) return;
- error = libspectrum_rzx_start_playback( rzx, 0, &snap );
- if( error ) { return; }
+ error = libspectrum_rzx_read( rzx, buffer, length );
+ if( error != LIBSPECTRUM_ERROR_NONE ) { return; }
- if( snap ) {
- [self process_snap2:snap];
- }
+ error = libspectrum_rzx_start_playback( rzx, 0, &snap );
+ if( error ) { return; }
- error = libspectrum_rzx_free( rzx );
- if( error ) { return; }
+ if( snap ) {
+ [self process_snap2:snap];
+ }
+
+ error = libspectrum_rzx_free( rzx );
+ if( error ) { return; }
}
// Extract active screen from snap
- (void) process_snap
{
- int error = 0;
- libspectrum_snap *snap;
+ int error = 0;
+ libspectrum_snap *snap;
- error = libspectrum_snap_alloc( &snap );
- if( error != LIBSPECTRUM_ERROR_NONE ) {
- return;
- }
+ error = libspectrum_snap_alloc( &snap );
+ if( error != LIBSPECTRUM_ERROR_NONE ) { return; }
- error = libspectrum_snap_read( snap, buffer, length, type, [filename UTF8String] );
- if( error ) {
- libspectrum_snap_free( snap );
- return;
- }
+ error = libspectrum_snap_read( snap, buffer, length, type,
+ [filename UTF8String] );
+ if( error ) { libspectrum_snap_free( snap ); return; }
- [self process_snap2:snap];
+ [self process_snap2:snap];
- error = libspectrum_snap_free( snap );
- if( error ) { return; }
+ error = libspectrum_snap_free( snap );
+ if( error ) { return; }
}
- (void) process_snap2:(libspectrum_snap *)snap
{
- switch(libspectrum_snap_machine(snap)) {
- case LIBSPECTRUM_MACHINE_16:
- case LIBSPECTRUM_MACHINE_48:
- [self process_snap_sinclair48:snap];
- break;
-
- case LIBSPECTRUM_MACHINE_TC2048:
- case LIBSPECTRUM_MACHINE_TC2068:
- case LIBSPECTRUM_MACHINE_TS2068:
- [self process_snap_timex:snap];
- break;
-
- case LIBSPECTRUM_MACHINE_128:
- case LIBSPECTRUM_MACHINE_PLUS2:
- case LIBSPECTRUM_MACHINE_PENT:
- case LIBSPECTRUM_MACHINE_PLUS2A:
- case LIBSPECTRUM_MACHINE_PLUS3:
- case LIBSPECTRUM_MACHINE_SCORP:
- case LIBSPECTRUM_MACHINE_PLUS3E:
- case LIBSPECTRUM_MACHINE_PENT512:
- case LIBSPECTRUM_MACHINE_PENT1024:
- [self process_snap_sinclair128:snap];
- break;
+ switch(libspectrum_snap_machine(snap)) {
+ case LIBSPECTRUM_MACHINE_16:
+ case LIBSPECTRUM_MACHINE_48:
+ [self process_snap_sinclair48:snap];
+ break;
+
+ case LIBSPECTRUM_MACHINE_TC2048:
+ case LIBSPECTRUM_MACHINE_TC2068:
+ case LIBSPECTRUM_MACHINE_TS2068:
+ [self process_snap_timex:snap];
+ break;
+
+ case LIBSPECTRUM_MACHINE_128:
+ case LIBSPECTRUM_MACHINE_PLUS2:
+ case LIBSPECTRUM_MACHINE_PENT:
+ case LIBSPECTRUM_MACHINE_PLUS2A:
+ case LIBSPECTRUM_MACHINE_PLUS3:
+ case LIBSPECTRUM_MACHINE_SCORP:
+ case LIBSPECTRUM_MACHINE_PLUS3E:
+ case LIBSPECTRUM_MACHINE_PENT512:
+ case LIBSPECTRUM_MACHINE_PENT1024:
+ [self process_snap_sinclair128:snap];
+ break;
- case LIBSPECTRUM_MACHINE_SE:
- [self process_snap_se:snap];
- break;
-
- default:
- break;
- }
+ case LIBSPECTRUM_MACHINE_SE:
+ [self process_snap_se:snap];
+ break;
+
+ default:
+ break;
+ }
}
- (void) process_snap_sinclair48:(libspectrum_snap *)snap
{
- // Just need to copy out first 6912 bytes from page 5
- scrData = [NSData dataWithBytes:(const void *)libspectrum_snap_pages( snap, 5 ) length:STANDARD_SCR_SIZE];
+ // Just need to copy out first 6912 bytes from page 5
+ scrData = [NSData dataWithBytes:(const void *)libspectrum_snap_pages( snap, 5 )
+ length:STANDARD_SCR_SIZE];
+ image_type = TYPE_SCR;
}
- (void) process_snap_sinclair128:(libspectrum_snap *)snap
{
- // Check which screen page is active and copy standard 6912 bytes
- int screen = ( libspectrum_snap_out_128_memoryport( snap ) & 0x08 ) ? 7 : 5;
- scrData = [NSData dataWithBytes:(const void *)libspectrum_snap_pages( snap, screen ) length:STANDARD_SCR_SIZE];
+ // Check which screen page is active and copy standard 6912 bytes
+ int screen = ( libspectrum_snap_out_128_memoryport( snap ) & 0x08 ) ? 7 : 5;
+ scrData = [NSData dataWithBytes:(const void *)libspectrum_snap_pages( snap, screen )
+ length:STANDARD_SCR_SIZE];
+ image_type = TYPE_SCR;
}
- (void) process_snap_timex:(libspectrum_snap *)snap inPage:(int)page
{
- // Check which screen mode and pages are active and copy as appropriate
- libspectrum_byte scr_data[HIRES_SCR_SIZE];
- int scr_length;
+ // Check which screen mode and pages are active and copy as appropriate
+ libspectrum_byte scr_data[HIRES_SCR_SIZE];
+ int scr_length;
- memset( scr_data, 0, HIRES_SCR_SIZE );
+ memset( scr_data, 0, HIRES_SCR_SIZE );
- if( libspectrum_snap_out_scld_dec( snap ) & 0x04 ) {
- memcpy( scr_data,
- libspectrum_snap_pages( snap, page ),
- MONO_BITMAP_SIZE );
- memcpy( scr_data + MONO_BITMAP_SIZE,
- libspectrum_snap_pages( snap, page ) + ALTDFILE_OFFSET,
- MONO_BITMAP_SIZE );
- scr_data[HIRES_ATTR] = ( libspectrum_snap_out_scld_dec( snap ) & HIRESCOLMASK ) | 0x07;
- scr_length = HIRES_SCR_SIZE;
- } else if( libspectrum_snap_out_scld_dec( snap ) & 0x02 ) {
- memcpy( scr_data,
- libspectrum_snap_pages( snap, page ),
- MONO_BITMAP_SIZE );
- memcpy( scr_data + MONO_BITMAP_SIZE,
- libspectrum_snap_pages( snap, page ) + ALTDFILE_OFFSET,
- MONO_BITMAP_SIZE );
- scr_length = HICOLOUR_SCR_SIZE;
- } else { /* ALTDFILE and default */
- int offset = ( libspectrum_snap_out_scld_dec( snap ) & 0x01 ) ? ALTDFILE_OFFSET : 0x0000;
- scr_length = STANDARD_SCR_SIZE;
- memcpy( scr_data,
- libspectrum_snap_pages( snap, page ) + offset,
- s...
[truncated message content] |
|
From: <fr...@us...> - 2008-05-10 23:53:27
|
Revision: 531
http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=531&view=rev
Author: fredm
Date: 2008-05-10 16:53:25 -0700 (Sat, 10 May 2008)
Log Message:
-----------
Merge up to vendor revision 3612.
Revision Links:
--------------
http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=3612&view=rev
Modified Paths:
--------------
trunk/FuseGenerator/libspectrum.h
trunk/FuseImporter/libspectrum.h
trunk/README
trunk/fuse/ChangeLog
trunk/fuse/Makefile.am
trunk/fuse/README
trunk/fuse/ay.c
trunk/fuse/compat/amiga/Makefile.am
trunk/fuse/compat/amiga/paths.c
trunk/fuse/configure.in
trunk/fuse/dck.c
trunk/fuse/debugger/commandl.l
trunk/fuse/debugger/commandy.y
trunk/fuse/debugger/debugger.c
trunk/fuse/debugger/debugger_internals.h
trunk/fuse/disk/Makefile.am
trunk/fuse/disk/beta.c
trunk/fuse/disk/disk.c
trunk/fuse/disk/disk.h
trunk/fuse/disk/fdd.c
trunk/fuse/disk/fdd.h
trunk/fuse/disk/plusd.c
trunk/fuse/disk/wd_fdc.c
trunk/fuse/disk/wd_fdc.h
trunk/fuse/display.c
trunk/fuse/divide.c
trunk/fuse/event.c
trunk/fuse/event.h
trunk/fuse/fuse.cpp
trunk/fuse/fuse.h
trunk/fuse/fusepb/English.lproj/InfoPlist.strings
trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
trunk/fuse/fusepb/Info-Fuse.plist
trunk/fuse/fusepb/controllers/FuseController.h
trunk/fuse/fusepb/controllers/FuseController.m
trunk/fuse/fusepb/models/Emulator.h
trunk/fuse/fusepb/models/Emulator.m
trunk/fuse/fusepb/nibs/MainMenu.nib/classes.nib
trunk/fuse/fusepb/nibs/MainMenu.nib/info.nib
trunk/fuse/fusepb/nibs/MainMenu.nib/keyedobjects.nib
trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib
trunk/fuse/fusepb/views/DisplayOpenGLView.h
trunk/fuse/fusepb/views/DisplayOpenGLView.m
trunk/fuse/hacking/ChangeLog
trunk/fuse/hacking/cvs-tags
trunk/fuse/if1.c
trunk/fuse/input.c
trunk/fuse/kempmouse.c
trunk/fuse/kempmouse.h
trunk/fuse/keysyms.pl
trunk/fuse/loader.c
trunk/fuse/loader.h
trunk/fuse/machine.c
trunk/fuse/machine.h
trunk/fuse/machines/pentagon.c
trunk/fuse/machines/pentagon.h
trunk/fuse/machines/pentagon1024.c
trunk/fuse/machines/pentagon512.c
trunk/fuse/machines/scorpion.c
trunk/fuse/machines/spec128.c
trunk/fuse/machines/spec128.h
trunk/fuse/machines/spec16.c
trunk/fuse/machines/spec48.c
trunk/fuse/machines/spec48.h
trunk/fuse/machines/spec_se.c
trunk/fuse/machines/specplus2.c
trunk/fuse/machines/specplus2a.c
trunk/fuse/machines/specplus3.c
trunk/fuse/machines/specplus3.h
trunk/fuse/machines/specplus3e.c
trunk/fuse/machines/tc2048.c
trunk/fuse/machines/tc2068.c
trunk/fuse/machines/tc2068.h
trunk/fuse/machines/ts2068.c
trunk/fuse/man/fuse.1
trunk/fuse/memory.c
trunk/fuse/memory.h
trunk/fuse/menu.c
trunk/fuse/menu_data.dat
trunk/fuse/periph.c
trunk/fuse/roms/plus3e-0.rom
trunk/fuse/roms/plus3e-1.rom
trunk/fuse/roms/plus3e-2.rom
trunk/fuse/settings.dat
trunk/fuse/settings.pl
trunk/fuse/simpleide.c
trunk/fuse/sound/Makefile.am
trunk/fuse/sound/aosound.c
trunk/fuse/spectrum.c
trunk/fuse/spectrum.h
trunk/fuse/tape.c
trunk/fuse/tape.h
trunk/fuse/timer/Makefile.am
trunk/fuse/ui/Makefile.am
trunk/fuse/ui/fb/fbkeyboard.c
trunk/fuse/ui/gtk/Makefile.am
trunk/fuse/ui/gtk/fileselector.c
trunk/fuse/ui/gtk/gtkdisplay.c
trunk/fuse/ui/options.dat
trunk/fuse/ui/scaler/Makefile.am
trunk/fuse/ui/sdl/Makefile.am
trunk/fuse/ui/sdl/sdldisplay.c
trunk/fuse/ui/sdl/sdlkeyboard.c
trunk/fuse/ui/svga/svgakeyboard.c
trunk/fuse/ui/win32/Makefile.am
trunk/fuse/ui/win32/debugger.c
trunk/fuse/ui/win32/debugger.h
trunk/fuse/ui/win32/debugger.rc
trunk/fuse/ui/win32/error.c
trunk/fuse/ui/win32/icons/Makefile.am
trunk/fuse/ui/win32/options-header.pl
trunk/fuse/ui/win32/options-resource.pl
trunk/fuse/ui/win32/options.pl
trunk/fuse/ui/win32/pokefinder.c
trunk/fuse/ui/win32/pokefinder.h
trunk/fuse/ui/win32/pokefinder.rc
trunk/fuse/ui/win32/statusbar.c
trunk/fuse/ui/win32/win32display.c
trunk/fuse/ui/win32/win32display.h
trunk/fuse/ui/win32/win32internals.h
trunk/fuse/ui/win32/win32keyboard.h
trunk/fuse/ui/win32/win32ui.c
trunk/fuse/ui/xlib/xdisplay.c
trunk/fuse/ui/xlib/xerror.c
trunk/fuse/ui/xlib/xkeyboard.c
trunk/fuse/ui.c
trunk/fuse/ula.c
trunk/fuse/utils.c
trunk/fuse/windres.rc
trunk/fuse/z80/z80.c
trunk/fuse/z80/z80_ops.c
trunk/libspectrum/config.h
trunk/libspectrum/libspectrum/ChangeLog
trunk/libspectrum/libspectrum/README
trunk/libspectrum/libspectrum/accessor.pl
trunk/libspectrum/libspectrum/configure.in
trunk/libspectrum/libspectrum/doc/libspectrum.txt
trunk/libspectrum/libspectrum/hacking/ChangeLog
trunk/libspectrum/libspectrum/ide.c
trunk/libspectrum/libspectrum/internals.h
trunk/libspectrum/libspectrum/libspectrum.c
trunk/libspectrum/libspectrum/libspectrum.h.in
trunk/libspectrum/libspectrum/sna.c
trunk/libspectrum/libspectrum/snap_accessors.txt
trunk/libspectrum/libspectrum/snapshot.c
trunk/libspectrum/libspectrum/szx.c
trunk/libspectrum/libspectrum/tape.c
trunk/libspectrum/libspectrum/test/Makefile.am
trunk/libspectrum/libspectrum/test/edges.c
trunk/libspectrum/libspectrum/test/test.h
trunk/libspectrum/libspectrum/test/test15.c
trunk/libspectrum/libspectrum/z80.c
trunk/libspectrum/libspectrum.h
Added Paths:
-----------
trunk/fuse/compat/amiga/osname.c
trunk/fuse/disk/upd_fdc.c
trunk/fuse/disk/upd_fdc.h
trunk/fuse/fuse.c
trunk/fuse/fusepb/main.m
trunk/fuse/fusepb/scaler/scalers16.c
trunk/fuse/sound/win32sound.c
trunk/fuse/ui/scaler/scaler.c
trunk/fuse/ui/scaler/scaler.h
trunk/fuse/ui/scaler/scaler_hq2x.c
trunk/fuse/ui/scaler/scaler_hq3x.c
trunk/fuse/ui/scaler/scaler_internals.h
trunk/fuse/ui/scaler/scalers.c
trunk/fuse/ui/ui.h
trunk/fuse/ui/widget/
trunk/fuse/ui/widget/Makefile.am
trunk/fuse/ui/widget/browse.c
trunk/fuse/ui/widget/debugger.c
trunk/fuse/ui/widget/error.c
trunk/fuse/ui/widget/filesel.c
trunk/fuse/ui/widget/fuse.font.sbf
trunk/fuse/ui/widget/memory.c
trunk/fuse/ui/widget/menu.c
trunk/fuse/ui/widget/mkfusefont.pl
trunk/fuse/ui/widget/options-header.pl
trunk/fuse/ui/widget/options.pl
trunk/fuse/ui/widget/picture.c
trunk/fuse/ui/widget/pokefinder.c
trunk/fuse/ui/widget/query.c
trunk/fuse/ui/widget/roms.c
trunk/fuse/ui/widget/select.c
trunk/fuse/ui/widget/text.c
trunk/fuse/ui/widget/widget.c
trunk/fuse/ui/widget/widget.h
trunk/fuse/ui/widget/widget_internals.h
trunk/fuse/ui/win32/binary.c
trunk/fuse/ui/win32/binary.h
trunk/fuse/ui/win32/binary.rc
trunk/fuse/ui/win32/browse.c
trunk/fuse/ui/win32/browse.h
trunk/fuse/ui/win32/browse.rc
trunk/fuse/ui/win32/icons/mdr_active.bmp
trunk/fuse/ui/win32/icons/mdr_inactive.bmp
trunk/fuse/ui/win32/icons/mouse_active.bmp
trunk/fuse/ui/win32/icons/mouse_inactive.bmp
trunk/fuse/ui/win32/icons/tape_marker_mask.bmp
trunk/fuse/ui/win32/memorybrowser.c
trunk/fuse/ui/win32/memorybrowser.h
trunk/fuse/ui/win32/memorybrowser.rc
trunk/fuse/ui/win32/picture.c
trunk/fuse/ui/win32/picture.h
trunk/fuse/ui/win32/picture.rc
trunk/fuse/ui/win32/rollback.c
trunk/fuse/ui/win32/rollback.h
trunk/fuse/ui/win32/rollback.rc
trunk/fuse/ui/win32/roms.c
trunk/fuse/ui/win32/roms.h
trunk/fuse/ui/win32/roms.rc
trunk/fuse/ui/win32/select_template.h
trunk/fuse/ui/win32/select_template.rc
trunk/fuse/ui/win32/statusbar.rc
trunk/fuse/ui/win32/win32joystick.c
trunk/fuse/ui/win32/win32joystick.h
trunk/fuse/ui/win32/win32joystick.rc
trunk/fuse/ui/win32/win32mouse.c
trunk/fuse/unittests/
trunk/fuse/unittests/Makefile.am
trunk/fuse/unittests/unittests.c
trunk/fuse/unittests/unittests.h
trunk/fuse/winfuse.ico
Removed Paths:
-------------
trunk/fuse/fusepb/main.mm
trunk/fuse/fusepb/scaler/hq2x.cpp
trunk/fuse/fusepb/scaler/hq2x.h
trunk/fuse/fusepb/scaler/hq3x.cpp
trunk/fuse/fusepb/scaler/hq3x.h
trunk/fuse/fusepb/scaler/intern.h
trunk/fuse/fusepb/scaler/scalers16.cpp
trunk/fuse/hacking/win32_todo.txt
trunk/fuse/ui/scaler/scaler.c
trunk/fuse/ui/scaler/scaler.h
trunk/fuse/ui/scaler/scaler_internals.h
trunk/fuse/ui/scaler/scalers.cpp
trunk/fuse/ui/ui.h
trunk/fuse/ui/widget/Makefile.am
trunk/fuse/ui/widget/browse.c
trunk/fuse/ui/widget/debugger.c
trunk/fuse/ui/widget/error.c
trunk/fuse/ui/widget/filesel.c
trunk/fuse/ui/widget/fuse.font.sbf
trunk/fuse/ui/widget/memory.c
trunk/fuse/ui/widget/menu.c
trunk/fuse/ui/widget/mkfusefont.pl
trunk/fuse/ui/widget/options-header.pl
trunk/fuse/ui/widget/options.pl
trunk/fuse/ui/widget/picture.c
trunk/fuse/ui/widget/pokefinder.c
trunk/fuse/ui/widget/query.c
trunk/fuse/ui/widget/roms.c
trunk/fuse/ui/widget/select.c
trunk/fuse/ui/widget/text.c
trunk/fuse/ui/widget/widget.c
trunk/fuse/ui/widget/widget.h
trunk/fuse/ui/widget/widget_internals.h
trunk/fuse/ui/win32/del_o.bat
trunk/fuse/ui/win32/menu_data.c
trunk/fuse/ui/win32/menu_data.h
trunk/fuse/ui/win32/menu_data.rc
trunk/fuse/ui/win32/win32ui.rc
trunk/fuse/unittests/Makefile.am
trunk/fuse/unittests/unittests.c
trunk/fuse/unittests/unittests.h
trunk/fuse/widget/
trunk/lib765/
trunk/libspectrum/libspectrum/TODO
Modified: trunk/FuseGenerator/libspectrum.h
===================================================================
--- trunk/FuseGenerator/libspectrum.h 2008-05-07 12:29:58 UTC (rev 530)
+++ trunk/FuseGenerator/libspectrum.h 2008-05-10 23:53:25 UTC (rev 531)
@@ -1,7 +1,7 @@
/* libspectrum.h: the library for dealing with ZX Spectrum emulator files
Copyright (c) 2001-2007 Philip Kendall, Darren Salt, Fredrick Meunier
- $Id: libspectrum.h.in 3426 2007-12-18 19:29:30Z zubzero $
+ $Id: libspectrum.h.in 3595 2008-04-01 10:51:58Z 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
@@ -613,6 +613,8 @@
void WIN32_DLL libspectrum_snap_set_beta_active( libspectrum_snap *snap, int beta_active );
int WIN32_DLL libspectrum_snap_beta_paged( libspectrum_snap *snap );
void WIN32_DLL libspectrum_snap_set_beta_paged( libspectrum_snap *snap, int beta_paged );
+int WIN32_DLL libspectrum_snap_beta_custom_rom( libspectrum_snap *snap );
+void WIN32_DLL libspectrum_snap_set_beta_custom_rom( libspectrum_snap *snap, int beta_custom_rom );
int WIN32_DLL libspectrum_snap_beta_direction( libspectrum_snap *snap );
void WIN32_DLL libspectrum_snap_set_beta_direction( libspectrum_snap *snap, int beta_direction );
libspectrum_byte WIN32_DLL libspectrum_snap_beta_system( libspectrum_snap *snap );
@@ -625,6 +627,8 @@
void WIN32_DLL libspectrum_snap_set_beta_data( libspectrum_snap *snap, libspectrum_byte beta_data );
libspectrum_byte WIN32_DLL libspectrum_snap_beta_status( libspectrum_snap *snap );
void WIN32_DLL libspectrum_snap_set_beta_status( libspectrum_snap *snap, libspectrum_byte beta_status );
+libspectrum_byte WIN32_DLL * libspectrum_snap_beta_rom( libspectrum_snap *snap, int idx );
+void WIN32_DLL libspectrum_snap_set_beta_rom( libspectrum_snap *snap, int idx, libspectrum_byte* beta_rom );
int WIN32_DLL libspectrum_snap_plusd_active( libspectrum_snap *snap );
void WIN32_DLL libspectrum_snap_set_plusd_active( libspectrum_snap *snap, int plusd_active );
int WIN32_DLL libspectrum_snap_plusd_paged( libspectrum_snap *snap );
@@ -647,6 +651,14 @@
void WIN32_DLL libspectrum_snap_set_plusd_rom( libspectrum_snap *snap, int idx, libspectrum_byte* plusd_rom );
libspectrum_byte WIN32_DLL * libspectrum_snap_plusd_ram( libspectrum_snap *snap, int idx );
void WIN32_DLL libspectrum_snap_set_plusd_ram( libspectrum_snap *snap, int idx, libspectrum_byte* plusd_ram );
+int WIN32_DLL libspectrum_snap_custom_rom( libspectrum_snap *snap );
+void WIN32_DLL libspectrum_snap_set_custom_rom( libspectrum_snap *snap, int custom_rom );
+size_t WIN32_DLL libspectrum_snap_custom_rom_pages( libspectrum_snap *snap );
+void WIN32_DLL libspectrum_snap_set_custom_rom_pages( libspectrum_snap *snap, size_t custom_rom_pages );
+libspectrum_byte WIN32_DLL * libspectrum_snap_roms( libspectrum_snap *snap, int idx );
+void WIN32_DLL libspectrum_snap_set_roms( libspectrum_snap *snap, int idx, libspectrum_byte* roms );
+size_t WIN32_DLL libspectrum_snap_rom_length( libspectrum_snap *snap, int idx );
+void WIN32_DLL libspectrum_snap_set_rom_length( libspectrum_snap *snap, int idx, size_t rom_length );
libspectrum_byte WIN32_DLL * libspectrum_snap_pages( libspectrum_snap *snap, int idx );
void WIN32_DLL libspectrum_snap_set_pages( libspectrum_snap *snap, int idx, libspectrum_byte* pages );
libspectrum_byte WIN32_DLL * libspectrum_snap_slt( libspectrum_snap *snap, int idx );
@@ -709,7 +721,26 @@
void WIN32_DLL libspectrum_snap_set_joystick_list( libspectrum_snap *snap, int idx, libspectrum_joystick joystick_list );
int WIN32_DLL libspectrum_snap_joystick_inputs( libspectrum_snap *snap, int idx );
void WIN32_DLL libspectrum_snap_set_joystick_inputs( libspectrum_snap *snap, int idx, int joystick_inputs );
+int WIN32_DLL libspectrum_snap_kempston_mouse_active( libspectrum_snap *snap );
+void WIN32_DLL libspectrum_snap_set_kempston_mouse_active( libspectrum_snap *snap, int kempston_mouse_active );
+int WIN32_DLL libspectrum_snap_simpleide_active( libspectrum_snap *snap );
+void WIN32_DLL libspectrum_snap_set_simpleide_active( libspectrum_snap *snap, int simpleide_active );
+int WIN32_DLL libspectrum_snap_divide_active( libspectrum_snap *snap );
+void WIN32_DLL libspectrum_snap_set_divide_active( libspectrum_snap *snap, int divide_active );
+int WIN32_DLL libspectrum_snap_divide_eprom_writeprotect( libspectrum_snap *snap);
+void WIN32_DLL libspectrum_snap_set_divide_eprom_writeprotect( libspectrum_snap *snap, int divide_eprom_writeprotect );
+int WIN32_DLL libspectrum_snap_divide_paged( libspectrum_snap *snap );
+void WIN32_DLL libspectrum_snap_set_divide_paged( libspectrum_snap *snap, int divide_paged );
+libspectrum_byte WIN32_DLL libspectrum_snap_divide_control( libspectrum_snap *snap );
+void WIN32_DLL libspectrum_snap_set_divide_control( libspectrum_snap *snap, libspectrum_byte divide_control );
+size_t WIN32_DLL libspectrum_snap_divide_pages( libspectrum_snap *snap );
+void WIN32_DLL libspectrum_snap_set_divide_pages( libspectrum_snap *snap, size_t divide_pages );
+libspectrum_byte WIN32_DLL * libspectrum_snap_divide_eprom( libspectrum_snap *snap, int idx );
+void WIN32_DLL libspectrum_snap_set_divide_eprom( libspectrum_snap *snap, int idx, libspectrum_byte* divide_eprom );
+libspectrum_byte WIN32_DLL * libspectrum_snap_divide_ram( libspectrum_snap *snap , int idx );
+void WIN32_DLL libspectrum_snap_set_divide_ram( libspectrum_snap *snap, int idx, libspectrum_byte* divide_ram );
+
/* DEPRECATED: use libspectrum_snap_read() instead */
DEPRECATED
libspectrum_error WIN32_DLL
@@ -786,6 +817,8 @@
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 */
+extern const int WIN32_DLL LIBSPECTRUM_TAPE_FLAGS_LENGTH_SHORT;
+extern const int WIN32_DLL LIBSPECTRUM_TAPE_FLAGS_LENGTH_LONG;
/* The states which a block can be in */
typedef enum libspectrum_tape_state_type {
Modified: trunk/FuseImporter/libspectrum.h
===================================================================
--- trunk/FuseImporter/libspectrum.h 2008-05-07 12:29:58 UTC (rev 530)
+++ trunk/FuseImporter/libspectrum.h 2008-05-10 23:53:25 UTC (rev 531)
@@ -1,7 +1,7 @@
/* libspectrum.h: the library for dealing with ZX Spectrum emulator files
Copyright (c) 2001-2007 Philip Kendall, Darren Salt, Fredrick Meunier
- $Id: libspectrum.h.in 3426 2007-12-18 19:29:30Z zubzero $
+ $Id: libspectrum.h.in 3595 2008-04-01 10:51:58Z 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
@@ -613,6 +613,8 @@
void WIN32_DLL libspectrum_snap_set_beta_active( libspectrum_snap *snap, int beta_active );
int WIN32_DLL libspectrum_snap_beta_paged( libspectrum_snap *snap );
void WIN32_DLL libspectrum_snap_set_beta_paged( libspectrum_snap *snap, int beta_paged );
+int WIN32_DLL libspectrum_snap_beta_custom_rom( libspectrum_snap *snap );
+void WIN32_DLL libspectrum_snap_set_beta_custom_rom( libspectrum_snap *snap, int beta_custom_rom );
int WIN32_DLL libspectrum_snap_beta_direction( libspectrum_snap *snap );
void WIN32_DLL libspectrum_snap_set_beta_direction( libspectrum_snap *snap, int beta_direction );
libspectrum_byte WIN32_DLL libspectrum_snap_beta_system( libspectrum_snap *snap );
@@ -625,6 +627,8 @@
void WIN32_DLL libspectrum_snap_set_beta_data( libspectrum_snap *snap, libspectrum_byte beta_data );
libspectrum_byte WIN32_DLL libspectrum_snap_beta_status( libspectrum_snap *snap );
void WIN32_DLL libspectrum_snap_set_beta_status( libspectrum_snap *snap, libspectrum_byte beta_status );
+libspectrum_byte WIN32_DLL * libspectrum_snap_beta_rom( libspectrum_snap *snap, int idx );
+void WIN32_DLL libspectrum_snap_set_beta_rom( libspectrum_snap *snap, int idx, libspectrum_byte* beta_rom );
int WIN32_DLL libspectrum_snap_plusd_active( libspectrum_snap *snap );
void WIN32_DLL libspectrum_snap_set_plusd_active( libspectrum_snap *snap, int plusd_active );
int WIN32_DLL libspectrum_snap_plusd_paged( libspectrum_snap *snap );
@@ -647,6 +651,14 @@
void WIN32_DLL libspectrum_snap_set_plusd_rom( libspectrum_snap *snap, int idx, libspectrum_byte* plusd_rom );
libspectrum_byte WIN32_DLL * libspectrum_snap_plusd_ram( libspectrum_snap *snap, int idx );
void WIN32_DLL libspectrum_snap_set_plusd_ram( libspectrum_snap *snap, int idx, libspectrum_byte* plusd_ram );
+int WIN32_DLL libspectrum_snap_custom_rom( libspectrum_snap *snap );
+void WIN32_DLL libspectrum_snap_set_custom_rom( libspectrum_snap *snap, int custom_rom );
+size_t WIN32_DLL libspectrum_snap_custom_rom_pages( libspectrum_snap *snap );
+void WIN32_DLL libspectrum_snap_set_custom_rom_pages( libspectrum_snap *snap, size_t custom_rom_pages );
+libspectrum_byte WIN32_DLL * libspectrum_snap_roms( libspectrum_snap *snap, int idx );
+void WIN32_DLL libspectrum_snap_set_roms( libspectrum_snap *snap, int idx, libspectrum_byte* roms );
+size_t WIN32_DLL libspectrum_snap_rom_length( libspectrum_snap *snap, int idx );
+void WIN32_DLL libspectrum_snap_set_rom_length( libspectrum_snap *snap, int idx, size_t rom_length );
libspectrum_byte WIN32_DLL * libspectrum_snap_pages( libspectrum_snap *snap, int idx );
void WIN32_DLL libspectrum_snap_set_pages( libspectrum_snap *snap, int idx, libspectrum_byte* pages );
libspectrum_byte WIN32_DLL * libspectrum_snap_slt( libspectrum_snap *snap, int idx );
@@ -709,7 +721,26 @@
void WIN32_DLL libspectrum_snap_set_joystick_list( libspectrum_snap *snap, int idx, libspectrum_joystick joystick_list );
int WIN32_DLL libspectrum_snap_joystick_inputs( libspectrum_snap *snap, int idx );
void WIN32_DLL libspectrum_snap_set_joystick_inputs( libspectrum_snap *snap, int idx, int joystick_inputs );
+int WIN32_DLL libspectrum_snap_kempston_mouse_active( libspectrum_snap *snap );
+void WIN32_DLL libspectrum_snap_set_kempston_mouse_active( libspectrum_snap *snap, int kempston_mouse_active );
+int WIN32_DLL libspectrum_snap_simpleide_active( libspectrum_snap *snap );
+void WIN32_DLL libspectrum_snap_set_simpleide_active( libspectrum_snap *snap, int simpleide_active );
+int WIN32_DLL libspectrum_snap_divide_active( libspectrum_snap *snap );
+void WIN32_DLL libspectrum_snap_set_divide_active( libspectrum_snap *snap, int divide_active );
+int WIN32_DLL libspectrum_snap_divide_eprom_writeprotect( libspectrum_snap *snap);
+void WIN32_DLL libspectrum_snap_set_divide_eprom_writeprotect( libspectrum_snap *snap, int divide_eprom_writeprotect );
+int WIN32_DLL libspectrum_snap_divide_paged( libspectrum_snap *snap );
+void WIN32_DLL libspectrum_snap_set_divide_paged( libspectrum_snap *snap, int divide_paged );
+libspectrum_byte WIN32_DLL libspectrum_snap_divide_control( libspectrum_snap *snap );
+void WIN32_DLL libspectrum_snap_set_divide_control( libspectrum_snap *snap, libspectrum_byte divide_control );
+size_t WIN32_DLL libspectrum_snap_divide_pages( libspectrum_snap *snap );
+void WIN32_DLL libspectrum_snap_set_divide_pages( libspectrum_snap *snap, size_t divide_pages );
+libspectrum_byte WIN32_DLL * libspectrum_snap_divide_eprom( libspectrum_snap *snap, int idx );
+void WIN32_DLL libspectrum_snap_set_divide_eprom( libspectrum_snap *snap, int idx, libspectrum_byte* divide_eprom );
+libspectrum_byte WIN32_DLL * libspectrum_snap_divide_ram( libspectrum_snap *snap , int idx );
+void WIN32_DLL libspectrum_snap_set_divide_ram( libspectrum_snap *snap, int idx, libspectrum_byte* divide_ram );
+
/* DEPRECATED: use libspectrum_snap_read() instead */
DEPRECATED
libspectrum_error WIN32_DLL
@@ -786,6 +817,8 @@
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 */
+extern const int WIN32_DLL LIBSPECTRUM_TAPE_FLAGS_LENGTH_SHORT;
+extern const int WIN32_DLL LIBSPECTRUM_TAPE_FLAGS_LENGTH_LONG;
/* The states which a block can be in */
typedef enum libspectrum_tape_state_type {
Modified: trunk/README
===================================================================
--- trunk/README 2008-05-07 12:29:58 UTC (rev 530)
+++ trunk/README 2008-05-10 23:53:25 UTC (rev 531)
@@ -22,9 +22,6 @@
cd audiofile
xcodebuild -configuration Deployment
cd ..
-cd lib765
-xcodebuild -configuration Deployment
-cd ..
cd libgcrypt
xcodebuild -configuration Deployment
cd ..
Modified: trunk/fuse/ChangeLog
===================================================================
--- trunk/fuse/ChangeLog 2008-05-07 12:29:58 UTC (rev 530)
+++ trunk/fuse/ChangeLog 2008-05-10 23:53:25 UTC (rev 531)
@@ -878,4 +878,4 @@
* Version 0.1.0 released.
-$Id: ChangeLog 3462 2008-01-04 09:34:40Z pak21 $
+$Id: ChangeLog 3482 2008-01-07 12:32:26Z pak21 $
Modified: trunk/fuse/Makefile.am
===================================================================
--- trunk/fuse/Makefile.am 2008-05-07 12:29:58 UTC (rev 530)
+++ trunk/fuse/Makefile.am 2008-05-10 23:53:25 UTC (rev 531)
@@ -1,7 +1,7 @@
# Process this file with automake to produce Makefile.in
-## Copyright (c) 1999-2004 Philip Kendall
+## Copyright (c) 1999-2008 Philip Kendall
-## $Id: Makefile.am 3318 2007-11-21 19:25:31Z zubzero $
+## $Id: Makefile.am 3609 2008-05-01 13:17:56Z 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
@@ -38,7 +38,7 @@
sound \
timer \
ui \
- @WIDGET@ \
+ unittests \
z80
DIST_SUBDIRS = debugger \
@@ -53,7 +53,7 @@
sound \
timer \
ui \
- widget \
+ unittests \
z80
fuse_SOURCES = ay.c \
@@ -112,20 +112,21 @@
fuse_LDADD = debugger/libdebugger.a \
@UI_LIBS@ \
+machines/libmachines.a \
disk/libdisk.a \
-machines/libmachines.a \
pokefinder/libpokefinder.a \
sound/libsound.a \
ui/scaler/libscaler.a \
+unittests/libunittests.a \
debugger/libdebugger.a \
timer/libtimer.a \
z80/libz80.a \
-@DSKLIBS@ \
@LIBSPEC_LIBS@ \
@GLIB_LIBS@ \
@PNG_LIBS@ \
@SOUND_LIBS@ \
@SAMPLERATE_LIBS@ \
+@SDL_LIBS@ \
@X_LIBS@ \
@XML_LIBS@ \
compat/@COMPAT_OSNAME@/libcompatos.a \
@@ -136,6 +137,7 @@
debugger/libdebugger.a \
machines/libmachines.a \
sound/libsound.a \
+ unittests/libunittests.a\
z80/libz80.a \
@WINDRES_OBJ@
@@ -150,8 +152,8 @@
settings.h: settings-header.pl settings.dat
@PERL@ -I$(srcdir)/perl $(srcdir)/settings-header.pl $(srcdir)/settings.dat > $@.tmp && mv $@.tmp $@
-INCLUDES = @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@ @DSK_CFLAGS@\
-@XML_CFLAGS@ @SAMPLERATE_CFLAGS@ -DFUSEDATADIR="\"${pkgdatadir}\""
+INCLUDES = @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@ \
+@XML_CFLAGS@ @SAMPLERATE_CFLAGS@ -DFUSEDATADIR="\"${pkgdatadir}\"" @SDL_CFLAGS@
noinst_HEADERS = ay.h \
bitmap.h \
@@ -201,7 +203,8 @@
menu_data.pl \
settings.pl \
settings-header.pl \
- settings.dat
+ settings.dat \
+ winfuse.ico
CLEANFILES = settings.c \
settings.h
Modified: trunk/fuse/README
===================================================================
--- trunk/fuse/README 2008-05-07 12:29:58 UTC (rev 530)
+++ trunk/fuse/README 2008-05-10 23:53:25 UTC (rev 531)
@@ -40,11 +40,6 @@
Optional:
-* If you want +3 and +3e support, you'll need John Elliott's lib765
- installed; get it from http://www.seasip.demon.co.uk/Unix/LibDsk/
- If you also have libdsk (from the same location) installed, you'll
- also get support for extended .dsk files (see 'THE .DSK FORMAT'
- section in fuse(1) for more details on this).
* Other libraries will give you some extended functionality:
* libgcrypt: the ability to digitally sign input recordings (note that
Fuse requires version 1.1.42 or later).
@@ -117,8 +112,7 @@
---------------------------------
The native Cocoa port by Fredrick Meunier <fr...@sp...> comes as
-a set of Xcode projects for libbz2, lib765, libdsk, libgcrypt,
-libspectrum and Fuse itself.
+a set of Xcode projects for libgcrypt, libspectrum and Fuse itself.
Closing comments
----------------
@@ -149,4 +143,4 @@
Philip Kendall <phi...@sh...>
5 January 2008
-$Id: README 3462 2008-01-04 09:34:40Z pak21 $
+$Id: README 3584 2008-03-25 10:27:30Z fredm $
Modified: trunk/fuse/ay.c
===================================================================
--- trunk/fuse/ay.c 2008-05-07 12:29:58 UTC (rev 530)
+++ trunk/fuse/ay.c 2008-05-10 23:53:25 UTC (rev 531)
@@ -1,7 +1,7 @@
/* ay.c: AY-8-3912 routines
Copyright (c) 1999-2004 Philip Kendall
- $Id: ay.c 3390 2007-12-03 12:59:54Z fredm $
+ $Id: ay.c 3494 2008-01-15 16:37: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
@@ -66,7 +66,7 @@
}
static void
-ay_reset( int hard_reset )
+ay_reset( int hard_reset GCC_UNUSED )
{
ayinfo *ay = &machine_current->ay;
Modified: trunk/fuse/compat/amiga/Makefile.am
===================================================================
--- trunk/fuse/compat/amiga/Makefile.am 2008-05-07 12:29:58 UTC (rev 530)
+++ trunk/fuse/compat/amiga/Makefile.am 2008-05-10 23:53:25 UTC (rev 531)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2007 Philip Kendall
-## $Id: Makefile.am 3115 2007-08-19 02:49:14Z fredm $
+## $Id: Makefile.am 3578 2008-03-22 20:51:36Z zubzero $
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@
noinst_LIBRARIES = libcompatos.a
-libcompatos_a_SOURCES = ../unix/osname.c \
+libcompatos_a_SOURCES = osname.c \
paths.c
INCLUDES = @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@
Copied: trunk/fuse/compat/amiga/osname.c (from rev 530, vendor/fuse-emulator/current/fuse/compat/amiga/osname.c)
===================================================================
--- trunk/fuse/compat/amiga/osname.c (rev 0)
+++ trunk/fuse/compat/amiga/osname.c 2008-05-10 23:53:25 UTC (rev 531)
@@ -0,0 +1,61 @@
+/* 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 $
+
+ This 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 <proto/exec.h>
+#include <proto/expansion.h>
+
+#include "ui/ui.h"
+
+struct Library *ExpansionBase;
+struct ExpansionIFace *IExpansion;
+
+int compat_osname( char *buffer, size_t length )
+{
+ STRPTR machine;
+
+ if( ExpansionBase = IExec->OpenLibrary( "expansion.library", 52 ) ) {
+ if( IExpansion = ( struct ExpansionIFace * ) IExec->GetInterface( ExpansionBase,"main",1,NULL ) ) {
+
+ IExpansion->GetMachineInfoTags( GMIT_MachineString, &machine,
+ TAG_DONE );
+
+ snprintf( buffer, length, "%s %s %s", "AmigaOS", machine, "4.0" );
+
+ IExec->DropInterface( ( struct Interface * )IExpansion );
+ }
+ IExec->CloseLibrary( ExpansionBase );
+ }
+ else
+ {
+ return 1;
+ }
+
+ return 0;
+}
Modified: trunk/fuse/compat/amiga/paths.c
===================================================================
--- trunk/fuse/compat/amiga/paths.c 2008-05-07 12:29:58 UTC (rev 530)
+++ trunk/fuse/compat/amiga/paths.c 2008-05-10 23:53:25 UTC (rev 531)
@@ -1,7 +1,7 @@
/* paths.c: Path-related compatibility r...
[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