[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx: [448] vendor/fuse-emulator/current/fuse
Brought to you by:
fredm
Menu
▾
▴
[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx: [448] vendor/fuse-emulator/current/fuse
|
From: <fr...@us...> - 2007-08-06 01:17:47
|
Revision: 448
http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=448&view=rev
Author: fredm
Date: 2007-08-05 18:17:48 -0700 (Sun, 05 Aug 2007)
Log Message:
-----------
Load . into vendor/fuse-emulator/current.
Modified Paths:
--------------
vendor/fuse-emulator/current/fuse/Makefile.am
vendor/fuse-emulator/current/fuse/compat/Makefile.am
vendor/fuse-emulator/current/fuse/compat/dirname.c
vendor/fuse-emulator/current/fuse/compat/getopt.c
vendor/fuse-emulator/current/fuse/compat/getopt1.c
vendor/fuse-emulator/current/fuse/compat/mkstemp.c
vendor/fuse-emulator/current/fuse/compat.h
vendor/fuse-emulator/current/fuse/configure.in
vendor/fuse-emulator/current/fuse/event.c
vendor/fuse-emulator/current/fuse/fuse.c
vendor/fuse-emulator/current/fuse/hacking/ChangeLog
vendor/fuse-emulator/current/fuse/machines/tc2048.c
vendor/fuse-emulator/current/fuse/menu_data.pl
vendor/fuse-emulator/current/fuse/printer.c
vendor/fuse-emulator/current/fuse/rzx.c
vendor/fuse-emulator/current/fuse/settings.pl
vendor/fuse-emulator/current/fuse/sound/Makefile.am
vendor/fuse-emulator/current/fuse/sound/alsasound.c
vendor/fuse-emulator/current/fuse/sound/aosound.c
vendor/fuse-emulator/current/fuse/sound/coreaudiosound.c
vendor/fuse-emulator/current/fuse/sound/dxsound.c
vendor/fuse-emulator/current/fuse/sound/hpsound.c
vendor/fuse-emulator/current/fuse/sound/nullsound.c
vendor/fuse-emulator/current/fuse/sound/osssound.c
vendor/fuse-emulator/current/fuse/sound/sdlsound.c
vendor/fuse-emulator/current/fuse/sound/sfifo.c
vendor/fuse-emulator/current/fuse/sound/sunsound.c
vendor/fuse-emulator/current/fuse/sound.c
vendor/fuse-emulator/current/fuse/spectrum.c
vendor/fuse-emulator/current/fuse/tape.c
vendor/fuse-emulator/current/fuse/tape.h
vendor/fuse-emulator/current/fuse/timer/timer.c
vendor/fuse-emulator/current/fuse/timer/timer.h
vendor/fuse-emulator/current/fuse/trdos.c
vendor/fuse-emulator/current/fuse/ui/gtk/debugger.c
vendor/fuse-emulator/current/fuse/ui/gtk/gtkjoystick.c
vendor/fuse-emulator/current/fuse/ui/gtk/gtkmouse.c
vendor/fuse-emulator/current/fuse/ui/gtk/gtkui.c
vendor/fuse-emulator/current/fuse/ui/gtk/pokefinder.c
vendor/fuse-emulator/current/fuse/ui/gtk/stock.c
vendor/fuse-emulator/current/fuse/ula.c
vendor/fuse-emulator/current/fuse/utils.c
vendor/fuse-emulator/current/fuse/widget/widget.c
vendor/fuse-emulator/current/fuse/z80/coretest.c
Added Paths:
-----------
vendor/fuse-emulator/current/fuse/compat/amiga/
vendor/fuse-emulator/current/fuse/compat/amiga/Makefile.am
vendor/fuse-emulator/current/fuse/compat/amiga/paths.c
vendor/fuse-emulator/current/fuse/compat/morphos/
vendor/fuse-emulator/current/fuse/compat/morphos/Makefile.am
vendor/fuse-emulator/current/fuse/compat/morphos/osname.c
vendor/fuse-emulator/current/fuse/compat/unix/
vendor/fuse-emulator/current/fuse/compat/unix/Makefile.am
vendor/fuse-emulator/current/fuse/compat/unix/osname.c
vendor/fuse-emulator/current/fuse/compat/unix/paths.c
vendor/fuse-emulator/current/fuse/compat/win32/
vendor/fuse-emulator/current/fuse/compat/win32/Makefile.am
vendor/fuse-emulator/current/fuse/compat/win32/osname.c
vendor/fuse-emulator/current/fuse/compat/win32/paths.c
vendor/fuse-emulator/current/fuse/timer/Makefile.am
vendor/fuse-emulator/current/fuse/timer/sdl.c
vendor/fuse-emulator/current/fuse/timer/unix.c
vendor/fuse-emulator/current/fuse/timer/win32.c
Removed Paths:
-------------
vendor/fuse-emulator/current/fuse/sound/lowlevel.h
Modified: vendor/fuse-emulator/current/fuse/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/Makefile.am 2007-08-06 01:17:08 UTC (rev 447)
+++ vendor/fuse-emulator/current/fuse/Makefile.am 2007-08-06 01:17:48 UTC (rev 448)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 1999-2004 Philip Kendall
-## $Id: Makefile.am 3007 2007-06-17 18:50:48Z zubzero $
+## $Id: Makefile.am 3091 2007-08-04 16:44:45Z pak21 $
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -36,6 +36,7 @@
pokefinder \
roms \
sound \
+ timer \
ui \
@WIDGET@ \
z80
@@ -87,7 +88,6 @@
sound.c \
spectrum.c \
tape.c \
- timer.c \
trdos.c \
ui.c \
uidisplay.c \
@@ -107,19 +107,18 @@
sound/libsound.a \
ui/scaler/libscaler.a \
debugger/libdebugger.a \
+timer/libtimer.a \
z80/libz80.a \
@DSKLIBS@ \
@LIBSPEC_LIBS@ \
@GLIB_LIBS@ \
@PNG_LIBS@ \
-@ASOUND_LIBS@ \
-@AO_LIBS@ \
+@SOUND_LIBS@ \
@SAMPLERATE_LIBS@ \
-@DIRECTSOUND_LIBS@ \
-@COREAUDIO_LIBS@ \
@X_LIBS@ \
@XML_LIBS@ \
compat/libcompat.a \
+compat/unix/libcompatos.a \
@WINDRES_OBJ@
fuse_DEPENDENCIES = @UI_LIBS@ \
@@ -173,7 +172,6 @@
sound.h \
spectrum.h \
tape.h \
- timer.h \
trdos.h \
utils.h \
joystick.h \
Modified: vendor/fuse-emulator/current/fuse/compat/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/Makefile.am 2007-08-06 01:17:08 UTC (rev 447)
+++ vendor/fuse-emulator/current/fuse/compat/Makefile.am 2007-08-06 01:17:48 UTC (rev 448)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
-## Copyright (c) 2003 Philip Kendall
+## Copyright (c) 2003-2007 Philip Kendall
-## $Id: Makefile.am 2889 2007-05-26 17:45:08Z zubzero $
+## $Id: Makefile.am 3091 2007-08-04 16:44:45Z 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
@@ -23,13 +23,25 @@
AUTOMAKE_OPTIONS = foreign
+SUBDIRS = @COMPAT_OSNAME@
+
+DIST_SUBDIRS = amiga \
+ morphos \
+ unix \
+ win32
+
noinst_LIBRARIES = libcompat.a
-libcompat_a_SOURCES = dirname.c \
- getopt.c \
- getopt1.c \
- mkstemp.c
+libcompat_a_SOURCES =
+EXTRA_libcompat_a_SOURCES = dirname.c \
+ getopt.c \
+ getopt1.c \
+ mkstemp.c
+
+libcompat_a_LIBADD = $(COMPAT_LIBADD)
+libcompat_a_DEPENDENCIES = $(COMPAT_LIBADD)
+
INCLUDES = @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@
noinst_HEADERS = getopt.h
Added: vendor/fuse-emulator/current/fuse/compat/amiga/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/amiga/Makefile.am (rev 0)
+++ vendor/fuse-emulator/current/fuse/compat/amiga/Makefile.am 2007-08-06 01:17:48 UTC (rev 448)
@@ -0,0 +1,31 @@
+## 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 $
+
+## This 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 = libcompatos.a
+
+libcompatos_a_SOURCES = ../unix/osname.c \
+ paths.c
+
+INCLUDES = @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@
Added: vendor/fuse-emulator/current/fuse/compat/amiga/paths.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/amiga/paths.c (rev 0)
+++ vendor/fuse-emulator/current/fuse/compat/amiga/paths.c 2007-08-06 01:17:48 UTC (rev 448)
@@ -0,0 +1,40 @@
+/* paths.c: Path-related compatability routines
+ Copyright (c) 1999-2007 Philip Kendall
+
+ $Id: paths.c 3092 2007-08-04 19:20: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
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+ Author contact information:
+
+ E-mail: phi...@sh...
+
+*/
+
+#include <config.h>
+
+#include "compat.h"
+
+const char*
+compat_get_temp_path( void )
+{
+ return "T:";
+}
+
+const char*
+compat_get_home_path( void )
+{
+ return "PROGDIR:settings";
+}
Modified: vendor/fuse-emulator/current/fuse/compat/dirname.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/dirname.c 2007-08-06 01:17:08 UTC (rev 447)
+++ vendor/fuse-emulator/current/fuse/compat/dirname.c 2007-08-06 01:17:48 UTC (rev 448)
@@ -26,8 +26,6 @@
#include <config.h>
-#ifndef HAVE_DIRNAME
-
#include <string.h>
#include "fuse.h"
@@ -99,5 +97,3 @@
return path;
}
-
-#endif /* #ifndef HAVE_DIRNAME */
Modified: vendor/fuse-emulator/current/fuse/compat/getopt.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/getopt.c 2007-08-06 01:17:08 UTC (rev 447)
+++ vendor/fuse-emulator/current/fuse/compat/getopt.c 2007-08-06 01:17:48 UTC (rev 448)
@@ -34,8 +34,6 @@
# include <config.h>
#endif
-#if !defined HAVE_GETOPT_LONG && !defined AMIGA && !defined __MORPHOS__
-
#if !defined __STDC__ || !__STDC__
/* This is a separate conditional since some stdc systems
reject `defined (const)'. */
@@ -1280,5 +1278,3 @@
}
#endif /* TEST */
-
-#endif /* #ifndef HAVE_GETOPT_LONG */
Modified: vendor/fuse-emulator/current/fuse/compat/getopt1.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/getopt1.c 2007-08-06 01:17:08 UTC (rev 447)
+++ vendor/fuse-emulator/current/fuse/compat/getopt1.c 2007-08-06 01:17:48 UTC (rev 448)
@@ -24,8 +24,6 @@
#include <config.h>
#endif
-#if !defined HAVE_GETOPT_LONG && !defined AMIGA && !defined __MORPHOS__
-
#ifdef _LIBC
# include <getopt.h>
#else
@@ -198,5 +196,3 @@
}
#endif /* TEST */
-
-#endif /* #ifndef HAVE_GETOPT_LONG */
Modified: vendor/fuse-emulator/current/fuse/compat/mkstemp.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/mkstemp.c 2007-08-06 01:17:08 UTC (rev 447)
+++ vendor/fuse-emulator/current/fuse/compat/mkstemp.c 2007-08-06 01:17:48 UTC (rev 448)
@@ -20,8 +20,6 @@
#include <config.h>
-#ifndef HAVE_MKSTEMP
-
#include <errno.h>
#include <stdlib.h>
#include <string.h>
@@ -109,5 +107,3 @@
errno = EEXIST;
return -1;
}
-
-#endif /* #ifdef HAVE_MKSTEMP */
Added: vendor/fuse-emulator/current/fuse/compat/morphos/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/morphos/Makefile.am (rev 0)
+++ vendor/fuse-emulator/current/fuse/compat/morphos/Makefile.am 2007-08-06 01:17:48 UTC (rev 448)
@@ -0,0 +1,31 @@
+## 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 $
+
+## This 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 = libcompatos.a
+
+libcompatos_a_SOURCES = osname.c \
+ ../amiga/paths.c
+
+INCLUDES = @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@
Added: vendor/fuse-emulator/current/fuse/compat/morphos/osname.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/morphos/osname.c (rev 0)
+++ vendor/fuse-emulator/current/fuse/compat/morphos/osname.c 2007-08-06 01:17:48 UTC (rev 448)
@@ -0,0 +1,34 @@
+/* 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 $
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+ Author contact information:
+
+ E-mail: phi...@sh...
+
+*/
+
+#include <config.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+
+int compat_osname( char *buffer, size_t length )
+{
+ snprintf( buffer, length, "%s %s %s", "MorphOS", "Pegasos", "1.4.4" );
+}
Added: vendor/fuse-emulator/current/fuse/compat/unix/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/unix/Makefile.am (rev 0)
+++ vendor/fuse-emulator/current/fuse/compat/unix/Makefile.am 2007-08-06 01:17:48 UTC (rev 448)
@@ -0,0 +1,31 @@
+## 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 $
+
+## This 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 = libcompatos.a
+
+libcompatos_a_SOURCES = osname.c \
+ paths.c
+
+INCLUDES = @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@
Added: vendor/fuse-emulator/current/fuse/compat/unix/osname.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/unix/osname.c (rev 0)
+++ vendor/fuse-emulator/current/fuse/compat/unix/osname.c 2007-08-06 01:17:48 UTC (rev 448)
@@ -0,0 +1,50 @@
+/* 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 $
+
+ This 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 <sys/utsname.h>
+
+#include "ui/ui.h"
+
+int compat_osname( char *buffer, size_t length )
+{
+ struct utsname osname;
+ int error;
+
+ error = uname( &osname );
+ if( error ) {
+ ui_error( UI_ERROR_ERROR, "error getting system information: %s",
+ strerror( errno ) );
+ return 1;
+ }
+
+ snprintf( buffer, length, "%s %s %s", osname.sysname, osname.machine,
+ osname.release );
+ return 0;
+}
Added: vendor/fuse-emulator/current/fuse/compat/unix/paths.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/unix/paths.c (rev 0)
+++ vendor/fuse-emulator/current/fuse/compat/unix/paths.c 2007-08-06 01:17:48 UTC (rev 448)
@@ -0,0 +1,48 @@
+/* paths.c: Path-related compatability routines
+ Copyright (c) 1999-2007 Philip Kendall
+
+ $Id: paths.c 3092 2007-08-04 19:20: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
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+ Author contact information:
+
+ E-mail: phi...@sh...
+
+*/
+
+#include <config.h>
+
+#include <stdlib.h>
+
+#include "compat.h"
+
+const char*
+compat_get_temp_path( void )
+{
+ const char *dir;
+
+ /* Use TMPDIR if specified, if not /tmp */
+ dir = getenv( "TMPDIR" ); if( dir ) return dir;
+ return "/tmp";
+}
+
+const char*
+compat_get_home_path( void )
+{
+ const char *dir;
+ dir = getenv( "HOME" ); if( dir ) return dir;
+ return ".";
+}
Added: vendor/fuse-emulator/current/fuse/compat/win32/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/win32/Makefile.am (rev 0)
+++ vendor/fuse-emulator/current/fuse/compat/win32/Makefile.am 2007-08-06 01:17:48 UTC (rev 448)
@@ -0,0 +1,31 @@
+## 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 $
+
+## This 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 = libcompatos.a
+
+libcompatos_a_SOURCES = osname.c \
+ paths.c
+
+INCLUDES = @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@
Added: vendor/fuse-emulator/current/fuse/compat/win32/osname.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/win32/osname.c (rev 0)
+++ vendor/fuse-emulator/current/fuse/compat/win32/osname.c 2007-08-06 01:17:48 UTC (rev 448)
@@ -0,0 +1,56 @@
+/* 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 $
+
+ This 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 <windows.h>
+
+int compat_osname( char *osname, size_t length )
+{
+ OSVERSIONINFO buf;
+ char *windows_name;
+
+ buf.dwOSVersionInfoSize = sizeof( buf );
+ sys_error = GetVersionEx( &buf );
+ if( sys_error == 0 ) {
+ ui_error( UI_ERROR_ERROR, "error getting system information." );
+ return 1;
+ }
+
+ switch( buf.dwPlatformId ) {
+ case VER_PLATFORM_WIN32_NT: windows_name = "NT"; break;
+ case VER_PLATFORM_WIN32_WINDOWS: windows_name = "95/98"; break;
+ case VER_PLATFORM_WIN32s: windows_name = "3.1"; break;
+ default: windows_name = "unknown"; break;
+ }
+
+ snprintf( osname, length,
+ "gcrypt: %s\nlibspectrum: %s\nuname: Windows %s %d.%d build %d %s",
+ gcrypt_version, libspectrum_version(),
+ windows_name, buf.dwMajorVersion, buf.dwMinorVersion,
+ buf.dwBuildNumber, buf.szCSDVersion );
+
+ return 0;
+}
Added: vendor/fuse-emulator/current/fuse/compat/win32/paths.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/win32/paths.c (rev 0)
+++ vendor/fuse-emulator/current/fuse/compat/win32/paths.c 2007-08-06 01:17:48 UTC (rev 448)
@@ -0,0 +1,52 @@
+/* paths.c: Path-related compatability routines
+ Copyright (c) 1999-2007 Philip Kendall
+
+ $Id: paths.c 3092 2007-08-04 19:20: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
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+ Author contact information:
+
+ E-mail: phi...@sh...
+
+*/
+
+#include <config.h>
+
+#include <stdlib.h>
+
+#include "compat.h"
+
+const char*
+compat_get_temp_path( void )
+{
+ const char *dir;
+
+ /* Something close to this algorithm specified at
+ http://msdn.microsoft.com/library/default.asp?url=/library/en-us/fileio/base/gettemppath.asp
+ */
+ dir = getenv( "TMP" ); if( dir ) return dir;
+ dir = getenv( "TEMP" ); if( dir ) return dir;
+ return ".";
+}
+
+const char*
+compat_get_home_path( void )
+{
+ const char *dir;
+ dir = getenv( "USERPROFILE" ); if( dir ) return dir;
+ dir = getenv( "WINDIR" ); if( dir ) return dir;
+ return ".";
+}
Modified: vendor/fuse-emulator/current/fuse/compat.h
===================================================================
--- vendor/fuse-emulator/current/fuse/compat.h 2007-08-06 01:17:08 UTC (rev 447)
+++ vendor/fuse-emulator/current/fuse/compat.h 2007-08-06 01:17:48 UTC (rev 448)
@@ -1,7 +1,7 @@
/* compat.h: various compatibility bits
Copyright (c) 2003 Philip Kendall
- $Id: compat.h 3039 2007-07-03 12:17:27Z fredm $
+ $Id: compat.h 3092 2007-08-04 19:20: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
@@ -26,6 +26,8 @@
#ifndef FUSE_COMPAT_H
#define FUSE_COMPAT_H
+#include <stdlib.h>
+
/* Remove the gcc-specific incantations if we're not using gcc */
#ifdef __GNUC__
@@ -70,4 +72,8 @@
#define FUSE_DIR_SEP_STR "/"
#endif
+int compat_osname( char *buffer, size_t length );
+const char* compat_get_temp_path( void );
+const char* compat_get_home_path( void );
+
#endif /* #ifndef FUSE_COMPAT_H */
Modified: vendor/fuse-emulator/current/fuse/configure.in
===================================================================
--- vendor/fuse-emulator/current/fuse/configure.in 2007-08-06 01:17:08 UTC (rev 447)
+++ vendor/fuse-emulator/current/fuse/configure.in 2007-08-06 01:17:48 UTC (rev 448)
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-dnl $Id: configure.in 3078 2007-07-27 10:49:51Z pak21 $
+dnl $Id: configure.in 3093 2007-08-04 20:51:34Z 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
@@ -351,11 +351,12 @@
plus3disk=yes)
AC_MSG_RESULT($plus3disk)
if test "$plus3disk" = yes; then
- AC_CHECK_HEADERS(765.h, DSKLIBS="$DSKLIBS -l765"; lib765=yes,
+ AC_CHECK_HEADERS(765.h, DSKLIBS="$DSKLIBS -l765" lib765=yes,
AC_MSG_WARN(765.h not found - +3 disk support disabled))
fi
dnl Do we want LibDsk support?
+AC_MSG_CHECKING(whether libdsk is available)
AC_ARG_WITH(libdsk,
[ --without-libdsk disable LibDsk support],
if test "$withval" = no; then libdsk=no; else libdsk=yes; fi,
@@ -396,12 +397,11 @@
AC_CHECK_LIB( asound, snd_pcm_hw_params_set_period_size_near,
[AC_CHECK_HEADER(
alsa/asoundlib.h,
- [AC_DEFINE([USE_LIBASOUND], 1, [Defined if we're going to be using the installed libasound]) ASOUND_LIBS='-lasound'],
+ [alsa_available=yes],
[AC_MSG_WARN(alsa/asoundlib.h not found - no ALSA output)]
)],
[AC_MSG_WARN(snd_pcm_hw_params_set_period_size_near not found - no ALSA output)]
)
- AC_SUBST(ASOUND_LIBS)
fi
dnl Check if a version of libao which supplies ao_open_live is available
@@ -415,21 +415,19 @@
AC_CHECK_LIB( ao, ao_open_live,
[AC_CHECK_HEADER(
ao/ao.h,
- [AC_DEFINE([USE_LIBAO], 1, [Defined if we're going to be using the installed libao]) AO_LIBS='-lao'],
+ [ao_available=yes],
[AC_MSG_WARN(ao/ao.h not found - no libao sound output)]
)],
[AC_MSG_WARN(ao_open_live not found - no libao sound output)]
)
- AC_SUBST(AO_LIBS)
fi
dnl Check if DirectSound is available
AC_CHECK_HEADER(
dsound.h,
- [AC_DEFINE([USE_DIRECTSOUND], 1, [Defined if we're going to be using DirectSound]) DIRECTSOUND_LIBS='-ldsound -lole32 -ldxguid'],
+ [dxsound_available=yes],
[AC_MSG_WARN(dsound.h not found - no DirectSound output)]
)
-AC_SUBST(DIRECTSOUND_LIBS)
PKG_CHECK_MODULES(SAMPLERATE, samplerate >= 0.1.0,
AC_DEFINE([HAVE_SAMPLERATE],1,[Define to 1 if you have libsamplerate.]),
@@ -440,11 +438,56 @@
dnl Check if CoreAudio is available
AC_CHECK_HEADER(
CoreAudio/AudioHardware.h,
- [AC_DEFINE([USE_COREAUDIO], 1, [Defined if we're going to be using CoreAudio]) COREAUDIO_LIBS='-framework CoreAudio -framework AudioUnit -framework CoreServices'],
+ [coreaudio_available=yes],
[AC_MSG_WARN(CoreAudio/AudioHardware.h not found - no CoreAudio sound output)]
)
-AC_SUBST(COREAUDIO_LIBS)
+dnl
+dnl Decide which sound routines to use
+dnl
+
+AC_MSG_CHECKING(which sound routines to use)
+if test "$dxsound_available" = yes; then
+ SOUND_LIBADD='dxsound.$(OBJEXT)' SOUND_LIBS='-ldsound -lole32 -ldxguid'
+ AC_MSG_RESULT(DirectX)
+elif test "$UI" = sdl; then
+ SOUND_LIBADD='sdlsound.$(OBJEXT)' SOUND_LIBS='' sound_fifo=yes
+ AC_MSG_RESULT(SDL)
+elif test "$alsa_available" = yes; then
+ SOUND_LIBADD='alsasound.$(OBJEXT)' SOUND_LIBS='-lasound'
+ AC_MSG_RESULT(ALSA)
+elif test "$ao_available" = yes; then
+ SOUND_LIBADD='aosound.$(OBJEXT)' SOUND_LIBS='-lao'
+ AC_MSG_RESULT(libao)
+elif test "$ac_cv_header_dsound_h" = yes; then
+ # Later selection between these two
+ SOUND_LIBADD='sunsound.$(OBJEXT) hpsound.$(OBJEXT)' SOUND_LIBS=''
+ AC_MSG_RESULT(Solaris or HP/UX)
+elif test "$ac_cv_header_sys_soundcard_h" = yes; then
+ SOUND_LIBADD='osssound.$(OBJEXT)' SOUND_LIBS=''
+ AC_MSG_RESULT(OSS)
+elif test "$ac_cv_header_sys_audioio_h" = yes; then
+ dnl OpenBSD
+ SOUND_LIBADD='sunsound.$(OBJEXT)' SOUND_LIBS=''
+ AC_MSG_RESULT(OpenBSD)
+elif test "$coreaudio_available" = yes; then
+ SOUND_LIBADD='coreaudiosound.$(OBJEXT)' SOUND_LIBS='-framework CoreAudio -framework AudioUnit -framework CoreServices' sound_fifo=yes
+ AC_MSG_RESULT(CoreAudio)
+else
+ SOUND_LIBADD='nullsound.$(OBJEXT)' SOUND_LIBS=''
+ AC_MSG_RESULT(none)
+ AC_DEFINE([NO_SOUND], 1, [Defined if no sound code is present])
+fi
+
+if test "$sound_fifo" = yes; then
+ dnl Strange construct used here as += doesn't seem to work on OS X
+ SOUND_LIBADD="$SOUND_LIBADD"' sfifo.$(OBJEXT)'
+ AC_DEFINE([SOUND_FIFO], 1, [Defined if the sound code uses a fifo])
+fi
+
+AC_SUBST(SOUND_LIBADD)
+AC_SUBST(SOUND_LIBS)
+
dnl Are we supplying the ROMs or relying on another package?
AC_MSG_CHECKING(where to find the Spectrum ROM images)
AC_ARG_WITH(roms-dir,
@@ -504,6 +547,82 @@
[Defined if we've got libxml2]),
AC_WARN(libxml2 not found - config file use disabled))
+dnl Work out which timer routines to use
+AC_MSG_CHECKING(which timer routines to use)
+if test "$UI" = sdl; then
+ TIMER_LIBADD='sdl.$(OBJEXT)'
+ timer_header='<SDL.h>'
+ timer_type='Uint32'
+ AC_MSG_RESULT(SDL)
+else
+ case "$target_os" in
+ win32)
+ TIMER_LIBADD='win32.$(OBJEXT)'
+ timer_header='<windows.h>'
+ timer_type='DWORD'
+ AC_MSG_RESULT(Win32)
+ ;;
+ *)
+ TIMER_LIBADD='unix.$(OBJEXT)'
+ timer_header='<sys/time.h>'
+ timer_type='struct timeval'
+ AC_MSG_RESULT(unix)
+ ;;
+ esac
+fi
+
+AC_SUBST(TIMER_LIBADD)
+AC_DEFINE_UNQUOTED([TIMER_HEADER], $timer_header, [The header needed to define the timer type])
+AC_DEFINE_UNQUOTED([TIMER_TYPE], $timer_type, [The type needed for the timer routines])
+
+dnl Work out which standard routines we're missing
+AC_MSG_CHECKING(which standard routines we're missing)
+COMPAT_LIBADD=''
+missing_routines=''
+if test "$ac_cv_func_dirname" = no; then
+ COMPAT_LIBADD="$COMPAT_LIBADD"'dirname.$(OBJEXT) '
+ missing_routines="$missing_routines"'dirname '
+fi
+if test "$ac_cv_func_getopt_long" = no; then
+ case "$target_os" in
+ amiga|morphos)
+ dnl Our getopt_long replacement doesn't work, so don't use it
+ ;;
+ *)
+ COMPAT_LIBADD="$COMPAT_LIBADD"'getopt.$(OBJEXT) getopt1.$(OBJEXT) '
+ missing_routines="$missing_routines"'getopt_long '
+ ;;
+ esac
+fi
+if test "$ac_cv_func_mkstemp" = no; then
+ COMPAT_LIBADD="$COMPAT_LIBADD"'mkstemp.$(OBJEXT) '
+ missing_routines="$missing_routines"'mkstemp '
+fi
+if test "x$missing_routines" = x; then
+ missing_routines='(none)'
+fi
+AC_MSG_RESULT($missing_routines)
+AC_SUBST(COMPAT_LIBADD)
+
+dnl Work out which compatability routines to use
+AC_MSG_CHECKING(which compatability routines to use)
+case "$target_os" in
+ amiga)
+ COMPAT_OSNAME='amiga'
+ ;;
+ morphos)
+ COMPAT_OSNAME='morphos'
+ ;;
+ win32)
+ COMPAT_OSNAME='win32'
+ ;;
+ *)
+ COMPAT_OSNAME='unix'
+ ;;
+esac
+AC_MSG_RESULT($COMPAT_OSNAME)
+AC_SUBST(COMPAT_OSNAME)
+
dnl Do we want the low memory compile?
AC_MSG_CHECKING(whether low memory compile requested)
AC_ARG_ENABLE(smallmem,
@@ -540,24 +659,12 @@
fi
fi
-dnl Debugging mode: turns off any use of signals to make running under gdb
-dnl useful.
-AC_MSG_CHECKING(whether debugging mode requested)
-AC_ARG_ENABLE(debug-mode,
-[ --enable-debug-mode enable debugging mode (developers only)],
-if test "$enableval" = yes; then
- debugging=yes;
-else
- debugging=no;
-fi,
-debugging=no)
-AC_MSG_RESULT($debugging)
-if test "$debugging" = yes; then
- AC_DEFINE([DEBUG_MODE], 1, [Defined if we're in debugging mode])
-fi
-
AC_OUTPUT(Makefile \
compat/Makefile \
+compat/amiga/Makefile \
+compat/morphos/Makefile \
+compat/unix/Makefile \
+compat/win32/Makefile \
debugger/Makefile \
disk/Makefile \
hacking/Makefile \
@@ -569,6 +676,7 @@
pokefinder/Makefile \
roms/Makefile \
sound/Makefile \
+timer/Makefile \
ui/Makefile \
ui/fb/Makefile \
ui/gtk/Makefile \
Modified: vendor/fuse-emulator/current/fuse/event.c
===================================================================
--- vendor/fuse-emulator/current/fuse/event.c 2007-08-06 01:17:08 UTC (rev 447)
+++ vendor/fuse-emulator/current/fuse/event.c 2007-08-06 01:17:48 UTC (rev 448)
@@ -1,7 +1,7 @@
/* event.c: Routines needed for dealing with the event list
Copyright (c) 2000-2004 Philip Kendall
- $Id: event.c 3032 2007-06-28 22:48:54Z zubzero $
+ $Id: event.c 3084 2007-07-30 21:54:54Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -38,12 +38,11 @@
#include "psg.h"
#include "rzx.h"
#include "tape.h"
-#include "timer.h"
+#include "timer/timer.h"
#include "trdos.h"
#include "ui/ui.h"
#include "ui/uijoystick.h"
#include "spectrum.h"
-#include "timer.h"
#include "z80/z80.h"
/* A large value to mean `no events due' */
Modified: vendor/fuse-emulator/current/fuse/fuse.c
===================================================================
--- vendor/fuse-emulator/current/fuse/fuse.c 2007-08-06 01:17:08 UTC (rev 447)
+++ vendor/fuse-emulator/current/fuse/fuse.c 2007-08-06 01:17:48 UTC (rev 448)
@@ -1,7 +1,7 @@
/* fuse.c: The Free Unix Spectrum Emulator
Copyright (c) 1999-2007 Philip Kendall
- $Id: fuse.c 3040 2007-07-03 14:14:00Z zubzero $
+ $Id: fuse.c 3091 2007-08-04 16:44:45Z 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
@@ -68,10 +68,9 @@
#include "slt.h"
#include "snapshot.h"
#include "sound.h"
-#include "sound/lowlevel.h"
#include "spectrum.h"
#include "tape.h"
-#include "timer.h"
+#include "timer/timer.h"
#include "trdos.h"
#include "ui/ui.h"
#include "ui/scaler/scaler.h"
@@ -297,15 +296,8 @@
{
size_t i;
unsigned int version[4] = { 0, 0, 0, 0 };
- char *custom;
+ char *custom, osname[ 256 ];
-#ifndef WIN32
- struct utsname buf;
-#else /* #ifndef WIN32 */
- OSVERSIONINFO buf;
- char *windows_name;
-#endif /* #ifndef WIN32 */
-
libspectrum_error error; int sys_error;
const char *gcrypt_version;
@@ -315,25 +307,8 @@
for( i=0; i<4; i++ ) if( version[i] > 0xff ) version[i] = 0xff;
-#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;
- }
-#endif /* #if defined(__MORPHOS__) */
+ sys_error = compat_osname( osname, sizeof( osname ) );
+ if( sys_error ) return 1;
error = libspectrum_creator_alloc( &fuse_creator ); if( error ) return error;
@@ -358,29 +333,10 @@
gcrypt_version = libspectrum_gcrypt_version();
if( !gcrypt_version ) gcrypt_version = "not available";
-#ifndef WIN32
-
- snprintf( custom, 256, "gcrypt: %s\nlibspectrum: %s\nuname: %s %s %s",
- gcrypt_version, libspectrum_version(),
- buf.sysname, buf.machine, buf.release );
-
-#else /* #ifndef WIN32 */
-
- switch( buf.dwPlatformId ) {
- case VER_PLATFORM_WIN32_NT: windows_name = "NT"; break;
- case VER_PLATFORM_WIN32_WINDOWS: windows_name = "95/98"; break;
- case VER_PLATFORM_WIN32s: windows_name = "3.1"; break;
- default: windows_name = "unknown"; break;
- }
-
snprintf( custom, 256,
- "gcrypt: %s\nlibspectrum: %s\nuname: Windows %s %d.%d build %d %s",
- gcrypt_version, libspectrum_version(),
- windows_name, buf.dwMajorVersion, buf.dwMinorVersion,
- buf.dwBuildNumber, buf.szCSDVersion );
+ "gcrypt: %s\nlibspectrum: %s\nuname: %s", gcrypt_version,
+ libspectrum_version(), osname );
-#endif /* #ifndef WIN32 */
-
error = libspectrum_creator_set_custom(
fuse_creator, (libspectrum_byte*)custom, strlen( custom )
);
Modified: vendor/fuse-emulator/current/fuse/hacking/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse/hacking/ChangeLog 2007-08-06 01:17:08 UTC (rev 447)
+++ vendor/fuse-emulator/current/fuse/hacking/ChangeLog 2007-08-06 01:17:48 UTC (rev 448)
@@ -1941,3 +1941,38 @@
simpleide.c,tape.c,ui/gtk/{browse.c,debugger.c,gtkjoystick.c,
gtkmouse.c,gtkui.c,pokefinder.c,rollback.c},z80/z80.c,zxatasp.c,
zxcf.c: some -Wextra tidyup (not finished yet).
+20070729 menu_data.pl,printer.c,settings.pl,ui/gtk/{debugger.c,gtkjoystick.c,
+ gtkmouse.c,pokefinder.c,stock.c},z80/coretest.c: more -Wextra tidyup.
+20070730 Makefile.am,configure.in,fuse.c,sound/{Makefile.am,alsasound.c,
+ aosound.c,coreaudiosound.c,dxsound.c,hpsound.c,lowlevel.h,nullsound.c,
+ osssound.c,sdlsound.c,sfifo.c,sound.c,sunsound.c},spectrum.c,timer.c:
+ move sound selection logic into configure.in (patch #1763265).
+20070730 utils.c: mmap no longer used.
+20070730 Makefile.am,configure.in,event.c,fuse.c,rzx.c,spectrum.c,tape.c,
+ timer.[ch],timer/{Makefile.am,sdl.c,timer.c,timer.h,unix.c,win32.c},
+ ui/gtk/gtkui.c,widget/widget.c: move timer code selection logic into
+ configure.in.
+20070731 configure.in: fix spelling of ALSA (thanks, Gergely).
+20070731 configure.in,compat/{Makefile.am,dirname.c,getopt.c,getopt1.c,
+ mkstemp.c}: move compatability detection logic into configure.in.
+20070731 timer/{Makefile.am,sdl.c,unix.c,win32.c}: add missing properties and
+ fix initial comments (Stuart).
+20070802 machines/tc2048.c: correct joystick port mask on TC2048 (verified on
+ real hardware) (Fred).
+20070803 configure.in,timer/timer.h: move timer header selection logic into
+ configure.in.
+20070803 sound/alsasound.c: release code should not dump 100 lines of stuff
+ onto the console.
+20070804 configure.in,fuse.c,compat/Makefile.am,compat/amiga/Makefile.am,
+ compat/morphos/{Makefile.am,osname.c},compat/unix/{Makefile.am,
+ osname.c},compat/win32/{Makefile.am,osname.c}: move OS name function
+ selection into configure.in.
+20070804 compat.h,settings.pl,trdos.c,utils.c,compat/amiga/{Makefile.am,paths.c},
+ compat/morphos/Makefile.am,compat/unix/{Makefile.am,paths.c},
+ compat/win32/{Makefile.am,paths.c}: move pathname functions into
+ compatability directories.
+20070804 configure.in: remove debug mode as its not used anywhere.
+20070806 compat/unix/osname.c: ensure we have the prototype for strerror()
+ (Fred).
+20070806 tape.[ch],ula.c: enable beeper output for MIC bit (an attempt at
+ feature request #1763114) (Fred).
Modified: vendor/fuse-emulator/current/fuse/machines/tc2048.c
===================================================================
--- vendor/fuse-emulator/current/fuse/machines/tc2048.c 2007-08-06 01:17:08 UTC (rev 447)
+++ vendor/fuse-emulator/current/fuse/machines/tc2048.c 2007-08-06 01:17:48 UTC (rev 448)
@@ -2,7 +2,7 @@
Copyright (c) 1999-2005 Philip Kendall
Copyright (c) 2002-2004 Fredrick Meunier
- $Id: tc2048.c 3022 2007-06-28 17:14:46Z zubzero $
+ $Id: tc2048.c 3088 2007-08-02 13:04:07Z fredm $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -47,7 +47,7 @@
static libspectrum_byte tc2048_contend_delay( libspectrum_dword time );
static const periph_t peripherals[] = {
- { 0x00e0, 0x0000, joystick_kempston_read, NULL },
+ { 0x0020, 0x0000, joystick_kempston_read, NULL },
{ 0x0018, 0x0010, if1_port_in, if1_port_out },
{ 0x0018, 0x0008, if1_port_in, if1_port_out },
{ 0x0018, 0x0000, if1_port_in, if1_port_out },
Modified: vendor/fuse-emulator/current/fuse/menu_data.pl
===================================================================
--- vendor/fuse-emulator/current/fuse/menu_data.pl 2007-08-06 01:17:08 UTC (rev 447)
+++ vendor/fuse-emulator/current/fuse/menu_data.pl 2007-08-06 01:17:48 UTC (rev 448)
@@ -3,7 +3,7 @@
# menu_data.pl: generate the menu structure from menu_data.dat
# Copyright (c) 2004-2007 Philip Kendall, Stuart Brady, Marek Januszewski
-# $Id: menu_data.pl 2915 2007-05-30 12:24:56Z zubzero $
+# $Id: menu_data.pl 3081 2007-07-29 15:30:30Z pak21 $
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -262,7 +262,7 @@
print 'NULL';
}
- print ", ", $item->{action} || 0, ", \"<$item->{type}>\" },\n";
+ print ", ", $item->{action} || 0, ", \"<$item->{type}>\", NULL },\n";
_dump_gtk( $item, "$gtk_path/$name", $new_cpath ) if $item->{submenu};
}
Modified: vendor/fuse-emulator/current/fuse/printer.c
===================================================================
--- vendor/fuse-emulator/current/fuse/printer.c 2007-08-06 01:17:08 UTC (rev 447)
+++ vendor/fuse-emulator/current/fuse/printer.c 2007-08-06 01:17:48 UTC (rev 448)
@@ -1,7 +1,7 @@
/* printer.c: Printer support
Copyright (c) 2001-2004 Ian Collier, Russell Marks, Philip Kendall
- $Id: printer.c 3080 2007-07-27 17:46:12Z pak21 $
+ $Id: printer.c 3081 2007-07-29 15:30:30Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -69,7 +69,7 @@
static void printer_zxp_reset(int hard_reset);
-static module_info_t printer_zxp_module_info={printer_zxp_reset,NULL};
+static module_info_t printer_zxp_module_info={printer_zxp_reset,NULL,NULL,NULL};
static void printer_zxp_init(void)
{
Modified: vendor/fuse-emulator/current/fuse/rzx.c
===================================================================
--- vendor/fuse-emulator/current/fuse/rzx.c 2007-08-06 01:17:08 UTC (rev 447)
+++ vendor/fuse-emulator/current/fuse/rzx.c 2007-08-06 01:17:48 UTC (rev 448)
@@ -1,7 +1,7 @@
/* rzx.c: .rzx files
Copyright (c) 2002-2003 Philip Kendall
- $Id: rzx.c 2958 2007-06-10 14:09:38Z pak21 $
+ $Id: rzx.c 3084 2007-07-30 21:54:54Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -40,7 +40,7 @@
#include "rzx.h"
#include "settings.h"
#include "snapshot.h"
-#include "timer.h"
+#include "timer/timer.h"
#include "ui/ui.h"
#include "ula.h"
#include "utils.h"
Modified: vendor/fuse-emulator/current/fuse/settings.pl
===================================================================
--- vendor/fuse-emulator/current/fuse/settings.pl 2007-08-06 01:17:08 UTC (rev 447)
+++ vendor/fuse-emulator/current/fuse/settings.pl 2007-08-06 01:17:48 UTC (rev 448)
@@ -3,7 +3,7 @@
# settings.pl: generate settings.c from settings.dat
# Copyright (c) 2002-2005 Philip Kendall
-# $Id: settings.pl 3039 2007-07-03 12:17:27Z fredm $
+# $Id: settings.pl 3092 2007-08-04 19:20: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
@@ -117,6 +117,8 @@
}
print hashline( __LINE__ ), << 'CODE';
+ /* show_help */ 0,
+ /* show_version */ 0,
};
#ifdef HAVE_LIB_XML2
@@ -170,7 +172,7 @@
xmlDocPtr doc;
- home = utils_get_home_path(); if( !home ) return 1;
+ home = compat_get_home_path(); if( !home ) return 1;
snprintf( path, 256, "%s/%s", home, CONFIG_FILE_NAME );
@@ -270,7 +272,7 @@
xmlDocPtr doc; xmlNodePtr root;
- home = utils_get_home_path(); if( !home ) return 1;
+ home = compat_get_home_path(); if( !home ) return 1;
snprintf( path, 256, "%s/%s", home, CONFIG_FILE_NAME );
Modified: vendor/fuse-emulator/current/fuse/sound/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/sound/Makefile.am 2007-08-06 01:17:08 UTC (rev 447)
+++ vendor/fuse-emulator/current/fuse/sound/Makefile.am 2007-08-06 01:17:48 UTC (rev 448)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2004 Philip Kendall
-## $Id: Makefile.am 2920 2007-06-02 02:06:05Z fredm $
+## $Id: Makefile.am 3082 2007-07-30 21:12:44Z pak21 $
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -27,15 +27,20 @@
noinst_LIBRARIES = libsound.a
-libsound_a_SOURCES = dxsound.c \
- alsasound.c \
- aosound.c \
- coreaudiosound.c \
- hpsound.c \
- nullsound.c \
- osssound.c \
- sdlsound.c \
- sfifo.c \
- sunsound.c
+libsound_a_SOURCES =
-noinst_HEADERS = lowlevel.h sfifo.h
+EXTRA_libsound_a_SOURCES = dxsound.c \
+ alsasound.c \
+ aosound.c \
+ coreaudiosound.c \
+ hpsound.c \
+ nullsound.c \
+ osssound.c \
+ sdlsound.c \
+ sfifo.c \
+ sunsound.c
+
+libsound_a_LIBADD = $(SOUND_LIBADD)
+libsound_a_DEPENDENCIES = $(SOUND_LIBADD)
+
+noinst_HEADERS = sfifo.h
Modified: vendor/fuse-emulator/current/fuse/sound/alsasound.c
===================================================================
--- vendor/fuse-emulator/current/fuse/sound/alsasound.c 2007-08-06 01:17:08 UTC (rev 447)
+++ vendor/fuse-emulator/current/fuse/sound/alsasound.c 2007-08-06 01:17:48 UTC (rev 448)
@@ -1,7 +1,7 @@
/* alsasound.c: ALSA (Linux) sound I/O
Copyright (c) 2006 Gergely Szasz
- $Id: alsasound.c 3059 2007-07-15 21:14:44Z zubzero $
+ $Id: alsasound.c 3090 2007-08-03 18:49:43Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -21,10 +21,6 @@
#include <config.h>
-#include "lowlevel.h"
-
-#ifdef SOUND_ALSA
-
#include <stdio.h>
#include <string.h>
#include <ctype.h>
@@ -337,12 +333,8 @@
return 1;
}
+ if( first_init ) snd_output_stdio_attach(&output, stdout, 0);
- if( first_init ) {
- snd_output_stdio_attach(&output, stdout, 0);
- snd_pcm_dump(pcm_handle, output);
- }
-
first_init = 0;
init_running = 0;
return 0; /* success */
@@ -376,5 +368,3 @@
}
}
}
-
-#endif /* #ifdef SOUND_ALSA */
Modified: vendor/fuse-emulator/current/fuse/sound/aosound.c
===================================================================
--- vendor/fuse-emulator/current/fuse/sound/aosound.c 2007-08-06 01:17:08 UTC (rev 447)
+++ vendor/fuse-emulator/current/fuse/sound/aosound.c 2007-08-06 01:17:48 UTC (rev 448)
@@ -1,7 +1,7 @@
/* aosound.c: libao sound I/O
Copyright (c) 2004 Gergely Szasz, Philip Kendall
- $Id: aosound.c 2889 2007-05-26 17:45:08Z zubzero $
+ $Id: aosound.c 3082 2007-07-30 21:12:44Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -27,10 +27,6 @@
#include <config.h>
-#include "lowlevel.h"
-
-#ifdef SOUND_AO
-
#include <string.h>
#include <ao/ao.h>
@@ -246,5 +242,3 @@
ao_play( dev_for_ao, data8, len );
}
-
-#endif /* #ifdef SOUND_AO */
Modified: vendor/fuse-emulator/current/fuse/sound/coreaudiosound.c
===================================================================
--- vendor/fuse-emulator/current/fuse/sound/coreaudiosound.c 2007-08-06 01:17:08 UTC (rev 447)
+++ vendor/fuse-emulator/current/fuse/sound/coreaudiosound.c 2007-08-06 01:17:48 UTC (rev 448)
@@ -19,10 +19,6 @@
#include <config.h>
-#include "lowlevel.h"
-
-#ifdef SOUND_COREAUDIO
-
#include <errno.h>
#include <unistd.h>
#include <CoreAudio/AudioHardware.h>
@@ -277,5 +273,3 @@
return noErr;
}
-
-#endif /* #ifdef SOUND_COREAUDIO */
Modified: vendor/fuse-emulator/current/fuse/sound/dxsound.c
===================================================================
--- vendor/fuse-emulator/current/fuse/sound/dxsound.c 2007-08-06 01:17:08 UTC (rev 447)
+++ vendor/fuse-emulator/current/fuse/sound/dxsound.c 2007-08-06 01:17:48 UTC (rev 448)
@@ -1,7 +1,7 @@
/* dxsound.c: DirectX sound I/O
Copyright (c) 2003-2004 Marek Januszewski, Philip Kendall
- $Id: dxsound.c 2889 2007-05-26 17:45:08Z zubzero $
+ $Id: dxsound.c 3082 2007-07-30 21:12:44Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -25,10 +25,6 @@
#include <config.h>
-#include "lowlevel.h"
-
-#ifdef SOUND_DX
-
#include <windows.h>
#include <mmsystem.h>
#include <dsound.h>
@@ -234,5 +230,3 @@
IDirectSoundBuffer_Unlock( lpDSBuffer, ucbuffer1, i1, ucbuffer2, i2 );
}
}
-
-#endif /* #ifdef SOUND_DX */
Modified: vendor/fuse-emulator/current/fuse/sound/hpsound.c
===================================================================
--- vendor/fuse-emulator/current/fuse/sound/hpsound.c 2007-08-06 01:17:08 UTC (rev 447)
+++ vendor/fuse-emulator/current/fuse/sound/hpsound.c 2007-08-06 01:17:48 UTC (rev 448)
@@ -2,7 +2,7 @@
Copyright (c) 2002-2004 Alexander Yurchenko, Russell Marks, Philip Kendall
Matan Ziv-Av, Stuart Brady
- $Id: hpsound.c 2889 2007-05-26 17:45:08Z zubzero $
+ $Id: hpsound.c 3082 2007-07-30 21:12:44Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -22,10 +22,8 @@
#include <config.h>
-#include "lowlevel.h"
+#ifdef AUDIO_FORMAT_LINEAR16BIT
-#ifdef SOUND_HP
-
#include <sys/types.h>
#include <sys/audio.h>
#include <sys/ioctl.h>
@@ -168,4 +166,4 @@
}
}
-#endif /* #ifdef SOUND_HP */
+#endif /* #ifdef AUDIO_FORMAT_LINEAR16BIT */
Deleted: vendor/fuse-emulator/current/fuse/sound/lowlevel.h
===================================================================
--- vendor/fuse-emulator/current/fuse/sound/lowlevel.h 2007-08-06 01:17:08 UTC (rev 447)
+++ vendor/fuse-emulator/current/fuse/sound/lowlevel.h 2007-08-06 01:17:48 UTC (rev 448)
@@ -1,83 +0,0 @@
-/* lowlevel.h: work out which lowlevel sound routines to use
- Copyright (c) 2004 Philip Kendall
-
- $Id: lowlevel.h 2920 2007-06-02 02:06:05Z fredm $
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-*/
-
-/* This header file should define HAVE_SOUND if any form of sound API
- is available. If so, it should define one of the SOUND_xxx defines. */
-
-#ifndef FUSE_SOUND_LOWLEVEL_H
-#define FUSE_SOUND_LOWLEVEL_H
-
-#if defined USE_DIRECTSOUND
-
-#define HAVE_SOUND
-#define SOUND_DX
-
-#elif defined UI_SDL /* #if defined USE_DIRECTSOUND */
-
-#define HAVE_SOUND
-#define SOUND_SDL
-
-#elif defined USE_LIBASOUND /* #if defined USE_DIRECTSOUND */
-
-#define HAVE_SOUND
-#define SOUND_ALSA
-
-#elif defined USE_LIBAO /* #if defined USE_DIRECTSOUND */
-
-#define HAVE_SOUND
-#define SOUND_AO
-
-#elif defined HAVE_SYS_AUDIO_H /* #if defined USE_DIRECTSOUND */
-
-#include <sys/audio.h>
-
-#if defined AUDIO_SETINFO
-
-#define HAVE_SOUND
-#define SOUND_SUN
-
-#elif defined AUDIO_FORMAT_LINEAR16BIT /* #if defined AUDIO_SETINFO */
-
-#define HAVE_SOUND
-#define SOUND_HP
-
-#endif /* #if defined AUDIO_SETINFO */
-
-#elif defined HAVE_SYS_SOUNDCARD_H /* #if defined USE_DIRECTSOUND */
-
-#define HAVE_SOUND
-#define SOUND_OSS
-
-/* TODO: does OpenBSD have <sys/audio.h>? Solaris does, so the above
- check will do there */
-#elif defined HAVE_SYS_AUDIOIO_H /* #if defined USE_DIRECTSOUND */
-
-#define HAVE_SOUND
-#define SOUND_SUN
-
-#elif defined USE_COREAUDIO /* #if defined USE_DIRECTSOUND */
-
-#define HAVE_SOUND
-#define SOUND_COREAUDIO
-
-#endif /* #if defined USE_DIRECTSOUND */
-
-#endif /* #ifndef FUSE_SOUND_LOWLEVEL_H */
Modified: vendor/fuse-emulator/current/fuse/sound/nullsound.c
===================================================================
--- vendor/fuse-emulator/current/fuse/sound/nullsound.c 2007-08-06 01:17:08 UTC (rev 447)
+++ vendor/fuse-emulator/current/fuse/sound/nullsound.c 2007-08-06 01:17:48 UTC (rev 448)
@@ -1,7 +1,7 @@
/* nullsound.c: dummy sound routines
Copyright (c) 2003-2004 Philip Kendall
- $Id: nullsound.c 2889 2007-05-26 17:45:08Z zubzero $
+ $Id: nullsound.c 3082 2007-07-30 21:12:44Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -21,13 +21,9 @@
#include <config.h>
-#include "lowlevel.h"
-
/* Dummy functions for when we don't have a sound device; should never be
called, so just abort if they are */
-#ifndef HAVE_SOUND
-
#include "fuse.h"
int
@@ -47,5 +43,3 @@
{
fuse_abort();
}
-
-#endif /* #ifndef HAVE_SOUND */
Modified: vendor/fuse-emulator/current/fuse/sound/osssound.c
===================================================================
--- vendor/fuse-emulator/current/fuse/sound/osssound.c 2007-08-06 01:17:08 UTC (rev 447)
+++ vendor/fuse-emulator/current/fuse/sound/osssound.c 2007-08-06 01:17:48 UTC (rev 448)
@@ -1,7 +1,7 @@
/* osssound.c: OSS (e.g. Linux) sound I/O
Copyright (c) 2000-2004 Russell Marks, Matan Ziv-Av, Philip Kendall
- $Id: osssound.c 2889 2007-05-26 17:45:08Z zubzero $
+ $Id: osssound.c 3082 2007-07-30 21:12:44Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -21,10 +21,6 @@
#include <config.h>
-#include "lowlevel.h"
-
-#ifdef SOUND_OSS
-
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
@@ -183,5 +179,3 @@
ofs+=ret,len-=ret;
}
}
-
-#endif /* #ifdef SOUND_OSS */
Modified: vendor/fuse-emulator/current/fuse/sound/sdlsound.c
===================================================================
--- vendor/fuse-emulator/current/fuse/sound/sdlsound.c 2007-08-06 01:17:08 UTC (rev 447)
+++ vendor/fuse-emulator/current/fuse/sound/sdlsound.c 2007-08-06 01:17:48 UTC (rev 448)
@@ -2,7 +2,7 @@
Copyright (c) 2002-2004 Alexander Yurchenko, Russell Marks, Philip Kendall,
Fredrick Meunier
- $Id: sdlsound.c 3039 2007-07-03 12:17:27Z fredm $
+ $Id: sdlsound.c 3082 2007-07-30 21:12:44Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -22,10 +22,6 @@
#include <config.h>
-#include "lowlevel.h"
-
-#ifdef SOUND_SDL
-
#include <errno.h>
#include <fcntl.h>
#include <math.h>
@@ -214,5 +210,3 @@
/* If we ran out of sound, do nothing else as SDL has prefilled
the output buffer with silence :( */
}
-
-#endif /* #ifdef SOUND_SDL */
Modified: vendor/fuse-emulator/current/fuse/sound/sfifo.c
===================================================================
--- vendor/fuse-emulator/current/fuse/sound/sfifo.c 2007-08-06 01:17:08 UTC (rev 447)
+++ vendor/fuse-emulator/current/fuse/sound/sfifo.c 2007-08-06 01:17:48 UTC (rev 448)
@@ -16,10 +16,6 @@
#include <config.h>
-#include "lowlevel.h"
-
-#if defined SOUND_SDL || defined SOUND_COREAUDIO
-
#ifdef __KERNEL__
# include <linux/string.h>
# include <asm/uaccess.h>
@@ -328,5 +324,3 @@
}
#endif
-
-#endif /* SOUND_SDL */
Modified: vendor/fuse-emulator/current/fuse/sound/sunsound.c
===================================================================
--- vendor/fuse-emulator/current/fuse/sound/sunsound.c 2007-08-06 01:17:08 UTC (rev 447)
+++ vendor/fuse-emulator/current/fuse/sound/sunsound.c 2007-08-06 01:17:48 UTC (rev 448)
@@ -1,7 +1,7 @@
/* sunsound.c: OpenBSD sound I/O
Copyright (c) 2002-2004 Alexander Yurchenko, Russell Marks, Philip Kendall
- $Id: sunsound.c 2889 2007-05-26 17:45:08Z zubzero $
+ $Id: sunsound.c 3082 2007-07-30 21:12:44Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -21,10 +21,8 @@
#include <config.h>
-#include "lowlevel.h"
+#if defined AUDIO_SETINFO || defined HAVE_SYS_AUDIOIO_H
-#ifdef SOUND_SUN
-
#if defined(__SVR4) && defined(__sun)
#define solaris
#else
@@ -208,4 +206,5 @@
}
}
-#endif /* #ifdef SOUND_SUN */
+#endif /* #if defined AUDIO_SETINFO || defined HAVE_SYS_AUDIOIO_H */
+
Modified: vendor/fuse-emulator/current/fuse/sound.c
===================================================================
--- vendor/fuse-emulator/current/fuse/sound.c 2007-08-06 01:17:08 UTC (rev 447)
+++ vendor/fuse-emulator/current/fuse/sound.c 2007-08-06 01:17:48 UTC (rev 448)
@@ -2,7 +2,7 @@
Copyright (c) 2000-2007 Russell Marks, Matan Ziv-Av, Philip Kendall,
Fredrick Meunier
- $Id: sound.c 2889 2007-05-26 17:45:08Z zubzero $
+ $Id: sound.c 3082 2007-07-30 21:12:44Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -46,7 +46,6 @@
#include "machine.h"
#include "settings.h"
#include "sound.h"
-#include "sound/lowlevel.h"
#include "tape.h"
#include "ui/ui.h"
@@ -175,7 +174,7 @@
#endif /* #ifdef HAVE_SAMPLERATE */
/* if we don't have any sound I/O code compiled in, don't do sound */
-#ifndef HAVE_SOUND
+#ifdef NO_SOUND
return;
#endif
Modified: vendor/fuse-emulator/current/fuse/spectrum.c
===================================================================
--- vendor/fuse-emulator/current/fuse/spectrum.c 2007-08-06 01:17:08 UTC (rev 447)
+++ vendor/fuse-emulator/...
[truncated message content] |
