diff options
Diffstat (limited to 'src/emu')
-rw-r--r-- | src/emu/cpu/alto2/a2roms.h | 2 | ||||
-rw-r--r-- | src/emu/cpu/e132xs/e132xs.c | 2 | ||||
-rw-r--r-- | src/emu/input.c | 12 | ||||
-rw-r--r-- | src/emu/sound/disc_sys.inc | 4 | ||||
-rw-r--r-- | src/emu/sound/fmopl.c | 10 | ||||
-rw-r--r-- | src/emu/sound/ym2413.c | 10 | ||||
-rw-r--r-- | src/emu/sound/ymf262.c | 10 |
7 files changed, 25 insertions, 25 deletions
diff --git a/src/emu/cpu/alto2/a2roms.h b/src/emu/cpu/alto2/a2roms.h index f1ffba032da..abd218344c9 100644 --- a/src/emu/cpu/alto2/a2roms.h +++ b/src/emu/cpu/alto2/a2roms.h @@ -30,7 +30,7 @@ typedef struct { } prom_load_t; #define ZERO 0 -#define KEEP ~0 +#define KEEP ~0U #define AMAP_DEFAULT {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15} #define AMAP_CONST_PROM {3,2,1,4,5,6,7,0,} diff --git a/src/emu/cpu/e132xs/e132xs.c b/src/emu/cpu/e132xs/e132xs.c index fb156aae200..5c8cdf66b65 100644 --- a/src/emu/cpu/e132xs/e132xs.c +++ b/src/emu/cpu/e132xs/e132xs.c @@ -835,7 +835,7 @@ static const INT32 immediate_values[32] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, - 16, 0, 0, 0, 32, 64, 128, 0x80000000, + 16, 0, 0, 0, 32, 64, 128, -2147483648 /*0x80000000 */, -8, -7, -6, -5, -4, -3, -2, -1 }; diff --git a/src/emu/input.c b/src/emu/input.c index 28337c7cf81..96fa1458368 100644 --- a/src/emu/input.c +++ b/src/emu/input.c @@ -139,7 +139,7 @@ static const code_string_table devclass_token_table[] = { DEVICE_CLASS_MOUSE, "MOUSECODE" }, { DEVICE_CLASS_LIGHTGUN, "GUNCODE" }, { DEVICE_CLASS_JOYSTICK, "JOYCODE" }, - { ~0, "UNKCODE" } + { ~0U, "UNKCODE" } }; // friendly strings for device classes @@ -149,7 +149,7 @@ static const code_string_table devclass_string_table[] = { DEVICE_CLASS_MOUSE, "Mouse" }, { DEVICE_CLASS_LIGHTGUN, "Gun" }, { DEVICE_CLASS_JOYSTICK, "Joy" }, - { ~0, "Unk" } + { ~0U, "Unk" } }; // token strings for item modifiers @@ -161,7 +161,7 @@ static const code_string_table modifier_token_table[] = { ITEM_MODIFIER_RIGHT, "RIGHT" }, { ITEM_MODIFIER_UP, "UP" }, { ITEM_MODIFIER_DOWN, "DOWN" }, - { ~0, "" } + { ~0U, "" } }; // friendly strings for item modifiers @@ -173,7 +173,7 @@ static const code_string_table modifier_string_table[] = { ITEM_MODIFIER_RIGHT, "Right" }, { ITEM_MODIFIER_UP, "Up" }, { ITEM_MODIFIER_DOWN, "Down" }, - { ~0, "" } + { ~0U, "" } }; // token strings for item classes @@ -182,7 +182,7 @@ static const code_string_table itemclass_token_table[] = { ITEM_CLASS_SWITCH, "SWITCH" }, { ITEM_CLASS_ABSOLUTE, "ABSOLUTE" }, { ITEM_CLASS_RELATIVE, "RELATIVE" }, - { ~0, "" } + { ~0U, "" } }; // token strings for standard item ids @@ -411,7 +411,7 @@ static const code_string_table itemid_token_table[] = { ITEM_ID_ADD_RELATIVE15,"ADDREL15" }, { ITEM_ID_ADD_RELATIVE16,"ADDREL16" }, - { ~0, NULL } + { ~0U, NULL } }; diff --git a/src/emu/sound/disc_sys.inc b/src/emu/sound/disc_sys.inc index b3c89188cad..402482bd156 100644 --- a/src/emu/sound/disc_sys.inc +++ b/src/emu/sound/disc_sys.inc @@ -28,8 +28,8 @@ *************************************/ // FIXME -//#undef I64FMT -//#define I64FMT "ll" +#undef I64FMT +#define I64FMT "ll" DISCRETE_START( dso_csvlog ) 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 */ diff --git a/src/emu/sound/ym2413.c b/src/emu/sound/ym2413.c index 3e33f478a41..94d039bae9d 100644 --- a/src/emu/sound/ym2413.c +++ b/src/emu/sound/ym2413.c @@ -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, @@ -447,7 +447,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 @@ -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 ", (UINT32)ksl_tab[i*16+j] ); } logerror("\n"); } @@ -1470,7 +1470,7 @@ 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]; - 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); @@ -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 = (UINT32) ksl_tab[block_fnum>>5]; block_fnum = block_fnum * 2; block = (block_fnum&0x1c00) >> 10; diff --git a/src/emu/sound/ymf262.c b/src/emu/sound/ymf262.c index aeb5df4c682..0f04a97eee1 100644 --- a/src/emu/sound/ymf262.c +++ b/src/emu/sound/ymf262.c @@ -297,7 +297,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, @@ -464,7 +464,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 @@ -1345,7 +1345,7 @@ static void OPL3_initalize(OPL3 *chip) logerror("YMF262.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"); } @@ -1438,7 +1438,7 @@ INLINE void set_mul(OPL3 *chip,int slot,int v) OPL3_CH *CH = &chip->P_CH[slot/2]; OPL3_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); @@ -1959,7 +1959,7 @@ static void OPL3WriteReg(OPL3 *chip, 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 = chip->fn_tab[block_fnum&0x03ff] >> (7-block); /* BLK 2,1,0 bits -> bits 3,2,1 of kcode */ |