From eefd9b2f8566d2e722b625e6eb271c1b48d7e8a8 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Mon, 9 Sep 2024 04:07:45 +1000 Subject: [PATCH] machine/ticket.cpp: Get device configuration constants out of the global namespace. --- src/devices/machine/ticket.cpp | 8 ++++---- src/devices/machine/ticket.h | 18 ++++++------------ src/mame/acorn/aristmk5.cpp | 2 +- src/mame/astrocorp/astrcorp.cpp | 8 ++++---- src/mame/barcrest/mpu4.cpp | 2 +- src/mame/bmc/bmcpokr.cpp | 2 +- src/mame/edevices/pzletime.cpp | 2 +- src/mame/excellent/d9final.cpp | 2 +- src/mame/excellent/dblcrown.cpp | 2 +- src/mame/excellent/witch.cpp | 2 +- src/mame/f32/f-32.cpp | 2 +- src/mame/ice/lethalj.cpp | 2 +- src/mame/igs/funtech.cpp | 2 +- src/mame/igs/goldstar.cpp | 2 +- src/mame/igs/igs017.cpp | 26 +++++++++++++------------- src/mame/igs/igs_fear.cpp | 2 +- src/mame/igs/igs_m027.cpp | 10 +++++----- src/mame/itech/capbowl.cpp | 2 +- src/mame/itech/itech32.cpp | 2 +- src/mame/itech/itech8.cpp | 2 +- src/mame/jaleco/cischeat.cpp | 2 +- src/mame/konami/konamigs.cpp | 2 +- src/mame/konami/konmedal.cpp | 6 +++--- src/mame/konami/konmedal68k.cpp | 12 +++++++----- src/mame/konami/piratesh.cpp | 4 ++-- src/mame/konami/quickpick5.cpp | 12 +++++++----- src/mame/midway/williams.cpp | 2 +- src/mame/misc/amusco.cpp | 2 +- src/mame/misc/babysuprem.cpp | 6 +++--- src/mame/misc/calomega.cpp | 4 ++-- src/mame/misc/clpoker.cpp | 2 +- src/mame/misc/dcheese.cpp | 2 +- src/mame/misc/gei.cpp | 2 +- src/mame/misc/gi6809.cpp | 2 +- src/mame/misc/interflip8035.cpp | 2 +- src/mame/misc/jackhouse.cpp | 2 +- src/mame/misc/kingpin.cpp | 2 +- src/mame/misc/kurukuru.cpp | 2 +- src/mame/misc/magic10.cpp | 6 +++--- src/mame/misc/mgavegas.cpp | 2 +- src/mame/misc/mjsenpu.cpp | 2 +- src/mame/misc/mpu12wbk.cpp | 2 +- src/mame/misc/multfish.cpp | 2 +- src/mame/misc/piggypas.cpp | 2 +- src/mame/misc/skylncr.cpp | 2 +- src/mame/misc/tapatune.cpp | 2 +- src/mame/misc/tickee.cpp | 10 +++++----- src/mame/misc/tvg01.cpp | 2 +- src/mame/msx/big10.cpp | 2 +- src/mame/namco/cgang.cpp | 2 +- src/mame/namco/namcos10.cpp | 6 +++--- src/mame/namco/wacky_gator.cpp | 2 +- src/mame/neogeo/midas.cpp | 6 +++--- src/mame/playmark/playmark.cpp | 8 ++++---- src/mame/playmark/powerbal.cpp | 4 ++-- src/mame/rare/xtheball.cpp | 23 ++++++++++++----------- src/mame/recfranco/rfslots8085.cpp | 4 ++-- src/mame/recfranco/rfslotsmcs48.cpp | 2 +- src/mame/sega/stv.cpp | 2 +- src/mame/seibu/banprestoms.cpp | 2 +- src/mame/seibu/feversoc.cpp | 2 +- src/mame/seta/albazc.cpp | 2 +- src/mame/seta/champbwl.cpp | 2 +- src/mame/seta/jclub2.cpp | 12 ++++++------ src/mame/seta/seta.cpp | 6 +++--- src/mame/seta/seta2.cpp | 4 ++-- src/mame/sigma/sigmab98.cpp | 10 +++++----- src/mame/subsino/subsino.cpp | 10 +++++----- src/mame/subsino/subsino2.cpp | 6 +++--- src/mame/sunelectronics/tonton.cpp | 2 +- src/mame/taito/cchance.cpp | 2 +- src/mame/taito/taito_o.cpp | 2 +- src/mame/toaplan/toaplan2.cpp | 2 +- src/mame/ussr/special_gambl.cpp | 2 +- 74 files changed, 163 insertions(+), 164 deletions(-) diff --git a/src/devices/machine/ticket.cpp b/src/devices/machine/ticket.cpp index 92e5f316819..ff99c4a6142 100644 --- a/src/devices/machine/ticket.cpp +++ b/src/devices/machine/ticket.cpp @@ -43,8 +43,8 @@ DEFINE_DEVICE_TYPE(HOPPER, hopper_device, "coin_hopper", "Coin Hopper") ticket_dispenser_device::ticket_dispenser_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, type, tag, owner, clock) - , m_motor_sense(TICKET_MOTOR_ACTIVE_LOW) - , m_status_sense(TICKET_STATUS_ACTIVE_LOW) + , m_motor_sense(MOTOR_ACTIVE_LOW) + , m_status_sense(STATUS_ACTIVE_LOW) , m_period(attotime::from_msec(100)) , m_hopper_type(false) , m_motoron(0) @@ -134,8 +134,8 @@ void ticket_dispenser_device::motor_w(int state) void ticket_dispenser_device::device_start() { - m_motoron = (m_motor_sense == TICKET_MOTOR_ACTIVE_HIGH); - m_ticketdispensed = (m_status_sense == TICKET_STATUS_ACTIVE_HIGH); + m_motoron = (m_motor_sense == MOTOR_ACTIVE_HIGH); + m_ticketdispensed = (m_status_sense == STATUS_ACTIVE_HIGH); m_ticketnotdispensed = !m_ticketdispensed; m_timer = timer_alloc(FUNC(ticket_dispenser_device::update_output_state), this); diff --git a/src/devices/machine/ticket.h b/src/devices/machine/ticket.h index 797fac5bd4e..67c6ef04e10 100644 --- a/src/devices/machine/ticket.h +++ b/src/devices/machine/ticket.h @@ -17,21 +17,9 @@ // GLOBAL VARIABLES //************************************************************************** -// device type definition DECLARE_DEVICE_TYPE(TICKET_DISPENSER, ticket_dispenser_device) DECLARE_DEVICE_TYPE(HOPPER, hopper_device) -//************************************************************************** -// CONSTANTS -//************************************************************************** - -const uint8_t TICKET_MOTOR_ACTIVE_LOW = 0; /* Ticket motor is triggered by D7=0 */ -const uint8_t TICKET_MOTOR_ACTIVE_HIGH = 1; /* Ticket motor is triggered by D7=1 */ - -const uint8_t TICKET_STATUS_ACTIVE_LOW = 0; /* Ticket is done dispensing when D7=0 */ -const uint8_t TICKET_STATUS_ACTIVE_HIGH = 1; /* Ticket is done dispensing when D7=1 */ - - //************************************************************************** // TYPE DEFINITIONS @@ -42,6 +30,12 @@ const uint8_t TICKET_STATUS_ACTIVE_HIGH = 1; /* Ticket is done dispensing whe class ticket_dispenser_device : public device_t { public: + static inline constexpr uint8_t MOTOR_ACTIVE_LOW = 0; // activated by state = 0 + static inline constexpr uint8_t MOTOR_ACTIVE_HIGH = 1; // activated by state = 1 + + static inline constexpr uint8_t STATUS_ACTIVE_LOW = 0; // output 0 when dispensing is done + static inline constexpr uint8_t STATUS_ACTIVE_HIGH = 1; // output 1 when dispensing is done + // construction/destruction ticket_dispenser_device(const machine_config &mconfig, const char *tag, device_t *owner, const attotime &period, uint8_t motor_sense, uint8_t status_sense) : ticket_dispenser_device(mconfig, tag, owner) diff --git a/src/mame/acorn/aristmk5.cpp b/src/mame/acorn/aristmk5.cpp index 6d0fbc4f9a4..58f7c2fa0ff 100644 --- a/src/mame/acorn/aristmk5.cpp +++ b/src/mame/acorn/aristmk5.cpp @@ -2422,7 +2422,7 @@ void aristmk5_state::aristmk5(machine_config &config) DS1302(config, m_rtc, 32.768_kHz_XTAL); - HOPPER(config, m_hopper, attotime::from_msec(100), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW); + HOPPER(config, m_hopper, attotime::from_msec(100), hopper_device::MOTOR_ACTIVE_HIGH, hopper_device::STATUS_ACTIVE_LOW); // some games (jungjuic, penpir2) use the IOC KART interface for debug rs232_port_device &rs232(RS232_PORT(config, "kart", default_rs232_devices, nullptr)); diff --git a/src/mame/astrocorp/astrcorp.cpp b/src/mame/astrocorp/astrcorp.cpp index 690a53e931a..0dd4991fa57 100644 --- a/src/mame/astrocorp/astrcorp.cpp +++ b/src/mame/astrocorp/astrcorp.cpp @@ -1263,8 +1263,8 @@ void astrocorp_state::showhand(machine_config &config) NVRAM(config, "nvram"); EEPROM_93C46_16BIT(config, "eeprom"); - HOPPER(config, m_ticket, attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW ); - HOPPER(config, m_hopper, attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW ); + HOPPER(config, m_ticket, attotime::from_msec(200), hopper_device::MOTOR_ACTIVE_HIGH, hopper_device::STATUS_ACTIVE_LOW); + HOPPER(config, m_hopper, attotime::from_msec(200), hopper_device::MOTOR_ACTIVE_HIGH, hopper_device::STATUS_ACTIVE_LOW); // video hardware SCREEN(config, m_screen, SCREEN_TYPE_RASTER); @@ -1308,8 +1308,8 @@ void astrocorp_state::skilldrp(machine_config &config) NVRAM(config, "nvram"); EEPROM_93C46_16BIT(config, "eeprom"); - HOPPER(config, m_ticket, attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW ); - HOPPER(config, m_hopper, attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW ); + HOPPER(config, m_ticket, attotime::from_msec(200), hopper_device::MOTOR_ACTIVE_HIGH, hopper_device::STATUS_ACTIVE_LOW); + HOPPER(config, m_hopper, attotime::from_msec(200), hopper_device::MOTOR_ACTIVE_HIGH, hopper_device::STATUS_ACTIVE_LOW); // video hardware SCREEN(config, m_screen, SCREEN_TYPE_RASTER); diff --git a/src/mame/barcrest/mpu4.cpp b/src/mame/barcrest/mpu4.cpp index 3292ac4f685..1e1ca8feaf7 100644 --- a/src/mame/barcrest/mpu4.cpp +++ b/src/mame/barcrest/mpu4.cpp @@ -2321,7 +2321,7 @@ void mpu4_state::mpu4_common(machine_config &config) BACTA_DATALOGGER(config, m_dataport, 0); m_dataport->rxd_handler().set(FUNC(mpu4_state::dataport_rxd)); - HOPPER(config, m_hopper1, attotime::from_msec(100), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); + HOPPER(config, m_hopper1, attotime::from_msec(100), hopper_device::MOTOR_ACTIVE_HIGH, hopper_device::STATUS_ACTIVE_HIGH); SPEAKER(config, "mono").front_center(); diff --git a/src/mame/bmc/bmcpokr.cpp b/src/mame/bmc/bmcpokr.cpp index 63331cebcb5..b437eb77349 100644 --- a/src/mame/bmc/bmcpokr.cpp +++ b/src/mame/bmc/bmcpokr.cpp @@ -1167,7 +1167,7 @@ void bmcpokr_state::bmcpokr(machine_config &config) TICKET_DISPENSER(config, m_hopper, 0); m_hopper->set_period(attotime::from_msec(10)); - m_hopper->set_senses(TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW, false); // hopper stuck low if too slow + m_hopper->set_senses(ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_LOW, false); // hopper stuck low if too slow SPEAKER(config, "mono").front_center(); diff --git a/src/mame/edevices/pzletime.cpp b/src/mame/edevices/pzletime.cpp index 23ccb5a7e7e..96461f4824e 100644 --- a/src/mame/edevices/pzletime.cpp +++ b/src/mame/edevices/pzletime.cpp @@ -298,7 +298,7 @@ void pzletime_state::pzletime(machine_config &config) PALETTE(config, m_palette[1], palette_device::RGB_555); EEPROM_93C46_16BIT(config, "eeprom"); - TICKET_DISPENSER(config, m_ticket, attotime::from_msec(2000), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); + TICKET_DISPENSER(config, m_ticket, attotime::from_msec(2000), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_HIGH); SPEAKER(config, "mono").front_center(); OKIM6295(config, m_oki, 937500, okim6295_device::PIN7_HIGH); //freq & pin7 taken from stlforce diff --git a/src/mame/excellent/d9final.cpp b/src/mame/excellent/d9final.cpp index 3fd07894611..7c4fb678aac 100644 --- a/src/mame/excellent/d9final.cpp +++ b/src/mame/excellent/d9final.cpp @@ -335,7 +335,7 @@ void d9final_state::d9final(machine_config &config) NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); // Sharp LH5116D-10 + battery - HOPPER(config, m_hopper, attotime::from_msec(20), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH ); + HOPPER(config, m_hopper, attotime::from_msec(20), hopper_device::MOTOR_ACTIVE_HIGH, hopper_device::STATUS_ACTIVE_HIGH); screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); screen.set_refresh_hz(60); diff --git a/src/mame/excellent/dblcrown.cpp b/src/mame/excellent/dblcrown.cpp index f5726f870d4..6032ee0839f 100644 --- a/src/mame/excellent/dblcrown.cpp +++ b/src/mame/excellent/dblcrown.cpp @@ -588,7 +588,7 @@ void dblcrown_state::dblcrown(machine_config &config) // 1000 ms. (minimal of MAX693A watchdog long timeout period with internal oscillator) WATCHDOG_TIMER(config, m_watchdog).set_time(attotime::from_msec(1000)); - HOPPER(config, m_hopper, attotime::from_msec(50), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH ); + HOPPER(config, m_hopper, attotime::from_msec(50), hopper_device::MOTOR_ACTIVE_HIGH, hopper_device::STATUS_ACTIVE_HIGH); NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); diff --git a/src/mame/excellent/witch.cpp b/src/mame/excellent/witch.cpp index 2b530f067fe..9932dbbac5f 100644 --- a/src/mame/excellent/witch.cpp +++ b/src/mame/excellent/witch.cpp @@ -1080,7 +1080,7 @@ void base_state::base(machine_config &config) NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); - TICKET_DISPENSER(config, m_hopper, attotime::from_msec(50), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); // time between hopper pulses in milliseconds (not right for attendant pay) + TICKET_DISPENSER(config, m_hopper, attotime::from_msec(50), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_HIGH); // time between hopper pulses in milliseconds (not right for attendant pay) // 82C255 (actual chip on PCB) is equivalent to two 8255s I8255(config, m_ppi[0]); diff --git a/src/mame/f32/f-32.cpp b/src/mame/f32/f-32.cpp index 52a9d3e2081..9747bbf9da8 100644 --- a/src/mame/f32/f-32.cpp +++ b/src/mame/f32/f-32.cpp @@ -477,7 +477,7 @@ void royalpk2_state::royalpk2(machine_config &config) NVRAM(config, m_nvram, nvram_device::DEFAULT_ALL_0); - HOPPER(config, m_hopper, attotime::from_msec(100), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW); + HOPPER(config, m_hopper, attotime::from_msec(100), hopper_device::MOTOR_ACTIVE_HIGH, hopper_device::STATUS_ACTIVE_LOW); /* video hardware */ screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); diff --git a/src/mame/ice/lethalj.cpp b/src/mame/ice/lethalj.cpp index eb57c49fc95..f014255e957 100644 --- a/src/mame/ice/lethalj.cpp +++ b/src/mame/ice/lethalj.cpp @@ -755,7 +755,7 @@ void lethalj_state::gameroom(machine_config &config) m_maincpu->set_pixels_per_clock(1); m_maincpu->set_scanline_ind16_callback(FUNC(lethalj_state::scanline_update)); - TICKET_DISPENSER(config, m_ticket, attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); + TICKET_DISPENSER(config, m_ticket, attotime::from_msec(200), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_HIGH); /* video hardware */ SCREEN(config, m_screen, SCREEN_TYPE_RASTER); diff --git a/src/mame/igs/funtech.cpp b/src/mame/igs/funtech.cpp index 52f7b709bfc..2d4f986a48e 100644 --- a/src/mame/igs/funtech.cpp +++ b/src/mame/igs/funtech.cpp @@ -670,7 +670,7 @@ void fun_tech_corp_state::base(machine_config &config) NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1); - TICKET_DISPENSER(config, m_hopper, attotime::from_msec(50), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); + TICKET_DISPENSER(config, m_hopper, attotime::from_msec(50), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_HIGH); // sound hardware SPEAKER(config, "mono").front_center(); diff --git a/src/mame/igs/goldstar.cpp b/src/mame/igs/goldstar.cpp index cfaa22ba198..6964a121967 100644 --- a/src/mame/igs/goldstar.cpp +++ b/src/mame/igs/goldstar.cpp @@ -11225,7 +11225,7 @@ void unkch_state::unkch(machine_config &config) aysnd.add_route(ALL_OUTPUTS, "mono", 0.50); /* payout hardware */ - TICKET_DISPENSER(config, m_ticket_dispenser, attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW); + TICKET_DISPENSER(config, m_ticket_dispenser, attotime::from_msec(200), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_LOW); } void unkch_state::rolling(machine_config &config) diff --git a/src/mame/igs/igs017.cpp b/src/mame/igs/igs017.cpp index 05378a8f484..ebc4d1a0757 100644 --- a/src/mame/igs/igs017.cpp +++ b/src/mame/igs/igs017.cpp @@ -4436,7 +4436,7 @@ void igs017_state::tarzan(machine_config &config) m_igs017_igs031->in_pa_callback().set_ioport("COINS"); m_igs017_igs031->in_pb_callback().set(FUNC(igs017_state::tarzan_keys_joy_r)); - HOPPER(config, m_hopper, attotime::from_msec(50), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW); + HOPPER(config, m_hopper, attotime::from_msec(50), hopper_device::MOTOR_ACTIVE_HIGH, hopper_device::STATUS_ACTIVE_LOW); // protection IGS_STRING(config, m_igs_string, 0); @@ -4470,7 +4470,7 @@ void igs017_state::starzan(machine_config &config) m_igs017_igs031->in_pb_callback().set_ioport("PLAYER1"); m_igs017_igs031->in_pc_callback().set(FUNC(igs017_state::dsw_r)); - HOPPER(config, m_hopper, attotime::from_msec(50), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW); + HOPPER(config, m_hopper, attotime::from_msec(50), hopper_device::MOTOR_ACTIVE_HIGH, hopper_device::STATUS_ACTIVE_LOW); // protection IGS_STRING(config, m_igs_string, 0); @@ -4504,7 +4504,7 @@ void igs017_state::happyskl(machine_config &config) m_igs017_igs031->in_pb_callback().set_ioport("PLAYER1"); m_igs017_igs031->in_pc_callback().set(FUNC(igs017_state::dsw_r)); - HOPPER(config, m_hopper, attotime::from_msec(50), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW); + HOPPER(config, m_hopper, attotime::from_msec(50), hopper_device::MOTOR_ACTIVE_HIGH, hopper_device::STATUS_ACTIVE_LOW); // video m_igs017_igs031->set_palette_scramble_cb(FUNC(igs017_state::tarzan_palette_bitswap)); @@ -4529,7 +4529,7 @@ void igs017_state::cpoker2(machine_config &config) m_igs017_igs031->in_pb_callback().set_ioport("PLAYER1"); m_igs017_igs031->in_pc_callback().set(FUNC(igs017_state::dsw_r)); - HOPPER(config, m_hopper, attotime::from_msec(50), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW); + HOPPER(config, m_hopper, attotime::from_msec(50), hopper_device::MOTOR_ACTIVE_HIGH, hopper_device::STATUS_ACTIVE_LOW); // protection IGS_INCDEC(config, m_igs_incdec, 0); @@ -4559,7 +4559,7 @@ void igs017_state::tjsb(machine_config &config) m_igs017_igs031->in_pb_callback().set_ioport("DSW2"); m_igs017_igs031->in_pc_callback().set_ioport("DSW3"); - HOPPER(config, m_hopper, attotime::from_msec(50), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW); + HOPPER(config, m_hopper, attotime::from_msec(50), hopper_device::MOTOR_ACTIVE_HIGH, hopper_device::STATUS_ACTIVE_LOW); // protection IGS_STRING(config, m_igs_string, 0); @@ -4590,7 +4590,7 @@ void igs017_state::spkrform(machine_config &config) m_igs017_igs031->in_pb_callback().set_ioport("DSW2"); m_igs017_igs031->in_pc_callback().set_ioport("DSW3"); - HOPPER(config, m_hopper, attotime::from_msec(50), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW); + HOPPER(config, m_hopper, attotime::from_msec(50), hopper_device::MOTOR_ACTIVE_HIGH, hopper_device::STATUS_ACTIVE_LOW); // protection IGS_STRING(config, m_igs_string, 0); @@ -4630,7 +4630,7 @@ void igs017_state::mgcs(machine_config &config) m_igs017_igs031->in_pb_callback().set(FUNC(igs017_state::mgcs_keys_joy_r)); m_igs017_igs031->in_pc_callback().set_ioport("JOY"); - HOPPER(config, m_hopper, attotime::from_msec(50), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW); + HOPPER(config, m_hopper, attotime::from_msec(50), hopper_device::MOTOR_ACTIVE_HIGH, hopper_device::STATUS_ACTIVE_LOW); // protection IGS_STRING(config, m_igs_string, 0); @@ -4664,7 +4664,7 @@ void igs017_state::lhzb2(machine_config &config) m_igs017_igs031->in_pb_callback().set_ioport("DSW1"); m_igs017_igs031->in_pc_callback().set_ioport("DSW2"); - HOPPER(config, m_hopper, attotime::from_msec(50), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW); + HOPPER(config, m_hopper, attotime::from_msec(50), hopper_device::MOTOR_ACTIVE_HIGH, hopper_device::STATUS_ACTIVE_LOW); // protection IGS_STRING(config, m_igs_string, 0); @@ -4699,7 +4699,7 @@ void igs017_state::lhzb2a(machine_config &config) // ppi8255 not used for i/o (just video enable)? - HOPPER(config, m_hopper, attotime::from_msec(50), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW); + HOPPER(config, m_hopper, attotime::from_msec(50), hopper_device::MOTOR_ACTIVE_HIGH, hopper_device::STATUS_ACTIVE_LOW); // protection IGS_STRING(config, m_igs_string, 0); @@ -4736,7 +4736,7 @@ void igs017_state::slqz2(machine_config &config) m_igs017_igs031->in_pb_callback().set_ioport("DSW1"); m_igs017_igs031->in_pc_callback().set_ioport("DSW2"); - HOPPER(config, m_hopper, attotime::from_msec(50), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW); + HOPPER(config, m_hopper, attotime::from_msec(50), hopper_device::MOTOR_ACTIVE_HIGH, hopper_device::STATUS_ACTIVE_LOW); // protection IGS_STRING(config, m_igs_string, 0); @@ -4765,7 +4765,7 @@ void igs017_state::sdmg2(machine_config &config) m_igs017_igs031->in_pb_callback().set_ioport("DSW2"); // DSW3 is read but unused (it's not populated on the PCB) - HOPPER(config, m_hopper, attotime::from_msec(50), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW); + HOPPER(config, m_hopper, attotime::from_msec(50), hopper_device::MOTOR_ACTIVE_HIGH, hopper_device::STATUS_ACTIVE_LOW); // protection IGS_INCDEC(config, m_igs_incdec, 0); @@ -4798,7 +4798,7 @@ void igs017_state::mgdha(machine_config &config) m_igs017_igs031->in_pa_callback().set_ioport("DSW1"); - HOPPER(config, m_hopper, attotime::from_msec(50), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW); + HOPPER(config, m_hopper, attotime::from_msec(50), hopper_device::MOTOR_ACTIVE_HIGH, hopper_device::STATUS_ACTIVE_LOW); } void igs017_state::mgdh(machine_config &config) @@ -4826,7 +4826,7 @@ void igs017_state::sdmg2p(machine_config &config) m_igs017_igs031->in_pb_callback().set_ioport("DSW2"); m_igs017_igs031->in_pc_callback().set_ioport("DSW3"); // there are 3 DIP banks on PCB but only two are shown in test mode - HOPPER(config, m_hopper, attotime::from_msec(50), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW); + HOPPER(config, m_hopper, attotime::from_msec(50), hopper_device::MOTOR_ACTIVE_HIGH, hopper_device::STATUS_ACTIVE_LOW); IGS_STRING(config, m_igs_string, 0); } diff --git a/src/mame/igs/igs_fear.cpp b/src/mame/igs/igs_fear.cpp index 774db87e6c6..327477fd959 100644 --- a/src/mame/igs/igs_fear.cpp +++ b/src/mame/igs/igs_fear.cpp @@ -783,7 +783,7 @@ void igs_fear_state::igs_fear(machine_config &config) V3021(config, "rtc"); - TICKET_DISPENSER(config, m_ticket, attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH ); + TICKET_DISPENSER(config, m_ticket, attotime::from_msec(200), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_HIGH); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/igs/igs_m027.cpp b/src/mame/igs/igs_m027.cpp index c970ffb3c89..885e0da6155 100644 --- a/src/mame/igs/igs_m027.cpp +++ b/src/mame/igs/igs_m027.cpp @@ -1100,7 +1100,7 @@ void igs_m027_state::lhdmg_xor(machine_config &config) m_igs017_igs031->in_pb_callback().set_ioport("DSW2"); m_igs017_igs031->in_pc_callback().set(NAME((&igs_m027_state::kbd_r<0, 3, 0>))); - HOPPER(config, m_hopper, attotime::from_msec(50), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW); + HOPPER(config, m_hopper, attotime::from_msec(50), hopper_device::MOTOR_ACTIVE_HIGH, hopper_device::STATUS_ACTIVE_LOW); } void igs_m027_state::lhzb4_xor(machine_config &config) @@ -1133,7 +1133,7 @@ void igs_m027_state::zhongguo_xor(machine_config &config) { lthy_xor(config); - HOPPER(config, m_hopper, attotime::from_msec(50), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW); + HOPPER(config, m_hopper, attotime::from_msec(50), hopper_device::MOTOR_ACTIVE_HIGH, hopper_device::STATUS_ACTIVE_LOW); } void igs_m027_state::mgzz_xor(machine_config &config) @@ -1148,7 +1148,7 @@ void igs_m027_state::mgzz_xor(machine_config &config) m_igs017_igs031->in_pb_callback().set_ioport("DSW2"); m_igs017_igs031->in_pc_callback().set_ioport("JOY"); - HOPPER(config, m_hopper, attotime::from_msec(50), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW); + HOPPER(config, m_hopper, attotime::from_msec(50), hopper_device::MOTOR_ACTIVE_HIGH, hopper_device::STATUS_ACTIVE_LOW); } void igs_m027_state::oceanpar_xor(machine_config &config) @@ -1161,8 +1161,8 @@ void igs_m027_state::oceanpar_xor(machine_config &config) m_ppi->out_pb_callback().set(FUNC(igs_m027_state::oceanpar_output_w)); m_ppi->out_pc_callback().set(FUNC(igs_m027_state::lamps_w)); - HOPPER(config, m_hopper, attotime::from_msec(50), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW); - TICKET_DISPENSER(config, m_ticket, attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW ); + HOPPER(config, m_hopper, attotime::from_msec(50), hopper_device::MOTOR_ACTIVE_HIGH, hopper_device::STATUS_ACTIVE_LOW); + TICKET_DISPENSER(config, m_ticket, attotime::from_msec(200), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_LOW); } void igs_m027_state::extradraw(machine_config &config) diff --git a/src/mame/itech/capbowl.cpp b/src/mame/itech/capbowl.cpp index b666e1cfbd1..06cb99937aa 100644 --- a/src/mame/itech/capbowl.cpp +++ b/src/mame/itech/capbowl.cpp @@ -584,7 +584,7 @@ void capbowl_base_state::base(machine_config &config) NVRAM(config, "nvram", nvram_device::DEFAULT_RANDOM); - TICKET_DISPENSER(config, "ticket", attotime::from_msec(100), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW); + TICKET_DISPENSER(config, "ticket", attotime::from_msec(100), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_LOW); // video hardware SCREEN(config, m_screen, SCREEN_TYPE_RASTER); diff --git a/src/mame/itech/itech32.cpp b/src/mame/itech/itech32.cpp index 24ea102e505..1d18c37df65 100644 --- a/src/mame/itech/itech32.cpp +++ b/src/mame/itech/itech32.cpp @@ -1775,7 +1775,7 @@ void itech32_state::base_devices(machine_config &config) GENERIC_LATCH_8(config, m_soundlatch).data_pending_callback().set_inputline(m_soundcpu, INPUT_LINE_IRQ0); - TICKET_DISPENSER(config, m_ticket, attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); + TICKET_DISPENSER(config, m_ticket, attotime::from_msec(200), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_HIGH); WATCHDOG_TIMER(config, "watchdog"); diff --git a/src/mame/itech/itech8.cpp b/src/mame/itech/itech8.cpp index a520136364c..6c9b23bca44 100644 --- a/src/mame/itech/itech8.cpp +++ b/src/mame/itech/itech8.cpp @@ -1721,7 +1721,7 @@ void itech8_state::itech8_core_devices(machine_config &config) { NVRAM(config, m_nvram, nvram_device::DEFAULT_RANDOM); - TICKET_DISPENSER(config, m_ticket, attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW); + TICKET_DISPENSER(config, m_ticket, attotime::from_msec(200), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_LOW); TLC34076(config, m_tlc34076, tlc34076_device::TLC34076_6_BIT); diff --git a/src/mame/jaleco/cischeat.cpp b/src/mame/jaleco/cischeat.cpp index 6ab604cd0f9..25a283be41c 100644 --- a/src/mame/jaleco/cischeat.cpp +++ b/src/mame/jaleco/cischeat.cpp @@ -2369,7 +2369,7 @@ void captflag_state::captflag(machine_config &config) m_maincpu->set_addrmap(AS_PROGRAM, &captflag_state::captflag_map); TIMER(config, "scantimer").configure_scanline(FUNC(captflag_state::captflag_scanline), "screen", 0, 1); - TICKET_DISPENSER(config, m_hopper, attotime::from_msec(2000), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH ); + TICKET_DISPENSER(config, m_hopper, attotime::from_msec(2000), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_HIGH); WATCHDOG_TIMER(config, m_watchdog); NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); diff --git a/src/mame/konami/konamigs.cpp b/src/mame/konami/konamigs.cpp index 49ce4bafb0f..9df04b9228e 100644 --- a/src/mame/konami/konamigs.cpp +++ b/src/mame/konami/konamigs.cpp @@ -1081,7 +1081,7 @@ void gsan_state::gs_medal(machine_config &config) m_screen->set_raw(XTAL(36'000'000) / 5, 457, 0, 320, 262, 0, 240); - HOPPER(config, "hopper", attotime::from_msec(100), TICKET_MOTOR_ACTIVE_LOW, TICKET_STATUS_ACTIVE_HIGH); + HOPPER(config, "hopper", attotime::from_msec(100), hopper_device::MOTOR_ACTIVE_LOW, hopper_device::STATUS_ACTIVE_HIGH); } void gsan_state::init_gsan() diff --git a/src/mame/konami/konmedal.cpp b/src/mame/konami/konmedal.cpp index df505156dfc..9aeba082b0d 100644 --- a/src/mame/konami/konmedal.cpp +++ b/src/mame/konami/konmedal.cpp @@ -832,7 +832,7 @@ void konmedal_state::tsukande(machine_config &config) NVRAM(config, m_nvram, nvram_device::DEFAULT_ALL_0); m_nvram->set_custom_handler(FUNC(konmedal_state::medal_nvram_init)); - HOPPER(config, "hopper", attotime::from_msec(100), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); + HOPPER(config, "hopper", attotime::from_msec(100), hopper_device::MOTOR_ACTIVE_HIGH, hopper_device::STATUS_ACTIVE_HIGH); K053252(config, m_k053252, XTAL(14'318'181) / 2); // not verified m_k053252->int1_ack().set(FUNC(konmedal_state::vbl_ack_w)); @@ -875,7 +875,7 @@ void konmedal_state::ddboy(machine_config &config) NVRAM(config, m_nvram, nvram_device::DEFAULT_ALL_0); m_nvram->set_custom_handler(FUNC(konmedal_state::medal_nvram_init)); - HOPPER(config, "hopper", attotime::from_msec(100), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); + HOPPER(config, "hopper", attotime::from_msec(100), hopper_device::MOTOR_ACTIVE_HIGH, hopper_device::STATUS_ACTIVE_HIGH); K053252(config, m_k053252, XTAL(14'318'181) / 2); // not verified m_k053252->int1_ack().set(FUNC(konmedal_state::vbl_ack_w)); @@ -1019,7 +1019,7 @@ void konmedal_state::shuriboy(machine_config &config) NVRAM(config, m_nvram, nvram_device::DEFAULT_ALL_0); m_nvram->set_custom_handler(FUNC(konmedal_state::shuriboy_nvram_init)); - HOPPER(config, "hopper", attotime::from_msec(100), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); + HOPPER(config, "hopper", attotime::from_msec(100), hopper_device::MOTOR_ACTIVE_HIGH, hopper_device::STATUS_ACTIVE_HIGH); /* video hardware */ screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); // everything not verified, just a placeholder diff --git a/src/mame/konami/konmedal68k.cpp b/src/mame/konami/konmedal68k.cpp index 217fe15ba5d..75e315f9676 100644 --- a/src/mame/konami/konmedal68k.cpp +++ b/src/mame/konami/konmedal68k.cpp @@ -21,16 +21,18 @@ ***************************************************************************/ #include "emu.h" +#include "k054156_k054157_k056832.h" +#include "k055555.h" +#include "konami_helper.h" + #include "cpu/m68000/m68000.h" #include "machine/eepromser.h" #include "machine/gen_latch.h" #include "machine/nvram.h" -#include "machine/timer.h" #include "machine/ticket.h" +#include "machine/timer.h" #include "sound/ymz280b.h" -#include "k054156_k054157_k056832.h" -#include "k055555.h" -#include "konami_helper.h" + #include "emupal.h" #include "screen.h" #include "speaker.h" @@ -640,7 +642,7 @@ void konmedal68k_state::kzaurus(machine_config &config) m_maincpu->set_addrmap(AS_PROGRAM, &konmedal68k_state::kzaurus_main); TIMER(config, "scantimer").configure_scanline(FUNC(konmedal68k_state::scanline), "screen", 0, 1); NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); - HOPPER(config, "hopper", attotime::from_msec(100), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); + HOPPER(config, "hopper", attotime::from_msec(100), hopper_device::MOTOR_ACTIVE_HIGH, hopper_device::STATUS_ACTIVE_HIGH); /* video hardware */ SCREEN(config, m_screen, SCREEN_TYPE_RASTER); diff --git a/src/mame/konami/piratesh.cpp b/src/mame/konami/piratesh.cpp index 8eb9c253f25..848afa44c12 100644 --- a/src/mame/konami/piratesh.cpp +++ b/src/mame/konami/piratesh.cpp @@ -610,8 +610,8 @@ void piratesh_state::piratesh(machine_config &config) K053252(config, m_k053252, XTAL(32'000'000)/4); m_k053252->set_offsets(40, 16); // TODO - TICKET_DISPENSER(config, "ticket", attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); - HOPPER(config, "hopper", attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); + TICKET_DISPENSER(config, "ticket", attotime::from_msec(200), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_HIGH); + HOPPER(config, "hopper", attotime::from_msec(200), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_HIGH); /* video hardware */ screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); diff --git a/src/mame/konami/quickpick5.cpp b/src/mame/konami/quickpick5.cpp index 502c7548a04..03a20cac67b 100644 --- a/src/mame/konami/quickpick5.cpp +++ b/src/mame/konami/quickpick5.cpp @@ -22,16 +22,18 @@ ***************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" -#include "machine/eepromser.h" -#include "sound/k051649.h" -#include "sound/okim6295.h" #include "k053244_k053245.h" #include "konami_helper.h" + +#include "cpu/z80/z80.h" +#include "machine/eepromser.h" #include "machine/k053252.h" #include "machine/nvram.h" #include "machine/ticket.h" #include "machine/timer.h" +#include "sound/k051649.h" +#include "sound/okim6295.h" + #include "emupal.h" #include "screen.h" #include "speaker.h" @@ -587,7 +589,7 @@ void quickpick5_state::quickpick5(machine_config &config) Z80(config, m_maincpu, XTAL(32'000'000)/4); // z84c0008pec 8mhz part, 32Mhz xtal verified on PCB, divisor unknown m_maincpu->set_addrmap(AS_PROGRAM, &quickpick5_state::quickpick5_main); TIMER(config, "scantimer").configure_scanline(FUNC(quickpick5_state::scanline), "screen", 0, 1); - HOPPER(config, "hopper", attotime::from_msec(100), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW); + HOPPER(config, "hopper", attotime::from_msec(100), hopper_device::MOTOR_ACTIVE_HIGH, hopper_device::STATUS_ACTIVE_LOW); K053252(config, m_k053252, XTAL(32'000'000)/4); /* K053252, xtal verified, divider not verified */ m_k053252->int1_ack().set(FUNC(quickpick5_state::vbl_ack_w)); diff --git a/src/mame/midway/williams.cpp b/src/mame/midway/williams.cpp index 2b9a1754e85..372241782a8 100644 --- a/src/mame/midway/williams.cpp +++ b/src/mame/midway/williams.cpp @@ -1780,7 +1780,7 @@ void williams_state::lottofun(machine_config &config) m_pia[0]->writepb_handler().set("ticket", FUNC(ticket_dispenser_device::motor_w)).bit(7); m_pia[0]->ca2_handler().set([this](int state) { machine().bookkeeping().coin_lockout_global_w(state); }); - TICKET_DISPENSER(config, "ticket", attotime::from_msec(70), TICKET_MOTOR_ACTIVE_LOW, TICKET_STATUS_ACTIVE_HIGH); + TICKET_DISPENSER(config, "ticket", attotime::from_msec(70), ticket_dispenser_device::MOTOR_ACTIVE_LOW, ticket_dispenser_device::STATUS_ACTIVE_HIGH); } diff --git a/src/mame/misc/amusco.cpp b/src/mame/misc/amusco.cpp index 3b29e01c5fc..0ed9dc3242b 100644 --- a/src/mame/misc/amusco.cpp +++ b/src/mame/misc/amusco.cpp @@ -574,7 +574,7 @@ void amusco_state::amusco(machine_config &config) i8155b.in_pc_callback().set(m_rtc, FUNC(msm5832_device::data_r)); i8155b.out_pc_callback().set(m_rtc, FUNC(msm5832_device::data_w)); - TICKET_DISPENSER(config, m_hopper, attotime::from_msec(30), TICKET_MOTOR_ACTIVE_LOW, TICKET_STATUS_ACTIVE_HIGH); + TICKET_DISPENSER(config, m_hopper, attotime::from_msec(30), ticket_dispenser_device::MOTOR_ACTIVE_LOW, ticket_dispenser_device::STATUS_ACTIVE_HIGH); /* video hardware */ SCREEN(config, m_screen, SCREEN_TYPE_RASTER); diff --git a/src/mame/misc/babysuprem.cpp b/src/mame/misc/babysuprem.cpp index e81e92f8c58..24f750ebf96 100644 --- a/src/mame/misc/babysuprem.cpp +++ b/src/mame/misc/babysuprem.cpp @@ -183,9 +183,9 @@ void bsuprem_state::bsuprem(machine_config &config) NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); - HOPPER(config, m_hopper_5, attotime::from_msec(50), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); - HOPPER(config, m_hopper_25, attotime::from_msec(50), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); - HOPPER(config, m_hopper_100, attotime::from_msec(50), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); + HOPPER(config, m_hopper_5, attotime::from_msec(50), hopper_device::MOTOR_ACTIVE_HIGH, hopper_device::STATUS_ACTIVE_HIGH); + HOPPER(config, m_hopper_25, attotime::from_msec(50), hopper_device::MOTOR_ACTIVE_HIGH, hopper_device::STATUS_ACTIVE_HIGH); + HOPPER(config, m_hopper_100, attotime::from_msec(50), hopper_device::MOTOR_ACTIVE_HIGH, hopper_device::STATUS_ACTIVE_HIGH); // Sound hardware SPEAKER(config, "mono").front_center(); diff --git a/src/mame/misc/calomega.cpp b/src/mame/misc/calomega.cpp index 265bf736932..4974f857a05 100644 --- a/src/mame/misc/calomega.cpp +++ b/src/mame/misc/calomega.cpp @@ -4648,7 +4648,7 @@ void calomega_state::sys903(machine_config &config) TIMER(config, "timer_0").configure_periodic(FUNC(calomega_state::timer_0), attotime::from_hz(550*2)); // (time*2) - Each timer pulse -> half period - HOPPER(config, m_hopper, attotime::from_msec(50), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH ); + HOPPER(config, m_hopper, attotime::from_msec(50), hopper_device::MOTOR_ACTIVE_HIGH, hopper_device::STATUS_ACTIVE_HIGH ); } @@ -4726,7 +4726,7 @@ void calomega_state::sys903kb(machine_config &config) TIMER(config, "timer_0").configure_periodic(FUNC(calomega_state::timer_0), attotime::from_hz(550*2)); // (time*2) - Each timer pulse -> half period - HOPPER(config, m_hopper, attotime::from_msec(50), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH ); + HOPPER(config, m_hopper, attotime::from_msec(50), hopper_device::MOTOR_ACTIVE_HIGH, hopper_device::STATUS_ACTIVE_HIGH ); } diff --git a/src/mame/misc/clpoker.cpp b/src/mame/misc/clpoker.cpp index cc23208fe26..1217bcf594d 100644 --- a/src/mame/misc/clpoker.cpp +++ b/src/mame/misc/clpoker.cpp @@ -268,7 +268,7 @@ void clpoker_state::clpoker(machine_config &config) ppi_inputs.in_pb_callback().set_ioport("INB"); ppi_inputs.in_pc_callback().set_ioport("INC"); - TICKET_DISPENSER(config, m_hopper, attotime::from_msec(60), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW); + TICKET_DISPENSER(config, m_hopper, attotime::from_msec(60), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_LOW); screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); screen.set_refresh_hz(60); // wrong diff --git a/src/mame/misc/dcheese.cpp b/src/mame/misc/dcheese.cpp index b6855b1367e..8d81497045f 100644 --- a/src/mame/misc/dcheese.cpp +++ b/src/mame/misc/dcheese.cpp @@ -388,7 +388,7 @@ void dcheese_state::dcheese(machine_config &config) EEPROM_93C46_16BIT(config, "eeprom"); - TICKET_DISPENSER(config, "ticket", attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW); + TICKET_DISPENSER(config, "ticket", attotime::from_msec(200), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_LOW); WATCHDOG_TIMER(config, "watchdog"); diff --git a/src/mame/misc/gei.cpp b/src/mame/misc/gei.cpp index a06d3112eed..d80debf2c04 100644 --- a/src/mame/misc/gei.cpp +++ b/src/mame/misc/gei.cpp @@ -1059,7 +1059,7 @@ void gei_state::getrivia(machine_config &config) m_ppi[1]->out_pb_callback().set(FUNC(gei_state::lamps_w)); m_ppi[1]->out_pc_callback().set(FUNC(gei_state::lamps2_w)); - TICKET_DISPENSER(config, m_ticket, attotime::from_msec(100), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); + TICKET_DISPENSER(config, m_ticket, attotime::from_msec(100), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_HIGH); // sound hardware SPEAKER(config, "speaker").front_center(); diff --git a/src/mame/misc/gi6809.cpp b/src/mame/misc/gi6809.cpp index 3d3ed95d32b..e3fe9e80c77 100644 --- a/src/mame/misc/gi6809.cpp +++ b/src/mame/misc/gi6809.cpp @@ -635,7 +635,7 @@ void gi6809_state::gi6809_base(machine_config &config) NETLIST_LOGIC_INPUT(config, "sound_nl:bit3", "PA3.IN", 0); NETLIST_STREAM_OUTPUT(config, "sound_nl:cout0", 0, "OUTPUT").set_mult_offset(1.0, 0.0); - TICKET_DISPENSER(config, m_hopper, attotime::from_msec(50), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); + TICKET_DISPENSER(config, m_hopper, attotime::from_msec(50), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_HIGH); } diff --git a/src/mame/misc/interflip8035.cpp b/src/mame/misc/interflip8035.cpp index eb309639040..b008fdf5d07 100644 --- a/src/mame/misc/interflip8035.cpp +++ b/src/mame/misc/interflip8035.cpp @@ -1237,7 +1237,7 @@ void interflip8035_state::interflip(machine_config &config) add_em_reels(config, 20, attotime::from_double(2)); // hopper device - HOPPER(config, m_hopper, attotime::from_msec(100), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); + HOPPER(config, m_hopper, attotime::from_msec(100), hopper_device::MOTOR_ACTIVE_HIGH, hopper_device::STATUS_ACTIVE_HIGH); // sound stuff SPEAKER(config, "mono").front_center(); diff --git a/src/mame/misc/jackhouse.cpp b/src/mame/misc/jackhouse.cpp index 1f04ebded66..917d50fe9fb 100644 --- a/src/mame/misc/jackhouse.cpp +++ b/src/mame/misc/jackhouse.cpp @@ -707,7 +707,7 @@ void jackhouse_state::jackhouse(machine_config &config) GFXDECODE(config, m_gfxdecode, m_palette, gfx_jackhouse); config.set_default_layout(layout_jackhouse); - HOPPER(config, m_hopper, attotime::from_msec(100), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); + HOPPER(config, m_hopper, attotime::from_msec(100), hopper_device::MOTOR_ACTIVE_HIGH, hopper_device::STATUS_ACTIVE_HIGH); SPEAKER(config, "speaker").front_center(); diff --git a/src/mame/misc/kingpin.cpp b/src/mame/misc/kingpin.cpp index f3a72a58b26..2675a0ad0ba 100644 --- a/src/mame/misc/kingpin.cpp +++ b/src/mame/misc/kingpin.cpp @@ -240,7 +240,7 @@ void kingpin_state::kingpin(machine_config &config) AY8912(config, "aysnd", XTAL(3'579'545)).add_route(ALL_OUTPUTS, "mono", 0.50); - HOPPER(config, "hopper", attotime::from_msec(100), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW); + HOPPER(config, "hopper", attotime::from_msec(100), hopper_device::MOTOR_ACTIVE_HIGH, hopper_device::STATUS_ACTIVE_LOW); config.set_default_layout(layout_kingpin); } diff --git a/src/mame/misc/kurukuru.cpp b/src/mame/misc/kurukuru.cpp index 33c92289a28..ec59b63195d 100644 --- a/src/mame/misc/kurukuru.cpp +++ b/src/mame/misc/kurukuru.cpp @@ -865,7 +865,7 @@ void kurukuru_state::kurukuru(machine_config &config) v9938.int_cb().set_inputline("maincpu", 0); SCREEN(config, "screen", SCREEN_TYPE_RASTER); - TICKET_DISPENSER(config, "hopper", attotime::from_msec(HOPPER_PULSE), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); + TICKET_DISPENSER(config, "hopper", attotime::from_msec(HOPPER_PULSE), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_HIGH); // sound hardware SPEAKER(config, "mono").front_center(); diff --git a/src/mame/misc/magic10.cpp b/src/mame/misc/magic10.cpp index 54934856a26..3c6b50a7850 100644 --- a/src/mame/misc/magic10.cpp +++ b/src/mame/misc/magic10.cpp @@ -984,8 +984,8 @@ void magic10_state::magic10(machine_config &config) // basic machine hardware m_maincpu->set_addrmap(AS_PROGRAM, &magic10_state::magic10_map); - TICKET_DISPENSER(config, m_ticket, attotime::from_msec(6), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH ); - HOPPER(config, m_hopper, attotime::from_msec(20), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH ); + TICKET_DISPENSER(config, m_ticket, attotime::from_msec(6), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_HIGH); + HOPPER(config, m_hopper, attotime::from_msec(20), hopper_device::MOTOR_ACTIVE_HIGH, hopper_device::STATUS_ACTIVE_HIGH); } @@ -1044,7 +1044,7 @@ void spetrix_state::spetrix(machine_config &config) { base(config); - TICKET_DISPENSER(config, m_ticket, attotime::from_msec(6), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH ); + TICKET_DISPENSER(config, m_ticket, attotime::from_msec(6), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_HIGH); m_maincpu->set_addrmap(AS_PROGRAM, &spetrix_state::spetrix_map); m_maincpu->set_vblank_int("screen", FUNC(spetrix_state::irq2_line_hold)); // L1 interrupts diff --git a/src/mame/misc/mgavegas.cpp b/src/mame/misc/mgavegas.cpp index 1bf8796d99f..58160541560 100644 --- a/src/mame/misc/mgavegas.cpp +++ b/src/mame/misc/mgavegas.cpp @@ -510,7 +510,7 @@ void mgavegas_state::mgavegas(machine_config &config) NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1); - TICKET_DISPENSER(config, "hopper", attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW); + TICKET_DISPENSER(config, "hopper", attotime::from_msec(200), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_LOW); // sound hardware SPEAKER(config, "mono").front_center(); diff --git a/src/mame/misc/mjsenpu.cpp b/src/mame/misc/mjsenpu.cpp index 7493f7dff58..293afc40784 100644 --- a/src/mame/misc/mjsenpu.cpp +++ b/src/mame/misc/mjsenpu.cpp @@ -471,7 +471,7 @@ void mjsenpu_state::mjsenpu(machine_config &config) NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1); // more likely coins out? - TICKET_DISPENSER(config, m_hopper, attotime::from_msec(50), TICKET_MOTOR_ACTIVE_LOW, TICKET_STATUS_ACTIVE_HIGH); + TICKET_DISPENSER(config, m_hopper, attotime::from_msec(50), ticket_dispenser_device::MOTOR_ACTIVE_LOW, ticket_dispenser_device::STATUS_ACTIVE_HIGH); /* video hardware */ screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); diff --git a/src/mame/misc/mpu12wbk.cpp b/src/mame/misc/mpu12wbk.cpp index 56940b7621f..84047288c27 100644 --- a/src/mame/misc/mpu12wbk.cpp +++ b/src/mame/misc/mpu12wbk.cpp @@ -962,7 +962,7 @@ void mpu12wbk_state::mpu12wbk(machine_config &config) NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); NVRAM(config, "nvram2", nvram_device::DEFAULT_ALL_0); - HOPPER(config, m_hopper, attotime::from_msec(100), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH ); + HOPPER(config, m_hopper, attotime::from_msec(100), hopper_device::MOTOR_ACTIVE_HIGH, hopper_device::STATUS_ACTIVE_HIGH); // video hardware screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); diff --git a/src/mame/misc/multfish.cpp b/src/mame/misc/multfish.cpp index 11a39c5f46b..0a7c3e4a1ea 100644 --- a/src/mame/misc/multfish.cpp +++ b/src/mame/misc/multfish.cpp @@ -1080,7 +1080,7 @@ void igrosoft_gamble_state::igrosoft_gamble(machine_config &config) AY8910(config, "aysnd", 6000000/4).add_route(ALL_OUTPUTS, "mono", 0.30); M48T35(config, m_m48t35, 0); - HOPPER(config, m_hopper, attotime::from_msec(100), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); + HOPPER(config, m_hopper, attotime::from_msec(100), hopper_device::MOTOR_ACTIVE_HIGH, hopper_device::STATUS_ACTIVE_HIGH); } void igrosoft_gamble_state::rollfr(machine_config &config) diff --git a/src/mame/misc/piggypas.cpp b/src/mame/misc/piggypas.cpp index 9f18a22de7f..a733f8c372d 100644 --- a/src/mame/misc/piggypas.cpp +++ b/src/mame/misc/piggypas.cpp @@ -235,7 +235,7 @@ void piggypas_state::piggypas(machine_config &config) ppi.out_pb_callback().set(FUNC(piggypas_state::ctrl_w)); ppi.in_pc_callback().set_ioport("IN0"); - TICKET_DISPENSER(config, "ticket", attotime::from_msec(100), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); + TICKET_DISPENSER(config, "ticket", attotime::from_msec(100), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_HIGH); } void piggypas_state::fidlstix(machine_config &config) diff --git a/src/mame/misc/skylncr.cpp b/src/mame/misc/skylncr.cpp index 19e24ccf161..91a4451fde6 100644 --- a/src/mame/misc/skylncr.cpp +++ b/src/mame/misc/skylncr.cpp @@ -1689,7 +1689,7 @@ void skylncr_state::skylncr(machine_config &config) ppi1.in_pb_callback().set_ioport("IN3"); ppi1.in_pc_callback().set_ioport("IN4"); - TICKET_DISPENSER(config, m_hopper, attotime::from_msec(HOPPER_PULSE), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); + TICKET_DISPENSER(config, m_hopper, attotime::from_msec(HOPPER_PULSE), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_HIGH); // video hardware screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); diff --git a/src/mame/misc/tapatune.cpp b/src/mame/misc/tapatune.cpp index 1e89dc53368..6671e750080 100644 --- a/src/mame/misc/tapatune.cpp +++ b/src/mame/misc/tapatune.cpp @@ -536,7 +536,7 @@ void tapatune_state::tapatune_base(machine_config &config) NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); - TICKET_DISPENSER(config, "ticket", attotime::from_msec(100), TICKET_MOTOR_ACTIVE_LOW, TICKET_STATUS_ACTIVE_LOW); + TICKET_DISPENSER(config, "ticket", attotime::from_msec(100), ticket_dispenser_device::MOTOR_ACTIVE_LOW, ticket_dispenser_device::STATUS_ACTIVE_LOW); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); diff --git a/src/mame/misc/tickee.cpp b/src/mame/misc/tickee.cpp index d3fe9044392..2b403e81c1b 100644 --- a/src/mame/misc/tickee.cpp +++ b/src/mame/misc/tickee.cpp @@ -806,8 +806,8 @@ void tickee_gun_state::tickee(machine_config &config) set_beamadd(50, 0); NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1); - TICKET_DISPENSER(config, m_ticket[0], attotime::from_msec(100), TICKET_MOTOR_ACTIVE_LOW, TICKET_STATUS_ACTIVE_HIGH); - TICKET_DISPENSER(config, m_ticket[1], attotime::from_msec(100), TICKET_MOTOR_ACTIVE_LOW, TICKET_STATUS_ACTIVE_HIGH); + TICKET_DISPENSER(config, m_ticket[0], attotime::from_msec(100), ticket_dispenser_device::MOTOR_ACTIVE_LOW, ticket_dispenser_device::STATUS_ACTIVE_HIGH); + TICKET_DISPENSER(config, m_ticket[1], attotime::from_msec(100), ticket_dispenser_device::MOTOR_ACTIVE_LOW, ticket_dispenser_device::STATUS_ACTIVE_HIGH); // video hardware TLC34076(config, m_tlc34076, tlc34076_device::TLC34076_6_BIT); @@ -850,8 +850,8 @@ void tickee_state::mouseatk(machine_config &config) NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1); - TICKET_DISPENSER(config, m_ticket[0], attotime::from_msec(100), TICKET_MOTOR_ACTIVE_LOW, TICKET_STATUS_ACTIVE_HIGH); - TICKET_DISPENSER(config, m_ticket[1], attotime::from_msec(100), TICKET_MOTOR_ACTIVE_LOW, TICKET_STATUS_ACTIVE_HIGH); + TICKET_DISPENSER(config, m_ticket[0], attotime::from_msec(100), ticket_dispenser_device::MOTOR_ACTIVE_LOW, ticket_dispenser_device::STATUS_ACTIVE_HIGH); + TICKET_DISPENSER(config, m_ticket[1], attotime::from_msec(100), ticket_dispenser_device::MOTOR_ACTIVE_LOW, ticket_dispenser_device::STATUS_ACTIVE_HIGH); // video hardware TLC34076(config, m_tlc34076, tlc34076_device::TLC34076_6_BIT); @@ -908,7 +908,7 @@ void tickee_gun_state::maletmad(machine_config &config) { rapidfir(config); - TICKET_DISPENSER(config, m_ticket[0], attotime::from_msec(100), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); + TICKET_DISPENSER(config, m_ticket[0], attotime::from_msec(100), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_HIGH); } diff --git a/src/mame/misc/tvg01.cpp b/src/mame/misc/tvg01.cpp index 2f30155df83..7221a76d6de 100644 --- a/src/mame/misc/tvg01.cpp +++ b/src/mame/misc/tvg01.cpp @@ -308,7 +308,7 @@ void tvg01_state::theboat(machine_config &config) vdp.set_vram_size(VDP_MEM); // 4x MB81464-15 vdp.int_cb().set_inputline("maincpu", INPUT_LINE_IRQ0); - TICKET_DISPENSER(config, "hopper", attotime::from_msec(HOPPER_PULSE), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); + TICKET_DISPENSER(config, "hopper", attotime::from_msec(HOPPER_PULSE), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_HIGH); SPEAKER(config, "mono").front_center(); diff --git a/src/mame/msx/big10.cpp b/src/mame/msx/big10.cpp index afedf20b555..9367b6054f5 100644 --- a/src/mame/msx/big10.cpp +++ b/src/mame/msx/big10.cpp @@ -239,7 +239,7 @@ void big10_state::big10(machine_config &config) NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); - TICKET_DISPENSER(config, m_hopper, attotime::from_msec(HOPPER_PULSE), TICKET_MOTOR_ACTIVE_LOW, TICKET_STATUS_ACTIVE_LOW); + TICKET_DISPENSER(config, m_hopper, attotime::from_msec(HOPPER_PULSE), ticket_dispenser_device::MOTOR_ACTIVE_LOW, ticket_dispenser_device::STATUS_ACTIVE_LOW); // video hardware v9938_device &v9938(V9938(config, "v9938", MASTER_CLOCK)); diff --git a/src/mame/namco/cgang.cpp b/src/mame/namco/cgang.cpp index b5f4f070913..52cf7407b4b 100644 --- a/src/mame/namco/cgang.cpp +++ b/src/mame/namco/cgang.cpp @@ -809,7 +809,7 @@ void cgang_state::cgang(machine_config &config) WATCHDOG_TIMER(config, m_watchdog); // HA1835P m_watchdog->set_time(attotime::from_msec(100)); // approximation - TICKET_DISPENSER(config, m_ticket, attotime::from_msec(3000), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); + TICKET_DISPENSER(config, m_ticket, attotime::from_msec(3000), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_HIGH); // video hardware PWM_DISPLAY(config, m_digits).set_size(10, 7); diff --git a/src/mame/namco/namcos10.cpp b/src/mame/namco/namcos10.cpp index abe9e7e4303..3fdfdb09f5a 100644 --- a/src/mame/namco/namcos10.cpp +++ b/src/mame/namco/namcos10.cpp @@ -1383,9 +1383,9 @@ void namcos10_state::namcos10_mgexio(machine_config &config) namcos10_mgexio_device &mgexio(NAMCOS10_MGEXIO(config, m_exio, 0)); - HOPPER(config, m_mgexio_hopper[0], attotime::from_msec(100), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); - HOPPER(config, m_mgexio_hopper[1], attotime::from_msec(100), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); - HOPPER(config, m_mgexio_hopper[2], attotime::from_msec(100), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); + HOPPER(config, m_mgexio_hopper[0], attotime::from_msec(100), hopper_device::MOTOR_ACTIVE_HIGH, hopper_device::STATUS_ACTIVE_HIGH); + HOPPER(config, m_mgexio_hopper[1], attotime::from_msec(100), hopper_device::MOTOR_ACTIVE_HIGH, hopper_device::STATUS_ACTIVE_HIGH); + HOPPER(config, m_mgexio_hopper[2], attotime::from_msec(100), hopper_device::MOTOR_ACTIVE_HIGH, hopper_device::STATUS_ACTIVE_HIGH); mgexio.port4_read_callback().set([this] (offs_t offset) { uint8_t r = 0; diff --git a/src/mame/namco/wacky_gator.cpp b/src/mame/namco/wacky_gator.cpp index 8f3ba4d7d1f..73e14c6e0b2 100644 --- a/src/mame/namco/wacky_gator.cpp +++ b/src/mame/namco/wacky_gator.cpp @@ -337,7 +337,7 @@ void wackygtr_state::wackygtr(machine_config &config) m_pit8253[1]->set_clk<2>(XTAL(3'579'545)/16); // this is a guess m_pit8253[1]->out_handler<2>().set(FUNC(wackygtr_state::alligator_ck<4>)); - TICKET_DISPENSER(config, "ticket", attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); + TICKET_DISPENSER(config, "ticket", attotime::from_msec(200), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_HIGH); } diff --git a/src/mame/neogeo/midas.cpp b/src/mame/neogeo/midas.cpp index ac6dd4f966c..0f3e227b963 100644 --- a/src/mame/neogeo/midas.cpp +++ b/src/mame/neogeo/midas.cpp @@ -673,15 +673,15 @@ void midas_state::hammer(machine_config &config) TICKET_DISPENSER(config, m_prize[0], 0); m_prize[0]->set_period(attotime::from_msec(1000*5)); - m_prize[0]->set_senses(TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW, false); + m_prize[0]->set_senses(ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_LOW, false); TICKET_DISPENSER(config, m_prize[1], 0); m_prize[1]->set_period(attotime::from_msec(1000*5)); - m_prize[1]->set_senses(TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW, false); + m_prize[1]->set_senses(ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_LOW, false); TICKET_DISPENSER(config, m_ticket, 0); m_ticket->set_period(attotime::from_msec(200)); - m_ticket->set_senses(TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW, false); + m_ticket->set_senses(ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_LOW, false); /* video hardware */ SCREEN(config, m_screen, SCREEN_TYPE_RASTER); diff --git a/src/mame/playmark/playmark.cpp b/src/mame/playmark/playmark.cpp index 7452cadcbc6..166bc306998 100644 --- a/src/mame/playmark/playmark.cpp +++ b/src/mame/playmark/playmark.cpp @@ -1315,8 +1315,8 @@ void playmark_state::hotmind(machine_config &config) MCFG_VIDEO_START_OVERRIDE(playmark_state,hotmind) - TICKET_DISPENSER(config, m_ticket, attotime::from_msec(350), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); - TICKET_DISPENSER(config, m_token, attotime::from_msec(350), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); + TICKET_DISPENSER(config, m_ticket, attotime::from_msec(350), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_HIGH); + TICKET_DISPENSER(config, m_token, attotime::from_msec(350), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_HIGH); // sound hardware SPEAKER(config, "mono").front_center(); @@ -1356,8 +1356,8 @@ void playmark_state::luckboomh(machine_config &config) MCFG_VIDEO_START_OVERRIDE(playmark_state,luckboomh) - TICKET_DISPENSER(config, m_ticket, attotime::from_msec(350), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); - TICKET_DISPENSER(config, m_token, attotime::from_msec(350), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); + TICKET_DISPENSER(config, m_ticket, attotime::from_msec(350), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_HIGH); + TICKET_DISPENSER(config, m_token, attotime::from_msec(350), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_HIGH); // sound hardware SPEAKER(config, "mono").front_center(); diff --git a/src/mame/playmark/powerbal.cpp b/src/mame/playmark/powerbal.cpp index 490a4511dd4..f29e0505e87 100644 --- a/src/mame/playmark/powerbal.cpp +++ b/src/mame/playmark/powerbal.cpp @@ -699,8 +699,8 @@ void magicstk_state::magicstk(machine_config &config) GFXDECODE(config, m_gfxdecode, m_palette, gfx_powerbal); PALETTE(config, m_palette).set_format(palette_device::RRRRGGGGBBBBRGBx, 512); - TICKET_DISPENSER(config, m_ticket, attotime::from_msec(350), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); - TICKET_DISPENSER(config, m_token, attotime::from_msec(350), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); + TICKET_DISPENSER(config, m_ticket, attotime::from_msec(350), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_HIGH); + TICKET_DISPENSER(config, m_token, attotime::from_msec(350), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_HIGH); // sound hardware SPEAKER(config, "mono").front_center(); diff --git a/src/mame/rare/xtheball.cpp b/src/mame/rare/xtheball.cpp index 27036f93f89..713cb1696fd 100644 --- a/src/mame/rare/xtheball.cpp +++ b/src/mame/rare/xtheball.cpp @@ -25,16 +25,17 @@ namespace { class xtheball_state : public driver_device { public: - xtheball_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_watchdog(*this, "watchdog"), - m_tlc34076(*this, "tlc34076"), - m_ticket(*this, "ticket"), - m_vram_bg(*this, "vrabg"), - m_vram_fg(*this, "vrafg"), - m_analog_x(*this, "ANALOGX"), - m_analog_y(*this, "ANALOGY") { } + xtheball_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu"), + m_watchdog(*this, "watchdog"), + m_tlc34076(*this, "tlc34076"), + m_ticket(*this, "ticket"), + m_vram_bg(*this, "vrabg"), + m_vram_fg(*this, "vrafg"), + m_analog_x(*this, "ANALOGX"), + m_analog_y(*this, "ANALOGY") + { } void xtheball(machine_config &config); @@ -319,7 +320,7 @@ void xtheball_state::xtheball(machine_config &config) latch3.q_out_cb<3>().set(FUNC(xtheball_state::foreground_mode_w)); // Q3 = video foreground control? - TICKET_DISPENSER(config, m_ticket, attotime::from_msec(100), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); + TICKET_DISPENSER(config, m_ticket, attotime::from_msec(100), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_HIGH); WATCHDOG_TIMER(config, m_watchdog); diff --git a/src/mame/recfranco/rfslots8085.cpp b/src/mame/recfranco/rfslots8085.cpp index 217d41c9ea6..a42a290b4fc 100644 --- a/src/mame/recfranco/rfslots8085.cpp +++ b/src/mame/recfranco/rfslots8085.cpp @@ -845,8 +845,8 @@ void rfslots8085_state::rf53_3297(machine_config &config) NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); - HOPPER(config, m_hopper[0], attotime::from_msec(150), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); // hopper motor 25 Pts. - HOPPER(config, m_hopper[1], attotime::from_msec(150), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); // hopper motor 100 Pts. + HOPPER(config, m_hopper[0], attotime::from_msec(150), hopper_device::MOTOR_ACTIVE_HIGH, hopper_device::STATUS_ACTIVE_HIGH); // hopper motor 25 Pts. + HOPPER(config, m_hopper[1], attotime::from_msec(150), hopper_device::MOTOR_ACTIVE_HIGH, hopper_device::STATUS_ACTIVE_HIGH); // hopper motor 100 Pts. add_em_reels(config, 100, attotime::from_double(2)); diff --git a/src/mame/recfranco/rfslotsmcs48.cpp b/src/mame/recfranco/rfslotsmcs48.cpp index 2795c757745..5e6785b8c91 100644 --- a/src/mame/recfranco/rfslotsmcs48.cpp +++ b/src/mame/recfranco/rfslotsmcs48.cpp @@ -728,7 +728,7 @@ void rfslotsmcs48_state::rf_3115_base(machine_config &config) NVRAM(config, "data_ram", nvram_device::DEFAULT_ALL_0); // Hopper device - HOPPER(config, m_hopper, attotime::from_msec(100), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); + HOPPER(config, m_hopper, attotime::from_msec(100), hopper_device::MOTOR_ACTIVE_HIGH, hopper_device::STATUS_ACTIVE_HIGH); SPEAKER(config, "mono").front_center(); } diff --git a/src/mame/sega/stv.cpp b/src/mame/sega/stv.cpp index 969b95d4c58..4d20921a82e 100644 --- a/src/mame/sega/stv.cpp +++ b/src/mame/sega/stv.cpp @@ -1284,7 +1284,7 @@ void stv_state::stv_slot(machine_config &config) void stv_state::hopper(machine_config &config) { stv(config); - HOPPER(config, m_hopper, attotime::from_msec(100), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); + HOPPER(config, m_hopper, attotime::from_msec(100), hopper_device::MOTOR_ACTIVE_HIGH, hopper_device::STATUS_ACTIVE_HIGH); m_maincpu->set_addrmap(AS_PROGRAM, &stv_state::hopper_mem); m_slave->set_addrmap(AS_PROGRAM, &stv_state::hopper_mem); diff --git a/src/mame/seibu/banprestoms.cpp b/src/mame/seibu/banprestoms.cpp index 26fcc264d10..8c8421bf116 100644 --- a/src/mame/seibu/banprestoms.cpp +++ b/src/mame/seibu/banprestoms.cpp @@ -413,7 +413,7 @@ void banprestoms_state::banprestoms(machine_config &config) NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); - TICKET_DISPENSER(config, m_ticket, attotime::from_msec(100), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); // TODO: period is guessed + TICKET_DISPENSER(config, m_ticket, attotime::from_msec(100), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_HIGH); // TODO: period is guessed // video hardware screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); // TODO: copied from other drivers using the same CRTC diff --git a/src/mame/seibu/feversoc.cpp b/src/mame/seibu/feversoc.cpp index 433b186d097..db6aea51908 100644 --- a/src/mame/seibu/feversoc.cpp +++ b/src/mame/seibu/feversoc.cpp @@ -323,7 +323,7 @@ void feversoc_state::feversoc(machine_config &config) NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); - TICKET_DISPENSER(config, m_hopper, attotime::from_msec(60), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); + TICKET_DISPENSER(config, m_hopper, attotime::from_msec(60), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_HIGH); } /*************************************************************************** diff --git a/src/mame/seta/albazc.cpp b/src/mame/seta/albazc.cpp index b1dcbfbd903..a5484e08070 100644 --- a/src/mame/seta/albazc.cpp +++ b/src/mame/seta/albazc.cpp @@ -227,7 +227,7 @@ void albazc_state::hanaroku(machine_config &config) NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); - TICKET_DISPENSER(config, m_hopper, attotime::from_msec(50), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); + TICKET_DISPENSER(config, m_hopper, attotime::from_msec(50), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_HIGH); // video hardware screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); diff --git a/src/mame/seta/champbwl.cpp b/src/mame/seta/champbwl.cpp index a0954ac559e..cd3b48ccdc4 100644 --- a/src/mame/seta/champbwl.cpp +++ b/src/mame/seta/champbwl.cpp @@ -601,7 +601,7 @@ void doraemon_state::doraemon(machine_config &config) m_spritegen->set_bg_yoffsets(0x00, 0x01); m_spritegen->set_fg_yoffsets(0x00, 0x10); - TICKET_DISPENSER(config, m_hopper, attotime::from_msec(2000), TICKET_MOTOR_ACTIVE_LOW, TICKET_STATUS_ACTIVE_LOW ); + TICKET_DISPENSER(config, m_hopper, attotime::from_msec(2000), ticket_dispenser_device::MOTOR_ACTIVE_LOW, ticket_dispenser_device::STATUS_ACTIVE_LOW); // video hardware screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); diff --git a/src/mame/seta/jclub2.cpp b/src/mame/seta/jclub2.cpp index 47e086d407a..9cf0a0656e2 100644 --- a/src/mame/seta/jclub2.cpp +++ b/src/mame/seta/jclub2.cpp @@ -1168,8 +1168,8 @@ void jclub2o_state::jclub2o(machine_config &config) EEPROM_S29290_16BIT(config, "eeprom"); WATCHDOG_TIMER(config, "watchdog"); - TICKET_DISPENSER(config, m_hopper1, attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); - TICKET_DISPENSER(config, m_hopper2, attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); + TICKET_DISPENSER(config, m_hopper1, attotime::from_msec(200), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_HIGH); + TICKET_DISPENSER(config, m_hopper2, attotime::from_msec(200), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_HIGH); // video hardware screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); @@ -1209,8 +1209,8 @@ void jclub2_state::jclub2(machine_config &config) EEPROM_93C46_8BIT(config, "eeprom"); WATCHDOG_TIMER(config, "watchdog"); - TICKET_DISPENSER(config, m_hopper1, attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); - TICKET_DISPENSER(config, m_hopper2, attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); + TICKET_DISPENSER(config, m_hopper1, attotime::from_msec(200), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_HIGH); + TICKET_DISPENSER(config, m_hopper2, attotime::from_msec(200), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_HIGH); // video hardware screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); @@ -1253,8 +1253,8 @@ void darkhors_state::darkhors(machine_config &config) EEPROM_93C46_8BIT(config, "eeprom"); WATCHDOG_TIMER(config, "watchdog"); - TICKET_DISPENSER(config, m_hopper1, attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); - TICKET_DISPENSER(config, m_hopper2, attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); + TICKET_DISPENSER(config, m_hopper1, attotime::from_msec(200), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_HIGH); + TICKET_DISPENSER(config, m_hopper2, attotime::from_msec(200), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_HIGH); // video hardware screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); diff --git a/src/mame/seta/seta.cpp b/src/mame/seta/seta.cpp index c3b5eab4973..6987031eab6 100644 --- a/src/mame/seta/seta.cpp +++ b/src/mame/seta/seta.cpp @@ -7799,7 +7799,7 @@ void setaroul_state::setaroul(machine_config &config) // devices UPD4992(config, m_rtc, 32'768); // ! Actually D4911C ! ACIA6850(config, "acia0", 0); - TICKET_DISPENSER(config, "hopper", attotime::from_msec(150), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW); + TICKET_DISPENSER(config, "hopper", attotime::from_msec(150), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_LOW); // video hardware screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); @@ -9091,8 +9091,8 @@ void jockeyc_state::jockeyc(machine_config &config) // devices UPD4992(config, m_rtc, 32'768); // ! Actually D4911C ! ACIA6850(config, "acia0", 0); - TICKET_DISPENSER(config, "hopper1", attotime::from_msec(150), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW); - TICKET_DISPENSER(config, "hopper2", attotime::from_msec(150), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW); + TICKET_DISPENSER(config, "hopper1", attotime::from_msec(150), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_LOW); + TICKET_DISPENSER(config, "hopper2", attotime::from_msec(150), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_LOW); // video hardware screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); diff --git a/src/mame/seta/seta2.cpp b/src/mame/seta/seta2.cpp index 8e69b482d91..f7bd76724ba 100644 --- a/src/mame/seta/seta2.cpp +++ b/src/mame/seta/seta2.cpp @@ -2371,7 +2371,7 @@ void seta2_state::reelquak(machine_config &config) downcast(*m_maincpu).parallel_w_cb().set(FUNC(seta2_state::reelquak_leds_w)); NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); - TICKET_DISPENSER(config, m_dispenser, attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW); + TICKET_DISPENSER(config, m_dispenser, attotime::from_msec(200), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_LOW); m_screen->set_visarea(0x00, 0x140-1, 0x000, 0x0f0-1); } @@ -2417,7 +2417,7 @@ void seta2_state::telpacfl(machine_config &config) EEPROM_93C46_16BIT(config, "eeprom"); // not hooked up, seems unused NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); - HOPPER(config, m_dispenser, attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW); + HOPPER(config, m_dispenser, attotime::from_msec(200), hopper_device::MOTOR_ACTIVE_HIGH, hopper_device::STATUS_ACTIVE_LOW); // video hardware m_screen->set_visarea(0x0, 0x180-1, 0x00, 0xf0-1); // still off by 1 because of different CRTC regs? diff --git a/src/mame/sigma/sigmab98.cpp b/src/mame/sigma/sigmab98.cpp index 7834f6c605f..27fbff96bba 100644 --- a/src/mame/sigma/sigmab98.cpp +++ b/src/mame/sigma/sigmab98.cpp @@ -1444,7 +1444,7 @@ void sigmab98_state::sigmab98(machine_config &config) NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); EEPROM_93C46_16BIT(config, "eeprom"); - TICKET_DISPENSER(config, m_hopper, attotime::from_msec(200), TICKET_MOTOR_ACTIVE_LOW, TICKET_STATUS_ACTIVE_LOW ); + TICKET_DISPENSER(config, m_hopper, attotime::from_msec(200), ticket_dispenser_device::MOTOR_ACTIVE_LOW, ticket_dispenser_device::STATUS_ACTIVE_LOW ); // video hardware SCREEN(config, m_screen, SCREEN_TYPE_RASTER); @@ -1516,7 +1516,7 @@ void lufykzku_state::lufykzku(machine_config &config) // No EEPROM MB3773(config, m_watchdog, 0); - TICKET_DISPENSER(config, m_hopper, attotime::from_msec(200), TICKET_MOTOR_ACTIVE_LOW, TICKET_STATUS_ACTIVE_LOW ); + TICKET_DISPENSER(config, m_hopper, attotime::from_msec(200), ticket_dispenser_device::MOTOR_ACTIVE_LOW, ticket_dispenser_device::STATUS_ACTIVE_LOW ); // 2 x 8-bit parallel/serial converters TTL165(config, m_dsw_shifter[0]); @@ -1593,7 +1593,7 @@ void sammymdl_state::sammymdl(machine_config &config) NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); // battery backed RAM EEPROM_93C46_8BIT(config, "eeprom"); - TICKET_DISPENSER(config, m_hopper, attotime::from_msec(200), TICKET_MOTOR_ACTIVE_LOW, TICKET_STATUS_ACTIVE_LOW ); + TICKET_DISPENSER(config, m_hopper, attotime::from_msec(200), ticket_dispenser_device::MOTOR_ACTIVE_LOW, ticket_dispenser_device::STATUS_ACTIVE_LOW ); WATCHDOG_TIMER(config, "watchdog"); @@ -1640,8 +1640,8 @@ void sammymdl_state::gocowboy(machine_config &config) TIMER(config, "scantimer").configure_scanline(FUNC(sammymdl_state::gocowboy_int), "screen", 0, 1); config.device_remove("hopper"); - TICKET_DISPENSER(config, m_hopper_small, attotime::from_msec(200), TICKET_MOTOR_ACTIVE_LOW, TICKET_STATUS_ACTIVE_LOW ); - TICKET_DISPENSER(config, m_hopper_large, attotime::from_msec(200), TICKET_MOTOR_ACTIVE_LOW, TICKET_STATUS_ACTIVE_LOW ); + TICKET_DISPENSER(config, m_hopper_small, attotime::from_msec(200), ticket_dispenser_device::MOTOR_ACTIVE_LOW, ticket_dispenser_device::STATUS_ACTIVE_LOW ); + TICKET_DISPENSER(config, m_hopper_large, attotime::from_msec(200), ticket_dispenser_device::MOTOR_ACTIVE_LOW, ticket_dispenser_device::STATUS_ACTIVE_LOW ); m_screen->screen_vblank().set_nop(); } diff --git a/src/mame/subsino/subsino.cpp b/src/mame/subsino/subsino.cpp index d01e641c196..b5d3d4bd9ee 100644 --- a/src/mame/subsino/subsino.cpp +++ b/src/mame/subsino/subsino.cpp @@ -2808,7 +2808,7 @@ void subsino_state::victor21(machine_config &config) ppi.tri_pb_callback().set_constant(0); ppi.in_pc_callback().set_ioport("INC"); - TICKET_DISPENSER(config, m_hopper, attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW); + TICKET_DISPENSER(config, m_hopper, attotime::from_msec(200), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_LOW); // video hardware screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); @@ -2850,7 +2850,7 @@ void subsino_state::crsbingo(machine_config &config) m_maincpu->set_addrmap(AS_PROGRAM, &subsino_state::crsbingo_map); m_maincpu->set_addrmap(AS_IO, &subsino_state::subsino_iomap); - TICKET_DISPENSER(config, m_hopper, attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW); + TICKET_DISPENSER(config, m_hopper, attotime::from_msec(200), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_LOW); // video hardware screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); @@ -2891,7 +2891,7 @@ void subsino_state::srider(machine_config &config) ppi2.in_pb_callback().set_ioport("INA"); ppi2.in_pc_callback().set_ioport("INB"); - TICKET_DISPENSER(config, m_hopper, attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW); + TICKET_DISPENSER(config, m_hopper, attotime::from_msec(200), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_LOW); // video hardware screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); @@ -2954,7 +2954,7 @@ void subsino_state::tisub(machine_config &config) ppi2.in_pb_callback().set_ioport("INA"); ppi2.in_pc_callback().set_ioport("INB"); - TICKET_DISPENSER(config, m_hopper, attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW); + TICKET_DISPENSER(config, m_hopper, attotime::from_msec(200), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_LOW); // video hardware screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); @@ -3009,7 +3009,7 @@ void subsino_state::stbsub(machine_config &config) ppi2.in_pc_callback().set_ioport("INA"); NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); - TICKET_DISPENSER(config, m_hopper, attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW); + TICKET_DISPENSER(config, m_hopper, attotime::from_msec(200), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_LOW); // video hardware screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); diff --git a/src/mame/subsino/subsino2.cpp b/src/mame/subsino/subsino2.cpp index 1373946d81c..0bac83c68d1 100644 --- a/src/mame/subsino/subsino2.cpp +++ b/src/mame/subsino/subsino2.cpp @@ -2787,7 +2787,7 @@ void subsino2_state::bishjan(machine_config &config) io.in_port_callback<9>().set_ioport("RESET"); io.out_port_callback<9>().set(FUNC(subsino2_state::bishjan_outputs_w)); - TICKET_DISPENSER(config, m_hopper, attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); + TICKET_DISPENSER(config, m_hopper, attotime::from_msec(200), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_HIGH); DS2430A(config, m_eeprom).set_timing_scale(0.24); @@ -3028,14 +3028,14 @@ void subsino2_state::xtrain(machine_config &config) io.out_port_callback<8>().set(FUNC(subsino2_state::xtrain_out_b_w)); // B io.out_port_callback<9>().set(FUNC(subsino2_state::xtrain_out_a_w)); // A - HOPPER(config, m_hopper, attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); + HOPPER(config, m_hopper, attotime::from_msec(200), hopper_device::MOTOR_ACTIVE_HIGH, hopper_device::STATUS_ACTIVE_HIGH); } void subsino2_state::ptrain(machine_config &config) { xtrain(config); - TICKET_DISPENSER(config, m_ticket, attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); + TICKET_DISPENSER(config, m_ticket, attotime::from_msec(200), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_HIGH); } void subsino2_state::expcard(machine_config &config) diff --git a/src/mame/sunelectronics/tonton.cpp b/src/mame/sunelectronics/tonton.cpp index 88e3f110748..36369118c03 100644 --- a/src/mame/sunelectronics/tonton.cpp +++ b/src/mame/sunelectronics/tonton.cpp @@ -226,7 +226,7 @@ void tonton_state::tonton(machine_config &config) m_v9938->int_cb().set_inputline(m_maincpu, 0); SCREEN(config, "screen", SCREEN_TYPE_RASTER); - TICKET_DISPENSER(config, m_hopper, attotime::from_msec(HOPPER_PULSE), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW ); + TICKET_DISPENSER(config, m_hopper, attotime::from_msec(HOPPER_PULSE), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_LOW); // sound hardware SPEAKER(config, "mono").front_center(); diff --git a/src/mame/taito/cchance.cpp b/src/mame/taito/cchance.cpp index bfefa20a413..e73e120cafd 100644 --- a/src/mame/taito/cchance.cpp +++ b/src/mame/taito/cchance.cpp @@ -285,7 +285,7 @@ void cchance_state::cchance(machine_config &config) TIMER(config, "scantimer").configure_scanline(FUNC(cchance_state::scanline_cb), "screen", 0, 1); TAITOIO_OPTO(config, "opto", 0); - HOPPER(config, m_hopper, attotime::from_msec(100), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); + HOPPER(config, m_hopper, attotime::from_msec(100), hopper_device::MOTOR_ACTIVE_HIGH, hopper_device::STATUS_ACTIVE_HIGH); X1_001(config, m_spritegen, 12_MHz_XTAL, m_palette, gfx_cchance); m_spritegen->set_fg_yoffsets(-0x12, 0x0e); diff --git a/src/mame/taito/taito_o.cpp b/src/mame/taito/taito_o.cpp index 25d621e6fc2..8818790a324 100644 --- a/src/mame/taito/taito_o.cpp +++ b/src/mame/taito/taito_o.cpp @@ -455,7 +455,7 @@ void taitoo_state::taitoo(machine_config &config) m_tc0080vco->set_bgflip_yoffs(-2); m_tc0080vco->set_palette(m_palette); - HOPPER(config, m_hopper, attotime::from_msec(100), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); + HOPPER(config, m_hopper, attotime::from_msec(100), hopper_device::MOTOR_ACTIVE_HIGH, hopper_device::STATUS_ACTIVE_HIGH); m_hopper->dispense_handler().set(FUNC(taitoo_state::hopper_int_cb)); SPEAKER(config, "mono").front_center(); diff --git a/src/mame/toaplan/toaplan2.cpp b/src/mame/toaplan/toaplan2.cpp index a1402106625..a15922fd981 100644 --- a/src/mame/toaplan/toaplan2.cpp +++ b/src/mame/toaplan/toaplan2.cpp @@ -4188,7 +4188,7 @@ void pwrkick_state::pwrkick(machine_config &config) // Sunwise SW931201-1 PCB (2 NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); - TICKET_DISPENSER(config, m_hopper, attotime::from_msec(PWRKICK_HOPPER_PULSE), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); + TICKET_DISPENSER(config, m_hopper, attotime::from_msec(PWRKICK_HOPPER_PULSE), ticket_dispenser_device::MOTOR_ACTIVE_HIGH, ticket_dispenser_device::STATUS_ACTIVE_HIGH); /* video hardware */ SCREEN(config, m_screen, SCREEN_TYPE_RASTER); diff --git a/src/mame/ussr/special_gambl.cpp b/src/mame/ussr/special_gambl.cpp index 488b253a54a..d24d3bdc756 100644 --- a/src/mame/ussr/special_gambl.cpp +++ b/src/mame/ussr/special_gambl.cpp @@ -274,7 +274,7 @@ void dinaris_state::dice(machine_config &config) m_ppi2->out_pc_callback().set(FUNC(dinaris_state::ppi2c_w)); NVRAM(config, m_nvram, nvram_device::DEFAULT_ALL_0); - HOPPER(config, m_hopper, attotime::from_msec(100), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW); + HOPPER(config, m_hopper, attotime::from_msec(100), hopper_device::MOTOR_ACTIVE_HIGH, hopper_device::STATUS_ACTIVE_LOW); } ROM_START(dindice)