diff options
author | Scott Stone <Tafoid@users.noreply.github.com> | 2017-10-11 20:33:13 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-11 20:33:13 -0400 |
commit | 9bba9dacb66d2f76ec87933f9fdcde7ba60afd17 (patch) | |
tree | 7269e4f1ddef95d7bc0798cda9d732d3eb28f920 | |
parent | 0a6f911618d2c7b00fcb842a10f6d40dd67b078e (diff) | |
parent | 522eec21d653d8c49e9dc96e9075a0438d2581b2 (diff) |
Merge pull request #2713 from DavidHaywood/121017
fix CPS3/STV
-rw-r--r-- | src/devices/cpu/sh/sh2comn.cpp | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/src/devices/cpu/sh/sh2comn.cpp b/src/devices/cpu/sh/sh2comn.cpp index f5d66ae7b3d..fca8070c936 100644 --- a/src/devices/cpu/sh/sh2comn.cpp +++ b/src/devices/cpu/sh/sh2comn.cpp @@ -181,11 +181,8 @@ void sh2_device::sh2_do_dma(int dma) } } - #ifdef USE_TIMER_FOR_DMA - //schedule next DMA callback + //schedule next DMA callback m_dma_current_active_timer[dma]->adjust(cycles_to_attotime(2), dma); - #endif - dmadata = m_program->read_byte(tempsrc); if (!m_dma_kludge_cb.isnull()) dmadata = m_dma_kludge_cb(tempsrc, tempdst, dmadata, m_active_dma_size[dma]); @@ -229,10 +226,8 @@ void sh2_device::sh2_do_dma(int dma) } } - #ifdef USE_TIMER_FOR_DMA - //schedule next DMA callback + //schedule next DMA callback m_dma_current_active_timer[dma]->adjust(cycles_to_attotime(2), dma); - #endif // check: should this really be using read_word_32 / write_word_32? dmadata = m_program->read_word(tempsrc); @@ -276,10 +271,8 @@ void sh2_device::sh2_do_dma(int dma) } } - #ifdef USE_TIMER_FOR_DMA - //schedule next DMA callback + //schedule next DMA callback m_dma_current_active_timer[dma]->adjust(cycles_to_attotime(2), dma); - #endif dmadata = m_program->read_dword(tempsrc); if (!m_dma_kludge_cb.isnull()) dmadata = m_dma_kludge_cb(tempsrc, tempdst, dmadata, m_active_dma_size[dma]); @@ -321,10 +314,8 @@ void sh2_device::sh2_do_dma(int dma) } } - #ifdef USE_TIMER_FOR_DMA - //schedule next DMA callback + //schedule next DMA callback m_dma_current_active_timer[dma]->adjust(cycles_to_attotime(2), dma); - #endif dmadata = m_program->read_dword(tempsrc); if (!m_dma_kludge_cb.isnull()) dmadata = m_dma_kludge_cb(tempsrc, tempdst, dmadata, m_active_dma_size[dma]); @@ -431,10 +422,6 @@ void sh2_device::sh2_dmac_check(int dma) break; } - - - -#ifdef USE_TIMER_FOR_DMA // start DMA timer // fever soccer uses cycle-stealing mode, requiring the CPU to be halted @@ -445,8 +432,6 @@ void sh2_device::sh2_dmac_check(int dma) } m_dma_current_active_timer[dma]->adjust(cycles_to_attotime(2), dma); -#endif - } } else |