From 43f569e58f26d23032b950ebcbd02f352532ba95 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sun, 27 Dec 2020 05:35:56 +1100 Subject: srcclean for 0.227 --- src/devices/cpu/st62xx/st62xx.cpp | 14 +++++++------- src/devices/cpu/st62xx/st62xx.h | 30 +++++++++++++++--------------- 2 files changed, 22 insertions(+), 22 deletions(-) (limited to 'src/devices/cpu/st62xx') diff --git a/src/devices/cpu/st62xx/st62xx.cpp b/src/devices/cpu/st62xx/st62xx.cpp index d1144e6dad0..81e25d72d01 100644 --- a/src/devices/cpu/st62xx/st62xx.cpp +++ b/src/devices/cpu/st62xx/st62xx.cpp @@ -16,12 +16,12 @@ #include "st62xx.h" #include "st62xx_dasm.h" -#define LOG_UNIMPL (1 << 1) -#define LOG_GPIO (1 << 2) -#define LOG_TIMER (1 << 3) -#define LOG_ALL (LOG_UNIMPL | LOG_GPIO | LOG_TIMER) +#define LOG_UNIMPL (1 << 1) +#define LOG_GPIO (1 << 2) +#define LOG_TIMER (1 << 3) +#define LOG_ALL (LOG_UNIMPL | LOG_GPIO | LOG_TIMER) -#define VERBOSE (LOG_ALL) +#define VERBOSE (LOG_ALL) #include "logmacro.h" DEFINE_DEVICE_TYPE(ST6228, st6228_device, "st6228", "STmicro ST6228") @@ -372,8 +372,8 @@ void st6228_device::watchdog_w(offs_t offset, uint8_t data) uint8_t st6228_device::gpio_data_r(offs_t offset) { const uint8_t data = (m_port_data[offset] & m_port_dir[offset]) | - (m_port_input[offset] & ~m_port_dir[offset]) | - (m_port_pullup[offset] & ~m_port_dir[offset]); + (m_port_input[offset] & ~m_port_dir[offset]) | + (m_port_pullup[offset] & ~m_port_dir[offset]); LOGMASKED(LOG_GPIO, "%s: gpio_data_r: Port %c Data: %02x\n", machine().describe_context(), offset + 'A', data); return data; } diff --git a/src/devices/cpu/st62xx/st62xx.h b/src/devices/cpu/st62xx/st62xx.h index e68385bd1e3..8442e1e798b 100644 --- a/src/devices/cpu/st62xx/st62xx.h +++ b/src/devices/cpu/st62xx/st62xx.h @@ -212,21 +212,21 @@ protected: enum : uint8_t { - PSC_MASK = 0x7f, - - TSCR_PS_BIT = 0, - TSCR_PS_MASK = 0x07, - TSCR_PSI_BIT = 3, - TSCR_DOUT_BIT = 4, - TSCR_TOUT_BIT = 5, - TSCR_ETI_BIT = 6, - TSCR_TMZ_BIT = 7, - - TSCR_MODE_MASK = (1 << TSCR_DOUT_BIT) | (1 << TSCR_TOUT_BIT), - TSCR_MODE_EVENT = 0x00, - TSCR_MODE_GATED = (1 << TSCR_DOUT_BIT), - TSCR_MODE_OUTPUT_0 = (1 << TSCR_TOUT_BIT), - TSCR_MODE_OUTPUT_1 = (1 << TSCR_DOUT_BIT) | (1 << TSCR_TOUT_BIT) + PSC_MASK = 0x7f, + + TSCR_PS_BIT = 0, + TSCR_PS_MASK = 0x07, + TSCR_PSI_BIT = 3, + TSCR_DOUT_BIT = 4, + TSCR_TOUT_BIT = 5, + TSCR_ETI_BIT = 6, + TSCR_TMZ_BIT = 7, + + TSCR_MODE_MASK = (1 << TSCR_DOUT_BIT) | (1 << TSCR_TOUT_BIT), + TSCR_MODE_EVENT = 0x00, + TSCR_MODE_GATED = (1 << TSCR_DOUT_BIT), + TSCR_MODE_OUTPUT_0 = (1 << TSCR_TOUT_BIT), + TSCR_MODE_OUTPUT_1 = (1 << TSCR_DOUT_BIT) | (1 << TSCR_TOUT_BIT) }; enum -- cgit v1.2.3-70-g09d2