etc/furnace
0
0
Fork 0
mirror of https://github.com/tildearrow/furnace.git synced 2024-11-15 17:25:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix divider again, split tone and envelope clock divider

Browse source
This commit is contained in:
cam900 2022-05-07 23:00:22 +09:00
parent 234f418f65
commit 0b0a6dbf28
3 changed files with 21 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/engine/platform/ay8930.cpp
View file

@ -27,7 +27,7 @@
#define rWrite(a,v) if (!skipRegisterWrites) {pendingWrites[a]=v;} #define rWrite(a,v) if (!skipRegisterWrites) {pendingWrites[a]=v;}
#define immWrite2(a,v) if (!skipRegisterWrites) {writes.emplace(a,v); if (dumpWrites) {addWrite(a,v);} } #define immWrite2(a,v) if (!skipRegisterWrites) {writes.emplace(a,v); if (dumpWrites) {addWrite(a,v);} }
#define CHIP_DIVIDER 8 #define CHIP_DIVIDER (clockSel?8:4)
const char* regCheatSheetAY8930[]={ const char* regCheatSheetAY8930[]={
"FreqL_A", "00", "FreqL_A", "00",
@ -651,7 +651,7 @@ void DivPlatformAY8930::setFlags(unsigned int flags) {
chipClock=COLOR_NTSC/2.0; chipClock=COLOR_NTSC/2.0;
break; break;
} }
rate=chipClock/8; rate=chipClock/4;
for (int i=0; i<3; i++) { for (int i=0; i<3; i++) {
oscBuf[i]->rate=rate; oscBuf[i]->rate=rate;
} }

20
src/engine/platform/sound/ay8910.cpp
View file

@ -1061,8 +1061,8 @@ void ay8910_device::sound_stream_update(short** outputs, int outLen)
for (int chan = 0; chan < NUM_CHANNELS; chan++) for (int chan = 0; chan < NUM_CHANNELS; chan++)
{ {
tone = &m_tone[chan]; tone = &m_tone[chan];
const int period = std::max<int>(1,tone->period) << 1; const int period = std::max<int>(1,tone->period) * (m_step_mul << 1);
tone->count += is_expanded_mode() ? 32 : (is_clock_divided() ? 1 : 2); tone->count += is_expanded_mode() ? 32 : ((m_feature & PSG_HAS_EXPANDED_MODE) ? 1 : 2);
while (tone->count >= period) while (tone->count >= period)
{ {
tone->duty_cycle = (tone->duty_cycle - 1) & 0x1f; tone->duty_cycle = (tone->duty_cycle - 1) & 0x1f;
@ -1071,13 +1071,14 @@ void ay8910_device::sound_stream_update(short** outputs, int outLen)
} }
} }
if ((++m_count_noise) >= noise_period()) const int period_noise = noise_period() * m_step_mul;
if ((++m_count_noise) >= period_noise)
{ {
/* toggle the prescaler output. Noise is no different to /* toggle the prescaler output. Noise is no different to
* channels. * channels.
*/ */
m_count_noise = 0; m_count_noise = 0;
m_prescale_noise = (m_prescale_noise + 1) & (is_clock_divided() ? 3 : 1); m_prescale_noise = (m_prescale_noise + 1) & ((m_feature & PSG_HAS_EXPANDED_MODE) ? 3 : 1);
if (is_expanded_mode()) // AY8930 noise generator rate is twice? compares as compatibility mode if (is_expanded_mode()) // AY8930 noise generator rate is twice? compares as compatibility mode
{ {
@ -1114,7 +1115,7 @@ void ay8910_device::sound_stream_update(short** outputs, int outLen)
envelope = &m_envelope[chan]; envelope = &m_envelope[chan];
if (envelope->holding == 0) if (envelope->holding == 0)
{ {
const int period = envelope->period * m_step; const int period = envelope->period * m_env_step_mul;
if ((++envelope->count) >= period) if ((++envelope->count) >= period)
{ {
envelope->count = 0; envelope->count = 0;
@ -1445,7 +1446,8 @@ ay8910_device::ay8910_device(device_type type, unsigned int clock,
m_noise_out(0), m_noise_out(0),
m_mode(0), m_mode(0),
m_env_step_mask((!(feature & PSG_HAS_EXPANDED_MODE)) && (psg_type == PSG_TYPE_AY) ? 0x0f : 0x1f), m_env_step_mask((!(feature & PSG_HAS_EXPANDED_MODE)) && (psg_type == PSG_TYPE_AY) ? 0x0f : 0x1f),
m_step( (feature & PSG_HAS_INTERNAL_DIVIDER) || (psg_type == PSG_TYPE_AY) ? 2 : 1), m_step_mul( (feature & PSG_HAS_INTERNAL_DIVIDER) ? 2 : 1),
m_env_step_mul( (!(feature & PSG_HAS_EXPANDED_MODE)) && (psg_type == PSG_TYPE_AY) ? (m_step_mul << 1) : m_step_mul),
m_zero_is_off( (!(feature & PSG_HAS_EXPANDED_MODE)) && (psg_type == PSG_TYPE_AY) ? 1 : 0), m_zero_is_off( (!(feature & PSG_HAS_EXPANDED_MODE)) && (psg_type == PSG_TYPE_AY) ? 1 : 0),
m_par( (!(feature & PSG_HAS_EXPANDED_MODE)) && (psg_type == PSG_TYPE_AY) ? &ay8910_param : &ym2149_param), m_par( (!(feature & PSG_HAS_EXPANDED_MODE)) && (psg_type == PSG_TYPE_AY) ? &ay8910_param : &ym2149_param),
m_par_env( (!(feature & PSG_HAS_EXPANDED_MODE)) && (psg_type == PSG_TYPE_AY) ? &ay8910_param : &ym2149_param_env), m_par_env( (!(feature & PSG_HAS_EXPANDED_MODE)) && (psg_type == PSG_TYPE_AY) ? &ay8910_param : &ym2149_param_env),
@ -1470,7 +1472,7 @@ void ay8910_device::set_type(psg_type_t psg_type)
if (psg_type == PSG_TYPE_AY) if (psg_type == PSG_TYPE_AY)
{ {
m_env_step_mask = 0x0f; m_env_step_mask = 0x0f;
m_step = is_clock_divided() ? 4 : 2; m_env_step_mul = is_clock_divided() ? 4 : 2;
m_zero_is_off = 1; m_zero_is_off = 1;
m_par = &ay8910_param; m_par = &ay8910_param;
m_par_env = &ay8910_param; m_par_env = &ay8910_param;
@ -1478,11 +1480,13 @@ void ay8910_device::set_type(psg_type_t psg_type)
else else
{ {
m_env_step_mask = 0x1f; m_env_step_mask = 0x1f;
m_step = is_clock_divided() ? 2 : 1; m_env_step_mul = is_clock_divided() ? 2 : 1;
m_zero_is_off = 0; m_zero_is_off = 0;
m_par = &ym2149_param; m_par = &ym2149_param;
m_par_env = &ym2149_param_env; m_par_env = &ym2149_param_env;
} }
if (m_feature & PSG_HAS_EXPANDED_MODE)
m_env_step_mul <<= 1;
} }

14
src/engine/platform/sound/ay8910.h
View file

@ -105,15 +105,14 @@ public:
if (m_feature & PSG_PIN26_IS_CLKSEL) if (m_feature & PSG_PIN26_IS_CLKSEL)
{ {
if (clk_sel) if (clk_sel)
{
m_flags |= YM2149_PIN26_LOW; m_flags |= YM2149_PIN26_LOW;
set_type(m_type);
}
else else
{
m_flags &= ~YM2149_PIN26_LOW; m_flags &= ~YM2149_PIN26_LOW;
set_type(m_type);
} m_step_mul = is_clock_divided() ? 2 : 1;
m_env_step_mul = (!(m_feature & PSG_HAS_EXPANDED_MODE)) && (m_type == PSG_TYPE_AY) ? (m_step_mul << 1) : m_step_mul;
if (m_feature & PSG_HAS_EXPANDED_MODE)
m_env_step_mul <<= 1;
} }
} }
@ -332,7 +331,8 @@ private:
unsigned char m_mode; unsigned char m_mode;
unsigned char m_env_step_mask; unsigned char m_env_step_mask;
/* init parameters ... */ /* init parameters ... */
int m_step; int m_step_mul;
int m_env_step_mul;
int m_zero_is_off; int m_zero_is_off;
unsigned char m_vol_enabled[NUM_CHANNELS]; unsigned char m_vol_enabled[NUM_CHANNELS];
const ay_ym_param *m_par; const ay_ym_param *m_par;