[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx:[747] trunk/fuse
Brought to you by:
fredm
Menu
▾
▴
[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx:[747] trunk/fuse
|
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.
|
