Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-25 22:04:15 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed OPLx key scale level order [Alexey, Phil Bennett]

Browse Source
This commit is contained in:
Phil Bennett 2013-07-22 17:49:24 +00:00
parent 0f6af58847
commit 315cdded93
3 changed files with 43 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/emu/sound/fmopl.c
View File

@ -368,25 +368,29 @@ static const UINT32 ksl_tab[8*16]=
0.000/DV, 0.000/DV, 3.000/DV, 4.875/DV, 0.000/DV, 0.000/DV, 3.000/DV, 4.875/DV,
6.000/DV, 7.125/DV, 7.875/DV, 8.625/DV, 6.000/DV, 7.125/DV, 7.875/DV, 8.625/DV,
9.000/DV, 9.750/DV,10.125/DV,10.500/DV, 9.000/DV, 9.750/DV,10.125/DV,10.500/DV,
10.875/DV,11.250/DV,11.625/DV,12.000/DV, 10.875/DV,11.250/DV,11.625/DV,12.000/DV,
/* OCT 5 */ /* OCT 5 */
0.000/DV, 3.000/DV, 6.000/DV, 7.875/DV, 0.000/DV, 3.000/DV, 6.000/DV, 7.875/DV,
9.000/DV,10.125/DV,10.875/DV,11.625/DV, 9.000/DV,10.125/DV,10.875/DV,11.625/DV,
12.000/DV,12.750/DV,13.125/DV,13.500/DV, 12.000/DV,12.750/DV,13.125/DV,13.500/DV,
13.875/DV,14.250/DV,14.625/DV,15.000/DV, 13.875/DV,14.250/DV,14.625/DV,15.000/DV,
/* OCT 6 */ /* OCT 6 */
0.000/DV, 6.000/DV, 9.000/DV,10.875/DV, 0.000/DV, 6.000/DV, 9.000/DV,10.875/DV,
12.000/DV,13.125/DV,13.875/DV,14.625/DV, 12.000/DV,13.125/DV,13.875/DV,14.625/DV,
15.000/DV,15.750/DV,16.125/DV,16.500/DV, 15.000/DV,15.750/DV,16.125/DV,16.500/DV,
16.875/DV,17.250/DV,17.625/DV,18.000/DV, 16.875/DV,17.250/DV,17.625/DV,18.000/DV,
/* OCT 7 */ /* OCT 7 */
0.000/DV, 9.000/DV,12.000/DV,13.875/DV, 0.000/DV, 9.000/DV,12.000/DV,13.875/DV,
15.000/DV,16.125/DV,16.875/DV,17.625/DV, 15.000/DV,16.125/DV,16.875/DV,17.625/DV,
18.000/DV,18.750/DV,19.125/DV,19.500/DV, 18.000/DV,18.750/DV,19.125/DV,19.500/DV,
19.875/DV,20.250/DV,20.625/DV,21.000/DV 19.875/DV,20.250/DV,20.625/DV,21.000/DV
}; };
#undef DV #undef DV
/* 0 / 3.0 / 1.5 / 6.0 dB/OCT */
static const UINT32 ksl_shift[4] = { 31, 1, 2, 0 };
/* sustain level table (3dB per step) */ /* sustain level table (3dB per step) */
/* 0 - 15: 0, 3, 6, 9,12,15,18,21,24,27,30,33,36,39,42,93 (dB)*/ /* 0 - 15: 0, 3, 6, 9,12,15,18,21,24,27,30,33,36,39,42,93 (dB)*/
#define SC(db) (UINT32) ( db * (2.0/ENV_STEP) ) #define SC(db) (UINT32) ( db * (2.0/ENV_STEP) )
@ -1395,9 +1399,8 @@ INLINE void set_ksl_tl(FM_OPL *OPL,int slot,int v)
{ {
OPL_CH *CH = &OPL->P_CH[slot/2]; OPL_CH *CH = &OPL->P_CH[slot/2];
OPL_SLOT *SLOT = &CH->SLOT[slot&1]; OPL_SLOT *SLOT = &CH->SLOT[slot&1];
int ksl = v>>6; /* 0 / 1.5 / 3.0 / 6.0 dB/OCT */
SLOT->ksl = ksl ? 3-ksl : 31; SLOT->ksl = ksl_shift[v >> 6];
SLOT->TL = (v&0x3f)<<(ENV_BITS-1-7); /* 7 bits TL (bit 6 = always 0) */ SLOT->TL = (v&0x3f)<<(ENV_BITS-1-7); /* 7 bits TL (bit 6 = always 0) */
SLOT->TLL = SLOT->TL + (CH->ksl_base>>SLOT->ksl); SLOT->TLL = SLOT->TL + (CH->ksl_base>>SLOT->ksl);

31
src/emu/sound/ym2413.c
View File

@ -304,25 +304,29 @@ static const UINT32 ksl_tab[8*16]=
0.000/DV, 0.000/DV, 3.000/DV, 4.875/DV, 0.000/DV, 0.000/DV, 3.000/DV, 4.875/DV,
6.000/DV, 7.125/DV, 7.875/DV, 8.625/DV, 6.000/DV, 7.125/DV, 7.875/DV, 8.625/DV,
9.000/DV, 9.750/DV,10.125/DV,10.500/DV, 9.000/DV, 9.750/DV,10.125/DV,10.500/DV,
10.875/DV,11.250/DV,11.625/DV,12.000/DV, 10.875/DV,11.250/DV,11.625/DV,12.000/DV,
/* OCT 5 */ /* OCT 5 */
0.000/DV, 3.000/DV, 6.000/DV, 7.875/DV, 0.000/DV, 3.000/DV, 6.000/DV, 7.875/DV,
9.000/DV,10.125/DV,10.875/DV,11.625/DV, 9.000/DV,10.125/DV,10.875/DV,11.625/DV,
12.000/DV,12.750/DV,13.125/DV,13.500/DV, 12.000/DV,12.750/DV,13.125/DV,13.500/DV,
13.875/DV,14.250/DV,14.625/DV,15.000/DV, 13.875/DV,14.250/DV,14.625/DV,15.000/DV,
/* OCT 6 */ /* OCT 6 */
0.000/DV, 6.000/DV, 9.000/DV,10.875/DV, 0.000/DV, 6.000/DV, 9.000/DV,10.875/DV,
12.000/DV,13.125/DV,13.875/DV,14.625/DV, 12.000/DV,13.125/DV,13.875/DV,14.625/DV,
15.000/DV,15.750/DV,16.125/DV,16.500/DV, 15.000/DV,15.750/DV,16.125/DV,16.500/DV,
16.875/DV,17.250/DV,17.625/DV,18.000/DV, 16.875/DV,17.250/DV,17.625/DV,18.000/DV,
/* OCT 7 */ /* OCT 7 */
0.000/DV, 9.000/DV,12.000/DV,13.875/DV, 0.000/DV, 9.000/DV,12.000/DV,13.875/DV,
15.000/DV,16.125/DV,16.875/DV,17.625/DV, 15.000/DV,16.125/DV,16.875/DV,17.625/DV,
18.000/DV,18.750/DV,19.125/DV,19.500/DV, 18.000/DV,18.750/DV,19.125/DV,19.500/DV,
19.875/DV,20.250/DV,20.625/DV,21.000/DV 19.875/DV,20.250/DV,20.625/DV,21.000/DV
}; };
#undef DV #undef DV
/* 0 / 3.0 / 1.5 / 6.0 dB/OCT */
static const UINT32 ksl_shift[4] = { 31, 1, 2, 0 };
/* sustain level table (3dB per step) */ /* sustain level table (3dB per step) */
/* 0 - 15: 0, 3, 6, 9,12,15,18,21,24,27,30,33,36,39,42,45 (dB)*/ /* 0 - 15: 0, 3, 6, 9,12,15,18,21,24,27,30,33,36,39,42,45 (dB)*/
#define SC(db) (UINT32) ( db * (1.0/ENV_STEP) ) #define SC(db) (UINT32) ( db * (1.0/ENV_STEP) )
@ -1475,14 +1479,11 @@ INLINE void set_mul(YM2413 *chip,int slot,int v)
/* set ksl, tl */ /* set ksl, tl */
INLINE void set_ksl_tl(YM2413 *chip,int chan,int v) INLINE void set_ksl_tl(YM2413 *chip,int chan,int v)
{ {
int ksl;
OPLL_CH *CH = &chip->P_CH[chan]; OPLL_CH *CH = &chip->P_CH[chan];
/* modulator */ /* modulator */
OPLL_SLOT *SLOT = &CH->SLOT[SLOT1]; OPLL_SLOT *SLOT = &CH->SLOT[SLOT1];
ksl = v>>6; /* 0 / 1.5 / 3.0 / 6.0 dB/OCT */ SLOT->ksl = ksl_shift[v >> 6];
SLOT->ksl = ksl ? 3-ksl : 31;
SLOT->TL = (v&0x3f)<<(ENV_BITS-2-7); /* 7 bits TL (bit 6 = always 0) */ SLOT->TL = (v&0x3f)<<(ENV_BITS-2-7); /* 7 bits TL (bit 6 = always 0) */
SLOT->TLL = SLOT->TL + (CH->ksl_base>>SLOT->ksl); SLOT->TLL = SLOT->TL + (CH->ksl_base>>SLOT->ksl);
} }
@ -1490,7 +1491,6 @@ INLINE void set_ksl_tl(YM2413 *chip,int chan,int v)
/* set ksl , waveforms, feedback */ /* set ksl , waveforms, feedback */
INLINE void set_ksl_wave_fb(YM2413 *chip,int chan,int v) INLINE void set_ksl_wave_fb(YM2413 *chip,int chan,int v)
{ {
int ksl;
OPLL_CH *CH = &chip->P_CH[chan]; OPLL_CH *CH = &chip->P_CH[chan];
/* modulator */ /* modulator */
OPLL_SLOT *SLOT = &CH->SLOT[SLOT1]; OPLL_SLOT *SLOT = &CH->SLOT[SLOT1];
@ -1499,9 +1499,8 @@ INLINE void set_ksl_wave_fb(YM2413 *chip,int chan,int v)
/*carrier*/ /*carrier*/
SLOT = &CH->SLOT[SLOT2]; SLOT = &CH->SLOT[SLOT2];
ksl = v>>6; /* 0 / 1.5 / 3.0 / 6.0 dB/OCT */
SLOT->ksl = ksl ? 3-ksl : 31; SLOT->ksl = ksl_shift[v >> 6];
SLOT->TLL = SLOT->TL + (CH->ksl_base>>SLOT->ksl); SLOT->TLL = SLOT->TL + (CH->ksl_base>>SLOT->ksl);
SLOT->wavetable = ((v&0x10)>>4)*SIN_LEN; SLOT->wavetable = ((v&0x10)>>4)*SIN_LEN;

26
src/emu/sound/ymf262.c
View File

@ -321,25 +321,29 @@ static const UINT32 ksl_tab[8*16]=
0.000/DV, 0.000/DV, 3.000/DV, 4.875/DV, 0.000/DV, 0.000/DV, 3.000/DV, 4.875/DV,
6.000/DV, 7.125/DV, 7.875/DV, 8.625/DV, 6.000/DV, 7.125/DV, 7.875/DV, 8.625/DV,
9.000/DV, 9.750/DV,10.125/DV,10.500/DV, 9.000/DV, 9.750/DV,10.125/DV,10.500/DV,
10.875/DV,11.250/DV,11.625/DV,12.000/DV, 10.875/DV,11.250/DV,11.625/DV,12.000/DV,
/* OCT 5 */ /* OCT 5 */
0.000/DV, 3.000/DV, 6.000/DV, 7.875/DV, 0.000/DV, 3.000/DV, 6.000/DV, 7.875/DV,
9.000/DV,10.125/DV,10.875/DV,11.625/DV, 9.000/DV,10.125/DV,10.875/DV,11.625/DV,
12.000/DV,12.750/DV,13.125/DV,13.500/DV, 12.000/DV,12.750/DV,13.125/DV,13.500/DV,
13.875/DV,14.250/DV,14.625/DV,15.000/DV, 13.875/DV,14.250/DV,14.625/DV,15.000/DV,
/* OCT 6 */ /* OCT 6 */
0.000/DV, 6.000/DV, 9.000/DV,10.875/DV, 0.000/DV, 6.000/DV, 9.000/DV,10.875/DV,
12.000/DV,13.125/DV,13.875/DV,14.625/DV, 12.000/DV,13.125/DV,13.875/DV,14.625/DV,
15.000/DV,15.750/DV,16.125/DV,16.500/DV, 15.000/DV,15.750/DV,16.125/DV,16.500/DV,
16.875/DV,17.250/DV,17.625/DV,18.000/DV, 16.875/DV,17.250/DV,17.625/DV,18.000/DV,
/* OCT 7 */ /* OCT 7 */
0.000/DV, 9.000/DV,12.000/DV,13.875/DV, 0.000/DV, 9.000/DV,12.000/DV,13.875/DV,
15.000/DV,16.125/DV,16.875/DV,17.625/DV, 15.000/DV,16.125/DV,16.875/DV,17.625/DV,
18.000/DV,18.750/DV,19.125/DV,19.500/DV, 18.000/DV,18.750/DV,19.125/DV,19.500/DV,
19.875/DV,20.250/DV,20.625/DV,21.000/DV 19.875/DV,20.250/DV,20.625/DV,21.000/DV
}; };
#undef DV #undef DV
/* 0 / 3.0 / 1.5 / 6.0 dB/OCT */
static const UINT32 ksl_shift[4] = { 31, 1, 2, 0 };
/* sustain level table (3dB per step) */ /* sustain level table (3dB per step) */
/* 0 - 15: 0, 3, 6, 9,12,15,18,21,24,27,30,33,36,39,42,93 (dB)*/ /* 0 - 15: 0, 3, 6, 9,12,15,18,21,24,27,30,33,36,39,42,93 (dB)*/
#define SC(db) (UINT32) ( db * (2.0/ENV_STEP) ) #define SC(db) (UINT32) ( db * (2.0/ENV_STEP) )
@ -1498,9 +1502,7 @@ INLINE void set_ksl_tl(OPL3 *chip,int slot,int v)
OPL3_CH *CH = &chip->P_CH[slot/2]; OPL3_CH *CH = &chip->P_CH[slot/2];
OPL3_SLOT *SLOT = &CH->SLOT[slot&1]; OPL3_SLOT *SLOT = &CH->SLOT[slot&1];
int ksl = v>>6; /* 0 / 1.5 / 3.0 / 6.0 dB/OCT */ SLOT->ksl = ksl_shift[v >> 6];
SLOT->ksl = ksl ? 3-ksl : 31;
SLOT->TL = (v&0x3f)<<(ENV_BITS-1-7); /* 7 bits TL (bit 6 = always 0) */ SLOT->TL = (v&0x3f)<<(ENV_BITS-1-7); /* 7 bits TL (bit 6 = always 0) */
if (chip->OPL3_mode & 1) if (chip->OPL3_mode & 1)