diff options
Diffstat (limited to 'src/devices/machine/s3c44b0.cpp')
-rw-r--r-- | src/devices/machine/s3c44b0.cpp | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/devices/machine/s3c44b0.cpp b/src/devices/machine/s3c44b0.cpp index 6d625557933..4321f9acdec 100644 --- a/src/devices/machine/s3c44b0.cpp +++ b/src/devices/machine/s3c44b0.cpp @@ -9,13 +9,11 @@ *******************************************************************************/ #include "emu.h" -#include "machine/s3c44b0.h" +#include "s3c44b0.h" #include "cpu/arm7/arm7.h" -#include "cpu/arm7/arm7core.h" #include "screen.h" -#include <algorithm> #include <cstdarg> @@ -239,7 +237,7 @@ s3c44b0_device::s3c44b0_device(const machine_config &mconfig, const char *tag, d memset(m_zdma, 0, sizeof(s3c44b0_dma_t)*2); memset(m_bdma, 0, sizeof(s3c44b0_dma_t)*2); memset(&m_clkpow, 0, sizeof(s3c44b0_clkpow_t)); - memset(&m_lcd, 0, sizeof(s3c44b0_lcd_t)); + m_lcd.clear(); memset(m_uart, 0, sizeof(s3c44b0_uart_t)*2); memset(&m_sio, 0, sizeof(s3c44b0_sio_t)); memset(&m_pwm, 0, sizeof(s3c44b0_pwm_t)); @@ -891,7 +889,7 @@ void s3c44b0_device::check_pending_irq() m_irq.regs.i_ispr |= (1 << int_type); if (m_irq.line_irq != ASSERT_LINE) { - m_cpu->set_input_line(ARM7_IRQ_LINE, ASSERT_LINE); + m_cpu->set_input_line(arm7_cpu_device::ARM7_IRQ_LINE, ASSERT_LINE); m_irq.line_irq = ASSERT_LINE; } } @@ -899,7 +897,7 @@ void s3c44b0_device::check_pending_irq() { if (m_irq.line_irq != CLEAR_LINE) { - m_cpu->set_input_line(ARM7_IRQ_LINE, CLEAR_LINE); + m_cpu->set_input_line(arm7_cpu_device::ARM7_IRQ_LINE, CLEAR_LINE); m_irq.line_irq = CLEAR_LINE; } } @@ -909,7 +907,7 @@ void s3c44b0_device::check_pending_irq() { if (m_irq.line_fiq != ASSERT_LINE) { - m_cpu->set_input_line(ARM7_FIRQ_LINE, ASSERT_LINE); + m_cpu->set_input_line(arm7_cpu_device::ARM7_FIRQ_LINE, ASSERT_LINE); m_irq.line_fiq = ASSERT_LINE; } } @@ -917,7 +915,7 @@ void s3c44b0_device::check_pending_irq() { if (m_irq.line_fiq != CLEAR_LINE) { - m_cpu->set_input_line(ARM7_FIRQ_LINE, CLEAR_LINE); + m_cpu->set_input_line(arm7_cpu_device::ARM7_FIRQ_LINE, CLEAR_LINE); m_irq.line_fiq = CLEAR_LINE; } } @@ -1106,9 +1104,8 @@ void s3c44b0_device::pwm_start(int timer) break; default : { - cnt = cmp = auto_reload = 0; + fatalerror("Invalid timer index %d!", timer); } - break; } // hz = freq / (cnt - cmp + 1); if (cnt < 2) |