diff options
Diffstat (limited to 'src/mame/drivers/mw8080bw.c')
-rw-r--r-- | src/mame/drivers/mw8080bw.c | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/src/mame/drivers/mw8080bw.c b/src/mame/drivers/mw8080bw.c index 27c8b5d4a98..dd7e4793797 100644 --- a/src/mame/drivers/mw8080bw.c +++ b/src/mame/drivers/mw8080bw.c @@ -611,7 +611,7 @@ static CUSTOM_INPUT( tornbase_score_input_r ) static WRITE8_HANDLER( tornbase_io_w ) { - if (offset & 0x01) tornbase_audio_w(space, 0, data); + if (offset & 0x01) tornbase_audio_w(devtag_get_device(space->machine, SOUND, "discrete"), 0, data); if (offset & 0x02) mb14241_0_shift_count_w(space, 0, data); @@ -859,14 +859,14 @@ static UINT8 maze_tone_timing_state; static STATE_POSTLOAD( maze_update_discrete ) { - maze_write_discrete(machine, maze_tone_timing_state); + maze_write_discrete(devtag_get_device(machine, SOUND, "discrete"), maze_tone_timing_state); } static TIMER_CALLBACK( maze_tone_timing_timer_callback ) { maze_tone_timing_state = !maze_tone_timing_state; - maze_write_discrete(machine, maze_tone_timing_state); + maze_write_discrete(devtag_get_device(machine, SOUND, "discrete"), maze_tone_timing_state); } @@ -980,10 +980,10 @@ static ADDRESS_MAP_START( boothill_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x01, 0x01) AM_WRITE(mw8080bw_reversable_shift_count_w) AM_RANGE(0x02, 0x02) AM_WRITE(mb14241_0_shift_data_w) - AM_RANGE(0x03, 0x03) AM_WRITE(boothill_audio_w) + AM_RANGE(0x03, 0x03) AM_DEVWRITE(SOUND, "discrete", boothill_audio_w) AM_RANGE(0x04, 0x04) AM_WRITE(watchdog_reset_w) - AM_RANGE(0x05, 0x05) AM_WRITE(midway_tone_generator_lo_w) - AM_RANGE(0x06, 0x06) AM_WRITE(midway_tone_generator_hi_w) + AM_RANGE(0x05, 0x05) AM_DEVWRITE(SOUND, "discrete", midway_tone_generator_lo_w) + AM_RANGE(0x06, 0x06) AM_DEVWRITE(SOUND, "discrete", midway_tone_generator_hi_w) ADDRESS_MAP_END @@ -1055,7 +1055,7 @@ MACHINE_DRIVER_END static WRITE8_HANDLER( checkmat_io_w ) { - if (offset & 0x01) checkmat_audio_w(space, 0, data); + if (offset & 0x01) checkmat_audio_w(devtag_get_device(space->machine, SOUND, "discrete"), 0, data); if (offset & 0x02) watchdog_reset_w(space, 0, data); } @@ -1212,11 +1212,11 @@ static ADDRESS_MAP_START( desertgu_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x01, 0x01) AM_WRITE(mb14241_0_shift_count_w) AM_RANGE(0x02, 0x02) AM_WRITE(mb14241_0_shift_data_w) - AM_RANGE(0x03, 0x03) AM_WRITE(desertgu_audio_1_w) + AM_RANGE(0x03, 0x03) AM_DEVWRITE(SOUND, "discrete", desertgu_audio_1_w) AM_RANGE(0x04, 0x04) AM_WRITE(watchdog_reset_w) - AM_RANGE(0x05, 0x05) AM_WRITE(midway_tone_generator_lo_w) - AM_RANGE(0x06, 0x06) AM_WRITE(midway_tone_generator_hi_w) - AM_RANGE(0x07, 0x07) AM_WRITE(desertgu_audio_2_w) + AM_RANGE(0x05, 0x05) AM_DEVWRITE(SOUND, "discrete", midway_tone_generator_lo_w) + AM_RANGE(0x06, 0x06) AM_DEVWRITE(SOUND, "discrete", midway_tone_generator_hi_w) + AM_RANGE(0x07, 0x07) AM_DEVWRITE(SOUND, "discrete", desertgu_audio_2_w) ADDRESS_MAP_END @@ -1332,10 +1332,10 @@ static ADDRESS_MAP_START( dplay_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x01, 0x01) AM_WRITE(mb14241_0_shift_count_w) AM_RANGE(0x02, 0x02) AM_WRITE(mb14241_0_shift_data_w) - AM_RANGE(0x03, 0x03) AM_WRITE(dplay_audio_w) + AM_RANGE(0x03, 0x03) AM_DEVWRITE(SOUND, "discrete", dplay_audio_w) AM_RANGE(0x04, 0x04) AM_WRITE(watchdog_reset_w) - AM_RANGE(0x05, 0x05) AM_WRITE(midway_tone_generator_lo_w) - AM_RANGE(0x06, 0x06) AM_WRITE(midway_tone_generator_hi_w) + AM_RANGE(0x05, 0x05) AM_DEVWRITE(SOUND, "discrete", midway_tone_generator_lo_w) + AM_RANGE(0x06, 0x06) AM_DEVWRITE(SOUND, "discrete", midway_tone_generator_hi_w) ADDRESS_MAP_END @@ -1720,9 +1720,9 @@ static ADDRESS_MAP_START( clowns_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x02, 0x02) AM_WRITE(mb14241_0_shift_data_w) AM_RANGE(0x03, 0x03) AM_WRITE(clowns_audio_1_w) AM_RANGE(0x04, 0x04) AM_WRITE(watchdog_reset_w) - AM_RANGE(0x05, 0x05) AM_WRITE(midway_tone_generator_lo_w) - AM_RANGE(0x06, 0x06) AM_WRITE(midway_tone_generator_hi_w) - AM_RANGE(0x07, 0x07) AM_WRITE(clowns_audio_2_w) + AM_RANGE(0x05, 0x05) AM_DEVWRITE(SOUND, "discrete", midway_tone_generator_lo_w) + AM_RANGE(0x06, 0x06) AM_DEVWRITE(SOUND, "discrete", midway_tone_generator_hi_w) + AM_RANGE(0x07, 0x07) AM_DEVWRITE(SOUND, "discrete", clowns_audio_2_w) ADDRESS_MAP_END @@ -1933,8 +1933,8 @@ static ADDRESS_MAP_START( dogpatch_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x02, 0x02) AM_WRITE(mb14241_0_shift_data_w) AM_RANGE(0x03, 0x03) AM_WRITE(dogpatch_audio_w) AM_RANGE(0x04, 0x04) AM_WRITE(watchdog_reset_w) - AM_RANGE(0x05, 0x05) AM_WRITE(midway_tone_generator_lo_w) - AM_RANGE(0x06, 0x06) AM_WRITE(midway_tone_generator_hi_w) + AM_RANGE(0x05, 0x05) AM_DEVWRITE(SOUND, "discrete", midway_tone_generator_lo_w) + AM_RANGE(0x06, 0x06) AM_DEVWRITE(SOUND, "discrete", midway_tone_generator_hi_w) ADDRESS_MAP_END @@ -2065,13 +2065,13 @@ static WRITE8_HANDLER( spcenctr_io_w ) watchdog_reset_w(space, 0, data); /* - - - - - 0 1 0 */ else if ((offset & 0x5f) == 0x01) - spcenctr_audio_1_w(space, 0, data); /* - 0 - 0 0 0 0 1 */ + spcenctr_audio_1_w(devtag_get_device(space->machine, SOUND, "discrete"), 0, data); /* - 0 - 0 0 0 0 1 */ else if ((offset & 0x5f) == 0x09) - spcenctr_audio_2_w(space, 0, data); /* - 0 - 0 1 0 0 1 */ + spcenctr_audio_2_w(devtag_get_device(space->machine, SOUND, "discrete"), 0, data); /* - 0 - 0 1 0 0 1 */ else if ((offset & 0x5f) == 0x11) - spcenctr_audio_3_w(space, 0, data); /* - 0 - 1 0 0 0 1 */ + spcenctr_audio_3_w(devtag_get_device(space->machine, SOUND, "discrete"), 0, data); /* - 0 - 1 0 0 0 1 */ else if ((offset & 0x07) == 0x03) { /* - - - - - 0 1 1 */ @@ -2343,7 +2343,7 @@ static ADDRESS_MAP_START( bowler_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x01, 0x01) AM_WRITE(mb14241_0_shift_count_w) AM_RANGE(0x02, 0x02) AM_WRITE(mb14241_0_shift_data_w) AM_RANGE(0x04, 0x04) AM_WRITE(watchdog_reset_w) - AM_RANGE(0x05, 0x05) AM_WRITE(bowler_audio_1_w) + AM_RANGE(0x05, 0x05) AM_DEVWRITE(SOUND, "discrete", bowler_audio_1_w) AM_RANGE(0x06, 0x06) AM_WRITE(bowler_audio_2_w) AM_RANGE(0x07, 0x07) AM_WRITE(bowler_lights_1_w) AM_RANGE(0x08, 0x08) AM_WRITE(bowler_audio_3_w) @@ -2539,9 +2539,9 @@ static ADDRESS_MAP_START( invaders_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x03, 0x03) AM_MIRROR(0x04) AM_READ(mb14241_0_shift_result_r) AM_RANGE(0x02, 0x02) AM_WRITE(mb14241_0_shift_count_w) - AM_RANGE(0x03, 0x03) AM_WRITE(invaders_audio_1_w) + AM_RANGE(0x03, 0x03) AM_DEVWRITE(SOUND, "discrete", invaders_audio_1_w) AM_RANGE(0x04, 0x04) AM_WRITE(mb14241_0_shift_data_w) - AM_RANGE(0x05, 0x05) AM_WRITE(invaders_audio_2_w) + AM_RANGE(0x05, 0x05) AM_DEVWRITE(SOUND, "discrete", invaders_audio_2_w) AM_RANGE(0x06, 0x06) AM_WRITE(watchdog_reset_w) ADDRESS_MAP_END @@ -2668,7 +2668,7 @@ static ADDRESS_MAP_START( blueshrk_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x01, 0x01) AM_WRITE(mb14241_0_shift_count_w) AM_RANGE(0x02, 0x02) AM_WRITE(mb14241_0_shift_data_w) - AM_RANGE(0x03, 0x03) AM_WRITE(blueshrk_audio_w) + AM_RANGE(0x03, 0x03) AM_DEVWRITE(SOUND, "discrete", blueshrk_audio_w) AM_RANGE(0x04, 0x04) AM_WRITE(watchdog_reset_w) ADDRESS_MAP_END @@ -2744,13 +2744,13 @@ static ADDRESS_MAP_START( invad2ct_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x02, 0x02) AM_MIRROR(0x04) AM_READ_PORT("IN2") AM_RANGE(0x03, 0x03) AM_MIRROR(0x04) AM_READ(mb14241_0_shift_result_r) - AM_RANGE(0x01, 0x01) AM_WRITE(invad2ct_audio_3_w) + AM_RANGE(0x01, 0x01) AM_DEVWRITE(SOUND, "discrete", invad2ct_audio_3_w) AM_RANGE(0x02, 0x02) AM_WRITE(mb14241_0_shift_count_w) - AM_RANGE(0x03, 0x03) AM_WRITE(invad2ct_audio_1_w) + AM_RANGE(0x03, 0x03) AM_DEVWRITE(SOUND, "discrete", invad2ct_audio_1_w) AM_RANGE(0x04, 0x04) AM_WRITE(mb14241_0_shift_data_w) - AM_RANGE(0x05, 0x05) AM_WRITE(invad2ct_audio_2_w) + AM_RANGE(0x05, 0x05) AM_DEVWRITE(SOUND, "discrete", invad2ct_audio_2_w) AM_RANGE(0x06, 0x06) AM_WRITE(watchdog_reset_w) - AM_RANGE(0x07, 0x07) AM_WRITE(invad2ct_audio_4_w) + AM_RANGE(0x07, 0x07) AM_DEVWRITE(SOUND, "discrete", invad2ct_audio_4_w) ADDRESS_MAP_END |