[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx: [423] vendor/fuse-emulator/current
Brought to you by:
fredm
Menu
▾
▴
[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx: [423] vendor/fuse-emulator/current
|
From: <fr...@us...> - 2007-07-05 10:50:56
|
Revision: 423
http://svn.sourceforge.net/fuse-for-macosx/?rev=423&view=rev
Author: fredm
Date: 2007-07-05 03:50:58 -0700 (Thu, 05 Jul 2007)
Log Message:
-----------
Load . into vendor/fuse-emulator/current.
Modified Paths:
--------------
vendor/fuse-emulator/current/fuse/ChangeLog
vendor/fuse-emulator/current/fuse/compat/getopt.c
vendor/fuse-emulator/current/fuse/compat/getopt1.c
vendor/fuse-emulator/current/fuse/compat.h
vendor/fuse-emulator/current/fuse/configure.in
vendor/fuse-emulator/current/fuse/debugger/breakpoint.c
vendor/fuse-emulator/current/fuse/debugger/commandl.l
vendor/fuse-emulator/current/fuse/debugger/commandy.y
vendor/fuse-emulator/current/fuse/debugger/expression.c
vendor/fuse-emulator/current/fuse/disk/plusd.c
vendor/fuse-emulator/current/fuse/disk/plusd.h
vendor/fuse-emulator/current/fuse/disk/wd1770.c
vendor/fuse-emulator/current/fuse/display.c
vendor/fuse-emulator/current/fuse/event.c
vendor/fuse-emulator/current/fuse/fuse.c
vendor/fuse-emulator/current/fuse/hacking/ChangeLog
vendor/fuse-emulator/current/fuse/hacking/implementation_notes.txt
vendor/fuse-emulator/current/fuse/hacking/input.txt
vendor/fuse-emulator/current/fuse/hacking/ui.txt
vendor/fuse-emulator/current/fuse/if1.c
vendor/fuse-emulator/current/fuse/machines/pentagon.c
vendor/fuse-emulator/current/fuse/machines/scorpion.c
vendor/fuse-emulator/current/fuse/machines/spec16.c
vendor/fuse-emulator/current/fuse/machines/spec48.c
vendor/fuse-emulator/current/fuse/machines/spec_se.c
vendor/fuse-emulator/current/fuse/machines/specplus2.c
vendor/fuse-emulator/current/fuse/machines/specplus2a.c
vendor/fuse-emulator/current/fuse/machines/specplus3.c
vendor/fuse-emulator/current/fuse/machines/specplus3e.c
vendor/fuse-emulator/current/fuse/machines/tc2048.c
vendor/fuse-emulator/current/fuse/machines/tc2068.c
vendor/fuse-emulator/current/fuse/memory.c
vendor/fuse-emulator/current/fuse/menu.h
vendor/fuse-emulator/current/fuse/pokefinder/pokefinder.c
vendor/fuse-emulator/current/fuse/pokefinder/pokefinder.h
vendor/fuse-emulator/current/fuse/printer.c
vendor/fuse-emulator/current/fuse/profile.c
vendor/fuse-emulator/current/fuse/screenshot.c
vendor/fuse-emulator/current/fuse/settings.pl
vendor/fuse-emulator/current/fuse/sound/sdlsound.c
vendor/fuse-emulator/current/fuse/spectrum.c
vendor/fuse-emulator/current/fuse/tape.c
vendor/fuse-emulator/current/fuse/timer.c
vendor/fuse-emulator/current/fuse/trdos.c
vendor/fuse-emulator/current/fuse/ui/gtk/browse.c
vendor/fuse-emulator/current/fuse/ui/gtk/fileselector.c
vendor/fuse-emulator/current/fuse/ui/gtk/gtkinternals.h
vendor/fuse-emulator/current/fuse/ui/gtk/gtkjoystick.c
vendor/fuse-emulator/current/fuse/ui/gtk/gtkkeyboard.c
vendor/fuse-emulator/current/fuse/ui/gtk/gtkui.c
vendor/fuse-emulator/current/fuse/ui/gtk/memory.c
vendor/fuse-emulator/current/fuse/ui/gtk/pokefinder.c
vendor/fuse-emulator/current/fuse/ui/gtk/rollback.c
vendor/fuse-emulator/current/fuse/ui/gtk/stock.c
vendor/fuse-emulator/current/fuse/ui/options.dat
vendor/fuse-emulator/current/fuse/ui/scaler/scalers.c
vendor/fuse-emulator/current/fuse/ui/sdl/sdlui.c
vendor/fuse-emulator/current/fuse/ui/xlib/xdisplay.c
vendor/fuse-emulator/current/fuse/ui/xlib/xdisplay.h
vendor/fuse-emulator/current/fuse/ui/xlib/xerror.c
vendor/fuse-emulator/current/fuse/ui/xlib/xui.c
vendor/fuse-emulator/current/fuse/utils.c
vendor/fuse-emulator/current/fuse/utils.h
vendor/fuse-emulator/current/fuse/widget/error.c
vendor/fuse-emulator/current/fuse/widget/filesel.c
vendor/fuse-emulator/current/fuse/widget/options.pl
vendor/fuse-emulator/current/fuse/widget/widget.c
vendor/fuse-emulator/current/fuse/z80/coretest.c
vendor/fuse-emulator/current/fuse/z80/z80.c
vendor/fuse-emulator/current/fuse/z80/z80_ops.c
vendor/fuse-emulator/current/fuse/zxatasp.c
vendor/fuse-emulator/current/fuse/zxcf.h
vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog
vendor/fuse-emulator/current/libspectrum/libspectrum.c
vendor/fuse-emulator/current/libspectrum/make-perl.c
vendor/fuse-emulator/current/libspectrum/microdrive.c
vendor/fuse-emulator/current/libspectrum/rzx.c
vendor/fuse-emulator/current/libspectrum/tape.c
vendor/fuse-emulator/current/libspectrum/timings.c
Modified: vendor/fuse-emulator/current/fuse/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse/ChangeLog 2007-07-05 10:02:14 UTC (rev 422)
+++ vendor/fuse-emulator/current/fuse/ChangeLog 2007-07-05 10:50:58 UTC (rev 423)
@@ -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 2830 2007-05-12 14:57:37Z pak21 $
+$Id: ChangeLog 3032 2007-06-28 22:48:54Z zubzero $
Modified: vendor/fuse-emulator/current/fuse/compat/getopt.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/getopt.c 2007-07-05 10:02:14 UTC (rev 422)
+++ vendor/fuse-emulator/current/fuse/compat/getopt.c 2007-07-05 10:50:58 UTC (rev 423)
@@ -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: vendor/fuse-emulator/current/fuse/compat/getopt1.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/getopt1.c 2007-07-05 10:02:14 UTC (rev 422)
+++ vendor/fuse-emulator/current/fuse/compat/getopt1.c 2007-07-05 10:50:58 UTC (rev 423)
@@ -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: vendor/fuse-emulator/current/fuse/compat.h
===================================================================
--- vendor/fuse-emulator/current/fuse/compat.h 2007-07-05 10:02:14 UTC (rev 422)
+++ vendor/fuse-emulator/current/fuse/compat.h 2007-07-05 10:50:58 UTC (rev 423)
@@ -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: vendor/fuse-emulator/current/fuse/configure.in
===================================================================
--- vendor/fuse-emulator/current/fuse/configure.in 2007-07-05 10:02:14 UTC (rev 422)
+++ vendor/fuse-emulator/current/fuse/configure.in 2007-07-05 10:50:58 UTC (rev 423)
@@ -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
@@ -191,42 +191,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: vendor/fuse-emulator/current/fuse/debugger/breakpoint.c
===================================================================
--- vendor/fuse-emulator/current/fuse/debugger/breakpoint.c 2007-07-05 10:02:14 UTC (rev 422)
+++ vendor/fuse-emulator/current/fuse/debugger/breakpoint.c 2007-07-05 10:50:58 UTC (rev 423)
@@ -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: vendor/fuse-emulator/current/fuse/debugger/commandl.l
===================================================================
--- vendor/fuse-emulator/current/fuse/debugger/commandl.l 2007-07-05 10:02:14 UTC (rev 422)
+++ vendor/fuse-emulator/current/fuse/debugger/commandl.l 2007-07-05 10:50:58 UTC (rev 423)
@@ -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: vendor/fuse-emulator/current/fuse/debugger/commandy.y
===================================================================
--- vendor/fuse-emulator/current/fuse/debugger/commandy.y 2007-07-05 10:02:14 UTC (rev 422)
+++ vendor/fuse-emulator/current/fuse/debugger/commandy.y 2007-07-05 10:50:58 UTC (rev 423)
@@ -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: vendor/fuse-emulator/current/fuse/debugger/expression.c
===================================================================
--- vendor/fuse-emulator/current/fuse/debugger/expression.c 2007-07-05 10:02:14 UTC (rev 422)
+++ vendor/fuse-emulator/current/fuse/debugger/expression.c 2007-07-05 10:50:58 UTC (rev 423)
@@ -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: vendor/fuse-emulator/current/fuse/disk/plusd.c
===================================================================
--- vendor/fuse-emulator/current/fuse/disk/plusd.c 2007-07-05 10:02:14 UTC (rev 422)
+++ vendor/fuse-emulator/current/fuse/disk/plusd.c 2007-07-05 10:50:58 UTC (rev 423)
@@ -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: vendor/fuse-emulator/current/fuse/disk/plusd.h
===================================================================
--- vendor/fuse-emulator/current/fuse/disk/plusd.h 2007-07-05 10:02:14 UTC (rev 422)
+++ vendor/fuse-emulator/current/fuse/disk/plusd.h 2007-07-05 10:50:58 UTC (rev 423)
@@ -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: vendor/fuse-emulator/current/fuse/disk/wd1770.c
===================================================================
--- vendor/fuse-emulator/current/fuse/disk/wd1770.c 2007-07-05 10:02:14 UTC (rev 422)
+++ vendor/fuse-emulator/current/fuse/disk/wd1770.c 2007-07-05 10:50:58 UTC (rev 423)
@@ -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: vendor/fuse-emulator/current/fuse/display.c
===================================================================
--- vendor/fuse-emulator/current/fuse/display.c 2007-07-05 10:02:14 UTC (rev 422)
+++ vendor/fuse-emulator/current/fuse/display.c 2007-07-05 10:50:58 UTC (rev 423)
@@ -2,7 +2,7 @@
Copyright (c) 1999-2006 Philip Kendall, Thomas Harte, Witold Filipczyk
and Fredrick Meunier
- $Id: display.c 2889 2007-05-26 17:45:08Z zubzero $
+ $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;
@@ -767,7 +767,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 ) {
@@ -1057,13 +1057,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: vendor/fuse-emulator/current/fuse/event.c
===================================================================
--- vendor/fuse-emulator/current/fuse/event.c 2007-07-05 10:02:14 UTC (rev 422)
+++ vendor/fuse-emulator/current/fuse/event.c 2007-07-05 10:50:58 UTC (rev 423)
@@ -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
@@ -58,7 +58,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(...) */
@@ -109,7 +109,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: vendor/fuse-emulator/current/fuse/fuse.c
===================================================================
--- vendor/fuse-emulator/current/fuse/fuse.c 2007-07-05 10:02:14 UTC (rev 422)
+++ vendor/fuse-emulator/current/fuse/fuse.c 2007-07-05 10:50:58 UTC (rev 423)
@@ -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
@@ -315,21 +315,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: vendor/fuse-emulator/current/fuse/hacking/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse/hacking/ChangeLog 2007-07-05 10:02:14 UTC (rev 422)
+++ vendor/fuse-emulator/current/fuse/hacking/ChangeLog 2007-07-05 10:50:58 UTC (rev 423)
@@ -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: vendor/fuse-emulator/current/fuse/hacking/implementation_notes.txt
===================================================================
--- vendor/fuse-emulator/current/fuse/hacking/implementation_notes.txt 2007-07-05 10:02:14 UTC (rev 422)
+++ vendor/fuse-emulator/current/fuse/hacking/implementation_notes.txt 2007-07-05 10:50:58 UTC (rev 423)
@@ -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: vendor/fuse-emulator/current/fuse/hacking/input.txt
===================================================================
--- vendor/fuse-emulator/current/fuse/hacking/input.txt 2007-07-05 10:02:14 UTC (rev 422)
+++ vendor/fuse-emulator/current/fuse/hacking/input.txt 2007-07-05 10:50:58 UTC (rev 423)
@@ -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: vendor/fuse-emulator/current/fuse/hacking/ui.txt
===================================================================
--- vendor/fuse-emulator/current/fuse/hacking/ui.txt 2007-07-05 10:02:14 UTC (rev 422)
+++ vendor/fuse-emulator/current/fuse/hacking/ui.txt 2007-07-05 10:50:58 UTC (rev 423)
@@ -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: vendor/fuse-emulator/current/fuse/if1.c
===================================================================
--- vendor/fuse-emulator/current/fuse/if1.c 2007-07-05 10:02:14 UTC (rev 422)
+++ vendor/fuse-emulator/current/fuse/if1.c 2007-07-05 10:50:58 UTC (rev 423)
@@ -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
COMMS_OUT pin level high (>+3V) then Q3 is off (the basis cannot
- be more higher potential then emitter (NPN transistor), so wathever
+ be more higher potential then emitter (NPN transistor), so whatever
is on the IC1 RX DATA (pin 33) the basis of Q4 is always on +12V,
so the collector of Q4 (PNP transistor) always on -12V.
If COMMS_OUT pin level goes low (~0V), then Q3 basis (connected
@@ -620,7 +620,7 @@
microdrives_restart();
}
-void
+static void
port_net_out( libspectrum_byte val )
{
if( if1_ula.comms_data == 1 ) { /* OK, if the comms_data == 1 */
@@ -654,7 +654,7 @@
if( if1_ula.s_net_mode == S_NET_RAW ) { /* if we out bit by bit, do it */
/* Here is the output routine */
-/* OK, examining the schematics of if1 and the dissasembly of if1 ROM, I
+/* OK, examining the schematics of if1 and the dissassembly of if1 ROM, I
see that the Q1 and Q2 transistors negate the RX DATA signal, and the
floating state of the net wire is the ~0V level, the forced is the ~3V.
The if1 software send complemented data and read straight data.
Modified: vendor/fuse-emulator/current/fuse/machines/pentagon.c
===================================================================
--- vendor/fuse-emulator/current/fuse/machines/pentagon.c 2007-07-05 10:02:14 UTC (rev 422)
+++ vendor/fuse-emulator/current/fuse/machines/pentagon.c 2007-07-05 10:50:58 UTC (rev 423)
@@ -1,7 +1,7 @@
/* pentagon.c: Pentagon 128K specific routines
Copyright (c) 1999-2007 Philip Kendall and Fredrick Meunier
- $Id: pentagon.c 3010 2007-06-18 19:40:05Z pak21 $
+ $Id: pentagon.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
@@ -30,6 +30,7 @@
#include "compat.h"
#include "joystick.h"
#include "machine.h"
+#include "machines.h"
#include "memory.h"
#include "periph.h"
#include "settings.h"
@@ -45,7 +46,7 @@
static int pentagon_reset( void );
static int pentagon_shutdown( void );
-const static periph_t peripherals[] = {
+static const periph_t peripherals[] = {
{ 0x00ff, 0x001f, pentagon_select_1f_read, trdos_cr_write },
{ 0x00ff, 0x003f, trdos_tr_read, trdos_tr_write },
{ 0x00ff, 0x005f, trdos_sec_read, trdos_sec_write },
@@ -57,7 +58,7 @@
{ 0x8002, 0x0000, NULL, spec128_memoryport_write },
};
-const static size_t peripherals_count =
+static const size_t peripherals_count =
sizeof( peripherals ) / sizeof( periph_t );
static libspectrum_byte
Modified: vendor/fuse-emulator/current/fuse/machines/scorpion.c
===================================================================
--- vendor/fuse-emulator/current/fuse/machines/scorpion.c 2007-07-05 10:02:14 UTC (rev 422)
+++ vendor/fuse-emulator/current/fuse/machines/scorpion.c 2007-07-05 10:50:58 UTC (rev 423)
@@ -1,7 +1,7 @@
/* scorpion.c: Scorpion 256K specific routines
Copyright (c) 1999-2007 Philip Kendall, Fredrick Meunier and Stuart Brady
- $Id: scorpion.c 3010 2007-06-18 19:40:05Z pak21 $
+ $Id: scorpion.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
@@ -33,6 +33,7 @@
#include "ay.h"
#include "compat.h"
#include "joystick.h"
+#include "machine.h"
#include "machines.h"
#include "memory.h"
#include "printer.h"
@@ -53,7 +54,7 @@
static int scorpion_shutdown( void );
static int scorpion_memory_map( void );
-const static periph_t peripherals[] = {
+static const periph_t peripherals[] = {
{ 0x00ff, 0x001f, scorpion_select_1f_read, trdos_cr_write },
{ 0x00ff, 0x003f, trdos_tr_read, trdos_tr_write },
{ 0x00ff, 0x005f, trdos_sec_read, trdos_sec_write },
@@ -66,7 +67,7 @@
{ 0xf002, 0x1000, NULL, specplus3_memoryport2_write },
};
-const static size_t peripherals_count =
+static const size_t peripherals_count =
sizeof( peripherals ) / sizeof( periph_t );
static libspectrum_byte
Modified: vendor/fuse-emulator/current/fuse/machines/spec16.c
===================================================================
--- vendor/fuse-emulator/current/fuse/machines/spec16.c 2007-07-05 10:02:14 UTC (rev 422)
+++ vendor/fuse-emulator/current/fuse/machines/spec16.c 2007-07-05 10:50:58 UTC (rev 423)
@@ -1,7 +1,7 @@
/* spec16.c: Spectrum 16K specific routines
Copyright (c) 1999-2007 Philip Kendall
- $Id: spec16.c 3010 2007-06-18 19:40:05Z pak21 $
+ $Id: spec16.c 3022 2007-06-28 17:14:46Z 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,7 +46,7 @@
static libspectrum_byte empty_chunk[ MEMORY_PAGE_SIZE ];
static memory_page empty_mapping;
-const static periph_t peripherals[] = {
+static const periph_t peripherals[] = {
{ 0x0001, 0x0000, ula_read, ula_write },
{ 0x0018, 0x0010, if1_port_in, if1_port_out },
{ 0x0018, 0x0008, if1_port_in, if1_port_out },
@@ -55,7 +55,7 @@
{ 0x00e0, 0x0000, joystick_kempston_read, NULL },
};
-const static size_t peripherals_count =
+static const size_t peripherals_count =
sizeof( peripherals ) / sizeof( periph_t );
static libspectrum_byte
Modified: vendor/fuse-emulator/current/fuse/machines/spec48.c
===================================================================
--- vendor/fuse-emulator/current/fuse/machines/spec48.c 2007-07-05 10:02:14 UTC (rev 422)
+++ vendor/fuse-emulator/current/fuse/machines/spec48.c 2007-07-05 10:50:58 UTC (rev 423)
@@ -1,7 +1,7 @@
/* spec48.c: Spectrum 48K specific routines
Copyright (c) 1999-2007 Philip Kendall
- $Id: spec48.c 3010 2007-06-18 19:40:05Z pak21 $
+ $Id: spec48.c 3022 2007-06-28 17:14:46Z 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
@@ -42,7 +42,7 @@
static int spec48_reset( void );
-const static periph_t peripherals[] = {
+static const periph_t peripherals[] = {
{ 0x0001, 0x0000, ula_read, ula_write },
{ 0x0018, 0x0010, if1_port_in, if1_port_out },
{ 0x0018, 0x0008, if1_port_in, if1_port_out },
@@ -51,7 +51,7 @@
{ 0x00e0, 0x0000, joystick_kempston_read, NULL },
};
-const static size_t peripherals_count =
+static const size_t peripherals_count =
sizeof( peripherals ) / sizeof( periph_t );
static libspectrum_byte
Modified: vendor/fuse-emulator/current/fuse/machines/spec_se.c
===================================================================
--- vendor/fuse-emulator/current/fuse/machines/spec_se.c 2007-07-05 10:02:14 UTC (rev 422)
+++ vendor/fuse-emulator/current/fuse/machines/spec_se.c 2007-07-05 10:50:58 UTC (rev 423)
@@ -5,7 +5,7 @@
Copyright (c) 1999-2002 Philip Kendall
Copyright (c) 2002-2003 Fredrick Meunier
- $Id: spec_se.c 3010 2007-06-18 19:40:05Z pak21 $
+ $Id: spec_se.c 3022 2007-06-28 17:14:46Z 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
@@ -60,7 +60,7 @@
static void spec_se_memoryport_write( libspectrum_word port,
libspectrum_byte b );
-const static periph_t peripherals[] = {
+static const periph_t peripherals[] = {
{ 0x00e0, 0x0000, joystick_kempston_read, NULL },
{ 0x00ff, 0x00f4, scld_hsr_read, scld_hsr_write },
@@ -88,7 +88,7 @@
{ 0x00ff, 0x00ff, scld_dec_read, scld_dec_write },
};
-const static size_t peripherals_count =
+static const size_t peripherals_count =
sizeof( peripherals ) / sizeof( periph_t );
static libspectrum_byte
Modified: vendor/fuse-emulator/current/fuse/machines/specplus2.c
===================================================================
--- vendor/fuse-emulator/current/fuse/machines/specplus2.c 2007-07-05 10:02:14 UTC (rev 422)
+++ vendor/fuse-emulator/current/fuse/machines/specplus2.c 2007-07-05 10:50:58 UTC (rev 423)
@@ -1,7 +1,7 @@
/* specplus2.c: Spectrum +2 specific routines
Copyright (c) 1999-2004 Philip Kendall
- $Id: specplus2.c 3010 2007-06-18 19:40:05Z pak21 $
+ $Id: specplus2.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
@@ -29,6 +29,7 @@
#include <libspectrum.h>
+#include "machine.h"
#include "machines.h"
#include "settings.h"
#include "spec128.h"
Modified: vendor/fuse-emulator/current/fuse/machines/specplus2a.c
===================================================================
--- vendor/fuse-emulator/current/fuse/machines/specplus2a.c 2007-07-05 10:02:14 UTC (rev 422)
+++ vendor/fuse-emulator/current/fuse/machines/specplus2a.c 2007-07-05 10:50:58 UTC (rev 423)
@@ -1,7 +1,7 @@
/* specplus2a.c: Spectrum +2A specific routines
Copyright (c) 1999-2004 Philip Kendall
- $Id: specplus2a.c 3010 2007-06-18 19:40:05Z pak21 $
+ $Id: specplus2a.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
@@ -28,6 +28,8 @@
#include <libspectrum.h>
#include "joystick.h"
+#include "machine.h"
+#include "machines.h"
#include "periph.h"
#include "printer.h"
#include "settings.h"
@@ -38,7 +40,7 @@
static int specplus2a_reset( void );
-const static periph_t peripherals[] = {
+static const periph_t peripherals[] = {
{ 0x0001, 0x0000, ula_read, ula_write },
{ 0x0018, 0x0010, if1_port_in, if1_port_out },
{ 0x0018, 0x0008, if1_port_in, if1_port_out },
@@ -51,7 +53,7 @@
{ 0xf002, 0x0000, printer_parallel_read, printer_parallel_write },
};
-const static size_t peripherals_count =
+static const size_t peripherals_count =
sizeof( peripherals ) / sizeof( periph_t );
int
Modified: vendor/fuse-emulator/current/fuse/machines/specplus3.c
===================================================================
--- vendor/fuse-emulator/current/fuse/machines/specplus3.c 2007-07-05 10:02:14 UTC (rev 422)
+++ vendor/fuse-emulator/current/fuse/machines/specplus3.c 2007-07-05 10:50:58 UTC (rev 423)
@@ -1,7 +1,7 @@
/* specplus3.c: Spectrum +2A/+3 specific routines
Copyright (c) 1999-2004 Philip Kendall, Darren Salt
- $Id: specplus3.c 3010 2007-06-18 19:40:05Z pak21 $
+ $Id: specplus3.c 3036 2007-07-01 04:35:12Z fredm $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -529,7 +529,7 @@
specplus3_disk_insert( specplus3_drive_number which, const char *filename,
int autoload )
{
- char template[ PATH_MAX ];
+ char tempfilename[ PATH_MAX ];
int fd, error;
if( which > SPECPLUS3_DRIVE_B ) {
@@ -545,18 +545,18 @@
}
/* Make a temporary copy of the disk file */
- error = utils_make_temp_file( &fd, template, filename, dsk_template );
+ error = utils_make_temp_file( &fd, tempfilename, filename, dsk_template );
if( error ) return error;
/* And now insert the disk */
drives[ which ].fd = fd;
- strcpy( drives[ which ].filename, template );
+ strcpy( drives[ which ].filename, tempfilename );
#ifdef HAVE_LIBDSK_H
fdl_settype( drives[which].drive, NULL ); /* Autodetect disk format */
- fdl_setfilename( drives[which].drive, template );
+ fdl_setfilename( drives[which].drive, tempfilename );
#else /* #ifdef HAVE_LIBDSK_H */
- fdd_setfilename( drives[which].drive, template );
+ fdd_setfilename( drives[which].drive, tempfilename );
#endif /* #ifdef HAVE_LIBDSK_H */
/* And set the appropriate `eject' item active */
@@ -630,7 +630,7 @@
}
} else if( dirty == FD_D_UNAVAILABLE ) {
- if( ui_plus3_disk_write( which ) ) return 1;
+ if( write && ui_plus3_disk_write( which ) ) return 1;
}
}
Modified: vendor/fuse-emulator/current/fuse/machines/specplus3e.c
===================================================================
--- vendor/fuse-emulator/current/fuse/machines/specplus3e.c 2007-07-05 10:02:14 UTC (rev 422)
+++ vendor/fuse-emulator/current/fuse/machines/specplus3e.c 2007-07-05 10:50:58 UTC (rev 423)
@@ -1,7 +1,7 @@
/* specplus3e.c: Spectrum +3e specific routines
Copyright (c) 1999-2004 Philip Kendall, Darren Salt
- $Id: specplus3e.c 3010 2007-06-18 19:40:05Z pak21 $
+ $Id: specplus3e.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
@@ -25,7 +25,7 @@
#include <config.h>
-#include "machine.h"
+#include "machines.h"
#include "periph.h"
#include "settings.h"
#include "specplus3.h"
Modified: vendor/fuse-emulator/current/fuse/machines/tc2048.c
===================================================================
--- vendor/fuse-emulator/current/fuse/machines/tc2048.c 2007-07-05 10:02:14 UTC (rev 422)
+++ vendor/fuse-emulator/current/fuse/machines/tc2048.c 2007-07-05 10:50:58 UTC (rev 423)
@@ -2,7 +2,7 @@
Copyright (c) 1999-2005 Philip Kendall
Copyright (c) 2002-2004 Fredrick Meunier
- $Id: tc2048.c 3010 2007-06-18 19:40:05Z pak21 $
+ $Id: tc2048.c 3022 2007-06-28 17:14:46Z 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,7 +46,7 @@
static int tc2048_reset( void );
static libspectrum_byte tc2048_contend_delay( libspectrum_dword time );
-const static periph_t peripherals[] = {
+static const periph_t peripherals[] = {
{ 0x00e0, 0x0000, joystick_kempston_read, NULL },
{ 0x0018, 0x0010, if1_port_in, if1_port_out },
{ 0x0018, 0x0008, if1_port_in, if1_port_out },
@@ -62,7 +62,7 @@
{ 0x00ff, 0x00ff, scld_dec_read, scld_dec_write },
};
-const static size_t peripherals_count =
+static const size_t peripherals_count =
sizeof( peripherals ) / sizeof( periph_t );
static libspectrum_byte
Modified: vendor/fuse-emulator/current/fuse/machines/tc2068.c
===================================================================
--- vendor/fuse-emulator/current/fuse/machines/tc2068.c 2007-07-05 10:02:14 UTC (rev 422)
+++ vendor/fuse-emulator/current/fuse/machines/tc2068.c 2007-07-05 10:50:58 UTC (rev 423)
@@ -4,7 +4,7 @@
Copyright (c) 2003 Witold Filipczyk
Copyright (c) 2003 Darren Salt
- $Id: tc2068.c 3010 2007-06-18 19:40:05Z pak21 $
+ $Id: tc2068.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
@@ -88,7 +88,7 @@
/* In theory, we may need to distinguish cases where some data
is returned here and were it isn't. In practice, this doesn't
matter for the TC2068 as it doesn't have a floating bus, so we'll
- get 0xff in both cases anwyay */
+ get 0xff in both cases anyway */
*attached = 1;
ret = machine_current->ay.registers[7] & 0x40
Modified: vendor/fuse-emulator/current/fuse/memory.c
===================================================================
--- vendor/fuse-emulator/current/fuse/memory.c 2007-07-05 10:02:14 UTC (rev 422)
+++ vendor/fuse-emulator/current/fuse/memory.c 2007-07-05 10:50:58 UTC (rev 423)
@@ -1,7 +1,7 @@
/* memory.c: Routines for accessing memory
Copyright (c) 1999-2004 Philip Kendall
- $Id: memory.c 3009 2007-06-17 20:37:50Z zubzero $
+ $Id: memory.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
@@ -81,7 +81,7 @@
};
/* Set up the information about the normal page mappings.
- Memory contention and useable pages vary from machine to machine and must
+ Memory contention and usable pages vary from machine to machine and must
be set in the appropriate _reset function */
int
memory_init( void )
@@ -263,7 +263,7 @@
Interface 2 connected to J1 would disable both ROM IC2 (if1 ROM) and
the Spectrum ROM, via isolating diodes D10 and D9 respectively.
- All comment in paranthesis added by me (Gergely Szasz).
+ All comment in parenthesis added by me (Gergely Szasz).
The ROMCS2 (B25 conn) in Interface 1 J1 edge connector is in the
same position than ROMCS (B25 conn) in the Spectrum edge connector.
Modified: vendor/fuse-emulator/current/fuse/menu.h
===================================================================
--- vendor/fuse-emulator/current/fuse/menu.h 2007-07-05 10:02:14 UTC (rev 422)
+++ vendor/fuse-emulator/current/fuse/menu.h 2007-07-05 10:50:58 UTC (rev 423)
@@ -1,7 +1,7 @@
/* menu.h: general menu callbacks
Copyright (c) 2004 Philip Kendall
- $Id: menu.h 2919 2007-06-02 00:31:17Z zubzero $
+ $Id: menu.h 3027 2007-06-28 19:24:20Z 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
@@ -130,7 +130,7 @@
MENU_CALLBACK( menu_options_sound );
MENU_CALLBACK( menu_options_peripherals );
MENU_CALLBACK( menu_options_rzx );
-MENU_CALLBACK( menu_options_joysticks_select );
+MENU_CALLBACK_WITH_ACTION( menu_options_joysticks_select );
MENU_CALLBACK( menu_machine_pause );
MENU_CALLBACK( menu_machine_reset );
Modified: vendor/fuse-emulator/current/fuse/pokefinder/pokefinder.c
===================================================================
--- vendor/fuse-emulator/current/fuse/pokefinder/pokefinder.c 2007-07-05 10:02:14 UTC (rev 422)
+++ vendor/fuse-emulator/current/fuse/pokefinder/pokefinder.c 2007-07-05 10:50:58 UTC (rev 423)
@@ -1,7 +1,7 @@
/* pokefinder.c: help with finding pokes
Copyright (c) 2003-2004 Philip Kendall
- $Id: pokefinder.c 2889 2007-05-26 17:45:08Z zubzero $
+ $Id: pokefinder.c 3028 2007-06-28 19:28:33Z zubzero $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -30,6 +30,7 @@
#include <libspectrum.h>
#include "memory.h"
+#include "pokefinder.h"
#include "spectrum.h"
libspectrum_byte pokefinder_possible[ 2 * SPECTRUM_RAM_PAGES ][0x2000];
Modified: vendor/fuse-emulator/current/fuse/pokefinder/pokefinder.h
===================================================================
--- vendor/fuse-emulator/current/fuse/pokefinder/pokefinder.h 2007-07-05 10:02:14 UTC (rev 422)
+++ vendor/fuse-emulator/current/fuse/pokefinder/pokefinder.h 2007-07-05 10:50:58 UTC (rev 423)
@@ -1,7 +1,7 @@
/* pokefinder.h: help with finding pokes
Copyright (c) 2003-2004 Philip Kendall
- $Id: pokefinder.h 2889 2007-05-26 17:45:08Z zubzero $
+ $Id: pokefinder.h 3028 2007-06-28 19:28:33Z 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
@@ -28,8 +28,8 @@
#include <libspectrum.h>
-extern libspectrum_byte pokefinder_possible[][0x4000];
-extern libspectrum_byte pokefinder_impossible[][0x4000/8];
+extern libspectrum_byte pokefinder_possible[][0x2000];
+extern libspectrum_byte pokefinder_impossible[][0x2000/8];
extern size_t pokefinder_count;
int pokefinder_clear( void );
Modified: vendor/fuse-emulator/current/fuse/printer.c
===================================================================
--- vendor/fuse-emulator/current/fuse/printer.c 2007-07-05 10:02:14 UTC (rev 422)
+++ vendor/fuse-emulator/current/fuse/printer.c 2007-07-05 10:50:58 UTC (rev 423)
@@ -1,7 +1,7 @@
/* printer.c: Printer support
Copyright (c) 2001-2004 Ian Collier, Russell Marks, Philip Kendall
- $Id: printer.c 3007 2007-06-17 18:50:48Z zubzero $
+ $Id: printer.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
@@ -579,7 +579,7 @@
*
* The Centronics spec seems to require that the strobe `goes low' for
* a minimum of 1us to give the printer time to read the data. But that's
- * not even a NOP's worth on the speccy, so we need to allow for longer;
+ * not even a NOP's worth on the Speccy, so we need to allow for longer;
* 10000 cycles seems reasonable, being thousands of times longer. :-)
* (And the longest delay I've seen was just over 5000 cycles.)
*/
Modified: vendor/fuse-emulator/current/fuse/profile.c
===================================================================
--- vendor/fuse-emulator/current/fuse/profile.c 2007-07-05 10:02:14 UTC (rev 422)
+++ vendor/fuse-emulator/current/fuse/profile.c 2007-07-05 10:50:58 UTC (rev 423)
@@ -1,7 +1,7 @@
/* profile.c: Z80 profiler
Copyright (c) 2005 Philip Kendall
- $Id: profile.c 2955 2007-06-09 15:59:34Z pak21 $
+ $Id: profile.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
@@ -32,6 +32,7 @@
#include "event.h"
#include "fuse.h"
+#include "profile.h"
#include "ui/ui.h"
#include "z80/z80.h"
Modified: vendor/fuse-emulator/current/fuse/screenshot.c
===================================================================
--- vendor/fuse-emulator/current/fuse/screenshot.c 2007-07-05 10:02:14 UTC (rev 422)
+++ vendor/fuse-emulator/current/fuse/screenshot.c 2007-07-05 10:50:58 UTC (rev 423)
@@ -1,7 +1,7 @@
/* screenshot.c: Routines for handling .png and .scr screenshots
Copyright (c) 2002-2003 Philip Kendall, Fredrick Meunier
- $Id: screenshot.c 2889 2007-05-26 17:45:08Z zubzero $
+ $Id: screenshot.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
@@ -372,7 +372,7 @@
byte_field_type bit;
} bft_union;
-libspectrum_byte
+static libspectrum_byte
convert_hires_to_lores( libspectrum_byte high, libspectrum_byte low )
{
bft_union ret, h, l;
Modified: vendor/fuse-emulator/current/fuse/settings.pl
===================================================================
--- vendor/fuse-emulator/current/fuse/settings.pl 2007-07-05 10:02:14 UTC (rev 422)
+++ vendor/fuse-emulator/current/fuse/settings.pl 2007-07-05 10:50:58 UTC (rev 423)
@@ -3,7 +3,7 @@
# settings.pl: generate settings.c from settings.dat
# Copyright (c) 2002-2005 Philip Kendall
-# $Id: settings.pl 2935 2007-06-04 21:56:06Z fredm $
+# $Id: settings.pl 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
@@ -78,7 +78,7 @@
#ifdef HAVE_GETOPT_LONG /* Did our libc include getopt_long? */
#include <getopt.h>
-#elif defined AMIGA /* #ifdef HAVE_GETOPT_LONG */
+#elif defined AMIGA || defined __MORPHOS__ /* #ifdef HAVE_GETOPT_LONG */
/* The platform uses GNU getopt, but not getopt_long, so we get
symbol clashes on this platform. Just use getopt */
#else /* #ifdef HAVE_GETOPT_LONG */
@@ -323,7 +323,7 @@
int argc, char **argv )
{
-#ifndef AMIGA
+#if !defined AMIGA && !defined __MORPHOS__
struct option long_options[] = {
@@ -369,7 +369,7 @@
int c;
-#ifdef AMIGA
+#if defined AMIGA || defined __MORPHOS__
c = getopt( argc, argv, "d:hm:o:p:f:r:s:t:v:g:j:V" );
#else /* #ifdef AMIGA */
c = getopt_long( argc, argv, "d:hm:o:p:f:r:s:t:v:g:j:V", long_options, NULL );
Modified: vendor/fuse-emulator/current/fuse/sound/sdlsound.c
===================================================================
--- vendor/fuse-emulator/current/fuse/sound/sdlsound.c 2007-07-05 10:02:14 UTC (rev 422)
+++ vendor/fuse-emulator/current/fuse/sound/sdlsound.c 2007-07-05 10:50:58 UTC (rev 423)
@@ -2,7 +2,7 @@
Copyright (c) 2002-2004 Alexander Yurchenko, Russell Marks, Philip Kendall,
Fredrick Meunier
- $Id: sdlsound.c 2889 2007-05-26 17:45:08Z zubzero $
+ $Id: sdlsound.c 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
@@ -60,6 +60,7 @@
float hz;
int sound_framesiz;
+#ifndef __MORPHOS__
/* I'd rather just use setenv, but Windows doesn't have it */
if( device ) {
const char *environment = "SDL_AUDIODRIVER=";
@@ -75,6 +76,7 @@
return 1;
}
}
+#endif /* #ifndef __MORPHOS__ */
SDL_InitSubSystem( SDL_INIT_AUDIO );
@@ -88,7 +90,11 @@
hz = (float)machine_current->timings.processor_speed /
machine_current->timings.tstates_per_frame;
sound_framesiz = *freqptr / hz;
+#ifndef __MORPHOS__
requested.samples = pow(2.0, floor(log2(sound_framesiz)));
+#else /* #ifndef __MORPHOS__ */
+ requested.samples = sound_framesiz;
+#endif /* #ifndef __MORPHOS__ */
if ( SDL_OpenAudio( &requested, &received ) < 0 ) {
settings_current.sound = 0;
@@ -109,7 +115,11 @@
hz = (float)machine_current->timings.processor_speed /
machine_current->timings.tstates_per_frame;
sound_framesiz = *freqptr / hz;
+#ifndef __MORPHOS__
requested.samples = pow(2.0, floor(log2(sound_framesiz)));
+#else /* #ifndef __MORPHOS__ */
+ requested.samples = sound_framesiz;
+#endif /* #ifndef __MORPHOS__ */
if( SDL_OpenAudio( &requested, NULL ) < 0 ) {
settings_current.sound = 0;
Modified: vendor/fuse-emulator/current/fuse/spectrum.c
===================================================================
--- vendor/fuse-emulator/current/fuse/spectrum.c 2007-07-05 10:02:14 UTC (rev 422)
+++ vendor/fuse-emulator/current/fuse/spectrum.c 2007-07-05 10:50:58 UTC (rev 423)
@@ -1,7 +1,7 @@
/* spectrum.c: Generic Spectrum routines
Copyright (c) 1999-2004 Philip Kendall, Darren Salt
- $Id: spectrum.c 2958 2007-06-10 14:09:38Z pak21 $
+ $Id: spectrum.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
@@ -67,7 +67,7 @@
/* Reduce the t-state count of both the processor and all the events
scheduled to occur. Done slightly differently if RZX playback is
- occuring */
+ occurring */
frame_length = rzx_playback ? tstates
: machine_current->timings.tstates_per_frame;
Modified: vendor/fuse-emulator/current/fuse/tape.c
===================================================================
--- vendor/fuse-emulator/current/fuse/tape.c 2007-07-05 10:02:14 UTC (rev 422)
+++ vendor/fuse-emulator/current/fuse/tape.c 2007-07-05 10:50:58 UTC (rev 423)
@@ -1,7 +1,7 @@
/* tape.c: tape handling routines
Copyright (c) 1999-2005 Philip Kendall, Darren Salt, Witold Filipczyk
- $Id: tape.c 3007 2007-06-17 18:50:48Z zubzero $
+ $Id: tape.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
@@ -74,7 +74,7 @@
...
[truncated message content] |
