diff --git a/src/emu/cpu/arm7/arm7.c b/src/emu/cpu/arm7/arm7.c index d80328bfb40..8652f971135 100644 --- a/src/emu/cpu/arm7/arm7.c +++ b/src/emu/cpu/arm7/arm7.c @@ -190,7 +190,7 @@ INLINE UINT32 arm7_tlb_translate(arm_state *cpustate, UINT32 vaddr) static CPU_TRANSLATE( arm7 ) { - arm_state *cpustate = (device != NULL) ? device->token : NULL; + arm_state *cpustate = (device != NULL) ? (arm_state *)device->token : NULL; /* only applies to the program address space and only does something if the MMU's enabled */ if( space == ADDRESS_SPACE_PROGRAM && ( COPRO_CTRL & COPRO_CTRL_MMU_EN ) ) @@ -228,7 +228,7 @@ static CPU_INIT( arm7 ) static CPU_RESET( arm7 ) { - arm_state *cpustate = device->token; + arm_state *cpustate = get_safe_token(device); // must call core reset arm7_core_reset(device); @@ -239,7 +239,7 @@ static CPU_RESET( arm7 ) static CPU_RESET( arm9 ) { - arm_state *cpustate = device->token; + arm_state *cpustate = get_safe_token(device); // must call core reset arm7_core_reset(device); @@ -250,7 +250,7 @@ static CPU_RESET( arm9 ) static CPU_RESET( pxa255 ) { - arm_state *cpustate = device->token; + arm_state *cpustate = get_safe_token(device); // must call core reset arm7_core_reset(device); @@ -574,7 +574,7 @@ static WRITE32_DEVICE_HANDLER( arm7_do_callback ) static READ32_DEVICE_HANDLER( arm7_rt_r_callback ) { - arm_state *cpustate = device->token; + arm_state *cpustate = get_safe_token(device); UINT32 opcode = offset; UINT8 cReg = ( opcode & INSN_COPRO_CREG ) >> INSN_COPRO_CREG_SHIFT; UINT8 op2 = ( opcode & INSN_COPRO_OP2 ) >> INSN_COPRO_OP2_SHIFT; @@ -717,7 +717,7 @@ static READ32_DEVICE_HANDLER( arm7_rt_r_callback ) static WRITE32_DEVICE_HANDLER( arm7_rt_w_callback ) { - arm_state *cpustate = device->token; + arm_state *cpustate = get_safe_token(device); UINT32 opcode = offset; UINT8 cReg = ( opcode & INSN_COPRO_CREG ) >> INSN_COPRO_CREG_SHIFT; UINT8 op2 = ( opcode & INSN_COPRO_OP2 ) >> INSN_COPRO_OP2_SHIFT; diff --git a/src/emu/cpu/tms0980/tms0980.c b/src/emu/cpu/tms0980/tms0980.c index 0e10a5c2775..399653ee569 100644 --- a/src/emu/cpu/tms0980/tms0980.c +++ b/src/emu/cpu/tms0980/tms0980.c @@ -474,8 +474,8 @@ static CPU_RESET( tms0980 ) */ INLINE UINT8 tms0980_next_pc( UINT8 pc ) { - UINT8 xor = ( pc & 0x3F ) == 0x3F ? 1 : 0; - UINT8 new_bit = ( ( pc ^ ( pc << 1 ) ) & 0x40 ) ? xor : 1 - xor; + UINT8 xorval = ( pc & 0x3F ) == 0x3F ? 1 : 0; + UINT8 new_bit = ( ( pc ^ ( pc << 1 ) ) & 0x40 ) ? xorval : 1 - xorval; return ( pc << 1 ) | new_bit; } diff --git a/src/emu/sound/okim6295.c b/src/emu/sound/okim6295.c index 5e3ff8c23e1..d528771797f 100644 --- a/src/emu/sound/okim6295.c +++ b/src/emu/sound/okim6295.c @@ -411,7 +411,7 @@ void okim6295_set_bank_base(const device_config *device, int base) fatalerror("Unable to allocate bank for oki6295 device '%s'", device->tag); /* override our memory map with a bank */ - memory_install_read8_handler(device->space[0], 0x00000, 0x3ffff, 0, 0, SMH_BANK(info->bank_num)); + memory_install_read8_handler(device->space[0], 0x00000, 0x3ffff, 0, 0, (read8_space_func)SMH_BANK(info->bank_num)); } /* if we have a bank number, set the base pointer */ diff --git a/src/mame/drivers/cham24.c b/src/mame/drivers/cham24.c index d0709f414af..7a5baca78ce 100644 --- a/src/mame/drivers/cham24.c +++ b/src/mame/drivers/cham24.c @@ -287,7 +287,7 @@ static MACHINE_START( cham24 ) memcpy(&dst[0xc000], &src[0x0f8000], 0x4000); /* uses 8K swapping, all ROM!*/ - memory_install_readwrite8_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x0000, 0x1fff, 0, 0, SMH_BANK(1), 0); + memory_install_readwrite8_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x0000, 0x1fff, 0, 0, (read8_space_func)SMH_BANK(1), 0); memory_set_bankptr(machine, 1, memory_region(machine, "gfx1")); /* need nametable ram, though. I doubt this uses more than 2k, but it starts up configured for 4 */ diff --git a/src/mame/drivers/galaga.c b/src/mame/drivers/galaga.c index ac3de2990b5..2c454204882 100644 --- a/src/mame/drivers/galaga.c +++ b/src/mame/drivers/galaga.c @@ -782,7 +782,7 @@ static WRITE8_HANDLER( bosco_latch_w ) } } -static CUSTOM_INPUT( shifted_port_r ) { return input_port_read(field->port->machine, param) >> 4; } +static CUSTOM_INPUT( shifted_port_r ) { return input_port_read(field->port->machine, (const char *)param) >> 4; } static WRITE8_DEVICE_HANDLER( out_0 ) { diff --git a/src/mame/drivers/multigam.c b/src/mame/drivers/multigam.c index 23063bd8fba..8772612e20e 100644 --- a/src/mame/drivers/multigam.c +++ b/src/mame/drivers/multigam.c @@ -652,7 +652,7 @@ static MACHINE_START( multigam ) nt_page[3] = nt_ram + 0xc00; memory_install_readwrite8_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x2000, 0x3eff, 0, 0, multigam_nt_r, multigam_nt_w); - memory_install_readwrite8_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x0000, 0x1fff, 0, 0, SMH_BANK(1), 0); + memory_install_readwrite8_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x0000, 0x1fff, 0, 0, (read8_space_func)SMH_BANK(1), 0); memory_set_bankptr(machine, 1, memory_region(machine, "gfx1")); } @@ -666,14 +666,14 @@ static MACHINE_START( multigm3 ) memory_install_readwrite8_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x2000, 0x3eff, 0, 0, multigam_nt_r, multigam_nt_w); - memory_install_readwrite8_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x0000, 0x03ff, 0, 0, SMH_BANK(2), 0); - memory_install_readwrite8_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x0400, 0x07ff, 0, 0, SMH_BANK(3), 0); - memory_install_readwrite8_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x0800, 0x0bff, 0, 0, SMH_BANK(4), 0); - memory_install_readwrite8_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x0c00, 0x0fff, 0, 0, SMH_BANK(5), 0); - memory_install_readwrite8_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x1000, 0x13ff, 0, 0, SMH_BANK(6), 0); - memory_install_readwrite8_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x1400, 0x17ff, 0, 0, SMH_BANK(7), 0); - memory_install_readwrite8_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x1800, 0x1bff, 0, 0, SMH_BANK(8), 0); - memory_install_readwrite8_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x1c00, 0x1fff, 0, 0, SMH_BANK(9), 0); + memory_install_readwrite8_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x0000, 0x03ff, 0, 0, (read8_space_func)SMH_BANK(2), 0); + memory_install_readwrite8_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x0400, 0x07ff, 0, 0, (read8_space_func)SMH_BANK(3), 0); + memory_install_readwrite8_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x0800, 0x0bff, 0, 0, (read8_space_func)SMH_BANK(4), 0); + memory_install_readwrite8_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x0c00, 0x0fff, 0, 0, (read8_space_func)SMH_BANK(5), 0); + memory_install_readwrite8_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x1000, 0x13ff, 0, 0, (read8_space_func)SMH_BANK(6), 0); + memory_install_readwrite8_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x1400, 0x17ff, 0, 0, (read8_space_func)SMH_BANK(7), 0); + memory_install_readwrite8_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x1800, 0x1bff, 0, 0, (read8_space_func)SMH_BANK(8), 0); + memory_install_readwrite8_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x1c00, 0x1fff, 0, 0, (read8_space_func)SMH_BANK(9), 0); set_videorom_bank(machine, 0, 8, 0, 8); }; diff --git a/src/mame/drivers/polepos.c b/src/mame/drivers/polepos.c index eba8d217596..2522e4d2e87 100644 --- a/src/mame/drivers/polepos.c +++ b/src/mame/drivers/polepos.c @@ -347,7 +347,7 @@ static WRITE16_HANDLER( polepos_z8002_nvi_enable_w ) } -static CUSTOM_INPUT( shifted_port_r ) { return input_port_read(field->port->machine, param) >> 4; } +static CUSTOM_INPUT( shifted_port_r ) { return input_port_read(field->port->machine, (const char *)param) >> 4; } static CUSTOM_INPUT( auto_start_r ) { return auto_start_mask; } static WRITE8_DEVICE_HANDLER( out_0 ) diff --git a/src/mame/drivers/tecmo.c b/src/mame/drivers/tecmo.c index 4e6e2b726c4..4649b732a4c 100644 --- a/src/mame/drivers/tecmo.c +++ b/src/mame/drivers/tecmo.c @@ -1088,9 +1088,9 @@ static DRIVER_INIT( backfirt ) tecmo_video_type = 2; /* no MSM */ - memory_install_write8_handler(cputag_get_address_space(machine, "soundcpu", ADDRESS_SPACE_PROGRAM), 0xc000, 0xc000, 0, 0, SMH_NOP); - memory_install_write8_handler(cputag_get_address_space(machine, "soundcpu", ADDRESS_SPACE_PROGRAM), 0xd000, 0xd000, 0, 0, SMH_NOP); - memory_install_write8_handler(cputag_get_address_space(machine, "soundcpu", ADDRESS_SPACE_PROGRAM), 0xe000, 0xe000, 0, 0, SMH_NOP); + memory_install_write8_handler(cputag_get_address_space(machine, "soundcpu", ADDRESS_SPACE_PROGRAM), 0xc000, 0xc000, 0, 0, (write8_space_func)SMH_NOP); + memory_install_write8_handler(cputag_get_address_space(machine, "soundcpu", ADDRESS_SPACE_PROGRAM), 0xd000, 0xd000, 0, 0, (write8_space_func)SMH_NOP); + memory_install_write8_handler(cputag_get_address_space(machine, "soundcpu", ADDRESS_SPACE_PROGRAM), 0xe000, 0xe000, 0, 0, (write8_space_func)SMH_NOP); } diff --git a/src/mame/machine/kaneko16.c b/src/mame/machine/kaneko16.c index f453650a378..4f57d5db376 100644 --- a/src/mame/machine/kaneko16.c +++ b/src/mame/machine/kaneko16.c @@ -655,11 +655,6 @@ int calc3_decompress_table(running_machine* machine, int tabnum, UINT8* dstram, } -static UINT8 calc3_decryption_key_byte; -static UINT8 calc3_unknown; -static UINT8 calc3_mode; -static UINT8 calc3_blocksize_offset; - DRIVER_INIT(calc3_scantables) { UINT8* rom = memory_region(machine,"cpu1"); @@ -677,7 +672,7 @@ DRIVER_INIT(calc3_scantables) for (x=0;x