diff --git a/src/devices/machine/74161.cpp b/src/devices/machine/74161.cpp index a866052d83d..a4c4d694ab6 100644 --- a/src/devices/machine/74161.cpp +++ b/src/devices/machine/74161.cpp @@ -26,7 +26,7 @@ ttl7416x_device::ttl7416x_device(const machine_config &mconfig, device_type type , m_pe(0) , m_cet(0) , m_cep(0) - , m_clock(0) + , m_pclock(0) , m_p(0) , m_out(0) , m_tc(0) @@ -61,7 +61,7 @@ void ttl7416x_device::device_start() save_item(NAME(m_pe)); save_item(NAME(m_cet)); save_item(NAME(m_cep)); - save_item(NAME(m_clock)); + save_item(NAME(m_pclock)); save_item(NAME(m_p)); save_item(NAME(m_out)); save_item(NAME(m_tc)); @@ -81,7 +81,7 @@ void ttl7416x_device::init() m_pe = 1; m_cet = 0; m_cep = 0; - m_clock = 0; + m_pclock = 0; m_p = 0; m_out = 0; @@ -159,9 +159,9 @@ WRITE_LINE_MEMBER( ttl7416x_device::cep_w ) WRITE_LINE_MEMBER( ttl7416x_device::clock_w ) { - uint8_t last_clock = m_clock; - m_clock = state; - if (m_clock != last_clock && m_clock != 0) + uint8_t last_clock = m_pclock; + m_pclock = state; + if (m_pclock != last_clock && m_pclock != 0) { tick(); } diff --git a/src/devices/machine/74161.h b/src/devices/machine/74161.h index 503617b1635..b0bc59b8afa 100644 --- a/src/devices/machine/74161.h +++ b/src/devices/machine/74161.h @@ -108,7 +108,7 @@ private: uint8_t m_pe; // pin 9 uint8_t m_cet; // pin 10 uint8_t m_cep; // pin 7 - uint8_t m_clock; // pin 2 + uint8_t m_pclock; // pin 2 uint8_t m_p; // pins 3-6 from LSB to MSB // outputs diff --git a/src/devices/video/hlcd0515.cpp b/src/devices/video/hlcd0515.cpp index 309e4f2d963..b7730332bfd 100644 --- a/src/devices/video/hlcd0515.cpp +++ b/src/devices/video/hlcd0515.cpp @@ -66,7 +66,7 @@ void hlcd0515_device::device_start() // zerofill m_cs = 0; - m_clock = 0; + m_pclock = 0; m_data = 0; m_count = 0; m_control = 0; @@ -79,7 +79,7 @@ void hlcd0515_device::device_start() // register for savestates save_item(NAME(m_cs)); - save_item(NAME(m_clock)); + save_item(NAME(m_pclock)); save_item(NAME(m_data)); save_item(NAME(m_count)); save_item(NAME(m_control)); @@ -162,7 +162,7 @@ WRITE_LINE_MEMBER(hlcd0515_device::write_clock) state = (state) ? 1 : 0; // clock/shift data on falling edge - if (!m_cs && !state && m_clock) + if (!m_cs && !state && m_pclock) { if (m_count < 5) { @@ -179,7 +179,7 @@ WRITE_LINE_MEMBER(hlcd0515_device::write_clock) m_count++; } - m_clock = state; + m_pclock = state; } diff --git a/src/devices/video/hlcd0515.h b/src/devices/video/hlcd0515.h index 898cf93ab1e..51d7c8380ae 100644 --- a/src/devices/video/hlcd0515.h +++ b/src/devices/video/hlcd0515.h @@ -76,7 +76,7 @@ protected: const u8 m_colmax; // number of column pins int m_cs; // input pin state - int m_clock; // " + int m_pclock; // " int m_data; // " int m_count; u8 m_control;