Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-23 08:49:55 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

ym2413.cpp: initialize stuff in the constructor (nw)

Browse Source
This commit is contained in:
Ivan Vangelista 2019-11-27 18:52:49 +01:00
parent c17c665bbe
commit fe48091d60
2 changed files with 61 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/devices/sound/ym2413.cpp
View File

@ -2,8 +2,8 @@
// copyright-holders:Jarek Burczynski, Ernesto Corvi
/*
**
** File: ym2413.c - software implementation of YM2413
** FM sound generator type OPLL
** File: ym2413.cpp - software implementation of YM2413
** FM sound generator type OPLL
**
** Copyright Jarek Burczynski
**
@ -1742,11 +1742,34 @@ ym2413_device::ym2413_device(const machine_config &mconfig, const char *tag, dev
ym2413_device::ym2413_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, type, tag, owner, clock)
, device_sound_interface(mconfig, *this)
, eg_cnt(0)
, eg_timer(0)
, eg_timer_add(0)
, eg_timer_overflow(0)
, rhythm(0)
, LFO_AM(0)
, LFO_PM(0)
, lfo_am_cnt(0)
, lfo_am_inc(0)
, lfo_pm_cnt(0)
, lfo_pm_inc(0)
, noise_rng(0)
, noise_p(0)
, noise_f(0)
, address(0)
{
for (int i = 0; i < 19; i++)
{
std::fill_n(&m_inst_table[i][0], 8, 0);
std::fill_n(&inst_tab[i][0], 8, 0);
}
std::fill(std::begin(tl_tab), std::end(tl_tab), 0);
std::fill(std::begin(sin_tab), std::end(sin_tab), 0);
std::fill(std::begin(instvol_r), std::end(instvol_r), 0);
std::fill(std::begin(fn_tab), std::end(fn_tab), 0);
std::fill(std::begin(output), std::end(output), 0);
}
DEFINE_DEVICE_TYPE(VRC7, vrc7snd_device, "vrc7snd", "Konami VRC7 (Sound)")

72
src/devices/sound/ym2413.h
View File

@ -32,58 +32,58 @@ protected:
private:
struct OPLL_SLOT
{
uint32_t ar; /* attack rate: AR<<2 */
uint32_t dr; /* decay rate: DR<<2 */
uint32_t rr; /* release rate:RR<<2 */
uint8_t KSR; /* key scale rate */
uint8_t ksl; /* keyscale level */
uint8_t ksr; /* key scale rate: kcode>>KSR */
uint8_t mul; /* multiple: mul_tab[ML] */
uint32_t ar = 0; /* attack rate: AR<<2 */
uint32_t dr = 0; /* decay rate: DR<<2 */
uint32_t rr = 0; /* release rate:RR<<2 */
uint8_t KSR = 0; /* key scale rate */
uint8_t ksl = 0; /* keyscale level */
uint8_t ksr = 0; /* key scale rate: kcode>>KSR */
uint8_t mul = 0; /* multiple: mul_tab[ML] */
/* Phase Generator */
uint32_t phase; /* frequency counter */
uint32_t freq; /* frequency counter step */
uint8_t fb_shift; /* feedback shift value */
int32_t op1_out[2]; /* slot1 output for feedback */
uint32_t phase = 0; /* frequency counter */
uint32_t freq = 0; /* frequency counter step */
uint8_t fb_shift = 0; /* feedback shift value */
int32_t op1_out[2] = { 0, 0 }; /* slot1 output for feedback */
/* Envelope Generator */
uint8_t eg_type; /* percussive/nonpercussive mode*/
uint8_t state; /* phase type */
uint32_t TL; /* total level: TL << 2 */
int32_t TLL; /* adjusted now TL */
int32_t volume; /* envelope counter */
uint32_t sl; /* sustain level: sl_tab[SL] */
uint8_t eg_type = 0; /* percussive/nonpercussive mode*/
uint8_t state = 0; /* phase type */
uint32_t TL = 0; /* total level: TL << 2 */
int32_t TLL = 0; /* adjusted now TL */
int32_t volume = 0; /* envelope counter */
uint32_t sl = 0; /* sustain level: sl_tab[SL] */
uint8_t eg_sh_dp; /* (dump state) */
uint8_t eg_sel_dp; /* (dump state) */
uint8_t eg_sh_ar; /* (attack state) */
uint8_t eg_sel_ar; /* (attack state) */
uint8_t eg_sh_dr; /* (decay state) */
uint8_t eg_sel_dr; /* (decay state) */
uint8_t eg_sh_rr; /* (release state for non-perc.)*/
uint8_t eg_sel_rr; /* (release state for non-perc.)*/
uint8_t eg_sh_rs; /* (release state for perc.mode)*/
uint8_t eg_sel_rs; /* (release state for perc.mode)*/
uint8_t eg_sh_dp = 0; /* (dump state) */
uint8_t eg_sel_dp = 0; /* (dump state) */
uint8_t eg_sh_ar = 0; /* (attack state) */
uint8_t eg_sel_ar = 0; /* (attack state) */
uint8_t eg_sh_dr = 0; /* (decay state) */
uint8_t eg_sel_dr = 0; /* (decay state) */
uint8_t eg_sh_rr = 0; /* (release state for non-perc.)*/
uint8_t eg_sel_rr = 0; /* (release state for non-perc.)*/
uint8_t eg_sh_rs = 0; /* (release state for perc.mode)*/
uint8_t eg_sel_rs = 0; /* (release state for perc.mode)*/
uint32_t key; /* 0 = KEY OFF, >0 = KEY ON */
uint32_t key = 0; /* 0 = KEY OFF, >0 = KEY ON */
/* LFO */
uint32_t AMmask; /* LFO Amplitude Modulation enable mask */
uint8_t vib; /* LFO Phase Modulation enable flag (active high)*/
uint32_t AMmask = 0; /* LFO Amplitude Modulation enable mask */
uint8_t vib = 0; /* LFO Phase Modulation enable flag (active high)*/
/* waveform select */
unsigned int wavetable;
unsigned int wavetable = 0;
};
struct OPLL_CH
{
OPLL_SLOT SLOT[2];
/* phase generator state */
uint32_t block_fnum; /* block+fnum */
uint32_t fc; /* Freq. freqement base */
uint32_t ksl_base; /* KeyScaleLevel Base step */
uint8_t kcode; /* key code (for key scaling) */
uint8_t sus; /* sus on/off (release speed in percussive mode)*/
uint32_t block_fnum = 0; /* block+fnum */
uint32_t fc = 0; /* Freq. freqement base */
uint32_t ksl_base = 0; /* KeyScaleLevel Base step */
uint8_t kcode = 0; /* key code (for key scaling) */
uint8_t sus = 0; /* sus on/off (release speed in percussive mode)*/
};
enum {