diff options
Diffstat (limited to 'src/mame/machine/intv.cpp')
-rw-r--r-- | src/mame/machine/intv.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mame/machine/intv.cpp b/src/mame/machine/intv.cpp index 68c3d2bf78f..3604a44b1d8 100644 --- a/src/mame/machine/intv.cpp +++ b/src/mame/machine/intv.cpp @@ -557,7 +557,7 @@ void intv_state::machine_reset() m_maincpu->set_input_line_vector(CP1610_INT_INTR, 0x1004); /* Set initial PC */ - m_maincpu->set_state_int(CP1610_R7, 0x1000); + m_maincpu->set_state_int(cp1610_cpu_device::CP1610_R7, 0x1000); if (m_is_keybd) { @@ -646,8 +646,8 @@ TIMER_CALLBACK_MEMBER(intv_state::intv_btb_fill) uint8_t row = m_backtab_row; //m_maincpu->adjust_icount(-STIC_ROW_FETCH); - for (int column = 0; column < STIC_BACKTAB_WIDTH; column++) - m_stic->write_to_btb(row, column, m_ram16[column + row * STIC_BACKTAB_WIDTH]); + for (int column = 0; column < stic_device::BACKTAB_WIDTH; column++) + m_stic->write_to_btb(row, column, m_ram16[column + row * stic_device::BACKTAB_WIDTH]); m_backtab_row += 1; } @@ -660,16 +660,16 @@ INTERRUPT_GEN_MEMBER(intv_state::intv_interrupt) m_bus_copy_mode = 1; m_backtab_row = 0; - m_maincpu->adjust_icount(-(12*STIC_ROW_BUSRQ+STIC_FRAME_BUSRQ)); // Account for stic cycle stealing - timer_set(m_maincpu->cycles_to_attotime(STIC_VBLANK_END), TIMER_INTV_INTERRUPT_COMPLETE); - for (int row = 0; row < STIC_BACKTAB_HEIGHT; row++) + m_maincpu->adjust_icount(-(12*stic_device::ROW_BUSRQ+stic_device::FRAME_BUSRQ)); // Account for stic cycle stealing + timer_set(m_maincpu->cycles_to_attotime(stic_device::VBLANK_END), TIMER_INTV_INTERRUPT_COMPLETE); + for (int row = 0; row < stic_device::BACKTAB_HEIGHT; row++) { - timer_set(m_maincpu->cycles_to_attotime(STIC_FIRST_FETCH-STIC_FRAME_BUSRQ+STIC_CYCLES_PER_SCANLINE*STIC_Y_SCALE*delay + (STIC_CYCLES_PER_SCANLINE*STIC_Y_SCALE*STIC_CARD_HEIGHT - STIC_ROW_BUSRQ)*row), TIMER_INTV_BTB_FILL); + timer_set(m_maincpu->cycles_to_attotime(stic_device::FIRST_FETCH-stic_device::FRAME_BUSRQ+stic_device::CYCLES_PER_SCANLINE*stic_device::Y_SCALE*delay + (stic_device::CYCLES_PER_SCANLINE*stic_device::Y_SCALE*stic_device::CARD_HEIGHT - stic_device::ROW_BUSRQ)*row), TIMER_INTV_BTB_FILL); } if (delay == 0) { - m_maincpu->adjust_icount(-STIC_ROW_BUSRQ); // extra row fetch occurs if vertical delay == 0 + m_maincpu->adjust_icount(-stic_device::ROW_BUSRQ); // extra row fetch occurs if vertical delay == 0 } m_stic->screenrefresh(); |