+++ /dev/null
-# ChangeLog for media-plugins/xmms-nsf
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-nsf/ChangeLog,v 1.17 2006/09/03 23:03:36 tsunam Exp $
-
- 03 Sep 2006; Joshua Jackson <tsunam@gentoo.org> xmms-nsf-0.0.3-r2.ebuild:
- stable x86; bug #144279
-
- 19 Aug 2006; Thomas Cort <tcort@gentoo.org> xmms-nsf-0.0.3-r2.ebuild:
- Stable on amd64 wrt Bug #144279.
-
-*xmms-nsf-0.0.3-r2 (12 Jun 2006)
-
- 12 Jun 2006; Luis Medinas <metalgod@gentoo.org>
- +files/xmms-nsf-0.0.3-compilefixes.patch, +xmms-nsf-0.0.3-r2.ebuild:
- Added a new patch to support compile fixes for gcc 3 and gcc4. Fixes for
- gcc4 were made by Miguel Marte <miguelmarte@gmail.com> on bug #136358.
-
-*xmms-nsf-0.0.3-r1 (09 Nov 2005)
-
- 09 Nov 2005; Luis Medinas <metalgod@gentoo.org>
- +files/xmms-nsf-0.0.3-about.patch, +xmms-nsf-0.0.3-r1.ebuild:
- Added a patch to control window to display when an nsf song is played and
- change 'Fadeout' option to 'Silence Until Next Song' thanks to
- <qube99@hotmail.com>.
-
- 09 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> xmms-nsf-0.0.3.ebuild:
- Don't install INSTALL file.
-
- 28 May 2005; Jan Brinkmann <luckyduck@gentoo.org> xmms-nsf-0.0.3.ebuild:
- gentoo sanity check failed, fixes #92700
-
- 11 Mar 2005; David Holm <dholm@gentoo.org> xmms-nsf-0.0.3.ebuild:
- Masked on ppc, sound corrupted
-
- 14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
- xmms-nsf-0.0.3.ebuild:
- Stable amd64.
-
- 06 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
- +files/xmms-nsf-0.0.3-PIC.patch:
- ~amd64. -sparc
-
- 22 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
- xmms-nsf-0.0.3.ebuild:
- Inherit eutils.
-
- 20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
- xmms-nsf-0.0.3.ebuild:
- Added IUSE.
-
- 12 Oct 2003; Martin Holzer <mholzer@gentoo.org> xmms-nsf-0.0.3.ebuild,
- files/xmms-nsf-0.0.3-gcc3.patch:
- adding gcc3 patch. Closes #30950.
-
-*xmms-nsf-0.0.3 (25 Oct 2002)
-
- 25 Oct 2002; Seemant Kulleen <seemant@gentoo.org> xmms-nsf-0.0.3.ebuild
- ChangeLog files/digest-xmms-nsf-0.0.3 :
-
- New package submitted by (and source tarball hosted by):
- Mattias Bengtsson (moonlite@linux.nu) in bug #4604. This package is a
- plugin which plays Nintendo 8-bit Sound Files.
+++ /dev/null
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX xmms-nsf-0.0.3-PIC.patch 1109 RMD160 b76f19cc27e772450d382b45d6abf2a3cbf6f4ad SHA1 a9a851e3c6b4a7bdfd2510b5b091cfb045581bf1 SHA256 0130b2049332a0b92d56d8c2a5740fa464b542a0650d0b1544e4899c060265c9
-MD5 8b5a150abf181904c2075418e276dc27 files/xmms-nsf-0.0.3-PIC.patch 1109
-RMD160 b76f19cc27e772450d382b45d6abf2a3cbf6f4ad files/xmms-nsf-0.0.3-PIC.patch 1109
-SHA256 0130b2049332a0b92d56d8c2a5740fa464b542a0650d0b1544e4899c060265c9 files/xmms-nsf-0.0.3-PIC.patch 1109
-AUX xmms-nsf-0.0.3-about.patch 6418 RMD160 4559976b6166be28cece6aef537c20e4de187ec4 SHA1 aad7c0c72b235ed3f720a4c149aa56a00c72ee88 SHA256 b6eb45ad3b33de3130d4e3c76a933cdf898666191c123e3e3917998402baa046
-MD5 5a49e69ded2a39ed299ddb5c3c7cb6df files/xmms-nsf-0.0.3-about.patch 6418
-RMD160 4559976b6166be28cece6aef537c20e4de187ec4 files/xmms-nsf-0.0.3-about.patch 6418
-SHA256 b6eb45ad3b33de3130d4e3c76a933cdf898666191c123e3e3917998402baa046 files/xmms-nsf-0.0.3-about.patch 6418
-AUX xmms-nsf-0.0.3-compilefixes.patch 19973 RMD160 f800a65c90f6afcaf3641155ab9269e03c7881fe SHA1 3862784ce2b279f20be528def7fb4d17d8efb2f1 SHA256 b82e85bd2fbe54105134f8dfce2a8f9dda3556999049a982d0f182289c41091d
-MD5 47875813ddc403ac614ed1590fc9a15c files/xmms-nsf-0.0.3-compilefixes.patch 19973
-RMD160 f800a65c90f6afcaf3641155ab9269e03c7881fe files/xmms-nsf-0.0.3-compilefixes.patch 19973
-SHA256 b82e85bd2fbe54105134f8dfce2a8f9dda3556999049a982d0f182289c41091d files/xmms-nsf-0.0.3-compilefixes.patch 19973
-AUX xmms-nsf-0.0.3-gcc3.patch 19364 RMD160 5390f0d2ab5052d174cab15748113a2289f8d353 SHA1 98a3cc32ff0c27cb6ef88d23a0c4c0006dc2c1c0 SHA256 024b6bd4d15317898bc55501e7e4b9a4d5faf2b4b89238ad0b469615a2bc41a4
-MD5 a4b5f9490c67aee61044efdc53229a3d files/xmms-nsf-0.0.3-gcc3.patch 19364
-RMD160 5390f0d2ab5052d174cab15748113a2289f8d353 files/xmms-nsf-0.0.3-gcc3.patch 19364
-SHA256 024b6bd4d15317898bc55501e7e4b9a4d5faf2b4b89238ad0b469615a2bc41a4 files/xmms-nsf-0.0.3-gcc3.patch 19364
-DIST xmms-nsf-0.0.3.tar.gz 185683 RMD160 d7d70b55a9bcf4f36014bcf396f9b1e66855a448 SHA1 004b4930f9d57792df4a8f2abb304301ed3d9d45 SHA256 43480b65b7ccd64396248404ccc54b62eb8cb21949f240a6d45d3a6cc1d352cd
-EBUILD xmms-nsf-0.0.3-r1.ebuild 963 RMD160 9cdd11ea199affe4e0ff3e75e03998f9624ff32e SHA1 61fa855fc45bd6478ac4aaa435e8d60891ad612d SHA256 9245b1a1b4b277ffbf2e1363f086a1e355fcf7d4dadc70fd59a6cbcb02d16ad3
-MD5 f444d088c63ac9914bb47613191c2724 xmms-nsf-0.0.3-r1.ebuild 963
-RMD160 9cdd11ea199affe4e0ff3e75e03998f9624ff32e xmms-nsf-0.0.3-r1.ebuild 963
-SHA256 9245b1a1b4b277ffbf2e1363f086a1e355fcf7d4dadc70fd59a6cbcb02d16ad3 xmms-nsf-0.0.3-r1.ebuild 963
-EBUILD xmms-nsf-0.0.3-r2.ebuild 967 RMD160 adff113079fffa149d14face009658704168583a SHA1 6058a0f0339d15c19575cf6aec9b60fd1fb40756 SHA256 19c6e14634e87eef1c1f3df84923d3cd74608dea47ff1b6e7ae6364fb69aefa7
-MD5 03c49a59e2ccaa339d3e60d645248c6b xmms-nsf-0.0.3-r2.ebuild 967
-RMD160 adff113079fffa149d14face009658704168583a xmms-nsf-0.0.3-r2.ebuild 967
-SHA256 19c6e14634e87eef1c1f3df84923d3cd74608dea47ff1b6e7ae6364fb69aefa7 xmms-nsf-0.0.3-r2.ebuild 967
-EBUILD xmms-nsf-0.0.3.ebuild 923 RMD160 87bd3ce16ee74f6c95b63aa64c532fb0362a3d9f SHA1 c55afd80bd8e640cf8523b6219e33842591006bf SHA256 447be3ce49c845fb82c009bbca31a6d7ab8e9d4aba2b8945282ec45082f808df
-MD5 12c7b44d3171faa9640f7012a9e4c2fd xmms-nsf-0.0.3.ebuild 923
-RMD160 87bd3ce16ee74f6c95b63aa64c532fb0362a3d9f xmms-nsf-0.0.3.ebuild 923
-SHA256 447be3ce49c845fb82c009bbca31a6d7ab8e9d4aba2b8945282ec45082f808df xmms-nsf-0.0.3.ebuild 923
-MISC ChangeLog 2255 RMD160 b819a6e7a66ef4255b2eb38eb783a40367393a32 SHA1 75f1934ad942859fcaa909d701ec1172de333769 SHA256 42fe7718e2f0122a9f73741e20e8fef2ead2882ca189aeb0d8ea35921f0d6bf1
-MD5 50235dee90f2a78c47d00c2a7860a458 ChangeLog 2255
-RMD160 b819a6e7a66ef4255b2eb38eb783a40367393a32 ChangeLog 2255
-SHA256 42fe7718e2f0122a9f73741e20e8fef2ead2882ca189aeb0d8ea35921f0d6bf1 ChangeLog 2255
-MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
-SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata.xml 158
-MD5 c5e35729649ecb8fe44a8f4f4b6772c8 files/digest-xmms-nsf-0.0.3 244
-RMD160 c4696cac501f85d0f0e055a93329739808cffb0d files/digest-xmms-nsf-0.0.3 244
-SHA256 55f8247935f463fa151e30a6acaad36177b898293b95736f069ef47bf5130286 files/digest-xmms-nsf-0.0.3 244
-MD5 c5e35729649ecb8fe44a8f4f4b6772c8 files/digest-xmms-nsf-0.0.3-r1 244
-RMD160 c4696cac501f85d0f0e055a93329739808cffb0d files/digest-xmms-nsf-0.0.3-r1 244
-SHA256 55f8247935f463fa151e30a6acaad36177b898293b95736f069ef47bf5130286 files/digest-xmms-nsf-0.0.3-r1 244
-MD5 c5e35729649ecb8fe44a8f4f4b6772c8 files/digest-xmms-nsf-0.0.3-r2 244
-RMD160 c4696cac501f85d0f0e055a93329739808cffb0d files/digest-xmms-nsf-0.0.3-r2 244
-SHA256 55f8247935f463fa151e30a6acaad36177b898293b95736f069ef47bf5130286 files/digest-xmms-nsf-0.0.3-r2 244
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFE+19Y2ZWR0Jhg/EsRAkzTAJ9Uyec1joF02bkwL/xQxFwQtw1X+wCeODrr
-mQb8E5/fGADP/+qq+aqC4e8=
-=nWvf
------END PGP SIGNATURE-----
+++ /dev/null
-MD5 45c55a17d81cd82d36d59bdb231777df xmms-nsf-0.0.3.tar.gz 185683
-RMD160 d7d70b55a9bcf4f36014bcf396f9b1e66855a448 xmms-nsf-0.0.3.tar.gz 185683
-SHA256 43480b65b7ccd64396248404ccc54b62eb8cb21949f240a6d45d3a6cc1d352cd xmms-nsf-0.0.3.tar.gz 185683
+++ /dev/null
-MD5 45c55a17d81cd82d36d59bdb231777df xmms-nsf-0.0.3.tar.gz 185683
-RMD160 d7d70b55a9bcf4f36014bcf396f9b1e66855a448 xmms-nsf-0.0.3.tar.gz 185683
-SHA256 43480b65b7ccd64396248404ccc54b62eb8cb21949f240a6d45d3a6cc1d352cd xmms-nsf-0.0.3.tar.gz 185683
+++ /dev/null
-MD5 45c55a17d81cd82d36d59bdb231777df xmms-nsf-0.0.3.tar.gz 185683
-RMD160 d7d70b55a9bcf4f36014bcf396f9b1e66855a448 xmms-nsf-0.0.3.tar.gz 185683
-SHA256 43480b65b7ccd64396248404ccc54b62eb8cb21949f240a6d45d3a6cc1d352cd xmms-nsf-0.0.3.tar.gz 185683
+++ /dev/null
-diff -Naur xmms-nsf-0.0.3.orig/src/nes/Makefile.am xmms-nsf-0.0.3/src/nes/Makefile.am
---- xmms-nsf-0.0.3.orig/src/nes/Makefile.am 2000-07-19 19:17:55.000000000 -0700
-+++ xmms-nsf-0.0.3/src/nes/Makefile.am 2004-07-06 18:00:50.388728466 -0700
-@@ -21,3 +21,5 @@
-
- EXTRA_DIST = license.txt COPYING
- INCLUDES = @XMMS_CFLAGS@
-+
-+CFLAGS = -fPIC -DPIC @CFLAGS@
-diff -Naur xmms-nsf-0.0.3.orig/src/nes/device/Makefile.am xmms-nsf-0.0.3/src/nes/device/Makefile.am
---- xmms-nsf-0.0.3.orig/src/nes/device/Makefile.am 2000-07-19 18:56:01.000000000 -0700
-+++ xmms-nsf-0.0.3/src/nes/device/Makefile.am 2004-07-06 18:00:38.662674686 -0700
-@@ -19,4 +19,4 @@
- sct_init.h \
- sct_main.h
-
--CFLAGS = -D_REENTRANT @CFLAGS@
-+CFLAGS = -fPIC -DPIC -D_REENTRANT @CFLAGS@
-diff -Naur xmms-nsf-0.0.3.orig/src/xmms/Makefile.am xmms-nsf-0.0.3/src/xmms/Makefile.am
---- xmms-nsf-0.0.3.orig/src/xmms/Makefile.am 2001-01-06 20:08:14.000000000 -0800
-+++ xmms-nsf-0.0.3/src/xmms/Makefile.am 2004-07-06 18:01:05.425232876 -0700
-@@ -22,3 +22,5 @@
-
- LIBS = @LIBS@ @XMMS_LIBS@
- INCLUDES = @XMMS_CFLAGS@ @GTK_CFLAGS@
-+
-+CFLAGS = -fPIC -DPIC @CFLAGS@
+++ /dev/null
-diff -ur xmms-nsf-0.0.3/src/nes/audiosys.c xmms-nsf-0.0.3.about/src/nes/audiosys.c
---- xmms-nsf-0.0.3/src/nes/audiosys.c 2001-01-06 23:17:57.000000000 -0500
-+++ xmms-nsf-0.0.3.about/src/nes/audiosys.c 2005-01-02 20:34:41.767192374 -0500
-@@ -8,8 +8,11 @@
-
- static NES_AUDIO_HANDLER *nah = 0;
- static NES_VOLUME_HANDLER *nvh = 0;
--void NESAudioRender(Int16 *bufp, Uint buflen)
-+Uint32 NESAudioRender(Int16 *bufp, Uint buflen)
- {
-+ Int16 x;
-+ Uint32 count = 0;
-+
- while (buflen--)
- {
- NES_AUDIO_HANDLER *ph;
-@@ -31,9 +34,17 @@
- else
- output = accum;
- output >>= 8;
-- *bufp++ = ((Int32)output) - 0x8000;
-+ x = ((Int32)output) - 0x8000;
-+ if (abs(x) < 96)
-+ count++;
-+ else
-+ count = 0;
-+
-+ *bufp++ = x;
- }
- }
-+
-+ return count;
- }
-
- void NESVolume(Uint volume)
-diff -ur xmms-nsf-0.0.3/src/nes/audiosys.h xmms-nsf-0.0.3.about/src/nes/audiosys.h
---- xmms-nsf-0.0.3/src/nes/audiosys.h 2001-01-06 23:17:56.000000000 -0500
-+++ xmms-nsf-0.0.3.about/src/nes/audiosys.h 2005-01-02 20:42:51.457112634 -0500
-@@ -21,7 +21,7 @@
- } NES_VOLUME_HANDLER;
-
-
--void NESAudioRender(Int16 *bufp, Uint buflen);
-+Uint32 NESAudioRender(Int16 *bufp, Uint buflen);
- void NESAudioHandlerInstall(NES_AUDIO_HANDLER *ph);
- void NESAudioFrequencySet(Uint freq);
- Uint NESAudioFrequencyGet(void);
-diff -ur xmms-nsf-0.0.3/src/xmms/callbacks.c xmms-nsf-0.0.3.about/src/xmms/callbacks.c
---- xmms-nsf-0.0.3/src/xmms/callbacks.c 2000-07-23 05:06:43.000000000 -0500
-+++ xmms-nsf-0.0.3.about/src/xmms/callbacks.c 2005-01-02 20:58:29.052175495 -0500
-@@ -219,7 +219,7 @@
- widget = lookup_widget(GTK_WIDGET(button), "spinbutton1");
- nsf_cfg.play_time = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget));
- widget = lookup_widget(GTK_WIDGET(button), "spinbutton2");
-- nsf_cfg.fadeout_time = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget));
-+ nsf_cfg.silence_time = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget));
-
- filename = g_strconcat(g_get_home_dir(), "/.xmms/config", NULL);
- cfg = xmms_cfg_open_file(filename);
-@@ -228,7 +228,7 @@
- }
-
- xmms_cfg_write_int(cfg, "NSF", "play_time",nsf_cfg.play_time);
-- xmms_cfg_write_int(cfg, "NSF", "fadeout_time",nsf_cfg.fadeout_time);
-+ xmms_cfg_write_int(cfg, "NSF", "silence_time",nsf_cfg.silence_time);
- xmms_cfg_write_file(cfg, filename);
- xmms_cfg_free(cfg);
- g_free(filename);
-diff -ur xmms-nsf-0.0.3/src/xmms/interface.c xmms-nsf-0.0.3.about/src/xmms/interface.c
---- xmms-nsf-0.0.3/src/xmms/interface.c 2000-07-23 04:41:14.000000000 -0500
-+++ xmms-nsf-0.0.3.about/src/xmms/interface.c 2005-01-02 20:55:32.754086347 -0500
-@@ -106,7 +106,7 @@
- gtk_label_set_justify (GTK_LABEL (label2), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment (GTK_MISC (label2), 0, 0.5);
-
-- label3 = gtk_label_new ("Fadeout Time:");
-+ label3 = gtk_label_new ("Silence Until Next Song:");
- gtk_widget_ref (label3);
- gtk_object_set_data_full (GTK_OBJECT (configure), "label3", label3,
- (GtkDestroyNotify) gtk_widget_unref);
-diff -ur xmms-nsf-0.0.3/src/xmms/nsf.c xmms-nsf-0.0.3.about/src/xmms/nsf.c
---- xmms-nsf-0.0.3/src/xmms/nsf.c 2001-01-07 00:15:12.000000000 -0500
-+++ xmms-nsf-0.0.3.about/src/xmms/nsf.c 2005-01-02 20:58:06.990044841 -0500
-@@ -23,7 +23,8 @@
-
- #define VERSION "0.0.3"
- #define PLAYTIME 30
--#define FADEOUTTIME 5
-+#define SILENCETIME 5
-+#define FREQ 44100
-
- #include "nsf.h"
-
-@@ -328,7 +329,7 @@
- widget = lookup_widget(nsf_configure_win, "spinbutton1");
- gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), nsf_cfg.play_time);
- widget = lookup_widget(nsf_configure_win, "spinbutton2");
-- gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), nsf_cfg.fadeout_time);
-+ gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), nsf_cfg.silence_time);
-
- gtk_widget_show(nsf_configure_win);
- }else{
-@@ -357,7 +358,7 @@
- nsf_win->dock_window_list = NULL;
-
- nsf_cfg.play_time = PLAYTIME; /* second */
-- nsf_cfg.fadeout_time = FADEOUTTIME; /* second */
-+ nsf_cfg.silence_time = SILENCETIME; /* second */
- nsf_cfg.player_shaded = FALSE;
- nsf_cfg.easy_move = FALSE;
-
-@@ -365,7 +366,7 @@
-
- if ((cfg = xmms_cfg_open_file(filename)) != 0){
- xmms_cfg_read_int(cfg, "NSF", "play_time", &nsf_cfg.play_time);
-- xmms_cfg_read_int(cfg, "NSF", "fadeout_time", &nsf_cfg.fadeout_time);
-+ xmms_cfg_read_int(cfg, "NSF", "silence_time", &nsf_cfg.silence_time);
- xmms_cfg_free(cfg);
- }
- }
-@@ -439,10 +440,11 @@
- {
- char data[2048 * 2];
- int bytes, blk_size, rate;
-+ Uint32 c = 0, count = 0;
-
- //setting NSF
- NSFSetSongNo(nsf_file->current_song);
-- NESAudioFrequencySet(44100);
-+ NESAudioFrequencySet(FREQ);
- NESReset();
-
- //16bit/8bit * 1channel * 512 sample = 1024byte
-@@ -460,7 +462,15 @@
- }
- if (bytes > 0){
- //read 1024byte = 512 sample * 2byte
-- NESAudioRender(data, bytes/2);
-+ c = NESAudioRender(data, bytes/2);
-+ if (c < 512)
-+ count = 0;
-+ else
-+ count += c;
-+ if (count > FREQ*nsf_cfg.silence_time) {
-+ nsf_file->eos = 1;
-+ count = 0;
-+ }
- nsf_ip.add_vis_pcm(nsf_ip.output->written_time(), (nsf_file->bits_per_sample == 16) ? FMT_S16_LE : FMT_U8,
- nsf_file->channels, bytes, data);
-
-@@ -512,6 +522,9 @@
- if (!(nsf_file->file = fopen(filename, "rb"))){
- return;
- }
-+
-+ nsf_about();
-+
- fseek(nsf_file->file, 0, SEEK_END);
- count = ftell(nsf_file->file);
- fseek(nsf_file->file, 0, SEEK_SET);
-diff -ur xmms-nsf-0.0.3/src/xmms/nsf.h xmms-nsf-0.0.3.about/src/xmms/nsf.h
---- xmms-nsf-0.0.3/src/xmms/nsf.h 2000-07-23 05:00:35.000000000 -0500
-+++ xmms-nsf-0.0.3.about/src/xmms/nsf.h 2005-01-02 20:58:37.563297001 -0500
-@@ -58,7 +58,7 @@
- typedef struct
- {
- gint play_time;
-- gint fadeout_time;
-+ gint silence_time;
- // reserve
- gint resolution;
- gint channels;
-diff -ur xmms-nsf-0.0.3/src/xmms/nsflib.h xmms-nsf-0.0.3.about/src/xmms/nsflib.h
---- xmms-nsf-0.0.3/src/xmms/nsflib.h 2000-07-23 05:05:21.000000000 -0500
-+++ xmms-nsf-0.0.3.about/src/xmms/nsflib.h 2005-01-02 20:45:55.481496508 -0500
-@@ -1,10 +1,11 @@
- typedef signed short Int16;
- typedef unsigned int Uint;
-+typedef unsigned int Uint32;
- typedef unsigned char Uint8;
-
- Uint NSFLoad(Uint8 *pData, Uint uSize);
- void NSFSetSongNo(Uint uSongNo);
- void NESAudioFrequencySet(Uint freq);
- void NESReset(void);
--void NESAudioRender(Int16 *bufp, Uint buflen);
-+Uint32 NESAudioRender(Int16 *bufp, Uint buflen);
- void NESTerminate(void);
+++ /dev/null
-diff -ur xmms-nsf-0.0.3/src/nes/handler.c xmms-nsf-0.0.3-gentoo/src/nes/handler.c
---- xmms-nsf-0.0.3/src/nes/handler.c 2001-01-07 17:17:57.000000000 +1300
-+++ xmms-nsf-0.0.3-gentoo/src/nes/handler.c 2003-10-12 19:56:48.000000000 +1300
-@@ -10,9 +10,9 @@
- static NES_READ_HANDLER *(nprh[0x10]) = { 0, };
- static NES_WRITE_HANDLER *(npwh[0x10]) = { 0, };
- #define EXTREADWRITE(p) \
--static Uint __fastcall ExtRd##p##(Uint A) \
-+static Uint __fastcall ExtRd##p (Uint A) \
- { \
-- NES_READ_HANDLER *ph = nprh[0x##p##]; \
-+ NES_READ_HANDLER *ph = nprh[0x##p ]; \
- do \
- { \
- if (ph->min <= A && A <= ph->max) \
-@@ -22,9 +22,9 @@
- } while ((ph = ph->next) != 0); \
- return 0; \
- } \
--static void __fastcall ExtWr##p##(Uint A, Uint V) \
-+static void __fastcall ExtWr##p (Uint A, Uint V) \
- { \
-- NES_WRITE_HANDLER *ph = npwh[0x##p##]; \
-+ NES_WRITE_HANDLER *ph = npwh[0x##p ]; \
- do \
- { \
- if (ph->min <= A && A <= ph->max) \
-diff -ur xmms-nsf-0.0.3/src/nes/km6502/km6502cd.h xmms-nsf-0.0.3-gentoo/src/nes/km6502/km6502cd.h
---- xmms-nsf-0.0.3/src/nes/km6502/km6502cd.h 2001-01-07 17:18:05.000000000 +1300
-+++ xmms-nsf-0.0.3-gentoo/src/nes/km6502/km6502cd.h 2003-10-12 20:07:08.000000000 +1300
-@@ -361,27 +361,27 @@
-
- /* --- ADC --- */
- #if BUILD_HUC6280
--#define DEF_ADC(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
--{ KMI_ADC(__THISP_ K_READ##p##(__THISP_ a(__THISP))); } \
--static void OpcodeCall D_Opco##i##(__CONTEXT) \
--{ KMI_ADC_D(__THISP_ K_READ##p##(__THISP_ a(__THISP))); } \
--static void OpcodeCall T_Opco##i##(__CONTEXT) \
-+#define DEF_ADC(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
-+{ KMI_ADC(__THISP_ K_READ##p (__THISP_ a(__THISP))); } \
-+static void OpcodeCall D_Opco##i (__CONTEXT) \
-+{ KMI_ADC_D(__THISP_ K_READ##p (__THISP_ a(__THISP))); } \
-+static void OpcodeCall T_Opco##i (__CONTEXT) \
- { \
- Uword saveA = KMI_PRET(__THISP); \
-- KMI_ADC(__THISP_ K_READ##p##(__THISP_ a(__THISP))); \
-+ KMI_ADC(__THISP_ K_READ##p (__THISP_ a(__THISP))); \
- KMI_POSTT(__THISP_ saveA); \
- } \
--static void OpcodeCall TD_Opc##i##(__CONTEXT) \
-+static void OpcodeCall TD_Opc##i (__CONTEXT) \
- { \
- Uword saveA = KMI_PRET(__THISP); \
-- KMI_ADC_D(__THISP_ K_READ##p##(__THISP_ a(__THISP))); \
-+ KMI_ADC_D(__THISP_ K_READ##p (__THISP_ a(__THISP))); \
- KMI_POSTT(__THISP_ saveA); \
- }
- #else
--#define DEF_ADC(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
--{ KMI_ADC(__THISP_ K_READ##p##(__THISP_ a(__THISP))); } \
--static void OpcodeCall D_Opco##i##(__CONTEXT) \
--{ KMI_ADC_D(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
-+#define DEF_ADC(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
-+{ KMI_ADC(__THISP_ K_READ##p (__THISP_ a(__THISP))); } \
-+static void OpcodeCall D_Opco##i (__CONTEXT) \
-+{ KMI_ADC_D(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
- #endif
- DEF_ADC(61,NP,KA_INDX) /* 61 - ADC - (Indirect,X) */
- DEF_ADC(65,ZP,KA_ZP) /* 65 - ADC - Zero Page */
-@@ -397,17 +397,17 @@
-
- /* --- AND --- */
- #if BUILD_HUC6280
--#define DEF_AND(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
--{ KM_AND(__THISP_ K_READ##p##(__THISP_ a(__THISP))); } \
--static void OpcodeCall T_Opco##i##(__CONTEXT) \
-+#define DEF_AND(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
-+{ KM_AND(__THISP_ K_READ##p (__THISP_ a(__THISP))); } \
-+static void OpcodeCall T_Opco##i (__CONTEXT) \
- { \
- Uword saveA = KMI_PRET(__THISP); \
-- KM_AND(__THISP_ K_READ##p##(__THISP_ a(__THISP))); \
-+ KM_AND(__THISP_ K_READ##p (__THISP_ a(__THISP))); \
- KMI_POSTT(__THISP_ saveA); \
- }
- #else
--#define DEF_AND(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
--{ KM_AND(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
-+#define DEF_AND(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
-+{ KM_AND(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
- #endif
- DEF_AND(21,NP,KA_INDX) /* 21 - AND - (Indirect,X) */
- DEF_AND(25,ZP,KA_ZP) /* 25 - AND - Zero Page */
-@@ -422,10 +422,10 @@
- #endif
-
- /* --- ASL --- */
--#define DEF_ASL(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-+#define DEF_ASL(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
- { \
- Uword adr = a(__THISP); \
-- K_WRITE##p##(__THISP_ adr, KM_ASL(__THISP_ K_READ##p##(__THISP_ adr))); \
-+ K_WRITE##p (__THISP_ adr, KM_ASL(__THISP_ K_READ##p (__THISP_ adr))); \
- }
- DEF_ASL(06,ZP,KA_ZP) /* 06 - ASL - Zero Page */
- DEF_ASL(0E,NP,KA_ABS) /* 0E - ASL - Absolute */
-@@ -436,7 +436,7 @@
-
- #if BUILD_HUC6280
- /* --- BBRi --- */
--#define DEF_BBR(i,y) static void OpcodeCall Opcode##i##(__CONTEXT) \
-+#define DEF_BBR(i,y) static void OpcodeCall Opcode##i (__CONTEXT) \
- { \
- Uword adr = KA_ZP(__THISP); \
- Uword rel = K_READ(__THISP_ KA_IMM(__THISP)); \
-@@ -451,7 +451,7 @@
- DEF_BBR(6F,6) /* 6F - BBR6 */
- DEF_BBR(7F,7) /* 7F - BBR7 */
- /* --- BBSi --- */
--#define DEF_BBS(i,y) static void OpcodeCall Opcode##i##(__CONTEXT) \
-+#define DEF_BBS(i,y) static void OpcodeCall Opcode##i (__CONTEXT) \
- { \
- Uword adr = KA_ZP(__THISP); \
- Uword rel = K_READ(__THISP_ KA_IMM(__THISP)); \
-@@ -468,8 +468,8 @@
- #endif
-
- /* --- BIT --- */
--#define DEF_BIT(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
--{ KM_BIT(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
-+#define DEF_BIT(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
-+{ KM_BIT(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
- DEF_BIT(24,ZP,KA_ZP) /* 24 - BIT - Zero Page */
- DEF_BIT(2C,NP,KA_ABS) /* 2C - BIT - Absolute */
- #if BUILD_HUC6280 || BUILD_M65C02
-@@ -479,7 +479,7 @@
- #endif
-
- /* --- Bcc --- */
--#define DEF_BRA(i,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-+#define DEF_BRA(i,a) static void OpcodeCall Opcode##i (__CONTEXT) \
- { \
- Uword rel = K_READ(__THISP_ KA_IMM(__THISP)); \
- if (a) KM_BRA(__THISP_ rel); \
-@@ -536,8 +536,8 @@
- { __THIS__.P &= ~V_FLAG; }
-
- /* --- CMP --- */
--#define DEF_CMP(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
--{ KM_CMP(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
-+#define DEF_CMP(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
-+{ KM_CMP(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
- DEF_CMP(C1,NP,KA_INDX) /* C1 - CMP - (Indirect,X) */
- DEF_CMP(C5,ZP,KA_ZP) /* C5 - CMP - Zero Page */
- DEF_CMP(C9,NP,KA_IMM) /* C9 - CMP - Immediate */
-@@ -551,24 +551,24 @@
- #endif
-
- /* --- CPX --- */
--#define DEF_CPX(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
--{ KM_CPX(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
-+#define DEF_CPX(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
-+{ KM_CPX(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
- DEF_CPX(E0,NP,KA_IMM) /* E0 - CPX - Immediate */
- DEF_CPX(E4,ZP,KA_ZP) /* E4 - CPX - Zero Page */
- DEF_CPX(EC,NP,KA_ABS) /* EC - CPX - Absolute */
-
- /* --- CPY --- */
--#define DEF_CPY(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
--{ KM_CPY(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
-+#define DEF_CPY(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
-+{ KM_CPY(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
- DEF_CPY(C0,NP,KA_IMM) /* C0 - CPY - Immediate */
- DEF_CPY(C4,ZP,KA_ZP) /* C4 - CPY - Zero Page */
- DEF_CPY(CC,NP,KA_ABS) /* CC - CPY - Absolute */
-
- /* --- DEC --- */
--#define DEF_DEC(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-+#define DEF_DEC(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
- { \
- Uword adr = a(__THISP); \
-- K_WRITE##p##(__THISP_ adr, KM_DEC(__THISP_ K_READ##p##(__THISP_ adr))); \
-+ K_WRITE##p (__THISP_ adr, KM_DEC(__THISP_ K_READ##p (__THISP_ adr))); \
- }
- DEF_DEC(C6,ZP,KA_ZP) /* C6 - DEC - Zero Page */
- DEF_DEC(CE,NP,KA_ABS) /* CE - DEC - Absolute */
-@@ -585,17 +585,17 @@
-
- /* --- EOR --- */
- #if BUILD_HUC6280
--#define DEF_EOR(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
--{ KM_EOR(__THISP_ K_READ##p##(__THISP_ a(__THISP))); } \
--static void OpcodeCall T_Opco##i##(__CONTEXT) \
-+#define DEF_EOR(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
-+{ KM_EOR(__THISP_ K_READ##p (__THISP_ a(__THISP))); } \
-+static void OpcodeCall T_Opco##i (__CONTEXT) \
- { \
- Uword saveA = KMI_PRET(__THISP); \
-- KM_EOR(__THISP_ K_READ##p##(__THISP_ a(__THISP))); \
-+ KM_EOR(__THISP_ K_READ##p (__THISP_ a(__THISP))); \
- KMI_POSTT(__THISP_ saveA); \
- }
- #else
--#define DEF_EOR(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
--{ KM_EOR(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
-+#define DEF_EOR(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
-+{ KM_EOR(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
- #endif
- DEF_EOR(41,NP,KA_INDX) /* 41 - EOR - (Indirect,X) */
- DEF_EOR(45,ZP,KA_ZP) /* 45 - EOR - Zero Page */
-@@ -610,10 +610,10 @@
- #endif
-
- /* --- INC --- */
--#define DEF_INC(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-+#define DEF_INC(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
- { \
- Uword adr = a(__THISP); \
-- K_WRITE##p##(__THISP_ adr, KM_INC(__THISP_ K_READ##p##(__THISP_ adr))); \
-+ K_WRITE##p (__THISP_ adr, KM_INC(__THISP_ K_READ##p (__THISP_ adr))); \
- }
- DEF_INC(E6,ZP,KA_ZP) /* E6 - INC - Zero Page */
- DEF_INC(EE,NP,KA_ABS) /* EE - INC - Absolute */
-@@ -629,12 +629,12 @@
- { __THIS__.Y = KM_INC(__THISP_ __THIS__.Y); }
-
- /* --- JMP --- */
--#define DEF_JMP(i,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-+#define DEF_JMP(i,a) static void OpcodeCall Opcode##i (__CONTEXT) \
- { __THIS__.PC = KI_READWORD(__THISP_ a(__THISP)); }
- #if BUILD_HUC6280 || BUILD_M65C02
- #define DEF_JMPBUG(i,a) DEF_JMP(i,a)
- #else
--#define DEF_JMPBUG(i,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-+#define DEF_JMPBUG(i,a) static void OpcodeCall Opcode##i (__CONTEXT) \
- { __THIS__.PC = KI_READWORDBUG(__THISP_ a(__THISP)); }
- #endif
- DEF_JMP(4C,KA_IMM16) /* 4C - JMP - Immediate */
-@@ -653,8 +653,8 @@
- }
-
- /* --- LDA --- */
--#define DEF_LDA(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
--{ __THIS__.A = KM_LD(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
-+#define DEF_LDA(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
-+{ __THIS__.A = KM_LD(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
- DEF_LDA(A1,NP,KA_INDX) /* A1 - LDA - (Indirect,X) */
- DEF_LDA(A5,ZP,KA_ZP) /* A5 - LDA - Zero Page */
- DEF_LDA(A9,NP,KA_IMM) /* A9 - LDA - Immediate */
-@@ -668,8 +668,8 @@
- #endif
-
- /* --- LDX --- */
--#define DEF_LDX(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
--{ __THIS__.X = KM_LD(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
-+#define DEF_LDX(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
-+{ __THIS__.X = KM_LD(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
- DEF_LDX(A2,NP,KA_IMM) /* A2 - LDX - Immediate */
- DEF_LDX(A6,ZP,KA_ZP) /* A6 - LDX - Zero Page */
- DEF_LDX(AE,NP,KA_ABS) /* AE - LDX - Absolute */
-@@ -677,8 +677,8 @@
- DEF_LDX(BE,NP,KA_ABSY_) /* BE - LDX - Absolute,Y */
-
- /* --- LDY --- */
--#define DEF_LDY(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
--{ __THIS__.Y = KM_LD(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
-+#define DEF_LDY(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
-+{ __THIS__.Y = KM_LD(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
- DEF_LDY(A0,NP,KA_IMM) /* A0 - LDY - Immediate */
- DEF_LDY(A4,ZP,KA_ZP) /* A4 - LDY - Zero Page */
- DEF_LDY(AC,NP,KA_ABS) /* AC - LDY - Absolute */
-@@ -686,10 +686,10 @@
- DEF_LDY(BC,NP,KA_ABSX_) /* BC - LDY - Absolute,X */
-
- /* --- LSR --- */
--#define DEF_LSR(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-+#define DEF_LSR(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
- { \
- Uword adr = a(__THISP); \
-- K_WRITE##p##(__THISP_ adr, KM_LSR(__THISP_ K_READ##p##(__THISP_ adr))); \
-+ K_WRITE##p (__THISP_ adr, KM_LSR(__THISP_ K_READ##p (__THISP_ adr))); \
- }
- DEF_LSR(46,ZP,KA_ZP) /* 46 - LSR - Zero Page */
- DEF_LSR(4E,NP,KA_ABS) /* 4E - LSR - Absolute */
-@@ -705,17 +705,17 @@
-
- /* --- ORA --- */
- #if BUILD_HUC6280
--#define DEF_ORA(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
--{ KM_ORA(__THISP_ K_READ##p##(__THISP_ a(__THISP))); } \
--static void OpcodeCall T_Opco##i##(__CONTEXT) \
-+#define DEF_ORA(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
-+{ KM_ORA(__THISP_ K_READ##p (__THISP_ a(__THISP))); } \
-+static void OpcodeCall T_Opco##i (__CONTEXT) \
- { \
- Uword saveA = KMI_PRET(__THISP); \
-- KM_ORA(__THISP_ K_READ##p##(__THISP_ a(__THISP))); \
-+ KM_ORA(__THISP_ K_READ##p (__THISP_ a(__THISP))); \
- KMI_POSTT(__THISP_ saveA); \
- }
- #else
--#define DEF_ORA(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
--{ KM_ORA(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
-+#define DEF_ORA(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
-+{ KM_ORA(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
- #endif
- DEF_ORA(01,NP,KA_INDX) /* 01 - ORA - (Indirect,X) */
- DEF_ORA(05,ZP,KA_ZP) /* 05 - ORA - Zero Page */
-@@ -751,7 +751,7 @@
-
- #if BUILD_HUC6280
- /* --- RMBi --- */
--#define DEF_RMB(i,y) static void OpcodeCall Opcode##i##(__CONTEXT) \
-+#define DEF_RMB(i,y) static void OpcodeCall Opcode##i (__CONTEXT) \
- { \
- Uword adr = KA_ZP(__THISP); \
- K_WRITEZP(__THISP_ adr, (Uword)(K_READZP(__THISP_ adr) & (~(1 << y)))); \
-@@ -765,7 +765,7 @@
- DEF_RMB(67,6) /* 67 - RMB6 */
- DEF_RMB(77,7) /* 77 - RMB7 */
- /* --- SMBi --- */
--#define DEF_SMB(i,y) static void OpcodeCall Opcode##i##(__CONTEXT) \
-+#define DEF_SMB(i,y) static void OpcodeCall Opcode##i (__CONTEXT) \
- { \
- Uword adr = KA_ZP(__THISP); \
- K_WRITEZP(__THISP_ adr, (Uword)(K_READZP(__THISP_ adr) | (1 << y))); \
-@@ -781,10 +781,10 @@
- #endif
-
- /* --- ROL --- */
--#define DEF_ROL(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-+#define DEF_ROL(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
- { \
- Uword adr = a(__THISP); \
-- K_WRITE##p##(__THISP_ adr, KM_ROL(__THISP_ K_READ##p##(__THISP_ adr))); \
-+ K_WRITE##p (__THISP_ adr, KM_ROL(__THISP_ K_READ##p (__THISP_ adr))); \
- }
- DEF_ROL(26,ZP,KA_ZP) /* 26 - ROL - Zero Page */
- DEF_ROL(2E,NP,KA_ABS) /* 2E - ROL - Absolute */
-@@ -794,10 +794,10 @@
- { __THIS__.A = KM_ROL(__THISP_ __THIS__.A); }
-
- /* --- ROR --- */
--#define DEF_ROR(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-+#define DEF_ROR(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
- { \
- Uword adr = a(__THISP); \
-- K_WRITE##p##(__THISP_ adr, KM_ROR(__THISP_ K_READ##p##(__THISP_ adr))); \
-+ K_WRITE##p (__THISP_ adr, KM_ROR(__THISP_ K_READ##p (__THISP_ adr))); \
- }
- DEF_ROR(66,ZP,KA_ZP) /* 66 - ROR - Zero Page */
- DEF_ROR(6E,NP,KA_ABS) /* 6E - ROR - Absolute */
-@@ -841,10 +841,10 @@
- #endif
-
- /* --- SBC --- */
--#define DEF_SBC(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
--{ KMI_SBC(__THISP_ K_READ##p##(__THISP_ a(__THISP))); } \
--static void OpcodeCall D_Opco##i##(__CONTEXT) \
--{ KMI_SBC_D(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
-+#define DEF_SBC(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
-+{ KMI_SBC(__THISP_ K_READ##p (__THISP_ a(__THISP))); } \
-+static void OpcodeCall D_Opco##i (__CONTEXT) \
-+{ KMI_SBC_D(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
- DEF_SBC(E1,NP,KA_INDX) /* E1 - SBC - (Indirect,X) */
- DEF_SBC(E5,ZP,KA_ZP) /* E5 - SBC - Zero Page */
- DEF_SBC(E9,NP,KA_IMM) /* E9 - SBC - Immediate */
-@@ -883,8 +883,8 @@
- #endif
-
- /* --- STA --- */
--#define DEF_STA(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
--{ K_WRITE##p##(__THISP_ a(__THISP), __THIS__.A); }
-+#define DEF_STA(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
-+{ K_WRITE##p (__THISP_ a(__THISP), __THIS__.A); }
- DEF_STA(81,NP,KA_INDX) /* 81 - STA - (Indirect,X) */
- DEF_STA(85,ZP,KA_ZP) /* 85 - STA - Zero Page */
- DEF_STA(8D,NP,KA_ABS) /* 8D - STA - Absolute */
-@@ -897,23 +897,23 @@
- #endif
-
- /* --- STX --- */
--#define DEF_STX(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
--{ K_WRITE##p##(__THISP_ a(__THISP), __THIS__.X); }
-+#define DEF_STX(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
-+{ K_WRITE##p (__THISP_ a(__THISP), __THIS__.X); }
- DEF_STX(86,ZP,KA_ZP) /* 86 - STX - Zero Page */
- DEF_STX(8E,NP,KA_ABS) /* 8E - STX - Absolute */
- DEF_STX(96,ZP,KA_ZPY) /* 96 - STX - Zero Page,Y */
-
- /* --- STY --- */
--#define DEF_STY(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
--{ K_WRITE##p##(__THISP_ a(__THISP), __THIS__.Y); }
-+#define DEF_STY(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
-+{ K_WRITE##p (__THISP_ a(__THISP), __THIS__.Y); }
- DEF_STY(84,ZP,KA_ZP) /* 84 - STY - Zero Page */
- DEF_STY(8C,NP,KA_ABS) /* 8C - STY - Absolute */
- DEF_STY(94,ZP,KA_ZPX) /* 94 - STY - Zero Page,X */
-
- #if BUILD_HUC6280 || BUILD_M65C02
- /* --- STZ --- */
--#define DEF_STZ(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
--{ K_WRITE##p##(__THISP_ a(__THISP), 0); }
-+#define DEF_STZ(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
-+{ K_WRITE##p (__THISP_ a(__THISP), 0); }
- DEF_STZ(64,ZP,KA_ZP) /* 64 - STZ - Zero Page */
- DEF_STZ(9C,NP,KA_ABS) /* 9C - STZ - Absolute */
- DEF_STZ(74,ZP,KA_ZPX) /* 74 - STZ - Zero Page,X */
-@@ -931,18 +931,18 @@
-
- #if BUILD_HUC6280 || BUILD_M65C02
- /* --- TRB --- */
--#define DEF_TRB(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-+#define DEF_TRB(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
- { \
- Uword adr = a(__THISP); \
-- K_WRITE##p##(__THISP_ adr, KM_TRB(__THISP_ K_READ##p##(__THISP_ adr))); \
-+ K_WRITE##p (__THISP_ adr, KM_TRB(__THISP_ K_READ##p (__THISP_ adr))); \
- }
- DEF_TRB(14,ZP,KA_ZP) /* 14 - TRB - Zero Page */
- DEF_TRB(1C,NP,KA_ABS) /* 1C - TRB - Absolute */
- /* --- TSB --- */
--#define DEF_TSB(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-+#define DEF_TSB(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
- { \
- Uword adr = a(__THISP); \
-- K_WRITE##p##(__THISP_ adr, KM_TSB(__THISP_ K_READ##p##(__THISP_ adr))); \
-+ K_WRITE##p (__THISP_ adr, KM_TSB(__THISP_ K_READ##p (__THISP_ adr))); \
- }
- DEF_TSB(04,ZP,KA_ZP) /* 04 - TSB - Zero Page */
- DEF_TSB(0C,NP,KA_ABS) /* 0C - TSB - Absolute */
-@@ -950,10 +950,10 @@
-
- #if BUILD_HUC6280
- /* --- TST --- */
--#define DEF_TST(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-+#define DEF_TST(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
- { \
- Uword imm = K_READ(__THISP_ KA_IMM(__THISP)); \
-- KM_TST(__THISP_ imm, K_READ##p##(__THISP_ a(__THISP))); \
-+ KM_TST(__THISP_ imm, K_READ##p (__THISP_ a(__THISP))); \
- }
- DEF_TST(83,ZP,KA_ZP) /* 83 - TST - Zero Page */
- DEF_TST(93,NP,KA_ABS) /* 93 - TST - Absolute */
-diff -ur xmms-nsf-0.0.3/src/nes/km6502/km6502ot.h xmms-nsf-0.0.3-gentoo/src/nes/km6502/km6502ot.h
---- xmms-nsf-0.0.3/src/nes/km6502/km6502ot.h 2001-01-07 17:18:05.000000000 +1300
-+++ xmms-nsf-0.0.3-gentoo/src/nes/km6502/km6502ot.h 2003-10-12 20:09:41.000000000 +1300
-@@ -1,35 +1,35 @@
- #define OPxx(i)
- #define OP__(i) \
-- case 0x##i##: \
-- Opcode##i##(__THISP); \
-+ case 0x##i : \
-+ Opcode##i (__THISP); \
- break;
- #define OP_d(i) \
-- case 0x##i##: \
-+ case 0x##i : \
- if (__THIS__.P & D_FLAG) \
-- D_Opco##i##(__THISP); \
-+ D_Opco##i (__THISP); \
- else \
-- Opcode##i##(__THISP); \
-+ Opcode##i (__THISP); \
- break;
- #if BUILD_HUC6280
- #define OPtd(i) \
-- case 0x##i##: \
-+ case 0x##i : \
- if (__THIS__.P & T_FLAG) \
- if (__THIS__.P & D_FLAG) \
-- TD_Opc##i##(__THISP); \
-+ TD_Opc##i (__THISP); \
- else \
-- T_Opco##i##(__THISP); \
-+ T_Opco##i (__THISP); \
- else \
- if (__THIS__.P & D_FLAG) \
-- D_Opco##i##(__THISP); \
-+ D_Opco##i (__THISP); \
- else \
-- Opcode##i##(__THISP); \
-+ Opcode##i (__THISP); \
- break;
- #define OPt_(i) \
-- case 0x##i##: \
-+ case 0x##i : \
- if (__THIS__.P & T_FLAG) \
-- T_Opco##i##(__THISP); \
-+ T_Opco##i (__THISP); \
- else \
-- Opcode##i##(__THISP); \
-+ Opcode##i (__THISP); \
- break;
- #else
- #define OPtd OP_d
-
---- xmms-nsf-0.0.3/src/xmms/nsf.c.orig 2006-06-11 01:07:15.000000000 -0400
-+++ xmms-nsf-0.0.3/src/xmms/nsf.c 2006-06-11 01:00:28.000000000 -0400
-@@ -462,7 +462,7 @@
- }
- if (bytes > 0){
- //read 1024byte = 512 sample * 2byte
-- c = NESAudioRender(data, bytes/2);
-+ c = NESAudioRender((Int16*)data, bytes/2);
- if (c < 512)
- count = 0;
- else
-@@ -529,7 +529,7 @@
- count = ftell(nsf_file->file);
- fseek(nsf_file->file, 0, SEEK_SET);
-
-- (void*)buffer = g_malloc0(count);
-+ buffer = (void*)g_malloc0(count);
- for(i=0;i<count;i++){
- *(buffer+i) = fgetc(nsf_file->file);
- }
+++ /dev/null
-diff -ur xmms-nsf-0.0.3/src/nes/handler.c xmms-nsf-0.0.3-gentoo/src/nes/handler.c
---- xmms-nsf-0.0.3/src/nes/handler.c 2001-01-07 17:17:57.000000000 +1300
-+++ xmms-nsf-0.0.3-gentoo/src/nes/handler.c 2003-10-12 19:56:48.000000000 +1300
-@@ -10,9 +10,9 @@
- static NES_READ_HANDLER *(nprh[0x10]) = { 0, };
- static NES_WRITE_HANDLER *(npwh[0x10]) = { 0, };
- #define EXTREADWRITE(p) \
--static Uint __fastcall ExtRd##p##(Uint A) \
-+static Uint __fastcall ExtRd##p (Uint A) \
- { \
-- NES_READ_HANDLER *ph = nprh[0x##p##]; \
-+ NES_READ_HANDLER *ph = nprh[0x##p ]; \
- do \
- { \
- if (ph->min <= A && A <= ph->max) \
-@@ -22,9 +22,9 @@
- } while ((ph = ph->next) != 0); \
- return 0; \
- } \
--static void __fastcall ExtWr##p##(Uint A, Uint V) \
-+static void __fastcall ExtWr##p (Uint A, Uint V) \
- { \
-- NES_WRITE_HANDLER *ph = npwh[0x##p##]; \
-+ NES_WRITE_HANDLER *ph = npwh[0x##p ]; \
- do \
- { \
- if (ph->min <= A && A <= ph->max) \
-diff -ur xmms-nsf-0.0.3/src/nes/km6502/km6502cd.h xmms-nsf-0.0.3-gentoo/src/nes/km6502/km6502cd.h
---- xmms-nsf-0.0.3/src/nes/km6502/km6502cd.h 2001-01-07 17:18:05.000000000 +1300
-+++ xmms-nsf-0.0.3-gentoo/src/nes/km6502/km6502cd.h 2003-10-12 20:07:08.000000000 +1300
-@@ -361,27 +361,27 @@
-
- /* --- ADC --- */
- #if BUILD_HUC6280
--#define DEF_ADC(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
--{ KMI_ADC(__THISP_ K_READ##p##(__THISP_ a(__THISP))); } \
--static void OpcodeCall D_Opco##i##(__CONTEXT) \
--{ KMI_ADC_D(__THISP_ K_READ##p##(__THISP_ a(__THISP))); } \
--static void OpcodeCall T_Opco##i##(__CONTEXT) \
-+#define DEF_ADC(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
-+{ KMI_ADC(__THISP_ K_READ##p (__THISP_ a(__THISP))); } \
-+static void OpcodeCall D_Opco##i (__CONTEXT) \
-+{ KMI_ADC_D(__THISP_ K_READ##p (__THISP_ a(__THISP))); } \
-+static void OpcodeCall T_Opco##i (__CONTEXT) \
- { \
- Uword saveA = KMI_PRET(__THISP); \
-- KMI_ADC(__THISP_ K_READ##p##(__THISP_ a(__THISP))); \
-+ KMI_ADC(__THISP_ K_READ##p (__THISP_ a(__THISP))); \
- KMI_POSTT(__THISP_ saveA); \
- } \
--static void OpcodeCall TD_Opc##i##(__CONTEXT) \
-+static void OpcodeCall TD_Opc##i (__CONTEXT) \
- { \
- Uword saveA = KMI_PRET(__THISP); \
-- KMI_ADC_D(__THISP_ K_READ##p##(__THISP_ a(__THISP))); \
-+ KMI_ADC_D(__THISP_ K_READ##p (__THISP_ a(__THISP))); \
- KMI_POSTT(__THISP_ saveA); \
- }
- #else
--#define DEF_ADC(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
--{ KMI_ADC(__THISP_ K_READ##p##(__THISP_ a(__THISP))); } \
--static void OpcodeCall D_Opco##i##(__CONTEXT) \
--{ KMI_ADC_D(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
-+#define DEF_ADC(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
-+{ KMI_ADC(__THISP_ K_READ##p (__THISP_ a(__THISP))); } \
-+static void OpcodeCall D_Opco##i (__CONTEXT) \
-+{ KMI_ADC_D(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
- #endif
- DEF_ADC(61,NP,KA_INDX) /* 61 - ADC - (Indirect,X) */
- DEF_ADC(65,ZP,KA_ZP) /* 65 - ADC - Zero Page */
-@@ -397,17 +397,17 @@
-
- /* --- AND --- */
- #if BUILD_HUC6280
--#define DEF_AND(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
--{ KM_AND(__THISP_ K_READ##p##(__THISP_ a(__THISP))); } \
--static void OpcodeCall T_Opco##i##(__CONTEXT) \
-+#define DEF_AND(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
-+{ KM_AND(__THISP_ K_READ##p (__THISP_ a(__THISP))); } \
-+static void OpcodeCall T_Opco##i (__CONTEXT) \
- { \
- Uword saveA = KMI_PRET(__THISP); \
-- KM_AND(__THISP_ K_READ##p##(__THISP_ a(__THISP))); \
-+ KM_AND(__THISP_ K_READ##p (__THISP_ a(__THISP))); \
- KMI_POSTT(__THISP_ saveA); \
- }
- #else
--#define DEF_AND(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
--{ KM_AND(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
-+#define DEF_AND(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
-+{ KM_AND(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
- #endif
- DEF_AND(21,NP,KA_INDX) /* 21 - AND - (Indirect,X) */
- DEF_AND(25,ZP,KA_ZP) /* 25 - AND - Zero Page */
-@@ -422,10 +422,10 @@
- #endif
-
- /* --- ASL --- */
--#define DEF_ASL(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-+#define DEF_ASL(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
- { \
- Uword adr = a(__THISP); \
-- K_WRITE##p##(__THISP_ adr, KM_ASL(__THISP_ K_READ##p##(__THISP_ adr))); \
-+ K_WRITE##p (__THISP_ adr, KM_ASL(__THISP_ K_READ##p (__THISP_ adr))); \
- }
- DEF_ASL(06,ZP,KA_ZP) /* 06 - ASL - Zero Page */
- DEF_ASL(0E,NP,KA_ABS) /* 0E - ASL - Absolute */
-@@ -436,7 +436,7 @@
-
- #if BUILD_HUC6280
- /* --- BBRi --- */
--#define DEF_BBR(i,y) static void OpcodeCall Opcode##i##(__CONTEXT) \
-+#define DEF_BBR(i,y) static void OpcodeCall Opcode##i (__CONTEXT) \
- { \
- Uword adr = KA_ZP(__THISP); \
- Uword rel = K_READ(__THISP_ KA_IMM(__THISP)); \
-@@ -451,7 +451,7 @@
- DEF_BBR(6F,6) /* 6F - BBR6 */
- DEF_BBR(7F,7) /* 7F - BBR7 */
- /* --- BBSi --- */
--#define DEF_BBS(i,y) static void OpcodeCall Opcode##i##(__CONTEXT) \
-+#define DEF_BBS(i,y) static void OpcodeCall Opcode##i (__CONTEXT) \
- { \
- Uword adr = KA_ZP(__THISP); \
- Uword rel = K_READ(__THISP_ KA_IMM(__THISP)); \
-@@ -468,8 +468,8 @@
- #endif
-
- /* --- BIT --- */
--#define DEF_BIT(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
--{ KM_BIT(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
-+#define DEF_BIT(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
-+{ KM_BIT(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
- DEF_BIT(24,ZP,KA_ZP) /* 24 - BIT - Zero Page */
- DEF_BIT(2C,NP,KA_ABS) /* 2C - BIT - Absolute */
- #if BUILD_HUC6280 || BUILD_M65C02
-@@ -479,7 +479,7 @@
- #endif
-
- /* --- Bcc --- */
--#define DEF_BRA(i,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-+#define DEF_BRA(i,a) static void OpcodeCall Opcode##i (__CONTEXT) \
- { \
- Uword rel = K_READ(__THISP_ KA_IMM(__THISP)); \
- if (a) KM_BRA(__THISP_ rel); \
-@@ -536,8 +536,8 @@
- { __THIS__.P &= ~V_FLAG; }
-
- /* --- CMP --- */
--#define DEF_CMP(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
--{ KM_CMP(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
-+#define DEF_CMP(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
-+{ KM_CMP(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
- DEF_CMP(C1,NP,KA_INDX) /* C1 - CMP - (Indirect,X) */
- DEF_CMP(C5,ZP,KA_ZP) /* C5 - CMP - Zero Page */
- DEF_CMP(C9,NP,KA_IMM) /* C9 - CMP - Immediate */
-@@ -551,24 +551,24 @@
- #endif
-
- /* --- CPX --- */
--#define DEF_CPX(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
--{ KM_CPX(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
-+#define DEF_CPX(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
-+{ KM_CPX(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
- DEF_CPX(E0,NP,KA_IMM) /* E0 - CPX - Immediate */
- DEF_CPX(E4,ZP,KA_ZP) /* E4 - CPX - Zero Page */
- DEF_CPX(EC,NP,KA_ABS) /* EC - CPX - Absolute */
-
- /* --- CPY --- */
--#define DEF_CPY(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
--{ KM_CPY(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
-+#define DEF_CPY(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
-+{ KM_CPY(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
- DEF_CPY(C0,NP,KA_IMM) /* C0 - CPY - Immediate */
- DEF_CPY(C4,ZP,KA_ZP) /* C4 - CPY - Zero Page */
- DEF_CPY(CC,NP,KA_ABS) /* CC - CPY - Absolute */
-
- /* --- DEC --- */
--#define DEF_DEC(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-+#define DEF_DEC(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
- { \
- Uword adr = a(__THISP); \
-- K_WRITE##p##(__THISP_ adr, KM_DEC(__THISP_ K_READ##p##(__THISP_ adr))); \
-+ K_WRITE##p (__THISP_ adr, KM_DEC(__THISP_ K_READ##p (__THISP_ adr))); \
- }
- DEF_DEC(C6,ZP,KA_ZP) /* C6 - DEC - Zero Page */
- DEF_DEC(CE,NP,KA_ABS) /* CE - DEC - Absolute */
-@@ -585,17 +585,17 @@
-
- /* --- EOR --- */
- #if BUILD_HUC6280
--#define DEF_EOR(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
--{ KM_EOR(__THISP_ K_READ##p##(__THISP_ a(__THISP))); } \
--static void OpcodeCall T_Opco##i##(__CONTEXT) \
-+#define DEF_EOR(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
-+{ KM_EOR(__THISP_ K_READ##p (__THISP_ a(__THISP))); } \
-+static void OpcodeCall T_Opco##i (__CONTEXT) \
- { \
- Uword saveA = KMI_PRET(__THISP); \
-- KM_EOR(__THISP_ K_READ##p##(__THISP_ a(__THISP))); \
-+ KM_EOR(__THISP_ K_READ##p (__THISP_ a(__THISP))); \
- KMI_POSTT(__THISP_ saveA); \
- }
- #else
--#define DEF_EOR(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
--{ KM_EOR(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
-+#define DEF_EOR(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
-+{ KM_EOR(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
- #endif
- DEF_EOR(41,NP,KA_INDX) /* 41 - EOR - (Indirect,X) */
- DEF_EOR(45,ZP,KA_ZP) /* 45 - EOR - Zero Page */
-@@ -610,10 +610,10 @@
- #endif
-
- /* --- INC --- */
--#define DEF_INC(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-+#define DEF_INC(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
- { \
- Uword adr = a(__THISP); \
-- K_WRITE##p##(__THISP_ adr, KM_INC(__THISP_ K_READ##p##(__THISP_ adr))); \
-+ K_WRITE##p (__THISP_ adr, KM_INC(__THISP_ K_READ##p (__THISP_ adr))); \
- }
- DEF_INC(E6,ZP,KA_ZP) /* E6 - INC - Zero Page */
- DEF_INC(EE,NP,KA_ABS) /* EE - INC - Absolute */
-@@ -629,12 +629,12 @@
- { __THIS__.Y = KM_INC(__THISP_ __THIS__.Y); }
-
- /* --- JMP --- */
--#define DEF_JMP(i,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-+#define DEF_JMP(i,a) static void OpcodeCall Opcode##i (__CONTEXT) \
- { __THIS__.PC = KI_READWORD(__THISP_ a(__THISP)); }
- #if BUILD_HUC6280 || BUILD_M65C02
- #define DEF_JMPBUG(i,a) DEF_JMP(i,a)
- #else
--#define DEF_JMPBUG(i,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-+#define DEF_JMPBUG(i,a) static void OpcodeCall Opcode##i (__CONTEXT) \
- { __THIS__.PC = KI_READWORDBUG(__THISP_ a(__THISP)); }
- #endif
- DEF_JMP(4C,KA_IMM16) /* 4C - JMP - Immediate */
-@@ -653,8 +653,8 @@
- }
-
- /* --- LDA --- */
--#define DEF_LDA(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
--{ __THIS__.A = KM_LD(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
-+#define DEF_LDA(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
-+{ __THIS__.A = KM_LD(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
- DEF_LDA(A1,NP,KA_INDX) /* A1 - LDA - (Indirect,X) */
- DEF_LDA(A5,ZP,KA_ZP) /* A5 - LDA - Zero Page */
- DEF_LDA(A9,NP,KA_IMM) /* A9 - LDA - Immediate */
-@@ -668,8 +668,8 @@
- #endif
-
- /* --- LDX --- */
--#define DEF_LDX(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
--{ __THIS__.X = KM_LD(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
-+#define DEF_LDX(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
-+{ __THIS__.X = KM_LD(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
- DEF_LDX(A2,NP,KA_IMM) /* A2 - LDX - Immediate */
- DEF_LDX(A6,ZP,KA_ZP) /* A6 - LDX - Zero Page */
- DEF_LDX(AE,NP,KA_ABS) /* AE - LDX - Absolute */
-@@ -677,8 +677,8 @@
- DEF_LDX(BE,NP,KA_ABSY_) /* BE - LDX - Absolute,Y */
-
- /* --- LDY --- */
--#define DEF_LDY(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
--{ __THIS__.Y = KM_LD(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
-+#define DEF_LDY(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
-+{ __THIS__.Y = KM_LD(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
- DEF_LDY(A0,NP,KA_IMM) /* A0 - LDY - Immediate */
- DEF_LDY(A4,ZP,KA_ZP) /* A4 - LDY - Zero Page */
- DEF_LDY(AC,NP,KA_ABS) /* AC - LDY - Absolute */
-@@ -686,10 +686,10 @@
- DEF_LDY(BC,NP,KA_ABSX_) /* BC - LDY - Absolute,X */
-
- /* --- LSR --- */
--#define DEF_LSR(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-+#define DEF_LSR(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
- { \
- Uword adr = a(__THISP); \
-- K_WRITE##p##(__THISP_ adr, KM_LSR(__THISP_ K_READ##p##(__THISP_ adr))); \
-+ K_WRITE##p (__THISP_ adr, KM_LSR(__THISP_ K_READ##p (__THISP_ adr))); \
- }
- DEF_LSR(46,ZP,KA_ZP) /* 46 - LSR - Zero Page */
- DEF_LSR(4E,NP,KA_ABS) /* 4E - LSR - Absolute */
-@@ -705,17 +705,17 @@
-
- /* --- ORA --- */
- #if BUILD_HUC6280
--#define DEF_ORA(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
--{ KM_ORA(__THISP_ K_READ##p##(__THISP_ a(__THISP))); } \
--static void OpcodeCall T_Opco##i##(__CONTEXT) \
-+#define DEF_ORA(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
-+{ KM_ORA(__THISP_ K_READ##p (__THISP_ a(__THISP))); } \
-+static void OpcodeCall T_Opco##i (__CONTEXT) \
- { \
- Uword saveA = KMI_PRET(__THISP); \
-- KM_ORA(__THISP_ K_READ##p##(__THISP_ a(__THISP))); \
-+ KM_ORA(__THISP_ K_READ##p (__THISP_ a(__THISP))); \
- KMI_POSTT(__THISP_ saveA); \
- }
- #else
--#define DEF_ORA(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
--{ KM_ORA(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
-+#define DEF_ORA(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
-+{ KM_ORA(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
- #endif
- DEF_ORA(01,NP,KA_INDX) /* 01 - ORA - (Indirect,X) */
- DEF_ORA(05,ZP,KA_ZP) /* 05 - ORA - Zero Page */
-@@ -751,7 +751,7 @@
-
- #if BUILD_HUC6280
- /* --- RMBi --- */
--#define DEF_RMB(i,y) static void OpcodeCall Opcode##i##(__CONTEXT) \
-+#define DEF_RMB(i,y) static void OpcodeCall Opcode##i (__CONTEXT) \
- { \
- Uword adr = KA_ZP(__THISP); \
- K_WRITEZP(__THISP_ adr, (Uword)(K_READZP(__THISP_ adr) & (~(1 << y)))); \
-@@ -765,7 +765,7 @@
- DEF_RMB(67,6) /* 67 - RMB6 */
- DEF_RMB(77,7) /* 77 - RMB7 */
- /* --- SMBi --- */
--#define DEF_SMB(i,y) static void OpcodeCall Opcode##i##(__CONTEXT) \
-+#define DEF_SMB(i,y) static void OpcodeCall Opcode##i (__CONTEXT) \
- { \
- Uword adr = KA_ZP(__THISP); \
- K_WRITEZP(__THISP_ adr, (Uword)(K_READZP(__THISP_ adr) | (1 << y))); \
-@@ -781,10 +781,10 @@
- #endif
-
- /* --- ROL --- */
--#define DEF_ROL(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-+#define DEF_ROL(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
- { \
- Uword adr = a(__THISP); \
-- K_WRITE##p##(__THISP_ adr, KM_ROL(__THISP_ K_READ##p##(__THISP_ adr))); \
-+ K_WRITE##p (__THISP_ adr, KM_ROL(__THISP_ K_READ##p (__THISP_ adr))); \
- }
- DEF_ROL(26,ZP,KA_ZP) /* 26 - ROL - Zero Page */
- DEF_ROL(2E,NP,KA_ABS) /* 2E - ROL - Absolute */
-@@ -794,10 +794,10 @@
- { __THIS__.A = KM_ROL(__THISP_ __THIS__.A); }
-
- /* --- ROR --- */
--#define DEF_ROR(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-+#define DEF_ROR(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
- { \
- Uword adr = a(__THISP); \
-- K_WRITE##p##(__THISP_ adr, KM_ROR(__THISP_ K_READ##p##(__THISP_ adr))); \
-+ K_WRITE##p (__THISP_ adr, KM_ROR(__THISP_ K_READ##p (__THISP_ adr))); \
- }
- DEF_ROR(66,ZP,KA_ZP) /* 66 - ROR - Zero Page */
- DEF_ROR(6E,NP,KA_ABS) /* 6E - ROR - Absolute */
-@@ -841,10 +841,10 @@
- #endif
-
- /* --- SBC --- */
--#define DEF_SBC(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
--{ KMI_SBC(__THISP_ K_READ##p##(__THISP_ a(__THISP))); } \
--static void OpcodeCall D_Opco##i##(__CONTEXT) \
--{ KMI_SBC_D(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
-+#define DEF_SBC(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
-+{ KMI_SBC(__THISP_ K_READ##p (__THISP_ a(__THISP))); } \
-+static void OpcodeCall D_Opco##i (__CONTEXT) \
-+{ KMI_SBC_D(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
- DEF_SBC(E1,NP,KA_INDX) /* E1 - SBC - (Indirect,X) */
- DEF_SBC(E5,ZP,KA_ZP) /* E5 - SBC - Zero Page */
- DEF_SBC(E9,NP,KA_IMM) /* E9 - SBC - Immediate */
-@@ -883,8 +883,8 @@
- #endif
-
- /* --- STA --- */
--#define DEF_STA(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
--{ K_WRITE##p##(__THISP_ a(__THISP), __THIS__.A); }
-+#define DEF_STA(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
-+{ K_WRITE##p (__THISP_ a(__THISP), __THIS__.A); }
- DEF_STA(81,NP,KA_INDX) /* 81 - STA - (Indirect,X) */
- DEF_STA(85,ZP,KA_ZP) /* 85 - STA - Zero Page */
- DEF_STA(8D,NP,KA_ABS) /* 8D - STA - Absolute */
-@@ -897,23 +897,23 @@
- #endif
-
- /* --- STX --- */
--#define DEF_STX(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
--{ K_WRITE##p##(__THISP_ a(__THISP), __THIS__.X); }
-+#define DEF_STX(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
-+{ K_WRITE##p (__THISP_ a(__THISP), __THIS__.X); }
- DEF_STX(86,ZP,KA_ZP) /* 86 - STX - Zero Page */
- DEF_STX(8E,NP,KA_ABS) /* 8E - STX - Absolute */
- DEF_STX(96,ZP,KA_ZPY) /* 96 - STX - Zero Page,Y */
-
- /* --- STY --- */
--#define DEF_STY(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
--{ K_WRITE##p##(__THISP_ a(__THISP), __THIS__.Y); }
-+#define DEF_STY(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
-+{ K_WRITE##p (__THISP_ a(__THISP), __THIS__.Y); }
- DEF_STY(84,ZP,KA_ZP) /* 84 - STY - Zero Page */
- DEF_STY(8C,NP,KA_ABS) /* 8C - STY - Absolute */
- DEF_STY(94,ZP,KA_ZPX) /* 94 - STY - Zero Page,X */
-
- #if BUILD_HUC6280 || BUILD_M65C02
- /* --- STZ --- */
--#define DEF_STZ(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
--{ K_WRITE##p##(__THISP_ a(__THISP), 0); }
-+#define DEF_STZ(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
-+{ K_WRITE##p (__THISP_ a(__THISP), 0); }
- DEF_STZ(64,ZP,KA_ZP) /* 64 - STZ - Zero Page */
- DEF_STZ(9C,NP,KA_ABS) /* 9C - STZ - Absolute */
- DEF_STZ(74,ZP,KA_ZPX) /* 74 - STZ - Zero Page,X */
-@@ -931,18 +931,18 @@
-
- #if BUILD_HUC6280 || BUILD_M65C02
- /* --- TRB --- */
--#define DEF_TRB(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-+#define DEF_TRB(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
- { \
- Uword adr = a(__THISP); \
-- K_WRITE##p##(__THISP_ adr, KM_TRB(__THISP_ K_READ##p##(__THISP_ adr))); \
-+ K_WRITE##p (__THISP_ adr, KM_TRB(__THISP_ K_READ##p (__THISP_ adr))); \
- }
- DEF_TRB(14,ZP,KA_ZP) /* 14 - TRB - Zero Page */
- DEF_TRB(1C,NP,KA_ABS) /* 1C - TRB - Absolute */
- /* --- TSB --- */
--#define DEF_TSB(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-+#define DEF_TSB(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
- { \
- Uword adr = a(__THISP); \
-- K_WRITE##p##(__THISP_ adr, KM_TSB(__THISP_ K_READ##p##(__THISP_ adr))); \
-+ K_WRITE##p (__THISP_ adr, KM_TSB(__THISP_ K_READ##p (__THISP_ adr))); \
- }
- DEF_TSB(04,ZP,KA_ZP) /* 04 - TSB - Zero Page */
- DEF_TSB(0C,NP,KA_ABS) /* 0C - TSB - Absolute */
-@@ -950,10 +950,10 @@
-
- #if BUILD_HUC6280
- /* --- TST --- */
--#define DEF_TST(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-+#define DEF_TST(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
- { \
- Uword imm = K_READ(__THISP_ KA_IMM(__THISP)); \
-- KM_TST(__THISP_ imm, K_READ##p##(__THISP_ a(__THISP))); \
-+ KM_TST(__THISP_ imm, K_READ##p (__THISP_ a(__THISP))); \
- }
- DEF_TST(83,ZP,KA_ZP) /* 83 - TST - Zero Page */
- DEF_TST(93,NP,KA_ABS) /* 93 - TST - Absolute */
-diff -ur xmms-nsf-0.0.3/src/nes/km6502/km6502ot.h xmms-nsf-0.0.3-gentoo/src/nes/km6502/km6502ot.h
---- xmms-nsf-0.0.3/src/nes/km6502/km6502ot.h 2001-01-07 17:18:05.000000000 +1300
-+++ xmms-nsf-0.0.3-gentoo/src/nes/km6502/km6502ot.h 2003-10-12 20:09:41.000000000 +1300
-@@ -1,35 +1,35 @@
- #define OPxx(i)
- #define OP__(i) \
-- case 0x##i##: \
-- Opcode##i##(__THISP); \
-+ case 0x##i : \
-+ Opcode##i (__THISP); \
- break;
- #define OP_d(i) \
-- case 0x##i##: \
-+ case 0x##i : \
- if (__THIS__.P & D_FLAG) \
-- D_Opco##i##(__THISP); \
-+ D_Opco##i (__THISP); \
- else \
-- Opcode##i##(__THISP); \
-+ Opcode##i (__THISP); \
- break;
- #if BUILD_HUC6280
- #define OPtd(i) \
-- case 0x##i##: \
-+ case 0x##i : \
- if (__THIS__.P & T_FLAG) \
- if (__THIS__.P & D_FLAG) \
-- TD_Opc##i##(__THISP); \
-+ TD_Opc##i (__THISP); \
- else \
-- T_Opco##i##(__THISP); \
-+ T_Opco##i (__THISP); \
- else \
- if (__THIS__.P & D_FLAG) \
-- D_Opco##i##(__THISP); \
-+ D_Opco##i (__THISP); \
- else \
-- Opcode##i##(__THISP); \
-+ Opcode##i (__THISP); \
- break;
- #define OPt_(i) \
-- case 0x##i##: \
-+ case 0x##i : \
- if (__THIS__.P & T_FLAG) \
-- T_Opco##i##(__THISP); \
-+ T_Opco##i (__THISP); \
- else \
-- Opcode##i##(__THISP); \
-+ Opcode##i (__THISP); \
- break;
- #else
- #define OPtd OP_d
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>sound</herd>
-</pkgmetadata>
+++ /dev/null
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-nsf/xmms-nsf-0.0.3-r1.ebuild,v 1.1 2005/11/09 03:25:02 metalgod Exp $
-
-inherit eutils gnuconfig autotools libtool
-
-IUSE=""
-
-DESCRIPTION="An xmms input-plugin for NSF-files (the nintendo 8-bit soundfiles) that uses source from NEZamp."
-HOMEPAGE="http://www.xmms.org/"
-SRC_URI="http://optronic.sourceforge.net/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-#-sparc: 0.0.3: Plays, but not completely... misses notes
-KEYWORDS="~x86 -sparc ~amd64 -ppc"
-
-DEPEND="media-sound/xmms
- =x11-libs/gtk+-1.2*"
-
-src_unpack() {
- unpack ${A}
- cd ${S}
- epatch ${FILESDIR}/${P}-about.patch
- epatch ${FILESDIR}/${P}-gcc3.patch
- epatch ${FILESDIR}/${P}-PIC.patch
-
- gnuconfig_update
-
- export WANT_AUTOMAKE=1.4
- eautomake
- elibtoolize
-}
-
-src_install() {
- make DESTDIR=${D} install || die
- dodoc AUTHORS ChangeLog NEWS README
-}
+++ /dev/null
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-nsf/xmms-nsf-0.0.3-r2.ebuild,v 1.3 2006/09/03 23:03:36 tsunam Exp $
-
-inherit eutils gnuconfig autotools libtool
-
-IUSE=""
-
-DESCRIPTION="An xmms input-plugin for NSF-files (the nintendo 8-bit soundfiles) that uses source from NEZamp."
-HOMEPAGE="http://www.xmms.org/"
-SRC_URI="http://optronic.sourceforge.net/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-#-sparc: 0.0.3: Plays, but not completely... misses notes
-KEYWORDS="amd64 -ppc -sparc x86"
-
-DEPEND="media-sound/xmms
- =x11-libs/gtk+-1.2*"
-
-src_unpack() {
- unpack ${A}
- cd ${S}
- epatch ${FILESDIR}/${P}-about.patch
- epatch ${FILESDIR}/${P}-PIC.patch
- epatch ${FILESDIR}/${P}-compilefixes.patch
-
- gnuconfig_update
-
- export WANT_AUTOMAKE=1.4
- eautomake
- elibtoolize
-}
-
-src_install() {
- make DESTDIR=${D} install || die
- dodoc AUTHORS ChangeLog NEWS README
-}
+++ /dev/null
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-nsf/xmms-nsf-0.0.3.ebuild,v 1.15 2005/09/09 11:30:29 flameeyes Exp $
-
-inherit eutils gnuconfig autotools libtool
-
-IUSE=""
-
-DESCRIPTION="An xmms input-plugin for NSF-files (the nintendo 8-bit soundfiles) that uses source from NEZamp."
-HOMEPAGE="http://www.xmms.org/"
-SRC_URI="http://optronic.sourceforge.net/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-#-sparc: 0.0.3: Plays, but not completely... misses notes
-KEYWORDS="x86 -sparc amd64 -ppc"
-
-DEPEND="media-sound/xmms
- =x11-libs/gtk+-1.2*"
-
-src_unpack() {
- unpack ${A}
- cd ${S}
- epatch ${FILESDIR}/${P}-gcc3.patch
- epatch ${FILESDIR}/${P}-PIC.patch
-
- gnuconfig_update
-
- export WANT_AUTOMAKE=1.4
- eautomake
- elibtoolize
-}
-
-src_install() {
- make DESTDIR=${D} install || die
- dodoc AUTHORS ChangeLog NEWS README
-}
projects / gentoo.git / commitdiff