summaryrefslogtreecommitdiffstats
path: root/src/devices/machine/ticket.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/machine/ticket.cpp')
-rw-r--r--src/devices/machine/ticket.cpp20
1 files changed, 11 insertions, 9 deletions
diff --git a/src/devices/machine/ticket.cpp b/src/devices/machine/ticket.cpp
index a3ab3072393..35c5d5625a8 100644
--- a/src/devices/machine/ticket.cpp
+++ b/src/devices/machine/ticket.cpp
@@ -17,7 +17,9 @@
//**************************************************************************
#define DEBUG_TICKET 0
-#define LOG(x) do { if (DEBUG_TICKET) logerror x; } while (0)
+
+#define VERBOSE (DEBUG_TICKET)
+#include "logmacro.h"
@@ -99,7 +101,7 @@ WRITE_LINE_MEMBER( ticket_dispenser_device::motor_w )
{
if (!m_power)
{
- LOG(("%s: Ticket Power On\n", machine().describe_context()));
+ LOG("%s: Ticket Power On\n", machine().describe_context());
m_timer->adjust(m_period);
m_power = true;
m_status = m_ticketnotdispensed;
@@ -111,7 +113,7 @@ WRITE_LINE_MEMBER( ticket_dispenser_device::motor_w )
{
if (m_hopper_type == false || m_status == m_ticketnotdispensed)
{
- LOG(("%s: Ticket Power Off\n", machine().describe_context()));
+ LOG("%s: Ticket Power Off\n", machine().describe_context());
m_timer->adjust(attotime::never);
m_output = 0;
}
@@ -135,7 +137,7 @@ void ticket_dispenser_device::device_start()
m_ticketdispensed = (m_status_sense == TICKET_STATUS_ACTIVE_HIGH);
m_ticketnotdispensed = !m_ticketdispensed;
- m_timer = timer_alloc();
+ m_timer = timer_alloc(FUNC(ticket_dispenser_device::update_output_state), this);
m_output.resolve();
@@ -156,22 +158,22 @@ void ticket_dispenser_device::device_reset()
//-------------------------------------------------
-// device_timer - handle timer callbacks
+// update_output_state -
//-------------------------------------------------
-void ticket_dispenser_device::device_timer(emu_timer &timer, device_timer_id id, int param)
+TIMER_CALLBACK_MEMBER(ticket_dispenser_device::update_output_state)
{
// if we still have power, keep toggling ticket states
if (m_power)
{
m_status = !m_status;
- LOG(("Ticket Status Changed to %02X\n", m_status));
+ LOG("Ticket Status Changed to %02X\n", m_status);
m_timer->adjust(m_period);
}
else if (m_hopper_type)
{
m_status = !m_status;
- LOG(("%s: Ticket Power Off\n", machine().describe_context()));
+ LOG("%s: Ticket Power Off\n", machine().describe_context());
m_timer->adjust(attotime::never);
m_output = 0;
}
@@ -183,6 +185,6 @@ void ticket_dispenser_device::device_timer(emu_timer &timer, device_timer_id id,
if (m_status == m_ticketdispensed)
{
machine().bookkeeping().increment_dispensed_tickets(1);
- LOG(("Ticket Dispensed\n"));
+ LOG("Ticket Dispensed\n");
}
}