summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices')
-rw-r--r--src/devices/cpu/hmcs40/hmcs40.h4
-rw-r--r--src/devices/cpu/sm510/sm590.h4
-rw-r--r--src/devices/cpu/tlcs900/tmp95c061.cpp4
-rw-r--r--src/devices/cpu/tlcs900/tmp95c063.cpp4
4 files changed, 8 insertions, 8 deletions
diff --git a/src/devices/cpu/hmcs40/hmcs40.h b/src/devices/cpu/hmcs40/hmcs40.h
index 9b622c7139a..98accae5931 100644
--- a/src/devices/cpu/hmcs40/hmcs40.h
+++ b/src/devices/cpu/hmcs40/hmcs40.h
@@ -82,8 +82,8 @@ class hmcs40_cpu_device : public cpu_device
{
public:
// max 8 4-bit R ports
- template <std::size_t Bit> auto read_r() { return m_read_r[Bit].bind(); }
- template <std::size_t Bit> auto write_r() { return m_write_r[Bit].bind(); }
+ template <std::size_t N> auto read_r() { return m_read_r[N].bind(); }
+ template <std::size_t N> auto write_r() { return m_write_r[N].bind(); }
// 16-bit discrete
auto read_d() { return m_read_d.bind(); }
diff --git a/src/devices/cpu/sm510/sm590.h b/src/devices/cpu/sm510/sm590.h
index 7e4bb229e66..8e866b954f8 100644
--- a/src/devices/cpu/sm510/sm590.h
+++ b/src/devices/cpu/sm510/sm590.h
@@ -93,8 +93,8 @@ public:
// four 4-bit R I/O ports
using sm510_base_device::write_r;
- template <std::size_t Bit> auto write_r() { return m_write_rx[Bit].bind(); }
- template <std::size_t Bit> auto read_r() { return m_read_rx[Bit].bind(); }
+ template <std::size_t N> auto write_r() { return m_write_rx[N].bind(); }
+ template <std::size_t N> auto read_r() { return m_read_rx[N].bind(); }
protected:
sm590_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, int stack_levels, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data);
diff --git a/src/devices/cpu/tlcs900/tmp95c061.cpp b/src/devices/cpu/tlcs900/tmp95c061.cpp
index c2f5ea258cf..d297ba73fcf 100644
--- a/src/devices/cpu/tlcs900/tmp95c061.cpp
+++ b/src/devices/cpu/tlcs900/tmp95c061.cpp
@@ -650,7 +650,7 @@ void tmp95c061_device::tlcs900_handle_timers()
m_timer[0] += 1;
if ( m_timer[0] == m_t8_reg[0] )
{
- if ( ( m_t8_mode[0] & 0x0c ) == 0x00 )
+ if ( ( m_trun & 0x02 ) && ( m_t8_mode[0] & 0x0c ) == 0x00 )
{
m_timer_change[1] += 1;
}
@@ -727,7 +727,7 @@ void tmp95c061_device::tlcs900_handle_timers()
m_timer[2] += 1;
if ( m_timer[2] == m_t8_reg[2] )
{
- if ( ( m_t8_mode[1] & 0x0c ) == 0x00 )
+ if ( ( m_trun & 0x08 ) && ( m_t8_mode[1] & 0x0c ) == 0x00 )
{
m_timer_change[3] += 1;
}
diff --git a/src/devices/cpu/tlcs900/tmp95c063.cpp b/src/devices/cpu/tlcs900/tmp95c063.cpp
index ab30572ac16..90663eeaff3 100644
--- a/src/devices/cpu/tlcs900/tmp95c063.cpp
+++ b/src/devices/cpu/tlcs900/tmp95c063.cpp
@@ -268,7 +268,7 @@ void tmp95c063_device::tlcs900_handle_timers()
m_timer[0] += 1;
if ( m_timer[0] == m_t8_reg[0] )
{
- if ( ( m_t8_mode[0] & 0x0c ) == 0x00 )
+ if ( ( m_t8run & 0x02 ) && ( m_t8_mode[0] & 0x0c ) == 0x00 )
{
m_timer_change[1] += 1;
}
@@ -345,7 +345,7 @@ void tmp95c063_device::tlcs900_handle_timers()
m_timer[2] += 1;
if ( m_timer[2] == m_t8_reg[2] )
{
- if ( ( m_t8_mode[1] & 0x0c ) == 0x00 )
+ if ( ( m_t8run & 0x08 ) && ( m_t8_mode[1] & 0x0c ) == 0x00 )
{
m_timer_change[3] += 1;
}