diff options
| author | 2012-01-07 15:51:50 +0000 | |
|---|---|---|
| committer | 2012-01-07 15:51:50 +0000 | |
| commit | 5243fd0d42a6300dce2729c8fb691cd7ed3843fc (patch) | |
| tree | 297b21179f5db7af53a34b41770a9a1480774818 | |
| parent | b9209b1c359d0a18d00bee1457574f75fd25f8d4 (diff) | |
fix nosound regression
| -rw-r--r-- | src/mame/drivers/wiz.c | 38 | ||||
| -rw-r--r-- | src/mame/includes/wiz.h | 4 |
2 files changed, 21 insertions, 21 deletions
diff --git a/src/mame/drivers/wiz.c b/src/mame/drivers/wiz.c index 759ca3bd65f..b9d397fa98e 100644 --- a/src/mame/drivers/wiz.c +++ b/src/mame/drivers/wiz.c @@ -217,11 +217,11 @@ static WRITE8_HANDLER( wiz_coin_counter_w ) coin_counter_w(space->machine(), offset,data); } -static WRITE8_HANDLER( wiz_nmi_mask_w ) +static WRITE8_HANDLER( wiz_main_nmi_mask_w ) { wiz_state *state = space->machine().driver_data<wiz_state>(); - state->m_nmi_mask = data & 1; + state->m_main_nmi_mask = data & 1; } static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 ) @@ -240,7 +240,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 ) AM_RANGE(0xe000, 0xe85f) AM_RAM AM_RANGE(0xf000, 0xf000) AM_READ_PORT("DSW0") AM_RANGE(0xf000, 0xf000) AM_RAM AM_BASE_MEMBER(wiz_state, m_sprite_bank) - AM_RANGE(0xf001, 0xf001) AM_WRITE(wiz_nmi_mask_w) + AM_RANGE(0xf001, 0xf001) AM_WRITE(wiz_main_nmi_mask_w) AM_RANGE(0xf002, 0xf003) AM_WRITE(wiz_palettebank_w) AM_RANGE(0xf004, 0xf005) AM_WRITE(wiz_char_bank_select_w) AM_RANGE(0xf006, 0xf006) AM_WRITE(wiz_flipx_w) @@ -254,11 +254,11 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 ) AM_RANGE(0xf818, 0xf818) AM_WRITE(wiz_bgcolor_w) ADDRESS_MAP_END -static WRITE8_HANDLER( sound_irq_mask_w ) +static WRITE8_HANDLER( wiz_sound_nmi_mask_w ) { wiz_state *state = space->machine().driver_data<wiz_state>(); - state->m_sound_irq_mask = data & 1; + state->m_sound_nmi_mask = data & 1; } @@ -266,20 +266,20 @@ static WRITE8_HANDLER( sound_irq_mask_w ) static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_ROM AM_RANGE(0x2000, 0x23ff) AM_RAM - AM_RANGE(0x3000, 0x3000) AM_READWRITE(soundlatch_r,sound_irq_mask_w) /* Stinger/Scion */ + AM_RANGE(0x3000, 0x3000) AM_READWRITE(soundlatch_r,wiz_sound_nmi_mask_w) /* Stinger/Scion */ AM_RANGE(0x4000, 0x4001) AM_DEVWRITE("8910.3", ay8910_address_data_w) AM_RANGE(0x5000, 0x5001) AM_DEVWRITE("8910.1", ay8910_address_data_w) - AM_RANGE(0x6000, 0x6001) AM_DEVWRITE("8910.2", ay8910_address_data_w) /* Wiz only */ - AM_RANGE(0x7000, 0x7000) AM_READWRITE(soundlatch_r,sound_irq_mask_w) /* Wiz */ + AM_RANGE(0x6000, 0x6001) AM_DEVWRITE("8910.2", ay8910_address_data_w) /* Wiz only */ + AM_RANGE(0x7000, 0x7000) AM_READWRITE(soundlatch_r,wiz_sound_nmi_mask_w) /* Wiz */ ADDRESS_MAP_END static ADDRESS_MAP_START( stinger_sound_map, AS_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_ROM AM_RANGE(0x2000, 0x23ff) AM_RAM - AM_RANGE(0x3000, 0x3000) AM_READWRITE(soundlatch_r,sound_irq_mask_w) /* Stinger/Scion */ + AM_RANGE(0x3000, 0x3000) AM_READWRITE(soundlatch_r,wiz_sound_nmi_mask_w) /* Stinger/Scion */ AM_RANGE(0x5000, 0x5001) AM_DEVWRITE("8910.1", ay8910_address_data_w) - AM_RANGE(0x6000, 0x6001) AM_DEVWRITE("8910.2", ay8910_address_data_w) /* Wiz only */ - AM_RANGE(0x7000, 0x7000) AM_READWRITE(soundlatch_r,sound_irq_mask_w) /* Wiz */ + AM_RANGE(0x6000, 0x6001) AM_DEVWRITE("8910.2", ay8910_address_data_w) /* Wiz only */ + AM_RANGE(0x7000, 0x7000) AM_READWRITE(soundlatch_r,wiz_sound_nmi_mask_w) /* Wiz */ ADDRESS_MAP_END @@ -706,20 +706,20 @@ static MACHINE_RESET( wiz ) state->m_dsc0 = state->m_dsc1 = 1; } -static INTERRUPT_GEN( wiz_vblank_irq ) +static INTERRUPT_GEN( wiz_vblank_interrupt ) { wiz_state *state = device->machine().driver_data<wiz_state>(); - if(state->m_nmi_mask & 1) - device_set_input_line(device,INPUT_LINE_NMI,PULSE_LINE); + if(state->m_main_nmi_mask & 1) + device_set_input_line(device, INPUT_LINE_NMI, PULSE_LINE); } -static INTERRUPT_GEN( sound_timer_irq ) +static INTERRUPT_GEN( wiz_sound_interrupt ) { wiz_state *state = device->machine().driver_data<wiz_state>(); - if(state->m_sound_irq_mask) - device_set_input_line(device, 0, HOLD_LINE); + if(state->m_sound_nmi_mask) + device_set_input_line(device, INPUT_LINE_NMI, PULSE_LINE); } @@ -728,11 +728,11 @@ static MACHINE_CONFIG_START( wiz, wiz_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz ??? */ MCFG_CPU_PROGRAM_MAP(main_map) - MCFG_CPU_VBLANK_INT("screen", wiz_vblank_irq) + MCFG_CPU_VBLANK_INT("screen", wiz_vblank_interrupt) MCFG_CPU_ADD("audiocpu", Z80, 14318000/8) /* ? */ MCFG_CPU_PROGRAM_MAP(sound_map) - MCFG_CPU_PERIODIC_INT(sound_timer_irq,4*60) /* ??? */ + MCFG_CPU_PERIODIC_INT(wiz_sound_interrupt,4*60) /* ??? */ MCFG_MACHINE_RESET( wiz ) diff --git a/src/mame/includes/wiz.h b/src/mame/includes/wiz.h index fc45bab22df..c367b956fec 100644 --- a/src/mame/includes/wiz.h +++ b/src/mame/includes/wiz.h @@ -21,8 +21,8 @@ public: UINT8 *m_spriteram; UINT8 *m_spriteram2; size_t m_spriteram_size; - UINT8 m_nmi_mask; - UINT8 m_sound_irq_mask; + UINT8 m_main_nmi_mask; + UINT8 m_sound_nmi_mask; }; |
