diff options
author | Vas Crabb <vas@vastheman.com> | 2019-02-06 17:40:55 +1100 |
---|---|---|
committer | Vas Crabb <vas@vastheman.com> | 2019-02-06 17:40:55 +1100 |
commit | 8b0a5fa2a6e3454a13ba52d46f1724840706268d (patch) | |
tree | 40719608405fdf90ca753b8da630403610bfaa17 | |
parent | e12e17ce8553d0e5fb1d8fe1e0e25a600cc88ca0 (diff) |
Make the delay for snapshot/quickload an attotime, and allow implicit zero. Removing the MCFG macros properly requires changing the pattern for the delegates. (nw)
69 files changed, 146 insertions, 146 deletions
diff --git a/src/devices/imagedev/snapquik.h b/src/devices/imagedev/snapquik.h index d091e9e3118..35873ad93e9 100644 --- a/src/devices/imagedev/snapquik.h +++ b/src/devices/imagedev/snapquik.h @@ -11,6 +11,8 @@ #ifndef MAME_DEVICES_IMAGEDEV_SNAPQUIK_H #define MAME_DEVICES_IMAGEDEV_SNAPQUIK_H +#pragma once + #include "softlist_dev.h" typedef delegate<image_init_result (device_image_interface &,const char *, int)> snapquick_load_delegate; @@ -21,7 +23,7 @@ class snapshot_image_device : public device_t, { public: // construction/destruction - snapshot_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + snapshot_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0U); virtual ~snapshot_image_device(); void set_interface(const char *interface) { m_interface = interface; } @@ -39,9 +41,7 @@ public: virtual const char *image_interface() const override { return m_interface; } virtual const char *file_extensions() const override { return m_file_extensions; } - TIMER_CALLBACK_MEMBER(process_snapshot_or_quickload); - void set_handler(snapquick_load_delegate load, const char *ext, s32 delay) { m_load = load; m_file_extensions = ext; m_delay = attotime::from_seconds(delay); }; - void set_handler(snapquick_load_delegate load, const char *ext, double delay) { m_load = load; m_file_extensions = ext; m_delay = attotime::from_double(delay); }; + void set_handler(snapquick_load_delegate load, const char *ext, attotime delay = attotime::from_seconds(0)) { m_load = load; m_file_extensions = ext; m_delay = delay; }; protected: snapshot_image_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -49,6 +49,8 @@ protected: // device-level overrides virtual void device_start() override; + TIMER_CALLBACK_MEMBER(process_snapshot_or_quickload); + snapquick_load_delegate m_load; /* loading function */ const char * m_file_extensions; /* file extensions */ const char * m_interface; @@ -65,7 +67,7 @@ class quickload_image_device : public snapshot_image_device { public: // construction/destruction - quickload_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + quickload_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0U); virtual iodevice_t image_type() const override { return IO_QUICKLOAD; } }; @@ -88,16 +90,16 @@ DECLARE_DEVICE_TYPE(QUICKLOAD, quickload_image_device) #define QUICKLOAD_LOAD_MEMBER(_class,_name) image_init_result QUICKLOAD_LOAD_NAME(_class,_name)(device_image_interface &image, const char *file_type, int quickload_size) #define QUICKLOAD_LOAD_DELEGATE(_class,_name) snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(_class,_name), downcast<_class *>(device->owner())) -#define MCFG_SNAPSHOT_ADD(_tag, _class, _load, _file_extensions, _delay) \ +#define MCFG_SNAPSHOT_ADD(_tag, _class, _load, ...) \ MCFG_DEVICE_ADD(_tag, SNAPSHOT, 0) \ - static_cast<snapshot_image_device *>(device)->set_handler(SNAPSHOT_LOAD_DELEGATE(_class,_load), _file_extensions, _delay); + static_cast<snapshot_image_device *>(device)->set_handler(SNAPSHOT_LOAD_DELEGATE(_class,_load), __VA_ARGS__); #define MCFG_SNAPSHOT_INTERFACE(_interface) \ downcast<snapshot_image_device &>(*device).set_interface(_interface); -#define MCFG_QUICKLOAD_ADD(_tag, _class, _load, _file_extensions, _delay) \ +#define MCFG_QUICKLOAD_ADD(_tag, _class, _load, ...) \ MCFG_DEVICE_ADD(_tag, QUICKLOAD, 0) \ - static_cast<quickload_image_device *>(device)->set_handler(QUICKLOAD_LOAD_DELEGATE(_class,_load), _file_extensions, _delay); + static_cast<quickload_image_device *>(device)->set_handler(QUICKLOAD_LOAD_DELEGATE(_class,_load), __VA_ARGS__); #define MCFG_QUICKLOAD_INTERFACE(_interface) \ downcast<quickload_image_device &>(*device).set_interface(_interface); diff --git a/src/mame/drivers/abc80.cpp b/src/mame/drivers/abc80.cpp index b31b6520681..b3ae56fd5cf 100644 --- a/src/mame/drivers/abc80.cpp +++ b/src/mame/drivers/abc80.cpp @@ -531,7 +531,7 @@ MACHINE_CONFIG_START(abc80_state::abc80) generic_keyboard_device &keyboard(GENERIC_KEYBOARD(config, KEYBOARD_TAG, 0)); keyboard.set_keyboard_callback(FUNC(abc80_state::kbd_w)); - MCFG_QUICKLOAD_ADD("quickload", abc80_state, bac, "bac", 2) + MCFG_QUICKLOAD_ADD("quickload", abc80_state, bac, "bac", attotime::from_seconds(2)) // internal ram RAM(config, RAM_TAG).set_default_size("16K"); diff --git a/src/mame/drivers/abc80x.cpp b/src/mame/drivers/abc80x.cpp index 922d01237c5..0bae43ca079 100644 --- a/src/mame/drivers/abc80x.cpp +++ b/src/mame/drivers/abc80x.cpp @@ -1113,7 +1113,7 @@ MACHINE_CONFIG_START(abc800_state::common) SOFTWARE_LIST(config, "hdd_list").set_original("abc800_hdd"); // quickload - MCFG_QUICKLOAD_ADD("quickload", abc800_state, bac, "bac", 2) + MCFG_QUICKLOAD_ADD("quickload", abc800_state, bac, "bac", attotime::from_seconds(2)) MACHINE_CONFIG_END diff --git a/src/mame/drivers/altair.cpp b/src/mame/drivers/altair.cpp index 2c7d771b7c6..76b451ee24f 100644 --- a/src/mame/drivers/altair.cpp +++ b/src/mame/drivers/altair.cpp @@ -119,7 +119,7 @@ void altair_state::altair(machine_config &config) uart_clock.signal_handler().append("acia", FUNC(acia6850_device::write_rxc)); /* quickload */ - QUICKLOAD(config, "quickload", 0).set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(altair_state, altair), this), "bin", 0); + QUICKLOAD(config, "quickload").set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(altair_state, altair), this), "bin"); } /* ROM definition */ diff --git a/src/mame/drivers/altos5.cpp b/src/mame/drivers/altos5.cpp index 665461025bc..e47462843a8 100644 --- a/src/mame/drivers/altos5.cpp +++ b/src/mame/drivers/altos5.cpp @@ -474,7 +474,7 @@ MACHINE_CONFIG_START(altos5_state::altos5) FLOPPY_CONNECTOR(config, "fdc:1", altos5_floppies, "525qd", floppy_image_device::default_floppy_formats).enable_sound(true); SOFTWARE_LIST(config, "flop_list").set_original("altos5"); - MCFG_QUICKLOAD_ADD("quickload", altos5_state, altos5, "com,cpm", 3) + MCFG_QUICKLOAD_ADD("quickload", altos5_state, altos5, "com,cpm", attotime::from_seconds(3)) MACHINE_CONFIG_END diff --git a/src/mame/drivers/amstrad.cpp b/src/mame/drivers/amstrad.cpp index c91e1246b88..2c62608955a 100644 --- a/src/mame/drivers/amstrad.cpp +++ b/src/mame/drivers/amstrad.cpp @@ -954,7 +954,7 @@ MACHINE_CONFIG_START(amstrad_state::amstrad_base) m_centronics->busy_handler().set(FUNC(amstrad_state::write_centronics_busy)); /* snapshot */ - MCFG_SNAPSHOT_ADD("snapshot", amstrad_state, amstrad, "sna", 0) + MCFG_SNAPSHOT_ADD("snapshot", amstrad_state, amstrad, "sna") CASSETTE(config, m_cassette); m_cassette->set_formats(cdt_cassette_formats); @@ -1077,7 +1077,7 @@ MACHINE_CONFIG_START(amstrad_state::cpcplus) m_centronics->busy_handler().set(FUNC(amstrad_state::write_centronics_busy)); /* snapshot */ - MCFG_SNAPSHOT_ADD("snapshot", amstrad_state, amstrad, "sna", 0) + MCFG_SNAPSHOT_ADD("snapshot", amstrad_state, amstrad, "sna") CASSETTE(config, m_cassette); m_cassette->set_formats(cdt_cassette_formats); diff --git a/src/mame/drivers/apple1.cpp b/src/mame/drivers/apple1.cpp index 30df1743e6b..9a5a513665a 100644 --- a/src/mame/drivers/apple1.cpp +++ b/src/mame/drivers/apple1.cpp @@ -614,7 +614,7 @@ MACHINE_CONFIG_START(apple1_state::apple1) A1BUS(config, A1_BUS_TAG, 0).set_cputag(m_maincpu); A1BUS_SLOT(config, "exp", 0, A1_BUS_TAG, apple1_cards, "cassette"); - MCFG_SNAPSHOT_ADD("snapshot", apple1_state, apple1, "snp", 0) + MCFG_SNAPSHOT_ADD("snapshot", apple1_state, apple1, "snp") SOFTWARE_LIST(config, "cass_list").set_original("apple1"); diff --git a/src/mame/drivers/atom.cpp b/src/mame/drivers/atom.cpp index 3d88f6c5a4b..0d5dd018c64 100644 --- a/src/mame/drivers/atom.cpp +++ b/src/mame/drivers/atom.cpp @@ -757,7 +757,7 @@ MACHINE_CONFIG_START(atom_state::atom) m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_MUTED); m_cassette->set_interface("atom_cass"); - MCFG_QUICKLOAD_ADD("quickload", atom_state, atom_atm, "atm", 0) + MCFG_QUICKLOAD_ADD("quickload", atom_state, atom_atm, "atm") /* utility rom slot */ MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_linear_slot, "atom_cart") diff --git a/src/mame/drivers/aussiebyte.cpp b/src/mame/drivers/aussiebyte.cpp index 2b8f7250d26..26e79698bd5 100644 --- a/src/mame/drivers/aussiebyte.cpp +++ b/src/mame/drivers/aussiebyte.cpp @@ -590,7 +590,7 @@ MACHINE_CONFIG_START(aussiebyte_state::aussiebyte) MSM5832(config, m_rtc, 32.768_kHz_XTAL); /* quickload */ - MCFG_QUICKLOAD_ADD("quickload", aussiebyte_state, aussiebyte, "com,cpm", 3) + MCFG_QUICKLOAD_ADD("quickload", aussiebyte_state, aussiebyte, "com,cpm", attotime::from_seconds(3)) MACHINE_CONFIG_END diff --git a/src/mame/drivers/avigo.cpp b/src/mame/drivers/avigo.cpp index 9f958fa98c5..d916f462b86 100644 --- a/src/mame/drivers/avigo.cpp +++ b/src/mame/drivers/avigo.cpp @@ -811,7 +811,7 @@ MACHINE_CONFIG_START(avigo_state::avigo) TIMER(config, "1hz_timer").configure_periodic(FUNC(avigo_state::avigo_1hz_timer), attotime::from_hz(1)); /* quickload */ - MCFG_QUICKLOAD_ADD("quickload", avigo_state, avigo, "app", 0) + MCFG_QUICKLOAD_ADD("quickload", avigo_state, avigo, "app") MACHINE_CONFIG_END diff --git a/src/mame/drivers/binbug.cpp b/src/mame/drivers/binbug.cpp index 58d130d8e4e..4996932999b 100644 --- a/src/mame/drivers/binbug.cpp +++ b/src/mame/drivers/binbug.cpp @@ -336,8 +336,8 @@ void binbug_state::binbug(machine_config &config) RS232_PORT(config, m_rs232, default_rs232_devices, "keyboard").set_option_device_input_defaults("keyboard", DEVICE_INPUT_DEFAULTS_NAME(keyboard)); /* quickload */ - quickload_image_device &quickload(QUICKLOAD(config, "quickload", 0)); - quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(binbug_state, binbug), this), "pgm", 1); + quickload_image_device &quickload(QUICKLOAD(config, "quickload")); + quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(binbug_state, binbug), this), "pgm", attotime::from_seconds(1)); } @@ -424,7 +424,7 @@ public: : binbug_state(mconfig, type, tag) , m_ctc(*this, "z80ctc") , m_pio(*this, "z80pio") - { } + { } DECLARE_READ8_MEMBER(porta_r); DECLARE_READ8_MEMBER(portb_r); diff --git a/src/mame/drivers/c128.cpp b/src/mame/drivers/c128.cpp index 2b406c91097..b678e5714a9 100644 --- a/src/mame/drivers/c128.cpp +++ b/src/mame/drivers/c128.cpp @@ -1755,8 +1755,8 @@ void c128_state::ntsc(machine_config &config) m_user->pl_handler().set(FUNC(c128_state::write_user_pb7)); m_user->pm_handler().set(FUNC(c128_state::write_user_pa2)); - quickload_image_device &quickload(QUICKLOAD(config, "quickload", 0)); - quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(c128_state, cbm_c64), this), "p00,prg", CBM_QUICKLOAD_DELAY_SECONDS); + quickload_image_device &quickload(QUICKLOAD(config, "quickload")); + quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(c128_state, cbm_c64), this), "p00,prg", CBM_QUICKLOAD_DELAY); // software list SOFTWARE_LIST(config, "cart_list_vic10").set_original("vic10"); @@ -1950,8 +1950,8 @@ void c128_state::pal(machine_config &config) m_user->pl_handler().set(FUNC(c128_state::write_user_pb7)); m_user->pm_handler().set(FUNC(c128_state::write_user_pa2)); - quickload_image_device &quickload(QUICKLOAD(config, "quickload", 0)); - quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(c128_state, cbm_c64), this), "p00,prg", CBM_QUICKLOAD_DELAY_SECONDS); + quickload_image_device &quickload(QUICKLOAD(config, "quickload")); + quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(c128_state, cbm_c64), this), "p00,prg", CBM_QUICKLOAD_DELAY); // software list SOFTWARE_LIST(config, "cart_list_vic10").set_original("vic10"); diff --git a/src/mame/drivers/c64.cpp b/src/mame/drivers/c64.cpp index f606bf6ce02..fe6912ce670 100644 --- a/src/mame/drivers/c64.cpp +++ b/src/mame/drivers/c64.cpp @@ -1361,8 +1361,8 @@ void c64_state::ntsc(machine_config &config) m_user->pl_handler().set(FUNC(c64_state::write_user_pb7)); m_user->pm_handler().set(FUNC(c64_state::write_user_pa2)); - quickload_image_device &quickload(QUICKLOAD(config, "quickload", 0)); - quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(c64_state, cbm_c64), this), "p00,prg,t64", CBM_QUICKLOAD_DELAY_SECONDS); + quickload_image_device &quickload(QUICKLOAD(config, "quickload")); + quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(c64_state, cbm_c64), this), "p00,prg,t64", CBM_QUICKLOAD_DELAY); // software list SOFTWARE_LIST(config, "cart_list_vic10").set_original("vic10"); @@ -1537,8 +1537,8 @@ void c64_state::pal(machine_config &config) m_user->pl_handler().set(FUNC(c64_state::write_user_pb7)); m_user->pm_handler().set(FUNC(c64_state::write_user_pa2)); - quickload_image_device &quickload(QUICKLOAD(config, "quickload", 0)); - quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(c64_state, cbm_c64), this), "p00,prg,t64", CBM_QUICKLOAD_DELAY_SECONDS); + quickload_image_device &quickload(QUICKLOAD(config, "quickload")); + quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(c64_state, cbm_c64), this), "p00,prg,t64", CBM_QUICKLOAD_DELAY); // software list SOFTWARE_LIST(config, "cart_list_vic10").set_original("vic10"); @@ -1687,8 +1687,8 @@ void c64gs_state::pal_gs(machine_config &config) m_user->pl_handler().set(FUNC(c64_state::write_user_pb7)); m_user->pm_handler().set(FUNC(c64_state::write_user_pa2)); - quickload_image_device &quickload(QUICKLOAD(config, "quickload", 0)); - quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(c64_state, cbm_c64), this), "p00,prg,t64", CBM_QUICKLOAD_DELAY_SECONDS); + quickload_image_device &quickload(QUICKLOAD(config, "quickload")); + quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(c64_state, cbm_c64), this), "p00,prg,t64", CBM_QUICKLOAD_DELAY); // software list SOFTWARE_LIST(config, "cart_list_vic10").set_original("vic10"); diff --git a/src/mame/drivers/cbm2.cpp b/src/mame/drivers/cbm2.cpp index ce010831c67..4f6a7081d70 100644 --- a/src/mame/drivers/cbm2.cpp +++ b/src/mame/drivers/cbm2.cpp @@ -2361,8 +2361,8 @@ void p500_state::p500_ntsc(machine_config &config) rs232.dsr_handler().set(m_acia, FUNC(mos6551_device::write_dsr)); rs232.cts_handler().set(m_acia, FUNC(mos6551_device::write_cts)); - quickload_image_device &quickload(QUICKLOAD(config, "quickload", 0)); - quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(p500_state, p500), this), "p00,prg", CBM_QUICKLOAD_DELAY_SECONDS); + quickload_image_device &quickload(QUICKLOAD(config, "quickload")); + quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(p500_state, p500), this), "p00,prg", CBM_QUICKLOAD_DELAY); // internal ram _128k(config); @@ -2495,8 +2495,8 @@ void p500_state::p500_pal(machine_config &config) rs232.dsr_handler().set(m_acia, FUNC(mos6551_device::write_dsr)); rs232.cts_handler().set(m_acia, FUNC(mos6551_device::write_cts)); - quickload_image_device &quickload(QUICKLOAD(config, "quickload", 0)); - quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(p500_state, p500), this), "p00,prg", CBM_QUICKLOAD_DELAY_SECONDS); + quickload_image_device &quickload(QUICKLOAD(config, "quickload")); + quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(p500_state, p500), this), "p00,prg", CBM_QUICKLOAD_DELAY); // internal ram _128k(config); @@ -2628,8 +2628,8 @@ void cbm2_state::cbm2lp_ntsc(machine_config &config) rs232.dsr_handler().set(m_acia, FUNC(mos6551_device::write_dsr)); rs232.cts_handler().set(m_acia, FUNC(mos6551_device::write_cts)); - quickload_image_device &quickload(QUICKLOAD(config, "quickload", 0)); - quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(cbm2_state, cbmb), this), "p00,prg,t64", CBM_QUICKLOAD_DELAY_SECONDS); + quickload_image_device &quickload(QUICKLOAD(config, "quickload")); + quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(cbm2_state, cbmb), this), "p00,prg,t64", CBM_QUICKLOAD_DELAY); // software list SOFTWARE_LIST(config, "cart_list").set_original("cbm2_cart"); diff --git a/src/mame/drivers/cd2650.cpp b/src/mame/drivers/cd2650.cpp index a0520110d61..38c84b29046 100644 --- a/src/mame/drivers/cd2650.cpp +++ b/src/mame/drivers/cd2650.cpp @@ -314,8 +314,8 @@ void cd2650_state::cd2650(machine_config &config) PALETTE(config, "palette", palette_device::MONOCHROME); /* quickload */ - quickload_image_device &quickload(QUICKLOAD(config, "quickload", 0)); - quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(cd2650_state, cd2650), this), "pgm", 1); + quickload_image_device &quickload(QUICKLOAD(config, "quickload")); + quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(cd2650_state, cd2650), this), "pgm", attotime::from_seconds(1)); /* Sound */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/comx35.cpp b/src/mame/drivers/comx35.cpp index 5d245ccd2ad..bb6f569991c 100644 --- a/src/mame/drivers/comx35.cpp +++ b/src/mame/drivers/comx35.cpp @@ -625,8 +625,8 @@ void comx35_state::base(machine_config &config, const XTAL clock) m_kbe->d11_callback().set_ioport("D11"); m_kbe->da_callback().set_inputline(m_maincpu, COSMAC_INPUT_LINE_EF3); - quickload_image_device &quickload(QUICKLOAD(config, "quickload", 0)); - quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(comx35_state, comx), this), "comx", 0); + quickload_image_device &quickload(QUICKLOAD(config, "quickload")); + quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(comx35_state, comx), this), "comx"); CASSETTE(config, m_cassette).set_default_state((cassette_state) (CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED)); diff --git a/src/mame/drivers/cosmicos.cpp b/src/mame/drivers/cosmicos.cpp index 6ec629e9dd0..bca91f96fc8 100644 --- a/src/mame/drivers/cosmicos.cpp +++ b/src/mame/drivers/cosmicos.cpp @@ -548,7 +548,7 @@ MACHINE_CONFIG_START(cosmicos_state::cosmicos) m_cti->add_route(ALL_OUTPUTS, "mono", 0.25); /* devices */ - MCFG_QUICKLOAD_ADD("quickload", cosmicos_state, cosmicos, "bin", 0) + MCFG_QUICKLOAD_ADD("quickload", cosmicos_state, cosmicos, "bin") CASSETTE(config, m_cassette); m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_MUTED); diff --git a/src/mame/drivers/cp1.cpp b/src/mame/drivers/cp1.cpp index 7e1d2988876..49d31927f23 100644 --- a/src/mame/drivers/cp1.cpp +++ b/src/mame/drivers/cp1.cpp @@ -290,7 +290,7 @@ void cp1_state::cp1(machine_config &config) CASSETTE(config, m_cassette); - QUICKLOAD(config, "quickload", 0).set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(cp1_state, quickload), this), "obj", 1); + QUICKLOAD(config, "quickload").set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(cp1_state, quickload), this), "obj", attotime::from_seconds(1)); } /* ROM definition */ diff --git a/src/mame/drivers/cybiko.cpp b/src/mame/drivers/cybiko.cpp index 440e770d2f7..4b5fa470899 100644 --- a/src/mame/drivers/cybiko.cpp +++ b/src/mame/drivers/cybiko.cpp @@ -426,8 +426,8 @@ void cybiko_state::cybikov1_base(machine_config &config) m_debug_serial->set_option_device_input_defaults("pty", DEVICE_INPUT_DEFAULTS_NAME(debug_serial)); // quickload - quickload_image_device &quickload(QUICKLOAD(config, "quickload", 0)); - quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(cybiko_state, cybiko), this), "bin,nv", 0); + quickload_image_device &quickload(QUICKLOAD(config, "quickload")); + quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(cybiko_state, cybiko), this), "bin,nv"); } void cybiko_state::cybikov1_flash(machine_config &config) @@ -498,8 +498,8 @@ void cybiko_state::cybikoxt(machine_config &config) subdevice<h8_sci_device>("maincpu:sci2")->tx_handler().set("debug_serial", FUNC(rs232_port_device::write_txd)); // quickload - quickload_image_device &quickload(QUICKLOAD(config.replace(), "quickload", 0)); - quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(cybiko_state, cybikoxt), this), "bin,nv", 0); + quickload_image_device &quickload(QUICKLOAD(config.replace(), "quickload")); + quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(cybiko_state, cybikoxt), this), "bin,nv"); } ///////// diff --git a/src/mame/drivers/d6800.cpp b/src/mame/drivers/d6800.cpp index 8463ff05a13..005868fdd12 100644 --- a/src/mame/drivers/d6800.cpp +++ b/src/mame/drivers/d6800.cpp @@ -444,7 +444,7 @@ MACHINE_CONFIG_START(d6800_state::d6800) TIMER(config, "d6800_p").configure_periodic(FUNC(d6800_state::d6800_p), attotime::from_hz(40000)); /* quickload */ - MCFG_QUICKLOAD_ADD("quickload", d6800_state, d6800, "bin,c8,ch8", 1) + MCFG_QUICKLOAD_ADD("quickload", d6800_state, d6800, "bin,c8,ch8", attotime::from_seconds(1)) MACHINE_CONFIG_END /* ROMs */ diff --git a/src/mame/drivers/dmv.cpp b/src/mame/drivers/dmv.cpp index d2e95134727..d53d64d9786 100644 --- a/src/mame/drivers/dmv.cpp +++ b/src/mame/drivers/dmv.cpp @@ -881,7 +881,7 @@ MACHINE_CONFIG_START(dmv_state::dmv) SOFTWARE_LIST(config, "flop_list").set_original("dmv"); - MCFG_QUICKLOAD_ADD("quickload", dmv_state, dmv, "com,cpm", 3) + MCFG_QUICKLOAD_ADD("quickload", dmv_state, dmv, "com,cpm", attotime::from_seconds(3)) MACHINE_CONFIG_END diff --git a/src/mame/drivers/elf.cpp b/src/mame/drivers/elf.cpp index 50ebed89d94..316db189ac5 100644 --- a/src/mame/drivers/elf.cpp +++ b/src/mame/drivers/elf.cpp @@ -275,7 +275,7 @@ void elf2_state::elf2(machine_config &config) CASSETTE(config, m_cassette); m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_MUTED); - QUICKLOAD(config, "quickload", 0).set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(elf2_state, elf), this), "bin", 0); + QUICKLOAD(config, "quickload").set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(elf2_state, elf), this), "bin"); /* internal ram */ RAM(config, RAM_TAG).set_default_size("256"); diff --git a/src/mame/drivers/eti660.cpp b/src/mame/drivers/eti660.cpp index be750085387..4e9cbd58d64 100644 --- a/src/mame/drivers/eti660.cpp +++ b/src/mame/drivers/eti660.cpp @@ -349,7 +349,7 @@ MACHINE_CONFIG_START(eti660_state::eti660) RAM(config, RAM_TAG).set_default_size("3K"); /* quickload */ - MCFG_QUICKLOAD_ADD("quickload", eti660_state, eti660, "bin,c8,ch8", 2) + MCFG_QUICKLOAD_ADD("quickload", eti660_state, eti660, "bin,c8,ch8", attotime::from_seconds(2)) MACHINE_CONFIG_END /* ROMs */ diff --git a/src/mame/drivers/galaxy.cpp b/src/mame/drivers/galaxy.cpp index 442483e895a..f5424dd9c6a 100644 --- a/src/mame/drivers/galaxy.cpp +++ b/src/mame/drivers/galaxy.cpp @@ -198,7 +198,7 @@ MACHINE_CONFIG_START(galaxy_state::galaxy) PALETTE(config, "palette", palette_device::MONOCHROME); /* snapshot */ - MCFG_SNAPSHOT_ADD("snapshot", galaxy_state, galaxy, "gal", 0) + MCFG_SNAPSHOT_ADD("snapshot", galaxy_state, galaxy, "gal") SPEAKER(config, "mono").front_center(); WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.25); @@ -237,7 +237,7 @@ MACHINE_CONFIG_START(galaxy_state::galaxyp) /* snapshot */ - MCFG_SNAPSHOT_ADD("snapshot", galaxy_state, galaxy, "gal", 0) + MCFG_SNAPSHOT_ADD("snapshot", galaxy_state, galaxy, "gal") /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/homelab.cpp b/src/mame/drivers/homelab.cpp index 501938b3618..281b8266ec4 100644 --- a/src/mame/drivers/homelab.cpp +++ b/src/mame/drivers/homelab.cpp @@ -778,7 +778,7 @@ MACHINE_CONFIG_START(homelab_state::homelab) WAVE(config, "wave", m_cass).add_route(ALL_OUTPUTS, "speaker", 0.25); CASSETTE(config, m_cass); - MCFG_QUICKLOAD_ADD("quickload", homelab_state, homelab, "htp", 2) + MCFG_QUICKLOAD_ADD("quickload", homelab_state, homelab, "htp", attotime::from_seconds(2)) MACHINE_CONFIG_END MACHINE_CONFIG_START(homelab_state::homelab3) @@ -810,7 +810,7 @@ MACHINE_CONFIG_START(homelab_state::homelab3) WAVE(config, "wave", m_cass).add_route(ALL_OUTPUTS, "speaker", 0.25); CASSETTE(config, m_cass); - MCFG_QUICKLOAD_ADD("quickload", homelab_state, homelab, "htp", 2) + MCFG_QUICKLOAD_ADD("quickload", homelab_state, homelab, "htp", attotime::from_seconds(2)) MACHINE_CONFIG_END MACHINE_CONFIG_START(homelab_state::brailab4) @@ -845,7 +845,7 @@ MACHINE_CONFIG_START(homelab_state::brailab4) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) CASSETTE(config, m_cass); - MCFG_QUICKLOAD_ADD("quickload", homelab_state, homelab, "htp", 18) + MCFG_QUICKLOAD_ADD("quickload", homelab_state, homelab, "htp", attotime::from_seconds(18)) MACHINE_CONFIG_END void homelab_state::init_brailab4() diff --git a/src/mame/drivers/instruct.cpp b/src/mame/drivers/instruct.cpp index b6c9aff95d1..f283d632037 100644 --- a/src/mame/drivers/instruct.cpp +++ b/src/mame/drivers/instruct.cpp @@ -436,8 +436,8 @@ void instruct_state::instruct(machine_config &config) config.set_default_layout(layout_instruct); /* quickload */ - quickload_image_device &quickload(QUICKLOAD(config, "quickload", 0)); - quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(instruct_state, instruct), this), "pgm", 1); + quickload_image_device &quickload(QUICKLOAD(config, "quickload")); + quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(instruct_state, instruct), this), "pgm", attotime::from_seconds(1)); /* cassette */ CASSETTE(config, m_cass); diff --git a/src/mame/drivers/jaguar.cpp b/src/mame/drivers/jaguar.cpp index 802d1684d57..113322163fc 100644 --- a/src/mame/drivers/jaguar.cpp +++ b/src/mame/drivers/jaguar.cpp @@ -1918,8 +1918,8 @@ void jaguar_state::jaguar(machine_config &config) vref.add_route(0, "rdac", -1.0, DAC_VREF_NEG_INPUT); /* quickload */ - quickload_image_device &quickload(QUICKLOAD(config, "quickload", 0)); - quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(jaguar_state, jaguar), this), "abs,bin,cof,jag,prg", 0); + quickload_image_device &quickload(QUICKLOAD(config, "quickload")); + quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(jaguar_state, jaguar), this), "abs,bin,cof,jag,prg"); /* cartridge */ generic_cartslot_device &cartslot(GENERIC_CARTSLOT(config, "cartslot", generic_plain_slot, "jaguar_cart", "j64,rom,bin")); diff --git a/src/mame/drivers/jr100.cpp b/src/mame/drivers/jr100.cpp index 3235e60ceb6..17c691f24ba 100644 --- a/src/mame/drivers/jr100.cpp +++ b/src/mame/drivers/jr100.cpp @@ -409,8 +409,8 @@ void jr100_state::jr100(machine_config &config) m_cassette->set_default_state((cassette_state)(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED)); /* quickload */ - quickload_image_device &quickload(QUICKLOAD(config, "quickload", 0)); - quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(jr100_state, jr100), this), "prg", 2); + quickload_image_device &quickload(QUICKLOAD(config, "quickload")); + quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(jr100_state, jr100), this), "prg", attotime::from_seconds(2)); } diff --git a/src/mame/drivers/jtc.cpp b/src/mame/drivers/jtc.cpp index e621fd2bdf2..a51be46d499 100644 --- a/src/mame/drivers/jtc.cpp +++ b/src/mame/drivers/jtc.cpp @@ -831,7 +831,7 @@ MACHINE_CONFIG_START(jtc_state::basic) m_centronics->busy_handler().set(FUNC(jtc_state::write_centronics_busy)); /* quickload */ - MCFG_QUICKLOAD_ADD("quickload", jtc_state, jtc, "jtc,bin", 2) + MCFG_QUICKLOAD_ADD("quickload", jtc_state, jtc, "jtc,bin", attotime::from_seconds(2)) MACHINE_CONFIG_END MACHINE_CONFIG_START(jtc_state::jtc) diff --git a/src/mame/drivers/jupace.cpp b/src/mame/drivers/jupace.cpp index 8529b217420..2672a74cdb5 100644 --- a/src/mame/drivers/jupace.cpp +++ b/src/mame/drivers/jupace.cpp @@ -790,7 +790,7 @@ MACHINE_CONFIG_START(ace_state::ace) m_cassette->set_default_state(CASSETTE_STOPPED); m_cassette->set_interface("jupace_cass"); - MCFG_SNAPSHOT_ADD("snapshot", ace_state, ace, "ace", 1) + MCFG_SNAPSHOT_ADD("snapshot", ace_state, ace, "ace", attotime::from_seconds(1)) I8255A(config, m_ppi); m_ppi->in_pb_callback().set(FUNC(ace_state::sby_r)); diff --git a/src/mame/drivers/kaypro.cpp b/src/mame/drivers/kaypro.cpp index 9907ea7920e..7da361b6987 100644 --- a/src/mame/drivers/kaypro.cpp +++ b/src/mame/drivers/kaypro.cpp @@ -224,7 +224,7 @@ MACHINE_CONFIG_START(kaypro_state::kayproii) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) /* devices */ - MCFG_QUICKLOAD_ADD("quickload", kaypro_state, kaypro, "com,cpm", 3) + MCFG_QUICKLOAD_ADD("quickload", kaypro_state, kaypro, "com,cpm", attotime::from_seconds(3)) kaypro_10_keyboard_device &kbd(KAYPRO_10_KEYBOARD(config, "kbd")); kbd.rxd_cb().set("sio", FUNC(z80sio_device::rxb_w)); @@ -315,7 +315,7 @@ MACHINE_CONFIG_START(kaypro_state::kaypro484) m_crtc->set_char_width(7); m_crtc->set_update_row_callback(FUNC(kaypro_state::kaypro484_update_row), this); - MCFG_QUICKLOAD_ADD("quickload", kaypro_state, kaypro, "com,cpm", 3) + MCFG_QUICKLOAD_ADD("quickload", kaypro_state, kaypro, "com,cpm", attotime::from_seconds(3)) kaypro_10_keyboard_device &kbd(KAYPRO_10_KEYBOARD(config, "kbd")); kbd.rxd_cb().set("sio_1", FUNC(z80sio_device::rxb_w)); diff --git a/src/mame/drivers/kc.cpp b/src/mame/drivers/kc.cpp index 47ea5426710..38bebdf1a0a 100644 --- a/src/mame/drivers/kc.cpp +++ b/src/mame/drivers/kc.cpp @@ -140,7 +140,7 @@ void kc_state::kc85_3(machine_config &config) /* devices */ quickload_image_device &quickload(QUICKLOAD(config, "quickload", 0)); - quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(kc_state, kc), this), "kcc", 2); + quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(kc_state, kc), this), "kcc", attotime::from_seconds(2)); CASSETTE(config, m_cassette); m_cassette->set_formats(kc_cassette_formats); @@ -218,8 +218,8 @@ void kc85_4_state::kc85_4(machine_config &config) SPEAKER_SOUND(config, "speaker").add_route(ALL_OUTPUTS, "mono", 0.50); /* devices */ - quickload_image_device &quickload(QUICKLOAD(config, "quickload", 0)); - quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(kc_state, kc), this), "kcc", 2); + quickload_image_device &quickload(QUICKLOAD(config, "quickload")); + quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(kc_state, kc), this), "kcc", attotime::from_seconds(2)); CASSETTE(config, m_cassette); m_cassette->set_formats(kc_cassette_formats); diff --git a/src/mame/drivers/lviv.cpp b/src/mame/drivers/lviv.cpp index ac4f23058f4..4796b5ab7db 100644 --- a/src/mame/drivers/lviv.cpp +++ b/src/mame/drivers/lviv.cpp @@ -462,7 +462,7 @@ MACHINE_CONFIG_START(lviv_state::lviv) SPEAKER_SOUND(config, "speaker").add_route(ALL_OUTPUTS, "mono", 0.50); /* snapshot */ - MCFG_SNAPSHOT_ADD("snapshot", lviv_state, lviv, "sav", 0) + MCFG_SNAPSHOT_ADD("snapshot", lviv_state, lviv, "sav") CASSETTE(config, m_cassette); m_cassette->set_formats(lviv_lvt_format); diff --git a/src/mame/drivers/lynx.cpp b/src/mame/drivers/lynx.cpp index 364c19c8f20..b5aafc332fc 100644 --- a/src/mame/drivers/lynx.cpp +++ b/src/mame/drivers/lynx.cpp @@ -101,7 +101,7 @@ MACHINE_CONFIG_START(lynx_state::lynx) m_sound->add_route(ALL_OUTPUTS, "mono", 0.50); /* devices */ - MCFG_QUICKLOAD_ADD("quickload", lynx_state, lynx, "o", 0) + MCFG_QUICKLOAD_ADD("quickload", lynx_state, lynx, "o"); MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_plain_slot, "lynx_cart") MCFG_GENERIC_EXTENSIONS("lnx,lyx") diff --git a/src/mame/drivers/mbee.cpp b/src/mame/drivers/mbee.cpp index 3fd8884996b..b20b3eb1064 100644 --- a/src/mame/drivers/mbee.cpp +++ b/src/mame/drivers/mbee.cpp @@ -686,8 +686,8 @@ MACHINE_CONFIG_START(mbee_state::mbee) m_crtc->set_on_update_addr_change_callback(FUNC(mbee_state::crtc_update_addr), this); m_crtc->out_vsync_callback().set(FUNC(mbee_state::crtc_vs)); - MCFG_QUICKLOAD_ADD("quickload", mbee_state, mbee, "mwb,com,bee", 3) - MCFG_QUICKLOAD_ADD("quickload2", mbee_state, mbee_z80bin, "bin", 3) + MCFG_QUICKLOAD_ADD("quickload", mbee_state, mbee, "mwb,com,bee", attotime::from_seconds(3)) + MCFG_QUICKLOAD_ADD("quickload2", mbee_state, mbee_z80bin, "bin", attotime::from_seconds(3)) CENTRONICS(config, m_centronics, centronics_devices, "printer"); m_centronics->ack_handler().set(m_pio, FUNC(z80pio_device::strobe_a)); @@ -744,8 +744,8 @@ MACHINE_CONFIG_START(mbee_state::mbeeic) m_crtc->set_on_update_addr_change_callback(FUNC(mbee_state::crtc_update_addr), this); m_crtc->out_vsync_callback().set(FUNC(mbee_state::crtc_vs)); - MCFG_QUICKLOAD_ADD("quickload", mbee_state, mbee, "mwb,com,bee", 2) - MCFG_QUICKLOAD_ADD("quickload2", mbee_state, mbee_z80bin, "bin", 2) + MCFG_QUICKLOAD_ADD("quickload", mbee_state, mbee, "mwb,com,bee", attotime::from_seconds(2)) + MCFG_QUICKLOAD_ADD("quickload2", mbee_state, mbee_z80bin, "bin", attotime::from_seconds(2)) CENTRONICS(config, m_centronics, centronics_devices, "printer"); m_centronics->ack_handler().set(m_pio, FUNC(z80pio_device::strobe_a)); diff --git a/src/mame/drivers/mekd2.cpp b/src/mame/drivers/mekd2.cpp index 25cc595b2f6..d77e9ff93fc 100644 --- a/src/mame/drivers/mekd2.cpp +++ b/src/mame/drivers/mekd2.cpp @@ -415,7 +415,7 @@ void mekd2_state::mekd2(machine_config &config) TIMER(config, "mekd2_c").configure_periodic(FUNC(mekd2_state::mekd2_c), attotime::from_hz(4800)); TIMER(config, "mekd2_p").configure_periodic(FUNC(mekd2_state::mekd2_p), attotime::from_hz(40000)); - QUICKLOAD(config, "quickload", 0).set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(mekd2_state, mekd2_quik), this), "d2", 1); + QUICKLOAD(config, "quickload").set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(mekd2_state, mekd2_quik), this), "d2", attotime::from_seconds(1)); } /*********************************************************** diff --git a/src/mame/drivers/meritum.cpp b/src/mame/drivers/meritum.cpp index 72ee1a5b4de..f9d46e2601e 100644 --- a/src/mame/drivers/meritum.cpp +++ b/src/mame/drivers/meritum.cpp @@ -439,7 +439,7 @@ MACHINE_CONFIG_START(meritum_state::meritum) /* devices */ CASSETTE(config, m_cassette); - MCFG_QUICKLOAD_ADD("quickload", meritum_state, trs80_cmd, "cmd", 1.0) + MCFG_QUICKLOAD_ADD("quickload", meritum_state, trs80_cmd, "cmd", attotime::from_seconds(1)) MACHINE_CONFIG_END /*************************************************************************** diff --git a/src/mame/drivers/microtan.cpp b/src/mame/drivers/microtan.cpp index e69488a88be..53785dc7345 100644 --- a/src/mame/drivers/microtan.cpp +++ b/src/mame/drivers/microtan.cpp @@ -236,8 +236,8 @@ MACHINE_CONFIG_START(microtan_state::microtan) AY8910(config, m_ay8910[1], 1000000).add_route(ALL_OUTPUTS, "speaker", 0.5); /* snapshot/quickload */ - MCFG_SNAPSHOT_ADD("snapshot", microtan_state, microtan, "m65", 0.5) - MCFG_QUICKLOAD_ADD("quickload", microtan_state, microtan, "hex", 0.5) + MCFG_SNAPSHOT_ADD("snapshot", microtan_state, microtan, "m65", attotime::from_msec(500)) + MCFG_QUICKLOAD_ADD("quickload", microtan_state, microtan, "hex", attotime::from_msec(500)) /* cassette */ CASSETTE(config, m_cassette); diff --git a/src/mame/drivers/mtx.cpp b/src/mame/drivers/mtx.cpp index 9dec61395dc..757218537d1 100644 --- a/src/mame/drivers/mtx.cpp +++ b/src/mame/drivers/mtx.cpp @@ -323,7 +323,7 @@ MACHINE_CONFIG_START(mtx_state::mtx512) output_latch_device ¢_data_out(OUTPUT_LATCH(config, "cent_data_out")); m_centronics->set_output_latch(cent_data_out); - MCFG_SNAPSHOT_ADD("snapshot", mtx_state, mtx, "mtx", 1) + MCFG_SNAPSHOT_ADD("snapshot", mtx_state, mtx, "mtx", attotime::from_seconds(1)) CASSETTE(config, m_cassette); m_cassette->set_default_state(CASSETTE_PLAY | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_MUTED); m_cassette->set_interface("mtx_cass"); diff --git a/src/mame/drivers/nascom1.cpp b/src/mame/drivers/nascom1.cpp index 58ec62c5a86..5f34272a69b 100644 --- a/src/mame/drivers/nascom1.cpp +++ b/src/mame/drivers/nascom1.cpp @@ -717,11 +717,11 @@ void nascom_state::nascom(machine_config &config) RAM(config, m_ram).set_default_size("48K").set_extra_options("8K,16K,32K"); // devices - snapshot_image_device &snapshot(SNAPSHOT(config, "snapshot", 0)); - snapshot.set_handler(snapquick_load_delegate(&SNAPSHOT_LOAD_NAME(nascom_state, nascom1), this), "nas", 0.5); + snapshot_image_device &snapshot(SNAPSHOT(config, "snapshot")); + snapshot.set_handler(snapquick_load_delegate(&SNAPSHOT_LOAD_NAME(nascom_state, nascom1), this), "nas", attotime::from_msec(500)); snapshot.set_interface("nascom_snap"); - snapshot_image_device &snapchar(SNAPSHOT(config, "snapchar", 0)); - snapchar.set_handler(snapquick_load_delegate(&SNAPSHOT_LOAD_NAME(nascom_state, charrom), this), "chr", 0.5); + snapshot_image_device &snapchar(SNAPSHOT(config, "snapchar")); + snapchar.set_handler(snapquick_load_delegate(&SNAPSHOT_LOAD_NAME(nascom_state, charrom), this), "chr", attotime::from_msec(500)); snapchar.set_interface("nascom_char"); } diff --git a/src/mame/drivers/pet.cpp b/src/mame/drivers/pet.cpp index bc66b62bb8e..86af4eca434 100644 --- a/src/mame/drivers/pet.cpp +++ b/src/mame/drivers/pet.cpp @@ -1783,8 +1783,8 @@ void pet_state::base_pet_devices(machine_config &config, const char *default_dri m_user->pl_handler().set(m_via, FUNC(via6522_device::write_pa7)); m_user->pm_handler().set(m_via, FUNC(via6522_device::write_cb2)); - quickload_image_device &quickload(QUICKLOAD(config, "quickload", 0)); - quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(pet_state, cbm_pet), this), "p00,prg", CBM_QUICKLOAD_DELAY_SECONDS); + quickload_image_device &quickload(QUICKLOAD(config, "quickload")); + quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(pet_state, cbm_pet), this), "p00,prg", CBM_QUICKLOAD_DELAY); quickload.set_interface("cbm_quik"); SOFTWARE_LIST(config, "cass_list").set_original("pet_cass"); diff --git a/src/mame/drivers/phunsy.cpp b/src/mame/drivers/phunsy.cpp index 53bf403f95d..fc48c97ea3b 100644 --- a/src/mame/drivers/phunsy.cpp +++ b/src/mame/drivers/phunsy.cpp @@ -373,8 +373,8 @@ void phunsy_state::phunsy(machine_config &config) CASSETTE(config, m_cass); /* quickload */ - quickload_image_device &quickload(QUICKLOAD(config, "quickload", 0)); - quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(phunsy_state, phunsy), this), "bin", 2); + quickload_image_device &quickload(QUICKLOAD(config, "quickload")); + quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(phunsy_state, phunsy), this), "bin", attotime::from_seconds(2)); } diff --git a/src/mame/drivers/pipbug.cpp b/src/mame/drivers/pipbug.cpp index d63fdb2149c..b045abfa294 100644 --- a/src/mame/drivers/pipbug.cpp +++ b/src/mame/drivers/pipbug.cpp @@ -174,8 +174,8 @@ void pipbug_state::pipbug(machine_config &config) m_rs232->set_option_device_input_defaults("terminal", DEVICE_INPUT_DEFAULTS_NAME(terminal)); /* quickload */ - quickload_image_device &quickload(QUICKLOAD(config, "quickload", 0)); - quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(pipbug_state, pipbug), this), "pgm", 1); + quickload_image_device &quickload(QUICKLOAD(config, "quickload")); + quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(pipbug_state, pipbug), this), "pgm", attotime::from_seconds(1)); } diff --git a/src/mame/drivers/plus4.cpp b/src/mame/drivers/plus4.cpp index 3f7866dcd5b..d52aee92877 100644 --- a/src/mame/drivers/plus4.cpp +++ b/src/mame/drivers/plus4.cpp @@ -930,8 +930,8 @@ void plus4_state::plus4(machine_config &config) m_exp->cd_wr_callback().set(FUNC(plus4_state::write)); m_exp->aec_wr_callback().set_inputline(MOS7501_TAG, INPUT_LINE_HALT); - quickload_image_device &quickload(QUICKLOAD(config, "quickload", 0)); - quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(plus4_state, cbm_c16), this), "p00,prg", CBM_QUICKLOAD_DELAY_SECONDS); + quickload_image_device &quickload(QUICKLOAD(config, "quickload")); + quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(plus4_state, cbm_c16), this), "p00,prg", CBM_QUICKLOAD_DELAY); // internal ram RAM(config, m_ram).set_default_size("64K"); diff --git a/src/mame/drivers/poly88.cpp b/src/mame/drivers/poly88.cpp index 1a16a1fd8c3..f41304fbe6d 100644 --- a/src/mame/drivers/poly88.cpp +++ b/src/mame/drivers/poly88.cpp @@ -231,7 +231,7 @@ MACHINE_CONFIG_START(poly88_state::poly88) m_uart->rxrdy_handler().set(FUNC(poly88_state::poly88_usart_rxready)); /* snapshot */ - MCFG_SNAPSHOT_ADD("snapshot", poly88_state, poly88, "img", 2) + MCFG_SNAPSHOT_ADD("snapshot", poly88_state, poly88, "img", attotime::from_seconds(2)) MACHINE_CONFIG_END MACHINE_CONFIG_START(poly88_state::poly8813) diff --git a/src/mame/drivers/primo.cpp b/src/mame/drivers/primo.cpp index 6e13ebff83d..e697420bbf4 100644 --- a/src/mame/drivers/primo.cpp +++ b/src/mame/drivers/primo.cpp @@ -270,8 +270,8 @@ MACHINE_CONFIG_START(primo_state::primoa32) SPEAKER_SOUND(config, "speaker").add_route(ALL_OUTPUTS, "mono", 0.50); /* snapshot/quickload */ - MCFG_SNAPSHOT_ADD("snapshot", primo_state, primo, "pss", 0) - MCFG_QUICKLOAD_ADD("quickload", primo_state, primo, "pp", 0) + MCFG_SNAPSHOT_ADD("snapshot", primo_state, primo, "pss") + MCFG_QUICKLOAD_ADD("quickload", primo_state, primo, "pp") CASSETTE(config, m_cassette); m_cassette->set_formats(primo_ptp_format); diff --git a/src/mame/drivers/psx.cpp b/src/mame/drivers/psx.cpp index e7f09bb3d00..e5e313c67b6 100644 --- a/src/mame/drivers/psx.cpp +++ b/src/mame/drivers/psx.cpp @@ -29,17 +29,15 @@ #include <zlib.h> -#define PSXCD_TAG "psxcd" - class psx1_state : public driver_device { public: - psx1_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + psx1_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ram(*this, "maincpu:ram"), m_parallel(*this, "parallel"), - m_psxcd(*this, PSXCD_TAG) + m_psxcd(*this, "psxcd") { } @@ -521,8 +519,8 @@ void psx1_state::subcpu_map(address_map &map) void psx1_state::psx_base(machine_config &config) { m_maincpu->set_addrmap(AS_PROGRAM, &psx1_state::psx_map); - m_maincpu->cd_read().set(PSXCD_TAG, FUNC(psxcd_device::read)); - m_maincpu->cd_write().set(PSXCD_TAG, FUNC(psxcd_device::write)); + m_maincpu->cd_read().set(m_psxcd, FUNC(psxcd_device::read)); + m_maincpu->cd_write().set(m_psxcd, FUNC(psxcd_device::write)); m_maincpu->subdevice<ram_device>("ram")->set_default_size("2M"); psxcontrollerports_device &controllers(PSXCONTROLLERPORTS(config, "controllers", 0)); @@ -545,8 +543,8 @@ void psx1_state::psx_base(machine_config &config) spu.add_route(0, "lspeaker", 1.00); spu.add_route(1, "rspeaker", 1.00); - quickload_image_device &quickload(QUICKLOAD(config, "quickload", 0)); - quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(psx1_state, psx_exe_load), this), "cpe,exe,psf,psx", 0); + quickload_image_device &quickload(QUICKLOAD(config, "quickload")); + quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(psx1_state, psx_exe_load), this), "cpe,exe,psf,psx"); PSX_PARALLEL_SLOT(config, "parallel", psx_parallel_devices, nullptr); diff --git a/src/mame/drivers/qx10.cpp b/src/mame/drivers/qx10.cpp index c4b84f16c45..92d9e7b1c8e 100644 --- a/src/mame/drivers/qx10.cpp +++ b/src/mame/drivers/qx10.cpp @@ -826,7 +826,7 @@ MACHINE_CONFIG_START(qx10_state::qx10) // software lists SOFTWARE_LIST(config, "flop_list").set_original("qx10_flop"); - MCFG_QUICKLOAD_ADD("quickload", qx10_state, qx10, "com,cpm", 3) + MCFG_QUICKLOAD_ADD("quickload", qx10_state, qx10, "com,cpm", attotime::from_seconds(3)) MACHINE_CONFIG_END diff --git a/src/mame/drivers/ravens.cpp b/src/mame/drivers/ravens.cpp index 38ea7c159e1..bbea711522d 100644 --- a/src/mame/drivers/ravens.cpp +++ b/src/mame/drivers/ravens.cpp @@ -351,8 +351,8 @@ void ravens_state::ravens(machine_config &config) config.set_default_layout(layout_ravens); /* quickload */ - quickload_image_device &quickload(QUICKLOAD(config, "quickload", 0)); - quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(ravens_state, ravens), this), "pgm", 1); + quickload_image_device &quickload(QUICKLOAD(config, "quickload")); + quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(ravens_state, ravens), this), "pgm", attotime::from_seconds(1)); /* cassette */ CASSETTE(config, m_cass); @@ -376,8 +376,8 @@ void ravens_state::ravens2(machine_config &config) m_terminal->set_keyboard_callback(FUNC(ravens_state::kbd_put)); /* quickload */ - quickload_image_device &quickload(QUICKLOAD(config, "quickload", 0)); - quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(ravens_state, ravens), this), "pgm", 1); + quickload_image_device &quickload(QUICKLOAD(config, "quickload")); + quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(ravens_state, ravens), this), "pgm", attotime::from_seconds(1)); /* cassette */ CASSETTE(config, m_cass); diff --git a/src/mame/drivers/rex6000.cpp b/src/mame/drivers/rex6000.cpp index 5b4b64c9597..0679d53292a 100644 --- a/src/mame/drivers/rex6000.cpp +++ b/src/mame/drivers/rex6000.cpp @@ -934,7 +934,7 @@ MACHINE_CONFIG_START(rex6000_state::rex6000) serport.cts_handler().set(m_uart, FUNC(ins8250_uart_device::cts_w)); /* quickload */ - MCFG_QUICKLOAD_ADD("quickload", rex6000_state, rex6000, "rex,ds2", 0) + MCFG_QUICKLOAD_ADD("quickload", rex6000_state, rex6000, "rex,ds2") tc8521_device &rtc(TC8521(config, TC8521_TAG, XTAL(32'768))); rtc.out_alarm_callback().set(FUNC(rex6000_state::alarm_irq)); @@ -998,7 +998,7 @@ MACHINE_CONFIG_START(oz750_state::oz750) ADDRESS_MAP_BANK(config, "bank1").set_map(&oz750_state::oz750_banked_map).set_options(ENDIANNESS_LITTLE, 8, 32, 0x2000); /* quickload */ - MCFG_QUICKLOAD_ADD("quickload", oz750_state, oz750, "wzd", 0) + MCFG_QUICKLOAD_ADD("quickload", oz750_state, oz750, "wzd") tc8521_device &rtc(TC8521(config, TC8521_TAG, XTAL(32'768))); rtc.out_alarm_callback().set(FUNC(rex6000_state::alarm_irq)); diff --git a/src/mame/drivers/smc777.cpp b/src/mame/drivers/smc777.cpp index d8716355230..b3acecfc5e6 100644 --- a/src/mame/drivers/smc777.cpp +++ b/src/mame/drivers/smc777.cpp @@ -1143,7 +1143,7 @@ MACHINE_CONFIG_START(smc777_state::smc777) FLOPPY_CONNECTOR(config, "fdc:1", smc777_floppies, "ssdd", floppy_image_device::default_floppy_formats); SOFTWARE_LIST(config, "flop_list").set_original("smc777"); - MCFG_QUICKLOAD_ADD("quickload", smc777_state, smc777, "com,cpm", 3) + MCFG_QUICKLOAD_ADD("quickload", smc777_state, smc777, "com,cpm", attotime::from_seconds(3)) /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/sorcerer.cpp b/src/mame/drivers/sorcerer.cpp index 7ce112baf18..ba853f407f4 100644 --- a/src/mame/drivers/sorcerer.cpp +++ b/src/mame/drivers/sorcerer.cpp @@ -445,8 +445,8 @@ MACHINE_CONFIG_START(sorcerer_state::sorcerer) INPUT_BUFFER(config, "cent_status_in"); /* quickload */ - MCFG_SNAPSHOT_ADD("snapshot", sorcerer_state, sorcerer, "snp", 2) - MCFG_QUICKLOAD_ADD("quickload", sorcerer_state, sorcerer, "bin", 3) + MCFG_SNAPSHOT_ADD("snapshot", sorcerer_state, sorcerer, "snp", attotime::from_seconds(2)) + MCFG_QUICKLOAD_ADD("quickload", sorcerer_state, sorcerer, "bin", attotime::from_seconds(3)) CASSETTE(config, m_cassette1); m_cassette1->set_formats(sorcerer_cassette_formats); diff --git a/src/mame/drivers/spectrum.cpp b/src/mame/drivers/spectrum.cpp index 445b4ae16f5..f1add2f80c2 100644 --- a/src/mame/drivers/spectrum.cpp +++ b/src/mame/drivers/spectrum.cpp @@ -703,10 +703,10 @@ MACHINE_CONFIG_START(spectrum_state::spectrum_common) m_exp->nmi_handler().set_inputline(m_maincpu, INPUT_LINE_NMI); /* devices */ - snapshot_image_device &snapshot(SNAPSHOT(config, "snapshot", 0)); - snapshot.set_handler(snapquick_load_delegate(&SNAPSHOT_LOAD_NAME(spectrum_state, spectrum), this), "ach,frz,plusd,prg,sem,sit,sna,snp,snx,sp,z80,zx", 0); - quickload_image_device &quickload(QUICKLOAD(config, "quickload", 0)); - quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(spectrum_state, spectrum), this), "raw,scr", 2); // The delay prevents the screen from being cleared by the RAM test at boot + snapshot_image_device &snapshot(SNAPSHOT(config, "snapshot")); + snapshot.set_handler(snapquick_load_delegate(&SNAPSHOT_LOAD_NAME(spectrum_state, spectrum), this), "ach,frz,plusd,prg,sem,sit,sna,snp,snx,sp,z80,zx"); + quickload_image_device &quickload(QUICKLOAD(config, "quickload")); + quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(spectrum_state, spectrum), this), "raw,scr", attotime::from_seconds(2)); // The delay prevents the screen from being cleared by the RAM test at boot CASSETTE(config, m_cassette); m_cassette->set_formats(tzx_cassette_formats); diff --git a/src/mame/drivers/ssem.cpp b/src/mame/drivers/ssem.cpp index 8a1ac6410e1..4039a2119e0 100644 --- a/src/mame/drivers/ssem.cpp +++ b/src/mame/drivers/ssem.cpp @@ -647,7 +647,7 @@ MACHINE_CONFIG_START(ssem_state::ssem) PALETTE(config, "palette", palette_device::MONOCHROME); /* quickload */ - MCFG_QUICKLOAD_ADD("quickload", ssem_state, ssem_store, "snp,asm", 1) + MCFG_QUICKLOAD_ADD("quickload", ssem_state, ssem_store, "snp,asm", attotime::from_seconds(1)) MACHINE_CONFIG_END diff --git a/src/mame/drivers/super80.cpp b/src/mame/drivers/super80.cpp index cc1d59c7fa9..1baebade4f0 100644 --- a/src/mame/drivers/super80.cpp +++ b/src/mame/drivers/super80.cpp @@ -751,8 +751,8 @@ void super80_state::super80(machine_config &config) INPUT_BUFFER(config, "cent_status_in", 0); /* quickload */ - quickload_image_device &quickload(QUICKLOAD(config, "quickload", 0)); - quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(super80_state, super80), this), "bin", 3); + quickload_image_device &quickload(QUICKLOAD(config, "quickload")); + quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(super80_state, super80), this), "bin", attotime::from_seconds(3)); /* cassette */ CASSETTE(config, m_cassette); @@ -845,8 +845,8 @@ void super80_state::super80v(machine_config &config) INPUT_BUFFER(config, "cent_status_in", 0); /* quickload */ - quickload_image_device &quickload(QUICKLOAD(config, "quickload", 0)); - quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(super80_state, super80), this), "bin", 3); + quickload_image_device &quickload(QUICKLOAD(config, "quickload")); + quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(super80_state, super80), this), "bin", attotime::from_seconds(3)); /* cassette */ CASSETTE(config, m_cassette); diff --git a/src/mame/drivers/svmu.cpp b/src/mame/drivers/svmu.cpp index 65d4baad3f1..468315ccc5d 100644 --- a/src/mame/drivers/svmu.cpp +++ b/src/mame/drivers/svmu.cpp @@ -341,8 +341,8 @@ void svmu_state::svmu(machine_config &config) /* devices */ ATMEL_29C010(config, m_flash); - quickload_image_device &quickload(QUICKLOAD(config, "quickload", 0)); - quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(svmu_state, svmu), this), "vms,bin", 0); + quickload_image_device &quickload(QUICKLOAD(config, "quickload")); + quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(svmu_state, svmu), this), "vms,bin"); quickload.set_interface("svmu_quik"); /* Software lists */ diff --git a/src/mame/drivers/ti85.cpp b/src/mame/drivers/ti85.cpp index 22cd1b25e75..36d3aa8c318 100644 --- a/src/mame/drivers/ti85.cpp +++ b/src/mame/drivers/ti85.cpp @@ -617,7 +617,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(ti85_state::ti85d) ti85(config); - MCFG_SNAPSHOT_ADD("snapshot", ti85_state, ti8x, "sav", 0) + MCFG_SNAPSHOT_ADD("snapshot", ti85_state, ti8x, "sav") //MCFG_TI85SERIAL_ADD( "tiserial" ) MACHINE_CONFIG_END @@ -673,7 +673,7 @@ MACHINE_CONFIG_START(ti85_state::ti86) MCFG_MACHINE_START_OVERRIDE(ti85_state, ti86 ) MCFG_MACHINE_RESET_OVERRIDE(ti85_state, ti85 ) - MCFG_SNAPSHOT_ADD("snapshot", ti85_state, ti8x, "sav", 0) + MCFG_SNAPSHOT_ADD("snapshot", ti85_state, ti8x, "sav") MACHINE_CONFIG_END MACHINE_CONFIG_START(ti85_state::ti83p) diff --git a/src/mame/drivers/tmc1800.cpp b/src/mame/drivers/tmc1800.cpp index b19c7173a11..992c0f9bf01 100644 --- a/src/mame/drivers/tmc1800.cpp +++ b/src/mame/drivers/tmc1800.cpp @@ -735,7 +735,7 @@ MACHINE_CONFIG_START(tmc1800_state::tmc1800) BEEP(config, m_beeper, 0).add_route(ALL_OUTPUTS, "mono", 0.25); // devices - MCFG_QUICKLOAD_ADD("quickload", tmc1800_base_state, tmc1800, "bin", 0) + MCFG_QUICKLOAD_ADD("quickload", tmc1800_base_state, tmc1800, "bin") CASSETTE(config, m_cassette); m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_MUTED); @@ -763,7 +763,7 @@ MACHINE_CONFIG_START(osc1000b_state::osc1000b) BEEP(config, m_beeper, 0).add_route(ALL_OUTPUTS, "mono", 0.25); // devices - MCFG_QUICKLOAD_ADD("quickload", tmc1800_base_state, tmc1800, "bin", 0) + MCFG_QUICKLOAD_ADD("quickload", tmc1800_base_state, tmc1800, "bin") CASSETTE(config, m_cassette); m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_MUTED); @@ -787,7 +787,7 @@ MACHINE_CONFIG_START(tmc2000_state::tmc2000) tmc2000_video(config); // devices - MCFG_QUICKLOAD_ADD("quickload", tmc1800_base_state, tmc1800, "bin", 0) + MCFG_QUICKLOAD_ADD("quickload", tmc1800_base_state, tmc1800, "bin") CASSETTE(config, m_cassette); m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_MUTED); @@ -811,7 +811,7 @@ MACHINE_CONFIG_START(nano_state::nano) nano_video(config); // devices - MCFG_QUICKLOAD_ADD("quickload", tmc1800_base_state, tmc1800, "bin", 0) + MCFG_QUICKLOAD_ADD("quickload", tmc1800_base_state, tmc1800, "bin") CASSETTE(config, m_cassette); m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_MUTED); diff --git a/src/mame/drivers/trs80.cpp b/src/mame/drivers/trs80.cpp index f9edf27948a..96a901869df 100644 --- a/src/mame/drivers/trs80.cpp +++ b/src/mame/drivers/trs80.cpp @@ -534,7 +534,7 @@ MACHINE_CONFIG_START(trs80_state::model1) // model I, level II m_cassette->set_formats(trs80l2_cassette_formats); m_cassette->set_default_state(CASSETTE_PLAY); - MCFG_QUICKLOAD_ADD("quickload", trs80_state, trs80_cmd, "cmd", 1.0) + MCFG_QUICKLOAD_ADD("quickload", trs80_state, trs80_cmd, "cmd", attotime::from_seconds(1)) FD1793(config, m_fdc, 4_MHz_XTAL / 4); // todo: should be fd1771 m_fdc->intrq_wr_callback().set(FUNC(trs80_state::intrq_w)); diff --git a/src/mame/drivers/trs80m3.cpp b/src/mame/drivers/trs80m3.cpp index 8a4500ab729..def0c09bd95 100644 --- a/src/mame/drivers/trs80m3.cpp +++ b/src/mame/drivers/trs80m3.cpp @@ -359,7 +359,7 @@ MACHINE_CONFIG_START(trs80m3_state::model3) m_cassette->set_formats(trs80l2_cassette_formats); m_cassette->set_default_state(CASSETTE_PLAY); - MCFG_QUICKLOAD_ADD("quickload", trs80m3_state, trs80_cmd, "cmd", 1.0) + MCFG_QUICKLOAD_ADD("quickload", trs80m3_state, trs80_cmd, "cmd", attotime::from_seconds(1)) FD1793(config, m_fdc, 4_MHz_XTAL / 4); m_fdc->intrq_wr_callback().set(FUNC(trs80m3_state::intrq_w)); diff --git a/src/mame/drivers/tvc.cpp b/src/mame/drivers/tvc.cpp index 69ce9c7a9f6..fce3871b8ed 100644 --- a/src/mame/drivers/tvc.cpp +++ b/src/mame/drivers/tvc.cpp @@ -829,7 +829,7 @@ MACHINE_CONFIG_START(tvc_state::tvc) m_cassette->set_interface("tvc_cass"); /* quickload */ - MCFG_QUICKLOAD_ADD("quickload", tvc_state, tvc64, "cas", 6) + MCFG_QUICKLOAD_ADD("quickload", tvc_state, tvc64, "cas", attotime::from_seconds(6)) /* Software lists */ SOFTWARE_LIST(config, "cart_list").set_original("tvc_cart"); diff --git a/src/mame/drivers/vc4000.cpp b/src/mame/drivers/vc4000.cpp index 21a3bf17294..dcd778e46a9 100644 --- a/src/mame/drivers/vc4000.cpp +++ b/src/mame/drivers/vc4000.cpp @@ -550,8 +550,8 @@ void vc4000_state::vc4000(machine_config &config) VC4000_SND(config, m_custom, 0).add_route(ALL_OUTPUTS, "mono", 0.50); /* quickload */ - quickload_image_device &quickload(QUICKLOAD(config, "quickload", 0)); - quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(vc4000_state, vc4000), this), "pgm,tvc", 0); + quickload_image_device &quickload(QUICKLOAD(config, "quickload")); + quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(vc4000_state, vc4000), this), "pgm,tvc"); /* cartridge */ VC4000_CART_SLOT(config, "cartslot", vc4000_cart, nullptr); diff --git a/src/mame/drivers/vgmplay.cpp b/src/mame/drivers/vgmplay.cpp index 83eaca695a2..23b3c349477 100644 --- a/src/mame/drivers/vgmplay.cpp +++ b/src/mame/drivers/vgmplay.cpp @@ -3435,7 +3435,7 @@ MACHINE_CONFIG_START(vgmplay_state::vgmplay) m_vgmplay->set_addrmap(AS_IO, &vgmplay_state::soundchips_map); m_vgmplay->set_addrmap(AS_IO16, &vgmplay_state::soundchips16_map); - MCFG_QUICKLOAD_ADD("quickload", vgmplay_state, load_file, "vgm,vgz", 0) + MCFG_QUICKLOAD_ADD("quickload", vgmplay_state, load_file, "vgm,vgz") MCFG_QUICKLOAD_INTERFACE("vgm_quik") SOFTWARE_LIST(config, "vgm_list").set_original("vgmplay"); diff --git a/src/mame/drivers/vic20.cpp b/src/mame/drivers/vic20.cpp index 7565b03e80d..a4035916c25 100644 --- a/src/mame/drivers/vic20.cpp +++ b/src/mame/drivers/vic20.cpp @@ -844,8 +844,8 @@ void vic20_state::vic20(machine_config &config, const char* softlist_filter) m_user->pl_handler().set(m_via1, FUNC(via6522_device::write_pb7)); m_user->pm_handler().set(m_via1, FUNC(via6522_device::write_cb2)); - quickload_image_device &quickload(QUICKLOAD(config, "quickload", 0)); - quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(vic20_state, cbm_vc20), this), "p00,prg", CBM_QUICKLOAD_DELAY_SECONDS); + quickload_image_device &quickload(QUICKLOAD(config, "quickload")); + quickload.set_handler(snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(vic20_state, cbm_vc20), this), "p00,prg", CBM_QUICKLOAD_DELAY); SOFTWARE_LIST(config, "cart_list").set_type("vic1001_cart", SOFTWARE_LIST_ORIGINAL_SYSTEM).set_filter(softlist_filter); SOFTWARE_LIST(config, "cass_list").set_type("vic1001_cass", SOFTWARE_LIST_ORIGINAL_SYSTEM).set_filter(softlist_filter); diff --git a/src/mame/drivers/vip.cpp b/src/mame/drivers/vip.cpp index 836ab8d71cb..0fbb232e00a 100644 --- a/src/mame/drivers/vip.cpp +++ b/src/mame/drivers/vip.cpp @@ -739,7 +739,7 @@ MACHINE_CONFIG_START(vip_state::vip) m_exp->dma_in_wr_callback().set(FUNC(vip_state::exp_dma_in_w)); // devices - MCFG_QUICKLOAD_ADD("quickload", vip_state, vip, "bin,c8,c8x", 0) + MCFG_QUICKLOAD_ADD("quickload", vip_state, vip, "bin,c8,c8x") CASSETTE(config, m_cassette); m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_MUTED); m_cassette->set_interface("vip_cass"); diff --git a/src/mame/drivers/vtech1.cpp b/src/mame/drivers/vtech1.cpp index 3915a858932..ad26a417244 100644 --- a/src/mame/drivers/vtech1.cpp +++ b/src/mame/drivers/vtech1.cpp @@ -467,7 +467,7 @@ void vtech1_state::laser110(machine_config &config) // snapshot snapshot_image_device &snapshot(SNAPSHOT(config, "snapshot", 0)); - snapshot.set_handler(snapquick_load_delegate(&SNAPSHOT_LOAD_NAME(vtech1_state, vtech1), this), "vz", 1.5); + snapshot.set_handler(snapquick_load_delegate(&SNAPSHOT_LOAD_NAME(vtech1_state, vtech1), this), "vz", attotime::from_double(1.5)); CASSETTE(config, m_cassette); m_cassette->set_formats(vtech1_cassette_formats); diff --git a/src/mame/drivers/xerox820.cpp b/src/mame/drivers/xerox820.cpp index 778d5969e61..20a95a9e1d4 100644 --- a/src/mame/drivers/xerox820.cpp +++ b/src/mame/drivers/xerox820.cpp @@ -666,7 +666,7 @@ MACHINE_CONFIG_START(xerox820_state::xerox820) // software lists SOFTWARE_LIST(config, "flop_list").set_original("xerox820"); - MCFG_QUICKLOAD_ADD("quickload", xerox820_state, xerox820, "com,cpm", 3) + MCFG_QUICKLOAD_ADD("quickload", xerox820_state, xerox820, "com,cpm", attotime::from_seconds(3)) MACHINE_CONFIG_END MACHINE_CONFIG_START(bigboard_state::bigboard) @@ -771,7 +771,7 @@ MACHINE_CONFIG_START(xerox820ii_state::xerox820ii) // software lists SOFTWARE_LIST(config, "flop_list").set_original("xerox820ii"); - MCFG_QUICKLOAD_ADD("quickload", xerox820_state, xerox820, "com,cpm", 3) + MCFG_QUICKLOAD_ADD("quickload", xerox820_state, xerox820, "com,cpm", attotime::from_seconds(3)) MACHINE_CONFIG_END MACHINE_CONFIG_START(xerox820ii_state::xerox168) diff --git a/src/mame/drivers/z1013.cpp b/src/mame/drivers/z1013.cpp index 0932272cefc..b6e438fbd34 100644 --- a/src/mame/drivers/z1013.cpp +++ b/src/mame/drivers/z1013.cpp @@ -401,7 +401,7 @@ MACHINE_CONFIG_START(z1013_state::z1013) CASSETTE(config, m_cass); m_cass->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED); - MCFG_SNAPSHOT_ADD("snapshot", z1013_state, z1013, "z80", 0) + MCFG_SNAPSHOT_ADD("snapshot", z1013_state, z1013, "z80") MACHINE_CONFIG_END MACHINE_CONFIG_START(z1013_state::z1013k76) diff --git a/src/mame/machine/cbm_snqk.h b/src/mame/machine/cbm_snqk.h index 5d19d453df2..32c9a597743 100644 --- a/src/mame/machine/cbm_snqk.h +++ b/src/mame/machine/cbm_snqk.h @@ -13,7 +13,7 @@ #include "imagedev/snapquik.h" -#define CBM_QUICKLOAD_DELAY_SECONDS 3 +#define CBM_QUICKLOAD_DELAY (attotime::from_seconds(3)) image_init_result general_cbm_loadsnap( device_image_interface &image, |