summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/sound/fmopl.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/emu/sound/fmopl.c')
-rw-r--r--src/emu/sound/fmopl.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/emu/sound/fmopl.c b/src/emu/sound/fmopl.c
index 98eda602c10..a681de4744c 100644
--- a/src/emu/sound/fmopl.c
+++ b/src/emu/sound/fmopl.c
@@ -344,7 +344,7 @@ static const int slot_array[32]=
/* 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/2.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,
@@ -511,7 +511,7 @@ O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),
/* multiple table */
#define ML 2
-static const UINT8 mul_tab[16]= {
+static const double mul_tab[16]= {
/* 1/2, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,10,12,12,15,15 */
0.50*ML, 1.00*ML, 2.00*ML, 3.00*ML, 4.00*ML, 5.00*ML, 6.00*ML, 7.00*ML,
8.00*ML, 9.00*ML,10.00*ML,10.00*ML,12.00*ML,12.00*ML,15.00*ML,15.00*ML
@@ -1299,7 +1299,7 @@ static void OPL_initalize(FM_OPL *OPL)
logerror("FMOPL.C: ksl_tab[oct=%2i] =",i);
for (j=0; j<16; j++)
{
- logerror("%08x ", ksl_tab[i*16+j] );
+ logerror("%08x ", (UINT32) ksl_tab[i*16+j] );
}
logerror("\n");
}
@@ -1388,7 +1388,7 @@ INLINE void set_mul(FM_OPL *OPL,int slot,int v)
OPL_CH *CH = &OPL->P_CH[slot/2];
OPL_SLOT *SLOT = &CH->SLOT[slot&1];
- SLOT->mul = mul_tab[v&0x0f];
+ SLOT->mul = (UINT8)mul_tab[v&0x0f];
SLOT->KSR = (v&0x10) ? 0 : 2;
SLOT->eg_type = (v&0x20);
SLOT->vib = (v&0x40);
@@ -1674,7 +1674,7 @@ static void OPLWriteReg(FM_OPL *OPL, int r, int v)
CH->block_fnum = block_fnum;
- CH->ksl_base = ksl_tab[block_fnum>>6];
+ CH->ksl_base = (UINT32) ksl_tab[block_fnum>>6];
CH->fc = OPL->fn_tab[block_fnum&0x03ff] >> (7-block);
/* BLK 2,1,0 bits -> bits 3,2,1 of kcode */