summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/sound/ym2413.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/sound/ym2413.cpp')
-rw-r--r--src/devices/sound/ym2413.cpp44
1 files changed, 22 insertions, 22 deletions
diff --git a/src/devices/sound/ym2413.cpp b/src/devices/sound/ym2413.cpp
index 505e3385fc6..7573bfa4323 100644
--- a/src/devices/sound/ym2413.cpp
+++ b/src/devices/sound/ym2413.cpp
@@ -98,7 +98,7 @@ to do:
//#define SAVE_SAMPLE
#ifdef SAVE_SAMPLE
-INLINE signed int acc_calc(signed int value)
+static inline signed int acc_calc(signed int value)
{
if (value>=0)
{
@@ -161,7 +161,7 @@ static FILE *sample[1];
#endif
#define LOG_CYM_FILE 0
-static FILE * cymfile = NULL;
+static FILE * cymfile = nullptr;
@@ -280,7 +280,7 @@ struct YM2413
/* table is 3dB/octave, DV converts this into 6dB/octave */
/* 0.1875 is bit 0 weight of the envelope counter (volume) expressed in the 'decibel' scale */
#define DV (0.1875/1.0)
-static const UINT32 ksl_tab[8*16]=
+static const double ksl_tab[8*16]=
{
/* OCT 0 */
0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
@@ -628,7 +628,7 @@ static int num_lock = 0;
#define SLOT8_2 (&chip->P_CH[8].SLOT[SLOT2])
-INLINE int limit( int val, int max, int min )
+static inline int limit( int val, int max, int min )
{
if ( val > max )
val = max;
@@ -640,7 +640,7 @@ INLINE int limit( int val, int max, int min )
/* advance LFO to next sample */
-INLINE void advance_lfo(YM2413 *chip)
+static inline void advance_lfo(YM2413 *chip)
{
/* LFO */
chip->lfo_am_cnt += chip->lfo_am_inc;
@@ -654,7 +654,7 @@ INLINE void advance_lfo(YM2413 *chip)
}
/* advance to next sample */
-INLINE void advance(YM2413 *chip)
+static inline void advance(YM2413 *chip)
{
OPLL_CH *CH;
OPLL_SLOT *op;
@@ -883,7 +883,7 @@ INLINE void advance(YM2413 *chip)
}
-INLINE signed int op_calc(UINT32 phase, unsigned int env, signed int pm, unsigned int wave_tab)
+static inline signed int op_calc(UINT32 phase, unsigned int env, signed int pm, unsigned int wave_tab)
{
UINT32 p;
@@ -894,7 +894,7 @@ INLINE signed int op_calc(UINT32 phase, unsigned int env, signed int pm, unsigne
return tl_tab[p];
}
-INLINE signed int op_calc1(UINT32 phase, unsigned int env, signed int pm, unsigned int wave_tab)
+static inline signed int op_calc1(UINT32 phase, unsigned int env, signed int pm, unsigned int wave_tab)
{
UINT32 p;
INT32 i;
@@ -916,7 +916,7 @@ INLINE signed int op_calc1(UINT32 phase, unsigned int env, signed int pm, unsign
#define volume_calc(OP) ((OP)->TLL + ((UINT32)(OP)->volume) + (chip->LFO_AM & (OP)->AMmask))
/* calculate output */
-INLINE void chan_calc( YM2413 *chip, OPLL_CH *CH )
+static inline void chan_calc( YM2413 *chip, OPLL_CH *CH )
{
OPLL_SLOT *SLOT;
unsigned int env;
@@ -993,7 +993,7 @@ number number BLK/FNUM2 FNUM Drum Hat Drum Tom Cymbal
/* calculate rhythm */
-INLINE void rhythm_calc( YM2413 *chip, OPLL_CH *CH, unsigned int noise )
+static inline void rhythm_calc( YM2413 *chip, OPLL_CH *CH, unsigned int noise )
{
OPLL_SLOT *SLOT;
signed int out;
@@ -1367,7 +1367,7 @@ static void OPLL_initalize(YM2413 *chip, device_t *device)
logerror("ym2413.c: ksl_tab[oct=%2i] =",i);
for (j=0; j<16; j++)
{
- logerror("%08x ", ksl_tab[i*16+j] );
+ logerror("%08x ", static_cast<UINT32>(ksl_tab[i*16+j]) );
}
logerror("\n");
}
@@ -1392,7 +1392,7 @@ static void OPLL_initalize(YM2413 *chip, device_t *device)
/*logerror("YM2413init eg_timer_add=%8x eg_timer_overflow=%8x\n", chip->eg_timer_add, chip->eg_timer_overflow);*/
}
-INLINE void KEY_ON(OPLL_SLOT *SLOT, UINT32 key_set)
+static inline void KEY_ON(OPLL_SLOT *SLOT, UINT32 key_set)
{
if( !SLOT->key )
{
@@ -1403,7 +1403,7 @@ INLINE void KEY_ON(OPLL_SLOT *SLOT, UINT32 key_set)
SLOT->key |= key_set;
}
-INLINE void KEY_OFF(OPLL_SLOT *SLOT, UINT32 key_clr)
+static inline void KEY_OFF(OPLL_SLOT *SLOT, UINT32 key_clr)
{
if( SLOT->key )
{
@@ -1419,7 +1419,7 @@ INLINE void KEY_OFF(OPLL_SLOT *SLOT, UINT32 key_clr)
}
/* update phase increment counter of operator (also update the EG rates if necessary) */
-INLINE void CALC_FCSLOT(OPLL_CH *CH,OPLL_SLOT *SLOT)
+static inline void CALC_FCSLOT(OPLL_CH *CH,OPLL_SLOT *SLOT)
{
int ksr;
UINT32 SLOT_rs;
@@ -1465,7 +1465,7 @@ INLINE void CALC_FCSLOT(OPLL_CH *CH,OPLL_SLOT *SLOT)
}
/* set multi,am,vib,EG-TYP,KSR,mul */
-INLINE void set_mul(YM2413 *chip,int slot,int v)
+static inline void set_mul(YM2413 *chip,int slot,int v)
{
OPLL_CH *CH = &chip->P_CH[slot/2];
OPLL_SLOT *SLOT = &CH->SLOT[slot&1];
@@ -1479,7 +1479,7 @@ INLINE void set_mul(YM2413 *chip,int slot,int v)
}
/* set ksl, tl */
-INLINE void set_ksl_tl(YM2413 *chip,int chan,int v)
+static inline void set_ksl_tl(YM2413 *chip,int chan,int v)
{
OPLL_CH *CH = &chip->P_CH[chan];
/* modulator */
@@ -1491,7 +1491,7 @@ INLINE void set_ksl_tl(YM2413 *chip,int chan,int v)
}
/* set ksl , waveforms, feedback */
-INLINE void set_ksl_wave_fb(YM2413 *chip,int chan,int v)
+static inline void set_ksl_wave_fb(YM2413 *chip,int chan,int v)
{
OPLL_CH *CH = &chip->P_CH[chan];
/* modulator */
@@ -1509,7 +1509,7 @@ INLINE void set_ksl_wave_fb(YM2413 *chip,int chan,int v)
}
/* set attack rate & decay rate */
-INLINE void set_ar_dr(YM2413 *chip,int slot,int v)
+static inline void set_ar_dr(YM2413 *chip,int slot,int v)
{
OPLL_CH *CH = &chip->P_CH[slot/2];
OPLL_SLOT *SLOT = &CH->SLOT[slot&1];
@@ -1533,7 +1533,7 @@ INLINE void set_ar_dr(YM2413 *chip,int slot,int v)
}
/* set sustain level & release rate */
-INLINE void set_sl_rr(YM2413 *chip,int slot,int v)
+static inline void set_sl_rr(YM2413 *chip,int slot,int v)
{
OPLL_CH *CH = &chip->P_CH[slot/2];
OPLL_SLOT *SLOT = &CH->SLOT[slot&1];
@@ -1839,7 +1839,7 @@ static void OPLLWriteReg(YM2413 *chip, int r, int v)
/* BLK 2,1,0 bits -> bits 3,2,1 of kcode, FNUM MSB -> kcode LSB */
CH->kcode = (block_fnum&0x0f00)>>8;
- CH->ksl_base = ksl_tab[block_fnum>>5];
+ CH->ksl_base = static_cast<UINT32>(ksl_tab[block_fnum>>5]);
block_fnum = block_fnum * 2;
block = (block_fnum&0x1c00) >> 10;
@@ -1956,7 +1956,7 @@ static void OPLL_UnLockTable(void)
if (cymfile)
fclose (cymfile);
- cymfile = NULL;
+ cymfile = nullptr;
}
static void OPLLResetChip(YM2413 *chip)
@@ -2005,7 +2005,7 @@ static YM2413 *OPLLCreate(device_t *device, int clock, int rate)
{
YM2413 *chip;
- if (OPLL_LockTable(device) == -1) return NULL;
+ if (OPLL_LockTable(device) == -1) return nullptr;
/* allocate memory block */
chip = auto_alloc_clear(device->machine(), YM2413);