diff --git a/src/emu/dislot.c b/src/emu/dislot.c index 4190dac0bc0..74d6c80f1d8 100644 --- a/src/emu/dislot.c +++ b/src/emu/dislot.c @@ -8,19 +8,18 @@ #include "emuopts.h" device_slot_interface::device_slot_interface(const machine_config &mconfig, device_t &device) - : device_interface(device) + : device_interface(device), + m_slot_interfaces(NULL), + m_default_card(NULL), + m_fixed(false) { - m_default_card = 0; - m_input_defaults = 0; - m_slot_interfaces = 0; } device_slot_interface::~device_slot_interface() { } - -void device_slot_interface::static_set_slot_info(device_t &device, const slot_interface *slots_info, const char *default_card,const input_device_default *default_input, const void *default_config, UINT32 default_clock, bool fixed) +void device_slot_interface::static_set_slot_info(device_t &device, const slot_interface *slots_info, const char *default_card, bool fixed) { device_slot_interface *slot; if (!device.interface(slot)) @@ -28,12 +27,62 @@ void device_slot_interface::static_set_slot_info(device_t &device, const slot_in slot->m_slot_interfaces = slots_info; slot->m_default_card = default_card; - slot->m_input_defaults = default_input; - slot->m_default_config = default_config; - slot->m_default_clock = default_clock; slot->m_fixed = fixed; } +device_card_options *device_slot_interface::static_alloc_card_options(device_t &device, const char *card) +{ + device_slot_interface &intf = dynamic_cast(device); + + device_card_options *options = intf.m_card_options.find(card); + if (options == NULL) + { + options = pool_alloc(intf.m_card_options.pool(), device_card_options()); + intf.m_card_options.append(card, *options); + } + + return options; +} + +void device_slot_interface::static_set_card_device_input_defaults(device_t &device, const char *card, const input_device_default *input_device_defaults) +{ + static_alloc_card_options(device, card)->m_input_device_defaults = input_device_defaults; +} + +void device_slot_interface::static_set_card_config(device_t &device, const char *card, const void *config) +{ + static_alloc_card_options(device, card)->m_config = config; +} + +void device_slot_interface::static_set_card_clock(device_t &device, const char *card, UINT32 clock) +{ + static_alloc_card_options(device, card)->m_clock = clock; +} + +const input_device_default *device_slot_interface::card_input_device_defaults(const char *card) const +{ + device_card_options *options = m_card_options.find(card); + if (options != NULL) + return options->m_input_device_defaults; + return NULL; +} + +const void *device_slot_interface::card_config(const char *card) const +{ + device_card_options *options = m_card_options.find(card); + if (options != NULL) + return options->m_config; + return NULL; +} + +const UINT32 device_slot_interface::card_clock(const char *card) const +{ + device_card_options *options = m_card_options.find(card); + if (options != NULL) + return options->m_clock; + return 0; +} + device_t* device_slot_interface::get_card_device() { const char *subtag; diff --git a/src/emu/dislot.h b/src/emu/dislot.h index 5e87b6aea3c..75e06d3915d 100644 --- a/src/emu/dislot.h +++ b/src/emu/dislot.h @@ -20,12 +20,17 @@ struct slot_interface bool internal; }; -#define MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, _fixed) \ - device_slot_interface::static_set_slot_info(*device, SLOT_INTERFACE_NAME(_slot_intf), _def_slot, DEVICE_INPUT_DEFAULTS_NAME(_def_inp), NULL, 0, _fixed); +#define MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_card, _fixed) \ + device_slot_interface::static_set_slot_info(*device, SLOT_INTERFACE_NAME(_slot_intf), _def_card, _fixed); -#define MCFG_DEVICE_SLOT_INTERFACE_FULL(_slot_intf, _def_slot, _def_inp, _def_config, _def_clock, _fixed) \ - device_slot_interface::static_set_slot_info(*device, SLOT_INTERFACE_NAME(_slot_intf), _def_slot, DEVICE_INPUT_DEFAULTS_NAME(_def_inp), _def_config, _def_clock, _fixed); +#define MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS(card, _dev_inp_def) \ + device_slot_interface::static_set_card_device_input_defaults(*device, card, DEVICE_INPUT_DEFAULTS_NAME(_dev_inp_def)); +#define MCFG_DEVICE_CARD_CONFIG(card, _config) \ + device_slot_interface::static_set_card_config(*device, card, _config); + +#define MCFG_DEVICE_CARD_CLOCK(card, _clock) \ + device_slot_interface::static_set_card_clock(*device, card, _clock); #define SLOT_INTERFACE_NAME(name) slot_interface_##name @@ -42,7 +47,19 @@ struct slot_interface #define SLOT_INTERFACE_EXTERN(name) extern const slot_interface slot_interface_##name[] -class device_slot_card_interface; +class device_card_options +{ + friend class device_slot_interface; + friend class simple_list; + +private: + const input_device_default *m_input_device_defaults; + const void *m_config; + UINT32 m_clock; + + // internal state + device_card_options * m_next; // link to the next reference +}; class device_slot_interface : public device_interface { @@ -51,23 +68,25 @@ public: device_slot_interface(const machine_config &mconfig, device_t &device); virtual ~device_slot_interface(); - static void static_set_slot_info(device_t &device, const slot_interface *slots_info, const char *default_card,const input_device_default *default_input, const void *default_config, UINT32 default_clock, bool fixed); + static void static_set_slot_info(device_t &device, const slot_interface *slots_info, const char *default_card,bool fixed); + static device_card_options *static_alloc_card_options(device_t &device, const char *card); + static void static_set_card_device_input_defaults(device_t &device, const char *card, const input_device_default *default_input); + static void static_set_card_config(device_t &device, const char *card, const void *config); + static void static_set_card_clock(device_t &device, const char *card, UINT32 default_clock); const slot_interface* get_slot_interfaces() const { return m_slot_interfaces; }; const char * get_default_card() const { return m_default_card; }; virtual const char * get_default_card_software(const machine_config &config, emu_options &options) { return NULL; }; - const input_device_default *input_ports_defaults() const { return m_input_defaults; } - const void *default_config() const { return m_default_config; } - const UINT32 default_clock() const { return m_default_clock; } + const input_device_default *card_input_device_defaults(const char *card) const; + const void *card_config(const char *card) const; + const UINT32 card_clock(const char *card) const; const bool fixed() const { return m_fixed; } const bool all_internal() const; bool is_internal_option(const char *option) const; device_t* get_card_device(); protected: - const char *m_default_card; - const input_device_default *m_input_defaults; const slot_interface *m_slot_interfaces; - const void *m_default_config; - UINT32 m_default_clock; + const char *m_default_card; + tagged_list m_card_options; bool m_fixed; }; diff --git a/src/emu/imagedev/floppy.h b/src/emu/imagedev/floppy.h index 2e916671b09..b9aee6296de 100644 --- a/src/emu/imagedev/floppy.h +++ b/src/emu/imagedev/floppy.h @@ -16,9 +16,9 @@ #include "formats/mfi_dsk.h" #include "formats/td0_dsk.h" -#define MCFG_FLOPPY_DRIVE_ADD(_tag, _slot_intf, _def_slot, _def_inp, _formats) \ +#define MCFG_FLOPPY_DRIVE_ADD(_tag, _slot_intf, _def_slot, _formats) \ MCFG_DEVICE_ADD(_tag, FLOPPY_CONNECTOR, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) \ + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) \ static_cast(device)->set_formats(_formats); #define DECLARE_FLOPPY_FORMATS(_name) \ diff --git a/src/emu/machine/ctronics.h b/src/emu/machine/ctronics.h index e099d745b50..5bb9b3fd28e 100644 --- a/src/emu/machine/ctronics.h +++ b/src/emu/machine/ctronics.h @@ -147,12 +147,12 @@ SLOT_INTERFACE_EXTERN(centronics_printer); DEVICE CONFIGURATION MACROS ***************************************************************************/ -#define MCFG_CENTRONICS_ADD(_tag, _intf, _slot_intf, _def_slot, _def_inp) \ +#define MCFG_CENTRONICS_ADD(_tag, _intf, _slot_intf, _def_slot) \ MCFG_DEVICE_ADD(_tag, CENTRONICS, 0) \ MCFG_DEVICE_CONFIG(_intf) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) #define MCFG_CENTRONICS_PRINTER_ADD(_tag, _intf) \ - MCFG_CENTRONICS_ADD(_tag, _intf, centronics_printer, "printer", NULL) + MCFG_CENTRONICS_ADD(_tag, _intf, centronics_printer, "printer") /*************************************************************************** DEFAULT INTERFACES diff --git a/src/emu/machine/idectrl.h b/src/emu/machine/idectrl.h index 57ff2d2ef32..794adf0d624 100644 --- a/src/emu/machine/idectrl.h +++ b/src/emu/machine/idectrl.h @@ -142,13 +142,13 @@ SLOT_INTERFACE_EXTERN(ide_image_devices); ***************************************************************************/ #define MCFG_IDE_CONTROLLER_ADD(_tag, _slotintf, _master, _slave, _fixed) \ - MCFG_IDE_SLOT_ADD("drive_0", _slotintf, _master, NULL, _fixed) \ - MCFG_IDE_SLOT_ADD("drive_1", _slotintf, _slave, NULL, _fixed) \ + MCFG_IDE_SLOT_ADD("drive_0", _slotintf, _master, _fixed) \ + MCFG_IDE_SLOT_ADD("drive_1", _slotintf, _slave, _fixed) \ MCFG_DEVICE_ADD(_tag, IDE_CONTROLLER, 0) -#define MCFG_IDE_SLOT_ADD(_tag, _slot_intf, _def_slot, _def_inp, _fixed) \ +#define MCFG_IDE_SLOT_ADD(_tag, _slot_intf, _def_slot, _fixed) \ MCFG_DEVICE_ADD(_tag, IDE_SLOT, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, _fixed) + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _fixed) /*************************************************************************** FUNCTION PROTOTYPES diff --git a/src/emu/machine/nscsi_bus.h b/src/emu/machine/nscsi_bus.h index def4786489a..1ca09838eff 100644 --- a/src/emu/machine/nscsi_bus.h +++ b/src/emu/machine/nscsi_bus.h @@ -6,9 +6,9 @@ #define MCFG_NSCSI_BUS_ADD(_tag) \ MCFG_DEVICE_ADD(_tag, NSCSI_BUS, 0) -#define MCFG_NSCSI_ADD(_tag, _slot_intf, _def_slot, _def_inp, _def_config, _def_clock, _fixed) \ +#define MCFG_NSCSI_ADD(_tag, _slot_intf, _def_slot, _fixed) \ MCFG_DEVICE_ADD(_tag, NSCSI_CONNECTOR, 0) \ - MCFG_DEVICE_SLOT_INTERFACE_FULL(_slot_intf, _def_slot, _def_inp, _def_config, _def_clock, _fixed) + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _fixed) class nscsi_device; diff --git a/src/emu/machine/pci.h b/src/emu/machine/pci.h index a850c4077d5..b940b42fac2 100644 --- a/src/emu/machine/pci.h +++ b/src/emu/machine/pci.h @@ -169,9 +169,9 @@ extern const device_type PCI_BUS; #define MCFG_PCI_BUS_ADD(_tag, _busnum) \ MCFG_DEVICE_ADD(_tag, PCI_BUS, 0) \ downcast(device)->set_busnum(_busnum); -#define MCFG_PCI_BUS_DEVICE(_tag, _slot_intf, _def_slot, _def_inp, _def_config, _def_clock, _fixed) \ +#define MCFG_PCI_BUS_DEVICE(_tag, _slot_intf, _def_slot, _fixed) \ MCFG_DEVICE_ADD(_tag, PCI_CONNECTOR, 0) \ - MCFG_DEVICE_SLOT_INTERFACE_FULL(_slot_intf, _def_slot, _def_inp, _def_config, _def_clock, _fixed) + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _fixed) #define MCFG_PCI_BUS_SIBLING(_father_tag) \ downcast(device)->set_father(_father_tag); diff --git a/src/emu/mconfig.c b/src/emu/mconfig.c index 9b4f36fb277..d7bf8a4f5de 100644 --- a/src/emu/mconfig.c +++ b/src/emu/mconfig.c @@ -91,15 +91,19 @@ machine_config::machine_config(const game_driver &gamedrv, emu_options &options) { if ((!intf[i].internal) || (isdefault && intf[i].internal)) { - const char *def = slot->get_default_card(); - bool is_default = (def != NULL && mame_stricmp(def, selval) == 0); - device_t *new_dev = device_add(&owner, intf[i].name, intf[i].devtype, is_default ? slot->default_clock() : 0); + device_t *new_dev = device_add(&owner, intf[i].name, intf[i].devtype, slot->card_clock(selval)); found = true; - if (is_default) { - device_t::static_set_input_default(*new_dev, slot->input_ports_defaults()); - if (slot->default_config()) { - device_t::static_set_static_config(*new_dev, slot->default_config()); - } + + const input_device_default *input_device_defaults = slot->card_input_device_defaults(selval); + if (input_device_defaults) + { + device_t::static_set_input_default(*new_dev, input_device_defaults); + } + + const void *config = slot->card_config(selval); + if (config) + { + device_t::static_set_static_config(*new_dev, config); } } } diff --git a/src/mame/drivers/jaguar.c b/src/mame/drivers/jaguar.c index 7c351ce2159..ed4444ee713 100644 --- a/src/mame/drivers/jaguar.c +++ b/src/mame/drivers/jaguar.c @@ -1572,7 +1572,7 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( cojagr3k_rom, cojagr3k ) MCFG_DEVICE_REMOVE("drive_0") - MCFG_IDE_SLOT_ADD("drive_0", ide_devices, NULL, NULL, true) + MCFG_IDE_SLOT_ADD("drive_0", ide_devices, NULL, true) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( cojag68k, cojagr3k ) diff --git a/src/mame/drivers/rastersp.c b/src/mame/drivers/rastersp.c index f4ff6e4f87f..a38be6c867f 100644 --- a/src/mame/drivers/rastersp.c +++ b/src/mame/drivers/rastersp.c @@ -893,8 +893,10 @@ static MACHINE_CONFIG_START( rastersp, rastersp_state ) MCFG_NVRAM_HANDLER(rastersp) MCFG_NSCSI_BUS_ADD("scsibus") - MCFG_NSCSI_ADD("scsibus:0", rastersp_scsi_devices, "harddisk", 0, 0, 0, true) - MCFG_NSCSI_ADD("scsibus:7", rastersp_scsi_devices, "ncr53c700", 0, &ncr53c700_intf, 66000000, true) + MCFG_NSCSI_ADD("scsibus:0", rastersp_scsi_devices, "harddisk", true) + MCFG_NSCSI_ADD("scsibus:7", rastersp_scsi_devices, "ncr53c700", true) + MCFG_DEVICE_CARD_CONFIG("ncr53c700", &ncr53c700_intf) + MCFG_DEVICE_CARD_CLOCK("ncr53c700", 66000000) /* Video */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mess/drivers/a2600.c b/src/mess/drivers/a2600.c index e75233b6f08..f944d6bce56 100644 --- a/src/mess/drivers/a2600.c +++ b/src/mess/drivers/a2600.c @@ -1953,8 +1953,8 @@ static MACHINE_CONFIG_START( a2600, a2600_state ) /* devices */ MCFG_RIOT6532_ADD("riot", MASTER_CLOCK_NTSC / 3, r6532_interface) - MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, "joy", NULL) - MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, NULL, NULL) + MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, "joy") + MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, NULL) MCFG_FRAGMENT_ADD(a2600_cartslot) MCFG_SOFTWARE_LIST_FILTER("cart_list", "NTSC") @@ -1990,8 +1990,8 @@ static MACHINE_CONFIG_START( a2600p, a2600_state ) /* devices */ MCFG_RIOT6532_ADD("riot", MASTER_CLOCK_PAL / 3, r6532_interface) - MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, "joy", NULL) - MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, NULL, NULL) + MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, "joy") + MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, NULL) MCFG_FRAGMENT_ADD(a2600_cartslot) MCFG_SOFTWARE_LIST_FILTER("cart_list", "PAL") diff --git a/src/mess/drivers/a5105.c b/src/mess/drivers/a5105.c index 8f277de206c..8ccea5953c7 100644 --- a/src/mess/drivers/a5105.c +++ b/src/mess/drivers/a5105.c @@ -614,10 +614,10 @@ static MACHINE_CONFIG_START( a5105, a5105_state ) MCFG_CASSETTE_ADD( "cassette", default_cassette_interface ) MCFG_UPD765A_ADD("upd765a", true, true) - MCFG_FLOPPY_DRIVE_ADD("upd765a:0", a5105_floppies, "525qd", 0, a5105_state::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("upd765a:1", a5105_floppies, "525qd", 0, a5105_state::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("upd765a:2", a5105_floppies, "525qd", 0, a5105_state::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("upd765a:3", a5105_floppies, "525qd", 0, a5105_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765a:0", a5105_floppies, "525qd", a5105_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765a:1", a5105_floppies, "525qd", a5105_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765a:2", a5105_floppies, "525qd", a5105_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765a:3", a5105_floppies, "525qd", a5105_state::floppy_formats) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) diff --git a/src/mess/drivers/abc1600.c b/src/mess/drivers/abc1600.c index f3e23185d13..7d545ce6eeb 100644 --- a/src/mess/drivers/abc1600.c +++ b/src/mess/drivers/abc1600.c @@ -1950,17 +1950,17 @@ static MACHINE_CONFIG_START( abc1600, abc1600_state ) MCFG_NMC9306_ADD(NMC9306_TAG) MCFG_E0516_ADD(E050_C16PC_TAG, XTAL_32_768kHz) MCFG_FD1797x_ADD(SAB1797_02P_TAG, XTAL_64MHz/64) - MCFG_FLOPPY_DRIVE_ADD(SAB1797_02P_TAG":0", abc1600_floppies, NULL, NULL, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(SAB1797_02P_TAG":1", abc1600_floppies, NULL, NULL, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(SAB1797_02P_TAG":2", abc1600_floppies, "525qd", NULL, floppy_image_device::default_floppy_formats) - MCFG_RS232_PORT_ADD(RS232_A_TAG, rs232a_intf, default_rs232_devices, NULL, NULL) - MCFG_RS232_PORT_ADD(RS232_B_TAG, rs232b_intf, default_rs232_devices, NULL, NULL) + MCFG_FLOPPY_DRIVE_ADD(SAB1797_02P_TAG":0", abc1600_floppies, NULL, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(SAB1797_02P_TAG":1", abc1600_floppies, NULL, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(SAB1797_02P_TAG":2", abc1600_floppies, "525qd", floppy_image_device::default_floppy_formats) + MCFG_RS232_PORT_ADD(RS232_A_TAG, rs232a_intf, default_rs232_devices, NULL) + MCFG_RS232_PORT_ADD(RS232_B_TAG, rs232b_intf, default_rs232_devices, NULL) MCFG_ABC99_ADD(abc99_intf) - MCFG_ABC1600BUS_SLOT_ADD("bus0i", bus0i_intf, abc1600bus_cards, NULL, NULL) - MCFG_ABC1600BUS_SLOT_ADD("bus0x", bus0x_intf, abc1600bus_cards, NULL, NULL) - MCFG_ABC1600BUS_SLOT_ADD("bus1", bus1_intf, abc1600bus_cards, NULL, NULL) - MCFG_ABC1600BUS_SLOT_ADD("bus2", bus2_intf, abc1600bus_cards, "4105", NULL) + MCFG_ABC1600BUS_SLOT_ADD("bus0i", bus0i_intf, abc1600bus_cards, NULL) + MCFG_ABC1600BUS_SLOT_ADD("bus0x", bus0x_intf, abc1600bus_cards, NULL) + MCFG_ABC1600BUS_SLOT_ADD("bus1", bus1_intf, abc1600bus_cards, NULL) + MCFG_ABC1600BUS_SLOT_ADD("bus2", bus2_intf, abc1600bus_cards, "4105") // internal ram MCFG_RAM_ADD(RAM_TAG) diff --git a/src/mess/drivers/abc80.c b/src/mess/drivers/abc80.c index 17d8750605f..c85dec44125 100644 --- a/src/mess/drivers/abc80.c +++ b/src/mess/drivers/abc80.c @@ -588,8 +588,9 @@ static MACHINE_CONFIG_START( abc80, abc80_state ) MCFG_Z80PIO_ADD(Z80PIO_TAG, XTAL_11_9808MHz/2/2, pio_intf) MCFG_CASSETTE_ADD("cassette", abc80_cassette_interface) MCFG_ABC80_KEYBOARD_ADD(kb_intf) - MCFG_ABCBUS_SLOT_ADD(ABCBUS_TAG, abcbus_intf, abcbus_cards, "slow", abc830_slow) - MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL, NULL) + MCFG_ABCBUS_SLOT_ADD(ABCBUS_TAG, abcbus_intf, abcbus_cards, "slow") + MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("slow", abc830_slow) + MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL) MCFG_ASCII_KEYBOARD_ADD(KEYBOARD_TAG, keyboard_intf) // internal ram diff --git a/src/mess/drivers/abc80x.c b/src/mess/drivers/abc80x.c index 73fece9aa8b..f1b760e52fc 100644 --- a/src/mess/drivers/abc80x.c +++ b/src/mess/drivers/abc80x.c @@ -1209,12 +1209,13 @@ static MACHINE_CONFIG_START( abc800c, abc800c_state ) MCFG_Z80SIO2_ADD(Z80SIO_TAG, ABC800_X01/2/2, sio_intf) MCFG_Z80DART_ADD(Z80DART_TAG, ABC800_X01/2/2, abc800_dart_intf) MCFG_CASSETTE_ADD("cassette", cass_intf) - MCFG_RS232_PORT_ADD(RS232_A_TAG, rs232a_intf, default_rs232_devices, NULL, NULL) - MCFG_RS232_PORT_ADD(RS232_B_TAG, rs232b_intf, default_rs232_devices, NULL, NULL) + MCFG_RS232_PORT_ADD(RS232_A_TAG, rs232a_intf, default_rs232_devices, NULL) + MCFG_RS232_PORT_ADD(RS232_B_TAG, rs232b_intf, default_rs232_devices, NULL) MCFG_ABC800_KEYBOARD_ADD(abc800_kb_intf) // ABC bus - MCFG_ABCBUS_SLOT_ADD(ABCBUS_TAG, abcbus_intf, abcbus_cards, "fast", abc830_fast) + MCFG_ABCBUS_SLOT_ADD(ABCBUS_TAG, abcbus_intf, abcbus_cards, "fast") + MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("fast", abc830_fast) // internal ram MCFG_RAM_ADD(RAM_TAG) @@ -1251,12 +1252,13 @@ static MACHINE_CONFIG_START( abc800m, abc800m_state ) MCFG_Z80SIO2_ADD(Z80SIO_TAG, ABC800_X01/2/2, sio_intf) MCFG_Z80DART_ADD(Z80DART_TAG, ABC800_X01/2/2, abc800_dart_intf) MCFG_CASSETTE_ADD("cassette", cass_intf) - MCFG_RS232_PORT_ADD(RS232_A_TAG, rs232a_intf, default_rs232_devices, NULL, NULL) - MCFG_RS232_PORT_ADD(RS232_B_TAG, rs232b_intf, default_rs232_devices, NULL, NULL) + MCFG_RS232_PORT_ADD(RS232_A_TAG, rs232a_intf, default_rs232_devices, NULL) + MCFG_RS232_PORT_ADD(RS232_B_TAG, rs232b_intf, default_rs232_devices, NULL) MCFG_ABC800_KEYBOARD_ADD(abc800_kb_intf) // ABC bus - MCFG_ABCBUS_SLOT_ADD(ABCBUS_TAG, abcbus_intf, abcbus_cards, "fast", abc830_fast) + MCFG_ABCBUS_SLOT_ADD(ABCBUS_TAG, abcbus_intf, abcbus_cards, "fast") + MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("fast", abc830_fast) // internal ram MCFG_RAM_ADD(RAM_TAG) @@ -1293,12 +1295,13 @@ static MACHINE_CONFIG_START( abc802, abc802_state ) MCFG_Z80SIO2_ADD(Z80SIO_TAG, ABC800_X01/2/2, sio_intf) MCFG_Z80DART_ADD(Z80DART_TAG, ABC800_X01/2/2, abc802_dart_intf) MCFG_CASSETTE_ADD("cassette", cass_intf) - MCFG_RS232_PORT_ADD(RS232_A_TAG, rs232a_intf, default_rs232_devices, NULL, NULL) - MCFG_RS232_PORT_ADD(RS232_B_TAG, rs232b_intf, default_rs232_devices, NULL, NULL) + MCFG_RS232_PORT_ADD(RS232_A_TAG, rs232a_intf, default_rs232_devices, NULL) + MCFG_RS232_PORT_ADD(RS232_B_TAG, rs232b_intf, default_rs232_devices, NULL) MCFG_ABC55_ADD(kb_intf) // ABC bus - MCFG_ABCBUS_SLOT_ADD(ABCBUS_TAG, abcbus_intf, abcbus_cards, "fast", abc834_fast) + MCFG_ABCBUS_SLOT_ADD(ABCBUS_TAG, abcbus_intf, abcbus_cards, "fast") + MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("fast", abc834_fast) // internal ram MCFG_RAM_ADD(RAM_TAG) @@ -1325,12 +1328,13 @@ static MACHINE_CONFIG_START( abc806, abc806_state ) MCFG_Z80CTC_ADD(Z80CTC_TAG, ABC800_X01/2/2, ctc_intf) MCFG_Z80SIO2_ADD(Z80SIO_TAG, ABC800_X01/2/2, sio_intf) MCFG_Z80DART_ADD(Z80DART_TAG, ABC800_X01/2/2, abc806_dart_intf) - MCFG_RS232_PORT_ADD(RS232_A_TAG, rs232a_intf, default_rs232_devices, NULL, NULL) - MCFG_RS232_PORT_ADD(RS232_B_TAG, rs232b_intf, default_rs232_devices, NULL, NULL) + MCFG_RS232_PORT_ADD(RS232_A_TAG, rs232a_intf, default_rs232_devices, NULL) + MCFG_RS232_PORT_ADD(RS232_B_TAG, rs232b_intf, default_rs232_devices, NULL) MCFG_ABC77_ADD(kb_intf) // ABC bus - MCFG_ABCBUS_SLOT_ADD(ABCBUS_TAG, abcbus_intf, abcbus_cards, "fast", abc832_fast) + MCFG_ABCBUS_SLOT_ADD(ABCBUS_TAG, abcbus_intf, abcbus_cards, "fast") + MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("fast", abc832_fast) // internal ram MCFG_RAM_ADD(RAM_TAG) diff --git a/src/mess/drivers/adam.c b/src/mess/drivers/adam.c index 020b60d08c9..d9e3de55647 100644 --- a/src/mess/drivers/adam.c +++ b/src/mess/drivers/adam.c @@ -1139,30 +1139,30 @@ static MACHINE_CONFIG_START( adam, adam_state ) MCFG_TIMER_DRIVER_ADD_PERIODIC("paddles", adam_state, paddle_tick, attotime::from_msec(20)) MCFG_ADAMNET_BUS_ADD() - MCFG_ADAMNET_SLOT_ADD("net1", adamnet_devices, "kb", NULL) - MCFG_ADAMNET_SLOT_ADD("net2", adamnet_devices, "prn", NULL) - MCFG_ADAMNET_SLOT_ADD("net3", adamnet_devices, "ddp", NULL) - MCFG_ADAMNET_SLOT_ADD("net4", adamnet_devices, "fdc", NULL) - MCFG_ADAMNET_SLOT_ADD("net5", adamnet_devices, NULL, NULL) - MCFG_ADAMNET_SLOT_ADD("net6", adamnet_devices, NULL, NULL) - MCFG_ADAMNET_SLOT_ADD("net7", adamnet_devices, NULL, NULL) - MCFG_ADAMNET_SLOT_ADD("net8", adamnet_devices, NULL, NULL) - MCFG_ADAMNET_SLOT_ADD("net9", adamnet_devices, NULL, NULL) - MCFG_ADAMNET_SLOT_ADD("net10", adamnet_devices, NULL, NULL) - MCFG_ADAMNET_SLOT_ADD("net11", adamnet_devices, NULL, NULL) - MCFG_ADAMNET_SLOT_ADD("net12", adamnet_devices, NULL, NULL) - MCFG_ADAMNET_SLOT_ADD("net13", adamnet_devices, NULL, NULL) - MCFG_ADAMNET_SLOT_ADD("net14", adamnet_devices, NULL, NULL) - MCFG_ADAMNET_SLOT_ADD("net15", adamnet_devices, NULL, NULL) + MCFG_ADAMNET_SLOT_ADD("net1", adamnet_devices, "kb") + MCFG_ADAMNET_SLOT_ADD("net2", adamnet_devices, "prn") + MCFG_ADAMNET_SLOT_ADD("net3", adamnet_devices, "ddp") + MCFG_ADAMNET_SLOT_ADD("net4", adamnet_devices, "fdc") + MCFG_ADAMNET_SLOT_ADD("net5", adamnet_devices, NULL) + MCFG_ADAMNET_SLOT_ADD("net6", adamnet_devices, NULL) + MCFG_ADAMNET_SLOT_ADD("net7", adamnet_devices, NULL) + MCFG_ADAMNET_SLOT_ADD("net8", adamnet_devices, NULL) + MCFG_ADAMNET_SLOT_ADD("net9", adamnet_devices, NULL) + MCFG_ADAMNET_SLOT_ADD("net10", adamnet_devices, NULL) + MCFG_ADAMNET_SLOT_ADD("net11", adamnet_devices, NULL) + MCFG_ADAMNET_SLOT_ADD("net12", adamnet_devices, NULL) + MCFG_ADAMNET_SLOT_ADD("net13", adamnet_devices, NULL) + MCFG_ADAMNET_SLOT_ADD("net14", adamnet_devices, NULL) + MCFG_ADAMNET_SLOT_ADD("net15", adamnet_devices, NULL) MCFG_CARTSLOT_ADD("cart") MCFG_CARTSLOT_EXTENSION_LIST("rom,col,bin") MCFG_CARTSLOT_NOT_MANDATORY MCFG_CARTSLOT_INTERFACE("coleco_cart") - MCFG_ADAM_EXPANSION_SLOT_ADD(ADAM_LEFT_EXPANSION_SLOT_TAG, XTAL_7_15909MHz/2, slot1_intf, adam_slot1_devices, "adamlink", NULL) - MCFG_ADAM_EXPANSION_SLOT_ADD(ADAM_CENTER_EXPANSION_SLOT_TAG, XTAL_7_15909MHz/2, slot2_intf, adam_slot2_devices, NULL, NULL) - MCFG_ADAM_EXPANSION_SLOT_ADD(ADAM_RIGHT_EXPANSION_SLOT_TAG, XTAL_7_15909MHz/2, slot3_intf, adam_slot3_devices, "ram", NULL) + MCFG_ADAM_EXPANSION_SLOT_ADD(ADAM_LEFT_EXPANSION_SLOT_TAG, XTAL_7_15909MHz/2, slot1_intf, adam_slot1_devices, "adamlink") + MCFG_ADAM_EXPANSION_SLOT_ADD(ADAM_CENTER_EXPANSION_SLOT_TAG, XTAL_7_15909MHz/2, slot2_intf, adam_slot2_devices, NULL) + MCFG_ADAM_EXPANSION_SLOT_ADD(ADAM_RIGHT_EXPANSION_SLOT_TAG, XTAL_7_15909MHz/2, slot3_intf, adam_slot3_devices, "ram") // internal ram MCFG_RAM_ADD(RAM_TAG) diff --git a/src/mess/drivers/amiga.c b/src/mess/drivers/amiga.c index 87bdac944f4..b1e6c8b766a 100644 --- a/src/mess/drivers/amiga.c +++ b/src/mess/drivers/amiga.c @@ -678,10 +678,10 @@ static MACHINE_CONFIG_START( ntsc, amiga_state ) /* fdc */ MCFG_AMIGA_FDC_ADD("fdc", AMIGA_68000_NTSC_CLOCK) - MCFG_FLOPPY_DRIVE_ADD("fdc:0", amiga_floppies, "35dd", 0, amiga_fdc::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fdc:1", amiga_floppies, 0, 0, amiga_fdc::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fdc:2", amiga_floppies, 0, 0, amiga_fdc::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fdc:3", amiga_floppies, 0, 0, amiga_fdc::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:0", amiga_floppies, "35dd", amiga_fdc::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:1", amiga_floppies, 0, amiga_fdc::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:2", amiga_floppies, 0, amiga_fdc::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:3", amiga_floppies, 0, amiga_fdc::floppy_formats) MCFG_AMIGA_KEYBOARD_ADD("kbd") MACHINE_CONFIG_END @@ -879,10 +879,10 @@ static MACHINE_CONFIG_START( a1200n, a1200_state ) /* fdc */ MCFG_AMIGA_FDC_ADD("fdc", AMIGA_68EC020_NTSC_CLOCK / 2) - MCFG_FLOPPY_DRIVE_ADD("fdc:0", amiga_floppies, "35dd", 0, amiga_fdc::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fdc:1", amiga_floppies, 0, 0, amiga_fdc::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fdc:2", amiga_floppies, 0, 0, amiga_fdc::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fdc:3", amiga_floppies, 0, 0, amiga_fdc::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:0", amiga_floppies, "35dd", amiga_fdc::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:1", amiga_floppies, 0, amiga_fdc::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:2", amiga_floppies, 0, amiga_fdc::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:3", amiga_floppies, 0, amiga_fdc::floppy_formats) MCFG_AMIGA_KEYBOARD_ADD("kbd") @@ -980,10 +980,10 @@ static MACHINE_CONFIG_START( a3000n, amiga_state ) /* fdc */ MCFG_AMIGA_FDC_ADD("fdc", AMIGA_68000_NTSC_CLOCK) - MCFG_FLOPPY_DRIVE_ADD("fdc:0", amiga_floppies, "35dd", 0, amiga_fdc::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fdc:1", amiga_floppies, 0, 0, amiga_fdc::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fdc:2", amiga_floppies, 0, 0, amiga_fdc::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fdc:3", amiga_floppies, 0, 0, amiga_fdc::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:0", amiga_floppies, "35dd", amiga_fdc::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:1", amiga_floppies, 0, amiga_fdc::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:2", amiga_floppies, 0, amiga_fdc::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:3", amiga_floppies, 0, amiga_fdc::floppy_formats) MCFG_AMIGA_KEYBOARD_ADD("kbd") diff --git a/src/mess/drivers/amstr_pc.c b/src/mess/drivers/amstr_pc.c index d2d7d715829..20037e45bd2 100644 --- a/src/mess/drivers/amstr_pc.c +++ b/src/mess/drivers/amstr_pc.c @@ -276,10 +276,10 @@ static MACHINE_CONFIG_START( pc200, amstrad_pc_state ) MCFG_INS8250_ADD( "ins8250_1", ibm5150_com_interface[1], XTAL_1_8432MHz ) /* TODO: Verify model */ MCFG_INS8250_ADD( "ins8250_2", ibm5150_com_interface[2], XTAL_1_8432MHz ) /* TODO: Verify model */ MCFG_INS8250_ADD( "ins8250_3", ibm5150_com_interface[3], XTAL_1_8432MHz ) /* TODO: Verify model */ - MCFG_RS232_PORT_ADD( "serport0", ibm5150_serport_config[0], amstr_com, NULL, NULL ) - MCFG_RS232_PORT_ADD( "serport1", ibm5150_serport_config[1], amstr_com, NULL, NULL ) - MCFG_RS232_PORT_ADD( "serport2", ibm5150_serport_config[2], amstr_com, NULL, NULL ) - MCFG_RS232_PORT_ADD( "serport3", ibm5150_serport_config[3], amstr_com, NULL, NULL ) + MCFG_RS232_PORT_ADD( "serport0", ibm5150_serport_config[0], amstr_com, NULL ) + MCFG_RS232_PORT_ADD( "serport1", ibm5150_serport_config[1], amstr_com, NULL ) + MCFG_RS232_PORT_ADD( "serport2", ibm5150_serport_config[2], amstr_com, NULL ) + MCFG_RS232_PORT_ADD( "serport3", ibm5150_serport_config[3], amstr_com, NULL ) /* video hardware */ MCFG_FRAGMENT_ADD( pcvideo_pc200 ) @@ -299,8 +299,8 @@ static MACHINE_CONFIG_START( pc200, amstrad_pc_state ) MCFG_PC_JOY_ADD("pc_joy") - MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "525dd", 0, ibmpc_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fdc:1", ibmpc_floppies, "525dd", 0, ibmpc_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "525dd", ibmpc_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:1", ibmpc_floppies, "525dd", ibmpc_floppy_formats) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) @@ -349,10 +349,10 @@ static MACHINE_CONFIG_START( ppc512, amstrad_pc_state ) MCFG_INS8250_ADD( "ins8250_1", ibm5150_com_interface[1], XTAL_1_8432MHz ) /* TODO: Verify model */ MCFG_INS8250_ADD( "ins8250_2", ibm5150_com_interface[2], XTAL_1_8432MHz ) /* TODO: Verify model */ MCFG_INS8250_ADD( "ins8250_3", ibm5150_com_interface[3], XTAL_1_8432MHz ) /* TODO: Verify model */ - MCFG_RS232_PORT_ADD( "serport0", ibm5150_serport_config[0], amstr_com, NULL, NULL ) - MCFG_RS232_PORT_ADD( "serport1", ibm5150_serport_config[1], amstr_com, NULL, NULL ) - MCFG_RS232_PORT_ADD( "serport2", ibm5150_serport_config[2], amstr_com, NULL, NULL ) - MCFG_RS232_PORT_ADD( "serport3", ibm5150_serport_config[3], amstr_com, NULL, NULL ) + MCFG_RS232_PORT_ADD( "serport0", ibm5150_serport_config[0], amstr_com, NULL ) + MCFG_RS232_PORT_ADD( "serport1", ibm5150_serport_config[1], amstr_com, NULL ) + MCFG_RS232_PORT_ADD( "serport2", ibm5150_serport_config[2], amstr_com, NULL ) + MCFG_RS232_PORT_ADD( "serport3", ibm5150_serport_config[3], amstr_com, NULL ) /* video hardware */ MCFG_FRAGMENT_ADD( pcvideo_pc200 ) @@ -372,8 +372,8 @@ static MACHINE_CONFIG_START( ppc512, amstrad_pc_state ) MCFG_PC_JOY_ADD("pc_joy") - MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "525dd", 0, ibmpc_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fdc:1", ibmpc_floppies, "525dd", 0, ibmpc_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "525dd", ibmpc_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:1", ibmpc_floppies, "525dd", ibmpc_floppy_formats) MCFG_MC146818_ADD( "rtc", MC146818_IGNORE_CENTURY ) diff --git a/src/mess/drivers/amstrad.c b/src/mess/drivers/amstrad.c index 5656e141a9f..e1297aaf021 100644 --- a/src/mess/drivers/amstrad.c +++ b/src/mess/drivers/amstrad.c @@ -877,7 +877,7 @@ static MACHINE_CONFIG_START( amstrad_nofdc, amstrad_state ) MCFG_CASSETTE_ADD( "cassette", amstrad_cassette_interface ) MCFG_SOFTWARE_LIST_ADD("cass_list","cpc_cass") - MCFG_CPC_EXPANSION_SLOT_ADD("exp",cpc_exp_intf,cpc_exp_cards,NULL,NULL) + MCFG_CPC_EXPANSION_SLOT_ADD("exp",cpc_exp_intf,cpc_exp_cards,NULL) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) @@ -891,8 +891,8 @@ FLOPPY_FORMATS_END static MACHINE_CONFIG_DERIVED( amstrad, amstrad_nofdc ) MCFG_UPD765A_ADD("upd765", true, true) - MCFG_FLOPPY_DRIVE_ADD("upd765:0", amstrad_floppies, "3ssdd", 0, amstrad_state::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("upd765:1", amstrad_floppies, "3ssdd", 0, amstrad_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765:0", amstrad_floppies, "3ssdd", amstrad_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765:1", amstrad_floppies, "3ssdd", amstrad_state::floppy_formats) MCFG_SOFTWARE_LIST_ADD("flop_list","cpc_flop") MACHINE_CONFIG_END @@ -954,10 +954,10 @@ static MACHINE_CONFIG_START( cpcplus, amstrad_state ) MCFG_FRAGMENT_ADD(cpcplus_cartslot) - MCFG_FLOPPY_DRIVE_ADD("upd765:0", amstrad_floppies, "3ssdd", 0, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("upd765:1", amstrad_floppies, "3ssdd", 0, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765:0", amstrad_floppies, "3ssdd", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765:1", amstrad_floppies, "3ssdd", floppy_image_device::default_floppy_formats) - MCFG_CPC_EXPANSION_SLOT_ADD("exp",cpc_exp_intf,cpc_exp_cards,NULL,NULL) + MCFG_CPC_EXPANSION_SLOT_ADD("exp",cpc_exp_intf,cpc_exp_cards,NULL) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) @@ -1021,8 +1021,8 @@ static MACHINE_CONFIG_DERIVED( aleste, amstrad ) MCFG_DEVICE_REMOVE("upd765") MCFG_I8272A_ADD("upd765", true) - MCFG_FLOPPY_DRIVE_ADD("upd765:0", aleste_floppies, "525hd", 0, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("upd765:1", aleste_floppies, "525hd", 0, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765:0", aleste_floppies, "525hd", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765:1", aleste_floppies, "525hd", floppy_image_device::default_floppy_formats) /* internal ram */ MCFG_RAM_MODIFY(RAM_TAG) diff --git a/src/mess/drivers/apc.c b/src/mess/drivers/apc.c index 3fb2962eb96..970ce57263c 100644 --- a/src/mess/drivers/apc.c +++ b/src/mess/drivers/apc.c @@ -1024,8 +1024,8 @@ static MACHINE_CONFIG_START( apc, apc_state ) MCFG_UPD1990A_ADD("upd1990a", XTAL_32_768kHz, apc_upd1990a_intf) MCFG_UPD765A_ADD("upd765", true, true) - MCFG_FLOPPY_DRIVE_ADD("upd765:0", apc_floppies, "8", 0, apc_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("upd765:1", apc_floppies, "8", 0, apc_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765:0", apc_floppies, "8", apc_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765:1", apc_floppies, "8", apc_floppy_formats) MCFG_SOFTWARE_LIST_ADD("disk_list","apc") /* video hardware */ diff --git a/src/mess/drivers/apple2.c b/src/mess/drivers/apple2.c index 1043d72bdd7..b315ad204cf 100644 --- a/src/mess/drivers/apple2.c +++ b/src/mess/drivers/apple2.c @@ -674,14 +674,14 @@ static MACHINE_CONFIG_START( apple2_common, apple2_state ) /* slot devices */ MCFG_A2BUS_BUS_ADD("a2bus", "maincpu", a2bus_intf) - MCFG_A2BUS_SLOT_ADD("a2bus", "sl0", apple2_slot0_cards, "lang", NULL) - MCFG_A2BUS_SLOT_ADD("a2bus", "sl1", apple2_cards, NULL, NULL) - MCFG_A2BUS_SLOT_ADD("a2bus", "sl2", apple2_cards, NULL, NULL) - MCFG_A2BUS_SLOT_ADD("a2bus", "sl3", apple2_cards, NULL, NULL) - MCFG_A2BUS_SLOT_ADD("a2bus", "sl4", apple2_cards, "mockingboard", NULL) - MCFG_A2BUS_SLOT_ADD("a2bus", "sl5", apple2_cards, NULL, NULL) - MCFG_A2BUS_SLOT_ADD("a2bus", "sl6", apple2_cards, "diskii", NULL) - MCFG_A2BUS_SLOT_ADD("a2bus", "sl7", apple2_cards, NULL, NULL) + MCFG_A2BUS_SLOT_ADD("a2bus", "sl0", apple2_slot0_cards, "lang") + MCFG_A2BUS_SLOT_ADD("a2bus", "sl1", apple2_cards, NULL) + MCFG_A2BUS_SLOT_ADD("a2bus", "sl2", apple2_cards, NULL) + MCFG_A2BUS_SLOT_ADD("a2bus", "sl3", apple2_cards, NULL) + MCFG_A2BUS_SLOT_ADD("a2bus", "sl4", apple2_cards, "mockingboard") + MCFG_A2BUS_SLOT_ADD("a2bus", "sl5", apple2_cards, NULL) + MCFG_A2BUS_SLOT_ADD("a2bus", "sl6", apple2_cards, "diskii") + MCFG_A2BUS_SLOT_ADD("a2bus", "sl7", apple2_cards, NULL) MCFG_SOFTWARE_LIST_ADD("flop525_list","apple2") MACHINE_CONFIG_END @@ -730,7 +730,7 @@ static MACHINE_CONFIG_DERIVED( apple2e, apple2_common ) MCFG_A2BUS_ONBOARD_ADD("a2bus", "sl0", A2BUS_LANG, NULL) MCFG_A2EAUXSLOT_BUS_ADD(AUXSLOT_TAG, "maincpu", a2eauxbus_intf) - MCFG_A2EAUXSLOT_SLOT_ADD(AUXSLOT_TAG, "aux", apple2eaux_cards, "ext80", NULL) // default to an extended 80-column card + MCFG_A2EAUXSLOT_SLOT_ADD(AUXSLOT_TAG, "aux", apple2eaux_cards, "ext80") // default to an extended 80-column card MACHINE_CONFIG_END diff --git a/src/mess/drivers/apple2gs.c b/src/mess/drivers/apple2gs.c index cb6ba3176d7..8f736f38bdc 100644 --- a/src/mess/drivers/apple2gs.c +++ b/src/mess/drivers/apple2gs.c @@ -360,13 +360,13 @@ static MACHINE_CONFIG_START( apple2gs, apple2gs_state ) /* slot devices */ MCFG_A2BUS_BUS_ADD("a2bus", "maincpu", a2bus_intf) MCFG_A2BUS_ONBOARD_ADD("a2bus", "sl0", A2BUS_LANG, NULL) - MCFG_A2BUS_SLOT_ADD("a2bus", "sl1", apple2_cards, NULL, NULL) - MCFG_A2BUS_SLOT_ADD("a2bus", "sl2", apple2_cards, NULL, NULL) - MCFG_A2BUS_SLOT_ADD("a2bus", "sl3", apple2_cards, NULL, NULL) - MCFG_A2BUS_SLOT_ADD("a2bus", "sl4", apple2_cards, NULL, NULL) - MCFG_A2BUS_SLOT_ADD("a2bus", "sl5", apple2_cards, NULL, NULL) - MCFG_A2BUS_SLOT_ADD("a2bus", "sl6", apple2_cards, NULL, NULL) - MCFG_A2BUS_SLOT_ADD("a2bus", "sl7", apple2_cards, NULL, NULL) + MCFG_A2BUS_SLOT_ADD("a2bus", "sl1", apple2_cards, NULL) + MCFG_A2BUS_SLOT_ADD("a2bus", "sl2", apple2_cards, NULL) + MCFG_A2BUS_SLOT_ADD("a2bus", "sl3", apple2_cards, NULL) + MCFG_A2BUS_SLOT_ADD("a2bus", "sl4", apple2_cards, NULL) + MCFG_A2BUS_SLOT_ADD("a2bus", "sl5", apple2_cards, NULL) + MCFG_A2BUS_SLOT_ADD("a2bus", "sl6", apple2_cards, NULL) + MCFG_A2BUS_SLOT_ADD("a2bus", "sl7", apple2_cards, NULL) MCFG_IWM_ADD("fdc", apple2_fdc_interface) diff --git a/src/mess/drivers/apricotp.c b/src/mess/drivers/apricotp.c index 6234524b28e..eeed9546ee1 100644 --- a/src/mess/drivers/apricotp.c +++ b/src/mess/drivers/apricotp.c @@ -656,8 +656,8 @@ static MACHINE_CONFIG_START( fp, fp_state ) MCFG_PIT8253_ADD(I8253A5_TAG, pit_intf) MCFG_Z80SIO0_ADD(Z80SIO0_TAG, 2500000, sio_intf) MCFG_WD2797x_ADD(WD2797_TAG, 2000000) - MCFG_FLOPPY_DRIVE_ADD(WD2797_TAG":0", fp_floppies, "35dd", NULL, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(WD2797_TAG":1", fp_floppies, NULL, NULL, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(WD2797_TAG":0", fp_floppies, "35dd", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(WD2797_TAG":1", fp_floppies, NULL, floppy_image_device::default_floppy_formats) MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, centronics_intf) /* internal ram */ diff --git a/src/mess/drivers/at.c b/src/mess/drivers/at.c index 725ecf82789..cf915ca562e 100644 --- a/src/mess/drivers/at.c +++ b/src/mess/drivers/at.c @@ -385,7 +385,7 @@ static MACHINE_CONFIG_FRAGMENT( at_motherboard ) MCFG_AT_KEYBOARD_CONTROLLER_ADD("keybc", XTAL_12MHz, keyboard_controller_intf) MCFG_PC_KBDC_ADD("pc_kbdc", pc_kbdc_intf) - MCFG_PC_KBDC_SLOT_ADD("pc_kbdc", "kbd", pc_at_keyboards, STR_KBD_MICROSOFT_NATURAL, NULL) + MCFG_PC_KBDC_SLOT_ADD("pc_kbdc", "kbd", pc_at_keyboards, STR_KBD_MICROSOFT_NATURAL) MCFG_MC146818_IRQ_ADD( "rtc", MC146818_STANDARD, at_mc146818_config ) @@ -409,10 +409,10 @@ static MACHINE_CONFIG_START( ibm5170, at_state ) MCFG_FRAGMENT_ADD( at_motherboard ) MCFG_ISA16_BUS_ADD("isabus", ":maincpu", isabus_intf) - MCFG_ISA16_SLOT_ADD("isabus","isa1", pc_isa16_cards, "ega", NULL, false) - MCFG_ISA16_SLOT_ADD("isabus","isa2", pc_isa16_cards, "fdc", NULL, false) - MCFG_ISA16_SLOT_ADD("isabus","isa3", pc_isa16_cards, "comat", NULL, false) - MCFG_ISA16_SLOT_ADD("isabus","isa4", pc_isa16_cards, "ide", NULL, false) + MCFG_ISA16_SLOT_ADD("isabus","isa1", pc_isa16_cards, "ega", false) + MCFG_ISA16_SLOT_ADD("isabus","isa2", pc_isa16_cards, "fdc", false) + MCFG_ISA16_SLOT_ADD("isabus","isa3", pc_isa16_cards, "comat", false) + MCFG_ISA16_SLOT_ADD("isabus","isa4", pc_isa16_cards, "ide", false) /* software lists */ MCFG_SOFTWARE_LIST_ADD("disk_list","ibm5170") @@ -446,10 +446,10 @@ static MACHINE_CONFIG_START( ibm5162, at_state ) MCFG_FRAGMENT_ADD( at_motherboard ) MCFG_ISA16_BUS_ADD("isabus", ":maincpu", isabus_intf) - MCFG_ISA16_SLOT_ADD("isabus","isa1", pc_isa16_cards, "fdc", NULL, false) - MCFG_ISA16_SLOT_ADD("isabus","isa2", pc_isa16_cards, "ide", NULL, false) - MCFG_ISA16_SLOT_ADD("isabus","isa3", pc_isa16_cards, "comat", NULL, false) - MCFG_ISA16_SLOT_ADD("isabus","isa4", pc_isa16_cards, "cga", NULL, false) + MCFG_ISA16_SLOT_ADD("isabus","isa1", pc_isa16_cards, "fdc", false) + MCFG_ISA16_SLOT_ADD("isabus","isa2", pc_isa16_cards, "ide", false) + MCFG_ISA16_SLOT_ADD("isabus","isa3", pc_isa16_cards, "comat", false) + MCFG_ISA16_SLOT_ADD("isabus","isa4", pc_isa16_cards, "cga", false) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) @@ -468,10 +468,10 @@ static MACHINE_CONFIG_START( ps2m30286, at_state ) MCFG_FRAGMENT_ADD( at_motherboard ) MCFG_ISA16_BUS_ADD("isabus", ":maincpu", isabus_intf) - MCFG_ISA16_SLOT_ADD("isabus","isa1", pc_isa16_cards, "fdc", NULL, false) - MCFG_ISA16_SLOT_ADD("isabus","isa2", pc_isa16_cards, "ide", NULL, false) - MCFG_ISA16_SLOT_ADD("isabus","isa3", pc_isa16_cards, "comat", NULL, false) - MCFG_ISA16_SLOT_ADD("isabus","isa4", pc_isa16_cards, "svga_et4k", NULL, false) + MCFG_ISA16_SLOT_ADD("isabus","isa1", pc_isa16_cards, "fdc", false) + MCFG_ISA16_SLOT_ADD("isabus","isa2", pc_isa16_cards, "ide", false) + MCFG_ISA16_SLOT_ADD("isabus","isa3", pc_isa16_cards, "comat", false) + MCFG_ISA16_SLOT_ADD("isabus","isa4", pc_isa16_cards, "svga_et4k", false) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) @@ -490,10 +490,10 @@ static MACHINE_CONFIG_START( neat, at_state ) MCFG_FRAGMENT_ADD( at_motherboard ) MCFG_ISA16_BUS_ADD("isabus", ":maincpu", isabus_intf) - MCFG_ISA16_SLOT_ADD("isabus", "isa1", pc_isa16_cards, "fdc", NULL, false) - MCFG_ISA16_SLOT_ADD("isabus", "isa2", pc_isa16_cards, "ide", NULL, false) - MCFG_ISA16_SLOT_ADD("isabus", "isa3", pc_isa16_cards, "comat", NULL, false) - MCFG_ISA16_SLOT_ADD("isabus","isa4", pc_isa16_cards, "svga_et4k", NULL, false) + MCFG_ISA16_SLOT_ADD("isabus", "isa1", pc_isa16_cards, "fdc", false) + MCFG_ISA16_SLOT_ADD("isabus", "isa2", pc_isa16_cards, "ide", false) + MCFG_ISA16_SLOT_ADD("isabus", "isa3", pc_isa16_cards, "comat", false) + MCFG_ISA16_SLOT_ADD("isabus","isa4", pc_isa16_cards, "svga_et4k", false) MCFG_CS8221_ADD("cs8221", "maincpu", "isa", "bios") @@ -513,11 +513,11 @@ static MACHINE_CONFIG_START( atvga, at_state ) MCFG_FRAGMENT_ADD( at_motherboard ) MCFG_ISA16_BUS_ADD("isabus", ":maincpu", isabus_intf) - MCFG_ISA16_SLOT_ADD("isabus","isa1", pc_isa16_cards, "fdcsmc", NULL, false) - MCFG_ISA16_SLOT_ADD("isabus","isa2", pc_isa16_cards, "ide", NULL, false) - MCFG_ISA16_SLOT_ADD("isabus","isa3", pc_isa16_cards, "comat", NULL, false) - MCFG_ISA16_SLOT_ADD("isabus","isa4", pc_isa16_cards, "ne2000", NULL, false) - MCFG_ISA16_SLOT_ADD("isabus","isa5", pc_isa16_cards, "svga_et4k", NULL, false) + MCFG_ISA16_SLOT_ADD("isabus","isa1", pc_isa16_cards, "fdcsmc", false) + MCFG_ISA16_SLOT_ADD("isabus","isa2", pc_isa16_cards, "ide", false) + MCFG_ISA16_SLOT_ADD("isabus","isa3", pc_isa16_cards, "comat", false) + MCFG_ISA16_SLOT_ADD("isabus","isa4", pc_isa16_cards, "ne2000", false) + MCFG_ISA16_SLOT_ADD("isabus","isa5", pc_isa16_cards, "svga_et4k", false) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) @@ -535,10 +535,10 @@ static MACHINE_CONFIG_START( xb42639, at_state ) MCFG_FRAGMENT_ADD( at_motherboard ) MCFG_ISA16_BUS_ADD("isabus", ":maincpu", isabus_intf) - MCFG_ISA16_SLOT_ADD("isabus","isa1", pc_isa16_cards, "fdc", NULL, false) - MCFG_ISA16_SLOT_ADD("isabus","isa2", pc_isa16_cards, "ide", NULL, false) - MCFG_ISA16_SLOT_ADD("isabus","isa3", pc_isa16_cards, "comat", NULL, false) - MCFG_ISA16_SLOT_ADD("isabus","isa4", pc_isa16_cards, "svga_et4k", NULL, false) + MCFG_ISA16_SLOT_ADD("isabus","isa1", pc_isa16_cards, "fdc", false) + MCFG_ISA16_SLOT_ADD("isabus","isa2", pc_isa16_cards, "ide", false) + MCFG_ISA16_SLOT_ADD("isabus","isa3", pc_isa16_cards, "comat", false) + MCFG_ISA16_SLOT_ADD("isabus","isa4", pc_isa16_cards, "svga_et4k", false) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) @@ -564,16 +564,17 @@ static MACHINE_CONFIG_START( at386, at_state ) MCFG_ISA16_BUS_ADD("isabus", ":maincpu", isabus_intf) // on board devices - MCFG_ISA16_SLOT_ADD("isabus","board1", pc_isa16_cards, "fdcsmc", NULL, true) - MCFG_ISA16_SLOT_ADD("isabus","board2", pc_isa16_cards, "comat", NULL, true) - MCFG_ISA16_SLOT_ADD("isabus","board3", pc_isa16_cards, "ide", NULL, true) - MCFG_ISA16_SLOT_ADD("isabus","board4", pc_isa16_cards, "lpt", NULL, true) + MCFG_ISA16_SLOT_ADD("isabus","board1", pc_isa16_cards, "fdcsmc", true) + MCFG_ISA16_SLOT_ADD("isabus","board2", pc_isa16_cards, "comat", true) + MCFG_ISA16_SLOT_ADD("isabus","board3", pc_isa16_cards, "ide", true) + MCFG_ISA16_SLOT_ADD("isabus","board4", pc_isa16_cards, "lpt", true) // ISA cards - MCFG_ISA16_SLOT_ADD("isabus","isa1", pc_isa16_cards, "svga_et4k", NULL, false) - MCFG_ISA16_SLOT_ADD("isabus","isa2", pc_isa16_cards, NULL, NULL, false) - MCFG_ISA16_SLOT_ADD("isabus","isa3", pc_isa16_cards, NULL, NULL, false) - MCFG_ISA16_SLOT_ADD("isabus","isa4", pc_isa16_cards, NULL, NULL, false) - MCFG_ISA16_SLOT_ADD("isabus","isa5", pc_isa16_cards, "ide_cd", ide_2nd, false) //2nd-ary IDE + MCFG_ISA16_SLOT_ADD("isabus","isa1", pc_isa16_cards, "svga_et4k", false) + MCFG_ISA16_SLOT_ADD("isabus","isa2", pc_isa16_cards, NULL, false) + MCFG_ISA16_SLOT_ADD("isabus","isa3", pc_isa16_cards, NULL, false) + MCFG_ISA16_SLOT_ADD("isabus","isa4", pc_isa16_cards, NULL, false) + MCFG_ISA16_SLOT_ADD("isabus","isa5", pc_isa16_cards, "ide_cd", false) //2nd-ary IDE + MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("ide_cd", ide_2nd) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) @@ -615,14 +616,14 @@ static MACHINE_CONFIG_START( k286i, at_state ) MCFG_FRAGMENT_ADD( at_motherboard ) MCFG_ISA16_BUS_ADD("isabus", ":maincpu", isabus_intf) - MCFG_ISA16_SLOT_ADD("isabus","isa1", pc_isa16_cards, "cga", NULL, false) - MCFG_ISA16_SLOT_ADD("isabus","isa2", pc_isa16_cards, "fdc", NULL, false) - MCFG_ISA16_SLOT_ADD("isabus","isa3", pc_isa16_cards, "comat", NULL, false) - MCFG_ISA16_SLOT_ADD("isabus","isa4", pc_isa16_cards, NULL, NULL, false) - MCFG_ISA16_SLOT_ADD("isabus","isa5", pc_isa16_cards, NULL, NULL, false) - MCFG_ISA16_SLOT_ADD("isabus","isa6", pc_isa16_cards, NULL, NULL, false) - MCFG_ISA16_SLOT_ADD("isabus","isa7", pc_isa16_cards, NULL, NULL, false) - MCFG_ISA16_SLOT_ADD("isabus","isa8", pc_isa16_cards, NULL, NULL, false) + MCFG_ISA16_SLOT_ADD("isabus","isa1", pc_isa16_cards, "cga", false) + MCFG_ISA16_SLOT_ADD("isabus","isa2", pc_isa16_cards, "fdc", false) + MCFG_ISA16_SLOT_ADD("isabus","isa3", pc_isa16_cards, "comat", false) + MCFG_ISA16_SLOT_ADD("isabus","isa4", pc_isa16_cards, NULL, false) + MCFG_ISA16_SLOT_ADD("isabus","isa5", pc_isa16_cards, NULL, false) + MCFG_ISA16_SLOT_ADD("isabus","isa6", pc_isa16_cards, NULL, false) + MCFG_ISA16_SLOT_ADD("isabus","isa7", pc_isa16_cards, NULL, false) + MCFG_ISA16_SLOT_ADD("isabus","isa8", pc_isa16_cards, NULL, false) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) @@ -654,14 +655,17 @@ static MACHINE_CONFIG_START( at586, at586_state ) MCFG_RAM_EXTRA_OPTIONS("1M,2M,8M,16M,32M,64M,128M,256M") MCFG_PCI_BUS_ADD("pcibus", 0) - MCFG_PCI_BUS_DEVICE("pcibus:0", pci_devices, "i82439tx", NULL, &tx_config, 0, true) - MCFG_PCI_BUS_DEVICE("pcibus:1", pci_devices, "i82371ab", NULL, NULL, 0, true) + MCFG_PCI_BUS_DEVICE("pcibus:0", pci_devices, "i82439tx", true) + MCFG_DEVICE_CARD_CONFIG("i82439tx", &tx_config) - MCFG_ISA16_SLOT_ADD(":pcibus:1:i82371ab:isabus","isa1", pc_isa16_cards, "svga_et4k", NULL, false) - MCFG_ISA16_SLOT_ADD(":pcibus:1:i82371ab:isabus","isa2", pc_isa16_cards, NULL, NULL, false) - MCFG_ISA16_SLOT_ADD(":pcibus:1:i82371ab:isabus","isa3", pc_isa16_cards, NULL, NULL, false) - MCFG_ISA16_SLOT_ADD(":pcibus:1:i82371ab:isabus","isa4", pc_isa16_cards, NULL, NULL, false) - MCFG_ISA16_SLOT_ADD(":pcibus:1:i82371ab:isabus","isa5", pc_isa16_cards, "ide_cd", ide_2nd, false) //2nd-ary IDE + MCFG_PCI_BUS_DEVICE("pcibus:1", pci_devices, "i82371ab", true) + + MCFG_ISA16_SLOT_ADD(":pcibus:1:i82371ab:isabus","isa1", pc_isa16_cards, "svga_et4k", false) + MCFG_ISA16_SLOT_ADD(":pcibus:1:i82371ab:isabus","isa2", pc_isa16_cards, NULL, false) + MCFG_ISA16_SLOT_ADD(":pcibus:1:i82371ab:isabus","isa3", pc_isa16_cards, NULL, false) + MCFG_ISA16_SLOT_ADD(":pcibus:1:i82371ab:isabus","isa4", pc_isa16_cards, NULL, false) + MCFG_ISA16_SLOT_ADD(":pcibus:1:i82371ab:isabus","isa5", pc_isa16_cards, "ide_cd", false) //2nd-ary IDE + MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("ide_cd", ide_2nd) MACHINE_CONFIG_END static MACHINE_CONFIG_START( at586x3, at586_state ) @@ -674,14 +678,17 @@ static MACHINE_CONFIG_START( at586x3, at586_state ) MCFG_RAM_EXTRA_OPTIONS("1M,2M,8M,16M,32M,64M") MCFG_PCI_BUS_ADD("pcibus", 0) - MCFG_PCI_BUS_DEVICE("pcibus:0", pci_devices, "i82439tx", NULL, &tx_config, 0, true) - MCFG_PCI_BUS_DEVICE("pcibus:1", pci_devices, "i82371sb", NULL, NULL, 0, true) + MCFG_PCI_BUS_DEVICE("pcibus:0", pci_devices, "i82439tx", true) + MCFG_DEVICE_CARD_CONFIG("i82439tx", &tx_config) - MCFG_ISA16_SLOT_ADD(":pcibus:1:i82371sb:isabus","isa1", pc_isa16_cards, "svga_et4k", NULL, false) - MCFG_ISA16_SLOT_ADD(":pcibus:1:i82371sb:isabus","isa2", pc_isa16_cards, NULL, NULL, false) - MCFG_ISA16_SLOT_ADD(":pcibus:1:i82371sb:isabus","isa3", pc_isa16_cards, NULL, NULL, false) - MCFG_ISA16_SLOT_ADD(":pcibus:1:i82371sb:isabus","isa4", pc_isa16_cards, NULL, NULL, false) - MCFG_ISA16_SLOT_ADD(":pcibus:1:i82371sb:isabus","isa5", pc_isa16_cards, "ide_cd", ide_2nd, false) //2nd-ary IDE + MCFG_PCI_BUS_DEVICE("pcibus:1", pci_devices, "i82371sb", true) + + MCFG_ISA16_SLOT_ADD(":pcibus:1:i82371sb:isabus","isa1", pc_isa16_cards, "svga_et4k", false) + MCFG_ISA16_SLOT_ADD(":pcibus:1:i82371sb:isabus","isa2", pc_isa16_cards, NULL, false) + MCFG_ISA16_SLOT_ADD(":pcibus:1:i82371sb:isabus","isa3", pc_isa16_cards, NULL, false) + MCFG_ISA16_SLOT_ADD(":pcibus:1:i82371sb:isabus","isa4", pc_isa16_cards, NULL, false) + MCFG_ISA16_SLOT_ADD(":pcibus:1:i82371sb:isabus","isa5", pc_isa16_cards, "ide_cd", false) //2nd-ary IDE + MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("ide_cd", ide_2nd) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( at386sx, atvga ) diff --git a/src/mess/drivers/atarist.c b/src/mess/drivers/atarist.c index d07a37e1bd4..a9e70159eee 100644 --- a/src/mess/drivers/atarist.c +++ b/src/mess/drivers/atarist.c @@ -2433,13 +2433,13 @@ static MACHINE_CONFIG_START( st, st_state ) MCFG_MC68901_ADD(MC68901_TAG, Y2/8, mfp_intf) MCFG_WD1772x_ADD(WD1772_TAG, Y2/4) - MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":0", atari_floppies, "35dd", 0, st_state::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":1", atari_floppies, 0, 0, st_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":0", atari_floppies, "35dd", st_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":1", atari_floppies, 0, st_state::floppy_formats) MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, centronics_intf) - MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL, NULL) - MCFG_SERIAL_PORT_ADD("mdin", midiin_intf, midiin_slot, "midiin", NULL) - MCFG_SERIAL_PORT_ADD("mdout", midiout_intf, midiout_slot, "midiout", NULL) + MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL) + MCFG_SERIAL_PORT_ADD("mdin", midiin_intf, midiin_slot, "midiin") + MCFG_SERIAL_PORT_ADD("mdout", midiout_intf, midiout_slot, "midiout") // cartridge MCFG_CARTSLOT_ADD("cart") @@ -2489,12 +2489,12 @@ static MACHINE_CONFIG_START( megast, megast_state ) MCFG_ACIA6850_ADD(MC6850_1_TAG, acia_midi_intf) MCFG_MC68901_ADD(MC68901_TAG, Y2/8, mfp_intf) MCFG_WD1772x_ADD(WD1772_TAG, Y2/4) - MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":0", atari_floppies, "35dd", 0, st_state::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":1", atari_floppies, 0, 0, st_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":0", atari_floppies, "35dd", st_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":1", atari_floppies, 0, st_state::floppy_formats) MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, centronics_intf) - MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL, NULL) - MCFG_SERIAL_PORT_ADD("mdin", midiin_intf, midiin_slot, "midiin", NULL) - MCFG_SERIAL_PORT_ADD("mdout", midiout_intf, midiout_slot, "midiout", NULL) + MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL) + MCFG_SERIAL_PORT_ADD("mdin", midiin_intf, midiin_slot, "midiin") + MCFG_SERIAL_PORT_ADD("mdout", midiout_intf, midiout_slot, "midiout") MCFG_RP5C15_ADD(RP5C15_TAG, XTAL_32_768kHz, rtc_intf) // cartridge @@ -2553,12 +2553,12 @@ static MACHINE_CONFIG_START( ste, ste_state ) MCFG_ACIA6850_ADD(MC6850_1_TAG, acia_midi_intf) MCFG_MC68901_ADD(MC68901_TAG, Y2/8, atariste_mfp_intf) MCFG_WD1772x_ADD(WD1772_TAG, Y2/4) - MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":0", atari_floppies, "35dd", 0, st_state::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":1", atari_floppies, 0, 0, st_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":0", atari_floppies, "35dd", st_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":1", atari_floppies, 0, st_state::floppy_formats) MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, centronics_intf) - MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL, NULL) - MCFG_SERIAL_PORT_ADD("mdin", midiin_intf, midiin_slot, "midiin", NULL) - MCFG_SERIAL_PORT_ADD("mdout", midiout_intf, midiout_slot, "midiout", NULL) + MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL) + MCFG_SERIAL_PORT_ADD("mdin", midiin_intf, midiin_slot, "midiin") + MCFG_SERIAL_PORT_ADD("mdout", midiout_intf, midiout_slot, "midiout") // cartridge MCFG_CARTSLOT_ADD("cart") diff --git a/src/mess/drivers/attache.c b/src/mess/drivers/attache.c index b3773936159..ba2629729c5 100644 --- a/src/mess/drivers/attache.c +++ b/src/mess/drivers/attache.c @@ -862,8 +862,8 @@ static MACHINE_CONFIG_START( attache, attache_state ) MCFG_UPD765A_ADD("fdc", true, true) - MCFG_FLOPPY_DRIVE_ADD("fdc:0", attache_floppies, "525dd", 0, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fdc:1", attache_floppies, "525dd", 0, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:0", attache_floppies, "525dd", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:1", attache_floppies, "525dd", floppy_image_device::default_floppy_formats) MCFG_TMS9927_ADD("crtc", 12324000, crtc_interface) diff --git a/src/mess/drivers/avigo.c b/src/mess/drivers/avigo.c index d64f141b483..c4c84e6cade 100644 --- a/src/mess/drivers/avigo.c +++ b/src/mess/drivers/avigo.c @@ -891,7 +891,7 @@ static MACHINE_CONFIG_START( avigo, avigo_state ) MCFG_QUANTUM_TIME(attotime::from_hz(60)) MCFG_NS16550_ADD( "ns16550", avigo_com_interface, XTAL_1_8432MHz ) - MCFG_RS232_PORT_ADD( "serport", avigo_serport_config, avigo_com, NULL, NULL ) + MCFG_RS232_PORT_ADD( "serport", avigo_serport_config, avigo_com, NULL ) /* video hardware */ MCFG_SCREEN_ADD("screen", LCD) diff --git a/src/mess/drivers/b2m.c b/src/mess/drivers/b2m.c index 64782fcaf60..86637fe235f 100644 --- a/src/mess/drivers/b2m.c +++ b/src/mess/drivers/b2m.c @@ -219,8 +219,8 @@ static MACHINE_CONFIG_START( b2m, b2m_state ) MCFG_FD1793x_ADD("fd1793", XTAL_8MHz / 8) - MCFG_FLOPPY_DRIVE_ADD("fd0", b2m_floppies, "525qd", 0, b2m_state::b2m_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fd1", b2m_floppies, "525qd", 0, b2m_state::b2m_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fd0", b2m_floppies, "525qd", b2m_state::b2m_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fd1", b2m_floppies, "525qd", b2m_state::b2m_floppy_formats) MCFG_SOFTWARE_LIST_ADD("flop_list","b2m") /* internal ram */ diff --git a/src/mess/drivers/bbc.c b/src/mess/drivers/bbc.c index 3f0aa7d1772..af23ee65363 100644 --- a/src/mess/drivers/bbc.c +++ b/src/mess/drivers/bbc.c @@ -887,7 +887,7 @@ static MACHINE_CONFIG_START( bbca, bbc_state ) /* acia */ MCFG_ACIA6850_ADD("acia6850", bbc_acia6850_interface) - MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL, NULL) + MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL) /* devices */ MCFG_VIA6522_ADD("via6522_0", 1000000, bbcb_system_via) @@ -988,7 +988,7 @@ static MACHINE_CONFIG_START( bbcm, bbc_state ) /* acia */ MCFG_ACIA6850_ADD("acia6850", bbc_acia6850_interface) - MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL, NULL) + MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL) /* devices */ MCFG_UPD7002_ADD("upd7002", bbc_uPD7002) @@ -1002,7 +1002,7 @@ static MACHINE_CONFIG_START( bbcm, bbc_state ) MCFG_MC6854_ADD("mc6854", adlc_intf) MCFG_ECONET_ADD(econet_intf) - MCFG_ECONET_SLOT_ADD("econet254", 254, econet_devices, NULL, NULL) + MCFG_ECONET_SLOT_ADD("econet254", 254, econet_devices, NULL) MACHINE_CONFIG_END /* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */ diff --git a/src/mess/drivers/bebox.c b/src/mess/drivers/bebox.c index 7bb0d1ade45..5a76580b0e4 100644 --- a/src/mess/drivers/bebox.c +++ b/src/mess/drivers/bebox.c @@ -226,13 +226,15 @@ static MACHINE_CONFIG_START( bebox, bebox_state ) /* pci */ MCFG_PCI_BUS_ADD("pcibus", 0) - MCFG_PCI_BUS_DEVICE("pcibus:0", pci_devices, "mpc105", NULL, &mpc105_config, 0, true) - MCFG_PCI_BUS_DEVICE("pcibus:1", pci_devices, "cirrus", NULL, NULL, 0, true) + MCFG_PCI_BUS_DEVICE("pcibus:0", pci_devices, "mpc105", true) + MCFG_DEVICE_CARD_CONFIG("mpc105", &mpc105_config) + + MCFG_PCI_BUS_DEVICE("pcibus:1", pci_devices, "cirrus", true) /*MCFG_PCI_BUS_DEVICE(12, NULL, scsi53c810_pci_read, scsi53c810_pci_write)*/ MCFG_SMC37C78_ADD("smc37c78") - MCFG_FLOPPY_DRIVE_ADD("smc37c78:0", bebox_floppies, "35hd", 0, bebox_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("smc37c78:0", bebox_floppies, "35hd", bebox_state::floppy_formats) MCFG_MC146818_ADD( "rtc", MC146818_STANDARD ) diff --git a/src/mess/drivers/bullet.c b/src/mess/drivers/bullet.c index 941d8a5e1f1..b46fff6102a 100644 --- a/src/mess/drivers/bullet.c +++ b/src/mess/drivers/bullet.c @@ -1264,17 +1264,18 @@ static MACHINE_CONFIG_START( bullet, bullet_state ) MCFG_Z80DMA_ADD(Z80DMA_TAG, XTAL_16MHz/4, dma_intf) MCFG_Z80PIO_ADD(Z80PIO_TAG, XTAL_16MHz/4, pio_intf) MCFG_MB8877x_ADD(MB8877_TAG, XTAL_16MHz/16) - MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":0", bullet_525_floppies, "525qd", NULL, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":1", bullet_525_floppies, NULL, NULL, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":2", bullet_525_floppies, NULL, NULL, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":3", bullet_525_floppies, NULL, NULL, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":4", bullet_8_floppies, NULL, NULL, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":5", bullet_8_floppies, NULL, NULL, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":6", bullet_8_floppies, NULL, NULL, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":7", bullet_8_floppies, NULL, NULL, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":0", bullet_525_floppies, "525qd", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":1", bullet_525_floppies, NULL, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":2", bullet_525_floppies, NULL, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":3", bullet_525_floppies, NULL, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":4", bullet_8_floppies, NULL, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":5", bullet_8_floppies, NULL, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":6", bullet_8_floppies, NULL, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":7", bullet_8_floppies, NULL, floppy_image_device::default_floppy_formats) MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, standard_centronics) - MCFG_RS232_PORT_ADD(RS232_A_TAG, rs232b_intf, default_rs232_devices, "serial_terminal", terminal) - MCFG_RS232_PORT_ADD(RS232_B_TAG, rs232a_intf, default_rs232_devices, NULL, NULL) + MCFG_RS232_PORT_ADD(RS232_A_TAG, rs232b_intf, default_rs232_devices, "serial_terminal") + MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("serial_terminal", terminal) + MCFG_RS232_PORT_ADD(RS232_B_TAG, rs232a_intf, default_rs232_devices, NULL) // software lists MCFG_SOFTWARE_LIST_ADD("flop_list", "wmbullet") @@ -1303,19 +1304,20 @@ static MACHINE_CONFIG_START( bulletf, bulletf_state ) MCFG_Z80DMA_ADD(Z80DMA_TAG, XTAL_16MHz/4, dma_intf) MCFG_Z80PIO_ADD(Z80PIO_TAG, XTAL_16MHz/4, bulletf_pio_intf) MCFG_MB8877x_ADD(MB8877_TAG, XTAL_16MHz/16) - MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":0", bullet_525_floppies, "525qd", NULL, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":1", bullet_525_floppies, NULL, NULL, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":2", bullet_525_floppies, NULL, NULL, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":3", bullet_525_floppies, NULL, NULL, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":4", bullet_8_floppies, NULL, NULL, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":5", bullet_8_floppies, NULL, NULL, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":6", bullet_8_floppies, NULL, NULL, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":7", bullet_8_floppies, NULL, NULL, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":8", bullet_35_floppies, NULL, NULL, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":9", bullet_35_floppies, NULL, NULL, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":0", bullet_525_floppies, "525qd", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":1", bullet_525_floppies, NULL, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":2", bullet_525_floppies, NULL, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":3", bullet_525_floppies, NULL, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":4", bullet_8_floppies, NULL, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":5", bullet_8_floppies, NULL, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":6", bullet_8_floppies, NULL, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":7", bullet_8_floppies, NULL, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":8", bullet_35_floppies, NULL, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":9", bullet_35_floppies, NULL, floppy_image_device::default_floppy_formats) MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, standard_centronics) - MCFG_RS232_PORT_ADD(RS232_A_TAG, rs232b_intf, default_rs232_devices, "serial_terminal", terminal) - MCFG_RS232_PORT_ADD(RS232_B_TAG, rs232a_intf, default_rs232_devices, NULL, NULL) + MCFG_RS232_PORT_ADD(RS232_A_TAG, rs232b_intf, default_rs232_devices, "serial_terminal") + MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("serial_terminal", terminal) + MCFG_RS232_PORT_ADD(RS232_B_TAG, rs232a_intf, default_rs232_devices, NULL) MCFG_SCSIBUS_ADD(SCSIBUS_TAG) MCFG_SCSIDEV_ADD(SCSIBUS_TAG ":harddisk0", SCSIHD, SCSI_ID_0) diff --git a/src/mess/drivers/bw12.c b/src/mess/drivers/bw12.c index 633a1fffdcf..33d5d627ac2 100644 --- a/src/mess/drivers/bw12.c +++ b/src/mess/drivers/bw12.c @@ -680,8 +680,8 @@ static MACHINE_CONFIG_START( common, bw12_state ) MCFG_Z80SIO0_ADD(Z80SIO_TAG, XTAL_16MHz/4, sio_intf) MCFG_PIT8253_ADD(PIT8253_TAG, pit_intf) MCFG_AY3600_ADD(AY3600PRO002_TAG, 0, bw12_ay3600_intf) - MCFG_RS232_PORT_ADD(RS232_A_TAG, rs232a_intf, default_rs232_devices, NULL, NULL) - MCFG_RS232_PORT_ADD(RS232_B_TAG, rs232b_intf, default_rs232_devices, NULL, NULL) + MCFG_RS232_PORT_ADD(RS232_A_TAG, rs232a_intf, default_rs232_devices, NULL) + MCFG_RS232_PORT_ADD(RS232_B_TAG, rs232b_intf, default_rs232_devices, NULL) /* printer */ MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, bw12_centronics_intf) @@ -689,8 +689,8 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( bw12, common ) /* floppy drives */ - MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":1", bw12_floppies, "525dd", 0, bw12_state::bw12_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":2", bw12_floppies, "525dd", 0, bw12_state::bw12_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":1", bw12_floppies, "525dd", bw12_state::bw12_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":2", bw12_floppies, "525dd", bw12_state::bw12_floppy_formats) // software lists MCFG_SOFTWARE_LIST_ADD("flop_list", "bw12") @@ -702,8 +702,8 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( bw14, common ) /* floppy drives */ - MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":1", bw14_floppies, "525dd", 0, bw12_state::bw14_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":2", bw14_floppies, "525dd", 0, bw12_state::bw14_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":1", bw14_floppies, "525dd", bw12_state::bw14_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":2", bw14_floppies, "525dd", bw12_state::bw14_floppy_formats) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) diff --git a/src/mess/drivers/bw2.c b/src/mess/drivers/bw2.c index e52d42e08ca..fc53d1ee9c7 100644 --- a/src/mess/drivers/bw2.c +++ b/src/mess/drivers/bw2.c @@ -672,10 +672,10 @@ static MACHINE_CONFIG_START( bw2, bw2_state ) MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, standard_centronics) MCFG_I8251_ADD(I8251_TAG, usart_intf) MCFG_WD2797x_ADD(WD2797_TAG, XTAL_16MHz/16) - MCFG_FLOPPY_DRIVE_ADD(WD2797_TAG":0", bw2_floppies, "35dd", NULL, bw2_state::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(WD2797_TAG":1", bw2_floppies, NULL, NULL, bw2_state::floppy_formats) - MCFG_BW2_EXPANSION_SLOT_ADD(BW2_EXPANSION_SLOT_TAG, XTAL_16MHz, bw2_expansion_cards, NULL, NULL) - MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL, NULL) + MCFG_FLOPPY_DRIVE_ADD(WD2797_TAG":0", bw2_floppies, "35dd", bw2_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(WD2797_TAG":1", bw2_floppies, NULL, bw2_state::floppy_formats) + MCFG_BW2_EXPANSION_SLOT_ADD(BW2_EXPANSION_SLOT_TAG, XTAL_16MHz, bw2_expansion_cards, NULL) + MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL) // software list MCFG_SOFTWARE_LIST_ADD("flop_list","bw2") diff --git a/src/mess/drivers/c128.c b/src/mess/drivers/c128.c index b2fed386bd2..1314dad0d56 100644 --- a/src/mess/drivers/c128.c +++ b/src/mess/drivers/c128.c @@ -1444,14 +1444,14 @@ static MACHINE_CONFIG_START( ntsc, c128_state ) MCFG_MOS6526_SERIAL_CALLBACKS(DEVWRITELINE(C64_USER_PORT_TAG, c64_user_port_device, cnt2_w), DEVWRITELINE(C64_USER_PORT_TAG, c64_user_port_device, sp2_w)) MCFG_MOS6526_PORT_A_CALLBACKS(READ8(c128_state, cia2_pa_r), WRITE8(c128_state, cia2_pa_w)) MCFG_MOS6526_PORT_B_CALLBACKS(DEVREAD8(C64_USER_PORT_TAG, c64_user_port_device, pb_r), DEVWRITE8(C64_USER_PORT_TAG, c64_user_port_device, pb_w), DEVWRITELINE(C64_USER_PORT_TAG, c64_user_port_device, pc2_w)) - MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, "c1530", NULL, DEVWRITELINE(MOS6526_2_TAG, mos6526_device, flag_w)) - MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, NULL, NULL) + MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, "c1530", DEVWRITELINE(MOS6526_2_TAG, mos6526_device, flag_w)) + MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, NULL) MCFG_VCS_CONTROL_PORT_TRIGGER_HANDLER(DEVWRITELINE(MOS8564_TAG, mos8564_device, lp_w)) - MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, "joy", NULL) - MCFG_C64_EXPANSION_SLOT_ADD(C64_EXPANSION_SLOT_TAG, VIC6567_CLOCK, c64_expansion_cards, NULL, NULL) + MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, "joy") + MCFG_C64_EXPANSION_SLOT_ADD(C64_EXPANSION_SLOT_TAG, VIC6567_CLOCK, c64_expansion_cards, NULL) MCFG_C64_EXPANSION_SLOT_IRQ_CALLBACKS(WRITELINE(c128_state, exp_irq_w), WRITELINE(c128_state, exp_nmi_w), WRITELINE(c128_state, exp_reset_w)) MCFG_C64_EXPANSION_SLOT_DMA_CALLBACKS(READ8(c128_state, exp_dma_cd_r), WRITE8(c128_state, exp_dma_cd_w), WRITELINE(c128_state, exp_dma_w)) - MCFG_C64_USER_PORT_ADD(C64_USER_PORT_TAG, c64_user_port_cards, NULL, NULL, WRITELINE(c128_state, exp_reset_w)) + MCFG_C64_USER_PORT_ADD(C64_USER_PORT_TAG, c64_user_port_cards, NULL, WRITELINE(c128_state, exp_reset_w)) MCFG_C64_USER_PORT_CIA1_CALLBACKS(DEVWRITELINE(MOS6526_1_TAG, mos6526_device, cnt_w), DEVWRITELINE(MOS6526_1_TAG, mos6526_device, sp_w)) MCFG_C64_USER_PORT_CIA2_CALLBACKS(DEVWRITELINE(MOS6526_2_TAG, mos6526_device, cnt_w), DEVWRITELINE(MOS6526_2_TAG, mos6526_device, sp_w), DEVWRITELINE(MOS6526_2_TAG, mos6526_device, flag_w)) MCFG_QUICKLOAD_ADD("quickload", c128_state, cbm_c64, "p00,prg", CBM_QUICKLOAD_DELAY_SECONDS) @@ -1499,11 +1499,11 @@ MACHINE_CONFIG_END //------------------------------------------------- static MACHINE_CONFIG_DERIVED( c128dcr, ntsc ) - MCFG_CBM_IEC_SLOT_ADD("iec4", 4, cbm_iec_devices, NULL, NULL) - MCFG_CBM_IEC_SLOT_ADD("iec8", 8, c128dcr_iec_devices, "c1571", NULL) // TODO c1571cr - MCFG_CBM_IEC_SLOT_ADD("iec9", 9, cbm_iec_devices, NULL, NULL) - MCFG_CBM_IEC_SLOT_ADD("iec10", 10, cbm_iec_devices, NULL, NULL) - MCFG_CBM_IEC_SLOT_ADD("iec11", 11, cbm_iec_devices, NULL, NULL) + MCFG_CBM_IEC_SLOT_ADD("iec4", 4, cbm_iec_devices, NULL) + MCFG_CBM_IEC_SLOT_ADD("iec8", 8, c128dcr_iec_devices, "c1571") // TODO c1571cr + MCFG_CBM_IEC_SLOT_ADD("iec9", 9, cbm_iec_devices, NULL) + MCFG_CBM_IEC_SLOT_ADD("iec10", 10, cbm_iec_devices, NULL) + MCFG_CBM_IEC_SLOT_ADD("iec11", 11, cbm_iec_devices, NULL) MCFG_CBM_IEC_BUS_ADD() MCFG_CBM_IEC_BUS_SRQ_CALLBACK(WRITELINE(c128_state, iec_srq_w)) MCFG_CBM_IEC_BUS_DATA_CALLBACK(WRITELINE(c128_state, iec_data_w)) @@ -1515,11 +1515,11 @@ MACHINE_CONFIG_END //------------------------------------------------- static MACHINE_CONFIG_DERIVED( c128d81, ntsc ) - MCFG_CBM_IEC_SLOT_ADD("iec4", 4, cbm_iec_devices, NULL, NULL) - MCFG_CBM_IEC_SLOT_ADD("iec8", 8, c128d81_iec_devices, "c1563", NULL) - MCFG_CBM_IEC_SLOT_ADD("iec9", 9, cbm_iec_devices, NULL, NULL) - MCFG_CBM_IEC_SLOT_ADD("iec10", 10, cbm_iec_devices, NULL, NULL) - MCFG_CBM_IEC_SLOT_ADD("iec11", 11, cbm_iec_devices, NULL, NULL) + MCFG_CBM_IEC_SLOT_ADD("iec4", 4, cbm_iec_devices, NULL) + MCFG_CBM_IEC_SLOT_ADD("iec8", 8, c128d81_iec_devices, "c1563") + MCFG_CBM_IEC_SLOT_ADD("iec9", 9, cbm_iec_devices, NULL) + MCFG_CBM_IEC_SLOT_ADD("iec10", 10, cbm_iec_devices, NULL) + MCFG_CBM_IEC_SLOT_ADD("iec11", 11, cbm_iec_devices, NULL) MCFG_CBM_IEC_BUS_ADD() MCFG_CBM_IEC_BUS_SRQ_CALLBACK(WRITELINE(c128_state, iec_srq_w)) MCFG_CBM_IEC_BUS_DATA_CALLBACK(WRITELINE(c128_state, iec_data_w)) @@ -1567,14 +1567,14 @@ static MACHINE_CONFIG_START( pal, c128_state ) MCFG_MOS6526_SERIAL_CALLBACKS(DEVWRITELINE(C64_USER_PORT_TAG, c64_user_port_device, cnt2_w), DEVWRITELINE(C64_USER_PORT_TAG, c64_user_port_device, sp2_w)) MCFG_MOS6526_PORT_A_CALLBACKS(READ8(c128_state, cia2_pa_r), WRITE8(c128_state, cia2_pa_w)) MCFG_MOS6526_PORT_B_CALLBACKS(DEVREAD8(C64_USER_PORT_TAG, c64_user_port_device, pb_r), DEVWRITE8(C64_USER_PORT_TAG, c64_user_port_device, pb_w), DEVWRITELINE(C64_USER_PORT_TAG, c64_user_port_device, pc2_w)) - MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, "c1530", NULL, DEVWRITELINE(MOS6526_2_TAG, mos6526_device, flag_w)) - MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, NULL, NULL) + MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, "c1530", DEVWRITELINE(MOS6526_2_TAG, mos6526_device, flag_w)) + MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, NULL) MCFG_VCS_CONTROL_PORT_TRIGGER_HANDLER(DEVWRITELINE(MOS8566_TAG, mos8566_device, lp_w)) - MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, "joy", NULL) - MCFG_C64_EXPANSION_SLOT_ADD(C64_EXPANSION_SLOT_TAG, VIC6569_CLOCK, c64_expansion_cards, NULL, NULL) + MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, "joy") + MCFG_C64_EXPANSION_SLOT_ADD(C64_EXPANSION_SLOT_TAG, VIC6569_CLOCK, c64_expansion_cards, NULL) MCFG_C64_EXPANSION_SLOT_IRQ_CALLBACKS(WRITELINE(c128_state, exp_irq_w), WRITELINE(c128_state, exp_nmi_w), WRITELINE(c128_state, exp_reset_w)) MCFG_C64_EXPANSION_SLOT_DMA_CALLBACKS(READ8(c128_state, exp_dma_cd_r), WRITE8(c128_state, exp_dma_cd_w), WRITELINE(c128_state, exp_dma_w)) - MCFG_C64_USER_PORT_ADD(C64_USER_PORT_TAG, c64_user_port_cards, NULL, NULL, WRITELINE(c128_state, exp_reset_w)) + MCFG_C64_USER_PORT_ADD(C64_USER_PORT_TAG, c64_user_port_cards, NULL, WRITELINE(c128_state, exp_reset_w)) MCFG_C64_USER_PORT_CIA1_CALLBACKS(DEVWRITELINE(MOS6526_1_TAG, mos6526_device, cnt_w), DEVWRITELINE(MOS6526_1_TAG, mos6526_device, sp_w)) MCFG_C64_USER_PORT_CIA2_CALLBACKS(DEVWRITELINE(MOS6526_2_TAG, mos6526_device, cnt_w), DEVWRITELINE(MOS6526_2_TAG, mos6526_device, sp_w), DEVWRITELINE(MOS6526_2_TAG, mos6526_device, flag_w)) MCFG_QUICKLOAD_ADD("quickload", c128_state, cbm_c64, "p00,prg", CBM_QUICKLOAD_DELAY_SECONDS) @@ -1622,11 +1622,11 @@ MACHINE_CONFIG_END //------------------------------------------------- static MACHINE_CONFIG_DERIVED( c128dcrp, pal ) - MCFG_CBM_IEC_SLOT_ADD("iec4", 4, cbm_iec_devices, NULL, NULL) - MCFG_CBM_IEC_SLOT_ADD("iec8", 8, c128dcr_iec_devices, "c1571", NULL) // TODO c1571cr - MCFG_CBM_IEC_SLOT_ADD("iec9", 9, cbm_iec_devices, NULL, NULL) - MCFG_CBM_IEC_SLOT_ADD("iec10", 10, cbm_iec_devices, NULL, NULL) - MCFG_CBM_IEC_SLOT_ADD("iec11", 11, cbm_iec_devices, NULL, NULL) + MCFG_CBM_IEC_SLOT_ADD("iec4", 4, cbm_iec_devices, NULL) + MCFG_CBM_IEC_SLOT_ADD("iec8", 8, c128dcr_iec_devices, "c1571") // TODO c1571cr + MCFG_CBM_IEC_SLOT_ADD("iec9", 9, cbm_iec_devices, NULL) + MCFG_CBM_IEC_SLOT_ADD("iec10", 10, cbm_iec_devices, NULL) + MCFG_CBM_IEC_SLOT_ADD("iec11", 11, cbm_iec_devices, NULL) MCFG_CBM_IEC_BUS_ADD() MCFG_CBM_IEC_BUS_SRQ_CALLBACK(WRITELINE(c128_state, iec_srq_w)) MCFG_CBM_IEC_BUS_DATA_CALLBACK(WRITELINE(c128_state, iec_data_w)) diff --git a/src/mess/drivers/c64.c b/src/mess/drivers/c64.c index e7cad36ed3e..4b065baef35 100644 --- a/src/mess/drivers/c64.c +++ b/src/mess/drivers/c64.c @@ -1077,17 +1077,17 @@ static MACHINE_CONFIG_START( ntsc, c64_state ) MCFG_MOS6526_SERIAL_CALLBACKS(DEVWRITELINE(C64_USER_PORT_TAG, c64_user_port_device, cnt2_w), DEVWRITELINE(C64_USER_PORT_TAG, c64_user_port_device, sp2_w)) MCFG_MOS6526_PORT_A_CALLBACKS(READ8(c64_state, cia2_pa_r), WRITE8(c64_state, cia2_pa_w)) MCFG_MOS6526_PORT_B_CALLBACKS(DEVREAD8(C64_USER_PORT_TAG, c64_user_port_device, pb_r), DEVWRITE8(C64_USER_PORT_TAG, c64_user_port_device, pb_w), DEVWRITELINE(C64_USER_PORT_TAG, c64_user_port_device, pc2_w)) - MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, "c1530", NULL, DEVWRITELINE(MOS6526_1_TAG, mos6526_device, flag_w)) + MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, "c1530", DEVWRITELINE(MOS6526_1_TAG, mos6526_device, flag_w)) MCFG_CBM_IEC_ADD("c1541") MCFG_CBM_IEC_BUS_SRQ_CALLBACK(DEVWRITELINE(MOS6526_1_TAG, mos6526_device, flag_w)) MCFG_CBM_IEC_BUS_ATN_CALLBACK(DEVWRITELINE(C64_USER_PORT_TAG, c64_user_port_device, atn_w)) - MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, NULL, NULL) + MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, NULL) MCFG_VCS_CONTROL_PORT_TRIGGER_HANDLER(DEVWRITELINE(MOS6567_TAG, mos6567_device, lp_w)) - MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, "joy", NULL) - MCFG_C64_EXPANSION_SLOT_ADD(C64_EXPANSION_SLOT_TAG, VIC6567_CLOCK, c64_expansion_cards, NULL, NULL) + MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, "joy") + MCFG_C64_EXPANSION_SLOT_ADD(C64_EXPANSION_SLOT_TAG, VIC6567_CLOCK, c64_expansion_cards, NULL) MCFG_C64_EXPANSION_SLOT_IRQ_CALLBACKS(WRITELINE(c64_state, exp_irq_w), WRITELINE(c64_state, exp_nmi_w), WRITELINE(c64_state, exp_reset_w)) MCFG_C64_EXPANSION_SLOT_DMA_CALLBACKS(READ8(c64_state, read), WRITE8(c64_state, write), WRITELINE(c64_state, exp_dma_w)) - MCFG_C64_USER_PORT_ADD(C64_USER_PORT_TAG, c64_user_port_cards, NULL, NULL, WRITELINE(c64_state, exp_reset_w)) + MCFG_C64_USER_PORT_ADD(C64_USER_PORT_TAG, c64_user_port_cards, NULL, WRITELINE(c64_state, exp_reset_w)) MCFG_C64_USER_PORT_CIA1_CALLBACKS(DEVWRITELINE(MOS6526_1_TAG, mos6526_device, cnt_w), DEVWRITELINE(MOS6526_1_TAG, mos6526_device, sp_w)) MCFG_C64_USER_PORT_CIA2_CALLBACKS(DEVWRITELINE(MOS6526_2_TAG, mos6526_device, cnt_w), DEVWRITELINE(MOS6526_2_TAG, mos6526_device, sp_w), DEVWRITELINE(MOS6526_2_TAG, mos6526_device, flag_w)) MCFG_QUICKLOAD_ADD("quickload", c64_state, cbm_c64, "p00,prg,t64", CBM_QUICKLOAD_DELAY_SECONDS) @@ -1131,7 +1131,7 @@ static MACHINE_CONFIG_START( ntsc_sx, sx64_state ) // devices MCFG_DEVICE_REMOVE("iec8") - MCFG_CBM_IEC_SLOT_ADD("iec8", 8, sx1541_iec_devices, "sx1541", NULL) + MCFG_CBM_IEC_SLOT_ADD("iec8", 8, sx1541_iec_devices, "sx1541") MACHINE_CONFIG_END @@ -1144,7 +1144,7 @@ static MACHINE_CONFIG_START( ntsc_dx, sx64_state ) // devices MCFG_DEVICE_REMOVE("iec9") - MCFG_CBM_IEC_SLOT_ADD("iec9", 9, sx1541_iec_devices, "sx1541", NULL) + MCFG_CBM_IEC_SLOT_ADD("iec9", 9, sx1541_iec_devices, "sx1541") MACHINE_CONFIG_END @@ -1190,17 +1190,17 @@ static MACHINE_CONFIG_START( pal, c64_state ) MCFG_MOS6526_SERIAL_CALLBACKS(DEVWRITELINE(C64_USER_PORT_TAG, c64_user_port_device, cnt2_w), DEVWRITELINE(C64_USER_PORT_TAG, c64_user_port_device, sp2_w)) MCFG_MOS6526_PORT_A_CALLBACKS(READ8(c64_state, cia2_pa_r), WRITE8(c64_state, cia2_pa_w)) MCFG_MOS6526_PORT_B_CALLBACKS(DEVREAD8(C64_USER_PORT_TAG, c64_user_port_device, pb_r), DEVWRITE8(C64_USER_PORT_TAG, c64_user_port_device, pb_w), DEVWRITELINE(C64_USER_PORT_TAG, c64_user_port_device, pc2_w)) - MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, "c1530", NULL, DEVWRITELINE(MOS6526_1_TAG, mos6526_device, flag_w)) + MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, "c1530", DEVWRITELINE(MOS6526_1_TAG, mos6526_device, flag_w)) MCFG_CBM_IEC_ADD("c1541") MCFG_CBM_IEC_BUS_SRQ_CALLBACK(DEVWRITELINE(MOS6526_1_TAG, mos6526_device, flag_w)) MCFG_CBM_IEC_BUS_ATN_CALLBACK(DEVWRITELINE(C64_USER_PORT_TAG, c64_user_port_device, atn_w)) - MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, NULL, NULL) + MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, NULL) MCFG_VCS_CONTROL_PORT_TRIGGER_HANDLER(DEVWRITELINE(MOS6569_TAG, mos6569_device, lp_w)) - MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, "joy", NULL) - MCFG_C64_EXPANSION_SLOT_ADD(C64_EXPANSION_SLOT_TAG, VIC6569_CLOCK, c64_expansion_cards, NULL, NULL) + MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, "joy") + MCFG_C64_EXPANSION_SLOT_ADD(C64_EXPANSION_SLOT_TAG, VIC6569_CLOCK, c64_expansion_cards, NULL) MCFG_C64_EXPANSION_SLOT_IRQ_CALLBACKS(WRITELINE(c64_state, exp_irq_w), WRITELINE(c64_state, exp_nmi_w), WRITELINE(c64_state, exp_reset_w)) MCFG_C64_EXPANSION_SLOT_DMA_CALLBACKS(READ8(c64_state, read), WRITE8(c64_state, write), WRITELINE(c64_state, exp_dma_w)) - MCFG_C64_USER_PORT_ADD(C64_USER_PORT_TAG, c64_user_port_cards, NULL, NULL, WRITELINE(c64_state, exp_reset_w)) + MCFG_C64_USER_PORT_ADD(C64_USER_PORT_TAG, c64_user_port_cards, NULL, WRITELINE(c64_state, exp_reset_w)) MCFG_C64_USER_PORT_CIA1_CALLBACKS(DEVWRITELINE(MOS6526_1_TAG, mos6526_device, cnt_w), DEVWRITELINE(MOS6526_1_TAG, mos6526_device, sp_w)) MCFG_C64_USER_PORT_CIA2_CALLBACKS(DEVWRITELINE(MOS6526_2_TAG, mos6526_device, cnt_w), DEVWRITELINE(MOS6526_2_TAG, mos6526_device, sp_w), DEVWRITELINE(MOS6526_2_TAG, mos6526_device, flag_w)) MCFG_QUICKLOAD_ADD("quickload", c64_state, cbm_c64, "p00,prg,t64", CBM_QUICKLOAD_DELAY_SECONDS) @@ -1235,7 +1235,7 @@ static MACHINE_CONFIG_START( pal_sx, sx64_state ) // devices MCFG_DEVICE_REMOVE("iec8") - MCFG_CBM_IEC_SLOT_ADD("iec8", 8, sx1541_iec_devices, "sx1541", NULL) + MCFG_CBM_IEC_SLOT_ADD("iec8", 8, sx1541_iec_devices, "sx1541") MACHINE_CONFIG_END @@ -1285,13 +1285,13 @@ static MACHINE_CONFIG_START( pal_gs, c64gs_state ) MCFG_CBM_IEC_BUS_SRQ_CALLBACK(DEVWRITELINE(MOS6526_1_TAG, mos6526_device, flag_w)) MCFG_CBM_IEC_BUS_ATN_CALLBACK(DEVWRITELINE(C64_USER_PORT_TAG, c64_user_port_device, atn_w)) - MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, NULL, NULL) + MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, NULL) MCFG_VCS_CONTROL_PORT_TRIGGER_HANDLER(DEVWRITELINE(MOS6569_TAG, mos6569_device, lp_w)) - MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, "joy", NULL) - MCFG_C64_EXPANSION_SLOT_ADD(C64_EXPANSION_SLOT_TAG, VIC6569_CLOCK, c64_expansion_cards, NULL, NULL) + MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, "joy") + MCFG_C64_EXPANSION_SLOT_ADD(C64_EXPANSION_SLOT_TAG, VIC6569_CLOCK, c64_expansion_cards, NULL) MCFG_C64_EXPANSION_SLOT_IRQ_CALLBACKS(WRITELINE(c64_state, exp_irq_w), WRITELINE(c64_state, exp_nmi_w), WRITELINE(c64_state, exp_reset_w)) MCFG_C64_EXPANSION_SLOT_DMA_CALLBACKS(READ8(c64_state, read), WRITE8(c64_state, write), WRITELINE(c64_state, exp_dma_w)) - MCFG_C64_USER_PORT_ADD(C64_USER_PORT_TAG, c64_user_port_cards, NULL, NULL, WRITELINE(c64_state, exp_reset_w)) + MCFG_C64_USER_PORT_ADD(C64_USER_PORT_TAG, c64_user_port_cards, NULL, WRITELINE(c64_state, exp_reset_w)) MCFG_C64_USER_PORT_CIA1_CALLBACKS(DEVWRITELINE(MOS6526_1_TAG, mos6526_device, cnt_w), DEVWRITELINE(MOS6526_1_TAG, mos6526_device, sp_w)) MCFG_C64_USER_PORT_CIA2_CALLBACKS(DEVWRITELINE(MOS6526_2_TAG, mos6526_device, cnt_w), DEVWRITELINE(MOS6526_2_TAG, mos6526_device, sp_w), DEVWRITELINE(MOS6526_2_TAG, mos6526_device, flag_w)) MCFG_QUICKLOAD_ADD("quickload", c64_state, cbm_c64, "p00,prg,t64", CBM_QUICKLOAD_DELAY_SECONDS) diff --git a/src/mess/drivers/cbm2.c b/src/mess/drivers/cbm2.c index e2c4c9f1d3e..fce11759cda 100644 --- a/src/mess/drivers/cbm2.c +++ b/src/mess/drivers/cbm2.c @@ -2197,13 +2197,13 @@ static MACHINE_CONFIG_START( p500_ntsc, p500_state ) MCFG_DS75161A_ADD(DS75161A_TAG, ds75161a_intf) MCFG_CBM_IEEE488_ADD("c8050") MCFG_IEEE488_SRQ_CALLBACK(DEVWRITELINE(MOS6525_1_TAG, tpi6525_device, i1_w)) - MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, NULL, NULL, DEVWRITELINE(MOS6526_TAG, mos6526_device, flag_w)) - MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, NULL, NULL) + MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, NULL, DEVWRITELINE(MOS6526_TAG, mos6526_device, flag_w)) + MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, NULL) MCFG_VCS_CONTROL_PORT_TRIGGER_HANDLER(DEVWRITELINE(MOS6567_TAG, mos6567_device, lp_w)) - MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, NULL, NULL) - MCFG_CBM2_EXPANSION_SLOT_ADD(CBM2_EXPANSION_SLOT_TAG, VIC6567_CLOCK, cbm2_expansion_cards, NULL, NULL) - MCFG_CBM2_USER_PORT_ADD(CBM2_USER_PORT_TAG, p500_user_intf, cbm2_user_port_cards, NULL, NULL) - MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL, NULL) + MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, NULL) + MCFG_CBM2_EXPANSION_SLOT_ADD(CBM2_EXPANSION_SLOT_TAG, VIC6567_CLOCK, cbm2_expansion_cards, NULL) + MCFG_CBM2_USER_PORT_ADD(CBM2_USER_PORT_TAG, p500_user_intf, cbm2_user_port_cards, NULL) + MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL) MCFG_QUICKLOAD_ADD("quickload", p500_state, p500, "p00,prg", CBM_QUICKLOAD_DELAY_SECONDS) // internal ram @@ -2254,13 +2254,13 @@ static MACHINE_CONFIG_START( p500_pal, p500_state ) MCFG_DS75161A_ADD(DS75161A_TAG, ds75161a_intf) MCFG_CBM_IEEE488_ADD("c8050") MCFG_IEEE488_SRQ_CALLBACK(DEVWRITELINE(MOS6525_1_TAG, tpi6525_device, i1_w)) - MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, NULL, NULL, DEVWRITELINE(MOS6526_TAG, mos6526_device, flag_w)) - MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, NULL, NULL) + MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, NULL, DEVWRITELINE(MOS6526_TAG, mos6526_device, flag_w)) + MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, NULL) MCFG_VCS_CONTROL_PORT_TRIGGER_HANDLER(DEVWRITELINE(MOS6569_TAG, mos6569_device, lp_w)) - MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, NULL, NULL) - MCFG_CBM2_EXPANSION_SLOT_ADD(CBM2_EXPANSION_SLOT_TAG, VIC6569_CLOCK, cbm2_expansion_cards, NULL, NULL) - MCFG_CBM2_USER_PORT_ADD(CBM2_USER_PORT_TAG, p500_user_intf, cbm2_user_port_cards, NULL, NULL) - MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL, NULL) + MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, NULL) + MCFG_CBM2_EXPANSION_SLOT_ADD(CBM2_EXPANSION_SLOT_TAG, VIC6569_CLOCK, cbm2_expansion_cards, NULL) + MCFG_CBM2_USER_PORT_ADD(CBM2_USER_PORT_TAG, p500_user_intf, cbm2_user_port_cards, NULL) + MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL) MCFG_QUICKLOAD_ADD("quickload", p500_state, p500, "p00,prg", CBM_QUICKLOAD_DELAY_SECONDS) // internal ram @@ -2318,12 +2318,12 @@ static MACHINE_CONFIG_START( cbm2lp_ntsc, cbm2_state ) MCFG_DS75161A_ADD(DS75161A_TAG, ds75161a_intf) MCFG_CBM_IEEE488_ADD("c8050") MCFG_IEEE488_SRQ_CALLBACK(DEVWRITELINE(MOS6525_1_TAG, tpi6525_device, i1_w)) - MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, NULL, NULL, DEVWRITELINE(MOS6526_TAG, mos6526_device, flag_w)) - MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, NULL, NULL) - MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, NULL, NULL) - MCFG_CBM2_EXPANSION_SLOT_ADD(CBM2_EXPANSION_SLOT_TAG, XTAL_18MHz/9, cbm2_expansion_cards, NULL, NULL) - MCFG_CBM2_USER_PORT_ADD(CBM2_USER_PORT_TAG, user_intf, cbm2_user_port_cards, NULL, NULL) - MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL, NULL) + MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, NULL,DEVWRITELINE(MOS6526_TAG, mos6526_device, flag_w)) + MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, NULL) + MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, NULL) + MCFG_CBM2_EXPANSION_SLOT_ADD(CBM2_EXPANSION_SLOT_TAG, XTAL_18MHz/9, cbm2_expansion_cards, NULL) + MCFG_CBM2_USER_PORT_ADD(CBM2_USER_PORT_TAG, user_intf, cbm2_user_port_cards, NULL) + MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL) MCFG_QUICKLOAD_ADD("quickload", cbm2_state, cbmb, "p00,prg,t64", CBM_QUICKLOAD_DELAY_SECONDS) // software list diff --git a/src/mess/drivers/coco12.c b/src/mess/drivers/coco12.c index a403d211d7d..d1215daf4d2 100644 --- a/src/mess/drivers/coco12.c +++ b/src/mess/drivers/coco12.c @@ -277,7 +277,7 @@ static MACHINE_CONFIG_START( coco, coco12_state ) MCFG_SAM6883_ADD(SAM_TAG, XTAL_3_579545MHz, coco12_state::sam6883_config) MCFG_CASSETTE_ADD("cassette", coco_state::coco_cassette_interface) MCFG_BITBANGER_ADD(BITBANGER_TAG, coco_state::coco_bitbanger_config) - MCFG_COCO_CARTRIDGE_ADD(CARTRIDGE_TAG, coco_state::cartridge_config, coco_cart, "pak", NULL) + MCFG_COCO_CARTRIDGE_ADD(CARTRIDGE_TAG, coco_state::cartridge_config, coco_cart, "pak") // video hardware MCFG_SCREEN_MC6847_NTSC_ADD(SCREEN_TAG, VDG_TAG) @@ -297,14 +297,14 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( cocoe, coco ) MCFG_COCO_CARTRIDGE_REMOVE(CARTRIDGE_TAG) - MCFG_COCO_CARTRIDGE_ADD(CARTRIDGE_TAG, coco12_state::cartridge_config, coco_cart, "fdc", NULL) + MCFG_COCO_CARTRIDGE_ADD(CARTRIDGE_TAG, coco12_state::cartridge_config, coco_cart, "fdc") MCFG_COCO_VHD_ADD(VHD0_TAG) MCFG_COCO_VHD_ADD(VHD1_TAG) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( coco2, coco ) MCFG_COCO_CARTRIDGE_REMOVE(CARTRIDGE_TAG) - MCFG_COCO_CARTRIDGE_ADD(CARTRIDGE_TAG, coco12_state::cartridge_config, coco_cart, "fdcv11", NULL) + MCFG_COCO_CARTRIDGE_ADD(CARTRIDGE_TAG, coco12_state::cartridge_config, coco_cart, "fdcv11") MCFG_COCO_VHD_ADD(VHD0_TAG) MCFG_COCO_VHD_ADD(VHD1_TAG) MACHINE_CONFIG_END @@ -316,7 +316,7 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( cp400, coco ) MCFG_COCO_CARTRIDGE_REMOVE(CARTRIDGE_TAG) - MCFG_COCO_CARTRIDGE_ADD(CARTRIDGE_TAG, coco12_state::cartridge_config, coco_cart, "cp400_fdc", NULL) + MCFG_COCO_CARTRIDGE_ADD(CARTRIDGE_TAG, coco12_state::cartridge_config, coco_cart, "cp400_fdc") MACHINE_CONFIG_END diff --git a/src/mess/drivers/coco3.c b/src/mess/drivers/coco3.c index b6bb8288f79..36e4c44a389 100644 --- a/src/mess/drivers/coco3.c +++ b/src/mess/drivers/coco3.c @@ -253,7 +253,7 @@ static MACHINE_CONFIG_START( coco3, coco3_state ) MCFG_PIA6821_ADD(PIA1_TAG, coco_state::pia1_config) MCFG_CASSETTE_ADD("cassette", coco_state::coco_cassette_interface) MCFG_BITBANGER_ADD(BITBANGER_TAG, coco_state::coco_bitbanger_config) - MCFG_COCO_CARTRIDGE_ADD(CARTRIDGE_TAG, coco_state::cartridge_config, coco_cart, "fdcv11", NULL) + MCFG_COCO_CARTRIDGE_ADD(CARTRIDGE_TAG, coco_state::cartridge_config, coco_cart, "fdcv11") MCFG_COCO_VHD_ADD(VHD0_TAG) MCFG_COCO_VHD_ADD(VHD1_TAG) diff --git a/src/mess/drivers/compis.c b/src/mess/drivers/compis.c index 89a97977dce..abdaee1b759 100644 --- a/src/mess/drivers/compis.c +++ b/src/mess/drivers/compis.c @@ -381,8 +381,8 @@ static MACHINE_CONFIG_START( compis, compis_state ) MCFG_I8251_ADD("uart", compis_usart_interface) MCFG_MM58274C_ADD("mm58274c", compis_mm58274c_interface) MCFG_I8272A_ADD("i8272a", true) - MCFG_FLOPPY_DRIVE_ADD("i8272a:0", compis_floppies, "525qd", 0, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("i8272a:1", compis_floppies, "525qd", 0, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("i8272a:0", compis_floppies, "525qd", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("i8272a:1", compis_floppies, "525qd", floppy_image_device::default_floppy_formats) MCFG_COMPIS_KEYBOARD_ADD() /* software lists */ @@ -421,8 +421,8 @@ static MACHINE_CONFIG_START( compis2, compis_state ) MCFG_I8251_ADD("uart", compis_usart_interface) MCFG_MM58274C_ADD("mm58274c", compis_mm58274c_interface) MCFG_I8272A_ADD("i8272a", true) - MCFG_FLOPPY_DRIVE_ADD("i8272a:0", compis_floppies, "525qd", 0, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("i8272a:1", compis_floppies, "525qd", 0, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("i8272a:0", compis_floppies, "525qd", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("i8272a:1", compis_floppies, "525qd", floppy_image_device::default_floppy_formats) MCFG_COMPIS_KEYBOARD_ADD() /* software lists */ diff --git a/src/mess/drivers/comx35.c b/src/mess/drivers/comx35.c index d156334e150..58080824108 100644 --- a/src/mess/drivers/comx35.c +++ b/src/mess/drivers/comx35.c @@ -695,7 +695,7 @@ static MACHINE_CONFIG_START( pal, comx35_state ) MCFG_CASSETTE_ADD("cassette", cassette_intf) // expansion bus - MCFG_COMX_EXPANSION_SLOT_ADD(EXPANSION_TAG, expansion_intf, comx_expansion_cards, "eb", NULL) + MCFG_COMX_EXPANSION_SLOT_ADD(EXPANSION_TAG, expansion_intf, comx_expansion_cards, "eb") // internal ram MCFG_RAM_ADD(RAM_TAG) @@ -726,7 +726,7 @@ static MACHINE_CONFIG_START( ntsc, comx35_state ) MCFG_CASSETTE_ADD("cassette", cassette_intf) // expansion bus - MCFG_COMX_EXPANSION_SLOT_ADD(EXPANSION_TAG, expansion_intf, comx_expansion_cards, "eb", NULL) + MCFG_COMX_EXPANSION_SLOT_ADD(EXPANSION_TAG, expansion_intf, comx_expansion_cards, "eb") // internal ram MCFG_RAM_ADD(RAM_TAG) diff --git a/src/mess/drivers/dmv.c b/src/mess/drivers/dmv.c index 5bc04533327..72607584a37 100644 --- a/src/mess/drivers/dmv.c +++ b/src/mess/drivers/dmv.c @@ -339,8 +339,8 @@ static MACHINE_CONFIG_START( dmv, dmv_state ) MCFG_UPD7220_ADD( "upd7220", XTAL_5MHz/2, hgdc_intf, upd7220_map ) // unk clock MCFG_I8237_ADD( "dma8237", XTAL_4MHz, dmv_dma8237_config ) MCFG_UPD765A_ADD( "upd765", true, true ) - MCFG_FLOPPY_DRIVE_ADD("upd765:0", dmv_floppies, "525dd", 0, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("upd765:1", dmv_floppies, "525dd", 0, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765:0", dmv_floppies, "525dd", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765:1", dmv_floppies, "525dd", floppy_image_device::default_floppy_formats) MACHINE_CONFIG_END /* ROM definition */ diff --git a/src/mess/drivers/dragon.c b/src/mess/drivers/dragon.c index 231ab687534..e47e9de4bc3 100644 --- a/src/mess/drivers/dragon.c +++ b/src/mess/drivers/dragon.c @@ -162,7 +162,7 @@ static MACHINE_CONFIG_DERIVED( dragon32, dragon_base ) MCFG_RAM_EXTRA_OPTIONS("64K") // cartridge - MCFG_COCO_CARTRIDGE_ADD(CARTRIDGE_TAG, dragon_state::cartridge_config, dragon_cart, "dragon_fdc", NULL) + MCFG_COCO_CARTRIDGE_ADD(CARTRIDGE_TAG, dragon_state::cartridge_config, dragon_cart, "dragon_fdc") MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED_CLASS( dragon64, dragon_base, dragon64_state ) @@ -171,7 +171,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( dragon64, dragon_base, dragon64_state ) MCFG_RAM_DEFAULT_SIZE("64K") // cartridge - MCFG_COCO_CARTRIDGE_ADD(CARTRIDGE_TAG, dragon_state::cartridge_config, dragon_cart, "dragon_fdc", NULL) + MCFG_COCO_CARTRIDGE_ADD(CARTRIDGE_TAG, dragon_state::cartridge_config, dragon_cart, "dragon_fdc") // acia MCFG_MOS6551_ADD("acia", XTAL_1_8432MHz, NULL) @@ -183,7 +183,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( d64plus, dragon_base, dragon64_state ) MCFG_RAM_DEFAULT_SIZE("128K") // cartridge - MCFG_COCO_CARTRIDGE_ADD(CARTRIDGE_TAG, dragon_state::cartridge_config, dragon_cart, "dragon_fdc", NULL) + MCFG_COCO_CARTRIDGE_ADD(CARTRIDGE_TAG, dragon_state::cartridge_config, dragon_cart, "dragon_fdc") // acia MCFG_MOS6551_ADD("acia", XTAL_1_8432MHz, NULL) @@ -195,7 +195,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( dgnalpha, dragon_base, dragon_alpha_state ) MCFG_RAM_DEFAULT_SIZE("64K") // cartridge - MCFG_COCO_CARTRIDGE_ADD(CARTRIDGE_TAG, dragon_alpha_state::cartridge_config, dragon_cart, NULL, NULL) + MCFG_COCO_CARTRIDGE_ADD(CARTRIDGE_TAG, dragon_alpha_state::cartridge_config, dragon_cart, NULL) // acia MCFG_MOS6551_ADD("acia", XTAL_1_8432MHz, NULL) @@ -219,7 +219,7 @@ static MACHINE_CONFIG_DERIVED( tanodr64, dragon_base ) MCFG_RAM_DEFAULT_SIZE("64K") // cartridge - MCFG_COCO_CARTRIDGE_ADD(CARTRIDGE_TAG, dragon_state::cartridge_config, dragon_cart, "sdtandy_fdc", NULL) + MCFG_COCO_CARTRIDGE_ADD(CARTRIDGE_TAG, dragon_state::cartridge_config, dragon_cart, "sdtandy_fdc") MACHINE_CONFIG_END diff --git a/src/mess/drivers/einstein.c b/src/mess/drivers/einstein.c index 9ac1df8f518..c5e5ddd5b93 100644 --- a/src/mess/drivers/einstein.c +++ b/src/mess/drivers/einstein.c @@ -773,10 +773,10 @@ static MACHINE_CONFIG_START( einstein, einstein_state ) MCFG_WD1770x_ADD(IC_I042, XTAL_X002) - MCFG_FLOPPY_DRIVE_ADD(IC_I042 ":0", einstein_floppies, "525dd", 0, einstein_state::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(IC_I042 ":1", einstein_floppies, "525dd", 0, einstein_state::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(IC_I042 ":2", einstein_floppies, "525dd", 0, einstein_state::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(IC_I042 ":3", einstein_floppies, "525dd", 0, einstein_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(IC_I042 ":0", einstein_floppies, "525dd", einstein_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(IC_I042 ":1", einstein_floppies, "525dd", einstein_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(IC_I042 ":2", einstein_floppies, "525dd", einstein_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(IC_I042 ":3", einstein_floppies, "525dd", einstein_state::floppy_formats) /* software lists */ MCFG_SOFTWARE_LIST_ADD("disk_list","einstein") diff --git a/src/mess/drivers/elwro800.c b/src/mess/drivers/elwro800.c index bcfb2997fd0..0b259531ea5 100644 --- a/src/mess/drivers/elwro800.c +++ b/src/mess/drivers/elwro800.c @@ -595,8 +595,8 @@ static MACHINE_CONFIG_START( elwro800, elwro800_state ) MCFG_CASSETTE_ADD( "cassette", elwro800jr_cassette_interface ) - MCFG_FLOPPY_DRIVE_ADD("upd765:0", elwro800jr_floppies, "525hd", 0, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("upd765:1", elwro800jr_floppies, "525hd", 0, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765:0", elwro800jr_floppies, "525hd", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765:1", elwro800jr_floppies, "525hd", floppy_image_device::default_floppy_formats) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) diff --git a/src/mess/drivers/esq1.c b/src/mess/drivers/esq1.c index c9bd962f415..cebd3ab1721 100644 --- a/src/mess/drivers/esq1.c +++ b/src/mess/drivers/esq1.c @@ -627,8 +627,8 @@ static MACHINE_CONFIG_START( esq1, esq1_state ) MCFG_DUARTN68681_ADD("duart", 4000000, duart_config) MCFG_ESQPANEL2x40_ADD("panel", esqpanel_config) - MCFG_SERIAL_PORT_ADD("mdin", midiin_intf, midiin_slot, "midiin", NULL) - MCFG_SERIAL_PORT_ADD("mdout", midiout_intf, midiout_slot, "midiout", NULL) + MCFG_SERIAL_PORT_ADD("mdin", midiin_intf, midiin_slot, "midiin") + MCFG_SERIAL_PORT_ADD("mdout", midiout_intf, midiout_slot, "midiout") MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mess/drivers/esq5505.c b/src/mess/drivers/esq5505.c index e751461fa0d..af11c16af6b 100644 --- a/src/mess/drivers/esq5505.c +++ b/src/mess/drivers/esq5505.c @@ -648,8 +648,8 @@ static MACHINE_CONFIG_START( vfx, esq5505_state ) MCFG_DUARTN68681_ADD("duart", 4000000, duart_config) - MCFG_SERIAL_PORT_ADD("mdin", midiin_intf, midiin_slot, "midiin", NULL) - MCFG_SERIAL_PORT_ADD("mdout", midiout_intf, midiout_slot, "midiout", NULL) + MCFG_SERIAL_PORT_ADD("mdin", midiin_intf, midiin_slot, "midiin") + MCFG_SERIAL_PORT_ADD("mdout", midiout_intf, midiout_slot, "midiout") MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("ensoniq", ES5505, XTAL_10MHz) @@ -666,7 +666,7 @@ static MACHINE_CONFIG_DERIVED(eps, vfx) MCFG_ESQPANEL1x22_ADD("panel", esqpanel_config) MCFG_WD1772x_ADD("wd1772", 8000000) - MCFG_FLOPPY_DRIVE_ADD("wd1772:0", ensoniq_floppies, "35dd", 0, esq5505_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("wd1772:0", ensoniq_floppies, "35dd", esq5505_state::floppy_formats) MCFG_HD63450_ADD( "mc68450", dmac_interface ) // MC68450 compatible MACHINE_CONFIG_END @@ -676,7 +676,7 @@ static MACHINE_CONFIG_DERIVED(vfxsd, vfx) MCFG_CPU_PROGRAM_MAP(vfxsd_map) MCFG_WD1772x_ADD("wd1772", 8000000) - MCFG_FLOPPY_DRIVE_ADD("wd1772:0", ensoniq_floppies, "35dd", 0, esq5505_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("wd1772:0", ensoniq_floppies, "35dd", esq5505_state::floppy_formats) MACHINE_CONFIG_END // 32-voice machines with the VFX-SD type config @@ -690,8 +690,8 @@ static MACHINE_CONFIG_START(vfx32, esq5505_state) MCFG_DUARTN68681_ADD("duart", 4000000, duart_config) - MCFG_SERIAL_PORT_ADD("mdin", midiin_intf, midiin_slot, "midiin", NULL) - MCFG_SERIAL_PORT_ADD("mdout", midiout_intf, midiout_slot, "midiout", NULL) + MCFG_SERIAL_PORT_ADD("mdin", midiin_intf, midiin_slot, "midiin") + MCFG_SERIAL_PORT_ADD("mdout", midiout_intf, midiout_slot, "midiout") MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("ensoniq", ES5505, XTAL_30_4761MHz / 2) @@ -700,7 +700,7 @@ static MACHINE_CONFIG_START(vfx32, esq5505_state) MCFG_SOUND_ROUTE(1, "rspeaker", 2.0) MCFG_WD1772x_ADD("wd1772", 8000000) - MCFG_FLOPPY_DRIVE_ADD("wd1772:0", ensoniq_floppies, "35dd", 0, esq5505_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("wd1772:0", ensoniq_floppies, "35dd", esq5505_state::floppy_formats) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED(sq1, vfx32) diff --git a/src/mess/drivers/esqkt.c b/src/mess/drivers/esqkt.c index 08660969110..5cf87ddb243 100644 --- a/src/mess/drivers/esqkt.c +++ b/src/mess/drivers/esqkt.c @@ -454,8 +454,8 @@ static MACHINE_CONFIG_START( kt, esqkt_state ) MCFG_ESQPANEL2x40_SQ1_ADD("sq1panel", esqpanel_config) MCFG_DUARTN68681_ADD("duart", 4000000, duart_config) - MCFG_SERIAL_PORT_ADD("mdin", midiin_intf, midiin_slot, "midiin", NULL) - MCFG_SERIAL_PORT_ADD("mdout", midiout_intf, midiout_slot, "midiout", NULL) + MCFG_SERIAL_PORT_ADD("mdin", midiin_intf, midiin_slot, "midiin") + MCFG_SERIAL_PORT_ADD("mdout", midiout_intf, midiout_slot, "midiout") MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("ensoniq", ES5506, XTAL_16MHz) diff --git a/src/mess/drivers/gb.c b/src/mess/drivers/gb.c index 4b89f958319..d65e7b4c5a8 100644 --- a/src/mess/drivers/gb.c +++ b/src/mess/drivers/gb.c @@ -704,7 +704,7 @@ static MACHINE_CONFIG_START( gameboy, gb_state ) MCFG_SOUND_ROUTE(1, "rspeaker", 0.50) /* cartslot */ - MCFG_GB_CARTRIDGE_ADD("gbslot", gb_cart, NULL, NULL) + MCFG_GB_CARTRIDGE_ADD("gbslot", gb_cart, NULL) MCFG_SOFTWARE_LIST_ADD("cart_list","gameboy") MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("gbc_list","gbcolor") @@ -793,7 +793,7 @@ static MACHINE_CONFIG_START( megaduck, megaduck_state ) MCFG_SOUND_ROUTE(0, "lspeaker", 0.50) MCFG_SOUND_ROUTE(1, "rspeaker", 0.50) - MCFG_MEGADUCK_CARTRIDGE_ADD("duckslot", megaduck_cart, NULL, NULL) + MCFG_MEGADUCK_CARTRIDGE_ADD("duckslot", megaduck_cart, NULL) MCFG_SOFTWARE_LIST_ADD("cart_list", "megaduck") MACHINE_CONFIG_END diff --git a/src/mess/drivers/gba.c b/src/mess/drivers/gba.c index 731049815e8..d0534bc3c7e 100644 --- a/src/mess/drivers/gba.c +++ b/src/mess/drivers/gba.c @@ -2270,7 +2270,7 @@ static MACHINE_CONFIG_START( gbadv, gba_state ) MCFG_SOUND_ADD("direct_b_right", DAC, 0) // GBA direct sound B right MCFG_SOUND_ROUTE(ALL_OUTPUTS, "spkright", 0.50) - MCFG_GBA_CARTRIDGE_ADD("cartslot", gba_cart, NULL, NULL) + MCFG_GBA_CARTRIDGE_ADD("cartslot", gba_cart, NULL) MCFG_SOFTWARE_LIST_ADD("cart_list","gba") MACHINE_CONFIG_END diff --git a/src/mess/drivers/genpc.c b/src/mess/drivers/genpc.c index 09dd50a8329..4365d97ef2b 100644 --- a/src/mess/drivers/genpc.c +++ b/src/mess/drivers/genpc.c @@ -124,15 +124,15 @@ static MACHINE_CONFIG_START( pcmda, genpc_state ) MCFG_IBM5160_MOTHERBOARD_ADD("mb","maincpu") - MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", pc_isa8_cards, "mda", NULL, false) - MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", pc_isa8_cards, "com", NULL, false) - MCFG_ISA8_SLOT_ADD("mb:isa", "isa3", pc_isa8_cards, "fdc_xt", NULL, false) - MCFG_ISA8_SLOT_ADD("mb:isa", "isa4", pc_isa8_cards, "hdc", NULL, false) - MCFG_ISA8_SLOT_ADD("mb:isa", "isa5", pc_isa8_cards, "adlib", NULL, false) - MCFG_ISA8_SLOT_ADD("mb:isa", "isa6", pc_isa8_cards, NULL, NULL, false) + MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", pc_isa8_cards, "mda", false) + MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", pc_isa8_cards, "com", false) + MCFG_ISA8_SLOT_ADD("mb:isa", "isa3", pc_isa8_cards, "fdc_xt", false) + MCFG_ISA8_SLOT_ADD("mb:isa", "isa4", pc_isa8_cards, "hdc", false) + MCFG_ISA8_SLOT_ADD("mb:isa", "isa5", pc_isa8_cards, "adlib", false) + MCFG_ISA8_SLOT_ADD("mb:isa", "isa6", pc_isa8_cards, NULL, false) /* keyboard */ - MCFG_PC_KBDC_SLOT_ADD("mb:pc_kbdc", "kbd", pc_xt_keyboards, STR_KBD_KEYTRONIC_PC3270, NULL) + MCFG_PC_KBDC_SLOT_ADD("mb:pc_kbdc", "kbd", pc_xt_keyboards, STR_KBD_KEYTRONIC_PC3270) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) @@ -148,15 +148,15 @@ static MACHINE_CONFIG_START( pcherc, genpc_state ) MCFG_IBM5160_MOTHERBOARD_ADD("mb","maincpu") - MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", pc_isa8_cards, "hercules", NULL, false) - MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", pc_isa8_cards, "com", NULL, false) - MCFG_ISA8_SLOT_ADD("mb:isa", "isa3", pc_isa8_cards, "fdc_xt", NULL, false) - MCFG_ISA8_SLOT_ADD("mb:isa", "isa4", pc_isa8_cards, "hdc", NULL, false) - MCFG_ISA8_SLOT_ADD("mb:isa", "isa5", pc_isa8_cards, "adlib", NULL, false) - MCFG_ISA8_SLOT_ADD("mb:isa", "isa6", pc_isa8_cards, NULL, NULL, false) + MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", pc_isa8_cards, "hercules", false) + MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", pc_isa8_cards, "com", false) + MCFG_ISA8_SLOT_ADD("mb:isa", "isa3", pc_isa8_cards, "fdc_xt", false) + MCFG_ISA8_SLOT_ADD("mb:isa", "isa4", pc_isa8_cards, "hdc", false) + MCFG_ISA8_SLOT_ADD("mb:isa", "isa5", pc_isa8_cards, "adlib", false) + MCFG_ISA8_SLOT_ADD("mb:isa", "isa6", pc_isa8_cards, NULL, false) /* keyboard */ - MCFG_PC_KBDC_SLOT_ADD("mb:pc_kbdc", "kbd", pc_xt_keyboards, STR_KBD_KEYTRONIC_PC3270, NULL) + MCFG_PC_KBDC_SLOT_ADD("mb:pc_kbdc", "kbd", pc_xt_keyboards, STR_KBD_KEYTRONIC_PC3270) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) @@ -174,15 +174,15 @@ static MACHINE_CONFIG_START( pccga, genpc_state ) MCFG_IBM5160_MOTHERBOARD_ADD("mb","maincpu") MCFG_DEVICE_INPUT_DEFAULTS(cga) - MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", pc_isa8_cards, "cga", NULL, false) - MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", pc_isa8_cards, "com", NULL, false) - MCFG_ISA8_SLOT_ADD("mb:isa", "isa3", pc_isa8_cards, "fdc_xt", NULL, false) - MCFG_ISA8_SLOT_ADD("mb:isa", "isa4", pc_isa8_cards, "hdc", NULL, false) - MCFG_ISA8_SLOT_ADD("mb:isa", "isa5", pc_isa8_cards, "sblaster1_0", NULL, false) - MCFG_ISA8_SLOT_ADD("mb:isa", "isa6", pc_isa8_cards, NULL, NULL, false) + MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", pc_isa8_cards, "cga", false) + MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", pc_isa8_cards, "com", false) + MCFG_ISA8_SLOT_ADD("mb:isa", "isa3", pc_isa8_cards, "fdc_xt", false) + MCFG_ISA8_SLOT_ADD("mb:isa", "isa4", pc_isa8_cards, "hdc", false) + MCFG_ISA8_SLOT_ADD("mb:isa", "isa5", pc_isa8_cards, "sblaster1_0", false) + MCFG_ISA8_SLOT_ADD("mb:isa", "isa6", pc_isa8_cards, NULL, false) /* keyboard */ - MCFG_PC_KBDC_SLOT_ADD("mb:pc_kbdc", "kbd", pc_xt_keyboards, STR_KBD_KEYTRONIC_PC3270, NULL) + MCFG_PC_KBDC_SLOT_ADD("mb:pc_kbdc", "kbd", pc_xt_keyboards, STR_KBD_KEYTRONIC_PC3270) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) @@ -200,15 +200,15 @@ static MACHINE_CONFIG_START( pcega, genpc_state ) MCFG_IBM5160_MOTHERBOARD_ADD("mb","maincpu") MCFG_DEVICE_INPUT_DEFAULTS(vga) - MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", pc_isa8_cards, "com", NULL, false) - MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", pc_isa8_cards, "fdc_xt", NULL, false) - MCFG_ISA8_SLOT_ADD("mb:isa", "isa3", pc_isa8_cards, "hdc", NULL, false) - MCFG_ISA8_SLOT_ADD("mb:isa", "isa4", pc_isa8_cards, "sblaster1_0", NULL, false) - MCFG_ISA8_SLOT_ADD("mb:isa", "isa5", pc_isa8_cards, "ega", NULL, false) - MCFG_ISA8_SLOT_ADD("mb:isa", "isa6", pc_isa8_cards, NULL, NULL, false) + MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", pc_isa8_cards, "com", false) + MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", pc_isa8_cards, "fdc_xt", false) + MCFG_ISA8_SLOT_ADD("mb:isa", "isa3", pc_isa8_cards, "hdc", false) + MCFG_ISA8_SLOT_ADD("mb:isa", "isa4", pc_isa8_cards, "sblaster1_0", false) + MCFG_ISA8_SLOT_ADD("mb:isa", "isa5", pc_isa8_cards, "ega", false) + MCFG_ISA8_SLOT_ADD("mb:isa", "isa6", pc_isa8_cards, NULL, false) /* keyboard */ - MCFG_PC_KBDC_SLOT_ADD("mb:pc_kbdc", "kbd", pc_xt_keyboards, STR_KBD_KEYTRONIC_PC3270, NULL) + MCFG_PC_KBDC_SLOT_ADD("mb:pc_kbdc", "kbd", pc_xt_keyboards, STR_KBD_KEYTRONIC_PC3270) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) @@ -226,15 +226,15 @@ static MACHINE_CONFIG_START( xtvga, genpc_state ) MCFG_IBM5160_MOTHERBOARD_ADD("mb","maincpu") MCFG_DEVICE_INPUT_DEFAULTS(vga) - MCFG_ISA8_SLOT_ADD("mb:isa","isa1", pc_isa8_cards, "com", NULL, false) - MCFG_ISA8_SLOT_ADD("mb:isa","isa2", pc_isa8_cards, "fdc_xt", NULL, false) - MCFG_ISA8_SLOT_ADD("mb:isa","isa3", pc_isa8_cards, "hdc", NULL, false) - MCFG_ISA8_SLOT_ADD("mb:isa","isa4", pc_isa8_cards, "sblaster1_0", NULL, false) - MCFG_ISA8_SLOT_ADD("mb:isa","isa5", pc_isa8_cards, "svga_et4k", NULL, false) - MCFG_ISA8_SLOT_ADD("mb:isa","isa6", pc_isa8_cards, NULL, NULL, false) + MCFG_ISA8_SLOT_ADD("mb:isa","isa1", pc_isa8_cards, "com", false) + MCFG_ISA8_SLOT_ADD("mb:isa","isa2", pc_isa8_cards, "fdc_xt", false) + MCFG_ISA8_SLOT_ADD("mb:isa","isa3", pc_isa8_cards, "hdc", false) + MCFG_ISA8_SLOT_ADD("mb:isa","isa4", pc_isa8_cards, "sblaster1_0", false) + MCFG_ISA8_SLOT_ADD("mb:isa","isa5", pc_isa8_cards, "svga_et4k", false) + MCFG_ISA8_SLOT_ADD("mb:isa","isa6", pc_isa8_cards, NULL, false) /* keyboard */ - MCFG_PC_KBDC_SLOT_ADD("mb:pc_kbdc", "kbd", pc_xt_keyboards, STR_KBD_KEYTRONIC_PC3270, NULL) + MCFG_PC_KBDC_SLOT_ADD("mb:pc_kbdc", "kbd", pc_xt_keyboards, STR_KBD_KEYTRONIC_PC3270) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) diff --git a/src/mess/drivers/hec2hrp.c b/src/mess/drivers/hec2hrp.c index ba70c625fe5..b792a311113 100644 --- a/src/mess/drivers/hec2hrp.c +++ b/src/mess/drivers/hec2hrp.c @@ -532,8 +532,8 @@ static MACHINE_CONFIG_START( hec2mx40, hec2hrp_state ) MCFG_CPU_PROGRAM_MAP(hecdisc2_mem) MCFG_CPU_IO_MAP(hecdisc2_io) MCFG_UPD765A_ADD("upd765", false, true) - MCFG_FLOPPY_DRIVE_ADD("upd765:0", hector_floppies, "525hd", 0, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("upd765:1", hector_floppies, "525hd", 0, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765:0", hector_floppies, "525hd", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765:1", hector_floppies, "525hd", floppy_image_device::default_floppy_formats) MCFG_MACHINE_RESET_OVERRIDE(hec2hrp_state,hec2hrx) MCFG_MACHINE_START_OVERRIDE(hec2hrp_state,hec2hrx) @@ -584,8 +584,8 @@ static MACHINE_CONFIG_START( hec2hrx, hec2hrp_state ) MCFG_CPU_PROGRAM_MAP(hecdisc2_mem) MCFG_CPU_IO_MAP(hecdisc2_io) MCFG_UPD765A_ADD("upd765", false, true) - MCFG_FLOPPY_DRIVE_ADD("upd765:0", hector_floppies, "525hd", 0, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("upd765:1", hector_floppies, "525hd", 0, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765:0", hector_floppies, "525hd", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765:1", hector_floppies, "525hd", floppy_image_device::default_floppy_formats) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -683,8 +683,8 @@ static MACHINE_CONFIG_START( hec2mx80, hec2hrp_state ) MCFG_CPU_PROGRAM_MAP(hecdisc2_mem) MCFG_CPU_IO_MAP(hecdisc2_io) MCFG_UPD765A_ADD("upd765", false, true) - MCFG_FLOPPY_DRIVE_ADD("upd765:0", hector_floppies, "525hd", 0, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("upd765:1", hector_floppies, "525hd", 0, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765:0", hector_floppies, "525hd", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765:1", hector_floppies, "525hd", floppy_image_device::default_floppy_formats) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mess/drivers/horizon.c b/src/mess/drivers/horizon.c index 92aa0c3faec..044bd9d0267 100644 --- a/src/mess/drivers/horizon.c +++ b/src/mess/drivers/horizon.c @@ -221,23 +221,24 @@ static MACHINE_CONFIG_START( horizon, horizon_state ) // devices MCFG_I8251_ADD(I8251_L_TAG, usart_l_intf) MCFG_I8251_ADD(I8251_R_TAG, usart_r_intf) - MCFG_RS232_PORT_ADD(RS232_A_TAG, rs232a_intf, default_rs232_devices, "serial_terminal", terminal) - MCFG_RS232_PORT_ADD(RS232_B_TAG, rs232b_intf, default_rs232_devices, NULL, NULL) + MCFG_RS232_PORT_ADD(RS232_A_TAG, rs232a_intf, default_rs232_devices, "serial_terminal") + MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("serial_terminal", terminal) + MCFG_RS232_PORT_ADD(RS232_B_TAG, rs232b_intf, default_rs232_devices, NULL) // S-100 MCFG_S100_BUS_ADD(s100_intf) //MCFG_S100_SLOT_ADD("s100_1", horizon_s100_cards, NULL, NULL) // CPU - MCFG_S100_SLOT_ADD("s100_2", horizon_s100_cards, NULL, NULL) // RAM - MCFG_S100_SLOT_ADD("s100_3", horizon_s100_cards, "mdsad", NULL) // MDS - MCFG_S100_SLOT_ADD("s100_4", horizon_s100_cards, NULL, NULL) // FPB - MCFG_S100_SLOT_ADD("s100_5", horizon_s100_cards, NULL, NULL) - MCFG_S100_SLOT_ADD("s100_6", horizon_s100_cards, NULL, NULL) - MCFG_S100_SLOT_ADD("s100_7", horizon_s100_cards, NULL, NULL) - MCFG_S100_SLOT_ADD("s100_8", horizon_s100_cards, NULL, NULL) - MCFG_S100_SLOT_ADD("s100_9", horizon_s100_cards, NULL, NULL) - MCFG_S100_SLOT_ADD("s100_10", horizon_s100_cards, NULL, NULL) - MCFG_S100_SLOT_ADD("s100_11", horizon_s100_cards, NULL, NULL) - MCFG_S100_SLOT_ADD("s100_12", horizon_s100_cards, NULL, NULL) + MCFG_S100_SLOT_ADD("s100_2", horizon_s100_cards, NULL) // RAM + MCFG_S100_SLOT_ADD("s100_3", horizon_s100_cards, "mdsad") // MDS + MCFG_S100_SLOT_ADD("s100_4", horizon_s100_cards, NULL) // FPB + MCFG_S100_SLOT_ADD("s100_5", horizon_s100_cards, NULL) + MCFG_S100_SLOT_ADD("s100_6", horizon_s100_cards, NULL) + MCFG_S100_SLOT_ADD("s100_7", horizon_s100_cards, NULL) + MCFG_S100_SLOT_ADD("s100_8", horizon_s100_cards, NULL) + MCFG_S100_SLOT_ADD("s100_9", horizon_s100_cards, NULL) + MCFG_S100_SLOT_ADD("s100_10", horizon_s100_cards, NULL) + MCFG_S100_SLOT_ADD("s100_11", horizon_s100_cards, NULL) + MCFG_S100_SLOT_ADD("s100_12", horizon_s100_cards, NULL) // software list MCFG_SOFTWARE_LIST_ADD("flop_list", "horizon") diff --git a/src/mess/drivers/ht68k.c b/src/mess/drivers/ht68k.c index 87658544480..2715effbf96 100644 --- a/src/mess/drivers/ht68k.c +++ b/src/mess/drivers/ht68k.c @@ -149,10 +149,10 @@ static MACHINE_CONFIG_START( ht68k, ht68k_state ) MCFG_WD1770x_ADD("wd1770", XTAL_8MHz ) - MCFG_FLOPPY_DRIVE_ADD("wd1770:0", ht68k_floppies, "525dd", 0, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("wd1770:1", ht68k_floppies, "525dd", 0, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("wd1770:2", ht68k_floppies, "525dd", 0, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("wd1770:3", ht68k_floppies, "525dd", 0, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("wd1770:0", ht68k_floppies, "525dd", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("wd1770:1", ht68k_floppies, "525dd", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("wd1770:2", ht68k_floppies, "525dd", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("wd1770:3", ht68k_floppies, "525dd", floppy_image_device::default_floppy_formats) MACHINE_CONFIG_END /* ROM definition */ diff --git a/src/mess/drivers/hx20.c b/src/mess/drivers/hx20.c index d20044caef7..039408c711c 100644 --- a/src/mess/drivers/hx20.c +++ b/src/mess/drivers/hx20.c @@ -868,7 +868,7 @@ static MACHINE_CONFIG_START( hx20, hx20_state ) // devices MCFG_MC146818_IRQ_ADD(MC146818_TAG, MC146818_STANDARD, rtc_intf) - MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL, NULL) + MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL) MCFG_CASSETTE_ADD(CASSETTE_TAG, default_cassette_interface) MCFG_EPSON_SIO_ADD("sio", "tf20") diff --git a/src/mess/drivers/ibmpc.c b/src/mess/drivers/ibmpc.c index c370c71d555..42a08b146dd 100644 --- a/src/mess/drivers/ibmpc.c +++ b/src/mess/drivers/ibmpc.c @@ -346,14 +346,14 @@ static MACHINE_CONFIG_START( ibm5150, ibmpc_state ) MCFG_IBM5150_MOTHERBOARD_ADD("mb","maincpu") MCFG_DEVICE_INPUT_DEFAULTS(cga) - MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", ibm_isa8_cards, "cga", NULL, false) - MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", ibm_isa8_cards, "com", NULL, false) - MCFG_ISA8_SLOT_ADD("mb:isa", "isa3", ibm_isa8_cards, "fdc", NULL, false) - MCFG_ISA8_SLOT_ADD("mb:isa", "isa4", ibm_isa8_cards, "hdc", NULL, false) - MCFG_ISA8_SLOT_ADD("mb:isa", "isa5", ibm_isa8_cards, NULL, NULL, false) + MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", ibm_isa8_cards, "cga", false) + MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", ibm_isa8_cards, "com", false) + MCFG_ISA8_SLOT_ADD("mb:isa", "isa3", ibm_isa8_cards, "fdc", false) + MCFG_ISA8_SLOT_ADD("mb:isa", "isa4", ibm_isa8_cards, "hdc", false) + MCFG_ISA8_SLOT_ADD("mb:isa", "isa5", ibm_isa8_cards, NULL, false) /* keyboard */ - MCFG_PC_KBDC_SLOT_ADD("mb:pc_kbdc", "kbd", pc_xt_keyboards, STR_KBD_KEYTRONIC_PC3270, NULL) + MCFG_PC_KBDC_SLOT_ADD("mb:pc_kbdc", "kbd", pc_xt_keyboards, STR_KBD_KEYTRONIC_PC3270) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) @@ -381,17 +381,17 @@ static MACHINE_CONFIG_START( ibm5160, ibmpc_state ) MCFG_IBM5160_MOTHERBOARD_ADD("mb","maincpu") MCFG_DEVICE_INPUT_DEFAULTS(cga) - MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", ibm_isa8_cards, "cga", NULL, false) - MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", ibm_isa8_cards, "com", NULL, false) - MCFG_ISA8_SLOT_ADD("mb:isa", "isa3", ibm_isa8_cards, "fdc", NULL, false) - MCFG_ISA8_SLOT_ADD("mb:isa", "isa4", ibm_isa8_cards, "hdc", NULL, false) - MCFG_ISA8_SLOT_ADD("mb:isa", "isa5", ibm_isa8_cards, NULL, NULL, false) - MCFG_ISA8_SLOT_ADD("mb:isa", "isa6", ibm_isa8_cards, NULL, NULL, false) - MCFG_ISA8_SLOT_ADD("mb:isa", "isa7", ibm_isa8_cards, NULL, NULL, false) - MCFG_ISA8_SLOT_ADD("mb:isa", "isa8", ibm_isa8_cards, NULL, NULL, false) + MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", ibm_isa8_cards, "cga", false) + MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", ibm_isa8_cards, "com", false) + MCFG_ISA8_SLOT_ADD("mb:isa", "isa3", ibm_isa8_cards, "fdc", false) + MCFG_ISA8_SLOT_ADD("mb:isa", "isa4", ibm_isa8_cards, "hdc", false) + MCFG_ISA8_SLOT_ADD("mb:isa", "isa5", ibm_isa8_cards, NULL, false) + MCFG_ISA8_SLOT_ADD("mb:isa", "isa6", ibm_isa8_cards, NULL, false) + MCFG_ISA8_SLOT_ADD("mb:isa", "isa7", ibm_isa8_cards, NULL, false) + MCFG_ISA8_SLOT_ADD("mb:isa", "isa8", ibm_isa8_cards, NULL, false) /* keyboard */ - MCFG_PC_KBDC_SLOT_ADD("mb:pc_kbdc", "kbd", pc_xt_keyboards, STR_KBD_KEYTRONIC_PC3270, NULL) + MCFG_PC_KBDC_SLOT_ADD("mb:pc_kbdc", "kbd", pc_xt_keyboards, STR_KBD_KEYTRONIC_PC3270) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) diff --git a/src/mess/drivers/iq151.c b/src/mess/drivers/iq151.c index 1465c908d30..8fe807f8e12 100644 --- a/src/mess/drivers/iq151.c +++ b/src/mess/drivers/iq151.c @@ -448,11 +448,11 @@ static MACHINE_CONFIG_START( iq151, iq151_state ) MCFG_TIMER_DRIVER_ADD_PERIODIC("cassette_timer", iq151_state, cassette_timer, attotime::from_hz(2000)) /* cartridge */ - MCFG_IQ151_CARTRIDGE_ADD("slot1", iq151_cart_interface, iq151_cart, NULL, NULL) - MCFG_IQ151_CARTRIDGE_ADD("slot2", iq151_cart_interface, iq151_cart, NULL, NULL) - MCFG_IQ151_CARTRIDGE_ADD("slot3", iq151_cart_interface, iq151_cart, NULL, NULL) - MCFG_IQ151_CARTRIDGE_ADD("slot4", iq151_cart_interface, iq151_cart, NULL, NULL) - MCFG_IQ151_CARTRIDGE_ADD("slot5", iq151_cart_interface, iq151_cart, "video32", NULL) + MCFG_IQ151_CARTRIDGE_ADD("slot1", iq151_cart_interface, iq151_cart, NULL) + MCFG_IQ151_CARTRIDGE_ADD("slot2", iq151_cart_interface, iq151_cart, NULL) + MCFG_IQ151_CARTRIDGE_ADD("slot3", iq151_cart_interface, iq151_cart, NULL) + MCFG_IQ151_CARTRIDGE_ADD("slot4", iq151_cart_interface, iq151_cart, NULL) + MCFG_IQ151_CARTRIDGE_ADD("slot5", iq151_cart_interface, iq151_cart, "video32") /* Software lists */ MCFG_SOFTWARE_LIST_ADD("cart_list", "iq151_cart") diff --git a/src/mess/drivers/kc.c b/src/mess/drivers/kc.c index a2c10891a92..00bde94b532 100644 --- a/src/mess/drivers/kc.c +++ b/src/mess/drivers/kc.c @@ -160,11 +160,11 @@ static MACHINE_CONFIG_START( kc85_3, kc_state ) MCFG_CASSETTE_ADD( "cassette", kc_cassette_interface ) /* cartridge slot */ - MCFG_KC85_CARTRIDGE_ADD("m8", "mc", kc85_exp_interface, kc85_cart, "m011", NULL) - MCFG_KC85_CARTRIDGE_ADD("mc", "exp", kc85_exp_interface, kc85_cart, NULL, NULL) + MCFG_KC85_CARTRIDGE_ADD("m8", "mc", kc85_exp_interface, kc85_cart, "m011") + MCFG_KC85_CARTRIDGE_ADD("mc", "exp", kc85_exp_interface, kc85_cart, NULL) /* expansion interface */ - MCFG_KC85_EXPANSION_ADD("exp", NULL, kc85_exp_interface, kc85_exp , NULL, NULL) + MCFG_KC85_EXPANSION_ADD("exp", NULL, kc85_exp_interface, kc85_exp , NULL) /* Software lists */ MCFG_SOFTWARE_LIST_ADD("cart_list", "kc_cart") @@ -212,11 +212,11 @@ static MACHINE_CONFIG_START( kc85_4, kc85_4_state ) MCFG_CASSETTE_ADD( "cassette", kc_cassette_interface ) /* cartridge slot */ - MCFG_KC85_CARTRIDGE_ADD("m8", "mc", kc85_exp_interface, kc85_cart, NULL, NULL) - MCFG_KC85_CARTRIDGE_ADD("mc", "exp", kc85_exp_interface, kc85_cart, NULL, NULL) + MCFG_KC85_CARTRIDGE_ADD("m8", "mc", kc85_exp_interface, kc85_cart, NULL) + MCFG_KC85_CARTRIDGE_ADD("mc", "exp", kc85_exp_interface, kc85_cart, NULL) /* expansion interface */ - MCFG_KC85_EXPANSION_ADD("exp", NULL, kc85_exp_interface, kc85_exp , NULL, NULL) + MCFG_KC85_EXPANSION_ADD("exp", NULL, kc85_exp_interface, kc85_exp , NULL) /* Software lists */ MCFG_SOFTWARE_LIST_ADD("cart_list", "kc_cart") diff --git a/src/mess/drivers/kyocera.c b/src/mess/drivers/kyocera.c index 9022af56acf..cf8157ce57b 100644 --- a/src/mess/drivers/kyocera.c +++ b/src/mess/drivers/kyocera.c @@ -1354,7 +1354,7 @@ static MACHINE_CONFIG_START( kc85, kc85_state ) MCFG_I8155_ADD(I8155_TAG, XTAL_4_9152MHz/2, kc85_8155_intf) MCFG_UPD1990A_ADD(UPD1990A_TAG, XTAL_32_768kHz, kc85_upd1990a_intf) MCFG_IM6402_ADD(IM6402_TAG, uart_intf) - MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL, NULL) + MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL) MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, standard_centronics) MCFG_CASSETTE_ADD("cassette", kc85_cassette_interface) @@ -1392,7 +1392,7 @@ static MACHINE_CONFIG_START( pc8201, pc8201_state ) MCFG_I8155_ADD(I8155_TAG, XTAL_4_9152MHz/2, kc85_8155_intf) MCFG_UPD1990A_ADD(UPD1990A_TAG, XTAL_32_768kHz, kc85_upd1990a_intf) MCFG_IM6402_ADD(IM6402_TAG, uart_intf) - MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL, NULL) + MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL) MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, standard_centronics) MCFG_CASSETTE_ADD("cassette", kc85_cassette_interface) @@ -1436,7 +1436,7 @@ static MACHINE_CONFIG_START( trsm100, trsm100_state ) MCFG_I8155_ADD(I8155_TAG, XTAL_4_9152MHz/2, kc85_8155_intf) MCFG_UPD1990A_ADD(UPD1990A_TAG, XTAL_32_768kHz, kc85_upd1990a_intf) MCFG_IM6402_ADD(IM6402_TAG, uart_intf) - MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL, NULL) + MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL) MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, standard_centronics) MCFG_CASSETTE_ADD("cassette", kc85_cassette_interface) // MCFG_MC14412_ADD(MC14412_TAG, XTAL_1MHz) @@ -1485,7 +1485,7 @@ static MACHINE_CONFIG_START( tandy200, tandy200_state ) MCFG_I8155_ADD(I8155_TAG, XTAL_4_9152MHz/2, tandy200_8155_intf) MCFG_RP5C01_ADD(RP5C01A_TAG, XTAL_32_768kHz, tandy200_rtc_intf) MCFG_I8251_ADD(I8251_TAG, /*XTAL_4_9152MHz/2,*/ tandy200_uart_intf) - MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL, NULL) + MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL) // MCFG_MC14412_ADD(MC14412_TAG, XTAL_1MHz) MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, standard_centronics) MCFG_CASSETTE_ADD("cassette", kc85_cassette_interface) diff --git a/src/mess/drivers/m20.c b/src/mess/drivers/m20.c index d59a4376198..ce6f957517f 100644 --- a/src/mess/drivers/m20.c +++ b/src/mess/drivers/m20.c @@ -989,8 +989,8 @@ static MACHINE_CONFIG_START( m20, m20_state ) /* Devices */ MCFG_FD1797x_ADD("fd1797", 1000000) - MCFG_FLOPPY_DRIVE_ADD("fd1797:0", m20_floppies, "5dd", NULL, m20_state::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fd1797:1", m20_floppies, "5dd", NULL, m20_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fd1797:0", m20_floppies, "5dd", m20_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fd1797:1", m20_floppies, "5dd", m20_state::floppy_formats) MCFG_MC6845_ADD("crtc", MC6845, PIXEL_CLOCK/8, mc6845_intf) /* hand tuned to get ~50 fps */ MCFG_I8255A_ADD("ppi8255", ppi_interface) MCFG_I8251_ADD("i8251_1", kbd_i8251_intf) diff --git a/src/mess/drivers/m5.c b/src/mess/drivers/m5.c index 2159eb501f4..4d375d89ef6 100644 --- a/src/mess/drivers/m5.c +++ b/src/mess/drivers/m5.c @@ -661,7 +661,7 @@ static MACHINE_CONFIG_START( m5, m5_state ) MCFG_CASSETTE_ADD("cassette", cassette_intf) MCFG_I8255_ADD(I8255A_TAG, ppi_intf) MCFG_UPD765A_ADD(UPD765_TAG, true, true) - MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", m5_floppies, "525dd", 0, m5_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", m5_floppies, "525dd", m5_state::floppy_formats) // cartridge MCFG_CARTSLOT_ADD("cart") diff --git a/src/mess/drivers/mac.c b/src/mess/drivers/mac.c index 9bf05d58c52..84e36f127ee 100644 --- a/src/mess/drivers/mac.c +++ b/src/mess/drivers/mac.c @@ -1052,12 +1052,12 @@ static MACHINE_CONFIG_START( macii, mac_state ) /* devices */ MCFG_RTC3430042_ADD("rtc", XTAL_32_768kHz) MCFG_NUBUS_BUS_ADD("nubus", "maincpu", nubus_intf) - MCFG_NUBUS_SLOT_ADD("nubus","nb9", mac_nubus_cards, "48gc", NULL) - MCFG_NUBUS_SLOT_ADD("nubus","nba", mac_nubus_cards, NULL, NULL) - MCFG_NUBUS_SLOT_ADD("nubus","nbb", mac_nubus_cards, NULL, NULL) - MCFG_NUBUS_SLOT_ADD("nubus","nbc", mac_nubus_cards, NULL, NULL) - MCFG_NUBUS_SLOT_ADD("nubus","nbd", mac_nubus_cards, NULL, NULL) - MCFG_NUBUS_SLOT_ADD("nubus","nbe", mac_nubus_cards, NULL, NULL) + MCFG_NUBUS_SLOT_ADD("nubus","nb9", mac_nubus_cards, "48gc") + MCFG_NUBUS_SLOT_ADD("nubus","nba", mac_nubus_cards, NULL) + MCFG_NUBUS_SLOT_ADD("nubus","nbb", mac_nubus_cards, NULL) + MCFG_NUBUS_SLOT_ADD("nubus","nbc", mac_nubus_cards, NULL) + MCFG_NUBUS_SLOT_ADD("nubus","nbd", mac_nubus_cards, NULL) + MCFG_NUBUS_SLOT_ADD("nubus","nbe", mac_nubus_cards, NULL) MCFG_SCSIBUS_ADD("scsi") MCFG_SCSIDEV_ADD("scsi:harddisk1", SCSIHD, SCSI_ID_6) @@ -1102,12 +1102,12 @@ static MACHINE_CONFIG_START( maciifx, mac_state ) /* devices */ MCFG_RTC3430042_ADD("rtc", XTAL_32_768kHz) MCFG_NUBUS_BUS_ADD("nubus", "maincpu", nubus_intf) - MCFG_NUBUS_SLOT_ADD("nubus","nb9", mac_nubus_cards, "48gc", NULL) - MCFG_NUBUS_SLOT_ADD("nubus","nba", mac_nubus_cards, NULL, NULL) - MCFG_NUBUS_SLOT_ADD("nubus","nbb", mac_nubus_cards, NULL, NULL) - MCFG_NUBUS_SLOT_ADD("nubus","nbc", mac_nubus_cards, NULL, NULL) - MCFG_NUBUS_SLOT_ADD("nubus","nbd", mac_nubus_cards, NULL, NULL) - MCFG_NUBUS_SLOT_ADD("nubus","nbe", mac_nubus_cards, NULL, NULL) + MCFG_NUBUS_SLOT_ADD("nubus","nb9", mac_nubus_cards, "48gc") + MCFG_NUBUS_SLOT_ADD("nubus","nba", mac_nubus_cards, NULL) + MCFG_NUBUS_SLOT_ADD("nubus","nbb", mac_nubus_cards, NULL) + MCFG_NUBUS_SLOT_ADD("nubus","nbc", mac_nubus_cards, NULL) + MCFG_NUBUS_SLOT_ADD("nubus","nbd", mac_nubus_cards, NULL) + MCFG_NUBUS_SLOT_ADD("nubus","nbe", mac_nubus_cards, NULL) MCFG_SCSIBUS_ADD("scsi") MCFG_SCSIDEV_ADD("scsi:harddisk1", SCSIHD, SCSI_ID_6) @@ -1162,7 +1162,7 @@ static MACHINE_CONFIG_DERIVED( maclc, macii ) MCFG_NUBUS_BUS_REMOVE("nubus") MCFG_NUBUS_BUS_ADD("pds", "maincpu", nubus_intf) - MCFG_NUBUS_SLOT_ADD("pds","lcpds", mac_lcpds_cards, NULL, NULL) + MCFG_NUBUS_SLOT_ADD("pds","lcpds", mac_lcpds_cards, NULL) MCFG_ASC_REPLACE("asc", C15M, ASC_TYPE_V8, mac_asc_irq) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) @@ -1231,9 +1231,9 @@ static MACHINE_CONFIG_DERIVED( maciivx, maclc ) MCFG_SCREEN_UPDATE_DRIVER(mac_state, screen_update_macrbvvram) MCFG_NUBUS_BUS_ADD("nubus", "maincpu", nubus_intf) - MCFG_NUBUS_SLOT_ADD("nubus","nbc", mac_nubus_cards, NULL, NULL) - MCFG_NUBUS_SLOT_ADD("nubus","nbd", mac_nubus_cards, NULL, NULL) - MCFG_NUBUS_SLOT_ADD("nubus","nbe", mac_nubus_cards, NULL, NULL) + MCFG_NUBUS_SLOT_ADD("nubus","nbc", mac_nubus_cards, NULL) + MCFG_NUBUS_SLOT_ADD("nubus","nbd", mac_nubus_cards, NULL) + MCFG_NUBUS_SLOT_ADD("nubus","nbe", mac_nubus_cards, NULL) MCFG_RAM_MODIFY(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("4M") @@ -1255,9 +1255,9 @@ static MACHINE_CONFIG_DERIVED( maciivi, maclc ) MCFG_SCREEN_UPDATE_DRIVER(mac_state, screen_update_macrbvvram) MCFG_NUBUS_BUS_ADD("nubus", "maincpu", nubus_intf) - MCFG_NUBUS_SLOT_ADD("nubus","nbc", mac_nubus_cards, NULL, NULL) - MCFG_NUBUS_SLOT_ADD("nubus","nbd", mac_nubus_cards, NULL, NULL) - MCFG_NUBUS_SLOT_ADD("nubus","nbe", mac_nubus_cards, NULL, NULL) + MCFG_NUBUS_SLOT_ADD("nubus","nbc", mac_nubus_cards, NULL) + MCFG_NUBUS_SLOT_ADD("nubus","nbd", mac_nubus_cards, NULL) + MCFG_NUBUS_SLOT_ADD("nubus","nbe", mac_nubus_cards, NULL) MCFG_RAM_MODIFY(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("4M") @@ -1315,7 +1315,7 @@ static MACHINE_CONFIG_START( macse30, mac_state ) MCFG_NCR5380_ADD("scsi:ncr5380", C7M, macplus_5380intf) MCFG_NUBUS_BUS_ADD("pds", "maincpu", nubus_intf) - MCFG_NUBUS_SLOT_ADD("pds","pds030", mac_pds030_cards, NULL, NULL) + MCFG_NUBUS_SLOT_ADD("pds","pds030", mac_pds030_cards, NULL) MCFG_SWIM_ADD("fdc", mac_iwm_interface) MCFG_LEGACY_FLOPPY_SONY_2_DRIVES_ADD(mac_floppy_interface) @@ -1644,8 +1644,8 @@ static MACHINE_CONFIG_START( macqd700, mac_state ) /* devices */ MCFG_RTC3430042_ADD("rtc", XTAL_32_768kHz) MCFG_NUBUS_BUS_ADD("nubus", "maincpu", nubus_intf) - MCFG_NUBUS_SLOT_ADD("nubus","nbd", mac_nubus_cards, NULL, NULL) - MCFG_NUBUS_SLOT_ADD("nubus","nbe", mac_nubus_cards, NULL, NULL) + MCFG_NUBUS_SLOT_ADD("nubus","nbd", mac_nubus_cards, NULL) + MCFG_NUBUS_SLOT_ADD("nubus","nbe", mac_nubus_cards, NULL) MCFG_IWM_ADD("fdc", mac_iwm_interface) MCFG_LEGACY_FLOPPY_SONY_2_DRIVES_ADD(mac_floppy_interface) diff --git a/src/mess/drivers/megadriv.c b/src/mess/drivers/megadriv.c index a5fb60b5883..66c05dc39cf 100644 --- a/src/mess/drivers/megadriv.c +++ b/src/mess/drivers/megadriv.c @@ -426,7 +426,7 @@ static MACHINE_CONFIG_START( ms_megadriv, md_cons_state ) MCFG_MACHINE_START_OVERRIDE( md_cons_state, ms_megadriv ) MCFG_MACHINE_RESET_OVERRIDE( md_cons_state, ms_megadriv ) - MCFG_MD_CARTRIDGE_ADD("mdslot", md_cart, NULL, NULL) + MCFG_MD_CARTRIDGE_ADD("mdslot", md_cart, NULL) MCFG_SOFTWARE_LIST_ADD("cart_list","megadriv") MACHINE_CONFIG_END @@ -436,7 +436,7 @@ static MACHINE_CONFIG_START( ms_megadpal, md_cons_state ) MCFG_MACHINE_START_OVERRIDE( md_cons_state, ms_megadriv ) MCFG_MACHINE_RESET_OVERRIDE( md_cons_state, ms_megadriv ) - MCFG_MD_CARTRIDGE_ADD("mdslot", md_cart, NULL, NULL) + MCFG_MD_CARTRIDGE_ADD("mdslot", md_cart, NULL) MCFG_SOFTWARE_LIST_ADD("cart_list","megadriv") MACHINE_CONFIG_END @@ -1089,7 +1089,7 @@ static MACHINE_CONFIG_START( pico, pico_state ) MCFG_MACHINE_START_OVERRIDE( pico_state, pico ) MCFG_MACHINE_RESET_OVERRIDE( pico_state, ms_megadriv ) - MCFG_PICO_CARTRIDGE_ADD("picoslot", pico_cart, NULL, NULL) + MCFG_PICO_CARTRIDGE_ADD("picoslot", pico_cart, NULL) MCFG_SOFTWARE_LIST_ADD("cart_list","pico") MACHINE_CONFIG_END @@ -1104,7 +1104,7 @@ static MACHINE_CONFIG_START( picopal, pico_state ) MCFG_MACHINE_START_OVERRIDE( pico_state, pico ) MCFG_MACHINE_RESET_OVERRIDE( pico_state, ms_megadriv ) - MCFG_PICO_CARTRIDGE_ADD("picoslot", pico_cart, NULL, NULL) + MCFG_PICO_CARTRIDGE_ADD("picoslot", pico_cart, NULL) MCFG_SOFTWARE_LIST_ADD("cart_list","pico") MACHINE_CONFIG_END diff --git a/src/mess/drivers/microdec.c b/src/mess/drivers/microdec.c index af41d06b930..ab033468eaa 100644 --- a/src/mess/drivers/microdec.c +++ b/src/mess/drivers/microdec.c @@ -103,8 +103,8 @@ static MACHINE_CONFIG_START( microdec, microdec_state ) MCFG_GENERIC_TERMINAL_ADD(TERMINAL_TAG, terminal_intf) MCFG_UPD765A_ADD("upd765", true, true) - MCFG_FLOPPY_DRIVE_ADD("upd765:0", microdec_floppies, "525hd", 0, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("upd765:1", microdec_floppies, "525hd", 0, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765:0", microdec_floppies, "525hd", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765:1", microdec_floppies, "525hd", floppy_image_device::default_floppy_formats) MACHINE_CONFIG_END /* ROM definition */ diff --git a/src/mess/drivers/mikromik.c b/src/mess/drivers/mikromik.c index 6ec681175d7..3b53bc63f4b 100644 --- a/src/mess/drivers/mikromik.c +++ b/src/mess/drivers/mikromik.c @@ -810,11 +810,11 @@ static MACHINE_CONFIG_START( mm1, mm1_state ) MCFG_PIT8253_ADD(I8253_TAG, pit_intf) MCFG_UPD765A_ADD(UPD765_TAG, /* XTAL_16MHz/2/2 */ true, true) MCFG_UPD7201_ADD(UPD7201_TAG, XTAL_6_144MHz/2, mpsc_intf) - MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", mm1_floppies, "525qd", 0, mm1_state::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":1", mm1_floppies, "525qd", 0, mm1_state::floppy_formats) - MCFG_RS232_PORT_ADD(RS232_A_TAG, rs232a_intf, default_rs232_devices, NULL, NULL) - MCFG_RS232_PORT_ADD(RS232_B_TAG, rs232b_intf, default_rs232_devices, NULL, NULL) - MCFG_RS232_PORT_ADD(RS232_C_TAG, rs232c_intf, default_rs232_devices, NULL, NULL) + MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", mm1_floppies, "525qd", mm1_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":1", mm1_floppies, "525qd", mm1_state::floppy_formats) + MCFG_RS232_PORT_ADD(RS232_A_TAG, rs232a_intf, default_rs232_devices, NULL) + MCFG_RS232_PORT_ADD(RS232_B_TAG, rs232b_intf, default_rs232_devices, NULL) + MCFG_RS232_PORT_ADD(RS232_C_TAG, rs232c_intf, default_rs232_devices, NULL) // internal ram MCFG_RAM_ADD(RAM_TAG) diff --git a/src/mess/drivers/mirage.c b/src/mess/drivers/mirage.c index 34b406cf40c..8072d223682 100644 --- a/src/mess/drivers/mirage.c +++ b/src/mess/drivers/mirage.c @@ -308,7 +308,7 @@ static MACHINE_CONFIG_START( mirage, mirage_state ) MCFG_ACIA6850_ADD("acia6850", mirage_acia6850_interface) MCFG_WD1772x_ADD("wd1772", 8000000) - MCFG_FLOPPY_DRIVE_ADD("wd1772:0", ensoniq_floppies, "35dd", 0, mirage_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("wd1772:0", ensoniq_floppies, "35dd", mirage_state::floppy_formats) MACHINE_CONFIG_END static INPUT_PORTS_START( mirage ) diff --git a/src/mess/drivers/mpz80.c b/src/mess/drivers/mpz80.c index 7c893500a26..6105b56a5d5 100644 --- a/src/mess/drivers/mpz80.c +++ b/src/mess/drivers/mpz80.c @@ -729,20 +729,20 @@ static MACHINE_CONFIG_START( mpz80, mpz80_state ) // S-100 MCFG_S100_BUS_ADD(s100_intf) - MCFG_S100_SLOT_ADD("s100_1", mpz80_s100_cards, "mm65k16s", NULL) - MCFG_S100_SLOT_ADD("s100_2", mpz80_s100_cards, "wunderbus", NULL) - MCFG_S100_SLOT_ADD("s100_3", mpz80_s100_cards, "dj2db", NULL) - MCFG_S100_SLOT_ADD("s100_4", mpz80_s100_cards, NULL, NULL)//"hdcdma") - MCFG_S100_SLOT_ADD("s100_5", mpz80_s100_cards, NULL, NULL) - MCFG_S100_SLOT_ADD("s100_6", mpz80_s100_cards, NULL, NULL) - MCFG_S100_SLOT_ADD("s100_7", mpz80_s100_cards, NULL, NULL) - MCFG_S100_SLOT_ADD("s100_8", mpz80_s100_cards, NULL, NULL) - MCFG_S100_SLOT_ADD("s100_9", mpz80_s100_cards, NULL, NULL) - MCFG_S100_SLOT_ADD("s100_10", mpz80_s100_cards, NULL, NULL) - MCFG_S100_SLOT_ADD("s100_11", mpz80_s100_cards, NULL, NULL) - MCFG_S100_SLOT_ADD("s100_12", mpz80_s100_cards, NULL, NULL) - MCFG_S100_SLOT_ADD("s100_13", mpz80_s100_cards, NULL, NULL) - MCFG_S100_SLOT_ADD("s100_14", mpz80_s100_cards, NULL, NULL) + MCFG_S100_SLOT_ADD("s100_1", mpz80_s100_cards, "mm65k16s") + MCFG_S100_SLOT_ADD("s100_2", mpz80_s100_cards, "wunderbus") + MCFG_S100_SLOT_ADD("s100_3", mpz80_s100_cards, "dj2db") + MCFG_S100_SLOT_ADD("s100_4", mpz80_s100_cards, NULL)//"hdcdma") + MCFG_S100_SLOT_ADD("s100_5", mpz80_s100_cards, NULL) + MCFG_S100_SLOT_ADD("s100_6", mpz80_s100_cards, NULL) + MCFG_S100_SLOT_ADD("s100_7", mpz80_s100_cards, NULL) + MCFG_S100_SLOT_ADD("s100_8", mpz80_s100_cards, NULL) + MCFG_S100_SLOT_ADD("s100_9", mpz80_s100_cards, NULL) + MCFG_S100_SLOT_ADD("s100_10", mpz80_s100_cards, NULL) + MCFG_S100_SLOT_ADD("s100_11", mpz80_s100_cards, NULL) + MCFG_S100_SLOT_ADD("s100_12", mpz80_s100_cards, NULL) + MCFG_S100_SLOT_ADD("s100_13", mpz80_s100_cards, NULL) + MCFG_S100_SLOT_ADD("s100_14", mpz80_s100_cards, NULL) // internal ram MCFG_RAM_ADD(RAM_TAG) diff --git a/src/mess/drivers/mz3500.c b/src/mess/drivers/mz3500.c index 07b46c69a6c..bfa9832e9c3 100644 --- a/src/mess/drivers/mz3500.c +++ b/src/mess/drivers/mz3500.c @@ -863,10 +863,10 @@ static MACHINE_CONFIG_START( mz3500, mz3500_state ) MCFG_I8255A_ADD( "i8255", i8255_intf ) MCFG_UPD765A_ADD("upd765a", true, true) - MCFG_FLOPPY_DRIVE_ADD("upd765a:0", mz3500_floppies, "525ssdd", 0, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("upd765a:1", mz3500_floppies, "525ssdd", 0, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("upd765a:2", mz3500_floppies, "525ssdd", 0, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("upd765a:3", mz3500_floppies, "525ssdd", 0, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765a:0", mz3500_floppies, "525ssdd", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765a:1", mz3500_floppies, "525ssdd", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765a:2", mz3500_floppies, "525ssdd", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765a:3", mz3500_floppies, "525ssdd", floppy_image_device::default_floppy_formats) MCFG_UPD7220_ADD("upd7220_chr", MAIN_CLOCK/5, hgdc_1_intf, upd7220_1_map) MCFG_UPD7220_ADD("upd7220_gfx", MAIN_CLOCK/5, hgdc_2_intf, upd7220_2_map) diff --git a/src/mess/drivers/mz6500.c b/src/mess/drivers/mz6500.c index 91383c59160..0507a5cebd9 100644 --- a/src/mess/drivers/mz6500.c +++ b/src/mess/drivers/mz6500.c @@ -159,8 +159,8 @@ static MACHINE_CONFIG_START( mz6500, mz6500_state ) /* Devices */ MCFG_UPD7220_ADD("upd7220", 8000000/6, hgdc_intf, upd7220_map) // unk clock MCFG_UPD765A_ADD("upd765", true, true) - MCFG_FLOPPY_DRIVE_ADD("upd765:0", mz6500_floppies, "525hd", 0, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("upd765:1", mz6500_floppies, "525hd", 0, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765:0", mz6500_floppies, "525hd", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765:1", mz6500_floppies, "525hd", floppy_image_device::default_floppy_formats) MACHINE_CONFIG_END /* ROM definition */ diff --git a/src/mess/drivers/nanos.c b/src/mess/drivers/nanos.c index e5a0be06813..104907e1a39 100644 --- a/src/mess/drivers/nanos.c +++ b/src/mess/drivers/nanos.c @@ -579,7 +579,7 @@ static MACHINE_CONFIG_START( nanos, nanos_state ) MCFG_Z80PIO_ADD( "z80pio", XTAL_4MHz, nanos_z80pio_intf ) /* UPD765 */ MCFG_UPD765A_ADD("upd765", false, true) - MCFG_FLOPPY_DRIVE_ADD("upd765:0", nanos_floppies, "525hd", 0, nanos_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765:0", nanos_floppies, "525hd", nanos_state::floppy_formats) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) diff --git a/src/mess/drivers/nc.c b/src/mess/drivers/nc.c index d930f7fc59d..8b74e89bc58 100644 --- a/src/mess/drivers/nc.c +++ b/src/mess/drivers/nc.c @@ -1641,8 +1641,8 @@ static MACHINE_CONFIG_DERIVED( nc200, nc100 ) MCFG_DEVICE_REMOVE("rtc") MCFG_UPD765A_ADD("upd765", true, true) - MCFG_FLOPPY_DRIVE_ADD("upd765:0", ibmpc_floppies, "525dd", 0, ibmpc_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("upd765:1", ibmpc_floppies, "525dd", 0, ibmpc_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765:0", ibmpc_floppies, "525dd", ibmpc_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765:1", ibmpc_floppies, "525dd", ibmpc_floppy_formats) MCFG_MC146818_ADD( "mc", MC146818_STANDARD ) diff --git a/src/mess/drivers/nes.c b/src/mess/drivers/nes.c index a2d067ba593..8f0d3af694b 100644 --- a/src/mess/drivers/nes.c +++ b/src/mess/drivers/nes.c @@ -517,7 +517,7 @@ static MACHINE_CONFIG_START( nes, nes_state ) MCFG_SOUND_CONFIG(nes_apu_interface) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90) - MCFG_NES_CARTRIDGE_ADD("nes_slot", nes_crt_interface, nes_cart, NULL, NULL) + MCFG_NES_CARTRIDGE_ADD("nes_slot", nes_crt_interface, nes_cart, NULL) MCFG_SOFTWARE_LIST_ADD("cart_list","nes") MCFG_SOFTWARE_LIST_ADD("ntb_list","nes_ntbrom") // Nantettate Baseball mini_carts MACHINE_CONFIG_END @@ -568,7 +568,7 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( famicom, nes ) MCFG_DEVICE_REMOVE("nes_slot") - MCFG_NES_CARTRIDGE_ADD("nes_slot", nes_crt_interface, nes_cart, NULL, NULL) + MCFG_NES_CARTRIDGE_ADD("nes_slot", nes_crt_interface, nes_cart, NULL) MCFG_NES_CARTRIDGE_NOT_MANDATORY MCFG_LEGACY_FLOPPY_DRIVE_ADD(FLOPPY_0, nes_floppy_interface) diff --git a/src/mess/drivers/newbrain.c b/src/mess/drivers/newbrain.c index cb6269856ea..23c204795ff 100644 --- a/src/mess/drivers/newbrain.c +++ b/src/mess/drivers/newbrain.c @@ -1419,8 +1419,8 @@ static MACHINE_CONFIG_DERIVED_CLASS( newbrain_eim, newbrain_a, newbrain_eim_stat MCFG_ADC0808_ADD(ADC0809_TAG, 500000, adc_intf) MCFG_ACIA6850_ADD(MC6850_TAG, acia_intf) MCFG_UPD765A_ADD(UPD765_TAG, false, true) - MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", newbrain_floppies, "525dd", 0, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":1", newbrain_floppies, "525dd", 0, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", newbrain_floppies, "525dd", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":1", newbrain_floppies, "525dd", floppy_image_device::default_floppy_formats) // internal ram MCFG_RAM_MODIFY(RAM_TAG) diff --git a/src/mess/drivers/next.c b/src/mess/drivers/next.c index 22438305e00..f95daf03db0 100644 --- a/src/mess/drivers/next.c +++ b/src/mess/drivers/next.c @@ -957,14 +957,17 @@ static MACHINE_CONFIG_START( next_base, next_state ) line_cb_t(FUNC(next_state::keyboard_irq), static_cast(owner)), line_cb_t(FUNC(next_state::power_irq), static_cast(owner)), line_cb_t(FUNC(next_state::nmi_irq), static_cast(owner))) - MCFG_NSCSI_ADD("scsibus:0", next_scsi_devices, "cdrom", 0, 0, 0, false) - MCFG_NSCSI_ADD("scsibus:1", next_scsi_devices, "harddisk", 0, 0, 0, false) - MCFG_NSCSI_ADD("scsibus:2", next_scsi_devices, 0, 0, 0, 0, false) - MCFG_NSCSI_ADD("scsibus:3", next_scsi_devices, 0, 0, 0, 0, false) - MCFG_NSCSI_ADD("scsibus:4", next_scsi_devices, 0, 0, 0, 0, false) - MCFG_NSCSI_ADD("scsibus:5", next_scsi_devices, 0, 0, 0, 0, false) - MCFG_NSCSI_ADD("scsibus:6", next_scsi_devices, 0, 0, 0, 0, false) - MCFG_NSCSI_ADD("scsibus:7", next_scsi_devices, "ncr5390", 0, &next_ncr5390_interface, 10000000, true) + MCFG_NSCSI_ADD("scsibus:0", next_scsi_devices, "cdrom", false) + MCFG_NSCSI_ADD("scsibus:1", next_scsi_devices, "harddisk", false) + MCFG_NSCSI_ADD("scsibus:2", next_scsi_devices, 0, false) + MCFG_NSCSI_ADD("scsibus:3", next_scsi_devices, 0, false) + MCFG_NSCSI_ADD("scsibus:4", next_scsi_devices, 0, false) + MCFG_NSCSI_ADD("scsibus:5", next_scsi_devices, 0, false) + MCFG_NSCSI_ADD("scsibus:6", next_scsi_devices, 0, false) + MCFG_NSCSI_ADD("scsibus:7", next_scsi_devices, "ncr5390", true) + MCFG_DEVICE_CARD_CONFIG("ncr5390", &next_ncr5390_interface) + MCFG_DEVICE_CARD_CLOCK("ncr5390", 10000000) + MCFG_MB8795_ADD("net", line_cb_t(FUNC(next_state::net_tx_irq), static_cast(owner)), line_cb_t(FUNC(next_state::net_rx_irq), static_cast(owner)), @@ -982,7 +985,7 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( next_fdc_base, next_base ) MCFG_N82077AA_ADD("fdc", n82077aa_device::MODE_PS2) - MCFG_FLOPPY_DRIVE_ADD("fdc:0", next_floppies, "35ed", 0, next_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:0", next_floppies, "35ed", next_state::floppy_formats) // software list MCFG_SOFTWARE_LIST_ADD("flop_list", "next") diff --git a/src/mess/drivers/ob68k1a.c b/src/mess/drivers/ob68k1a.c index 11e49c24d35..bec91516ef9 100644 --- a/src/mess/drivers/ob68k1a.c +++ b/src/mess/drivers/ob68k1a.c @@ -357,8 +357,8 @@ static MACHINE_CONFIG_START( ob68k1a, ob68k1a_state ) MCFG_ACIA6850_ADD(MC6850_0_TAG, acia0_intf) MCFG_ACIA6850_ADD(MC6850_1_TAG, acia1_intf) MCFG_COM8116_ADD(COM8116_TAG, XTAL_5_0688MHz, dbrg_intf) - MCFG_RS232_PORT_ADD(RS232_A_TAG, rs232a_intf, default_rs232_devices, "serial_terminal", NULL) - MCFG_RS232_PORT_ADD(RS232_B_TAG, rs232b_intf, default_rs232_devices, NULL, NULL) + MCFG_RS232_PORT_ADD(RS232_A_TAG, rs232a_intf, default_rs232_devices, "serial_terminal") + MCFG_RS232_PORT_ADD(RS232_B_TAG, rs232b_intf, default_rs232_devices, NULL) // internal ram MCFG_RAM_ADD(RAM_TAG) diff --git a/src/mess/drivers/orion.c b/src/mess/drivers/orion.c index 664aa560e44..29846381191 100644 --- a/src/mess/drivers/orion.c +++ b/src/mess/drivers/orion.c @@ -125,10 +125,10 @@ static MACHINE_CONFIG_START( orion128, orion_state ) MCFG_FD1793x_ADD("fd1793", XTAL_8MHz / 8) - MCFG_FLOPPY_DRIVE_ADD("fd0", orion_floppies, "525qd", 0, orion_state::orion_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fd1", orion_floppies, "525qd", 0, orion_state::orion_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fd2", orion_floppies, "525qd", 0, orion_state::orion_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fd3", orion_floppies, "525qd", 0, orion_state::orion_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fd0", orion_floppies, "525qd", orion_state::orion_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fd1", orion_floppies, "525qd", orion_state::orion_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fd2", orion_floppies, "525qd", orion_state::orion_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fd3", orion_floppies, "525qd", orion_state::orion_floppy_formats) MCFG_SOFTWARE_LIST_ADD("flop_list","orion_flop") MCFG_CARTSLOT_ADD("cart") @@ -195,10 +195,10 @@ static MACHINE_CONFIG_START( orionz80, orion_state ) MCFG_FD1793x_ADD("fd1793", XTAL_8MHz / 8) - MCFG_FLOPPY_DRIVE_ADD("fd0", orion_floppies, "525qd", 0, orion_state::orion_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fd1", orion_floppies, "525qd", 0, orion_state::orion_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fd2", orion_floppies, "525qd", 0, orion_state::orion_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fd3", orion_floppies, "525qd", 0, orion_state::orion_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fd0", orion_floppies, "525qd", orion_state::orion_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fd1", orion_floppies, "525qd", orion_state::orion_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fd2", orion_floppies, "525qd", orion_state::orion_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fd3", orion_floppies, "525qd", orion_state::orion_floppy_formats) MCFG_SOFTWARE_LIST_ADD("flop_list","orion_flop") MCFG_CARTSLOT_ADD("cart") @@ -255,10 +255,10 @@ static MACHINE_CONFIG_START( orionpro, orion_state ) MCFG_FD1793x_ADD("fd1793", XTAL_8MHz / 8) - MCFG_FLOPPY_DRIVE_ADD("fd0", orion_floppies, "525qd", 0, orion_state::orion_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fd1", orion_floppies, "525qd", 0, orion_state::orion_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fd2", orion_floppies, "525qd", 0, orion_state::orion_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fd3", orion_floppies, "525qd", 0, orion_state::orion_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fd0", orion_floppies, "525qd", orion_state::orion_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fd1", orion_floppies, "525qd", orion_state::orion_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fd2", orion_floppies, "525qd", orion_state::orion_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fd3", orion_floppies, "525qd", orion_state::orion_floppy_formats) MCFG_SOFTWARE_LIST_ADD("flop_list","orionpro_flop") MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("flop128_list","orion_flop") diff --git a/src/mess/drivers/p8k.c b/src/mess/drivers/p8k.c index 037b011d6b1..659b93384b9 100644 --- a/src/mess/drivers/p8k.c +++ b/src/mess/drivers/p8k.c @@ -811,8 +811,8 @@ static MACHINE_CONFIG_START( p8k, p8k_state ) MCFG_Z80PIO_ADD("z80pio_1", 1229000, p8k_pio_1_intf) MCFG_Z80PIO_ADD("z80pio_2", 1229000, p8k_pio_2_intf) MCFG_I8272A_ADD("i8272", true) - MCFG_FLOPPY_DRIVE_ADD("i8272:0", p8k_floppies, "525hd", 0, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("i8272:1", p8k_floppies, "525hd", 0, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("i8272:0", p8k_floppies, "525hd", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("i8272:1", p8k_floppies, "525hd", floppy_image_device::default_floppy_formats) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mess/drivers/pasopia7.c b/src/mess/drivers/pasopia7.c index 76d199dadf6..09460118485 100644 --- a/src/mess/drivers/pasopia7.c +++ b/src/mess/drivers/pasopia7.c @@ -1017,8 +1017,8 @@ static MACHINE_CONFIG_START( p7_base, pasopia7_state ) MCFG_I8255_ADD( "ppi8255_1", ppi8255_intf_1 ) MCFG_I8255_ADD( "ppi8255_2", ppi8255_intf_2 ) MCFG_UPD765A_ADD("fdc", true, true) - MCFG_FLOPPY_DRIVE_ADD("fdc:0", pasopia7_floppies, "525hd", 0, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fdc:1", pasopia7_floppies, "525hd", 0, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:0", pasopia7_floppies, "525hd", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:1", pasopia7_floppies, "525hd", floppy_image_device::default_floppy_formats) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( p7_raster, p7_base ) diff --git a/src/mess/drivers/pc.c b/src/mess/drivers/pc.c index 50e0fdabe3a..bd12b04762f 100644 --- a/src/mess/drivers/pc.c +++ b/src/mess/drivers/pc.c @@ -1003,10 +1003,10 @@ static MACHINE_CONFIG_START( pccga, pc_state ) MCFG_INS8250_ADD( "ins8250_1", ibm5150_com_interface[1], XTAL_1_8432MHz ) /* TODO: Verify model */ MCFG_INS8250_ADD( "ins8250_2", ibm5150_com_interface[2], XTAL_1_8432MHz ) /* TODO: Verify model */ MCFG_INS8250_ADD( "ins8250_3", ibm5150_com_interface[3], XTAL_1_8432MHz ) /* TODO: Verify model */ - MCFG_RS232_PORT_ADD( "serport0", ibm5150_serport_config[0], ibm5150_com, NULL, NULL ) - MCFG_RS232_PORT_ADD( "serport1", ibm5150_serport_config[1], ibm5150_com, NULL, NULL ) - MCFG_RS232_PORT_ADD( "serport2", ibm5150_serport_config[2], ibm5150_com, NULL, NULL ) - MCFG_RS232_PORT_ADD( "serport3", ibm5150_serport_config[3], ibm5150_com, NULL, NULL ) + MCFG_RS232_PORT_ADD( "serport0", ibm5150_serport_config[0], ibm5150_com, NULL ) + MCFG_RS232_PORT_ADD( "serport1", ibm5150_serport_config[1], ibm5150_com, NULL ) + MCFG_RS232_PORT_ADD( "serport2", ibm5150_serport_config[2], ibm5150_com, NULL ) + MCFG_RS232_PORT_ADD( "serport3", ibm5150_serport_config[3], ibm5150_com, NULL ) /* video hardware */ MCFG_FRAGMENT_ADD( pcvideo_cga ) @@ -1019,7 +1019,7 @@ static MACHINE_CONFIG_START( pccga, pc_state ) /* keyboard */ MCFG_PC_KBDC_ADD("pc_kbdc", pc_kbdc_intf) - MCFG_PC_KBDC_SLOT_ADD("pc_kbdc", "kbd", pc_xt_keyboards, STR_KBD_KEYTRONIC_PC3270, NULL) + MCFG_PC_KBDC_SLOT_ADD("pc_kbdc", "kbd", pc_xt_keyboards, STR_KBD_KEYTRONIC_PC3270) /* printer */ MCFG_PC_LPT_ADD("lpt_0", pc_lpt_config) @@ -1029,8 +1029,8 @@ static MACHINE_CONFIG_START( pccga, pc_state ) MCFG_PC_FDC_XT_ADD("fdc") - MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "525dd", 0, pc_state::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fdc:1", ibmpc_floppies, "525dd", 0, pc_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "525dd", pc_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:1", ibmpc_floppies, "525dd", pc_state::floppy_formats) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) @@ -1087,10 +1087,10 @@ static MACHINE_CONFIG_START( europc, europc_pc_state ) MCFG_INS8250_ADD( "ins8250_1", ibm5150_com_interface[1], XTAL_1_8432MHz ) /* TODO: Verify model */ MCFG_INS8250_ADD( "ins8250_2", ibm5150_com_interface[2], XTAL_1_8432MHz ) /* TODO: Verify model */ MCFG_INS8250_ADD( "ins8250_3", ibm5150_com_interface[3], XTAL_1_8432MHz ) /* TODO: Verify model */ - MCFG_RS232_PORT_ADD( "serport0", ibm5150_serport_config[0], ibm5150_com, NULL, NULL ) - MCFG_RS232_PORT_ADD( "serport1", ibm5150_serport_config[1], ibm5150_com, NULL, NULL ) - MCFG_RS232_PORT_ADD( "serport2", ibm5150_serport_config[2], ibm5150_com, NULL, NULL ) - MCFG_RS232_PORT_ADD( "serport3", ibm5150_serport_config[3], ibm5150_com, NULL, NULL ) + MCFG_RS232_PORT_ADD( "serport0", ibm5150_serport_config[0], ibm5150_com, NULL ) + MCFG_RS232_PORT_ADD( "serport1", ibm5150_serport_config[1], ibm5150_com, NULL ) + MCFG_RS232_PORT_ADD( "serport2", ibm5150_serport_config[2], ibm5150_com, NULL ) + MCFG_RS232_PORT_ADD( "serport3", ibm5150_serport_config[3], ibm5150_com, NULL ) MCFG_PC_JOY_ADD("pc_joy") /* video hardware */ @@ -1111,8 +1111,8 @@ static MACHINE_CONFIG_START( europc, europc_pc_state ) MCFG_PC_FDC_XT_ADD("fdc") - MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "525dd", 0, pc_state::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fdc:1", ibmpc_floppies, "525dd", 0, pc_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "525dd", pc_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:1", ibmpc_floppies, "525dd", pc_state::floppy_formats) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) @@ -1137,8 +1137,8 @@ static MACHINE_CONFIG_START( t1000hx, tandy_pc_state ) MCFG_INS8250_ADD( "ins8250_0", ibm5150_com_interface[0], XTAL_1_8432MHz ) /* TODO: Verify model */ MCFG_INS8250_ADD( "ins8250_1", ibm5150_com_interface[1], XTAL_1_8432MHz ) /* TODO: Verify model */ - MCFG_RS232_PORT_ADD( "serport0", ibm5150_serport_config[0], ibm5150_com, NULL, NULL ) - MCFG_RS232_PORT_ADD( "serport1", ibm5150_serport_config[1], ibm5150_com, NULL, NULL ) + MCFG_RS232_PORT_ADD( "serport0", ibm5150_serport_config[0], ibm5150_com, NULL ) + MCFG_RS232_PORT_ADD( "serport1", ibm5150_serport_config[1], ibm5150_com, NULL ) /* video hardware */ MCFG_FRAGMENT_ADD( pcvideo_t1000 ) @@ -1162,7 +1162,7 @@ static MACHINE_CONFIG_START( t1000hx, tandy_pc_state ) MCFG_PC_FDC_XT_ADD("fdc") - MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "35dd", 0, pc_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "35dd", pc_state::floppy_formats) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) @@ -1171,7 +1171,7 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( t1000sx, t1000hx ) MCFG_DEVICE_REMOVE("fdc:0") - MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "525dd", 0, pc_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "525dd", pc_state::floppy_formats) MACHINE_CONFIG_END static MACHINE_CONFIG_START( t1000_16, tandy_pc_state ) @@ -1191,8 +1191,8 @@ static MACHINE_CONFIG_START( t1000_16, tandy_pc_state ) MCFG_INS8250_ADD( "ins8250_0", ibm5150_com_interface[0], XTAL_1_8432MHz ) /* TODO: Verify model */ MCFG_INS8250_ADD( "ins8250_1", ibm5150_com_interface[1], XTAL_1_8432MHz ) /* TODO: Verify model */ - MCFG_RS232_PORT_ADD( "serport0", ibm5150_serport_config[0], ibm5150_com, NULL, NULL ) - MCFG_RS232_PORT_ADD( "serport1", ibm5150_serport_config[1], ibm5150_com, NULL, NULL ) + MCFG_RS232_PORT_ADD( "serport0", ibm5150_serport_config[0], ibm5150_com, NULL ) + MCFG_RS232_PORT_ADD( "serport1", ibm5150_serport_config[1], ibm5150_com, NULL ) /* video hardware */ MCFG_FRAGMENT_ADD( pcvideo_t1000 ) @@ -1215,7 +1215,7 @@ static MACHINE_CONFIG_START( t1000_16, tandy_pc_state ) MCFG_PC_JOY_ADD("pc_joy") MCFG_PC_FDC_XT_ADD("fdc") - MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "35dd", 0, pc_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "35dd", pc_state::floppy_formats) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) @@ -1240,8 +1240,8 @@ static MACHINE_CONFIG_START( t1000_286, tandy_pc_state ) MCFG_INS8250_ADD( "ins8250_0", ibm5150_com_interface[0], XTAL_1_8432MHz ) /* TODO: Verify model */ MCFG_INS8250_ADD( "ins8250_1", ibm5150_com_interface[1], XTAL_1_8432MHz ) /* TODO: Verify model */ - MCFG_RS232_PORT_ADD( "serport0", ibm5150_serport_config[0], ibm5150_com, NULL, NULL ) - MCFG_RS232_PORT_ADD( "serport1", ibm5150_serport_config[1], ibm5150_com, NULL, NULL ) + MCFG_RS232_PORT_ADD( "serport0", ibm5150_serport_config[0], ibm5150_com, NULL ) + MCFG_RS232_PORT_ADD( "serport1", ibm5150_serport_config[1], ibm5150_com, NULL ) /* video hardware */ MCFG_FRAGMENT_ADD( pcvideo_t1000 ) @@ -1264,7 +1264,7 @@ static MACHINE_CONFIG_START( t1000_286, tandy_pc_state ) MCFG_PC_JOY_ADD("pc_joy") MCFG_PC_FDC_XT_ADD("fdc") - MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "35dd", 0, pc_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "35dd", pc_state::floppy_formats) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) @@ -1309,8 +1309,8 @@ static MACHINE_CONFIG_START( ibmpcjr, tandy_pc_state ) MCFG_INS8250_ADD( "ins8250_0", ibm5150_com_interface[0], XTAL_1_8432MHz ) /* TODO: Verify model */ MCFG_INS8250_ADD( "ins8250_1", ibm5150_com_interface[1], XTAL_1_8432MHz ) /* TODO: Verify model */ - MCFG_RS232_PORT_ADD( "serport0", ibm5150_serport_config[0], ibm5150_com, NULL, NULL ) - MCFG_RS232_PORT_ADD( "serport1", ibm5150_serport_config[1], ibm5150_com, NULL, NULL ) + MCFG_RS232_PORT_ADD( "serport0", ibm5150_serport_config[0], ibm5150_com, NULL ) + MCFG_RS232_PORT_ADD( "serport1", ibm5150_serport_config[1], ibm5150_com, NULL ) /* video hardware */ MCFG_FRAGMENT_ADD( pcvideo_pcjr ) @@ -1337,7 +1337,7 @@ static MACHINE_CONFIG_START( ibmpcjr, tandy_pc_state ) MCFG_UPD765A_ADD("upd765", false, false) - MCFG_FLOPPY_DRIVE_ADD("upd765:0", ibmpc_floppies, "525dd", 0, pc_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765:0", ibmpc_floppies, "525dd", pc_state::floppy_formats) /* cartridge */ MCFG_CARTSLOT_ADD("cart1") @@ -1372,8 +1372,8 @@ static MACHINE_CONFIG_DERIVED( ibmpcjx, ibmpcjr ) MCFG_CPU_IO_MAP(ibmpcjx_io) MCFG_DEVICE_REMOVE("upd765:0"); - MCFG_FLOPPY_DRIVE_ADD("upd765:0", ibmpc_floppies, "35dd", 0, pc_state::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("upd765:1", ibmpc_floppies, "35dd", 0, pc_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765:0", ibmpc_floppies, "35dd", pc_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765:1", ibmpc_floppies, "35dd", pc_state::floppy_formats) MCFG_GFXDECODE(ibmpcjx) MACHINE_CONFIG_END @@ -1415,8 +1415,8 @@ static MACHINE_CONFIG_START( mc1502, pc_state ) MCFG_CASSETTE_ADD( "cassette", mc1502_cassette_interface ) // has no motor control MCFG_FD1793x_ADD("vg93", XTAL_16MHz / 16) - MCFG_FLOPPY_DRIVE_ADD("fd0", mc1502_floppies, "525qd", 0, pc_state::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fd1", mc1502_floppies, "525qd", 0, pc_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fd0", mc1502_floppies, "525qd", pc_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fd1", mc1502_floppies, "525qd", pc_state::floppy_formats) MCFG_SOFTWARE_LIST_ADD("flop_list","mc1502_flop") // MCFG_SOFTWARE_LIST_ADD("cass_list","mc1502_cass") @@ -1463,14 +1463,14 @@ static MACHINE_CONFIG_START( ec1841, pc_state ) MCFG_PC_FDC_XT_ADD("fdc") - MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "525dd", 0, pc_state::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fdc:1", ibmpc_floppies, "525dd", 0, pc_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "525dd", pc_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:1", ibmpc_floppies, "525dd", pc_state::floppy_formats) MCFG_SOFTWARE_LIST_ADD("flop_list","ec1841") /* keyboard -- needs dump */ MCFG_PC_KBDC_ADD("pc_kbdc", pc_kbdc_intf) - MCFG_PC_KBDC_SLOT_ADD("pc_kbdc", "kbd", pc_xt_keyboards, STR_KBD_KEYTRONIC_PC3270, NULL) + MCFG_PC_KBDC_SLOT_ADD("pc_kbdc", "kbd", pc_xt_keyboards, STR_KBD_KEYTRONIC_PC3270) /* internal ram -- up to 4 banks of 512K */ MCFG_RAM_ADD(RAM_TAG) @@ -1500,10 +1500,10 @@ static MACHINE_CONFIG_START( iskr1031, pc_state ) MCFG_INS8250_ADD( "ins8250_1", ibm5150_com_interface[1], XTAL_1_8432MHz ) /* TODO: Verify model */ MCFG_INS8250_ADD( "ins8250_2", ibm5150_com_interface[2], XTAL_1_8432MHz ) /* TODO: Verify model */ MCFG_INS8250_ADD( "ins8250_3", ibm5150_com_interface[3], XTAL_1_8432MHz ) /* TODO: Verify model */ - MCFG_RS232_PORT_ADD( "serport0", ibm5150_serport_config[0], ibm5150_com, NULL, NULL ) - MCFG_RS232_PORT_ADD( "serport1", ibm5150_serport_config[1], ibm5150_com, NULL, NULL ) - MCFG_RS232_PORT_ADD( "serport2", ibm5150_serport_config[2], ibm5150_com, NULL, NULL ) - MCFG_RS232_PORT_ADD( "serport3", ibm5150_serport_config[3], ibm5150_com, NULL, NULL ) + MCFG_RS232_PORT_ADD( "serport0", ibm5150_serport_config[0], ibm5150_com, NULL ) + MCFG_RS232_PORT_ADD( "serport1", ibm5150_serport_config[1], ibm5150_com, NULL ) + MCFG_RS232_PORT_ADD( "serport2", ibm5150_serport_config[2], ibm5150_com, NULL ) + MCFG_RS232_PORT_ADD( "serport3", ibm5150_serport_config[3], ibm5150_com, NULL ) /* video hardware */ MCFG_FRAGMENT_ADD( pcvideo_cga ) @@ -1516,7 +1516,7 @@ static MACHINE_CONFIG_START( iskr1031, pc_state ) /* keyboard */ MCFG_PC_KBDC_ADD("pc_kbdc", pc_kbdc_intf) - MCFG_PC_KBDC_SLOT_ADD("pc_kbdc", "kbd", pc_xt_keyboards, STR_KBD_KEYTRONIC_PC3270, NULL) + MCFG_PC_KBDC_SLOT_ADD("pc_kbdc", "kbd", pc_xt_keyboards, STR_KBD_KEYTRONIC_PC3270) /* printer */ MCFG_PC_LPT_ADD("lpt_0", pc_lpt_config) @@ -1525,8 +1525,8 @@ static MACHINE_CONFIG_START( iskr1031, pc_state ) MCFG_PC_FDC_XT_ADD("fdc") - MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "525dd", 0, pc_state::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fdc:1", ibmpc_floppies, "525dd", 0, pc_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "525dd", pc_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:1", ibmpc_floppies, "525dd", pc_state::floppy_formats) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) @@ -1545,8 +1545,8 @@ static MACHINE_CONFIG_DERIVED( asst128, iskr1031 ) MCFG_PIT8253_ADD( "pit8253", pcjr_pit8253_config ) - MCFG_FLOPPY_DRIVE_ADD("fdc:0", asst128_floppies, "525ssqd", 0, pc_state::asst128_formats) - MCFG_FLOPPY_DRIVE_ADD("fdc:1", asst128_floppies, "525ssqd", 0, pc_state::asst128_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:0", asst128_floppies, "525ssqd", pc_state::asst128_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:1", asst128_floppies, "525ssqd", pc_state::asst128_formats) MCFG_DEVICE_REMOVE(CGA_SCREEN_NAME) MCFG_DEVICE_REMOVE(CGA_MC6845_NAME) @@ -1576,10 +1576,10 @@ static MACHINE_CONFIG_START( iskr3104, pc_state ) MCFG_INS8250_ADD( "ins8250_1", ibm5150_com_interface[1], XTAL_1_8432MHz ) /* TODO: Verify model */ MCFG_INS8250_ADD( "ins8250_2", ibm5150_com_interface[2], XTAL_1_8432MHz ) /* TODO: Verify model */ MCFG_INS8250_ADD( "ins8250_3", ibm5150_com_interface[3], XTAL_1_8432MHz ) /* TODO: Verify model */ - MCFG_RS232_PORT_ADD( "serport0", ibm5150_serport_config[0], ibm5150_com, NULL, NULL ) - MCFG_RS232_PORT_ADD( "serport1", ibm5150_serport_config[1], ibm5150_com, NULL, NULL ) - MCFG_RS232_PORT_ADD( "serport2", ibm5150_serport_config[2], ibm5150_com, NULL, NULL ) - MCFG_RS232_PORT_ADD( "serport3", ibm5150_serport_config[3], ibm5150_com, NULL, NULL ) + MCFG_RS232_PORT_ADD( "serport0", ibm5150_serport_config[0], ibm5150_com, NULL ) + MCFG_RS232_PORT_ADD( "serport1", ibm5150_serport_config[1], ibm5150_com, NULL ) + MCFG_RS232_PORT_ADD( "serport2", ibm5150_serport_config[2], ibm5150_com, NULL ) + MCFG_RS232_PORT_ADD( "serport3", ibm5150_serport_config[3], ibm5150_com, NULL ) /* video hardware */ // MCFG_FRAGMENT_ADD( pcvideo_ega ) // Put this back after ISA are added to this driver @@ -1591,7 +1591,7 @@ static MACHINE_CONFIG_START( iskr3104, pc_state ) /* keyboard */ MCFG_PC_KBDC_ADD("pc_kbdc", pc_kbdc_intf) - MCFG_PC_KBDC_SLOT_ADD("pc_kbdc", "kbd", pc_xt_keyboards, STR_KBD_KEYTRONIC_PC3270, NULL) + MCFG_PC_KBDC_SLOT_ADD("pc_kbdc", "kbd", pc_xt_keyboards, STR_KBD_KEYTRONIC_PC3270) /* printer */ MCFG_PC_LPT_ADD("lpt_0", pc_lpt_config) @@ -1601,8 +1601,8 @@ static MACHINE_CONFIG_START( iskr3104, pc_state ) MCFG_PC_FDC_XT_ADD("fdc") - MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "525dd", 0, pc_state::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fdc:1", ibmpc_floppies, "525dd", 0, pc_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "525dd", pc_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:1", ibmpc_floppies, "525dd", pc_state::floppy_formats) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) @@ -1631,10 +1631,10 @@ static MACHINE_CONFIG_START( poisk2, pc_state ) MCFG_INS8250_ADD( "ins8250_1", ibm5150_com_interface[1], XTAL_1_8432MHz ) /* TODO: Verify model */ MCFG_INS8250_ADD( "ins8250_2", ibm5150_com_interface[2], XTAL_1_8432MHz ) /* TODO: Verify model */ MCFG_INS8250_ADD( "ins8250_3", ibm5150_com_interface[3], XTAL_1_8432MHz ) /* TODO: Verify model */ - MCFG_RS232_PORT_ADD( "serport0", ibm5150_serport_config[0], ibm5150_com, NULL, NULL ) - MCFG_RS232_PORT_ADD( "serport1", ibm5150_serport_config[1], ibm5150_com, NULL, NULL ) - MCFG_RS232_PORT_ADD( "serport2", ibm5150_serport_config[2], ibm5150_com, NULL, NULL ) - MCFG_RS232_PORT_ADD( "serport3", ibm5150_serport_config[3], ibm5150_com, NULL, NULL ) + MCFG_RS232_PORT_ADD( "serport0", ibm5150_serport_config[0], ibm5150_com, NULL ) + MCFG_RS232_PORT_ADD( "serport1", ibm5150_serport_config[1], ibm5150_com, NULL ) + MCFG_RS232_PORT_ADD( "serport2", ibm5150_serport_config[2], ibm5150_com, NULL ) + MCFG_RS232_PORT_ADD( "serport3", ibm5150_serport_config[3], ibm5150_com, NULL ) /* video hardware */ MCFG_FRAGMENT_ADD( pcvideo_poisk2 ) @@ -1647,7 +1647,7 @@ static MACHINE_CONFIG_START( poisk2, pc_state ) /* keyboard */ MCFG_PC_KBDC_ADD("pc_kbdc", pc_kbdc_intf) - MCFG_PC_KBDC_SLOT_ADD("pc_kbdc", "kbd", pc_xt_keyboards, STR_KBD_KEYTRONIC_PC3270, NULL) + MCFG_PC_KBDC_SLOT_ADD("pc_kbdc", "kbd", pc_xt_keyboards, STR_KBD_KEYTRONIC_PC3270) /* printer */ MCFG_PC_LPT_ADD("lpt_0", pc_lpt_config) @@ -1657,8 +1657,8 @@ static MACHINE_CONFIG_START( poisk2, pc_state ) MCFG_PC_FDC_XT_ADD("fdc") - MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "525dd", 0, pc_state::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fdc:1", ibmpc_floppies, "525dd", 0, pc_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "525dd", pc_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:1", ibmpc_floppies, "525dd", pc_state::floppy_formats) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) @@ -1686,10 +1686,10 @@ static MACHINE_CONFIG_START( zenith, pc_state ) MCFG_INS8250_ADD( "ins8250_1", ibm5150_com_interface[1], XTAL_1_8432MHz ) /* TODO: Verify model */ MCFG_INS8250_ADD( "ins8250_2", ibm5150_com_interface[2], XTAL_1_8432MHz ) /* TODO: Verify model */ MCFG_INS8250_ADD( "ins8250_3", ibm5150_com_interface[3], XTAL_1_8432MHz ) /* TODO: Verify model */ - MCFG_RS232_PORT_ADD( "serport0", ibm5150_serport_config[0], ibm5150_com, NULL, NULL ) - MCFG_RS232_PORT_ADD( "serport1", ibm5150_serport_config[1], ibm5150_com, NULL, NULL ) - MCFG_RS232_PORT_ADD( "serport2", ibm5150_serport_config[2], ibm5150_com, NULL, NULL ) - MCFG_RS232_PORT_ADD( "serport3", ibm5150_serport_config[3], ibm5150_com, NULL, NULL ) + MCFG_RS232_PORT_ADD( "serport0", ibm5150_serport_config[0], ibm5150_com, NULL ) + MCFG_RS232_PORT_ADD( "serport1", ibm5150_serport_config[1], ibm5150_com, NULL ) + MCFG_RS232_PORT_ADD( "serport2", ibm5150_serport_config[2], ibm5150_com, NULL ) + MCFG_RS232_PORT_ADD( "serport3", ibm5150_serport_config[3], ibm5150_com, NULL ) /* video hardware */ MCFG_FRAGMENT_ADD( pcvideo_cga ) @@ -1702,7 +1702,7 @@ static MACHINE_CONFIG_START( zenith, pc_state ) /* keyboard */ MCFG_PC_KBDC_ADD("pc_kbdc", pc_kbdc_intf) - MCFG_PC_KBDC_SLOT_ADD("pc_kbdc", "kbd", pc_xt_keyboards, STR_KBD_KEYTRONIC_PC3270, NULL) + MCFG_PC_KBDC_SLOT_ADD("pc_kbdc", "kbd", pc_xt_keyboards, STR_KBD_KEYTRONIC_PC3270) /* printer */ MCFG_PC_LPT_ADD("lpt_0", pc_lpt_config) @@ -1712,8 +1712,8 @@ static MACHINE_CONFIG_START( zenith, pc_state ) MCFG_PC_FDC_XT_ADD("fdc") - MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "525dd", 0, pc_state::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fdc:1", ibmpc_floppies, "525dd", 0, pc_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "525dd", pc_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:1", ibmpc_floppies, "525dd", pc_state::floppy_formats) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) @@ -1741,10 +1741,10 @@ static MACHINE_CONFIG_START( olivetti, pc_state ) MCFG_INS8250_ADD( "ins8250_1", ibm5150_com_interface[1], XTAL_1_8432MHz ) /* TODO: Verify model */ MCFG_INS8250_ADD( "ins8250_2", ibm5150_com_interface[2], XTAL_1_8432MHz ) /* TODO: Verify model */ MCFG_INS8250_ADD( "ins8250_3", ibm5150_com_interface[3], XTAL_1_8432MHz ) /* TODO: Verify model */ - MCFG_RS232_PORT_ADD( "serport0", ibm5150_serport_config[0], ibm5150_com, NULL, NULL ) - MCFG_RS232_PORT_ADD( "serport1", ibm5150_serport_config[1], ibm5150_com, NULL, NULL ) - MCFG_RS232_PORT_ADD( "serport2", ibm5150_serport_config[2], ibm5150_com, NULL, NULL ) - MCFG_RS232_PORT_ADD( "serport3", ibm5150_serport_config[3], ibm5150_com, NULL, NULL ) + MCFG_RS232_PORT_ADD( "serport0", ibm5150_serport_config[0], ibm5150_com, NULL ) + MCFG_RS232_PORT_ADD( "serport1", ibm5150_serport_config[1], ibm5150_com, NULL ) + MCFG_RS232_PORT_ADD( "serport2", ibm5150_serport_config[2], ibm5150_com, NULL ) + MCFG_RS232_PORT_ADD( "serport3", ibm5150_serport_config[3], ibm5150_com, NULL ) /* video hardware */ MCFG_FRAGMENT_ADD( pcvideo_cga ) @@ -1757,7 +1757,7 @@ static MACHINE_CONFIG_START( olivetti, pc_state ) /* keyboard */ MCFG_PC_KBDC_ADD("pc_kbdc", pc_kbdc_intf) - MCFG_PC_KBDC_SLOT_ADD("pc_kbdc", "kbd", pc_xt_keyboards, STR_KBD_KEYTRONIC_PC3270, NULL) + MCFG_PC_KBDC_SLOT_ADD("pc_kbdc", "kbd", pc_xt_keyboards, STR_KBD_KEYTRONIC_PC3270) /* printer */ MCFG_PC_LPT_ADD("lpt_0", pc_lpt_config) @@ -1767,8 +1767,8 @@ static MACHINE_CONFIG_START( olivetti, pc_state ) MCFG_PC_FDC_XT_ADD("fdc") - MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "525dd", 0, pc_state::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fdc:1", ibmpc_floppies, "525dd", 0, pc_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "525dd", pc_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:1", ibmpc_floppies, "525dd", pc_state::floppy_formats) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) @@ -1796,10 +1796,10 @@ static MACHINE_CONFIG_START( ibm5550, pc_state ) MCFG_INS8250_ADD( "ins8250_1", ibm5150_com_interface[1], XTAL_1_8432MHz ) /* TODO: Verify model */ MCFG_INS8250_ADD( "ins8250_2", ibm5150_com_interface[2], XTAL_1_8432MHz ) /* TODO: Verify model */ MCFG_INS8250_ADD( "ins8250_3", ibm5150_com_interface[3], XTAL_1_8432MHz ) /* TODO: Verify model */ - MCFG_RS232_PORT_ADD( "serport0", ibm5150_serport_config[0], ibm5150_com, NULL, NULL ) - MCFG_RS232_PORT_ADD( "serport1", ibm5150_serport_config[1], ibm5150_com, NULL, NULL ) - MCFG_RS232_PORT_ADD( "serport2", ibm5150_serport_config[2], ibm5150_com, NULL, NULL ) - MCFG_RS232_PORT_ADD( "serport3", ibm5150_serport_config[3], ibm5150_com, NULL, NULL ) + MCFG_RS232_PORT_ADD( "serport0", ibm5150_serport_config[0], ibm5150_com, NULL ) + MCFG_RS232_PORT_ADD( "serport1", ibm5150_serport_config[1], ibm5150_com, NULL ) + MCFG_RS232_PORT_ADD( "serport2", ibm5150_serport_config[2], ibm5150_com, NULL ) + MCFG_RS232_PORT_ADD( "serport3", ibm5150_serport_config[3], ibm5150_com, NULL ) /* video hardware */ MCFG_FRAGMENT_ADD( pcvideo_cga ) @@ -1812,7 +1812,7 @@ static MACHINE_CONFIG_START( ibm5550, pc_state ) /* keyboard */ MCFG_PC_KBDC_ADD("pc_kbdc", pc_kbdc_intf) - MCFG_PC_KBDC_SLOT_ADD("pc_kbdc", "kbd", pc_xt_keyboards, STR_KBD_KEYTRONIC_PC3270, NULL) + MCFG_PC_KBDC_SLOT_ADD("pc_kbdc", "kbd", pc_xt_keyboards, STR_KBD_KEYTRONIC_PC3270) /* printer */ MCFG_PC_LPT_ADD("lpt_0", pc_lpt_config) @@ -1822,8 +1822,8 @@ static MACHINE_CONFIG_START( ibm5550, pc_state ) MCFG_PC_FDC_XT_ADD("fdc") - MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "525dd", 0, pc_state::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fdc:1", ibmpc_floppies, "525dd", 0, pc_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:0", ibmpc_floppies, "525dd", pc_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:1", ibmpc_floppies, "525dd", pc_state::floppy_formats) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) diff --git a/src/mess/drivers/pc100.c b/src/mess/drivers/pc100.c index 5ce33ddc752..b888a198bac 100644 --- a/src/mess/drivers/pc100.c +++ b/src/mess/drivers/pc100.c @@ -497,8 +497,8 @@ static MACHINE_CONFIG_START( pc100, pc100_state ) MCFG_UPD765A_ADD("upd765", true, true) MCFG_MSM58321_ADD("rtc", XTAL_32_768kHz, rtc_intf) - MCFG_FLOPPY_DRIVE_ADD("upd765:0", pc100_floppies, "525hd", 0, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("upd765:1", pc100_floppies, "525hd", 0, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765:0", pc100_floppies, "525hd", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765:1", pc100_floppies, "525hd", floppy_image_device::default_floppy_formats) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mess/drivers/pc1512.c b/src/mess/drivers/pc1512.c index f72a5ac37c2..e1c12e1a669 100644 --- a/src/mess/drivers/pc1512.c +++ b/src/mess/drivers/pc1512.c @@ -1268,15 +1268,15 @@ static MACHINE_CONFIG_START( pc1512, pc1512_state ) MCFG_PC_FDC_XT_ADD(PC_FDC_XT_TAG) MCFG_INS8250_ADD(INS8250_TAG, uart_intf, XTAL_1_8432MHz) MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, centronics_intf) - MCFG_FLOPPY_DRIVE_ADD(PC_FDC_XT_TAG ":0", ibmpc_floppies, "525dd", 0, pc1512_state::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(PC_FDC_XT_TAG ":1", ibmpc_floppies, "525dd", 0, pc1512_state::floppy_formats) - MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL, NULL) + MCFG_FLOPPY_DRIVE_ADD(PC_FDC_XT_TAG ":0", ibmpc_floppies, "525dd", pc1512_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(PC_FDC_XT_TAG ":1", ibmpc_floppies, "525dd", pc1512_state::floppy_formats) + MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL) // ISA8 bus MCFG_ISA8_BUS_ADD(ISA_BUS_TAG, ":" I8086_TAG, isabus_intf) - MCFG_ISA8_SLOT_ADD(ISA_BUS_TAG, "isa1", pc1512_isa8_cards, NULL, NULL, false) - MCFG_ISA8_SLOT_ADD(ISA_BUS_TAG, "isa2", pc1512_isa8_cards, NULL, NULL, false) - MCFG_ISA8_SLOT_ADD(ISA_BUS_TAG, "isa3", pc1512_isa8_cards, NULL, NULL, false) + MCFG_ISA8_SLOT_ADD(ISA_BUS_TAG, "isa1", pc1512_isa8_cards, NULL, false) + MCFG_ISA8_SLOT_ADD(ISA_BUS_TAG, "isa2", pc1512_isa8_cards, NULL, false) + MCFG_ISA8_SLOT_ADD(ISA_BUS_TAG, "isa3", pc1512_isa8_cards, NULL, false) // internal ram MCFG_RAM_ADD(RAM_TAG) @@ -1314,15 +1314,15 @@ static MACHINE_CONFIG_START( pc1640, pc1640_state ) MCFG_PC_FDC_XT_ADD(PC_FDC_XT_TAG) MCFG_INS8250_ADD(INS8250_TAG, uart_intf, XTAL_1_8432MHz) MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, centronics_intf) - MCFG_FLOPPY_DRIVE_ADD(PC_FDC_XT_TAG ":0", ibmpc_floppies, "525dd", 0, pc1512_state::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(PC_FDC_XT_TAG ":1", ibmpc_floppies, "525dd", 0, pc1512_state::floppy_formats) - MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL, NULL) + MCFG_FLOPPY_DRIVE_ADD(PC_FDC_XT_TAG ":0", ibmpc_floppies, "525dd", pc1512_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(PC_FDC_XT_TAG ":1", ibmpc_floppies, "525dd", pc1512_state::floppy_formats) + MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL) // ISA8 bus MCFG_ISA8_BUS_ADD(ISA_BUS_TAG, ":" I8086_TAG, isabus_intf) - MCFG_ISA8_SLOT_ADD(ISA_BUS_TAG, "isa1", pc1512_isa8_cards, "wdxt_gen", NULL, false) - MCFG_ISA8_SLOT_ADD(ISA_BUS_TAG, "isa2", pc1512_isa8_cards, NULL, NULL, false) - MCFG_ISA8_SLOT_ADD(ISA_BUS_TAG, "isa3", pc1512_isa8_cards, NULL, NULL, false) + MCFG_ISA8_SLOT_ADD(ISA_BUS_TAG, "isa1", pc1512_isa8_cards, "wdxt_gen", false) + MCFG_ISA8_SLOT_ADD(ISA_BUS_TAG, "isa2", pc1512_isa8_cards, NULL, false) + MCFG_ISA8_SLOT_ADD(ISA_BUS_TAG, "isa3", pc1512_isa8_cards, NULL, false) // internal ram MCFG_RAM_ADD(RAM_TAG) diff --git a/src/mess/drivers/pc8401a.c b/src/mess/drivers/pc8401a.c index 6c730f8fd61..61febb606fc 100644 --- a/src/mess/drivers/pc8401a.c +++ b/src/mess/drivers/pc8401a.c @@ -616,7 +616,7 @@ static MACHINE_CONFIG_START( pc8401a, pc8401a_state ) MCFG_UPD1990A_ADD(UPD1990A_TAG, XTAL_32_768kHz, rtc_intf) MCFG_I8255A_ADD(I8255A_TAG, ppi_intf) MCFG_I8251_ADD(I8251_TAG, uart_intf) - MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL, NULL) + MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL) /* video hardware */ MCFG_FRAGMENT_ADD(pc8401a_video) @@ -650,7 +650,7 @@ static MACHINE_CONFIG_START( pc8500, pc8500_state ) MCFG_UPD1990A_ADD(UPD1990A_TAG, XTAL_32_768kHz, rtc_intf) MCFG_I8255A_ADD(I8255A_TAG, ppi_intf) MCFG_I8251_ADD(I8251_TAG, uart_intf) - MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL, NULL) + MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL) /* video hardware */ MCFG_FRAGMENT_ADD(pc8500_video) diff --git a/src/mess/drivers/pc8801.c b/src/mess/drivers/pc8801.c index f393e098ef1..c6b0016b869 100644 --- a/src/mess/drivers/pc8801.c +++ b/src/mess/drivers/pc8801.c @@ -2684,8 +2684,8 @@ static MACHINE_CONFIG_START( pc8801, pc8801_state ) MCFG_I8251_ADD(I8251_TAG, uart_intf) - MCFG_FLOPPY_DRIVE_ADD("upd765:0", pc88_floppies, "525hd", 0, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("upd765:1", pc88_floppies, "525hd", 0, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765:0", pc88_floppies, "525hd", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765:1", pc88_floppies, "525hd", floppy_image_device::default_floppy_formats) MCFG_SOFTWARE_LIST_ADD("disk_list","pc8801_flop") /* video hardware */ diff --git a/src/mess/drivers/pc88va.c b/src/mess/drivers/pc88va.c index 103174ae7dc..3d2a81a70f2 100644 --- a/src/mess/drivers/pc88va.c +++ b/src/mess/drivers/pc88va.c @@ -1885,8 +1885,8 @@ static MACHINE_CONFIG_START( pc88va, pc88va_state ) MCFG_UPD71071_ADD("dmac",pc88va_dma_config) MCFG_UPD765A_ADD("upd765", false, true) - MCFG_FLOPPY_DRIVE_ADD("upd765:0", pc88va_floppies, "525hd", 0, pc88va_state::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("upd765:1", pc88va_floppies, "525hd", 0, pc88va_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765:0", pc88va_floppies, "525hd", pc88va_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765:1", pc88va_floppies, "525hd", pc88va_state::floppy_formats) MCFG_SOFTWARE_LIST_ADD("disk_list","pc88va") MCFG_PIT8253_ADD("pit8253",pc88va_pit8253_config) diff --git a/src/mess/drivers/pc9801.c b/src/mess/drivers/pc9801.c index 027b1d7e5e2..c47d727fc9f 100644 --- a/src/mess/drivers/pc9801.c +++ b/src/mess/drivers/pc9801.c @@ -3533,8 +3533,8 @@ static MACHINE_CONFIG_FRAGMENT( pc9801_mouse ) MACHINE_CONFIG_END static MACHINE_CONFIG_FRAGMENT( pc9801_cbus ) - MCFG_PC9801CBUS_SLOT_ADD("cbus0", pc9801_cbus, "pc9801_26", NULL) - MCFG_PC9801CBUS_SLOT_ADD("cbus1", pc9801_cbus, NULL, NULL) + MCFG_PC9801CBUS_SLOT_ADD("cbus0", pc9801_cbus, "pc9801_26") + MCFG_PC9801CBUS_SLOT_ADD("cbus1", pc9801_cbus, NULL) // TODO: six max slots MACHINE_CONFIG_END @@ -3570,10 +3570,10 @@ static MACHINE_CONFIG_START( pc9801, pc9801_state ) MCFG_UPD765A_ADD("upd765_2hd", false, true) MCFG_UPD765A_ADD("upd765_2dd", false, true) - MCFG_FLOPPY_DRIVE_ADD("upd765_2hd:0", pc9801_floppies, "525hd", 0, pc9801_state::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("upd765_2hd:1", pc9801_floppies, "525hd", 0, pc9801_state::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("upd765_2dd:0", pc9801_floppies, "525hd", 0, pc9801_state::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("upd765_2dd:1", pc9801_floppies, "525hd", 0, pc9801_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765_2hd:0", pc9801_floppies, "525hd", pc9801_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765_2hd:1", pc9801_floppies, "525hd", pc9801_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765_2dd:0", pc9801_floppies, "525hd", pc9801_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765_2dd:1", pc9801_floppies, "525hd", pc9801_state::floppy_formats) MCFG_SOFTWARE_LIST_ADD("disk_list","pc98") @@ -3637,8 +3637,8 @@ static MACHINE_CONFIG_START( pc9801rs, pc9801_state ) MCFG_UPD765A_ADD("upd765_2hd", false, true) //"upd765_2dd" - MCFG_FLOPPY_DRIVE_ADD("upd765_2hd:0", pc9801_floppies, "525hd", 0, pc9801_state::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("upd765_2hd:1", pc9801_floppies, "525hd", 0, pc9801_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765_2hd:0", pc9801_floppies, "525hd", pc9801_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765_2hd:1", pc9801_floppies, "525hd", pc9801_state::floppy_formats) MCFG_FRAGMENT_ADD(pc9801_cbus) @@ -3703,8 +3703,8 @@ static MACHINE_CONFIG_START( pc9821, pc9801_state ) MCFG_UPD765A_ADD("upd765_2hd", false, true) //"upd765_2dd" - MCFG_FLOPPY_DRIVE_ADD("upd765_2hd:0", pc9801_floppies, "525hd", 0, pc9801_state::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("upd765_2hd:1", pc9801_floppies, "525hd", 0, pc9801_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765_2hd:0", pc9801_floppies, "525hd", pc9801_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765_2hd:1", pc9801_floppies, "525hd", pc9801_state::floppy_formats) MCFG_FRAGMENT_ADD(pc9801_cbus) diff --git a/src/mess/drivers/pce.c b/src/mess/drivers/pce.c index e9d8bfe9af7..974210d8a51 100644 --- a/src/mess/drivers/pce.c +++ b/src/mess/drivers/pce.c @@ -400,13 +400,13 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( pce, pce_common ) - MCFG_PCE_CARTRIDGE_ADD("cartslot", pce_cart, NULL, NULL) + MCFG_PCE_CARTRIDGE_ADD("cartslot", pce_cart, NULL) MCFG_SOFTWARE_LIST_ADD("cart_list","pce") MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( tg16, pce_common ) - MCFG_TG16_CARTRIDGE_ADD("cartslot", pce_cart, NULL, NULL) + MCFG_TG16_CARTRIDGE_ADD("cartslot", pce_cart, NULL) MCFG_SOFTWARE_LIST_ADD("cart_list","tg16") MACHINE_CONFIG_END @@ -440,7 +440,7 @@ static MACHINE_CONFIG_START( sgx, pce_state ) MCFG_SOUND_ROUTE(0, "lspeaker", 1.00) MCFG_SOUND_ROUTE(1, "rspeaker", 1.00) - MCFG_PCE_CARTRIDGE_ADD("cartslot", pce_cart, NULL, NULL) + MCFG_PCE_CARTRIDGE_ADD("cartslot", pce_cart, NULL) MCFG_SOFTWARE_LIST_ADD("cart_list","sgx") MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("pce_list","pce") diff --git a/src/mess/drivers/pcw.c b/src/mess/drivers/pcw.c index 151ff06fc9f..4bc20952ee3 100644 --- a/src/mess/drivers/pcw.c +++ b/src/mess/drivers/pcw.c @@ -1294,8 +1294,8 @@ static MACHINE_CONFIG_START( pcw, pcw_state ) MCFG_UPD765A_ADD("upd765", true, true) - MCFG_FLOPPY_DRIVE_ADD("upd765:0", pcw_floppies, "3dsdd", 0, pcw_state::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("upd765:1", pcw_floppies, "3dsdd", 0, pcw_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765:0", pcw_floppies, "3dsdd", pcw_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765:1", pcw_floppies, "3dsdd", pcw_state::floppy_formats) MCFG_SOFTWARE_LIST_ADD("disk_list","pcw") diff --git a/src/mess/drivers/pcw16.c b/src/mess/drivers/pcw16.c index 54e0810b744..980c2926cda 100644 --- a/src/mess/drivers/pcw16.c +++ b/src/mess/drivers/pcw16.c @@ -1067,8 +1067,8 @@ static MACHINE_CONFIG_START( pcw16, pcw16_state ) /* printer */ MCFG_PC_LPT_ADD("lpt", pcw16_lpt_config) MCFG_PC_FDC_SUPERIO_ADD("fdc") - MCFG_FLOPPY_DRIVE_ADD("fdc:0", pcw16_floppies, "35hd", 0, pcw16_state::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fdc:1", pcw16_floppies, "35hd", 0, pcw16_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:0", pcw16_floppies, "35hd", pcw16_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:1", pcw16_floppies, "35hd", pcw16_state::floppy_formats) MCFG_SOFTWARE_LIST_ADD("disk_list","pcw16") diff --git a/src/mess/drivers/pet.c b/src/mess/drivers/pet.c index 065285b0052..5571443e086 100644 --- a/src/mess/drivers/pet.c +++ b/src/mess/drivers/pet.c @@ -1470,11 +1470,11 @@ static MACHINE_CONFIG_START( pet, pet_state ) MCFG_CBM_IEEE488_ADD("c4040") MCFG_IEEE488_SRQ_CALLBACK(DEVWRITELINE(M6520_2_TAG, pia6821_device, cb1_w)) MCFG_IEEE488_ATN_CALLBACK(DEVWRITELINE(M6520_2_TAG, pia6821_device, ca1_w)) - MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, "c2n", NULL, DEVWRITELINE(M6520_1_TAG, pia6821_device, ca1_w)) - MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT2_TAG, cbm_datassette_devices, NULL, NULL, DEVWRITELINE(M6522_TAG, via6522_device, write_cb1)) - MCFG_PET_EXPANSION_SLOT_ADD(PET_EXPANSION_SLOT_TAG, XTAL_8MHz/8, pet_expansion_cards, NULL, NULL) + MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, "c2n", DEVWRITELINE(M6520_1_TAG, pia6821_device, ca1_w)) + MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT2_TAG, cbm_datassette_devices, NULL, DEVWRITELINE(M6522_TAG, via6522_device, write_cb1)) + MCFG_PET_EXPANSION_SLOT_ADD(PET_EXPANSION_SLOT_TAG, XTAL_8MHz/8, pet_expansion_cards, NULL) MCFG_PET_EXPANSION_SLOT_DMA_CALLBACKS(READ8(pet_state, read), WRITE8(pet_state, write)) - MCFG_PET_USER_PORT_ADD(PET_USER_PORT_TAG, user_intf, pet_user_port_cards, NULL, NULL) + MCFG_PET_USER_PORT_ADD(PET_USER_PORT_TAG, user_intf, pet_user_port_cards, NULL) MCFG_QUICKLOAD_ADD("quickload", pet_state, cbm_pet, "p00,prg", CBM_QUICKLOAD_DELAY_SECONDS) // software lists @@ -1749,11 +1749,11 @@ static MACHINE_CONFIG_START( pet80, pet80_state ) MCFG_CBM_IEEE488_ADD("c8050") MCFG_IEEE488_SRQ_CALLBACK(DEVWRITELINE(M6520_2_TAG, pia6821_device, cb1_w)) MCFG_IEEE488_ATN_CALLBACK(DEVWRITELINE(M6520_2_TAG, pia6821_device, ca1_w)) - MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, "c2n", NULL, DEVWRITELINE(M6520_1_TAG, pia6821_device, ca1_w)) - MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT2_TAG, cbm_datassette_devices, NULL, NULL, DEVWRITELINE(M6522_TAG, via6522_device, write_cb1)) - MCFG_PET_EXPANSION_SLOT_ADD(PET_EXPANSION_SLOT_TAG, XTAL_16MHz/16, pet_expansion_cards, NULL, NULL) + MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, "c2n", DEVWRITELINE(M6520_1_TAG, pia6821_device, ca1_w)) + MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT2_TAG, cbm_datassette_devices, NULL, DEVWRITELINE(M6522_TAG, via6522_device, write_cb1)) + MCFG_PET_EXPANSION_SLOT_ADD(PET_EXPANSION_SLOT_TAG, XTAL_16MHz/16, pet_expansion_cards, NULL) MCFG_PET_EXPANSION_SLOT_DMA_CALLBACKS(READ8(pet_state, read), WRITE8(pet_state, write)) - MCFG_PET_USER_PORT_ADD(PET_USER_PORT_TAG, user_intf, pet_user_port_cards, NULL, NULL) + MCFG_PET_USER_PORT_ADD(PET_USER_PORT_TAG, user_intf, pet_user_port_cards, NULL) MCFG_QUICKLOAD_ADD("quickload", pet_state, cbm_pet, "p00,prg", CBM_QUICKLOAD_DELAY_SECONDS) // software lists @@ -1777,7 +1777,7 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED_CLASS( superpet, pet8032, superpet_state ) MCFG_DEVICE_REMOVE(PET_EXPANSION_SLOT_TAG) - MCFG_PET_EXPANSION_SLOT_ADD(PET_EXPANSION_SLOT_TAG, XTAL_16MHz/16, pet_expansion_cards, "superpet", NULL) + MCFG_PET_EXPANSION_SLOT_ADD(PET_EXPANSION_SLOT_TAG, XTAL_16MHz/16, pet_expansion_cards, "superpet") MCFG_PET_EXPANSION_SLOT_DMA_CALLBACKS(READ8(pet_state, read), WRITE8(pet_state, write)) MCFG_SOFTWARE_LIST_ADD("flop_list2", "superpet_flop") @@ -1790,7 +1790,7 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED_CLASS( cbm8096, pet80, cbm8096_state ) MCFG_DEVICE_REMOVE(PET_EXPANSION_SLOT_TAG) - MCFG_PET_EXPANSION_SLOT_ADD(PET_EXPANSION_SLOT_TAG, XTAL_16MHz/16, pet_expansion_cards, "64k", NULL) + MCFG_PET_EXPANSION_SLOT_ADD(PET_EXPANSION_SLOT_TAG, XTAL_16MHz/16, pet_expansion_cards, "64k") MCFG_PET_EXPANSION_SLOT_DMA_CALLBACKS(READ8(pet_state, read), WRITE8(pet_state, write)) MCFG_RAM_ADD(RAM_TAG) @@ -1818,7 +1818,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( cbm8296, pet80, cbm8296_state ) MCFG_DEVICE_CONFIG(cbm8296_crtc_intf) MCFG_DEVICE_REMOVE("ieee8") - MCFG_IEEE488_SLOT_ADD("ieee8", 8, cbm_ieee488_devices, "c8250", NULL) + MCFG_IEEE488_SLOT_ADD("ieee8", 8, cbm_ieee488_devices, "c8250") MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("128K") @@ -1833,7 +1833,7 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( cbm8296d, cbm8296 ) MCFG_DEVICE_REMOVE("ieee8") - MCFG_IEEE488_SLOT_ADD("ieee8", 8, cbm8296d_ieee488_devices, "c8250lp", NULL) + MCFG_IEEE488_SLOT_ADD("ieee8", 8, cbm8296d_ieee488_devices, "c8250lp") MACHINE_CONFIG_END diff --git a/src/mess/drivers/plus4.c b/src/mess/drivers/plus4.c index d478da79e2b..f70bae12ca5 100644 --- a/src/mess/drivers/plus4.c +++ b/src/mess/drivers/plus4.c @@ -736,14 +736,14 @@ static MACHINE_CONFIG_START( ntsc, plus4_state ) MCFG_MOS6551_ADD(MOS6551_TAG, XTAL_1_8432MHz, WRITELINE(plus4_state, acia_irq_w)) MCFG_MOS6529_ADD(MOS6529_USER_TAG, DEVREAD8(PLUS4_USER_PORT_TAG, plus4_user_port_device, p_r), DEVWRITE8(PLUS4_USER_PORT_TAG, plus4_user_port_device, p_w)) MCFG_MOS6529_ADD(MOS6529_KB_TAG, CONSTANT(0xff), WRITE8(plus4_state, spi_kb_w)) - MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, plus4_datassette_devices, "c1531", NULL, NULL) + MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, plus4_datassette_devices, "c1531", NULL) MCFG_CBM_IEC_ADD(NULL) MCFG_CBM_IEC_BUS_ATN_CALLBACK(DEVWRITELINE(PLUS4_USER_PORT_TAG, plus4_user_port_device, atn_w)) - MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, NULL, NULL) - MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, "joy", NULL) - MCFG_PLUS4_EXPANSION_SLOT_ADD(PLUS4_EXPANSION_SLOT_TAG, XTAL_14_31818MHz/16, plus4_expansion_cards, "c1551", NULL, WRITELINE(plus4_state, exp_irq_w)) + MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, NULL) + MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, "joy") + MCFG_PLUS4_EXPANSION_SLOT_ADD(PLUS4_EXPANSION_SLOT_TAG, XTAL_14_31818MHz/16, plus4_expansion_cards, "c1551", WRITELINE(plus4_state, exp_irq_w)) MCFG_PLUS4_EXPANSION_SLOT_DMA_CALLBACKS(READ8(plus4_state, read), WRITE8(plus4_state, write), INPUTLINE(MOS7501_TAG, INPUT_LINE_HALT)) - MCFG_PLUS4_USER_PORT_ADD(PLUS4_USER_PORT_TAG, plus4_user_port_cards, NULL, NULL) + MCFG_PLUS4_USER_PORT_ADD(PLUS4_USER_PORT_TAG, plus4_user_port_cards, NULL) MCFG_QUICKLOAD_ADD("quickload", plus4_state, cbm_c16, "p00,prg", CBM_QUICKLOAD_DELAY_SECONDS) // internal ram @@ -782,14 +782,14 @@ static MACHINE_CONFIG_START( pal, plus4_state ) MCFG_MOS6551_ADD(MOS6551_TAG, XTAL_1_8432MHz, WRITELINE(plus4_state, acia_irq_w)) MCFG_MOS6529_ADD(MOS6529_USER_TAG, DEVREAD8(PLUS4_USER_PORT_TAG, plus4_user_port_device, p_r), DEVWRITE8(PLUS4_USER_PORT_TAG, plus4_user_port_device, p_w)) MCFG_MOS6529_ADD(MOS6529_KB_TAG, CONSTANT(0xff), WRITE8(plus4_state, spi_kb_w)) - MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, plus4_datassette_devices, "c1531", NULL, NULL) + MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, plus4_datassette_devices, "c1531", NULL) MCFG_CBM_IEC_ADD(NULL) MCFG_CBM_IEC_BUS_ATN_CALLBACK(DEVWRITELINE(PLUS4_USER_PORT_TAG, plus4_user_port_device, atn_w)) - MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, NULL, NULL) - MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, "joy", NULL) - MCFG_PLUS4_EXPANSION_SLOT_ADD(PLUS4_EXPANSION_SLOT_TAG, XTAL_17_73447MHz/20, plus4_expansion_cards, "c1551", NULL, WRITELINE(plus4_state, exp_irq_w)) + MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, NULL) + MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, "joy") + MCFG_PLUS4_EXPANSION_SLOT_ADD(PLUS4_EXPANSION_SLOT_TAG, XTAL_17_73447MHz/20, plus4_expansion_cards, "c1551", WRITELINE(plus4_state, exp_irq_w)) MCFG_PLUS4_EXPANSION_SLOT_DMA_CALLBACKS(READ8(plus4_state, read), WRITE8(plus4_state, write), INPUTLINE(MOS7501_TAG, INPUT_LINE_HALT)) - MCFG_PLUS4_USER_PORT_ADD(PLUS4_USER_PORT_TAG, plus4_user_port_cards, NULL, NULL) + MCFG_PLUS4_USER_PORT_ADD(PLUS4_USER_PORT_TAG, plus4_user_port_cards, NULL) MCFG_QUICKLOAD_ADD("quickload", plus4_state, cbm_c16, "p00,prg", CBM_QUICKLOAD_DELAY_SECONDS) // internal ram diff --git a/src/mess/drivers/portfoli.c b/src/mess/drivers/portfoli.c index 07616a5d6c3..e1c690aa951 100644 --- a/src/mess/drivers/portfoli.c +++ b/src/mess/drivers/portfoli.c @@ -916,7 +916,7 @@ static MACHINE_CONFIG_START( portfolio, portfolio_state ) MCFG_INS8250_ADD(M82C50A_TAG, i8250_intf, XTAL_1_8432MHz) // should be MCFG_INS8250A_ADD MCFG_TIMER_DRIVER_ADD_PERIODIC("counter", portfolio_state, counter_tick, attotime::from_hz(XTAL_32_768kHz/16384)) MCFG_TIMER_DRIVER_ADD_PERIODIC(TIMER_TICK_TAG, portfolio_state, system_tick, attotime::from_hz(XTAL_32_768kHz/32768)) - MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL, NULL) + MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL) /* fake keyboard */ MCFG_TIMER_DRIVER_ADD_PERIODIC("keyboard", portfolio_state, keyboard_tick, attotime::from_usec(2500)) diff --git a/src/mess/drivers/prof180x.c b/src/mess/drivers/prof180x.c index ba89c11640f..3057dd8a18c 100644 --- a/src/mess/drivers/prof180x.c +++ b/src/mess/drivers/prof180x.c @@ -246,10 +246,10 @@ static MACHINE_CONFIG_START( prof180x, prof180x_state ) /* devices */ MCFG_UPD765A_ADD(FDC9268_TAG, false, true) - MCFG_FLOPPY_DRIVE_ADD(FDC9268_TAG ":0", prof180x_floppies, "35dd", 0, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(FDC9268_TAG ":1", prof180x_floppies, "35dd", 0, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(FDC9268_TAG ":2", prof180x_floppies, "35dd", 0, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(FDC9268_TAG ":3", prof180x_floppies, "35dd", 0, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(FDC9268_TAG ":0", prof180x_floppies, "35dd", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(FDC9268_TAG ":1", prof180x_floppies, "35dd", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(FDC9268_TAG ":2", prof180x_floppies, "35dd", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(FDC9268_TAG ":3", prof180x_floppies, "35dd", floppy_image_device::default_floppy_formats) //MCFG_RTC8583_ADD(MK3835_TAG, rtc_intf) MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, standard_centronics) diff --git a/src/mess/drivers/prof80.c b/src/mess/drivers/prof80.c index 10fdb7cdaf8..a3967a61541 100644 --- a/src/mess/drivers/prof80.c +++ b/src/mess/drivers/prof80.c @@ -618,20 +618,20 @@ static MACHINE_CONFIG_START( prof80, prof80_state ) // devices MCFG_UPD1990A_ADD(UPD1990A_TAG, XTAL_32_768kHz, rtc_intf) MCFG_UPD765A_ADD(UPD765_TAG, false, true) - MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", prof80_floppies, "525qd", 0, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":1", prof80_floppies, "525qd", 0, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", prof80_floppies, "525qd", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":1", prof80_floppies, "525qd", floppy_image_device::default_floppy_formats) // ECB bus MCFG_ECBBUS_ADD(Z80_TAG, ecb_intf) - MCFG_ECBBUS_SLOT_ADD(1, "ecb_1", prof80_ecb_cards, "grip21", NULL) - MCFG_ECBBUS_SLOT_ADD(2, "ecb_2", prof80_ecb_cards, NULL, NULL) - MCFG_ECBBUS_SLOT_ADD(3, "ecb_3", prof80_ecb_cards, NULL, NULL) - MCFG_ECBBUS_SLOT_ADD(4, "ecb_4", prof80_ecb_cards, NULL, NULL) - MCFG_ECBBUS_SLOT_ADD(5, "ecb_5", prof80_ecb_cards, NULL, NULL) + MCFG_ECBBUS_SLOT_ADD(1, "ecb_1", prof80_ecb_cards, "grip21") + MCFG_ECBBUS_SLOT_ADD(2, "ecb_2", prof80_ecb_cards, NULL) + MCFG_ECBBUS_SLOT_ADD(3, "ecb_3", prof80_ecb_cards, NULL) + MCFG_ECBBUS_SLOT_ADD(4, "ecb_4", prof80_ecb_cards, NULL) + MCFG_ECBBUS_SLOT_ADD(5, "ecb_5", prof80_ecb_cards, NULL) // V24 - MCFG_RS232_PORT_ADD(RS232_A_TAG, rs232_intf, default_rs232_devices, NULL, NULL) - MCFG_RS232_PORT_ADD(RS232_B_TAG, rs232_intf, default_rs232_devices, NULL, NULL) + MCFG_RS232_PORT_ADD(RS232_A_TAG, rs232_intf, default_rs232_devices, NULL) + MCFG_RS232_PORT_ADD(RS232_B_TAG, rs232_intf, default_rs232_devices, NULL) // internal ram MCFG_RAM_ADD(RAM_TAG) diff --git a/src/mess/drivers/psx.c b/src/mess/drivers/psx.c index 3d69667ec68..2f6615cdd9e 100644 --- a/src/mess/drivers/psx.c +++ b/src/mess/drivers/psx.c @@ -496,8 +496,8 @@ static MACHINE_CONFIG_START( psxntsc, psx1_state ) MCFG_RAM_DEFAULT_SIZE("2M") MCFG_DEVICE_ADD("maincpu:sio0:controllers", PSXCONTROLLERPORTS, 0) - MCFG_PSX_CTRL_PORT_ADD("port1", psx_controllers, "digital_pad", NULL) - MCFG_PSX_CTRL_PORT_ADD("port2", psx_controllers, "digital_pad", NULL) + MCFG_PSX_CTRL_PORT_ADD("port1", psx_controllers, "digital_pad") + MCFG_PSX_CTRL_PORT_ADD("port2", psx_controllers, "digital_pad") /* video hardware */ MCFG_PSXGPU_ADD( "maincpu", "gpu", CXD8561Q, 0x100000, XTAL_53_693175MHz ) @@ -532,8 +532,8 @@ static MACHINE_CONFIG_START( psxpal, psx1_state ) MCFG_RAM_DEFAULT_SIZE("2M") MCFG_DEVICE_ADD("maincpu:sio0:controllers", PSXCONTROLLERPORTS, 0) - MCFG_PSX_CTRL_PORT_ADD("port1", psx_controllers, "digital_pad", NULL) - MCFG_PSX_CTRL_PORT_ADD("port2", psx_controllers, "digital_pad", NULL) + MCFG_PSX_CTRL_PORT_ADD("port1", psx_controllers, "digital_pad") + MCFG_PSX_CTRL_PORT_ADD("port2", psx_controllers, "digital_pad") /* video hardware */ /* TODO: visible area and refresh rate */ diff --git a/src/mess/drivers/px4.c b/src/mess/drivers/px4.c index a974501e164..bf24f4f9fc1 100644 --- a/src/mess/drivers/px4.c +++ b/src/mess/drivers/px4.c @@ -1296,7 +1296,7 @@ static MACHINE_CONFIG_START( px4, px4_state ) MCFG_EPSON_SIO_ADD("sio", NULL) // rs232 port - MCFG_RS232_PORT_ADD("rs232", rs232_intf, default_rs232_devices, NULL, NULL) + MCFG_RS232_PORT_ADD("rs232", rs232_intf, default_rs232_devices, NULL) // rom capsules MCFG_CARTSLOT_ADD("capsule1") diff --git a/src/mess/drivers/pyl601.c b/src/mess/drivers/pyl601.c index a0dc8a54b03..141c869e43c 100644 --- a/src/mess/drivers/pyl601.c +++ b/src/mess/drivers/pyl601.c @@ -576,8 +576,8 @@ static MACHINE_CONFIG_START( pyl601, pyl601_state ) /* Devices */ MCFG_MC6845_ADD("crtc", MC6845, XTAL_2MHz, pyl601_crtc6845_interface) MCFG_UPD765A_ADD("upd765", true, true) - MCFG_FLOPPY_DRIVE_ADD("upd765:0", pyl601_floppies, "525hd", 0, pyl601_state::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("upd765:1", pyl601_floppies, "525hd", 0, pyl601_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765:0", pyl601_floppies, "525hd", pyl601_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765:1", pyl601_floppies, "525hd", pyl601_state::floppy_formats) MCFG_SOFTWARE_LIST_ADD("flop_list","pyl601") /* internal ram */ diff --git a/src/mess/drivers/ql.c b/src/mess/drivers/ql.c index f7431f46140..3149db92cb6 100644 --- a/src/mess/drivers/ql.c +++ b/src/mess/drivers/ql.c @@ -1032,8 +1032,8 @@ static MACHINE_CONFIG_START( ql, ql_state ) MCFG_WD1772_ADD(WD1772_TAG,ql_wd17xx_interface) MCFG_MICRODRIVE_ADD(MDV_1, mdv1_config) MCFG_MICRODRIVE_ADD(MDV_2, mdv2_config) - MCFG_RS232_PORT_ADD(RS232_A_TAG, rs232a_intf, default_rs232_devices, NULL, NULL) // wired as DCE - MCFG_RS232_PORT_ADD(RS232_B_TAG, rs232b_intf, default_rs232_devices, NULL, NULL) // wired as DTE + MCFG_RS232_PORT_ADD(RS232_A_TAG, rs232a_intf, default_rs232_devices, NULL) // wired as DCE + MCFG_RS232_PORT_ADD(RS232_B_TAG, rs232b_intf, default_rs232_devices, NULL) // wired as DTE // cartridge MCFG_CARTSLOT_ADD("cart") diff --git a/src/mess/drivers/qx10.c b/src/mess/drivers/qx10.c index 58fe0b95d6c..a3875e9c390 100644 --- a/src/mess/drivers/qx10.c +++ b/src/mess/drivers/qx10.c @@ -890,9 +890,9 @@ static MACHINE_CONFIG_START( qx10, qx10_state ) MCFG_UPD7220_ADD("upd7220", MAIN_CLK/6, hgdc_intf, upd7220_map) // unk clock MCFG_MC146818_IRQ_ADD( "rtc", MC146818_STANDARD, qx10_mc146818_config ) MCFG_UPD765A_ADD("upd765", true, true) - MCFG_FLOPPY_DRIVE_ADD("upd765:0", qx10_floppies, "525dd", 0, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("upd765:1", qx10_floppies, "525dd", 0, floppy_image_device::default_floppy_formats) - MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL, NULL) + MCFG_FLOPPY_DRIVE_ADD("upd765:0", qx10_floppies, "525dd", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765:1", qx10_floppies, "525dd", floppy_image_device::default_floppy_formats) + MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL) MCFG_QX10_KEYBOARD_ADD("kbd", qx10_keyboard_interface) /* internal ram */ diff --git a/src/mess/drivers/sage2.c b/src/mess/drivers/sage2.c index 0199581d3b1..f941d8fb778 100644 --- a/src/mess/drivers/sage2.c +++ b/src/mess/drivers/sage2.c @@ -590,11 +590,12 @@ static MACHINE_CONFIG_START( sage2, sage2_state ) MCFG_I8251_ADD(I8251_1_TAG, usart1_intf) MCFG_UPD765A_ADD(UPD765_TAG, false, false) MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, centronics_intf) - MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", sage2_floppies, "525qd", 0, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":1", sage2_floppies, "525qd", 0, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", sage2_floppies, "525qd", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":1", sage2_floppies, "525qd", floppy_image_device::default_floppy_formats) MCFG_IEEE488_BUS_ADD() - MCFG_RS232_PORT_ADD(RS232_A_TAG, rs232a_intf, default_rs232_devices, "serial_terminal", terminal) - MCFG_RS232_PORT_ADD(RS232_B_TAG, rs232b_intf, default_rs232_devices, NULL, NULL) + MCFG_RS232_PORT_ADD(RS232_A_TAG, rs232a_intf, default_rs232_devices, "serial_terminal") + MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("serial_terminal", terminal) + MCFG_RS232_PORT_ADD(RS232_B_TAG, rs232b_intf, default_rs232_devices, NULL) // internal ram MCFG_RAM_ADD(RAM_TAG) diff --git a/src/mess/drivers/samcoupe.c b/src/mess/drivers/samcoupe.c index 807e5fc89f6..84645790e31 100644 --- a/src/mess/drivers/samcoupe.c +++ b/src/mess/drivers/samcoupe.c @@ -559,8 +559,8 @@ static MACHINE_CONFIG_START( samcoupe, samcoupe_state ) MCFG_SOFTWARE_LIST_ADD("cass_list","samcoupe_cass") MCFG_WD1772x_ADD("wd1772", SAMCOUPE_XTAL_X1/3) - MCFG_FLOPPY_DRIVE_ADD("wd1772:0", samcoupe_floppies, "35dd", 0, samcoupe_state::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("wd1772:1", samcoupe_floppies, "35dd", 0, samcoupe_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("wd1772:0", samcoupe_floppies, "35dd", samcoupe_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("wd1772:1", samcoupe_floppies, "35dd", samcoupe_state::floppy_formats) MCFG_SOFTWARE_LIST_ADD("flop_list","samcoupe_flop") /* sound hardware */ diff --git a/src/mess/drivers/saturn.c b/src/mess/drivers/saturn.c index 421a7369556..11b104259e6 100644 --- a/src/mess/drivers/saturn.c +++ b/src/mess/drivers/saturn.c @@ -810,7 +810,7 @@ MACHINE_CONFIG_DERIVED( saturnus, saturn ) MCFG_SOFTWARE_LIST_ADD("cd_list","saturn") MCFG_SOFTWARE_LIST_FILTER("cd_list","NTSC-U") - MCFG_SATURN_CARTRIDGE_ADD("exp", saturn_cart, NULL, NULL) + MCFG_SATURN_CARTRIDGE_ADD("exp", saturn_cart, NULL) MCFG_SOFTWARE_LIST_ADD("cart_list","sat_cart") MACHINE_CONFIG_END @@ -820,7 +820,7 @@ MACHINE_CONFIG_DERIVED( saturneu, saturn ) MCFG_SOFTWARE_LIST_ADD("cd_list","saturn") MCFG_SOFTWARE_LIST_FILTER("cd_list","PAL") - MCFG_SATURN_CARTRIDGE_ADD("exp", saturn_cart, NULL, NULL) + MCFG_SATURN_CARTRIDGE_ADD("exp", saturn_cart, NULL) MCFG_SOFTWARE_LIST_ADD("cart_list","sat_cart") MACHINE_CONFIG_END @@ -830,7 +830,7 @@ MACHINE_CONFIG_DERIVED( saturnjp, saturn ) MCFG_SOFTWARE_LIST_ADD("cd_list","saturn") MCFG_SOFTWARE_LIST_FILTER("cd_list","NTSC-J") - MCFG_SATURN_CARTRIDGE_ADD("exp", saturn_cart, NULL, NULL) + MCFG_SATURN_CARTRIDGE_ADD("exp", saturn_cart, NULL) MCFG_SOFTWARE_LIST_ADD("cart_list","sat_cart") MACHINE_CONFIG_END diff --git a/src/mess/drivers/sdk86.c b/src/mess/drivers/sdk86.c index 4a9226511c7..86e9ce5825c 100644 --- a/src/mess/drivers/sdk86.c +++ b/src/mess/drivers/sdk86.c @@ -184,7 +184,8 @@ static MACHINE_CONFIG_START( sdk86, sdk86_state ) /* Devices */ MCFG_I8251_ADD(I8251_TAG, usart_intf) MCFG_I8279_ADD("i8279", 2500000, sdk86_intf) // based on divider - MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, "serial_terminal", terminal) + MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, "serial_terminal") + MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("serial_terminal", terminal) MCFG_TIMER_DRIVER_ADD_PERIODIC("serial", sdk86_state, serial_tick, attotime::from_hz(307200)) MACHINE_CONFIG_END diff --git a/src/mess/drivers/sg1000.c b/src/mess/drivers/sg1000.c index dbfdd08689a..853e4810511 100644 --- a/src/mess/drivers/sg1000.c +++ b/src/mess/drivers/sg1000.c @@ -813,7 +813,7 @@ static MACHINE_CONFIG_START( sg1000, sg1000_state ) MCFG_SOUND_CONFIG(psg_intf) /* cartridge */ - MCFG_SG1000_CARTRIDGE_ADD(CARTSLOT_TAG, sg1000_cart, NULL, NULL) + MCFG_SG1000_CARTRIDGE_ADD(CARTSLOT_TAG, sg1000_cart, NULL) /* software lists */ MCFG_SOFTWARE_LIST_ADD("cart_list","sg1000") @@ -833,7 +833,7 @@ static MACHINE_CONFIG_DERIVED( omv, sg1000 ) MCFG_CPU_IO_MAP(omv_io_map) MCFG_DEVICE_REMOVE(CARTSLOT_TAG) - MCFG_OMV_CARTRIDGE_ADD(CARTSLOT_TAG, sg1000_cart, NULL, NULL) + MCFG_OMV_CARTRIDGE_ADD(CARTSLOT_TAG, sg1000_cart, NULL) MCFG_RAM_MODIFY(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("2K") @@ -866,7 +866,7 @@ static MACHINE_CONFIG_START( sc3000, sc3000_state ) MCFG_CASSETTE_ADD("cassette", sc3000_cassette_interface) /* cartridge */ - MCFG_SC3000_CARTRIDGE_ADD(CARTSLOT_TAG, sg1000_cart, NULL, NULL) + MCFG_SC3000_CARTRIDGE_ADD(CARTSLOT_TAG, sg1000_cart, NULL) /* software lists */ MCFG_SOFTWARE_LIST_ADD("cart_list","sg1000") @@ -902,10 +902,10 @@ static MACHINE_CONFIG_START( sf7000, sf7000_state ) MCFG_I8255_ADD(UPD9255_1_TAG, sf7000_ppi_intf) MCFG_I8251_ADD(UPD8251_TAG, usart_intf) MCFG_UPD765A_ADD(UPD765_TAG, false, false) - MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", sf7000_floppies, "3ssdd", 0, sf7000_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", sf7000_floppies, "3ssdd", sf7000_state::floppy_formats) MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, standard_centronics) MCFG_CASSETTE_ADD("cassette", sc3000_cassette_interface) - MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL, NULL) + MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL) /* software lists */ MCFG_SOFTWARE_LIST_ADD("flop_list","sf7000") diff --git a/src/mess/drivers/sms.c b/src/mess/drivers/sms.c index abef61272f9..4239b4034cc 100644 --- a/src/mess/drivers/sms.c +++ b/src/mess/drivers/sms.c @@ -592,7 +592,7 @@ static MACHINE_CONFIG_START( sms_ntsc_base, sms_state ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SMS_CARTRIDGE_ADD("slot", sms_cart, NULL, NULL) + MCFG_SMS_CARTRIDGE_ADD("slot", sms_cart, NULL) MCFG_SOFTWARE_LIST_ADD("cart_list","sms") MACHINE_CONFIG_END @@ -648,7 +648,7 @@ static MACHINE_CONFIG_DERIVED( sms1_ntsc, sms_ntsc_base ) MCFG_SEGA315_5124_ADD("sms_vdp", _315_5124_ntsc_intf) // cardslot, not present in Master System II - MCFG_SMS_CARD_ADD("mycard", sms_cart, NULL, NULL) + MCFG_SMS_CARD_ADD("mycard", sms_cart, NULL) MACHINE_CONFIG_END @@ -686,39 +686,39 @@ static MACHINE_CONFIG_START( sms_sdisp, smssdisp_state ) /* Both CPUs seem to communicate with the VDP etc? */ MCFG_CPU_IO_MAP(sms_io) - MCFG_SMS_CARTRIDGE_ADD("slot", sms_cart, NULL, NULL) // should be mandatory? - MCFG_SMS_CARTRIDGE_ADD("slot2", sms_cart, NULL, NULL) - MCFG_SMS_CARTRIDGE_ADD("slot3", sms_cart, NULL, NULL) - MCFG_SMS_CARTRIDGE_ADD("slot4", sms_cart, NULL, NULL) - MCFG_SMS_CARTRIDGE_ADD("slot5", sms_cart, NULL, NULL) - MCFG_SMS_CARTRIDGE_ADD("slot6", sms_cart, NULL, NULL) - MCFG_SMS_CARTRIDGE_ADD("slot7", sms_cart, NULL, NULL) - MCFG_SMS_CARTRIDGE_ADD("slot8", sms_cart, NULL, NULL) - MCFG_SMS_CARTRIDGE_ADD("slot9", sms_cart, NULL, NULL) - MCFG_SMS_CARTRIDGE_ADD("slot10", sms_cart, NULL, NULL) - MCFG_SMS_CARTRIDGE_ADD("slot11", sms_cart, NULL, NULL) - MCFG_SMS_CARTRIDGE_ADD("slot12", sms_cart, NULL, NULL) - MCFG_SMS_CARTRIDGE_ADD("slot13", sms_cart, NULL, NULL) - MCFG_SMS_CARTRIDGE_ADD("slot14", sms_cart, NULL, NULL) - MCFG_SMS_CARTRIDGE_ADD("slot15", sms_cart, NULL, NULL) - MCFG_SMS_CARTRIDGE_ADD("slot16", sms_cart, NULL, NULL) + MCFG_SMS_CARTRIDGE_ADD("slot", sms_cart, NULL) // should be mandatory? + MCFG_SMS_CARTRIDGE_ADD("slot2", sms_cart, NULL) + MCFG_SMS_CARTRIDGE_ADD("slot3", sms_cart, NULL) + MCFG_SMS_CARTRIDGE_ADD("slot4", sms_cart, NULL) + MCFG_SMS_CARTRIDGE_ADD("slot5", sms_cart, NULL) + MCFG_SMS_CARTRIDGE_ADD("slot6", sms_cart, NULL) + MCFG_SMS_CARTRIDGE_ADD("slot7", sms_cart, NULL) + MCFG_SMS_CARTRIDGE_ADD("slot8", sms_cart, NULL) + MCFG_SMS_CARTRIDGE_ADD("slot9", sms_cart, NULL) + MCFG_SMS_CARTRIDGE_ADD("slot10", sms_cart, NULL) + MCFG_SMS_CARTRIDGE_ADD("slot11", sms_cart, NULL) + MCFG_SMS_CARTRIDGE_ADD("slot12", sms_cart, NULL) + MCFG_SMS_CARTRIDGE_ADD("slot13", sms_cart, NULL) + MCFG_SMS_CARTRIDGE_ADD("slot14", sms_cart, NULL) + MCFG_SMS_CARTRIDGE_ADD("slot15", sms_cart, NULL) + MCFG_SMS_CARTRIDGE_ADD("slot16", sms_cart, NULL) - MCFG_SMS_CARD_ADD("slot17", sms_cart, NULL, NULL) - MCFG_SMS_CARD_ADD("slot18", sms_cart, NULL, NULL) - MCFG_SMS_CARD_ADD("slot19", sms_cart, NULL, NULL) - MCFG_SMS_CARD_ADD("slot20", sms_cart, NULL, NULL) - MCFG_SMS_CARD_ADD("slot21", sms_cart, NULL, NULL) - MCFG_SMS_CARD_ADD("slot22", sms_cart, NULL, NULL) - MCFG_SMS_CARD_ADD("slot23", sms_cart, NULL, NULL) - MCFG_SMS_CARD_ADD("slot24", sms_cart, NULL, NULL) - MCFG_SMS_CARD_ADD("slot25", sms_cart, NULL, NULL) - MCFG_SMS_CARD_ADD("slot26", sms_cart, NULL, NULL) - MCFG_SMS_CARD_ADD("slot27", sms_cart, NULL, NULL) - MCFG_SMS_CARD_ADD("slot28", sms_cart, NULL, NULL) - MCFG_SMS_CARD_ADD("slot29", sms_cart, NULL, NULL) - MCFG_SMS_CARD_ADD("slot30", sms_cart, NULL, NULL) - MCFG_SMS_CARD_ADD("slot31", sms_cart, NULL, NULL) - MCFG_SMS_CARD_ADD("slot32", sms_cart, NULL, NULL) + MCFG_SMS_CARD_ADD("slot17", sms_cart, NULL) + MCFG_SMS_CARD_ADD("slot18", sms_cart, NULL) + MCFG_SMS_CARD_ADD("slot19", sms_cart, NULL) + MCFG_SMS_CARD_ADD("slot20", sms_cart, NULL) + MCFG_SMS_CARD_ADD("slot21", sms_cart, NULL) + MCFG_SMS_CARD_ADD("slot22", sms_cart, NULL) + MCFG_SMS_CARD_ADD("slot23", sms_cart, NULL) + MCFG_SMS_CARD_ADD("slot24", sms_cart, NULL) + MCFG_SMS_CARD_ADD("slot25", sms_cart, NULL) + MCFG_SMS_CARD_ADD("slot26", sms_cart, NULL) + MCFG_SMS_CARD_ADD("slot27", sms_cart, NULL) + MCFG_SMS_CARD_ADD("slot28", sms_cart, NULL) + MCFG_SMS_CARD_ADD("slot29", sms_cart, NULL) + MCFG_SMS_CARD_ADD("slot30", sms_cart, NULL) + MCFG_SMS_CARD_ADD("slot31", sms_cart, NULL) + MCFG_SMS_CARD_ADD("slot32", sms_cart, NULL) MCFG_SOFTWARE_LIST_ADD("cart_list","sms") MACHINE_CONFIG_END @@ -740,7 +740,7 @@ static MACHINE_CONFIG_START( sms_pal_base, sms_state ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SMS_CARTRIDGE_ADD("slot", sms_cart, NULL, NULL) + MCFG_SMS_CARTRIDGE_ADD("slot", sms_cart, NULL) MCFG_SOFTWARE_LIST_ADD("cart_list","sms") MACHINE_CONFIG_END @@ -797,7 +797,7 @@ static MACHINE_CONFIG_DERIVED( sms1_pal, sms_pal_base ) MCFG_SEGA315_5124_ADD("sms_vdp", _315_5124_pal_intf) // cardslot, not present in Master System II - MCFG_SMS_CARD_ADD("mycard", sms_cart, NULL, NULL) + MCFG_SMS_CARD_ADD("mycard", sms_cart, NULL) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( sms_fm, sms1_ntsc ) @@ -811,7 +811,7 @@ static MACHINE_CONFIG_DERIVED( sg1000m3, sms_fm ) MCFG_CPU_IO_MAP(sms_no3e3f_io) MCFG_DEVICE_REMOVE("slot") - MCFG_SG1000MK3_CARTRIDGE_ADD("slot", sg1000mk3_cart, NULL, NULL) + MCFG_SG1000MK3_CARTRIDGE_ADD("slot", sg1000mk3_cart, NULL) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( sms2_fm, sms2_ntsc ) @@ -855,7 +855,7 @@ static MACHINE_CONFIG_START( gamegear, sms_state ) MCFG_SOUND_ROUTE(1, "rspeaker", 1.00) /* cartridge */ - MCFG_GG_CARTRIDGE_ADD("slot", gg_cart, NULL, NULL) + MCFG_GG_CARTRIDGE_ADD("slot", gg_cart, NULL) MCFG_SOFTWARE_LIST_ADD("cart_list","gamegear") MACHINE_CONFIG_END diff --git a/src/mess/drivers/snes.c b/src/mess/drivers/snes.c index 0fdeeafc700..bbed04b6222 100644 --- a/src/mess/drivers/snes.c +++ b/src/mess/drivers/snes.c @@ -1665,7 +1665,7 @@ static MACHINE_CONFIG_START( snes, snes_console_state ) MCFG_SOUND_ROUTE(0, "lspeaker", 1.00) MCFG_SOUND_ROUTE(1, "rspeaker", 1.00) - MCFG_SNS_CARTRIDGE_ADD("snsslot", snes_cart, NULL, NULL) + MCFG_SNS_CARTRIDGE_ADD("snsslot", snes_cart, NULL) MCFG_SOFTWARE_LIST_ADD("cart_list","snes") MCFG_SOFTWARE_LIST_ADD("bsx_list","snes_bspack") MCFG_SOFTWARE_LIST_ADD("st_list","snes_strom") diff --git a/src/mess/drivers/softbox.c b/src/mess/drivers/softbox.c index b46c49bbfdb..2849564bc0b 100644 --- a/src/mess/drivers/softbox.c +++ b/src/mess/drivers/softbox.c @@ -304,7 +304,8 @@ static MACHINE_CONFIG_START( softbox, softbox_state ) MCFG_I8255A_ADD(I8255_1_TAG, ppi1_intf) MCFG_COM8116_ADD(COM8116_TAG, XTAL_5_0688MHz, dbrg_intf) MCFG_CBM_IEEE488_ADD("c8050") - MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, "serial_terminal", terminal) + MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, "serial_terminal") + MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("serial_terminal", terminal) // software lists MCFG_SOFTWARE_LIST_ADD("flop_list", "softbox") diff --git a/src/mess/drivers/special.c b/src/mess/drivers/special.c index cd76db0745a..9eecab154fd 100644 --- a/src/mess/drivers/special.c +++ b/src/mess/drivers/special.c @@ -451,8 +451,8 @@ static MACHINE_CONFIG_DERIVED( specimx, special ) /* Devices */ MCFG_FD1793x_ADD("fd1793", XTAL_8MHz / 8) - MCFG_FLOPPY_DRIVE_ADD("fd0", specimx_floppies, "525qd", 0, special_state::specimx_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fd1", specimx_floppies, "525qd", 0, special_state::specimx_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fd0", specimx_floppies, "525qd", special_state::specimx_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fd1", specimx_floppies, "525qd", special_state::specimx_floppy_formats) MCFG_SOFTWARE_LIST_ADD("flop_list","special_flop") /* internal ram */ @@ -491,8 +491,8 @@ static MACHINE_CONFIG_START( erik, special_state ) MCFG_I8255_ADD( "ppi8255", specialist_ppi8255_interface ) MCFG_FD1793x_ADD("fd1793", XTAL_8MHz / 8) - MCFG_FLOPPY_DRIVE_ADD("fd0", specimx_floppies, "525qd", 0, special_state::specimx_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fd1", specimx_floppies, "525qd", 0, special_state::specimx_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fd0", specimx_floppies, "525qd", special_state::specimx_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fd1", specimx_floppies, "525qd", special_state::specimx_floppy_formats) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) diff --git a/src/mess/drivers/specpls3.c b/src/mess/drivers/specpls3.c index 8e3cea1c41a..f059f655b9f 100644 --- a/src/mess/drivers/specpls3.c +++ b/src/mess/drivers/specpls3.c @@ -393,8 +393,8 @@ static MACHINE_CONFIG_DERIVED( spectrum_plus3, spectrum_128 ) MCFG_MACHINE_RESET_OVERRIDE(spectrum_state, spectrum_plus3 ) MCFG_UPD765A_ADD("upd765", true, true) - MCFG_FLOPPY_DRIVE_ADD("upd765:0", specpls3_floppies, "3ssdd", 0, spectrum_state::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("upd765:1", specpls3_floppies, "3ssdd", 0, spectrum_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765:0", specpls3_floppies, "3ssdd", spectrum_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd765:1", specpls3_floppies, "3ssdd", spectrum_state::floppy_formats) MCFG_SOFTWARE_LIST_ADD("flop_list","spectrum_flop") MACHINE_CONFIG_END diff --git a/src/mess/drivers/super6.c b/src/mess/drivers/super6.c index ec315a1f2ea..30eb071900b 100644 --- a/src/mess/drivers/super6.c +++ b/src/mess/drivers/super6.c @@ -597,10 +597,11 @@ static MACHINE_CONFIG_START( super6, super6_state ) MCFG_Z80PIO_ADD(Z80PIO_TAG, XTAL_24MHz/4, pio_intf) MCFG_WD2793x_ADD(WD2793_TAG, 1000000) MCFG_COM8116_ADD(BR1945_TAG, XTAL_5_0688MHz, brg_intf) - MCFG_FLOPPY_DRIVE_ADD(WD2793_TAG":0", super6_floppies, "525dd", NULL, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(WD2793_TAG":1", super6_floppies, NULL, NULL, floppy_image_device::default_floppy_formats) - MCFG_RS232_PORT_ADD(RS232_A_TAG, rs232b_intf, default_rs232_devices, "serial_terminal", terminal) - MCFG_RS232_PORT_ADD(RS232_B_TAG, rs232a_intf, default_rs232_devices, NULL, NULL) + MCFG_FLOPPY_DRIVE_ADD(WD2793_TAG":0", super6_floppies, "525dd", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(WD2793_TAG":1", super6_floppies, NULL, floppy_image_device::default_floppy_formats) + MCFG_RS232_PORT_ADD(RS232_A_TAG, rs232b_intf, default_rs232_devices, "serial_terminal") + MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("serial_terminal", terminal) + MCFG_RS232_PORT_ADD(RS232_B_TAG, rs232a_intf, default_rs232_devices, NULL) // internal ram MCFG_RAM_ADD(RAM_TAG) diff --git a/src/mess/drivers/superslave.c b/src/mess/drivers/superslave.c index 776af26f72c..b24e1900fa2 100644 --- a/src/mess/drivers/superslave.c +++ b/src/mess/drivers/superslave.c @@ -467,10 +467,11 @@ static MACHINE_CONFIG_START( superslave, superslave_state ) MCFG_Z80DART_ADD(Z80DART_1_TAG, 4000000, dart1_intf) MCFG_Z80PIO_ADD(Z80PIO_TAG, 4000000, pio_intf) MCFG_COM8116_ADD(BR1941_TAG, XTAL_5_0688MHz, dbrg_intf) - MCFG_RS232_PORT_ADD(RS232_A_TAG, rs232a_intf, default_rs232_devices, "serial_terminal", terminal) - MCFG_RS232_PORT_ADD(RS232_B_TAG, rs232b_intf, default_rs232_devices, NULL, NULL) - MCFG_RS232_PORT_ADD(RS232_C_TAG, rs232c_intf, default_rs232_devices, NULL, NULL) - MCFG_RS232_PORT_ADD(RS232_D_TAG, rs232d_intf, default_rs232_devices, NULL, NULL) + MCFG_RS232_PORT_ADD(RS232_A_TAG, rs232a_intf, default_rs232_devices, "serial_terminal") + MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("serial_terminal", terminal) + MCFG_RS232_PORT_ADD(RS232_B_TAG, rs232b_intf, default_rs232_devices, NULL) + MCFG_RS232_PORT_ADD(RS232_C_TAG, rs232c_intf, default_rs232_devices, NULL) + MCFG_RS232_PORT_ADD(RS232_D_TAG, rs232d_intf, default_rs232_devices, NULL) // internal ram MCFG_RAM_ADD(RAM_TAG) diff --git a/src/mess/drivers/tandy2k.c b/src/mess/drivers/tandy2k.c index e80dd661578..1c00cb97953 100644 --- a/src/mess/drivers/tandy2k.c +++ b/src/mess/drivers/tandy2k.c @@ -717,10 +717,10 @@ static MACHINE_CONFIG_START( tandy2k, tandy2k_state ) MCFG_PIC8259_ADD(I8259A_0_TAG, INPUTLINE(I80186_TAG, INPUT_LINE_INT0), VCC, NULL) MCFG_PIC8259_ADD(I8259A_1_TAG, INPUTLINE(I80186_TAG, INPUT_LINE_INT1), VCC, NULL) MCFG_I8272A_ADD(I8272A_TAG, true) - MCFG_FLOPPY_DRIVE_ADD(I8272A_TAG ":0", tandy2k_floppies, "525qd", 0, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(I8272A_TAG ":1", tandy2k_floppies, "525qd", 0, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(I8272A_TAG ":0", tandy2k_floppies, "525qd", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(I8272A_TAG ":1", tandy2k_floppies, "525qd", floppy_image_device::default_floppy_formats) MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, standard_centronics) - MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL, NULL) + MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL) MCFG_TANDY2K_KEYBOARD_ADD(kb_intf) // software lists diff --git a/src/mess/drivers/tdv2324.c b/src/mess/drivers/tdv2324.c index 6c5b5c09a2d..ece9c9fb79d 100644 --- a/src/mess/drivers/tdv2324.c +++ b/src/mess/drivers/tdv2324.c @@ -404,8 +404,8 @@ static MACHINE_CONFIG_START( tdv2324, tdv2324_state ) MCFG_PIT8253_ADD(P8253_5_1_TAG, pit1_intf) MCFG_Z80SIO2_ADD(MK3887N4_TAG, 8000000/2, sio_intf) MCFG_FD1797x_ADD(FD1797PL02_TAG, 8000000/4) - MCFG_FLOPPY_DRIVE_ADD(FD1797PL02_TAG":0", tdv2324_floppies, "8dsdd", NULL, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(FD1797PL02_TAG":1", tdv2324_floppies, "8dsdd", NULL, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(FD1797PL02_TAG":0", tdv2324_floppies, "8dsdd", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(FD1797PL02_TAG":1", tdv2324_floppies, "8dsdd", floppy_image_device::default_floppy_formats) // internal ram MCFG_RAM_ADD(RAM_TAG) diff --git a/src/mess/drivers/tiki100.c b/src/mess/drivers/tiki100.c index 99157062a96..72c424a10ac 100644 --- a/src/mess/drivers/tiki100.c +++ b/src/mess/drivers/tiki100.c @@ -611,8 +611,8 @@ static MACHINE_CONFIG_START( tiki100, tiki100_state ) MCFG_Z80CTC_ADD(Z80CTC_TAG, XTAL_8MHz/4, ctc_intf) MCFG_TIMER_DRIVER_ADD_PERIODIC("ctc", tiki100_state, ctc_tick, attotime::from_hz(XTAL_8MHz/4)) MCFG_FD1797x_ADD(FD1797_TAG, XTAL_8MHz/8) // FD1767PL-02 or FD1797-PL - MCFG_FLOPPY_DRIVE_ADD(FD1797_TAG":0", tiki100_floppies, "525dd", NULL, tiki100_state::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(FD1797_TAG":1", tiki100_floppies, "525dd", NULL, tiki100_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(FD1797_TAG":0", tiki100_floppies, "525dd", tiki100_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(FD1797_TAG":1", tiki100_floppies, "525dd", tiki100_state::floppy_formats) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mess/drivers/tim011.c b/src/mess/drivers/tim011.c index 62aedacfc82..1c9dc6fc56a 100644 --- a/src/mess/drivers/tim011.c +++ b/src/mess/drivers/tim011.c @@ -145,10 +145,10 @@ static MACHINE_CONFIG_START( tim011,tim011_state ) // FDC9266 location U43 XTAL_8MHz MCFG_UPD765A_ADD(FDC9266_TAG, true, true) /* floppy drives */ - MCFG_FLOPPY_DRIVE_ADD(FDC9266_TAG ":0", tim011_floppies, "35dd", 0, tim011_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(FDC9266_TAG ":1", tim011_floppies, "35dd", 0, tim011_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(FDC9266_TAG ":2", tim011_floppies, "35dd", 0, tim011_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(FDC9266_TAG ":3", tim011_floppies, "35dd", 0, tim011_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(FDC9266_TAG ":0", tim011_floppies, "35dd", tim011_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(FDC9266_TAG ":1", tim011_floppies, "35dd", tim011_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(FDC9266_TAG ":2", tim011_floppies, "35dd", tim011_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(FDC9266_TAG ":3", tim011_floppies, "35dd", tim011_floppy_formats) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mess/drivers/trs80m2.c b/src/mess/drivers/trs80m2.c index 011d065774f..dd856907b1d 100644 --- a/src/mess/drivers/trs80m2.c +++ b/src/mess/drivers/trs80m2.c @@ -840,10 +840,10 @@ static MACHINE_CONFIG_START( trs80m2, trs80m2_state ) MCFG_Z80PIO_ADD(Z80PIO_TAG, XTAL_8MHz/2, pio_intf) MCFG_Z80SIO0_ADD(Z80SIO_TAG, XTAL_8MHz/2, sio_intf) MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, centronics_intf) - MCFG_FLOPPY_DRIVE_ADD(FD1791_TAG":0", trs80m2_floppies, "8dsdd", NULL, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(FD1791_TAG":1", trs80m2_floppies, NULL, NULL, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(FD1791_TAG":2", trs80m2_floppies, NULL, NULL, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(FD1791_TAG":3", trs80m2_floppies, NULL, NULL, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(FD1791_TAG":0", trs80m2_floppies, "8dsdd", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(FD1791_TAG":1", trs80m2_floppies, NULL, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(FD1791_TAG":2", trs80m2_floppies, NULL, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(FD1791_TAG":3", trs80m2_floppies, NULL, floppy_image_device::default_floppy_formats) MCFG_TRS80M2_KEYBOARD_ADD(kb_intf) MCFG_ASCII_KEYBOARD_ADD(KEYBOARD_TAG, keyboard_intf) @@ -890,10 +890,10 @@ static MACHINE_CONFIG_START( trs80m16, trs80m16_state ) MCFG_Z80PIO_ADD(Z80PIO_TAG, XTAL_8MHz/2, pio_intf) MCFG_Z80SIO0_ADD(Z80SIO_TAG, XTAL_8MHz/2, sio_intf) MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, centronics_intf) - MCFG_FLOPPY_DRIVE_ADD(FD1791_TAG":0", trs80m2_floppies, "8ssdd", NULL, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(FD1791_TAG":1", trs80m2_floppies, NULL, NULL, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(FD1791_TAG":2", trs80m2_floppies, NULL, NULL, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(FD1791_TAG":3", trs80m2_floppies, NULL, NULL, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(FD1791_TAG":0", trs80m2_floppies, "8ssdd", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(FD1791_TAG":1", trs80m2_floppies, NULL, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(FD1791_TAG":2", trs80m2_floppies, NULL, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(FD1791_TAG":3", trs80m2_floppies, NULL, floppy_image_device::default_floppy_formats) MCFG_PIC8259_ADD(AM9519A_TAG, INPUTLINE(M68000_TAG, M68K_IRQ_5), VCC, NULL ) MCFG_TRS80M2_KEYBOARD_ADD(kb_intf) diff --git a/src/mess/drivers/tvc.c b/src/mess/drivers/tvc.c index 523d191e64b..02557bfd84a 100644 --- a/src/mess/drivers/tvc.c +++ b/src/mess/drivers/tvc.c @@ -716,10 +716,10 @@ static MACHINE_CONFIG_START( tvc, tvc_state ) MCFG_CARTSLOT_INTERFACE("tvc_cart") /* expansion interface */ - MCFG_TVC64_EXPANSION_ADD("exp1", tvc_exp_interface, tvc_exp , NULL, NULL) - MCFG_TVC64_EXPANSION_ADD("exp2", tvc_exp_interface, tvc_exp , NULL, NULL) - MCFG_TVC64_EXPANSION_ADD("exp3", tvc_exp_interface, tvc_exp , NULL, NULL) - MCFG_TVC64_EXPANSION_ADD("exp4", tvc_exp_interface, tvc_exp , NULL, NULL) + MCFG_TVC64_EXPANSION_ADD("exp1", tvc_exp_interface, tvc_exp , NULL) + MCFG_TVC64_EXPANSION_ADD("exp2", tvc_exp_interface, tvc_exp , NULL) + MCFG_TVC64_EXPANSION_ADD("exp3", tvc_exp_interface, tvc_exp , NULL) + MCFG_TVC64_EXPANSION_ADD("exp4", tvc_exp_interface, tvc_exp , NULL) /* cassette */ MCFG_CASSETTE_ADD( "cassette", tvc_cassette_interface ) diff --git a/src/mess/drivers/v1050.c b/src/mess/drivers/v1050.c index c66e1d51f09..e369e68b703 100644 --- a/src/mess/drivers/v1050.c +++ b/src/mess/drivers/v1050.c @@ -1101,13 +1101,13 @@ static MACHINE_CONFIG_START( v1050, v1050_state ) MCFG_I8251_ADD(I8251A_KB_TAG, /*XTAL_16MHz/8,*/ kb_8251_intf) MCFG_I8251_ADD(I8251A_SIO_TAG, /*XTAL_16MHz/8,*/ sio_8251_intf) MCFG_MB8877x_ADD(MB8877_TAG, XTAL_16MHz/16) - MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":0", v1050_floppies, "525qd", NULL, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":1", v1050_floppies, "525qd", NULL, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":2", v1050_floppies, NULL, NULL, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":3", v1050_floppies, NULL, NULL, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":0", v1050_floppies, "525qd", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":1", v1050_floppies, "525qd", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":2", v1050_floppies, NULL, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":3", v1050_floppies, NULL, floppy_image_device::default_floppy_formats) MCFG_TIMER_DRIVER_ADD_PERIODIC(TIMER_KB_TAG, v1050_state, kb_8251_tick, attotime::from_hz((double)XTAL_16MHz/4/13/8)) MCFG_TIMER_DRIVER_ADD(TIMER_SIO_TAG, v1050_state, sio_8251_tick) - MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL, NULL) + MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL) // SASI bus MCFG_SCSIBUS_ADD(SASIBUS_TAG) diff --git a/src/mess/drivers/vic10.c b/src/mess/drivers/vic10.c index b072947a50e..7c7e78af4f8 100644 --- a/src/mess/drivers/vic10.c +++ b/src/mess/drivers/vic10.c @@ -626,11 +626,11 @@ static MACHINE_CONFIG_START( vic10, vic10_state ) MCFG_MOS6526_SERIAL_CALLBACKS(DEVWRITELINE(VIC10_EXPANSION_SLOT_TAG, vic10_expansion_slot_device, cnt_w), DEVWRITELINE(VIC10_EXPANSION_SLOT_TAG, vic10_expansion_slot_device, sp_w)) MCFG_MOS6526_PORT_A_CALLBACKS(READ8(vic10_state, cia_pa_r), NULL) MCFG_MOS6526_PORT_B_CALLBACKS(READ8(vic10_state, cia_pb_r), WRITE8(vic10_state, cia_pb_w), NULL) - MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, "c1530", NULL, DEVWRITELINE(MOS6526_TAG, mos6526_device, flag_w)) - MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, NULL, NULL) + MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, "c1530", DEVWRITELINE(MOS6526_TAG, mos6526_device, flag_w)) + MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, NULL) MCFG_VCS_CONTROL_PORT_TRIGGER_HANDLER(DEVWRITELINE(MOS6566_TAG, mos6566_device, lp_w)) - MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, "joy", NULL) - MCFG_VIC10_EXPANSION_SLOT_ADD(VIC10_EXPANSION_SLOT_TAG, VIC6566_CLOCK, vic10_expansion_cards, NULL, NULL) + MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, "joy") + MCFG_VIC10_EXPANSION_SLOT_ADD(VIC10_EXPANSION_SLOT_TAG, VIC6566_CLOCK, vic10_expansion_cards, NULL) MCFG_VIC10_EXPANSION_SLOT_IRQ_CALLBACKS(WRITELINE(vic10_state, exp_irq_w), WRITELINE(vic10_state, exp_reset_w)) MCFG_VIC10_EXPANSION_SLOT_SERIAL_CALLBACKS(DEVWRITELINE(MOS6526_TAG, mos6526_device, cnt_w), DEVWRITELINE(MOS6526_TAG, mos6526_device, sp_w)) diff --git a/src/mess/drivers/vic20.c b/src/mess/drivers/vic20.c index 034f8ea7f49..8290feeff6c 100644 --- a/src/mess/drivers/vic20.c +++ b/src/mess/drivers/vic20.c @@ -668,10 +668,10 @@ static MACHINE_CONFIG_START( vic20, vic20_state ) // devices MCFG_VIA6522_ADD(M6522_1_TAG, 0, via1_intf) MCFG_VIA6522_ADD(M6522_2_TAG, 0, via2_intf) - MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, "c1530", NULL, DEVWRITELINE(M6522_2_TAG, via6522_device, write_ca1)) + MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, "c1530", DEVWRITELINE(M6522_2_TAG, via6522_device, write_ca1)) MCFG_CBM_IEC_ADD("c1541") MCFG_CBM_IEC_BUS_SRQ_CALLBACK(DEVWRITELINE(M6522_2_TAG, via6522_device, write_cb1)) - MCFG_VIC20_USER_PORT_ADD(VIC20_USER_PORT_TAG, user_intf, vic20_user_port_cards, NULL, NULL) + MCFG_VIC20_USER_PORT_ADD(VIC20_USER_PORT_TAG, user_intf, vic20_user_port_cards, NULL) MCFG_QUICKLOAD_ADD("quickload", vic20_state, cbm_vc20, "p00,prg", CBM_QUICKLOAD_DELAY_SECONDS) // software lists @@ -700,9 +700,9 @@ static MACHINE_CONFIG_DERIVED( ntsc, vic20 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) // devices - MCFG_VIC20_EXPANSION_SLOT_ADD(VIC20_EXPANSION_SLOT_TAG, MOS6560_CLOCK, vic20_expansion_cards, NULL, NULL) + MCFG_VIC20_EXPANSION_SLOT_ADD(VIC20_EXPANSION_SLOT_TAG, MOS6560_CLOCK, vic20_expansion_cards, NULL) MCFG_VIC20_EXPANSION_SLOT_IRQ_CALLBACKS(INPUTLINE(M6502_TAG, M6502_IRQ_LINE), INPUTLINE(M6502_TAG, M6502_NMI_LINE), WRITELINE(vic20_state, exp_reset_w)) - MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, "joy", NULL) + MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, "joy") MCFG_VCS_CONTROL_PORT_TRIGGER_HANDLER(DEVWRITELINE(M6560_TAG, mos6560_device, lp_w)) // software lists @@ -727,9 +727,9 @@ static MACHINE_CONFIG_DERIVED( pal, vic20 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) // devices - MCFG_VIC20_EXPANSION_SLOT_ADD(VIC20_EXPANSION_SLOT_TAG, MOS6561_CLOCK, vic20_expansion_cards, NULL, NULL) + MCFG_VIC20_EXPANSION_SLOT_ADD(VIC20_EXPANSION_SLOT_TAG, MOS6561_CLOCK, vic20_expansion_cards, NULL) MCFG_VIC20_EXPANSION_SLOT_IRQ_CALLBACKS(INPUTLINE(M6502_TAG, M6502_IRQ_LINE), INPUTLINE(M6502_TAG, M6502_NMI_LINE), WRITELINE(vic20_state, exp_reset_w)) - MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, "joy", NULL) + MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, "joy") MCFG_VCS_CONTROL_PORT_TRIGGER_HANDLER(DEVWRITELINE(M6561_TAG, mos6561_device, lp_w)) // software lists diff --git a/src/mess/drivers/victor9k.c b/src/mess/drivers/victor9k.c index fb9715e6217..cc95a76ebb5 100644 --- a/src/mess/drivers/victor9k.c +++ b/src/mess/drivers/victor9k.c @@ -958,10 +958,10 @@ static MACHINE_CONFIG_START( victor9k, victor9k_state ) MCFG_VIA6522_ADD(M6522_4_TAG, XTAL_30MHz/30, via4_intf) MCFG_VIA6522_ADD(M6522_5_TAG, XTAL_30MHz/30, via5_intf) MCFG_VIA6522_ADD(M6522_6_TAG, XTAL_30MHz/30, via6_intf) - MCFG_FLOPPY_DRIVE_ADD(I8048_TAG":0", victor9k_floppies, "525qd", 0, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(I8048_TAG":1", victor9k_floppies, "525qd", 0, floppy_image_device::default_floppy_formats) - MCFG_RS232_PORT_ADD(RS232_A_TAG, rs232a_intf, default_rs232_devices, NULL, NULL) - MCFG_RS232_PORT_ADD(RS232_B_TAG, rs232b_intf, default_rs232_devices, NULL, NULL) + MCFG_FLOPPY_DRIVE_ADD(I8048_TAG":0", victor9k_floppies, "525qd", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(I8048_TAG":1", victor9k_floppies, "525qd", floppy_image_device::default_floppy_formats) + MCFG_RS232_PORT_ADD(RS232_A_TAG, rs232a_intf, default_rs232_devices, NULL) + MCFG_RS232_PORT_ADD(RS232_B_TAG, rs232b_intf, default_rs232_devices, NULL) MCFG_VICTOR9K_KEYBOARD_ADD(kb_intf) // internal ram diff --git a/src/mess/drivers/vidbrain.c b/src/mess/drivers/vidbrain.c index baf4dfe75eb..9f2b2060f60 100644 --- a/src/mess/drivers/vidbrain.c +++ b/src/mess/drivers/vidbrain.c @@ -591,7 +591,7 @@ static MACHINE_CONFIG_START( vidbrain, vidbrain_state ) MCFG_F3853_ADD(F3853_TAG, XTAL_4MHz/2, smi_intf) // cartridge - MCFG_VIDEOBRAIN_EXPANSION_SLOT_ADD(VIDEOBRAIN_EXPANSION_SLOT_TAG, expansion_intf, expansion_cards, NULL, NULL) + MCFG_VIDEOBRAIN_EXPANSION_SLOT_ADD(VIDEOBRAIN_EXPANSION_SLOT_TAG, expansion_intf, expansion_cards, NULL) // software lists MCFG_SOFTWARE_LIST_ADD("cart_list", "vidbrain") diff --git a/src/mess/drivers/vip.c b/src/mess/drivers/vip.c index 4b8f5ff6e92..e628bd62d6a 100644 --- a/src/mess/drivers/vip.c +++ b/src/mess/drivers/vip.c @@ -782,8 +782,8 @@ static MACHINE_CONFIG_START( vip, vip_state ) MCFG_SOUND_CONFIG_DISCRETE(vip) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) - MCFG_VIP_BYTEIO_PORT_ADD(VIP_BYTEIO_PORT_TAG, byteio_intf, vip_byteio_cards, NULL, NULL) - MCFG_VIP_EXPANSION_SLOT_ADD(VIP_EXPANSION_SLOT_TAG, XTAL_3_52128MHz/2, expansion_intf, vip_expansion_cards, NULL, NULL) + MCFG_VIP_BYTEIO_PORT_ADD(VIP_BYTEIO_PORT_TAG, byteio_intf, vip_byteio_cards, NULL) + MCFG_VIP_EXPANSION_SLOT_ADD(VIP_EXPANSION_SLOT_TAG, XTAL_3_52128MHz/2, expansion_intf, vip_expansion_cards, NULL) // devices MCFG_QUICKLOAD_ADD("quickload", vip_state, vip, "bin,c8,c8x", 0) diff --git a/src/mess/drivers/vixen.c b/src/mess/drivers/vixen.c index 4f957bc62c8..24d80ae5277 100644 --- a/src/mess/drivers/vixen.c +++ b/src/mess/drivers/vixen.c @@ -833,12 +833,12 @@ static MACHINE_CONFIG_START( vixen, vixen_state ) MCFG_I8155_ADD(P8155H_IO_TAG, XTAL_23_9616MHz/6, io_i8155_intf) MCFG_I8251_ADD(P8251A_TAG, usart_intf) MCFG_FD1797x_ADD(FDC1797_TAG, XTAL_23_9616MHz/24) - MCFG_FLOPPY_DRIVE_ADD(FDC1797_TAG":0", vixen_floppies, "525dd", NULL, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(FDC1797_TAG":1", vixen_floppies, "525dd", NULL, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(FDC1797_TAG":0", vixen_floppies, "525dd", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(FDC1797_TAG":1", vixen_floppies, "525dd", floppy_image_device::default_floppy_formats) MCFG_IEEE488_BUS_ADD() MCFG_IEEE488_SRQ_CALLBACK(WRITELINE(vixen_state, srq_w)) MCFG_IEEE488_ATN_CALLBACK(WRITELINE(vixen_state, atn_w)) - MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL, NULL) + MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL) /* software lists */ MCFG_SOFTWARE_LIST_ADD("disk_list", "vixen") diff --git a/src/mess/drivers/vk100.c b/src/mess/drivers/vk100.c index 206e47356b7..3a48b35a099 100644 --- a/src/mess/drivers/vk100.c +++ b/src/mess/drivers/vk100.c @@ -1067,7 +1067,7 @@ static MACHINE_CONFIG_START( vk100, vk100_state ) /* i8251 uart */ MCFG_I8251_ADD("i8251", i8251_intf) - MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL, NULL) + MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL) MCFG_COM8116_ADD(COM5016T_TAG, XTAL_5_0688MHz, dbrg_intf) MCFG_DEFAULT_LAYOUT( layout_vk100 ) diff --git a/src/mess/drivers/vt100.c b/src/mess/drivers/vt100.c index ea01249bb62..d42fd2b3ef7 100644 --- a/src/mess/drivers/vt100.c +++ b/src/mess/drivers/vt100.c @@ -477,7 +477,7 @@ static MACHINE_CONFIG_START( vt100, vt100_state ) /* i8251 uart */ MCFG_I8251_ADD("i8251", i8251_intf) - MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL, NULL) + MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL) MCFG_COM8116_ADD(COM5016T_TAG, XTAL_5_0688MHz, dbrg_intf) diff --git a/src/mess/drivers/wangpc.c b/src/mess/drivers/wangpc.c index de6e2848ead..e46e99d223e 100644 --- a/src/mess/drivers/wangpc.c +++ b/src/mess/drivers/wangpc.c @@ -1216,19 +1216,19 @@ static MACHINE_CONFIG_START( wangpc, wangpc_state ) MCFG_IM6402_ADD(IM6402_TAG, uart_intf) MCFG_MC2661_ADD(SCN2661_TAG, 0, epci_intf) MCFG_UPD765A_ADD(UPD765_TAG, false, false) - MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", wangpc_floppies, "525dd", 0, wangpc_state::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":1", wangpc_floppies, "525dd", 0, wangpc_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", wangpc_floppies, "525dd", wangpc_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":1", wangpc_floppies, "525dd", wangpc_state::floppy_formats) MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, centronics_intf) - MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL, NULL) + MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL) MCFG_WANGPC_KEYBOARD_ADD() // bus MCFG_WANGPC_BUS_ADD(bus_intf) - MCFG_WANGPC_BUS_SLOT_ADD("slot1", 1, wangpc_cards, NULL, NULL) - MCFG_WANGPC_BUS_SLOT_ADD("slot2", 2, wangpc_cards, "lvc", NULL) - MCFG_WANGPC_BUS_SLOT_ADD("slot3", 3, wangpc_cards, NULL, NULL) - MCFG_WANGPC_BUS_SLOT_ADD("slot4", 4, wangpc_cards, NULL, NULL) - MCFG_WANGPC_BUS_SLOT_ADD("slot5", 5, wangpc_cards, NULL, NULL) + MCFG_WANGPC_BUS_SLOT_ADD("slot1", 1, wangpc_cards, NULL) + MCFG_WANGPC_BUS_SLOT_ADD("slot2", 2, wangpc_cards, "lvc") + MCFG_WANGPC_BUS_SLOT_ADD("slot3", 3, wangpc_cards, NULL) + MCFG_WANGPC_BUS_SLOT_ADD("slot4", 4, wangpc_cards, NULL) + MCFG_WANGPC_BUS_SLOT_ADD("slot5", 5, wangpc_cards, NULL) // internal ram MCFG_RAM_ADD(RAM_TAG) diff --git a/src/mess/drivers/x68k.c b/src/mess/drivers/x68k.c index 8e3a53680c9..3b137737666 100644 --- a/src/mess/drivers/x68k.c +++ b/src/mess/drivers/x68k.c @@ -2731,14 +2731,14 @@ static MACHINE_CONFIG_FRAGMENT( x68000_base ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) MCFG_UPD72065_ADD("upd72065", true, true) - MCFG_FLOPPY_DRIVE_ADD("upd72065:0", x68k_floppies, "525hd", 0, x68k_state::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("upd72065:1", x68k_floppies, "525hd", 0, x68k_state::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("upd72065:2", x68k_floppies, "525hd", 0, x68k_state::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("upd72065:3", x68k_floppies, "525hd", 0, x68k_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd72065:0", x68k_floppies, "525hd", x68k_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd72065:1", x68k_floppies, "525hd", x68k_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd72065:2", x68k_floppies, "525hd", x68k_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("upd72065:3", x68k_floppies, "525hd", x68k_state::floppy_formats) MCFG_SOFTWARE_LIST_ADD("flop_list","x68k_flop") - MCFG_X68K_EXPANSION_SLOT_ADD("exp",x68k_exp_intf,x68000_exp_cards,NULL,NULL) + MCFG_X68K_EXPANSION_SLOT_ADD("exp",x68k_exp_intf,x68000_exp_cards,NULL) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) diff --git a/src/mess/drivers/xerox820.c b/src/mess/drivers/xerox820.c index e8801e02fca..90383a5f815 100644 --- a/src/mess/drivers/xerox820.c +++ b/src/mess/drivers/xerox820.c @@ -736,11 +736,11 @@ static MACHINE_CONFIG_START( xerox820, xerox820_state ) MCFG_Z80CTC_ADD(Z80CTC_TAG, XTAL_20MHz/8, ctc_intf) //MCFG_TIMER_DRIVER_ADD_PERIODIC("ctc", xerox820_state, ctc_tick, attotime::from_hz(XTAL_20MHz/8)) MCFG_FD1771x_ADD(FD1771_TAG, XTAL_20MHz/20) - MCFG_FLOPPY_DRIVE_ADD(FD1771_TAG":0", xerox820_floppies, "sa400", NULL, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(FD1771_TAG":1", xerox820_floppies, "sa400", NULL, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(FD1771_TAG":0", xerox820_floppies, "sa400", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(FD1771_TAG":1", xerox820_floppies, "sa400", floppy_image_device::default_floppy_formats) MCFG_COM8116_ADD(COM8116_TAG, XTAL_5_0688MHz, com8116_intf) - MCFG_RS232_PORT_ADD(RS232_A_TAG, rs232a_intf, default_rs232_devices, NULL, NULL) - MCFG_RS232_PORT_ADD(RS232_B_TAG, rs232b_intf, default_rs232_devices, NULL, NULL) + MCFG_RS232_PORT_ADD(RS232_A_TAG, rs232a_intf, default_rs232_devices, NULL) + MCFG_RS232_PORT_ADD(RS232_B_TAG, rs232b_intf, default_rs232_devices, NULL) MCFG_ASCII_KEYBOARD_ADD(KEYBOARD_TAG, keyboard_intf) /* internal ram */ @@ -784,11 +784,11 @@ static MACHINE_CONFIG_START( xerox820ii, xerox820ii_state ) MCFG_Z80CTC_ADD(Z80CTC_TAG, XTAL_16MHz/4, ctc_intf) //MCFG_TIMER_DRIVER_ADD_PERIODIC("ctc", xerox820_state, ctc_tick, attotime::from_hz(XTAL_16MHz/4)) MCFG_FD1797x_ADD(FD1797_TAG, XTAL_16MHz/8) - MCFG_FLOPPY_DRIVE_ADD(FD1797_TAG":0", xerox820_floppies, "sa450", NULL, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(FD1797_TAG":1", xerox820_floppies, "sa450", NULL, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(FD1797_TAG":0", xerox820_floppies, "sa450", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(FD1797_TAG":1", xerox820_floppies, "sa450", floppy_image_device::default_floppy_formats) MCFG_COM8116_ADD(COM8116_TAG, XTAL_5_0688MHz, com8116_intf) - MCFG_RS232_PORT_ADD(RS232_A_TAG, rs232a_intf, default_rs232_devices, NULL, NULL) - MCFG_RS232_PORT_ADD(RS232_B_TAG, rs232b_intf, default_rs232_devices, NULL, NULL) + MCFG_RS232_PORT_ADD(RS232_A_TAG, rs232a_intf, default_rs232_devices, NULL) + MCFG_RS232_PORT_ADD(RS232_B_TAG, rs232b_intf, default_rs232_devices, NULL) MCFG_ASCII_KEYBOARD_ADD(KEYBOARD_TAG, keyboard_intf) // SASI bus diff --git a/src/mess/drivers/xor100.c b/src/mess/drivers/xor100.c index 2c2f34d57d9..f4ec87222c3 100644 --- a/src/mess/drivers/xor100.c +++ b/src/mess/drivers/xor100.c @@ -606,26 +606,27 @@ static MACHINE_CONFIG_START( xor100, xor100_state ) MCFG_Z80CTC_ADD(Z80CTC_TAG, XTAL_8MHz/2, ctc_intf) MCFG_COM8116_ADD(COM5016_TAG, XTAL_5_0688MHz, com5016_intf) MCFG_FD1795x_ADD(WD1795_TAG, XTAL_8MHz/4) - MCFG_FLOPPY_DRIVE_ADD(WD1795_TAG":0", xor100_floppies, "8ssdd", NULL, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(WD1795_TAG":1", xor100_floppies, "8ssdd", NULL, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(WD1795_TAG":2", xor100_floppies, NULL, NULL, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(WD1795_TAG":3", xor100_floppies, NULL, NULL, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(WD1795_TAG":0", xor100_floppies, "8ssdd", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(WD1795_TAG":1", xor100_floppies, "8ssdd", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(WD1795_TAG":2", xor100_floppies, NULL, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(WD1795_TAG":3", xor100_floppies, NULL, floppy_image_device::default_floppy_formats) MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, xor100_centronics_intf) - MCFG_RS232_PORT_ADD(RS232_A_TAG, rs232a_intf, default_rs232_devices, NULL, NULL) - MCFG_RS232_PORT_ADD(RS232_B_TAG, rs232b_intf, default_rs232_devices, "serial_terminal", terminal) + MCFG_RS232_PORT_ADD(RS232_A_TAG, rs232a_intf, default_rs232_devices, NULL) + MCFG_RS232_PORT_ADD(RS232_B_TAG, rs232b_intf, default_rs232_devices, "serial_terminal") + MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("serial_terminal", terminal) // S-100 MCFG_S100_BUS_ADD(s100_intf) - MCFG_S100_SLOT_ADD("s100_1", xor100_s100_cards, NULL, NULL) - MCFG_S100_SLOT_ADD("s100_2", xor100_s100_cards, NULL, NULL) - MCFG_S100_SLOT_ADD("s100_3", xor100_s100_cards, NULL, NULL) - MCFG_S100_SLOT_ADD("s100_4", xor100_s100_cards, NULL, NULL) - MCFG_S100_SLOT_ADD("s100_5", xor100_s100_cards, NULL, NULL) - MCFG_S100_SLOT_ADD("s100_6", xor100_s100_cards, NULL, NULL) - MCFG_S100_SLOT_ADD("s100_7", xor100_s100_cards, NULL, NULL) - MCFG_S100_SLOT_ADD("s100_8", xor100_s100_cards, NULL, NULL) - MCFG_S100_SLOT_ADD("s100_9", xor100_s100_cards, NULL, NULL) - MCFG_S100_SLOT_ADD("s100_10", xor100_s100_cards, NULL, NULL) + MCFG_S100_SLOT_ADD("s100_1", xor100_s100_cards, NULL) + MCFG_S100_SLOT_ADD("s100_2", xor100_s100_cards, NULL) + MCFG_S100_SLOT_ADD("s100_3", xor100_s100_cards, NULL) + MCFG_S100_SLOT_ADD("s100_4", xor100_s100_cards, NULL) + MCFG_S100_SLOT_ADD("s100_5", xor100_s100_cards, NULL) + MCFG_S100_SLOT_ADD("s100_6", xor100_s100_cards, NULL) + MCFG_S100_SLOT_ADD("s100_7", xor100_s100_cards, NULL) + MCFG_S100_SLOT_ADD("s100_8", xor100_s100_cards, NULL) + MCFG_S100_SLOT_ADD("s100_9", xor100_s100_cards, NULL) + MCFG_S100_SLOT_ADD("s100_10", xor100_s100_cards, NULL) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) diff --git a/src/mess/drivers/z88.c b/src/mess/drivers/z88.c index 0083933fbb2..e6ec86dcdc8 100644 --- a/src/mess/drivers/z88.c +++ b/src/mess/drivers/z88.c @@ -672,9 +672,9 @@ static MACHINE_CONFIG_START( z88, z88_state ) MCFG_RAM_EXTRA_OPTIONS("32K,64K,256K,512k") // cartridges - MCFG_Z88_CARTRIDGE_ADD("slot1", z88_cart_interface, z88_cart, NULL, NULL) - MCFG_Z88_CARTRIDGE_ADD("slot2", z88_cart_interface, z88_cart, NULL, NULL) - MCFG_Z88_CARTRIDGE_ADD("slot3", z88_cart_interface, z88_cart, NULL, NULL) + MCFG_Z88_CARTRIDGE_ADD("slot1", z88_cart_interface, z88_cart, NULL) + MCFG_Z88_CARTRIDGE_ADD("slot2", z88_cart_interface, z88_cart, NULL) + MCFG_Z88_CARTRIDGE_ADD("slot3", z88_cart_interface, z88_cart, NULL) MACHINE_CONFIG_END diff --git a/src/mess/machine/a2bus.h b/src/mess/machine/a2bus.h index ab2ef1d3645..d08fffdc6e5 100644 --- a/src/mess/machine/a2bus.h +++ b/src/mess/machine/a2bus.h @@ -23,9 +23,9 @@ MCFG_DEVICE_ADD(_tag, A2BUS, 0) \ MCFG_DEVICE_CONFIG(_config) \ a2bus_device::static_set_cputag(*device, _cputag); -#define MCFG_A2BUS_SLOT_ADD(_nbtag, _tag, _slot_intf, _def_slot, _def_inp) \ +#define MCFG_A2BUS_SLOT_ADD(_nbtag, _tag, _slot_intf, _def_slot) \ MCFG_DEVICE_ADD(_tag, A2BUS_SLOT, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) \ + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) \ a2bus_slot_device::static_set_a2bus_slot(*device, _nbtag, _tag); #define MCFG_A2BUS_SLOT_REMOVE(_tag) \ MCFG_DEVICE_REMOVE(_tag) diff --git a/src/mess/machine/a2eauxslot.h b/src/mess/machine/a2eauxslot.h index 5f8340baa1c..afcf7f1a781 100644 --- a/src/mess/machine/a2eauxslot.h +++ b/src/mess/machine/a2eauxslot.h @@ -22,9 +22,9 @@ MCFG_DEVICE_ADD(_tag, A2EAUXSLOT, 0) \ MCFG_DEVICE_CONFIG(_config) \ a2eauxslot_device::static_set_cputag(*device, _cputag); -#define MCFG_A2EAUXSLOT_SLOT_ADD(_nbtag, _tag, _slot_intf, _def_slot, _def_inp) \ +#define MCFG_A2EAUXSLOT_SLOT_ADD(_nbtag, _tag, _slot_intf, _def_slot) \ MCFG_DEVICE_ADD(_tag, A2EAUXSLOT_SLOT, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) \ + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) \ a2eauxslot_slot_device::static_set_a2eauxslot_slot(*device, _nbtag, _tag); #define MCFG_A2EAUXSLOT_SLOT_REMOVE(_tag) \ MCFG_DEVICE_REMOVE(_tag) diff --git a/src/mess/machine/a2midi.c b/src/mess/machine/a2midi.c index 9b8e4b23188..d1c2ebd2463 100644 --- a/src/mess/machine/a2midi.c +++ b/src/mess/machine/a2midi.c @@ -65,8 +65,8 @@ static const serial_port_interface midiout_intf = MACHINE_CONFIG_FRAGMENT( midi ) MCFG_PTM6840_ADD(MIDI_PTM_TAG, ptm_interface) MCFG_ACIA6850_ADD(MIDI_ACIA_TAG, acia_interface) - MCFG_SERIAL_PORT_ADD("mdin", midiin_intf, midiin_slot, "midiin", NULL) - MCFG_SERIAL_PORT_ADD("mdout", midiout_intf, midiout_slot, "midiout", NULL) + MCFG_SERIAL_PORT_ADD("mdin", midiin_intf, midiin_slot, "midiin") + MCFG_SERIAL_PORT_ADD("mdout", midiout_intf, midiout_slot, "midiout") MACHINE_CONFIG_END //------------------------------------------------- diff --git a/src/mess/machine/a2scsi.c b/src/mess/machine/a2scsi.c index f0d66576a98..ac5a966d41f 100644 --- a/src/mess/machine/a2scsi.c +++ b/src/mess/machine/a2scsi.c @@ -52,14 +52,16 @@ SLOT_INTERFACE_END MACHINE_CONFIG_FRAGMENT( scsi ) MCFG_SCSIBUS_ADD("scsi") MCFG_NSCSI_BUS_ADD(SCSI_BUS_TAG) - MCFG_NSCSI_ADD("scsibus:0", scsi_devices, 0, 0, 0, 0, false) - MCFG_NSCSI_ADD("scsibus:1", scsi_devices, 0, 0, 0, 0, false) - MCFG_NSCSI_ADD("scsibus:2", scsi_devices, 0, 0, 0, 0, false) - MCFG_NSCSI_ADD("scsibus:3", scsi_devices, 0, 0, 0, 0, false) - MCFG_NSCSI_ADD("scsibus:4", scsi_devices, 0, 0, 0, 0, false) - MCFG_NSCSI_ADD("scsibus:5", scsi_devices, 0, 0, 0, 0, false) - MCFG_NSCSI_ADD("scsibus:6", scsi_devices, "harddisk", 0, 0, 0, false) - MCFG_NSCSI_ADD("scsibus:7", scsi_devices, "ncr5380", 0, &ncr5380_interface, 10000000, true) + MCFG_NSCSI_ADD("scsibus:0", scsi_devices, 0, false) + MCFG_NSCSI_ADD("scsibus:1", scsi_devices, 0, false) + MCFG_NSCSI_ADD("scsibus:2", scsi_devices, 0, false) + MCFG_NSCSI_ADD("scsibus:3", scsi_devices, 0, false) + MCFG_NSCSI_ADD("scsibus:4", scsi_devices, 0, false) + MCFG_NSCSI_ADD("scsibus:5", scsi_devices, 0, false) + MCFG_NSCSI_ADD("scsibus:6", scsi_devices, "harddisk", false) + MCFG_NSCSI_ADD("scsibus:7", scsi_devices, "ncr5380", true) + MCFG_DEVICE_CARD_CONFIG("ncr5380", &ncr5380_interface) + MCFG_DEVICE_CARD_CLOCK("ncr5380", 10000000) MACHINE_CONFIG_END ROM_START( scsi ) diff --git a/src/mess/machine/a2ssc.c b/src/mess/machine/a2ssc.c index 2c476e17ee7..85cf151cdca 100644 --- a/src/mess/machine/a2ssc.c +++ b/src/mess/machine/a2ssc.c @@ -46,7 +46,7 @@ MACHINE_CONFIG_FRAGMENT( ssc ) MCFG_MOS6551_ADD(SSC_ACIA_TAG, XTAL_1_8432MHz, WRITELINE(a2bus_ssc_device, acia_irq_w)) MCFG_MOS6551_RXD_TXD_CALLBACKS(NULL, DEVWRITELINE(SSC_RS232_TAG, rs232_port_device, tx)) - MCFG_RS232_PORT_ADD(SSC_RS232_TAG, rs232_intf, rs232_devices, NULL, NULL) + MCFG_RS232_PORT_ADD(SSC_RS232_TAG, rs232_intf, rs232_devices, NULL) MACHINE_CONFIG_END ROM_START( ssc ) diff --git a/src/mess/machine/abc1600_bus.h b/src/mess/machine/abc1600_bus.h index 4eb7105dc15..cfac894034e 100644 --- a/src/mess/machine/abc1600_bus.h +++ b/src/mess/machine/abc1600_bus.h @@ -69,10 +69,10 @@ const abc1600bus_interface (_name) = -#define MCFG_ABC1600BUS_SLOT_ADD(_tag, _config, _slot_intf, _def_slot, _def_inp) \ +#define MCFG_ABC1600BUS_SLOT_ADD(_tag, _config, _slot_intf, _def_slot) \ MCFG_DEVICE_ADD(_tag, ABC1600BUS_SLOT, 0) \ MCFG_DEVICE_CONFIG(_config) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) diff --git a/src/mess/machine/abc890.c b/src/mess/machine/abc890.c index 9b11c49a1f3..d5a4e94cad3 100644 --- a/src/mess/machine/abc890.c +++ b/src/mess/machine/abc890.c @@ -58,13 +58,13 @@ static ABCBUS_INTERFACE( abcbus_intf ) //------------------------------------------------- static MACHINE_CONFIG_FRAGMENT( abc890 ) - MCFG_ABCBUS_SLOT_ADD("io1", abcbus_intf, abcbus_cards, NULL, NULL) - MCFG_ABCBUS_SLOT_ADD("io2", abcbus_intf, abcbus_cards, NULL, NULL) - MCFG_ABCBUS_SLOT_ADD("io3", abcbus_intf, abcbus_cards, NULL, NULL) - MCFG_ABCBUS_SLOT_ADD("io4", abcbus_intf, abcbus_cards, NULL, NULL) - MCFG_ABCBUS_SLOT_ADD("mem1", abcbus_intf, abcbus_cards, NULL, NULL) - MCFG_ABCBUS_SLOT_ADD("mem2", abcbus_intf, abcbus_cards, NULL, NULL) - MCFG_ABCBUS_SLOT_ADD("mem3", abcbus_intf, abcbus_cards, NULL, NULL) + MCFG_ABCBUS_SLOT_ADD("io1", abcbus_intf, abcbus_cards, NULL) + MCFG_ABCBUS_SLOT_ADD("io2", abcbus_intf, abcbus_cards, NULL) + MCFG_ABCBUS_SLOT_ADD("io3", abcbus_intf, abcbus_cards, NULL) + MCFG_ABCBUS_SLOT_ADD("io4", abcbus_intf, abcbus_cards, NULL) + MCFG_ABCBUS_SLOT_ADD("mem1", abcbus_intf, abcbus_cards, NULL) + MCFG_ABCBUS_SLOT_ADD("mem2", abcbus_intf, abcbus_cards, NULL) + MCFG_ABCBUS_SLOT_ADD("mem3", abcbus_intf, abcbus_cards, NULL) MACHINE_CONFIG_END @@ -84,9 +84,9 @@ machine_config_constructor abc890_device::device_mconfig_additions() const //------------------------------------------------- static MACHINE_CONFIG_FRAGMENT( abc894 ) - MCFG_ABCBUS_SLOT_ADD("io1", abcbus_intf, abcbus_cards, NULL, NULL) - MCFG_ABCBUS_SLOT_ADD("io2", abcbus_intf, abcbus_cards, NULL, NULL) - MCFG_ABCBUS_SLOT_ADD("io3", abcbus_intf, abcbus_cards, NULL, NULL) + MCFG_ABCBUS_SLOT_ADD("io1", abcbus_intf, abcbus_cards, NULL) + MCFG_ABCBUS_SLOT_ADD("io2", abcbus_intf, abcbus_cards, NULL) + MCFG_ABCBUS_SLOT_ADD("io3", abcbus_intf, abcbus_cards, NULL) MACHINE_CONFIG_END @@ -106,13 +106,14 @@ machine_config_constructor abc894_device::device_mconfig_additions() const //------------------------------------------------- static MACHINE_CONFIG_FRAGMENT( abc850 ) - MCFG_ABCBUS_SLOT_ADD("io1", abcbus_intf, abcbus_cards, "fast", abc850_fast) - MCFG_ABCBUS_SLOT_ADD("io2", abcbus_intf, abcbus_cards, "hdc", NULL) - MCFG_ABCBUS_SLOT_ADD("io3", abcbus_intf, abcbus_cards, NULL, NULL) - MCFG_ABCBUS_SLOT_ADD("io4", abcbus_intf, abcbus_cards, NULL, NULL) - MCFG_ABCBUS_SLOT_ADD("io5", abcbus_intf, abcbus_cards, NULL, NULL) - MCFG_ABCBUS_SLOT_ADD("io6", abcbus_intf, abcbus_cards, NULL, NULL) - MCFG_ABCBUS_SLOT_ADD("io7", abcbus_intf, abcbus_cards, NULL, NULL) + MCFG_ABCBUS_SLOT_ADD("io1", abcbus_intf, abcbus_cards, "fast") + MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("fast", abc850_fast) + MCFG_ABCBUS_SLOT_ADD("io2", abcbus_intf, abcbus_cards, "hdc") + MCFG_ABCBUS_SLOT_ADD("io3", abcbus_intf, abcbus_cards, NULL) + MCFG_ABCBUS_SLOT_ADD("io4", abcbus_intf, abcbus_cards, NULL) + MCFG_ABCBUS_SLOT_ADD("io5", abcbus_intf, abcbus_cards, NULL) + MCFG_ABCBUS_SLOT_ADD("io6", abcbus_intf, abcbus_cards, NULL) + MCFG_ABCBUS_SLOT_ADD("io7", abcbus_intf, abcbus_cards, NULL) MACHINE_CONFIG_END diff --git a/src/mess/machine/abc_fd2.c b/src/mess/machine/abc_fd2.c index 6a63129b120..832c75c1768 100644 --- a/src/mess/machine/abc_fd2.c +++ b/src/mess/machine/abc_fd2.c @@ -147,8 +147,8 @@ static MACHINE_CONFIG_FRAGMENT( abc_fd2 ) MCFG_Z80PIO_ADD(Z80PIO_TAG, XTAL_4MHz/2, pio_intf) // ? MCFG_FD1771x_ADD(FD1771_TAG, XTAL_4MHz/2) // ? - MCFG_FLOPPY_DRIVE_ADD(FD1771_TAG":0", abc_fd2_floppies, "525sssd", NULL, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(FD1771_TAG":1", abc_fd2_floppies, "525sssd", NULL, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(FD1771_TAG":0", abc_fd2_floppies, "525sssd", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(FD1771_TAG":1", abc_fd2_floppies, "525sssd", floppy_image_device::default_floppy_formats) MACHINE_CONFIG_END diff --git a/src/mess/machine/abcbus.h b/src/mess/machine/abcbus.h index fe3b672cf7c..cc6414f52af 100644 --- a/src/mess/machine/abcbus.h +++ b/src/mess/machine/abcbus.h @@ -82,10 +82,10 @@ const abcbus_interface (_name) = -#define MCFG_ABCBUS_SLOT_ADD(_tag, _config, _slot_intf, _def_slot, _def_inp) \ +#define MCFG_ABCBUS_SLOT_ADD(_tag, _config, _slot_intf, _def_slot) \ MCFG_DEVICE_ADD(_tag, ABCBUS_SLOT, 0) \ MCFG_DEVICE_CONFIG(_config) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) diff --git a/src/mess/machine/adam_fdc.c b/src/mess/machine/adam_fdc.c index 6595aa18ffb..8ff26567d06 100644 --- a/src/mess/machine/adam_fdc.c +++ b/src/mess/machine/adam_fdc.c @@ -126,7 +126,7 @@ static MACHINE_CONFIG_FRAGMENT( adam_fdc ) MCFG_WD2793x_ADD(WD2793_TAG, XTAL_4MHz/4) - MCFG_FLOPPY_DRIVE_ADD(WD2793_TAG":0", adam_fdc_floppies, "525dd", 0, adam_fdc_device::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(WD2793_TAG":0", adam_fdc_floppies, "525dd", adam_fdc_device::floppy_formats) MACHINE_CONFIG_END diff --git a/src/mess/machine/adamexp.h b/src/mess/machine/adamexp.h index 8268c8c55ea..18cc34d8e3d 100644 --- a/src/mess/machine/adamexp.h +++ b/src/mess/machine/adamexp.h @@ -34,10 +34,10 @@ const adam_expansion_slot_interface (_name) = -#define MCFG_ADAM_EXPANSION_SLOT_ADD(_tag, _clock, _config, _slot_intf, _def_slot, _def_inp) \ +#define MCFG_ADAM_EXPANSION_SLOT_ADD(_tag, _clock, _config, _slot_intf, _def_slot) \ MCFG_DEVICE_ADD(_tag, ADAM_EXPANSION_SLOT, _clock) \ MCFG_DEVICE_CONFIG(_config) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) diff --git a/src/mess/machine/adamnet.h b/src/mess/machine/adamnet.h index e791ccbbc84..4da558a5b0b 100644 --- a/src/mess/machine/adamnet.h +++ b/src/mess/machine/adamnet.h @@ -31,9 +31,9 @@ #define MCFG_ADAMNET_BUS_ADD() \ MCFG_DEVICE_ADD(ADAMNET_TAG, ADAMNET, 0) -#define MCFG_ADAMNET_SLOT_ADD(_tag, _slot_intf, _def_slot, _def_inp) \ +#define MCFG_ADAMNET_SLOT_ADD(_tag, _slot_intf, _def_slot) \ MCFG_DEVICE_ADD(_tag, ADAMNET_SLOT, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) diff --git a/src/mess/machine/apollo.c b/src/mess/machine/apollo.c index 0717dced094..b05642e1057 100644 --- a/src/mess/machine/apollo.c +++ b/src/mess/machine/apollo.c @@ -1375,7 +1375,7 @@ MACHINE_CONFIG_FRAGMENT( apollo ) MCFG_DUART68681_ADD( APOLLO_SIO2_TAG, XTAL_3_6864MHz, apollo_sio2_config ) MCFG_PC_FDC_AT_ADD(APOLLO_FDC_TAG) - MCFG_FLOPPY_DRIVE_ADD(APOLLO_FDC_TAG ":0", apollo_floppies, "525hd", 0, apollo_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(APOLLO_FDC_TAG ":0", apollo_floppies, "525hd", apollo_state::floppy_formats) MCFG_OMTI8621_ADD(APOLLO_WDC_TAG, apollo_wdc_config) MCFG_SC499_ADD(APOLLO_CTAPE_TAG, apollo_ctape_config) diff --git a/src/mess/machine/bw2exp.h b/src/mess/machine/bw2exp.h index 8b46cabffbe..2874686a906 100644 --- a/src/mess/machine/bw2exp.h +++ b/src/mess/machine/bw2exp.h @@ -56,9 +56,9 @@ // INTERFACE CONFIGURATION MACROS //************************************************************************** -#define MCFG_BW2_EXPANSION_SLOT_ADD(_tag, _clock, _slot_intf, _def_slot, _def_inp) \ +#define MCFG_BW2_EXPANSION_SLOT_ADD(_tag, _clock, _slot_intf, _def_slot) \ MCFG_DEVICE_ADD(_tag, BW2_EXPANSION_SLOT, _clock) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) diff --git a/src/mess/machine/c1571.c b/src/mess/machine/c1571.c index 8bc42ac271d..a634fda79ad 100644 --- a/src/mess/machine/c1571.c +++ b/src/mess/machine/c1571.c @@ -817,7 +817,7 @@ static MACHINE_CONFIG_FRAGMENT( mini_chief ) MCFG_64H156_ADD(C64H156_TAG, XTAL_16MHz, ga_intf) MCFG_ISA8_BUS_ADD(ISA_BUS_TAG, M6502_TAG, isabus_intf) - MCFG_ISA8_SLOT_ADD(ISA_BUS_TAG, "isa1", mini_chief_isa8_cards, NULL/*"wd1002a_wx1"*/, NULL, false) + MCFG_ISA8_SLOT_ADD(ISA_BUS_TAG, "isa1", mini_chief_isa8_cards, NULL/*"wd1002a_wx1"*/, false) MACHINE_CONFIG_END diff --git a/src/mess/machine/c1581.c b/src/mess/machine/c1581.c index 73e59db9462..772e620cdcd 100644 --- a/src/mess/machine/c1581.c +++ b/src/mess/machine/c1581.c @@ -283,7 +283,7 @@ static MACHINE_CONFIG_FRAGMENT( c1581 ) MCFG_WD1772x_ADD(WD1772_TAG, XTAL_16MHz/2) - MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG":0", c1581_floppies, "35dd", 0, c1581_device::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG":0", c1581_floppies, "35dd", c1581_device::floppy_formats) MACHINE_CONFIG_END diff --git a/src/mess/machine/c64_midi_maplin.c b/src/mess/machine/c64_midi_maplin.c index 8824d94b337..a093d47962d 100644 --- a/src/mess/machine/c64_midi_maplin.c +++ b/src/mess/machine/c64_midi_maplin.c @@ -103,8 +103,8 @@ static const serial_port_interface midiout_intf = static MACHINE_CONFIG_FRAGMENT( c64_maplin_midi ) MCFG_ACIA6850_ADD(MC6850_TAG, acia_intf) - MCFG_SERIAL_PORT_ADD("mdin", midiin_intf, midiin_slot, "midiin", NULL) - MCFG_SERIAL_PORT_ADD("mdout", midiout_intf, midiout_slot, "midiout", NULL) + MCFG_SERIAL_PORT_ADD("mdin", midiin_intf, midiin_slot, "midiin") + MCFG_SERIAL_PORT_ADD("mdout", midiout_intf, midiout_slot, "midiout") MACHINE_CONFIG_END diff --git a/src/mess/machine/c64_midi_namesoft.c b/src/mess/machine/c64_midi_namesoft.c index e6a0c53adac..52bc988e32a 100644 --- a/src/mess/machine/c64_midi_namesoft.c +++ b/src/mess/machine/c64_midi_namesoft.c @@ -103,8 +103,8 @@ static const serial_port_interface midiout_intf = static MACHINE_CONFIG_FRAGMENT( c64_passport_midi ) MCFG_ACIA6850_ADD(MC6850_TAG, acia_intf) - MCFG_SERIAL_PORT_ADD("mdin", midiin_intf, midiin_slot, "midiin", NULL) - MCFG_SERIAL_PORT_ADD("mdout", midiout_intf, midiout_slot, "midiout", NULL) + MCFG_SERIAL_PORT_ADD("mdin", midiin_intf, midiin_slot, "midiin") + MCFG_SERIAL_PORT_ADD("mdout", midiout_intf, midiout_slot, "midiout") MACHINE_CONFIG_END diff --git a/src/mess/machine/c64_midi_passport.c b/src/mess/machine/c64_midi_passport.c index fd5d9e93e52..e8955558ff3 100644 --- a/src/mess/machine/c64_midi_passport.c +++ b/src/mess/machine/c64_midi_passport.c @@ -127,8 +127,8 @@ static MACHINE_CONFIG_FRAGMENT( c64_passport_midi ) MCFG_ACIA6850_ADD(MC6850_TAG, acia_intf) MCFG_PTM6840_ADD(MC6840_TAG, ptm_intf) - MCFG_SERIAL_PORT_ADD("mdin", midiin_intf, midiin_slot, "midiin", NULL) - MCFG_SERIAL_PORT_ADD("mdout", midiout_intf, midiout_slot, "midiout", NULL) + MCFG_SERIAL_PORT_ADD("mdin", midiin_intf, midiin_slot, "midiin") + MCFG_SERIAL_PORT_ADD("mdout", midiout_intf, midiout_slot, "midiout") MACHINE_CONFIG_END diff --git a/src/mess/machine/c64_midi_sci.c b/src/mess/machine/c64_midi_sci.c index 2ae79fb04ff..4eaf29b5462 100644 --- a/src/mess/machine/c64_midi_sci.c +++ b/src/mess/machine/c64_midi_sci.c @@ -103,8 +103,8 @@ static const serial_port_interface midiout_intf = static MACHINE_CONFIG_FRAGMENT( c64_sequential_midi ) MCFG_ACIA6850_ADD(MC6850_TAG, acia_intf) - MCFG_SERIAL_PORT_ADD("mdin", midiin_intf, midiin_slot, "midiin", NULL) - MCFG_SERIAL_PORT_ADD("mdout", midiout_intf, midiout_slot, "midiout", NULL) + MCFG_SERIAL_PORT_ADD("mdin", midiin_intf, midiin_slot, "midiin") + MCFG_SERIAL_PORT_ADD("mdout", midiout_intf, midiout_slot, "midiout") MACHINE_CONFIG_END diff --git a/src/mess/machine/c64_midi_siel.c b/src/mess/machine/c64_midi_siel.c index ebb7fc286fc..8f9c9362f11 100644 --- a/src/mess/machine/c64_midi_siel.c +++ b/src/mess/machine/c64_midi_siel.c @@ -103,8 +103,8 @@ static const serial_port_interface midiout_intf = static MACHINE_CONFIG_FRAGMENT( c64_siel_midi ) MCFG_ACIA6850_ADD(MC6850_TAG, acia_intf) - MCFG_SERIAL_PORT_ADD("mdin", midiin_intf, midiin_slot, "midiin", NULL) - MCFG_SERIAL_PORT_ADD("mdout", midiout_intf, midiout_slot, "midiout", NULL) + MCFG_SERIAL_PORT_ADD("mdin", midiin_intf, midiin_slot, "midiin") + MCFG_SERIAL_PORT_ADD("mdout", midiout_intf, midiout_slot, "midiout") MACHINE_CONFIG_END diff --git a/src/mess/machine/c64_swiftlink.c b/src/mess/machine/c64_swiftlink.c index 87aeb646989..91685cb95f1 100644 --- a/src/mess/machine/c64_swiftlink.c +++ b/src/mess/machine/c64_swiftlink.c @@ -55,7 +55,7 @@ static MACHINE_CONFIG_FRAGMENT( c64_swiftlink ) MCFG_MOS6551_ADD(MOS6551_TAG, XTAL_3_6864MHz, WRITELINE(c64_swiftlink_cartridge_device, acia_irq_w)) MCFG_MOS6551_RXD_TXD_CALLBACKS(NULL, DEVWRITELINE(RS232_TAG, rs232_port_device, tx)) - MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL, NULL) + MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL) MACHINE_CONFIG_END diff --git a/src/mess/machine/c64_turbo232.c b/src/mess/machine/c64_turbo232.c index ce28ad9da62..eee58f3b745 100644 --- a/src/mess/machine/c64_turbo232.c +++ b/src/mess/machine/c64_turbo232.c @@ -55,7 +55,7 @@ static MACHINE_CONFIG_FRAGMENT( c64_turbo232 ) MCFG_MOS6551_ADD(MOS6551_TAG, XTAL_3_6864MHz, WRITELINE(c64_turbo232_cartridge_device, acia_irq_w)) MCFG_MOS6551_RXD_TXD_CALLBACKS(NULL, DEVWRITELINE(RS232_TAG, rs232_port_device, tx)) - MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL, NULL) + MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL) MACHINE_CONFIG_END diff --git a/src/mess/machine/c64_vic1011.c b/src/mess/machine/c64_vic1011.c index 23a6ae6ec59..8d683c409d7 100644 --- a/src/mess/machine/c64_vic1011.c +++ b/src/mess/machine/c64_vic1011.c @@ -45,7 +45,7 @@ static const rs232_port_interface rs232_intf = //------------------------------------------------- static MACHINE_CONFIG_FRAGMENT( vic1011 ) - MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL, NULL) + MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL) MACHINE_CONFIG_END diff --git a/src/mess/machine/c64exp.h b/src/mess/machine/c64exp.h index a0ae13715e1..1fa57cfd8b0 100644 --- a/src/mess/machine/c64exp.h +++ b/src/mess/machine/c64exp.h @@ -54,12 +54,12 @@ // INTERFACE CONFIGURATION MACROS //************************************************************************** -#define MCFG_C64_EXPANSION_SLOT_ADD(_tag, _clock, _slot_intf, _def_slot, _def_inp) \ +#define MCFG_C64_EXPANSION_SLOT_ADD(_tag, _clock, _slot_intf, _def_slot) \ MCFG_DEVICE_ADD(_tag, C64_EXPANSION_SLOT, _clock) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) #define MCFG_C64_PASSTHRU_EXPANSION_SLOT_ADD() \ - MCFG_C64_EXPANSION_SLOT_ADD(C64_EXPANSION_SLOT_TAG, 0, c64_expansion_cards, NULL, NULL) \ + MCFG_C64_EXPANSION_SLOT_ADD(C64_EXPANSION_SLOT_TAG, 0, c64_expansion_cards, NULL) \ MCFG_C64_EXPANSION_SLOT_IRQ_CALLBACKS(DEVWRITELINE(DEVICE_SELF_OWNER, c64_expansion_slot_device, irq_w), DEVWRITELINE(DEVICE_SELF_OWNER, c64_expansion_slot_device, nmi_w), DEVWRITELINE(DEVICE_SELF_OWNER, c64_expansion_slot_device, reset_w)) \ MCFG_C64_EXPANSION_SLOT_DMA_CALLBACKS(DEVREAD8(DEVICE_SELF_OWNER, c64_expansion_slot_device, dma_cd_r), DEVWRITE8(DEVICE_SELF_OWNER, c64_expansion_slot_device, dma_cd_w), DEVWRITELINE(DEVICE_SELF_OWNER, c64_expansion_slot_device, dma_w)) diff --git a/src/mess/machine/c64user.h b/src/mess/machine/c64user.h index 3088e901552..905c97312bf 100644 --- a/src/mess/machine/c64user.h +++ b/src/mess/machine/c64user.h @@ -43,10 +43,10 @@ // INTERFACE CONFIGURATION MACROS //************************************************************************** -#define MCFG_C64_USER_PORT_ADD(_tag, _slot_intf, _def_slot, _def_inp, _reset) \ +#define MCFG_C64_USER_PORT_ADD(_tag, _slot_intf, _def_slot, _reset) \ MCFG_DEVICE_ADD(_tag, C64_USER_PORT, 0) \ downcast(device)->set_reset_callback(DEVCB2_##_reset); \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) #define MCFG_C64_USER_PORT_CIA1_CALLBACKS(_cnt, _sp) \ diff --git a/src/mess/machine/c8280.c b/src/mess/machine/c8280.c index 54a10fc5c04..e25931e1347 100644 --- a/src/mess/machine/c8280.c +++ b/src/mess/machine/c8280.c @@ -341,8 +341,8 @@ static MACHINE_CONFIG_FRAGMENT( c8280 ) MCFG_FD1797x_ADD(WD1797_TAG, XTAL_12MHz/6) // clock? - MCFG_FLOPPY_DRIVE_ADD(WD1797_TAG":0", c8280_floppies, "8dsdd", NULL, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(WD1797_TAG":1", c8280_floppies, "8dsdd", NULL, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(WD1797_TAG":0", c8280_floppies, "8dsdd", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(WD1797_TAG":1", c8280_floppies, "8dsdd", floppy_image_device::default_floppy_formats) MACHINE_CONFIG_END diff --git a/src/mess/machine/cbm2exp.h b/src/mess/machine/cbm2exp.h index 7a31199c6d3..1aa6712deea 100644 --- a/src/mess/machine/cbm2exp.h +++ b/src/mess/machine/cbm2exp.h @@ -46,9 +46,9 @@ // INTERFACE CONFIGURATION MACROS //************************************************************************** -#define MCFG_CBM2_EXPANSION_SLOT_ADD(_tag, _clock, _slot_intf, _def_slot, _def_inp) \ +#define MCFG_CBM2_EXPANSION_SLOT_ADD(_tag, _clock, _slot_intf, _def_slot) \ MCFG_DEVICE_ADD(_tag, CBM2_EXPANSION_SLOT, _clock) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) diff --git a/src/mess/machine/cbm2user.h b/src/mess/machine/cbm2user.h index dc50e229021..e4801672fab 100644 --- a/src/mess/machine/cbm2user.h +++ b/src/mess/machine/cbm2user.h @@ -34,10 +34,10 @@ const cbm2_user_port_interface (_name) = -#define MCFG_CBM2_USER_PORT_ADD(_tag, _config, _slot_intf, _def_slot, _def_inp) \ +#define MCFG_CBM2_USER_PORT_ADD(_tag, _config, _slot_intf, _def_slot) \ MCFG_DEVICE_ADD(_tag, CBM2_USER_PORT, 0) \ MCFG_DEVICE_CONFIG(_config) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) diff --git a/src/mess/machine/cbmiec.h b/src/mess/machine/cbmiec.h index b30f53cd4b9..1cd447e0968 100644 --- a/src/mess/machine/cbmiec.h +++ b/src/mess/machine/cbmiec.h @@ -48,9 +48,9 @@ downcast(device)->set_reset_callback(DEVCB2_##_write); -#define MCFG_CBM_IEC_SLOT_ADD(_tag, _num, _slot_intf, _def_slot, _def_inp) \ +#define MCFG_CBM_IEC_SLOT_ADD(_tag, _num, _slot_intf, _def_slot) \ MCFG_DEVICE_ADD(_tag, CBM_IEC_SLOT, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) \ + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) \ cbm_iec_slot_device::static_set_slot(*device, _num); diff --git a/src/mess/machine/cbmipt.h b/src/mess/machine/cbmipt.h index 6b484c172de..68e46bcee03 100644 --- a/src/mess/machine/cbmipt.h +++ b/src/mess/machine/cbmipt.h @@ -107,19 +107,19 @@ #define MCFG_CBM_IEC_ADD(_default_drive) \ - MCFG_CBM_IEC_SLOT_ADD("iec4", 4, cbm_iec_devices, NULL, NULL) \ - MCFG_CBM_IEC_SLOT_ADD("iec8", 8, cbm_iec_devices, _default_drive, NULL) \ - MCFG_CBM_IEC_SLOT_ADD("iec9", 9, cbm_iec_devices, NULL, NULL) \ - MCFG_CBM_IEC_SLOT_ADD("iec10", 10, cbm_iec_devices, NULL, NULL) \ - MCFG_CBM_IEC_SLOT_ADD("iec11", 11, cbm_iec_devices, NULL, NULL) \ + MCFG_CBM_IEC_SLOT_ADD("iec4", 4, cbm_iec_devices, NULL) \ + MCFG_CBM_IEC_SLOT_ADD("iec8", 8, cbm_iec_devices, _default_drive) \ + MCFG_CBM_IEC_SLOT_ADD("iec9", 9, cbm_iec_devices, NULL) \ + MCFG_CBM_IEC_SLOT_ADD("iec10", 10, cbm_iec_devices, NULL) \ + MCFG_CBM_IEC_SLOT_ADD("iec11", 11, cbm_iec_devices, NULL) \ MCFG_CBM_IEC_BUS_ADD() #define MCFG_CBM_IEEE488_ADD(_default_drive) \ - MCFG_IEEE488_SLOT_ADD("ieee8", 8, cbm_ieee488_devices, _default_drive, NULL) \ - MCFG_IEEE488_SLOT_ADD("ieee9", 9, cbm_ieee488_devices, NULL, NULL) \ - MCFG_IEEE488_SLOT_ADD("ieee10", 10, cbm_ieee488_devices, NULL, NULL) \ - MCFG_IEEE488_SLOT_ADD("ieee11", 11, cbm_ieee488_devices, NULL, NULL) \ + MCFG_IEEE488_SLOT_ADD("ieee8", 8, cbm_ieee488_devices, _default_drive) \ + MCFG_IEEE488_SLOT_ADD("ieee9", 9, cbm_ieee488_devices, NULL) \ + MCFG_IEEE488_SLOT_ADD("ieee10", 10, cbm_ieee488_devices, NULL) \ + MCFG_IEEE488_SLOT_ADD("ieee11", 11, cbm_ieee488_devices, NULL) \ MCFG_IEEE488_BUS_ADD() diff --git a/src/mess/machine/coco_multi.c b/src/mess/machine/coco_multi.c index 3238ac0faed..212735c21d9 100644 --- a/src/mess/machine/coco_multi.c +++ b/src/mess/machine/coco_multi.c @@ -108,10 +108,10 @@ static const cococart_interface multi_cococart_interface = }; static MACHINE_CONFIG_FRAGMENT(coco_multi) - MCFG_COCO_CARTRIDGE_ADD(SLOT1_TAG, multi_cococart_interface, coco_cart_slot1_3, NULL, NULL) - MCFG_COCO_CARTRIDGE_ADD(SLOT2_TAG, multi_cococart_interface, coco_cart_slot1_3, NULL, NULL) - MCFG_COCO_CARTRIDGE_ADD(SLOT3_TAG, multi_cococart_interface, coco_cart_slot1_3, NULL, NULL) - MCFG_COCO_CARTRIDGE_ADD(SLOT4_TAG, multi_cococart_interface, coco_cart_slot4, "fdcv11", NULL) + MCFG_COCO_CARTRIDGE_ADD(SLOT1_TAG, multi_cococart_interface, coco_cart_slot1_3, NULL) + MCFG_COCO_CARTRIDGE_ADD(SLOT2_TAG, multi_cococart_interface, coco_cart_slot1_3, NULL) + MCFG_COCO_CARTRIDGE_ADD(SLOT3_TAG, multi_cococart_interface, coco_cart_slot1_3, NULL) + MCFG_COCO_CARTRIDGE_ADD(SLOT4_TAG, multi_cococart_interface, coco_cart_slot4, "fdcv11") MACHINE_CONFIG_END //************************************************************************** diff --git a/src/mess/machine/cococart.h b/src/mess/machine/cococart.h index d7c4958d480..aaee2ba2e80 100644 --- a/src/mess/machine/cococart.h +++ b/src/mess/machine/cococart.h @@ -165,10 +165,10 @@ private: DEVICE CONFIGURATION MACROS ***************************************************************************/ -#define MCFG_COCO_CARTRIDGE_ADD(_tag,_config,_slot_intf,_def_slot, _def_inp) \ +#define MCFG_COCO_CARTRIDGE_ADD(_tag,_config,_slot_intf,_def_slot) \ MCFG_DEVICE_ADD(_tag, COCOCART_SLOT, 0) \ MCFG_DEVICE_CONFIG(_config) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) #define MCFG_COCO_CARTRIDGE_REMOVE(_tag) \ MCFG_DEVICE_REMOVE(_tag) diff --git a/src/mess/machine/comx_eb.c b/src/mess/machine/comx_eb.c index c57abead4e7..6133c4746a7 100644 --- a/src/mess/machine/comx_eb.c +++ b/src/mess/machine/comx_eb.c @@ -139,10 +139,10 @@ static COMX_EXPANSION_INTERFACE( expansion_intf ) //------------------------------------------------- static MACHINE_CONFIG_FRAGMENT( comx_eb ) - MCFG_COMX_EXPANSION_SLOT_ADD(SLOT1_TAG, expansion_intf, comx_expansion_cards, "fd", NULL) - MCFG_COMX_EXPANSION_SLOT_ADD(SLOT2_TAG, expansion_intf, comx_expansion_cards, "clm", NULL) - MCFG_COMX_EXPANSION_SLOT_ADD(SLOT3_TAG, expansion_intf, comx_expansion_cards, "joy", NULL) - MCFG_COMX_EXPANSION_SLOT_ADD(SLOT4_TAG, expansion_intf, comx_expansion_cards, "ram", NULL) + MCFG_COMX_EXPANSION_SLOT_ADD(SLOT1_TAG, expansion_intf, comx_expansion_cards, "fd") + MCFG_COMX_EXPANSION_SLOT_ADD(SLOT2_TAG, expansion_intf, comx_expansion_cards, "clm") + MCFG_COMX_EXPANSION_SLOT_ADD(SLOT3_TAG, expansion_intf, comx_expansion_cards, "joy") + MCFG_COMX_EXPANSION_SLOT_ADD(SLOT4_TAG, expansion_intf, comx_expansion_cards, "ram") MACHINE_CONFIG_END diff --git a/src/mess/machine/comx_fd.c b/src/mess/machine/comx_fd.c index 517a977a310..ecab6d24e2d 100644 --- a/src/mess/machine/comx_fd.c +++ b/src/mess/machine/comx_fd.c @@ -102,8 +102,8 @@ SLOT_INTERFACE_END static MACHINE_CONFIG_FRAGMENT( comx_fd ) MCFG_WD1770x_ADD(WD1770_TAG, XTAL_8MHz) - MCFG_FLOPPY_DRIVE_ADD(WD1770_TAG":0", comx_fd_floppies, "525sd35t", NULL, comx_fd_device::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(WD1770_TAG":1", comx_fd_floppies, NULL, NULL, comx_fd_device::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(WD1770_TAG":0", comx_fd_floppies, "525sd35t", comx_fd_device::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(WD1770_TAG":1", comx_fd_floppies, NULL, comx_fd_device::floppy_formats) MACHINE_CONFIG_END diff --git a/src/mess/machine/comx_prn.c b/src/mess/machine/comx_prn.c index 55f5041d5d3..6d4279ece81 100644 --- a/src/mess/machine/comx_prn.c +++ b/src/mess/machine/comx_prn.c @@ -65,7 +65,7 @@ SLOT_INTERFACE_END //------------------------------------------------- static MACHINE_CONFIG_FRAGMENT( comx_prn ) - MCFG_CENTRONICS_ADD(CENTRONICS_TAG, standard_centronics, comx_centronics_printer, "pl80", NULL) + MCFG_CENTRONICS_ADD(CENTRONICS_TAG, standard_centronics, comx_centronics_printer, "pl80") MACHINE_CONFIG_END diff --git a/src/mess/machine/comxexp.h b/src/mess/machine/comxexp.h index 41861287d6f..da40e3f1e40 100644 --- a/src/mess/machine/comxexp.h +++ b/src/mess/machine/comxexp.h @@ -57,10 +57,10 @@ const comx_expansion_slot_interface (_name) = -#define MCFG_COMX_EXPANSION_SLOT_ADD(_tag, _config, _slot_intf, _def_slot, _def_inp) \ +#define MCFG_COMX_EXPANSION_SLOT_ADD(_tag, _config, _slot_intf, _def_slot) \ MCFG_DEVICE_ADD(_tag, COMX_EXPANSION_SLOT, 0) \ MCFG_DEVICE_CONFIG(_config) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) diff --git a/src/mess/machine/cpc_rom.c b/src/mess/machine/cpc_rom.c index 60b849325f4..b6c880f2eee 100644 --- a/src/mess/machine/cpc_rom.c +++ b/src/mess/machine/cpc_rom.c @@ -34,7 +34,7 @@ static MACHINE_CONFIG_FRAGMENT( cpc_rom ) MCFG_ROMSLOT_ADD("rom6") // pass-through - MCFG_CPC_EXPANSION_SLOT_ADD("exp",sub_exp_intf,cpc_exp_cards,NULL,NULL) + MCFG_CPC_EXPANSION_SLOT_ADD("exp",sub_exp_intf,cpc_exp_cards,NULL) MACHINE_CONFIG_END diff --git a/src/mess/machine/cpc_ssa1.c b/src/mess/machine/cpc_ssa1.c index 22b7a1b481b..5524896fe31 100644 --- a/src/mess/machine/cpc_ssa1.c +++ b/src/mess/machine/cpc_ssa1.c @@ -135,7 +135,7 @@ static MACHINE_CONFIG_FRAGMENT( cpc_ssa1 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) // pass-through - MCFG_CPC_EXPANSION_SLOT_ADD("exp",sub_exp_intf,cpc_exp_cards,NULL,NULL) + MCFG_CPC_EXPANSION_SLOT_ADD("exp",sub_exp_intf,cpc_exp_cards,NULL) MACHINE_CONFIG_END @@ -146,7 +146,7 @@ static MACHINE_CONFIG_FRAGMENT( cpc_dkspeech ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) // pass-through - MCFG_CPC_EXPANSION_SLOT_ADD("exp",sub_exp_intf,cpc_exp_cards,NULL,NULL) + MCFG_CPC_EXPANSION_SLOT_ADD("exp",sub_exp_intf,cpc_exp_cards,NULL) MACHINE_CONFIG_END diff --git a/src/mess/machine/cpcexp.h b/src/mess/machine/cpcexp.h index b9cb44b756b..3e4df4f51a8 100644 --- a/src/mess/machine/cpcexp.h +++ b/src/mess/machine/cpcexp.h @@ -54,10 +54,10 @@ const cpc_expansion_slot_interface (_name) = -#define MCFG_CPC_EXPANSION_SLOT_ADD(_tag, _config, _slot_intf, _def_slot, _def_inp) \ +#define MCFG_CPC_EXPANSION_SLOT_ADD(_tag, _config, _slot_intf, _def_slot) \ MCFG_DEVICE_ADD(_tag, CPC_EXPANSION_SLOT, 0) \ MCFG_DEVICE_CONFIG(_config) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) diff --git a/src/mess/machine/e01.c b/src/mess/machine/e01.c index de7e84e5e4a..6a0d4fd9b2f 100644 --- a/src/mess/machine/e01.c +++ b/src/mess/machine/e01.c @@ -305,8 +305,8 @@ static MACHINE_CONFIG_FRAGMENT( e01 ) MCFG_VIA6522_ADD(R6522_TAG, XTAL_8MHz/4, via_intf) MCFG_MC6854_ADD(MC6854_TAG, adlc_intf) MCFG_WD2793x_ADD(WD2793_TAG, XTAL_8MHz/4) - MCFG_FLOPPY_DRIVE_ADD(WD2793_TAG":0", e01_floppies, "35dd", NULL, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(WD2793_TAG":1", e01_floppies, "35dd", NULL, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(WD2793_TAG":0", e01_floppies, "35dd", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(WD2793_TAG":1", e01_floppies, "35dd", floppy_image_device::default_floppy_formats) MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, e01_centronics_intf) MCFG_SCSIBUS_ADD(SCSIBUS_TAG) diff --git a/src/mess/machine/ecbbus.h b/src/mess/machine/ecbbus.h index 74ad0030898..6df96343a61 100644 --- a/src/mess/machine/ecbbus.h +++ b/src/mess/machine/ecbbus.h @@ -40,9 +40,9 @@ const ecbbus_interface (_name) = -#define MCFG_ECBBUS_SLOT_ADD(_num, _tag, _slot_intf, _def_slot, _def_inp) \ +#define MCFG_ECBBUS_SLOT_ADD(_num, _tag, _slot_intf, _def_slot) \ MCFG_DEVICE_ADD(_tag, ECBBUS_SLOT, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) \ + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) \ ecbbus_slot_device::static_set_ecbbus_slot(*device, ECBBUS_TAG, _num); diff --git a/src/mess/machine/econet.h b/src/mess/machine/econet.h index ce81129eadb..703b4d6a398 100644 --- a/src/mess/machine/econet.h +++ b/src/mess/machine/econet.h @@ -37,9 +37,9 @@ const econet_interface (_name) = -#define MCFG_ECONET_SLOT_ADD(_tag, _num, _slot_intf, _def_slot, _def_inp) \ +#define MCFG_ECONET_SLOT_ADD(_tag, _num, _slot_intf, _def_slot) \ MCFG_DEVICE_ADD(_tag, ECONET_SLOT, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) \ + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) \ econet_slot_device::static_set_slot(*device, _num); diff --git a/src/mess/machine/epson_sio.h b/src/mess/machine/epson_sio.h index 87cab2288c4..df2fb6c8c4c 100644 --- a/src/mess/machine/epson_sio.h +++ b/src/mess/machine/epson_sio.h @@ -21,7 +21,7 @@ #define MCFG_EPSON_SIO_ADD(_tag, _def_slot) \ MCFG_DEVICE_ADD(_tag, EPSON_SIO, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(epson_sio_devices, _def_slot, NULL, false) + MCFG_DEVICE_SLOT_INTERFACE(epson_sio_devices, _def_slot, false) //************************************************************************** diff --git a/src/mess/machine/fd2000.c b/src/mess/machine/fd2000.c index 626f41faaa1..747652eee95 100644 --- a/src/mess/machine/fd2000.c +++ b/src/mess/machine/fd2000.c @@ -243,7 +243,7 @@ static MACHINE_CONFIG_FRAGMENT( fd2000 ) MCFG_VIA6522_ADD(G65SC22P2_TAG, XTAL_24MHz/12, via_intf) MCFG_DP8473_ADD(DP8473V_TAG) - MCFG_FLOPPY_DRIVE_ADD(DP8473V_TAG":0", fd2000_floppies, "35hd", 0, floppy_image_device::default_floppy_formats)//fd2000_device::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(DP8473V_TAG":0", fd2000_floppies, "35hd", floppy_image_device::default_floppy_formats)//fd2000_device::floppy_formats) MACHINE_CONFIG_END @@ -258,7 +258,7 @@ static MACHINE_CONFIG_FRAGMENT( fd4000 ) MCFG_VIA6522_ADD(G65SC22P2_TAG, XTAL_24MHz/12, via_intf) MCFG_PC8477A_ADD(PC8477AV1_TAG) - MCFG_FLOPPY_DRIVE_ADD(PC8477AV1_TAG":0", fd4000_floppies, "35ed", 0, floppy_image_device::default_floppy_formats)//fd2000_device::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(PC8477AV1_TAG":0", fd4000_floppies, "35ed", floppy_image_device::default_floppy_formats)//fd2000_device::floppy_formats) MACHINE_CONFIG_END diff --git a/src/mess/machine/gb_slot.h b/src/mess/machine/gb_slot.h index fe7ff000afa..4d7eabf807e 100644 --- a/src/mess/machine/gb_slot.h +++ b/src/mess/machine/gb_slot.h @@ -192,13 +192,13 @@ extern const device_type MEGADUCK_CART_SLOT; DEVICE CONFIGURATION MACROS ***************************************************************************/ -#define MCFG_GB_CARTRIDGE_ADD(_tag,_slot_intf,_def_slot,_def_inp) \ +#define MCFG_GB_CARTRIDGE_ADD(_tag,_slot_intf,_def_slot) \ MCFG_DEVICE_ADD(_tag, GB_CART_SLOT, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) -#define MCFG_MEGADUCK_CARTRIDGE_ADD(_tag,_slot_intf,_def_slot,_def_inp) \ +#define MCFG_MEGADUCK_CARTRIDGE_ADD(_tag,_slot_intf,_def_slot) \ MCFG_DEVICE_ADD(_tag, MEGADUCK_CART_SLOT, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) #endif diff --git a/src/mess/machine/gba_slot.h b/src/mess/machine/gba_slot.h index dc919371ef4..b4eb0cc246a 100644 --- a/src/mess/machine/gba_slot.h +++ b/src/mess/machine/gba_slot.h @@ -110,9 +110,9 @@ extern const device_type GBA_CART_SLOT; DEVICE CONFIGURATION MACROS ***************************************************************************/ -#define MCFG_GBA_CARTRIDGE_ADD(_tag,_slot_intf,_def_slot,_def_inp) \ +#define MCFG_GBA_CARTRIDGE_ADD(_tag,_slot_intf,_def_slot) \ MCFG_DEVICE_ADD(_tag, GBA_CART_SLOT, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) diff --git a/src/mess/machine/ieee488.h b/src/mess/machine/ieee488.h index 39ebfb0e2d2..04d9b2c0c4a 100644 --- a/src/mess/machine/ieee488.h +++ b/src/mess/machine/ieee488.h @@ -58,9 +58,9 @@ downcast(device)->set_ren_callback(DEVCB2_##_write); -#define MCFG_IEEE488_SLOT_ADD(_tag, _num, _slot_intf, _def_slot, _def_inp) \ +#define MCFG_IEEE488_SLOT_ADD(_tag, _num, _slot_intf, _def_slot) \ MCFG_DEVICE_ADD(_tag, IEEE488_SLOT, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) \ + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) \ ieee488_slot_device::static_set_slot(*device, _num); diff --git a/src/mess/machine/iq151_disc2.c b/src/mess/machine/iq151_disc2.c index 299dbcbcb8a..67b9ff7bd57 100644 --- a/src/mess/machine/iq151_disc2.c +++ b/src/mess/machine/iq151_disc2.c @@ -23,8 +23,8 @@ SLOT_INTERFACE_END static MACHINE_CONFIG_FRAGMENT( iq151_disc2 ) MCFG_UPD765A_ADD("fdc", false, true) - MCFG_FLOPPY_DRIVE_ADD("fdc:1", iq151_disc2_floppies, "8sssd", 0, iq151_disc2_device::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fdc:2", iq151_disc2_floppies, "8sssd", 0, iq151_disc2_device::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:1", iq151_disc2_floppies, "8sssd", iq151_disc2_device::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:2", iq151_disc2_floppies, "8sssd", iq151_disc2_device::floppy_formats) MACHINE_CONFIG_END ROM_START( iq151_disc2 ) diff --git a/src/mess/machine/iq151cart.h b/src/mess/machine/iq151cart.h index 1cbab3b28ae..d5a9dad486f 100644 --- a/src/mess/machine/iq151cart.h +++ b/src/mess/machine/iq151cart.h @@ -139,9 +139,9 @@ extern const device_type IQ151CART_SLOT; DEVICE CONFIGURATION MACROS ***************************************************************************/ -#define MCFG_IQ151_CARTRIDGE_ADD(_tag,_config,_slot_intf,_def_slot,_def_inp) \ +#define MCFG_IQ151_CARTRIDGE_ADD(_tag,_config,_slot_intf,_def_slot) \ MCFG_DEVICE_ADD(_tag, IQ151CART_SLOT, 0) \ MCFG_DEVICE_CONFIG(_config) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) #endif /* __IQ151CART_H__ */ diff --git a/src/mess/machine/isa.h b/src/mess/machine/isa.h index 5c0fa49a338..4f59d37f4c7 100644 --- a/src/mess/machine/isa.h +++ b/src/mess/machine/isa.h @@ -76,17 +76,17 @@ MCFG_DEVICE_ADD(_tag, ISA8, 0) \ MCFG_DEVICE_CONFIG(_config) \ isa8_device::static_set_cputag(*device, _cputag); -#define MCFG_ISA8_SLOT_ADD(_isatag, _tag, _slot_intf, _def_slot, _def_inp, _fixed) \ +#define MCFG_ISA8_SLOT_ADD(_isatag, _tag, _slot_intf, _def_slot, _fixed) \ MCFG_DEVICE_ADD(_tag, ISA8_SLOT, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, _fixed) \ + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _fixed) \ isa8_slot_device::static_set_isa8_slot(*device, owner, _isatag); #define MCFG_ISA16_BUS_ADD(_tag, _cputag, _config) \ MCFG_DEVICE_ADD(_tag, ISA16, 0) \ MCFG_DEVICE_CONFIG(_config) \ isa8_device::static_set_cputag(*device, _cputag); -#define MCFG_ISA16_SLOT_ADD(_isatag, _tag, _slot_intf, _def_slot, _def_inp, _fixed) \ +#define MCFG_ISA16_SLOT_ADD(_isatag, _tag, _slot_intf, _def_slot, _fixed) \ MCFG_DEVICE_ADD(_tag, ISA16_SLOT, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, _fixed) \ + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _fixed) \ isa16_slot_device::static_set_isa16_slot(*device, owner, _isatag); //************************************************************************** // TYPE DEFINITIONS diff --git a/src/mess/machine/isa_com.c b/src/mess/machine/isa_com.c index 6a4a4cf22de..9e8fddb0b71 100644 --- a/src/mess/machine/isa_com.c +++ b/src/mess/machine/isa_com.c @@ -91,10 +91,10 @@ static MACHINE_CONFIG_FRAGMENT( com_config ) MCFG_INS8250_ADD( "uart_1", genpc_com_interface[1], XTAL_1_8432MHz ) //MCFG_INS8250_ADD( "uart_2", genpc_com_interface[2], XTAL_1_8432MHz ) //MCFG_INS8250_ADD( "uart_3", genpc_com_interface[3], XTAL_1_8432MHz ) - MCFG_RS232_PORT_ADD( "serport0", serport_config[0], isa_com, "microsoft_mouse", NULL ) - MCFG_RS232_PORT_ADD( "serport1", serport_config[1], isa_com, NULL, NULL ) - //MCFG_RS232_PORT_ADD( "serport2", serport_config[2], isa_com, NULL, NULL ) - //MCFG_RS232_PORT_ADD( "serport3", serport_config[3], isa_com, NULL, NULL ) + MCFG_RS232_PORT_ADD( "serport0", serport_config[0], isa_com, "microsoft_mouse" ) + MCFG_RS232_PORT_ADD( "serport1", serport_config[1], isa_com, NULL ) + //MCFG_RS232_PORT_ADD( "serport2", serport_config[2], isa_com, NULL ) + //MCFG_RS232_PORT_ADD( "serport3", serport_config[3], isa_com, NULL ) MACHINE_CONFIG_END //************************************************************************** @@ -160,10 +160,10 @@ static MACHINE_CONFIG_FRAGMENT( com_at_config ) MCFG_NS16450_ADD( "uart_1", genpc_com_interface[1], XTAL_1_8432MHz ) // MCFG_NS16450_ADD( "uart_2", genpc_com_interface[2], XTAL_1_8432MHz ) // MCFG_NS16450_ADD( "uart_3", genpc_com_interface[3], XTAL_1_8432MHz ) - MCFG_RS232_PORT_ADD( "serport0", serport_config[0], isa_com, "microsoft_mouse", NULL ) - MCFG_RS232_PORT_ADD( "serport1", serport_config[1], isa_com, NULL, NULL ) -// MCFG_RS232_PORT_ADD( "serport2", serport_config[2], isa_com, NULL, NULL ) -// MCFG_RS232_PORT_ADD( "serport3", serport_config[3], isa_com, NULL, NULL ) + MCFG_RS232_PORT_ADD( "serport0", serport_config[0], isa_com, "microsoft_mouse" ) + MCFG_RS232_PORT_ADD( "serport1", serport_config[1], isa_com, NULL ) +// MCFG_RS232_PORT_ADD( "serport2", serport_config[2], isa_com, NULL ) +// MCFG_RS232_PORT_ADD( "serport3", serport_config[3], isa_com, NULL ) MACHINE_CONFIG_END //************************************************************************** diff --git a/src/mess/machine/isa_fdc.c b/src/mess/machine/isa_fdc.c index 7d8c899e292..48b391251f8 100644 --- a/src/mess/machine/isa_fdc.c +++ b/src/mess/machine/isa_fdc.c @@ -32,32 +32,32 @@ SLOT_INTERFACE_END static MACHINE_CONFIG_FRAGMENT( cfg_xt ) MCFG_PC_FDC_XT_ADD("fdc") - MCFG_FLOPPY_DRIVE_ADD("fdc:0", pc_dd_floppies, "525dd", 0, isa8_fdc_device::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fdc:1", pc_dd_floppies, "525dd", 0, isa8_fdc_device::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:0", pc_dd_floppies, "525dd", isa8_fdc_device::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:1", pc_dd_floppies, "525dd", isa8_fdc_device::floppy_formats) MACHINE_CONFIG_END static MACHINE_CONFIG_FRAGMENT( cfg_at ) MCFG_PC_FDC_AT_ADD("fdc") - MCFG_FLOPPY_DRIVE_ADD("fdc:0", pc_hd_floppies, "35hd", 0, isa8_fdc_device::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fdc:1", pc_hd_floppies, "35hd", 0, isa8_fdc_device::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:0", pc_hd_floppies, "35hd", isa8_fdc_device::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:1", pc_hd_floppies, "35hd", isa8_fdc_device::floppy_formats) MACHINE_CONFIG_END static MACHINE_CONFIG_FRAGMENT( cfg_smc ) MCFG_SMC37C78_ADD("fdc") - MCFG_FLOPPY_DRIVE_ADD("fdc:0", pc_hd_floppies, "35hd", 0, isa8_fdc_device::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fdc:1", pc_hd_floppies, "35hd", 0, isa8_fdc_device::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:0", pc_hd_floppies, "35hd", isa8_fdc_device::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:1", pc_hd_floppies, "35hd", isa8_fdc_device::floppy_formats) MACHINE_CONFIG_END static MACHINE_CONFIG_FRAGMENT( cfg_ps2 ) MCFG_N82077AA_ADD("fdc", n82077aa_device::MODE_PS2) - MCFG_FLOPPY_DRIVE_ADD("fdc:0", pc_hd_floppies, "35hd", 0, isa8_fdc_device::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fdc:1", pc_hd_floppies, "35hd", 0, isa8_fdc_device::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:0", pc_hd_floppies, "35hd", isa8_fdc_device::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:1", pc_hd_floppies, "35hd", isa8_fdc_device::floppy_formats) MACHINE_CONFIG_END static MACHINE_CONFIG_FRAGMENT( cfg_superio ) MCFG_PC_FDC_SUPERIO_ADD("fdc") - MCFG_FLOPPY_DRIVE_ADD("fdc:0", pc_hd_floppies, "35hd", 0, isa8_fdc_device::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fdc:1", pc_hd_floppies, "35hd", 0, isa8_fdc_device::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:0", pc_hd_floppies, "35hd", isa8_fdc_device::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:1", pc_hd_floppies, "35hd", isa8_fdc_device::floppy_formats) MACHINE_CONFIG_END diff --git a/src/mess/machine/isa_gus.c b/src/mess/machine/isa_gus.c index b33b50ffef4..4cb044490dc 100644 --- a/src/mess/machine/isa_gus.c +++ b/src/mess/machine/isa_gus.c @@ -1253,8 +1253,8 @@ static MACHINE_CONFIG_FRAGMENT( gus_config ) MCFG_SOUND_ROUTE(0,"lspeaker",0.50) MCFG_SOUND_ROUTE(1,"rspeaker",0.50) MCFG_ACIA6850_ADD("midi",gus_midi_interface) - MCFG_SERIAL_PORT_ADD("mdin", midiin_intf, midiin_slot, "midiin", NULL) - MCFG_SERIAL_PORT_ADD("mdout", midiout_intf, midiout_slot, "midiout", NULL) + MCFG_SERIAL_PORT_ADD("mdin", midiin_intf, midiin_slot, "midiin") + MCFG_SERIAL_PORT_ADD("mdout", midiout_intf, midiout_slot, "midiout") MACHINE_CONFIG_END static INPUT_PORTS_START( gus_joy ) diff --git a/src/mess/machine/isa_sblaster.c b/src/mess/machine/isa_sblaster.c index 463aea083f4..c561eeaef4a 100644 --- a/src/mess/machine/isa_sblaster.c +++ b/src/mess/machine/isa_sblaster.c @@ -97,8 +97,8 @@ static MACHINE_CONFIG_FRAGMENT( sblaster1_0_config ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.00) MCFG_PC_JOY_ADD("pc_joy") - MCFG_SERIAL_PORT_ADD("mdin", midiin_intf, midiin_slot, "midiin", NULL) - MCFG_SERIAL_PORT_ADD("mdout", midiout_intf, midiout_slot, "midiout", NULL) + MCFG_SERIAL_PORT_ADD("mdin", midiin_intf, midiin_slot, "midiin") + MCFG_SERIAL_PORT_ADD("mdout", midiout_intf, midiout_slot, "midiout") MACHINE_CONFIG_END static MACHINE_CONFIG_FRAGMENT( sblaster1_5_config ) @@ -114,8 +114,8 @@ static MACHINE_CONFIG_FRAGMENT( sblaster1_5_config ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.00) MCFG_PC_JOY_ADD("pc_joy") - MCFG_SERIAL_PORT_ADD("mdin", midiin_intf, midiin_slot, "midiin", NULL) - MCFG_SERIAL_PORT_ADD("mdout", midiout_intf, midiout_slot, "midiout", NULL) + MCFG_SERIAL_PORT_ADD("mdin", midiin_intf, midiin_slot, "midiin") + MCFG_SERIAL_PORT_ADD("mdout", midiout_intf, midiout_slot, "midiout") MACHINE_CONFIG_END static MACHINE_CONFIG_FRAGMENT( sblaster_16_config ) @@ -131,8 +131,8 @@ static MACHINE_CONFIG_FRAGMENT( sblaster_16_config ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.00) MCFG_PC_JOY_ADD("pc_joy") - MCFG_SERIAL_PORT_ADD("mdin", midiin_intf, midiin_slot, "midiin", NULL) - MCFG_SERIAL_PORT_ADD("mdout", midiout_intf, midiout_slot, "midiout", NULL) + MCFG_SERIAL_PORT_ADD("mdin", midiin_intf, midiin_slot, "midiin") + MCFG_SERIAL_PORT_ADD("mdout", midiout_intf, midiout_slot, "midiout") MACHINE_CONFIG_END static READ8_DEVICE_HANDLER( ym3812_16_r ) diff --git a/src/mess/machine/kc_d002.c b/src/mess/machine/kc_d002.c index 95d50dc79f5..5cba0483048 100644 --- a/src/mess/machine/kc_d002.c +++ b/src/mess/machine/kc_d002.c @@ -65,13 +65,13 @@ static const kcexp_interface kc_d002_interface = }; static MACHINE_CONFIG_FRAGMENT( kc_d002 ) - MCFG_KC85_CARTRIDGE_ADD("m0", "m4", kc_d002_interface, kc85_cart, NULL, NULL) - MCFG_KC85_CARTRIDGE_ADD("m4", "m8", kc_d002_interface, kc85_cart, NULL, NULL) - MCFG_KC85_CARTRIDGE_ADD("m8", "mc", kc_d002_interface, kc85_cart, NULL, NULL) - MCFG_KC85_CARTRIDGE_ADD("mc", "exp", kc_d002_interface, kc85_cart, NULL, NULL) + MCFG_KC85_CARTRIDGE_ADD("m0", "m4", kc_d002_interface, kc85_cart, NULL) + MCFG_KC85_CARTRIDGE_ADD("m4", "m8", kc_d002_interface, kc85_cart, NULL) + MCFG_KC85_CARTRIDGE_ADD("m8", "mc", kc_d002_interface, kc85_cart, NULL) + MCFG_KC85_CARTRIDGE_ADD("mc", "exp", kc_d002_interface, kc85_cart, NULL) // expansion interface - MCFG_KC85_EXPANSION_ADD("exp", NULL, kc_d002_interface, kc85_exp , NULL, NULL) + MCFG_KC85_EXPANSION_ADD("exp", NULL, kc_d002_interface, kc85_exp, NULL) MACHINE_CONFIG_END //************************************************************************** diff --git a/src/mess/machine/kc_d004.c b/src/mess/machine/kc_d004.c index 5851ebf460e..0a8e9e00cbf 100644 --- a/src/mess/machine/kc_d004.c +++ b/src/mess/machine/kc_d004.c @@ -78,10 +78,10 @@ static MACHINE_CONFIG_FRAGMENT(kc_d004) MCFG_Z80CTC_ADD( Z80CTC_TAG, XTAL_8MHz/2, kc_d004_ctc_intf ) MCFG_UPD765A_ADD(UPD765_TAG, false, false) - MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", kc_d004_floppies, "525hd", 0, kc_d004_device::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":1", kc_d004_floppies, "525hd", 0, kc_d004_device::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":2", kc_d004_floppies, "525hd", 0, kc_d004_device::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":3", kc_d004_floppies, "525hd", 0, kc_d004_device::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", kc_d004_floppies, "525hd", kc_d004_device::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":1", kc_d004_floppies, "525hd", kc_d004_device::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":2", kc_d004_floppies, "525hd", kc_d004_device::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":3", kc_d004_floppies, "525hd", kc_d004_device::floppy_formats) MACHINE_CONFIG_END static MACHINE_CONFIG_FRAGMENT(kc_d004_gide) diff --git a/src/mess/machine/kcexp.h b/src/mess/machine/kcexp.h index f8fe28bf671..f9cf2e659cf 100644 --- a/src/mess/machine/kcexp.h +++ b/src/mess/machine/kcexp.h @@ -122,16 +122,16 @@ extern const device_type KCCART_SLOT; DEVICE CONFIGURATION MACROS ***************************************************************************/ -#define MCFG_KC85_EXPANSION_ADD(_tag,_next_slot_tag,_config,_slot_intf,_def_slot,_def_inp) \ +#define MCFG_KC85_EXPANSION_ADD(_tag,_next_slot_tag,_config,_slot_intf,_def_slot) \ MCFG_DEVICE_ADD(_tag, KCEXP_SLOT, 0) \ MCFG_DEVICE_CONFIG(_config) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) \ + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) \ kcexp_slot_device::static_set_next_slot(*device, _next_slot_tag); -#define MCFG_KC85_CARTRIDGE_ADD(_tag,_next_slot_tag,_config,_slot_intf,_def_slot,_def_inp) \ +#define MCFG_KC85_CARTRIDGE_ADD(_tag,_next_slot_tag,_config,_slot_intf,_def_slot) \ MCFG_DEVICE_ADD(_tag, KCCART_SLOT, 0) \ MCFG_DEVICE_CONFIG(_config) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) \ + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) \ kcexp_slot_device::static_set_next_slot(*device, _next_slot_tag); #endif /* __KCEXP_H__ */ diff --git a/src/mess/machine/lux10828.c b/src/mess/machine/lux10828.c index ab94c61875e..a2d6f96fbc8 100644 --- a/src/mess/machine/lux10828.c +++ b/src/mess/machine/lux10828.c @@ -348,8 +348,8 @@ static MACHINE_CONFIG_FRAGMENT( luxor_55_10828 ) MCFG_Z80PIO_ADD(Z80PIO_TAG, XTAL_4MHz/2, pio_intf) MCFG_MB8876x_ADD(MB8876_TAG, XTAL_4MHz/2) - MCFG_FLOPPY_DRIVE_ADD(MB8876_TAG":0", abc_floppies, "525dd", NULL, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(MB8876_TAG":1", abc_floppies, "525dd", NULL, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(MB8876_TAG":0", abc_floppies, "525dd", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(MB8876_TAG":1", abc_floppies, "525dd", floppy_image_device::default_floppy_formats) MACHINE_CONFIG_END diff --git a/src/mess/machine/lux21046.c b/src/mess/machine/lux21046.c index 343ca959c25..ed52e7e3f77 100644 --- a/src/mess/machine/lux21046.c +++ b/src/mess/machine/lux21046.c @@ -293,8 +293,8 @@ static MACHINE_CONFIG_FRAGMENT( luxor_55_21046 ) MCFG_Z80DMA_ADD(Z80DMA_TAG, XTAL_16MHz/4, dma_intf) MCFG_FD1793x_ADD(SAB1793_TAG, XTAL_16MHz/8) - MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":0", abc_floppies, "525dd", NULL, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":1", abc_floppies, "525dd", NULL, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":0", abc_floppies, "525dd", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":1", abc_floppies, "525dd", floppy_image_device::default_floppy_formats) MACHINE_CONFIG_END diff --git a/src/mess/machine/md_sk.c b/src/mess/machine/md_sk.c index 6d24d78fe29..6c400061b8e 100644 --- a/src/mess/machine/md_sk.c +++ b/src/mess/machine/md_sk.c @@ -77,7 +77,7 @@ static SLOT_INTERFACE_START(sk_sub_cart) SLOT_INTERFACE_END static MACHINE_CONFIG_FRAGMENT( sk_slot ) - MCFG_MD_CARTRIDGE_ADD("subslot", sk_sub_cart, NULL, NULL) + MCFG_MD_CARTRIDGE_ADD("subslot", sk_sub_cart, NULL) MCFG_MD_CARTRIDGE_NOT_MANDATORY MACHINE_CONFIG_END diff --git a/src/mess/machine/md_slot.h b/src/mess/machine/md_slot.h index 8b1e1580e43..8a09c2028b2 100644 --- a/src/mess/machine/md_slot.h +++ b/src/mess/machine/md_slot.h @@ -228,13 +228,13 @@ extern const device_type PICO_CART_SLOT; DEVICE CONFIGURATION MACROS ***************************************************************************/ -#define MCFG_MD_CARTRIDGE_ADD(_tag,_slot_intf,_def_slot,_def_inp) \ +#define MCFG_MD_CARTRIDGE_ADD(_tag,_slot_intf,_def_slot) \ MCFG_DEVICE_ADD(_tag, MD_CART_SLOT, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) -#define MCFG_PICO_CARTRIDGE_ADD(_tag,_slot_intf,_def_slot,_def_inp) \ +#define MCFG_PICO_CARTRIDGE_ADD(_tag,_slot_intf,_def_slot) \ MCFG_DEVICE_ADD(_tag, PICO_CART_SLOT, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) #define MCFG_MD_CARTRIDGE_NOT_MANDATORY \ static_cast(device)->set_must_be_loaded(FALSE); diff --git a/src/mess/machine/mface2.c b/src/mess/machine/mface2.c index e4b26cf307c..badbf251c0c 100644 --- a/src/mess/machine/mface2.c +++ b/src/mess/machine/mface2.c @@ -26,7 +26,7 @@ CPC_EXPANSION_INTERFACE(sub_exp_intf) // device machine config static MACHINE_CONFIG_FRAGMENT( cpc_mface2 ) // pass-through - MCFG_CPC_EXPANSION_SLOT_ADD("exp",sub_exp_intf,cpc_exp_cards,NULL,NULL) + MCFG_CPC_EXPANSION_SLOT_ADD("exp",sub_exp_intf,cpc_exp_cards,NULL) MACHINE_CONFIG_END DIRECT_UPDATE_MEMBER( cpc_multiface2_device::amstrad_default ) diff --git a/src/mess/machine/nes_ggenie.c b/src/mess/machine/nes_ggenie.c index 1feac1d3e28..2954a21685c 100644 --- a/src/mess/machine/nes_ggenie.c +++ b/src/mess/machine/nes_ggenie.c @@ -259,7 +259,7 @@ static const nes_cart_interface gg_crt_interface = }; static MACHINE_CONFIG_FRAGMENT( sub_slot ) - MCFG_NES_CARTRIDGE_ADD("gg_slot", gg_crt_interface, nes_cart, NULL, NULL) + MCFG_NES_CARTRIDGE_ADD("gg_slot", gg_crt_interface, nes_cart, NULL) MCFG_NES_CARTRIDGE_NOT_MANDATORY MACHINE_CONFIG_END diff --git a/src/mess/machine/nes_slot.h b/src/mess/machine/nes_slot.h index 0fe9e24ea60..bbb0f8941df 100644 --- a/src/mess/machine/nes_slot.h +++ b/src/mess/machine/nes_slot.h @@ -404,10 +404,10 @@ extern const device_type NES_CART_SLOT; DEVICE CONFIGURATION MACROS ***************************************************************************/ -#define MCFG_NES_CARTRIDGE_ADD(_tag,_config,_slot_intf,_def_slot,_def_inp) \ +#define MCFG_NES_CARTRIDGE_ADD(_tag,_config,_slot_intf,_def_slot) \ MCFG_DEVICE_ADD(_tag, NES_CART_SLOT, 0) \ MCFG_DEVICE_CONFIG(_config) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) #define MCFG_NES_CARTRIDGE_NOT_MANDATORY \ static_cast(device)->set_must_be_loaded(FALSE); diff --git a/src/mess/machine/nes_sunsoft_dcs.h b/src/mess/machine/nes_sunsoft_dcs.h index 4f5d988bd5a..0fbb60ea006 100644 --- a/src/mess/machine/nes_sunsoft_dcs.h +++ b/src/mess/machine/nes_sunsoft_dcs.h @@ -71,7 +71,7 @@ extern const device_type NES_NTB_SLOT; #define MCFG_NTB_MINICART_ADD(_tag, _slot_intf) \ MCFG_DEVICE_ADD(_tag, NES_NTB_SLOT, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, NULL, NULL, false) + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, NULL, false) //************************************************************************** diff --git a/src/mess/machine/nubus.h b/src/mess/machine/nubus.h index 0932a4e0b6f..d89eed80b79 100644 --- a/src/mess/machine/nubus.h +++ b/src/mess/machine/nubus.h @@ -22,9 +22,9 @@ MCFG_DEVICE_ADD(_tag, NUBUS, 0) \ MCFG_DEVICE_CONFIG(_config) \ nubus_device::static_set_cputag(*device, _cputag); -#define MCFG_NUBUS_SLOT_ADD(_nbtag, _tag, _slot_intf, _def_slot, _def_inp) \ +#define MCFG_NUBUS_SLOT_ADD(_nbtag, _tag, _slot_intf, _def_slot) \ MCFG_DEVICE_ADD(_tag, NUBUS_SLOT, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) \ + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) \ nubus_slot_device::static_set_nubus_slot(*device, _nbtag, _tag); #define MCFG_NUBUS_SLOT_REMOVE(_tag) \ MCFG_DEVICE_REMOVE(_tag) diff --git a/src/mess/machine/pc9801_cbus.h b/src/mess/machine/pc9801_cbus.h index beb5176ab3d..0a15d5cbcfd 100644 --- a/src/mess/machine/pc9801_cbus.h +++ b/src/mess/machine/pc9801_cbus.h @@ -22,9 +22,9 @@ //************************************************************************** -#define MCFG_PC9801CBUS_SLOT_ADD(_tag, _slot_intf, _def_slot, _def_inp) \ +#define MCFG_PC9801CBUS_SLOT_ADD(_tag, _slot_intf, _def_slot) \ MCFG_DEVICE_ADD(_tag, PC9801CBUS_SLOT, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) diff --git a/src/mess/machine/pc_joy.h b/src/mess/machine/pc_joy.h index a4c40451b1f..8247bdfd87a 100644 --- a/src/mess/machine/pc_joy.h +++ b/src/mess/machine/pc_joy.h @@ -13,7 +13,7 @@ #define MCFG_PC_JOY_ADD(_tag) \ MCFG_DEVICE_ADD(_tag, PC_JOY, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(pc_joysticks, "basic_joy", NULL, false) + MCFG_DEVICE_SLOT_INTERFACE(pc_joysticks, "basic_joy", false) SLOT_INTERFACE_EXTERN(pc_joysticks); diff --git a/src/mess/machine/pc_kbdc.h b/src/mess/machine/pc_kbdc.h index 36a1c5adf1b..7e2fda1e8ef 100644 --- a/src/mess/machine/pc_kbdc.h +++ b/src/mess/machine/pc_kbdc.h @@ -22,9 +22,9 @@ set the data line and then set the clock line. #define MCFG_PC_KBDC_ADD(_tag, _config) \ MCFG_DEVICE_ADD(_tag, PC_KBDC, 0) \ MCFG_DEVICE_CONFIG(_config) -#define MCFG_PC_KBDC_SLOT_ADD(_kbdc_tag, _tag, _slot_intf, _def_slot, _def_inp ) \ +#define MCFG_PC_KBDC_SLOT_ADD(_kbdc_tag, _tag, _slot_intf, _def_slot) \ MCFG_DEVICE_ADD(_tag, PC_KBDC_SLOT, 0 ) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) \ + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) \ pc_kbdc_slot_device::static_set_pc_kbdc_slot(*device, owner->subdevice(_kbdc_tag) ); //************************************************************************** diff --git a/src/mess/machine/pc_lpt.c b/src/mess/machine/pc_lpt.c index ef050c1b332..4f17bea8828 100644 --- a/src/mess/machine/pc_lpt.c +++ b/src/mess/machine/pc_lpt.c @@ -58,7 +58,7 @@ static SLOT_INTERFACE_START(pc_centronics) SLOT_INTERFACE_END static MACHINE_CONFIG_FRAGMENT( pc_lpt ) - MCFG_CENTRONICS_ADD("centronics", pc_centronics_config, pc_centronics, "printer", NULL) + MCFG_CENTRONICS_ADD("centronics", pc_centronics_config, pc_centronics, "printer") MACHINE_CONFIG_END diff --git a/src/mess/machine/pce_slot.h b/src/mess/machine/pce_slot.h index 59d09e9a7db..b8c4ca0b65f 100644 --- a/src/mess/machine/pce_slot.h +++ b/src/mess/machine/pce_slot.h @@ -112,14 +112,14 @@ extern const device_type PCE_CART_SLOT; DEVICE CONFIGURATION MACROS ***************************************************************************/ -#define MCFG_PCE_CARTRIDGE_ADD(_tag,_slot_intf,_def_slot,_def_inp) \ +#define MCFG_PCE_CARTRIDGE_ADD(_tag,_slot_intf,_def_slot) \ MCFG_DEVICE_ADD(_tag, PCE_CART_SLOT, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) \ + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) \ static_cast(device)->set_intf("pce_cart"); -#define MCFG_TG16_CARTRIDGE_ADD(_tag,_slot_intf,_def_slot,_def_inp) \ +#define MCFG_TG16_CARTRIDGE_ADD(_tag,_slot_intf,_def_slot) \ MCFG_DEVICE_ADD(_tag, PCE_CART_SLOT, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) \ + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) \ static_cast(device)->set_intf("tg16_cart"); diff --git a/src/mess/machine/petcass.h b/src/mess/machine/petcass.h index f8d0316b4ad..da2e45e0151 100644 --- a/src/mess/machine/petcass.h +++ b/src/mess/machine/petcass.h @@ -38,9 +38,9 @@ // INTERFACE CONFIGURATION MACROS //************************************************************************** -#define MCFG_PET_DATASSETTE_PORT_ADD(_tag, _slot_intf, _def_slot, _def_inp, _devcb) \ +#define MCFG_PET_DATASSETTE_PORT_ADD(_tag, _slot_intf, _def_slot, _devcb) \ MCFG_DEVICE_ADD(_tag, PET_DATASSETTE_PORT, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) \ + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) \ devcb = &pet_datassette_port_device::set_read_handler(*device, DEVCB2_##_devcb); diff --git a/src/mess/machine/petexp.h b/src/mess/machine/petexp.h index 0ac796f876a..2dfa45f66bd 100644 --- a/src/mess/machine/petexp.h +++ b/src/mess/machine/petexp.h @@ -30,9 +30,9 @@ // INTERFACE CONFIGURATION MACROS //************************************************************************** -#define MCFG_PET_EXPANSION_SLOT_ADD(_tag, _clock, _slot_intf, _def_slot, _def_inp) \ +#define MCFG_PET_EXPANSION_SLOT_ADD(_tag, _clock, _slot_intf, _def_slot) \ MCFG_DEVICE_ADD(_tag, PET_EXPANSION_SLOT, _clock) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) #define MCFG_PET_EXPANSION_SLOT_DMA_CALLBACKS(_read, _write) \ diff --git a/src/mess/machine/petuser.h b/src/mess/machine/petuser.h index 0db2af54990..1bd673c8bf6 100644 --- a/src/mess/machine/petuser.h +++ b/src/mess/machine/petuser.h @@ -47,10 +47,10 @@ const pet_user_port_interface (_name) = -#define MCFG_PET_USER_PORT_ADD(_tag, _config, _slot_intf, _def_slot, _def_inp) \ +#define MCFG_PET_USER_PORT_ADD(_tag, _config, _slot_intf, _def_slot) \ MCFG_DEVICE_ADD(_tag, PET_USER_PORT, 0) \ MCFG_DEVICE_CONFIG(_config) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) diff --git a/src/mess/machine/pf10.c b/src/mess/machine/pf10.c index 26f054a3e25..2e8e1c945e1 100644 --- a/src/mess/machine/pf10.c +++ b/src/mess/machine/pf10.c @@ -68,7 +68,7 @@ static MACHINE_CONFIG_FRAGMENT( pf10 ) MCFG_CPU_IO_MAP(cpu_io) MCFG_UPD765A_ADD("upd765a", false, true) - MCFG_FLOPPY_DRIVE_ADD("upd765a:0", pf10_floppies, "35dd", 0, floppy_image_device::default_floppy_formats) // SMD-165 + MCFG_FLOPPY_DRIVE_ADD("upd765a:0", pf10_floppies, "35dd", floppy_image_device::default_floppy_formats) // SMD-165 MCFG_EPSON_SIO_ADD("sio", NULL) MACHINE_CONFIG_END diff --git a/src/mess/machine/plus4_sid.c b/src/mess/machine/plus4_sid.c index 9b2d207ce1c..ee4b9522030 100644 --- a/src/mess/machine/plus4_sid.c +++ b/src/mess/machine/plus4_sid.c @@ -69,7 +69,7 @@ static MACHINE_CONFIG_FRAGMENT( plus4_sid ) MCFG_SOUND_ADD("dac", DAC, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) - MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, NULL, NULL) + MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, NULL) MACHINE_CONFIG_END diff --git a/src/mess/machine/plus4exp.h b/src/mess/machine/plus4exp.h index a3beb8710fe..a688d25a342 100644 --- a/src/mess/machine/plus4exp.h +++ b/src/mess/machine/plus4exp.h @@ -56,13 +56,13 @@ // INTERFACE CONFIGURATION MACROS //************************************************************************** -#define MCFG_PLUS4_EXPANSION_SLOT_ADD(_tag, _clock, _slot_intf, _def_slot, _def_inp, _irq) \ +#define MCFG_PLUS4_EXPANSION_SLOT_ADD(_tag, _clock, _slot_intf, _def_slot, _irq) \ MCFG_DEVICE_ADD(_tag, PLUS4_EXPANSION_SLOT, _clock) \ downcast(device)->set_irq_callback(DEVCB2_##_irq); \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) #define MCFG_PLUS4_PASSTHRU_EXPANSION_SLOT_ADD() \ - MCFG_PLUS4_EXPANSION_SLOT_ADD(PLUS4_EXPANSION_SLOT_TAG, 0, plus4_expansion_cards, NULL, NULL, DEVWRITELINE(DEVICE_SELF_OWNER, plus4_expansion_slot_device, irq_w)) \ + MCFG_PLUS4_EXPANSION_SLOT_ADD(PLUS4_EXPANSION_SLOT_TAG, 0, plus4_expansion_cards, NULL, DEVWRITELINE(DEVICE_SELF_OWNER, plus4_expansion_slot_device, irq_w)) \ MCFG_PLUS4_EXPANSION_SLOT_DMA_CALLBACKS(DEVREAD8(DEVICE_SELF_OWNER, plus4_expansion_slot_device, dma_cd_r), DEVWRITE8(DEVICE_SELF_OWNER, plus4_expansion_slot_device, dma_cd_w), DEVWRITELINE(DEVICE_SELF_OWNER, plus4_expansion_slot_device, aec_w)) diff --git a/src/mess/machine/plus4user.h b/src/mess/machine/plus4user.h index 4e8b17822e5..b1039756d0b 100644 --- a/src/mess/machine/plus4user.h +++ b/src/mess/machine/plus4user.h @@ -43,9 +43,9 @@ // INTERFACE CONFIGURATION MACROS //************************************************************************** -#define MCFG_PLUS4_USER_PORT_ADD(_tag, _slot_intf, _def_slot, _def_inp) \ +#define MCFG_PLUS4_USER_PORT_ADD(_tag, _slot_intf, _def_slot) \ MCFG_DEVICE_ADD(_tag, PLUS4_USER_PORT, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) diff --git a/src/mess/machine/psxcport.h b/src/mess/machine/psxcport.h index 396cb9c72b0..5059ebc02c1 100644 --- a/src/mess/machine/psxcport.h +++ b/src/mess/machine/psxcport.h @@ -6,9 +6,9 @@ #include "cpu/psx/siodev.h" #include "machine/psxcard.h" -#define MCFG_PSX_CTRL_PORT_ADD(_tag, _slot_intf, _def_slot, _def_inp) \ +#define MCFG_PSX_CTRL_PORT_ADD(_tag, _slot_intf, _def_slot) \ MCFG_DEVICE_ADD(_tag, PSX_CONTROLLER_PORT, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) SLOT_INTERFACE_EXTERN(psx_controllers); diff --git a/src/mess/machine/psxmultitap.c b/src/mess/machine/psxmultitap.c index 45641c83254..ad39d254160 100644 --- a/src/mess/machine/psxmultitap.c +++ b/src/mess/machine/psxmultitap.c @@ -15,10 +15,10 @@ psx_multitap_device::psx_multitap_device(const machine_config& mconfig, const ch } static MACHINE_CONFIG_FRAGMENT( psx_multitap ) - MCFG_PSX_CTRL_PORT_ADD("a", psx_controllers_nomulti, "digital_pad", NULL) - MCFG_PSX_CTRL_PORT_ADD("b", psx_controllers_nomulti, NULL, NULL) - MCFG_PSX_CTRL_PORT_ADD("c", psx_controllers_nomulti, NULL, NULL) - MCFG_PSX_CTRL_PORT_ADD("d", psx_controllers_nomulti, NULL, NULL) + MCFG_PSX_CTRL_PORT_ADD("a", psx_controllers_nomulti, "digital_pad") + MCFG_PSX_CTRL_PORT_ADD("b", psx_controllers_nomulti, NULL) + MCFG_PSX_CTRL_PORT_ADD("c", psx_controllers_nomulti, NULL) + MCFG_PSX_CTRL_PORT_ADD("d", psx_controllers_nomulti, NULL) MACHINE_CONFIG_END machine_config_constructor psx_multitap_device::device_mconfig_additions() const diff --git a/src/mess/machine/s100.h b/src/mess/machine/s100.h index 03513f2524c..93da12f6b81 100644 --- a/src/mess/machine/s100.h +++ b/src/mess/machine/s100.h @@ -90,9 +90,9 @@ const s100_bus_interface (_name) = -#define MCFG_S100_SLOT_ADD(_tag, _slot_intf, _def_slot, _def_inp) \ +#define MCFG_S100_SLOT_ADD(_tag, _slot_intf, _def_slot) \ MCFG_DEVICE_ADD(_tag, S100_SLOT, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) diff --git a/src/mess/machine/s100_dj2db.c b/src/mess/machine/s100_dj2db.c index fe9068351de..c4dd3149ee4 100644 --- a/src/mess/machine/s100_dj2db.c +++ b/src/mess/machine/s100_dj2db.c @@ -114,10 +114,10 @@ static MACHINE_CONFIG_FRAGMENT( s100_dj2db ) MCFG_COM8116_ADD(BR1941_TAG, XTAL_5_0688MHz, brg_intf) MCFG_MB8866x_ADD(MB8866_TAG, XTAL_10MHz/5) - MCFG_FLOPPY_DRIVE_ADD(MB8866_TAG":0", s100_dj2db_floppies, "8dsdd", NULL, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(MB8866_TAG":1", s100_dj2db_floppies, NULL, NULL, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(MB8866_TAG":2", s100_dj2db_floppies, NULL, NULL, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD(MB8866_TAG":3", s100_dj2db_floppies, NULL, NULL, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(MB8866_TAG":0", s100_dj2db_floppies, "8dsdd", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(MB8866_TAG":1", s100_dj2db_floppies, NULL, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(MB8866_TAG":2", s100_dj2db_floppies, NULL, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(MB8866_TAG":3", s100_dj2db_floppies, NULL, floppy_image_device::default_floppy_formats) MACHINE_CONFIG_END diff --git a/src/mess/machine/s100_nsmdsa.c b/src/mess/machine/s100_nsmdsa.c index f6873a9f7a5..53ffd5930a1 100644 --- a/src/mess/machine/s100_nsmdsa.c +++ b/src/mess/machine/s100_nsmdsa.c @@ -57,8 +57,8 @@ SLOT_INTERFACE_END //------------------------------------------------- static MACHINE_CONFIG_FRAGMENT( mds_a ) - MCFG_FLOPPY_DRIVE_ADD("floppy0", mds_a_floppies, "525sd", NULL, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("floppy1", mds_a_floppies, "525sd", NULL, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("floppy0", mds_a_floppies, "525sd", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("floppy1", mds_a_floppies, "525sd", floppy_image_device::default_floppy_formats) MACHINE_CONFIG_END diff --git a/src/mess/machine/s100_nsmdsad.c b/src/mess/machine/s100_nsmdsad.c index a62b5091c0a..280e9214e6f 100644 --- a/src/mess/machine/s100_nsmdsad.c +++ b/src/mess/machine/s100_nsmdsad.c @@ -58,8 +58,8 @@ SLOT_INTERFACE_END //------------------------------------------------- static MACHINE_CONFIG_FRAGMENT( mds_ad ) - MCFG_FLOPPY_DRIVE_ADD("floppy0", mds_ad_floppies, "525dd", NULL, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("floppy1", mds_ad_floppies, "525dd", NULL, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("floppy0", mds_ad_floppies, "525dd", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("floppy1", mds_ad_floppies, "525dd", floppy_image_device::default_floppy_formats) MACHINE_CONFIG_END diff --git a/src/mess/machine/s100_wunderbus.c b/src/mess/machine/s100_wunderbus.c index 4df290a5b8d..d9a11fdf206 100644 --- a/src/mess/machine/s100_wunderbus.c +++ b/src/mess/machine/s100_wunderbus.c @@ -179,9 +179,10 @@ static MACHINE_CONFIG_FRAGMENT( s100_wunderbus ) MCFG_INS8250_ADD(INS8250_1_TAG, ace1_intf, XTAL_18_432MHz/10) MCFG_INS8250_ADD(INS8250_2_TAG, ace2_intf, XTAL_18_432MHz/10) MCFG_INS8250_ADD(INS8250_3_TAG, ace3_intf, XTAL_18_432MHz/10) - MCFG_RS232_PORT_ADD(RS232_A_TAG, rs232a_intf, default_rs232_devices, "serial_terminal", terminal) - MCFG_RS232_PORT_ADD(RS232_B_TAG, rs232b_intf, default_rs232_devices, NULL, NULL) - MCFG_RS232_PORT_ADD(RS232_C_TAG, rs232c_intf, default_rs232_devices, NULL, NULL) + MCFG_RS232_PORT_ADD(RS232_A_TAG, rs232a_intf, default_rs232_devices, "serial_terminal") + MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("serial_terminal", terminal) + MCFG_RS232_PORT_ADD(RS232_B_TAG, rs232b_intf, default_rs232_devices, NULL) + MCFG_RS232_PORT_ADD(RS232_C_TAG, rs232c_intf, default_rs232_devices, NULL) MCFG_UPD1990A_ADD(UPD1990C_TAG, XTAL_32_768kHz, rtc_intf) MACHINE_CONFIG_END diff --git a/src/mess/machine/sat_slot.h b/src/mess/machine/sat_slot.h index 4982222c387..d610494e65c 100644 --- a/src/mess/machine/sat_slot.h +++ b/src/mess/machine/sat_slot.h @@ -111,9 +111,9 @@ extern const device_type SATURN_CART_SLOT; DEVICE CONFIGURATION MACROS ***************************************************************************/ -#define MCFG_SATURN_CARTRIDGE_ADD(_tag,_slot_intf,_def_slot,_def_inp) \ +#define MCFG_SATURN_CARTRIDGE_ADD(_tag,_slot_intf,_def_slot) \ MCFG_DEVICE_ADD(_tag, SATURN_CART_SLOT, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) #endif diff --git a/src/mess/machine/sega8_rom.c b/src/mess/machine/sega8_rom.c index 5b2698f85af..9d8b37262de 100644 --- a/src/mess/machine/sega8_rom.c +++ b/src/mess/machine/sega8_rom.c @@ -400,7 +400,7 @@ static SLOT_INTERFACE_START(sg1000_card) SLOT_INTERFACE_END static MACHINE_CONFIG_FRAGMENT( sub_slot ) - MCFG_SG1000_CARD_ADD("cardslot", sg1000_card, NULL, NULL) + MCFG_SG1000_CARD_ADD("cardslot", sg1000_card, NULL) MACHINE_CONFIG_END machine_config_constructor sega8_cardcatch_device::device_mconfig_additions() const diff --git a/src/mess/machine/sega8_slot.h b/src/mess/machine/sega8_slot.h index 23d54af0f21..2a4fafb53f3 100644 --- a/src/mess/machine/sega8_slot.h +++ b/src/mess/machine/sega8_slot.h @@ -169,60 +169,60 @@ public: DEVICE CONFIGURATION MACROS ***************************************************************************/ -#define MCFG_SG1000_CARTRIDGE_ADD(_tag,_slot_intf,_def_slot,_def_inp) \ +#define MCFG_SG1000_CARTRIDGE_ADD(_tag,_slot_intf,_def_slot) \ MCFG_DEVICE_ADD(_tag, SEGA8_CART_SLOT, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) \ + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) \ static_cast(device)->set_mandatory(TRUE); \ static_cast(device)->set_intf("sg1000_cart"); \ static_cast(device)->set_ext("bin,sg"); -#define MCFG_OMV_CARTRIDGE_ADD(_tag,_slot_intf,_def_slot,_def_inp) \ +#define MCFG_OMV_CARTRIDGE_ADD(_tag,_slot_intf,_def_slot) \ MCFG_DEVICE_ADD(_tag, SEGA8_CART_SLOT, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) \ + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) \ static_cast(device)->set_mandatory(FALSE); \ static_cast(device)->set_intf("sg1000_cart"); \ static_cast(device)->set_ext("bin,sg"); -#define MCFG_SC3000_CARTRIDGE_ADD(_tag,_slot_intf,_def_slot,_def_inp) \ +#define MCFG_SC3000_CARTRIDGE_ADD(_tag,_slot_intf,_def_slot) \ MCFG_DEVICE_ADD(_tag, SEGA8_CART_SLOT, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) \ + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) \ static_cast(device)->set_mandatory(TRUE); \ static_cast(device)->set_intf("sg1000_cart"); \ static_cast(device)->set_ext("bin,sg,sc"); -#define MCFG_SG1000MK3_CARTRIDGE_ADD(_tag,_slot_intf,_def_slot,_def_inp) \ +#define MCFG_SG1000MK3_CARTRIDGE_ADD(_tag,_slot_intf,_def_slot) \ MCFG_DEVICE_ADD(_tag, SEGA8_CART_SLOT, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) \ + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) \ static_cast(device)->set_mandatory(TRUE); \ static_cast(device)->set_intf("sms_cart"); \ static_cast(device)->set_ext("bin,sms,sg"); -#define MCFG_SMS_CARTRIDGE_ADD(_tag,_slot_intf,_def_slot,_def_inp) \ +#define MCFG_SMS_CARTRIDGE_ADD(_tag,_slot_intf,_def_slot) \ MCFG_DEVICE_ADD(_tag, SEGA8_CART_SLOT, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) \ + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) \ static_cast(device)->set_mandatory(FALSE); \ static_cast(device)->set_intf("sms_cart"); \ static_cast(device)->set_ext("bin,sms"); -#define MCFG_GG_CARTRIDGE_ADD(_tag,_slot_intf,_def_slot,_def_inp) \ +#define MCFG_GG_CARTRIDGE_ADD(_tag,_slot_intf,_def_slot) \ MCFG_DEVICE_ADD(_tag, SEGA8_CART_SLOT, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) \ + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) \ static_cast(device)->set_mandatory(TRUE); \ static_cast(device)->set_intf("gamegear_cart"); \ static_cast(device)->set_ext("bin,gg"); -#define MCFG_SMS_CARD_ADD(_tag,_slot_intf,_def_slot,_def_inp) \ +#define MCFG_SMS_CARD_ADD(_tag,_slot_intf,_def_slot) \ MCFG_DEVICE_ADD(_tag, SEGA8_CARD_SLOT, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) \ + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) \ static_cast(device)->set_mandatory(FALSE); \ static_cast(device)->set_intf("sms_card"); \ static_cast(device)->set_ext("bin"); \ -#define MCFG_SG1000_CARD_ADD(_tag,_slot_intf,_def_slot,_def_inp) \ +#define MCFG_SG1000_CARD_ADD(_tag,_slot_intf,_def_slot) \ MCFG_DEVICE_ADD(_tag, SEGA8_CARD_SLOT, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) \ + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) \ static_cast(device)->set_intf("sg1000_cart"); \ static_cast(device)->set_ext("bin,sg"); \ diff --git a/src/mess/machine/serial.h b/src/mess/machine/serial.h index add46fb9ae1..875e22b626a 100644 --- a/src/mess/machine/serial.h +++ b/src/mess/machine/serial.h @@ -3,15 +3,15 @@ #include "emu.h" -#define MCFG_SERIAL_PORT_ADD(_tag, _intf, _slot_intf, _def_slot, _def_inp) \ +#define MCFG_SERIAL_PORT_ADD(_tag, _intf, _slot_intf, _def_slot) \ MCFG_DEVICE_ADD(_tag, SERIAL_PORT, 0) \ MCFG_DEVICE_CONFIG(_intf) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) -#define MCFG_RS232_PORT_ADD(_tag, _intf, _slot_intf, _def_slot, _def_inp) \ +#define MCFG_RS232_PORT_ADD(_tag, _intf, _slot_intf, _def_slot) \ MCFG_DEVICE_ADD(_tag, RS232_PORT, 0) \ MCFG_DEVICE_CONFIG(_intf) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) struct serial_port_interface { diff --git a/src/mess/machine/sns_bsx.c b/src/mess/machine/sns_bsx.c index 7509de35a46..9b947b3bad8 100644 --- a/src/mess/machine/sns_bsx.c +++ b/src/mess/machine/sns_bsx.c @@ -236,7 +236,7 @@ static SLOT_INTERFACE_START(bsx_cart) SLOT_INTERFACE_END static MACHINE_CONFIG_FRAGMENT( bs_slot ) - MCFG_SNS_BSX_CARTRIDGE_ADD("bs_slot", bsx_cart, NULL, NULL) + MCFG_SNS_BSX_CARTRIDGE_ADD("bs_slot", bsx_cart, NULL) MACHINE_CONFIG_END diff --git a/src/mess/machine/sns_slot.h b/src/mess/machine/sns_slot.h index 0b3ade34b5a..ece28560e58 100644 --- a/src/mess/machine/sns_slot.h +++ b/src/mess/machine/sns_slot.h @@ -259,17 +259,17 @@ extern const device_type SNS_BSX_CART_SLOT; DEVICE CONFIGURATION MACROS ***************************************************************************/ -#define MCFG_SNS_CARTRIDGE_ADD(_tag,_slot_intf,_def_slot,_def_inp) \ +#define MCFG_SNS_CARTRIDGE_ADD(_tag,_slot_intf,_def_slot) \ MCFG_DEVICE_ADD(_tag, SNS_CART_SLOT, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) -#define MCFG_SNS_SUFAMI_CARTRIDGE_ADD(_tag,_slot_intf,_def_slot,_def_inp) \ +#define MCFG_SNS_SUFAMI_CARTRIDGE_ADD(_tag,_slot_intf,_def_slot) \ MCFG_DEVICE_ADD(_tag, SNS_SUFAMI_CART_SLOT, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) -#define MCFG_SNS_BSX_CARTRIDGE_ADD(_tag,_slot_intf,_def_slot,_def_inp) \ +#define MCFG_SNS_BSX_CARTRIDGE_ADD(_tag,_slot_intf,_def_slot) \ MCFG_DEVICE_ADD(_tag, SNS_BSX_CART_SLOT, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) #endif diff --git a/src/mess/machine/sns_sufami.c b/src/mess/machine/sns_sufami.c index 92eba4b3e9f..e0128810d6b 100644 --- a/src/mess/machine/sns_sufami.c +++ b/src/mess/machine/sns_sufami.c @@ -55,8 +55,8 @@ static SLOT_INTERFACE_START(sufamiturbo_cart) SLOT_INTERFACE_END static MACHINE_CONFIG_FRAGMENT( st_slot ) - MCFG_SNS_SUFAMI_CARTRIDGE_ADD("st_slot1", sufamiturbo_cart, NULL, NULL) - MCFG_SNS_SUFAMI_CARTRIDGE_ADD("st_slot2", sufamiturbo_cart, NULL, NULL) + MCFG_SNS_SUFAMI_CARTRIDGE_ADD("st_slot1", sufamiturbo_cart, NULL) + MCFG_SNS_SUFAMI_CARTRIDGE_ADD("st_slot2", sufamiturbo_cart, NULL) MACHINE_CONFIG_END diff --git a/src/mess/machine/southbridge.c b/src/mess/machine/southbridge.c index 13c5cc52406..a4411cedd0f 100644 --- a/src/mess/machine/southbridge.c +++ b/src/mess/machine/southbridge.c @@ -119,7 +119,7 @@ static MACHINE_CONFIG_FRAGMENT( southbridge ) MCFG_AT_KEYBOARD_CONTROLLER_ADD("keybc", XTAL_12MHz, keyboard_controller_intf) MCFG_PC_KBDC_ADD("pc_kbdc", pc_kbdc_intf) - MCFG_PC_KBDC_SLOT_ADD("pc_kbdc", "kbd", pc_at_keyboards, STR_KBD_MICROSOFT_NATURAL, NULL) + MCFG_PC_KBDC_SLOT_ADD("pc_kbdc", "kbd", pc_at_keyboards, STR_KBD_MICROSOFT_NATURAL) MCFG_MC146818_IRQ_ADD( "rtc", MC146818_STANDARD, at_mc146818_config ) @@ -130,10 +130,10 @@ static MACHINE_CONFIG_FRAGMENT( southbridge ) MCFG_ISA16_BUS_ADD("isabus", ":maincpu", isabus_intf) // on board devices - MCFG_ISA16_SLOT_ADD("isabus","board1", pc_isa_onboard, "fdcsmc", NULL, true) - MCFG_ISA16_SLOT_ADD("isabus","board2", pc_isa_onboard, "comat", NULL, true) - MCFG_ISA16_SLOT_ADD("isabus","board3", pc_isa_onboard, "ide", NULL, true) - MCFG_ISA16_SLOT_ADD("isabus","board4", pc_isa_onboard, "lpt", NULL, true) + MCFG_ISA16_SLOT_ADD("isabus","board1", pc_isa_onboard, "fdcsmc", true) + MCFG_ISA16_SLOT_ADD("isabus","board2", pc_isa_onboard, "comat", true) + MCFG_ISA16_SLOT_ADD("isabus","board3", pc_isa_onboard, "ide", true) + MCFG_ISA16_SLOT_ADD("isabus","board4", pc_isa_onboard, "lpt", true) MACHINE_CONFIG_END //------------------------------------------------- diff --git a/src/mess/machine/superpet.c b/src/mess/machine/superpet.c index 98028641a2b..2bc12bea00b 100644 --- a/src/mess/machine/superpet.c +++ b/src/mess/machine/superpet.c @@ -90,7 +90,7 @@ static MACHINE_CONFIG_FRAGMENT( superpet ) MCFG_MOS6551_ADD(MOS6551_TAG, XTAL_1_8432MHz, WRITELINE(superpet_device, acia_irq_w)) MCFG_MOS6551_RXD_TXD_CALLBACKS(NULL, DEVWRITELINE(RS232_TAG, rs232_port_device, tx)) - MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL, NULL) + MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL) MACHINE_CONFIG_END diff --git a/src/mess/machine/tf20.c b/src/mess/machine/tf20.c index ea0feca24d8..d18f8bb79c2 100644 --- a/src/mess/machine/tf20.c +++ b/src/mess/machine/tf20.c @@ -129,8 +129,8 @@ static MACHINE_CONFIG_FRAGMENT( tf20 ) MCFG_UPD765A_ADD("5a", true, true) // floppy drives - MCFG_FLOPPY_DRIVE_ADD("5a:0", tf20_floppies, "525dd", 0, floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("5a:1", tf20_floppies, "525dd", 0, floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("5a:0", tf20_floppies, "525dd", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("5a:1", tf20_floppies, "525dd", floppy_image_device::default_floppy_formats) // serial interface to another device MCFG_EPSON_SIO_ADD("sio", NULL) diff --git a/src/mess/machine/ti99/gromport.h b/src/mess/machine/ti99/gromport.h index 07290df2f24..039ca819e1b 100644 --- a/src/mess/machine/ti99/gromport.h +++ b/src/mess/machine/ti99/gromport.h @@ -56,7 +56,7 @@ SLOT_INTERFACE_EXTERN(gromport); #define MCFG_TI99_GROMPORT_ADD( _tag, _conf ) \ MCFG_DEVICE_ADD(_tag, GROMPORT, 0) \ MCFG_DEVICE_CONFIG(_conf) \ - MCFG_DEVICE_SLOT_INTERFACE(gromport, "single", NULL, false) + MCFG_DEVICE_SLOT_INTERFACE(gromport, "single", false) /****************************************************************************/ diff --git a/src/mess/machine/ti99/joyport.h b/src/mess/machine/ti99/joyport.h index 375d07dba60..f76a4decd45 100644 --- a/src/mess/machine/ti99/joyport.h +++ b/src/mess/machine/ti99/joyport.h @@ -79,16 +79,16 @@ SLOT_INTERFACE_EXTERN(joystick_port_gen); #define MCFG_GENEVE_JOYPORT_ADD( _tag, _conf ) \ MCFG_DEVICE_ADD(_tag, JOYPORT, 0) \ MCFG_DEVICE_CONFIG( _conf ) \ - MCFG_DEVICE_SLOT_INTERFACE(joystick_port_gen, "twinjoy", NULL, false) + MCFG_DEVICE_SLOT_INTERFACE(joystick_port_gen, "twinjoy", false) #define MCFG_TI_JOYPORT4A_ADD( _tag, _conf ) \ MCFG_DEVICE_ADD(_tag, JOYPORT, 0) \ MCFG_DEVICE_CONFIG( _conf ) \ - MCFG_DEVICE_SLOT_INTERFACE(joystick_port, "twinjoy", NULL, false) + MCFG_DEVICE_SLOT_INTERFACE(joystick_port, "twinjoy", false) #define MCFG_TI_JOYPORT4_ADD( _tag, _conf ) \ MCFG_DEVICE_ADD(_tag, JOYPORT, 0) \ MCFG_DEVICE_CONFIG( _conf ) \ - MCFG_DEVICE_SLOT_INTERFACE(joystick_port_994, "twinjoy", NULL, false) + MCFG_DEVICE_SLOT_INTERFACE(joystick_port_994, "twinjoy", false) #endif /* __JOYPORT__ */ diff --git a/src/mess/machine/ti99/peribox.h b/src/mess/machine/ti99/peribox.h index bb0108aeaff..9a144c9c8e8 100644 --- a/src/mess/machine/ti99/peribox.h +++ b/src/mess/machine/ti99/peribox.h @@ -231,11 +231,11 @@ protected: #define MCFG_PERIBOX_SLOT_ADD(_tag, _slot_intf) \ MCFG_DEVICE_ADD(_tag, PERIBOX_SLOT, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, NULL, NULL, false) + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, NULL, false) #define MCFG_PERIBOX_SLOT_ADD_DEF(_tag, _slot_intf, _default) \ MCFG_DEVICE_ADD(_tag, PERIBOX_SLOT, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _default, NULL, false) + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _default, false) /* The following defines are required because the WD17xx DEVICE_START implementation diff --git a/src/mess/machine/tvc_hbf.c b/src/mess/machine/tvc_hbf.c index 57fd6ebea94..9d605c4e75e 100644 --- a/src/mess/machine/tvc_hbf.c +++ b/src/mess/machine/tvc_hbf.c @@ -22,8 +22,8 @@ SLOT_INTERFACE_END static MACHINE_CONFIG_FRAGMENT(tvc_hbf) MCFG_FD1793x_ADD("fdc", XTAL_16MHz / 16) - MCFG_FLOPPY_DRIVE_ADD("fdc:0", tvc_hbf_floppies, "525qd", NULL, tvc_hbf_device::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fdc:1", tvc_hbf_floppies, "525qd", NULL, tvc_hbf_device::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:0", tvc_hbf_floppies, "525qd", tvc_hbf_device::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fdc:1", tvc_hbf_floppies, "525qd", tvc_hbf_device::floppy_formats) MACHINE_CONFIG_END ROM_START( tvc_hbf ) diff --git a/src/mess/machine/tvcexp.h b/src/mess/machine/tvcexp.h index 819fdbc26be..ff18936f4c6 100644 --- a/src/mess/machine/tvcexp.h +++ b/src/mess/machine/tvcexp.h @@ -125,8 +125,8 @@ extern const device_type TVCEXP_SLOT; DEVICE CONFIGURATION MACROS ***************************************************************************/ -#define MCFG_TVC64_EXPANSION_ADD(_tag,_config,_slot_intf,_def_slot,_def_inp) \ +#define MCFG_TVC64_EXPANSION_ADD(_tag,_config,_slot_intf,_def_slot) \ MCFG_DEVICE_ADD(_tag, TVCEXP_SLOT, 0) \ MCFG_DEVICE_CONFIG(_config) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) #endif /* __TVCEXP_H__ */ diff --git a/src/mess/machine/vcsctrl.h b/src/mess/machine/vcsctrl.h index 9fbc932fb9d..c345f3d7234 100644 --- a/src/mess/machine/vcsctrl.h +++ b/src/mess/machine/vcsctrl.h @@ -23,9 +23,9 @@ // INTERFACE CONFIGURATION MACROS //************************************************************************** -#define MCFG_VCS_CONTROL_PORT_ADD(_tag, _slot_intf, _def_slot, _def_inp) \ +#define MCFG_VCS_CONTROL_PORT_ADD(_tag, _slot_intf, _def_slot) \ MCFG_DEVICE_ADD(_tag, VCS_CONTROL_PORT, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) #define MCFG_VCS_CONTROL_PORT_TRIGGER_HANDLER(_devcb) \ diff --git a/src/mess/machine/vic1011.c b/src/mess/machine/vic1011.c index 9228a6560dc..1ed9e151a7a 100644 --- a/src/mess/machine/vic1011.c +++ b/src/mess/machine/vic1011.c @@ -45,7 +45,7 @@ static const rs232_port_interface rs232_intf = //------------------------------------------------- static MACHINE_CONFIG_FRAGMENT( vic1011 ) - MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL, NULL) + MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL) MACHINE_CONFIG_END diff --git a/src/mess/machine/vic10exp.h b/src/mess/machine/vic10exp.h index 56b23e9155d..4eb9e7b5c00 100644 --- a/src/mess/machine/vic10exp.h +++ b/src/mess/machine/vic10exp.h @@ -54,9 +54,9 @@ // INTERFACE CONFIGURATION MACROS //************************************************************************** -#define MCFG_VIC10_EXPANSION_SLOT_ADD(_tag, _clock, _slot_intf, _def_slot, _def_inp) \ +#define MCFG_VIC10_EXPANSION_SLOT_ADD(_tag, _clock, _slot_intf, _def_slot) \ MCFG_DEVICE_ADD(_tag, VIC10_EXPANSION_SLOT, _clock) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) #define MCFG_VIC10_EXPANSION_SLOT_IRQ_CALLBACKS(_irq, _res) \ diff --git a/src/mess/machine/vic20exp.h b/src/mess/machine/vic20exp.h index 4ea043c43d5..1a897419b14 100644 --- a/src/mess/machine/vic20exp.h +++ b/src/mess/machine/vic20exp.h @@ -53,12 +53,12 @@ // INTERFACE CONFIGURATION MACROS //************************************************************************** -#define MCFG_VIC20_EXPANSION_SLOT_ADD(_tag, _clock, _slot_intf, _def_slot, _def_inp) \ +#define MCFG_VIC20_EXPANSION_SLOT_ADD(_tag, _clock, _slot_intf, _def_slot) \ MCFG_DEVICE_ADD(_tag, VIC20_EXPANSION_SLOT, _clock) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) #define MCFG_VIC20_PASSTHRU_EXPANSION_SLOT_ADD(_tag) \ - MCFG_VIC20_EXPANSION_SLOT_ADD(_tag, 0, vic20_expansion_cards, NULL, NULL) \ + MCFG_VIC20_EXPANSION_SLOT_ADD(_tag, 0, vic20_expansion_cards, NULL) \ MCFG_VIC20_EXPANSION_SLOT_IRQ_CALLBACKS(DEVWRITELINE(DEVICE_SELF_OWNER, vic20_expansion_slot_device, irq_w), DEVWRITELINE(DEVICE_SELF_OWNER, vic20_expansion_slot_device, nmi_w), DEVWRITELINE(DEVICE_SELF_OWNER, vic20_expansion_slot_device, res_w)) diff --git a/src/mess/machine/vic20user.h b/src/mess/machine/vic20user.h index 331073a780f..8a99aeb0e3a 100644 --- a/src/mess/machine/vic20user.h +++ b/src/mess/machine/vic20user.h @@ -47,10 +47,10 @@ const vic20_user_port_interface (_name) = -#define MCFG_VIC20_USER_PORT_ADD(_tag, _config, _slot_intf, _def_slot, _def_inp) \ +#define MCFG_VIC20_USER_PORT_ADD(_tag, _config, _slot_intf, _def_slot) \ MCFG_DEVICE_ADD(_tag, VIC20_USER_PORT, 0) \ MCFG_DEVICE_CONFIG(_config) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) diff --git a/src/mess/machine/vidbrain_exp.h b/src/mess/machine/vidbrain_exp.h index 4b8a7797f76..7997927c6ed 100644 --- a/src/mess/machine/vidbrain_exp.h +++ b/src/mess/machine/vidbrain_exp.h @@ -60,10 +60,10 @@ const videobrain_expansion_slot_interface (_name) = -#define MCFG_VIDEOBRAIN_EXPANSION_SLOT_ADD(_tag, _config, _slot_intf, _def_slot, _def_inp) \ +#define MCFG_VIDEOBRAIN_EXPANSION_SLOT_ADD(_tag, _config, _slot_intf, _def_slot) \ MCFG_DEVICE_ADD(_tag, VIDEOBRAIN_EXPANSION_SLOT, 0) \ MCFG_DEVICE_CONFIG(_config) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) diff --git a/src/mess/machine/vip_byteio.h b/src/mess/machine/vip_byteio.h index 82c38e8e53c..6211b967f1b 100644 --- a/src/mess/machine/vip_byteio.h +++ b/src/mess/machine/vip_byteio.h @@ -57,10 +57,10 @@ const vip_byteio_port_interface (_name) = -#define MCFG_VIP_BYTEIO_PORT_ADD(_tag, _config, _slot_intf, _def_slot, _def_inp) \ +#define MCFG_VIP_BYTEIO_PORT_ADD(_tag, _config, _slot_intf, _def_slot) \ MCFG_DEVICE_ADD(_tag, VIP_BYTEIO_PORT, 0) \ MCFG_DEVICE_CONFIG(_config) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) diff --git a/src/mess/machine/vip_exp.h b/src/mess/machine/vip_exp.h index 7669e3a59ff..5893a1ad516 100644 --- a/src/mess/machine/vip_exp.h +++ b/src/mess/machine/vip_exp.h @@ -57,10 +57,10 @@ const vip_expansion_slot_interface (_name) = -#define MCFG_VIP_EXPANSION_SLOT_ADD(_tag, _clock, _config, _slot_intf, _def_slot, _def_inp) \ +#define MCFG_VIP_EXPANSION_SLOT_ADD(_tag, _clock, _config, _slot_intf, _def_slot) \ MCFG_DEVICE_ADD(_tag, VIP_EXPANSION_SLOT, _clock) \ MCFG_DEVICE_CONFIG(_config) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) diff --git a/src/mess/machine/vp575.c b/src/mess/machine/vp575.c index 9801f832399..4de17fb3e2d 100644 --- a/src/mess/machine/vp575.c +++ b/src/mess/machine/vp575.c @@ -99,11 +99,11 @@ static VIP_EXPANSION_INTERFACE( expansion5_intf ) //------------------------------------------------- static MACHINE_CONFIG_FRAGMENT( vp575 ) - MCFG_VIP_EXPANSION_SLOT_ADD("exp1", XTAL_3_52128MHz/2, expansion1_intf, vip_expansion_cards, NULL, NULL) - MCFG_VIP_EXPANSION_SLOT_ADD("exp2", XTAL_3_52128MHz/2, expansion2_intf, vip_expansion_cards, NULL, NULL) - MCFG_VIP_EXPANSION_SLOT_ADD("exp3", XTAL_3_52128MHz/2, expansion3_intf, vip_expansion_cards, NULL, NULL) - MCFG_VIP_EXPANSION_SLOT_ADD("exp4", XTAL_3_52128MHz/2, expansion4_intf, vip_expansion_cards, NULL, NULL) - MCFG_VIP_EXPANSION_SLOT_ADD("exp5", XTAL_3_52128MHz/2, expansion5_intf, vip_expansion_cards, NULL, NULL) + MCFG_VIP_EXPANSION_SLOT_ADD("exp1", XTAL_3_52128MHz/2, expansion1_intf, vip_expansion_cards, NULL) + MCFG_VIP_EXPANSION_SLOT_ADD("exp2", XTAL_3_52128MHz/2, expansion2_intf, vip_expansion_cards, NULL) + MCFG_VIP_EXPANSION_SLOT_ADD("exp3", XTAL_3_52128MHz/2, expansion3_intf, vip_expansion_cards, NULL) + MCFG_VIP_EXPANSION_SLOT_ADD("exp4", XTAL_3_52128MHz/2, expansion4_intf, vip_expansion_cards, NULL) + MCFG_VIP_EXPANSION_SLOT_ADD("exp5", XTAL_3_52128MHz/2, expansion5_intf, vip_expansion_cards, NULL) MACHINE_CONFIG_END diff --git a/src/mess/machine/wangpcbus.h b/src/mess/machine/wangpcbus.h index 7b427d2ba32..fbe1e028635 100644 --- a/src/mess/machine/wangpcbus.h +++ b/src/mess/machine/wangpcbus.h @@ -40,9 +40,9 @@ const wangpcbus_interface (_name) = -#define MCFG_WANGPC_BUS_SLOT_ADD(_tag, _sid, _slot_intf, _def_slot, _def_inp) \ +#define MCFG_WANGPC_BUS_SLOT_ADD(_tag, _sid, _slot_intf, _def_slot) \ MCFG_DEVICE_ADD(_tag, WANGPC_BUS_SLOT, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) \ + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) \ wangpcbus_slot_device::static_set_wangpcbus_slot(*device, _sid); diff --git a/src/mess/machine/x68kexp.h b/src/mess/machine/x68kexp.h index a13bec16a8f..05c384aae6c 100644 --- a/src/mess/machine/x68kexp.h +++ b/src/mess/machine/x68kexp.h @@ -78,10 +78,10 @@ const x68k_expansion_slot_interface (_name) = -#define MCFG_X68K_EXPANSION_SLOT_ADD(_tag, _config, _slot_intf, _def_slot, _def_inp) \ +#define MCFG_X68K_EXPANSION_SLOT_ADD(_tag, _config, _slot_intf, _def_slot) \ MCFG_DEVICE_ADD(_tag, X68K_EXPANSION_SLOT, 0) \ MCFG_DEVICE_CONFIG(_config) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) //************************************************************************** // TYPE DEFINITIONS diff --git a/src/mess/machine/z88cart.h b/src/mess/machine/z88cart.h index b9594ab1324..d4ac5dfcd82 100644 --- a/src/mess/machine/z88cart.h +++ b/src/mess/machine/z88cart.h @@ -137,9 +137,9 @@ extern const device_type Z88CART_SLOT; DEVICE CONFIGURATION MACROS ***************************************************************************/ -#define MCFG_Z88_CARTRIDGE_ADD(_tag,_config,_slot_intf,_def_slot,_def_inp) \ +#define MCFG_Z88_CARTRIDGE_ADD(_tag,_config,_slot_intf,_def_slot) \ MCFG_DEVICE_ADD(_tag, Z88CART_SLOT, 0) \ MCFG_DEVICE_CONFIG(_config) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) #endif /* __Z88CART_H__ */