aboutsummaryrefslogtreecommitdiff
path: root/source/apu.c
diff options
context:
space:
mode:
Diffstat (limited to 'source/apu.c')
-rw-r--r--source/apu.c114
1 files changed, 3 insertions, 111 deletions
diff --git a/source/apu.c b/source/apu.c
index 81d3688..91453e6 100644
--- a/source/apu.c
+++ b/source/apu.c
@@ -1,93 +1,4 @@
-/*******************************************************************************
- Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.
-
- (c) Copyright 1996 - 2002 Gary Henderson (gary.henderson@ntlworld.com) and
- Jerremy Koot (jkoot@snes9x.com)
-
- (c) Copyright 2001 - 2004 John Weidman (jweidman@slip.net)
-
- (c) Copyright 2002 - 2004 Brad Jorsch (anomie@users.sourceforge.net),
- funkyass (funkyass@spam.shaw.ca),
- Joel Yliluoma (http://iki.fi/bisqwit/)
- Kris Bleakley (codeviolation@hotmail.com),
- Matthew Kendora,
- Nach (n-a-c-h@users.sourceforge.net),
- Peter Bortas (peter@bortas.org) and
- zones (kasumitokoduck@yahoo.com)
-
- C4 x86 assembler and some C emulation code
- (c) Copyright 2000 - 2003 zsKnight (zsknight@zsnes.com),
- _Demo_ (_demo_@zsnes.com), and Nach
-
- C4 C++ code
- (c) Copyright 2003 Brad Jorsch
-
- DSP-1 emulator code
- (c) Copyright 1998 - 2004 Ivar (ivar@snes9x.com), _Demo_, Gary Henderson,
- John Weidman, neviksti (neviksti@hotmail.com),
- Kris Bleakley, Andreas Naive
-
- DSP-2 emulator code
- (c) Copyright 2003 Kris Bleakley, John Weidman, neviksti, Matthew Kendora, and
- Lord Nightmare (lord_nightmare@users.sourceforge.net
-
- OBC1 emulator code
- (c) Copyright 2001 - 2004 zsKnight, pagefault (pagefault@zsnes.com) and
- Kris Bleakley
- Ported from x86 assembler to C by sanmaiwashi
-
- SPC7110 and RTC C++ emulator code
- (c) Copyright 2002 Matthew Kendora with research by
- zsKnight, John Weidman, and Dark Force
-
- S-DD1 C emulator code
- (c) Copyright 2003 Brad Jorsch with research by
- Andreas Naive and John Weidman
-
- S-RTC C emulator code
- (c) Copyright 2001 John Weidman
-
- ST010 C++ emulator code
- (c) Copyright 2003 Feather, Kris Bleakley, John Weidman and Matthew Kendora
-
- Super FX x86 assembler emulator code
- (c) Copyright 1998 - 2003 zsKnight, _Demo_, and pagefault
-
- Super FX C emulator code
- (c) Copyright 1997 - 1999 Ivar, Gary Henderson and John Weidman
-
-
- SH assembler code partly based on x86 assembler code
- (c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se)
-
- (c) Copyright 2014 - 2016 Daniel De Matteis. (UNDER NO CIRCUMSTANCE
- WILL COMMERCIAL RIGHTS EVER BE APPROPRIATED TO ANY PARTY)
-
- Specific ports contains the works of other authors. See headers in
- individual files.
-
- Snes9x homepage: http://www.snes9x.com
-
- Permission to use, copy, modify and distribute Snes9x in both binary and
- source form, for non-commercial purposes, is hereby granted without fee,
- providing that this license information and copyright notice appear with
- all copies and any derived work.
-
- This software is provided 'as-is', without any express or implied
- warranty. In no event shall the authors be held liable for any damages
- arising from the use of this software.
-
- Snes9x is freeware for PERSONAL USE only. Commercial users should
- seek permission of the copyright holders first. Commercial use includes
- charging money for Snes9x or software derived from Snes9x.
-
- The copyright holders request that bug fixes and improvements to the code
- should be forwarded to them so everyone can benefit from the modifications
- in future versions.
-
- Super NES and Super Nintendo Entertainment System are trademarks of
- Nintendo Co., Limited and its subsidiary companies.
-*******************************************************************************/
+#include "../copyright"
#ifndef USE_BLARGG_APU
@@ -127,7 +38,6 @@ uint8_t APUROM [64];
void S9xResetAPU()
{
-
int i, j;
Settings.APUEnabled = Settings.NextAPUEnabled;
@@ -275,7 +185,6 @@ void S9xSetAPUDSP(uint8_t byte)
break;
case APU_KOFF:
- // if (byte)
{
int c;
uint8_t mask = 1;
@@ -289,7 +198,6 @@ void S9xSetAPUDSP(uint8_t byte)
KeyOnPrev &= ~mask;
APU.KeyedChannels &= ~mask;
APU.DSP [APU_KON] &= ~mask;
- //APU.DSP [APU_KOFF] |= mask;
S9xSetSoundKeyOff(c);
}
}
@@ -298,14 +206,12 @@ void S9xSetAPUDSP(uint8_t byte)
{
KeyOnPrev &= ~mask;
APU.KeyedChannels |= mask;
- //APU.DSP [APU_KON] |= mask;
APU.DSP [APU_KOFF] &= ~mask;
APU.DSP [APU_ENDX] &= ~mask;
S9xPlaySample(c);
}
}
}
- //KeyOnPrev=0;
APU.DSP [APU_KOFF] = byte;
return;
case APU_KON:
@@ -323,8 +229,6 @@ void S9xSetAPUDSP(uint8_t byte)
{
KeyOnPrev &= ~mask;
APU.KeyedChannels |= mask;
- //APU.DSP [APU_KON] |= mask;
- //APU.DSP [APU_KOFF] &= ~mask;
APU.DSP [APU_ENDX] &= ~mask;
S9xPlaySample(c);
}
@@ -342,8 +246,6 @@ void S9xSetAPUDSP(uint8_t byte)
case APU_VOL_LEFT + 0x50:
case APU_VOL_LEFT + 0x60:
case APU_VOL_LEFT + 0x70:
- // At Shin Megami Tensei suggestion 6/11/00
- // if (byte != APU.DSP [reg])
{
S9xSetSoundVolume(reg >> 4, (signed char) byte,
(signed char) APU.DSP [reg + 1]);
@@ -357,8 +259,6 @@ void S9xSetAPUDSP(uint8_t byte)
case APU_VOL_RIGHT + 0x50:
case APU_VOL_RIGHT + 0x60:
case APU_VOL_RIGHT + 0x70:
- // At Shin Megami Tensei suggestion 6/11/00
- // if (byte != APU.DSP [reg])
{
S9xSetSoundVolume(reg >> 4, (signed char) APU.DSP [reg - 1],
(signed char) byte);
@@ -374,7 +274,7 @@ void S9xSetAPUDSP(uint8_t byte)
case APU_P_LOW + 0x60:
case APU_P_LOW + 0x70:
S9xSetSoundHertz(reg >> 4,
- ((byte + (APU.DSP [reg + 1] << 8)) & FREQUENCY_MASK) * 8);
+ (((byte + (APU.DSP [reg + 1] << 8)) & FREQUENCY_MASK) * 32000) >> 12);
break;
case APU_P_HIGH + 0x00:
@@ -397,8 +297,6 @@ void S9xSetAPUDSP(uint8_t byte)
case APU_SRCN + 0x50:
case APU_SRCN + 0x60:
case APU_SRCN + 0x70:
- if (byte != APU.DSP [reg])
- S9xSetSoundSample(reg >> 4, byte);
break;
case APU_ADSR1 + 0x00:
@@ -507,8 +405,6 @@ void S9xSetAPUDSP(uint8_t byte)
S9xSetFilterCoefficient(reg >> 4, (signed char) byte);
break;
default:
- // XXX
- //printf ("Write %02x to unknown APU register %02x\n", byte, reg);
break;
}
@@ -613,8 +509,6 @@ void S9xFixEnvelope(int channel, uint8_t gain, uint8_t adsr1, uint8_t adsr2)
void S9xSetAPUControl(uint8_t byte)
{
- //if (byte & 0x40)
- //printf ("*** Special SPC700 timing enabled\n");
if ((byte & 1) != 0 && !APU.TimerEnabled [0])
{
APU.Timer [0] = 0;
@@ -725,11 +619,9 @@ uint8_t S9xGetAPUDSP()
case APU_ENVX + 0x50:
case APU_ENVX + 0x60:
case APU_ENVX + 0x70:
- return ((uint8_t) S9xGetEnvelopeHeight(reg >> 4));
+ return 0;
case APU_ENDX:
- // To fix speech in Magical Drop 2 6/11/00
- // APU.DSP [APU_ENDX] = 0;
break;
default:
break;
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 12:27:49 +0000