From be9721646509e3c3aa548ac57cf7762f2de0c5df Mon Sep 17 00:00:00 2001 From: hap Date: Thu, 12 Sep 2024 11:29:21 +0200 Subject: concept: correct typo, igs_m027xa: m_ prefix for class variables, ticket: remove empty destructor --- src/devices/machine/ticket.cpp | 10 +--------- src/devices/machine/ticket.h | 1 - src/mame/concept/concept.cpp | 2 +- src/mame/igs/igs_m027xa.cpp | 24 ++++++++++++------------ 4 files changed, 14 insertions(+), 23 deletions(-) diff --git a/src/devices/machine/ticket.cpp b/src/devices/machine/ticket.cpp index 97d837eb7a7..8e285efff5d 100644 --- a/src/devices/machine/ticket.cpp +++ b/src/devices/machine/ticket.cpp @@ -57,14 +57,6 @@ hopper_device::hopper_device(const machine_config &mconfig, const char *tag, dev m_hopper_type = true; } -//------------------------------------------------- -// ~ticket_dispenser_device - destructor -//------------------------------------------------- - -ticket_dispenser_device::~ticket_dispenser_device() -{ -} - //************************************************************************** // READ/WRITE HANDLERS @@ -86,7 +78,7 @@ int ticket_dispenser_device::line_r() void ticket_dispenser_device::motor_w(int state) { - // On an activate signal, start dispensing! + // On rising edge, start dispensing! if (state) { if (!m_power) diff --git a/src/devices/machine/ticket.h b/src/devices/machine/ticket.h index 350baf7c4be..d9afe4e4d39 100644 --- a/src/devices/machine/ticket.h +++ b/src/devices/machine/ticket.h @@ -37,7 +37,6 @@ public: set_period(period); } ticket_dispenser_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); - virtual ~ticket_dispenser_device(); // inline configuration helpers void set_period(const attotime &period) { m_period = period; } diff --git a/src/mame/concept/concept.cpp b/src/mame/concept/concept.cpp index d31d59d32a1..b2bf59658af 100644 --- a/src/mame/concept/concept.cpp +++ b/src/mame/concept/concept.cpp @@ -151,7 +151,7 @@ void concept_state::corvus_concept(machine_config &config) MOS6551(config, m_acia1, 16.364_MHz_XTAL / 16); m_acia1->set_xtal(16.364_MHz_XTAL / 9); m_acia1->txd_handler().set("rs232b", FUNC(rs232_port_device::write_txd)); - m_acia0->irq_handler().set_inputline(m_maincpu, M68K_IRQ_2); + m_acia1->irq_handler().set_inputline(m_maincpu, M68K_IRQ_2); MOS6551(config, m_kbdacia, 16.364_MHz_XTAL / 16); m_kbdacia->set_xtal(16.364_MHz_XTAL / 9); diff --git a/src/mame/igs/igs_m027xa.cpp b/src/mame/igs/igs_m027xa.cpp index 407bff205e2..5d7df5530e7 100644 --- a/src/mame/igs/igs_m027xa.cpp +++ b/src/mame/igs/igs_m027xa.cpp @@ -89,10 +89,10 @@ private: u32 m_irq_pending; // it appears they will be needed to differentiate between IRQs from the XA and elsewhere though u32 m_xa_cmd; u32 m_xa_ret0; - bool irq_from_igs031; - bool irq_from_xa; - u8 m_port0_dat; + bool m_irq_from_igs031; + bool m_irq_from_xa; s8 m_num_params; + u8 m_port0_dat; u8 m_port1_dat; u8 m_port2_dat; u8 m_port3_dat; @@ -146,8 +146,8 @@ void igs_m027xa_state::machine_reset() m_irq_pending = 0xff; m_xa_cmd = 0; m_xa_ret0 = 0; - irq_from_igs031 = false; - irq_from_xa = false; + m_irq_from_igs031 = false; + m_irq_from_xa = false; m_num_params = 0; m_port0_dat = 0; m_port1_dat = 0; @@ -170,8 +170,8 @@ void igs_m027xa_state::machine_start() save_item(NAME(m_irq_pending)); save_item(NAME(m_xa_cmd)); save_item(NAME(m_xa_ret0)); - save_item(NAME(irq_from_igs031)); - save_item(NAME(irq_from_xa)); + save_item(NAME(m_irq_from_igs031)); + save_item(NAME(m_irq_from_xa)); save_item(NAME(m_num_params)); save_item(NAME(m_port0_dat)); save_item(NAME(m_port1_dat)); @@ -386,9 +386,9 @@ void igs_m027xa_state::igs_40000014_w(offs_t offset, u32 data, u32 mem_mask) u32 igs_m027xa_state::gpio_r() { u32 ret = m_io_test[2].read_safe(0xffffffff); - if (irq_from_igs031) + if (m_irq_from_igs031) ret ^= 1 << 11; - if (irq_from_xa) + if (m_irq_from_xa) ret ^= 1 << 12; return ret; } @@ -437,7 +437,7 @@ void igs_m027xa_state::xa_w(offs_t offset, u16 data, u16 mem_mask) } else { - irq_from_xa = false; + m_irq_from_xa = false; LOGMASKED(LOG_DEBUG, "%s: unhandled xa_w %04x %08x (%08x)\n", machine().describe_context(), offset * 2, data, mem_mask); } } @@ -507,7 +507,7 @@ void igs_m027xa_state::mcu_p3_w(uint8_t data) if (posedge(oldport3, m_port3_dat, 5)) { - irq_from_xa = true; + m_irq_from_xa = true; igs027_trigger_irq(3); } // high->low transition on bit 0x80 must read into latches! @@ -547,7 +547,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(igs_m027xa_state::interrupt) if (scanline == 240 && m_igs017_igs031->get_irq_enable()) { - irq_from_igs031 = true; + m_irq_from_igs031 = true; igs027_trigger_irq(3); } if (scanline == 0 && (m_igs_40000014 & 1)) -- cgit v1.2.3