fuse-for-macosx-commits Mailing List for Fuse for macOS (Page 4)
Brought to you by:
fredm
Menu
▾
▴
fuse-for-macosx-commits — Tracks commits to the repostiory
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(9) |
Dec
(31) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(24) |
Feb
(11) |
Mar
(6) |
Apr
(48) |
May
(9) |
Jun
(38) |
Jul
(33) |
Aug
(15) |
Sep
|
Oct
(3) |
Nov
(6) |
Dec
(3) |
| 2008 |
Jan
|
Feb
(24) |
Mar
(11) |
Apr
(22) |
May
(7) |
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
(3) |
Nov
(18) |
Dec
(23) |
| 2009 |
Jan
(16) |
Feb
(1) |
Mar
(1) |
Apr
|
May
|
Jun
(7) |
Jul
(4) |
Aug
(11) |
Sep
(9) |
Oct
|
Nov
(3) |
Dec
(2) |
| 2010 |
Jan
(1) |
Feb
|
Mar
(1) |
Apr
(2) |
May
(8) |
Jun
|
Jul
|
Aug
(2) |
Sep
(2) |
Oct
(9) |
Nov
|
Dec
(8) |
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
(7) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(5) |
Nov
(2) |
Dec
|
| 2012 |
Jan
(4) |
Feb
(5) |
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
(10) |
Nov
(13) |
Dec
(11) |
| 2013 |
Jan
(4) |
Feb
(1) |
Mar
(8) |
Apr
(8) |
May
(16) |
Jun
(5) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(4) |
| 2014 |
Jan
|
Feb
(6) |
Mar
(2) |
Apr
(1) |
May
|
Jun
|
Jul
(1) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
(6) |
| 2015 |
Jan
|
Feb
|
Mar
(2) |
Apr
|
May
|
Jun
(5) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
(10) |
Jun
(9) |
Jul
(6) |
Aug
(5) |
Sep
(3) |
Oct
(6) |
Nov
(5) |
Dec
|
|
From: <fr...@us...> - 2013-06-01 07:10:31
|
Revision: 762
http://sourceforge.net/p/fuse-for-macosx/code/762
Author: fredm
Date: 2013-06-01 07:10:26 +0000 (Sat, 01 Jun 2013)
Log Message:
-----------
Merge up to vendor 1.1.0 release branches r5011.
Revision Links:
--------------
http://sourceforge.net/p/fuse-for-macosx/code/5011
Modified Paths:
--------------
trunk/fuse/Makefile.am
trunk/fuse/fusepb/resources/Fuse Help/html/general.html
trunk/fuse/fusepb/resources/Fuse Help/html/joysticks.html
trunk/fuse/fusepb/resources/Fuse Help/html/spectranet.html
trunk/fuse/hacking/ChangeLog
trunk/fuse/man/fuse.1
trunk/fuse/pokefinder/pokemem.c
trunk/fuse/ui/win32/installer/fuse.nsi.in
Property Changed:
----------------
trunk/fuse/
Index: trunk/fuse
===================================================================
--- trunk/fuse 2013-06-01 03:21:06 UTC (rev 761)
+++ trunk/fuse 2013-06-01 07:10:26 UTC (rev 762)
Property changes on: trunk/fuse
___________________________________________________________________
Modified: svn:mergeinfo
## -1,5 +1,5 ##
/vendor/fuse-emulator/0.10.0/fuse:556-557
/vendor/fuse-emulator/0.10.0-pre1/fuse:545-546
-/vendor/fuse-emulator/current/fuse:530-756
+/vendor/fuse-emulator/current/fuse:530-761
/vendor/fuse-emulator/fuse-1.0.0a/fuse:668-669
/vendor/fuse-emulator/fuse-r4617/fuse:686
\ No newline at end of property
Modified: trunk/fuse/Makefile.am
===================================================================
--- trunk/fuse/Makefile.am 2013-06-01 03:21:06 UTC (rev 761)
+++ trunk/fuse/Makefile.am 2013-06-01 07:10:26 UTC (rev 762)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 1999-2009 Philip Kendall
-## $Id: Makefile.am 4980 2013-05-21 12:37:51Z fredm $
+## $Id: Makefile.am 5003 2013-05-26 16:24:03Z sbaldovi $
## 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
@@ -244,7 +244,7 @@
cp $(top_builddir)/.libs/fuse$(EXEEXT) $(DESTDIR) || \
cp $(top_builddir)/fuse$(EXEEXT) $(DESTDIR)
# Get text files
- for file in AUTHORS COPYING README; \
+ for file in AUTHORS ChangeLog COPYING README; \
do cp "$(top_srcdir)/$$file" "$(DESTDIR)/$$file.txt"; \
done
# Get manuals
Modified: trunk/fuse/fusepb/resources/Fuse Help/html/general.html
===================================================================
--- trunk/fuse/fusepb/resources/Fuse Help/html/general.html 2013-06-01 03:21:06 UTC (rev 761)
+++ trunk/fuse/fusepb/resources/Fuse Help/html/general.html 2013-06-01 07:10:26 UTC (rev 762)
@@ -1,207 +1,199 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
-<head>
- <meta http-equiv="content-type"
- content="text/html; charset=ISO-8859-1">
-<!-- AppleSegStart="General Preferences" -->
- <title>General Preferences</title>
-</head>
-<body>
-<font face="Lucida Grande,Helvetica,Arial"><a name="General Preferences"></a><!-- AppleSegDescription="This section describes the Fuse general preferences dialog." --></font>
-<h2><font face="Lucida Grande,Helvetica,Arial"><span
- style="font-style: italic;">General</span> preferences</font></h2>
-<p><font face="Lucida Grande,Helvetica,Arial">The General pane of Fuse
-preferences lets you configure miscellaneous Fuse options.<br>
-</font></p>
-<table style="text-align: left; width: 100%;" cellpadding="2"
- cellspacing="2">
- <tbody>
- <tr>
- <th style="vertical-align: top;"><font style="font-weight: bold;"
- face="Lucida Grande,Helvetica,Arial">OPTION</font><br>
- </th>
- <th style="vertical-align: top;"><font style="font-weight: bold;"
- face="Lucida Grande,Helvetica,Arial">DESCRIPTION</font><br>
- </th>
- </tr>
- <tr>
- <td style="vertical-align: top;"><span class="emphasis"><font
- face="Lucida Grande,Helvetica,Arial"><em>Emulation
-speed</em></font></span></td>
- <td style="vertical-align: top;"><span class="emphasis"><font
- face="Lucida Grande,Helvetica,Arial"><em></em></font></span><font
- face="Lucida Grande,Helvetica,Arial">Set how fast Fuse will
-attempt to emulate the Spectrum, as a percentage of the speed at
-which the real machine runs. If your machine isn't fast enough to
-keep up with the requested speed, Fuse will just run as fast as it
-can. Note that if the emulation speed is 1%, no sound
-output will be produced.</font></td>
- </tr>
- <tr>
- <td style="vertical-align: top;"><span class="emphasis"><font
- face="Lucida Grande,Helvetica,Arial"><em>Screen
-refresh
-rate</em></font></span></td>
- <td style="vertical-align: top;"><font
- face="Lucida Grande,Helvetica,Arial">Specify the frame rate,
-the ratio of spectrum frame updates to real frame updates. This is
-useful if your machine is having trouble keeping up with the
-spectrum screen updates.</font></td>
- </tr>
- <tr>
- <td style="vertical-align: top;"><span class="emphasis"><font
- face="Lucida Grande,Helvetica,Arial"><em>Issue
-2
-keyboard</em></font></span></td>
- <td style="vertical-align: top;"><font
- face="Lucida Grande,Helvetica,Arial">Early versions of the
-Spectrum used a different value for unused bits on the keyboard
-input ports, and a few games depended on the old value of these
-bits. Enabling this option switches to the old value, to let you </font><font
- face="Lucida Grande,Helvetica,Arial">run those games.</font></td>
- </tr>
- <tr>
- <td style="vertical-align: top;"><span class="emphasis"><font
- face="Lucida Grande,Helvetica,Arial"><em>Late
-timings</em></font></span></td>
- <td style="vertical-align: top;"><font
- face="Lucida Grande,Helvetica,Arial">If
-selected,
-Fuse
-will
-cause all screen-related timings (for example, when
-the screen is rendered and when memory contention occurs) to be one
-tstate later than "normal", an effect which is present on some real
-hardware.</font>
- <span class="emphasis"><font face="Lucida Grande,Helvetica,Arial"><em></em></font></span></td>
- </tr>
- <tr>
- <td style="vertical-align: top;"><span class="emphasis"><font
- face="Lucida Grande,Helvetica,Arial"><em>Use
-tape
-traps</em></font></span></td>
- <td style="vertical-align: top;"><font
- face="Lucida Grande,Helvetica,Arial">Ordinarily, Fuse
-intercepts calls to the ROM tape-loading routine in order to load
-from tape files more quickly when possible. But this can (rarely)
-interfere with TZX loading; disabling this option avoids the
-problem at the cost of slower (i.e. always real-time) tape-loading.
-When tape-loading traps are disabled, you need to start tape
-playback manually, by choosing the<span class="emphasis"><em>Tape,
-Play</em></span> menu item.</font></td>
- </tr>
- <tr>
- <td style="vertical-align: top;"><span class="emphasis"><font
- face="Lucida Grande,Helvetica,Arial"><em>Fast
-tape
-loading</em></font></span></td>
- <td style="vertical-align: top;"><font
- face="Lucida Grande,Helvetica,Arial">If this option is
-enabled, then Fuse will run at the fastest possible speed when the
-virtual tape is playing, thus dramatically reducing the time it
-takes to load programs. You may wish to disable this option if you
-wish to stop the tape at a specific point.</font></td>
- </tr>
- <tr>
- <td style="vertical-align: top;"><span class="emphasis"><font
- face="Lucida Grande,Helvetica,Arial"><em>Detect
-tape
-loaders</em></font></span></td>
- <td style="vertical-align: top;"><font
- face="Lucida Grande,Helvetica,Arial">If
-this
-option
-is enabled, Fuse
-will attempt to detect when a loading routine is in progress, and then
-automatically start the virtual tape to load the program in. This is
-done by using a heuristic to identify a
-loading routine, so is by no means infalliable, but works in most cases.</font></td>
- </tr>
- <tr>
- <td style="vertical-align: top;"><span class="emphasis"><font
- face="Lucida Grande,Helvetica,Arial"><em>Auto-load
-media</em></font></span></td>
- <td style="vertical-align: top;"><font
- face="Lucida Grande,Helvetica,Arial">On many occasions when
-you open a tape or disk file, it's because it's got a program in
-you want to load and run. If this option is selected, this will
-automatically happen for you when you open one of these files using the
- </font><font face="Lucida Grande,Helvetica,Arial"><span
- class="emphasis"><em>File,
-Open...</em></span></font><font face="Lucida Grande,Helvetica,Arial">
-menu option - you must then use the Media menu to use tapes or disks
-for saving data to, or for loading data into an already running program.</font></td>
- </tr>
- <tr>
- <td style="vertical-align: top;"><span class="emphasis"><font
- face="Lucida Grande,Helvetica,Arial"><em>Use
-.slt
-traps</em></font></span></td>
- <td style="vertical-align: top;"><font
- face="Lucida Grande,Helvetica,Arial">The multi-load aspect of
-SLT files requires a trap instruction to be supported. This
-instruction is not generally used except for this trap, but since
-it's not inconceivable that a program could be wanting to use the
-real instruction instead, you can choose whether to support the
-trap or not.</font></td>
- </tr>
- <tr>
- <td style="vertical-align: top;"><span class="emphasis"><font
- face="Lucida Grande,Helvetica,Arial"><em>Confirm
-actions</em></font></span></td>
- <td style="vertical-align: top;"><font
- face="Lucida Grande,Helvetica,Arial">Specify
-whether `dangerous' actions (those which could cause data loss, for
-example resetting the Spectrum) require confirmation before occuring.</font></td>
- </tr>
- <tr>
- <td style="vertical-align: top;"><span class="emphasis"><font
- face="Lucida Grande,Helvetica,Arial"><em>Allow
-writes
-to
-ROM</em></font></span></td>
- <td style="vertical-align: top;"><font
- face="Lucida Grande,Helvetica,Arial">If this option is
-selected, Fuse will happily allow programs to overwrite what would
-normally be ROM. This probably isn't very useful in most
-circumstances, especially as the 48K ROM overwrites parts of
-itself.</font></td>
- </tr>
- <tr>
- <td style="vertical-align: top;"><span class="emphasis"><font
- face="Lucida Grande,Helvetica,Arial"><em>Show
-tape/disk
-status</em></font></span></td>
- <td style="vertical-align: top;"><font
- face="Lucida Grande,Helvetica,Arial">Enables the status icons
-showing whether the disk and tape are being accessed.</font></td>
- </tr>
- <tr>
- <td style="vertical-align: top;"><span class="emphasis"><font
- face="Lucida Grande,Helvetica,Arial"><em>Set
-joysticks
-on
-snapshot
-load</em></font></span></td>
- <td style="vertical-align: top;"><font
- face="Lucida Grande,Helvetica,Arial">Controls
-whether Fuse should
-allow snapshot files to override your current joystick configuration.</font></td>
- </tr>
- <tr>
- <td style="vertical-align: top;"><span class="emphasis"><font
- face="Lucida Grande,Helvetica,Arial"><em>Reset
-Preferences</em></font></span></td>
- <td style="vertical-align: top;"><font
- face="Lucida Grande,Helvetica,Arial">This causes all of Fuse's
-current preferences to be discarded and replaced with the default
-values as shipped.</font></td>
- </tr>
- </tbody>
-</table>
-<span class="emphasis"><font face="Lucida Grande,Helvetica,Arial"><em></em></font></span><font
- face="Lucida Grande,Helvetica,Arial"></font>
-<p><span class="emphasis"><font face="Lucida Grande,Helvetica,Arial"><em></em></font></span>
-<!-- AppleSegEnd --></p>
-</body>
+ <head>
+ <meta http-equiv="content-type" content="text/html;
+ charset=ISO-8859-1">
+ <!-- AppleSegStart="General Preferences" -->
+ <title>General Preferences</title>
+ </head>
+ <body>
+ <font face="Lucida Grande,Helvetica,Arial"><a name="General
+ Preferences"></a><!-- AppleSegDescription="This section describes the Fuse general preferences dialog." --></font>
+ <h2><font face="Lucida Grande,Helvetica,Arial"><span
+ style="font-style: italic;">General</span> preferences</font></h2>
+ <p><font face="Lucida Grande,Helvetica,Arial">The General pane of
+ Fuse preferences lets you configure miscellaneous Fuse options.<br>
+ </font></p>
+ <table style="text-align: left; width: 100%;" cellpadding="2"
+ cellspacing="2">
+ <tbody>
+ <tr>
+ <th style="vertical-align: top;"><font style="font-weight:
+ bold;" face="Lucida Grande,Helvetica,Arial">OPTION</font><br>
+ </th>
+ <th style="vertical-align: top;"><font style="font-weight:
+ bold;" face="Lucida Grande,Helvetica,Arial">DESCRIPTION</font><br>
+ </th>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>Emulation speed</em></font></span></td>
+ <td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em></em></font></span><font
+ face="Lucida Grande,Helvetica,Arial">Set how fast Fuse
+ will attempt to emulate the Spectrum, as a percentage of
+ the speed at which the real machine runs. If your machine
+ isn't fast enough to keep up with the requested speed,
+ Fuse will just run as fast as it can. Note that if the
+ emulation speed is 1%, no sound output will be produced.</font></td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>Screen refresh
+ rate</em></font></span></td>
+ <td style="vertical-align: top;"><font face="Lucida
+ Grande,Helvetica,Arial">Specify the frame rate, the ratio
+ of spectrum frame updates to real frame updates. This is
+ useful if your machine is having trouble keeping up with
+ the spectrum screen updates.</font></td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>Use tape traps</em></font></span></td>
+ <td style="vertical-align: top;"><font face="Lucida
+ Grande,Helvetica,Arial">Ordinarily, Fuse intercepts calls
+ to the ROM tape-loading routine in order to load from tape
+ files more quickly when possible. But this can (rarely)
+ interfere with TZX loading; disabling this option avoids
+ the problem at the cost of slower (i.e. always real-time)
+ tape-loading. When tape-loading traps are disabled, you
+ need to start tape playback manually, by choosing the<span
+ class="emphasis"><em>Tape, Play</em></span> menu item.</font></td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>Fast tape
+ loading</em></font></span></td>
+ <td style="vertical-align: top;"><font face="Lucida
+ Grande,Helvetica,Arial">If this option is enabled, then
+ Fuse will run at the fastest possible speed when the
+ virtual tape is playing, thus dramatically reducing the
+ time it takes to load programs. You may wish to disable
+ this option if you wish to stop the tape at a specific
+ point.</font></td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>Accelerate
+ loaders</em></font></span></td>
+ <td style="vertical-align: top;"><font face="Lucida
+ Grande,Helvetica,Arial">If this option is enabled, then
+ Fuse will attempt to accelerate tape loaders by "short
+ circuiting" the loading loop. This will in general speed
+ up loading, but may cause some loaders to fail.</font></td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>Detect tape
+ loaders</em></font></span></td>
+ <td style="vertical-align: top;"><font face="Lucida
+ Grande,Helvetica,Arial">If this option is enabled, Fuse
+ will attempt to detect when a loading routine is in
+ progress, and then automatically start the virtual tape to
+ load the program in. This is done by using a heuristic to
+ identify a loading routine, so is by no means infalliable,
+ but works in most cases.</font></td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>Auto-load media</em></font></span></td>
+ <td style="vertical-align: top;"><font face="Lucida
+ Grande,Helvetica,Arial">On many occasions when you open a
+ tape or disk file, it's because it's got a program in you
+ want to load and run. If this option is selected, this
+ will automatically happen for you when you open one of
+ these files using the </font><font face="Lucida
+ Grande,Helvetica,Arial"><span class="emphasis"><em>File,
+ Open...</em></span></font><font face="Lucida
+ Grande,Helvetica,Arial"> menu option - you must then use
+ the Media menu to use tapes or disks for saving data to,
+ or for loading data into an already running program.</font></td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>Show tape/disk
+ status</em></font></span></td>
+ <td style="vertical-align: top;"><font face="Lucida
+ Grande,Helvetica,Arial">Enables the status icons showing
+ whether the disk and tape are being accessed.</font></td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>Confirm actions</em></font></span></td>
+ <td style="vertical-align: top;"><font face="Lucida
+ Grande,Helvetica,Arial">Specify whether `dangerous'
+ actions (those which could cause data loss, for example
+ resetting the Spectrum) require confirmation before
+ occuring.</font></td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>Issue 2
+ keyboard</em></font></span></td>
+ <td style="vertical-align: top;"><font face="Lucida
+ Grande,Helvetica,Arial">Early versions of the Spectrum
+ used a different value for unused bits on the keyboard
+ input ports, and a few games depended on the old value of
+ these bits. Enabling this option switches to the old
+ value, to let you </font><font face="Lucida
+ Grande,Helvetica,Arial">run those games.</font></td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>Late CPU
+ timings</em></font></span></td>
+ <td style="vertical-align: top;"><font face="Lucida
+ Grande,Helvetica,Arial">If selected, Fuse will cause all
+ screen-related timings (for example, when the screen is
+ rendered and when memory contention occurs) to be one
+ tstate later than "normal", an effect which is present on
+ some real hardware.</font> <span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em></em></font></span></td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>Allow writes to
+ ROM</em></font></span></td>
+ <td style="vertical-align: top;"><font face="Lucida
+ Grande,Helvetica,Arial">If this option is selected, Fuse
+ will happily allow programs to overwrite what would
+ normally be ROM. This probably isn't very useful in most
+ circumstances, especially as the 48K ROM overwrites parts
+ of itself.</font></td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>Use .slt traps</em></font></span></td>
+ <td style="vertical-align: top;"><font face="Lucida
+ Grande,Helvetica,Arial">The multi-load aspect of SLT files
+ requires a trap instruction to be supported. This
+ instruction is not generally used except for this trap,
+ but since it's not inconceivable that a program could be
+ wanting to use the real instruction instead, you can
+ choose whether to support the trap or not.</font></td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>Set joysticks
+ on snapshot load</em></font></span></td>
+ <td style="vertical-align: top;"><font face="Lucida
+ Grande,Helvetica,Arial">Controls whether Fuse should allow
+ snapshot files to override your current joystick
+ configuration.</font></td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>Reset
+ Preferences</em></font></span></td>
+ <td style="vertical-align: top;"><font face="Lucida
+ Grande,Helvetica,Arial">This causes all of Fuse's current
+ preferences to be discarded and replaced with the default
+ values as shipped.</font></td>
+ </tr>
+ </tbody>
+ </table>
+ <span class="emphasis"><font face="Lucida Grande,Helvetica,Arial"><em></em></font></span>
+ <p><span class="emphasis"><font face="Lucida Grande,Helvetica,Arial"><em></em></font></span>
+ <!-- AppleSegEnd --></p>
+ </body>
</html>
Modified: trunk/fuse/fusepb/resources/Fuse Help/html/joysticks.html
===================================================================
--- trunk/fuse/fusepb/resources/Fuse Help/html/joysticks.html 2013-06-01 03:21:06 UTC (rev 761)
+++ trunk/fuse/fusepb/resources/Fuse Help/html/joysticks.html 2013-06-01 07:10:26 UTC (rev 762)
@@ -43,12 +43,16 @@
face="Lucida Grande,Helvetica,Arial"><em>Kempston</em></font></span>
<font face="Lucida Grande,Helvetica,Arial">A Kempston joystick,
read from input port 31. Note that the <span class="emphasis"><em>Peripherals
+
+
preferences > Kempston interface</em></span> option must
also be set for the input to be recognised.</font></p>
<p style="margin-left: 40px;"> <span class="emphasis"><font
face="Lucida Grande,Helvetica,Arial"><em>Sinclair 1</em></font></span>
<span class="emphasis"><font face="Lucida Grande,Helvetica,Arial"><em>Sinclair
+
+
2</em></font></span> <font face="Lucida
Grande,Helvetica,Arial">The `left' and `right' Sinclair
joysticks, equivalent to pressing 1 (left), 2 (right), 3 (down),
@@ -58,6 +62,8 @@
face="Lucida Grande,Helvetica,Arial"><em>Timex 1</em></font></span>
<span class="emphasis"><font face="Lucida Grande,Helvetica,Arial"><em>Timex
+
+
2</em></font></span> <font face="Lucida
Grande,Helvetica,Arial">The `left' and `right' joysticks as
attached to the Timex 2068s built-in joystick interface.</font></p>
@@ -81,6 +87,20 @@
</tr>
<tr>
<td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>Interface II</em></font></span></td>
+ <td style="vertical-align: top;"><font face="Lucida
+ Grande,Helvetica,Arial">If this option is selected, Fuse
+ will emulate a cartridge port as found on the Interface
+ II. Cartridges can then be inserted and removed via the <span
+ class="emphasis"><em>Media > Cartridge</em></span>
+ menu. Note that the Pentagon, Scorpion, Interface II,
+ ZXATASP and ZXCF all use the same hardware mechanism for
+ accessing some of their extended features, so only one of
+ these should be selected at once or unpredictable
+ behaviour will occur.</font></td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;"><span class="emphasis"><font
face="Lucida Grande,Helvetica,Arial"><em>Kempston
joystick interface</em></font></span></td>
<td style="vertical-align: top;"><font face="Lucida
@@ -108,17 +128,12 @@
</tr>
<tr>
<td style="vertical-align: top;"><span class="emphasis"><font
- face="Lucida Grande,Helvetica,Arial"><em>Interface II</em></font></span></td>
+ face="Lucida Grande,Helvetica,Arial"><em>Swap mouse
+ buttons</em></font></span></td>
<td style="vertical-align: top;"><font face="Lucida
- Grande,Helvetica,Arial">If this option is selected, Fuse
- will emulate a cartridge port as found on the Interface
- II. Cartridges can then be inserted and removed via the <span
- class="emphasis"><em>Media > Cartridge</em></span>
- menu. Note that the Pentagon, Scorpion, Interface II,
- ZXATASP and ZXCF all use the same hardware mechanism for
- accessing some of their extended features, so only one of
- these should be selected at once or unpredictable
- behaviour will occur.</font></td>
+ Grande,Helvetica,Arial">If this option is enabled, the
+ left and right mouse buttons will be swapped when
+ emulating a Kempston mouse.</font></td>
</tr>
</tbody>
</table>
Modified: trunk/fuse/fusepb/resources/Fuse Help/html/spectranet.html
===================================================================
--- trunk/fuse/fusepb/resources/Fuse Help/html/spectranet.html 2013-06-01 03:21:06 UTC (rev 761)
+++ trunk/fuse/fusepb/resources/Fuse Help/html/spectranet.html 2013-06-01 07:10:26 UTC (rev 762)
@@ -25,6 +25,9 @@
+
+
+
preferences</em></span></font></a><font face="Lucida
Grande,Helvetica,Arial"> dialog, and the state of its </font><font
face="Lucida Grande,Helvetica,Arial">automatic page-in</font><font
@@ -67,6 +70,9 @@
+
+
+
preferences</em></span></font></a><font face="Lucida
Grande,Helvetica,Arial"> dialog</font><font face="Lucida
Grande,Helvetica,Arial">. Once that's done, open the installer
@@ -96,6 +102,9 @@
+
+
+
disable</span></font><font face="Lucida
Grande,Helvetica,Arial"><span class="emphasis"><em></em></span></font>
<font face="Lucida Grande,Helvetica,Arial">option</font><font
@@ -111,15 +120,9 @@
Spectranet" and ending with the Spectranet's IP address (which
will be 255.255.255.255 at this stage).<br>
<br>
- If you see all that, type the following command:<br>
- </font></p>
- <font face="Lucida Grande,Helvetica,Arial"><big><span
- style="font-family: monospace;">%cfgnew</span></big><br>
- </font>
- <p><font face="Lucida Grande,Helvetica,Arial">Which will show the
- standard 0 OK, 0:1 at the bottom of the screen. Now, trigger an
- NMI (the Machine > NMI menu option) and you should get a
- white on blue Spectranet NMI menu with five options.<br>
+ Now, trigger an NMI (the Machine > NMI menu option) and you
+ should get a white on blue Spectranet NMI menu with five
+ options.<br>
<br>
Select [A] Configure network settings - this should lead you to
another menu, which will scroll of the top of the screen; don't
@@ -171,6 +174,9 @@
+
+
+
: 255.255.255.000</span><br style="font-family: monospace;">
<span style="font-family: monospace;">Default gateway :
192.168.000.001</span><br style="font-family: monospace;">
@@ -189,6 +195,9 @@
+
+
+
: fuse</span><br style="font-family: monospace;">
<br style="font-family: monospace;">
<span style="font-family: monospace;"><menu options></span></big><font
@@ -199,11 +208,22 @@
Exit, at which point you'll be returned to BASIC. Reset the
Spectrum again and you'll see the same four line status display,
but this time with your IP address on the last line.<br>
- <br>
- Congratulations! You have now installed the Spectranet firmware.
- To save having to go through all that every time you start Fuse,
- save a .szx snapshot at this point, and load that in every time
- you want to use the Spectranet.</font></p>
+ </font><br>
+ <font face="Lucida Grande,Helvetica,Arial"><font face="Lucida
+ Grande,Helvetica,Arial">Now type the following commands:<br>
+ </font> <font face="Lucida Grande,Helvetica,Arial"><big><span
+ style="font-family: monospace;">%cfgnew<br>
+ %cfgcommit</span></big></font><big><br>
+ </big> </font> </p>
+ <p><font face="Lucida Grande,Helvetica,Arial">Which will show the
+ standard <font face="Lucida Grande,Helvetica,Arial"><big><span
+ style="font-family: monospace;">0 OK, 0:1</span></big></font>
+ at the bottom of the screen. </font></p>
+ <p><font face="Lucida Grande,Helvetica,Arial"> Congratulations! You
+ have now installed the Spectranet firmware. To save having to go
+ through all that every time you start Fuse, save a .szx snapshot
+ at this point, and load that in every time you want to use the
+ Spectranet.</font></p>
<!-- AppleSegEnd -->
</body>
</html>
Modified: trunk/fuse/hacking/ChangeLog
===================================================================
--- trunk/fuse/hacking/ChangeLog 2013-06-01 03:21:06 UTC (rev 761)
+++ trunk/fuse/hacking/ChangeLog 2013-06-01 07:10:26 UTC (rev 762)
@@ -4518,3 +4518,13 @@
20130524 ChangeLog,README: updates for a "1.1.1" release (Fred).
20130524 ChangeLog,README,configure.ac,man/fuse.1: fill in date and bump
version number (Stuart).
+20130526 Makefile.am,ui/win32/installer/fuse.nsi.in: distribute ChangeLog and
+ build notes in Windows packages (Sergio).
+20130527 pokefinder/pokemem.c: fix crash when opening a file without extension
+ (patch #312) (UB880D and Sergio).
+20130531 man/fuse.1: correct Spectranet initialisation script (thanks, Guesser)
+ (Fred).
+20130531 man/fuse.1: add missing documentation (fixes bug #282) (Stuart).
+20130531 ui/win32/installer/fuse.nsi.in: adding Fuse to the OpenWith list for
+ file extensions could result in an true association under some
+ circumstances on Windows 7 (thanks, Alessandro Grussu) (Sergio).
Modified: trunk/fuse/man/fuse.1
===================================================================
--- trunk/fuse/man/fuse.1 2013-06-01 03:21:06 UTC (rev 761)
+++ trunk/fuse/man/fuse.1 2013-06-01 07:10:26 UTC (rev 762)
@@ -1988,6 +1988,13 @@
you wish to stop the tape at a specific point.
.RE
.PP
+.I "Accelerate loaders"
+.RS
+If this option is enabled, then Fuse will attempt to accelerate tape
+loaders by \(lqshort circuiting\(rq the loading loop. This will in
+general speed up loading, but may cause some loaders to fail.
+.RE
+.PP
.I "Detect loaders"
.RS
If this option is enabled, Fuse will attempt to detect when a loading
@@ -2046,6 +2053,14 @@
If the value smaller than 4 or greater than 254 Fuse assumes 4 or 254.
.RE
.PP
+.I "Random length MDR cartridge"
+.RS
+If this option is enabled, Fuse will use a random Microdrive cartridge
+length instead of the length specified in the
+.I "MDR cartridge len"
+option.
+.RE
+.PP
.I "RS-232 handshake"
.RS
If you turn this option off, Fuse assumes the RS-232 line other end is
@@ -2211,6 +2226,12 @@
connected mouse may be used.
.RE
.PP
+.I "Swap mouse buttons"
+.RS
+If this option is enabled, the left and right mouse buttons will be swapped
+when emulating a Kempston mouse.
+.RE
+.PP
.I "Fuller Box"
.RS
If this option is selected, Fuse will emulate a Fuller Box AY sound and
@@ -2365,14 +2386,6 @@
section for more details.
.RE
.PP
-.I "Opus Discovery interface"
-.RS
-If this option is selected, Fuse will emulate the Opus Discovery interface.
-See the
-.B "OPUS DISCOVERY EMULATION"
-section for more details.
-.RE
-.PP
.I "+D interface"
.RS
If this option is selected, Fuse will emulate the +D interface. See the
@@ -2395,8 +2408,22 @@
section for more details. Beta\ 128 emulation is enabled for the
Pentagon and Scorpion machines regardless of this option.
.RE
+.PP
+.I "Beta\ 128 auto-boot in 48K\ machines"
+.RS
+If this option is selected, then when a Beta\ 128 interface is used in 48K
+or TC2048 emulation, the machine will boot directly into the TR-DOS system.
.RE
.PP
+.I "Opus Discovery interface"
+.RS
+If this option is selected, Fuse will emulate the Opus Discovery interface.
+See the
+.B "OPUS DISCOVERY EMULATION"
+section for more details.
+.RE
+.RE
+.PP
.I "Options, RZX..."
.RS
Display the RZX Options dialog, letting you configure how Fuse's deals
@@ -3740,11 +3767,7 @@
starting with \(lqAlioth Spectranet\(rq and ending with the Spectranet's IP
address (which will be 255.255.255.255 at this stage).
.PP
-If you see all that, type the following command:
-.PP
-%cfgnew
-.PP
-Which will show the standard 0 OK, 0:1 at the bottom of the screen. Now trigger an NMI (the Machine / NMI menu option)
+Now trigger an NMI (the Machine / NMI menu option)
and you should get a white on blue Spectranet NMI menu with five
options.
.PP
@@ -3798,7 +3821,17 @@
.PP
If everything looks correct, select [I] Save changes and exit (you'll
see a brief \(lqSaving configuration...\(rq message) followed by [E] Exit,
-at which point you'll be returned to BASIC. Reset the Spectrum again
+at which point you'll be returned to BASIC.
+.PP
+Now type the following commands:
+.PP
+%cfgnew
+.br
+%cfgcommit
+.PP
+Which will show the standard 0 OK, 0:1 at the bottom of the screen.
+.PP
+Reset the Spectrum again
and you'll see the same four line status display, but this time with
your IP address on the last line.
.PP
Modified: trunk/fuse/pokefinder/pokemem.c
===================================================================
--- trunk/fuse/pokefinder/pokemem.c 2013-06-01 03:21:06 UTC (rev 761)
+++ trunk/fuse/pokefinder/pokemem.c 2013-06-01 07:10:26 UTC (rev 762)
@@ -1,7 +1,7 @@
/* pokemem.c: help with handling pokes
Copyright (c) 2011 Philip Kendall, Sergio Baldoví
- $Id: pokemem.c 4785 2012-12-07 23:56:40Z sbaldovi $
+ $Id: pokemem.c 5005 2013-05-29 21:17:26Z 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
@@ -487,8 +487,8 @@
int
pokemem_find_pokfile( const char *path )
{
- int n, has_extension;
- size_t length, filename_size, last_dot, last_slash;
+ int n, has_extension, last_dot, last_slash;
+ size_t length, filename_size;
char *test_file, *c;
if( pokfile ) return 1; /* Previous .pok file already found */
@@ -507,7 +507,7 @@
c = strrchr( test_file, '.' );
last_dot = ( c )? c - test_file : -1;
- has_extension = ( last_dot > last_slash );
+ has_extension = ( last_dot > last_slash + 1 );
/* Try .pok extension */
if( has_extension ) {
@@ -532,15 +532,16 @@
}
/* Browse POKES/ directory */
- if( last_slash ) {
+ if( last_slash >= 0 ) {
n = last_slash + 1; /* insert directory */
- filename_size = ( has_extension )? last_dot - last_slash - 1 :
- strlen( &path[n] );
+ filename_size =
+ ( has_extension )? (unsigned int) ( last_dot - last_slash - 1 ) :
+ strlen( &path[n] );
test_file[ n ] = '\0';
strncat( test_file, "POKES", 5 );
} else {
n = 0; /* prepend directory */
- filename_size = ( has_extension )? last_dot : length;
+ filename_size = ( has_extension )? (unsigned int) last_dot : length;
strncpy( test_file, "POKES", 5 );
test_file[ 5 ] = '\0';
}
Modified: trunk/fuse/ui/win32/installer/fuse.nsi.in
===================================================================
--- trunk/fuse/ui/win32/installer/fuse.nsi.in 2013-06-01 03:21:06 UTC (rev 761)
+++ trunk/fuse/ui/win32/installer/fuse.nsi.in 2013-06-01 07:10:26 UTC (rev 762)
@@ -1,7 +1,7 @@
## NSIS (nsis.sf.net) script to produce installer for win32 platform
## Copyright (c) 2009 Marek Januszewski
-## $Id: fuse.nsi.in 4775 2012-11-26 23:03:36Z sbaldovi $
+## $Id: fuse.nsi.in 5010 2013-05-31 18:32:45Z sbaldovi $
## 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
@@ -116,10 +116,6 @@
${CallArtificialFunction} UnRegisterExtension_
!macroend
-!macro AddOpenWithListCall _EXTENSION
- WriteRegStr HKLM "Software\Classes\${_EXTENSION}\OpenWithProgids" "${PROG_ID}" ""
-!macroend
-
!macro SelectUnregisteredExt_
Exch $R1 ;section
Exch
@@ -146,6 +142,9 @@
Exch $R0 ;extension
Push $0
+ ; Recommend Fuse in the Open With list
+ WriteRegStr HKLM "Software\Classes\$R0\OpenWithProgids" "${PROG_ID}" ""
+
; Read global file association
ReadRegStr $0 HKLM "Software\Classes\$R0" ""
StrCmp "$0" "" NoBackup ; is it empty
@@ -211,7 +210,6 @@
!define SelectUnregisteredExt `!insertmacro SelectUnregisteredExtCall`
!define RegisterExtension `!insertmacro RegisterExtensionCall`
!define UnRegisterExtension `!insertmacro UnRegisterExtensionCall`
-!define AddOpenWithList `!insertmacro AddOpenWithListCall`
;--------------------------------
; Uninstall previous version
@@ -246,10 +244,12 @@
; Installation files
File "AUTHORS.txt"
+ File "ChangeLog.txt"
File "COPYING.txt"
File "fuse.exe"
File "fuse.html"
File "README.txt"
+ File /nonfatal "README-win32.txt"
File "*.dll"
SetOutPath $INSTDIR\lib
File "lib\*"
@@ -303,14 +303,6 @@
WriteRegStr HKLM "Software\Classes\${PROG_ID}\shell\open\command" "" '"$INSTDIR\fuse.exe" "%1"'
WriteRegStr HKLM "Software\Classes\Applications\fuse.exe" "NoOpenWith" ""
- ; Recommend Fuse for known extensions
- ${AddOpenWithList} ".pzx"
- ${AddOpenWithList} ".rzx"
- ${AddOpenWithList} ".sna"
- ${AddOpenWithList} ".szx"
- ${AddOpenWithList} ".tap"
- ${AddOpenWithList} ".tzx"
- ${AddOpenWithList} ".z80"
System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
SectionEnd
@@ -362,10 +354,12 @@
Delete "$INSTDIR\roms\*"
RMDir "$INSTDIR\roms"
Delete "$INSTDIR\AUTHORS.txt"
+ Delete "$INSTDIR\ChangeLog.txt"
Delete "$INSTDIR\COPYING.txt"
Delete "$INSTDIR\fuse.exe"
Delete "$INSTDIR\fuse.html"
Delete "$INSTDIR\README.txt"
+ Delete "$INSTDIR\README-win32.txt"
Delete "$INSTDIR\*.dll"
RMDir "$INSTDIR"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2013-06-01 03:21:09
|
Revision: 761
http://sourceforge.net/p/fuse-for-macosx/code/761
Author: fredm
Date: 2013-06-01 03:21:06 +0000 (Sat, 01 Jun 2013)
Log Message:
-----------
Tag vendor/fuse-emulator/current as
vendor/fuse-emulator/fuse-1.1.0-r5011.
Revision Links:
--------------
http://sourceforge.net/p/fuse-for-macosx/code/5011
Added Paths:
-----------
vendor/fuse-emulator/fuse-1.1.0-r5011/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2013-06-01 03:20:50
|
Revision: 760
http://sourceforge.net/p/fuse-for-macosx/code/760
Author: fredm
Date: 2013-06-01 03:20:47 +0000 (Sat, 01 Jun 2013)
Log Message:
-----------
Load . into vendor/fuse-emulator/current.
Modified Paths:
--------------
vendor/fuse-emulator/current/fuse/Makefile.am
vendor/fuse-emulator/current/fuse/hacking/ChangeLog
vendor/fuse-emulator/current/fuse/man/fuse.1
vendor/fuse-emulator/current/fuse/pokefinder/pokemem.c
vendor/fuse-emulator/current/fuse/ui/win32/installer/fuse.nsi.in
Modified: vendor/fuse-emulator/current/fuse/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/Makefile.am 2013-05-26 12:20:07 UTC (rev 759)
+++ vendor/fuse-emulator/current/fuse/Makefile.am 2013-06-01 03:20:47 UTC (rev 760)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 1999-2009 Philip Kendall
-## $Id: Makefile.am 4980 2013-05-21 12:37:51Z fredm $
+## $Id: Makefile.am 5003 2013-05-26 16:24:03Z sbaldovi $
## 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
@@ -244,7 +244,7 @@
cp $(top_builddir)/.libs/fuse$(EXEEXT) $(DESTDIR) || \
cp $(top_builddir)/fuse$(EXEEXT) $(DESTDIR)
# Get text files
- for file in AUTHORS COPYING README; \
+ for file in AUTHORS ChangeLog COPYING README; \
do cp "$(top_srcdir)/$$file" "$(DESTDIR)/$$file.txt"; \
done
# Get manuals
Modified: vendor/fuse-emulator/current/fuse/hacking/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse/hacking/ChangeLog 2013-05-26 12:20:07 UTC (rev 759)
+++ vendor/fuse-emulator/current/fuse/hacking/ChangeLog 2013-06-01 03:20:47 UTC (rev 760)
@@ -4518,3 +4518,13 @@
20130524 ChangeLog,README: updates for a "1.1.1" release (Fred).
20130524 ChangeLog,README,configure.ac,man/fuse.1: fill in date and bump
version number (Stuart).
+20130526 Makefile.am,ui/win32/installer/fuse.nsi.in: distribute ChangeLog and
+ build notes in Windows packages (Sergio).
+20130527 pokefinder/pokemem.c: fix crash when opening a file without extension
+ (patch #312) (UB880D and Sergio).
+20130531 man/fuse.1: correct Spectranet initialisation script (thanks, Guesser)
+ (Fred).
+20130531 man/fuse.1: add missing documentation (fixes bug #282) (Stuart).
+20130531 ui/win32/installer/fuse.nsi.in: adding Fuse to the OpenWith list for
+ file extensions could result in an true association under some
+ circumstances on Windows 7 (thanks, Alessandro Grussu) (Sergio).
Modified: vendor/fuse-emulator/current/fuse/man/fuse.1
===================================================================
--- vendor/fuse-emulator/current/fuse/man/fuse.1 2013-05-26 12:20:07 UTC (rev 759)
+++ vendor/fuse-emulator/current/fuse/man/fuse.1 2013-06-01 03:20:47 UTC (rev 760)
@@ -1988,6 +1988,13 @@
you wish to stop the tape at a specific point.
.RE
.PP
+.I "Accelerate loaders"
+.RS
+If this option is enabled, then Fuse will attempt to accelerate tape
+loaders by \(lqshort circuiting\(rq the loading loop. This will in
+general speed up loading, but may cause some loaders to fail.
+.RE
+.PP
.I "Detect loaders"
.RS
If this option is enabled, Fuse will attempt to detect when a loading
@@ -2046,6 +2053,14 @@
If the value smaller than 4 or greater than 254 Fuse assumes 4 or 254.
.RE
.PP
+.I "Random length MDR cartridge"
+.RS
+If this option is enabled, Fuse will use a random Microdrive cartridge
+length instead of the length specified in the
+.I "MDR cartridge len"
+option.
+.RE
+.PP
.I "RS-232 handshake"
.RS
If you turn this option off, Fuse assumes the RS-232 line other end is
@@ -2211,6 +2226,12 @@
connected mouse may be used.
.RE
.PP
+.I "Swap mouse buttons"
+.RS
+If this option is enabled, the left and right mouse buttons will be swapped
+when emulating a Kempston mouse.
+.RE
+.PP
.I "Fuller Box"
.RS
If this option is selected, Fuse will emulate a Fuller Box AY sound and
@@ -2365,14 +2386,6 @@
section for more details.
.RE
.PP
-.I "Opus Discovery interface"
-.RS
-If this option is selected, Fuse will emulate the Opus Discovery interface.
-See the
-.B "OPUS DISCOVERY EMULATION"
-section for more details.
-.RE
-.PP
.I "+D interface"
.RS
If this option is selected, Fuse will emulate the +D interface. See the
@@ -2395,8 +2408,22 @@
section for more details. Beta\ 128 emulation is enabled for the
Pentagon and Scorpion machines regardless of this option.
.RE
+.PP
+.I "Beta\ 128 auto-boot in 48K\ machines"
+.RS
+If this option is selected, then when a Beta\ 128 interface is used in 48K
+or TC2048 emulation, the machine will boot directly into the TR-DOS system.
.RE
.PP
+.I "Opus Discovery interface"
+.RS
+If this option is selected, Fuse will emulate the Opus Discovery interface.
+See the
+.B "OPUS DISCOVERY EMULATION"
+section for more details.
+.RE
+.RE
+.PP
.I "Options, RZX..."
.RS
Display the RZX Options dialog, letting you configure how Fuse's deals
@@ -3740,11 +3767,7 @@
starting with \(lqAlioth Spectranet\(rq and ending with the Spectranet's IP
address (which will be 255.255.255.255 at this stage).
.PP
-If you see all that, type the following command:
-.PP
-%cfgnew
-.PP
-Which will show the standard 0 OK, 0:1 at the bottom of the screen. Now trigger an NMI (the Machine / NMI menu option)
+Now trigger an NMI (the Machine / NMI menu option)
and you should get a white on blue Spectranet NMI menu with five
options.
.PP
@@ -3798,7 +3821,17 @@
.PP
If everything looks correct, select [I] Save changes and exit (you'll
see a brief \(lqSaving configuration...\(rq message) followed by [E] Exit,
-at which point you'll be returned to BASIC. Reset the Spectrum again
+at which point you'll be returned to BASIC.
+.PP
+Now type the following commands:
+.PP
+%cfgnew
+.br
+%cfgcommit
+.PP
+Which will show the standard 0 OK, 0:1 at the bottom of the screen.
+.PP
+Reset the Spectrum again
and you'll see the same four line status display, but this time with
your IP address on the last line.
.PP
Modified: vendor/fuse-emulator/current/fuse/pokefinder/pokemem.c
===================================================================
--- vendor/fuse-emulator/current/fuse/pokefinder/pokemem.c 2013-05-26 12:20:07 UTC (rev 759)
+++ vendor/fuse-emulator/current/fuse/pokefinder/pokemem.c 2013-06-01 03:20:47 UTC (rev 760)
@@ -1,7 +1,7 @@
/* pokemem.c: help with handling pokes
Copyright (c) 2011 Philip Kendall, Sergio Baldoví
- $Id: pokemem.c 4785 2012-12-07 23:56:40Z sbaldovi $
+ $Id: pokemem.c 5005 2013-05-29 21:17:26Z 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
@@ -487,8 +487,8 @@
int
pokemem_find_pokfile( const char *path )
{
- int n, has_extension;
- size_t length, filename_size, last_dot, last_slash;
+ int n, has_extension, last_dot, last_slash;
+ size_t length, filename_size;
char *test_file, *c;
if( pokfile ) return 1; /* Previous .pok file already found */
@@ -507,7 +507,7 @@
c = strrchr( test_file, '.' );
last_dot = ( c )? c - test_file : -1;
- has_extension = ( last_dot > last_slash );
+ has_extension = ( last_dot > last_slash + 1 );
/* Try .pok extension */
if( has_extension ) {
@@ -532,15 +532,16 @@
}
/* Browse POKES/ directory */
- if( last_slash ) {
+ if( last_slash >= 0 ) {
n = last_slash + 1; /* insert directory */
- filename_size = ( has_extension )? last_dot - last_slash - 1 :
- strlen( &path[n] );
+ filename_size =
+ ( has_extension )? (unsigned int) ( last_dot - last_slash - 1 ) :
+ strlen( &path[n] );
test_file[ n ] = '\0';
strncat( test_file, "POKES", 5 );
} else {
n = 0; /* prepend directory */
- filename_size = ( has_extension )? last_dot : length;
+ filename_size = ( has_extension )? (unsigned int) last_dot : length;
strncpy( test_file, "POKES", 5 );
test_file[ 5 ] = '\0';
}
Modified: vendor/fuse-emulator/current/fuse/ui/win32/installer/fuse.nsi.in
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/win32/installer/fuse.nsi.in 2013-05-26 12:20:07 UTC (rev 759)
+++ vendor/fuse-emulator/current/fuse/ui/win32/installer/fuse.nsi.in 2013-06-01 03:20:47 UTC (rev 760)
@@ -1,7 +1,7 @@
## NSIS (nsis.sf.net) script to produce installer for win32 platform
## Copyright (c) 2009 Marek Januszewski
-## $Id: fuse.nsi.in 4775 2012-11-26 23:03:36Z sbaldovi $
+## $Id: fuse.nsi.in 5010 2013-05-31 18:32:45Z sbaldovi $
## 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
@@ -116,10 +116,6 @@
${CallArtificialFunction} UnRegisterExtension_
!macroend
-!macro AddOpenWithListCall _EXTENSION
- WriteRegStr HKLM "Software\Classes\${_EXTENSION}\OpenWithProgids" "${PROG_ID}" ""
-!macroend
-
!macro SelectUnregisteredExt_
Exch $R1 ;section
Exch
@@ -146,6 +142,9 @@
Exch $R0 ;extension
Push $0
+ ; Recommend Fuse in the Open With list
+ WriteRegStr HKLM "Software\Classes\$R0\OpenWithProgids" "${PROG_ID}" ""
+
; Read global file association
ReadRegStr $0 HKLM "Software\Classes\$R0" ""
StrCmp "$0" "" NoBackup ; is it empty
@@ -211,7 +210,6 @@
!define SelectUnregisteredExt `!insertmacro SelectUnregisteredExtCall`
!define RegisterExtension `!insertmacro RegisterExtensionCall`
!define UnRegisterExtension `!insertmacro UnRegisterExtensionCall`
-!define AddOpenWithList `!insertmacro AddOpenWithListCall`
;--------------------------------
; Uninstall previous version
@@ -246,10 +244,12 @@
; Installation files
File "AUTHORS.txt"
+ File "ChangeLog.txt"
File "COPYING.txt"
File "fuse.exe"
File "fuse.html"
File "README.txt"
+ File /nonfatal "README-win32.txt"
File "*.dll"
SetOutPath $INSTDIR\lib
File "lib\*"
@@ -303,14 +303,6 @@
WriteRegStr HKLM "Software\Classes\${PROG_ID}\shell\open\command" "" '"$INSTDIR\fuse.exe" "%1"'
WriteRegStr HKLM "Software\Classes\Applications\fuse.exe" "NoOpenWith" ""
- ; Recommend Fuse for known extensions
- ${AddOpenWithList} ".pzx"
- ${AddOpenWithList} ".rzx"
- ${AddOpenWithList} ".sna"
- ${AddOpenWithList} ".szx"
- ${AddOpenWithList} ".tap"
- ${AddOpenWithList} ".tzx"
- ${AddOpenWithList} ".z80"
System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
SectionEnd
@@ -362,10 +354,12 @@
Delete "$INSTDIR\roms\*"
RMDir "$INSTDIR\roms"
Delete "$INSTDIR\AUTHORS.txt"
+ Delete "$INSTDIR\ChangeLog.txt"
Delete "$INSTDIR\COPYING.txt"
Delete "$INSTDIR\fuse.exe"
Delete "$INSTDIR\fuse.html"
Delete "$INSTDIR\README.txt"
+ Delete "$INSTDIR\README-win32.txt"
Delete "$INSTDIR\*.dll"
RMDir "$INSTDIR"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2013-05-26 12:20:10
|
Revision: 759
http://sourceforge.net/p/fuse-for-macosx/code/759
Author: fredm
Date: 2013-05-26 12:20:07 +0000 (Sun, 26 May 2013)
Log Message:
-----------
Create 1.1.x release branch
Added Paths:
-----------
branches/Release-1_1_0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2013-05-25 05:12:15
|
Revision: 758
http://sourceforge.net/p/fuse-for-macosx/code/758
Author: fredm
Date: 2013-05-25 05:12:12 +0000 (Sat, 25 May 2013)
Log Message:
-----------
Fix comment.
Modified Paths:
--------------
trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html
Modified: trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html
===================================================================
--- trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html 2013-05-25 05:09:56 UTC (rev 757)
+++ trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html 2013-05-25 05:12:12 UTC (rev 758)
@@ -10,7 +10,7 @@
<body>
<font face="Lucida Grande,Helvetica,Arial">
<!-- AppleSegStart="What's New In Fuse?" --><a name="What's New In
- Fuse?" id="What's New In Fuse?"></a><!-- AppleSegDescription="This section describes the changes for version 1.1.0 of the Fuse emulator." --></font><br>
+ Fuse?" id="What's New In Fuse?"></a><!-- AppleSegDescription="This section describes the changes for version 1.1.1 of the Fuse emulator." --></font><br>
<h2><font><font face="Lucida Grande,Helvetica,Arial">What's new in
Fuse For Mac OS X 1.1.1</font></font></h2>
<ul>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2013-05-25 05:10:00
|
Revision: 757
http://sourceforge.net/p/fuse-for-macosx/code/757
Author: fredm
Date: 2013-05-25 05:09:56 +0000 (Sat, 25 May 2013)
Log Message:
-----------
Merge up to vendor 1.1.0 release branches r4995.
Revision Links:
--------------
http://sourceforge.net/p/fuse-for-macosx/code/4995
Modified Paths:
--------------
trunk/fuse/AUTHORS
trunk/fuse/ChangeLog
trunk/fuse/Makefile.am
trunk/fuse/README
trunk/fuse/configure.ac
trunk/fuse/fusepb/Credits.html
trunk/fuse/fusepb/English.lproj/InfoPlist.strings
trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
trunk/fuse/fusepb/Info-Fuse.plist
trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html
trunk/fuse/hacking/ChangeLog
trunk/fuse/hacking/Makefile.am
trunk/fuse/lib/Makefile.am
trunk/fuse/man/fuse.1
trunk/fuse/peripherals/ide/divide.c
trunk/fuse/peripherals/ide/divide.h
trunk/fuse/peripherals/ide/ide.c
trunk/fuse/peripherals/ide/ide.h
trunk/fuse/peripherals/ide/simpleide.c
trunk/fuse/peripherals/ide/simpleide.h
trunk/fuse/peripherals/ide/zxatasp.c
trunk/fuse/peripherals/ide/zxatasp.h
trunk/fuse/peripherals/ide/zxcf.c
trunk/fuse/peripherals/ide/zxcf.h
trunk/fuse/sound/Makefile.am
trunk/fuse/ui/gtk/gtkui.c
trunk/fuse/ui/widget/menu.c
trunk/fuse/ui/widget/options.pl
trunk/fuse/ui/widget/query.c
trunk/fuse/ui/widget/widget.c
trunk/fuse/ui/widget/widget_internals.h
trunk/fuse/ui/wii/Makefile.am
trunk/fuse/ui/win32/win32ui.c
Property Changed:
----------------
trunk/fuse/
Index: trunk/fuse
===================================================================
--- trunk/fuse 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse 2013-05-25 05:09:56 UTC (rev 757)
Property changes on: trunk/fuse
___________________________________________________________________
Modified: svn:mergeinfo
## -1,5 +1,5 ##
/vendor/fuse-emulator/0.10.0/fuse:556-557
/vendor/fuse-emulator/0.10.0-pre1/fuse:545-546
-/vendor/fuse-emulator/current/fuse:530-752
+/vendor/fuse-emulator/current/fuse:530-756
/vendor/fuse-emulator/fuse-1.0.0a/fuse:668-669
/vendor/fuse-emulator/fuse-r4617/fuse:686
\ No newline at end of property
Modified: trunk/fuse/AUTHORS
===================================================================
--- trunk/fuse/AUTHORS 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/AUTHORS 2013-05-25 05:09:56 UTC (rev 757)
@@ -34,6 +34,8 @@
* Marek Januszewski: Some patches making Fuse much closer to compiling under
Win32, and fixing up the GTK+ 2.0 interface.
+* Sergio Baldoví: improvements to the Win32 UI.
+
* Stuart Brady: for the Scorpion, +D interface emulation and HP-UX sound
support.
@@ -52,4 +54,4 @@
* Philip Kendall: everything else.
-$Id: AUTHORS 4835 2012-12-31 15:35:45Z zubzero $
+$Id: AUTHORS 4972 2013-05-19 16:46:43Z zubzero $
Modified: trunk/fuse/ChangeLog
===================================================================
--- trunk/fuse/ChangeLog 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/ChangeLog 2013-05-25 05:09:56 UTC (rev 757)
@@ -1,5 +1,14 @@
-2013-05-18 Philip Kendall <phi...@sh...>
+2013-05-24 Philip Kendall <phi...@sh...>
+ * Fuse 1.1.1 released.
+
+ * Distribute PORTING,hacking/valgrind.supp,sound/wiisound.c,
+ tests/success.{mgt.bz2,opd} and ui/wii/wiimouse.h (Stuart Brady).
+ * Add ChangeLog entries for 1.0.0.1 and 1.0.0.1a (Fredrick Meunier).
+ * Release correct version of source files.
+
+2013-05-19 Philip Kendall <phi...@sh...>
+
* Fuse 1.1.0 released.
* Remove ROMs that there is no formal permission to distribute.
@@ -57,6 +66,22 @@
* Various other minor bugfixes.
+2011-04-01 Philip Kendall <phi...@sh...>
+
+ * Fuse 1.0.0.1a released.
+
+ * Remove all ROMs for which there isn't explicit permission to
+ distribute (Philip Kendall).
+
+2011-01-12 Philip Kendall <phi...@sh...>
+
+ * Fuse 1.0.0.1 released.
+
+ * Fix temporary breakpoints on platforms using replacement Glib
+ (Fredrick Meunier, Sergio Baldovi; thanks, Chris Cowley)
+ * Ensure Amiga port can load files (Chris Young)
+ * Fix SVGAlib compilation (rkd77)
+
2010-12-16 Philip Kendall <phi...@sh...>
* Fuse 1.0.0 released.
@@ -1094,4 +1119,4 @@
* Version 0.1.0 released.
-$Id: ChangeLog 4944 2013-05-16 20:55:22Z pak21 $
+$Id: ChangeLog 4995 2013-05-24 19:54:19Z zubzero $
Modified: trunk/fuse/Makefile.am
===================================================================
--- trunk/fuse/Makefile.am 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/Makefile.am 2013-05-25 05:09:56 UTC (rev 757)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 1999-2009 Philip Kendall
-## $Id: Makefile.am 4782 2012-12-02 22:49:57Z sbaldovi $
+## $Id: Makefile.am 4980 2013-05-21 12:37:51Z 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
@@ -203,6 +203,7 @@
EXTRA_DIST = AUTHORS \
INSTALL \
+ PORTING \
README \
THANKS \
keysyms.dat \
Modified: trunk/fuse/README
===================================================================
--- trunk/fuse/README 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/README 2013-05-25 05:09:56 UTC (rev 757)
@@ -1,4 +1,4 @@
-The Free Unix Spectrum Emulator (Fuse) 1.1.0
+The Free Unix Spectrum Emulator (Fuse) 1.1.1
============================================
Fuse (the Free Unix Spectrum Emulator) was originally, and somewhat
@@ -105,6 +105,6 @@
<http://www.worldofspectrum.org/forums/>.
Philip Kendall <phi...@sh...>
-18th May, 2013
+24th May, 2013
-$Id: README 4958 2013-05-18 13:07:46Z zubzero $
+$Id: README 4995 2013-05-24 19:54:19Z zubzero $
Modified: trunk/fuse/configure.ac
===================================================================
--- trunk/fuse/configure.ac 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/configure.ac 2013-05-25 05:09:56 UTC (rev 757)
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-dnl $Id: configure.ac 4898 2013-02-25 22:20:54Z pak21 $
+dnl $Id: configure.ac 4995 2013-05-24 19:54:19Z zubzero $
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
@@ -20,12 +20,12 @@
dnl E-mail: phi...@sh...
dnl Package version
-m4_define([fuse_version], [1.1.0])
+m4_define([fuse_version], [1.1.1])
dnl Product full version
m4_define([fuse_major_version], [1])
m4_define([fuse_minor_version], [1])
-m4_define([fuse_micro_version], [0])
+m4_define([fuse_micro_version], [1])
m4_define([fuse_nano_version], [0])
m4_define([fuse_full_version], [fuse_major_version.fuse_minor_version.fuse_micro_version.fuse_nano_version])
m4_define([fuse_rc_version], [fuse_major_version,fuse_minor_version,fuse_micro_version,fuse_nano_version])
Modified: trunk/fuse/fusepb/Credits.html
===================================================================
--- trunk/fuse/fusepb/Credits.html 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/fusepb/Credits.html 2013-05-25 05:09:56 UTC (rev 757)
@@ -1,143 +1,194 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
-<head>
- <meta content="text/html; charset=ISO-8859-1"
- http-equiv="content-type">
- <title>Fuse credits</title>
-</head>
-<body>
-<p class="MsoNormal"><span style="font-family: Helvetica;" lang="EN-US">Fuse
-for
-Mac OS X has a home page at:</span></p>
-<p class="MsoNormal"><span style="font-family: Helvetica;" lang="EN-US"><a
- href="http://fuse-for-macosx.sourceforge.net/">http://fuse-for-macosx.sourceforge.net/</a><br>
-</span><br>
-<span style="font-family: Helvetica;" lang="EN-US">If you've got any
-bug reports, suggestions or the like for Fuse, or
-just want to get involved in the development, this is coordinated via
-the Fuse for Mac OS X project page on SourceForge,<br>
-<a href="http://sourceforge.net/projects/fuse-for-macosx/">http://sourceforge.net/projects/fuse-for-macosx/</a><br>
-<br>
-If you're interested in more general Speccy related discussions, visit
-the <a href="http://www.worldofspectrum.org/forums/">World of Spectrum
-Forums</a> or the Usenet group '<a href="news:comp.sys.sinclair">comp.sys.sinclair</a>',
-but
-do read the <a href="http://www.worldofspectrum.org/faq/index.html">FAQ</a>
-first!<br>
-</span></p>
-<p class="MsoNormal"><span style="font-family: Helvetica;" lang="EN-US">Fuse
-has
-been brought to you by:</span></p>
-<ul>
- <li><span style="font-family: Helvetica;" lang="EN-US">Matan Ziv-Av:
-SVGAlib and framebuffer user interfaces, the glib replacement code,
-some
-work on the sound code and the original `widget' code.</span></li>
- <li><span style="font-family: Helvetica;" lang="EN-US">Russell Marks:
-the generic and OSS-specific sound code, the man page, the Kempston
-joystick emulation and lots of bug reports and fixes.</span></li>
- <li><span style="font-family: Helvetica;" lang="EN-US">Ian Collier:
-the original ZX Printer emulation (for xz80).</span></li>
- <li><span style="font-family: Helvetica;" lang="EN-US">John Elliott:
-for lib765, which once provided Fuse's emulation of the +3's FDC, and
-libdsk
-which provides support for more disk image formats see <a
- href="http://www.seasip.demon.co.uk/Unix/LibDsk/">here</a>.</span></li>
- <li><span style="font-family: Helvetica;" lang="EN-US">Darren Salt:
-the original versions of the code for +3 emulation, SLT support, MITSHM
-support (for the Xlib UI), TZX raw data blocks, Spectrum SE support,
-RZX embedded snapshots and compression, the Kempston mouse emulation
-and made many improvements to the widget code.</span></li>
- <li><span style="font-family: Helvetica;" lang="EN-US">Alexander
-Yurchenko: the OpenBSD/Solaris-specific sound code.</span></li>
- <li><span style="font-family: Helvetica;" lang="EN-US">Fredrick
-Meunier: for TC2048 support, the SDL user interface, the graphics
-filters, Pentagon support, Spectrum SE support, Interface
-II support and more.</span></li>
- <li><span style="font-family: Helvetica;" lang="EN-US">Andrew Owen:
-for the keyboard help screens and the file icons.</span></li>
- <li><span style="font-family: Helvetica;" lang="EN-US">Paul van der
-Laan: for the Fuse program icon.<br>
- </span></li>
- <li><span style="font-family: Helvetica;" lang="EN-US">Ludvig
-Strigeus
-and The <a href="http://www.scummvm.org/">ScummVM</a> project: for the
-original graphics filter code and inspiration in improving the windowed
-performance of Fuse.</span></li>
- <li><span style="font-family: Helvetica;" lang="EN-US">Dmitry
-Sanarin:
-the original TR-DOS emulation (for the <a
- href="http://glukalka.sourceforge.net">Glukalka</a> emulator).</span></li>
- <li><span style="font-family: Helvetica;" lang="EN-US">Witold
-Filipczyk:
-TC2068 support and more.</span></li>
- <li><span style="font-family: Helvetica;" lang="EN-US">Matthew
-Westcott: the AY logging code and the DivIDE emulation.</span></li>
- <li><span style="font-family: Helvetica;" lang="EN-US">Marek
-Januszewski:
-Some patches making Fuse much closer to compiling under Win32, and
-fixing
-up the GTK+ 2.0 interface.</span></li>
- <li><span style="font-family: Helvetica;" lang="EN-US">Stuart
-Brady: for the DISCiPLE emulation, +D emulation, Scorpion emulation and HP-UX sound support.</span></li>
- <li><span style="font-family: Helvetica;" lang="EN-US">Garry
-Lancaster: the 8-bit IDE, ZXATASP and ZXCF interface
-emulations.</span></li>
- <li><span style="font-family: Helvetica;" lang="EN-US">Gergely Szasz:
-+3, +D, Opus and Interface I/microdrive emulation, the PAL TV scalers,
-the TV 3x
-scaler, the movie logging code, the libao sound code, and made many
-improvements to the widget code.</span></li>
- <li><span style="font-family: Helvetica;" lang="EN-US">Shay Green:
-the Blip_Buffer band pass filter for beeper and AY output.</span></li>
- <li><span style="font-family: Helvetica;" lang="EN-US">Boris Donko:
-for various Z80 core fixes: missing memory contention on LD (nnnn),A
-instruction, flags on SCF and FLAG_V on DEC, and timing of INC SP.</span></li>
- <li><span style="font-family: Helvetica;" lang="EN-US">Ivan Ruiz
-Etxabe: for helping test RZX competition mode recording.</span></li>
- <li><span style="font-family: Helvetica;" lang="EN-US">David Muriel:
-for helping test RZX competition mode recording.<br>
- </span></li>
- <li><span style="font-family: Helvetica;" lang="EN-US">Ian Greenway:
-for information about reading from unattached ports. If you've got an
-Amiga, you may well like to check out Ian's Spectrum Emulator, <a
- href="http://www.greew.freeserve.co.uk/ASp.html">ASp</a></span></li>
- <li><span style="font-family: Helvetica;" lang="EN-US">Mark Woodmass:
-for putting me on the track of (and finding the solution to) bugs with
-regard to Fuse's R register emulation during HALTs and interrupts and
-Fuse's mask for the memory control port on the 128K/+2 machines. Mark's
-another one who's written an emulator: see '<a
- href="http://www.worldofspectrum.org/emulators.html#pcwin">SPIN</a>'</span></li>
- <li><span style="font-family: Helvetica;" lang="EN-US">Michael D
-Wynne: the Opus Discovery emulation (for the <a
- href="http://www.chuntey.com/">EightyOne</a> Sinclair machines
-emulator)<br>
- </span></li>
- <li><span style="font-family: Helvetica;" lang="EN-US">Joystick
-support frm the </span><span style="font-family: Helvetica;"
- lang="EN-US"><a href="http://www.libsdl.org">Simple DirectMedia Layer</a>
-library</span></li>
- <li><span style="font-family: Helvetica;" lang="EN-US">Philip
-Kendall: everything else.</span></li>
-</ul>
-<p class="MsoNormal"><span style="font-family: Helvetica;" lang="EN-US">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 WARRENTY; 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 with this
-program; if not, write to the </span></p>
-<span style="font-family: Helvetica;" lang="EN-US">Free Software
-Foundation, Inc.,<br>
-59 Temple Place - Suite 330,<br>
-Boston, MA 02111-1307, USA<br>
-</span>
-<br>
-</body>
+ <head>
+ <meta content="text/html; charset=ISO-8859-1"
+ http-equiv="content-type">
+ <title>Fuse credits</title>
+ </head>
+ <body>
+ <p class="MsoNormal"><span style="font-family: Helvetica;"
+ lang="EN-US">Fuse
+ for
+ Mac OS X has a home page at:</span></p>
+ <p class="MsoNormal"><span style="font-family: Helvetica;"
+ lang="EN-US"><a href="http://fuse-for-macosx.sourceforge.net/">http://fuse-for-macosx.sourceforge.net/</a><br>
+ </span><br>
+ <span style="font-family: Helvetica;" lang="EN-US">If you've got
+ any
+ bug reports, suggestions or the like for Fuse, or
+ just want to get involved in the development, this is
+ coordinated via
+ the Fuse for Mac OS X project page on SourceForge,<br>
+ <a href="http://sourceforge.net/projects/fuse-for-macosx/">http://sourceforge.net/projects/fuse-for-macosx/</a><br>
+ <br>
+ If you're interested in more general Speccy related discussions,
+ visit
+ the <a href="http://www.worldofspectrum.org/forums/">World of
+ Spectrum
+ Forums</a> or the Usenet group '<a
+ href="news:comp.sys.sinclair">comp.sys.sinclair</a>',
+ but
+ do read the <a
+ href="http://www.worldofspectrum.org/faq/index.html">FAQ</a>
+ first!<br>
+ </span></p>
+ <p class="MsoNormal"><span style="font-family: Helvetica;"
+ lang="EN-US">Fuse
+ has
+ been brought to you by:</span></p>
+ <ul>
+ <li><span style="font-family: Helvetica;" lang="EN-US">Matan
+ Ziv-Av:
+ SVGAlib and framebuffer user interfaces, the glib replacement
+ code,
+ some
+ work on the sound code and the original `widget' code.</span></li>
+ <li><span style="font-family: Helvetica;" lang="EN-US">Russell
+ Marks:
+ the generic and OSS-specific sound code, the man page, the
+ Kempston
+ joystick emulation and lots of bug reports and fixes.</span></li>
+ <li><span style="font-family: Helvetica;" lang="EN-US">Ian
+ Collier:
+ the original ZX Printer emulation (for xz80).</span></li>
+ <li><span style="font-family: Helvetica;" lang="EN-US">John
+ Elliott:
+ for lib765, which once provided Fuse's emulation of the +3's
+ FDC, and
+ libdsk
+ which provides support for more disk image formats see <a
+ href="http://www.seasip.demon.co.uk/Unix/LibDsk/">here</a>.</span></li>
+ <li><span style="font-family: Helvetica;" lang="EN-US">Darren
+ Salt:
+ the original versions of the code for +3 emulation, SLT
+ support, MITSHM
+ support (for the Xlib UI), TZX raw data blocks, Spectrum SE
+ support,
+ RZX embedded snapshots and compression, the Kempston mouse
+ emulation
+ and made many improvements to the widget code.</span></li>
+ <li><span style="font-family: Helvetica;" lang="EN-US">Alexander
+ Yurchenko: the OpenBSD/Solaris-specific sound code.</span></li>
+ <li><span style="font-family: Helvetica;" lang="EN-US">Fredrick
+ Meunier: for TC2048 support, the SDL user interface, the
+ graphics
+ filters, Pentagon support, Spectrum SE support, Interface
+ II support and more.</span></li>
+ <li><span style="font-family: Helvetica;" lang="EN-US">Andrew
+ Owen:
+ for the keyboard help screens and the file icons.</span></li>
+ <li><span style="font-family: Helvetica;" lang="EN-US">Paul van
+ der
+ Laan: for the Fuse program icon.<br>
+ </span></li>
+ <li><span style="font-family: Helvetica;" lang="EN-US">Ludvig
+ Strigeus
+ and The <a href="http://www.scummvm.org/">ScummVM</a>
+ project: for the
+ original graphics filter code and inspiration in improving the
+ windowed
+ performance of Fuse.</span></li>
+ <li><span style="font-family: Helvetica;" lang="EN-US">Dmitry
+ Sanarin:
+ the original TR-DOS emulation (for the <a
+ href="http://glukalka.sourceforge.net">Glukalka</a>
+ emulator).</span></li>
+ <li><span style="font-family: Helvetica;" lang="EN-US">Witold
+ Filipczyk:
+ TC2068 support and more.</span></li>
+ <li><span style="font-family: Helvetica;" lang="EN-US">Matthew
+ Westcott: the AY logging code and the DivIDE emulation.</span></li>
+ <li><span style="font-family: Helvetica;" lang="EN-US">Marek
+ Januszewski:
+ Some patches making Fuse much closer to compiling under Win32,
+ and
+ fixing
+ up the GTK+ 2.0 interface.</span></li>
+ <li><span style="font-family: Helvetica;" lang="EN-US">Sergio
+ Baldoví: improvements to the Win32 UI.<br>
+ </span></li>
+ <li><span style="font-family: Helvetica;" lang="EN-US">Stuart
+ Brady: for the DISCiPLE emulation, +D emulation, Scorpion
+ emulation and HP-UX sound support.</span></li>
+ <li><span style="font-family: Helvetica;" lang="EN-US">Garry
+ Lancaster: the 8-bit IDE, ZXATASP and ZXCF interface
+ emulations.</span></li>
+ <li><span style="font-family: Helvetica;" lang="EN-US">Gergely
+ Szasz:
+ +3, +D, Opus and Interface I/microdrive emulation, the PAL TV
+ scalers,
+ the TV 3x
+ scaler, the movie logging code, the libao sound code, and made
+ many
+ improvements to the widget code.</span></li>
+ <li><span style="font-family: Helvetica;" lang="EN-US">Shay Green:
+ the Blip_Buffer band pass filter for beeper and AY output.</span></li>
+ <li><span style="font-family: Helvetica;" lang="EN-US">Boris
+ Donko:
+ for various Z80 core fixes: missing memory contention on LD
+ (nnnn),A
+ instruction, flags on SCF and FLAG_V on DEC, and timing of INC
+ SP.</span></li>
+ <li><span style="font-family: Helvetica;" lang="EN-US">Ivan Ruiz
+ Etxabe: for helping test RZX competition mode recording.</span></li>
+ <li><span style="font-family: Helvetica;" lang="EN-US">David
+ Muriel:
+ for helping test RZX competition mode recording.<br>
+ </span></li>
+ <li><span style="font-family: Helvetica;" lang="EN-US">Ian
+ Greenway:
+ for information about reading from unattached ports. If you've
+ got an
+ Amiga, you may well like to check out Ian's Spectrum Emulator,
+ <a href="http://www.greew.freeserve.co.uk/ASp.html">ASp</a></span></li>
+ <li><span style="font-family: Helvetica;" lang="EN-US">Mark
+ Woodmass:
+ for putting me on the track of (and finding the solution to)
+ bugs with
+ regard to Fuse's R register emulation during HALTs and
+ interrupts and
+ Fuse's mask for the memory control port on the 128K/+2
+ machines. Mark's
+ another one who's written an emulator: see '<a
+ href="http://www.worldofspectrum.org/emulators.html#pcwin">SPIN</a>'</span></li>
+ <li><span style="font-family: Helvetica;" lang="EN-US">Michael D
+ Wynne: the Opus Discovery emulation (for the <a
+ href="http://www.chuntey.com/">EightyOne</a> Sinclair
+ machines
+ emulator)<br>
+ </span></li>
+ <li><span style="font-family: Helvetica;" lang="EN-US">Joystick
+ support frm the </span><span style="font-family: Helvetica;"
+ lang="EN-US"><a href="http://www.libsdl.org">Simple
+ DirectMedia Layer</a>
+ library</span></li>
+ <li><span style="font-family: Helvetica;" lang="EN-US">Philip
+ Kendall: everything else.</span></li>
+ </ul>
+ <p class="MsoNormal"><span style="font-family: Helvetica;"
+ lang="EN-US">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 WARRENTY; 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 with this
+ program; if not, write to the </span></p>
+ <span style="font-family: Helvetica;" lang="EN-US">Free Software
+ Foundation, Inc.,<br>
+ 59 Temple Place - Suite 330,<br>
+ Boston, MA 02111-1307, USA<br>
+ </span>
+ <br>
+ </body>
</html>
Modified: trunk/fuse/fusepb/English.lproj/InfoPlist.strings
===================================================================
(Binary files differ)
Modified: trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
===================================================================
--- trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2013-05-25 05:09:56 UTC (rev 757)
@@ -1879,7 +1879,7 @@
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_MODEL_CPU = "";
GCC_OPTIMIZATION_LEVEL = 0;
- GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ GCC_VERSION = "";
HEADER_SEARCH_PATHS = (
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)/audiofile.framework/Headers",
..,
@@ -1921,7 +1921,7 @@
GCC_ENABLE_CPP_RTTI = NO;
GCC_ENABLE_OBJC_EXCEPTIONS = NO;
GCC_OPTIMIZATION_LEVEL = 2;
- GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ GCC_VERSION = "";
HEADER_SEARCH_PATHS = (
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)/audiofile.framework/Headers",
..,
@@ -1962,7 +1962,7 @@
GCC_ENABLE_CPP_RTTI = NO;
GCC_ENABLE_OBJC_EXCEPTIONS = NO;
GCC_OPTIMIZATION_LEVEL = 2;
- GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ GCC_VERSION = "";
HEADER_SEARCH_PATHS = (
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)/audiofile.framework/Headers",
..,
Modified: trunk/fuse/fusepb/Info-Fuse.plist
===================================================================
--- trunk/fuse/fusepb/Info-Fuse.plist 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/fusepb/Info-Fuse.plist 2013-05-25 05:09:56 UTC (rev 757)
@@ -548,11 +548,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>1.1.0</string>
+ <string>1.1.1</string>
<key>CFBundleSignature</key>
<string>FUSE</string>
<key>CFBundleVersion</key>
- <string>1.1.0</string>
+ <string>1.1.1</string>
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSPrincipalClass</key>
Modified: trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html
===================================================================
--- trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html 2013-05-25 05:09:56 UTC (rev 757)
@@ -12,7 +12,7 @@
<!-- AppleSegStart="What's New In Fuse?" --><a name="What's New In
Fuse?" id="What's New In Fuse?"></a><!-- AppleSegDescription="This section describes the changes for version 1.1.0 of the Fuse emulator." --></font><br>
<h2><font><font face="Lucida Grande,Helvetica,Arial">What's new in
- Fuse For Mac OS X 1.1.0</font></font></h2>
+ Fuse For Mac OS X 1.1.1</font></font></h2>
<ul>
<li><font face="Lucida Grande,Helvetica,Arial">New policy:</font></li>
<li style="list-style-type: none; list-style-image: none;
Modified: trunk/fuse/hacking/ChangeLog
===================================================================
--- trunk/fuse/hacking/ChangeLog 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/hacking/ChangeLog 2013-05-25 05:09:56 UTC (rev 757)
@@ -3401,6 +3401,7 @@
everything else (fixes bug #3084862) (thanks, Phil) (Fred).
20110104 nic: add .deps and Makefile to the ignore property (Fred).
20110109 ui/widget/filesel.c: make Amiga work again (Chris Young).
+20110112 ChangeLog,README,configure.in,man/fuse.1: updates for 1.0.0.1 release.
20110113 ui/win32/installer/fuse.nsi: windows installer improvements; optionally
delete configuration file (fuse.cfg) on uninstall, silently uninstall
previous version if reinstalling to the same folder, include AUTHORS
@@ -3552,8 +3553,11 @@
Makefile.am}: remove ROMs that there is no formal permission to
distribute.
20110327 roms/Makefile.am: distribute README.copyright.
+20110327 ChangeLog,README,configure.in,fuse.c,man/fuse.1: updates for 1.0.0.1a
+ release.
20110328 configure.in: allow the user to say they do not want to use windres
(works around bug #3248008; thanks, Cygnus).
+20110401 ChangeLog,man/fuse.1: didn't manage to release this earlier.
20110401 peripherals/disk/{opus,plusd}.c: remove incorrect use of GCC_UNUSED
(Stuart).
20110401 fuse.c,ui/{gtk/gtkui.c,widget/menu.c},windres.rc: update copyright
@@ -4494,3 +4498,23 @@
confirmation dialogue for reset due to peripheral changes (Sergio).
20130517 README: update date for 1.1 release.
20130518 README: mention DISCiPLE support (Stuart).
+20130518 ui/widget/options.pl: display confirmation dialogue for reset due to
+ peripheral changes (Stuart).
+20130518 ui/widget/options.pl: update peripherals list when a machine reset is
+ not needed (Sergio).
+20130519 ui/widget/{query.c,widget.c,widget_internals.h}: display confirmation
+ messages (Stuart).
+20130519 ui/widget/{options.pl,query.c}: choose no/cancel upon pressing escape
+ for all all confirmation dialogues, and remove workaround for this
+ from peripheral reset confirmation dialogue (Stuart).
+20130519 ui/{gtk/gtkui.c,widget/menu.c,win32/win32ui.c}: use different
+ confirmation messages for hard and soft resets (Stuart).
+20130519 ChangeLog,README,man/fuse.1: update date for 1.1 release (Stuart).
+20130519 AUTHOR,man/fuse.1: Add Sergio Baldoví (Stuart).
+20130519 lib/Makefile.am: distribute tests/success.{mgt.bz2,opd} (Stuart).
+20130519 Makefile.am,hacking/Makefile.am,sound/Makefile.am,ui/wii/Makefile.am:
+ distribute PORTING,hacking/valgrind.supp,sound/wiisound.c,
+ ui/wii/wiimouse.h (Stuart).
+20130524 ChangeLog,README: updates for a "1.1.1" release (Fred).
+20130524 ChangeLog,README,configure.ac,man/fuse.1: fill in date and bump
+ version number (Stuart).
Modified: trunk/fuse/hacking/Makefile.am
===================================================================
--- trunk/fuse/hacking/Makefile.am 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/hacking/Makefile.am 2013-05-25 05:09:56 UTC (rev 757)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2002-2011 Philip Kendall
-## $Id: Makefile.am 4663 2012-02-11 12:48:36Z fredm $
+## $Id: Makefile.am 4980 2013-05-21 12:37:51Z 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
@@ -33,4 +33,5 @@
spectranet.txt \
tc2048_tech_notes.txt \
timer.txt \
- ui.txt
+ ui.txt \
+ valgrind.supp
Modified: trunk/fuse/lib/Makefile.am
===================================================================
--- trunk/fuse/lib/Makefile.am 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/lib/Makefile.am 2013-05-25 05:09:56 UTC (rev 757)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 1999-2004 Philip Kendall
-## $Id: Makefile.am 4624 2012-01-09 20:59:35Z pak21 $
+## $Id: Makefile.am 4980 2013-05-21 12:37:51Z 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
@@ -64,6 +64,8 @@
tests/fatware-success.hdf.bz2 \
tests/idedos-success.hdf.bz2 \
tests/success.mdr \
+ tests/success.mgt.bz2 \
+ tests/success.opd \
tests/success.udi \
uncompressed/disk_plus3.szx \
uncompressed/tape_128.szx \
Modified: trunk/fuse/man/fuse.1
===================================================================
--- trunk/fuse/man/fuse.1 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/man/fuse.1 2013-05-25 05:09:56 UTC (rev 757)
@@ -23,7 +23,7 @@
.\" E-mail: phi...@sh...
.\"
.\"
-.TH fuse 1 "18th May, 2013" "Version 1.1.0" "Emulators"
+.TH fuse 1 "24th May, 2013" "Version 1.1.1" "Emulators"
.\"
.\"------------------------------------------------------------------
.\"
@@ -4779,6 +4779,8 @@
Marek Januszewski wrote various bits of code to make Fuse work under
Win32, including the DirectDraw user interface.
.PP
+Sergio Baldov\('i made many improvements to the Win32 UI.
+.PP
Stuart Brady wrote the DISCiPLE and +D emulation, Scorpion emulation
and the HP-UX sound code.
.PP
Modified: trunk/fuse/peripherals/ide/divide.c
===================================================================
--- trunk/fuse/peripherals/ide/divide.c 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/peripherals/ide/divide.c 2013-05-25 05:09:56 UTC (rev 757)
@@ -1,7 +1,7 @@
/* divide.c: DivIDE interface routines
Copyright (c) 2005-2008 Matthew Westcott, Philip Kendall
- $Id: divide.c 4906 2013-03-10 11:21:37Z fredm $
+ $Id: divide.c 4972 2013-05-19 16:46:43Z 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
Modified: trunk/fuse/peripherals/ide/divide.h
===================================================================
--- trunk/fuse/peripherals/ide/divide.h 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/peripherals/ide/divide.h 2013-05-25 05:09:56 UTC (rev 757)
@@ -1,7 +1,7 @@
/* divide.h: DivIDE interface routines
Copyright (c) 2005 Matthew Westcott
- $Id: divide.h 4924 2013-05-05 07:40:02Z sbaldovi $
+ $Id: divide.h 4972 2013-05-19 16:46:43Z 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
Modified: trunk/fuse/peripherals/ide/ide.c
===================================================================
--- trunk/fuse/peripherals/ide/ide.c 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/peripherals/ide/ide.c 2013-05-25 05:09:56 UTC (rev 757)
@@ -1,7 +1,7 @@
/* ide.c: Generic routines shared between the various IDE devices
Copyright (c) 2005 Philip Kendall
- $Id: ide.c 4664 2012-02-12 11:51:01Z fredm $
+ $Id: ide.c 4972 2013-05-19 16:46:43Z 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
Modified: trunk/fuse/peripherals/ide/ide.h
===================================================================
--- trunk/fuse/peripherals/ide/ide.h 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/peripherals/ide/ide.h 2013-05-25 05:09:56 UTC (rev 757)
@@ -1,7 +1,7 @@
/* ide.h: Generic routines shared between the various IDE devices
Copyright (c) 2005 Philip Kendall
- $Id: ide.h 4664 2012-02-12 11:51:01Z fredm $
+ $Id: ide.h 4972 2013-05-19 16:46:43Z 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
Modified: trunk/fuse/peripherals/ide/simpleide.c
===================================================================
--- trunk/fuse/peripherals/ide/simpleide.c 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/peripherals/ide/simpleide.c 2013-05-25 05:09:56 UTC (rev 757)
@@ -3,7 +3,7 @@
2004 Philip Kendall,
2008 Fredrick Meunier
- $Id: simpleide.c 4926 2013-05-05 07:58:18Z sbaldovi $
+ $Id: simpleide.c 4972 2013-05-19 16:46:43Z 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
Modified: trunk/fuse/peripherals/ide/simpleide.h
===================================================================
--- trunk/fuse/peripherals/ide/simpleide.h 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/peripherals/ide/simpleide.h 2013-05-25 05:09:56 UTC (rev 757)
@@ -1,7 +1,7 @@
/* simpleide.h: Simple 8-bit IDE interface routines
Copyright (c) 2003-2004 Garry Lancaster
- $Id: simpleide.h 4664 2012-02-12 11:51:01Z fredm $
+ $Id: simpleide.h 4972 2013-05-19 16:46:43Z 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
Modified: trunk/fuse/peripherals/ide/zxatasp.c
===================================================================
--- trunk/fuse/peripherals/ide/zxatasp.c 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/peripherals/ide/zxatasp.c 2013-05-25 05:09:56 UTC (rev 757)
@@ -1,7 +1,7 @@
/* zxatasp.c: ZXATASP interface routines
Copyright (c) 2003-2008 Garry Lancaster and Philip Kendall
- $Id: zxatasp.c 4906 2013-03-10 11:21:37Z fredm $
+ $Id: zxatasp.c 4972 2013-05-19 16:46:43Z 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
Modified: trunk/fuse/peripherals/ide/zxatasp.h
===================================================================
--- trunk/fuse/peripherals/ide/zxatasp.h 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/peripherals/ide/zxatasp.h 2013-05-25 05:09:56 UTC (rev 757)
@@ -2,7 +2,7 @@
Copyright (c) 2003-2004 Garry Lancaster,
2004 Philip Kendall
- $Id: zxatasp.h 4664 2012-02-12 11:51:01Z fredm $
+ $Id: zxatasp.h 4972 2013-05-19 16:46:43Z 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
Modified: trunk/fuse/peripherals/ide/zxcf.c
===================================================================
--- trunk/fuse/peripherals/ide/zxcf.c 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/peripherals/ide/zxcf.c 2013-05-25 05:09:56 UTC (rev 757)
@@ -1,7 +1,7 @@
/* zxcf.c: ZXCF interface routines
Copyright (c) 2003-2008 Garry Lancaster and Philip Kendall
- $Id: zxcf.c 4906 2013-03-10 11:21:37Z fredm $
+ $Id: zxcf.c 4972 2013-05-19 16:46:43Z 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
Modified: trunk/fuse/peripherals/ide/zxcf.h
===================================================================
--- trunk/fuse/peripherals/ide/zxcf.h 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/peripherals/ide/zxcf.h 2013-05-25 05:09:56 UTC (rev 757)
@@ -2,7 +2,7 @@
Copyright (c) 2003-2004 Garry Lancaster,
2004 Philip Kendall
- $Id: zxcf.h 4664 2012-02-12 11:51:01Z fredm $
+ $Id: zxcf.h 4972 2013-05-19 16:46:43Z 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
Modified: trunk/fuse/sound/Makefile.am
===================================================================
--- trunk/fuse/sound/Makefile.am 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/sound/Makefile.am 2013-05-25 05:09:56 UTC (rev 757)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2004 Philip Kendall
-## $Id: Makefile.am 4743 2012-10-10 13:20:50Z fredm $
+## $Id: Makefile.am 4980 2013-05-21 12:37:51Z 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
@@ -41,6 +41,7 @@
sdlsound.c \
sfifo.c \
sunsound.c \
+ wiisound.c \
win32sound.c
libsound_a_LIBADD = $(SOUND_LIBADD)
Modified: trunk/fuse/ui/gtk/gtkui.c
===================================================================
--- trunk/fuse/ui/gtk/gtkui.c 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/ui/gtk/gtkui.c 2013-05-25 05:09:56 UTC (rev 757)
@@ -1,7 +1,7 @@
/* gtkui.c: GTK+ routines for dealing with the user interface
Copyright (c) 2000-2005 Philip Kendall, Russell Marks
- $Id: gtkui.c 4962 2013-05-19 05:25:15Z sbaldovi $
+ $Id: gtkui.c 4968 2013-05-19 16:11:17Z zubzero $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -536,8 +536,12 @@
menu_machine_reset( GtkAction *gtk_action GCC_UNUSED, guint action )
{
int hard_reset = action;
+ const char *message = "Reset?";
- if( gtkui_confirm( "Reset?" ) && machine_reset( hard_reset ) ) {
+ if( hard_reset )
+ message = "Hard reset?";
+
+ if( gtkui_confirm( message ) && machine_reset( hard_reset ) ) {
ui_error( UI_ERROR_ERROR, "couldn't reset machine: giving up!" );
/* FIXME: abort() seems a bit extreme here, but it'll do for now */
Modified: trunk/fuse/ui/widget/menu.c
===================================================================
--- trunk/fuse/ui/widget/menu.c 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/ui/widget/menu.c 2013-05-25 05:09:56 UTC (rev 757)
@@ -1,7 +1,7 @@
/* menu.c: general menu widget
Copyright (c) 2001-2006 Philip Kendall
- $Id: menu.c 4915 2013-04-07 05:32:09Z fredm $
+ $Id: menu.c 4968 2013-05-19 16:11:17Z zubzero $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -584,12 +584,18 @@
void
menu_machine_reset( int action )
{
- if( widget_do( WIDGET_TYPE_QUERY, "Reset machine?" ) ||
+ int hard_reset = action;
+ const char *message = "Reset?";
+
+ if( hard_reset )
+ message = "Hard reset?";
+
+ if( widget_do( WIDGET_TYPE_QUERY, message ) ||
!widget_query.confirm )
return;
widget_end_all( WIDGET_FINISHED_OK );
- machine_reset( action );
+ machine_reset( hard_reset );
}
void
Modified: trunk/fuse/ui/widget/options.pl
===================================================================
--- trunk/fuse/ui/widget/options.pl 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/ui/widget/options.pl 2013-05-25 05:09:56 UTC (rev 757)
@@ -1,9 +1,9 @@
#!/usr/bin/perl -w
# options.pl: generate options dialog boxes
-# Copyright (c) 2001-2008 Philip Kendall, Fredrick Meunier
+# Copyright (c) 2001-2013 Philip Kendall, Fredrick Meunier
-# $Id: options.pl 4961 2013-05-19 05:17:30Z sbaldovi $
+# $Id: options.pl 4969 2013-05-19 16:21:14Z 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
@@ -37,7 +37,7 @@
my @dialogs = Fuse::Dialog::read( shift @ARGV );
print Fuse::GPL( 'options.c: options dialog boxes',
- '2001-2004 Philip Kendall' ) . << "CODE";
+ '2001-2013 Philip Kendall' ) . << "CODE";
/* This file is autogenerated from options.dat by options.pl.
Do not edit unless you know what you\'re doing! */
@@ -363,11 +363,35 @@
int
widget_options_finish( widget_finish_state finished )
{
+ int error;
+
/* If we exited normally, actually set the options */
if( finished == WIDGET_FINISHED_OK ) {
+ /* Get a copy of current settings */
+ settings_info original_settings;
+ memset( &original_settings, 0, sizeof( settings_info ) );
+ settings_copy( &original_settings, &settings_current );
+
+ /* Apply new options */
settings_copy( &settings_current, &widget_options_settings );
- /* Bring the peripherals list into sync with the new options */
- periph_posthook();
+
+ int needs_hard_reset = periph_postcheck();
+
+ if( needs_hard_reset ) {
+ error = widget_do( WIDGET_TYPE_QUERY,
+ "Some options need to reset the machine. Reset?" );
+ if( !error && !widget_query.confirm )
+ settings_copy( &settings_current, &original_settings );
+ else
+ periph_posthook();
+ }
+ else {
+ /* Bring the peripherals list into sync with the new options */
+ periph_posthook();
+ }
+
+ settings_free( &original_settings );
+
/* make the needed UI changes */
uidisplay_hotswap_gfx_mode();
}
Modified: trunk/fuse/ui/widget/query.c
===================================================================
--- trunk/fuse/ui/widget/query.c 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/ui/widget/query.c 2013-05-25 05:09:56 UTC (rev 757)
@@ -1,7 +1,7 @@
/* query.c: The query widgets
Copyright (c) 2004-2008 Darren Salt, Fredrick Meunier
- $Id: query.c 4179 2010-10-08 10:05:55Z fredm $
+ $Id: query.c 4968 2013-05-19 16:11:17Z zubzero $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -30,6 +30,7 @@
#include <string.h>
#include "fuse.h"
+#include "utils.h"
#include "widget_internals.h"
widget_query_t widget_query;
@@ -104,12 +105,15 @@
static size_t highlight_line = 0;
+static char **message_lines;
+static size_t num_message_lines;
+
static void
widget_query_line_draw( int left_edge, int width, struct widget_query_entry *menu,
const char *label )
{
int colour = WIDGET_COLOUR_BACKGROUND;
- int y = menu->index * 8 + 24;
+ int y = (menu->index + num_message_lines) * 8 + 24;
if( menu->index == highlight_line ) colour = WIDGET_COLOUR_HIGHLIGHT;
widget_rectangle( left_edge*8+1, y, width*8-2, 1*8, colour );
@@ -121,10 +125,12 @@
const int query_vert_external_margin = 8;
static int
-widget_calculate_query_width( const char *title, widget_query_entry *menu )
+widget_calculate_query_width( const char *title, widget_query_entry *menu,
+ char **lines, int num_lines )
{
widget_query_entry *ptr;
int max_width=0;
+ int i;
if (!menu) {
return 64;
@@ -139,17 +145,34 @@
max_width = total_width;
}
+ for( i=0; i<num_lines; i++) {
+ int total_width = widget_stringwidth( lines[i] )+2*8;
+
+ if( total_width > max_width )
+ max_width = total_width;
+ }
+
return ( max_width + query_vert_external_margin * 2 ) / 8;
}
static int
-internal_query_draw( widget_query_entry *query, int save, const char *data )
+internal_query_draw( widget_query_entry *query, int save, const char *message )
{
widget_query_entry *ptr;
size_t height = 0;
- int menu_width = widget_calculate_query_width( title, query );
+ int menu_width;
int menu_left_edge_x;
+ int i;
+ if( split_message( message, &message_lines, &num_message_lines, 28 ) ) {
+ return 1;
+ }
+
+ menu_width = widget_calculate_query_width( title, query, message_lines,
+ num_message_lines );
+
+ height = num_message_lines;
+
/* How many options do we have? */
for( ptr = query; ptr->text; ptr++ )
height ++;
@@ -161,6 +184,11 @@
widget_printstring( menu_left_edge_x*8+2, 16, WIDGET_COLOUR_TITLE, title );
+ for( i=0; i<num_message_lines; i++ ) {
+ widget_printstring( menu_left_edge_x*8+8, i*8+24,
+ WIDGET_COLOUR_FOREGROUND, message_lines[i] );
+ }
+
for( ptr = query; ptr->text; ptr++ ) {
widget_query_line_draw( menu_left_edge_x, menu_width, ptr, ptr->text );
}
@@ -174,6 +202,7 @@
widget_query_draw( void *data )
{
highlight_line = 0;
+ widget_query.confirm = 0;
return internal_query_draw( query_confirm, 0, (const char *) data );
}
@@ -181,6 +210,7 @@
widget_query_save_draw( void *data )
{
highlight_line = 0;
+ widget_query.save = UI_CONFIRM_SAVE_CANCEL;
return internal_query_draw( query_save, 1, (const char *) data );
}
@@ -191,7 +221,8 @@
int new_highlight_line = 0;
int cursor_pressed = 0;
widget_query_entry *ptr;
- int menu_width = widget_calculate_query_width( title, query );
+ int menu_width = widget_calculate_query_width( title, query, message_lines,
+ num_message_lines );
int menu_left_edge_x = DISPLAY_WIDTH_COLS/2-menu_width/2;
switch( key ) {
@@ -282,3 +313,15 @@
sizeof(query_save)/sizeof(widget_query_entry),
key );
}
+
+int
+widget_query_finish( widget_finish_state finished )
+{
+ int i;
+ for( i=0; i<num_message_lines; i++ ) {
+ free( message_lines[i] );
+ }
+ free( message_lines );
+
+ return 0;
+}
Modified: trunk/fuse/ui/widget/widget.c
===================================================================
--- trunk/fuse/ui/widget/widget.c 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/ui/widget/widget.c 2013-05-25 05:09:56 UTC (rev 757)
@@ -1,7 +1,7 @@
/* widget.c: Simple dialog boxes for all user interfaces.
Copyright (c) 2001-2005 Matan Ziv-Av, Philip Kendall, Russell Marks
- $Id: widget.c 4697 2012-05-07 02:28:52Z fredm $
+ $Id: widget.c 4968 2013-05-19 16:11:17Z zubzero $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -692,8 +692,8 @@
{ widget_roms_draw, widget_roms_finish, widget_roms_keyhandler },
{ widget_peripherals_general_draw, widget_options_finish, widget_peripherals_general_keyhandler },
{ widget_peripherals_disk_draw, widget_options_finish, widget_peripherals_disk_keyhandler },
- { widget_query_draw, NULL, widget_query_keyhandler },
- { widget_query_save_draw,NULL, widget_query_save_keyhandler },
+ { widget_query_draw, widget_query_finish, widget_query_keyhandler },
+ { widget_query_save_draw,widget_query_finish, widget_query_save_keyhandler },
{ widget_diskoptions_draw, widget_options_finish, widget_diskoptions_keyhandler },
};
Modified: trunk/fuse/ui/widget/widget_internals.h
===================================================================
--- trunk/fuse/ui/widget/widget_internals.h 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/ui/widget/widget_internals.h 2013-05-25 05:09:56 UTC (rev 757)
@@ -1,7 +1,7 @@
/* widget_internals.h: Functions internal to the widget code
Copyright (c) 2001-2005 Matan Ziv-Av, Philip Kendall
- $Id: widget_internals.h 4543 2011-09-19 01:46:48Z fredm $
+ $Id: widget_internals.h 4968 2013-05-19 16:11:17Z zubzero $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -259,6 +259,7 @@
void widget_query_keyhandler( input_key key );
int widget_query_save_draw( void *data );
void widget_query_save_keyhandler( input_key key );
+int widget_query_finish( widget_finish_state finished );
/* The widgets actually available */
Modified: trunk/fuse/ui/wii/Makefile.am
===================================================================
--- trunk/fuse/ui/wii/Makefile.am 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/ui/wii/Makefile.am 2013-05-25 05:09:56 UTC (rev 757)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2001-2009 Philip Kendall, Bjoern Giesler
-## $Id: Makefile.am 4743 2012-10-10 13:20:50Z fredm $
+## $Id: Makefile.am 4980 2013-05-21 12:37:51Z 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
@@ -43,6 +43,7 @@
noinst_HEADERS = wiidisplay.h \
wiikeyboard.h \
- wiikeysyms.h
+ wiikeysyms.h \
+ wiimouse.h
CLEANFILES = keysyms.c
Modified: trunk/fuse/ui/win32/win32ui.c
===================================================================
--- trunk/fuse/ui/win32/win32ui.c 2013-05-25 04:16:54 UTC (rev 756)
+++ trunk/fuse/ui/win32/win32ui.c 2013-05-25 05:09:56 UTC (rev 757)
@@ -1,7 +1,7 @@
/* win32ui.c: Win32 routines for dealing with the user interface
Copyright (c) 2003-2007 Marek Januszewski, Philip Kendall, Stuart Brady
- $Id: win32ui.c 4849 2013-01-03 23:27:39Z sbaldovi $
+ $Id: win32ui.c 4968 2013-05-19 16:11:17Z zubzero $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -564,8 +564,12 @@
menu_machine_reset( int action )
{
int hard_reset = action;
+ const char *message = "Reset?";
+
+ if( hard_reset )
+ message = "Hard reset?";
- if( win32ui_confirm( "Reset?" ) && machine_reset( hard_reset ) ) {
+ if( win32ui_confirm( message ) && machine_reset( hard_reset ) ) {
ui_error( UI_ERROR_ERROR, "couldn't reset machine: giving up!" );
/* FIXME: abort() seems a bit extreme here, but it'll do for now */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2013-05-25 04:16:58
|
Revision: 756
http://sourceforge.net/p/fuse-for-macosx/code/756
Author: fredm
Date: 2013-05-25 04:16:54 +0000 (Sat, 25 May 2013)
Log Message:
-----------
Merge up to vendor 1.1.0 release branches r4995.
Revision Links:
--------------
http://sourceforge.net/p/fuse-for-macosx/code/4995
Modified Paths:
--------------
trunk/libspectrum/Info.plist
trunk/libspectrum/libspectrum/ChangeLog
trunk/libspectrum/libspectrum/Makefile.am
trunk/libspectrum/libspectrum/README
trunk/libspectrum/libspectrum/configure.ac
trunk/libspectrum/libspectrum/doc/libspectrum.3
trunk/libspectrum/libspectrum/doc/libspectrum.txt
trunk/libspectrum/libspectrum/hacking/ChangeLog
trunk/libspectrum/libspectrum.xcodeproj/project.pbxproj
Property Changed:
----------------
trunk/libspectrum/libspectrum/
Modified: trunk/libspectrum/Info.plist
===================================================================
--- trunk/libspectrum/Info.plist 2013-05-25 03:45:58 UTC (rev 755)
+++ trunk/libspectrum/Info.plist 2013-05-25 04:16:54 UTC (rev 756)
@@ -23,6 +23,6 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>1.1.0</string>
+ <string>1.1.1</string>
</dict>
</plist>
Index: trunk/libspectrum/libspectrum
===================================================================
--- trunk/libspectrum/libspectrum 2013-05-25 03:45:58 UTC (rev 755)
+++ trunk/libspectrum/libspectrum 2013-05-25 04:16:54 UTC (rev 756)
Property changes on: trunk/libspectrum/libspectrum
___________________________________________________________________
Modified: svn:mergeinfo
## -1,5 +1,5 ##
/vendor/fuse-emulator/0.10.0/libspectrum:556-557
/vendor/fuse-emulator/0.10.0-pre1/libspectrum:545-546
-/vendor/fuse-emulator/current/libspectrum:530-752
+/vendor/fuse-emulator/current/libspectrum:530-755
/vendor/fuse-emulator/fuse-1.0.0a/libspectrum:668-669
/vendor/fuse-emulator/fuse-r4617/libspectrum:686
\ No newline at end of property
Modified: trunk/libspectrum/libspectrum/ChangeLog
===================================================================
--- trunk/libspectrum/libspectrum/ChangeLog 2013-05-25 03:45:58 UTC (rev 755)
+++ trunk/libspectrum/libspectrum/ChangeLog 2013-05-25 04:16:54 UTC (rev 756)
@@ -1,3 +1,10 @@
+2013-05-24 Philip Kendall <phi...@sh...>
+
+ * libspectrum 1.1.1 released.
+
+ * Decreased libtool version to allow binaries built against
+ libspectrum 1.0.0 to run with libspectrum 1.1.1.
+
2013-05-18 Philip Kendall <phi...@sh...>
* libspectrum 1.1.0 released.
@@ -333,5 +340,5 @@
* libspectrum separated from Fuse just before the 0.5.0 release of
Fuse; see Fuse's ChangeLog for changes up to this point
-$Id: ChangeLog 4948 2013-05-16 21:00:24Z pak21 $
+$Id: ChangeLog 4994 2013-05-24 19:52:37Z zubzero $
Modified: trunk/libspectrum/libspectrum/Makefile.am
===================================================================
--- trunk/libspectrum/libspectrum/Makefile.am 2013-05-25 03:45:58 UTC (rev 755)
+++ trunk/libspectrum/libspectrum/Makefile.am 2013-05-25 04:16:54 UTC (rev 756)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2001-2013 Philip Kendall
-## $Id: Makefile.am 4935 2013-05-16 19:43:50Z pak21 $
+## $Id: Makefile.am 4985 2013-05-24 17:27:14Z 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
@@ -63,7 +63,7 @@
zlib.c \
zxs.c
-libspectrum_la_LDFLAGS = -version-info 9:0:0 -no-undefined @WINDRES_LDFLAGS@
+libspectrum_la_LDFLAGS = -version-info 9:0:1 -no-undefined @WINDRES_LDFLAGS@
libspectrum_la_LIBADD = @AUDIOFILE_LIBS@ @GLIB_LIBS@ -lm
Modified: trunk/libspectrum/libspectrum/README
===================================================================
--- trunk/libspectrum/libspectrum/README 2013-05-25 03:45:58 UTC (rev 755)
+++ trunk/libspectrum/libspectrum/README 2013-05-25 04:16:54 UTC (rev 756)
@@ -1,4 +1,4 @@
-libspectrum 1.1.0
+libspectrum 1.1.1
=================
libspectrum is a library which is designed to make the input and
@@ -67,6 +67,6 @@
Then, type "make" and if everything went well, "make install".
Philip Kendall <phi...@sh...>
-18th May, 2013
+24th May, 2013
-$Id: README 4951 2013-05-17 18:48:41Z pak21 $
+$Id: README 4992 2013-05-24 19:49:15Z zubzero $
Modified: trunk/libspectrum/libspectrum/configure.ac
===================================================================
--- trunk/libspectrum/libspectrum/configure.ac 2013-05-25 03:45:58 UTC (rev 755)
+++ trunk/libspectrum/libspectrum/configure.ac 2013-05-25 04:16:54 UTC (rev 756)
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
dnl Copyright (c) 1999-2012 Philip Kendall
-dnl $Id: configure.ac 4847 2013-01-03 09:16:15Z zubzero $
+dnl $Id: configure.ac 4986 2013-05-24 19:03:20Z zubzero $
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
@@ -22,12 +22,12 @@
dnl E-mail: phi...@sh...
dnl Package version
-m4_define([libspectrum_version], [1.1.0])
+m4_define([libspectrum_version], [1.1.1])
dnl Product full version
m4_define([libspectrum_major_version], [1])
m4_define([libspectrum_minor_version], [1])
-m4_define([libspectrum_micro_version], [0])
+m4_define([libspectrum_micro_version], [1])
m4_define([libspectrum_nano_version], [0])
m4_define([libspectrum_full_version],
[libspectrum_major_version.libspectrum_minor_version.libspectrum_micro_version.libspectrum_nano_version])
Modified: trunk/libspectrum/libspectrum/doc/libspectrum.3
===================================================================
--- trunk/libspectrum/libspectrum/doc/libspectrum.3 2013-05-25 03:45:58 UTC (rev 755)
+++ trunk/libspectrum/libspectrum/doc/libspectrum.3 2013-05-25 04:16:54 UTC (rev 756)
@@ -22,7 +22,7 @@
.\" E-mail: phi...@sh...
.\"
.\"
-.TH libspectrum 3 "18th May, 2013" "Version 1.1.0" "Emulators"
+.TH libspectrum 3 "24th May, 2013" "Version 1.1.1" "Emulators"
.\"
.\"------------------------------------------------------------------
.\"
Modified: trunk/libspectrum/libspectrum/doc/libspectrum.txt
===================================================================
--- trunk/libspectrum/libspectrum/doc/libspectrum.txt 2013-05-25 03:45:58 UTC (rev 755)
+++ trunk/libspectrum/libspectrum/doc/libspectrum.txt 2013-05-25 04:16:54 UTC (rev 756)
@@ -1,4 +1,4 @@
-libspectrum 1.1.0
+libspectrum 1.1.1
=================
libspectrum is a fairly simple library designed to make the handling
@@ -1826,4 +1826,4 @@
Write `data' to register `reg' of the IDE channel `chn'.
-$Id: libspectrum.txt 4964 2013-05-19 05:30:32Z sbaldovi $
+$Id: libspectrum.txt 4986 2013-05-24 19:03:20Z zubzero $
Modified: trunk/libspectrum/libspectrum/hacking/ChangeLog
===================================================================
--- trunk/libspectrum/libspectrum/hacking/ChangeLog 2013-05-25 03:45:58 UTC (rev 755)
+++ trunk/libspectrum/libspectrum/hacking/ChangeLog 2013-05-25 04:16:54 UTC (rev 756)
@@ -947,3 +947,9 @@
20130516 ChangeLog: update date in main changelog.
20130517 README: update one more date for the 1.1 release.
20130518 doc/libspectrum.txt: update version number for 1.1 release (Sergio).
+20130524 Makefile.am: update libtool age to support binaries built against
+ libspectrum 1.0.0 (Stuart).
+20130524 ChangeLog,README,configure.ac,doc/libspectrum.{3,txt},
+ hacking/ChangeLog: updates for a "1.1.1" release (Stuart).
+20130524 doc/libspectrum,README: further updates for 1.1.1(Stuart).
+20130524 ChangeLog: fill in date (Stuart).
Modified: trunk/libspectrum/libspectrum.xcodeproj/project.pbxproj
===================================================================
--- trunk/libspectrum/libspectrum.xcodeproj/project.pbxproj 2013-05-25 03:45:58 UTC (rev 755)
+++ trunk/libspectrum/libspectrum.xcodeproj/project.pbxproj 2013-05-25 04:16:54 UTC (rev 756)
@@ -375,7 +375,7 @@
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
- GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ GCC_VERSION = "";
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
@@ -394,7 +394,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
DEPLOYMENT_POSTPROCESSING = YES;
- GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ GCC_VERSION = "";
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
@@ -412,7 +412,7 @@
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
- GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ GCC_VERSION = "";
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
@@ -434,7 +434,7 @@
FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../bzip2/build/Deployment\"";
FRAMEWORK_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../libgcrypt/build/Deployment\"";
FRAMEWORK_SEARCH_PATHS_QUOTED_3 = "\"$(SRCROOT)/../audiofile/build/Deployment\"";
- FRAMEWORK_VERSION = 1.1.0;
+ FRAMEWORK_VERSION = 1.1.1;
GCC_DYNAMIC_NO_PIC = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_NO_COMMON_BLOCKS = YES;
@@ -481,7 +481,7 @@
FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../bzip2/build/Deployment\"";
FRAMEWORK_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../libgcrypt/build/Deployment\"";
FRAMEWORK_SEARCH_PATHS_QUOTED_3 = "\"$(SRCROOT)/../audiofile/build/Deployment\"";
- FRAMEWORK_VERSION = 1.1.0;
+ FRAMEWORK_VERSION = 1.1.1;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_NO_COMMON_BLOCKS = YES;
GCC_OPTIMIZATION_LEVEL = 2;
@@ -526,7 +526,7 @@
FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../bzip2/build/Deployment\"";
FRAMEWORK_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../libgcrypt/build/Deployment\"";
FRAMEWORK_SEARCH_PATHS_QUOTED_3 = "\"$(SRCROOT)/../audiofile/build/Deployment\"";
- FRAMEWORK_VERSION = 1.1.0;
+ FRAMEWORK_VERSION = 1.1.1;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_NO_COMMON_BLOCKS = YES;
GCC_OPTIMIZATION_LEVEL = 2;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2013-05-25 03:46:02
|
Revision: 755
http://sourceforge.net/p/fuse-for-macosx/code/755
Author: fredm
Date: 2013-05-25 03:45:58 +0000 (Sat, 25 May 2013)
Log Message:
-----------
Tag vendor/fuse-emulator/current as
vendor/fuse-emulator/fuse-1.1.0-r4995.
Revision Links:
--------------
http://sourceforge.net/p/fuse-for-macosx/code/4995
Added Paths:
-----------
vendor/fuse-emulator/fuse-1.1.0-r4995/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2013-05-25 03:45:42
|
Revision: 754
http://sourceforge.net/p/fuse-for-macosx/code/754
Author: fredm
Date: 2013-05-25 03:45:38 +0000 (Sat, 25 May 2013)
Log Message:
-----------
Load . into vendor/fuse-emulator/current.
Modified Paths:
--------------
vendor/fuse-emulator/current/fuse/AUTHORS
vendor/fuse-emulator/current/fuse/ChangeLog
vendor/fuse-emulator/current/fuse/Makefile.am
vendor/fuse-emulator/current/fuse/README
vendor/fuse-emulator/current/fuse/configure.ac
vendor/fuse-emulator/current/fuse/hacking/ChangeLog
vendor/fuse-emulator/current/fuse/hacking/Makefile.am
vendor/fuse-emulator/current/fuse/lib/Makefile.am
vendor/fuse-emulator/current/fuse/man/fuse.1
vendor/fuse-emulator/current/fuse/peripherals/ide/divide.c
vendor/fuse-emulator/current/fuse/peripherals/ide/divide.h
vendor/fuse-emulator/current/fuse/peripherals/ide/ide.c
vendor/fuse-emulator/current/fuse/peripherals/ide/ide.h
vendor/fuse-emulator/current/fuse/peripherals/ide/simpleide.c
vendor/fuse-emulator/current/fuse/peripherals/ide/simpleide.h
vendor/fuse-emulator/current/fuse/peripherals/ide/zxatasp.c
vendor/fuse-emulator/current/fuse/peripherals/ide/zxatasp.h
vendor/fuse-emulator/current/fuse/peripherals/ide/zxcf.c
vendor/fuse-emulator/current/fuse/peripherals/ide/zxcf.h
vendor/fuse-emulator/current/fuse/sound/Makefile.am
vendor/fuse-emulator/current/fuse/ui/gtk/gtkui.c
vendor/fuse-emulator/current/fuse/ui/widget/menu.c
vendor/fuse-emulator/current/fuse/ui/widget/options.pl
vendor/fuse-emulator/current/fuse/ui/widget/query.c
vendor/fuse-emulator/current/fuse/ui/widget/widget.c
vendor/fuse-emulator/current/fuse/ui/widget/widget_internals.h
vendor/fuse-emulator/current/fuse/ui/wii/Makefile.am
vendor/fuse-emulator/current/fuse/ui/win32/win32ui.c
vendor/fuse-emulator/current/libspectrum/ChangeLog
vendor/fuse-emulator/current/libspectrum/Makefile.am
vendor/fuse-emulator/current/libspectrum/README
vendor/fuse-emulator/current/libspectrum/configure.ac
vendor/fuse-emulator/current/libspectrum/doc/libspectrum.3
vendor/fuse-emulator/current/libspectrum/doc/libspectrum.txt
vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog
Modified: vendor/fuse-emulator/current/fuse/AUTHORS
===================================================================
--- vendor/fuse-emulator/current/fuse/AUTHORS 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/AUTHORS 2013-05-25 03:45:38 UTC (rev 754)
@@ -34,6 +34,8 @@
* Marek Januszewski: Some patches making Fuse much closer to compiling under
Win32, and fixing up the GTK+ 2.0 interface.
+* Sergio Baldoví: improvements to the Win32 UI.
+
* Stuart Brady: for the Scorpion, +D interface emulation and HP-UX sound
support.
@@ -52,4 +54,4 @@
* Philip Kendall: everything else.
-$Id: AUTHORS 4835 2012-12-31 15:35:45Z zubzero $
+$Id: AUTHORS 4972 2013-05-19 16:46:43Z zubzero $
Modified: vendor/fuse-emulator/current/fuse/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse/ChangeLog 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/ChangeLog 2013-05-25 03:45:38 UTC (rev 754)
@@ -1,5 +1,14 @@
-2013-05-18 Philip Kendall <phi...@sh...>
+2013-05-24 Philip Kendall <phi...@sh...>
+ * Fuse 1.1.1 released.
+
+ * Distribute PORTING,hacking/valgrind.supp,sound/wiisound.c,
+ tests/success.{mgt.bz2,opd} and ui/wii/wiimouse.h (Stuart Brady).
+ * Add ChangeLog entries for 1.0.0.1 and 1.0.0.1a (Fredrick Meunier).
+ * Release correct version of source files.
+
+2013-05-19 Philip Kendall <phi...@sh...>
+
* Fuse 1.1.0 released.
* Remove ROMs that there is no formal permission to distribute.
@@ -57,6 +66,22 @@
* Various other minor bugfixes.
+2011-04-01 Philip Kendall <phi...@sh...>
+
+ * Fuse 1.0.0.1a released.
+
+ * Remove all ROMs for which there isn't explicit permission to
+ distribute (Philip Kendall).
+
+2011-01-12 Philip Kendall <phi...@sh...>
+
+ * Fuse 1.0.0.1 released.
+
+ * Fix temporary breakpoints on platforms using replacement Glib
+ (Fredrick Meunier, Sergio Baldovi; thanks, Chris Cowley)
+ * Ensure Amiga port can load files (Chris Young)
+ * Fix SVGAlib compilation (rkd77)
+
2010-12-16 Philip Kendall <phi...@sh...>
* Fuse 1.0.0 released.
@@ -1094,4 +1119,4 @@
* Version 0.1.0 released.
-$Id: ChangeLog 4944 2013-05-16 20:55:22Z pak21 $
+$Id: ChangeLog 4995 2013-05-24 19:54:19Z zubzero $
Modified: vendor/fuse-emulator/current/fuse/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/Makefile.am 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/Makefile.am 2013-05-25 03:45:38 UTC (rev 754)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 1999-2009 Philip Kendall
-## $Id: Makefile.am 4782 2012-12-02 22:49:57Z sbaldovi $
+## $Id: Makefile.am 4980 2013-05-21 12:37:51Z 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
@@ -203,6 +203,7 @@
EXTRA_DIST = AUTHORS \
INSTALL \
+ PORTING \
README \
THANKS \
keysyms.dat \
Modified: vendor/fuse-emulator/current/fuse/README
===================================================================
--- vendor/fuse-emulator/current/fuse/README 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/README 2013-05-25 03:45:38 UTC (rev 754)
@@ -1,4 +1,4 @@
-The Free Unix Spectrum Emulator (Fuse) 1.1.0
+The Free Unix Spectrum Emulator (Fuse) 1.1.1
============================================
Fuse (the Free Unix Spectrum Emulator) was originally, and somewhat
@@ -105,6 +105,6 @@
<http://www.worldofspectrum.org/forums/>.
Philip Kendall <phi...@sh...>
-18th May, 2013
+24th May, 2013
-$Id: README 4958 2013-05-18 13:07:46Z zubzero $
+$Id: README 4995 2013-05-24 19:54:19Z zubzero $
Modified: vendor/fuse-emulator/current/fuse/configure.ac
===================================================================
--- vendor/fuse-emulator/current/fuse/configure.ac 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/configure.ac 2013-05-25 03:45:38 UTC (rev 754)
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-dnl $Id: configure.ac 4898 2013-02-25 22:20:54Z pak21 $
+dnl $Id: configure.ac 4995 2013-05-24 19:54:19Z zubzero $
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
@@ -20,12 +20,12 @@
dnl E-mail: phi...@sh...
dnl Package version
-m4_define([fuse_version], [1.1.0])
+m4_define([fuse_version], [1.1.1])
dnl Product full version
m4_define([fuse_major_version], [1])
m4_define([fuse_minor_version], [1])
-m4_define([fuse_micro_version], [0])
+m4_define([fuse_micro_version], [1])
m4_define([fuse_nano_version], [0])
m4_define([fuse_full_version], [fuse_major_version.fuse_minor_version.fuse_micro_version.fuse_nano_version])
m4_define([fuse_rc_version], [fuse_major_version,fuse_minor_version,fuse_micro_version,fuse_nano_version])
Modified: vendor/fuse-emulator/current/fuse/hacking/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse/hacking/ChangeLog 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/hacking/ChangeLog 2013-05-25 03:45:38 UTC (rev 754)
@@ -3401,6 +3401,7 @@
everything else (fixes bug #3084862) (thanks, Phil) (Fred).
20110104 nic: add .deps and Makefile to the ignore property (Fred).
20110109 ui/widget/filesel.c: make Amiga work again (Chris Young).
+20110112 ChangeLog,README,configure.in,man/fuse.1: updates for 1.0.0.1 release.
20110113 ui/win32/installer/fuse.nsi: windows installer improvements; optionally
delete configuration file (fuse.cfg) on uninstall, silently uninstall
previous version if reinstalling to the same folder, include AUTHORS
@@ -3552,8 +3553,11 @@
Makefile.am}: remove ROMs that there is no formal permission to
distribute.
20110327 roms/Makefile.am: distribute README.copyright.
+20110327 ChangeLog,README,configure.in,fuse.c,man/fuse.1: updates for 1.0.0.1a
+ release.
20110328 configure.in: allow the user to say they do not want to use windres
(works around bug #3248008; thanks, Cygnus).
+20110401 ChangeLog,man/fuse.1: didn't manage to release this earlier.
20110401 peripherals/disk/{opus,plusd}.c: remove incorrect use of GCC_UNUSED
(Stuart).
20110401 fuse.c,ui/{gtk/gtkui.c,widget/menu.c},windres.rc: update copyright
@@ -4494,3 +4498,23 @@
confirmation dialogue for reset due to peripheral changes (Sergio).
20130517 README: update date for 1.1 release.
20130518 README: mention DISCiPLE support (Stuart).
+20130518 ui/widget/options.pl: display confirmation dialogue for reset due to
+ peripheral changes (Stuart).
+20130518 ui/widget/options.pl: update peripherals list when a machine reset is
+ not needed (Sergio).
+20130519 ui/widget/{query.c,widget.c,widget_internals.h}: display confirmation
+ messages (Stuart).
+20130519 ui/widget/{options.pl,query.c}: choose no/cancel upon pressing escape
+ for all all confirmation dialogues, and remove workaround for this
+ from peripheral reset confirmation dialogue (Stuart).
+20130519 ui/{gtk/gtkui.c,widget/menu.c,win32/win32ui.c}: use different
+ confirmation messages for hard and soft resets (Stuart).
+20130519 ChangeLog,README,man/fuse.1: update date for 1.1 release (Stuart).
+20130519 AUTHOR,man/fuse.1: Add Sergio Baldoví (Stuart).
+20130519 lib/Makefile.am: distribute tests/success.{mgt.bz2,opd} (Stuart).
+20130519 Makefile.am,hacking/Makefile.am,sound/Makefile.am,ui/wii/Makefile.am:
+ distribute PORTING,hacking/valgrind.supp,sound/wiisound.c,
+ ui/wii/wiimouse.h (Stuart).
+20130524 ChangeLog,README: updates for a "1.1.1" release (Fred).
+20130524 ChangeLog,README,configure.ac,man/fuse.1: fill in date and bump
+ version number (Stuart).
Modified: vendor/fuse-emulator/current/fuse/hacking/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/hacking/Makefile.am 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/hacking/Makefile.am 2013-05-25 03:45:38 UTC (rev 754)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2002-2011 Philip Kendall
-## $Id: Makefile.am 4663 2012-02-11 12:48:36Z fredm $
+## $Id: Makefile.am 4980 2013-05-21 12:37:51Z 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
@@ -33,4 +33,5 @@
spectranet.txt \
tc2048_tech_notes.txt \
timer.txt \
- ui.txt
+ ui.txt \
+ valgrind.supp
Modified: vendor/fuse-emulator/current/fuse/lib/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/lib/Makefile.am 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/lib/Makefile.am 2013-05-25 03:45:38 UTC (rev 754)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 1999-2004 Philip Kendall
-## $Id: Makefile.am 4624 2012-01-09 20:59:35Z pak21 $
+## $Id: Makefile.am 4980 2013-05-21 12:37:51Z 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
@@ -64,6 +64,8 @@
tests/fatware-success.hdf.bz2 \
tests/idedos-success.hdf.bz2 \
tests/success.mdr \
+ tests/success.mgt.bz2 \
+ tests/success.opd \
tests/success.udi \
uncompressed/disk_plus3.szx \
uncompressed/tape_128.szx \
Modified: vendor/fuse-emulator/current/fuse/man/fuse.1
===================================================================
--- vendor/fuse-emulator/current/fuse/man/fuse.1 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/man/fuse.1 2013-05-25 03:45:38 UTC (rev 754)
@@ -23,7 +23,7 @@
.\" E-mail: phi...@sh...
.\"
.\"
-.TH fuse 1 "18th May, 2013" "Version 1.1.0" "Emulators"
+.TH fuse 1 "24th May, 2013" "Version 1.1.1" "Emulators"
.\"
.\"------------------------------------------------------------------
.\"
@@ -4779,6 +4779,8 @@
Marek Januszewski wrote various bits of code to make Fuse work under
Win32, including the DirectDraw user interface.
.PP
+Sergio Baldov\('i made many improvements to the Win32 UI.
+.PP
Stuart Brady wrote the DISCiPLE and +D emulation, Scorpion emulation
and the HP-UX sound code.
.PP
Modified: vendor/fuse-emulator/current/fuse/peripherals/ide/divide.c
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/ide/divide.c 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/peripherals/ide/divide.c 2013-05-25 03:45:38 UTC (rev 754)
@@ -1,7 +1,7 @@
/* divide.c: DivIDE interface routines
Copyright (c) 2005-2008 Matthew Westcott, Philip Kendall
- $Id: divide.c 4906 2013-03-10 11:21:37Z fredm $
+ $Id: divide.c 4972 2013-05-19 16:46:43Z 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
Modified: vendor/fuse-emulator/current/fuse/peripherals/ide/divide.h
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/ide/divide.h 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/peripherals/ide/divide.h 2013-05-25 03:45:38 UTC (rev 754)
@@ -1,7 +1,7 @@
/* divide.h: DivIDE interface routines
Copyright (c) 2005 Matthew Westcott
- $Id: divide.h 4924 2013-05-05 07:40:02Z sbaldovi $
+ $Id: divide.h 4972 2013-05-19 16:46:43Z 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
Modified: vendor/fuse-emulator/current/fuse/peripherals/ide/ide.c
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/ide/ide.c 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/peripherals/ide/ide.c 2013-05-25 03:45:38 UTC (rev 754)
@@ -1,7 +1,7 @@
/* ide.c: Generic routines shared between the various IDE devices
Copyright (c) 2005 Philip Kendall
- $Id: ide.c 4664 2012-02-12 11:51:01Z fredm $
+ $Id: ide.c 4972 2013-05-19 16:46:43Z 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
Modified: vendor/fuse-emulator/current/fuse/peripherals/ide/ide.h
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/ide/ide.h 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/peripherals/ide/ide.h 2013-05-25 03:45:38 UTC (rev 754)
@@ -1,7 +1,7 @@
/* ide.h: Generic routines shared between the various IDE devices
Copyright (c) 2005 Philip Kendall
- $Id: ide.h 4664 2012-02-12 11:51:01Z fredm $
+ $Id: ide.h 4972 2013-05-19 16:46:43Z 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
Modified: vendor/fuse-emulator/current/fuse/peripherals/ide/simpleide.c
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/ide/simpleide.c 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/peripherals/ide/simpleide.c 2013-05-25 03:45:38 UTC (rev 754)
@@ -3,7 +3,7 @@
2004 Philip Kendall,
2008 Fredrick Meunier
- $Id: simpleide.c 4926 2013-05-05 07:58:18Z sbaldovi $
+ $Id: simpleide.c 4972 2013-05-19 16:46:43Z 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
Modified: vendor/fuse-emulator/current/fuse/peripherals/ide/simpleide.h
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/ide/simpleide.h 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/peripherals/ide/simpleide.h 2013-05-25 03:45:38 UTC (rev 754)
@@ -1,7 +1,7 @@
/* simpleide.h: Simple 8-bit IDE interface routines
Copyright (c) 2003-2004 Garry Lancaster
- $Id: simpleide.h 4664 2012-02-12 11:51:01Z fredm $
+ $Id: simpleide.h 4972 2013-05-19 16:46:43Z 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
Modified: vendor/fuse-emulator/current/fuse/peripherals/ide/zxatasp.c
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/ide/zxatasp.c 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/peripherals/ide/zxatasp.c 2013-05-25 03:45:38 UTC (rev 754)
@@ -1,7 +1,7 @@
/* zxatasp.c: ZXATASP interface routines
Copyright (c) 2003-2008 Garry Lancaster and Philip Kendall
- $Id: zxatasp.c 4906 2013-03-10 11:21:37Z fredm $
+ $Id: zxatasp.c 4972 2013-05-19 16:46:43Z 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
Modified: vendor/fuse-emulator/current/fuse/peripherals/ide/zxatasp.h
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/ide/zxatasp.h 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/peripherals/ide/zxatasp.h 2013-05-25 03:45:38 UTC (rev 754)
@@ -2,7 +2,7 @@
Copyright (c) 2003-2004 Garry Lancaster,
2004 Philip Kendall
- $Id: zxatasp.h 4664 2012-02-12 11:51:01Z fredm $
+ $Id: zxatasp.h 4972 2013-05-19 16:46:43Z 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
Modified: vendor/fuse-emulator/current/fuse/peripherals/ide/zxcf.c
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/ide/zxcf.c 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/peripherals/ide/zxcf.c 2013-05-25 03:45:38 UTC (rev 754)
@@ -1,7 +1,7 @@
/* zxcf.c: ZXCF interface routines
Copyright (c) 2003-2008 Garry Lancaster and Philip Kendall
- $Id: zxcf.c 4906 2013-03-10 11:21:37Z fredm $
+ $Id: zxcf.c 4972 2013-05-19 16:46:43Z 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
Modified: vendor/fuse-emulator/current/fuse/peripherals/ide/zxcf.h
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/ide/zxcf.h 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/peripherals/ide/zxcf.h 2013-05-25 03:45:38 UTC (rev 754)
@@ -2,7 +2,7 @@
Copyright (c) 2003-2004 Garry Lancaster,
2004 Philip Kendall
- $Id: zxcf.h 4664 2012-02-12 11:51:01Z fredm $
+ $Id: zxcf.h 4972 2013-05-19 16:46:43Z 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
Modified: vendor/fuse-emulator/current/fuse/sound/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/sound/Makefile.am 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/sound/Makefile.am 2013-05-25 03:45:38 UTC (rev 754)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2004 Philip Kendall
-## $Id: Makefile.am 4743 2012-10-10 13:20:50Z fredm $
+## $Id: Makefile.am 4980 2013-05-21 12:37:51Z 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
@@ -41,6 +41,7 @@
sdlsound.c \
sfifo.c \
sunsound.c \
+ wiisound.c \
win32sound.c
libsound_a_LIBADD = $(SOUND_LIBADD)
Modified: vendor/fuse-emulator/current/fuse/ui/gtk/gtkui.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/gtk/gtkui.c 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/ui/gtk/gtkui.c 2013-05-25 03:45:38 UTC (rev 754)
@@ -1,7 +1,7 @@
/* gtkui.c: GTK+ routines for dealing with the user interface
Copyright (c) 2000-2005 Philip Kendall, Russell Marks
- $Id: gtkui.c 4962 2013-05-19 05:25:15Z sbaldovi $
+ $Id: gtkui.c 4968 2013-05-19 16:11:17Z zubzero $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -536,8 +536,12 @@
menu_machine_reset( GtkAction *gtk_action GCC_UNUSED, guint action )
{
int hard_reset = action;
+ const char *message = "Reset?";
- if( gtkui_confirm( "Reset?" ) && machine_reset( hard_reset ) ) {
+ if( hard_reset )
+ message = "Hard reset?";
+
+ if( gtkui_confirm( message ) && machine_reset( hard_reset ) ) {
ui_error( UI_ERROR_ERROR, "couldn't reset machine: giving up!" );
/* FIXME: abort() seems a bit extreme here, but it'll do for now */
Modified: vendor/fuse-emulator/current/fuse/ui/widget/menu.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/widget/menu.c 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/ui/widget/menu.c 2013-05-25 03:45:38 UTC (rev 754)
@@ -1,7 +1,7 @@
/* menu.c: general menu widget
Copyright (c) 2001-2006 Philip Kendall
- $Id: menu.c 4915 2013-04-07 05:32:09Z fredm $
+ $Id: menu.c 4968 2013-05-19 16:11:17Z zubzero $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -584,12 +584,18 @@
void
menu_machine_reset( int action )
{
- if( widget_do( WIDGET_TYPE_QUERY, "Reset machine?" ) ||
+ int hard_reset = action;
+ const char *message = "Reset?";
+
+ if( hard_reset )
+ message = "Hard reset?";
+
+ if( widget_do( WIDGET_TYPE_QUERY, message ) ||
!widget_query.confirm )
return;
widget_end_all( WIDGET_FINISHED_OK );
- machine_reset( action );
+ machine_reset( hard_reset );
}
void
Modified: vendor/fuse-emulator/current/fuse/ui/widget/options.pl
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/widget/options.pl 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/ui/widget/options.pl 2013-05-25 03:45:38 UTC (rev 754)
@@ -1,9 +1,9 @@
#!/usr/bin/perl -w
# options.pl: generate options dialog boxes
-# Copyright (c) 2001-2008 Philip Kendall, Fredrick Meunier
+# Copyright (c) 2001-2013 Philip Kendall, Fredrick Meunier
-# $Id: options.pl 4961 2013-05-19 05:17:30Z sbaldovi $
+# $Id: options.pl 4969 2013-05-19 16:21:14Z 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
@@ -37,7 +37,7 @@
my @dialogs = Fuse::Dialog::read( shift @ARGV );
print Fuse::GPL( 'options.c: options dialog boxes',
- '2001-2004 Philip Kendall' ) . << "CODE";
+ '2001-2013 Philip Kendall' ) . << "CODE";
/* This file is autogenerated from options.dat by options.pl.
Do not edit unless you know what you\'re doing! */
@@ -363,11 +363,35 @@
int
widget_options_finish( widget_finish_state finished )
{
+ int error;
+
/* If we exited normally, actually set the options */
if( finished == WIDGET_FINISHED_OK ) {
+ /* Get a copy of current settings */
+ settings_info original_settings;
+ memset( &original_settings, 0, sizeof( settings_info ) );
+ settings_copy( &original_settings, &settings_current );
+
+ /* Apply new options */
settings_copy( &settings_current, &widget_options_settings );
- /* Bring the peripherals list into sync with the new options */
- periph_posthook();
+
+ int needs_hard_reset = periph_postcheck();
+
+ if( needs_hard_reset ) {
+ error = widget_do( WIDGET_TYPE_QUERY,
+ "Some options need to reset the machine. Reset?" );
+ if( !error && !widget_query.confirm )
+ settings_copy( &settings_current, &original_settings );
+ else
+ periph_posthook();
+ }
+ else {
+ /* Bring the peripherals list into sync with the new options */
+ periph_posthook();
+ }
+
+ settings_free( &original_settings );
+
/* make the needed UI changes */
uidisplay_hotswap_gfx_mode();
}
Modified: vendor/fuse-emulator/current/fuse/ui/widget/query.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/widget/query.c 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/ui/widget/query.c 2013-05-25 03:45:38 UTC (rev 754)
@@ -1,7 +1,7 @@
/* query.c: The query widgets
Copyright (c) 2004-2008 Darren Salt, Fredrick Meunier
- $Id: query.c 4179 2010-10-08 10:05:55Z fredm $
+ $Id: query.c 4968 2013-05-19 16:11:17Z zubzero $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -30,6 +30,7 @@
#include <string.h>
#include "fuse.h"
+#include "utils.h"
#include "widget_internals.h"
widget_query_t widget_query;
@@ -104,12 +105,15 @@
static size_t highlight_line = 0;
+static char **message_lines;
+static size_t num_message_lines;
+
static void
widget_query_line_draw( int left_edge, int width, struct widget_query_entry *menu,
const char *label )
{
int colour = WIDGET_COLOUR_BACKGROUND;
- int y = menu->index * 8 + 24;
+ int y = (menu->index + num_message_lines) * 8 + 24;
if( menu->index == highlight_line ) colour = WIDGET_COLOUR_HIGHLIGHT;
widget_rectangle( left_edge*8+1, y, width*8-2, 1*8, colour );
@@ -121,10 +125,12 @@
const int query_vert_external_margin = 8;
static int
-widget_calculate_query_width( const char *title, widget_query_entry *menu )
+widget_calculate_query_width( const char *title, widget_query_entry *menu,
+ char **lines, int num_lines )
{
widget_query_entry *ptr;
int max_width=0;
+ int i;
if (!menu) {
return 64;
@@ -139,17 +145,34 @@
max_width = total_width;
}
+ for( i=0; i<num_lines; i++) {
+ int total_width = widget_stringwidth( lines[i] )+2*8;
+
+ if( total_width > max_width )
+ max_width = total_width;
+ }
+
return ( max_width + query_vert_external_margin * 2 ) / 8;
}
static int
-internal_query_draw( widget_query_entry *query, int save, const char *data )
+internal_query_draw( widget_query_entry *query, int save, const char *message )
{
widget_query_entry *ptr;
size_t height = 0;
- int menu_width = widget_calculate_query_width( title, query );
+ int menu_width;
int menu_left_edge_x;
+ int i;
+ if( split_message( message, &message_lines, &num_message_lines, 28 ) ) {
+ return 1;
+ }
+
+ menu_width = widget_calculate_query_width( title, query, message_lines,
+ num_message_lines );
+
+ height = num_message_lines;
+
/* How many options do we have? */
for( ptr = query; ptr->text; ptr++ )
height ++;
@@ -161,6 +184,11 @@
widget_printstring( menu_left_edge_x*8+2, 16, WIDGET_COLOUR_TITLE, title );
+ for( i=0; i<num_message_lines; i++ ) {
+ widget_printstring( menu_left_edge_x*8+8, i*8+24,
+ WIDGET_COLOUR_FOREGROUND, message_lines[i] );
+ }
+
for( ptr = query; ptr->text; ptr++ ) {
widget_query_line_draw( menu_left_edge_x, menu_width, ptr, ptr->text );
}
@@ -174,6 +202,7 @@
widget_query_draw( void *data )
{
highlight_line = 0;
+ widget_query.confirm = 0;
return internal_query_draw( query_confirm, 0, (const char *) data );
}
@@ -181,6 +210,7 @@
widget_query_save_draw( void *data )
{
highlight_line = 0;
+ widget_query.save = UI_CONFIRM_SAVE_CANCEL;
return internal_query_draw( query_save, 1, (const char *) data );
}
@@ -191,7 +221,8 @@
int new_highlight_line = 0;
int cursor_pressed = 0;
widget_query_entry *ptr;
- int menu_width = widget_calculate_query_width( title, query );
+ int menu_width = widget_calculate_query_width( title, query, message_lines,
+ num_message_lines );
int menu_left_edge_x = DISPLAY_WIDTH_COLS/2-menu_width/2;
switch( key ) {
@@ -282,3 +313,15 @@
sizeof(query_save)/sizeof(widget_query_entry),
key );
}
+
+int
+widget_query_finish( widget_finish_state finished )
+{
+ int i;
+ for( i=0; i<num_message_lines; i++ ) {
+ free( message_lines[i] );
+ }
+ free( message_lines );
+
+ return 0;
+}
Modified: vendor/fuse-emulator/current/fuse/ui/widget/widget.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/widget/widget.c 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/ui/widget/widget.c 2013-05-25 03:45:38 UTC (rev 754)
@@ -1,7 +1,7 @@
/* widget.c: Simple dialog boxes for all user interfaces.
Copyright (c) 2001-2005 Matan Ziv-Av, Philip Kendall, Russell Marks
- $Id: widget.c 4697 2012-05-07 02:28:52Z fredm $
+ $Id: widget.c 4968 2013-05-19 16:11:17Z zubzero $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -692,8 +692,8 @@
{ widget_roms_draw, widget_roms_finish, widget_roms_keyhandler },
{ widget_peripherals_general_draw, widget_options_finish, widget_peripherals_general_keyhandler },
{ widget_peripherals_disk_draw, widget_options_finish, widget_peripherals_disk_keyhandler },
- { widget_query_draw, NULL, widget_query_keyhandler },
- { widget_query_save_draw,NULL, widget_query_save_keyhandler },
+ { widget_query_draw, widget_query_finish, widget_query_keyhandler },
+ { widget_query_save_draw,widget_query_finish, widget_query_save_keyhandler },
{ widget_diskoptions_draw, widget_options_finish, widget_diskoptions_keyhandler },
};
Modified: vendor/fuse-emulator/current/fuse/ui/widget/widget_internals.h
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/widget/widget_internals.h 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/ui/widget/widget_internals.h 2013-05-25 03:45:38 UTC (rev 754)
@@ -1,7 +1,7 @@
/* widget_internals.h: Functions internal to the widget code
Copyright (c) 2001-2005 Matan Ziv-Av, Philip Kendall
- $Id: widget_internals.h 4543 2011-09-19 01:46:48Z fredm $
+ $Id: widget_internals.h 4968 2013-05-19 16:11:17Z zubzero $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -259,6 +259,7 @@
void widget_query_keyhandler( input_key key );
int widget_query_save_draw( void *data );
void widget_query_save_keyhandler( input_key key );
+int widget_query_finish( widget_finish_state finished );
/* The widgets actually available */
Modified: vendor/fuse-emulator/current/fuse/ui/wii/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/wii/Makefile.am 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/ui/wii/Makefile.am 2013-05-25 03:45:38 UTC (rev 754)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2001-2009 Philip Kendall, Bjoern Giesler
-## $Id: Makefile.am 4743 2012-10-10 13:20:50Z fredm $
+## $Id: Makefile.am 4980 2013-05-21 12:37:51Z 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
@@ -43,6 +43,7 @@
noinst_HEADERS = wiidisplay.h \
wiikeyboard.h \
- wiikeysyms.h
+ wiikeysyms.h \
+ wiimouse.h
CLEANFILES = keysyms.c
Modified: vendor/fuse-emulator/current/fuse/ui/win32/win32ui.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/win32/win32ui.c 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/fuse/ui/win32/win32ui.c 2013-05-25 03:45:38 UTC (rev 754)
@@ -1,7 +1,7 @@
/* win32ui.c: Win32 routines for dealing with the user interface
Copyright (c) 2003-2007 Marek Januszewski, Philip Kendall, Stuart Brady
- $Id: win32ui.c 4849 2013-01-03 23:27:39Z sbaldovi $
+ $Id: win32ui.c 4968 2013-05-19 16:11:17Z zubzero $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -564,8 +564,12 @@
menu_machine_reset( int action )
{
int hard_reset = action;
+ const char *message = "Reset?";
+
+ if( hard_reset )
+ message = "Hard reset?";
- if( win32ui_confirm( "Reset?" ) && machine_reset( hard_reset ) ) {
+ if( win32ui_confirm( message ) && machine_reset( hard_reset ) ) {
ui_error( UI_ERROR_ERROR, "couldn't reset machine: giving up!" );
/* FIXME: abort() seems a bit extreme here, but it'll do for now */
Modified: vendor/fuse-emulator/current/libspectrum/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/libspectrum/ChangeLog 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/libspectrum/ChangeLog 2013-05-25 03:45:38 UTC (rev 754)
@@ -1,3 +1,10 @@
+2013-05-24 Philip Kendall <phi...@sh...>
+
+ * libspectrum 1.1.1 released.
+
+ * Decreased libtool version to allow binaries built against
+ libspectrum 1.0.0 to run with libspectrum 1.1.1.
+
2013-05-18 Philip Kendall <phi...@sh...>
* libspectrum 1.1.0 released.
@@ -333,5 +340,5 @@
* libspectrum separated from Fuse just before the 0.5.0 release of
Fuse; see Fuse's ChangeLog for changes up to this point
-$Id: ChangeLog 4948 2013-05-16 21:00:24Z pak21 $
+$Id: ChangeLog 4994 2013-05-24 19:52:37Z zubzero $
Modified: vendor/fuse-emulator/current/libspectrum/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/libspectrum/Makefile.am 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/libspectrum/Makefile.am 2013-05-25 03:45:38 UTC (rev 754)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2001-2013 Philip Kendall
-## $Id: Makefile.am 4935 2013-05-16 19:43:50Z pak21 $
+## $Id: Makefile.am 4985 2013-05-24 17:27:14Z 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
@@ -63,7 +63,7 @@
zlib.c \
zxs.c
-libspectrum_la_LDFLAGS = -version-info 9:0:0 -no-undefined @WINDRES_LDFLAGS@
+libspectrum_la_LDFLAGS = -version-info 9:0:1 -no-undefined @WINDRES_LDFLAGS@
libspectrum_la_LIBADD = @AUDIOFILE_LIBS@ @GLIB_LIBS@ -lm
Modified: vendor/fuse-emulator/current/libspectrum/README
===================================================================
--- vendor/fuse-emulator/current/libspectrum/README 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/libspectrum/README 2013-05-25 03:45:38 UTC (rev 754)
@@ -1,4 +1,4 @@
-libspectrum 1.1.0
+libspectrum 1.1.1
=================
libspectrum is a library which is designed to make the input and
@@ -67,6 +67,6 @@
Then, type "make" and if everything went well, "make install".
Philip Kendall <phi...@sh...>
-18th May, 2013
+24th May, 2013
-$Id: README 4951 2013-05-17 18:48:41Z pak21 $
+$Id: README 4992 2013-05-24 19:49:15Z zubzero $
Modified: vendor/fuse-emulator/current/libspectrum/configure.ac
===================================================================
--- vendor/fuse-emulator/current/libspectrum/configure.ac 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/libspectrum/configure.ac 2013-05-25 03:45:38 UTC (rev 754)
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
dnl Copyright (c) 1999-2012 Philip Kendall
-dnl $Id: configure.ac 4847 2013-01-03 09:16:15Z zubzero $
+dnl $Id: configure.ac 4986 2013-05-24 19:03:20Z zubzero $
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
@@ -22,12 +22,12 @@
dnl E-mail: phi...@sh...
dnl Package version
-m4_define([libspectrum_version], [1.1.0])
+m4_define([libspectrum_version], [1.1.1])
dnl Product full version
m4_define([libspectrum_major_version], [1])
m4_define([libspectrum_minor_version], [1])
-m4_define([libspectrum_micro_version], [0])
+m4_define([libspectrum_micro_version], [1])
m4_define([libspectrum_nano_version], [0])
m4_define([libspectrum_full_version],
[libspectrum_major_version.libspectrum_minor_version.libspectrum_micro_version.libspectrum_nano_version])
Modified: vendor/fuse-emulator/current/libspectrum/doc/libspectrum.3
===================================================================
--- vendor/fuse-emulator/current/libspectrum/doc/libspectrum.3 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/libspectrum/doc/libspectrum.3 2013-05-25 03:45:38 UTC (rev 754)
@@ -22,7 +22,7 @@
.\" E-mail: phi...@sh...
.\"
.\"
-.TH libspectrum 3 "18th May, 2013" "Version 1.1.0" "Emulators"
+.TH libspectrum 3 "24th May, 2013" "Version 1.1.1" "Emulators"
.\"
.\"------------------------------------------------------------------
.\"
Modified: vendor/fuse-emulator/current/libspectrum/doc/libspectrum.txt
===================================================================
--- vendor/fuse-emulator/current/libspectrum/doc/libspectrum.txt 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/libspectrum/doc/libspectrum.txt 2013-05-25 03:45:38 UTC (rev 754)
@@ -1,4 +1,4 @@
-libspectrum 1.1.0
+libspectrum 1.1.1
=================
libspectrum is a fairly simple library designed to make the handling
@@ -1826,4 +1826,4 @@
Write `data' to register `reg' of the IDE channel `chn'.
-$Id: libspectrum.txt 4964 2013-05-19 05:30:32Z sbaldovi $
+$Id: libspectrum.txt 4986 2013-05-24 19:03:20Z zubzero $
Modified: vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog 2013-05-19 12:37:08 UTC (rev 753)
+++ vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog 2013-05-25 03:45:38 UTC (rev 754)
@@ -947,3 +947,9 @@
20130516 ChangeLog: update date in main changelog.
20130517 README: update one more date for the 1.1 release.
20130518 doc/libspectrum.txt: update version number for 1.1 release (Sergio).
+20130524 Makefile.am: update libtool age to support binaries built against
+ libspectrum 1.0.0 (Stuart).
+20130524 ChangeLog,README,configure.ac,doc/libspectrum.{3,txt},
+ hacking/ChangeLog: updates for a "1.1.1" release (Stuart).
+20130524 doc/libspectrum,README: further updates for 1.1.1(Stuart).
+20130524 ChangeLog: fill in date (Stuart).
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2013-05-19 12:37:11
|
Revision: 753
http://sourceforge.net/p/fuse-for-macosx/code/753
Author: fredm
Date: 2013-05-19 12:37:08 +0000 (Sun, 19 May 2013)
Log Message:
-----------
Merge up to vendor 1.1.0 release branches r4964.
Revision Links:
--------------
http://sourceforge.net/p/fuse-for-macosx/code/4964
Modified Paths:
--------------
trunk/fuse/fusepb/controllers/FuseController.m
trunk/fuse/fusepb/main.m
trunk/fuse/fusepb/models/Emulator.h
trunk/fuse/fusepb/models/Emulator.m
trunk/fuse/fusepb/settings-header.pl
trunk/fuse/fusepb/views/DisplayOpenGLView.h
trunk/fuse/fusepb/views/DisplayOpenGLView.m
trunk/fuse/hacking/ChangeLog
trunk/fuse/periph.c
trunk/fuse/periph.h
trunk/fuse/perl/Fuse/Dialog.pm
trunk/fuse/settings-header.pl
trunk/fuse/settings.pl
trunk/fuse/ui/gtk/binary.c
trunk/fuse/ui/gtk/confirm.c
trunk/fuse/ui/gtk/gtkinternals.h
trunk/fuse/ui/gtk/gtkjoystick.c
trunk/fuse/ui/gtk/gtkui.c
trunk/fuse/ui/gtk/options.pl
trunk/fuse/ui/gtk/pokemem.c
trunk/fuse/ui/gtk/rollback.c
trunk/fuse/ui/gtk/roms.c
trunk/fuse/ui/gtk/stock.c
trunk/fuse/ui/options.dat
trunk/fuse/ui/widget/options.pl
trunk/fuse/ui/widget/roms.c
trunk/fuse/ui/win32/options.pl
trunk/libspectrum/libspectrum/doc/libspectrum.txt
trunk/libspectrum/libspectrum/hacking/ChangeLog
Property Changed:
----------------
trunk/fuse/
trunk/libspectrum/libspectrum/
Index: trunk/fuse
===================================================================
--- trunk/fuse 2013-05-19 11:10:39 UTC (rev 752)
+++ trunk/fuse 2013-05-19 12:37:08 UTC (rev 753)
Property changes on: trunk/fuse
___________________________________________________________________
Modified: svn:mergeinfo
## -1,5 +1,5 ##
/vendor/fuse-emulator/0.10.0/fuse:556-557
/vendor/fuse-emulator/0.10.0-pre1/fuse:545-546
-/vendor/fuse-emulator/current/fuse:530-749
+/vendor/fuse-emulator/current/fuse:530-752
/vendor/fuse-emulator/fuse-1.0.0a/fuse:668-669
/vendor/fuse-emulator/fuse-r4617/fuse:686
\ No newline at end of property
Modified: trunk/fuse/fusepb/controllers/FuseController.m
===================================================================
--- trunk/fuse/fusepb/controllers/FuseController.m 2013-05-19 11:10:39 UTC (rev 752)
+++ trunk/fuse/fusepb/controllers/FuseController.m 2013-05-19 12:37:08 UTC (rev 753)
@@ -1172,8 +1172,7 @@
if( error != NSAlertAlternateReturn ) return;
- error = [[DisplayOpenGLView instance] settingsResetDefaults];
- if( error ) ui_error( UI_ERROR_ERROR, "Error resetting preferences" );
+ [[DisplayOpenGLView instance] settingsResetDefaults];
}
- (void)dealloc
Modified: trunk/fuse/fusepb/main.m
===================================================================
--- trunk/fuse/fusepb/main.m 2013-05-19 11:10:39 UTC (rev 752)
+++ trunk/fuse/fusepb/main.m 2013-05-19 12:37:08 UTC (rev 753)
@@ -41,8 +41,7 @@
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
- int error = settings_defaults( &settings_current );
- if( error ) return error;
+ settings_defaults( &settings_current );
/* This is passed if we are launched by double-clicking */
if ( argc >= 2 && strncmp( argv[1], "-psn", 4 ) == 0 ) {
Modified: trunk/fuse/fusepb/models/Emulator.h
===================================================================
--- trunk/fuse/fusepb/models/Emulator.h 2013-05-19 11:10:39 UTC (rev 752)
+++ trunk/fuse/fusepb/models/Emulator.h 2013-05-19 12:37:08 UTC (rev 753)
@@ -131,7 +131,7 @@
-(void) profileFinish:(const char *)filename;
-(void) settingsSave;
--(int) settingsResetDefaults;
+-(void) settingsResetDefaults;
-(void) fullscreen;
Modified: trunk/fuse/fusepb/models/Emulator.m
===================================================================
--- trunk/fuse/fusepb/models/Emulator.m 2013-05-19 11:10:39 UTC (rev 752)
+++ trunk/fuse/fusepb/models/Emulator.m 2013-05-19 12:37:08 UTC (rev 753)
@@ -495,10 +495,10 @@
settings_write_config( &settings_current );
}
--(int) settingsResetDefaults
+-(void) settingsResetDefaults
{
[NSUserDefaults resetStandardUserDefaults];
- return settings_defaults( &settings_current );
+ settings_defaults( &settings_current );
}
-(void) fullscreen
Modified: trunk/fuse/fusepb/settings-header.pl
===================================================================
--- trunk/fuse/fusepb/settings-header.pl 2013-05-19 11:10:39 UTC (rev 752)
+++ trunk/fuse/fusepb/settings-header.pl 2013-05-19 12:37:08 UTC (rev 753)
@@ -106,8 +106,8 @@
extern settings_info settings_default;
int settings_init( int *first_arg, int argc, char **argv );
-int settings_defaults( settings_info *settings );
-int settings_copy( settings_info *dest, settings_info *src );
+void settings_defaults( settings_info *settings );
+void settings_copy( settings_info *dest, settings_info *src );
#define SETTINGS_ROM_COUNT 32
extern const char *settings_rom_name[ SETTINGS_ROM_COUNT ];
Modified: trunk/fuse/fusepb/views/DisplayOpenGLView.h
===================================================================
--- trunk/fuse/fusepb/views/DisplayOpenGLView.h 2013-05-19 11:10:39 UTC (rev 752)
+++ trunk/fuse/fusepb/views/DisplayOpenGLView.h 2013-05-19 12:37:08 UTC (rev 753)
@@ -166,7 +166,7 @@
-(void) profileFinish:(const char *)filename;
-(void) settingsSave;
--(int) settingsResetDefaults;
+-(void) settingsResetDefaults;
-(void) fullscreen;
Modified: trunk/fuse/fusepb/views/DisplayOpenGLView.m
===================================================================
--- trunk/fuse/fusepb/views/DisplayOpenGLView.m 2013-05-19 11:10:39 UTC (rev 752)
+++ trunk/fuse/fusepb/views/DisplayOpenGLView.m 2013-05-19 12:37:08 UTC (rev 753)
@@ -952,9 +952,9 @@
[proxy_emulator settingsSave];
}
--(int) settingsResetDefaults
+-(void) settingsResetDefaults
{
- return [proxy_emulator settingsResetDefaults];
+ [proxy_emulator settingsResetDefaults];
}
-(void) fullscreen
Modified: trunk/fuse/hacking/ChangeLog
===================================================================
--- trunk/fuse/hacking/ChangeLog 2013-05-19 11:10:39 UTC (rev 752)
+++ trunk/fuse/hacking/ChangeLog 2013-05-19 12:37:08 UTC (rev 753)
@@ -4480,7 +4480,17 @@
complete some missing field initializers (Sergio).
20130505 peripherals/if1.c: put braces around empty body in ‘do’ statements
(Sergio).
+20130512 ui/win32/options.pl: refactor options dialogs to split *_init and
+ *_done functions out of *_proc function (Sergio).
+20130513 settings-header.pl,settings.pl: change settings_defaults(),
+ settings_copy() and settings_copy_internal() to void functions (Fred).
+20130513 ui/widget/{options.pl,roms.c}: change settings_copy() to void function
+ on widget UIs (Sergio).
20130516 man/fuse.1: update date and version for 1.1 release.
20130516 ChangeLog: update date in main changelog.
+20130517 periph.[c|h],perl/Fuse/Dialog.pm,ui/gtk/{binary.c,confirm.c,
+ gtkinternals.h,gtkjoystick.c,gtkui.c,options.pl,pokemem.c,rollback.c,
+ roms.c,stock.c},ui/options.dat,ui/win32/options.pl: display
+ confirmation dialogue for reset due to peripheral changes (Sergio).
20130517 README: update date for 1.1 release.
20130518 README: mention DISCiPLE support (Stuart).
Modified: trunk/fuse/periph.c
===================================================================
--- trunk/fuse/periph.c 2013-05-19 11:10:39 UTC (rev 752)
+++ trunk/fuse/periph.c 2013-05-19 12:37:08 UTC (rev 753)
@@ -1,7 +1,7 @@
/* periph.c: code for handling peripherals
Copyright (c) 2005-2011 Philip Kendall
- $Id: periph.c 4906 2013-03-10 11:21:37Z fredm $
+ $Id: periph.c 4962 2013-05-19 05:25:15Z sbaldovi $
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
@@ -169,6 +169,28 @@
*needs_hard_reset;
}
+/* Work out whether a peripheral needs a hard reset without (de)activate */
+static void
+get_hard_reset( gpointer key, gpointer value, gpointer user_data )
+{
+ periph_private_t *private = value;
+ int active = 0;
+ int *machine_hard_reset = (int *)user_data;
+ int periph_hard_reset = 0;
+
+ switch ( private->present ) {
+ case PERIPH_PRESENT_NEVER: active = 0; break;
+ case PERIPH_PRESENT_OPTIONAL:
+ active = private->periph->option ? *(private->periph->option) : 0; break;
+ case PERIPH_PRESENT_ALWAYS: active = 1; break;
+ }
+
+ periph_hard_reset = ( private && ( private->active != active ) &&
+ private->periph->hard_reset );
+
+ *machine_hard_reset = ( periph_hard_reset || *machine_hard_reset );
+}
+
/* Free the memory used by a peripheral-port response pair */
static void
free_peripheral( gpointer data, gpointer user_data GCC_UNUSED )
@@ -426,6 +448,17 @@
}
}
+int
+periph_postcheck( void )
+{
+ int needs_hard_reset = 0;
+
+ /* Detect if a hard reset is needed without (de)activating peripherals */
+ g_hash_table_foreach( peripherals, get_hard_reset, &needs_hard_reset );
+
+ return needs_hard_reset;
+}
+
/* Register debugger page/unpage events for a peripheral */
void
periph_register_paging_events( const char *type_string, int *page_event,
Modified: trunk/fuse/periph.h
===================================================================
--- trunk/fuse/periph.h 2013-05-19 11:10:39 UTC (rev 752)
+++ trunk/fuse/periph.h 2013-05-19 12:37:08 UTC (rev 753)
@@ -1,7 +1,7 @@
/* periph.h: code for handling peripherals
Copyright (c) 2004-2011 Philip Kendall
- $Id: periph.h 4906 2013-03-10 11:21:37Z fredm $
+ $Id: periph.h 4962 2013-05-19 05:25:15Z sbaldovi $
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
@@ -154,6 +154,8 @@
void periph_posthook( void );
+int periph_postcheck( void );
+
/* Register debugger page/unpage events for a peripheral */
void periph_register_paging_events( const char *type_string, int *page_event,
int *unpage_event );
Modified: trunk/fuse/perl/Fuse/Dialog.pm
===================================================================
--- trunk/fuse/perl/Fuse/Dialog.pm 2013-05-19 11:10:39 UTC (rev 752)
+++ trunk/fuse/perl/Fuse/Dialog.pm 2013-05-19 12:37:08 UTC (rev 753)
@@ -1,7 +1,7 @@
# Fuse::Dialog: routines for creating Fuse dialog boxes
# Copyright (c) 2003-2005 Philip Kendall
-# $Id: Dialog.pm 2889 2007-05-26 17:45:08Z zubzero $
+# $Id: Dialog.pm 4962 2013-05-19 05:25:15Z sbaldovi $
# 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
@@ -49,6 +49,7 @@
my( $name, $title, @widgets ) = split /\n/;
my @widget_data;
+ my $postcheck;
my $posthook;
foreach( @widgets ) {
@@ -56,6 +57,11 @@
my( $widget_type, $text, $value, $key, $data1, $data2 ) =
split /\s*,\s*/;
+ if( lc $widget_type eq 'postcheck' ) {
+ $postcheck = $text;
+ next;
+ }
+
if( lc $widget_type eq 'posthook' ) {
$posthook = $text;
next;
@@ -72,6 +78,7 @@
push @dialogs, { name => $name,
title => $title,
+ postcheck => $postcheck,
posthook => $posthook,
widgets => \@widget_data };
}
Modified: trunk/fuse/settings-header.pl
===================================================================
--- trunk/fuse/settings-header.pl 2013-05-19 11:10:39 UTC (rev 752)
+++ trunk/fuse/settings-header.pl 2013-05-19 12:37:08 UTC (rev 753)
@@ -3,7 +3,7 @@
# settings-header.pl: generate settings.h from settings.dat
# Copyright (c) 2002-2003 Philip Kendall
-# $Id: settings-header.pl 4924 2013-05-05 07:40:02Z sbaldovi $
+# $Id: settings-header.pl 4961 2013-05-19 05:17:30Z sbaldovi $
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -102,8 +102,8 @@
extern settings_info settings_default;
int settings_init( int *first_arg, int argc, char **argv );
-int settings_defaults( settings_info *settings );
-int settings_copy( settings_info *dest, settings_info *src );
+void settings_defaults( settings_info *settings );
+void settings_copy( settings_info *dest, settings_info *src );
#define SETTINGS_ROM_COUNT 30
char **settings_get_rom_setting( settings_info *settings, size_t which );
Modified: trunk/fuse/settings.pl
===================================================================
--- trunk/fuse/settings.pl 2013-05-19 11:10:39 UTC (rev 752)
+++ trunk/fuse/settings.pl 2013-05-19 12:37:08 UTC (rev 753)
@@ -3,7 +3,7 @@
# settings.pl: generate settings.c from settings.dat
# Copyright (c) 2002-2005 Philip Kendall, Fredrick Meunier
-# $Id: settings.pl 4841 2013-01-02 01:55:24Z zubzero $
+# $Id: settings.pl 4961 2013-05-19 05:17:30Z sbaldovi $
# 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
@@ -123,7 +123,7 @@
static int settings_command_line( settings_info *settings, int *first_arg,
int argc, char **argv );
-static int settings_copy_internal( settings_info *dest, settings_info *src );
+static void settings_copy_internal( settings_info *dest, settings_info *src );
/* Called on emulator startup */
int
@@ -141,14 +141,13 @@
}
/* Fill the settings structure with sensible defaults */
-int settings_defaults( settings_info *settings )
+void settings_defaults( settings_info *settings )
{
- int retval;
BOOL value;
NSMutableDictionary *defaultValues = [NSMutableDictionary dictionary];
- retval = settings_copy_internal( settings, &settings_default );
+ settings_copy_internal( settings, &settings_default );
CODE
@@ -193,8 +192,6 @@
[[NSUserDefaults standardUserDefaults] registerDefaults:defaultValues];
[[NSUserDefaultsController sharedUserDefaultsController] setInitialValues:defaultValues];
-
- return retval;
}
/* Read options from the config file */
@@ -457,7 +454,7 @@
}
/* Copy one settings object to another */
-static int
+static void
settings_copy_internal( settings_info *dest, settings_info *src )
{
settings_free( dest );
@@ -483,7 +480,7 @@
print << "CODE";
if( src->cocoa && src->cocoa->$name ) {
dest->cocoa->$name = [NSMutableArray arrayWithArray:src->cocoa->$name];
- if( !dest->cocoa->$name ) { settings_free( dest ); return 1; }
+ if( !dest->cocoa->$name ) { settings_free( dest ); }
} else {
dest->cocoa->$name = [NSMutableArray arrayWithCapacity:NUM_RECENT_ITEMS];
}
@@ -492,8 +489,6 @@
}
print << 'CODE';
-
- return 0;
}
int
@@ -551,10 +546,10 @@
}
/* Copy one settings object to another */
-int settings_copy( settings_info *dest, settings_info *src )
+void settings_copy( settings_info *dest, settings_info *src )
{
- if( settings_defaults( dest ) ) return 1;
- return settings_copy_internal( dest, src );
+ settings_defaults( dest );
+ settings_copy_internal( dest, src );
}
char **
Modified: trunk/fuse/ui/gtk/binary.c
===================================================================
--- trunk/fuse/ui/gtk/binary.c 2013-05-19 11:10:39 UTC (rev 752)
+++ trunk/fuse/ui/gtk/binary.c 2013-05-19 12:37:08 UTC (rev 753)
@@ -1,7 +1,7 @@
/* binary.c: GTK+ routines to load/save chunks of binary data
Copyright (c) 2003-2005 Philip Kendall
- $Id: binary.c 4908 2013-03-10 22:13:57Z sbaldovi $
+ $Id: binary.c 4962 2013-05-19 05:25:15Z sbaldovi $
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
@@ -146,7 +146,7 @@
/* Command buttons */
gtkstock_create_ok_cancel( info->dialog, NULL, info->activate_data, info,
- NULL );
+ DEFAULT_DESTROY, DEFAULT_DESTROY );
}
void
Modified: trunk/fuse/ui/gtk/confirm.c
===================================================================
--- trunk/fuse/ui/gtk/confirm.c 2013-05-19 11:10:39 UTC (rev 752)
+++ trunk/fuse/ui/gtk/confirm.c 2013-05-19 12:37:08 UTC (rev 753)
@@ -1,7 +1,7 @@
/* confirm.c: Confirmation dialog box
Copyright (c) 2000-2003 Philip Kendall, Russell Marks
- $Id: confirm.c 4723 2012-07-08 13:26:15Z fredm $
+ $Id: confirm.c 4962 2013-05-19 05:25:15Z sbaldovi $
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 @@
gtk_box_pack_start( GTK_BOX( content_area ), label, TRUE, TRUE, 5 );
gtkstock_create_ok_cancel( dialog, NULL, G_CALLBACK( set_confirmed ),
- &confirm, NULL );
+ &confirm, DEFAULT_DESTROY, DEFAULT_DESTROY );
gtk_widget_show_all( dialog );
gtk_main();
Modified: trunk/fuse/ui/gtk/gtkinternals.h
===================================================================
--- trunk/fuse/ui/gtk/gtkinternals.h 2013-05-19 11:10:39 UTC (rev 752)
+++ trunk/fuse/ui/gtk/gtkinternals.h 2013-05-19 12:37:08 UTC (rev 753)
@@ -1,7 +1,7 @@
/* gtkinternals.h: stuff internal to the GTK+ UI
Copyright (c) 2003-2005 Philip Kendall
- $Id: gtkinternals.h 4723 2012-07-08 13:26:15Z fredm $
+ $Id: gtkinternals.h 4962 2013-05-19 05:25:15Z sbaldovi $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -108,7 +108,8 @@
GtkAccelGroup *accel,
/* for OK button -> */ GCallback action,
gpointer actiondata,
- /* for both buttons -> */ GCallback destroy );
+ /* for both buttons -> */ GCallback destroy_ok,
+ GCallback destroy_cancel );
GtkAccelGroup* gtkstock_create_close( GtkWidget *widget, GtkAccelGroup *accel,
GCallback destroy,
gboolean esconly );
Modified: trunk/fuse/ui/gtk/gtkjoystick.c
===================================================================
--- trunk/fuse/ui/gtk/gtkjoystick.c 2013-05-19 11:10:39 UTC (rev 752)
+++ trunk/fuse/ui/gtk/gtkjoystick.c 2013-05-19 12:37:08 UTC (rev 753)
@@ -1,7 +1,7 @@
/* gtkjoystick.c: Joystick emulation
Copyright (c) 2003-2004 Darren Salt, Philip Kendall
- $Id: gtkjoystick.c 4915 2013-04-07 05:32:09Z fredm $
+ $Id: gtkjoystick.c 4962 2013-05-19 05:25:15Z sbaldovi $
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
@@ -231,7 +231,7 @@
g_object_unref( model );
gtkstock_create_ok_cancel( dialog, NULL, G_CALLBACK( joystick_done ),
- &info, NULL );
+ &info, DEFAULT_DESTROY, DEFAULT_DESTROY );
gtk_widget_show_all( dialog );
gtk_main();
Modified: trunk/fuse/ui/gtk/gtkui.c
===================================================================
--- trunk/fuse/ui/gtk/gtkui.c 2013-05-19 11:10:39 UTC (rev 752)
+++ trunk/fuse/ui/gtk/gtkui.c 2013-05-19 12:37:08 UTC (rev 753)
@@ -1,7 +1,7 @@
/* gtkui.c: GTK+ routines for dealing with the user interface
Copyright (c) 2000-2005 Philip Kendall, Russell Marks
- $Id: gtkui.c 4740 2012-10-10 12:48:21Z fredm $
+ $Id: gtkui.c 4962 2013-05-19 05:25:15Z sbaldovi $
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
@@ -456,8 +456,9 @@
/* Create and add the actions buttons to the dialog box */
gtkstock_create_ok_cancel( dialog.dialog, NULL,
- G_CALLBACK( menu_options_filter_done ),
- (gpointer) &dialog, NULL );
+ G_CALLBACK( menu_options_filter_done ),
+ (gpointer) &dialog, DEFAULT_DESTROY,
+ DEFAULT_DESTROY );
gtk_widget_show_all( dialog.dialog );
@@ -589,8 +590,9 @@
/* Create and add the actions buttons to the dialog box */
gtkstock_create_ok_cancel( dialog.dialog, NULL,
- G_CALLBACK( menu_machine_select_done ),
- (gpointer) &dialog, NULL );
+ G_CALLBACK( menu_machine_select_done ),
+ (gpointer) &dialog, DEFAULT_DESTROY,
+ DEFAULT_DESTROY );
gtk_widget_show_all( dialog.dialog );
@@ -749,8 +751,9 @@
/* Create and add the actions buttons to the dialog box */
gtkstock_create_ok_cancel( dialog.dialog, NULL,
- G_CALLBACK( confirm_joystick_done ),
- (gpointer) &dialog, NULL );
+ G_CALLBACK( confirm_joystick_done ),
+ (gpointer) &dialog, DEFAULT_DESTROY,
+ DEFAULT_DESTROY );
gtk_widget_show_all( dialog.dialog );
Modified: trunk/fuse/ui/gtk/options.pl
===================================================================
--- trunk/fuse/ui/gtk/options.pl 2013-05-19 11:10:39 UTC (rev 752)
+++ trunk/fuse/ui/gtk/options.pl 2013-05-19 12:37:08 UTC (rev 753)
@@ -1,9 +1,9 @@
#!/usr/bin/perl -w
# options.pl: generate options dialog boxes
-# $Id: options.pl 4723 2012-07-08 13:26:15Z fredm $
+# $Id: options.pl 4962 2013-05-19 05:25:15Z sbaldovi $
-# Copyright (c) 2002-2004 Philip Kendall
+# Copyright (c) 2002-2013 Philip Kendall
# 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,14 +36,14 @@
my %combo_default;
print Fuse::GPL( 'options.c: options dialog boxes',
- '2001-2004 Philip Kendall' ) . << "CODE";
+ '2001-2013 Philip Kendall' ) . << "CODE";
/* This file is autogenerated from options.dat by options.pl.
Do not edit unless you know what you\'re doing! */
#include <config.h>
-#ifdef UI_GTK /* Use this file iff we're using GTK+ */
+#ifdef UI_GTK /* Use this file if we're using GTK+ */
#include <stdio.h>
#include <stdlib.h>
@@ -65,8 +65,9 @@
static int
option_enumerate_combo( const char **options, char *value, guint count,
- int def ) {
- int i;
+ int def )
+{
+ guint i;
if( value != NULL ) {
for( i = 0; i < count; i++) {
if( !strcmp( value, options[ i ] ) )
@@ -126,11 +127,12 @@
}
print << "CODE";
int
-option_enumerate_$_->{name}_$widget->{value}( void ) {
+option_enumerate_$_->{name}_$widget->{value}( void )
+{
return option_enumerate_combo( $_->{name}_$widget->{value}_combo,
- settings_current.$widget->{value},
- $_->{name}_$widget->{value}_combo_count,
- $combo_default{$widget->{value}} );
+ settings_current.$widget->{value},
+ $_->{name}_$widget->{value}_combo_count,
+ $combo_default{$widget->{value}} );
}
CODE
@@ -171,7 +173,7 @@
dialog.$widget->{value} =
gtk_check_button_new_with_label( "$text" );
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( dialog.$widget->{value} ),
- settings_current.$widget->{value} );
+ settings_current.$widget->{value} );
gtk_container_add( GTK_CONTAINER( content_area ), dialog.$widget->{value} );
CODE
@@ -187,7 +189,7 @@
gchar buffer[80];
gtk_box_pack_start( GTK_BOX( content_area ), frame, TRUE, TRUE, 0 );
-
+
gtk_container_set_border_width( GTK_CONTAINER( hbox ), 4 );
gtk_container_add( GTK_CONTAINER( frame ), hbox );
@@ -210,7 +212,7 @@
GtkWidget *hbox = gtk_box_new( GTK_ORIENTATION_HORIZONTAL, 0 );
GtkWidget *combo = gtk_combo_box_text_new();
GtkWidget *text = gtk_label_new( "$text" );
- int i;
+ guint i;
gtk_box_pack_start( GTK_BOX( hbox ), text, FALSE, FALSE, 5 );
text = gtk_label_new( " " );
@@ -244,8 +246,8 @@
print << "CODE";
/* Create the OK and Cancel buttons */
gtkstock_create_ok_cancel( dialog.dialog, NULL,
- G_CALLBACK( menu_options_$_->{name}_done ),
- (gpointer) &dialog, NULL );
+ G_CALLBACK( menu_options_$_->{name}_done ),
+ (gpointer) &dialog, NULL, DEFAULT_DESTROY );
/* Display the window */
gtk_widget_show_all( dialog.dialog );
@@ -265,6 +267,18 @@
CODE
+ if( $_->{postcheck} ) {
+
+ print << "CODE";
+ /* Get a copy of current settings */
+ settings_info original_settings;
+ memset( &original_settings, 0, sizeof( settings_info ) );
+ settings_copy( &original_settings, &settings_current );
+
+CODE
+
+ }
+
foreach my $widget ( @{ $_->{widgets} } ) {
if( $widget->{type} eq "Checkbox" ) {
@@ -286,7 +300,7 @@
print << "CODE";
free( settings_current.$widget->{value} );
settings_current.$widget->{value} = utils_safe_strdup( $_->{name}_$widget->{value}_combo[
- gtk_combo_box_get_active( GTK_COMBO_BOX( ptr->$widget->{value} ) ) ] );
+ gtk_combo_box_get_active( GTK_COMBO_BOX( ptr->$widget->{value} ) ) ] );
CODE
} else {
@@ -294,6 +308,26 @@
}
}
+ if( $_->{postcheck} ) {
+
+ print << "CODE";
+ int needs_hard_reset = $_->{postcheck}();
+
+ /* Confirm reset */
+ if( needs_hard_reset && !gtkui_confirm("Some options need to reset the machine. Reset?" ) ) {
+
+ /* Cancel new settings */
+ settings_copy( &settings_current, &original_settings );
+ settings_free( &original_settings );
+ return;
+ }
+
+ settings_free( &original_settings );
+
+CODE
+
+ }
+
print << "CODE";
gtk_widget_destroy( ptr->dialog );
@@ -307,6 +341,7 @@
gtk_main_quit();
}
+
CODE
}
Modified: trunk/fuse/ui/gtk/pokemem.c
===================================================================
--- trunk/fuse/ui/gtk/pokemem.c 2013-05-19 11:10:39 UTC (rev 752)
+++ trunk/fuse/ui/gtk/pokemem.c 2013-05-19 12:37:08 UTC (rev 753)
@@ -1,7 +1,7 @@
/* pokemem.c: GTK+ interface that handles pok files
Copyright (c) 2011 Philip Kendall, Sergio Baldoví
- $Id: pokemem.c 4769 2012-11-22 12:42:08Z fredm $
+ $Id: pokemem.c 4962 2013-05-19 05:25:15Z sbaldovi $
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
@@ -182,6 +182,7 @@
gtkstock_create_ok_cancel( dialog, accel_group,
G_CALLBACK( pokemem_update_list ),
(gpointer) &dialog,
+ G_CALLBACK( pokemem_close ),
G_CALLBACK( pokemem_close ) );
gtk_accel_group_disconnect_key( accel_group, GDK_KEY_Return, 0 );
Modified: trunk/fuse/ui/gtk/rollback.c
===================================================================
--- trunk/fuse/ui/gtk/rollback.c 2013-05-19 11:10:39 UTC (rev 752)
+++ trunk/fuse/ui/gtk/rollback.c 2013-05-19 12:37:08 UTC (rev 753)
@@ -1,7 +1,7 @@
/* rollback.c: select a rollback point
Copyright (c) 2004 Philip Kendall
- $Id: rollback.c 4708 2012-05-25 12:14:50Z fredm $
+ $Id: rollback.c 4962 2013-05-19 05:25:15Z sbaldovi $
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
@@ -100,7 +100,7 @@
list = create_rollback_list();
gtkstock_create_ok_cancel( dialog, NULL, G_CALLBACK( select_row ), list,
- NULL );
+ DEFAULT_DESTROY, DEFAULT_DESTROY );
content_area = gtk_dialog_get_content_area( GTK_DIALOG( dialog ) );
gtk_box_pack_start( GTK_BOX( content_area ), list, TRUE, TRUE, 0 );
Modified: trunk/fuse/ui/gtk/roms.c
===================================================================
--- trunk/fuse/ui/gtk/roms.c 2013-05-19 11:10:39 UTC (rev 752)
+++ trunk/fuse/ui/gtk/roms.c 2013-05-19 12:37:08 UTC (rev 753)
@@ -1,7 +1,7 @@
/* roms.c: ROM selector dialog box
Copyright (c) 2003-2004 Philip Kendall
- $Id: roms.c 4723 2012-07-08 13:26:15Z fredm $
+ $Id: roms.c 4962 2013-05-19 05:25:15Z sbaldovi $
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
@@ -75,7 +75,7 @@
/* Create the OK and Cancel buttons */
gtkstock_create_ok_cancel( dialog, NULL, G_CALLBACK( roms_done ), &info,
- NULL );
+ DEFAULT_DESTROY, DEFAULT_DESTROY );
/* And the current values of each of the ROMs */
vbox = GTK_BOX( gtk_dialog_get_content_area( GTK_DIALOG( dialog ) ) );
Modified: trunk/fuse/ui/gtk/stock.c
===================================================================
--- trunk/fuse/ui/gtk/stock.c 2013-05-19 11:10:39 UTC (rev 752)
+++ trunk/fuse/ui/gtk/stock.c 2013-05-19 12:37:08 UTC (rev 753)
@@ -1,7 +1,7 @@
/* stock.c: 'standard' GTK+ widgets etc
Copyright (c) 2004 Darren Salt, Philip Kendall
- $Id: stock.c 4723 2012-07-08 13:26:15Z fredm $
+ $Id: stock.c 4962 2013-05-19 05:25:15Z sbaldovi $
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
@@ -147,14 +147,15 @@
GtkAccelGroup*
gtkstock_create_ok_cancel( GtkWidget *widget, GtkAccelGroup *accel,
- GCallback action, gpointer actiondata,
- GCallback destroy )
+ GCallback action, gpointer actiondata,
+ GCallback destroy_ok, GCallback destroy_cancel )
{
gtkstock_button btn[] = {
{ GTK_STOCK_CANCEL, NULL, NULL, NULL, 0, 0, 0, 0 },
{ GTK_STOCK_OK, NULL, NULL, NULL, 0, 0, 0, 0 },
};
- btn[1].destroy = btn[0].destroy = destroy ? destroy : DEFAULT_DESTROY;
+ btn[0].destroy = destroy_cancel ? destroy_cancel : NULL;
+ btn[1].destroy = destroy_ok ? destroy_ok : NULL;
btn[1].action = action;
btn[1].actiondata = actiondata;
Modified: trunk/fuse/ui/options.dat
===================================================================
--- trunk/fuse/ui/options.dat 2013-05-19 11:10:39 UTC (rev 752)
+++ trunk/fuse/ui/options.dat 2013-05-19 12:37:08 UTC (rev 753)
@@ -46,6 +46,7 @@
Checkbox, Spectra(n)et, spectranet, INPUT_KEY_n
Checkbox, Spe(c)tranet disable, spectranet_disable, INPUT_KEY_c
#endif
+Postcheck, periph_postcheck
Posthook, periph_posthook
peripherals_disk
@@ -63,6 +64,7 @@
Checkbox, (B)eta 128 interface, beta128, INPUT_KEY_b
Checkbox, Beta 128 (a)uto-boot in 48K machines, beta128_48boot, INPUT_KEY_a
Checkbox, (O)pus Discovery interface, opus, INPUT_KEY_o
+Postcheck, periph_postcheck
Posthook, periph_posthook
rzx
Modified: trunk/fuse/ui/widget/options.pl
===================================================================
--- trunk/fuse/ui/widget/options.pl 2013-05-19 11:10:39 UTC (rev 752)
+++ trunk/fuse/ui/widget/options.pl 2013-05-19 12:37:08 UTC (rev 753)
@@ -3,7 +3,7 @@
# options.pl: generate options dialog boxes
# Copyright (c) 2001-2008 Philip Kendall, Fredrick Meunier
-# $Id: options.pl 4913 2013-03-25 11:00:51Z fredm $
+# $Id: options.pl 4961 2013-05-19 05:17:30Z sbaldovi $
# 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
@@ -363,11 +363,9 @@
int
widget_options_finish( widget_finish_state finished )
{
- int error = 0;
-
/* If we exited normally, actually set the options */
if( finished == WIDGET_FINISHED_OK ) {
- error = settings_copy( &settings_current, &widget_options_settings );
+ settings_copy( &settings_current, &widget_options_settings );
/* Bring the peripherals list into sync with the new options */
periph_posthook();
/* make the needed UI changes */
@@ -375,7 +373,6 @@
}
settings_free( &widget_options_settings );
memset( &widget_options_settings, 0, sizeof( settings_info ) );
- if( error ) return error;
return 0;
}
@@ -434,8 +431,7 @@
if( !widget_$_->{name}_running ) { /* we want to copy settings, only when start up */
highlight_line = 0;
/* Get a copy of the current settings */
- error = settings_copy( &widget_options_settings, &settings_current );
- if( error ) { settings_free( &widget_options_settings ); return error; }
+ settings_copy( &widget_options_settings, &settings_current );
widget_$_->{name}_running = 1;
}
Modified: trunk/fuse/ui/widget/roms.c
===================================================================
--- trunk/fuse/ui/widget/roms.c 2013-05-19 11:10:39 UTC (rev 752)
+++ trunk/fuse/ui/widget/roms.c 2013-05-19 12:37:08 UTC (rev 753)
@@ -1,7 +1,7 @@
/* roms.c: select ROMs widget
Copyright (c) 2003-2004 Philip Kendall
- $Id: roms.c 4633 2012-01-19 23:26:10Z pak21 $
+ $Id: roms.c 4961 2013-05-19 05:17:30Z sbaldovi $
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
@@ -44,7 +44,7 @@
int
widget_roms_draw( void *data )
{
- int i, error;
+ int i;
char buffer[32];
char key[] = "\x0A ";
@@ -59,11 +59,7 @@
ui_error( UI_ERROR_ERROR, "out of memory at %s:%d", __FILE__, __LINE__ );
return 1;
}
- error = settings_copy( widget_settings, &settings_current );
- if( error ) {
- settings_free( widget_settings ); free( widget_settings );
- return error;
- }
+ settings_copy( widget_settings, &settings_current );
info->initialised = 1;
}
@@ -158,11 +154,8 @@
int
widget_roms_finish( widget_finish_state finished )
{
- int error;
-
if( finished == WIDGET_FINISHED_OK ) {
- error = settings_copy( &settings_current, widget_settings );
- if( error ) return error;
+ settings_copy( &settings_current, widget_settings );
}
settings_free( widget_settings ); free( widget_settings );
Modified: trunk/fuse/ui/win32/options.pl
===================================================================
--- trunk/fuse/ui/win32/options.pl 2013-05-19 11:10:39 UTC (rev 752)
+++ trunk/fuse/ui/win32/options.pl 2013-05-19 12:37:08 UTC (rev 753)
@@ -1,9 +1,9 @@
#!/usr/bin/perl -w
# options.pl: generate options dialog boxes
-# $Id: options.pl 4643 2012-01-21 16:12:10Z pak21 $
+# $Id: options.pl 4962 2013-05-19 05:25:15Z sbaldovi $
-# Copyright (c) 2001-2007 Philip Kendall, Marek Januszewski, Stuart Brady
+# Copyright (c) 2001-2013 Philip Kendall, Marek Januszewski, Stuart Brady
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -35,14 +35,14 @@
my @dialogs = Fuse::Dialog::read( shift @ARGV );
print Fuse::GPL( 'options.c: options dialog boxes',
- '2001-2009 Philip Kendall, Marek Januszewski, Stuart Brady' ) . << "CODE";
+ '2001-2013 Philip Kendall, Marek Januszewski, Stuart Brady' ) . << "CODE";
/* This file is autogenerated from options.dat by options.pl.
Do not edit unless you know what you\'re doing! */
#include <config.h>
-#ifdef UI_WIN32 /* Use this file iff we're using WIN32 */
+#ifdef UI_WIN32 /* Use this file if we're using WIN32 */
#include <libspectrum.h>
@@ -57,7 +57,7 @@
static int
option_enumerate_combo( const char **options, char *value, int count,
- int def ) {
+ int def ) {
int i;
if( value != NULL ) {
for( i = 0; i < count; i++) {
@@ -120,9 +120,9 @@
int
option_enumerate_$_->{name}_$widget->{value}( void ) {
return option_enumerate_combo( $_->{name}_$widget->{value}_combo,
- settings_current.$widget->{value},
- $_->{name}_$widget->{value}_combo_count,
- $combo_default{$widget->{value}} );
+ settings_current.$widget->{value},
+ $_->{name}_$widget->{value}_combo_count,
+ $combo_default{$widget->{value}} );
}
CODE
@@ -134,67 +134,54 @@
my $optname = uc( "OPT_$_->{name}" );
print << "CODE";
-static BOOL CALLBACK
-menu_options_$_->{name}_proc( HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam )
+static void
+menu_options_$_->{name}_init( HWND hwndDlg )
{
char buffer[80];
int i;
-
+
i = 0;
- buffer[0] = '\\0'; /* Shut gcc up */
-
- switch( msg )
- {
- case WM_INITDIALOG:
- {
- /* FIXME: save the handle returned by LoadIcon() in win32ui.c */
- SendMessage( hwndDlg, WM_SETICON, ICON_SMALL,
- (LPARAM)LoadIcon( fuse_hInstance, "win32_icon" ) );
+ buffer[0] = '\\0'; /* Shut gcc up */
- /* initialize the controls with current settings */
-
- /* FIXME split *_init and *_done functions out of *_proc function */
CODE
-
foreach my $widget ( @{ $_->{widgets} } ) {
my $type = $widget->{type};
if( $type eq "Checkbox" ) {
my $idcname = uc( "$widget->{value}" );
print << "CODE";
- SendDlgItemMessage( hwndDlg, IDC_${optname}_${idcname}, BM_SETCHECK,
- settings_current.$widget->{value} ? BST_CHECKED : BST_UNCHECKED, 0 );
+ SendDlgItemMessage( hwndDlg, IDC_${optname}_${idcname}, BM_SETCHECK,
+ settings_current.$widget->{value} ? BST_CHECKED : BST_UNCHECKED, 0 );
CODE
} elsif( $widget->{type} eq "Entry" ) {
my $idcname = uc( "$widget->{value}" );
print << "CODE";
- /* FIXME This is asuming SendDlgItemMessage is not UNICODE */
- snprintf( buffer, 80, "%d", settings_current.$widget->{value} );
- SendDlgItemMessage( hwndDlg, IDC_${optname}_${idcname}, WM_SETTEXT,
- 0, (LPARAM) buffer );
+ /* FIXME This is asuming SendDlgItemMessage is not UNICODE */
+ snprintf( buffer, 80, "%d", settings_current.$widget->{value} );
+ SendDlgItemMessage( hwndDlg, IDC_${optname}_${idcname}, WM_SETTEXT,
+ 0, (LPARAM) buffer );
CODE
} elsif( $type eq "Combo" ) {
my $idcname = uc( "$widget->{value}" );
print << "CODE";
- for( i = 0; i < $_->{name}_$widget->{value}_combo_count; i++ ) {
- /* FIXME This is asuming SendDlgItemMessage is not UNICODE */
- SendDlgItemMessage( hwndDlg, IDC_${optname}_${idcname}, CB_ADDSTRING,
- 0, (LPARAM) $_->{name}_$widget->{value}_combo[i] );
+ for( i = 0; i < $_->{name}_$widget->{value}_combo_count; i++ ) {
+ /* FIXME This is asuming SendDlgItemMessage is not UNICODE */
+ SendDlgItemMessage( hwndDlg, IDC_${optname}_${idcname}, CB_ADDSTRING,
+ 0, (LPARAM) $_->{name}_$widget->{value}_combo[i] );
+ }
+ SendDlgItemMessage( hwndDlg, IDC_${optname}_${idcname}, CB_SETCURSEL,
+ (LPARAM) $combo_default{$widget->{value}}, 0 );
+ if( settings_current.$widget->{value} != NULL ) {
+ for( i = 0; i < $_->{name}_$widget->{value}_combo_count; i++ ) {
+ if( !strcmp( settings_current.$widget->{value},
+ $_->{name}_$widget->{value}_combo[i] ) ) {
+ SendDlgItemMessage( hwndDlg, IDC_${optname}_${idcname},
+ CB_SETCURSEL, i, 0 );
}
- SendDlgItemMessage( hwndDlg, IDC_${optname}_${idcname}, CB_SETCURSEL,
- (LPARAM) $combo_default{$widget->{value}}, 0 );
- if( settings_current.$widget->{value} != NULL ) {
- for( i = 0; i < $_->{name}_$widget->{value}_combo_count; i++ ) {
- if( !strcmp( settings_current.$widget->{value},
- $_->{name}_$widget->{value}_combo[i] ) ) {
- SendDlgItemMessage( hwndDlg, IDC_${optname}_${idcname},
- CB_SETCURSEL, i, 0 );
- }
- }
- }
-
+ }
+ }
CODE
} else {
die "Unknown type `$type'";
@@ -202,16 +189,29 @@
}
print << "CODE";
- return FALSE;
+}
+
+static void
+menu_options_$_->{name}_done( HWND hwndDlg )
+{
+ char buffer[80];
+
+ buffer[0] = '\\0'; /* Shut gcc up */
+
+CODE
+
+ if( $_->{postcheck} ) {
+
+ print << "CODE";
+ /* Get a copy of current settings */
+ settings_info original_settings;
+ memset( &original_settings, 0, sizeof( settings_info ) );
+ settings_copy( &original_settings, &settings_current );
+
+CODE
+
}
- case WM_COMMAND:
- switch( LOWORD( wParam ) )
- {
- case IDOK:
- {
- /* Read the controls and apply the settings */
-CODE
foreach my $widget ( @{ $_->{widgets} } ) {
my $type = $widget->{type};
@@ -219,25 +219,26 @@
my $idcname = uc( "$widget->{value}" );
print << "CODE";
- settings_current.$widget->{value} =
- IsDlgButtonChecked( hwndDlg, IDC_${optname}_${idcname} );
+ settings_current.$widget->{value} =
+ IsDlgButtonChecked( hwndDlg, IDC_${optname}_${idcname} );
CODE
} elsif( $widget->{type} eq "Entry" ) {
my $idcname = uc( "$widget->{value}" );
print << "CODE";
- /* FIXME This is asuming SendDlgItemMessage is not UNICODE */
- SendDlgItemMessage( hwndDlg, IDC_${optname}_${idcname}, WM_GETTEXT, 80, (LPARAM) buffer );
- settings_current.$widget->{value} = atoi( buffer );
+ /* FIXME This is asuming SendDlgItemMessage is not UNICODE */
+ SendDlgItemMessage( hwndDlg, IDC_${optname}_${idcname}, WM_GETTEXT,
+ 80, (LPARAM) buffer );
+ settings_current.$widget->{value} = atoi( buffer );
CODE
} elsif( $widget->{type} eq "Combo" ) {
my $idcname = uc( "$widget->{value}" );
print << "CODE";
- free( settings_current.$widget->{value} );
- settings_current.$widget->{value} =
- utils_safe_strdup( $_->{name}_$widget->{value}_combo[
- SendDlgItemMessage( hwndDlg, IDC_${optname}_${idcname}, CB_GETCURSEL, 0, 0 ) ] );
+ free( settings_current.$widget->{value} );
+ settings_current.$widget->{value} =
+ utils_safe_strdup( $_->{name}_$widget->{value}_combo[
+ SendDlgItemMessage( hwndDlg, IDC_${optname}_${idcname}, CB_GETCURSEL, 0, 0 ) ] );
CODE
} else {
@@ -245,21 +246,70 @@
}
}
- print " $_->{posthook}();\n\n" if $_->{posthook};
+ if( $_->{postcheck} ) {
+ print << "CODE";
+ int needs_hard_reset = $_->{postcheck}();
+
+ /* Confirm reset */
+ if( needs_hard_reset ) {
+ ShowWindow( hwndDlg, SW_HIDE );
+
+ if( !win32ui_confirm("Some options need to reset the machine. Reset?" ) ) {
+ /* Cancel new settings */
+ settings_copy( &settings_current, &original_settings );
+ settings_free( &original_settings );
+
+ ShowWindow( hwndDlg, SW_SHOW );
+ return;
+ }
+ }
+
+ settings_free( &original_settings );
+
+CODE
+ }
+
+ print " $_->{posthook}();\n\n" if $_->{posthook};
+
print << "CODE";
- win32statusbar_set_visibility( settings_current.statusbar );
- display_refresh_all();
+ win32statusbar_set_visibility( settings_current.statusbar );
+ display_refresh_all();
- EndDialog( hwndDlg, 0 );
+ EndDialog( hwndDlg, 0 );
+}
+
+static BOOL CALLBACK
+menu_options_$_->{name}_proc( HWND hwndDlg, UINT msg, WPARAM wParam GCC_UNUSED,
+ LPARAM lParam GCC_UNUSED )
+{
+ switch( msg )
+ {
+ case WM_INITDIALOG:
+ {
+ /* FIXME: save the handle returned by LoadIcon() in win32ui.c */
+ SendMessage( hwndDlg, WM_SETICON, ICON_SMALL,
+ (LPARAM)LoadIcon( fuse_hInstance, "win32_icon" ) );
+
+ /* initialize the controls with current settings */
+ menu_options_$_->{name}_init( hwndDlg );
+
+ return TRUE;
+ }
+
+ case WM_COMMAND:
+ switch( LOWORD( wParam ) )
+ {
+ case IDOK:
+ /* Read the controls and apply the settings */
+ menu_options_$_->{name}_done( hwndDlg );
return 0;
- }
case IDCANCEL:
EndDialog( hwndDlg, 0 );
return 0;
- }
- break;
+ }
+ break;
case WM_CLOSE:
EndDialog( hwndDlg, 0 );
@@ -270,7 +320,7 @@
}
void
-menu_options_$_->{name}( int action )
+menu_options_$_->{name}( int action GCC_UNUSED )
{
fuse_emulation_pause();
Index: trunk/libspectrum/libspectrum
===================================================================
--- trunk/libspectrum/libspectrum 2013-05-19 11:10:39 UTC (rev 752)
+++ trunk/libspectrum/libspectrum 2013-05-19 12:37:08 UTC (rev 753)
Property changes on: trunk/libspectrum/libspectrum
___________________________________________________________________
Modified: svn:mergeinfo
## -1,5 +1,5 ##
/vendor/fuse-emulator/0.10.0/libspectrum:556-557
/vendor/fuse-emulator/0.10.0-pre1/libspectrum:545-546
-/vendor/fuse-emulator/current/libspectrum:530-749
+/vendor/fuse-emulator/current/libspectrum:530-752
/vendor/fuse-emulator/fuse-1.0.0a/libspectrum:668-669
/vendor/fuse-emulator/fuse-r4617/libspectrum:686
\ No newline at end of property
Modified: trunk/libspectrum/libspectrum/doc/libspectrum.txt
===================================================================
--- trunk/libspectrum/libspectrum/doc/libspectrum.txt 2013-05-19 11:10:39 UTC (rev 752)
+++ trunk/libspectrum/libspectrum/doc/libspectrum.txt 2013-05-19 12:37:08 UTC (rev 753)
@@ -1,4 +1,4 @@
-libspectrum 1.0.0
+libspectrum 1.1.0
=================
libspectrum is a fairly simple library designed to make the handling
@@ -1826,4 +1826,4 @@
Write `data' to register `reg' of the IDE channel `chn'.
-$Id: libspectrum.txt 4860 2013-01-26 11:33:25Z fredm $
+$Id: libspectrum.txt 4964 2013-05-19 05:30:32Z sbaldovi $
Modified: trunk/libspectrum/libspectrum/hacking/ChangeLog
===================================================================
--- trunk/libspectrum/libspectrum/hacking/ChangeLog 2013-05-19 11:10:39 UTC (rev 752)
+++ trunk/libspectrum/libspectrum/hacking/ChangeLog 2013-05-19 12:37:08 UTC (rev 753)
@@ -946,3 +946,4 @@
20130516 doc/libspectrum.3: update version number and date for 1.1 release.
20130516 ChangeLog: update date in main changelog.
20130517 README: update one more date for the 1.1 release.
+20130518 doc/libspectrum.txt: update version number for 1.1 release (Sergio).
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2013-05-19 11:10:41
|
Revision: 752
http://sourceforge.net/p/fuse-for-macosx/code/752
Author: fredm
Date: 2013-05-19 11:10:39 +0000 (Sun, 19 May 2013)
Log Message:
-----------
Tag vendor/fuse-emulator/current as
vendor/fuse-emulator/fuse-1.1.0-r4964.
Revision Links:
--------------
http://sourceforge.net/p/fuse-for-macosx/code/4964
Added Paths:
-----------
vendor/fuse-emulator/fuse-1.1.0-r4964/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2013-05-19 11:10:26
|
Revision: 751
http://sourceforge.net/p/fuse-for-macosx/code/751
Author: fredm
Date: 2013-05-19 11:10:23 +0000 (Sun, 19 May 2013)
Log Message:
-----------
Load . into vendor/fuse-emulator/current.
Modified Paths:
--------------
vendor/fuse-emulator/current/fuse/hacking/ChangeLog
vendor/fuse-emulator/current/fuse/periph.c
vendor/fuse-emulator/current/fuse/periph.h
vendor/fuse-emulator/current/fuse/perl/Fuse/Dialog.pm
vendor/fuse-emulator/current/fuse/settings-header.pl
vendor/fuse-emulator/current/fuse/settings.pl
vendor/fuse-emulator/current/fuse/ui/gtk/binary.c
vendor/fuse-emulator/current/fuse/ui/gtk/confirm.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/gtkui.c
vendor/fuse-emulator/current/fuse/ui/gtk/options.pl
vendor/fuse-emulator/current/fuse/ui/gtk/pokemem.c
vendor/fuse-emulator/current/fuse/ui/gtk/rollback.c
vendor/fuse-emulator/current/fuse/ui/gtk/roms.c
vendor/fuse-emulator/current/fuse/ui/gtk/stock.c
vendor/fuse-emulator/current/fuse/ui/options.dat
vendor/fuse-emulator/current/fuse/ui/widget/options.pl
vendor/fuse-emulator/current/fuse/ui/widget/roms.c
vendor/fuse-emulator/current/fuse/ui/win32/options.pl
vendor/fuse-emulator/current/libspectrum/doc/libspectrum.txt
vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog
Modified: vendor/fuse-emulator/current/fuse/hacking/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse/hacking/ChangeLog 2013-05-19 10:36:47 UTC (rev 750)
+++ vendor/fuse-emulator/current/fuse/hacking/ChangeLog 2013-05-19 11:10:23 UTC (rev 751)
@@ -4480,7 +4480,17 @@
complete some missing field initializers (Sergio).
20130505 peripherals/if1.c: put braces around empty body in ‘do’ statements
(Sergio).
+20130512 ui/win32/options.pl: refactor options dialogs to split *_init and
+ *_done functions out of *_proc function (Sergio).
+20130513 settings-header.pl,settings.pl: change settings_defaults(),
+ settings_copy() and settings_copy_internal() to void functions (Fred).
+20130513 ui/widget/{options.pl,roms.c}: change settings_copy() to void function
+ on widget UIs (Sergio).
20130516 man/fuse.1: update date and version for 1.1 release.
20130516 ChangeLog: update date in main changelog.
+20130517 periph.[c|h],perl/Fuse/Dialog.pm,ui/gtk/{binary.c,confirm.c,
+ gtkinternals.h,gtkjoystick.c,gtkui.c,options.pl,pokemem.c,rollback.c,
+ roms.c,stock.c},ui/options.dat,ui/win32/options.pl: display
+ confirmation dialogue for reset due to peripheral changes (Sergio).
20130517 README: update date for 1.1 release.
20130518 README: mention DISCiPLE support (Stuart).
Modified: vendor/fuse-emulator/current/fuse/periph.c
===================================================================
--- vendor/fuse-emulator/current/fuse/periph.c 2013-05-19 10:36:47 UTC (rev 750)
+++ vendor/fuse-emulator/current/fuse/periph.c 2013-05-19 11:10:23 UTC (rev 751)
@@ -1,7 +1,7 @@
/* periph.c: code for handling peripherals
Copyright (c) 2005-2011 Philip Kendall
- $Id: periph.c 4906 2013-03-10 11:21:37Z fredm $
+ $Id: periph.c 4962 2013-05-19 05:25:15Z sbaldovi $
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
@@ -169,6 +169,28 @@
*needs_hard_reset;
}
+/* Work out whether a peripheral needs a hard reset without (de)activate */
+static void
+get_hard_reset( gpointer key, gpointer value, gpointer user_data )
+{
+ periph_private_t *private = value;
+ int active = 0;
+ int *machine_hard_reset = (int *)user_data;
+ int periph_hard_reset = 0;
+
+ switch ( private->present ) {
+ case PERIPH_PRESENT_NEVER: active = 0; break;
+ case PERIPH_PRESENT_OPTIONAL:
+ active = private->periph->option ? *(private->periph->option) : 0; break;
+ case PERIPH_PRESENT_ALWAYS: active = 1; break;
+ }
+
+ periph_hard_reset = ( private && ( private->active != active ) &&
+ private->periph->hard_reset );
+
+ *machine_hard_reset = ( periph_hard_reset || *machine_hard_reset );
+}
+
/* Free the memory used by a peripheral-port response pair */
static void
free_peripheral( gpointer data, gpointer user_data GCC_UNUSED )
@@ -426,6 +448,17 @@
}
}
+int
+periph_postcheck( void )
+{
+ int needs_hard_reset = 0;
+
+ /* Detect if a hard reset is needed without (de)activating peripherals */
+ g_hash_table_foreach( peripherals, get_hard_reset, &needs_hard_reset );
+
+ return needs_hard_reset;
+}
+
/* Register debugger page/unpage events for a peripheral */
void
periph_register_paging_events( const char *type_string, int *page_event,
Modified: vendor/fuse-emulator/current/fuse/periph.h
===================================================================
--- vendor/fuse-emulator/current/fuse/periph.h 2013-05-19 10:36:47 UTC (rev 750)
+++ vendor/fuse-emulator/current/fuse/periph.h 2013-05-19 11:10:23 UTC (rev 751)
@@ -1,7 +1,7 @@
/* periph.h: code for handling peripherals
Copyright (c) 2004-2011 Philip Kendall
- $Id: periph.h 4906 2013-03-10 11:21:37Z fredm $
+ $Id: periph.h 4962 2013-05-19 05:25:15Z sbaldovi $
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
@@ -154,6 +154,8 @@
void periph_posthook( void );
+int periph_postcheck( void );
+
/* Register debugger page/unpage events for a peripheral */
void periph_register_paging_events( const char *type_string, int *page_event,
int *unpage_event );
Modified: vendor/fuse-emulator/current/fuse/perl/Fuse/Dialog.pm
===================================================================
--- vendor/fuse-emulator/current/fuse/perl/Fuse/Dialog.pm 2013-05-19 10:36:47 UTC (rev 750)
+++ vendor/fuse-emulator/current/fuse/perl/Fuse/Dialog.pm 2013-05-19 11:10:23 UTC (rev 751)
@@ -1,7 +1,7 @@
# Fuse::Dialog: routines for creating Fuse dialog boxes
# Copyright (c) 2003-2005 Philip Kendall
-# $Id: Dialog.pm 2889 2007-05-26 17:45:08Z zubzero $
+# $Id: Dialog.pm 4962 2013-05-19 05:25:15Z sbaldovi $
# 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
@@ -49,6 +49,7 @@
my( $name, $title, @widgets ) = split /\n/;
my @widget_data;
+ my $postcheck;
my $posthook;
foreach( @widgets ) {
@@ -56,6 +57,11 @@
my( $widget_type, $text, $value, $key, $data1, $data2 ) =
split /\s*,\s*/;
+ if( lc $widget_type eq 'postcheck' ) {
+ $postcheck = $text;
+ next;
+ }
+
if( lc $widget_type eq 'posthook' ) {
$posthook = $text;
next;
@@ -72,6 +78,7 @@
push @dialogs, { name => $name,
title => $title,
+ postcheck => $postcheck,
posthook => $posthook,
widgets => \@widget_data };
}
Modified: vendor/fuse-emulator/current/fuse/settings-header.pl
===================================================================
--- vendor/fuse-emulator/current/fuse/settings-header.pl 2013-05-19 10:36:47 UTC (rev 750)
+++ vendor/fuse-emulator/current/fuse/settings-header.pl 2013-05-19 11:10:23 UTC (rev 751)
@@ -3,7 +3,7 @@
# settings-header.pl: generate settings.h from settings.dat
# Copyright (c) 2002-2003 Philip Kendall
-# $Id: settings-header.pl 4924 2013-05-05 07:40:02Z sbaldovi $
+# $Id: settings-header.pl 4961 2013-05-19 05:17:30Z sbaldovi $
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -102,8 +102,8 @@
extern settings_info settings_default;
int settings_init( int *first_arg, int argc, char **argv );
-int settings_defaults( settings_info *settings );
-int settings_copy( settings_info *dest, settings_info *src );
+void settings_defaults( settings_info *settings );
+void settings_copy( settings_info *dest, settings_info *src );
#define SETTINGS_ROM_COUNT 30
char **settings_get_rom_setting( settings_info *settings, size_t which );
Modified: vendor/fuse-emulator/current/fuse/settings.pl
===================================================================
--- vendor/fuse-emulator/current/fuse/settings.pl 2013-05-19 10:36:47 UTC (rev 750)
+++ vendor/fuse-emulator/current/fuse/settings.pl 2013-05-19 11:10:23 UTC (rev 751)
@@ -3,7 +3,7 @@
# settings.pl: generate settings.c from settings.dat
# Copyright (c) 2002-2005 Philip Kendall
-# $Id: settings.pl 4841 2013-01-02 01:55:24Z zubzero $
+# $Id: settings.pl 4961 2013-05-19 05:17:30Z sbaldovi $
# 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 @@
static int settings_command_line( settings_info *settings, int *first_arg,
int argc, char **argv );
-static int settings_copy_internal( settings_info *dest, settings_info *src );
+static void settings_copy_internal( settings_info *dest, settings_info *src );
/* Called on emulator startup */
int
@@ -138,11 +138,7 @@
{
int error;
- error = settings_defaults( &settings_current );
- if( error ) {
- ui_error( UI_ERROR_ERROR, "out of memory at %s:%d", __FILE__, __LINE__ );
- return error;
- }
+ settings_defaults( &settings_current );
error = read_config_file( &settings_current );
if( error ) return error;
@@ -154,9 +150,9 @@
}
/* Fill the settings structure with sensible defaults */
-int settings_defaults( settings_info *settings )
+void settings_defaults( settings_info *settings )
{
- return settings_copy_internal( settings, &settings_default );
+ settings_copy_internal( settings, &settings_default );
}
#ifdef HAVE_LIB_XML2
@@ -684,7 +680,7 @@
}
/* Copy one settings object to another */
-static int
+static void
settings_copy_internal( settings_info *dest, settings_info *src )
{
settings_free( dest );
@@ -708,15 +704,13 @@
}
print hashline( __LINE__ ), << 'CODE';
-
- return 0;
}
/* Copy one settings object to another */
-int settings_copy( settings_info *dest, settings_info *src )
+void settings_copy( settings_info *dest, settings_info *src )
{
- if( settings_defaults( dest ) ) return 1;
- return settings_copy_internal( dest, src );
+ settings_defaults( dest );
+ settings_copy_internal( dest, src );
}
char **
Modified: vendor/fuse-emulator/current/fuse/ui/gtk/binary.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/gtk/binary.c 2013-05-19 10:36:47 UTC (rev 750)
+++ vendor/fuse-emulator/current/fuse/ui/gtk/binary.c 2013-05-19 11:10:23 UTC (rev 751)
@@ -1,7 +1,7 @@
/* binary.c: GTK+ routines to load/save chunks of binary data
Copyright (c) 2003-2005 Philip Kendall
- $Id: binary.c 4908 2013-03-10 22:13:57Z sbaldovi $
+ $Id: binary.c 4962 2013-05-19 05:25:15Z sbaldovi $
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
@@ -146,7 +146,7 @@
/* Command buttons */
gtkstock_create_ok_cancel( info->dialog, NULL, info->activate_data, info,
- NULL );
+ DEFAULT_DESTROY, DEFAULT_DESTROY );
}
void
Modified: vendor/fuse-emulator/current/fuse/ui/gtk/confirm.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/gtk/confirm.c 2013-05-19 10:36:47 UTC (rev 750)
+++ vendor/fuse-emulator/current/fuse/ui/gtk/confirm.c 2013-05-19 11:10:23 UTC (rev 751)
@@ -1,7 +1,7 @@
/* confirm.c: Confirmation dialog box
Copyright (c) 2000-2003 Philip Kendall, Russell Marks
- $Id: confirm.c 4723 2012-07-08 13:26:15Z fredm $
+ $Id: confirm.c 4962 2013-05-19 05:25:15Z sbaldovi $
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 @@
gtk_box_pack_start( GTK_BOX( content_area ), label, TRUE, TRUE, 5 );
gtkstock_create_ok_cancel( dialog, NULL, G_CALLBACK( set_confirmed ),
- &confirm, NULL );
+ &confirm, DEFAULT_DESTROY, DEFAULT_DESTROY );
gtk_widget_show_all( dialog );
gtk_main();
Modified: vendor/fuse-emulator/current/fuse/ui/gtk/gtkinternals.h
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/gtk/gtkinternals.h 2013-05-19 10:36:47 UTC (rev 750)
+++ vendor/fuse-emulator/current/fuse/ui/gtk/gtkinternals.h 2013-05-19 11:10:23 UTC (rev 751)
@@ -1,7 +1,7 @@
/* gtkinternals.h: stuff internal to the GTK+ UI
Copyright (c) 2003-2005 Philip Kendall
- $Id: gtkinternals.h 4723 2012-07-08 13:26:15Z fredm $
+ $Id: gtkinternals.h 4962 2013-05-19 05:25:15Z sbaldovi $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -108,7 +108,8 @@
GtkAccelGroup *accel,
/* for OK button -> */ GCallback action,
gpointer actiondata,
- /* for both buttons -> */ GCallback destroy );
+ /* for both buttons -> */ GCallback destroy_ok,
+ GCallback destroy_cancel );
GtkAccelGroup* gtkstock_create_close( GtkWidget *widget, GtkAccelGroup *accel,
GCallback destroy,
gboolean esconly );
Modified: vendor/fuse-emulator/current/fuse/ui/gtk/gtkjoystick.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/gtk/gtkjoystick.c 2013-05-19 10:36:47 UTC (rev 750)
+++ vendor/fuse-emulator/current/fuse/ui/gtk/gtkjoystick.c 2013-05-19 11:10:23 UTC (rev 751)
@@ -1,7 +1,7 @@
/* gtkjoystick.c: Joystick emulation
Copyright (c) 2003-2004 Darren Salt, Philip Kendall
- $Id: gtkjoystick.c 4915 2013-04-07 05:32:09Z fredm $
+ $Id: gtkjoystick.c 4962 2013-05-19 05:25:15Z sbaldovi $
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
@@ -231,7 +231,7 @@
g_object_unref( model );
gtkstock_create_ok_cancel( dialog, NULL, G_CALLBACK( joystick_done ),
- &info, NULL );
+ &info, DEFAULT_DESTROY, DEFAULT_DESTROY );
gtk_widget_show_all( dialog );
gtk_main();
Modified: vendor/fuse-emulator/current/fuse/ui/gtk/gtkui.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/gtk/gtkui.c 2013-05-19 10:36:47 UTC (rev 750)
+++ vendor/fuse-emulator/current/fuse/ui/gtk/gtkui.c 2013-05-19 11:10:23 UTC (rev 751)
@@ -1,7 +1,7 @@
/* gtkui.c: GTK+ routines for dealing with the user interface
Copyright (c) 2000-2005 Philip Kendall, Russell Marks
- $Id: gtkui.c 4740 2012-10-10 12:48:21Z fredm $
+ $Id: gtkui.c 4962 2013-05-19 05:25:15Z sbaldovi $
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
@@ -456,8 +456,9 @@
/* Create and add the actions buttons to the dialog box */
gtkstock_create_ok_cancel( dialog.dialog, NULL,
- G_CALLBACK( menu_options_filter_done ),
- (gpointer) &dialog, NULL );
+ G_CALLBACK( menu_options_filter_done ),
+ (gpointer) &dialog, DEFAULT_DESTROY,
+ DEFAULT_DESTROY );
gtk_widget_show_all( dialog.dialog );
@@ -589,8 +590,9 @@
/* Create and add the actions buttons to the dialog box */
gtkstock_create_ok_cancel( dialog.dialog, NULL,
- G_CALLBACK( menu_machine_select_done ),
- (gpointer) &dialog, NULL );
+ G_CALLBACK( menu_machine_select_done ),
+ (gpointer) &dialog, DEFAULT_DESTROY,
+ DEFAULT_DESTROY );
gtk_widget_show_all( dialog.dialog );
@@ -749,8 +751,9 @@
/* Create and add the actions buttons to the dialog box */
gtkstock_create_ok_cancel( dialog.dialog, NULL,
- G_CALLBACK( confirm_joystick_done ),
- (gpointer) &dialog, NULL );
+ G_CALLBACK( confirm_joystick_done ),
+ (gpointer) &dialog, DEFAULT_DESTROY,
+ DEFAULT_DESTROY );
gtk_widget_show_all( dialog.dialog );
Modified: vendor/fuse-emulator/current/fuse/ui/gtk/options.pl
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/gtk/options.pl 2013-05-19 10:36:47 UTC (rev 750)
+++ vendor/fuse-emulator/current/fuse/ui/gtk/options.pl 2013-05-19 11:10:23 UTC (rev 751)
@@ -1,9 +1,9 @@
#!/usr/bin/perl -w
# options.pl: generate options dialog boxes
-# $Id: options.pl 4723 2012-07-08 13:26:15Z fredm $
+# $Id: options.pl 4962 2013-05-19 05:25:15Z sbaldovi $
-# Copyright (c) 2002-2004 Philip Kendall
+# Copyright (c) 2002-2013 Philip Kendall
# 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,14 +36,14 @@
my %combo_default;
print Fuse::GPL( 'options.c: options dialog boxes',
- '2001-2004 Philip Kendall' ) . << "CODE";
+ '2001-2013 Philip Kendall' ) . << "CODE";
/* This file is autogenerated from options.dat by options.pl.
Do not edit unless you know what you\'re doing! */
#include <config.h>
-#ifdef UI_GTK /* Use this file iff we're using GTK+ */
+#ifdef UI_GTK /* Use this file if we're using GTK+ */
#include <stdio.h>
#include <stdlib.h>
@@ -65,8 +65,9 @@
static int
option_enumerate_combo( const char **options, char *value, guint count,
- int def ) {
- int i;
+ int def )
+{
+ guint i;
if( value != NULL ) {
for( i = 0; i < count; i++) {
if( !strcmp( value, options[ i ] ) )
@@ -126,11 +127,12 @@
}
print << "CODE";
int
-option_enumerate_$_->{name}_$widget->{value}( void ) {
+option_enumerate_$_->{name}_$widget->{value}( void )
+{
return option_enumerate_combo( $_->{name}_$widget->{value}_combo,
- settings_current.$widget->{value},
- $_->{name}_$widget->{value}_combo_count,
- $combo_default{$widget->{value}} );
+ settings_current.$widget->{value},
+ $_->{name}_$widget->{value}_combo_count,
+ $combo_default{$widget->{value}} );
}
CODE
@@ -171,7 +173,7 @@
dialog.$widget->{value} =
gtk_check_button_new_with_label( "$text" );
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( dialog.$widget->{value} ),
- settings_current.$widget->{value} );
+ settings_current.$widget->{value} );
gtk_container_add( GTK_CONTAINER( content_area ), dialog.$widget->{value} );
CODE
@@ -187,7 +189,7 @@
gchar buffer[80];
gtk_box_pack_start( GTK_BOX( content_area ), frame, TRUE, TRUE, 0 );
-
+
gtk_container_set_border_width( GTK_CONTAINER( hbox ), 4 );
gtk_container_add( GTK_CONTAINER( frame ), hbox );
@@ -210,7 +212,7 @@
GtkWidget *hbox = gtk_box_new( GTK_ORIENTATION_HORIZONTAL, 0 );
GtkWidget *combo = gtk_combo_box_text_new();
GtkWidget *text = gtk_label_new( "$text" );
- int i;
+ guint i;
gtk_box_pack_start( GTK_BOX( hbox ), text, FALSE, FALSE, 5 );
text = gtk_label_new( " " );
@@ -244,8 +246,8 @@
print << "CODE";
/* Create the OK and Cancel buttons */
gtkstock_create_ok_cancel( dialog.dialog, NULL,
- G_CALLBACK( menu_options_$_->{name}_done ),
- (gpointer) &dialog, NULL );
+ G_CALLBACK( menu_options_$_->{name}_done ),
+ (gpointer) &dialog, NULL, DEFAULT_DESTROY );
/* Display the window */
gtk_widget_show_all( dialog.dialog );
@@ -265,6 +267,18 @@
CODE
+ if( $_->{postcheck} ) {
+
+ print << "CODE";
+ /* Get a copy of current settings */
+ settings_info original_settings;
+ memset( &original_settings, 0, sizeof( settings_info ) );
+ settings_copy( &original_settings, &settings_current );
+
+CODE
+
+ }
+
foreach my $widget ( @{ $_->{widgets} } ) {
if( $widget->{type} eq "Checkbox" ) {
@@ -286,7 +300,7 @@
print << "CODE";
free( settings_current.$widget->{value} );
settings_current.$widget->{value} = utils_safe_strdup( $_->{name}_$widget->{value}_combo[
- gtk_combo_box_get_active( GTK_COMBO_BOX( ptr->$widget->{value} ) ) ] );
+ gtk_combo_box_get_active( GTK_COMBO_BOX( ptr->$widget->{value} ) ) ] );
CODE
} else {
@@ -294,6 +308,26 @@
}
}
+ if( $_->{postcheck} ) {
+
+ print << "CODE";
+ int needs_hard_reset = $_->{postcheck}();
+
+ /* Confirm reset */
+ if( needs_hard_reset && !gtkui_confirm("Some options need to reset the machine. Reset?" ) ) {
+
+ /* Cancel new settings */
+ settings_copy( &settings_current, &original_settings );
+ settings_free( &original_settings );
+ return;
+ }
+
+ settings_free( &original_settings );
+
+CODE
+
+ }
+
print << "CODE";
gtk_widget_destroy( ptr->dialog );
@@ -307,6 +341,7 @@
gtk_main_quit();
}
+
CODE
}
Modified: vendor/fuse-emulator/current/fuse/ui/gtk/pokemem.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/gtk/pokemem.c 2013-05-19 10:36:47 UTC (rev 750)
+++ vendor/fuse-emulator/current/fuse/ui/gtk/pokemem.c 2013-05-19 11:10:23 UTC (rev 751)
@@ -1,7 +1,7 @@
/* pokemem.c: GTK+ interface that handles pok files
Copyright (c) 2011 Philip Kendall, Sergio Baldoví
- $Id: pokemem.c 4769 2012-11-22 12:42:08Z fredm $
+ $Id: pokemem.c 4962 2013-05-19 05:25:15Z sbaldovi $
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
@@ -182,6 +182,7 @@
gtkstock_create_ok_cancel( dialog, accel_group,
G_CALLBACK( pokemem_update_list ),
(gpointer) &dialog,
+ G_CALLBACK( pokemem_close ),
G_CALLBACK( pokemem_close ) );
gtk_accel_group_disconnect_key( accel_group, GDK_KEY_Return, 0 );
Modified: vendor/fuse-emulator/current/fuse/ui/gtk/rollback.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/gtk/rollback.c 2013-05-19 10:36:47 UTC (rev 750)
+++ vendor/fuse-emulator/current/fuse/ui/gtk/rollback.c 2013-05-19 11:10:23 UTC (rev 751)
@@ -1,7 +1,7 @@
/* rollback.c: select a rollback point
Copyright (c) 2004 Philip Kendall
- $Id: rollback.c 4708 2012-05-25 12:14:50Z fredm $
+ $Id: rollback.c 4962 2013-05-19 05:25:15Z sbaldovi $
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
@@ -100,7 +100,7 @@
list = create_rollback_list();
gtkstock_create_ok_cancel( dialog, NULL, G_CALLBACK( select_row ), list,
- NULL );
+ DEFAULT_DESTROY, DEFAULT_DESTROY );
content_area = gtk_dialog_get_content_area( GTK_DIALOG( dialog ) );
gtk_box_pack_start( GTK_BOX( content_area ), list, TRUE, TRUE, 0 );
Modified: vendor/fuse-emulator/current/fuse/ui/gtk/roms.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/gtk/roms.c 2013-05-19 10:36:47 UTC (rev 750)
+++ vendor/fuse-emulator/current/fuse/ui/gtk/roms.c 2013-05-19 11:10:23 UTC (rev 751)
@@ -1,7 +1,7 @@
/* roms.c: ROM selector dialog box
Copyright (c) 2003-2004 Philip Kendall
- $Id: roms.c 4723 2012-07-08 13:26:15Z fredm $
+ $Id: roms.c 4962 2013-05-19 05:25:15Z sbaldovi $
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
@@ -75,7 +75,7 @@
/* Create the OK and Cancel buttons */
gtkstock_create_ok_cancel( dialog, NULL, G_CALLBACK( roms_done ), &info,
- NULL );
+ DEFAULT_DESTROY, DEFAULT_DESTROY );
/* And the current values of each of the ROMs */
vbox = GTK_BOX( gtk_dialog_get_content_area( GTK_DIALOG( dialog ) ) );
Modified: vendor/fuse-emulator/current/fuse/ui/gtk/stock.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/gtk/stock.c 2013-05-19 10:36:47 UTC (rev 750)
+++ vendor/fuse-emulator/current/fuse/ui/gtk/stock.c 2013-05-19 11:10:23 UTC (rev 751)
@@ -1,7 +1,7 @@
/* stock.c: 'standard' GTK+ widgets etc
Copyright (c) 2004 Darren Salt, Philip Kendall
- $Id: stock.c 4723 2012-07-08 13:26:15Z fredm $
+ $Id: stock.c 4962 2013-05-19 05:25:15Z sbaldovi $
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
@@ -147,14 +147,15 @@
GtkAccelGroup*
gtkstock_create_ok_cancel( GtkWidget *widget, GtkAccelGroup *accel,
- GCallback action, gpointer actiondata,
- GCallback destroy )
+ GCallback action, gpointer actiondata,
+ GCallback destroy_ok, GCallback destroy_cancel )
{
gtkstock_button btn[] = {
{ GTK_STOCK_CANCEL, NULL, NULL, NULL, 0, 0, 0, 0 },
{ GTK_STOCK_OK, NULL, NULL, NULL, 0, 0, 0, 0 },
};
- btn[1].destroy = btn[0].destroy = destroy ? destroy : DEFAULT_DESTROY;
+ btn[0].destroy = destroy_cancel ? destroy_cancel : NULL;
+ btn[1].destroy = destroy_ok ? destroy_ok : NULL;
btn[1].action = action;
btn[1].actiondata = actiondata;
Modified: vendor/fuse-emulator/current/fuse/ui/options.dat
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/options.dat 2013-05-19 10:36:47 UTC (rev 750)
+++ vendor/fuse-emulator/current/fuse/ui/options.dat 2013-05-19 11:10:23 UTC (rev 751)
@@ -46,6 +46,7 @@
Checkbox, Spectra(n)et, spectranet, INPUT_KEY_n
Checkbox, Spe(c)tranet disable, spectranet_disable, INPUT_KEY_c
#endif
+Postcheck, periph_postcheck
Posthook, periph_posthook
peripherals_disk
@@ -63,6 +64,7 @@
Checkbox, (B)eta 128 interface, beta128, INPUT_KEY_b
Checkbox, Beta 128 (a)uto-boot in 48K machines, beta128_48boot, INPUT_KEY_a
Checkbox, (O)pus Discovery interface, opus, INPUT_KEY_o
+Postcheck, periph_postcheck
Posthook, periph_posthook
rzx
Modified: vendor/fuse-emulator/current/fuse/ui/widget/options.pl
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/widget/options.pl 2013-05-19 10:36:47 UTC (rev 750)
+++ vendor/fuse-emulator/current/fuse/ui/widget/options.pl 2013-05-19 11:10:23 UTC (rev 751)
@@ -3,7 +3,7 @@
# options.pl: generate options dialog boxes
# Copyright (c) 2001-2008 Philip Kendall, Fredrick Meunier
-# $Id: options.pl 4913 2013-03-25 11:00:51Z fredm $
+# $Id: options.pl 4961 2013-05-19 05:17:30Z sbaldovi $
# 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
@@ -363,11 +363,9 @@
int
widget_options_finish( widget_finish_state finished )
{
- int error = 0;
-
/* If we exited normally, actually set the options */
if( finished == WIDGET_FINISHED_OK ) {
- error = settings_copy( &settings_current, &widget_options_settings );
+ settings_copy( &settings_current, &widget_options_settings );
/* Bring the peripherals list into sync with the new options */
periph_posthook();
/* make the needed UI changes */
@@ -375,7 +373,6 @@
}
settings_free( &widget_options_settings );
memset( &widget_options_settings, 0, sizeof( settings_info ) );
- if( error ) return error;
return 0;
}
@@ -434,8 +431,7 @@
if( !widget_$_->{name}_running ) { /* we want to copy settings, only when start up */
highlight_line = 0;
/* Get a copy of the current settings */
- error = settings_copy( &widget_options_settings, &settings_current );
- if( error ) { settings_free( &widget_options_settings ); return error; }
+ settings_copy( &widget_options_settings, &settings_current );
widget_$_->{name}_running = 1;
}
Modified: vendor/fuse-emulator/current/fuse/ui/widget/roms.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/widget/roms.c 2013-05-19 10:36:47 UTC (rev 750)
+++ vendor/fuse-emulator/current/fuse/ui/widget/roms.c 2013-05-19 11:10:23 UTC (rev 751)
@@ -1,7 +1,7 @@
/* roms.c: select ROMs widget
Copyright (c) 2003-2004 Philip Kendall
- $Id: roms.c 4633 2012-01-19 23:26:10Z pak21 $
+ $Id: roms.c 4961 2013-05-19 05:17:30Z sbaldovi $
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
@@ -44,7 +44,7 @@
int
widget_roms_draw( void *data )
{
- int i, error;
+ int i;
char buffer[32];
char key[] = "\x0A ";
@@ -59,11 +59,7 @@
ui_error( UI_ERROR_ERROR, "out of memory at %s:%d", __FILE__, __LINE__ );
return 1;
}
- error = settings_copy( widget_settings, &settings_current );
- if( error ) {
- settings_free( widget_settings ); free( widget_settings );
- return error;
- }
+ settings_copy( widget_settings, &settings_current );
info->initialised = 1;
}
@@ -158,11 +154,8 @@
int
widget_roms_finish( widget_finish_state finished )
{
- int error;
-
if( finished == WIDGET_FINISHED_OK ) {
- error = settings_copy( &settings_current, widget_settings );
- if( error ) return error;
+ settings_copy( &settings_current, widget_settings );
}
settings_free( widget_settings ); free( widget_settings );
Modified: vendor/fuse-emulator/current/fuse/ui/win32/options.pl
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/win32/options.pl 2013-05-19 10:36:47 UTC (rev 750)
+++ vendor/fuse-emulator/current/fuse/ui/win32/options.pl 2013-05-19 11:10:23 UTC (rev 751)
@@ -1,9 +1,9 @@
#!/usr/bin/perl -w
# options.pl: generate options dialog boxes
-# $Id: options.pl 4643 2012-01-21 16:12:10Z pak21 $
+# $Id: options.pl 4962 2013-05-19 05:25:15Z sbaldovi $
-# Copyright (c) 2001-2007 Philip Kendall, Marek Januszewski, Stuart Brady
+# Copyright (c) 2001-2013 Philip Kendall, Marek Januszewski, Stuart Brady
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -35,14 +35,14 @@
my @dialogs = Fuse::Dialog::read( shift @ARGV );
print Fuse::GPL( 'options.c: options dialog boxes',
- '2001-2009 Philip Kendall, Marek Januszewski, Stuart Brady' ) . << "CODE";
+ '2001-2013 Philip Kendall, Marek Januszewski, Stuart Brady' ) . << "CODE";
/* This file is autogenerated from options.dat by options.pl.
Do not edit unless you know what you\'re doing! */
#include <config.h>
-#ifdef UI_WIN32 /* Use this file iff we're using WIN32 */
+#ifdef UI_WIN32 /* Use this file if we're using WIN32 */
#include <libspectrum.h>
@@ -57,7 +57,7 @@
static int
option_enumerate_combo( const char **options, char *value, int count,
- int def ) {
+ int def ) {
int i;
if( value != NULL ) {
for( i = 0; i < count; i++) {
@@ -120,9 +120,9 @@
int
option_enumerate_$_->{name}_$widget->{value}( void ) {
return option_enumerate_combo( $_->{name}_$widget->{value}_combo,
- settings_current.$widget->{value},
- $_->{name}_$widget->{value}_combo_count,
- $combo_default{$widget->{value}} );
+ settings_current.$widget->{value},
+ $_->{name}_$widget->{value}_combo_count,
+ $combo_default{$widget->{value}} );
}
CODE
@@ -134,67 +134,54 @@
my $optname = uc( "OPT_$_->{name}" );
print << "CODE";
-static BOOL CALLBACK
-menu_options_$_->{name}_proc( HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam )
+static void
+menu_options_$_->{name}_init( HWND hwndDlg )
{
char buffer[80];
int i;
-
+
i = 0;
- buffer[0] = '\\0'; /* Shut gcc up */
-
- switch( msg )
- {
- case WM_INITDIALOG:
- {
- /* FIXME: save the handle returned by LoadIcon() in win32ui.c */
- SendMessage( hwndDlg, WM_SETICON, ICON_SMALL,
- (LPARAM)LoadIcon( fuse_hInstance, "win32_icon" ) );
+ buffer[0] = '\\0'; /* Shut gcc up */
- /* initialize the controls with current settings */
-
- /* FIXME split *_init and *_done functions out of *_proc function */
CODE
-
foreach my $widget ( @{ $_->{widgets} } ) {
my $type = $widget->{type};
if( $type eq "Checkbox" ) {
my $idcname = uc( "$widget->{value}" );
print << "CODE";
- SendDlgItemMessage( hwndDlg, IDC_${optname}_${idcname}, BM_SETCHECK,
- settings_current.$widget->{value} ? BST_CHECKED : BST_UNCHECKED, 0 );
+ SendDlgItemMessage( hwndDlg, IDC_${optname}_${idcname}, BM_SETCHECK,
+ settings_current.$widget->{value} ? BST_CHECKED : BST_UNCHECKED, 0 );
CODE
} elsif( $widget->{type} eq "Entry" ) {
my $idcname = uc( "$widget->{value}" );
print << "CODE";
- /* FIXME This is asuming SendDlgItemMessage is not UNICODE */
- snprintf( buffer, 80, "%d", settings_current.$widget->{value} );
- SendDlgItemMessage( hwndDlg, IDC_${optname}_${idcname}, WM_SETTEXT,
- 0, (LPARAM) buffer );
+ /* FIXME This is asuming SendDlgItemMessage is not UNICODE */
+ snprintf( buffer, 80, "%d", settings_current.$widget->{value} );
+ SendDlgItemMessage( hwndDlg, IDC_${optname}_${idcname}, WM_SETTEXT,
+ 0, (LPARAM) buffer );
CODE
} elsif( $type eq "Combo" ) {
my $idcname = uc( "$widget->{value}" );
print << "CODE";
- for( i = 0; i < $_->{name}_$widget->{value}_combo_count; i++ ) {
- /* FIXME This is asuming SendDlgItemMessage is not UNICODE */
- SendDlgItemMessage( hwndDlg, IDC_${optname}_${idcname}, CB_ADDSTRING,
- 0, (LPARAM) $_->{name}_$widget->{value}_combo[i] );
+ for( i = 0; i < $_->{name}_$widget->{value}_combo_count; i++ ) {
+ /* FIXME This is asuming SendDlgItemMessage is not UNICODE */
+ SendDlgItemMessage( hwndDlg, IDC_${optname}_${idcname}, CB_ADDSTRING,
+ 0, (LPARAM) $_->{name}_$widget->{value}_combo[i] );
+ }
+ SendDlgItemMessage( hwndDlg, IDC_${optname}_${idcname}, CB_SETCURSEL,
+ (LPARAM) $combo_default{$widget->{value}}, 0 );
+ if( settings_current.$widget->{value} != NULL ) {
+ for( i = 0; i < $_->{name}_$widget->{value}_combo_count; i++ ) {
+ if( !strcmp( settings_current.$widget->{value},
+ $_->{name}_$widget->{value}_combo[i] ) ) {
+ SendDlgItemMessage( hwndDlg, IDC_${optname}_${idcname},
+ CB_SETCURSEL, i, 0 );
}
- SendDlgItemMessage( hwndDlg, IDC_${optname}_${idcname}, CB_SETCURSEL,
- (LPARAM) $combo_default{$widget->{value}}, 0 );
- if( settings_current.$widget->{value} != NULL ) {
- for( i = 0; i < $_->{name}_$widget->{value}_combo_count; i++ ) {
- if( !strcmp( settings_current.$widget->{value},
- $_->{name}_$widget->{value}_combo[i] ) ) {
- SendDlgItemMessage( hwndDlg, IDC_${optname}_${idcname},
- CB_SETCURSEL, i, 0 );
- }
- }
- }
-
+ }
+ }
CODE
} else {
die "Unknown type `$type'";
@@ -202,16 +189,29 @@
}
print << "CODE";
- return FALSE;
+}
+
+static void
+menu_options_$_->{name}_done( HWND hwndDlg )
+{
+ char buffer[80];
+
+ buffer[0] = '\\0'; /* Shut gcc up */
+
+CODE
+
+ if( $_->{postcheck} ) {
+
+ print << "CODE";
+ /* Get a copy of current settings */
+ settings_info original_settings;
+ memset( &original_settings, 0, sizeof( settings_info ) );
+ settings_copy( &original_settings, &settings_current );
+
+CODE
+
}
- case WM_COMMAND:
- switch( LOWORD( wParam ) )
- {
- case IDOK:
- {
- /* Read the controls and apply the settings */
-CODE
foreach my $widget ( @{ $_->{widgets} } ) {
my $type = $widget->{type};
@@ -219,25 +219,26 @@
my $idcname = uc( "$widget->{value}" );
print << "CODE";
- settings_current.$widget->{value} =
- IsDlgButtonChecked( hwndDlg, IDC_${optname}_${idcname} );
+ settings_current.$widget->{value} =
+ IsDlgButtonChecked( hwndDlg, IDC_${optname}_${idcname} );
CODE
} elsif( $widget->{type} eq "Entry" ) {
my $idcname = uc( "$widget->{value}" );
print << "CODE";
- /* FIXME This is asuming SendDlgItemMessage is not UNICODE */
- SendDlgItemMessage( hwndDlg, IDC_${optname}_${idcname}, WM_GETTEXT, 80, (LPARAM) buffer );
- settings_current.$widget->{value} = atoi( buffer );
+ /* FIXME This is asuming SendDlgItemMessage is not UNICODE */
+ SendDlgItemMessage( hwndDlg, IDC_${optname}_${idcname}, WM_GETTEXT,
+ 80, (LPARAM) buffer );
+ settings_current.$widget->{value} = atoi( buffer );
CODE
} elsif( $widget->{type} eq "Combo" ) {
my $idcname = uc( "$widget->{value}" );
print << "CODE";
- free( settings_current.$widget->{value} );
- settings_current.$widget->{value} =
- utils_safe_strdup( $_->{name}_$widget->{value}_combo[
- SendDlgItemMessage( hwndDlg, IDC_${optname}_${idcname}, CB_GETCURSEL, 0, 0 ) ] );
+ free( settings_current.$widget->{value} );
+ settings_current.$widget->{value} =
+ utils_safe_strdup( $_->{name}_$widget->{value}_combo[
+ SendDlgItemMessage( hwndDlg, IDC_${optname}_${idcname}, CB_GETCURSEL, 0, 0 ) ] );
CODE
} else {
@@ -245,21 +246,70 @@
}
}
- print " $_->{posthook}();\n\n" if $_->{posthook};
+ if( $_->{postcheck} ) {
+ print << "CODE";
+ int needs_hard_reset = $_->{postcheck}();
+
+ /* Confirm reset */
+ if( needs_hard_reset ) {
+ ShowWindow( hwndDlg, SW_HIDE );
+
+ if( !win32ui_confirm("Some options need to reset the machine. Reset?" ) ) {
+ /* Cancel new settings */
+ settings_copy( &settings_current, &original_settings );
+ settings_free( &original_settings );
+
+ ShowWindow( hwndDlg, SW_SHOW );
+ return;
+ }
+ }
+
+ settings_free( &original_settings );
+
+CODE
+ }
+
+ print " $_->{posthook}();\n\n" if $_->{posthook};
+
print << "CODE";
- win32statusbar_set_visibility( settings_current.statusbar );
- display_refresh_all();
+ win32statusbar_set_visibility( settings_current.statusbar );
+ display_refresh_all();
- EndDialog( hwndDlg, 0 );
+ EndDialog( hwndDlg, 0 );
+}
+
+static BOOL CALLBACK
+menu_options_$_->{name}_proc( HWND hwndDlg, UINT msg, WPARAM wParam GCC_UNUSED,
+ LPARAM lParam GCC_UNUSED )
+{
+ switch( msg )
+ {
+ case WM_INITDIALOG:
+ {
+ /* FIXME: save the handle returned by LoadIcon() in win32ui.c */
+ SendMessage( hwndDlg, WM_SETICON, ICON_SMALL,
+ (LPARAM)LoadIcon( fuse_hInstance, "win32_icon" ) );
+
+ /* initialize the controls with current settings */
+ menu_options_$_->{name}_init( hwndDlg );
+
+ return TRUE;
+ }
+
+ case WM_COMMAND:
+ switch( LOWORD( wParam ) )
+ {
+ case IDOK:
+ /* Read the controls and apply the settings */
+ menu_options_$_->{name}_done( hwndDlg );
return 0;
- }
case IDCANCEL:
EndDialog( hwndDlg, 0 );
return 0;
- }
- break;
+ }
+ break;
case WM_CLOSE:
EndDialog( hwndDlg, 0 );
@@ -270,7 +320,7 @@
}
void
-menu_options_$_->{name}( int action )
+menu_options_$_->{name}( int action GCC_UNUSED )
{
fuse_emulation_pause();
Modified: vendor/fuse-emulator/current/libspectrum/doc/libspectrum.txt
===================================================================
--- vendor/fuse-emulator/current/libspectrum/doc/libspectrum.txt 2013-05-19 10:36:47 UTC (rev 750)
+++ vendor/fuse-emulator/current/libspectrum/doc/libspectrum.txt 2013-05-19 11:10:23 UTC (rev 751)
@@ -1,4 +1,4 @@
-libspectrum 1.0.0
+libspectrum 1.1.0
=================
libspectrum is a fairly simple library designed to make the handling
@@ -1826,4 +1826,4 @@
Write `data' to register `reg' of the IDE channel `chn'.
-$Id: libspectrum.txt 4860 2013-01-26 11:33:25Z fredm $
+$Id: libspectrum.txt 4964 2013-05-19 05:30:32Z sbaldovi $
Modified: vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog 2013-05-19 10:36:47 UTC (rev 750)
+++ vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog 2013-05-19 11:10:23 UTC (rev 751)
@@ -946,3 +946,4 @@
20130516 doc/libspectrum.3: update version number and date for 1.1 release.
20130516 ChangeLog: update date in main changelog.
20130517 README: update one more date for the 1.1 release.
+20130518 doc/libspectrum.txt: update version number for 1.1 release (Sergio).
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2013-05-19 10:36:50
|
Revision: 750
http://sourceforge.net/p/fuse-for-macosx/code/750
Author: fredm
Date: 2013-05-19 10:36:47 +0000 (Sun, 19 May 2013)
Log Message:
-----------
Merge up to vendor 1.1.0 release branches r4959.
Revision Links:
--------------
http://sourceforge.net/p/fuse-for-macosx/code/4959
Modified Paths:
--------------
trunk/fuse/ChangeLog
trunk/fuse/README
trunk/fuse/fusepb/English.lproj/InfoPlist.strings
trunk/fuse/fusepb/Info-Fuse.plist
trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html
trunk/fuse/hacking/ChangeLog
trunk/fuse/man/fuse.1
trunk/libspectrum/libspectrum/ChangeLog
trunk/libspectrum/libspectrum/Makefile.am
trunk/libspectrum/libspectrum/README
trunk/libspectrum/libspectrum/doc/libspectrum.3
trunk/libspectrum/libspectrum/hacking/ChangeLog
Property Changed:
----------------
trunk/fuse/
trunk/libspectrum/libspectrum/
Index: trunk/fuse
===================================================================
--- trunk/fuse 2013-05-18 13:41:18 UTC (rev 749)
+++ trunk/fuse 2013-05-19 10:36:47 UTC (rev 750)
Property changes on: trunk/fuse
___________________________________________________________________
Modified: svn:mergeinfo
## -1,5 +1,5 ##
/vendor/fuse-emulator/0.10.0/fuse:556-557
/vendor/fuse-emulator/0.10.0-pre1/fuse:545-546
-/vendor/fuse-emulator/current/fuse:530-746
+/vendor/fuse-emulator/current/fuse:530-749
/vendor/fuse-emulator/fuse-1.0.0a/fuse:668-669
/vendor/fuse-emulator/fuse-r4617/fuse:686
\ No newline at end of property
Modified: trunk/fuse/ChangeLog
===================================================================
--- trunk/fuse/ChangeLog 2013-05-18 13:41:18 UTC (rev 749)
+++ trunk/fuse/ChangeLog 2013-05-19 10:36:47 UTC (rev 750)
@@ -1,4 +1,4 @@
-201?-??-?? Philip Kendall <phi...@sh...>
+2013-05-18 Philip Kendall <phi...@sh...>
* Fuse 1.1.0 released.
@@ -1094,4 +1094,4 @@
* Version 0.1.0 released.
-$Id: ChangeLog 4879 2013-02-12 00:36:01Z zubzero $
+$Id: ChangeLog 4944 2013-05-16 20:55:22Z pak21 $
Modified: trunk/fuse/README
===================================================================
--- trunk/fuse/README 2013-05-18 13:41:18 UTC (rev 749)
+++ trunk/fuse/README 2013-05-19 10:36:47 UTC (rev 750)
@@ -25,7 +25,7 @@
* Support for the RZX input recording file format, including
rollback and 'competition mode'.
* Emulation of the DivIDE, Interface 1, Kempston mouse, Spectrum +3e,
- ZXATASP, ZXCF, Beta 128, Opus Discovery and +D interfaces.
+ ZXATASP, ZXCF, Beta 128, Opus Discovery, +D and DISCiPLE interfaces.
Help! <xyz> doesn't work
------------------------
@@ -105,6 +105,6 @@
<http://www.worldofspectrum.org/forums/>.
Philip Kendall <phi...@sh...>
-?? ???? 2012
+18th May, 2013
-$Id: README 4846 2013-01-03 09:14:29Z zubzero $
+$Id: README 4958 2013-05-18 13:07:46Z zubzero $
Modified: trunk/fuse/fusepb/English.lproj/InfoPlist.strings
===================================================================
(Binary files differ)
Modified: trunk/fuse/fusepb/Info-Fuse.plist
===================================================================
--- trunk/fuse/fusepb/Info-Fuse.plist 2013-05-18 13:41:18 UTC (rev 749)
+++ trunk/fuse/fusepb/Info-Fuse.plist 2013-05-19 10:36:47 UTC (rev 750)
@@ -552,7 +552,7 @@
<key>CFBundleSignature</key>
<string>FUSE</string>
<key>CFBundleVersion</key>
- <string>4915</string>
+ <string>1.1.0</string>
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSPrincipalClass</key>
Modified: trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html
===================================================================
--- trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html 2013-05-18 13:41:18 UTC (rev 749)
+++ trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html 2013-05-19 10:36:47 UTC (rev 750)
@@ -25,7 +25,11 @@
elsewhere and then the Fuse preferences set to refer to
these new ROM images. This applies to the following
machines; Pentagon series and Scorpion, and the following
- interfaces; Interface I, Opus Discovery, Betadisk.<br>
+ interfaces; Interface I, Opus Discovery, Betadisk.</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Any changes
+ that enable and disable peripherals may result in a hard
+ reset of the emulated machine if required for proper
+ emulation of the hardware.<br>
</font></li>
</ul>
<br>
@@ -35,9 +39,7 @@
list-style-position: outside;">
<ul>
<li><font face="Lucida Grande,Helvetica,Arial">Add Spectranet
- ethernet interface emulation (Philip Kendall).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Add SpeccyBoot
- ethernet interface emulation (Patrik Persson).</font></li>
+ Ethernet interface emulation (Philip Kendall).</font></li>
<li><font face="Lucida Grande,Helvetica,Arial">Add SpecDrum
sound interface emulation (Jon Mitchell).</font></li>
<li><font face="Lucida Grande,Helvetica,Arial">Add DISCiPLE
@@ -110,8 +112,7 @@
<li><font face="Lucida Grande,Helvetica,Arial">Update SE ROMs
to v4.04 (Fredrick Meunier).</font></li>
<li><font face="Lucida Grande,Helvetica,Arial">Update to v1.38
- of the +3e ROMs (fixes bug #290) (thanks, Guesser)
- (Fredrick Meunier).<br>
+ of the +3e ROMs (thanks, Guesser) (Fredrick Meunier).<br>
</font></li>
</ul>
</li>
Modified: trunk/fuse/hacking/ChangeLog
===================================================================
--- trunk/fuse/hacking/ChangeLog 2013-05-18 13:41:18 UTC (rev 749)
+++ trunk/fuse/hacking/ChangeLog 2013-05-19 10:36:47 UTC (rev 750)
@@ -4480,3 +4480,7 @@
complete some missing field initializers (Sergio).
20130505 peripherals/if1.c: put braces around empty body in ‘do’ statements
(Sergio).
+20130516 man/fuse.1: update date and version for 1.1 release.
+20130516 ChangeLog: update date in main changelog.
+20130517 README: update date for 1.1 release.
+20130518 README: mention DISCiPLE support (Stuart).
Modified: trunk/fuse/man/fuse.1
===================================================================
--- trunk/fuse/man/fuse.1 2013-05-18 13:41:18 UTC (rev 749)
+++ trunk/fuse/man/fuse.1 2013-05-19 10:36:47 UTC (rev 750)
@@ -1,7 +1,7 @@
.\" -*- nroff -*-
.\"
.\" fuse.1: Fuse man page
-.\" Copyright (c) 2001-2010 Russell Marks, Philip Kendall, Darren Salt,
+.\" Copyright (c) 2001-2013 Russell Marks, Philip Kendall, Darren Salt,
.\" Fredrick Meunier, Stuart Brady
.\"
.\" This program is free software; you can redistribute it and/or modify
@@ -23,7 +23,7 @@
.\" E-mail: phi...@sh...
.\"
.\"
-.TH fuse 1 "??th ????, 201?" "Version 1.1.0" "Emulators"
+.TH fuse 1 "18th May, 2013" "Version 1.1.0" "Emulators"
.\"
.\"------------------------------------------------------------------
.\"
Index: trunk/libspectrum/libspectrum
===================================================================
--- trunk/libspectrum/libspectrum 2013-05-18 13:41:18 UTC (rev 749)
+++ trunk/libspectrum/libspectrum 2013-05-19 10:36:47 UTC (rev 750)
Property changes on: trunk/libspectrum/libspectrum
___________________________________________________________________
Modified: svn:mergeinfo
## -1,5 +1,5 ##
/vendor/fuse-emulator/0.10.0/libspectrum:556-557
/vendor/fuse-emulator/0.10.0-pre1/libspectrum:545-546
-/vendor/fuse-emulator/current/libspectrum:530-740
+/vendor/fuse-emulator/current/libspectrum:530-749
/vendor/fuse-emulator/fuse-1.0.0a/libspectrum:668-669
/vendor/fuse-emulator/fuse-r4617/libspectrum:686
\ No newline at end of property
Modified: trunk/libspectrum/libspectrum/ChangeLog
===================================================================
--- trunk/libspectrum/libspectrum/ChangeLog 2013-05-18 13:41:18 UTC (rev 749)
+++ trunk/libspectrum/libspectrum/ChangeLog 2013-05-19 10:36:47 UTC (rev 750)
@@ -1,4 +1,4 @@
-201?-??-?? Philip Kendall <phi...@sh...>
+2013-05-18 Philip Kendall <phi...@sh...>
* libspectrum 1.1.0 released.
@@ -333,5 +333,5 @@
* libspectrum separated from Fuse just before the 0.5.0 release of
Fuse; see Fuse's ChangeLog for changes up to this point
-$Id: ChangeLog 4801 2012-12-26 10:55:01Z fredm $
+$Id: ChangeLog 4948 2013-05-16 21:00:24Z pak21 $
Modified: trunk/libspectrum/libspectrum/Makefile.am
===================================================================
--- trunk/libspectrum/libspectrum/Makefile.am 2013-05-18 13:41:18 UTC (rev 749)
+++ trunk/libspectrum/libspectrum/Makefile.am 2013-05-19 10:36:47 UTC (rev 750)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
-## Copyright (c) 2001-2004 Philip Kendall
+## Copyright (c) 2001-2013 Philip Kendall
-## $Id: Makefile.am 4757 2012-11-07 11:14:48Z fredm $
+## $Id: Makefile.am 4935 2013-05-16 19:43:50Z pak21 $
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -63,7 +63,7 @@
zlib.c \
zxs.c
-libspectrum_la_LDFLAGS = -version-info 8:0:0 -no-undefined @WINDRES_LDFLAGS@
+libspectrum_la_LDFLAGS = -version-info 9:0:0 -no-undefined @WINDRES_LDFLAGS@
libspectrum_la_LIBADD = @AUDIOFILE_LIBS@ @GLIB_LIBS@ -lm
Modified: trunk/libspectrum/libspectrum/README
===================================================================
--- trunk/libspectrum/libspectrum/README 2013-05-18 13:41:18 UTC (rev 749)
+++ trunk/libspectrum/libspectrum/README 2013-05-19 10:36:47 UTC (rev 750)
@@ -67,6 +67,6 @@
Then, type "make" and if everything went well, "make install".
Philip Kendall <phi...@sh...>
-?? ??? 201?
+18th May, 2013
-$Id: README 4801 2012-12-26 10:55:01Z fredm $
+$Id: README 4951 2013-05-17 18:48:41Z pak21 $
Modified: trunk/libspectrum/libspectrum/doc/libspectrum.3
===================================================================
--- trunk/libspectrum/libspectrum/doc/libspectrum.3 2013-05-18 13:41:18 UTC (rev 749)
+++ trunk/libspectrum/libspectrum/doc/libspectrum.3 2013-05-19 10:36:47 UTC (rev 750)
@@ -1,7 +1,7 @@
.\" -*- nroff -*-
.\"
.\" libspectrum.3: libspectrum summary
-.\" Copyright (c) 2004-2008 Philip Kendall
+.\" Copyright (c) 2004-2013 Philip Kendall
.\"
.\" 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,7 +22,7 @@
.\" E-mail: phi...@sh...
.\"
.\"
-.TH libspectrum 3 "16th December, 2010" "Version 1.0.0" "Emulators"
+.TH libspectrum 3 "18th May, 2013" "Version 1.1.0" "Emulators"
.\"
.\"------------------------------------------------------------------
.\"
Modified: trunk/libspectrum/libspectrum/hacking/ChangeLog
===================================================================
--- trunk/libspectrum/libspectrum/hacking/ChangeLog 2013-05-18 13:41:18 UTC (rev 749)
+++ trunk/libspectrum/libspectrum/hacking/ChangeLog 2013-05-19 10:36:47 UTC (rev 750)
@@ -942,3 +942,7 @@
patch #305).
20130307 accessor.pl,snap_accessors.txt,szx.c: implement Spectranet's "suppress
NMI" flipflop (bug #259).
+20130516 Makefile.am: update library version number for 1.1 release.
+20130516 doc/libspectrum.3: update version number and date for 1.1 release.
+20130516 ChangeLog: update date in main changelog.
+20130517 README: update one more date for the 1.1 release.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2013-05-18 13:41:21
|
Revision: 749
http://sourceforge.net/p/fuse-for-macosx/code/749
Author: fredm
Date: 2013-05-18 13:41:18 +0000 (Sat, 18 May 2013)
Log Message:
-----------
Tag vendor/fuse-emulator/current as
vendor/fuse-emulator/fuse-1.1.0-r4959.
Revision Links:
--------------
http://sourceforge.net/p/fuse-for-macosx/code/4959
Added Paths:
-----------
vendor/fuse-emulator/fuse-1.1.0-r4959/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2013-05-18 13:41:02
|
Revision: 748
http://sourceforge.net/p/fuse-for-macosx/code/748
Author: fredm
Date: 2013-05-18 13:40:59 +0000 (Sat, 18 May 2013)
Log Message:
-----------
Load . into vendor/fuse-emulator/current.
Modified Paths:
--------------
vendor/fuse-emulator/current/fuse/ChangeLog
vendor/fuse-emulator/current/fuse/README
vendor/fuse-emulator/current/fuse/hacking/ChangeLog
vendor/fuse-emulator/current/fuse/man/fuse.1
vendor/fuse-emulator/current/libspectrum/ChangeLog
vendor/fuse-emulator/current/libspectrum/Makefile.am
vendor/fuse-emulator/current/libspectrum/README
vendor/fuse-emulator/current/libspectrum/doc/libspectrum.3
vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog
Modified: vendor/fuse-emulator/current/fuse/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse/ChangeLog 2013-05-18 11:45:11 UTC (rev 747)
+++ vendor/fuse-emulator/current/fuse/ChangeLog 2013-05-18 13:40:59 UTC (rev 748)
@@ -1,4 +1,4 @@
-201?-??-?? Philip Kendall <phi...@sh...>
+2013-05-18 Philip Kendall <phi...@sh...>
* Fuse 1.1.0 released.
@@ -1094,4 +1094,4 @@
* Version 0.1.0 released.
-$Id: ChangeLog 4879 2013-02-12 00:36:01Z zubzero $
+$Id: ChangeLog 4944 2013-05-16 20:55:22Z pak21 $
Modified: vendor/fuse-emulator/current/fuse/README
===================================================================
--- vendor/fuse-emulator/current/fuse/README 2013-05-18 11:45:11 UTC (rev 747)
+++ vendor/fuse-emulator/current/fuse/README 2013-05-18 13:40:59 UTC (rev 748)
@@ -25,7 +25,7 @@
* Support for the RZX input recording file format, including
rollback and 'competition mode'.
* Emulation of the DivIDE, Interface 1, Kempston mouse, Spectrum +3e,
- ZXATASP, ZXCF, Beta 128, Opus Discovery and +D interfaces.
+ ZXATASP, ZXCF, Beta 128, Opus Discovery, +D and DISCiPLE interfaces.
Help! <xyz> doesn't work
------------------------
@@ -105,6 +105,6 @@
<http://www.worldofspectrum.org/forums/>.
Philip Kendall <phi...@sh...>
-?? ???? 2012
+18th May, 2013
-$Id: README 4846 2013-01-03 09:14:29Z zubzero $
+$Id: README 4958 2013-05-18 13:07:46Z zubzero $
Modified: vendor/fuse-emulator/current/fuse/hacking/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse/hacking/ChangeLog 2013-05-18 11:45:11 UTC (rev 747)
+++ vendor/fuse-emulator/current/fuse/hacking/ChangeLog 2013-05-18 13:40:59 UTC (rev 748)
@@ -4480,3 +4480,7 @@
complete some missing field initializers (Sergio).
20130505 peripherals/if1.c: put braces around empty body in ‘do’ statements
(Sergio).
+20130516 man/fuse.1: update date and version for 1.1 release.
+20130516 ChangeLog: update date in main changelog.
+20130517 README: update date for 1.1 release.
+20130518 README: mention DISCiPLE support (Stuart).
Modified: vendor/fuse-emulator/current/fuse/man/fuse.1
===================================================================
--- vendor/fuse-emulator/current/fuse/man/fuse.1 2013-05-18 11:45:11 UTC (rev 747)
+++ vendor/fuse-emulator/current/fuse/man/fuse.1 2013-05-18 13:40:59 UTC (rev 748)
@@ -1,7 +1,7 @@
.\" -*- nroff -*-
.\"
.\" fuse.1: Fuse man page
-.\" Copyright (c) 2001-2010 Russell Marks, Philip Kendall, Darren Salt,
+.\" Copyright (c) 2001-2013 Russell Marks, Philip Kendall, Darren Salt,
.\" Fredrick Meunier, Stuart Brady
.\"
.\" This program is free software; you can redistribute it and/or modify
@@ -23,7 +23,7 @@
.\" E-mail: phi...@sh...
.\"
.\"
-.TH fuse 1 "??th ????, 201?" "Version 1.1.0" "Emulators"
+.TH fuse 1 "18th May, 2013" "Version 1.1.0" "Emulators"
.\"
.\"------------------------------------------------------------------
.\"
Modified: vendor/fuse-emulator/current/libspectrum/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/libspectrum/ChangeLog 2013-05-18 11:45:11 UTC (rev 747)
+++ vendor/fuse-emulator/current/libspectrum/ChangeLog 2013-05-18 13:40:59 UTC (rev 748)
@@ -1,4 +1,4 @@
-201?-??-?? Philip Kendall <phi...@sh...>
+2013-05-18 Philip Kendall <phi...@sh...>
* libspectrum 1.1.0 released.
@@ -333,5 +333,5 @@
* libspectrum separated from Fuse just before the 0.5.0 release of
Fuse; see Fuse's ChangeLog for changes up to this point
-$Id: ChangeLog 4801 2012-12-26 10:55:01Z fredm $
+$Id: ChangeLog 4948 2013-05-16 21:00:24Z pak21 $
Modified: vendor/fuse-emulator/current/libspectrum/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/libspectrum/Makefile.am 2013-05-18 11:45:11 UTC (rev 747)
+++ vendor/fuse-emulator/current/libspectrum/Makefile.am 2013-05-18 13:40:59 UTC (rev 748)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
-## Copyright (c) 2001-2004 Philip Kendall
+## Copyright (c) 2001-2013 Philip Kendall
-## $Id: Makefile.am 4757 2012-11-07 11:14:48Z fredm $
+## $Id: Makefile.am 4935 2013-05-16 19:43:50Z pak21 $
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -63,7 +63,7 @@
zlib.c \
zxs.c
-libspectrum_la_LDFLAGS = -version-info 8:0:0 -no-undefined @WINDRES_LDFLAGS@
+libspectrum_la_LDFLAGS = -version-info 9:0:0 -no-undefined @WINDRES_LDFLAGS@
libspectrum_la_LIBADD = @AUDIOFILE_LIBS@ @GLIB_LIBS@ -lm
Modified: vendor/fuse-emulator/current/libspectrum/README
===================================================================
--- vendor/fuse-emulator/current/libspectrum/README 2013-05-18 11:45:11 UTC (rev 747)
+++ vendor/fuse-emulator/current/libspectrum/README 2013-05-18 13:40:59 UTC (rev 748)
@@ -67,6 +67,6 @@
Then, type "make" and if everything went well, "make install".
Philip Kendall <phi...@sh...>
-?? ??? 201?
+18th May, 2013
-$Id: README 4801 2012-12-26 10:55:01Z fredm $
+$Id: README 4951 2013-05-17 18:48:41Z pak21 $
Modified: vendor/fuse-emulator/current/libspectrum/doc/libspectrum.3
===================================================================
--- vendor/fuse-emulator/current/libspectrum/doc/libspectrum.3 2013-05-18 11:45:11 UTC (rev 747)
+++ vendor/fuse-emulator/current/libspectrum/doc/libspectrum.3 2013-05-18 13:40:59 UTC (rev 748)
@@ -1,7 +1,7 @@
.\" -*- nroff -*-
.\"
.\" libspectrum.3: libspectrum summary
-.\" Copyright (c) 2004-2008 Philip Kendall
+.\" Copyright (c) 2004-2013 Philip Kendall
.\"
.\" 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,7 +22,7 @@
.\" E-mail: phi...@sh...
.\"
.\"
-.TH libspectrum 3 "16th December, 2010" "Version 1.0.0" "Emulators"
+.TH libspectrum 3 "18th May, 2013" "Version 1.1.0" "Emulators"
.\"
.\"------------------------------------------------------------------
.\"
Modified: vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog 2013-05-18 11:45:11 UTC (rev 747)
+++ vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog 2013-05-18 13:40:59 UTC (rev 748)
@@ -942,3 +942,7 @@
patch #305).
20130307 accessor.pl,snap_accessors.txt,szx.c: implement Spectranet's "suppress
NMI" flipflop (bug #259).
+20130516 Makefile.am: update library version number for 1.1 release.
+20130516 doc/libspectrum.3: update version number and date for 1.1 release.
+20130516 ChangeLog: update date in main changelog.
+20130517 README: update one more date for the 1.1 release.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2013-05-18 11:45:15
|
Revision: 747
http://sourceforge.net/p/fuse-for-macosx/code/747
Author: fredm
Date: 2013-05-18 11:45:11 +0000 (Sat, 18 May 2013)
Log Message:
-----------
Merge up to vendor revision 4927.
Revision Links:
--------------
http://sourceforge.net/p/fuse-for-macosx/code/4927
Modified Paths:
--------------
trunk/fuse/fusepb/resources/Fuse Help/html/spectranet.html
trunk/fuse/hacking/ChangeLog
trunk/fuse/machines/machines_periph.c
trunk/fuse/machines/spec128.h
trunk/fuse/machines/specplus2.c
trunk/fuse/man/fuse.1
trunk/fuse/peripherals/ay.c
trunk/fuse/peripherals/disk/beta.c
trunk/fuse/peripherals/disk/opus.c
trunk/fuse/peripherals/disk/opus.h
trunk/fuse/peripherals/fuller.c
trunk/fuse/peripherals/ide/divide.h
trunk/fuse/peripherals/ide/simpleide.c
trunk/fuse/peripherals/if1.c
trunk/fuse/peripherals/if2.c
trunk/fuse/peripherals/joystick.c
trunk/fuse/peripherals/kempmouse.c
trunk/fuse/peripherals/kempmouse.h
trunk/fuse/peripherals/melodik.c
trunk/fuse/peripherals/printer.c
trunk/fuse/peripherals/scld.c
trunk/fuse/peripherals/speccyboot.c
trunk/fuse/peripherals/specdrum.c
trunk/fuse/peripherals/specdrum.h
trunk/fuse/peripherals/spectranet.c
trunk/fuse/peripherals/ula.c
trunk/fuse/settings-header.pl
trunk/fuse/sound.c
trunk/fuse/unittests/unittests.c
Property Changed:
----------------
trunk/fuse/
Index: trunk/fuse
===================================================================
--- trunk/fuse 2013-05-18 11:04:37 UTC (rev 746)
+++ trunk/fuse 2013-05-18 11:45:11 UTC (rev 747)
Property changes on: trunk/fuse
___________________________________________________________________
Modified: svn:mergeinfo
## -1,5 +1,5 ##
/vendor/fuse-emulator/0.10.0/fuse:556-557
/vendor/fuse-emulator/0.10.0-pre1/fuse:545-546
-/vendor/fuse-emulator/current/fuse:530-741
+/vendor/fuse-emulator/current/fuse:530-746
/vendor/fuse-emulator/fuse-1.0.0a/fuse:668-669
/vendor/fuse-emulator/fuse-r4617/fuse:686
\ No newline at end of property
Modified: trunk/fuse/fusepb/resources/Fuse Help/html/spectranet.html
===================================================================
--- trunk/fuse/fusepb/resources/Fuse Help/html/spectranet.html 2013-05-18 11:04:37 UTC (rev 746)
+++ trunk/fuse/fusepb/resources/Fuse Help/html/spectranet.html 2013-05-18 11:45:11 UTC (rev 747)
@@ -23,6 +23,8 @@
+
+
preferences</em></span></font></a><font face="Lucida
Grande,Helvetica,Arial"> dialog, and the state of its </font><font
face="Lucida Grande,Helvetica,Arial">automatic page-in</font><font
@@ -63,6 +65,8 @@
+
+
preferences</em></span></font></a><font face="Lucida
Grande,Helvetica,Arial"> dialog</font><font face="Lucida
Grande,Helvetica,Arial">. Once that's done, open the installer
@@ -90,6 +94,8 @@
Grande,Helvetica,Arial"> </font><font face="Lucida
Grande,Helvetica,Arial"><span style="font-style: italic;">Spectranet
+
+
disable</span></font><font face="Lucida
Grande,Helvetica,Arial"><span class="emphasis"><em></em></span></font>
<font face="Lucida Grande,Helvetica,Arial">option</font><font
@@ -105,9 +111,15 @@
Spectranet" and ending with the Spectranet's IP address (which
will be 255.255.255.255 at this stage).<br>
<br>
- If you see all that, trigger an NMI (the Machine > NMI menu
- option) and you should get a white on blue Spectranet NMI menu
- with five options.<br>
+ If you see all that, type the following command:<br>
+ </font></p>
+ <font face="Lucida Grande,Helvetica,Arial"><big><span
+ style="font-family: monospace;">%cfgnew</span></big><br>
+ </font>
+ <p><font face="Lucida Grande,Helvetica,Arial">Which will show the
+ standard 0 OK, 0:1 at the bottom of the screen. Now, trigger an
+ NMI (the Machine > NMI menu option) and you should get a
+ white on blue Spectranet NMI menu with five options.<br>
<br>
Select [A] Configure network settings - this should lead you to
another menu, which will scroll of the top of the screen; don't
@@ -157,6 +169,8 @@
+
+
: 255.255.255.000</span><br style="font-family: monospace;">
<span style="font-family: monospace;">Default gateway :
192.168.000.001</span><br style="font-family: monospace;">
@@ -173,6 +187,8 @@
+
+
: fuse</span><br style="font-family: monospace;">
<br style="font-family: monospace;">
<span style="font-family: monospace;"><menu options></span></big><font
Modified: trunk/fuse/hacking/ChangeLog
===================================================================
--- trunk/fuse/hacking/ChangeLog 2013-05-18 11:04:37 UTC (rev 746)
+++ trunk/fuse/hacking/ChangeLog 2013-05-18 11:45:11 UTC (rev 747)
@@ -4456,8 +4456,27 @@
20130404 ui/win32/win32joystick.c: fix input events fired when various joystick
buttons are pressed simultaneously (Sergio).
20130407 input.[ch],man/fuse.1,settings.dat,ui/{gtk/gtkjoystick.c,
- sdl/sdljoystick.c,uijoystick.c,widget/menu.c}: allow up to 15 joytick
- buttons to be defined to accomodate e.g. XBox 360 ABXY button use
+ sdl/sdljoystick.c,uijoystick.c,widget/menu.c}: allow up to 15 joystick
+ buttons to be defined to accommodate e.g. XBox 360 ABXY button use
(patch #309) (Fred).
20130420 peripherals/disk/disk.c: fix loading of EDSK files with redundant
sector images (bug #293) (Fred).
+20130420 peripherals/spectranet.c: allow disabling Spectranet code (more from
+ bug #259) (Sergio).
+20130501 sound.c: don't try to enable right channel for Specdrum unless stereo
+ mode is set (fixes bug #294) (thanks, mcleod_ideafix and Sergio)
+ (Fred).
+20130501 man/fuse.1: add %cfgnew step in Spectranet initialisation steps
+ (thanks, smogit and Guesser) (Fred).
+20130505 peripherals/{disk/opus.h,specdrum.h}: add missing subversion properties
+ (Sergio).
+20130505 machines/{spec128.h,specplus2.c},peripherals/{disk/opus.h,ide/divide.h,
+ kempmouse.h,specdrum.h},settings-header.pl: remove and relocate some
+ header inclusions (Sergio).
+20130505 unittests/unittests.c: add missing header (Sergio).
+20130505 peripherals/{ay.c,fuller.c,if1.c,if2.c,joystick.c,kempmouse.c,
+ machines_periph.c,melodik.c,printer.c,scld.c,speccyboot.c,specdrum.c,
+ ula.c},peripherals/disk/{beta.c,opus.c}, peripherals/ide/simpleide.c:
+ complete some missing field initializers (Sergio).
+20130505 peripherals/if1.c: put braces around empty body in ‘do’ statements
+ (Sergio).
Modified: trunk/fuse/machines/machines_periph.c
===================================================================
--- trunk/fuse/machines/machines_periph.c 2013-05-18 11:04:37 UTC (rev 746)
+++ trunk/fuse/machines/machines_periph.c 2013-05-18 11:45:11 UTC (rev 747)
@@ -1,7 +1,7 @@
/* machines_periph.c: various machine-specific peripherals
Copyright (c) 2011 Philip Kendall
- $Id: machines_periph.c 4624 2012-01-09 20:59:35Z pak21 $
+ $Id: machines_periph.c 4926 2013-05-05 07:58:18Z sbaldovi $
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
@@ -49,7 +49,9 @@
static const periph_t spec128_memory = {
NULL,
- spec128_memory_ports
+ spec128_memory_ports,
+ 0,
+ NULL
};
static const periph_port_t plus3_memory_ports[] = {
@@ -60,7 +62,9 @@
static const periph_t plus3_memory = {
NULL,
- plus3_memory_ports
+ plus3_memory_ports,
+ 0,
+ NULL
};
static const periph_port_t upd765_ports[] = {
@@ -71,7 +75,9 @@
static const periph_t upd765 = {
NULL,
- upd765_ports
+ upd765_ports,
+ 0,
+ NULL
};
static const periph_port_t se_memory_ports[] = {
@@ -81,7 +87,9 @@
static const periph_t se_memory = {
NULL,
- se_memory_ports
+ se_memory_ports,
+ 0,
+ NULL
};
static const periph_port_t tc2068_ay_ports[] = {
@@ -92,7 +100,9 @@
static const periph_t tc2068_ay = {
NULL,
- tc2068_ay_ports
+ tc2068_ay_ports,
+ 0,
+ NULL
};
static const periph_port_t beta128_pentagon_ports[] = {
@@ -106,7 +116,9 @@
static const periph_t beta128_pentagon = {
NULL,
- beta128_pentagon_ports
+ beta128_pentagon_ports,
+ 0,
+ NULL
};
static const periph_port_t beta128_pentagon_late_ports[] = {
@@ -120,7 +132,9 @@
static const periph_t beta128_pentagon_late = {
NULL,
- beta128_pentagon_late_ports
+ beta128_pentagon_late_ports,
+ 0,
+ NULL
};
static const periph_port_t pentagon1024_memory_ports[] = {
@@ -131,7 +145,9 @@
static const periph_t pentagon1024_memory = {
NULL,
- pentagon1024_memory_ports
+ pentagon1024_memory_ports,
+ 0,
+ NULL
};
void
Modified: trunk/fuse/machines/spec128.h
===================================================================
--- trunk/fuse/machines/spec128.h 2013-05-18 11:04:37 UTC (rev 746)
+++ trunk/fuse/machines/spec128.h 2013-05-18 11:45:11 UTC (rev 747)
@@ -1,7 +1,7 @@
/* spec128.h: Spectrum 128K specific routines
Copyright (c) 1999-2004 Philip Kendall
- $Id: spec128.h 4277 2011-01-24 22:01:43Z pak21 $
+ $Id: spec128.h 4924 2013-05-05 07:40:02Z sbaldovi $
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,7 +29,6 @@
#include <libspectrum.h>
#include "machine.h"
-#include "periph.h"
int spec128_init( fuse_machine_info *machine );
int spec128_common_reset( int contention );
Modified: trunk/fuse/machines/specplus2.c
===================================================================
--- trunk/fuse/machines/specplus2.c 2013-05-18 11:04:37 UTC (rev 746)
+++ trunk/fuse/machines/specplus2.c 2013-05-18 11:45:11 UTC (rev 747)
@@ -1,7 +1,7 @@
/* specplus2.c: Spectrum +2 specific routines
Copyright (c) 1999-2011 Philip Kendall
- $Id: specplus2.c 4638 2012-01-21 12:52:14Z fredm $
+ $Id: specplus2.c 4924 2013-05-05 07:40:02Z sbaldovi $
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 "machine.h"
#include "machines_periph.h"
#include "machines.h"
+#include "periph.h"
#include "peripherals/disk/beta.h"
#include "settings.h"
#include "spec128.h"
Modified: trunk/fuse/man/fuse.1
===================================================================
--- trunk/fuse/man/fuse.1 2013-05-18 11:04:37 UTC (rev 746)
+++ trunk/fuse/man/fuse.1 2013-05-18 11:45:11 UTC (rev 747)
@@ -3740,7 +3740,11 @@
starting with \(lqAlioth Spectranet\(rq and ending with the Spectranet's IP
address (which will be 255.255.255.255 at this stage).
.PP
-If you see all that, trigger an NMI (the Machine / NMI menu option)
+If you see all that, type the following command:
+.PP
+%cfgnew
+.PP
+Which will show the standard 0 OK, 0:1 at the bottom of the screen. Now trigger an NMI (the Machine / NMI menu option)
and you should get a white on blue Spectranet NMI menu with five
options.
.PP
Modified: trunk/fuse/peripherals/ay.c
===================================================================
--- trunk/fuse/peripherals/ay.c 2013-05-18 11:04:37 UTC (rev 746)
+++ trunk/fuse/peripherals/ay.c 2013-05-18 11:45:11 UTC (rev 747)
@@ -1,7 +1,7 @@
/* ay.c: AY-8-3912 routines
Copyright (c) 1999-2009 Philip Kendall
- $Id: ay.c 4640 2012-01-21 13:26:35Z pak21 $
+ $Id: ay.c 4926 2013-05-05 07:58:18Z sbaldovi $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -66,7 +66,9 @@
static periph_t ay_periph = {
NULL,
- ay_ports
+ ay_ports,
+ 0,
+ NULL
};
static periph_port_t ay_ports_plus3[] = {
@@ -77,7 +79,9 @@
static periph_t ay_periph_plus3 = {
NULL,
- ay_ports_plus3
+ ay_ports_plus3,
+ 0,
+ NULL
};
static periph_port_t ay_ports_full_decode[] = {
@@ -88,7 +92,9 @@
static periph_t ay_periph_full_decode = {
NULL,
- ay_ports_full_decode
+ ay_ports_full_decode,
+ 0,
+ NULL
};
static periph_port_t ay_ports_timex[] = {
@@ -99,7 +105,9 @@
static periph_t ay_periph_timex = {
NULL,
- ay_ports_timex
+ ay_ports_timex,
+ 0,
+ NULL
};
void
Modified: trunk/fuse/peripherals/disk/beta.c
===================================================================
--- trunk/fuse/peripherals/disk/beta.c 2013-05-18 11:04:37 UTC (rev 746)
+++ trunk/fuse/peripherals/disk/beta.c 2013-05-18 11:45:11 UTC (rev 747)
@@ -1,7 +1,7 @@
/* beta.c: Routines for handling the Beta disk interface
Copyright (c) 2004-2011 Stuart Brady, Philip Kendall
- $Id: beta.c 4906 2013-03-10 11:21:37Z fredm $
+ $Id: beta.c 4926 2013-05-05 07:58:18Z sbaldovi $
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
@@ -92,7 +92,8 @@
static const periph_t beta_peripheral = {
&settings_current.beta128,
beta_ports,
- 1
+ 1,
+ NULL
};
static void beta_reset( int hard_reset );
Modified: trunk/fuse/peripherals/disk/opus.c
===================================================================
--- trunk/fuse/peripherals/disk/opus.c 2013-05-18 11:04:37 UTC (rev 746)
+++ trunk/fuse/peripherals/disk/opus.c 2013-05-18 11:45:11 UTC (rev 747)
@@ -2,7 +2,7 @@
Copyright (c) 1999-2011 Stuart Brady, Fredrick Meunier, Philip Kendall,
Dmitry Sanarin, Darren Salt, Michael D Wynne, Gergely Szasz
- $Id: opus.c 4906 2013-03-10 11:21:37Z fredm $
+ $Id: opus.c 4926 2013-05-05 07:58:18Z sbaldovi $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -102,7 +102,8 @@
static const periph_t opus_periph = {
&settings_current.opus,
NULL,
- 1
+ 1,
+ NULL
};
void
Modified: trunk/fuse/peripherals/disk/opus.h
===================================================================
--- trunk/fuse/peripherals/disk/opus.h 2013-05-18 11:04:37 UTC (rev 746)
+++ trunk/fuse/peripherals/disk/opus.h 2013-05-18 11:45:11 UTC (rev 747)
@@ -1,7 +1,7 @@
/* opus.h: Routines for handling the Opus Discovery interface
Copyright (c) 2005-2009 Stuart Brady, Fredrick Meunier
- $Id$
+ $Id: opus.h 4924 2013-05-05 07:40:02Z sbaldovi $
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,16 +30,15 @@
#include <config.h>
+#include <libspectrum.h>
+
+#include "fdd.h"
+
typedef enum opus_drive_number {
OPUS_DRIVE_1 = 0,
OPUS_DRIVE_2,
} opus_drive_number;
-#include <libspectrum.h>
-
-#include "periph.h"
-#include "fdd.h"
-
extern int opus_available; /* Is the Opus available for use? */
extern int opus_active; /* Opus enabled? */
Modified: trunk/fuse/peripherals/fuller.c
===================================================================
--- trunk/fuse/peripherals/fuller.c 2013-05-18 11:04:37 UTC (rev 746)
+++ trunk/fuse/peripherals/fuller.c 2013-05-18 11:45:11 UTC (rev 747)
@@ -1,7 +1,7 @@
/* fuller.c: Routines for handling the Fuller Box
Copyright (c) 2007-2011 Stuart Brady, Fredrick Meunier, Philip Kendall
- $Id: fuller.c 4906 2013-03-10 11:21:37Z fredm $
+ $Id: fuller.c 4926 2013-05-05 07:58:18Z sbaldovi $
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
@@ -59,7 +59,8 @@
static const periph_t fuller_periph = {
&settings_current.fuller,
fuller_ports,
- 1
+ 1,
+ NULL
};
static void
Modified: trunk/fuse/peripherals/ide/divide.h
===================================================================
--- trunk/fuse/peripherals/ide/divide.h 2013-05-18 11:04:37 UTC (rev 746)
+++ trunk/fuse/peripherals/ide/divide.h 2013-05-18 11:45:11 UTC (rev 747)
@@ -1,7 +1,7 @@
/* divide.h: DivIDE interface routines
Copyright (c) 2005 Matthew Westcott
- $Id: divide.h 4664 2012-02-12 11:51:01Z fredm $
+ $Id: divide.h 4924 2013-05-05 07:40:02Z sbaldovi $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -27,7 +27,6 @@
#define FUSE_DIVIDE_H
#include <libspectrum.h>
-#include "periph.h"
/* Whether DivIDE is currently paged in */
extern int divide_active;
Modified: trunk/fuse/peripherals/ide/simpleide.c
===================================================================
--- trunk/fuse/peripherals/ide/simpleide.c 2013-05-18 11:04:37 UTC (rev 746)
+++ trunk/fuse/peripherals/ide/simpleide.c 2013-05-18 11:45:11 UTC (rev 747)
@@ -3,7 +3,7 @@
2004 Philip Kendall,
2008 Fredrick Meunier
- $Id: simpleide.c 4906 2013-03-10 11:21:37Z fredm $
+ $Id: simpleide.c 4926 2013-05-05 07:58:18Z sbaldovi $
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
@@ -51,7 +51,8 @@
static const periph_t simpleide_periph = {
&settings_current.simpleide_active,
simpleide_ports,
- 1
+ 1,
+ NULL
};
static libspectrum_ide_channel *simpleide_idechn;
Modified: trunk/fuse/peripherals/if1.c
===================================================================
--- trunk/fuse/peripherals/if1.c 2013-05-18 11:04:37 UTC (rev 746)
+++ trunk/fuse/peripherals/if1.c 2013-05-18 11:45:11 UTC (rev 747)
@@ -1,7 +1,7 @@
/* if1.c: Interface 1 handling routines
Copyright (c) 2004-2011 Gergely Szasz, Philip Kendall
- $Id: if1.c 4906 2013-03-10 11:21:37Z fredm $
+ $Id: if1.c 4927 2013-05-05 08:05:11Z sbaldovi $
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
@@ -221,7 +221,8 @@
static const periph_t if1_periph = {
&settings_current.interface1,
if1_ports,
- 1
+ 1,
+ NULL
};
/* Memory source */
@@ -897,8 +898,8 @@
if( settings_current.rs232_handshake &&
if1_ula.fd_t != -1 && if1_ula.cts != val ) {
char data = val ? 0x03 : 0x02;
- do ; while( write( if1_ula.fd_t, "", 1 ) != 1 );
- do ; while( write( if1_ula.fd_t, &data, 1 ) != 1 );
+ do {} while( write( if1_ula.fd_t, "", 1 ) != 1 );
+ do {} while( write( if1_ula.fd_t, &data, 1 ) != 1 );
}
if1_ula.cts = val;
@@ -947,15 +948,15 @@
if( if1_ula.count_out == -1 ) {
if1_ula.count_out = 13;
if1_ula.data_out = '?';
- do ; while( write( if1_ula.fd_t, "", 1 ) != 1 );
+ do {} while( write( if1_ula.fd_t, "", 1 ) != 1 );
}
if( if1_ula.count_out == 13 ) {
/* Here is the output routine */
if( if1_ula.data_out == 0x00 ) {
if1_ula.data_out = '*';
- do ; while( write( if1_ula.fd_t, "", 1 ) != 1 );
+ do {} while( write( if1_ula.fd_t, "", 1 ) != 1 );
}
- do ; while( write( if1_ula.fd_t, &if1_ula.data_out, 1 ) != 1 );
+ do {} while( write( if1_ula.fd_t, &if1_ula.data_out, 1 ) != 1 );
if1_ula.count_out = 0;
}
if1_ula.rx = val & 0x01; /* set rx */
@@ -970,7 +971,7 @@
*/
if1_ula.net = ( val & 0x01 ) ? 0 : 1; /* set rx */
lseek( if1_ula.fd_net, 0, SEEK_SET ); /* we save only the state of the wire*/
- do ; while( write( if1_ula.fd_net, &if1_ula.net, 1 ) == -1 );
+ do {} while( write( if1_ula.fd_net, &if1_ula.net, 1 ) == -1 );
#ifdef HAVE_FSYNC
fsync( if1_ula.fd_net );
#endif /* #ifdef HAVE_FSYNC */
@@ -988,7 +989,7 @@
/* lseek( if1_ula.fd_net, 0, SEEK_SET ); start a packet */
/* first we send the station number */
- do ; while( write( if1_ula.fd_net, &if1_ula.net_data, 1 ) == -1 );
+ do {} while( write( if1_ula.fd_net, &if1_ula.net_data, 1 ) == -1 );
#ifdef HAVE_FSYNC
fsync( if1_ula.fd_net );
#endif /* #ifdef HAVE_FSYNC */
Modified: trunk/fuse/peripherals/if2.c
===================================================================
--- trunk/fuse/peripherals/if2.c 2013-05-18 11:04:37 UTC (rev 746)
+++ trunk/fuse/peripherals/if2.c 2013-05-18 11:45:11 UTC (rev 747)
@@ -1,7 +1,7 @@
/* if2.c: Interface 2 cartridge handling routines
Copyright (c) 2003-2011 Darren Salt, Fredrick Meunier, Philip Kendall
- $Id: if2.c 4872 2013-02-02 20:54:33Z fredm $
+ $Id: if2.c 4926 2013-05-05 07:58:18Z sbaldovi $
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
@@ -65,6 +65,8 @@
static const periph_t if2_periph = {
&settings_current.interface2,
+ NULL,
+ 0,
NULL
};
Modified: trunk/fuse/peripherals/joystick.c
===================================================================
--- trunk/fuse/peripherals/joystick.c 2013-05-18 11:04:37 UTC (rev 746)
+++ trunk/fuse/peripherals/joystick.c 2013-05-18 11:45:11 UTC (rev 747)
@@ -1,7 +1,7 @@
/* joystick.c: Joystick emulation support
Copyright (c) 2001-2011 Russell Marks, Darren Salt, Philip Kendall
- $Id: joystick.c 4299 2011-02-08 22:24:30Z pak21 $
+ $Id: joystick.c 4926 2013-05-05 07:58:18Z sbaldovi $
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
@@ -104,7 +104,9 @@
static const periph_t kempston_strict_periph = {
&settings_current.joy_kempston,
- kempston_strict_decoding
+ kempston_strict_decoding,
+ 0,
+ NULL
};
static const periph_port_t kempston_loose_decoding[] = {
@@ -114,7 +116,9 @@
static const periph_t kempston_loose_periph = {
&settings_current.joy_kempston,
- kempston_loose_decoding
+ kempston_loose_decoding,
+ 0,
+ NULL
};
/* Init/shutdown functions. Errors aren't important here */
Modified: trunk/fuse/peripherals/kempmouse.c
===================================================================
--- trunk/fuse/peripherals/kempmouse.c 2013-05-18 11:04:37 UTC (rev 746)
+++ trunk/fuse/peripherals/kempmouse.c 2013-05-18 11:45:11 UTC (rev 747)
@@ -1,7 +1,7 @@
/* kempmouse.c: Kempston mouse emulation
Copyright (c) 2004-2008 Darren Salt, Fredrick Meunier
- $Id: kempmouse.c 4906 2013-03-10 11:21:37Z fredm $
+ $Id: kempmouse.c 4926 2013-05-05 07:58:18Z sbaldovi $
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
@@ -73,7 +73,8 @@
static const periph_t kempmouse_periph = {
&settings_current.kempston_mouse,
kempmouse_ports,
- 1
+ 1,
+ NULL
};
void
Modified: trunk/fuse/peripherals/kempmouse.h
===================================================================
--- trunk/fuse/peripherals/kempmouse.h 2013-05-18 11:04:37 UTC (rev 746)
+++ trunk/fuse/peripherals/kempmouse.h 2013-05-18 11:45:11 UTC (rev 747)
@@ -1,7 +1,7 @@
/* kempmouse.h: Kempston mouse emulation
Copyright (c) 2004-2008 Darren Salt, Fredrick Meunier
- $Id: kempmouse.h 4640 2012-01-21 13:26:35Z pak21 $
+ $Id: kempmouse.h 4924 2013-05-05 07:40:02Z sbaldovi $
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,9 +26,6 @@
#ifndef FUSE_KEMPMOUSE_H
#define FUSE_KEMPMOUSE_H
-#include <libspectrum.h>
-#include "periph.h"
-
void kempmouse_init( void );
void kempmouse_update( int dx, int dy, int button, int down );
Modified: trunk/fuse/peripherals/melodik.c
===================================================================
--- trunk/fuse/peripherals/melodik.c 2013-05-18 11:04:37 UTC (rev 746)
+++ trunk/fuse/peripherals/melodik.c 2013-05-18 11:45:11 UTC (rev 747)
@@ -1,7 +1,7 @@
/* melodik.c: Routines for handling the Melodik interface
Copyright (c) 2009-2011 Fredrick Meunier, Philip Kendall
- $Id: melodik.c 4906 2013-03-10 11:21:37Z fredm $
+ $Id: melodik.c 4926 2013-05-05 07:58:18Z sbaldovi $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -57,7 +57,8 @@
static const periph_t melodik_periph = {
&settings_current.melodik,
melodik_ports,
- 1
+ 1,
+ NULL
};
static void
Modified: trunk/fuse/peripherals/printer.c
===================================================================
--- trunk/fuse/peripherals/printer.c 2013-05-18 11:04:37 UTC (rev 746)
+++ trunk/fuse/peripherals/printer.c 2013-05-18 11:45:11 UTC (rev 747)
@@ -1,7 +1,7 @@
/* printer.c: Printer support
Copyright (c) 2001-2004 Ian Collier, Russell Marks, Philip Kendall
- $Id: printer.c 4906 2013-03-10 11:21:37Z fredm $
+ $Id: printer.c 4926 2013-05-05 07:58:18Z sbaldovi $
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
@@ -91,7 +91,8 @@
static const periph_t printer_zxp_periph = {
&settings_current.zxprinter,
printer_zxp_ports,
- 1
+ 1,
+ NULL
};
static const periph_port_t printer_zxp_ports_full_decode[] = {
@@ -101,7 +102,9 @@
static const periph_t printer_zxp_periph_full_decode = {
&settings_current.zxprinter,
- printer_zxp_ports_full_decode
+ printer_zxp_ports_full_decode,
+ 0,
+ NULL
};
static const periph_port_t printer_parallel_ports[] = {
@@ -111,7 +114,9 @@
static const periph_t printer_parallel_periph = {
&settings_current.printer,
- printer_parallel_ports
+ printer_parallel_ports,
+ 0,
+ NULL
};
static void printer_zxp_init(void)
Modified: trunk/fuse/peripherals/scld.c
===================================================================
--- trunk/fuse/peripherals/scld.c 2013-05-18 11:04:37 UTC (rev 746)
+++ trunk/fuse/peripherals/scld.c 2013-05-18 11:45:11 UTC (rev 747)
@@ -1,7 +1,7 @@
/* scld.c: Routines for handling the Timex SCLD
Copyright (c) 2002-2011 Fredrick Meunier, Philip Kendall, Witold Filipczyk
- $Id: scld.c 4872 2013-02-02 20:54:33Z fredm $
+ $Id: scld.c 4926 2013-05-05 07:58:18Z sbaldovi $
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
@@ -76,7 +76,9 @@
static const periph_t scld_periph = {
NULL,
- scld_ports
+ scld_ports,
+ 0,
+ NULL
};
void
Modified: trunk/fuse/peripherals/speccyboot.c
===================================================================
--- trunk/fuse/peripherals/speccyboot.c 2013-05-18 11:04:37 UTC (rev 746)
+++ trunk/fuse/peripherals/speccyboot.c 2013-05-18 11:45:11 UTC (rev 747)
@@ -3,7 +3,7 @@
Copyright (c) 2009-2011 Patrik Persson, Philip Kendall
- $Id: speccyboot.c 4906 2013-03-10 11:21:37Z fredm $
+ $Id: speccyboot.c 4926 2013-05-05 07:58:18Z sbaldovi $
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
@@ -75,7 +75,8 @@
static const periph_t speccyboot_periph = {
&settings_current.speccyboot,
speccyboot_ports,
- 1
+ 1,
+ NULL
};
/* ---------------------------------------------------------------------------
Modified: trunk/fuse/peripherals/specdrum.c
===================================================================
--- trunk/fuse/peripherals/specdrum.c 2013-05-18 11:04:37 UTC (rev 746)
+++ trunk/fuse/peripherals/specdrum.c 2013-05-18 11:45:11 UTC (rev 747)
@@ -1,7 +1,7 @@
/* specdrum.c: Routines for handling the Specdrum Drum Kit
Copyright (c) 2011 Jon Mitchell
- $Id: specdrum.c 4906 2013-03-10 11:21:37Z fredm $
+ $Id: specdrum.c 4926 2013-05-05 07:58:18Z sbaldovi $
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
@@ -59,7 +59,8 @@
static const periph_t specdrum_periph = {
&settings_current.specdrum,
specdrum_ports,
- 1
+ 1,
+ NULL
};
void
Modified: trunk/fuse/peripherals/specdrum.h
===================================================================
--- trunk/fuse/peripherals/specdrum.h 2013-05-18 11:04:37 UTC (rev 746)
+++ trunk/fuse/peripherals/specdrum.h 2013-05-18 11:45:11 UTC (rev 747)
@@ -1,7 +1,7 @@
/* specdrum.h: Routines for handling the Specdrum Drum Kit
Copyright (c) 2011 Jon Mitchell
- $Id$
+ $Id: specdrum.h 4924 2013-05-05 07:40:02Z sbaldovi $
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,8 +30,6 @@
#include <libspectrum.h>
-#include "periph.h"
-
typedef struct specdrum_info {
int specdrum_present; /* SpecDrum present */
libspectrum_signed_byte specdrum_dac; /* Current byte in the SpecDrum 8bit DAC */
Modified: trunk/fuse/peripherals/spectranet.c
===================================================================
--- trunk/fuse/peripherals/spectranet.c 2013-05-18 11:04:37 UTC (rev 746)
+++ trunk/fuse/peripherals/spectranet.c 2013-05-18 11:45:11 UTC (rev 747)
@@ -1,7 +1,7 @@
/* spectranet.c: Spectranet emulation
Copyright (c) 2011-2013 Philip Kendall
- $Id: spectranet.c 4906 2013-03-10 11:21:37Z fredm $
+ $Id: spectranet.c 4919 2013-04-20 07:47:56Z sbaldovi $
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
@@ -521,10 +521,26 @@
}
void
+spectranet_nmi( void )
+{
+}
+
+void
spectranet_unpage( void )
{
}
+void
+spectranet_retn( void )
+{
+}
+
+int
+spectranet_nmi_flipflop( void )
+{
+ return 0;
+}
+
libspectrum_byte
spectranet_w5100_read( memory_page *page GCC_UNUSED,
libspectrum_word address GCC_UNUSED )
Modified: trunk/fuse/peripherals/ula.c
===================================================================
--- trunk/fuse/peripherals/ula.c 2013-05-18 11:04:37 UTC (rev 746)
+++ trunk/fuse/peripherals/ula.c 2013-05-18 11:45:11 UTC (rev 747)
@@ -1,7 +1,7 @@
/* ula.c: ULA routines
Copyright (c) 1999-2011 Philip Kendall, Darren Salt
- $Id: ula.c 4640 2012-01-21 13:26:35Z pak21 $
+ $Id: ula.c 4926 2013-05-05 07:58:18Z sbaldovi $
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
@@ -71,7 +71,9 @@
static const periph_t ula_periph = {
NULL,
- ula_ports
+ ula_ports,
+ 0,
+ NULL
};
static const periph_port_t ula_ports_full_decode[] = {
@@ -81,7 +83,9 @@
static const periph_t ula_periph_full_decode = {
NULL,
- ula_ports_full_decode
+ ula_ports_full_decode,
+ 0,
+ NULL
};
void
Modified: trunk/fuse/settings-header.pl
===================================================================
--- trunk/fuse/settings-header.pl 2013-05-18 11:04:37 UTC (rev 746)
+++ trunk/fuse/settings-header.pl 2013-05-18 11:45:11 UTC (rev 747)
@@ -3,7 +3,7 @@
# settings-header.pl: generate settings.h from settings.dat
# Copyright (c) 2002-2003 Philip Kendall
-# $Id: settings-header.pl 4633 2012-01-19 23:26:10Z pak21 $
+# $Id: settings-header.pl 4924 2013-05-05 07:40:02Z sbaldovi $
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -64,13 +64,13 @@
/* This file is autogenerated from settings.dat by settings-header.pl.
Do not edit unless you know what will happen! */
+#ifndef FUSE_SETTINGS_H
+#define FUSE_SETTINGS_H
+
#include <config.h>
#include <sys/types.h>
-#ifndef FUSE_SETTINGS_H
-#define FUSE_SETTINGS_H
-
typedef struct settings_info {
CODE
Modified: trunk/fuse/sound.c
===================================================================
--- trunk/fuse/sound.c 2013-05-18 11:04:37 UTC (rev 746)
+++ trunk/fuse/sound.c 2013-05-18 11:45:11 UTC (rev 747)
@@ -2,7 +2,7 @@
Copyright (c) 2000-2012 Russell Marks, Matan Ziv-Av, Philip Kendall,
Fredrick Meunier, Patrik Rak
- $Id: sound.c 4785 2012-12-07 23:56:40Z sbaldovi $
+ $Id: sound.c 4921 2013-05-01 12:37: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
@@ -275,12 +275,6 @@
blip_synth_set_output( ay_c_synth, left_buf );
}
- right_specdrum_synth = new_Blip_Synth();
- blip_synth_set_volume( right_specdrum_synth,
- sound_get_volume( settings_current.volume_specdrum ) );
- blip_synth_set_output( right_specdrum_synth, right_buf );
- blip_synth_set_treble_eq( right_specdrum_synth, treble );
-
sound_enabled = sound_enabled_ever = 1;
sound_channels = ( sound_stereo_ay != SOUND_STEREO_AY_NONE ? 2 : 1 );
Modified: trunk/fuse/unittests/unittests.c
===================================================================
--- trunk/fuse/unittests/unittests.c 2013-05-18 11:04:37 UTC (rev 746)
+++ trunk/fuse/unittests/unittests.c 2013-05-18 11:45:11 UTC (rev 747)
@@ -1,7 +1,7 @@
/* unittests.c: unit testing framework for Fuse
Copyright (c) 2008-2011 Philip Kendall
- $Id: unittests.c 4822 2012-12-29 18:57:33Z pak21 $
+ $Id: unittests.c 4925 2013-05-05 07:54:35Z sbaldovi $
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 "fuse.h"
#include "machine.h"
#include "mempool.h"
+#include "periph.h"
#include "peripherals/disk/beta.h"
#include "peripherals/disk/disciple.h"
#include "peripherals/disk/opus.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2013-05-18 11:04:39
|
Revision: 746
http://sourceforge.net/p/fuse-for-macosx/code/746
Author: fredm
Date: 2013-05-18 11:04:37 +0000 (Sat, 18 May 2013)
Log Message:
-----------
Tag vendor/fuse-emulator/current as vendor/fuse-emulator/fuse-r4927.
Revision Links:
--------------
http://sourceforge.net/p/fuse-for-macosx/code/4927
Added Paths:
-----------
vendor/fuse-emulator/fuse-r4927/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2013-05-18 11:04:20
|
Revision: 745
http://sourceforge.net/p/fuse-for-macosx/code/745
Author: fredm
Date: 2013-05-18 11:04:17 +0000 (Sat, 18 May 2013)
Log Message:
-----------
Load . into vendor/fuse-emulator/current.
Modified Paths:
--------------
vendor/fuse-emulator/current/fuse/hacking/ChangeLog
vendor/fuse-emulator/current/fuse/machines/machines_periph.c
vendor/fuse-emulator/current/fuse/machines/spec128.h
vendor/fuse-emulator/current/fuse/machines/specplus2.c
vendor/fuse-emulator/current/fuse/man/fuse.1
vendor/fuse-emulator/current/fuse/peripherals/ay.c
vendor/fuse-emulator/current/fuse/peripherals/disk/beta.c
vendor/fuse-emulator/current/fuse/peripherals/disk/opus.c
vendor/fuse-emulator/current/fuse/peripherals/disk/opus.h
vendor/fuse-emulator/current/fuse/peripherals/fuller.c
vendor/fuse-emulator/current/fuse/peripherals/ide/divide.h
vendor/fuse-emulator/current/fuse/peripherals/ide/simpleide.c
vendor/fuse-emulator/current/fuse/peripherals/if1.c
vendor/fuse-emulator/current/fuse/peripherals/if2.c
vendor/fuse-emulator/current/fuse/peripherals/joystick.c
vendor/fuse-emulator/current/fuse/peripherals/kempmouse.c
vendor/fuse-emulator/current/fuse/peripherals/kempmouse.h
vendor/fuse-emulator/current/fuse/peripherals/melodik.c
vendor/fuse-emulator/current/fuse/peripherals/printer.c
vendor/fuse-emulator/current/fuse/peripherals/scld.c
vendor/fuse-emulator/current/fuse/peripherals/speccyboot.c
vendor/fuse-emulator/current/fuse/peripherals/specdrum.c
vendor/fuse-emulator/current/fuse/peripherals/specdrum.h
vendor/fuse-emulator/current/fuse/peripherals/spectranet.c
vendor/fuse-emulator/current/fuse/peripherals/ula.c
vendor/fuse-emulator/current/fuse/settings-header.pl
vendor/fuse-emulator/current/fuse/sound.c
vendor/fuse-emulator/current/fuse/unittests/unittests.c
vendor/fuse-emulator/current/fuse-utils/hacking/ChangeLog
Modified: vendor/fuse-emulator/current/fuse/hacking/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse/hacking/ChangeLog 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/hacking/ChangeLog 2013-05-18 11:04:17 UTC (rev 745)
@@ -4456,8 +4456,27 @@
20130404 ui/win32/win32joystick.c: fix input events fired when various joystick
buttons are pressed simultaneously (Sergio).
20130407 input.[ch],man/fuse.1,settings.dat,ui/{gtk/gtkjoystick.c,
- sdl/sdljoystick.c,uijoystick.c,widget/menu.c}: allow up to 15 joytick
- buttons to be defined to accomodate e.g. XBox 360 ABXY button use
+ sdl/sdljoystick.c,uijoystick.c,widget/menu.c}: allow up to 15 joystick
+ buttons to be defined to accommodate e.g. XBox 360 ABXY button use
(patch #309) (Fred).
20130420 peripherals/disk/disk.c: fix loading of EDSK files with redundant
sector images (bug #293) (Fred).
+20130420 peripherals/spectranet.c: allow disabling Spectranet code (more from
+ bug #259) (Sergio).
+20130501 sound.c: don't try to enable right channel for Specdrum unless stereo
+ mode is set (fixes bug #294) (thanks, mcleod_ideafix and Sergio)
+ (Fred).
+20130501 man/fuse.1: add %cfgnew step in Spectranet initialisation steps
+ (thanks, smogit and Guesser) (Fred).
+20130505 peripherals/{disk/opus.h,specdrum.h}: add missing subversion properties
+ (Sergio).
+20130505 machines/{spec128.h,specplus2.c},peripherals/{disk/opus.h,ide/divide.h,
+ kempmouse.h,specdrum.h},settings-header.pl: remove and relocate some
+ header inclusions (Sergio).
+20130505 unittests/unittests.c: add missing header (Sergio).
+20130505 peripherals/{ay.c,fuller.c,if1.c,if2.c,joystick.c,kempmouse.c,
+ machines_periph.c,melodik.c,printer.c,scld.c,speccyboot.c,specdrum.c,
+ ula.c},peripherals/disk/{beta.c,opus.c}, peripherals/ide/simpleide.c:
+ complete some missing field initializers (Sergio).
+20130505 peripherals/if1.c: put braces around empty body in ‘do’ statements
+ (Sergio).
Modified: vendor/fuse-emulator/current/fuse/machines/machines_periph.c
===================================================================
--- vendor/fuse-emulator/current/fuse/machines/machines_periph.c 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/machines/machines_periph.c 2013-05-18 11:04:17 UTC (rev 745)
@@ -1,7 +1,7 @@
/* machines_periph.c: various machine-specific peripherals
Copyright (c) 2011 Philip Kendall
- $Id: machines_periph.c 4624 2012-01-09 20:59:35Z pak21 $
+ $Id: machines_periph.c 4926 2013-05-05 07:58:18Z sbaldovi $
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
@@ -49,7 +49,9 @@
static const periph_t spec128_memory = {
NULL,
- spec128_memory_ports
+ spec128_memory_ports,
+ 0,
+ NULL
};
static const periph_port_t plus3_memory_ports[] = {
@@ -60,7 +62,9 @@
static const periph_t plus3_memory = {
NULL,
- plus3_memory_ports
+ plus3_memory_ports,
+ 0,
+ NULL
};
static const periph_port_t upd765_ports[] = {
@@ -71,7 +75,9 @@
static const periph_t upd765 = {
NULL,
- upd765_ports
+ upd765_ports,
+ 0,
+ NULL
};
static const periph_port_t se_memory_ports[] = {
@@ -81,7 +87,9 @@
static const periph_t se_memory = {
NULL,
- se_memory_ports
+ se_memory_ports,
+ 0,
+ NULL
};
static const periph_port_t tc2068_ay_ports[] = {
@@ -92,7 +100,9 @@
static const periph_t tc2068_ay = {
NULL,
- tc2068_ay_ports
+ tc2068_ay_ports,
+ 0,
+ NULL
};
static const periph_port_t beta128_pentagon_ports[] = {
@@ -106,7 +116,9 @@
static const periph_t beta128_pentagon = {
NULL,
- beta128_pentagon_ports
+ beta128_pentagon_ports,
+ 0,
+ NULL
};
static const periph_port_t beta128_pentagon_late_ports[] = {
@@ -120,7 +132,9 @@
static const periph_t beta128_pentagon_late = {
NULL,
- beta128_pentagon_late_ports
+ beta128_pentagon_late_ports,
+ 0,
+ NULL
};
static const periph_port_t pentagon1024_memory_ports[] = {
@@ -131,7 +145,9 @@
static const periph_t pentagon1024_memory = {
NULL,
- pentagon1024_memory_ports
+ pentagon1024_memory_ports,
+ 0,
+ NULL
};
void
Modified: vendor/fuse-emulator/current/fuse/machines/spec128.h
===================================================================
--- vendor/fuse-emulator/current/fuse/machines/spec128.h 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/machines/spec128.h 2013-05-18 11:04:17 UTC (rev 745)
@@ -1,7 +1,7 @@
/* spec128.h: Spectrum 128K specific routines
Copyright (c) 1999-2004 Philip Kendall
- $Id: spec128.h 4277 2011-01-24 22:01:43Z pak21 $
+ $Id: spec128.h 4924 2013-05-05 07:40:02Z sbaldovi $
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,7 +29,6 @@
#include <libspectrum.h>
#include "machine.h"
-#include "periph.h"
int spec128_init( fuse_machine_info *machine );
int spec128_common_reset( int contention );
Modified: vendor/fuse-emulator/current/fuse/machines/specplus2.c
===================================================================
--- vendor/fuse-emulator/current/fuse/machines/specplus2.c 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/machines/specplus2.c 2013-05-18 11:04:17 UTC (rev 745)
@@ -1,7 +1,7 @@
/* specplus2.c: Spectrum +2 specific routines
Copyright (c) 1999-2011 Philip Kendall
- $Id: specplus2.c 4638 2012-01-21 12:52:14Z fredm $
+ $Id: specplus2.c 4924 2013-05-05 07:40:02Z sbaldovi $
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 "machine.h"
#include "machines_periph.h"
#include "machines.h"
+#include "periph.h"
#include "peripherals/disk/beta.h"
#include "settings.h"
#include "spec128.h"
Modified: vendor/fuse-emulator/current/fuse/man/fuse.1
===================================================================
--- vendor/fuse-emulator/current/fuse/man/fuse.1 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/man/fuse.1 2013-05-18 11:04:17 UTC (rev 745)
@@ -3740,7 +3740,11 @@
starting with \(lqAlioth Spectranet\(rq and ending with the Spectranet's IP
address (which will be 255.255.255.255 at this stage).
.PP
-If you see all that, trigger an NMI (the Machine / NMI menu option)
+If you see all that, type the following command:
+.PP
+%cfgnew
+.PP
+Which will show the standard 0 OK, 0:1 at the bottom of the screen. Now trigger an NMI (the Machine / NMI menu option)
and you should get a white on blue Spectranet NMI menu with five
options.
.PP
Modified: vendor/fuse-emulator/current/fuse/peripherals/ay.c
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/ay.c 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/peripherals/ay.c 2013-05-18 11:04:17 UTC (rev 745)
@@ -1,7 +1,7 @@
/* ay.c: AY-8-3912 routines
Copyright (c) 1999-2009 Philip Kendall
- $Id: ay.c 4640 2012-01-21 13:26:35Z pak21 $
+ $Id: ay.c 4926 2013-05-05 07:58:18Z sbaldovi $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -66,7 +66,9 @@
static periph_t ay_periph = {
NULL,
- ay_ports
+ ay_ports,
+ 0,
+ NULL
};
static periph_port_t ay_ports_plus3[] = {
@@ -77,7 +79,9 @@
static periph_t ay_periph_plus3 = {
NULL,
- ay_ports_plus3
+ ay_ports_plus3,
+ 0,
+ NULL
};
static periph_port_t ay_ports_full_decode[] = {
@@ -88,7 +92,9 @@
static periph_t ay_periph_full_decode = {
NULL,
- ay_ports_full_decode
+ ay_ports_full_decode,
+ 0,
+ NULL
};
static periph_port_t ay_ports_timex[] = {
@@ -99,7 +105,9 @@
static periph_t ay_periph_timex = {
NULL,
- ay_ports_timex
+ ay_ports_timex,
+ 0,
+ NULL
};
void
Modified: vendor/fuse-emulator/current/fuse/peripherals/disk/beta.c
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/disk/beta.c 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/peripherals/disk/beta.c 2013-05-18 11:04:17 UTC (rev 745)
@@ -1,7 +1,7 @@
/* beta.c: Routines for handling the Beta disk interface
Copyright (c) 2004-2011 Stuart Brady, Philip Kendall
- $Id: beta.c 4906 2013-03-10 11:21:37Z fredm $
+ $Id: beta.c 4926 2013-05-05 07:58:18Z sbaldovi $
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
@@ -92,7 +92,8 @@
static const periph_t beta_peripheral = {
&settings_current.beta128,
beta_ports,
- 1
+ 1,
+ NULL
};
static void beta_reset( int hard_reset );
Modified: vendor/fuse-emulator/current/fuse/peripherals/disk/opus.c
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/disk/opus.c 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/peripherals/disk/opus.c 2013-05-18 11:04:17 UTC (rev 745)
@@ -2,7 +2,7 @@
Copyright (c) 1999-2011 Stuart Brady, Fredrick Meunier, Philip Kendall,
Dmitry Sanarin, Darren Salt, Michael D Wynne, Gergely Szasz
- $Id: opus.c 4906 2013-03-10 11:21:37Z fredm $
+ $Id: opus.c 4926 2013-05-05 07:58:18Z sbaldovi $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -102,7 +102,8 @@
static const periph_t opus_periph = {
&settings_current.opus,
NULL,
- 1
+ 1,
+ NULL
};
void
Modified: vendor/fuse-emulator/current/fuse/peripherals/disk/opus.h
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/disk/opus.h 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/peripherals/disk/opus.h 2013-05-18 11:04:17 UTC (rev 745)
@@ -1,7 +1,7 @@
/* opus.h: Routines for handling the Opus Discovery interface
Copyright (c) 2005-2009 Stuart Brady, Fredrick Meunier
- $Id$
+ $Id: opus.h 4924 2013-05-05 07:40:02Z sbaldovi $
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,16 +30,15 @@
#include <config.h>
+#include <libspectrum.h>
+
+#include "fdd.h"
+
typedef enum opus_drive_number {
OPUS_DRIVE_1 = 0,
OPUS_DRIVE_2,
} opus_drive_number;
-#include <libspectrum.h>
-
-#include "periph.h"
-#include "fdd.h"
-
extern int opus_available; /* Is the Opus available for use? */
extern int opus_active; /* Opus enabled? */
Modified: vendor/fuse-emulator/current/fuse/peripherals/fuller.c
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/fuller.c 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/peripherals/fuller.c 2013-05-18 11:04:17 UTC (rev 745)
@@ -1,7 +1,7 @@
/* fuller.c: Routines for handling the Fuller Box
Copyright (c) 2007-2011 Stuart Brady, Fredrick Meunier, Philip Kendall
- $Id: fuller.c 4906 2013-03-10 11:21:37Z fredm $
+ $Id: fuller.c 4926 2013-05-05 07:58:18Z sbaldovi $
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
@@ -59,7 +59,8 @@
static const periph_t fuller_periph = {
&settings_current.fuller,
fuller_ports,
- 1
+ 1,
+ NULL
};
static void
Modified: vendor/fuse-emulator/current/fuse/peripherals/ide/divide.h
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/ide/divide.h 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/peripherals/ide/divide.h 2013-05-18 11:04:17 UTC (rev 745)
@@ -1,7 +1,7 @@
/* divide.h: DivIDE interface routines
Copyright (c) 2005 Matthew Westcott
- $Id: divide.h 4664 2012-02-12 11:51:01Z fredm $
+ $Id: divide.h 4924 2013-05-05 07:40:02Z sbaldovi $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -27,7 +27,6 @@
#define FUSE_DIVIDE_H
#include <libspectrum.h>
-#include "periph.h"
/* Whether DivIDE is currently paged in */
extern int divide_active;
Modified: vendor/fuse-emulator/current/fuse/peripherals/ide/simpleide.c
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/ide/simpleide.c 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/peripherals/ide/simpleide.c 2013-05-18 11:04:17 UTC (rev 745)
@@ -3,7 +3,7 @@
2004 Philip Kendall,
2008 Fredrick Meunier
- $Id: simpleide.c 4906 2013-03-10 11:21:37Z fredm $
+ $Id: simpleide.c 4926 2013-05-05 07:58:18Z sbaldovi $
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
@@ -51,7 +51,8 @@
static const periph_t simpleide_periph = {
&settings_current.simpleide_active,
simpleide_ports,
- 1
+ 1,
+ NULL
};
static libspectrum_ide_channel *simpleide_idechn;
Modified: vendor/fuse-emulator/current/fuse/peripherals/if1.c
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/if1.c 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/peripherals/if1.c 2013-05-18 11:04:17 UTC (rev 745)
@@ -1,7 +1,7 @@
/* if1.c: Interface 1 handling routines
Copyright (c) 2004-2011 Gergely Szasz, Philip Kendall
- $Id: if1.c 4906 2013-03-10 11:21:37Z fredm $
+ $Id: if1.c 4927 2013-05-05 08:05:11Z sbaldovi $
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
@@ -221,7 +221,8 @@
static const periph_t if1_periph = {
&settings_current.interface1,
if1_ports,
- 1
+ 1,
+ NULL
};
/* Memory source */
@@ -897,8 +898,8 @@
if( settings_current.rs232_handshake &&
if1_ula.fd_t != -1 && if1_ula.cts != val ) {
char data = val ? 0x03 : 0x02;
- do ; while( write( if1_ula.fd_t, "", 1 ) != 1 );
- do ; while( write( if1_ula.fd_t, &data, 1 ) != 1 );
+ do {} while( write( if1_ula.fd_t, "", 1 ) != 1 );
+ do {} while( write( if1_ula.fd_t, &data, 1 ) != 1 );
}
if1_ula.cts = val;
@@ -947,15 +948,15 @@
if( if1_ula.count_out == -1 ) {
if1_ula.count_out = 13;
if1_ula.data_out = '?';
- do ; while( write( if1_ula.fd_t, "", 1 ) != 1 );
+ do {} while( write( if1_ula.fd_t, "", 1 ) != 1 );
}
if( if1_ula.count_out == 13 ) {
/* Here is the output routine */
if( if1_ula.data_out == 0x00 ) {
if1_ula.data_out = '*';
- do ; while( write( if1_ula.fd_t, "", 1 ) != 1 );
+ do {} while( write( if1_ula.fd_t, "", 1 ) != 1 );
}
- do ; while( write( if1_ula.fd_t, &if1_ula.data_out, 1 ) != 1 );
+ do {} while( write( if1_ula.fd_t, &if1_ula.data_out, 1 ) != 1 );
if1_ula.count_out = 0;
}
if1_ula.rx = val & 0x01; /* set rx */
@@ -970,7 +971,7 @@
*/
if1_ula.net = ( val & 0x01 ) ? 0 : 1; /* set rx */
lseek( if1_ula.fd_net, 0, SEEK_SET ); /* we save only the state of the wire*/
- do ; while( write( if1_ula.fd_net, &if1_ula.net, 1 ) == -1 );
+ do {} while( write( if1_ula.fd_net, &if1_ula.net, 1 ) == -1 );
#ifdef HAVE_FSYNC
fsync( if1_ula.fd_net );
#endif /* #ifdef HAVE_FSYNC */
@@ -988,7 +989,7 @@
/* lseek( if1_ula.fd_net, 0, SEEK_SET ); start a packet */
/* first we send the station number */
- do ; while( write( if1_ula.fd_net, &if1_ula.net_data, 1 ) == -1 );
+ do {} while( write( if1_ula.fd_net, &if1_ula.net_data, 1 ) == -1 );
#ifdef HAVE_FSYNC
fsync( if1_ula.fd_net );
#endif /* #ifdef HAVE_FSYNC */
Modified: vendor/fuse-emulator/current/fuse/peripherals/if2.c
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/if2.c 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/peripherals/if2.c 2013-05-18 11:04:17 UTC (rev 745)
@@ -1,7 +1,7 @@
/* if2.c: Interface 2 cartridge handling routines
Copyright (c) 2003-2011 Darren Salt, Fredrick Meunier, Philip Kendall
- $Id: if2.c 4872 2013-02-02 20:54:33Z fredm $
+ $Id: if2.c 4926 2013-05-05 07:58:18Z sbaldovi $
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
@@ -65,6 +65,8 @@
static const periph_t if2_periph = {
&settings_current.interface2,
+ NULL,
+ 0,
NULL
};
Modified: vendor/fuse-emulator/current/fuse/peripherals/joystick.c
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/joystick.c 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/peripherals/joystick.c 2013-05-18 11:04:17 UTC (rev 745)
@@ -1,7 +1,7 @@
/* joystick.c: Joystick emulation support
Copyright (c) 2001-2011 Russell Marks, Darren Salt, Philip Kendall
- $Id: joystick.c 4299 2011-02-08 22:24:30Z pak21 $
+ $Id: joystick.c 4926 2013-05-05 07:58:18Z sbaldovi $
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
@@ -104,7 +104,9 @@
static const periph_t kempston_strict_periph = {
&settings_current.joy_kempston,
- kempston_strict_decoding
+ kempston_strict_decoding,
+ 0,
+ NULL
};
static const periph_port_t kempston_loose_decoding[] = {
@@ -114,7 +116,9 @@
static const periph_t kempston_loose_periph = {
&settings_current.joy_kempston,
- kempston_loose_decoding
+ kempston_loose_decoding,
+ 0,
+ NULL
};
/* Init/shutdown functions. Errors aren't important here */
Modified: vendor/fuse-emulator/current/fuse/peripherals/kempmouse.c
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/kempmouse.c 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/peripherals/kempmouse.c 2013-05-18 11:04:17 UTC (rev 745)
@@ -1,7 +1,7 @@
/* kempmouse.c: Kempston mouse emulation
Copyright (c) 2004-2008 Darren Salt, Fredrick Meunier
- $Id: kempmouse.c 4906 2013-03-10 11:21:37Z fredm $
+ $Id: kempmouse.c 4926 2013-05-05 07:58:18Z sbaldovi $
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
@@ -73,7 +73,8 @@
static const periph_t kempmouse_periph = {
&settings_current.kempston_mouse,
kempmouse_ports,
- 1
+ 1,
+ NULL
};
void
Modified: vendor/fuse-emulator/current/fuse/peripherals/kempmouse.h
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/kempmouse.h 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/peripherals/kempmouse.h 2013-05-18 11:04:17 UTC (rev 745)
@@ -1,7 +1,7 @@
/* kempmouse.h: Kempston mouse emulation
Copyright (c) 2004-2008 Darren Salt, Fredrick Meunier
- $Id: kempmouse.h 4640 2012-01-21 13:26:35Z pak21 $
+ $Id: kempmouse.h 4924 2013-05-05 07:40:02Z sbaldovi $
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,9 +26,6 @@
#ifndef FUSE_KEMPMOUSE_H
#define FUSE_KEMPMOUSE_H
-#include <libspectrum.h>
-#include "periph.h"
-
void kempmouse_init( void );
void kempmouse_update( int dx, int dy, int button, int down );
Modified: vendor/fuse-emulator/current/fuse/peripherals/melodik.c
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/melodik.c 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/peripherals/melodik.c 2013-05-18 11:04:17 UTC (rev 745)
@@ -1,7 +1,7 @@
/* melodik.c: Routines for handling the Melodik interface
Copyright (c) 2009-2011 Fredrick Meunier, Philip Kendall
- $Id: melodik.c 4906 2013-03-10 11:21:37Z fredm $
+ $Id: melodik.c 4926 2013-05-05 07:58:18Z sbaldovi $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -57,7 +57,8 @@
static const periph_t melodik_periph = {
&settings_current.melodik,
melodik_ports,
- 1
+ 1,
+ NULL
};
static void
Modified: vendor/fuse-emulator/current/fuse/peripherals/printer.c
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/printer.c 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/peripherals/printer.c 2013-05-18 11:04:17 UTC (rev 745)
@@ -1,7 +1,7 @@
/* printer.c: Printer support
Copyright (c) 2001-2004 Ian Collier, Russell Marks, Philip Kendall
- $Id: printer.c 4906 2013-03-10 11:21:37Z fredm $
+ $Id: printer.c 4926 2013-05-05 07:58:18Z sbaldovi $
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
@@ -91,7 +91,8 @@
static const periph_t printer_zxp_periph = {
&settings_current.zxprinter,
printer_zxp_ports,
- 1
+ 1,
+ NULL
};
static const periph_port_t printer_zxp_ports_full_decode[] = {
@@ -101,7 +102,9 @@
static const periph_t printer_zxp_periph_full_decode = {
&settings_current.zxprinter,
- printer_zxp_ports_full_decode
+ printer_zxp_ports_full_decode,
+ 0,
+ NULL
};
static const periph_port_t printer_parallel_ports[] = {
@@ -111,7 +114,9 @@
static const periph_t printer_parallel_periph = {
&settings_current.printer,
- printer_parallel_ports
+ printer_parallel_ports,
+ 0,
+ NULL
};
static void printer_zxp_init(void)
Modified: vendor/fuse-emulator/current/fuse/peripherals/scld.c
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/scld.c 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/peripherals/scld.c 2013-05-18 11:04:17 UTC (rev 745)
@@ -1,7 +1,7 @@
/* scld.c: Routines for handling the Timex SCLD
Copyright (c) 2002-2011 Fredrick Meunier, Philip Kendall, Witold Filipczyk
- $Id: scld.c 4872 2013-02-02 20:54:33Z fredm $
+ $Id: scld.c 4926 2013-05-05 07:58:18Z sbaldovi $
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
@@ -76,7 +76,9 @@
static const periph_t scld_periph = {
NULL,
- scld_ports
+ scld_ports,
+ 0,
+ NULL
};
void
Modified: vendor/fuse-emulator/current/fuse/peripherals/speccyboot.c
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/speccyboot.c 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/peripherals/speccyboot.c 2013-05-18 11:04:17 UTC (rev 745)
@@ -3,7 +3,7 @@
Copyright (c) 2009-2011 Patrik Persson, Philip Kendall
- $Id: speccyboot.c 4906 2013-03-10 11:21:37Z fredm $
+ $Id: speccyboot.c 4926 2013-05-05 07:58:18Z sbaldovi $
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
@@ -75,7 +75,8 @@
static const periph_t speccyboot_periph = {
&settings_current.speccyboot,
speccyboot_ports,
- 1
+ 1,
+ NULL
};
/* ---------------------------------------------------------------------------
Modified: vendor/fuse-emulator/current/fuse/peripherals/specdrum.c
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/specdrum.c 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/peripherals/specdrum.c 2013-05-18 11:04:17 UTC (rev 745)
@@ -1,7 +1,7 @@
/* specdrum.c: Routines for handling the Specdrum Drum Kit
Copyright (c) 2011 Jon Mitchell
- $Id: specdrum.c 4906 2013-03-10 11:21:37Z fredm $
+ $Id: specdrum.c 4926 2013-05-05 07:58:18Z sbaldovi $
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
@@ -59,7 +59,8 @@
static const periph_t specdrum_periph = {
&settings_current.specdrum,
specdrum_ports,
- 1
+ 1,
+ NULL
};
void
Modified: vendor/fuse-emulator/current/fuse/peripherals/specdrum.h
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/specdrum.h 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/peripherals/specdrum.h 2013-05-18 11:04:17 UTC (rev 745)
@@ -1,7 +1,7 @@
/* specdrum.h: Routines for handling the Specdrum Drum Kit
Copyright (c) 2011 Jon Mitchell
- $Id$
+ $Id: specdrum.h 4924 2013-05-05 07:40:02Z sbaldovi $
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,8 +30,6 @@
#include <libspectrum.h>
-#include "periph.h"
-
typedef struct specdrum_info {
int specdrum_present; /* SpecDrum present */
libspectrum_signed_byte specdrum_dac; /* Current byte in the SpecDrum 8bit DAC */
Modified: vendor/fuse-emulator/current/fuse/peripherals/spectranet.c
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/spectranet.c 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/peripherals/spectranet.c 2013-05-18 11:04:17 UTC (rev 745)
@@ -1,7 +1,7 @@
/* spectranet.c: Spectranet emulation
Copyright (c) 2011-2013 Philip Kendall
- $Id: spectranet.c 4906 2013-03-10 11:21:37Z fredm $
+ $Id: spectranet.c 4919 2013-04-20 07:47:56Z sbaldovi $
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
@@ -521,10 +521,26 @@
}
void
+spectranet_nmi( void )
+{
+}
+
+void
spectranet_unpage( void )
{
}
+void
+spectranet_retn( void )
+{
+}
+
+int
+spectranet_nmi_flipflop( void )
+{
+ return 0;
+}
+
libspectrum_byte
spectranet_w5100_read( memory_page *page GCC_UNUSED,
libspectrum_word address GCC_UNUSED )
Modified: vendor/fuse-emulator/current/fuse/peripherals/ula.c
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/ula.c 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/peripherals/ula.c 2013-05-18 11:04:17 UTC (rev 745)
@@ -1,7 +1,7 @@
/* ula.c: ULA routines
Copyright (c) 1999-2011 Philip Kendall, Darren Salt
- $Id: ula.c 4640 2012-01-21 13:26:35Z pak21 $
+ $Id: ula.c 4926 2013-05-05 07:58:18Z sbaldovi $
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
@@ -71,7 +71,9 @@
static const periph_t ula_periph = {
NULL,
- ula_ports
+ ula_ports,
+ 0,
+ NULL
};
static const periph_port_t ula_ports_full_decode[] = {
@@ -81,7 +83,9 @@
static const periph_t ula_periph_full_decode = {
NULL,
- ula_ports_full_decode
+ ula_ports_full_decode,
+ 0,
+ NULL
};
void
Modified: vendor/fuse-emulator/current/fuse/settings-header.pl
===================================================================
--- vendor/fuse-emulator/current/fuse/settings-header.pl 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/settings-header.pl 2013-05-18 11:04:17 UTC (rev 745)
@@ -3,7 +3,7 @@
# settings-header.pl: generate settings.h from settings.dat
# Copyright (c) 2002-2003 Philip Kendall
-# $Id: settings-header.pl 4633 2012-01-19 23:26:10Z pak21 $
+# $Id: settings-header.pl 4924 2013-05-05 07:40:02Z sbaldovi $
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -64,13 +64,13 @@
/* This file is autogenerated from settings.dat by settings-header.pl.
Do not edit unless you know what will happen! */
+#ifndef FUSE_SETTINGS_H
+#define FUSE_SETTINGS_H
+
#include <config.h>
#include <sys/types.h>
-#ifndef FUSE_SETTINGS_H
-#define FUSE_SETTINGS_H
-
typedef struct settings_info {
CODE
Modified: vendor/fuse-emulator/current/fuse/sound.c
===================================================================
--- vendor/fuse-emulator/current/fuse/sound.c 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/sound.c 2013-05-18 11:04:17 UTC (rev 745)
@@ -2,7 +2,7 @@
Copyright (c) 2000-2012 Russell Marks, Matan Ziv-Av, Philip Kendall,
Fredrick Meunier, Patrik Rak
- $Id: sound.c 4785 2012-12-07 23:56:40Z sbaldovi $
+ $Id: sound.c 4921 2013-05-01 12:37: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
@@ -275,12 +275,6 @@
blip_synth_set_output( ay_c_synth, left_buf );
}
- right_specdrum_synth = new_Blip_Synth();
- blip_synth_set_volume( right_specdrum_synth,
- sound_get_volume( settings_current.volume_specdrum ) );
- blip_synth_set_output( right_specdrum_synth, right_buf );
- blip_synth_set_treble_eq( right_specdrum_synth, treble );
-
sound_enabled = sound_enabled_ever = 1;
sound_channels = ( sound_stereo_ay != SOUND_STEREO_AY_NONE ? 2 : 1 );
Modified: vendor/fuse-emulator/current/fuse/unittests/unittests.c
===================================================================
--- vendor/fuse-emulator/current/fuse/unittests/unittests.c 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse/unittests/unittests.c 2013-05-18 11:04:17 UTC (rev 745)
@@ -1,7 +1,7 @@
/* unittests.c: unit testing framework for Fuse
Copyright (c) 2008-2011 Philip Kendall
- $Id: unittests.c 4822 2012-12-29 18:57:33Z pak21 $
+ $Id: unittests.c 4925 2013-05-05 07:54:35Z sbaldovi $
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 "fuse.h"
#include "machine.h"
#include "mempool.h"
+#include "periph.h"
#include "peripherals/disk/beta.h"
#include "peripherals/disk/disciple.h"
#include "peripherals/disk/opus.h"
Modified: vendor/fuse-emulator/current/fuse-utils/hacking/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/hacking/ChangeLog 2013-05-11 05:17:28 UTC (rev 744)
+++ vendor/fuse-emulator/current/fuse-utils/hacking/ChangeLog 2013-05-18 11:04:17 UTC (rev 745)
@@ -409,6 +409,6 @@
20130223 fmfconv_ff.c: use the same encoder on later stages (Sergio).
20130223 fmfconv.c: force mpeg4 video encoder for youtube profile and don't
force AAC audio encoder for ipod profile (Sergio).
-201300407 converter/{romloader.cc,romloader.h}: include read and computed
- checksum (thanks, Ivan Shmakov) (Fred).
-201300407 converter/romloader.cc: print flag byte (thanks, Ivan Shmakov) (Fred).
+20130407 converter/{romloader.cc,romloader.h}: include read and computed
+ checksum (thanks, Ivan Shmakov) (Fred).
+20130407 converter/romloader.cc: print flag byte (thanks, Ivan Shmakov) (Fred).
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2013-05-11 05:17:31
|
Revision: 744
http://sourceforge.net/p/fuse-for-macosx/code/744
Author: fredm
Date: 2013-05-11 05:17:28 +0000 (Sat, 11 May 2013)
Log Message:
-----------
Don't try to show secondary dialogs when in fullscreen mode (thanks, Andrew
Owen).
Modified Paths:
--------------
trunk/fuse/fusepb/controllers/FuseController.m
Modified: trunk/fuse/fusepb/controllers/FuseController.m
===================================================================
--- trunk/fuse/fusepb/controllers/FuseController.m 2013-04-26 05:15:13 UTC (rev 743)
+++ trunk/fuse/fusepb/controllers/FuseController.m 2013-05-11 05:17:28 UTC (rev 744)
@@ -1055,78 +1055,96 @@
- (IBAction)showRollbackPane:(id)sender
{
- if( !rollbackController ) {
- rollbackController = [[RollbackController alloc] init];
+ if( !settings_current.full_screen ) {
+ if( !rollbackController ) {
+ rollbackController = [[RollbackController alloc] init];
+ }
+ [rollbackController showWindow:self];
}
- [rollbackController showWindow:self];
}
- (IBAction)showTapeBrowserPane:(id)sender
{
- if( !tapeBrowserController ) {
- tapeBrowserController = [[TapeBrowserController alloc] init];
+ if( !settings_current.full_screen ) {
+ if( !tapeBrowserController ) {
+ tapeBrowserController = [[TapeBrowserController alloc] init];
+ }
+ [tapeBrowserController showWindow:self];
}
- [tapeBrowserController showWindow:self];
}
- (IBAction)showKeyboardPane:(id)sender
{
if( !settings_current.full_screen ) {
- if( !keyboardController ) {
- keyboardController = [[KeyboardController alloc] init];
+ if( !settings_current.full_screen ) {
+ if( !keyboardController ) {
+ keyboardController = [[KeyboardController alloc] init];
+ }
+ [keyboardController showCloseWindow:self];
}
- [keyboardController showCloseWindow:self];
}
[self releaseCmdKeys:@"k" withCode:QZ_k];
}
- (IBAction)showLoadBinaryPane:(id)sender
{
- if( !loadBinaryController ) {
- loadBinaryController = [[LoadBinaryController alloc] init];
+ if( !settings_current.full_screen ) {
+ if( !loadBinaryController ) {
+ loadBinaryController = [[LoadBinaryController alloc] init];
+ }
+
+ [loadBinaryController showWindow:self];
}
-
- [loadBinaryController showWindow:self];
}
- (IBAction)showSaveBinaryPane:(id)sender
{
- if( !saveBinaryController ) {
- saveBinaryController = [[SaveBinaryController alloc] init];
+ if( !settings_current.full_screen ) {
+ if( !saveBinaryController ) {
+ saveBinaryController = [[SaveBinaryController alloc] init];
+ }
+ [saveBinaryController showWindow:self];
}
- [saveBinaryController showWindow:self];
}
- (IBAction)showPokeFinderPane:(id)sender
{
- if( !pokeFinderController ) {
- pokeFinderController = [[PokeFinderController alloc] init];
+ if( !settings_current.full_screen ) {
+ if( !pokeFinderController ) {
+ pokeFinderController = [[PokeFinderController alloc] init];
+ }
+ [pokeFinderController showWindow:self];
}
- [pokeFinderController showWindow:self];
}
- (IBAction)showPokeMemoryPane:(id)sender
{
- if( !pokeMemoryController ) {
- pokeMemoryController = [[PokeMemoryController alloc] init];
+ if( !settings_current.full_screen ) {
+ if( !pokeMemoryController ) {
+ pokeMemoryController = [[PokeMemoryController alloc] init];
+ }
+ [pokeMemoryController showWindow:self];
}
- [pokeMemoryController showWindow:self];
}
- (IBAction)showMemoryBrowserPane:(id)sender
{
- if( !memoryBrowserController ) {
- memoryBrowserController = [[MemoryBrowserController alloc] init];
+ if( !settings_current.full_screen ) {
+ if( !memoryBrowserController ) {
+ memoryBrowserController = [[MemoryBrowserController alloc] init];
+ }
}
[memoryBrowserController showWindow:self];
}
- (IBAction)showPreferencesPane:(id)sender;
{
- if( !preferencesController ) {
- preferencesController = [[PreferencesController alloc] init];
+ if( !settings_current.full_screen ) {
+ if( !preferencesController ) {
+ preferencesController = [[PreferencesController alloc] init];
+ }
+ [preferencesController showWindow:self];
}
- [preferencesController showWindow:self];
[self releaseCmdKeys:@"." withCode:QZ_PERIOD];
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2013-04-26 05:15:15
|
Revision: 743
http://sourceforge.net/p/fuse-for-macosx/code/743
Author: fredm
Date: 2013-04-26 05:15:13 +0000 (Fri, 26 Apr 2013)
Log Message:
-----------
Move version numbers to 4915.
Modified Paths:
--------------
trunk/fuse/fusepb/English.lproj/InfoPlist.strings
trunk/fuse/fusepb/Info-Fuse.plist
Modified: trunk/fuse/fusepb/English.lproj/InfoPlist.strings
===================================================================
(Binary files differ)
Modified: trunk/fuse/fusepb/Info-Fuse.plist
===================================================================
--- trunk/fuse/fusepb/Info-Fuse.plist 2013-04-25 05:47:40 UTC (rev 742)
+++ trunk/fuse/fusepb/Info-Fuse.plist 2013-04-26 05:15:13 UTC (rev 743)
@@ -552,7 +552,7 @@
<key>CFBundleSignature</key>
<string>FUSE</string>
<key>CFBundleVersion</key>
- <string>4918</string>
+ <string>4915</string>
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSPrincipalClass</key>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2013-04-25 05:47:46
|
Revision: 742
http://sourceforge.net/p/fuse-for-macosx/code/742
Author: fredm
Date: 2013-04-25 05:47:40 +0000 (Thu, 25 Apr 2013)
Log Message:
-----------
Merge up to vendor revision 4915.
Revision Links:
--------------
http://sourceforge.net/p/fuse-for-macosx/code/4915
Modified Paths:
--------------
trunk/fuse/AUTHORS
trunk/fuse/ChangeLog
trunk/fuse/Makefile.am
trunk/fuse/README
trunk/fuse/THANKS
trunk/fuse/compat/amiga/Makefile.am
trunk/fuse/compat/linux/Makefile.am
trunk/fuse/compat/mkstemp.c
trunk/fuse/compat/morphos/Makefile.am
trunk/fuse/compat/unix/Makefile.am
trunk/fuse/compat/unix/socket.c
trunk/fuse/compat/unix/tuntap.c
trunk/fuse/compat/wii/Makefile.am
trunk/fuse/compat/win32/Makefile.am
trunk/fuse/compat/win32/paths.c
trunk/fuse/configure.ac
trunk/fuse/fuse.c
trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
trunk/fuse/fusepb/Info-Fuse.plist
trunk/fuse/fusepb/config.h
trunk/fuse/fusepb/controllers/JoystickConfigurationController.h
trunk/fuse/fusepb/controllers/JoystickConfigurationController.m
trunk/fuse/fusepb/controllers/PreferencesController.m
trunk/fuse/fusepb/libspectrum.h
trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html
trunk/fuse/fusepb/resources/Fuse Help/html/disciple.html
trunk/fuse/fusepb/resources/Fuse Help/html/formats.html
trunk/fuse/fusepb/resources/Fuse Help/html/machine.html
trunk/fuse/fusepb/resources/Fuse Help/html/menus.html
trunk/fuse/fusepb/resources/Fuse Help/html/peripherals.html
trunk/fuse/fusepb/resources/Fuse Help/html/plusd.html
trunk/fuse/fusepb/resources/Fuse Help/html/preferences.html
trunk/fuse/fusepb/resources/Fuse Help/html/sound.html
trunk/fuse/fusepb/resources/Fuse Help/html/spectranet.html
trunk/fuse/fusepb/resources/Fuse Help/html/tocstart.html
trunk/fuse/fusepb/xibs/JoystickConfiguration.xib
trunk/fuse/fusepb/xibs/Preferences.xib
trunk/fuse/hacking/ChangeLog
trunk/fuse/hacking/peripheral_tests.txt
trunk/fuse/hacking/spectranet.txt
trunk/fuse/input.c
trunk/fuse/input.h
trunk/fuse/keysyms.pl
trunk/fuse/lib/compressed/tape_se.szx
trunk/fuse/lib/uncompressed/tape_se.szx
trunk/fuse/machines/spec_se.c
trunk/fuse/man/fuse.1
trunk/fuse/memory.c
trunk/fuse/menu.c
trunk/fuse/menu.h
trunk/fuse/menu_data.dat
trunk/fuse/periph.c
trunk/fuse/periph.h
trunk/fuse/peripherals/disk/beta.c
trunk/fuse/peripherals/disk/disciple.c
trunk/fuse/peripherals/disk/disciple.h
trunk/fuse/peripherals/disk/disk.c
trunk/fuse/peripherals/disk/disk.h
trunk/fuse/peripherals/disk/fdd.h
trunk/fuse/peripherals/disk/opus.c
trunk/fuse/peripherals/disk/plusd.c
trunk/fuse/peripherals/disk/plusd.h
trunk/fuse/peripherals/flash/am29f010.c
trunk/fuse/peripherals/fuller.c
trunk/fuse/peripherals/ide/divide.c
trunk/fuse/peripherals/ide/simpleide.c
trunk/fuse/peripherals/ide/zxatasp.c
trunk/fuse/peripherals/ide/zxcf.c
trunk/fuse/peripherals/if1.c
trunk/fuse/peripherals/if1.h
trunk/fuse/peripherals/if2.c
trunk/fuse/peripherals/if2.h
trunk/fuse/peripherals/kempmouse.c
trunk/fuse/peripherals/melodik.c
trunk/fuse/peripherals/nic/Makefile.am
trunk/fuse/peripherals/nic/w5100.c
trunk/fuse/peripherals/nic/w5100_internals.h
trunk/fuse/peripherals/nic/w5100_socket.c
trunk/fuse/peripherals/printer.c
trunk/fuse/peripherals/scld.c
trunk/fuse/peripherals/speccyboot.c
trunk/fuse/peripherals/specdrum.c
trunk/fuse/peripherals/spectranet.c
trunk/fuse/peripherals/spectranet.h
trunk/fuse/pokefinder/pokemem.c
trunk/fuse/rectangle.c
trunk/fuse/roms/Makefile.am
trunk/fuse/roms/README.copyright
trunk/fuse/roms/plus3e-0.rom
trunk/fuse/roms/plus3e-1.rom
trunk/fuse/roms/plus3e-2.rom
trunk/fuse/roms/se-0.rom
trunk/fuse/roms/se-1.rom
trunk/fuse/settings.dat
trunk/fuse/settings.pl
trunk/fuse/snapshot.c
trunk/fuse/sound/blipbuffer.c
trunk/fuse/sound/blipbuffer.h
trunk/fuse/sound/win32sound.c
trunk/fuse/sound.c
trunk/fuse/spectrum.c
trunk/fuse/tape.c
trunk/fuse/ui/cocoa/cocoajoystick.c
trunk/fuse/ui/gtk/binary.c
trunk/fuse/ui/gtk/debugger.c
trunk/fuse/ui/gtk/gtkjoystick.c
trunk/fuse/ui/options.dat
trunk/fuse/ui/sdl/sdljoystick.c
trunk/fuse/ui/uijoystick.c
trunk/fuse/ui/widget/filesel.c
trunk/fuse/ui/widget/menu.c
trunk/fuse/ui/widget/options.pl
trunk/fuse/ui/win32/about.rc
trunk/fuse/ui/win32/binary.c
trunk/fuse/ui/win32/binary.rc
trunk/fuse/ui/win32/browse.rc
trunk/fuse/ui/win32/debugger.h
trunk/fuse/ui/win32/debugger.rc
trunk/fuse/ui/win32/hyperlinks.c
trunk/fuse/ui/win32/memorybrowser.c
trunk/fuse/ui/win32/memorybrowser.rc
trunk/fuse/ui/win32/picture.c
trunk/fuse/ui/win32/picture.rc
trunk/fuse/ui/win32/pokefinder.rc
trunk/fuse/ui/win32/pokemem.c
trunk/fuse/ui/win32/pokemem.rc
trunk/fuse/ui/win32/rollback.rc
trunk/fuse/ui/win32/roms.c
trunk/fuse/ui/win32/select_template.rc
trunk/fuse/ui/win32/statusbar.c
trunk/fuse/ui/win32/win32joystick.c
trunk/fuse/ui/win32/win32ui.c
trunk/fuse/ui.c
trunk/fuse/unittests/unittests.c
trunk/fuse/utils.c
trunk/fuse/windres.rc
trunk/fuse/z80/coretest.c
trunk/fuse/z80/z80.c
trunk/fuse/z80/z80.h
trunk/fuse/z80/z80.pl
Added Paths:
-----------
trunk/fuse/fusepb/resources/Fuse Help/html/pokememory.html
trunk/fuse/fusepb/resources/Fuse Help/html/weak.html
trunk/fuse/roms/disciple.rom
Property Changed:
----------------
trunk/fuse/
Index: trunk/fuse
===================================================================
--- trunk/fuse 2013-04-20 11:35:58 UTC (rev 741)
+++ trunk/fuse 2013-04-25 05:47:40 UTC (rev 742)
Property changes on: trunk/fuse
___________________________________________________________________
Modified: svn:mergeinfo
## -1,5 +1,5 ##
/vendor/fuse-emulator/0.10.0/fuse:556-557
/vendor/fuse-emulator/0.10.0-pre1/fuse:545-546
-/vendor/fuse-emulator/current/fuse:530-719
+/vendor/fuse-emulator/current/fuse:530-741
/vendor/fuse-emulator/fuse-1.0.0a/fuse:668-669
/vendor/fuse-emulator/fuse-r4617/fuse:686
\ No newline at end of property
Modified: trunk/fuse/AUTHORS
===================================================================
--- trunk/fuse/AUTHORS 2013-04-20 11:35:58 UTC (rev 741)
+++ trunk/fuse/AUTHORS 2013-04-25 05:47:40 UTC (rev 742)
@@ -39,7 +39,7 @@
* Garry Lancaster: the simple 8-bit IDE, ZXATASP and ZXCF support.
-* Gergely Szasz: +3, +D, Opus and Interface I/microdrive emulation, the 'movie'
+* Gergely Szasz: +3, +D, Opus and Interface 1/Microdrive emulation, the 'movie'
code and the ao sound driver.
* Bjoern Giesler: the original Wii port.
@@ -52,4 +52,4 @@
* Philip Kendall: everything else.
-$Id: AUTHORS 4237 2010-12-31 19:31:26Z pak21 $
+$Id: AUTHORS 4835 2012-12-31 15:35:45Z zubzero $
Modified: trunk/fuse/ChangeLog
===================================================================
--- trunk/fuse/ChangeLog 2013-04-20 11:35:58 UTC (rev 741)
+++ trunk/fuse/ChangeLog 2013-04-25 05:47:40 UTC (rev 742)
@@ -1,3 +1,62 @@
+201?-??-?? Philip Kendall <phi...@sh...>
+
+ * Fuse 1.1.0 released.
+
+ * Remove ROMs that there is no formal permission to distribute.
+
+ * New features:
+ * Add Spectranet ethernet interface emulation (Philip Kendall).
+ * Add SpeccyBoot ethernet interface emulation (Patrik Persson).
+ * Add SpecDrum sound interface emulation (Jon Mitchell).
+ * Add DISCiPLE disk interface emulation (Stuart Brady).
+ Sinclair Network emulation is not provided, and the interface is
+ not available under 128K emulation in this release.
+ * Support reading PZX files (Fredrick Meunier).
+ * Add support for POK files (Sergio Baldoví).
+ * Add recording of movies to FMF files (Gergely Szasz).
+ * Add GTK+ 3 compatibility (Sergio Baldoví).
+
+ * Emulation core improvements:
+ * Add support for ABC AY stereo (Stuart Brady).
+ * Correct feedback in AY noise generator (Patrik Rak).
+ * MIC bit only isn't enough to drive the speaker (Fredrick Meunier).
+ * Mirror Interface 1 ROM to the second 8Kb of ROM as in the real
+ interface (Fredrick Meunier, with thanks to mcleod_ideafix and
+ zx81).
+ * Support the Beta interface setting to not auto-boot the interface
+ on 48K machines (ketmar).
+
+ * Machine specific improvements:
+ * Read and write all potential 1024k worth of memory pages from a
+ snap (ketmar and Fredrick Meunier).
+ * Initialise the Pentagon 1024k memory ports from a snapshot (ketmar
+ and Fredrick Meunier).
+ * Restore the paged state of the Beta ROM when loading Pentagon
+ 128k/512k/1024k snapshots (ketmar and Fredrick Meunier).
+
+ * Debugger improvements:
+ * Disassemble ED 4D as RETI (Simon Owen).
+ * Add IM, IFF1 and IFF2 setting and getting to the debugger (Alex
+ Badea).
+
+ * Miscellaneous improvements:
+ * Many improvements to Win32 UI and installer (Sergio Baldoví).
+ * Allow the use of the SDL joystick code in the GTK+ and Xlib UIs
+ (Sergio Baldoví).
+ * Add current machine name to GTK+ and Win32 statusbars (Sergio
+ Baldoví).
+ * Allow the drag and drop of files from KDE (Dolphin/Konqueror)
+ (Sergio Baldoví, with thanks to Diondeville).
+ * Add a statusbar for the xlib UI (Gergely Szasz).
+ * Extend supported symbol characters on SDL and xlib UIs (Sergio
+ Baldoví).
+ * Support for the TZX set signal level block (Fredrick Meunier).
+ * Drop support for GLib and GTK+ version 1.x (Alberto Garcia and
+ Sergio Baldoví).
+ * Support setting late timings from snapshots (Fredrick Meunier).
+
+ * Various other minor bugfixes.
+
2010-12-16 Philip Kendall <phi...@sh...>
* Fuse 1.0.0 released.
@@ -1035,4 +1094,4 @@
* Version 0.1.0 released.
-$Id: ChangeLog 4409 2011-05-01 10:47:07Z zubzero $
+$Id: ChangeLog 4879 2013-02-12 00:36:01Z zubzero $
Modified: trunk/fuse/Makefile.am
===================================================================
--- trunk/fuse/Makefile.am 2013-04-20 11:35:58 UTC (rev 741)
+++ trunk/fuse/Makefile.am 2013-04-25 05:47:40 UTC (rev 742)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 1999-2009 Philip Kendall
-## $Id: Makefile.am 4770 2012-11-23 22:59:48Z sbaldovi $
+## $Id: Makefile.am 4782 2012-12-02 22:49:57Z sbaldovi $
## 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
@@ -290,7 +290,8 @@
@test `find $(top_win32dir) -type f -name \*.dll -print | wc -l` -ne 0 || \
{ echo "ERROR: external libraries not found in $(top_win32dir). Please, manually copy them."; exit 1; }
# Locate NSIS in system path, MSYS drive or Cygwin drive
- @if makensis -VERSION > /dev/null 2>&1; then \
+ @NSISFILE="$(abs_top_builddir)/ui/win32/installer/fuse.nsi"; \
+ if makensis -VERSION > /dev/null 2>&1; then \
MAKENSIS="makensis"; \
elif [ -x "/c/Program Files/NSIS/makensis" ]; then \
MAKENSIS="/c/Program\ Files/NSIS/makensis"; \
@@ -299,8 +300,11 @@
else \
echo 'ERROR: cannot locate makensis tool'; exit 1; \
fi; \
+ case "`uname -s`" in \
+ CYGWIN*) NSISFILE=`cygpath -m $$NSISFILE`;; \
+ esac; \
cd $(top_win32dir); \
- eval "$$MAKENSIS -V2 -NOCD $(abs_top_builddir)/ui/win32/installer/fuse.nsi"
+ eval "$$MAKENSIS -V2 -NOCD $$NSISFILE"
mv $(top_win32dir)/$(package_win32)-setup.exe $(top_builddir)
-sha1sum $(top_builddir)/$(package_win32)-setup.exe > $(top_builddir)/$(package_win32)-setup.exe.sha1 && \
{ test -z "$(UNIX2DOS)" || $(UNIX2DOS) $(top_builddir)/$(package_win32)-setup.exe.sha1; }
Modified: trunk/fuse/README
===================================================================
--- trunk/fuse/README 2013-04-20 11:35:58 UTC (rev 741)
+++ trunk/fuse/README 2013-04-25 05:47:40 UTC (rev 742)
@@ -1,4 +1,4 @@
-The Free Unix Spectrum Emulator (Fuse) 1.0.0
+The Free Unix Spectrum Emulator (Fuse) 1.1.0
============================================
Fuse (the Free Unix Spectrum Emulator) was originally, and somewhat
@@ -24,7 +24,7 @@
* Emulation of some of the printers you could attach to a Spectrum.
* Support for the RZX input recording file format, including
rollback and 'competition mode'.
-* Emulation of the DivIDE, Interface I, Kempston mouse, Spectrum +3e,
+* Emulation of the DivIDE, Interface 1, Kempston mouse, Spectrum +3e,
ZXATASP, ZXCF, Beta 128, Opus Discovery and +D interfaces.
Help! <xyz> doesn't work
@@ -33,7 +33,7 @@
If you're having a problem using/running/building Fuse, the two places
you're most likely to get help are the development mailing list
<fus...@li...> or the official forums at
-<http://sourceforge.net/projects/fuse-emulator/forums>.
+<http://sourceforge.net/p/fuse-emulator/discussion/>.
What you'll need to run Fuse
----------------------------
@@ -105,6 +105,6 @@
<http://www.worldofspectrum.org/forums/>.
Philip Kendall <phi...@sh...>
-16 December 2010
+?? ???? 2012
-$Id: README 4763 2012-11-16 11:01:59Z fredm $
+$Id: README 4846 2013-01-03 09:14:29Z zubzero $
Modified: trunk/fuse/THANKS
===================================================================
--- trunk/fuse/THANKS 2013-04-20 11:35:58 UTC (rev 741)
+++ trunk/fuse/THANKS 2013-04-25 05:47:40 UTC (rev 742)
@@ -5,10 +5,10 @@
* Michael Bukin: for XWinAllegro, which was used by previous versions of
Fuse for the graphical display.
- (http://www.canvaslink.com/allegro/xwinallegro/)
+ (http://web.archive.org/web/19990210094206/http://www.canvaslink.com/allegro/xwinallegro/)
* Ian Collier: the source to his xz80
- (http://www.comlab.ox.ac.uk/oucl/users/ian.collier/Spectrum/index.html)
+ (http://web.archive.org/web/19990428010016/http://www.comlab.ox.ac.uk/oucl/users/ian.collier/Spectrum/index.html)
was very helpful for getting the z80 opcodes right; also the ZX Printer
emulation is based on xz80's.
@@ -27,9 +27,9 @@
* Ian Greenway: for information about reading from unattached ports. If
you've got an Amiga, you may well like to check out Ian's Spectrum
- Emulator, ASp: http://www.greew.freeserve.co.uk/ASp.html
+ Emulator, ASp: http://www.lasernet.plus.com/asp.html
-* Shawn Hargreaves: for Allegro (http://www.talula.demon.co.uk/allegro/)
+* Shawn Hargreaves: for Allegro (http://alleg.sourceforge.net/)
(again, used by previous versions of Fuse for the graphical display)
* Steven Harrison: for helping track down why the SDL sound routines
@@ -67,7 +67,7 @@
* Darren Salt: quite a few bits of code (see `AUTHORS')
-* Dmitry Sanarin: the author of Glukalka (http://glukalka.sf.net/),
+* Dmitry Sanarin: the author of Glukalka (http://www.sanarin.ru/glukalka/),
from which Fuse's TR-DOS emulation code was taken.
* Steve Snake (via Mark Woodmass): for pointing out which memory pages
@@ -78,10 +78,11 @@
the code which is used as the graphics scalers. For ScummVM, check out
http://www.scummvm.org/
-* Gergely Szasz: Interface I/microdrive emulation, the 'movie' code and the
+* Gergely Szasz: Interface 1/Microdrive emulation, the 'movie' code and the
ao sound driver (see `AUTHORS')
-* Miklos Szeredi: his `SpectEmu' (http://www.inf.bme.hu/~mszeredi/spectemu/)
+* Miklos Szeredi: his `SpectEmu'
+ (http://web.archive.org/web/20100408033206/http://www.inf.bme.hu/~mszeredi/spectemu/)
gave the inspiration for an important rewrite of the Z80 core, and was
also _very_ useful whilst trying to track down some bugs.
@@ -101,4 +102,4 @@
* Matan Ziv-Av: for various bits of code (see `AUTHORS')
-$Id: THANKS 2433 2004-11-28 21:58:44Z pak21 $
+$Id: THANKS 4882 2013-02-15 23:47:37Z sbaldovi $
Modified: trunk/fuse/compat/amiga/Makefile.am
===================================================================
--- trunk/fuse/compat/amiga/Makefile.am 2013-04-20 11:35:58 UTC (rev 741)
+++ trunk/fuse/compat/amiga/Makefile.am 2013-04-25 05:47:40 UTC (rev 742)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2007-2012 Philip Kendall
-## $Id: Makefile.am 4743 2012-10-10 13:20:50Z fredm $
+## $Id: Makefile.am 4898 2013-02-25 22:20: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
@@ -31,8 +31,11 @@
../unix/file.c \
osname.c \
paths.c \
- ../unix/timer.c \
- ../unix/tuntap.c
+ ../unix/timer.c
+if HAVE_TUNTAP
+libcompatos_a_SOURCES += ../unix/tuntap.c
+endif
+
AM_CPPFLAGS += @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@ \
-DFUSEDATADIR="\"${pkgdatadir}\""
Modified: trunk/fuse/compat/linux/Makefile.am
===================================================================
--- trunk/fuse/compat/linux/Makefile.am 2013-04-20 11:35:58 UTC (rev 741)
+++ trunk/fuse/compat/linux/Makefile.am 2013-04-25 05:47:40 UTC (rev 742)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2012 Philip Kendall
-## $Id: Makefile.am 4779 2012-11-29 18:55:54Z sbaldovi $
+## $Id: Makefile.am 4898 2013-02-25 22:20: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
@@ -31,12 +31,15 @@
../unix/file.c \
../unix/osname.c \
paths.c \
- ../unix/timer.c \
- ../unix/tuntap.c
+ ../unix/timer.c
if HAVE_SOCKETS
libcompatos_a_SOURCES += ../unix/socket.c
endif
+if HAVE_TUNTAP
+libcompatos_a_SOURCES += ../unix/tuntap.c
+endif
+
AM_CPPFLAGS += @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@ \
-DFUSEDATADIR="\"${pkgdatadir}\""
Modified: trunk/fuse/compat/mkstemp.c
===================================================================
--- trunk/fuse/compat/mkstemp.c 2013-04-20 11:35:58 UTC (rev 741)
+++ trunk/fuse/compat/mkstemp.c 2013-04-25 05:47:40 UTC (rev 742)
@@ -49,7 +49,6 @@
int len;
char *XXXXXX;
static uint64_t value;
- uint64_t random_time_bits;
unsigned int count;
int fd = -1;
int save_errno = errno;
Modified: trunk/fuse/compat/morphos/Makefile.am
===================================================================
--- trunk/fuse/compat/morphos/Makefile.am 2013-04-20 11:35:58 UTC (rev 741)
+++ trunk/fuse/compat/morphos/Makefile.am 2013-04-25 05:47:40 UTC (rev 742)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2007-2008 Philip Kendall
-## $Id: Makefile.am 4743 2012-10-10 13:20:50Z fredm $
+## $Id: Makefile.am 4898 2013-02-25 22:20: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
@@ -31,7 +31,10 @@
../unix/file.c \
osname.c \
../amiga/paths.c \
- ../unix/timer.c \
- ../unix/tuntap.c
+ ../unix/timer.c
+if HAVE_TUNTAP
+libcompatos_a_SOURCES += ../unix/tuntap.c
+endif
+
AM_CPPFLAGS += @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@
Modified: trunk/fuse/compat/unix/Makefile.am
===================================================================
--- trunk/fuse/compat/unix/Makefile.am 2013-04-20 11:35:58 UTC (rev 741)
+++ trunk/fuse/compat/unix/Makefile.am 2013-04-25 05:47:40 UTC (rev 742)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2007-2012 Philip Kendall
-## $Id: Makefile.am 4779 2012-11-29 18:55:54Z sbaldovi $
+## $Id: Makefile.am 4898 2013-02-25 22:20: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
@@ -31,12 +31,15 @@
file.c \
osname.c \
paths.c \
- timer.c \
- tuntap.c
+ timer.c
if HAVE_SOCKETS
libcompatos_a_SOURCES += socket.c
endif
+if HAVE_TUNTAP
+libcompatos_a_SOURCES += tuntap.c
+endif
+
AM_CPPFLAGS += @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@ \
-DFUSEDATADIR="\"${pkgdatadir}\""
Modified: trunk/fuse/compat/unix/socket.c
===================================================================
--- trunk/fuse/compat/unix/socket.c 2013-04-20 11:35:58 UTC (rev 741)
+++ trunk/fuse/compat/unix/socket.c 2013-04-25 05:47:40 UTC (rev 742)
@@ -1,7 +1,7 @@
/* socket.c: Socket-related compatibility routines
- Copyright (c) 2011 Philip Kendall
+ Copyright (c) 2011-2012 Philip Kendall
- $Id: socket.c 4775 2012-11-26 23:03:36Z sbaldovi $
+ $Id: socket.c 4828 2012-12-30 19:43:37Z 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
@@ -116,5 +116,12 @@
char bitbucket;
ssize_t bytes_read;
- bytes_read = read( self->read_fd, &bitbucket, 1 );
+ do {
+ bytes_read = read( self->read_fd, &bitbucket, 1 );
+ if( bytes_read == -1 && errno != EINTR ) {
+ ui_error( UI_ERROR_ERROR,
+ "%s: %d: unexpected error %d (%s) reading from pipe", __FILE__,
+ __LINE__, errno, strerror(errno) );
+ }
+ } while( bytes_read < 0 );
}
Modified: trunk/fuse/compat/unix/tuntap.c
===================================================================
--- trunk/fuse/compat/unix/tuntap.c 2013-04-20 11:35:58 UTC (rev 741)
+++ trunk/fuse/compat/unix/tuntap.c 2013-04-25 05:47:40 UTC (rev 742)
@@ -1,7 +1,7 @@
/* tuntap.c: TUN/TAP compatability layer
Copyright (c) 2009-2010 Patrik Persson, Philip Kendall
- $Id: tuntap.c 4432 2011-05-11 14:08:17Z pak21 $
+ $Id: tuntap.c 4898 2013-02-25 22:20: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
@@ -30,11 +30,9 @@
#include <sys/types.h>
#include <sys/stat.h>
-#ifdef LINUX_TAP
#include <linux/if_tun.h>
#include <net/if.h>
#include <sys/ioctl.h>
-#endif /* #ifdef LINUX_TAP */
#include "ui/ui.h"
@@ -43,8 +41,6 @@
{
int fd = -1;
-#ifdef LINUX_TAP
-
if ( (fd = open( "/dev/net/tun", O_RDWR | O_NONBLOCK )) < 0 )
ui_error( UI_ERROR_ERROR, "couldn't open TUN/TAP device '/dev/net/tun'" );
else {
@@ -59,12 +55,5 @@
}
}
-#else
-
- ui_error( UI_ERROR_ERROR,
- "TUN/TAP not yet supported for this operating system" );
-
-#endif /* #ifdef LINUX_TAP */
-
return fd;
}
Modified: trunk/fuse/compat/wii/Makefile.am
===================================================================
--- trunk/fuse/compat/wii/Makefile.am 2013-04-20 11:35:58 UTC (rev 741)
+++ trunk/fuse/compat/wii/Makefile.am 2013-04-25 05:47:40 UTC (rev 742)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2007-2008 Philip Kendall
-## $Id: Makefile.am 4743 2012-10-10 13:20:50Z fredm $
+## $Id: Makefile.am 4898 2013-02-25 22:20: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
@@ -31,7 +31,10 @@
../unix/file.c \
osname.c \
paths.c \
- timer.c \
- ../unix/tuntap.c
+ timer.c
+if HAVE_TUNTAP
+libcompatos_a_SOURCES += ../unix/tuntap.c
+endif
+
AM_CPPFLAGS += @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@
Modified: trunk/fuse/compat/win32/Makefile.am
===================================================================
--- trunk/fuse/compat/win32/Makefile.am 2013-04-20 11:35:58 UTC (rev 741)
+++ trunk/fuse/compat/win32/Makefile.am 2013-04-25 05:47:40 UTC (rev 742)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2007-2008 Philip Kendall
-## $Id: Makefile.am 4779 2012-11-29 18:55:54Z sbaldovi $
+## $Id: Makefile.am 4898 2013-02-25 22:20: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
@@ -31,8 +31,7 @@
../unix/file.c \
osname.c \
paths.c \
- timer.c \
- ../unix/tuntap.c
+ timer.c
if HAVE_SOCKETS
libcompatos_a_SOURCES += socket.c
Modified: trunk/fuse/compat/win32/paths.c
===================================================================
--- trunk/fuse/compat/win32/paths.c 2013-04-20 11:35:58 UTC (rev 741)
+++ trunk/fuse/compat/win32/paths.c 2013-04-25 05:47:40 UTC (rev 742)
@@ -1,7 +1,7 @@
/* paths.c: Path-related compatibility routines
Copyright (c) 1999-2012 Philip Kendall
- $Id: paths.c 4739 2012-10-10 12:14:56Z fredm $
+ $Id: paths.c 4882 2013-02-15 23:47:37Z sbaldovi $
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 @@
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
+ http://msdn.microsoft.com/en-us/library/windows/desktop/aa364992%28v=vs.85%29.aspx
*/
dir = getenv( "TMP" ); if( dir ) return dir;
dir = getenv( "TEMP" ); if( dir ) return dir;
Modified: trunk/fuse/configure.ac
===================================================================
--- trunk/fuse/configure.ac 2013-04-20 11:35:58 UTC (rev 741)
+++ trunk/fuse/configure.ac 2013-04-25 05:47:40 UTC (rev 742)
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-dnl $Id: configure.ac 4779 2012-11-29 18:55:54Z sbaldovi $
+dnl $Id: configure.ac 4898 2013-02-25 22:20:54Z 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
@@ -20,20 +20,20 @@
dnl E-mail: phi...@sh...
dnl Package version
-m4_define([fuse_version], [1.0.0])
+m4_define([fuse_version], [1.1.0])
dnl Product full version
m4_define([fuse_major_version], [1])
-m4_define([fuse_minor_version], [0])
+m4_define([fuse_minor_version], [1])
m4_define([fuse_micro_version], [0])
m4_define([fuse_nano_version], [0])
m4_define([fuse_full_version], [fuse_major_version.fuse_minor_version.fuse_micro_version.fuse_nano_version])
m4_define([fuse_rc_version], [fuse_major_version,fuse_minor_version,fuse_micro_version,fuse_nano_version])
dnl Package info
-m4_define([fuse_copyright], ["(c) 1999-2012 Philip Kendall and others"])
-m4_define([fuse_url], [http://fuse-emulator.sourceforge.net])
-m4_define([fuse_bugreport], [http://sourceforge.net/tracker/?group_id=91293&atid=596648])
+m4_define([fuse_copyright], ["(c) 1999-2013 Philip Kendall and others"])
+m4_define([fuse_url], [http://fuse-emulator.sourceforge.net/])
+m4_define([fuse_bugreport], [http://sourceforge.net/p/fuse-emulator/bugs/])
AC_INIT([fuse],[fuse_version],[fuse_bugreport],[fuse],[fuse_url])
AC_CONFIG_SRCDIR(fuse.c)
@@ -105,6 +105,7 @@
dnl Checks for library functions.
AC_CHECK_FUNCS(dirname geteuid getopt_long mkstemp fsync)
+AC_CHECK_LIB([m],[cos])
dnl Allow the user to say that various libraries are in one place
AC_ARG_WITH(local-prefix,
@@ -134,6 +135,7 @@
AC_DEFINE([UI_WIN32], 1, [Defined if Win32 UI in use])
AC_DEFINE([WINVER], 0x0400, [Minimal supported version of Windows is 95 or NT4])
AC_DEFINE([_WIN32_IE], 0x400, [Internet Explorer is 4.0 or higher is required])
+ AC_DEFINE([WIN32_LEAN_AND_MEAN],, [Exclude rarely used stuff from Windows headers <windows.h>])
UI=win32; UI_LIBS="ui/win32/libuiwin32.a",
AC_MSG_ERROR([Win32 UI not found]))
fi
@@ -531,7 +533,9 @@
dsound.h,
[dxsound_available=yes],
[AC_MSG_WARN(dsound.h not found - no DirectSound output)],
- [#define DIRECTSOUND_VERSION 0x0700]
+ [#define DIRECTSOUND_VERSION 0x0700
+ #include <windows.h>
+ #include <mmsystem.h>]
)
dnl Check if MS Windows Multimedia API sound is available
@@ -759,11 +763,14 @@
int test2 = TUNSETIFF;
]])
],
- [AC_DEFINE([LINUX_TAP], 1, [Define to 1 if Linux TAP devices are supported.])
+ [AC_DEFINE([BUILD_SPECCYBOOT], 1, [Define to 1 if SpeccyBoot is supported.])
+ linux_tap=yes
AC_MSG_RESULT(yes)],
[AC_MSG_RESULT(no)]
)
CPPFLAGS="$ac_save_CPPFLAGS"
+AM_CONDITIONAL(HAVE_TUNTAP, test x$linux_tap != x)
+AM_CONDITIONAL(BUILD_SPECCYBOOT, test x$linux_tap != x)
dnl Work out which standard routines we're missing
AC_MSG_CHECKING(which standard routines we're missing)
Modified: trunk/fuse/fuse.c
===================================================================
--- trunk/fuse/fuse.c 2013-04-20 11:35:58 UTC (rev 741)
+++ trunk/fuse/fuse.c 2013-04-25 05:47:40 UTC (rev 742)
@@ -1,7 +1,7 @@
/* fuse.c: The Free Unix Spectrum Emulator
Copyright (c) 1999-2012 Philip Kendall and others
- $Id: fuse.c 4762 2012-11-12 11:32:09Z fredm $
+ $Id: fuse.c 4846 2013-01-03 09:14:29Z 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
@@ -121,6 +121,7 @@
const char *disk_opus;
const char *disk_plusd;
const char *disk_beta;
+ const char *disk_disciple;
const char *dock;
const char *if2;
const char *playback;
@@ -380,7 +381,7 @@
"'AUTHORS' for more details.\n"
"\n"
"For help, please mail <fus...@li...> or use\n"
- "the forums at <http://sourceforge.net/projects/fuse-emulator/forums>.\n"
+ "the forums at <http://sourceforge.net/p/fuse-emulator/discussion/>.\n"
"\n"
"This program is distributed in the hope that it will be useful,\n"
"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -470,6 +471,7 @@
start_files->disk_plus3 = settings_current.plus3disk_file;
start_files->disk_opus = settings_current.opusdisk_file;
start_files->disk_plusd = settings_current.plusddisk_file;
+ start_files->disk_disciple = settings_current.discipledisk_file;
start_files->disk_beta = settings_current.betadisk_file;
start_files->dock = settings_current.dck_file;
start_files->if2 = settings_current.if2_file;
@@ -569,7 +571,11 @@
start_files->disk_opus = filename; break;
case LIBSPECTRUM_CLASS_DISK_PLUSD:
- start_files->disk_plusd = filename; break;
+ if( periph_is_active( PERIPH_TYPE_DISCIPLE ) )
+ start_files->disk_disciple = filename;
+ else
+ start_files->disk_plusd = filename;
+ break;
case LIBSPECTRUM_CLASS_DISK_TRDOS:
start_files->disk_beta = filename; break;
@@ -588,6 +594,8 @@
start_files->disk_beta = filename;
else if( periph_is_active( PERIPH_TYPE_PLUSD ) )
start_files->disk_plusd = filename;
+ else if( periph_is_active( PERIPH_TYPE_DISCIPLE ) )
+ start_files->disk_disciple = filename;
else if( periph_is_active( PERIPH_TYPE_OPUS ) )
start_files->disk_opus = filename;
}
@@ -668,12 +676,12 @@
start_files->dock = NULL;
}
- /* Can't use disks and the Interface II simultaneously */
+ /* Can't use disks and the Interface 2 simultaneously */
if( ( start_files->disk_plus3 || start_files->disk_beta ) &&
start_files->if2 ) {
ui_error(
UI_ERROR_WARNING,
- "can't use disks and the Interface II simultaneously; cartridge ignored"
+ "can't use disks and the Interface 2 simultaneously; cartridge ignored"
);
start_files->if2 = NULL;
}
@@ -697,6 +705,11 @@
if( error ) return error;
}
+ if( start_files->disk_disciple ) {
+ error = utils_open_file( start_files->disk_disciple, autoload, NULL );
+ if( error ) return error;
+ }
+
if( start_files->disk_opus ) {
error = utils_open_file( start_files->disk_opus, autoload, NULL );
if( error ) return error;
Modified: trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
===================================================================
--- trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2013-04-20 11:35:58 UTC (rev 741)
+++ trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2013-04-25 05:47:40 UTC (rev 742)
@@ -189,6 +189,7 @@
B684A19E0E93A8CD00A5B097 /* event.c in Sources */ = {isa = PBXBuildFile; fileRef = B684A19D0E93A8CD00A5B097 /* event.c */; };
B684A1A00E93A8D700A5B097 /* variable.c in Sources */ = {isa = PBXBuildFile; fileRef = B684A19F0E93A8D700A5B097 /* variable.c */; };
B684A1A20E93A8FC00A5B097 /* file.c in Sources */ = {isa = PBXBuildFile; fileRef = B684A1A10E93A8FC00A5B097 /* file.c */; };
+ B69A00421723B8F300FF201C /* disciple.rom in Resources */ = {isa = PBXBuildFile; fileRef = B69A00411723B8F300FF201C /* disciple.rom */; };
B69BE5331660DF5300C5D0CE /* socket.c in Sources */ = {isa = PBXBuildFile; fileRef = B69BE5321660DF5300C5D0CE /* socket.c */; };
B69BE5381660DF8B00C5D0CE /* movie.c in Sources */ = {isa = PBXBuildFile; fileRef = B69BE5361660DF8B00C5D0CE /* movie.c */; };
B69BE53C1660E01000C5D0CE /* am29f010.c in Sources */ = {isa = PBXBuildFile; fileRef = B69BE53A1660E01000C5D0CE /* am29f010.c */; };
@@ -269,7 +270,6 @@
B6E1F1AB14F653FB00600EB0 /* speccyboot.c in Sources */ = {isa = PBXBuildFile; fileRef = B6E1F1A714F653FB00600EB0 /* speccyboot.c */; };
B6E1F1AD14F653FB00600EB0 /* specdrum.c in Sources */ = {isa = PBXBuildFile; fileRef = B6E1F1A914F653FB00600EB0 /* specdrum.c */; };
B6E1F1B114F6555400600EB0 /* disciple.c in Sources */ = {isa = PBXBuildFile; fileRef = B6E1F1AF14F6555400600EB0 /* disciple.c */; };
- B6E1F1B414F6560500600EB0 /* tuntap.c in Sources */ = {isa = PBXBuildFile; fileRef = B6E1F1B314F6560500600EB0 /* tuntap.c */; };
B6E1F24414F7A14200600EB0 /* enc28j60.c in Sources */ = {isa = PBXBuildFile; fileRef = B6E1F24214F7A14200600EB0 /* enc28j60.c */; };
B6E1F26E14F85BD500600EB0 /* speccyboot-1.4.rom in Resources */ = {isa = PBXBuildFile; fileRef = B6E1F26D14F85BD500600EB0 /* speccyboot-1.4.rom */; };
B6F047F60952A6D6006D8005 /* tape_se.szx in CopyFiles */ = {isa = PBXBuildFile; fileRef = B6F047F20952A6BA006D8005 /* tape_se.szx */; };
@@ -542,6 +542,7 @@
B68CB2C503DD920300A804BA /* debugger.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = debugger.h; path = ../debugger/debugger.h; sourceTree = "<group>"; };
B68CB2C603DD920300A804BA /* disassemble.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = disassemble.c; path = ../debugger/disassemble.c; sourceTree = "<group>"; };
B68CB2CC03DD923C00A804BA /* memory.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = memory.c; sourceTree = "<group>"; };
+ B69A00411723B8F300FF201C /* disciple.rom */ = {isa = PBXFileReference; lastKnownFileType = file; name = disciple.rom; path = ../roms/disciple.rom; sourceTree = SOURCE_ROOT; };
B69BE5321660DF5300C5D0CE /* socket.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = socket.c; sourceTree = "<group>"; };
B69BE5351660DF8B00C5D0CE /* movie_tables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = movie_tables.h; sourceTree = "<group>"; };
B69BE5361660DF8B00C5D0CE /* movie.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = movie.c; sourceTree = "<group>"; };
@@ -681,7 +682,6 @@
B6E1F1AA14F653FB00600EB0 /* specdrum.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = specdrum.h; sourceTree = "<group>"; };
B6E1F1AF14F6555400600EB0 /* disciple.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = disciple.c; sourceTree = "<group>"; };
B6E1F1B014F6555400600EB0 /* disciple.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = disciple.h; sourceTree = "<group>"; };
- B6E1F1B314F6560500600EB0 /* tuntap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tuntap.c; sourceTree = "<group>"; };
B6E1F24214F7A14200600EB0 /* enc28j60.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = enc28j60.c; sourceTree = "<group>"; };
B6E1F24314F7A14200600EB0 /* enc28j60.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = enc28j60.h; sourceTree = "<group>"; };
B6E1F26D14F85BD500600EB0 /* speccyboot-1.4.rom */ = {isa = PBXFileReference; lastKnownFileType = file; name = "speccyboot-1.4.rom"; path = "../roms/speccyboot-1.4.rom"; sourceTree = "<group>"; };
@@ -943,7 +943,6 @@
B63225EB0C66BA1300BB081B /* osname.c */,
B69BE5321660DF5300C5D0CE /* socket.c */,
B64BD10B0FF6EE4E000B82AE /* timer.c */,
- B6E1F1B314F6560500600EB0 /* tuntap.c */,
);
path = unix;
sourceTree = "<group>";
@@ -1382,6 +1381,7 @@
F559854D0389212301A804BA /* 128-0.rom */,
F559854E0389212301A804BA /* 128-1.rom */,
F559854C0389212301A804BA /* 48.rom */,
+ B69A00411723B8F300FF201C /* disciple.rom */,
F55985520389213E01A804BA /* plus2-0.rom */,
F55985530389213E01A804BA /* plus2-1.rom */,
F55985540389213E01A804BA /* plus3-0.rom */,
@@ -1546,7 +1546,7 @@
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0450;
+ LastUpgradeCheck = 0460;
};
buildConfigurationList = B63319B3086803BA00732AA3 /* Build configuration list for PBXProject "Fuse" */;
compatibilityVersion = "Xcode 3.2";
@@ -1577,6 +1577,7 @@
B61F460D09121DF100C8096C /* 128-0.rom in Resources */,
B61F460E09121DF100C8096C /* 128-1.rom in Resources */,
B61F460C09121DF100C8096C /* 48.rom in Resources */,
+ B69A00421723B8F300FF201C /* disciple.rom in Resources */,
B61F461709121DF100C8096C /* plus2-0.rom in Resources */,
B61F461809121DF100C8096C /* plus2-1.rom in Resources */,
B61F461909121DF100C8096C /* plus3-0.rom in Resources */,
@@ -1832,7 +1833,6 @@
B6E1F1AB14F653FB00600EB0 /* speccyboot.c in Sources */,
B6E1F1AD14F653FB00600EB0 /* specdrum.c in Sources */,
B6E1F1B114F6555400600EB0 /* disciple.c in Sources */,
- B6E1F1B414F6560500600EB0 /* tuntap.c in Sources */,
B6E1F24414F7A14200600EB0 /* enc28j60.c in Sources */,
B61700F7163EAFC600142336 /* PokeMemoryController.m in Sources */,
B69BE5331660DF5300C5D0CE /* socket.c in Sources */,
Modified: trunk/fuse/fusepb/Info-Fuse.plist
===================================================================
--- trunk/fuse/fusepb/Info-Fuse.plist 2013-04-20 11:35:58 UTC (rev 741)
+++ trunk/fuse/fusepb/Info-Fuse.plist 2013-04-25 05:47:40 UTC (rev 742)
@@ -548,11 +548,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>1.0.0</string>
+ <string>1.1.0</string>
<key>CFBundleSignature</key>
<string>FUSE</string>
<key>CFBundleVersion</key>
- <string>4779</string>
+ <string>4918</string>
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSPrincipalClass</key>
Modified: trunk/fuse/fusepb/config.h
===================================================================
--- trunk/fuse/fusepb/config.h 2013-04-20 11:35:58 UTC (rev 741)
+++ trunk/fuse/fusepb/config.h 2013-04-25 05:47:40 UTC (rev 742)
@@ -5,10 +5,10 @@
#define BUILD_SPECTRANET 1
/* Define copyright of Fuse */
-#define FUSE_COPYRIGHT "(c) 1999-2012 Philip Kendall and others"
+#define FUSE_COPYRIGHT "(c) 1999-2013 Philip Kendall and others"
/* Define version information for win32 executables */
-#define FUSE_RC_VERSION 1,0,0,0
+#define FUSE_RC_VERSION 1,1,0,0
/* Define to 1 if you have the `dirname' function. */
#define HAVE_DIRNAME 1
@@ -164,7 +164,7 @@
/* #undef USE_WIDGET */
/* Version number of package */
-#define VERSION "1.0.0"
+#define VERSION "1.1.0"
/* Define to 1 if your processor stores words with the most significant byte
first (like Motorola and SPARC, unlike Intel and VAX). */
Modified: trunk/fuse/fusepb/controllers/JoystickConfigurationController.h
===================================================================
--- trunk/fuse/fusepb/controllers/JoystickConfigurationController.h 2013-04-20 11:35:58 UTC (rev 741)
+++ trunk/fuse/fusepb/controllers/JoystickConfigurationController.h 2013-04-25 05:47:40 UTC (rev 742)
@@ -38,6 +38,11 @@
IBOutlet NSPopUpButton *joyFire8;
IBOutlet NSPopUpButton *joyFire9;
IBOutlet NSPopUpButton *joyFire10;
+ IBOutlet NSPopUpButton *joyFire11;
+ IBOutlet NSPopUpButton *joyFire12;
+ IBOutlet NSPopUpButton *joyFire13;
+ IBOutlet NSPopUpButton *joyFire14;
+ IBOutlet NSPopUpButton *joyFire15;
IBOutlet NSPopUpButton *joyXAxis;
IBOutlet NSPopUpButton *joyYAxis;
Modified: trunk/fuse/fusepb/controllers/JoystickConfigurationController.m
===================================================================
--- trunk/fuse/fusepb/controllers/JoystickConfigurationController.m 2013-04-20 11:35:58 UTC (rev 741)
+++ trunk/fuse/fusepb/controllers/JoystickConfigurationController.m 2013-04-25 05:47:40 UTC (rev 742)
@@ -119,6 +119,11 @@
[currentValues setObject:@([[joyFire8 selectedItem] tag]) forKey:@"joystick1fire8"];
[currentValues setObject:@([[joyFire9 selectedItem] tag]) forKey:@"joystick1fire9"];
[currentValues setObject:@([[joyFire10 selectedItem] tag]) forKey:@"joystick1fire10"];
+ [currentValues setObject:@([[joyFire11 selectedItem] tag]) forKey:@"joystick1fire11"];
+ [currentValues setObject:@([[joyFire12 selectedItem] tag]) forKey:@"joystick1fire12"];
+ [currentValues setObject:@([[joyFire13 selectedItem] tag]) forKey:@"joystick1fire13"];
+ [currentValues setObject:@([[joyFire14 selectedItem] tag]) forKey:@"joystick1fire14"];
+ [currentValues setObject:@([[joyFire15 selectedItem] tag]) forKey:@"joystick1fire15"];
[currentValues setObject:@([[joyXAxis selectedItem] tag]) forKey:@"joy1x"];
[currentValues setObject:@([[joyYAxis selectedItem] tag]) forKey:@"joy1y"];
break;
@@ -133,6 +138,11 @@
[currentValues setObject:@([[joyFire8 selectedItem] tag]) forKey:@"joystick2fire8"];
[currentValues setObject:@([[joyFire9 selectedItem] tag]) forKey:@"joystick2fire9"];
[currentValues setObject:@([[joyFire10 selectedItem] tag]) forKey:@"joystick2fire10"];
+ [currentValues setObject:@([[joyFire11 selectedItem] tag]) forKey:@"joystick2fire11"];
+ [currentValues setObject:@([[joyFire12 selectedItem] tag]) forKey:@"joystick2fire12"];
+ [currentValues setObject:@([[joyFire13 selectedItem] tag]) forKey:@"joystick2fire13"];
+ [currentValues setObject:@([[joyFire14 selectedItem] tag]) forKey:@"joystick2fire14"];
+ [currentValues setObject:@([[joyFire15 selectedItem] tag]) forKey:@"joystick2fire15"];
[currentValues setObject:@([[joyXAxis selectedItem] tag]) forKey:@"joy2x"];
[currentValues setObject:@([[joyYAxis selectedItem] tag]) forKey:@"joy2y"];
break;
@@ -183,6 +193,16 @@
indexOfItemWithTag:settings_current.joystick_1_fire_9]];
[joyFire10 selectItemAtIndex:[joyXAxis
indexOfItemWithTag:settings_current.joystick_1_fire_10]];
+ [joyFire11 selectItemAtIndex:[joyXAxis
+ indexOfItemWithTag:settings_current.joystick_1_fire_11]];
+ [joyFire12 selectItemAtIndex:[joyXAxis
+ indexOfItemWithTag:settings_current.joystick_1_fire_12]];
+ [joyFire13 selectItemAtIndex:[joyXAxis
+ indexOfItemWithTag:settings_current.joystick_1_fire_13]];
+ [joyFire14 selectItemAtIndex:[joyXAxis
+ indexOfItemWithTag:settings_current.joystick_1_fire_14]];
+ [joyFire15 selectItemAtIndex:[joyXAxis
+ indexOfItemWithTag:settings_current.joystick_1_fire_15]];
x_axis = settings_current.joy1_xaxis;
y_axis = settings_current.joy1_yaxis;
break;
@@ -207,6 +227,16 @@
indexOfItemWithTag:settings_current.joystick_2_fire_9]];
[joyFire10 selectItemAtIndex:[joyXAxis
indexOfItemWithTag:settings_current.joystick_2_fire_10]];
+ [joyFire11 selectItemAtIndex:[joyXAxis
+ indexOfItemWithTag:settings_current.joystick_2_fire_11]];
+ [joyFire12 selectItemAtIndex:[joyXAxis
+ indexOfItemWithTag:settings_current.joystick_2_fire_12]];
+ [joyFire13 selectItemAtIndex:[joyXAxis
+ indexOfItemWithTag:settings_current.joystick_2_fire_13]];
+ [joyFire14 selectItemAtIndex:[joyXAxis
+ indexOfItemWithTag:settings_current.joystick_2_fire_14]];
+ [joyFire15 selectItemAtIndex:[joyXAxis
+ indexOfItemWithTag:settings_current.joystick_2_fire_15]];
x_axis = settings_current.joy2_xaxis;
y_axis = settings_current.joy2_yaxis;
break;
@@ -214,7 +244,7 @@
assert(0);
}
- for( i=0; i<10; i++ ) {
+ for( i=0; i<15; i++ ) {
[joyXAxis addItemWithTitle:[NSString stringWithFormat:@"%ld", i]];
[[joyXAxis lastItem] setTag:i];
[joyYAxis addItemWithTitle:[NSString stringWithFormat:@"%ld", i]];
@@ -239,6 +269,11 @@
[joyFire8 removeAllItems];
[joyFire9 removeAllItems];
[joyFire10 removeAllItems];
+ [joyFire11 removeAllItems];
+ [joyFire12 removeAllItems];
+ [joyFire13 removeAllItems];
+ [joyFire14 removeAllItems];
+ [joyFire15 removeAllItems];
for( i = 0; i < key_menu_count; i++ ) {
[joyFire1 addItemWithTitle:@(key_menu[i].key)];
@@ -261,6 +296,16 @@
[[joyFire9 lastItem] setTag:key_menu[i].value];
[joyFire10 addItemWithTitle:@(key_menu[i].key)];
[[joyFire10 lastItem] setTag:key_menu[i].value];
+ [joyFire11 addItemWithTitle:@(key_menu[i].key)];
+ [[joyFire11 lastItem] setTag:key_menu[i].value];
+ [joyFire12 addItemWithTitle:@(key_menu[i].key)];
+ [[joyFire12 lastItem] setTag:key_menu[i].value];
+ [joyFire13 addItemWithTitle:@(key_menu[i].key)];
+ [[joyFire13 lastItem] setTag:key_menu[i].value];
+ [joyFire14 addItemWithTitle:@(key_menu[i].key)];
+ [[joyFire14 lastItem] setTag:key_menu[i].value];
+ [joyFire15 addItemWithTitle:@(key_menu[i].key)];
+ [[joyFire15 lastItem] setTag:key_menu[i].value];
}
switch(joyNum) {
@@ -285,6 +330,16 @@
indexOfItemWithTag:settings_current.joystick_1_fire_9]];
[joyFire10 selectItemAtIndex:[joyFire10
indexOfItemWithTag:settings_current.joystick_1_fire_10]];
+ [joyFire11 selectItemAtIndex:[joyFire1
+ indexOfItemWithTag:settings_current.joystick_1_fire_11]];
+ [joyFire12 selectItemAtIndex:[joyFire2
+ indexOfItemWithTag:settings_current.joystick_1_fire_12]];
+ [joyFire13 selectItemAtIndex:[joyFire3
+ indexOfItemWithTag:settings_current.joystick_1_fire_13]];
+ [joyFire14 selectItemAtIndex:[joyFire4
+ indexOfItemWithTag:settings_current.joystick_1_fire_14]];
+ [joyFire15 selectItemAtIndex:[joyFire5
+ indexOfItemWithTag:settings_current.joystick_1_fire_15]];
break;
case 2:
[joyFire1 selectItemAtIndex:[joyFire1
@@ -307,6 +362,16 @@
indexOfItemWithTag:settings_current.joystick_2_fire_9]];
[joyFire10 selectItemAtIndex:[joyFire10
indexOfItemWithTag:settings_current.joystick_2_fire_10]];
+ [joyFire11 selectItemAtIndex:[joyFire1
+ indexOfItemWithTag:settings_current.joystick_2_fire_11]];
+ [joyFire12 selectItemAtIndex:[joyFire2
+ indexOfItemWithTag:settings_current.joystick_2_fire_12]];
+ [joyFire13 selectItemAtIndex:[joyFire3
+ indexOfItemWithTag:settings_current.joystick_2_fire_13]];
+ [joyFire14 selectItemAtIndex:[joyFire4
+ indexOfItemWithTag:settings_current.joystick_2_fire_14]];
+ [joyFire15 selectItemAtIndex:[joyFire5
+ indexOfItemWithTag:settings_current.joystick_2_fire_15]];
break;
default:
assert(0);
Modified: trunk/fuse/fusepb/controllers/PreferencesController.m
===================================================================
--- trunk/fuse/fusepb/controllers/PreferencesController.m 2013-04-20 11:35:58 UTC (rev 741)
+++ trunk/fuse/fusepb/controllers/PreferencesController.m 2013-04-25 05:47:40 UTC (rev 742)
@@ -44,6 +44,7 @@
#include "fuse.h"
#include "joystick.h"
#include "options_cocoa.h"
+#include "periph.h"
#include "printer.h"
#include "settings.h"
#include "settings_cocoa.h"
@@ -178,6 +179,8 @@
fuse_joystick_end();
fuse_joystick_init();
+ periph_posthook();
+
[[DisplayOpenGLView instance] unpause];
}
Modified: trunk/fuse/fusepb/libspectrum.h
===================================================================
--- trunk/fuse/fusepb/libspectrum.h 2013-04-20 11:35:58 UTC (rev 741)
+++ trunk/fuse/fusepb/libspectrum.h 2013-04-25 05:47:40 UTC (rev 742)
@@ -1,7 +1,7 @@
/* libspectrum.h: the library for dealing with ZX Spectrum emulator files
Copyright (c) 2001-2007 Philip Kendall, Darren Salt, Fredrick Meunier
- $Id: libspectrum.h.in 4695 2012-05-07 02:03:10Z fredm $
+ $Id: libspectrum.h.in 4836 2012-12-31 15:40:10Z 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
@@ -40,10 +40,19 @@
#ifdef _WIN32
-#define WIN32_LEAN_AND_MEAN /* Exclude rarely used stuff from Windows
- headers */
+/* Exclude rarely used stuff from Windows headers */
+#ifndef WIN32_LEAN_AND_MEAN
+
+#define WIN32_LEAN_AND_MEAN /**/
#include <windows.h>
+#undef WIN32_LEAN_AND_MEAN
+#else
+
+#include <windows.h>
+
+#endif /* #ifndef WIN32_LEAN_AND_MEAN */
+
#ifdef LIBSPECTRUM_EXPORTS
#define WIN32_DLL __declspec( dllexport )
#else /* #ifdef LIBSPECTRUM_EXPORTS */
@@ -365,7 +374,7 @@
/* Below here, present only in 0.2.2 and later */
LIBSPECTRUM_ID_HARDDISK_HDF, /* .hdf hard disk image */
- LIBSPECTRUM_ID_CARTRIDGE_IF2, /* .rom Interface II cartridge image */
+ LIBSPECTRUM_ID_CARTRIDGE_IF2, /* .rom Interface 2 cartridge image */
/* Below here, present only in 0.3.0 and later */
@@ -422,7 +431,7 @@
/* Below here, present only in 0.2.2 and later */
LIBSPECTRUM_CLASS_HARDDISK, /* A hard disk image */
- LIBSPECTRUM_CLASS_CARTRIDGE_IF2, /* Interface II cartridges */
+ LIBSPECTRUM_CLASS_CARTRIDGE_IF2, /* Interface 2 cartridges */
/* Below here, present only in 0.3.0 and later */
@@ -490,6 +499,8 @@
LIBSPECTRUM_MACHINE_48_NTSC,
+ LIBSPECTRUM_MACHINE_128E,
+
} libspectrum_machine;
WIN32_DLL const char* libspectrum_machine_name( libspectrum_machine type );
@@ -697,6 +708,8 @@
WIN32_DLL void libspectrum_snap_set_sp( libspectrum_snap *snap, libspectrum_word sp );
WIN32_DLL libspectrum_word libspectrum_snap_pc( libspectrum_snap *snap );
WIN32_DLL void libspectrum_snap_set_pc( libspectrum_snap *snap, libspectrum_word pc );
+WIN32_DLL libspectrum_word libspectrum_snap_memptr( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_memptr( libspectrum_snap *snap, libspectrum_word memptr );
WIN32_DLL libspectrum_byte libspectrum_snap_iff1( libspectrum_snap *snap );
WIN32_DLL void libspectrum_snap_set_iff1( libspectrum_snap *snap, libspectrum_byte iff1 );
WIN32_DLL libspectrum_byte libspectrum_snap_iff2( libspectrum_snap *snap );
@@ -709,6 +722,8 @@
WIN32_DLL void libspectrum_snap_set_halted( libspectrum_snap *snap, int halted );
WIN32_DLL int libspectrum_snap_last_instruction_ei( libspectrum_snap *snap );
WIN32_DLL void libspectrum_snap_set_last_instruction_ei( libspectrum_snap *snap, int last_instruction_ei );
+WIN32_DLL int libspectrum_snap_last_instruction_set_f( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_last_instruction_set_f( libspectrum_snap *snap, int last_instruction_set_f );
WIN32_DLL libspectrum_byte libspectrum_snap_out_ula( libspectrum_snap *snap );
WIN32_DLL void libspectrum_snap_set_out_ula( libspectrum_snap *snap, libspectrum_byte out_ula );
WIN32_DLL libspectrum_byte libspectrum_snap_out_128_memoryport( libspectrum_snap *snap );
@@ -919,6 +934,8 @@
WIN32_DLL void libspectrum_snap_set_spectranet_paged( libspectrum_snap *snap, int spectranet_paged );
WIN32_DLL int libspectrum_snap_spectranet_paged_via_io( libspectrum_snap *snap );
WIN32_DLL void libspectrum_snap_set_spectranet_paged_via_io( libspectrum_snap *snap, int spectranet_paged_via_io );
+WIN32_DLL int libspectrum_snap_spectranet_nmi_flipflop( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_spectranet_nmi_flipflop( libspectrum_snap *snap, int spectranet_nmi_flipflop );
WIN32_DLL int libspectrum_snap_spectranet_programmable_trap_active( libspectrum_snap *snap );
WIN32_DLL void libspectrum_snap_set_spectranet_programmable_trap_active( libspectrum_snap *snap, int spectranet_programmable_trap_active );
WIN32_DLL int libspectrum_snap_spectranet_programmable_trap_msb( libspectrum_snap *snap );
@@ -941,6 +958,10 @@
WIN32_DLL void libspectrum_snap_set_spectranet_flash( libspectrum_snap *snap, int idx, libspectrum_byte* spectranet_flash );
WIN32_DLL libspectrum_byte * libspectrum_snap_spectranet_ram( libspectrum_snap *snap, int idx );
WIN32_DLL void libspectrum_snap_set_spectranet_ram( libspectrum_snap *snap, int idx, libspectrum_byte* spectranet_ram );
+WIN32_DLL int libspectrum_snap_late_timings( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_late_timings( libspectrum_snap *snap, int late_timings );
+WIN32_DLL int libspectrum_snap_zx_printer_active( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_zx_printer_active( libspectrum_snap *snap, int zx_printer_active );
/*
* Tape handling routines
Modified: trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html
===================================================================
--- trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html 2013-04-20 11:35:58 UTC (rev 741)
+++ trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html 2013-04-25 05:47:40 UTC (rev 742)
@@ -41,7 +41,10 @@
<li><font face="Lucida Grande,Helvetica,Arial">Add SpecDrum
sound interface emulation (Jon Mitchell).</font></li>
<li><font face="Lucida Grande,Helvetica,Arial">Add DISCiPLE
- disk interface emulation (Stuart Brady).</font></li>
+ disk interface emulation (Stuart Brady), note that
+ Sinclair Network emulation is not provided, and the
+ interface is not available under 128K emulation in this
+ release.</font></li>
<li><font face="Lucida Grande,Helvetica,Arial">Support reading
PZX files (Fredrick Meunier).</font></li>
<li><font face="Lucida Grande,Helvetica,Arial">Add support for
@@ -71,6 +74,21 @@
<li><font face="Lucida Grande,Helvetica,Arial">Support the
Beta interface setting to not auto-boot the interface on
48K machines (ketmar).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Support setting
+ late timings from snapshots (Fredrick Meunier).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Add separate
+ switch to enable ZX Printer emulation (Fredrick Meunier).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Reset machine
+ when installed peripherals are changed (Fredrick Meunier).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Fix memory disk
+ image corrupted after save (Sergio Baldoví).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Allow up to 15
+ joystick buttons to be defined to accommodate e.g. XBox
+ 360 ABXY button use (Fredrick Meunier).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Fix loading of
+ EDSK files with redundant sector images (Fredrick
+ Meunier).<br>
+ </font></li>
</ul>
<br>
</li>
@@ -87,6 +105,14 @@
<li><font face="Lucida Grande,Helvetica,Arial">Restore the
paged state of the Beta ROM when loading Pentagon
128k/512k/1024k snapshots (ketmar and Fredrick Meunier).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Fix SE writing
+ dock and exrom pages to snapshots (Fredrick Meunier).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Update SE ROMs
+ to v4.04 (Fredrick Meunier).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Update to v1.38
+ of the +3e ROMs (fixes bug #290) (thanks, Guesser)
+ (Fredrick Meunier).<br>
+ </font></li>
</ul>
</li>
<li style="list-style-type: none; list-style-image: none;
@@ -111,6 +137,23 @@
TZX set signal level block (Fredrick Meunier).</font></li>
<li><font face="Lucida Grande,Helvetica,Arial">Support setting
late timings from snapshots (Fredrick Meunier).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Fix 16x9
+ panoramic widescreen and non-panoramic non-4/3 widescreen
+ (thanks, Adam Meath)</font><font face="Lucida
+ Grande,Helvetica,Arial"><font face="Lucida
+ Grande,Helvetica,Arial"> (Fredrick Meunier)</font>.</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Properly handle
+ opening and closing windows more than once</font><font
+ face="Lucida Grande,Helvetica,Arial"><font face="Lucida
+ Grande,Helvetica,Arial"> (Fredrick Meunier)</font>.</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Fix display of
+ memory map in debugger</font><font face="Lucida
+ Grande,Helvetica,Arial"><font face="Lucida
+ Grande,Helvetica,Arial"><font face="Lucida
+ Grande,Helvetica,Arial"> (Fredrick Meunier)</font></font>.</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Updated retina
+ icon images from Paul van der Laan.<br>
+ </font></li>
</ul>
<li style="list-style: none outside none;"><br>
</li>
Modified: trunk/fuse/fusepb/resources/Fuse Help/html/disciple.html
===================================================================
--- trunk/fuse/fusepb/resources/Fuse Help/html/disciple.html 2013-04-20 11:35:58 UTC (rev 741)
+++ trunk/fuse/fusepb/resources/Fuse Help/html/disciple.html 2013-04-25 05:47:40 UTC (rev 742)
@@ -9,17 +9,14 @@
<body>
<font face="Lucida Grande,Helvetica,Arial"><a name="+D EMULATION"></a><!-- AppleSegDescription="This section describes the +D interface emulation in Fuse." --></font>
<div class="refsect1" xml:lang="en" lang="en">
- <h2><font face="Lucida Grande,Helvetica,Arial">DISCiPLE Emulation</font></h2>
+ <h2><font face="Lucida Grande,Helvetica,Arial">DISCIPLE Emulation</font></h2>
</div>
- <p>
- <font face="Lucida Grande,Helvetica,Arial">Fuse supports emulating
- the
- DISCiPLE disk and printer interface, although it does not
- currently
- support emulation of the Sinclair Network, or support emulation
- of a
- DISCiPLE attached to a 128K machine. See the <font face="Lucida
- Grande,Helvetica,Arial"><span class="emphasis"><em></em></span></font></font><font
+ <p> <font face="Lucida Grande,Helvetica,Arial">Fuse supports
+ emulating the DISCiPLE disk and printer interface, although it
+ does not currently support emulation of the Sinclair Network, or
+ support emulation of a DISCiPLE attached to a 128K machine. See
+ the <font face="Lucida Grande,Helvetica,Arial"><span
+ class="emphasis"><em></em></span></font></font><font
face="Lucida Grande,Helvetica,Arial"><font face="Lucida
Grande,Helvetica,Arial"><span class="emphasis"><em><font
face="Lucida Grande,Helvetica,Arial">...
[truncated message content] |
|
From: <fr...@us...> - 2013-04-20 11:36:01
|
Revision: 741
http://sourceforge.net/p/fuse-for-macosx/code/741
Author: fredm
Date: 2013-04-20 11:35:58 +0000 (Sat, 20 Apr 2013)
Log Message:
-----------
Merge up to vendor revision 4915.
Revision Links:
--------------
http://sourceforge.net/p/fuse-for-macosx/code/4915
Modified Paths:
--------------
trunk/FuseGenerator/FuseGenerator.xcodeproj/project.pbxproj
trunk/FuseGenerator/config.h
trunk/FuseGenerator/libspectrum.h
trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj
trunk/FuseImporter/config.h
trunk/FuseImporter/libspectrum.h
trunk/libspectrum/Info.plist
trunk/libspectrum/config.h
trunk/libspectrum/libspectrum/ChangeLog
trunk/libspectrum/libspectrum/README
trunk/libspectrum/libspectrum/accessor.pl
trunk/libspectrum/libspectrum/configure.ac
trunk/libspectrum/libspectrum/csw.c
trunk/libspectrum/libspectrum/doc/libspectrum.3
trunk/libspectrum/libspectrum/doc/libspectrum.txt
trunk/libspectrum/libspectrum/hacking/ChangeLog
trunk/libspectrum/libspectrum/libspectrum.c
trunk/libspectrum/libspectrum/libspectrum.h.in
trunk/libspectrum/libspectrum/make-perl.c
trunk/libspectrum/libspectrum/rzx.c
trunk/libspectrum/libspectrum/sna.c
trunk/libspectrum/libspectrum/snap_accessors.txt
trunk/libspectrum/libspectrum/snapshot.c
trunk/libspectrum/libspectrum/szx.c
trunk/libspectrum/libspectrum/timings.c
trunk/libspectrum/libspectrum/z80.c
trunk/libspectrum/libspectrum.h
trunk/libspectrum/libspectrum.xcodeproj/project.pbxproj
Property Changed:
----------------
trunk/libspectrum/libspectrum/
Modified: trunk/FuseGenerator/FuseGenerator.xcodeproj/project.pbxproj
===================================================================
--- trunk/FuseGenerator/FuseGenerator.xcodeproj/project.pbxproj 2013-04-20 07:02:15 UTC (rev 740)
+++ trunk/FuseGenerator/FuseGenerator.xcodeproj/project.pbxproj 2013-04-20 11:35:58 UTC (rev 741)
@@ -363,7 +363,7 @@
089C1669FE841209C02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0450;
+ LastUpgradeCheck = 0460;
};
buildConfigurationList = 2CA326220896AD4900168862 /* Build configuration list for PBXProject "FuseGenerator" */;
compatibilityVersion = "Xcode 3.2";
@@ -532,12 +532,18 @@
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "ppc i386 ppc64 x86_64";
+ CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
DEAD_CODE_STRIPPING = YES;
GCC_C_LANGUAGE_STANDARD = c99;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- SDKROOT = macosx;
+ MACOSX_DEPLOYMENT_TARGET = 10.7;
+ SDKROOT = macosx10.7;
};
name = Debug;
};
@@ -545,12 +551,18 @@
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+ CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
DEAD_CODE_STRIPPING = YES;
GCC_C_LANGUAGE_STANDARD = c99;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- SDKROOT = macosx;
+ MACOSX_DEPLOYMENT_TARGET = 10.7;
+ SDKROOT = macosx10.7;
};
name = Release;
};
Modified: trunk/FuseGenerator/config.h
===================================================================
--- trunk/FuseGenerator/config.h 2013-04-20 07:02:15 UTC (rev 740)
+++ trunk/FuseGenerator/config.h 2013-04-20 11:35:58 UTC (rev 741)
@@ -83,7 +83,7 @@
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "1.0.0.1a"
+#define VERSION "1.1.0"
/* Define to 1 if your processor stores words with the most significant byte
first (like Motorola and SPARC, unlike Intel and VAX). */
Modified: trunk/FuseGenerator/libspectrum.h
===================================================================
--- trunk/FuseGenerator/libspectrum.h 2013-04-20 07:02:15 UTC (rev 740)
+++ trunk/FuseGenerator/libspectrum.h 2013-04-20 11:35:58 UTC (rev 741)
@@ -1,7 +1,7 @@
/* libspectrum.h: the library for dealing with ZX Spectrum emulator files
Copyright (c) 2001-2007 Philip Kendall, Darren Salt, Fredrick Meunier
- $Id: libspectrum.h.in 4695 2012-05-07 02:03:10Z fredm $
+ $Id: libspectrum.h.in 4836 2012-12-31 15:40:10Z 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
@@ -40,10 +40,19 @@
#ifdef _WIN32
-#define WIN32_LEAN_AND_MEAN /* Exclude rarely used stuff from Windows
- headers */
+/* Exclude rarely used stuff from Windows headers */
+#ifndef WIN32_LEAN_AND_MEAN
+
+#define WIN32_LEAN_AND_MEAN /**/
#include <windows.h>
+#undef WIN32_LEAN_AND_MEAN
+#else
+
+#include <windows.h>
+
+#endif /* #ifndef WIN32_LEAN_AND_MEAN */
+
#ifdef LIBSPECTRUM_EXPORTS
#define WIN32_DLL __declspec( dllexport )
#else /* #ifdef LIBSPECTRUM_EXPORTS */
@@ -221,7 +230,7 @@
WIN32_DLL gchar* g_array_free( GArray *array, gboolean free_segment );
#include <TargetConditionals.h>
-
+
#ifdef TARGET_RT_64_BIT
#define GINT_TO_POINTER(i) ((gpointer) (glong)(i))
#define GPOINTER_TO_INT(p) ((gint) (glong)(p))
@@ -273,11 +282,11 @@
/* we support files compressed with bz2 */
-#define LIBSPECTRUM_SUPPORTS_BZ2_COMPRESSION (1)
+#define LIBSPECTRUM_SUPPORTS_BZ2_COMPRESSION (1)
/* we support files wav files */
-#define LIBSPECTRUM_SUPPORTS_AUDIOFILE (1)
+#define LIBSPECTRUM_SUPPORTS_AUDIOFILE (1)
/* Initialisation */
@@ -365,7 +374,7 @@
/* Below here, present only in 0.2.2 and later */
LIBSPECTRUM_ID_HARDDISK_HDF, /* .hdf hard disk image */
- LIBSPECTRUM_ID_CARTRIDGE_IF2, /* .rom Interface II cartridge image */
+ LIBSPECTRUM_ID_CARTRIDGE_IF2, /* .rom Interface 2 cartridge image */
/* Below here, present only in 0.3.0 and later */
@@ -422,7 +431,7 @@
/* Below here, present only in 0.2.2 and later */
LIBSPECTRUM_CLASS_HARDDISK, /* A hard disk image */
- LIBSPECTRUM_CLASS_CARTRIDGE_IF2, /* Interface II cartridges */
+ LIBSPECTRUM_CLASS_CARTRIDGE_IF2, /* Interface 2 cartridges */
/* Below here, present only in 0.3.0 and later */
@@ -490,6 +499,8 @@
LIBSPECTRUM_MACHINE_48_NTSC,
+ LIBSPECTRUM_MACHINE_128E,
+
} libspectrum_machine;
WIN32_DLL const char* libspectrum_machine_name( libspectrum_machine type );
@@ -697,6 +708,8 @@
WIN32_DLL void libspectrum_snap_set_sp( libspectrum_snap *snap, libspectrum_word sp );
WIN32_DLL libspectrum_word libspectrum_snap_pc( libspectrum_snap *snap );
WIN32_DLL void libspectrum_snap_set_pc( libspectrum_snap *snap, libspectrum_word pc );
+WIN32_DLL libspectrum_word libspectrum_snap_memptr( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_memptr( libspectrum_snap *snap, libspectrum_word memptr );
WIN32_DLL libspectrum_byte libspectrum_snap_iff1( libspectrum_snap *snap );
WIN32_DLL void libspectrum_snap_set_iff1( libspectrum_snap *snap, libspectrum_byte iff1 );
WIN32_DLL libspectrum_byte libspectrum_snap_iff2( libspectrum_snap *snap );
@@ -709,6 +722,8 @@
WIN32_DLL void libspectrum_snap_set_halted( libspectrum_snap *snap, int halted );
WIN32_DLL int libspectrum_snap_last_instruction_ei( libspectrum_snap *snap );
WIN32_DLL void libspectrum_snap_set_last_instruction_ei( libspectrum_snap *snap, int last_instruction_ei );
+WIN32_DLL int libspectrum_snap_last_instruction_set_f( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_last_instruction_set_f( libspectrum_snap *snap, int last_instruction_set_f );
WIN32_DLL libspectrum_byte libspectrum_snap_out_ula( libspectrum_snap *snap );
WIN32_DLL void libspectrum_snap_set_out_ula( libspectrum_snap *snap, libspectrum_byte out_ula );
WIN32_DLL libspectrum_byte libspectrum_snap_out_128_memoryport( libspectrum_snap *snap );
@@ -919,6 +934,8 @@
WIN32_DLL void libspectrum_snap_set_spectranet_paged( libspectrum_snap *snap, int spectranet_paged );
WIN32_DLL int libspectrum_snap_spectranet_paged_via_io( libspectrum_snap *snap );
WIN32_DLL void libspectrum_snap_set_spectranet_paged_via_io( libspectrum_snap *snap, int spectranet_paged_via_io );
+WIN32_DLL int libspectrum_snap_spectranet_nmi_flipflop( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_spectranet_nmi_flipflop( libspectrum_snap *snap, int spectranet_nmi_flipflop );
WIN32_DLL int libspectrum_snap_spectranet_programmable_trap_active( libspectrum_snap *snap );
WIN32_DLL void libspectrum_snap_set_spectranet_programmable_trap_active( libspectrum_snap *snap, int spectranet_programmable_trap_active );
WIN32_DLL int libspectrum_snap_spectranet_programmable_trap_msb( libspectrum_snap *snap );
@@ -941,6 +958,10 @@
WIN32_DLL void libspectrum_snap_set_spectranet_flash( libspectrum_snap *snap, int idx, libspectrum_byte* spectranet_flash );
WIN32_DLL libspectrum_byte * libspectrum_snap_spectranet_ram( libspectrum_snap *snap, int idx );
WIN32_DLL void libspectrum_snap_set_spectranet_ram( libspectrum_snap *snap, int idx, libspectrum_byte* spectranet_ram );
+WIN32_DLL int libspectrum_snap_late_timings( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_late_timings( libspectrum_snap *snap, int late_timings );
+WIN32_DLL int libspectrum_snap_zx_printer_active( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_zx_printer_active( libspectrum_snap *snap, int zx_printer_active );
/*
* Tape handling routines
Modified: trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj
===================================================================
--- trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj 2013-04-20 07:02:15 UTC (rev 740)
+++ trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj 2013-04-20 11:35:58 UTC (rev 741)
@@ -338,7 +338,7 @@
089C1669FE841209C02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0450;
+ LastUpgradeCheck = 0460;
};
buildConfigurationList = B6B0E30008CC65D5001D8411 /* Build configuration list for PBXProject "FuseImporter" */;
compatibilityVersion = "Xcode 3.2";
@@ -565,9 +565,17 @@
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+ CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
- SDKROOT = macosx;
+ GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNINITIALIZED_AUTOS = YES;
+ GCC_WARN_UNUSED_VARIABLE = YES;
+ MACOSX_DEPLOYMENT_TARGET = 10.7;
+ SDKROOT = macosx10.7;
};
name = Development;
};
@@ -575,10 +583,18 @@
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+ CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
DEPLOYMENT_POSTPROCESSING = YES;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
- SDKROOT = macosx;
+ GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNINITIALIZED_AUTOS = YES;
+ GCC_WARN_UNUSED_VARIABLE = YES;
+ MACOSX_DEPLOYMENT_TARGET = 10.7;
+ SDKROOT = macosx10.7;
};
name = Deployment;
};
@@ -586,9 +602,17 @@
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+ CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
- SDKROOT = macosx;
+ GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNINITIALIZED_AUTOS = YES;
+ GCC_WARN_UNUSED_VARIABLE = YES;
+ MACOSX_DEPLOYMENT_TARGET = 10.7;
+ SDKROOT = macosx10.7;
};
name = Default;
};
Modified: trunk/FuseImporter/config.h
===================================================================
--- trunk/FuseImporter/config.h 2013-04-20 07:02:15 UTC (rev 740)
+++ trunk/FuseImporter/config.h 2013-04-20 11:35:58 UTC (rev 741)
@@ -83,7 +83,7 @@
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "1.0.0.1a"
+#define VERSION "1.1.0"
/* Define to 1 if your processor stores words with the most significant byte
first (like Motorola and SPARC, unlike Intel and VAX). */
Modified: trunk/FuseImporter/libspectrum.h
===================================================================
--- trunk/FuseImporter/libspectrum.h 2013-04-20 07:02:15 UTC (rev 740)
+++ trunk/FuseImporter/libspectrum.h 2013-04-20 11:35:58 UTC (rev 741)
@@ -1,7 +1,7 @@
/* libspectrum.h: the library for dealing with ZX Spectrum emulator files
Copyright (c) 2001-2007 Philip Kendall, Darren Salt, Fredrick Meunier
- $Id: libspectrum.h.in 4695 2012-05-07 02:03:10Z fredm $
+ $Id: libspectrum.h.in 4836 2012-12-31 15:40:10Z 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
@@ -40,10 +40,19 @@
#ifdef _WIN32
-#define WIN32_LEAN_AND_MEAN /* Exclude rarely used stuff from Windows
- headers */
+/* Exclude rarely used stuff from Windows headers */
+#ifndef WIN32_LEAN_AND_MEAN
+
+#define WIN32_LEAN_AND_MEAN /**/
#include <windows.h>
+#undef WIN32_LEAN_AND_MEAN
+#else
+
+#include <windows.h>
+
+#endif /* #ifndef WIN32_LEAN_AND_MEAN */
+
#ifdef LIBSPECTRUM_EXPORTS
#define WIN32_DLL __declspec( dllexport )
#else /* #ifdef LIBSPECTRUM_EXPORTS */
@@ -221,7 +230,7 @@
WIN32_DLL gchar* g_array_free( GArray *array, gboolean free_segment );
#include <TargetConditionals.h>
-
+
#ifdef TARGET_RT_64_BIT
#define GINT_TO_POINTER(i) ((gpointer) (glong)(i))
#define GPOINTER_TO_INT(p) ((gint) (glong)(p))
@@ -273,11 +282,11 @@
/* we support files compressed with bz2 */
-#define LIBSPECTRUM_SUPPORTS_BZ2_COMPRESSION (1)
+#define LIBSPECTRUM_SUPPORTS_BZ2_COMPRESSION (1)
/* we support files wav files */
-#define LIBSPECTRUM_SUPPORTS_AUDIOFILE (1)
+#define LIBSPECTRUM_SUPPORTS_AUDIOFILE (1)
/* Initialisation */
@@ -365,7 +374,7 @@
/* Below here, present only in 0.2.2 and later */
LIBSPECTRUM_ID_HARDDISK_HDF, /* .hdf hard disk image */
- LIBSPECTRUM_ID_CARTRIDGE_IF2, /* .rom Interface II cartridge image */
+ LIBSPECTRUM_ID_CARTRIDGE_IF2, /* .rom Interface 2 cartridge image */
/* Below here, present only in 0.3.0 and later */
@@ -422,7 +431,7 @@
/* Below here, present only in 0.2.2 and later */
LIBSPECTRUM_CLASS_HARDDISK, /* A hard disk image */
- LIBSPECTRUM_CLASS_CARTRIDGE_IF2, /* Interface II cartridges */
+ LIBSPECTRUM_CLASS_CARTRIDGE_IF2, /* Interface 2 cartridges */
/* Below here, present only in 0.3.0 and later */
@@ -490,6 +499,8 @@
LIBSPECTRUM_MACHINE_48_NTSC,
+ LIBSPECTRUM_MACHINE_128E,
+
} libspectrum_machine;
WIN32_DLL const char* libspectrum_machine_name( libspectrum_machine type );
@@ -697,6 +708,8 @@
WIN32_DLL void libspectrum_snap_set_sp( libspectrum_snap *snap, libspectrum_word sp );
WIN32_DLL libspectrum_word libspectrum_snap_pc( libspectrum_snap *snap );
WIN32_DLL void libspectrum_snap_set_pc( libspectrum_snap *snap, libspectrum_word pc );
+WIN32_DLL libspectrum_word libspectrum_snap_memptr( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_memptr( libspectrum_snap *snap, libspectrum_word memptr );
WIN32_DLL libspectrum_byte libspectrum_snap_iff1( libspectrum_snap *snap );
WIN32_DLL void libspectrum_snap_set_iff1( libspectrum_snap *snap, libspectrum_byte iff1 );
WIN32_DLL libspectrum_byte libspectrum_snap_iff2( libspectrum_snap *snap );
@@ -709,6 +722,8 @@
WIN32_DLL void libspectrum_snap_set_halted( libspectrum_snap *snap, int halted );
WIN32_DLL int libspectrum_snap_last_instruction_ei( libspectrum_snap *snap );
WIN32_DLL void libspectrum_snap_set_last_instruction_ei( libspectrum_snap *snap, int last_instruction_ei );
+WIN32_DLL int libspectrum_snap_last_instruction_set_f( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_last_instruction_set_f( libspectrum_snap *snap, int last_instruction_set_f );
WIN32_DLL libspectrum_byte libspectrum_snap_out_ula( libspectrum_snap *snap );
WIN32_DLL void libspectrum_snap_set_out_ula( libspectrum_snap *snap, libspectrum_byte out_ula );
WIN32_DLL libspectrum_byte libspectrum_snap_out_128_memoryport( libspectrum_snap *snap );
@@ -919,6 +934,8 @@
WIN32_DLL void libspectrum_snap_set_spectranet_paged( libspectrum_snap *snap, int spectranet_paged );
WIN32_DLL int libspectrum_snap_spectranet_paged_via_io( libspectrum_snap *snap );
WIN32_DLL void libspectrum_snap_set_spectranet_paged_via_io( libspectrum_snap *snap, int spectranet_paged_via_io );
+WIN32_DLL int libspectrum_snap_spectranet_nmi_flipflop( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_spectranet_nmi_flipflop( libspectrum_snap *snap, int spectranet_nmi_flipflop );
WIN32_DLL int libspectrum_snap_spectranet_programmable_trap_active( libspectrum_snap *snap );
WIN32_DLL void libspectrum_snap_set_spectranet_programmable_trap_active( libspectrum_snap *snap, int spectranet_programmable_trap_active );
WIN32_DLL int libspectrum_snap_spectranet_programmable_trap_msb( libspectrum_snap *snap );
@@ -941,6 +958,10 @@
WIN32_DLL void libspectrum_snap_set_spectranet_flash( libspectrum_snap *snap, int idx, libspectrum_byte* spectranet_flash );
WIN32_DLL libspectrum_byte * libspectrum_snap_spectranet_ram( libspectrum_snap *snap, int idx );
WIN32_DLL void libspectrum_snap_set_spectranet_ram( libspectrum_snap *snap, int idx, libspectrum_byte* spectranet_ram );
+WIN32_DLL int libspectrum_snap_late_timings( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_late_timings( libspectrum_snap *snap, int late_timings );
+WIN32_DLL int libspectrum_snap_zx_printer_active( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_zx_printer_active( libspectrum_snap *snap, int zx_printer_active );
/*
* Tape handling routines
Modified: trunk/libspectrum/Info.plist
===================================================================
--- trunk/libspectrum/Info.plist 2013-04-20 07:02:15 UTC (rev 740)
+++ trunk/libspectrum/Info.plist 2013-04-20 11:35:58 UTC (rev 741)
@@ -23,6 +23,6 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>0.5.0</string>
+ <string>1.1.0</string>
</dict>
</plist>
Modified: trunk/libspectrum/config.h
===================================================================
--- trunk/libspectrum/config.h 2013-04-20 07:02:15 UTC (rev 740)
+++ trunk/libspectrum/config.h 2013-04-20 11:35:58 UTC (rev 741)
@@ -86,7 +86,7 @@
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "1.0.0"
+#define VERSION "1.1.0"
/* Define to 1 if your processor stores words with the most significant byte
first (like Motorola and SPARC, unlike Intel and VAX). */
Index: trunk/libspectrum/libspectrum
===================================================================
--- trunk/libspectrum/libspectrum 2013-04-20 07:02:15 UTC (rev 740)
+++ trunk/libspectrum/libspectrum 2013-04-20 11:35:58 UTC (rev 741)
Property changes on: trunk/libspectrum/libspectrum
___________________________________________________________________
Modified: svn:mergeinfo
## -1,5 +1,5 ##
/vendor/fuse-emulator/0.10.0/libspectrum:556-557
/vendor/fuse-emulator/0.10.0-pre1/libspectrum:545-546
-/vendor/fuse-emulator/current/libspectrum:530-717
+/vendor/fuse-emulator/current/libspectrum:530-740
/vendor/fuse-emulator/fuse-1.0.0a/libspectrum:668-669
/vendor/fuse-emulator/fuse-r4617/libspectrum:686
\ No newline at end of property
Modified: trunk/libspectrum/libspectrum/ChangeLog
===================================================================
--- trunk/libspectrum/libspectrum/ChangeLog 2013-04-20 07:02:15 UTC (rev 740)
+++ trunk/libspectrum/libspectrum/ChangeLog 2013-04-20 11:35:58 UTC (rev 741)
@@ -1,3 +1,26 @@
+201?-??-?? Philip Kendall <phi...@sh...>
+
+ * libspectrum 1.1.0 released.
+
+ * Support for Spectranet in snapshots (Philip Kendall).
+
+ * Support for Cheetah SpecDrum in snapshots (Fredrick Meunier).
+
+ * Support reading PZX files (Fredrick Meunier).
+
+ * Support for the TZX set signal level block (Fredrick Meunier).
+
+ * Various minor bug fixes/improvements:
+ * Add support for detecting POK files (Sergio Baldoví).
+ * Advertise support for bzip2 compressed and wav files (Sergio
+ Baldoví).
+ * Drop support for GLib version 1.x (Alberto Garcia).
+ * Add support for audiofile 0.3.x (Alberto Garcia).
+ * Load all snapshot RAM pages for machines with more than 128k
+ (Fredrick Meunier; thanks, ketmar).
+ * Support more SZX 1.5 features (Fredrick Meunier).
+ * Modernise autoconf support (Sergio Baldoví).
+
2010-12-16 Philip Kendall <phi...@sh...>
* libspectrum 1.0.0 released.
@@ -310,5 +333,5 @@
* libspectrum separated from Fuse just before the 0.5.0 release of
Fuse; see Fuse's ChangeLog for changes up to this point
-$Id: ChangeLog 4220 2010-12-17 10:54:29Z fredm $
+$Id: ChangeLog 4801 2012-12-26 10:55:01Z fredm $
Modified: trunk/libspectrum/libspectrum/README
===================================================================
--- trunk/libspectrum/libspectrum/README 2013-04-20 07:02:15 UTC (rev 740)
+++ trunk/libspectrum/libspectrum/README 2013-04-20 11:35:58 UTC (rev 741)
@@ -1,4 +1,4 @@
-libspectrum 1.0.0
+libspectrum 1.1.0
=================
libspectrum is a library which is designed to make the input and
@@ -11,7 +11,7 @@
* Snapshots: .z80, .szx, .sna (all read/write), .zxs, .sp., .snp and
+D snapshots (read only).
* Tape images: .tzx, .tap, .spc, .sta and .ltp (read/write) and
- Warajevo .tap, Z80Em and CSW version 1 (read only).
+ .pzx, Warajevo .tap, Z80Em and CSW version 1 (read only).
* Input recordings: .rzx (read/write).
* Disk images: .dsk (both plain and extended), .fdi, .sad, .scl, .td0,
.trd and .udi (identification only).
@@ -67,6 +67,6 @@
Then, type "make" and if everything went well, "make install".
Philip Kendall <phi...@sh...>
-16 December 2010
+?? ??? 201?
-$Id: README 4220 2010-12-17 10:54:29Z fredm $
+$Id: README 4801 2012-12-26 10:55:01Z fredm $
Modified: trunk/libspectrum/libspectrum/accessor.pl
===================================================================
--- trunk/libspectrum/libspectrum/accessor.pl 2013-04-20 07:02:15 UTC (rev 740)
+++ trunk/libspectrum/libspectrum/accessor.pl 2013-04-20 11:35:58 UTC (rev 741)
@@ -3,7 +3,7 @@
# accessor.pl: generate accessor functions
# Copyright (c) 2003-2009 Philip Kendall
-# $Id: accessor.pl 4624 2012-01-09 20:59:35Z pak21 $
+# $Id: accessor.pl 4904 2013-03-08 20:21:02Z 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
@@ -67,12 +67,13 @@
libspectrum_byte a_, f_; libspectrum_word bc_, de_, hl_;
libspectrum_word ix, iy; libspectrum_byte i, r;
- libspectrum_word sp, pc;
+ libspectrum_word sp, pc, memptr;
libspectrum_byte iff1, iff2, im;
int halted; /* Is the Z80 currently HALTed? */
int last_instruction_ei; /* Was the last instruction an EI? */
+ int last_instruction_set_f; /* Did the last instruction set Flags? */
/* Custom ROM */
int custom_rom;
@@ -173,7 +174,7 @@
size_t zxcf_pages;
libspectrum_byte *zxcf_ram[ SNAPSHOT_ZXCF_PAGES ];
- /* Interface II cartridge */
+ /* Interface 2 cartridge */
int interface2_active;
libspectrum_byte *interface2_rom[1];
@@ -221,6 +222,7 @@
int spectranet_active;
int spectranet_paged;
int spectranet_paged_via_io;
+ int spectranet_nmi_flipflop;
int spectranet_programmable_trap_active;
int spectranet_programmable_trap_msb;
int spectranet_all_traps_disabled;
@@ -232,6 +234,12 @@
libspectrum_byte *spectranet_w5100[1];
libspectrum_byte *spectranet_flash[1];
libspectrum_byte *spectranet_ram[1];
+
+ /* Timings emulation */
+ int late_timings;
+
+ /* Printer emulation */
+ int zx_printer_active;
};
/* Initialise a libspectrum_snap structure */
Modified: trunk/libspectrum/libspectrum/configure.ac
===================================================================
--- trunk/libspectrum/libspectrum/configure.ac 2013-04-20 07:02:15 UTC (rev 740)
+++ trunk/libspectrum/libspectrum/configure.ac 2013-04-20 11:35:58 UTC (rev 741)
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
-dnl Copyright (c) 1999-2008 Philip Kendall
+dnl Copyright (c) 1999-2012 Philip Kendall
-dnl $Id: configure.ac 4778 2012-11-28 23:21:34Z sbaldovi $
+dnl $Id: configure.ac 4847 2013-01-03 09:16:15Z zubzero $
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
@@ -22,11 +22,11 @@
dnl E-mail: phi...@sh...
dnl Package version
-m4_define([libspectrum_version], [1.0.0])
+m4_define([libspectrum_version], [1.1.0])
dnl Product full version
m4_define([libspectrum_major_version], [1])
-m4_define([libspectrum_minor_version], [0])
+m4_define([libspectrum_minor_version], [1])
m4_define([libspectrum_micro_version], [0])
m4_define([libspectrum_nano_version], [0])
m4_define([libspectrum_full_version],
@@ -35,11 +35,11 @@
[libspectrum_major_version,libspectrum_minor_version,libspectrum_micro_version,libspectrum_nano_version])
dnl Package info
-m4_define([libspectrum_copyright], ["(c) 1999-2012 Philip Kendall and others"])
+m4_define([libspectrum_copyright], ["(c) 1999-2013 Philip Kendall and others"])
m4_define([libspectrum_url],
[http://fuse-emulator.sourceforge.net/libspectrum.php])
m4_define([libspectrum_bugreport],
- [http://sourceforge.net/tracker/?group_id=91293&atid=596648])
+ [http://sourceforge.net/p/fuse-emulator/bugs/])
AC_INIT([libspectrum],[libspectrum_version],[libspectrum_bugreport],
[libspectrum],[libspectrum_url])
@@ -99,6 +99,7 @@
WINDRES_OBJ="windres.o"
WINDRES_LDFLAGS="-Xlinker windres.o"
fi
+ AC_DEFINE([WIN32_LEAN_AND_MEAN],, [Exclude rarely used stuff from Windows headers <windows.h>])
;;
esac
AC_SUBST(WINDRES_OBJ)
@@ -164,14 +165,14 @@
if test "$withval" = no; then glib=no; else glib=yes; fi,
glib=yes)
AC_MSG_RESULT($glib)
-if test "$glib" = yes; then
+AS_IF([test "$glib" = yes], [
PKG_CHECK_MODULES(
GLIB,
glib-2.0,
AC_DEFINE([HAVE_LIB_GLIB], 1, [Defined if we've got glib]),
glib="no"
)
-fi
+])
AM_CONDITIONAL(USE_MYGLIB, test "$glib" = no)
@@ -201,7 +202,7 @@
if test "$withval" = no; then libaudiofile=no; else libaudiofile=yes; fi,
libaudiofile=yes)
AC_MSG_RESULT($libaudiofile)
-if test "$libaudiofile" = yes; then
+AS_IF([test "$libaudiofile" = yes], [
PKG_CHECK_MODULES(
AUDIOFILE,
audiofile,
@@ -214,7 +215,7 @@
AC_DEFINE([HAVE_LIB_AUDIOFILE], 1, [Defined if we've got audiofile])
)
fi
-fi
+])
AC_CONFIG_FILES([
Makefile
Modified: trunk/libspectrum/libspectrum/csw.c
===================================================================
--- trunk/libspectrum/libspectrum/csw.c 2013-04-20 07:02:15 UTC (rev 740)
+++ trunk/libspectrum/libspectrum/csw.c 2013-04-20 11:35:58 UTC (rev 741)
@@ -2,7 +2,7 @@
Copyright (c) 2002-2007 Darren Salt, Fredrick Meunier
Based on tap.c, copyright (c) 2001 Philip Kendall
- $Id: csw.c 4653 2012-02-03 11:48:30Z fredm $
+ $Id: csw.c 4780 2012-11-29 19:09:52Z sbaldovi $
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
@@ -39,7 +39,6 @@
{
libspectrum_tape_block *block = NULL;
libspectrum_tape_rle_pulse_block *csw_block;
- libspectrum_error error;
int compressed;
@@ -112,6 +111,8 @@
if( compressed ) {
/* Compressed data... */
#ifdef HAVE_ZLIB_H
+ libspectrum_error error;
+
csw_block->data = NULL;
csw_block->length = 0;
error = libspectrum_zlib_inflate( buffer, length, &csw_block->data,
Modified: trunk/libspectrum/libspectrum/doc/libspectrum.3
===================================================================
--- trunk/libspectrum/libspectrum/doc/libspectrum.3 2013-04-20 07:02:15 UTC (rev 740)
+++ trunk/libspectrum/libspectrum/doc/libspectrum.3 2013-04-20 11:35:58 UTC (rev 741)
@@ -27,7 +27,7 @@
.\"------------------------------------------------------------------
.\"
.SH NAME
-libspectrum \- Sinclair ZX Spectrum support library
+libspectrum \(em Sinclair ZX Spectrum support library
.\"
.\"------------------------------------------------------------------
.\"
Modified: trunk/libspectrum/libspectrum/doc/libspectrum.txt
===================================================================
--- trunk/libspectrum/libspectrum/doc/libspectrum.txt 2013-04-20 07:02:15 UTC (rev 740)
+++ trunk/libspectrum/libspectrum/doc/libspectrum.txt 2013-04-20 11:35:58 UTC (rev 741)
@@ -8,7 +8,7 @@
* Snapshots: .z80, .szx, .sna (all read/write), .zxs, .sp., .snp and
+D snapshots (read only).
* Tape images: .tzx, .tap, .spc, .sta and .ltp (read/write) and
- Warajevo .tap, Z80Em and CSW version 1 (read only).
+ .pzx, Warajevo .tap, Z80Em and CSW version 1 (read only).
* Input recordings: .rzx (read/write).
* Disk images: .dsk (both plain and extended), .fdi, .sad, .scl, .td0,
.trd and .udi (identification only).
@@ -43,6 +43,9 @@
the library does not support zlib compression, then the constant will
not be defined.
+Bzip2 compression is similarly covered by LIBSPECTRUM_SUPPORTS_BZ2_COMPRESSION
+and WAV file support is covered by LIBSPECTRUM_SUPPORTS_AUDIOFILE.
+
Defined types
=============
@@ -168,6 +171,7 @@
LIBSPECTRUM_MACHINE_48 48K Spectrum
LIBSPECTRUM_MACHINE_48_NTSC NTSC version of 48K Spectrum
LIBSPECTRUM_MACHINE_128 (Original) 128K Spectrum
+LIBSPECTRUM_MACHINE_128E Spectrum 128Ke
LIBSPECTRUM_MACHINE_PLUS2 Spectrum +2 (the grey one)
LIBSPECTRUM_MACHINE_PLUS2A Spectrum +2A (the black one)
LIBSPECTRUM_MACHINE_PLUS3 Spectrum +3
@@ -273,7 +277,7 @@
LIBSPECTRUM_ID_UNKNOWN Couldn't identify this file
LIBSPECTRUM_ID_CARTRIDGE_DCK A .dck Timex dock image
-LIBSPECTRUM_ID_CARTRIDGE_IF2 A .rom Interface II cartridge
+LIBSPECTRUM_ID_CARTRIDGE_IF2 A .rom Interface 2 cartridge
LIBSPECTRUM_ID_COMPRESSED_BZ2 A bzip2 compressed file
LIBSPECTRUM_ID_COMPRESSED_GZ A gzip compressed file
@@ -346,7 +350,7 @@
LIBSPECTRUM_CLASS_UNKNOWN An unknown file type
LIBSPECTRUM_CLASS_CARTRIDGE_TIMEX A Timex dock cartridge
-LIBSPECTRUM_CLASS_CARTRIDGE_IF2 An Interface II cartridge
+LIBSPECTRUM_CLASS_CARTRIDGE_IF2 An Interface 2 cartridge
LIBSPECTRUM_CLASS_DISK_GENERIC A generic disk image
LIBSPECTRUM_CLASS_DISK_PLUSD An MGT/+D disk image
LIBSPECTRUM_CLASS_DISK_PLUS3 A +3 disk image
@@ -552,6 +556,7 @@
* libspectrum_byte r
* libspectrum_word sp
* libspectrum_word pc
+* libspectrum_word memptr
* libspectrum_byte iff1
* libspectrum_byte iff2
* libspectrum_byte im
@@ -560,6 +565,7 @@
* int halted
* int last_instruction_ei
+* int last_instruction_set_f
* libspectrum_byte out_ula
@@ -682,6 +688,25 @@
* int specdrum_active
* libspectrum_signed_byte specdrum_dac
+* int spectranet_active
+* int spectranet_paged
+* int spectranet_paged_via_io
+* int spectranet_programmable_trap_active
+* int spectranet_programmable_trap_msb
+* int spectranet_all_traps_disabled
+* int spectranet_rst8_trap_disabled
+* int spectranet_deny_downstream_a15
+* int spectranet_page_a
+* int spectranet_page_b
+* libspectrum_word spectranet_programmable_trap
+* libspectrum_byte* spectranet_w5100[1]
+* libspectrum_byte* spectranet_flash[1]
+* libspectrum_byte* spectranet_ram[1]
+
+* int late_timings
+
+* int zx_printer_enabled
+
Most of those should be fairly self-explanatory; those which may not
be are:
@@ -696,9 +721,19 @@
previously executed was an EI and thus interrupts should not be
accepted at this point, but will be after the next opcode.
+* `last_instruction_set_f' being non-zero signals that the opcode
+ previously executed affected the F register.
+
* `out_plus3_memoryport' should also be used to save the state of
the Scorpion's secondary memory control port (0x1ffd).
+* `late_timings' being non-zero signals that the emulated Spectrum
+ should use timings 1 t-state later than usual as in some machines
+ that have warmed up.
+
+* `zx_printer_enabled' being non-zero signals that the emulated Spectrum
+ has a ZX Printer connected.
+
* The `beta_*' functions represent the Betadisk
interface. `beta_paged' is non-zero if the Betadisk ROM is currently
paged in between 0x0000 and 0x3fff and `beta_direction' is non-zero
@@ -715,6 +750,8 @@
* `exrom_ram' and `dock_ram' are non-zero if the corresponding 8K page
of the Timex EXROM or DOCK are writable.
+* The `spectranet_*' functions represent the Spectranet interface.
+
* `joystick_active_count' is the number of joysticks connected to the emulated
Spectrum. `joystick_list' gives the type of the joysticks and
`joystick_inputs' gives the corresponding connections to the real machines
@@ -1789,4 +1826,4 @@
Write `data' to register `reg' of the IDE channel `chn'.
-$Id: libspectrum.txt 4433 2011-05-14 05:44:47Z fredm $
+$Id: libspectrum.txt 4860 2013-01-26 11:33:25Z fredm $
Modified: trunk/libspectrum/libspectrum/hacking/ChangeLog
===================================================================
--- trunk/libspectrum/libspectrum/hacking/ChangeLog 2013-04-20 07:02:15 UTC (rev 740)
+++ trunk/libspectrum/libspectrum/hacking/ChangeLog 2013-04-20 11:35:58 UTC (rev 741)
@@ -905,3 +905,40 @@
20121129 configure.ac: don't check for windres when not building for Windows
hosts. Remove --without-windres option, previously used as a workaround
(Sergio).
+20121129 csw.c,rzx.c,szx.c: remove unused variables when not linking against
+ external libraries (Sergio).
+20121202 configure.ac: fix the macro expansion of PKG_CHECK_MODULES when using
+ both --without-glib and --with-libaudiofile options (Sergio).
+20121208 configure.ac,libspectrum.h.in: preliminary support for 64-bits binaries
+ for Windows (patch #3591613) (Sergio).
+20121208 README: document support for reading PZX files (Sergio).
+20121222 szx.c: split SNET block into SNET, SNEF and SNER so that flash could
+ theoretically be saved separately (patch #3596469) (Fred).
+20121225 accessor.pl,libspectrum.h.in,sna.c,snap_accessors.txt,snapshot.c,szx.c,
+ z80.c: extend SZX support to version 1.5 draft specs (Fred).
+20121226 accessor.pl,snap_accessors.txt,snapshot.c,szx.c: MEMPTR is also in v1.4
+ SZX files (Fred).
+20121226 make-perl.c: fix typo in comment (Fred).
+20121226 szx.c: inline constant in write_snet_chunk() (Fred).
+20121226 doc/libspectrum.txt: add some text about changes to the interface
+ (Fred).
+20121226 configure.ac: bump version number to 1.1.0 (Fred).
+20121226 doc/libspectrum.txt: tweak PZX text (Fred).
+20121226 ChangeLog,README: first updates for a "1.1.0" release (Fred).
+20121227 libspectrum.c: set name for Spectrum 128Ke machine type (Sergio).
+20121229 doc/libspectrum.1: use an em dash (Stuart).
+20121230 timings.c: add timings for 128Ke, copied from those for 128K (Stuart).
+20121231 timings.c: 128Ke timings are intended to be based on +2A (Fred).
+20121231 libspectrum.c: add 128Ke capabilities as long as it is in the library
+ (Fred).
+20121231 accessor.pl,doc/libspectrum.txt,libspectrum.h.in,sna.c,z80.c: rename
+ 'Interface II' to 'Interface 2' in comments and documentation (Stuart).
+20130103 configure.ac: make some URLs point to the new sourceforge forge and
+ update copyright date to 2013 (Sergio).
+20130103 configure.ac: add trailing slash to URL of bug tracker (Stuart).
+20130126 accessor.pl,doc/libspectrum.txt,snap_accessors.txt,snapshot.c,szx.c:
+ add support for storing ZX Printer state (bug #274) (Fred).
+20130130 timings.c: correct video timing for +2A/+3 etc machines (part of
+ patch #305).
+20130307 accessor.pl,snap_accessors.txt,szx.c: implement Spectranet's "suppress
+ NMI" flipflop (bug #259).
Modified: trunk/libspectrum/libspectrum/libspectrum.c
===================================================================
--- trunk/libspectrum/libspectrum/libspectrum.c 2013-04-20 07:02:15 UTC (rev 740)
+++ trunk/libspectrum/libspectrum/libspectrum.c 2013-04-20 11:35:58 UTC (rev 741)
@@ -1,7 +1,7 @@
/* libspectrum.c: Some general routines
Copyright (c) 2001-2009 Philip Kendall, Darren Salt, Fredrick Meunier
- $Id: libspectrum.c 4759 2012-11-07 12:01:50Z fredm $
+ $Id: libspectrum.c 4830 2012-12-30 21:37:36Z 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
@@ -237,6 +237,7 @@
case LIBSPECTRUM_MACHINE_TC2068: return "Timex TC2068";
case LIBSPECTRUM_MACHINE_TS2068: return "Timex TS2068";
case LIBSPECTRUM_MACHINE_128: return "Spectrum 128K";
+ case LIBSPECTRUM_MACHINE_128E: return "Spectrum 128Ke";
case LIBSPECTRUM_MACHINE_PLUS2: return "Spectrum +2";
case LIBSPECTRUM_MACHINE_PENT: return "Pentagon 128K";
case LIBSPECTRUM_MACHINE_PENT512: return "Pentagon 512K";
@@ -296,7 +297,7 @@
switch( type ) {
case LIBSPECTRUM_MACHINE_128: case LIBSPECTRUM_MACHINE_PLUS2:
case LIBSPECTRUM_MACHINE_PLUS2A: case LIBSPECTRUM_MACHINE_PLUS3:
- case LIBSPECTRUM_MACHINE_PLUS3E:
+ case LIBSPECTRUM_MACHINE_PLUS3E: case LIBSPECTRUM_MACHINE_128E:
case LIBSPECTRUM_MACHINE_TC2068: case LIBSPECTRUM_MACHINE_TS2068:
case LIBSPECTRUM_MACHINE_PENT:
case LIBSPECTRUM_MACHINE_PENT512: case LIBSPECTRUM_MACHINE_PENT1024:
@@ -311,7 +312,7 @@
switch( type ) {
case LIBSPECTRUM_MACHINE_128: case LIBSPECTRUM_MACHINE_PLUS2:
case LIBSPECTRUM_MACHINE_PLUS2A: case LIBSPECTRUM_MACHINE_PLUS3:
- case LIBSPECTRUM_MACHINE_PLUS3E:
+ case LIBSPECTRUM_MACHINE_PLUS3E: case LIBSPECTRUM_MACHINE_128E:
case LIBSPECTRUM_MACHINE_PENT:
case LIBSPECTRUM_MACHINE_PENT512: case LIBSPECTRUM_MACHINE_PENT1024:
case LIBSPECTRUM_MACHINE_SCORP:
@@ -325,7 +326,7 @@
/* +3 Spectrum-style 0x1ffd memory paging */
switch( type ) {
case LIBSPECTRUM_MACHINE_PLUS2A: case LIBSPECTRUM_MACHINE_PLUS3:
- case LIBSPECTRUM_MACHINE_PLUS3E:
+ case LIBSPECTRUM_MACHINE_PLUS3E: case LIBSPECTRUM_MACHINE_128E:
capabilities |= LIBSPECTRUM_MACHINE_CAPABILITY_PLUS3_MEMORY; break;
default:
break;
@@ -379,6 +380,7 @@
switch( type ) {
case LIBSPECTRUM_MACHINE_PLUS2: case LIBSPECTRUM_MACHINE_PLUS2A:
case LIBSPECTRUM_MACHINE_PLUS3: case LIBSPECTRUM_MACHINE_PLUS3E:
+ case LIBSPECTRUM_MACHINE_128E:
capabilities |= LIBSPECTRUM_MACHINE_CAPABILITY_SINCLAIR_JOYSTICK; break;
default:
break;
Modified: trunk/libspectrum/libspectrum/libspectrum.h.in
===================================================================
--- trunk/libspectrum/libspectrum/libspectrum.h.in 2013-04-20 07:02:15 UTC (rev 740)
+++ trunk/libspectrum/libspectrum/libspectrum.h.in 2013-04-20 11:35:58 UTC (rev 741)
@@ -1,7 +1,7 @@
/* libspectrum.h: the library for dealing with ZX Spectrum emulator files
Copyright (c) 2001-2007 Philip Kendall, Darren Salt, Fredrick Meunier
- $Id: libspectrum.h.in 4695 2012-05-07 02:03:10Z fredm $
+ $Id: libspectrum.h.in 4836 2012-12-31 15:40:10Z 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
@@ -40,10 +40,19 @@
#ifdef _WIN32
-#define WIN32_LEAN_AND_MEAN /* Exclude rarely used stuff from Windows
- headers */
+/* Exclude rarely used stuff from Windows headers */
+#ifndef WIN32_LEAN_AND_MEAN
+
+#define WIN32_LEAN_AND_MEAN /**/
#include <windows.h>
+#undef WIN32_LEAN_AND_MEAN
+#else
+
+#include <windows.h>
+
+#endif /* #ifndef WIN32_LEAN_AND_MEAN */
+
#ifdef LIBSPECTRUM_EXPORTS
#define WIN32_DLL __declspec( dllexport )
#else /* #ifdef LIBSPECTRUM_EXPORTS */
@@ -182,7 +191,7 @@
/* Below here, present only in 0.2.2 and later */
LIBSPECTRUM_ID_HARDDISK_HDF, /* .hdf hard disk image */
- LIBSPECTRUM_ID_CARTRIDGE_IF2, /* .rom Interface II cartridge image */
+ LIBSPECTRUM_ID_CARTRIDGE_IF2, /* .rom Interface 2 cartridge image */
/* Below here, present only in 0.3.0 and later */
@@ -239,7 +248,7 @@
/* Below here, present only in 0.2.2 and later */
LIBSPECTRUM_CLASS_HARDDISK, /* A hard disk image */
- LIBSPECTRUM_CLASS_CARTRIDGE_IF2, /* Interface II cartridges */
+ LIBSPECTRUM_CLASS_CARTRIDGE_IF2, /* Interface 2 cartridges */
/* Below here, present only in 0.3.0 and later */
@@ -307,6 +316,8 @@
LIBSPECTRUM_MACHINE_48_NTSC,
+ LIBSPECTRUM_MACHINE_128E,
+
} libspectrum_machine;
WIN32_DLL const char* libspectrum_machine_name( libspectrum_machine type );
Modified: trunk/libspectrum/libspectrum/make-perl.c
===================================================================
--- trunk/libspectrum/libspectrum/make-perl.c 2013-04-20 07:02:15 UTC (rev 740)
+++ trunk/libspectrum/libspectrum/make-perl.c 2013-04-20 11:35:58 UTC (rev 741)
@@ -1,7 +1,7 @@
/* make-perl.c: Generate a perl script to create the libspectrum_* typedefs
Copyright (c) 2002-2003 Philip Kendall, Darren Salt
- $Id: make-perl.c 4695 2012-05-07 02:03:10Z fredm $
+ $Id: make-perl.c 4796 2012-12-26 10:36:57Z fredm $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -336,7 +336,7 @@
#endif /* #ifdef HAVE_LIBBZ2 */
#ifdef HAVE_LIB_AUDIOFILE
- printf( "\n/* we support files wav files */\n" );
+ printf( "\n/* we support wav files */\n" );
printf( "#define LIBSPECTRUM_SUPPORTS_AUDIOFILE (1)\n\n" );
#endif /* #ifdef HAVE_LIB_AUDIOFILE */
Modified: trunk/libspectrum/libspectrum/rzx.c
===================================================================
--- trunk/libspectrum/libspectrum/rzx.c 2013-04-20 07:02:15 UTC (rev 740)
+++ trunk/libspectrum/libspectrum/rzx.c 2013-04-20 11:35:58 UTC (rev 741)
@@ -1,7 +1,7 @@
/* rzx.c: routines for dealing with .rzx files
Copyright (c) 2002-2008 Philip Kendall
- $Id: rzx.c 4548 2011-11-06 21:44:48Z pak21 $
+ $Id: rzx.c 4780 2012-11-29 19:09:52Z sbaldovi $
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
@@ -194,7 +194,9 @@
{
size_t i;
input_block_t *input;
+#ifdef HAVE_GCRYPT_H
signature_block_t *signature;
+#endif /* #ifdef HAVE_GCRYPT_H */
switch( block->type ) {
@@ -216,9 +218,8 @@
return LIBSPECTRUM_ERROR_NONE;
case LIBSPECTRUM_RZX_SIGN_END_BLOCK:
+#ifdef HAVE_GCRYPT_H
signature = &( block->types.signature );
-
-#ifdef HAVE_GCRYPT_H
gcry_mpi_release( signature->r );
gcry_mpi_release( signature->s );
#endif /* #ifdef HAVE_GCRYPT_H */
@@ -1448,7 +1449,6 @@
rzx_write_input( input_block_t *block, libspectrum_byte **buffer,
libspectrum_byte **ptr, size_t *length, int compress )
{
- libspectrum_error error;
size_t i, size;
size_t length_offset, data_offset, flags_offset;
libspectrum_byte *length_ptr;
@@ -1512,6 +1512,7 @@
/* Compress the data the simple way. Really, we should stream the data */
libspectrum_byte *gzsnap = NULL; size_t gzlength;
libspectrum_byte *data_ptr = *buffer + data_offset;
+ libspectrum_error error;
error = libspectrum_zlib_compress( data_ptr, *ptr - data_ptr,
&gzsnap, &gzlength );
Modified: trunk/libspectrum/libspectrum/sna.c
===================================================================
--- trunk/libspectrum/libspectrum/sna.c 2013-04-20 07:02:15 UTC (rev 740)
+++ trunk/libspectrum/libspectrum/sna.c 2013-04-20 11:35:58 UTC (rev 741)
@@ -1,7 +1,7 @@
/* sna.c: Routines for handling .sna snapshots
Copyright (c) 2001-2002 Philip Kendall
- $Id: sna.c 4285 2011-01-31 10:47:01Z fredm $
+ $Id: sna.c 4836 2012-12-31 15:40:10Z 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
@@ -310,7 +310,7 @@
if( libspectrum_snap_divide_active( snap ) )
*out_flags |= LIBSPECTRUM_FLAG_SNAPSHOT_MAJOR_INFO_LOSS;
- /* We don't save the Interface II ROM at all */
+ /* We don't save the Interface 2 ROM at all */
if( libspectrum_snap_interface2_active( snap ) )
*out_flags |= LIBSPECTRUM_FLAG_SNAPSHOT_MAJOR_INFO_LOSS;
@@ -331,6 +331,10 @@
if( libspectrum_snap_specdrum_active( snap ) )
*out_flags |= LIBSPECTRUM_FLAG_SNAPSHOT_MAJOR_INFO_LOSS;
+ /* We don't save the Spectranet state at all */
+ if( libspectrum_snap_spectranet_active( snap ) )
+ *out_flags |= LIBSPECTRUM_FLAG_SNAPSHOT_MAJOR_INFO_LOSS;
+
ptr = *buffer;
write_header( buffer, &ptr, length, snap );
@@ -349,6 +353,7 @@
break;
case LIBSPECTRUM_MACHINE_128:
+ case LIBSPECTRUM_MACHINE_128E:
case LIBSPECTRUM_MACHINE_PENT512:
case LIBSPECTRUM_MACHINE_PENT1024:
case LIBSPECTRUM_MACHINE_PLUS2:
Modified: trunk/libspectrum/libspectrum/snap_accessors.txt
===================================================================
--- trunk/libspectrum/libspectrum/snap_accessors.txt 2013-04-20 07:02:15 UTC (rev 740)
+++ trunk/libspectrum/libspectrum/snap_accessors.txt 2013-04-20 11:35:58 UTC (rev 741)
@@ -1,7 +1,7 @@
# snap_accessors.txt: simple accessors for libspectrum_snap
# Copyright (c) 2003-2009 Philip Kendall
-# $Id: snap_accessors.txt 4624 2012-01-09 20:59:35Z pak21 $
+# $Id: snap_accessors.txt 4904 2013-03-08 20:21:02Z 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
@@ -39,6 +39,7 @@
libspectrum_byte r
libspectrum_word sp
libspectrum_word pc
+libspectrum_word memptr
libspectrum_byte iff1
libspectrum_byte iff2
libspectrum_byte im
@@ -47,6 +48,7 @@
int halted
int last_instruction_ei
+int last_instruction_set_f
libspectrum_byte out_ula
@@ -176,6 +178,7 @@
int spectranet_active
int spectranet_paged
int spectranet_paged_via_io
+int spectranet_nmi_flipflop
int spectranet_programmable_trap_active
int spectranet_programmable_trap_msb
int spectranet_all_traps_disabled
@@ -187,3 +190,7 @@
libspectrum_byte* spectranet_w5100 1
libspectrum_byte* spectranet_flash 1
libspectrum_byte* spectranet_ram 1
+
+int late_timings
+
+int zx_printer_active
Modified: trunk/libspectrum/libspectrum/snapshot.c
===================================================================
--- trunk/libspectrum/libspectrum/snapshot.c 2013-04-20 07:02:15 UTC (rev 740)
+++ trunk/libspectrum/libspectrum/snapshot.c 2013-04-20 11:35:58 UTC (rev 741)
@@ -1,7 +1,7 @@
/* snapshot.c: Snapshot handling routines
Copyright (c) 2001-2009 Philip Kendall, Darren Salt
- $Id: snapshot.c 4624 2012-01-09 20:59:35Z pak21 $
+ $Id: snapshot.c 4860 2013-01-26 11:33:25Z 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
@@ -64,6 +64,7 @@
libspectrum_snap_set_r ( snap, 0x00 );
libspectrum_snap_set_sp ( snap, 0x0000 );
libspectrum_snap_set_pc ( snap, 0x0000 );
+ libspectrum_snap_set_memptr( snap, 0x0000 );
libspectrum_snap_set_iff1( snap, 1 );
libspectrum_snap_set_iff2( snap, 1 );
@@ -71,6 +72,7 @@
libspectrum_snap_set_halted( snap, 0 );
libspectrum_snap_set_last_instruction_ei( snap, 0 );
+ libspectrum_snap_set_last_instruction_set_f( snap, 0 );
libspectrum_snap_set_custom_rom( snap, 0 );
libspectrum_snap_set_custom_rom_pages( snap, 0 );
@@ -217,6 +219,10 @@
libspectrum_snap_set_spectranet_flash( snap, 0, NULL );
libspectrum_snap_set_spectranet_ram( snap, 0, NULL );
+ libspectrum_snap_set_late_timings( snap, 0 );
+
+ libspectrum_snap_set_zx_printer_active( snap, 0 );
+
return snap;
}
Modified: trunk/libspectrum/libspectrum/szx.c
===================================================================
--- trunk/libspectrum/libspectrum/szx.c 2013-04-20 07:02:15 UTC (rev 740)
+++ trunk/libspectrum/libspectrum/szx.c 2013-04-20 11:35:58 UTC (rev 741)
@@ -1,7 +1,7 @@
/* szx.c: Routines for .szx snapshots
Copyright (c) 1998-2012 Philip Kendall, Fredrick Meunier, Stuart Brady
- $Id: szx.c 4758 2012-11-07 11:58:26Z fredm $
+ $Id: szx.c 4904 2013-03-08 20:21:02Z 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
@@ -57,12 +57,15 @@
SZX_MACHINE_PENTAGON512,
SZX_MACHINE_PENTAGON1024,
SZX_MACHINE_48_NTSC,
+ SZX_MACHINE_128KE,
} szx_machine_type;
static const char *signature = "ZXST";
static const size_t signature_length = 4;
+static const libspectrum_byte ZXSTMF_ALTERNATETIMINGS = 1;
+
static const char *libspectrum_string = "libspectrum: ";
static const libspectrum_byte SZX_VERSION_MAJOR = 1;
@@ -75,6 +78,7 @@
#define ZXSTBID_Z80REGS "Z80R"
static const libspectrum_byte ZXSTZF_EILAST = 1;
static const libspectrum_byte ZXSTZF_HALTED = 2;
+static const libspectrum_byte ZXSTZF_FSET = 4;
#define ZXSTBID_SPECREGS "SPCR"
@@ -124,6 +128,7 @@
#define ZXSTBID_ROM "ROM\0"
#define ZXSTBID_ZXPRINTER "ZXPR"
+static const libspectrum_word ZXSTPRF_ENABLED = 1;
#define ZXSTBID_IF1 "IF1\0"
static const libspectrum_word ZXSTIF1F_ENABLED = 1;
@@ -133,6 +138,12 @@
#define ZXSTBID_MICRODRIVE "MDRV"
#define ZXSTBID_PLUS3DISK "+3\0\0"
#define ZXSTBID_DSKFILE "DSK\0"
+#define ZXSTBID_LEC "LEC\0"
+static const libspectrum_word ZXSTLECF_PAGED = 1;
+
+#define ZXSTBID_LECRAMPAGE "LCRP"
+static const libspectrum_word ZXSTLCRPF_COMPRESSED = 1;
+
#define ZXSTBID_TIMEXREGS "SCLD"
#define ZXSTBID_BETA128 "B128"
@@ -199,9 +210,14 @@
static const libspectrum_word ZXSTSNET_ALL_DISABLED = 16;
static const libspectrum_word ZXSTSNET_RST8_DISABLED = 32;
static const libspectrum_word ZXSTSNET_DENY_DOWNSTREAM_A15 = 64;
-static const libspectrum_word ZXSTSNET_FLASH_COMPRESSED = 128;
-static const libspectrum_word ZXSTSNET_RAM_COMPRESSED = 256;
+static const libspectrum_word ZXSTSNET_NMI_FLIPFLOP = 128;
+#define ZXSTBID_SPECTRANETFLASHPAGE "SNEF"
+static const libspectrum_byte ZXSTSNEF_FLASH_COMPRESSED = 1;
+
+#define ZXSTBID_SPECTRANETRAMPAGE "SNER"
+static const libspectrum_byte ZXSTSNER_RAM_COMPRESSED = 1;
+
static libspectrum_error
read_chunk( libspectrum_snap *snap, libspectrum_word version,
const libspectrum_byte **buffer, const libspectrum_byte *end,
@@ -292,6 +308,12 @@
static libspectrum_error
write_snet_chunk( libspectrum_byte **buffer, libspectrum_byte **ptr,
size_t *length, libspectrum_snap *snap, int compress );
+static libspectrum_error
+write_snef_chunk( libspectrum_byte **buffer, libspectrum_byte **ptr,
+ size_t *length, libspectrum_snap *snap, int compress );
+static libspectrum_error
+write_sner_chunk( libspectrum_byte **buffer, libspectrum_byte **ptr,
+ size_t *length, libspectrum_snap *snap, int compress );
#ifdef HAVE_ZLIB_H
@@ -313,6 +335,9 @@
write_dirp_chunk( libspectrum_byte **buffer, libspectrum_byte **ptr,
size_t *length, libspectrum_snap *snap, int page,
int compress );
+static libspectrum_error
+write_zxpr_chunk( libspectrum_byte **buffer, libspectrum_byte **ptr,
+ size_t *length, int *out_flags, libspectrum_snap *snap );
static void
write_chunk_header( libspectrum_byte **buffer, libspectrum_byte **ptr,
@@ -1360,14 +1385,20 @@
libspectrum_snap_set_tstates( snap, libspectrum_read_dword( buffer ) );
if( version >= 0x0101 ) {
- (*buffer)++; /* Skip dwHoldIntReqCycles */
+ (*buffer)++; /* Skip chHoldIntReqCycles */
- /* Flags; ignore the 'last instruction EI' flag for now */
+ /* Flags */
+ libspectrum_snap_set_last_instruction_ei( snap, **buffer & ZXSTZF_EILAST );
libspectrum_snap_set_halted( snap, **buffer & ZXSTZF_HALTED );
+ libspectrum_snap_set_last_instruction_set_f( snap, **buffer & ZXSTZF_FSET );
(*buffer)++;
- (*buffer)++; /* Skip the hidden register */
- (*buffer)++; /* Skip the reserved byte */
+ if( version >= 0x0104 ) {
+ libspectrum_snap_set_memptr( snap, libspectrum_read_word( buffer ) );
+ } else {
+ (*buffer)++; /* Skip the hidden register */
+ (*buffer)++; /* Skip the reserved byte */
+ }
} else {
*buffer += 4; /* Skip the reserved dword */
@@ -1704,6 +1735,27 @@
}
static libspectrum_error
+read_zxpr_chunk( libspectrum_snap *snap, libspectrum_word version,
+ const libspectrum_byte **buffer,
+ const libspectrum_byte *end GCC_UNUSED, size_t data_length,
+ szx_context *ctx GCC_UNUSED )
+{
+ libspectrum_word flags;
+
+ if( data_length != 2 ) {
+ libspectrum_print_error( LIBSPECTRUM_ERROR_UNKNOWN,
+ "%s:read_zxpr_chunk: unknown length %lu",
+ __FILE__, (unsigned long)data_length );
+ return LIBSPECTRUM_ERROR_UNKNOWN;
+ }
+
+ flags = libspectrum_read_word( buffer );
+ libspectrum_snap_set_zx_printer_active( snap, flags & ZXSTPRF_ENABLED );
+
+ return LIBSPECTRUM_ERROR_NONE;
+}
+
+static libspectrum_error
read_if2r_chunk( libspectrum_snap *snap, libspectrum_word version GCC_UNUSED,
const libspectrum_byte **buffer,
const libspectrum_byte *end GCC_UNUSED, size_t data_length,
@@ -1914,9 +1966,8 @@
int compressed, size_t *data_remaining,
void (*setter)(libspectrum_snap*, int, libspectrum_byte*) )
{
- size_t data_length, uncompressed_length = 0;
- libspectrum_error error;
- libspectrum_byte *data_out, *uncompressed_data;
+ size_t data_length;
+ libspectrum_byte *data_out;
const libspectrum_byte *data;
if( *data_remaining < 4 ) {
@@ -1938,6 +1989,9 @@
if( compressed ) {
#ifdef HAVE_ZLIB_H
+ libspectrum_error error;
+ size_t uncompressed_length = 0;
+ libspectrum_byte *uncompressed_data;
error = libspectrum_zlib_inflate( *buffer, data_length, &uncompressed_data,
&uncompressed_length );
@@ -1989,12 +2043,9 @@
szx_context *ctx GCC_UNUSED )
{
libspectrum_word flags;
- int flash_compressed, ram_compressed;
- libspectrum_error error;
libspectrum_byte *w5100;
- size_t data_remaining;
- if( data_length < 62 ) {
+ if( data_length < 54 ) {
libspectrum_print_error(
LIBSPECTRUM_ERROR_UNKNOWN,
"read_snet_chunk: length %lu too short", (unsigned long)data_length
@@ -2014,8 +2065,7 @@
libspectrum_snap_set_spectranet_all_traps_disabled( snap, flags & ZXSTSNET_ALL_DISABLED );
libspectrum_snap_set_spectranet_rst8_trap_disabled( snap, flags & ZXSTSNET_RST8_DISABLED );
libspectrum_snap_set_spectranet_deny_downstream_a15( snap, flags & ZXSTSNET_DENY_DOWNSTREAM_A15 );
- flash_compressed = flags & ZXSTSNET_FLASH_COMPRESSED;
- ram_compressed = flags & ZXSTSNET_RAM_COMPRESSED;
+ libspectrum_snap_set_spectranet_nmi_flipflop( snap, flags & ZXSTSNET_NMI_FLIPFLOP );
libspectrum_snap_set_spectranet_page_a( snap, **buffer ); (*buffer)++;
libspectrum_snap_set_spectranet_page_b( snap, **buffer ); (*buffer)++;
@@ -2028,13 +2078,65 @@
memcpy( w5100, *buffer, 0x30 );
(*buffer) += 0x30;
- data_remaining = data_length - 54;
+ return LIBSPECTRUM_ERROR_NONE;
+}
+static libspectrum_error
+read_snef_chunk( libspectrum_snap *snap, libspectrum_word version GCC_UNUSED,
+ const libspectrum_byte **buffer,
+ const libspectrum_byte *end GCC_UNUSED, size_t data_length,
+ szx_context *ctx GCC_UNUSED )
+{
+ libspectrum_byte flags;
+ int flash_compressed;
+ libspectrum_error error;
+ size_t data_remaining;
+
+ if( data_length < 5 ) {
+ libspectrum_print_error(
+ LIBSPECTRUM_ERROR_UNKNOWN,
+ "read_snef_chunk: length %lu too short", (unsigned long)data_length
+ );
+ return LIBSPECTRUM_ERROR_UNKNOWN;
+ }
+
+ flags = **buffer; (*buffer)++;
+ flash_compressed = flags & ZXSTSNEF_FLASH_COMPRESSED;
+
+ data_remaining = data_length - 1;
+
error = read_snet_memory( snap, buffer, flash_compressed, &data_remaining,
libspectrum_snap_set_spectranet_flash );
if( error )
return error;
+ return LIBSPECTRUM_ERROR_NONE;
+}
+
+static libspectrum_error
+read_sner_chunk( libspectrum_snap *snap, libspectrum_word version GCC_UNUSED,
+ const libspectrum_byte **buffer,
+ const libspectrum_byte *end GCC_UNUSED, size_t data_length,
+ szx_context *ctx GCC_UNUSED )
+{
+ libspectrum_byte flags;
+ int ram_compressed;
+ libspectrum_error error;
+ size_t data_remaining;
+
+ if( data_length < 5 ) {
+ libspectrum_print_error(
+ LIBSPECTRUM_ERROR_UNKNOWN,
+ "read_sner_chunk: length %lu too short", (unsigned long)data_length
+ );
+ return LIBSPECTRUM_ERROR_UNKNOWN;
+ }
+
+ flags = **buffer; (*buffer)++;
+ ram_compressed = flags & ZXSTSNER_RAM_COMPRESSED;
+
+ data_remaining = data_length - 1;
+
error = read_snet_memory( snap, buffer, ram_compressed, &data_remaining,
libspectrum_snap_set_spectranet_ram );
if( error )
@@ -2064,44 +2166,48 @@
static struct read_chunk_t read_chunks[] = {
- { ZXSTBID_AY, read_ay_chunk },
- { ZXSTBID_BETA128, read_b128_chunk },
- { ZXSTBID_BETADISK, skip_chunk },
- { ZXSTBID_COVOX, skip_chunk },
- { ZXSTBID_CREATOR, read_crtr_chunk },
- { ZXSTBID_DIVIDE, read_dide_chunk },
- { ZXSTBID_DIVIDERAMPAGE, read_dirp_chunk },
- { ZXSTBID_DOCK, read_dock_chunk },
- { ZXSTBID_DSKFILE, skip_chunk },
- { ZXSTBID_GS, skip_chunk },
- { ZXSTBID_GSRAMPAGE, skip_chunk },
- { ZXSTBID_IF1, read_if1_chunk },
- { ZXSTBID_IF2ROM, read_if2r_chunk },
- { ZXSTBID_JOYSTICK, read_joy_chunk },
- { ZXSTBID_KEYBOARD, read_keyb_chunk },
- { ZXSTBID_MICRODRIVE, skip_chunk },
- { ZXSTBID_MOUSE, read_amxm_chunk },
- { ZXSTBID_MULTIFACE, skip_chunk },
- { ZXSTBID_OPUS, read_opus_chunk },
- { ZXSTBID_OPUSDISK, skip_chunk },
- { ZXSTBID_PLUS3DISK, skip_chunk },
- { ZXSTBID_PLUSD, read_plsd_chunk },
- { ZXSTBID_PLUSDDISK, skip_chunk },
- { ZXSTBID_RAMPAGE, read_ramp_chunk },
- { ZXSTBID_ROM, read_rom_chunk },
- { ZXSTBID_SIMPLEIDE, read_side_chunk },
- { ZXSTBID_SPECDRUM, read_drum_chunk },
- { ZXSTBID_SPECREGS, read_spcr_chunk },
- { ZXSTBID_SPECTRANET, read_snet_chunk },
- { ZXSTBID_TIMEXREGS, read_scld_chunk },
- { ZXSTBID_USPEECH, skip_chunk },
- { ZXSTBID_Z80REGS, read_z80r_chunk },
- { ZXSTBID_ZXATASPRAMPAGE, read_atrp_chunk },
- { ZXSTBID_ZXATASP, read_zxat_chunk },
- { ZXSTBID_ZXCF, read_zxcf_chunk },
- { ZXSTBID_ZXCFRAMPAGE, read_cfrp_chunk },
- { ZXSTBID_ZXPRINTER, skip_chunk },
- { ZXSTBID_ZXTAPE, skip_chunk },
+ { ZXSTBID_AY, read_ay_chunk },
+ { ZXSTBID_BETA128, read_b128_chunk },
+ { ZXSTBID_BETADISK, skip_chunk },
+ { ZXSTBID_COVOX, skip_chunk },
+ { ZXSTBID_CREATOR, read_crtr_chunk },
+ { ZXSTBID_DIVIDE, read_dide_chunk },
+ { ZXSTBID_DIVIDERAMPAGE, read_dirp_chunk },
+ { ZXSTBID_DOCK, read_dock_chunk },
+ { ZXSTBID_DSKFILE, skip_chunk },
+ { ZXSTBID_LEC, skip_chunk },
+ { ZXSTBID_LECRAMPAGE, skip_chunk },
+ { ZXSTBID_GS, skip_chunk },
+ { ZXSTBID_GSRAMPAGE, skip_chunk },
+ { ZXSTBID_IF1, read_if1_chunk },
+ { ZXSTBID_IF2ROM, read_if2r_chunk },
+ { ZXSTBID_JOYSTICK, read_joy_chunk },
+ { ZXSTBID_KEYBOARD, read_keyb_chunk },
+ { ZXSTBID_MICRODRIVE, skip_chunk },
+ { ZXSTB...
[truncated message content] |
|
From: <fr...@us...> - 2013-04-20 07:02:18
|
Revision: 740
http://sourceforge.net/p/fuse-for-macosx/code/740
Author: fredm
Date: 2013-04-20 07:02:15 +0000 (Sat, 20 Apr 2013)
Log Message:
-----------
Tag vendor/fuse-emulator/current as vendor/fuse-emulator/fuse-r4918.
Revision Links:
--------------
http://sourceforge.net/p/fuse-for-macosx/code/4918
Added Paths:
-----------
vendor/fuse-emulator/fuse-r4918/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2013-04-20 07:01:48
|
Revision: 739
http://sourceforge.net/p/fuse-for-macosx/code/739
Author: fredm
Date: 2013-04-20 07:01:40 +0000 (Sat, 20 Apr 2013)
Log Message:
-----------
Load . into vendor/fuse-emulator/current.
Modified Paths:
--------------
vendor/fuse-emulator/current/fuse/AUTHORS
vendor/fuse-emulator/current/fuse/ChangeLog
vendor/fuse-emulator/current/fuse/Makefile.am
vendor/fuse-emulator/current/fuse/README
vendor/fuse-emulator/current/fuse/THANKS
vendor/fuse-emulator/current/fuse/compat/amiga/Makefile.am
vendor/fuse-emulator/current/fuse/compat/linux/Makefile.am
vendor/fuse-emulator/current/fuse/compat/mkstemp.c
vendor/fuse-emulator/current/fuse/compat/morphos/Makefile.am
vendor/fuse-emulator/current/fuse/compat/unix/Makefile.am
vendor/fuse-emulator/current/fuse/compat/unix/socket.c
vendor/fuse-emulator/current/fuse/compat/unix/tuntap.c
vendor/fuse-emulator/current/fuse/compat/wii/Makefile.am
vendor/fuse-emulator/current/fuse/compat/win32/Makefile.am
vendor/fuse-emulator/current/fuse/compat/win32/paths.c
vendor/fuse-emulator/current/fuse/configure.ac
vendor/fuse-emulator/current/fuse/fuse.c
vendor/fuse-emulator/current/fuse/hacking/ChangeLog
vendor/fuse-emulator/current/fuse/hacking/peripheral_tests.txt
vendor/fuse-emulator/current/fuse/hacking/spectranet.txt
vendor/fuse-emulator/current/fuse/input.c
vendor/fuse-emulator/current/fuse/input.h
vendor/fuse-emulator/current/fuse/keysyms.pl
vendor/fuse-emulator/current/fuse/lib/compressed/tape_se.szx
vendor/fuse-emulator/current/fuse/lib/uncompressed/tape_se.szx
vendor/fuse-emulator/current/fuse/machines/spec_se.c
vendor/fuse-emulator/current/fuse/man/fuse.1
vendor/fuse-emulator/current/fuse/memory.c
vendor/fuse-emulator/current/fuse/menu.c
vendor/fuse-emulator/current/fuse/menu.h
vendor/fuse-emulator/current/fuse/menu_data.dat
vendor/fuse-emulator/current/fuse/periph.c
vendor/fuse-emulator/current/fuse/periph.h
vendor/fuse-emulator/current/fuse/peripherals/disk/beta.c
vendor/fuse-emulator/current/fuse/peripherals/disk/disciple.c
vendor/fuse-emulator/current/fuse/peripherals/disk/disciple.h
vendor/fuse-emulator/current/fuse/peripherals/disk/disk.c
vendor/fuse-emulator/current/fuse/peripherals/disk/disk.h
vendor/fuse-emulator/current/fuse/peripherals/disk/fdd.h
vendor/fuse-emulator/current/fuse/peripherals/disk/opus.c
vendor/fuse-emulator/current/fuse/peripherals/disk/plusd.c
vendor/fuse-emulator/current/fuse/peripherals/disk/plusd.h
vendor/fuse-emulator/current/fuse/peripherals/flash/am29f010.c
vendor/fuse-emulator/current/fuse/peripherals/fuller.c
vendor/fuse-emulator/current/fuse/peripherals/ide/divide.c
vendor/fuse-emulator/current/fuse/peripherals/ide/simpleide.c
vendor/fuse-emulator/current/fuse/peripherals/ide/zxatasp.c
vendor/fuse-emulator/current/fuse/peripherals/ide/zxcf.c
vendor/fuse-emulator/current/fuse/peripherals/if1.c
vendor/fuse-emulator/current/fuse/peripherals/if1.h
vendor/fuse-emulator/current/fuse/peripherals/if2.c
vendor/fuse-emulator/current/fuse/peripherals/if2.h
vendor/fuse-emulator/current/fuse/peripherals/kempmouse.c
vendor/fuse-emulator/current/fuse/peripherals/melodik.c
vendor/fuse-emulator/current/fuse/peripherals/nic/Makefile.am
vendor/fuse-emulator/current/fuse/peripherals/nic/w5100.c
vendor/fuse-emulator/current/fuse/peripherals/nic/w5100_internals.h
vendor/fuse-emulator/current/fuse/peripherals/nic/w5100_socket.c
vendor/fuse-emulator/current/fuse/peripherals/printer.c
vendor/fuse-emulator/current/fuse/peripherals/scld.c
vendor/fuse-emulator/current/fuse/peripherals/speccyboot.c
vendor/fuse-emulator/current/fuse/peripherals/specdrum.c
vendor/fuse-emulator/current/fuse/peripherals/spectranet.c
vendor/fuse-emulator/current/fuse/peripherals/spectranet.h
vendor/fuse-emulator/current/fuse/pokefinder/pokemem.c
vendor/fuse-emulator/current/fuse/rectangle.c
vendor/fuse-emulator/current/fuse/roms/Makefile.am
vendor/fuse-emulator/current/fuse/roms/README.copyright
vendor/fuse-emulator/current/fuse/roms/plus3e-0.rom
vendor/fuse-emulator/current/fuse/roms/plus3e-1.rom
vendor/fuse-emulator/current/fuse/roms/plus3e-2.rom
vendor/fuse-emulator/current/fuse/roms/se-0.rom
vendor/fuse-emulator/current/fuse/roms/se-1.rom
vendor/fuse-emulator/current/fuse/settings.dat
vendor/fuse-emulator/current/fuse/settings.pl
vendor/fuse-emulator/current/fuse/snapshot.c
vendor/fuse-emulator/current/fuse/sound/blipbuffer.c
vendor/fuse-emulator/current/fuse/sound/blipbuffer.h
vendor/fuse-emulator/current/fuse/sound/win32sound.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/ui/gtk/binary.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/options.dat
vendor/fuse-emulator/current/fuse/ui/sdl/sdljoystick.c
vendor/fuse-emulator/current/fuse/ui/uijoystick.c
vendor/fuse-emulator/current/fuse/ui/widget/filesel.c
vendor/fuse-emulator/current/fuse/ui/widget/menu.c
vendor/fuse-emulator/current/fuse/ui/widget/options.pl
vendor/fuse-emulator/current/fuse/ui/win32/about.rc
vendor/fuse-emulator/current/fuse/ui/win32/binary.c
vendor/fuse-emulator/current/fuse/ui/win32/binary.rc
vendor/fuse-emulator/current/fuse/ui/win32/browse.rc
vendor/fuse-emulator/current/fuse/ui/win32/debugger.h
vendor/fuse-emulator/current/fuse/ui/win32/debugger.rc
vendor/fuse-emulator/current/fuse/ui/win32/hyperlinks.c
vendor/fuse-emulator/current/fuse/ui/win32/memorybrowser.c
vendor/fuse-emulator/current/fuse/ui/win32/memorybrowser.rc
vendor/fuse-emulator/current/fuse/ui/win32/picture.c
vendor/fuse-emulator/current/fuse/ui/win32/picture.rc
vendor/fuse-emulator/current/fuse/ui/win32/pokefinder.rc
vendor/fuse-emulator/current/fuse/ui/win32/pokemem.c
vendor/fuse-emulator/current/fuse/ui/win32/pokemem.rc
vendor/fuse-emulator/current/fuse/ui/win32/rollback.rc
vendor/fuse-emulator/current/fuse/ui/win32/roms.c
vendor/fuse-emulator/current/fuse/ui/win32/select_template.rc
vendor/fuse-emulator/current/fuse/ui/win32/statusbar.c
vendor/fuse-emulator/current/fuse/ui/win32/win32joystick.c
vendor/fuse-emulator/current/fuse/ui/win32/win32ui.c
vendor/fuse-emulator/current/fuse/ui.c
vendor/fuse-emulator/current/fuse/unittests/unittests.c
vendor/fuse-emulator/current/fuse/utils.c
vendor/fuse-emulator/current/fuse/windres.rc
vendor/fuse-emulator/current/fuse/z80/coretest.c
vendor/fuse-emulator/current/fuse/z80/z80.c
vendor/fuse-emulator/current/fuse/z80/z80.h
vendor/fuse-emulator/current/fuse/z80/z80.pl
vendor/fuse-emulator/current/fuse-utils/AUTHORS
vendor/fuse-emulator/current/fuse-utils/ChangeLog
vendor/fuse-emulator/current/fuse-utils/README
vendor/fuse-emulator/current/fuse-utils/configure.ac
vendor/fuse-emulator/current/fuse-utils/converter/romloader.cc
vendor/fuse-emulator/current/fuse-utils/converter/romloader.h
vendor/fuse-emulator/current/fuse-utils/fmfconv.c
vendor/fuse-emulator/current/fuse-utils/fmfconv_au.c
vendor/fuse-emulator/current/fuse-utils/fmfconv_ff.c
vendor/fuse-emulator/current/fuse-utils/hacking/ChangeLog
vendor/fuse-emulator/current/fuse-utils/man/audio2tape.1
vendor/fuse-emulator/current/fuse-utils/man/createhdf.1
vendor/fuse-emulator/current/fuse-utils/man/fmfconv.1
vendor/fuse-emulator/current/fuse-utils/man/fuse-utils.1
vendor/fuse-emulator/current/fuse-utils/man/listbasic.1
vendor/fuse-emulator/current/fuse-utils/man/profile2map.1
vendor/fuse-emulator/current/fuse-utils/man/raw2hdf.1
vendor/fuse-emulator/current/fuse-utils/man/rzxcheck.1
vendor/fuse-emulator/current/fuse-utils/man/rzxdump.1
vendor/fuse-emulator/current/fuse-utils/man/rzxtool.1
vendor/fuse-emulator/current/fuse-utils/man/scl2trd.1
vendor/fuse-emulator/current/fuse-utils/man/snap2tzx.1
vendor/fuse-emulator/current/fuse-utils/man/snapconv.1
vendor/fuse-emulator/current/fuse-utils/man/tape2wav.1
vendor/fuse-emulator/current/fuse-utils/man/tapeconv.1
vendor/fuse-emulator/current/fuse-utils/man/tzxlist.1
vendor/fuse-emulator/current/fuse-utils/scl2trd.c
vendor/fuse-emulator/current/libspectrum/ChangeLog
vendor/fuse-emulator/current/libspectrum/README
vendor/fuse-emulator/current/libspectrum/accessor.pl
vendor/fuse-emulator/current/libspectrum/configure.ac
vendor/fuse-emulator/current/libspectrum/csw.c
vendor/fuse-emulator/current/libspectrum/doc/libspectrum.3
vendor/fuse-emulator/current/libspectrum/doc/libspectrum.txt
vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog
vendor/fuse-emulator/current/libspectrum/libspectrum.c
vendor/fuse-emulator/current/libspectrum/libspectrum.h.in
vendor/fuse-emulator/current/libspectrum/make-perl.c
vendor/fuse-emulator/current/libspectrum/rzx.c
vendor/fuse-emulator/current/libspectrum/sna.c
vendor/fuse-emulator/current/libspectrum/snap_accessors.txt
vendor/fuse-emulator/current/libspectrum/snapshot.c
vendor/fuse-emulator/current/libspectrum/szx.c
vendor/fuse-emulator/current/libspectrum/timings.c
vendor/fuse-emulator/current/libspectrum/z80.c
Added Paths:
-----------
vendor/fuse-emulator/current/fuse/roms/disciple.rom
Modified: vendor/fuse-emulator/current/fuse/AUTHORS
===================================================================
--- vendor/fuse-emulator/current/fuse/AUTHORS 2013-04-11 13:17:03 UTC (rev 738)
+++ vendor/fuse-emulator/current/fuse/AUTHORS 2013-04-20 07:01:40 UTC (rev 739)
@@ -39,7 +39,7 @@
* Garry Lancaster: the simple 8-bit IDE, ZXATASP and ZXCF support.
-* Gergely Szasz: +3, +D, Opus and Interface I/microdrive emulation, the 'movie'
+* Gergely Szasz: +3, +D, Opus and Interface 1/Microdrive emulation, the 'movie'
code and the ao sound driver.
* Bjoern Giesler: the original Wii port.
@@ -52,4 +52,4 @@
* Philip Kendall: everything else.
-$Id: AUTHORS 4237 2010-12-31 19:31:26Z pak21 $
+$Id: AUTHORS 4835 2012-12-31 15:35:45Z zubzero $
Modified: vendor/fuse-emulator/current/fuse/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse/ChangeLog 2013-04-11 13:17:03 UTC (rev 738)
+++ vendor/fuse-emulator/current/fuse/ChangeLog 2013-04-20 07:01:40 UTC (rev 739)
@@ -1,3 +1,62 @@
+201?-??-?? Philip Kendall <phi...@sh...>
+
+ * Fuse 1.1.0 released.
+
+ * Remove ROMs that there is no formal permission to distribute.
+
+ * New features:
+ * Add Spectranet ethernet interface emulation (Philip Kendall).
+ * Add SpeccyBoot ethernet interface emulation (Patrik Persson).
+ * Add SpecDrum sound interface emulation (Jon Mitchell).
+ * Add DISCiPLE disk interface emulation (Stuart Brady).
+ Sinclair Network emulation is not provided, and the interface is
+ not available under 128K emulation in this release.
+ * Support reading PZX files (Fredrick Meunier).
+ * Add support for POK files (Sergio Baldoví).
+ * Add recording of movies to FMF files (Gergely Szasz).
+ * Add GTK+ 3 compatibility (Sergio Baldoví).
+
+ * Emulation core improvements:
+ * Add support for ABC AY stereo (Stuart Brady).
+ * Correct feedback in AY noise generator (Patrik Rak).
+ * MIC bit only isn't enough to drive the speaker (Fredrick Meunier).
+ * Mirror Interface 1 ROM to the second 8Kb of ROM as in the real
+ interface (Fredrick Meunier, with thanks to mcleod_ideafix and
+ zx81).
+ * Support the Beta interface setting to not auto-boot the interface
+ on 48K machines (ketmar).
+
+ * Machine specific improvements:
+ * Read and write all potential 1024k worth of memory pages from a
+ snap (ketmar and Fredrick Meunier).
+ * Initialise the Pentagon 1024k memory ports from a snapshot (ketmar
+ and Fredrick Meunier).
+ * Restore the paged state of the Beta ROM when loading Pentagon
+ 128k/512k/1024k snapshots (ketmar and Fredrick Meunier).
+
+ * Debugger improvements:
+ * Disassemble ED 4D as RETI (Simon Owen).
+ * Add IM, IFF1 and IFF2 setting and getting to the debugger (Alex
+ Badea).
+
+ * Miscellaneous improvements:
+ * Many improvements to Win32 UI and installer (Sergio Baldoví).
+ * Allow the use of the SDL joystick code in the GTK+ and Xlib UIs
+ (Sergio Baldoví).
+ * Add current machine name to GTK+ and Win32 statusbars (Sergio
+ Baldoví).
+ * Allow the drag and drop of files from KDE (Dolphin/Konqueror)
+ (Sergio Baldoví, with thanks to Diondeville).
+ * Add a statusbar for the xlib UI (Gergely Szasz).
+ * Extend supported symbol characters on SDL and xlib UIs (Sergio
+ Baldoví).
+ * Support for the TZX set signal level block (Fredrick Meunier).
+ * Drop support for GLib and GTK+ version 1.x (Alberto Garcia and
+ Sergio Baldoví).
+ * Support setting late timings from snapshots (Fredrick Meunier).
+
+ * Various other minor bugfixes.
+
2010-12-16 Philip Kendall <phi...@sh...>
* Fuse 1.0.0 released.
@@ -1035,4 +1094,4 @@
* Version 0.1.0 released.
-$Id: ChangeLog 4409 2011-05-01 10:47:07Z zubzero $
+$Id: ChangeLog 4879 2013-02-12 00:36:01Z zubzero $
Modified: vendor/fuse-emulator/current/fuse/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/Makefile.am 2013-04-11 13:17:03 UTC (rev 738)
+++ vendor/fuse-emulator/current/fuse/Makefile.am 2013-04-20 07:01:40 UTC (rev 739)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 1999-2009 Philip Kendall
-## $Id: Makefile.am 4770 2012-11-23 22:59:48Z sbaldovi $
+## $Id: Makefile.am 4782 2012-12-02 22:49:57Z sbaldovi $
## 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
@@ -290,7 +290,8 @@
@test `find $(top_win32dir) -type f -name \*.dll -print | wc -l` -ne 0 || \
{ echo "ERROR: external libraries not found in $(top_win32dir). Please, manually copy them."; exit 1; }
# Locate NSIS in system path, MSYS drive or Cygwin drive
- @if makensis -VERSION > /dev/null 2>&1; then \
+ @NSISFILE="$(abs_top_builddir)/ui/win32/installer/fuse.nsi"; \
+ if makensis -VERSION > /dev/null 2>&1; then \
MAKENSIS="makensis"; \
elif [ -x "/c/Program Files/NSIS/makensis" ]; then \
MAKENSIS="/c/Program\ Files/NSIS/makensis"; \
@@ -299,8 +300,11 @@
else \
echo 'ERROR: cannot locate makensis tool'; exit 1; \
fi; \
+ case "`uname -s`" in \
+ CYGWIN*) NSISFILE=`cygpath -m $$NSISFILE`;; \
+ esac; \
cd $(top_win32dir); \
- eval "$$MAKENSIS -V2 -NOCD $(abs_top_builddir)/ui/win32/installer/fuse.nsi"
+ eval "$$MAKENSIS -V2 -NOCD $$NSISFILE"
mv $(top_win32dir)/$(package_win32)-setup.exe $(top_builddir)
-sha1sum $(top_builddir)/$(package_win32)-setup.exe > $(top_builddir)/$(package_win32)-setup.exe.sha1 && \
{ test -z "$(UNIX2DOS)" || $(UNIX2DOS) $(top_builddir)/$(package_win32)-setup.exe.sha1; }
Modified: vendor/fuse-emulator/current/fuse/README
===================================================================
--- vendor/fuse-emulator/current/fuse/README 2013-04-11 13:17:03 UTC (rev 738)
+++ vendor/fuse-emulator/current/fuse/README 2013-04-20 07:01:40 UTC (rev 739)
@@ -1,4 +1,4 @@
-The Free Unix Spectrum Emulator (Fuse) 1.0.0
+The Free Unix Spectrum Emulator (Fuse) 1.1.0
============================================
Fuse (the Free Unix Spectrum Emulator) was originally, and somewhat
@@ -24,7 +24,7 @@
* Emulation of some of the printers you could attach to a Spectrum.
* Support for the RZX input recording file format, including
rollback and 'competition mode'.
-* Emulation of the DivIDE, Interface I, Kempston mouse, Spectrum +3e,
+* Emulation of the DivIDE, Interface 1, Kempston mouse, Spectrum +3e,
ZXATASP, ZXCF, Beta 128, Opus Discovery and +D interfaces.
Help! <xyz> doesn't work
@@ -33,7 +33,7 @@
If you're having a problem using/running/building Fuse, the two places
you're most likely to get help are the development mailing list
<fus...@li...> or the official forums at
-<http://sourceforge.net/projects/fuse-emulator/forums>.
+<http://sourceforge.net/p/fuse-emulator/discussion/>.
What you'll need to run Fuse
----------------------------
@@ -105,6 +105,6 @@
<http://www.worldofspectrum.org/forums/>.
Philip Kendall <phi...@sh...>
-16 December 2010
+?? ???? 2012
-$Id: README 4763 2012-11-16 11:01:59Z fredm $
+$Id: README 4846 2013-01-03 09:14:29Z zubzero $
Modified: vendor/fuse-emulator/current/fuse/THANKS
===================================================================
--- vendor/fuse-emulator/current/fuse/THANKS 2013-04-11 13:17:03 UTC (rev 738)
+++ vendor/fuse-emulator/current/fuse/THANKS 2013-04-20 07:01:40 UTC (rev 739)
@@ -5,10 +5,10 @@
* Michael Bukin: for XWinAllegro, which was used by previous versions of
Fuse for the graphical display.
- (http://www.canvaslink.com/allegro/xwinallegro/)
+ (http://web.archive.org/web/19990210094206/http://www.canvaslink.com/allegro/xwinallegro/)
* Ian Collier: the source to his xz80
- (http://www.comlab.ox.ac.uk/oucl/users/ian.collier/Spectrum/index.html)
+ (http://web.archive.org/web/19990428010016/http://www.comlab.ox.ac.uk/oucl/users/ian.collier/Spectrum/index.html)
was very helpful for getting the z80 opcodes right; also the ZX Printer
emulation is based on xz80's.
@@ -27,9 +27,9 @@
* Ian Greenway: for information about reading from unattached ports. If
you've got an Amiga, you may well like to check out Ian's Spectrum
- Emulator, ASp: http://www.greew.freeserve.co.uk/ASp.html
+ Emulator, ASp: http://www.lasernet.plus.com/asp.html
-* Shawn Hargreaves: for Allegro (http://www.talula.demon.co.uk/allegro/)
+* Shawn Hargreaves: for Allegro (http://alleg.sourceforge.net/)
(again, used by previous versions of Fuse for the graphical display)
* Steven Harrison: for helping track down why the SDL sound routines
@@ -67,7 +67,7 @@
* Darren Salt: quite a few bits of code (see `AUTHORS')
-* Dmitry Sanarin: the author of Glukalka (http://glukalka.sf.net/),
+* Dmitry Sanarin: the author of Glukalka (http://www.sanarin.ru/glukalka/),
from which Fuse's TR-DOS emulation code was taken.
* Steve Snake (via Mark Woodmass): for pointing out which memory pages
@@ -78,10 +78,11 @@
the code which is used as the graphics scalers. For ScummVM, check out
http://www.scummvm.org/
-* Gergely Szasz: Interface I/microdrive emulation, the 'movie' code and the
+* Gergely Szasz: Interface 1/Microdrive emulation, the 'movie' code and the
ao sound driver (see `AUTHORS')
-* Miklos Szeredi: his `SpectEmu' (http://www.inf.bme.hu/~mszeredi/spectemu/)
+* Miklos Szeredi: his `SpectEmu'
+ (http://web.archive.org/web/20100408033206/http://www.inf.bme.hu/~mszeredi/spectemu/)
gave the inspiration for an important rewrite of the Z80 core, and was
also _very_ useful whilst trying to track down some bugs.
@@ -101,4 +102,4 @@
* Matan Ziv-Av: for various bits of code (see `AUTHORS')
-$Id: THANKS 2433 2004-11-28 21:58:44Z pak21 $
+$Id: THANKS 4882 2013-02-15 23:47:37Z sbaldovi $
Modified: vendor/fuse-emulator/current/fuse/compat/amiga/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/amiga/Makefile.am 2013-04-11 13:17:03 UTC (rev 738)
+++ vendor/fuse-emulator/current/fuse/compat/amiga/Makefile.am 2013-04-20 07:01:40 UTC (rev 739)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2007-2012 Philip Kendall
-## $Id: Makefile.am 4743 2012-10-10 13:20:50Z fredm $
+## $Id: Makefile.am 4898 2013-02-25 22:20: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
@@ -31,8 +31,11 @@
../unix/file.c \
osname.c \
paths.c \
- ../unix/timer.c \
- ../unix/tuntap.c
+ ../unix/timer.c
+if HAVE_TUNTAP
+libcompatos_a_SOURCES += ../unix/tuntap.c
+endif
+
AM_CPPFLAGS += @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@ \
-DFUSEDATADIR="\"${pkgdatadir}\""
Modified: vendor/fuse-emulator/current/fuse/compat/linux/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/linux/Makefile.am 2013-04-11 13:17:03 UTC (rev 738)
+++ vendor/fuse-emulator/current/fuse/compat/linux/Makefile.am 2013-04-20 07:01:40 UTC (rev 739)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2012 Philip Kendall
-## $Id: Makefile.am 4779 2012-11-29 18:55:54Z sbaldovi $
+## $Id: Makefile.am 4898 2013-02-25 22:20: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
@@ -31,12 +31,15 @@
../unix/file.c \
../unix/osname.c \
paths.c \
- ../unix/timer.c \
- ../unix/tuntap.c
+ ../unix/timer.c
if HAVE_SOCKETS
libcompatos_a_SOURCES += ../unix/socket.c
endif
+if HAVE_TUNTAP
+libcompatos_a_SOURCES += ../unix/tuntap.c
+endif
+
AM_CPPFLAGS += @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@ \
-DFUSEDATADIR="\"${pkgdatadir}\""
Modified: vendor/fuse-emulator/current/fuse/compat/mkstemp.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/mkstemp.c 2013-04-11 13:17:03 UTC (rev 738)
+++ vendor/fuse-emulator/current/fuse/compat/mkstemp.c 2013-04-20 07:01:40 UTC (rev 739)
@@ -49,7 +49,6 @@
int len;
char *XXXXXX;
static uint64_t value;
- uint64_t random_time_bits;
unsigned int count;
int fd = -1;
int save_errno = errno;
Modified: vendor/fuse-emulator/current/fuse/compat/morphos/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/morphos/Makefile.am 2013-04-11 13:17:03 UTC (rev 738)
+++ vendor/fuse-emulator/current/fuse/compat/morphos/Makefile.am 2013-04-20 07:01:40 UTC (rev 739)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2007-2008 Philip Kendall
-## $Id: Makefile.am 4743 2012-10-10 13:20:50Z fredm $
+## $Id: Makefile.am 4898 2013-02-25 22:20: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
@@ -31,7 +31,10 @@
../unix/file.c \
osname.c \
../amiga/paths.c \
- ../unix/timer.c \
- ../unix/tuntap.c
+ ../unix/timer.c
+if HAVE_TUNTAP
+libcompatos_a_SOURCES += ../unix/tuntap.c
+endif
+
AM_CPPFLAGS += @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@
Modified: vendor/fuse-emulator/current/fuse/compat/unix/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/unix/Makefile.am 2013-04-11 13:17:03 UTC (rev 738)
+++ vendor/fuse-emulator/current/fuse/compat/unix/Makefile.am 2013-04-20 07:01:40 UTC (rev 739)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2007-2012 Philip Kendall
-## $Id: Makefile.am 4779 2012-11-29 18:55:54Z sbaldovi $
+## $Id: Makefile.am 4898 2013-02-25 22:20: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
@@ -31,12 +31,15 @@
file.c \
osname.c \
paths.c \
- timer.c \
- tuntap.c
+ timer.c
if HAVE_SOCKETS
libcompatos_a_SOURCES += socket.c
endif
+if HAVE_TUNTAP
+libcompatos_a_SOURCES += tuntap.c
+endif
+
AM_CPPFLAGS += @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@ \
-DFUSEDATADIR="\"${pkgdatadir}\""
Modified: vendor/fuse-emulator/current/fuse/compat/unix/socket.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/unix/socket.c 2013-04-11 13:17:03 UTC (rev 738)
+++ vendor/fuse-emulator/current/fuse/compat/unix/socket.c 2013-04-20 07:01:40 UTC (rev 739)
@@ -1,7 +1,7 @@
/* socket.c: Socket-related compatibility routines
- Copyright (c) 2011 Philip Kendall
+ Copyright (c) 2011-2012 Philip Kendall
- $Id: socket.c 4775 2012-11-26 23:03:36Z sbaldovi $
+ $Id: socket.c 4828 2012-12-30 19:43:37Z 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
@@ -116,5 +116,12 @@
char bitbucket;
ssize_t bytes_read;
- bytes_read = read( self->read_fd, &bitbucket, 1 );
+ do {
+ bytes_read = read( self->read_fd, &bitbucket, 1 );
+ if( bytes_read == -1 && errno != EINTR ) {
+ ui_error( UI_ERROR_ERROR,
+ "%s: %d: unexpected error %d (%s) reading from pipe", __FILE__,
+ __LINE__, errno, strerror(errno) );
+ }
+ } while( bytes_read < 0 );
}
Modified: vendor/fuse-emulator/current/fuse/compat/unix/tuntap.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/unix/tuntap.c 2013-04-11 13:17:03 UTC (rev 738)
+++ vendor/fuse-emulator/current/fuse/compat/unix/tuntap.c 2013-04-20 07:01:40 UTC (rev 739)
@@ -1,7 +1,7 @@
/* tuntap.c: TUN/TAP compatability layer
Copyright (c) 2009-2010 Patrik Persson, Philip Kendall
- $Id: tuntap.c 4432 2011-05-11 14:08:17Z pak21 $
+ $Id: tuntap.c 4898 2013-02-25 22:20: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
@@ -30,11 +30,9 @@
#include <sys/types.h>
#include <sys/stat.h>
-#ifdef LINUX_TAP
#include <linux/if_tun.h>
#include <net/if.h>
#include <sys/ioctl.h>
-#endif /* #ifdef LINUX_TAP */
#include "ui/ui.h"
@@ -43,8 +41,6 @@
{
int fd = -1;
-#ifdef LINUX_TAP
-
if ( (fd = open( "/dev/net/tun", O_RDWR | O_NONBLOCK )) < 0 )
ui_error( UI_ERROR_ERROR, "couldn't open TUN/TAP device '/dev/net/tun'" );
else {
@@ -59,12 +55,5 @@
}
}
-#else
-
- ui_error( UI_ERROR_ERROR,
- "TUN/TAP not yet supported for this operating system" );
-
-#endif /* #ifdef LINUX_TAP */
-
return fd;
}
Modified: vendor/fuse-emulator/current/fuse/compat/wii/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/wii/Makefile.am 2013-04-11 13:17:03 UTC (rev 738)
+++ vendor/fuse-emulator/current/fuse/compat/wii/Makefile.am 2013-04-20 07:01:40 UTC (rev 739)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2007-2008 Philip Kendall
-## $Id: Makefile.am 4743 2012-10-10 13:20:50Z fredm $
+## $Id: Makefile.am 4898 2013-02-25 22:20: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
@@ -31,7 +31,10 @@
../unix/file.c \
osname.c \
paths.c \
- timer.c \
- ../unix/tuntap.c
+ timer.c
+if HAVE_TUNTAP
+libcompatos_a_SOURCES += ../unix/tuntap.c
+endif
+
AM_CPPFLAGS += @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@
Modified: vendor/fuse-emulator/current/fuse/compat/win32/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/win32/Makefile.am 2013-04-11 13:17:03 UTC (rev 738)
+++ vendor/fuse-emulator/current/fuse/compat/win32/Makefile.am 2013-04-20 07:01:40 UTC (rev 739)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 2007-2008 Philip Kendall
-## $Id: Makefile.am 4779 2012-11-29 18:55:54Z sbaldovi $
+## $Id: Makefile.am 4898 2013-02-25 22:20: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
@@ -31,8 +31,7 @@
../unix/file.c \
osname.c \
paths.c \
- timer.c \
- ../unix/tuntap.c
+ timer.c
if HAVE_SOCKETS
libcompatos_a_SOURCES += socket.c
Modified: vendor/fuse-emulator/current/fuse/compat/win32/paths.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/win32/paths.c 2013-04-11 13:17:03 UTC (rev 738)
+++ vendor/fuse-emulator/current/fuse/compat/win32/paths.c 2013-04-20 07:01:40 UTC (rev 739)
@@ -1,7 +1,7 @@
/* paths.c: Path-related compatibility routines
Copyright (c) 1999-2012 Philip Kendall
- $Id: paths.c 4739 2012-10-10 12:14:56Z fredm $
+ $Id: paths.c 4882 2013-02-15 23:47:37Z sbaldovi $
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 @@
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
+ http://msdn.microsoft.com/en-us/library/windows/desktop/aa364992%28v=vs.85%29.aspx
*/
dir = getenv( "TMP" ); if( dir ) return dir;
dir = getenv( "TEMP" ); if( dir ) return dir;
Modified: vendor/fuse-emulator/current/fuse/configure.ac
===================================================================
--- vendor/fuse-emulator/current/fuse/configure.ac 2013-04-11 13:17:03 UTC (rev 738)
+++ vendor/fuse-emulator/current/fuse/configure.ac 2013-04-20 07:01:40 UTC (rev 739)
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-dnl $Id: configure.ac 4779 2012-11-29 18:55:54Z sbaldovi $
+dnl $Id: configure.ac 4898 2013-02-25 22:20:54Z 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
@@ -20,20 +20,20 @@
dnl E-mail: phi...@sh...
dnl Package version
-m4_define([fuse_version], [1.0.0])
+m4_define([fuse_version], [1.1.0])
dnl Product full version
m4_define([fuse_major_version], [1])
-m4_define([fuse_minor_version], [0])
+m4_define([fuse_minor_version], [1])
m4_define([fuse_micro_version], [0])
m4_define([fuse_nano_version], [0])
m4_define([fuse_full_version], [fuse_major_version.fuse_minor_version.fuse_micro_version.fuse_nano_version])
m4_define([fuse_rc_version], [fuse_major_version,fuse_minor_version,fuse_micro_version,fuse_nano_version])
dnl Package info
-m4_define([fuse_copyright], ["(c) 1999-2012 Philip Kendall and others"])
-m4_define([fuse_url], [http://fuse-emulator.sourceforge.net])
-m4_define([fuse_bugreport], [http://sourceforge.net/tracker/?group_id=91293&atid=596648])
+m4_define([fuse_copyright], ["(c) 1999-2013 Philip Kendall and others"])
+m4_define([fuse_url], [http://fuse-emulator.sourceforge.net/])
+m4_define([fuse_bugreport], [http://sourceforge.net/p/fuse-emulator/bugs/])
AC_INIT([fuse],[fuse_version],[fuse_bugreport],[fuse],[fuse_url])
AC_CONFIG_SRCDIR(fuse.c)
@@ -105,6 +105,7 @@
dnl Checks for library functions.
AC_CHECK_FUNCS(dirname geteuid getopt_long mkstemp fsync)
+AC_CHECK_LIB([m],[cos])
dnl Allow the user to say that various libraries are in one place
AC_ARG_WITH(local-prefix,
@@ -134,6 +135,7 @@
AC_DEFINE([UI_WIN32], 1, [Defined if Win32 UI in use])
AC_DEFINE([WINVER], 0x0400, [Minimal supported version of Windows is 95 or NT4])
AC_DEFINE([_WIN32_IE], 0x400, [Internet Explorer is 4.0 or higher is required])
+ AC_DEFINE([WIN32_LEAN_AND_MEAN],, [Exclude rarely used stuff from Windows headers <windows.h>])
UI=win32; UI_LIBS="ui/win32/libuiwin32.a",
AC_MSG_ERROR([Win32 UI not found]))
fi
@@ -531,7 +533,9 @@
dsound.h,
[dxsound_available=yes],
[AC_MSG_WARN(dsound.h not found - no DirectSound output)],
- [#define DIRECTSOUND_VERSION 0x0700]
+ [#define DIRECTSOUND_VERSION 0x0700
+ #include <windows.h>
+ #include <mmsystem.h>]
)
dnl Check if MS Windows Multimedia API sound is available
@@ -759,11 +763,14 @@
int test2 = TUNSETIFF;
]])
],
- [AC_DEFINE([LINUX_TAP], 1, [Define to 1 if Linux TAP devices are supported.])
+ [AC_DEFINE([BUILD_SPECCYBOOT], 1, [Define to 1 if SpeccyBoot is supported.])
+ linux_tap=yes
AC_MSG_RESULT(yes)],
[AC_MSG_RESULT(no)]
)
CPPFLAGS="$ac_save_CPPFLAGS"
+AM_CONDITIONAL(HAVE_TUNTAP, test x$linux_tap != x)
+AM_CONDITIONAL(BUILD_SPECCYBOOT, test x$linux_tap != x)
dnl Work out which standard routines we're missing
AC_MSG_CHECKING(which standard routines we're missing)
Modified: vendor/fuse-emulator/current/fuse/fuse.c
===================================================================
--- vendor/fuse-emulator/current/fuse/fuse.c 2013-04-11 13:17:03 UTC (rev 738)
+++ vendor/fuse-emulator/current/fuse/fuse.c 2013-04-20 07:01:40 UTC (rev 739)
@@ -1,7 +1,7 @@
/* fuse.c: The Free Unix Spectrum Emulator
Copyright (c) 1999-2012 Philip Kendall and others
- $Id: fuse.c 4762 2012-11-12 11:32:09Z fredm $
+ $Id: fuse.c 4846 2013-01-03 09:14:29Z 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
@@ -121,6 +121,7 @@
const char *disk_opus;
const char *disk_plusd;
const char *disk_beta;
+ const char *disk_disciple;
const char *dock;
const char *if2;
const char *playback;
@@ -390,7 +391,7 @@
"'AUTHORS' for more details.\n"
"\n"
"For help, please mail <fus...@li...> or use\n"
- "the forums at <http://sourceforge.net/projects/fuse-emulator/forums>.\n"
+ "the forums at <http://sourceforge.net/p/fuse-emulator/discussion/>.\n"
"\n"
"This program is distributed in the hope that it will be useful,\n"
"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -480,6 +481,7 @@
start_files->disk_plus3 = settings_current.plus3disk_file;
start_files->disk_opus = settings_current.opusdisk_file;
start_files->disk_plusd = settings_current.plusddisk_file;
+ start_files->disk_disciple = settings_current.discipledisk_file;
start_files->disk_beta = settings_current.betadisk_file;
start_files->dock = settings_current.dck_file;
start_files->if2 = settings_current.if2_file;
@@ -579,7 +581,11 @@
start_files->disk_opus = filename; break;
case LIBSPECTRUM_CLASS_DISK_PLUSD:
- start_files->disk_plusd = filename; break;
+ if( periph_is_active( PERIPH_TYPE_DISCIPLE ) )
+ start_files->disk_disciple = filename;
+ else
+ start_files->disk_plusd = filename;
+ break;
case LIBSPECTRUM_CLASS_DISK_TRDOS:
start_files->disk_beta = filename; break;
@@ -598,6 +604,8 @@
start_files->disk_beta = filename;
else if( periph_is_active( PERIPH_TYPE_PLUSD ) )
start_files->disk_plusd = filename;
+ else if( periph_is_active( PERIPH_TYPE_DISCIPLE ) )
+ start_files->disk_disciple = filename;
else if( periph_is_active( PERIPH_TYPE_OPUS ) )
start_files->disk_opus = filename;
}
@@ -678,12 +686,12 @@
start_files->dock = NULL;
}
- /* Can't use disks and the Interface II simultaneously */
+ /* Can't use disks and the Interface 2 simultaneously */
if( ( start_files->disk_plus3 || start_files->disk_beta ) &&
start_files->if2 ) {
ui_error(
UI_ERROR_WARNING,
- "can't use disks and the Interface II simultaneously; cartridge ignored"
+ "can't use disks and the Interface 2 simultaneously; cartridge ignored"
);
start_files->if2 = NULL;
}
@@ -707,6 +715,11 @@
if( error ) return error;
}
+ if( start_files->disk_disciple ) {
+ error = utils_open_file( start_files->disk_disciple, autoload, NULL );
+ if( error ) return error;
+ }
+
if( start_files->disk_opus ) {
error = utils_open_file( start_files->disk_opus, autoload, NULL );
if( error ) return error;
Modified: vendor/fuse-emulator/current/fuse/hacking/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse/hacking/ChangeLog 2013-04-11 13:17:03 UTC (rev 738)
+++ vendor/fuse-emulator/current/fuse/hacking/ChangeLog 2013-04-20 07:01:40 UTC (rev 739)
@@ -3607,7 +3607,7 @@
periph.h,peripherals/disk/{Makefile.am,disciple.[ch]},settings.dat,
tape.c,ui.c,ui/{options.dat,ui.h},z80/{coretest.c,z80_checks.h,
z80_ops.c}: DISCiPLE emulation (Stuart).
-20110414 disciple.c: avoid C++/C99 comments (Stuart).
+20110414 peripherals/disk/disciple.c: avoid C++/C99 comments (Stuart).
20110415 ui/win32/win32ui.c: fix the disabling of menu entries below a
separator, e.g., /File/Movie/Stop Movie Recording (patch #3286195)
(Sergio Baldoví).
@@ -4297,3 +4297,167 @@
peripherals/spectranet.c,ui/options.dat,utils.c: allow the disabling of
Spectranet code if required libraries are not present (patch #3589476)
(Sergio).
+20121202 Makefile.am: translate path used for makensis on cygwin (win32 port)
+ (Sergio).
+20121208 configure.ac,peripherals/flash/am29f010.c,peripherals/printer.c,
+ pokefinder/pokemem.c,rectangle.c,sound/{blipbuffer.c,win32sound.c},
+ sound.c,ui/win32/{about.rc,browse.rc,binary.{c,rc},debugger.rc,
+ hyperlinks.c,memorybrowser.{c,rc},picture.{c,rc},pokefinder.rc,
+ pokemem.{c,rc},rollback.rc,roms.c,select_template.rc,win32joystick.c,
+ win32ui.c},windres.rc: preliminary support for 64-bits binaries for
+ Windows (patch #3591613) (Sergio).
+20121208 man/fuse.1: Update man page for movie, stereo separation and statusbar
+ options. Remove reference to fixed issue in joystick dialog on GTK+ UI
+ (Sergio).
+20121208 man/fuse.1: document support for reading PZX files (Sergio).
+20121210 man/fuse.1: fix a couple of typos (Fred).
+20121222 hacking/spectranet.txt: add reference to precompiled installers (Fred).
+20121222 man/fuse.1: add information on SpecDrum settings and Spectranet
+ (bug #3495082) (Fred).
+20121222 configure.ac: link explicitly against the math library. This is
+ necessary for the binutils gold linker (patch #3596551) (Alberto
+ Garcia).
+20121225 snapshot.c: support setting late timings from snapshots (Fred).
+20121227 man/fuse.1: update descriptions for SpeccyBoot interface and
+ confirm-actions option. Fix dashes (Sergio).
+20121227 configure.ac: bump version number to 1.1.0 (Fred).
+20121227 ChangeLog,README: first updates for a "1.1.0" release (Fred).
+20121227 man/fuse.1: fix spelling, capitalisation, dashes, quotes and
+ whitespace (Stuart).
+20121228 man/fuse.1: fix whitespace and grammar issues (Stuart).
+20121228 man/fuse.1: make better use of named glyphs (Stuart).
+20121228 man/fuse.1: remove trailing spaces (Stuart).
+20121228 compat/unix/socket.c,tape.c,unittests.c: fix warnings.
+20121228 man/fuse.1: whitespace and italics fixes (Stuart).
+20121228 man/fuse.1: add missing 'SpecDrum volume' section (Stuart).
+20121228 man/fuse.1: restore spacing between synopsis and description and
+ use default paragraph spacing for the entire man page (Stuart).
+20121228 man/fuse.1: use 'tbl' syntax for example of Spectranet current
+ configuration screen (Stuart).
+20121229 unittests/unittests.c: make unit tests pass for 16K and Timex
+ machines.
+20121229 man/fuse.1: whitespace and punctuation fixes (Stuart).
+20121230 man/fuse.1: use bold font for command line option names (Stuart).
+20121230 compat/unix/socket.c: don't ignore the return code from read().
+20121230 man/fuse.1: formatting fixes (Stuart).
+20121230 man/fuse.1: fix typo (Fred).
+20121230 man/fuse.1: fix typo (thanks, Fred) (Stuart).
+20121230 man/fuse.1: use conformant and more consistent syntax (Stuart).
+20121231 AUTHORS,README,THANKS,fuse.c,man/fuse.1,menu.[ch],menu_data.dat,
+ peripherals/if[12].[ch],ui.c,ui/options.dat: rename 'Interface I' and
+ 'Interface II' to 'Interface 1' and 'Interface 2' (Stuart).
+20121231 man/fuse.1: use non-breaking spaces where appropriate (Stuart).
+20130101 man/fuse.1: fix text in SPECTRANET EMULATION section (Fred).
+20130102 menu.c,menu_data.dat,settings.{dat,pl}: fix command line options and
+ add menu items for Opus Discovery and DISCiPLE ROM selection (Stuart).
+20130102 fuse.c,man/fuse.1,utils.c: wire up the --discipledisk option and
+ document it (Stuart).
+20130102 hacking/peripheral_tests.txt: add instructions for testing the
+ DISCiPLE interface (Stuart).
+20130103 configure.ac,fuse.c: make some URLs point to the new sourceforge forge
+ and update copyright date to 2013 (Sergio).
+20130103 configure.ac,fuse.c,README: add trailing slashes to URLs where
+ appropriate (Stuart).
+20130103 peripherals/disk/disciple.c: fix inverted printer busy logic (Stuart).
+20130104 ui/win32/win32ui.c: empty sound buffer when emulation is paused using a
+ shortcut key on Win32 UI (thanks, Lee Tonks) (Sergio).
+20130105 roms/{Makefile.am,README.copyright,disciple.rom}: add DISCiPLE ROM
+ with EPSON printer support (Fred).
+20130106 compat/mkstemp.c: remove unused variable (Sergio).
+20130106 peripherals/disk/disciple.c: swap order of ROM banks (Stuart).
+20130107 man/fuse.1: initial documentation of the drive emulation flags
+ (bug #250) (Fred).
+20130123 memory.c: correct restore of pentagon 1024 memory ports from snapshots
+ (bug #275) (rkd77).
+20130126 peripherals/nic/w5100_socket.c: make sure write_pending member of
+ nic_w5100_socket_t is initialised (bug #275) (rkd77).
+20130126 machines/spec_se.c: make sure that RAM variables are initialised before
+ they are referenced (more from bug #275) (rkd77).
+20130126 man/fuse.1,peripherals/printer.c,settings.dat,ui/options.dat:
+ add separate switch to enable ZX Printer emulation (bug #274) (Fred).
+20130127 machines/spec_se.c: fix SE writing dock and exrom pages to snapshots
+ (Fred).
+20130127 lib/{compressed/tape_se.szx,uncompressed/tape_se.szx},man/fuse.1,
+ roms/{README.copyright,se-0.rom,se-1.rom},tape.c: update SE ROMs to
+ v4.04 (Fred).
+20130128 peripherals/disk/{beta.c,disciple.c,opus.c,plusd.c},
+ peripherals/ide/divide.c,peripherals/{if1.c,if2.c,scld.c,speccyboot.c,
+ spectranet.c}: make sure that an associated peripheral is enabled
+ before running it's associated memory_map function (bug #276) (Fred).
+20130128 peripherals/nic/w5100_socket.c: ensure we don't read bogus data on
+ UDP writes (bug #271).
+20130130 spectrum.c: changes to keep +2A/+3 contention correct after
+ libspectrum timing changes in r4866 (Fuse part of patch #305).
+20130131 man/fuse.1: document the Poke Memory dialog (Sergio).
+20130131 man/fuse.1: fix bad syntax in the Fuse Movie File section. Add missing
+ space before TS2068 machine (Sergio).
+20130203 peripherals/disk/{beta.c,disciple.c,opus.c,plusd.c},
+ peripherals/ide/divide.c,peripherals/{if1.c,if2.c,scld.c,speccyboot.c,
+ spectranet.c}: revert fix to bug #273, ensure that interfaces are
+ disabled in the reset function unless the peripheral is enabled
+ (bug #276 #278) (thanks, Stuart Brady) (Fred).
+20130203 peripherals/nic/w5100_socket.c: remove data races (patch #306) (thanks,
+ Alberto Garcia and helgrind).
+20130211 peripherals/disk/disciple.c: fix typo in comment documenting port
+ decoding at the single bit level (Stuart).
+20130212 peripherals/disk/{disciple.c,opus.c,plusd.c}: revert further changes
+ made when reverting the fix to bug #273, causing the Opus Discovery
+ to be left paged in after a reset and +D/DISCiPLE to be left paged in
+ if loading of the interface's ROM fails (bug #284) (Stuart).
+20130212 ChangeLog: document limitations of the DISCiPLE emulation (bug #285)
+ (Stuart).
+20130216 compat/win32/paths.c,keysyms.pl,man/fuse.1,sound/blipbuffer.[ch],
+ spectrum.c,THANKS,ui/win32/debugger.h: fix broken URLs (thanks, Fred)
+ (Sergio).
+20130223 ui/widget/filesel.c: fix a couple of memory leaks (Sergio).
+20130223 peripherals/disk/{disk.h,fdd.h}: fix header descriptions (Sergio).
+20130223 peripherals/disk/disciple.c,roms/disciple.rom: remove GDOS from
+ DISCiPLE ROM image and use 8 KiB ROMs (Stuart).
+20130223 peripherals/disk/disciple.c: remove comments regarding unattached
+ port I/O for paging operations (Stuart).
+20130223 peripherals/disk/{disciple,plusd}.[ch]: rename the paging port
+ functions to {disciple,plusd}_patch_{read,write} (from *_mem_*)
+ to follow MGT terminology (Stuart).
+20130223 man/fuse.1: improve NMI documentation for +D and DISCiPLE (Stuart).
+20130225 compat/{win32/Makefile.am,unix/{Makefile.am,tuntap.c},
+ morphos/Makefile.am,wii/Makefile.am,amiga/Makefile.am,
+ linux/Makefile.am},configure.ac,peripherals/{speccyboot.c,
+ nic/Makefile.am}: improve SpeccyBoot behaviour on non-Linux systems
+ and when ROM is not available (patch #302) (Sergio).
+20130229 man/fuse.1: sort disciple, discipledisk, paltv2x, sound-device and
+ specdrum options alphabetically (Sergio).
+20130301 man/fuse.1: add Spectranet options and fix a couple of typos (bug #244)
+ (Sergio).
+20130303 ui/widget/menu.c: remove potential use of uninitialised variable
+ (Fred).
+20130303 peripherals/disk/disk.c: fix memory disk image corrupted after save
+ (bug #279) (Sergio).
+20130303 man/fuse.1: document hq2x and hq3x filters (Sergio).
+20130308 peripherals/spectranet.[ch],z80/{coretest.c,z80.{c,h,pl}}: implement
+ Spectranet's "suppress NMI" flipflop (bug #259).
+20130310 periph.[ch],peripherals/disk/{beta.c,disciple.c,opus.c,plusd.c},
+ peripherals/ide/{divide.c,simpleide.c,zxatasp.c,zxcf.c},
+ peripherals/{fuller.c,if1.c,kempmouse.c,melodik.c,printer.c,
+ speccyboot.c,specdrum.c,spectranet.c},
+ ui/options.dat: do a hard reset when a peripheral that requires it is
+ enabled or disabled in settings (bugs #281, #283, #289) (Fred).
+20130310 man/fuse.1: mention that peripherals changes can result in hard resets
+ (Fred).
+20130310 ui/gtk/{binary.c,debugger.c}: replace deprecated GtkTable with GtkGrid
+ (patch #307) (Sergio).
+20130310 ui/win32/{picture.c,statusbar.c}: use best practices for releasing GDI
+ objects on win32 UI (thanks, Dr. Memory) (Sergio).
+20130322 roms/{plus3e-0.rom,plus3e-1.rom,plus3e-2.rom}: update to v1.38 of the
+ +3e ROMs (fixes bug #290) (thanks, Guesser) (Fred).
+20130324 peripherals/nic/{w5100.c,w5100_internals.h,w5100_socket.c}: destroy
+ mutex before closing (patch #308) (Sergio).
+20130325 ui/widget/options.pl: run the peripherals posthook at the appropriate
+ point to work (bug #281) (Sergio and Fred).
+20130404 ui/win32/win32joystick.c: fix input events fired when various joystick
+ buttons are pressed simultaneously (Sergio).
+20130407 input.[ch],man/fuse.1,settings.dat,ui/{gtk/gtkjoystick.c,
+ sdl/sdljoystick.c,uijoystick.c,widget/menu.c}: allow up to 15 joytick
+ buttons to be defined to accomodate e.g. XBox 360 ABXY button use
+ (patch #309) (Fred).
+20130420 peripherals/disk/disk.c: fix loading of EDSK files with redundant
+ sector images (bug #293) (Fred).
Modified: vendor/fuse-emulator/current/fuse/hacking/peripheral_tests.txt
===================================================================
--- vendor/fuse-emulator/current/fuse/hacking/peripheral_tests.txt 2013-04-11 13:17:03 UTC (rev 738)
+++ vendor/fuse-emulator/current/fuse/hacking/peripheral_tests.txt 2013-04-20 07:01:40 UTC (rev 739)
@@ -13,11 +13,26 @@
* Uncompress lib/tests/success.mgt.bz2
* Start fuse as
./fuse --plusd --plusddisk lib/tests/success.mgt PlusDSystemTape.tzx
+* Hit enter
* Hit <Break>
* Enter NEW
* Enter LOAD d1"Success"
* You should see "Congraturation! You sucsess!"
+DISCiPLE
+
+* Acquire the DISCiPLE system tape from
+ ftp://ftp.worldofspectrum.org/pub/sinclair/utils/DISCiPLESystemTapeV3d.tzx.zip
+* Uncompress lib/tests/success.mgt.bz2
+* Place a DISCiPLE ROM image in the 'roms' directory.
+* Start fuse as
+ ./fuse --disciple --discipledisk lib/tests/success.mgt DISCiPLESystemTapeV3d.tzx.zip
+* Hit enter
+* Hit <Break>
+* Enter NEW
+* Enter LOAD d1"Success"
+* You should see "Congraturation! You sucsess!"
+
DivIDE
* Acquire the FATware installer from http://baze.au.com/divide/
Modified: vendor/fuse-emulator/current/fuse/hacking/spectranet.txt
===================================================================
--- vendor/fuse-emulator/current/fuse/hacking/spectranet.txt 2013-04-11 13:17:03 UTC (rev 738)
+++ vendor/fuse-emulator/current/fuse/hacking/spectranet.txt 2013-04-20 07:01:40 UTC (rev 739)
@@ -7,11 +7,11 @@
a later firmware than this, things may have changed slightly.
The first thing you will need to do is to obtain a copy of the
-Spectranet installer as a .tap file (or similar). This may in fact be
-the hardest step - see below for instructions for building the installer
-from source if you really can't find a copy. A number of
-Spectranet-enabled folks hang out in the #zx channel on the Coldfront
-IRC network (irc.coldfront.net) - try asking in there.
+Spectranet installer as a .tap file (or similar). You can find installers
+at http://spectrum.alioth.net/doc/index.php in the Downloads section, or
+you can see below for instructions for building the installer from
+source. A number of Spectranet-enabled folks hang out in the #zx channel
+on the Coldfront IRC network (irc.coldfront.net) - try asking in there.
Once you have a copy of the installer, start Fuse and tick the
"Spectranet" and "Spectranet disable" options from the Options /
Modified: vendor/fuse-emulator/current/fuse/input.c
===================================================================
--- vendor/fuse-emulator/current/fuse/input.c 2013-04-11 13:17:03 UTC (rev 738)
+++ vendor/fuse-emulator/current/fuse/input.c 2013-04-20 07:01:40 UTC (rev 739)
@@ -1,7 +1,7 @@
/* input.c: generalised input events layer for Fuse
Copyright (c) 2004 Philip Kendall
- $Id: input.c 4545 2011-09-19 01:57:01Z fredm $
+ $Id: input.c 4915 2013-04-07 05:32:09Z 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
@@ -159,6 +159,11 @@
case INPUT_JOYSTICK_FIRE_8 : return settings_current.joystick_1_fire_8;
case INPUT_JOYSTICK_FIRE_9 : return settings_current.joystick_1_fire_9;
case INPUT_JOYSTICK_FIRE_10: return settings_current.joystick_1_fire_10;
+ case INPUT_JOYSTICK_FIRE_11: return settings_current.joystick_1_fire_11;
+ case INPUT_JOYSTICK_FIRE_12: return settings_current.joystick_1_fire_12;
+ case INPUT_JOYSTICK_FIRE_13: return settings_current.joystick_1_fire_13;
+ case INPUT_JOYSTICK_FIRE_14: return settings_current.joystick_1_fire_14;
+ case INPUT_JOYSTICK_FIRE_15: return settings_current.joystick_1_fire_15;
default: break;
}
break;
@@ -175,6 +180,11 @@
case INPUT_JOYSTICK_FIRE_8 : return settings_current.joystick_2_fire_8;
case INPUT_JOYSTICK_FIRE_9 : return settings_current.joystick_2_fire_9;
case INPUT_JOYSTICK_FIRE_10: return settings_current.joystick_2_fire_10;
+ case INPUT_JOYSTICK_FIRE_11: return settings_current.joystick_2_fire_11;
+ case INPUT_JOYSTICK_FIRE_12: return settings_current.joystick_2_fire_12;
+ case INPUT_JOYSTICK_FIRE_13: return settings_current.joystick_2_fire_13;
+ case INPUT_JOYSTICK_FIRE_14: return settings_current.joystick_2_fire_14;
+ case INPUT_JOYSTICK_FIRE_15: return settings_current.joystick_2_fire_15;
default: break;
}
break;
Modified: vendor/fuse-emulator/current/fuse/input.h
===================================================================
--- vendor/fuse-emulator/current/fuse/input.h 2013-04-11 13:17:03 UTC (rev 738)
+++ vendor/fuse-emulator/current/fuse/input.h 2013-04-20 07:01:40 UTC (rev 739)
@@ -1,7 +1,7 @@
/* input.h: generalised input events layer for Fuse
Copyright (c) 2004 Philip Kendall
- $Id: input.h 4698 2012-05-07 02:38:35Z fredm $
+ $Id: input.h 4915 2013-04-07 05:32:09Z 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
@@ -199,6 +199,11 @@
INPUT_JOYSTICK_FIRE_8,
INPUT_JOYSTICK_FIRE_9,
INPUT_JOYSTICK_FIRE_10,
+ INPUT_JOYSTICK_FIRE_11,
+ INPUT_JOYSTICK_FIRE_12,
+ INPUT_JOYSTICK_FIRE_13,
+ INPUT_JOYSTICK_FIRE_14,
+ INPUT_JOYSTICK_FIRE_15,
} input_key;
Modified: vendor/fuse-emulator/current/fuse/keysyms.pl
===================================================================
--- vendor/fuse-emulator/current/fuse/keysyms.pl 2013-04-11 13:17:03 UTC (rev 738)
+++ vendor/fuse-emulator/current/fuse/keysyms.pl 2013-04-20 07:01:40 UTC (rev 739)
@@ -4,7 +4,7 @@
# Copyright (c) 2000-2007 Philip Kendall, Matan Ziv-Av, Russell Marks,
# Fredrick Meunier, Catalin Mihaila, Stuart Brady
-# $Id: keysyms.pl 4723 2012-07-08 13:26:15Z fredm $
+# $Id: keysyms.pl 4882 2013-02-15 23:47:37Z sbaldovi $
# 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
@@ -104,7 +104,7 @@
my $keysym = shift;
- # http://msdn2.microsoft.com/en-us/library/ms645540.aspx
+ # http://msdn.microsoft.com/en-us/library/dd375731(VS.85).aspx
$keysym =~ tr/a-z/A-Z/;
Modified: vendor/fuse-emulator/current/fuse/lib/compressed/tape_se.szx
===================================================================
(Binary files differ)
Modified: vendor/fuse-emulator/current/fuse/lib/uncompressed/tape_se.szx
===================================================================
(Binary files differ)
Modified: vendor/fuse-emulator/current/fuse/machines/spec_se.c
===================================================================
--- vendor/fuse-emulator/current/fuse/machines/spec_se.c 2013-04-11 13:17:03 UTC (rev 738)
+++ vendor/fuse-emulator/current/fuse/machines/spec_se.c 2013-04-20 07:01:40 UTC (rev 739)
@@ -1,7 +1,7 @@
/* spec_se.c: ZX Spectrum SE specific routines
Copyright (c) 1999-2011 Fredrick Meunier, Philip Kendall, Darren Salt
- $Id: spec_se.c 4724 2012-07-08 13:38:21Z fredm $
+ $Id: spec_se.c 4862 2013-01-27 11:00:36Z 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
@@ -46,7 +46,7 @@
#include "tc2068.h"
#include "ui/ui.h"
-static int dock_exrom_reset( void );
+static void dock_exrom_reset( void );
static int spec_se_reset( void );
static int spec_se_memory_map( void );
@@ -73,13 +73,11 @@
return 0;
}
-static int
+static void
dock_exrom_reset( void )
{
/* The dock is always active on the SE */
dck_active = 1;
-
- return 0;
}
int
@@ -88,7 +86,7 @@
int error;
size_t i, j;
- error = dock_exrom_reset(); if( error ) return error;
+ dock_exrom_reset();
error = machine_load_rom( 0, settings_current.rom_spec_se_0,
settings_default.rom_spec_se_0, 0x4000 );
@@ -128,10 +126,9 @@
periph_set_present( PERIPH_TYPE_SCLD, PERIPH_PRESENT_ALWAYS );
/* ZX Printer available */
- periph_set_present( PERIPH_TYPE_ZXPRINTER_FULL_DECODE, PERIPH_PRESENT_OPTIONAL );
+ periph_set_present( PERIPH_TYPE_ZXPRINTER_FULL_DECODE,
+ PERIPH_PRESENT_OPTIONAL );
- periph_update();
-
for( i = 0; i < 8; i++ ) {
libspectrum_byte *dock_ram = memory_pool_allocate( 0x2000 );
@@ -145,12 +142,16 @@
timex_dock[page_num].offset = j * MEMORY_PAGE_SIZE;
timex_dock[page_num].page_num = i;
timex_dock[page_num].contended = 0;
+ timex_dock[page_num].writable = 1;
+ timex_dock[page_num].save_to_snapshot = 1;
timex_dock[page_num].source = memory_source_dock;
timex_exrom[page_num].page = exrom_ram + j * MEMORY_PAGE_SIZE;
timex_exrom[page_num].offset = j * MEMORY_PAGE_SIZE;
timex_exrom[page_num].page_num = i;
timex_exrom[page_num].contended = 0;
+ timex_exrom[page_num].writable = 1;
+ timex_exrom[page_num].save_to_snapshot = 1;
timex_exrom[page_num].source = memory_source_exrom;
}
}
@@ -171,6 +172,10 @@
memory_current_screen = 5;
memory_screen_mask = 0xdfff;
+ /* Make sure SCLD and friends are enabled, calls memory_map() as a side
+ effect so we need memory related variables etc. to be initialised */
+ periph_update();
+
scld_dec_write( 0x00ff, 0x80 );
scld_dec_write( 0x00ff, 0x00 );
scld_hsr_write( 0x00f4, 0x00 );
Modified: vendor/fuse-emulator/current/fuse/man/fuse.1
===================================================================
--- vendor/fuse-emulator/current/fuse/man/fuse.1 2013-04-11 13:17:03 UTC (rev 738)
+++ vendor/fuse-emulator/current/fuse/man/fuse.1 2013-04-20 07:01:40 UTC (rev 739)
@@ -23,50 +23,48 @@
.\" E-mail: phi...@sh...
.\"
.\"
-.TH fuse 1 "16th December, 2010" "Version 1.0.0" "Emulators"
+.TH fuse 1 "??th ????, 201?" "Version 1.1.0" "Emulators"
.\"
.\"------------------------------------------------------------------
.\"
.SH NAME
-fuse \- Sinclair ZX Spectrum emulator
+fuse \(em Sinclair ZX Spectrum emulator
.\"
.\"------------------------------------------------------------------
.\"
.SH SYNOPSIS
.\" the trend for long-option-using programs is to give a largely
.\" generic synopsis, so...
-.PD 0
.B fuse
.RI [ options ]
.P
-.PD 1
.\"
.\"------------------------------------------------------------------
.\"
.SH DESCRIPTION
-Fuse is a Sinclair ZX Spectrum emulator. It supports several models
+Fuse is a Sinclair ZX\ Spectrum emulator. It supports several models
(including the 128), with quite faithful emulation of the display and
sound.
.PP
The emulator can load any of the formats supported by
.IR libspectrum (3)
-\- this includes Z80, SNA and SZX snapshots, and TAP and TZX
+\(em this includes Z80, SNA and SZX snapshots, and PZX, TAP and TZX
virtual-tape files. Saving to SZX, Z80 and SNA snapshots and TZX and
TAP tape files is supported. The SLT extension to the Z80 format is
partly supported (enough for multi-load games); however, loading of
-the old DAT-file variant is not. DSK, UDI, FDI, TR0, SDF, MGT, IMG,
+the old DAT-file variant is not. DSK, UDI, FDI, TR0, SDF, MGT, IMG,
SAD, TRD, SCL and OPD disk images are supported when a disk interface
-is being emulated, including the integrated disk drives on +3,
+is being emulated, including the integrated disk drives on +3,
Pentagon or Scorpion machines as well as the +D, DISCiPLE,
-Opus Discovery and Beta 128 interfaces. DCK cartridge images are
-supported when emulating a Timex 2068 variant. Interface II ROM
+Opus Discovery and Beta\ 128 interfaces. DCK cartridge images are
+supported when emulating a Timex\ 2068 variant. Interface\ 2 ROM
cartridges are also supported.
.PP
Finally, there is also support for reading and writing the RZX input recording
format.
.PP
See the
-.B COMPRESSED FILES
+.B "COMPRESSED FILES"
section for details on reading files compressed with
.IR bzip2 "(3)"
or
@@ -82,18 +80,18 @@
.\" the options list is in alphabetical order by long option name (or
.\" short option name if none).
.\"
-.I \-\-accelerate\-loader
+.B \-\-accelerate\-loader
.RS
-Specify whether Fuse should attempt to accelerate tape loaders ...
[truncated message content] |
|
From: <fr...@us...> - 2013-04-11 13:17:06
|
Revision: 738
http://sourceforge.net/p/fuse-for-macosx/code/738
Author: fredm
Date: 2013-04-11 13:17:03 +0000 (Thu, 11 Apr 2013)
Log Message:
-----------
Add documentation of External sound interfaces, add mode hyperlinks (thanks,
Paul van der Laan).
Modified Paths:
--------------
trunk/fuse/fusepb/resources/Fuse Help/html/disciple.html
trunk/fuse/fusepb/resources/Fuse Help/html/mappings.html
trunk/fuse/fusepb/resources/Fuse Help/html/menus.html
trunk/fuse/fusepb/resources/Fuse Help/html/opus.html
trunk/fuse/fusepb/resources/Fuse Help/html/peripherals.html
trunk/fuse/fusepb/resources/Fuse Help/html/plusd.html
trunk/fuse/fusepb/resources/Fuse Help/html/trdos.html
Modified: trunk/fuse/fusepb/resources/Fuse Help/html/disciple.html
===================================================================
--- trunk/fuse/fusepb/resources/Fuse Help/html/disciple.html 2013-04-11 12:08:41 UTC (rev 737)
+++ trunk/fuse/fusepb/resources/Fuse Help/html/disciple.html 2013-04-11 13:17:03 UTC (rev 738)
@@ -1,57 +1,81 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
-<head>
- <meta http-equiv="content-type"
- content="text/html; charset=ISO-8859-1">
-<!-- AppleSegStart="DISCiPLE Emulation" -->
- <title>DISCiPLE Emulation</title>
-</head>
-<body>
-<font face="Lucida Grande,Helvetica,Arial"><a name="+D EMULATION"></a><!-- AppleSegDescription="This section describes the +D interface emulation in Fuse." --></font>
-<div class="refsect1" xml:lang="en" lang="en">
-<h2><font face="Lucida Grande,Helvetica,Arial">DISCiPLE Emulation</font></h2>
-</div>
-<p>
-<font face="Lucida Grande,Helvetica,Arial">Fuse supports emulating the
-DISCiPLE disk and printer interface, although it does not currently
-support emulation of the Sinclair Network, or support emulation of a
-DISCiPLE attached to a 128K machine. See the <font
- face="Lucida Grande,Helvetica,Arial"><span class="emphasis"><em>DISK
-FILE FORMATS</em></span></font>
-section for more details on supported disk file formats, which are the
-same as for +D emulation.</font><font
- face="Lucida Grande,Helvetica,Arial"> The DISCiPLE's printer port is
-emulated. (See the
-</font><font face="Lucida Grande,Helvetica,Arial"><span class="emphasis"><em>PRINTER
-EMULATION</em></span></font><font face="Lucida Grande,Helvetica,Arial">
-section for more details.) The DISCiPLE may only be used with 48K
-emulation at present. To access disks, you will first need to
-load GDOS, by inserting a disk containing the DOS file (SYS) and
-entering "RUN". Once DOS is
-loaded, you can load to/from DISCiPLE disks by prefixing filenames with
-<span style="font-style: italic;">`d n</span>' where <span
- style="font-style: italic;">` n '</span> is the number of the drive in
-use. For example, `LOAD d1;"myfile"' would load the file named
-`myfile' from the emulated drive 1. Microdrive syntax may also be used.</font></p>
-<p><font face="Lucida Grande,Helvetica,Arial">To save a snapshot,
-choose the `Machine, NMI' menu option, and then
-press `4' to save a 48K snapshot, or `5' to save a 128K snapshot.</font></p>
-<p><font face="Lucida Grande,Helvetica,Arial">When saving a 128K
-snapshot, you must then press Y or N to indicate
-whether the screen changed while saving the snapshot, to finish
-saving. You can also choose `3' to save a screenshot to disk.</font></p>
-<p><font face="Lucida Grande,Helvetica,Arial">Options `1' and `2' allow
-screenshots to be printed (in monochrome) if
-printer emulation is enabled.<br>
-</font></p>
-<p><font face="Lucida Grande,Helvetica,Arial">Note that GDOS on the
-DISCiPLE contains a bug which causes corruption in any saved snapshots,
-and incorrect restoration of saved snapshots, even if saved on a
-+D. This bug is not present in G+DOS on the +D. (Note: this
-was caused by saving/restoring the AF register twice in the NMI
-handler, where both AF and the AF' shadow register should have been
-saved/restored.)<br>
-</font></p>
-<!-- AppleSegEnd -->
-</body>
+ <head>
+ <meta http-equiv="content-type" content="text/html;
+ charset=ISO-8859-1">
+ <!-- AppleSegStart="DISCiPLE Emulation" -->
+ <title>DISCiPLE Emulation</title>
+ </head>
+ <body>
+ <font face="Lucida Grande,Helvetica,Arial"><a name="+D EMULATION"></a><!-- AppleSegDescription="This section describes the +D interface emulation in Fuse." --></font>
+ <div class="refsect1" xml:lang="en" lang="en">
+ <h2><font face="Lucida Grande,Helvetica,Arial">DISCiPLE Emulation</font></h2>
+ </div>
+ <p>
+ <font face="Lucida Grande,Helvetica,Arial">Fuse supports emulating
+ the
+ DISCiPLE disk and printer interface, although it does not
+ currently
+ support emulation of the Sinclair Network, or support emulation
+ of a
+ DISCiPLE attached to a 128K machine. See the <font face="Lucida
+ Grande,Helvetica,Arial"><span class="emphasis"><em></em></span></font></font><font
+ face="Lucida Grande,Helvetica,Arial"><font face="Lucida
+ Grande,Helvetica,Arial"><span class="emphasis"><em><font
+ face="Lucida Grande,Helvetica,Arial"><font face="Lucida
+ Grande,Helvetica,Arial"><span class="emphasis"><em><font
+ face="Lucida Grande,Helvetica,Arial"><a
+ href="formats.html">Disk File Formats</a></font></em></span></font></font></em></span></font>
+ section for more details on supported disk file formats, which
+ are the
+ same as for +D emulation.</font><font face="Lucida
+ Grande,Helvetica,Arial"> The DISCiPLE's printer port is
+ emulated. (See the </font><font face="Lucida
+ Grande,Helvetica,Arial"><span class="emphasis"><em></em></span></font><font
+ face="Lucida Grande,Helvetica,Arial"><span class="emphasis"><em><font
+ face="Lucida Grande,Helvetica,Arial"><a
+ href="printer.html">Printer Emulation</a></font></em></span></font><font
+ face="Lucida Grande,Helvetica,Arial">
+ section for more details.) The DISCiPLE may only be used with
+ 48K
+ emulation at present. To access disks, you will first need
+ to
+ load GDOS, by inserting a disk containing the DOS file (SYS) and
+ entering "RUN". Once DOS is
+ loaded, you can load to/from DISCiPLE disks by prefixing
+ filenames with
+ <span style="font-style: italic;">`d n</span>' where <span
+ style="font-style: italic;">` n '</span> is the number of the
+ drive in
+ use. For example, `LOAD d1;"myfile"' would load the file
+ named
+ `myfile' from the emulated drive 1. Microdrive syntax may also
+ be used.</font></p>
+ <p><font face="Lucida Grande,Helvetica,Arial">To save a snapshot,
+ choose the `Machine, NMI' menu option, and then
+ press `4' to save a 48K snapshot, or `5' to save a 128K
+ snapshot.</font></p>
+ <p><font face="Lucida Grande,Helvetica,Arial">When saving a 128K
+ snapshot, you must then press Y or N to indicate
+ whether the screen changed while saving the snapshot, to finish
+ saving. You can also choose `3' to save a screenshot to
+ disk.</font></p>
+ <p><font face="Lucida Grande,Helvetica,Arial">Options `1' and `2'
+ allow
+ screenshots to be printed (in monochrome) if
+ printer emulation is enabled.<br>
+ </font></p>
+ <p><font face="Lucida Grande,Helvetica,Arial">Note that GDOS on the
+ DISCiPLE contains a bug which causes corruption in any saved
+ snapshots,
+ and incorrect restoration of saved snapshots, even if saved on a
+ +D. This bug is not present in G+DOS on the +D.
+ (Note: this
+ was caused by saving/restoring the AF register twice in the NMI
+ handler, where both AF and the AF' shadow register should have
+ been
+ saved/restored.)<br>
+ </font></p>
+ <!-- AppleSegEnd -->
+ </body>
</html>
Modified: trunk/fuse/fusepb/resources/Fuse Help/html/mappings.html
===================================================================
--- trunk/fuse/fusepb/resources/Fuse Help/html/mappings.html 2013-04-11 12:08:41 UTC (rev 737)
+++ trunk/fuse/fusepb/resources/Fuse Help/html/mappings.html 2013-04-11 13:17:03 UTC (rev 738)
@@ -1,77 +1,89 @@
-<head>
-<!-- AppleSegStart="Key Mappings" -->
- <title>Key Mappings</title>
-</head>
-<font face="Lucida Grande,Helvetica,Arial"><a name=
-"Key Mappings"></a><!-- AppleSegDescription="This section describes the key mappings for the emulated computer." --></font>
-<div class="refsect1" xml:lang="en" lang="en">
-<h2><font face="Lucida Grande,Helvetica,Arial">Key
-Mappings</font></h2>
-</div>
-<p><font face="Lucida Grande,Helvetica,Arial">When emulating the
-Spectrum, the alphanumeric keys (along with <span class=
-"emphasis"><em>Enter</em></span> and <span class=
-"emphasis"><em>Space</em></span>) are mapped as-is to the Spectrum
-keys. The other key mappings are:</font></p>
-<div class="variablelist">
-<dl>
-<dt><span class="emphasis"><font face=
-"Lucida Grande,Helvetica,Arial"><em>Shift</em></font></span></dt>
-<dd>
-<p><font face="Lucida Grande,Helvetica,Arial">emulated as Caps
-Shift</font></p>
-</dd>
-<dt><span class="term"><font face=
-"Lucida Grande,Helvetica,Arial"><em>Control</em>, and <span class=
-"emphasis"><em>Option</em></span></font></span></dt>
-<dd>
-<p><font face="Lucida Grande,Helvetica,Arial">emulated as Symbol
-Shift</font></p>
-</dd>
-<dt><span class="term"><font face=
-"Lucida Grande,Helvetica,Arial"><em>Delete</em></font></span></dt>
-<dd>
-<p><font face="Lucida Grande,Helvetica,Arial">emulated as Caps-0
-(Delete)</font></p>
-</dd>
-<dt><span class="term"><font face=
-"Lucida Grande,Helvetica,Arial"><em>Esc</em></font></span></dt>
-<dd>
-<p><font face="Lucida Grande,Helvetica,Arial">emulated as Caps-1
-(Edit)</font></p>
-</dd>
-<dt><span class="term"><font face=
-"Lucida Grande,Helvetica,Arial"><em>Caps
-Lock</em></font></span></dt>
-<dd>
-<p><font face="Lucida Grande,Helvetica,Arial">emulated as
-Caps-2</font></p>
-</dd>
-<dt><span class="term"><font face=
-"Lucida Grande,Helvetica,Arial"><em>Cursor
-keys</em></font></span></dt>
-<dd>
-<p><font face="Lucida Grande,Helvetica,Arial">emulated as
-Caps-5/6/7/8 (as appropriate)</font></p>
-</dd>
-<dt><span class="term"><font face=
-"Lucida Grande,Helvetica,Arial"><em>Tab</em></font></span></dt>
-<dd>
-<p><font face="Lucida Grande,Helvetica,Arial">emulated as emulated
-as Caps Shift-Symbol Shift (Extended Mode)</font></p>
-</dd>
-</dl>
-</div>
-<p><font face="Lucida Grande,Helvetica,Arial">Some further
-punctuation keys are supported, if they exist on your keyboard -
-'<span class="emphasis"><em>,</em></span>', '<span class=
-"emphasis"><em><tt class="literal">.</tt></em></span>',
-'<span class="emphasis"><em>/</em></span>', '<span class=
-"emphasis"><em>;</em></span>', '<span class=
-"emphasis"><em>'</em></span>', '<span class=
-"emphasis"><em>#</em></span>', '<span class=
-"emphasis"><em>-</em></span>', '_', '+', ';', ':', ''', '"',
-'<', '>' and '<span class="emphasis"><em>=</em></span>'.
-These are mapped to the appropriate symbol-shifted keys on the
-Spectrum.</font></p>
-<!-- AppleSegEnd -->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+ <head>
+
+ <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
+ <!-- AppleSegStart="Key Mappings" -->
+ <title>Key Mappings</title>
+ </head>
+ <body>
+ <font face="Lucida Grande,Helvetica,Arial"><a name="Key Mappings"></a><!-- AppleSegDescription="This section describes the key mappings for the emulated computer." --></font>
+ <div class="refsect1" xml:lang="en" lang="en">
+ <h2><font face="Lucida Grande,Helvetica,Arial">Key
+ Mappings</font></h2>
+ </div>
+ <p><font face="Lucida Grande,Helvetica,Arial">When emulating the
+ Spectrum, the alphanumeric keys (along with <span
+ class="emphasis"><em>Enter</em></span> and <span
+ class="emphasis"><em>Space</em></span>) are mapped as-is to
+ the Spectrum
+ keys. The other key mappings are:</font></p>
+ <div class="variablelist">
+ <dl>
+ <dt><span class="emphasis"><font face="Lucida
+ Grande,Helvetica,Arial"><em>Shift</em></font></span></dt>
+ <dd>
+ <p><font face="Lucida Grande,Helvetica,Arial">emulated as Caps
+ Shift</font></p>
+ </dd>
+ <dt><span class="term"><font face="Lucida
+ Grande,Helvetica,Arial"><em><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>⌘</em></font></span></em>,
+ and <span class="emphasis"><em>Option</em></span></font></span></dt>
+ <dd>
+ <p><font face="Lucida Grande,Helvetica,Arial">emulated as
+ Symbol
+ Shift</font></p>
+ </dd>
+ <dt><span class="term"><font face="Lucida
+ Grande,Helvetica,Arial"><em>Delete</em></font></span></dt>
+ <dd>
+ <p><font face="Lucida Grande,Helvetica,Arial">emulated as
+ Caps-0
+ (Delete)</font></p>
+ </dd>
+ <dt><span class="term"><font face="Lucida
+ Grande,Helvetica,Arial"><em>Esc</em></font></span></dt>
+ <dd>
+ <p><font face="Lucida Grande,Helvetica,Arial">emulated as
+ Caps-1
+ (Edit)</font></p>
+ </dd>
+ <dt><span class="term"><font face="Lucida
+ Grande,Helvetica,Arial"><em>Caps
+ Lock</em></font></span></dt>
+ <dd>
+ <p><font face="Lucida Grande,Helvetica,Arial">emulated as
+ Caps-2</font></p>
+ </dd>
+ <dt><span class="term"><font face="Lucida
+ Grande,Helvetica,Arial"><em>Cursor
+ keys</em></font></span></dt>
+ <dd>
+ <p><font face="Lucida Grande,Helvetica,Arial">emulated as
+ Caps-5/6/7/8 (as appropriate)</font></p>
+ </dd>
+ <dt><span class="term"><font face="Lucida
+ Grande,Helvetica,Arial"><em>Tab</em></font></span></dt>
+ <dd>
+ <p><font face="Lucida Grande,Helvetica,Arial">emulated as
+ emulated
+ as Caps Shift-Symbol Shift (Extended Mode)</font></p>
+ </dd>
+ </dl>
+ </div>
+ <p><font face="Lucida Grande,Helvetica,Arial">Some further
+ punctuation keys are supported, if they exist on your keyboard -
+ '<span class="emphasis"><em>,</em></span>', '<span
+ class="emphasis"><em><tt class="literal">.</tt></em></span>',
+ '<span class="emphasis"><em>/</em></span>', '<span
+ class="emphasis"><em>;</em></span>', '<span class="emphasis"><em>'</em></span>',
+ '<span class="emphasis"><em>#</em></span>', '<span
+ class="emphasis"><em>-</em></span>', '_', '+', ';', ':', ''',
+ '"',
+ '<', '>' and '<span class="emphasis"><em>=</em></span>'.
+ These are mapped to the appropriate symbol-shifted keys on the
+ Spectrum.</font></p>
+ <!-- AppleSegEnd -->
+ </body>
+</html>
Modified: trunk/fuse/fusepb/resources/Fuse Help/html/menus.html
===================================================================
--- trunk/fuse/fusepb/resources/Fuse Help/html/menus.html 2013-04-11 12:08:41 UTC (rev 737)
+++ trunk/fuse/fusepb/resources/Fuse Help/html/menus.html 2013-04-11 13:17:03 UTC (rev 738)
@@ -248,7 +248,7 @@
</td>
<td style="vertical-align: top;"><font face="Lucida
Grande,Helvetica,Arial">Start the monitor/debugger. See
- the <span class="emphasis"><em>Monitor/Debugger</em></span>
+ the <a href="monitor.html"><span class="emphasis"><em>Monitor/Debugger</em></span></a>
section for more information.</font></td>
</tr>
<tr>
@@ -258,9 +258,9 @@
<td style="vertical-align: top;"><br>
</td>
<td style="vertical-align: top;"><font face="Lucida
- Grande,Helvetica,Arial">Start the `poke finder'. See the <span
- class="emphasis"><em>Poke Finder</em></span> section for
- more information.</font></td>
+ Grande,Helvetica,Arial">Start the `poke finder'. See the <a
+ href="pokefinder.html"><span class="emphasis"><em>Poke
+ Finder</em></span></a> section for more information.</font></td>
</tr>
<tr>
<td style="vertical-align: top;"><span class="emphasis"><font
@@ -286,17 +286,19 @@
ROM, this will cause a reset, but modified ROMs are
available which make use of this feature. When the +D (or
DISCiPLE) is emulated, this is used to access the +D (or
- DISCiPLE)'s screenshot and snapshot features (see the </font><font
- face="Lucida Grande,Helvetica,Arial"><span
- class="emphasis"><em>+D Emulation</em></span></font><font
- face="Lucida Grande,Helvetica,Arial"> and </font><font
- face="Lucida Grande,Helvetica,Arial"><span
- class="emphasis"><em>DISCiPLE Emulation</em></span></font><font
- face="Lucida Grande,Helvetica,Arial"> sections for more
- information). Note that GDOS on the DISCiPLE contains a
- bug which causes corruption of saved snapshots, and a
- failure to return from the NMI menu correctly. This
- bug is not present in G+DOS on the +D.<br>
+ DISCiPLE)'s screenshot and snapshot features (see the </font><a
+ href="plusd.html"><font face="Lucida
+ Grande,Helvetica,Arial"><span class="emphasis"><em>+D
+ Emulation</em></span></font></a><font face="Lucida
+ Grande,Helvetica,Arial"> and </font><a
+ href="disciple.html"><font face="Lucida
+ Grande,Helvetica,Arial"><span class="emphasis"><em>DISCiPLE
+ Emulation</em></span></font></a><font face="Lucida
+ Grande,Helvetica,Arial"> sections for more information).
+ Note that GDOS on the DISCiPLE contains a bug which causes
+ corruption of saved snapshots, and a failure to return
+ from the NMI menu correctly. This bug is not present
+ in G+DOS on the +D.<br>
</font></td>
</tr>
<tr>
@@ -548,9 +550,11 @@
drives. If any other machine is being emulated this menu
cannot be selected unless a disk interface like the Opus
Discovery, +D, DISCiPLE or Beta 128 is being emulated.
- (See <span class="emphasis"><em>The .DSK Format</em></span>
- and <span class="emphasis"><em>Beta Disk Formats</em></span>
- sections below for notes on the file formats supported).</font>
+ (See <a href="dsk.html"><span class="emphasis"><em>The
+ .DSK Format</em></span></a> and <a
+ href="trdos.html"><span class="emphasis"><em>Beta Disk
+ Formats</em></span></a> sections for notes on
+ the file formats supported).</font>
<p><font face="Lucida Grande,Helvetica,Arial">Note that
(since version 0.6.2), Fuse works with true virtual disk
images: any changes made to a disk image will not affect
Modified: trunk/fuse/fusepb/resources/Fuse Help/html/opus.html
===================================================================
--- trunk/fuse/fusepb/resources/Fuse Help/html/opus.html 2013-04-11 12:08:41 UTC (rev 737)
+++ trunk/fuse/fusepb/resources/Fuse Help/html/opus.html 2013-04-11 13:17:03 UTC (rev 738)
@@ -1,44 +1,60 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
-<head>
- <meta http-equiv="content-type"
- content="text/html; charset=ISO-8859-1">
-<!-- AppleSegStart="Opus Discovery Emulation" -->
- <title>Opus Discovery Emulation</title>
-</head>
-<body>
-<font face="Lucida Grande,Helvetica,Arial"><a name="+D EMULATION"></a><!-- AppleSegDescription="This section describes the +D interface emulation in Fuse." --></font>
-<div class="refsect1" xml:lang="en" lang="en">
-<h2><font face="Lucida Grande,Helvetica,Arial">Opus Discovery Emulation</font></h2>
-</div>
-<p>
-<font face="Lucida Grande,Helvetica,Arial">By default, Fuse emulates
-the Opus Discovery interface with the optional 2k RAM expansion and a
-second 40 track single sided disk drive.<br>
-</font></p>
-<p><font face="Lucida Grande,Helvetica,Arial">See the <font
- face="Lucida Grande,Helvetica,Arial"><span class="emphasis"><em>DISK
-FILE FORMATS</em></span></font>
-section for more details on supported disk file formats.</font><font
- face="Lucida Grande,Helvetica,Arial"> The Opus Discoveries' printer
-port is also emulated for output only. (See the
-</font><font face="Lucida Grande,Helvetica,Arial"><span class="emphasis"><em>PRINTER
-EMULATION</em></span></font><font face="Lucida Grande,Helvetica,Arial">
-section for more details.) The Opus Discovery may only be used with
-16K, 48K, 128K, TC2048 and +2 (not +2A) emulation.<br>
-</font></p>
-<p><font face="Lucida Grande,Helvetica,Arial">To access disks, use the
-same syntax as Interface I and Microdrives.<br>
-</font></p>
-<h3><font face="Lucida Grande,Helvetica,Arial">ROM File<br>
-</font></h3>
-<p><font face="Lucida Grande,Helvetica,Arial">The ROM file for the Opus
-</font><font face="Lucida Grande,Helvetica,Arial">Discovery is not
-freely distributable and so is not included in this package. In order
-to use the Opus Discovery emulation you will need to download a copy of
-the ROM file and use the </font><font
- face="Lucida Grande,Helvetica,Arial"><span class="emphasis"><em>Preferences,
-ROM</em></span> dialog to configure the file for use with Fuse.<br>
-</font></p>
-</body>
+ <head>
+ <meta http-equiv="content-type" content="text/html;
+ charset=ISO-8859-1">
+ <!-- AppleSegStart="Opus Discovery Emulation" -->
+ <title>Opus Discovery Emulation</title>
+ </head>
+ <body>
+ <font face="Lucida Grande,Helvetica,Arial"><a name="+D EMULATION"></a><!-- AppleSegDescription="This section describes the +D interface emulation in Fuse." --></font>
+ <div class="refsect1" xml:lang="en" lang="en">
+ <h2><font face="Lucida Grande,Helvetica,Arial">Opus Discovery
+ Emulation</font></h2>
+ </div>
+ <p>
+ <font face="Lucida Grande,Helvetica,Arial">By default, Fuse
+ emulates
+ the Opus Discovery interface with the optional 2k RAM expansion
+ and a
+ second 40 track single sided disk drive.<br>
+ </font></p>
+ <p><font face="Lucida Grande,Helvetica,Arial">See the </font><font
+ face="Lucida Grande,Helvetica,Arial"><font face="Lucida
+ Grande,Helvetica,Arial"><font face="Lucida
+ Grande,Helvetica,Arial"><span class="emphasis"><em><font
+ face="Lucida Grande,Helvetica,Arial"><a
+ href="formats.html">Disk File Formats</a></font></em></span></font></font>
+ section for more details on supported disk file formats.</font><font
+ face="Lucida Grande,Helvetica,Arial"> The Opus Discoveries'
+ printer
+ port is also emulated for output only. (See the </font><font
+ face="Lucida Grande,Helvetica,Arial"><span class="emphasis"><em></em></span></font><font
+ face="Lucida Grande,Helvetica,Arial"><span class="emphasis"><em><font
+ face="Lucida Grande,Helvetica,Arial"><a
+ href="printer.html">Printer Emulation</a></font></em></span></font><font
+ face="Lucida Grande,Helvetica,Arial">
+ section for more details.) The Opus Discovery may only be used
+ with
+ 16K, 48K, 128K, TC2048 and +2 (not +2A) emulation.<br>
+ </font></p>
+ <p><font face="Lucida Grande,Helvetica,Arial">To access disks, use
+ the
+ same syntax as the Interface I and Microdrives.<br>
+ </font></p>
+ <h3><font face="Lucida Grande,Helvetica,Arial">ROM File<br>
+ </font></h3>
+ <p><font face="Lucida Grande,Helvetica,Arial">The ROM file for the
+ Opus
+ </font><font face="Lucida Grande,Helvetica,Arial">Discovery is not
+ freely distributable and so is not included in this package. In
+ order
+ to use the Opus Discovery emulation you will need to download a
+ copy of
+ the ROM file and use the </font><font face="Lucida
+ Grande,Helvetica,Arial"><span class="emphasis"><em>Preferences,
+ ROM</em></span> dialog to configure the file for use with
+ Fuse.<br>
+ </font></p>
+ </body>
</html>
Modified: trunk/fuse/fusepb/resources/Fuse Help/html/peripherals.html
===================================================================
--- trunk/fuse/fusepb/resources/Fuse Help/html/peripherals.html 2013-04-11 12:08:41 UTC (rev 737)
+++ trunk/fuse/fusepb/resources/Fuse Help/html/peripherals.html 2013-04-11 13:17:03 UTC (rev 738)
@@ -41,7 +41,7 @@
<td style="vertical-align: top;"><font face="Lucida
Grande,Helvetica,Arial">If this option is selected, Fuse
will emulate the Sinclair Interface I, and allow
- microdrive cartriges to be inserted and removed via the <span
+ microdrive cartridges to be inserted and removed via the <span
class="emphasis"><em>Media > Microdrive</em></span>
menus.</font></td>
</tr>
@@ -146,6 +146,8 @@
ethernet interface for the Spectrum. See the <a
href="spectranet.html"><span class="emphasis"><em>Spectranet
+
+
Emulation</em></span></a> section for more details.</font></td>
</tr>
</tbody>
@@ -295,6 +297,8 @@
face="Lucida Grande,Helvetica,Arial"><a
href="spectranet.html"><span class="emphasis"><em>Spectranet
+
+
Emulation</em></span></a></font><font face="Lucida
Grande,Helvetica,Arial"><a href="spectranet.html"><span
class="emphasis"><em></em></span></a></font><font
@@ -320,9 +324,8 @@
<td style="vertical-align: top;"><font face="Lucida
Grande,Helvetica,Arial">This option controls the number of
blocks in a new microdrive cartridge. If the value smaller
- than 4 or greater than 254 Fuse assumes 4 or 254. See the
- <span class="emphasis"><em>Interface I</em></span> section
- for more details.</font></td>
+ than 4 or greater than 254 Fuse assumes 4 or 254.<br>
+ </font></td>
</tr>
</tbody>
</table>
@@ -357,7 +360,7 @@
face="Lucida Grande,Helvetica,Arial"><em>Graphic Output
File</em></font></span> </td>
<td style="vertical-align: top;"><font face="Lucida
- Grande,Helvetica,Arial">Specify the filename and location
+ Grande,Helvetica,Arial">Specify the file name and location
for the printer graphics output file.</font></td>
</tr>
<tr>
@@ -365,11 +368,66 @@
face="Lucida Grande,Helvetica,Arial"><em>Text Output
File</em></font></span></td>
<td style="vertical-align: top;"><font face="Lucida
- Grande,Helvetica,Arial">Specify the filename and location
+ Grande,Helvetica,Arial">Specify the file name and location
for the printer text output file</font></td>
</tr>
</tbody>
</table>
+ <h3><font face="Lucida Grande,Helvetica,Arial">External sound
+ interface options</font></h3>
+ <table style="text-align: left; width: 100%;" cellpadding="2"
+ cellspacing="2">
+ <tbody>
+ <tr>
+ <th style="vertical-align: top;"><font style="font-weight:
+ bold;" face="Lucida Grande,Helvetica,Arial">OPTION</font><br>
+ </th>
+ <th style="vertical-align: top;"><font style="font-weight:
+ bold;" face="Lucida Grande,Helvetica,Arial">DESCRIPTION</font><br>
+ </th>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>None</em></font></span></td>
+ <td style="vertical-align: top;"><font face="Lucida
+ Grande,Helvetica,Arial">If this option is selected, Fuse
+ will not emulate any external sound interface.</font></td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>Fuller</em></font></span></td>
+ <td style="vertical-align: top;"><font face="Lucida
+ Grande,Helvetica,Arial">If this option is selected, Fuse
+ will emulate a Fuller Box AY sound and joystick interface.
+ This emulation is only available for the 16k, 48k and
+ TC2048 machines.</font></td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>Melodik</em></font></span></td>
+ <td style="vertical-align: top;"><font face="Lucida
+ Grande,Helvetica,Arial">If this option is selected, Fuse
+ will emulate a Melodik AY sound interface. These
+ interfaces and many similar ones were produced to make the
+ 48K Spectrum compatible with the same AY music as the 128K
+ Spectrum. This emulation is only available
+ for the 16k, 48k and TC2048
+ machines.</font></td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;"><span class="emphasis"><font
+ face="Lucida Grande,Helvetica,Arial"><em>SpecDrum</em></font></span></td>
+ <td style="vertical-align: top;"><font face="Lucida
+ Grande,Helvetica,Arial">If this option is selected, Fuse
+ will emulate a Cheetah SpecDrum sound interface. See
+ the <a
+ href="http://www.worldofspectrum.org/infoseekid.cgi?id=1000062">World
+ of Spectrum Infoseek web page</a> for manuals, software
+ and more. This emulation is only available for<br>
+ the 48k, 128k and TC2048 machines.</font></td>
+ </tr>
+ </tbody>
+ </table>
<span class="emphasis"><font face="Lucida Grande,Helvetica,Arial"><br>
</font></span>
<p><span class="emphasis"><font face="Lucida Grande,Helvetica,Arial"><em></em></font></span><!-- AppleSegEnd --></p>
Modified: trunk/fuse/fusepb/resources/Fuse Help/html/plusd.html
===================================================================
--- trunk/fuse/fusepb/resources/Fuse Help/html/plusd.html 2013-04-11 12:08:41 UTC (rev 737)
+++ trunk/fuse/fusepb/resources/Fuse Help/html/plusd.html 2013-04-11 13:17:03 UTC (rev 738)
@@ -1,43 +1,60 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
-<head>
-
-<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"><!-- AppleSegStart="+D Emulation" -->
- <title>+D Emulation</title>
-</head>
-<body>
-<font face="Lucida Grande,Helvetica,Arial"><a name="+D EMULATION"></a><!-- AppleSegDescription="This section describes the +D interface emulation in Fuse." --></font>
-<div class="refsect1" xml:lang="en" lang="en">
-<h2><font face="Lucida Grande,Helvetica,Arial">+D Emulation</font></h2>
-</div>
-<p>
-<font face="Lucida Grande,Helvetica,Arial">Fuse supports emulating the
-+D disk and printer interface. See the <font
- face="Lucida Grande,Helvetica,Arial"><span class="emphasis"><em>DISK
-FILE FORMATS</em></span></font>
-section for more details on supported disk file formats.</font><font
- face="Lucida Grande,Helvetica,Arial"> The +D's printer port is
-emulated. (See the
-</font><font face="Lucida Grande,Helvetica,Arial"><span class="emphasis"><em>PRINTER
-EMULATION</em></span></font><font face="Lucida Grande,Helvetica,Arial">
-section for more details.) The +D may only be used with 48K, 128K and
-+2 (not +2A) emulation. To access disks, load G+DOS, by inserting a
-disk containing the DOS file (+SYS) and entering "RUN". Once DOS is
-loaded, you can load to/from +D disks by prefixing filenames with <span
- style="font-style: italic;">`d n</span>' where <span
- style="font-style: italic;">` n '</span> is the number of the drive in
-use. For example, `LOAD d1;"myfile"' would load the file named
-`myfile' from the emulated drive 1. Microdrive syntax may also be used.</font></p>
-<p><font face="Lucida Grande,Helvetica,Arial">To save a snapshot,
-choose the `Machine, NMI' menu option, and then
-press `4' to save a 48K snapshot, or `5' to save a 128K snapshot.</font></p>
-<p><font face="Lucida Grande,Helvetica,Arial">When saving a 128K
-snapshot, you must then press Y or N to indicate
-whether the screen changed while saving the snapshot, to finish
-saving. You can also choose `3' to save a screenshot to disk.</font></p>
-<p><font face="Lucida Grande,Helvetica,Arial">Options `1' and `2' allow
-screenshots to be printed (in monochrome) if
-printer emulation is enabled.</font></p>
-<!-- AppleSegEnd -->
-</body>
+ <head>
+ <meta http-equiv="content-type" content="text/html;
+ charset=ISO-8859-1">
+ <!-- AppleSegStart="+D Emulation" -->
+ <title>+D Emulation</title>
+ </head>
+ <body>
+ <font face="Lucida Grande,Helvetica,Arial"><a name="+D EMULATION"></a><!-- AppleSegDescription="This section describes the +D interface emulation in Fuse." --></font>
+ <div class="refsect1" xml:lang="en" lang="en">
+ <h2><font face="Lucida Grande,Helvetica,Arial">+D Emulation</font></h2>
+ </div>
+ <p>
+ <font face="Lucida Grande,Helvetica,Arial">Fuse supports emulating
+ the
+ +D disk and printer interface. See the <font face="Lucida
+ Grande,Helvetica,Arial"><span class="emphasis"><em></em></span></font></font><font
+ face="Lucida Grande,Helvetica,Arial"><font face="Lucida
+ Grande,Helvetica,Arial"><span class="emphasis"><em><font
+ face="Lucida Grande,Helvetica,Arial"><a
+ href="formats.html">Disk File Formats</a></font></em></span></font>
+ section for more details on supported disk file formats.</font><font
+ face="Lucida Grande,Helvetica,Arial"> The +D's printer port is
+ emulated. (See the </font><font face="Lucida
+ Grande,Helvetica,Arial"><span class="emphasis"><em></em></span></font><font
+ face="Lucida Grande,Helvetica,Arial"><span class="emphasis"><em><font
+ face="Lucida Grande,Helvetica,Arial"><a
+ href="printer.html">Printer Emulation</a></font></em></span></font><font
+ face="Lucida Grande,Helvetica,Arial">
+ section for more details.) The +D may only be used with 48K,
+ 128K and
+ +2 (not +2A) emulation. To access disks, load G+DOS, by
+ inserting a
+ disk containing the DOS file (+SYS) and entering "RUN". Once DOS
+ is
+ loaded, you can load to/from +D disks by prefixing file names
+ with <span style="font-style: italic;">`d n</span>' where <span
+ style="font-style: italic;">` n '</span> is the number of the
+ drive in
+ use. For example, `LOAD d1;"myfile"' would load the file
+ named
+ `myfile' from the emulated drive 1. Microdrive syntax may also
+ be used.</font></p>
+ <p><font face="Lucida Grande,Helvetica,Arial">To save a snapshot,
+ choose the `Machine, NMI' menu option, and then
+ press `4' to save a 48K snapshot, or `5' to save a 128K
+ snapshot.</font></p>
+ <p><font face="Lucida Grande,Helvetica,Arial">When saving a 128K
+ snapshot, you must then press Y or N to indicate
+ whether the screen changed while saving the snapshot, to finish
+ saving. You can also choose `3' to save a screenshot to
+ disk.</font></p>
+ <p><font face="Lucida Grande,Helvetica,Arial">Options `1' and `2'
+ allow
+ screenshots to be printed (in monochrome) if
+ printer emulation is enabled.</font></p>
+ <!-- AppleSegEnd -->
+ </body>
</html>
Modified: trunk/fuse/fusepb/resources/Fuse Help/html/trdos.html
===================================================================
--- trunk/fuse/fusepb/resources/Fuse Help/html/trdos.html 2013-04-11 12:08:41 UTC (rev 737)
+++ trunk/fuse/fusepb/resources/Fuse Help/html/trdos.html 2013-04-11 13:17:03 UTC (rev 738)
@@ -1,33 +1,38 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
-<head>
- <meta http-equiv="content-type"
- content="text/html; charset=ISO-8859-1">
-<!-- AppleSegStart="Beta 128 Emulation" -->
- <title>Beta 128 Emulation</title>
-</head>
-<body>
-<font face="Lucida Grande,Helvetica,Arial"><a name="Beta 128 Emulation"></a><!-- AppleSegDescription="This section describes the TR-DOS disk formats supported by Fuse." --></font>
-<div class="refsect1" xml:lang="en" lang="en">
-<h2><font face="Lucida Grande,Helvetica,Arial">Beta 128 Emulation</font></h2>
-</div>
-<p>
-<font face="Lucida Grande,Helvetica,Arial">Fuse supports Betadisk
-emulation in its Pentagon and Scorpion emulation, and also under 128K
-and
-+2 (but not +2A) emulation if the </font><font
- face="Lucida Grande,Helvetica,Arial"><span class="emphasis"><em>Beta
-128 interface option</em></span></font><font
- face="Lucida Grande,Helvetica,Arial"> from the </font><font
- face="Lucida Grande,Helvetica,Arial"><span class="emphasis"><em>Preferences,
-Peripherals...</em></span></font><font
- face="Lucida Grande,Helvetica,Arial"> dialog is enabled.<br>
-</font></p>
-<p><font face="Lucida Grande,Helvetica,Arial">See the <font
- face="Lucida Grande,Helvetica,Arial"><span class="emphasis"><em>DISK
-FILE FORMATS</em></span></font>
-section for more details on supported disk file formats.<br>
-</font></p>
-<!-- AppleSegEnd -->
-</body>
+ <head>
+ <meta http-equiv="content-type" content="text/html;
+ charset=ISO-8859-1">
+ <!-- AppleSegStart="Beta 128 Emulation" -->
+ <title>Beta 128 Emulation</title>
+ </head>
+ <body>
+ <font face="Lucida Grande,Helvetica,Arial"><a name="Beta 128
+ Emulation"></a><!-- AppleSegDescription="This section describes the TR-DOS disk formats supported by Fuse." --></font>
+ <div class="refsect1" xml:lang="en" lang="en">
+ <h2><font face="Lucida Grande,Helvetica,Arial">Beta 128 Emulation</font></h2>
+ </div>
+ <p>
+ <font face="Lucida Grande,Helvetica,Arial">Fuse supports Betadisk
+ emulation in its Pentagon and Scorpion emulation, and also under
+ 128K
+ and
+ +2 (but not +2A) emulation if the </font><font face="Lucida
+ Grande,Helvetica,Arial"><span class="emphasis"><em>Beta
+ 128 interface option</em></span></font><font face="Lucida
+ Grande,Helvetica,Arial"> from the </font><font face="Lucida
+ Grande,Helvetica,Arial"><span class="emphasis"><em>Preferences,
+ Peripherals...</em></span></font><font face="Lucida
+ Grande,Helvetica,Arial"> dialog is enabled.<br>
+ </font></p>
+ <p><font face="Lucida Grande,Helvetica,Arial">See the <font
+ face="Lucida Grande,Helvetica,Arial"><span class="emphasis"><em></em></span></font></font><font
+ face="Lucida Grande,Helvetica,Arial"><font face="Lucida
+ Grande,Helvetica,Arial"><span class="emphasis"><em><font
+ face="Lucida Grande,Helvetica,Arial"><a
+ href="formats.html">Disk File Formats</a></font></em></span></font>
+ section for more details on supported disk file formats.<br>
+ </font></p>
+ <!-- AppleSegEnd -->
+ </body>
</html>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
