Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-04 17:38:08 +03:00
Code Issues Actions 36 Packages Projects Releases Wiki Activity

Make MCFG_DEVICE_ADD and callable device types more flexible:

Browse Source 
* Allows defaulted clocks (see subtle example with vboy)
* Allows additional constructors (see RS232 port in tranz330)
* Allows use of device finder in place of tag in MCFG_DEVICE_ADD
* Requires out-of-line destructor for devices using incomplete types
* Requires XTAL or explicit u32 for clocks for devices with private types

Devices must still define the standard constructor.  When writing
additional constructors, be aware that the constructor runs before
device_add_mconfig in the context of the existing device, not the new
device.  See osborne1, zorba, tranz330, and vboy for examples of this in
use.  Compilation is a bit slower, but this is temporary while
refactoring is in progress.

Eliminated the need for MCFG_SOUND_ROUTE_EX.

Removed macros from slot option configuration - they just obfuscated
code and slowed it down with needless dynamic casts, but didn't actually
simplify it.
This commit is contained in:
Vas Crabb 2018-05-04 03:01:32 +10:00
parent aa96f47092
commit 32a73f450d
866 changed files with 5404 additions and 4725 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/devices/bus/a2bus/a2diskiing.cpp
View File

@ -27,9 +27,10 @@ DEFINE_DEVICE_TYPE(A2BUS_DISKIING13, a2bus_diskiing13_device, "diskii13", "Apple
#define WOZFDC_TAG "wozfdc"
#define DISKII_ROM_REGION "diskii_rom"
static SLOT_INTERFACE_START( a2_floppies )
SLOT_INTERFACE( "525", FLOPPY_525_SD )
SLOT_INTERFACE_END
static void a2_floppies(device_slot_interface &device)
{
device.option_add("525", FLOPPY_525_SD);
}
ROM_START( diskiing )
ROM_REGION(0x100, DISKII_ROM_REGION, 0)

4
src/devices/bus/a2bus/a2dx1.cpp
View File

@ -35,9 +35,9 @@ MACHINE_CONFIG_START(a2bus_dx1_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("speaker")
MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC
MCFG_SOUND_ADD("dacvol", DAC_8BIT_R2R, 0) // unknown DAC
MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE_EX(0, "dacvol", 1.0, DAC_VREF_POS_INPUT)
MCFG_SOUND_ROUTE(0, "dacvol", 1.0, DAC_VREF_POS_INPUT)
MACHINE_CONFIG_END
//**************************************************************************

13
src/devices/bus/a2bus/a2hsscsi.cpp
View File

@ -65,11 +65,12 @@ void a2bus_hsscsi_device::ncr5380(device_t *device)
MCFG_NCR5380N_DRQ_HANDLER(DEVWRITELINE("^^", a2bus_hsscsi_device, drq_w))
}
static SLOT_INTERFACE_START( hsscsi_devices )
SLOT_INTERFACE("cdrom", NSCSI_CDROM)
SLOT_INTERFACE("harddisk", NSCSI_HARDDISK)
SLOT_INTERFACE_INTERNAL("ncr5380", NCR5380N)
SLOT_INTERFACE_END
static void hsscsi_devices(device_slot_interface &device)
{
device.option_add("cdrom", NSCSI_CDROM);
device.option_add("harddisk", NSCSI_HARDDISK);
device.option_add_internal("ncr5380", NCR5380N);
}
ROM_START( hsscsi )
ROM_REGION(0x8000, SCSI_ROM_REGION, 0)
@ -94,7 +95,7 @@ MACHINE_CONFIG_START(a2bus_hsscsi_device::device_add_mconfig)
MCFG_NSCSI_ADD("scsibus:5", hsscsi_devices, nullptr, false)
MCFG_NSCSI_ADD("scsibus:6", hsscsi_devices, "harddisk", false)
MCFG_NSCSI_ADD("scsibus:7", hsscsi_devices, "ncr5380", true)
MCFG_DEVICE_CARD_MACHINE_CONFIG("ncr5380", ncr5380)
MCFG_SLOT_OPTION_MACHINE_CONFIG("ncr5380", ncr5380)
MACHINE_CONFIG_END
//-------------------------------------------------

2
src/devices/bus/a2bus/a2sam.cpp
View File

@ -35,7 +35,7 @@ MACHINE_CONFIG_START(a2bus_sam_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("speaker")
MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
//**************************************************************************

13
src/devices/bus/a2bus/a2scsi.cpp
View File

@ -58,11 +58,12 @@ void a2bus_scsi_device::ncr5380(device_t *device)
MCFG_NCR5380N_DRQ_HANDLER(DEVWRITELINE("^^", a2bus_scsi_device, drq_w))
}
static SLOT_INTERFACE_START( scsi_devices )
SLOT_INTERFACE("cdrom", NSCSI_CDROM)
SLOT_INTERFACE("harddisk", NSCSI_HARDDISK)
SLOT_INTERFACE_INTERNAL("ncr5380", NCR5380N)
SLOT_INTERFACE_END
static void scsi_devices(device_slot_interface &device)
{
device.option_add("cdrom", NSCSI_CDROM);
device.option_add("harddisk", NSCSI_HARDDISK);
device.option_add_internal("ncr5380", NCR5380N);
}
ROM_START( scsi )
ROM_REGION(0x4000, SCSI_ROM_REGION, 0) // this is the Rev. C ROM
@ -87,7 +88,7 @@ MACHINE_CONFIG_START(a2bus_scsi_device::device_add_mconfig)
MCFG_NSCSI_ADD("scsibus:5", scsi_devices, nullptr, false)
MCFG_NSCSI_ADD("scsibus:6", scsi_devices, "harddisk", false)
MCFG_NSCSI_ADD("scsibus:7", scsi_devices, "ncr5380", true)
MCFG_DEVICE_CARD_MACHINE_CONFIG("ncr5380", ncr5380)
MCFG_SLOT_OPTION_MACHINE_CONFIG("ncr5380", ncr5380)
MACHINE_CONFIG_END
//-------------------------------------------------

7
src/devices/bus/a2bus/corvfdc01.cpp
View File

@ -31,9 +31,10 @@ FLOPPY_FORMATS_MEMBER( a2bus_corvfdc01_device::corv_floppy_formats )
FLOPPY_IMD_FORMAT
FLOPPY_FORMATS_END
static SLOT_INTERFACE_START( corv_floppies )
SLOT_INTERFACE( "8sssd", FLOPPY_8_SSSD )
SLOT_INTERFACE_END
static void corv_floppies(device_slot_interface &device)
{
device.option_add("8sssd", FLOPPY_8_SSSD);
}
ROM_START( fdc01 )
ROM_REGION(0x20, FDC01_ROM_REGION, 0)

7
src/devices/bus/a2bus/corvfdc02.cpp
View File

@ -34,9 +34,10 @@ FLOPPY_FORMATS_MEMBER( a2bus_corvfdc02_device::corv_floppy_formats )
FLOPPY_IMD_FORMAT
FLOPPY_FORMATS_END
static SLOT_INTERFACE_START( corv_floppies )
SLOT_INTERFACE( "525dsqd", FLOPPY_525_QD )
SLOT_INTERFACE_END
static void corv_floppies(device_slot_interface &device)
{
device.option_add("525dsqd", FLOPPY_525_QD);
}
ROM_START( fdc02 )
ROM_REGION(0x20, FDC02_ROM_REGION, 0)

45
src/devices/bus/a7800/a78_carts.h
View File

@ -10,31 +10,32 @@
#include "hiscore.h"
#include "cpuwiz.h"
static SLOT_INTERFACE_START(a7800_cart)
SLOT_INTERFACE_INTERNAL("a78_rom", A78_ROM)
SLOT_INTERFACE_INTERNAL("a78_pokey", A78_ROM_POKEY)
SLOT_INTERFACE_INTERNAL("a78_sg", A78_ROM_SG)
SLOT_INTERFACE_INTERNAL("a78_sg_pokey", A78_ROM_SG_POKEY)
SLOT_INTERFACE_INTERNAL("a78_sg_ram", A78_ROM_SG_RAM)
SLOT_INTERFACE_INTERNAL("a78_sg9", A78_ROM_SG9)
SLOT_INTERFACE_INTERNAL("a78_mram", A78_ROM_MRAM)
SLOT_INTERFACE_INTERNAL("a78_abs", A78_ROM_ABSOLUTE)
SLOT_INTERFACE_INTERNAL("a78_act", A78_ROM_ACTIVISION)
SLOT_INTERFACE_INTERNAL("a78_hsc", A78_HISCORE)
SLOT_INTERFACE_INTERNAL("a78_xboard", A78_XBOARD) // the actual XBoarD expansion (as passthru)
SLOT_INTERFACE_INTERNAL("a78_xm", A78_XM) // the actual XM expansion (as passthru)
SLOT_INTERFACE_INTERNAL("a78_megacart", A78_ROM_MEGACART)
SLOT_INTERFACE_INTERNAL("a78_versa", A78_ROM_VERSABOARD)
static void a7800_cart(device_slot_interface &device)
{
device.option_add_internal("a78_rom", A78_ROM);
device.option_add_internal("a78_pokey", A78_ROM_POKEY);
device.option_add_internal("a78_sg", A78_ROM_SG);
device.option_add_internal("a78_sg_pokey", A78_ROM_SG_POKEY);
device.option_add_internal("a78_sg_ram", A78_ROM_SG_RAM);
device.option_add_internal("a78_sg9", A78_ROM_SG9);
device.option_add_internal("a78_mram", A78_ROM_MRAM);
device.option_add_internal("a78_abs", A78_ROM_ABSOLUTE);
device.option_add_internal("a78_act", A78_ROM_ACTIVISION);
device.option_add_internal("a78_hsc", A78_HISCORE);
device.option_add_internal("a78_xboard", A78_XBOARD); // the actual XBoarD expansion (as passthru)
device.option_add_internal("a78_xm", A78_XM); // the actual XM expansion (as passthru)
device.option_add_internal("a78_megacart", A78_ROM_MEGACART);
device.option_add_internal("a78_versa", A78_ROM_VERSABOARD);
// cart variants with a POKEY at 0x0450 (typically a VersaBoard variant, or an homebrew pcb)
SLOT_INTERFACE_INTERNAL("a78_p450_t0", A78_ROM_P450)
SLOT_INTERFACE_INTERNAL("a78_p450_t1", A78_ROM_P450_POKEY)
SLOT_INTERFACE_INTERNAL("a78_p450_t6", A78_ROM_P450_SG_RAM)
SLOT_INTERFACE_INTERNAL("a78_p450_ta", A78_ROM_P450_SG9)
SLOT_INTERFACE_INTERNAL("a78_p450_vb", A78_ROM_P450_VB)
SLOT_INTERFACE_END
device.option_add_internal("a78_p450_t0", A78_ROM_P450);
device.option_add_internal("a78_p450_t1", A78_ROM_P450_POKEY);
device.option_add_internal("a78_p450_t6", A78_ROM_P450_SG_RAM);
device.option_add_internal("a78_p450_ta", A78_ROM_P450_SG9);
device.option_add_internal("a78_p450_vb", A78_ROM_P450_VB);
}
// supported devices
SLOT_INTERFACE_EXTERN(a78_cart);
void a78_cart(device_slot_interface &device);
#endif // MAME_BUS_A7800_A78_CARTS_H

70
src/devices/bus/a800/a800_carts.h
View File

@ -10,41 +10,45 @@
#include "oss.h"
#include "sparta.h"
static SLOT_INTERFACE_START(a800_left)
SLOT_INTERFACE_INTERNAL("a800_8k", A800_ROM)
SLOT_INTERFACE_INTERNAL("a800_8k_right", A800_ROM)
SLOT_INTERFACE_INTERNAL("a800_16k", A800_ROM)
SLOT_INTERFACE_INTERNAL("a800_phoenix", A800_ROM) // not really emulated at this stage
SLOT_INTERFACE_INTERNAL("a800_bbsb", A800_ROM_BBSB)
SLOT_INTERFACE_INTERNAL("a800_oss8k", A800_ROM_OSS8K)
SLOT_INTERFACE_INTERNAL("a800_oss034m", A800_ROM_OSS34)
SLOT_INTERFACE_INTERNAL("a800_oss043m", A800_ROM_OSS43)
SLOT_INTERFACE_INTERNAL("a800_ossm091", A800_ROM_OSS91)
SLOT_INTERFACE_INTERNAL("a800_williams", A800_ROM_WILLIAMS)
SLOT_INTERFACE_INTERNAL("a800_diamond", A800_ROM_EXPRESS)
SLOT_INTERFACE_INTERNAL("a800_express", A800_ROM_EXPRESS)
SLOT_INTERFACE_INTERNAL("a800_sparta", A800_ROM_SPARTADOS) // this is a passthru cart with unemulated (atm) subslot
SLOT_INTERFACE_INTERNAL("a800_blizzard", A800_ROM)
SLOT_INTERFACE_INTERNAL("a800_turbo64", A800_ROM_TURBO)
SLOT_INTERFACE_INTERNAL("a800_turbo128", A800_ROM_TURBO)
SLOT_INTERFACE_INTERNAL("a800_tlink2", A800_ROM_TELELINK2)
SLOT_INTERFACE_INTERNAL("a800_sitsa", A800_ROM_MICROCALC)
SLOT_INTERFACE_INTERNAL("a800_corina", A800_ROM) // NOT SUPPORTED YET!
SLOT_INTERFACE_INTERNAL("xegs", XEGS_ROM)
SLOT_INTERFACE_END
static void a800_left(device_slot_interface &device)
{
device.option_add_internal("a800_8k", A800_ROM);
device.option_add_internal("a800_8k_right", A800_ROM);
device.option_add_internal("a800_16k", A800_ROM);
device.option_add_internal("a800_phoenix", A800_ROM); // not really emulated at this stage
device.option_add_internal("a800_bbsb", A800_ROM_BBSB);
device.option_add_internal("a800_oss8k", A800_ROM_OSS8K);
device.option_add_internal("a800_oss034m", A800_ROM_OSS34);
device.option_add_internal("a800_oss043m", A800_ROM_OSS43);
device.option_add_internal("a800_ossm091", A800_ROM_OSS91);
device.option_add_internal("a800_williams", A800_ROM_WILLIAMS);
device.option_add_internal("a800_diamond", A800_ROM_EXPRESS);
device.option_add_internal("a800_express", A800_ROM_EXPRESS);
device.option_add_internal("a800_sparta", A800_ROM_SPARTADOS); // this is a passthru cart with unemulated (atm) subslot
device.option_add_internal("a800_blizzard", A800_ROM);
device.option_add_internal("a800_turbo64", A800_ROM_TURBO);
device.option_add_internal("a800_turbo128", A800_ROM_TURBO);
device.option_add_internal("a800_tlink2", A800_ROM_TELELINK2);
device.option_add_internal("a800_sitsa", A800_ROM_MICROCALC);
device.option_add_internal("a800_corina", A800_ROM); // NOT SUPPORTED YET!
device.option_add_internal("xegs", XEGS_ROM);
}
static SLOT_INTERFACE_START(a800_right)
SLOT_INTERFACE_INTERNAL("a800_8k_right", A800_ROM)
SLOT_INTERFACE_END
static void a800_right(device_slot_interface &device)
{
device.option_add_internal("a800_8k_right", A800_ROM);
}
static SLOT_INTERFACE_START(xegs_carts)
SLOT_INTERFACE_INTERNAL("xegs", XEGS_ROM)
SLOT_INTERFACE_END
static void xegs_carts(device_slot_interface &device)
{
device.option_add_internal("xegs", XEGS_ROM);
}
static SLOT_INTERFACE_START(a5200_carts)
SLOT_INTERFACE_INTERNAL("a5200", A800_ROM)
SLOT_INTERFACE_INTERNAL("a5200_2chips", A5200_ROM_2CHIPS)
SLOT_INTERFACE_INTERNAL("a5200_bbsb", A5200_ROM_BBSB)
SLOT_INTERFACE_END
static void a5200_carts(device_slot_interface &device)
{
device.option_add_internal("a5200", A800_ROM);
device.option_add_internal("a5200_2chips", A5200_ROM_2CHIPS);
device.option_add_internal("a5200_bbsb", A5200_ROM_BBSB);
}
#endif // MAME_BUS_A800_A800_CARTS_H

7
src/devices/bus/a800/a8sio.cpp
View File

@ -196,6 +196,7 @@ WRITE_LINE_MEMBER( device_a8sio_card_interface::motor_w )
}
SLOT_INTERFACE_START(a8sio_cards)
SLOT_INTERFACE("cassette", A8SIO_CASSETTE)
SLOT_INTERFACE_END
void a8sio_cards(device_slot_interface &device)
{
device.option_add("cassette", A8SIO_CASSETTE);
}

2
src/devices/bus/a800/a8sio.h
View File

@ -142,6 +142,6 @@ public:
};
SLOT_INTERFACE_EXTERN(a8sio_cards);
void a8sio_cards(device_slot_interface &device);
#endif // MAME_BUS_A800_A8SIO_H

6
src/devices/bus/abcbus/abc890.cpp
View File

@ -71,7 +71,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(abc850_device::device_add_mconfig)
MCFG_ABCBUS_SLOT_ADD("io1", abcbus_cards, "abc850fdd")
MCFG_ABCBUS_SLOT_ADD("io2", abcbus_cards, "xebec")
MCFG_DEVICE_CARD_DEFAULT_BIOS("xebec", "ro202")
MCFG_SLOT_OPTION_DEFAULT_BIOS("xebec", "ro202")
MCFG_ABCBUS_SLOT_ADD("io3", abcbus_cards, nullptr)
MCFG_ABCBUS_SLOT_ADD("io4", abcbus_cards, nullptr)
MCFG_ABCBUS_SLOT_ADD("io5", abcbus_cards, nullptr)
@ -87,7 +87,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(abc852_device::device_add_mconfig)
MCFG_ABCBUS_SLOT_ADD("io1", abcbus_cards, "abc850fdd")
MCFG_ABCBUS_SLOT_ADD("io2", abcbus_cards, "xebec")
MCFG_DEVICE_CARD_DEFAULT_BIOS("xebec", "basf6185")
MCFG_SLOT_OPTION_DEFAULT_BIOS("xebec", "basf6185")
MCFG_ABCBUS_SLOT_ADD("io3", abcbus_cards, nullptr)
MCFG_ABCBUS_SLOT_ADD("io4", abcbus_cards, nullptr)
MCFG_ABCBUS_SLOT_ADD("io5", abcbus_cards, nullptr)
@ -103,7 +103,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(abc856_device::device_add_mconfig)
MCFG_ABCBUS_SLOT_ADD("io1", abcbus_cards, "abc850fdd")
MCFG_ABCBUS_SLOT_ADD("io2", abcbus_cards, "xebec")
MCFG_DEVICE_CARD_DEFAULT_BIOS("xebec", "micr1325")
MCFG_SLOT_OPTION_DEFAULT_BIOS("xebec", "micr1325")
MCFG_ABCBUS_SLOT_ADD("io3", abcbus_cards, nullptr)
MCFG_ABCBUS_SLOT_ADD("io4", abcbus_cards, nullptr)
MCFG_ABCBUS_SLOT_ADD("io5", abcbus_cards, nullptr)

75
src/devices/bus/abcbus/abcbus.cpp
View File

@ -101,51 +101,54 @@ void abcbus_slot_device::device_start()
// SLOT_INTERFACE( abc80_cards )
//-------------------------------------------------
SLOT_INTERFACE_START( abc80_cards )
SLOT_INTERFACE("fd2", ABC_FD2)
SLOT_INTERFACE("memcard", ABC_MEMORY_CARD)
SLOT_INTERFACE("abcexp", ABC_EXPANSION_UNIT)
SLOT_INTERFACE("16k", ABC80_16KB_RAM_CARD)
SLOT_INTERFACE("slow", LUXOR_55_10828)
SLOT_INTERFACE("abc830", ABC830)
SLOT_INTERFACE("db411223", DATABOARD_4112_23)
SLOT_INTERFACE("unidisk", UNIDISK)
SLOT_INTERFACE("cadabc", ABC_CADMOUSE)
SLOT_INTERFACE_END
void abc80_cards(device_slot_interface &device)
{
device.option_add("fd2", ABC_FD2);
device.option_add("memcard", ABC_MEMORY_CARD);
device.option_add("abcexp", ABC_EXPANSION_UNIT);
device.option_add("16k", ABC80_16KB_RAM_CARD);
device.option_add("slow", LUXOR_55_10828);
device.option_add("abc830", ABC830);
device.option_add("db411223", DATABOARD_4112_23);
device.option_add("unidisk", UNIDISK);
device.option_add("cadabc", ABC_CADMOUSE);
}
//-------------------------------------------------
// SLOT_INTERFACE( abcbus_cards )
//-------------------------------------------------
SLOT_INTERFACE_START( abcbus_cards )
SLOT_INTERFACE("abc830", ABC830)
SLOT_INTERFACE("abc832", ABC832)
SLOT_INTERFACE("abc834", ABC834)
SLOT_INTERFACE("abc838", ABC838)
SLOT_INTERFACE("abc850", ABC850)
SLOT_INTERFACE_INTERNAL("abc850fdd", ABC850_FLOPPY)
SLOT_INTERFACE("abc852", ABC852)
SLOT_INTERFACE("abc856", ABC856)
SLOT_INTERFACE("abc890", ABC890)
SLOT_INTERFACE("abc894", ABC894)
SLOT_INTERFACE("db411223", DATABOARD_4112_23)
SLOT_INTERFACE("hdc", ABC_HDC)
SLOT_INTERFACE("sio", ABC_SIO)
SLOT_INTERFACE("slow", LUXOR_55_10828)
SLOT_INTERFACE("uni800", ABC_UNI800)
SLOT_INTERFACE("unidisk", UNIDISK)
SLOT_INTERFACE("slutprov", ABC_SLUTPROV)
SLOT_INTERFACE("xebec", LUXOR_55_21056)
SLOT_INTERFACE_END
void abcbus_cards(device_slot_interface &device)
{
device.option_add("abc830", ABC830);
device.option_add("abc832", ABC832);
device.option_add("abc834", ABC834);
device.option_add("abc838", ABC838);
device.option_add("abc850", ABC850);
device.option_add_internal("abc850fdd", ABC850_FLOPPY);
device.option_add("abc852", ABC852);
device.option_add("abc856", ABC856);
device.option_add("abc890", ABC890);
device.option_add("abc894", ABC894);
device.option_add("db411223", DATABOARD_4112_23);
device.option_add("hdc", ABC_HDC);
device.option_add("sio", ABC_SIO);
device.option_add("slow", LUXOR_55_10828);
device.option_add("uni800", ABC_UNI800);
device.option_add("unidisk", UNIDISK);
device.option_add("slutprov", ABC_SLUTPROV);
device.option_add("xebec", LUXOR_55_21056);
}
//-------------------------------------------------
// SLOT_INTERFACE( abc1600bus_cards )
//-------------------------------------------------
SLOT_INTERFACE_START( abc1600bus_cards )
SLOT_INTERFACE("4105", LUXOR_4105) // SASI interface
// SLOT_INTERFACE("4077", LUXOR_4077) // Winchester controller
// SLOT_INTERFACE("4004", LUXOR_4004) // ICOM I/O (Z80, Z80PIO, Z80SIO/2, Z80CTC, 2 Z80DMAs, 2 PROMs, 64KB RAM)
SLOT_INTERFACE_END
void abc1600bus_cards(device_slot_interface &device)
{
device.option_add("4105", LUXOR_4105); // SASI interface
// device.option_add("4077", LUXOR_4077); // Winchester controller
// device.option_add("4004", LUXOR_4004); // ICOM I/O (Z80, Z80PIO, Z80SIO/2, Z80CTC, 2 Z80DMAs, 2 PROMs, 64KB RAM)
}

6
src/devices/bus/abcbus/abcbus.h
View File

@ -307,9 +307,9 @@ protected:
DECLARE_DEVICE_TYPE(ABCBUS_SLOT, abcbus_slot_device)
SLOT_INTERFACE_EXTERN( abc80_cards );
SLOT_INTERFACE_EXTERN( abcbus_cards );
SLOT_INTERFACE_EXTERN( abc1600bus_cards );
void abc80_cards(device_slot_interface &device);
void abcbus_cards(device_slot_interface &device);
void abc1600bus_cards(device_slot_interface &device);
typedef device_type_iterator<abcbus_slot_device> abcbus_slot_device_iterator;

7
src/devices/bus/abcbus/fd2.cpp
View File

@ -223,9 +223,10 @@ static const z80_daisy_config daisy_chain[] =
// SLOT_INTERFACE( abc_fd2_floppies )
//-------------------------------------------------
static SLOT_INTERFACE_START( abc_fd2_floppies )
SLOT_INTERFACE( "525sssd", FLOPPY_525_SSSD )
SLOT_INTERFACE_END
static void abc_fd2_floppies(device_slot_interface &device)
{
device.option_add("525sssd", FLOPPY_525_SSSD);
}
FLOPPY_FORMATS_MEMBER( abc_fd2_device::floppy_formats )
FLOPPY_ABC_FD2_FORMAT

15
src/devices/bus/abcbus/lux10828.cpp
View File

@ -287,13 +287,14 @@ static const z80_daisy_config daisy_chain[] =
{ nullptr }
};
static SLOT_INTERFACE_START( abc_floppies )
SLOT_INTERFACE( "525sssd", FLOPPY_525_SSSD )
SLOT_INTERFACE( "525sd", FLOPPY_525_SD )
SLOT_INTERFACE( "525ssdd", FLOPPY_525_SSDD )
SLOT_INTERFACE( "525dd", FLOPPY_525_DD )
SLOT_INTERFACE( "8dsdd", FLOPPY_8_DSDD )
SLOT_INTERFACE_END
static void abc_floppies(device_slot_interface &device)
{
device.option_add("525sssd", FLOPPY_525_SSSD);
device.option_add("525sd", FLOPPY_525_SD);
device.option_add("525ssdd", FLOPPY_525_SSDD);
device.option_add("525dd", FLOPPY_525_DD);
device.option_add("8dsdd", FLOPPY_8_DSDD);
}
FLOPPY_FORMATS_MEMBER( luxor_55_10828_device::floppy_formats )
FLOPPY_ABC800_FORMAT

17
src/devices/bus/abcbus/lux21046.cpp
View File

@ -256,14 +256,15 @@ FLOPPY_FORMATS_MEMBER( luxor_55_21046_device::floppy_formats )
FLOPPY_ABC800_FORMAT
FLOPPY_FORMATS_END
static SLOT_INTERFACE_START( abc_floppies )
SLOT_INTERFACE( "525sssd", FLOPPY_525_SSSD )
SLOT_INTERFACE( "525sd", FLOPPY_525_SD )
SLOT_INTERFACE( "525ssdd", FLOPPY_525_SSDD )
SLOT_INTERFACE( "525dd", FLOPPY_525_DD )
SLOT_INTERFACE( "525qd", FLOPPY_525_QD )
SLOT_INTERFACE( "8dsdd", FLOPPY_8_DSDD )
SLOT_INTERFACE_END
static void abc_floppies(device_slot_interface &device)
{
device.option_add("525sssd", FLOPPY_525_SSSD);
device.option_add("525sd", FLOPPY_525_SD);
device.option_add("525ssdd", FLOPPY_525_SSDD);
device.option_add("525dd", FLOPPY_525_DD);
device.option_add("525qd", FLOPPY_525_QD);
device.option_add("8dsdd", FLOPPY_8_DSDD);
}
WRITE_LINE_MEMBER( luxor_55_21046_device::fdc_intrq_w )
{

13
src/devices/bus/abckb/abckb.cpp
View File

@ -142,9 +142,10 @@ WRITE_LINE_MEMBER( abc_keyboard_port_device::keydown_w )
#include "abc77.h"
#include "abc99.h"
SLOT_INTERFACE_START( abc_keyboard_devices )
SLOT_INTERFACE("abc800", ABC800_KEYBOARD)
SLOT_INTERFACE("abc55", ABC55)
SLOT_INTERFACE("abc77", ABC77)
SLOT_INTERFACE("abc99", ABC99)
SLOT_INTERFACE_END
void abc_keyboard_devices(device_slot_interface &device)
{
device.option_add("abc800", ABC800_KEYBOARD);
device.option_add("abc55", ABC55);
device.option_add("abc77", ABC77);
device.option_add("abc99", ABC99);
}

2
src/devices/bus/abckb/abckb.h
View File

@ -89,6 +89,6 @@ DECLARE_DEVICE_TYPE(ABC_KEYBOARD_PORT, abc_keyboard_port_device)
// supported devices
SLOT_INTERFACE_EXTERN( abc_keyboard_devices );
void abc_keyboard_devices(device_slot_interface &device);
#endif // MAME_BUS_ABCKB_ABCKB_H

21
src/devices/bus/adam/exp.cpp
View File

@ -156,24 +156,27 @@ void adam_expansion_slot_device::bd_w(address_space &space, offs_t offset, uint8
// SLOT_INTERFACE( adam_slot1_devices )
//-------------------------------------------------
SLOT_INTERFACE_START( adam_slot1_devices )
SLOT_INTERFACE("adamlink", ADAMLINK)
SLOT_INTERFACE_END
void adam_slot1_devices(device_slot_interface &device)
{
device.option_add("adamlink", ADAMLINK);
}
//-------------------------------------------------
// SLOT_INTERFACE( adam_slot2_devices )
//-------------------------------------------------
SLOT_INTERFACE_START( adam_slot2_devices )
SLOT_INTERFACE("ide", ADAM_IDE)
SLOT_INTERFACE_END
void adam_slot2_devices(device_slot_interface &device)
{
device.option_add("ide", ADAM_IDE);
}
//-------------------------------------------------
// SLOT_INTERFACE( adam_slot3_devices )
//-------------------------------------------------
SLOT_INTERFACE_START( adam_slot3_devices )
SLOT_INTERFACE("ram", ADAM_RAM)
SLOT_INTERFACE_END
void adam_slot3_devices(device_slot_interface &device)
{
device.option_add("ram", ADAM_RAM);
}

6
src/devices/bus/adam/exp.h
View File

@ -116,8 +116,8 @@ protected:
DECLARE_DEVICE_TYPE(ADAM_EXPANSION_SLOT, adam_expansion_slot_device)
SLOT_INTERFACE_EXTERN( adam_slot1_devices );
SLOT_INTERFACE_EXTERN( adam_slot2_devices );
SLOT_INTERFACE_EXTERN( adam_slot3_devices );
void adam_slot1_devices(device_slot_interface &device);
void adam_slot2_devices(device_slot_interface &device);
void adam_slot3_devices(device_slot_interface &device);
#endif // MAME_BUS_ADAM_EXP_H

15
src/devices/bus/adamnet/adamnet.cpp
View File

@ -257,10 +257,11 @@ WRITE_LINE_MEMBER( adamnet_device::reset_w )
#include "printer.h"
#include "spi.h"
SLOT_INTERFACE_START( adamnet_devices )
SLOT_INTERFACE("ddp", ADAM_DDP)
SLOT_INTERFACE("fdc", ADAM_FDC)
SLOT_INTERFACE("kb", ADAM_KB)
SLOT_INTERFACE("prn", ADAM_PRN)
SLOT_INTERFACE("spi", ADAM_SPI)
SLOT_INTERFACE_END
void adamnet_devices(device_slot_interface &device)
{
device.option_add("ddp", ADAM_DDP);
device.option_add("fdc", ADAM_FDC);
device.option_add("kb", ADAM_KB);
device.option_add("prn", ADAM_PRN);
device.option_add("spi", ADAM_SPI);
}

4
src/devices/bus/adamnet/adamnet.h
View File

@ -127,8 +127,6 @@ DECLARE_DEVICE_TYPE(ADAMNET, adamnet_device)
DECLARE_DEVICE_TYPE(ADAMNET_SLOT, adamnet_slot_device)
SLOT_INTERFACE_EXTERN( adamnet_devices );
void adamnet_devices(device_slot_interface &device);
#endif // MAME_BUS_ADAMNET_ADAMNET_H

7
src/devices/bus/adamnet/fdc.cpp
View File

@ -117,9 +117,10 @@ FLOPPY_FORMATS_MEMBER( adam_fdc_device::floppy_formats )
FLOPPY_ADAM_FORMAT
FLOPPY_FORMATS_END
static SLOT_INTERFACE_START( adam_fdc_floppies )
SLOT_INTERFACE( "525ssdd", FLOPPY_525_SSDD )
SLOT_INTERFACE_END
static void adam_fdc_floppies(device_slot_interface &device)
{
device.option_add("525ssdd", FLOPPY_525_SSDD);
}
//-------------------------------------------------

27
src/devices/bus/amiga/keyboard/keyboard.cpp
View File

@ -104,16 +104,17 @@ device_amiga_keyboard_interface::~device_amiga_keyboard_interface()
// SLOT INTERFACE
//**************************************************************************
SLOT_INTERFACE_START( amiga_keyboard_devices )
SLOT_INTERFACE("a500_us", A500_KBD_US)
SLOT_INTERFACE("a500_de", A500_KBD_DE)
SLOT_INTERFACE("a500_fr", A500_KBD_FR)
SLOT_INTERFACE("a500_it", A500_KBD_IT)
SLOT_INTERFACE("a500_se", A500_KBD_SE)
SLOT_INTERFACE("a500_es", A500_KBD_ES)
SLOT_INTERFACE("a500_dk", A500_KBD_DK)
SLOT_INTERFACE("a500_ch", A500_KBD_CH)
SLOT_INTERFACE("a500_no", A500_KBD_NO)
SLOT_INTERFACE("a500_gb", A500_KBD_GB)
SLOT_INTERFACE("a1200_us", A1200_KBD)
SLOT_INTERFACE_END
void amiga_keyboard_devices(device_slot_interface &device)
{
device.option_add("a500_us", A500_KBD_US);
device.option_add("a500_de", A500_KBD_DE);
device.option_add("a500_fr", A500_KBD_FR);
device.option_add("a500_it", A500_KBD_IT);
device.option_add("a500_se", A500_KBD_SE);
device.option_add("a500_es", A500_KBD_ES);
device.option_add("a500_dk", A500_KBD_DK);
device.option_add("a500_ch", A500_KBD_CH);
device.option_add("a500_no", A500_KBD_NO);
device.option_add("a500_gb", A500_KBD_GB);
device.option_add("a1200_us", A1200_KBD);
}

2
src/devices/bus/amiga/keyboard/keyboard.h
View File

@ -98,6 +98,6 @@ protected:
DECLARE_DEVICE_TYPE(AMIGA_KEYBOARD_INTERFACE, amiga_keyboard_bus_device)
// supported devices
SLOT_INTERFACE_EXTERN( amiga_keyboard_devices );
void amiga_keyboard_devices(device_slot_interface &device);
#endif // MAME_BUS_AMIGA_KEYBOARD_H

55
src/devices/bus/amiga/zorro/cards.cpp
View File

@ -16,32 +16,37 @@
#include "buddha.h"
SLOT_INTERFACE_START( a1000_expansion_cards )
SLOT_INTERFACE_END
void a1000_expansion_cards(device_slot_interface &device)
{
}
SLOT_INTERFACE_START( a500_expansion_cards )
SLOT_INTERFACE("ar1", ACTION_REPLAY_MK1)
SLOT_INTERFACE("ar2", ACTION_REPLAY_MK2)
SLOT_INTERFACE("ar3", ACTION_REPLAY_MK3)
SLOT_INTERFACE("a590", A590)
SLOT_INTERFACE_END
void a500_expansion_cards(device_slot_interface &device)
{
device.option_add("ar1", ACTION_REPLAY_MK1);
device.option_add("ar2", ACTION_REPLAY_MK2);
device.option_add("ar3", ACTION_REPLAY_MK3);
device.option_add("a590", A590);
}
SLOT_INTERFACE_START( a2000_expansion_cards )
SLOT_INTERFACE("ar1", ACTION_REPLAY_MK1)
SLOT_INTERFACE("ar2", ACTION_REPLAY_MK2)
SLOT_INTERFACE("ar3", ACTION_REPLAY_MK3)
SLOT_INTERFACE_END
void a2000_expansion_cards(device_slot_interface &device)
{
device.option_add("ar1", ACTION_REPLAY_MK1);
device.option_add("ar2", ACTION_REPLAY_MK2);
device.option_add("ar3", ACTION_REPLAY_MK3);
}
SLOT_INTERFACE_START( zorro2_cards )
SLOT_INTERFACE("a2052", A2052)
SLOT_INTERFACE("a2091", A2091)
SLOT_INTERFACE("a2232", A2232)
SLOT_INTERFACE("buddha", BUDDHA)
SLOT_INTERFACE_END
void zorro2_cards(device_slot_interface &device)
{
device.option_add("a2052", A2052);
device.option_add("a2091", A2091);
device.option_add("a2232", A2232);
device.option_add("buddha", BUDDHA);
}
SLOT_INTERFACE_START( zorro3_cards )
SLOT_INTERFACE("a2052", A2052)
SLOT_INTERFACE("a2091", A2091)
SLOT_INTERFACE("a2232", A2232)
SLOT_INTERFACE("buddha", BUDDHA)
SLOT_INTERFACE_END
void zorro3_cards(device_slot_interface &device)
{
device.option_add("a2052", A2052);
device.option_add("a2091", A2091);
device.option_add("a2232", A2232);
device.option_add("buddha", BUDDHA);
}

10
src/devices/bus/amiga/zorro/cards.h
View File

@ -27,11 +27,11 @@
#pragma once
SLOT_INTERFACE_EXTERN( a1000_expansion_cards );
SLOT_INTERFACE_EXTERN( a500_expansion_cards );
SLOT_INTERFACE_EXTERN( a2000_expansion_cards );
void a1000_expansion_cards(device_slot_interface &device);
void a500_expansion_cards(device_slot_interface &device);
void a2000_expansion_cards(device_slot_interface &device);
SLOT_INTERFACE_EXTERN( zorro2_cards );
SLOT_INTERFACE_EXTERN( zorro3_cards );
void zorro2_cards(device_slot_interface &device);
void zorro3_cards(device_slot_interface &device);
#endif // MAME_BUS_AMIGA_ZORRO_CARDS_H

11
src/devices/bus/apricot/expansion/cards.cpp
View File

@ -10,8 +10,9 @@
#include "cards.h"
#include "ram.h"
SLOT_INTERFACE_START( apricot_expansion_cards )
SLOT_INTERFACE("128k", APRICOT_128K_RAM)
SLOT_INTERFACE("256k", APRICOT_256K_RAM)
SLOT_INTERFACE("512k", APRICOT_512K_RAM)
SLOT_INTERFACE_END
void apricot_expansion_cards(device_slot_interface &device)
{
device.option_add("128k", APRICOT_128K_RAM);
device.option_add("256k", APRICOT_256K_RAM);
device.option_add("512k", APRICOT_512K_RAM);
}

2
src/devices/bus/apricot/expansion/cards.h
View File

@ -11,6 +11,6 @@
#pragma once
SLOT_INTERFACE_EXTERN( apricot_expansion_cards );
void apricot_expansion_cards(device_slot_interface &device);
#endif // MAME_BUS_APRICOT_EXPANSION_CARDS_H

7
src/devices/bus/apricot/keyboard/keyboard.cpp
View File

@ -101,6 +101,7 @@ device_apricot_keyboard_interface::~device_apricot_keyboard_interface()
// SLOT INTERFACE
//**************************************************************************
SLOT_INTERFACE_START( apricot_keyboard_devices )
SLOT_INTERFACE("hle", APRICOT_KEYBOARD_HLE)
SLOT_INTERFACE_END
void apricot_keyboard_devices(device_slot_interface &device)
{
device.option_add("hle", APRICOT_KEYBOARD_HLE);
}

2
src/devices/bus/apricot/keyboard/keyboard.h
View File

@ -102,7 +102,7 @@ protected:
DECLARE_DEVICE_TYPE(APRICOT_KEYBOARD_INTERFACE, apricot_keyboard_bus_device)
// supported devices
SLOT_INTERFACE_EXTERN( apricot_keyboard_devices );
void apricot_keyboard_devices(device_slot_interface &device);
#endif // MAME_BUS_APRICOT_KEYBOARD_KEYBOARD_H

31
src/devices/bus/bbc/1mhzbus/1mhzbus.cpp
View File

@ -131,18 +131,19 @@ WRITE_LINE_MEMBER(bbc_1mhzbus_slot_device::rst_w)
#include "cfa3000opt.h"
SLOT_INTERFACE_START(bbc_1mhzbus_devices)
// SLOT_INTERFACE("teletext", BBC_TELETEXT) /* Acorn ANE01 Teletext Adapter */
// SLOT_INTERFACE("ieee488", BBC_IEEE488) /* Acorn ANK01 IEEE488 Interface */
// SLOT_INTERFACE("m500", BBC_M500) /* Acorn ANV02 Music 500 */
// SLOT_INTERFACE("m2000", BBC_M2000) /* Hybrid Music 2000 MIDI Interface */
// SLOT_INTERFACE("m3000", BBC_M3000) /* Hybrid Music 3000 Expander */
// SLOT_INTERFACE("m5000", BBC_M5000) /* Hybrid Music 5000 Synthesiser */
// SLOT_INTERFACE("multiform", BBC_MULTIFORM) /* Technomatic Multiform Z80 */
SLOT_INTERFACE("opus3", BBC_OPUS3) /* Opus Challenger 3 */
// SLOT_INTERFACE("ramdisc", BBC_RAMDISC) /* Morley Electronics RAM Disc */
// SLOT_INTERFACE("graduate", BBC_GRADUATE) /* The Torch Graduate G400/G800 */
SLOT_INTERFACE("beebsid", BBC_BEEBSID) /* BeebSID */
// SLOT_INTERFACE("prisma3", BBC_PRISMA3) /* PRISMA-3 - Millipede 1989 */
SLOT_INTERFACE("cfa3000opt", CFA3000_OPT) /* Henson CFA 3000 Option Board */
SLOT_INTERFACE_END
void bbc_1mhzbus_devices(device_slot_interface &device)
{
// device.option_add("teletext", BBC_TELETEXT); /* Acorn ANE01 Teletext Adapter */
// device.option_add("ieee488", BBC_IEEE488); /* Acorn ANK01 IEEE488 Interface */
// device.option_add("m500", BBC_M500); /* Acorn ANV02 Music 500 */
// device.option_add("m2000", BBC_M2000); /* Hybrid Music 2000 MIDI Interface */
// device.option_add("m3000", BBC_M3000); /* Hybrid Music 3000 Expander */
// device.option_add("m5000", BBC_M5000); /* Hybrid Music 5000 Synthesiser */
// device.option_add("multiform", BBC_MULTIFORM); /* Technomatic Multiform Z80 */
device.option_add("opus3", BBC_OPUS3); /* Opus Challenger 3 */
// device.option_add("ramdisc", BBC_RAMDISC); /* Morley Electronics RAM Disc */
// device.option_add("graduate", BBC_GRADUATE); /* The Torch Graduate G400/G800 */
device.option_add("beebsid", BBC_BEEBSID); /* BeebSID */
// device.option_add("prisma3", BBC_PRISMA3); /* PRISMA-3 - Millipede 1989 */
device.option_add("cfa3000opt", CFA3000_OPT); /* Henson CFA 3000 Option Board */
}

2
src/devices/bus/bbc/1mhzbus/1mhzbus.h
View File

@ -163,7 +163,7 @@ protected:
// device type definition
DECLARE_DEVICE_TYPE(BBC_1MHZBUS_SLOT, bbc_1mhzbus_slot_device)
SLOT_INTERFACE_EXTERN( bbc_1mhzbus_devices );
void bbc_1mhzbus_devices(device_slot_interface &device);
#endif // MAME_BUS_BBC_1MHZBUS_1MHZBUS_H

7
src/devices/bus/bbc/1mhzbus/opus3.cpp
View File

@ -60,9 +60,10 @@ FLOPPY_FORMATS_MEMBER(bbc_opus3_device::floppy_formats)
FLOPPY_OPUS_DDCPM_FORMAT
FLOPPY_FORMATS_END0
SLOT_INTERFACE_START(bbc_floppies)
SLOT_INTERFACE("525qd", FLOPPY_525_QD)
SLOT_INTERFACE_END
void bbc_floppies(device_slot_interface &device)
{
device.option_add("525qd", FLOPPY_525_QD);
}
ROM_START( opus3 )

13
src/devices/bus/bbc/analogue/analogue.cpp
View File

@ -111,9 +111,10 @@ void bbc_analogue_slot_device::device_reset()
#include "cfa3000a.h"
SLOT_INTERFACE_START( bbc_analogue_devices )
SLOT_INTERFACE("acornjoy", BBC_ACORNJOY) /* Acorn ANH01 Joysticks */
SLOT_INTERFACE("voltmace3b", BBC_VOLTMACE3B) /* Voltmace Delta 3b "Twin" Joysticks */
// SLOT_INTERFACE("quinkey", BBC_QUINKEY) /* Microwriter Quinkey */
SLOT_INTERFACE("cfa3000a", CFA3000_ANLG) /* Hanson CFA 3000 Analogue */
SLOT_INTERFACE_END
void bbc_analogue_devices(device_slot_interface &device)
{
device.option_add("acornjoy", BBC_ACORNJOY); /* Acorn ANH01 Joysticks */
device.option_add("voltmace3b", BBC_VOLTMACE3B); /* Voltmace Delta 3b "Twin" Joysticks */
// device.option_add("quinkey", BBC_QUINKEY); /* Microwriter Quinkey */
device.option_add("cfa3000a", CFA3000_ANLG); /* Hanson CFA 3000 Analogue */
}

2
src/devices/bus/bbc/analogue/analogue.h
View File

@ -96,6 +96,6 @@ protected:
// device type definition
DECLARE_DEVICE_TYPE(BBC_ANALOGUE_SLOT, bbc_analogue_slot_device)
SLOT_INTERFACE_EXTERN( bbc_analogue_devices );
void bbc_analogue_devices(device_slot_interface &device);
#endif // MAME_BUS_BBC_ANALOGUE_ANALOGUE_H

15
src/devices/bus/bbc/fdc/acorn.cpp
View File

@ -29,13 +29,14 @@ FLOPPY_FORMATS_MEMBER( bbc_acorn8271_device::floppy_formats )
FLOPPY_FSD_FORMAT
FLOPPY_FORMATS_END0
static SLOT_INTERFACE_START( bbc_floppies_525 )
SLOT_INTERFACE("525sssd", FLOPPY_525_SSSD)
SLOT_INTERFACE("525sd", FLOPPY_525_SD)
SLOT_INTERFACE("525ssdd", FLOPPY_525_SSDD)
SLOT_INTERFACE("525dd", FLOPPY_525_DD)
SLOT_INTERFACE("525qd", FLOPPY_525_QD)
SLOT_INTERFACE_END
static void bbc_floppies_525(device_slot_interface &device)
{
device.option_add("525sssd", FLOPPY_525_SSSD);
device.option_add("525sd", FLOPPY_525_SD);
device.option_add("525ssdd", FLOPPY_525_SSDD);
device.option_add("525dd", FLOPPY_525_DD);
device.option_add("525qd", FLOPPY_525_QD);
}
ROM_START( acorn8271 )
ROM_REGION(0x4000, "dfs_rom", 0)

15
src/devices/bus/bbc/fdc/cumana.cpp
View File

@ -31,13 +31,14 @@ FLOPPY_FORMATS_MEMBER( bbc_cumanafdc_device::floppy_formats )
FLOPPY_FSD_FORMAT
FLOPPY_FORMATS_END0
static SLOT_INTERFACE_START( bbc_floppies_525 )
SLOT_INTERFACE("525sssd", FLOPPY_525_SSSD)
SLOT_INTERFACE("525sd", FLOPPY_525_SD)
SLOT_INTERFACE("525ssdd", FLOPPY_525_SSDD)
SLOT_INTERFACE("525dd", FLOPPY_525_DD)
SLOT_INTERFACE("525qd", FLOPPY_525_QD)
SLOT_INTERFACE_END
static void bbc_floppies_525(device_slot_interface &device)
{
device.option_add("525sssd", FLOPPY_525_SSSD);
device.option_add("525sd", FLOPPY_525_SD);
device.option_add("525ssdd", FLOPPY_525_SSDD);
device.option_add("525dd", FLOPPY_525_DD);
device.option_add("525qd", FLOPPY_525_QD);
}
ROM_START( cumana1 )
ROM_REGION(0x4000, "dfs_rom", 0)

15
src/devices/bus/bbc/fdc/cv1797.cpp
View File

@ -30,13 +30,14 @@ FLOPPY_FORMATS_MEMBER( bbc_cv1797_device::floppy_formats )
FLOPPY_FSD_FORMAT
FLOPPY_FORMATS_END0
static SLOT_INTERFACE_START( bbc_floppies_525 )
SLOT_INTERFACE("525sssd", FLOPPY_525_SSSD)
SLOT_INTERFACE("525sd", FLOPPY_525_SD)
SLOT_INTERFACE("525ssdd", FLOPPY_525_SSDD)
SLOT_INTERFACE("525dd", FLOPPY_525_DD)
SLOT_INTERFACE("525qd", FLOPPY_525_QD)
SLOT_INTERFACE_END
static void bbc_floppies_525(device_slot_interface &device)
{
device.option_add("525sssd", FLOPPY_525_SSSD);
device.option_add("525sd", FLOPPY_525_SD);
device.option_add("525ssdd", FLOPPY_525_SSDD);
device.option_add("525dd", FLOPPY_525_DD);
device.option_add("525qd", FLOPPY_525_QD);
}
ROM_START( cv1797 )
ROM_REGION(0x4000, "dfs_rom", 0)

37
src/devices/bus/bbc/fdc/fdc.cpp
View File

@ -119,21 +119,22 @@ void bbc_fdc_slot_device::device_reset()
//#include "zdfs.h"
SLOT_INTERFACE_START( bbc_fdc_devices )
SLOT_INTERFACE("acorn8271", BBC_ACORN8271)
SLOT_INTERFACE("acorn1770", BBC_ACORN1770)
SLOT_INTERFACE("cumana1", BBC_CUMANA1)
SLOT_INTERFACE("cumana2", BBC_CUMANA2)
SLOT_INTERFACE("cv1797", BBC_CV1797)
//SLOT_INTERFACE("microware", BBC_MICROWARE)
SLOT_INTERFACE("opus8272", BBC_OPUS8272)
SLOT_INTERFACE("opus2791", BBC_OPUS2791)
SLOT_INTERFACE("opus2793", BBC_OPUS2793)
SLOT_INTERFACE("opus1770", BBC_OPUS1770)
//SLOT_INTERFACE("stl8271", BBC_STL8271)
//SLOT_INTERFACE("stl1770_1", BBC_STL1770_1)
//SLOT_INTERFACE("stl1770_2", BBC_STL1770_2)
SLOT_INTERFACE("weddb2", BBC_WEDDB2)
SLOT_INTERFACE("weddb3", BBC_WEDDB3)
//SLOT_INTERFACE("zdfs", BBC_ZDFS)
SLOT_INTERFACE_END
void bbc_fdc_devices(device_slot_interface &device)
{
device.option_add("acorn8271", BBC_ACORN8271);
device.option_add("acorn1770", BBC_ACORN1770);
device.option_add("cumana1", BBC_CUMANA1);
device.option_add("cumana2", BBC_CUMANA2);
device.option_add("cv1797", BBC_CV1797);
//device.option_add("microware", BBC_MICROWARE);
device.option_add("opus8272", BBC_OPUS8272);
device.option_add("opus2791", BBC_OPUS2791);
device.option_add("opus2793", BBC_OPUS2793);
device.option_add("opus1770", BBC_OPUS1770);
//device.option_add("stl8271", BBC_STL8271);
//device.option_add("stl1770_1", BBC_STL1770_1);
//device.option_add("stl1770_2", BBC_STL1770_2);
device.option_add("weddb2", BBC_WEDDB2);
device.option_add("weddb3", BBC_WEDDB3);
//device.option_add("zdfs", BBC_ZDFS);
}

2
src/devices/bus/bbc/fdc/fdc.h
View File

@ -82,7 +82,7 @@ protected:
// device type definition
DECLARE_DEVICE_TYPE(BBC_FDC_SLOT, bbc_fdc_slot_device)
SLOT_INTERFACE_EXTERN( bbc_fdc_devices );
void bbc_fdc_devices(device_slot_interface &device);
#endif // MAME_BUS_BBC_FDC_FDC_H

15
src/devices/bus/bbc/fdc/opus.cpp
View File

@ -39,13 +39,14 @@ FLOPPY_FORMATS_MEMBER( bbc_opusfdc_device::floppy_formats )
FLOPPY_OPUS_DDCPM_FORMAT
FLOPPY_FORMATS_END0
static SLOT_INTERFACE_START( bbc_floppies_525 )
SLOT_INTERFACE("525sssd", FLOPPY_525_SSSD)
SLOT_INTERFACE("525sd", FLOPPY_525_SD)
SLOT_INTERFACE("525ssdd", FLOPPY_525_SSDD)
SLOT_INTERFACE("525dd", FLOPPY_525_DD)
SLOT_INTERFACE("525qd", FLOPPY_525_QD)
SLOT_INTERFACE_END
static void bbc_floppies_525(device_slot_interface &device)
{
device.option_add("525sssd", FLOPPY_525_SSSD);
device.option_add("525sd", FLOPPY_525_SD);
device.option_add("525ssdd", FLOPPY_525_SSDD);
device.option_add("525dd", FLOPPY_525_DD);
device.option_add("525qd", FLOPPY_525_QD);
}
ROM_START( opus8272 )
ROM_REGION(0x4000, "dfs_rom", 0)

15
src/devices/bus/bbc/fdc/watford.cpp
View File

@ -33,13 +33,14 @@ FLOPPY_FORMATS_MEMBER( bbc_watfordfdc_device::floppy_formats )
FLOPPY_FSD_FORMAT
FLOPPY_FORMATS_END0
static SLOT_INTERFACE_START( bbc_floppies_525 )
SLOT_INTERFACE("525sssd", FLOPPY_525_SSSD)
SLOT_INTERFACE("525sd", FLOPPY_525_SD)
SLOT_INTERFACE("525ssdd", FLOPPY_525_SSDD)
SLOT_INTERFACE("525dd", FLOPPY_525_DD)
SLOT_INTERFACE("525qd", FLOPPY_525_QD)
SLOT_INTERFACE_END
static void bbc_floppies_525(device_slot_interface &device)
{
device.option_add("525sssd", FLOPPY_525_SSSD);
device.option_add("525sd", FLOPPY_525_SD);
device.option_add("525ssdd", FLOPPY_525_SSDD);
device.option_add("525dd", FLOPPY_525_DD);
device.option_add("525qd", FLOPPY_525_QD);
}
ROM_START( weddb2 )
ROM_REGION(0x4000, "dfs_rom", 0)

9
src/devices/bus/bbc/joyport/joyport.cpp
View File

@ -130,7 +130,8 @@ WRITE8_MEMBER(bbc_joyport_slot_device::pb_w)
//#include "mouse.h"
SLOT_INTERFACE_START( bbc_joyport_devices )
SLOT_INTERFACE("joystick", BBCMC_JOYSTICK)
//SLOT_INTERFACE("mouse", BBCMC_MOUSE)
SLOT_INTERFACE_END
void bbc_joyport_devices(device_slot_interface &device)
{
device.option_add("joystick", BBCMC_JOYSTICK);
//device.option_add("mouse", BBCMC_MOUSE);
}

2
src/devices/bus/bbc/joyport/joyport.h
View File

@ -106,7 +106,7 @@ protected:
// device type definition
DECLARE_DEVICE_TYPE(BBC_JOYPORT_SLOT, bbc_joyport_slot_device)
SLOT_INTERFACE_EXTERN( bbc_joyport_devices );
void bbc_joyport_devices(device_slot_interface &device);
#endif // MAME_BUS_BBC_JOYPORT_JOYPORT_H

44
src/devices/bus/bbc/tube/tube.cpp
View File

@ -146,37 +146,39 @@ WRITE8_MEMBER(bbc_tube_slot_device::host_w)
// SLOT_INTERFACE( bbc_extube_devices )
//-------------------------------------------------
SLOT_INTERFACE_START( bbc_extube_devices )
SLOT_INTERFACE("6502", BBC_TUBE_6502) /* Acorn ANC01 6502 2nd processor */
SLOT_INTERFACE("z80", BBC_TUBE_Z80) /* Acorn ANC04 Z80 2nd processor */
// SLOT_INTERFACE("32016", BBC_TUBE_32016) /* Acorn ANC05 32016 2nd processor */
// SLOT_INTERFACE("camb", BBC_TUBE_CAMB) /* Acorn ANC06 Cambridge Co-Processor */
SLOT_INTERFACE("arm", BBC_TUBE_ARM) /* Acorn ANC13 ARM Evaluation System */
SLOT_INTERFACE("80286", BBC_TUBE_80286) /* Acorn 80286 2nd Processor */
// SLOT_INTERFACE("a500", BBC_TUBE_A500) /* Acorn A500 2nd Processor */
SLOT_INTERFACE("casper", BBC_TUBE_CASPER) /* Casper 68000 2nd Processor */
SLOT_INTERFACE("zep100", BBC_TUBE_ZEP100) /* Torch Z80 Communicator (ZEP100) */
void bbc_extube_devices(device_slot_interface &device)
{
device.option_add("6502", BBC_TUBE_6502); /* Acorn ANC01 6502 2nd processor */
device.option_add("z80", BBC_TUBE_Z80); /* Acorn ANC04 Z80 2nd processor */
// device.option_add("32016", BBC_TUBE_32016); /* Acorn ANC05 32016 2nd processor */
// device.option_add("camb", BBC_TUBE_CAMB); /* Acorn ANC06 Cambridge Co-Processor */
device.option_add("arm", BBC_TUBE_ARM); /* Acorn ANC13 ARM Evaluation System */
device.option_add("80286", BBC_TUBE_80286); /* Acorn 80286 2nd Processor */
// device.option_add("a500", BBC_TUBE_A500); /* Acorn A500 2nd Processor */
device.option_add("casper", BBC_TUBE_CASPER); /* Casper 68000 2nd Processor */
device.option_add("zep100", BBC_TUBE_ZEP100); /* Torch Z80 Communicator (ZEP100) */
/* Acorn ANC21 Universal 2nd Processor Unit */
SLOT_INTERFACE("65c102", BBC_TUBE_65C102) /* Acorn ADC06 65C102 co-processor */
SLOT_INTERFACE("80186", BBC_TUBE_80186) /* Acorn ADC08 80186 co-processor */
SLOT_INTERFACE_END
device.option_add("65c102", BBC_TUBE_65C102); /* Acorn ADC06 65C102 co-processor */
device.option_add("80186", BBC_TUBE_80186); /* Acorn ADC08 80186 co-processor */
}
//-------------------------------------------------
// SLOT_INTERFACE( bbc_intube_devices )
//-------------------------------------------------
SLOT_INTERFACE_START( bbc_intube_devices )
SLOT_INTERFACE("65c102", BBC_TUBE_65C102) /* Acorn ADC06 65C102 co-processor */
SLOT_INTERFACE("80186", BBC_TUBE_80186) /* Acorn ADC08 80186 co-processor */
// SLOT_INTERFACE("arm7", BBC_TUBE_ARM7) /* Sprow ARM7 co-processor */
SLOT_INTERFACE_END
void bbc_intube_devices(device_slot_interface &device)
{
device.option_add("65c102", BBC_TUBE_65C102); /* Acorn ADC06 65C102 co-processor */
device.option_add("80186", BBC_TUBE_80186); /* Acorn ADC08 80186 co-processor */
// device.option_add("arm7", BBC_TUBE_ARM7); /* Sprow ARM7 co-processor */
}
//-------------------------------------------------
// SLOT_INTERFACE( bbc_x25tube_devices )
//-------------------------------------------------
//SLOT_INTERFACE_START( bbc_x25tube_devices )
// SLOT_INTERFACE("x25", BBC_TUBE_X25) /* Econet X25 Gateway */
//SLOT_INTERFACE_END
//void bbc_x25tube_devices(device_slot_interface &device)
// device.option_add("x25", BBC_TUBE_X25); /* Econet X25 Gateway */
//}

6
src/devices/bus/bbc/tube/tube.h
View File

@ -116,9 +116,9 @@ protected:
// device type definition
DECLARE_DEVICE_TYPE(BBC_TUBE_SLOT, bbc_tube_slot_device)
SLOT_INTERFACE_EXTERN( bbc_extube_devices );
SLOT_INTERFACE_EXTERN( bbc_intube_devices );
//SLOT_INTERFACE_EXTERN( bbc_x25tube_devices );
void bbc_extube_devices(device_slot_interface &device);
void bbc_intube_devices(device_slot_interface &device);
//void bbc_x25tube_devices(device_slot_interface &device);
#endif // MAME_BUS_BBC_TUBE_TUBE_H

15
src/devices/bus/bbc/userport/userport.cpp
View File

@ -119,10 +119,11 @@ WRITE8_MEMBER(bbc_userport_slot_device::pb_w)
#include "cfa3000kbd.h"
SLOT_INTERFACE_START( bbc_userport_devices )
// SLOT_INTERFACE("amxmouse", BBC_AMXMOUSE) /* AMX Mouse */
// SLOT_INTERFACE("m512mouse", BBC_M512MOUSE) /* Acorn Mouse (provided with Master 512) */
// SLOT_INTERFACE("tracker", BBC_TRACKER) /* Marconi RB2 Tracker Ball / Acorn Tracker Ball */
// SLOT_INTERFACE("music4000", BBC_MUSIC4000) /* Hybrid Music 4000 Keyboard */
SLOT_INTERFACE("cfa3000kbd", CFA3000_KBD) /* Henson CFA 3000 Keyboard */
SLOT_INTERFACE_END
void bbc_userport_devices(device_slot_interface &device)
{
// device.option_add("amxmouse", BBC_AMXMOUSE); /* AMX Mouse */
// device.option_add("m512mouse", BBC_M512MOUSE); /* Acorn Mouse (provided with Master 512) */
// device.option_add("tracker", BBC_TRACKER); /* Marconi RB2 Tracker Ball / Acorn Tracker Ball */
// device.option_add("music4000", BBC_MUSIC4000); /* Hybrid Music 4000 Keyboard */
device.option_add("cfa3000kbd", CFA3000_KBD); /* Henson CFA 3000 Keyboard */
}

2
src/devices/bus/bbc/userport/userport.h
View File

@ -106,7 +106,7 @@ protected:
DECLARE_DEVICE_TYPE(BBC_USERPORT_SLOT, bbc_userport_slot_device)
SLOT_INTERFACE_EXTERN( bbc_userport_devices );
void bbc_userport_devices(device_slot_interface &device);
#endif // MAME_BUS_BBC_USERPORT_USERPORT_H

7
src/devices/bus/bml3/bml3mp1802.cpp
View File

@ -23,9 +23,10 @@
DEFINE_DEVICE_TYPE(BML3BUS_MP1802, bml3bus_mp1802_device, "bml3mp1802", "Hitachi MP-1802 Floppy Controller Card")
static SLOT_INTERFACE_START( mp1802_floppies )
SLOT_INTERFACE("dd", FLOPPY_525_DD)
SLOT_INTERFACE_END
static void mp1802_floppies(device_slot_interface &device)
{
device.option_add("dd", FLOPPY_525_DD);
}
WRITE_LINE_MEMBER( bml3bus_mp1802_device::bml3_wd17xx_intrq_w )
{

7
src/devices/bus/bw2/exp.cpp
View File

@ -187,6 +187,7 @@ WRITE8_MEMBER( bw2_expansion_slot_device::modsel_w )
// slot devices
#include "ramcard.h"
SLOT_INTERFACE_START( bw2_expansion_cards )
SLOT_INTERFACE("ramcard", BW2_RAMCARD)
SLOT_INTERFACE_END
void bw2_expansion_cards(device_slot_interface &device)
{
device.option_add("ramcard", BW2_RAMCARD);
}

3
src/devices/bus/bw2/exp.h
View File

@ -124,7 +124,6 @@ protected:
DECLARE_DEVICE_TYPE(BW2_EXPANSION_SLOT, bw2_expansion_slot_device)
SLOT_INTERFACE_EXTERN( bw2_expansion_cards );
void bw2_expansion_cards(device_slot_interface &device);
#endif // MAME_BUS_BW2_EXP_H

141
src/devices/bus/c64/exp.cpp
View File

@ -368,75 +368,76 @@ int c64_expansion_slot_device::exrom_r(offs_t offset, int sphi2, int ba, int rw,
#include "xl80.h"
#include "zaxxon.h"
SLOT_INTERFACE_START( c64_expansion_cards )
SLOT_INTERFACE("16k", C64_16KB)
SLOT_INTERFACE("cpm", C64_CPM)
SLOT_INTERFACE("dqbb", C64_DQBB)
SLOT_INTERFACE("easyflash", C64_EASYFLASH)
SLOT_INTERFACE("georam", C64_GEORAM)
SLOT_INTERFACE("ide64", C64_IDE64)
SLOT_INTERFACE("midimap", C64_MIDI_MAPLIN)
SLOT_INTERFACE("midins", C64_MIDI_NAMESOFT)
SLOT_INTERFACE("midipp", C64_MIDI_PASSPORT)
SLOT_INTERFACE("midisci", C64_MIDI_SCI)
SLOT_INTERFACE("midisiel", C64_MIDI_SIEL)
SLOT_INTERFACE("music64", C64_MUSIC64)
SLOT_INTERFACE("neoram", C64_NEORAM)
SLOT_INTERFACE("reu1700", C64_REU1700)
SLOT_INTERFACE("reu1750", C64_REU1750)
SLOT_INTERFACE("reu1764", C64_REU1764)
SLOT_INTERFACE("sfxse", C64_SFX_SOUND_EXPANDER)
SLOT_INTERFACE("speakez", C64_SPEAKEASY)
SLOT_INTERFACE("supercpu", C64_SUPERCPU)
SLOT_INTERFACE("swiftlink", C64_SWIFTLINK)
SLOT_INTERFACE("turbo232", C64_TURBO232)
void c64_expansion_cards(device_slot_interface &device)
{
device.option_add("16k", C64_16KB);
device.option_add("cpm", C64_CPM);
device.option_add("dqbb", C64_DQBB);
device.option_add("easyflash", C64_EASYFLASH);
device.option_add("georam", C64_GEORAM);
device.option_add("ide64", C64_IDE64);
device.option_add("midimap", C64_MIDI_MAPLIN);
device.option_add("midins", C64_MIDI_NAMESOFT);
device.option_add("midipp", C64_MIDI_PASSPORT);
device.option_add("midisci", C64_MIDI_SCI);
device.option_add("midisiel", C64_MIDI_SIEL);
device.option_add("music64", C64_MUSIC64);
device.option_add("neoram", C64_NEORAM);
device.option_add("reu1700", C64_REU1700);
device.option_add("reu1750", C64_REU1750);
device.option_add("reu1764", C64_REU1764);
device.option_add("sfxse", C64_SFX_SOUND_EXPANDER);
device.option_add("speakez", C64_SPEAKEASY);
device.option_add("supercpu", C64_SUPERCPU);
device.option_add("swiftlink", C64_SWIFTLINK);
device.option_add("turbo232", C64_TURBO232);
// the following need ROMs from the software list
SLOT_INTERFACE_INTERNAL("standard", C64_STD)
SLOT_INTERFACE_INTERNAL("comal80", C64_COMAL80)
SLOT_INTERFACE_INTERNAL("c128_comal80", C128_COMAL80)
SLOT_INTERFACE_INTERNAL("cs64", C64_CURRAH_SPEECH)
SLOT_INTERFACE_INTERNAL("dela_ep256", C64_DELA_EP256)
SLOT_INTERFACE_INTERNAL("ep64", C64_DELA_EP64)
SLOT_INTERFACE_INTERNAL("ep7x8", C64_DELA_EP7X8)
SLOT_INTERFACE_INTERNAL("dinamic", C64_DINAMIC)
SLOT_INTERFACE_INTERNAL("easycalcres", C64_EASY_CALC_RESULT)
SLOT_INTERFACE_INTERNAL("epyxfastload", C64_EPYX_FAST_LOAD)
SLOT_INTERFACE_INTERNAL("exos", C64_EXOS)
SLOT_INTERFACE_INTERNAL("fcc", C64_FCC)
SLOT_INTERFACE_INTERNAL("final", C64_FINAL)
SLOT_INTERFACE_INTERNAL("final3", C64_FINAL3)
SLOT_INTERFACE_INTERNAL("fun_play", C64_FUN_PLAY)
SLOT_INTERFACE_INTERNAL("ieee488", C64_IEEE488)
SLOT_INTERFACE_INTERNAL("kingsoft", C64_KINGSOFT)
SLOT_INTERFACE_INTERNAL("mach5", C64_MACH5)
SLOT_INTERFACE_INTERNAL("magic_desk", C64_MAGIC_DESK)
SLOT_INTERFACE_INTERNAL("magic_formel", C64_MAGIC_FORMEL)
SLOT_INTERFACE_INTERNAL("magic_voice", C64_MAGIC_VOICE)
SLOT_INTERFACE_INTERNAL("mikroasm", C64_MIKRO_ASSEMBLER)
SLOT_INTERFACE_INTERNAL("multiscreen", C64_MULTISCREEN)
SLOT_INTERFACE_INTERNAL("ocean", C64_OCEAN)
SLOT_INTERFACE_INTERNAL("pagefox", C64_PAGEFOX)
SLOT_INTERFACE_INTERNAL("partner", C64_PARTNER)
SLOT_INTERFACE_INTERNAL("partner128", C128_PARTNER)
SLOT_INTERFACE_INTERNAL("prophet64", C64_PROPHET64)
SLOT_INTERFACE_INTERNAL("ps64", C64_PS64)
SLOT_INTERFACE_INTERNAL("rex", C64_REX)
SLOT_INTERFACE_INTERNAL("rex_ep256", C64_REX_EP256)
SLOT_INTERFACE_INTERNAL("ross", C64_ROSS)
SLOT_INTERFACE_INTERNAL("silverrock", C64_SILVERROCK)
SLOT_INTERFACE_INTERNAL("simons_basic", C64_SIMONS_BASIC)
SLOT_INTERFACE_INTERNAL("stardos", C64_STARDOS)
SLOT_INTERFACE_INTERNAL("struct_basic", C64_STRUCTURED_BASIC)
SLOT_INTERFACE_INTERNAL("super_explode", C64_SUPER_EXPLODE)
SLOT_INTERFACE_INTERNAL("super_games", C64_SUPER_GAMES)
SLOT_INTERFACE_INTERNAL("sw8k", C64_SW8K)
SLOT_INTERFACE_INTERNAL("system3", C64_SYSTEM3)
SLOT_INTERFACE_INTERNAL("tdos", C64_TDOS)
SLOT_INTERFACE_INTERNAL("vizastar", C64_VIZASTAR)
SLOT_INTERFACE_INTERNAL("vizawrite", C64_VW64)
SLOT_INTERFACE_INTERNAL("warp_speed", C64_WARP_SPEED)
SLOT_INTERFACE_INTERNAL("westermann", C64_WESTERMANN)
SLOT_INTERFACE_INTERNAL("zaxxon", C64_ZAXXON)
SLOT_INTERFACE_INTERNAL("xl80", C64_XL80)
SLOT_INTERFACE_END
device.option_add_internal("standard", C64_STD);
device.option_add_internal("comal80", C64_COMAL80);
device.option_add_internal("c128_comal80", C128_COMAL80);
device.option_add_internal("cs64", C64_CURRAH_SPEECH);
device.option_add_internal("dela_ep256", C64_DELA_EP256);
device.option_add_internal("ep64", C64_DELA_EP64);
device.option_add_internal("ep7x8", C64_DELA_EP7X8);
device.option_add_internal("dinamic", C64_DINAMIC);
device.option_add_internal("easycalcres", C64_EASY_CALC_RESULT);
device.option_add_internal("epyxfastload", C64_EPYX_FAST_LOAD);
device.option_add_internal("exos", C64_EXOS);
device.option_add_internal("fcc", C64_FCC);
device.option_add_internal("final", C64_FINAL);
device.option_add_internal("final3", C64_FINAL3);
device.option_add_internal("fun_play", C64_FUN_PLAY);
device.option_add_internal("ieee488", C64_IEEE488);
device.option_add_internal("kingsoft", C64_KINGSOFT);
device.option_add_internal("mach5", C64_MACH5);
device.option_add_internal("magic_desk", C64_MAGIC_DESK);
device.option_add_internal("magic_formel", C64_MAGIC_FORMEL);
device.option_add_internal("magic_voice", C64_MAGIC_VOICE);
device.option_add_internal("mikroasm", C64_MIKRO_ASSEMBLER);
device.option_add_internal("multiscreen", C64_MULTISCREEN);
device.option_add_internal("ocean", C64_OCEAN);
device.option_add_internal("pagefox", C64_PAGEFOX);
device.option_add_internal("partner", C64_PARTNER);
device.option_add_internal("partner128", C128_PARTNER);
device.option_add_internal("prophet64", C64_PROPHET64);
device.option_add_internal("ps64", C64_PS64);
device.option_add_internal("rex", C64_REX);
device.option_add_internal("rex_ep256", C64_REX_EP256);
device.option_add_internal("ross", C64_ROSS);
device.option_add_internal("silverrock", C64_SILVERROCK);
device.option_add_internal("simons_basic", C64_SIMONS_BASIC);
device.option_add_internal("stardos", C64_STARDOS);
device.option_add_internal("struct_basic", C64_STRUCTURED_BASIC);
device.option_add_internal("super_explode", C64_SUPER_EXPLODE);
device.option_add_internal("super_games", C64_SUPER_GAMES);
device.option_add_internal("sw8k", C64_SW8K);
device.option_add_internal("system3", C64_SYSTEM3);
device.option_add_internal("tdos", C64_TDOS);
device.option_add_internal("vizastar", C64_VIZASTAR);
device.option_add_internal("vizawrite", C64_VW64);
device.option_add_internal("warp_speed", C64_WARP_SPEED);
device.option_add_internal("westermann", C64_WESTERMANN);
device.option_add_internal("zaxxon", C64_ZAXXON);
device.option_add_internal("xl80", C64_XL80);
}

4
src/devices/bus/c64/exp.h
View File

@ -195,8 +195,6 @@ protected:
// device type definition
DECLARE_DEVICE_TYPE(C64_EXPANSION_SLOT, c64_expansion_slot_device)
SLOT_INTERFACE_EXTERN( c64_expansion_cards );
void c64_expansion_cards(device_slot_interface &device);
#endif

19
src/devices/bus/c64/user.cpp
View File

@ -22,12 +22,13 @@
#include "geocable.h"
#include "bus/vic20/vic1011.h"
SLOT_INTERFACE_START( c64_user_port_cards )
SLOT_INTERFACE("4cga", C64_4CGA)
SLOT_INTERFACE("4dxh", C64_4DXH)
SLOT_INTERFACE("4ksa", C64_4KSA)
SLOT_INTERFACE("4tba", C64_4TBA)
SLOT_INTERFACE("bn1541", C64_BN1541)
SLOT_INTERFACE("geocable", C64_GEOCABLE)
SLOT_INTERFACE("rs232", VIC1011)
SLOT_INTERFACE_END
void c64_user_port_cards(device_slot_interface &device)
{
device.option_add("4cga", C64_4CGA);
device.option_add("4dxh", C64_4DXH);
device.option_add("4ksa", C64_4KSA);
device.option_add("4tba", C64_4TBA);
device.option_add("bn1541", C64_BN1541);
device.option_add("geocable", C64_GEOCABLE);
device.option_add("rs232", VIC1011);
}

2
src/devices/bus/c64/user.h
View File

@ -28,6 +28,6 @@
#include "bus/pet/user.h"
SLOT_INTERFACE_EXTERN( c64_user_port_cards );
void c64_user_port_cards(device_slot_interface &device);
#endif // MAME_BUS_C64_USER_H

13
src/devices/bus/cbm2/exp.cpp
View File

@ -188,9 +188,10 @@ void cbm2_expansion_slot_device::write(address_space &space, offs_t offset, uint
#include "hrg.h"
#include "std.h"
SLOT_INTERFACE_START( cbm2_expansion_cards )
SLOT_INTERFACE("24k", CBM2_24K)
SLOT_INTERFACE("hrga", CBM2_HRG_A)
SLOT_INTERFACE("hrgb", CBM2_HRG_B)
SLOT_INTERFACE_INTERNAL("standard", CBM2_STD)
SLOT_INTERFACE_END
void cbm2_expansion_cards(device_slot_interface &device)
{
device.option_add("24k", CBM2_24K);
device.option_add("hrga", CBM2_HRG_A);
device.option_add("hrgb", CBM2_HRG_B);
device.option_add_internal("standard", CBM2_STD);
}

3
src/devices/bus/cbm2/exp.h
View File

@ -128,7 +128,6 @@ protected:
DECLARE_DEVICE_TYPE(CBM2_EXPANSION_SLOT, cbm2_expansion_slot_device)
SLOT_INTERFACE_EXTERN( cbm2_expansion_cards );
void cbm2_expansion_cards(device_slot_interface &device);
#endif // MAME_BUS_CBM2_EXP_H

5
src/devices/bus/cbm2/user.cpp
View File

@ -74,5 +74,6 @@ void cbm2_user_port_device::device_start()
// SLOT_INTERFACE( cbm2_user_port_cards )
//-------------------------------------------------
SLOT_INTERFACE_START( cbm2_user_port_cards )
SLOT_INTERFACE_END
void cbm2_user_port_cards(device_slot_interface &device)
{
}

3
src/devices/bus/cbm2/user.h
View File

@ -147,7 +147,6 @@ DECLARE_DEVICE_TYPE(CBM2_USER_PORT, cbm2_user_port_device)
// slot devices
SLOT_INTERFACE_EXTERN( cbm2_user_port_cards );
void cbm2_user_port_cards(device_slot_interface &device);
#endif // MAME_BUS_CBM2_USER_H

7
src/devices/bus/cbmiec/c1541.cpp
View File

@ -754,9 +754,10 @@ WRITE_LINE_MEMBER( c1541_device_base::byte_w )
// SLOT_INTERFACE( c1540_floppies )
//-------------------------------------------------
static SLOT_INTERFACE_START( c1540_floppies )
SLOT_INTERFACE( "525ssqd", ALPS_3255190X )
SLOT_INTERFACE_END
static void c1540_floppies(device_slot_interface &device)
{
device.option_add("525ssqd", ALPS_3255190X);
}
//-------------------------------------------------

14
src/devices/bus/cbmiec/c1571.cpp
View File

@ -564,9 +564,10 @@ WRITE_LINE_MEMBER( c1571_device::byte_w )
// SLOT_INTERFACE( c1571_floppies )
//-------------------------------------------------
static SLOT_INTERFACE_START( c1571_floppies )
SLOT_INTERFACE( "525qd", FLOPPY_525_QD )
SLOT_INTERFACE_END
static void c1571_floppies(device_slot_interface &device)
{
device.option_add("525qd", FLOPPY_525_QD);
}
//-------------------------------------------------
@ -594,9 +595,10 @@ FLOPPY_FORMATS_END
// isa8bus_interface isabus_intf
//-------------------------------------------------
static SLOT_INTERFACE_START( mini_chief_isa8_cards )
SLOT_INTERFACE("wd1002a_wx1", ISA8_WD1002A_WX1)
SLOT_INTERFACE_END
static void mini_chief_isa8_cards(device_slot_interface &device)
{
device.option_add("wd1002a_wx1", ISA8_WD1002A_WX1);
}
//-------------------------------------------------
// device_add_mconfig - add device configuration

7
src/devices/bus/cbmiec/c1581.cpp
View File

@ -248,9 +248,10 @@ WRITE8_MEMBER( c1581_device::cia_pb_w )
// SLOT_INTERFACE( c1581_floppies )
//-------------------------------------------------
static SLOT_INTERFACE_START( c1581_floppies )
SLOT_INTERFACE( "35dd", FLOPPY_35_DD ) // Chinon F-354-E
SLOT_INTERFACE_END
static void c1581_floppies(device_slot_interface &device)
{
device.option_add("35dd", FLOPPY_35_DD); // Chinon F-354-E
}
//-------------------------------------------------

55
src/devices/bus/cbmiec/cbmiec.cpp
View File

@ -497,30 +497,31 @@ int cbm_iec_device::get_signal(int signal)
#include "vic1520.h"
#include "c1526.h"
SLOT_INTERFACE_START( cbm_iec_devices )
SLOT_INTERFACE("c1540", C1540)
SLOT_INTERFACE("c1541", C1541)
SLOT_INTERFACE("c1541c", C1541C)
SLOT_INTERFACE("c1541ii", C1541II)
SLOT_INTERFACE("fsd1", FSD1)
SLOT_INTERFACE("fsd2", FSD2)
SLOT_INTERFACE("csd1", CSD1)
SLOT_INTERFACE("c1541dd", C1541_DOLPHIN_DOS)
SLOT_INTERFACE("c1541pd", C1541_PROFESSIONAL_DOS_V1)
SLOT_INTERFACE("c1541pdc", C1541_PROLOGIC_DOS_CLASSIC)
SLOT_INTERFACE("c1570", C1570)
SLOT_INTERFACE("c1571", C1571)
SLOT_INTERFACE("c1581", C1581)
SLOT_INTERFACE("indusgt", INDUS_GT)
SLOT_INTERFACE("cmdhd", CMD_HD)
SLOT_INTERFACE("fd2000", FD2000)
SLOT_INTERFACE("fd4000", FD4000)
SLOT_INTERFACE("interpod", INTERPOD)
SLOT_INTERFACE("minichief", MINI_CHIEF)
SLOT_INTERFACE("serialbox", SERIAL_BOX)
SLOT_INTERFACE("diag264", DIAG264_SERIAL_LOOPBACK)
SLOT_INTERFACE("nl10", C64_NL10_INTERFACE)
SLOT_INTERFACE("vic1515", VIC1515)
SLOT_INTERFACE("vic1520", VIC1520)
SLOT_INTERFACE("c1526", C1526)
SLOT_INTERFACE_END
void cbm_iec_devices(device_slot_interface &device)
{
device.option_add("c1540", C1540);
device.option_add("c1541", C1541);
device.option_add("c1541c", C1541C);
device.option_add("c1541ii", C1541II);
device.option_add("fsd1", FSD1);
device.option_add("fsd2", FSD2);
device.option_add("csd1", CSD1);
device.option_add("c1541dd", C1541_DOLPHIN_DOS);
device.option_add("c1541pd", C1541_PROFESSIONAL_DOS_V1);
device.option_add("c1541pdc", C1541_PROLOGIC_DOS_CLASSIC);
device.option_add("c1570", C1570);
device.option_add("c1571", C1571);
device.option_add("c1581", C1581);
device.option_add("indusgt", INDUS_GT);
device.option_add("cmdhd", CMD_HD);
device.option_add("fd2000", FD2000);
device.option_add("fd4000", FD4000);
device.option_add("interpod", INTERPOD);
device.option_add("minichief", MINI_CHIEF);
device.option_add("serialbox", SERIAL_BOX);
device.option_add("diag264", DIAG264_SERIAL_LOOPBACK);
device.option_add("nl10", C64_NL10_INTERFACE);
device.option_add("vic1515", VIC1515);
device.option_add("vic1520", VIC1520);
device.option_add("c1526", C1526);
}

3
src/devices/bus/cbmiec/cbmiec.h
View File

@ -204,7 +204,6 @@ DECLARE_DEVICE_TYPE(CBM_IEC, cbm_iec_device)
DECLARE_DEVICE_TYPE(CBM_IEC_SLOT, cbm_iec_slot_device)
SLOT_INTERFACE_EXTERN( cbm_iec_devices );
void cbm_iec_devices(device_slot_interface &device);
#endif // MAME_BUS_CBMIEC_CBMIEC_H

14
src/devices/bus/cbmiec/fd2000.cpp
View File

@ -194,13 +194,15 @@ WRITE8_MEMBER( fd2000_device::via_pb_w )
*/
}
static SLOT_INTERFACE_START( fd2000_floppies )
SLOT_INTERFACE( "35hd", FLOPPY_35_HD ) // TEAC FD-235HF
SLOT_INTERFACE_END
static void fd2000_floppies(device_slot_interface &device)
{
device.option_add("35hd", FLOPPY_35_HD); // TEAC FD-235HF
}
static SLOT_INTERFACE_START( fd4000_floppies )
SLOT_INTERFACE( "35ed", FLOPPY_35_ED ) // TEAC FD-235J
SLOT_INTERFACE_END
static void fd4000_floppies(device_slot_interface &device)
{
device.option_add("35ed", FLOPPY_35_ED); // TEAC FD-235J
}
/*
FLOPPY_FORMATS_MEMBER( fd2000_device::floppy_formats )
FLOPPY_D81_FORMAT

4
src/devices/bus/cbus/pc9801_86.cpp
View File

@ -66,8 +66,8 @@ MACHINE_CONFIG_START(pc9801_86_device::device_add_mconfig)
MCFG_SOUND_ADD("ldac", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) // burr brown pcm61p
MCFG_SOUND_ADD("rdac", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) // burr brown pcm61p
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE_EX(0, "ldac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "ldac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE_EX(0, "rdac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "rdac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "ldac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "ldac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "rdac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "rdac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
// RAM

6
src/devices/bus/centronics/covox.cpp
View File

@ -43,7 +43,7 @@ MACHINE_CONFIG_START(centronics_covox_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("speaker")
MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
void centronics_covox_device::device_start()
@ -93,8 +93,8 @@ MACHINE_CONFIG_START(centronics_covox_stereo_device::device_add_mconfig)
MCFG_SOUND_ADD("ldac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.5) // unknown DAC
MCFG_SOUND_ADD("rdac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.5) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE_EX(0, "ldac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "ldac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE_EX(0, "rdac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "rdac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "ldac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "ldac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "rdac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "rdac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
void centronics_covox_stereo_device::device_start()

23
src/devices/bus/centronics/ctronics.cpp
View File

@ -122,14 +122,15 @@ device_centronics_peripheral_interface::~device_centronics_peripheral_interface(
#include "printer.h"
#include "covox.h"
SLOT_INTERFACE_START(centronics_devices)
SLOT_INTERFACE("pl80", COMX_PL80)
SLOT_INTERFACE("ex800", EPSON_EX800)
SLOT_INTERFACE("lx800", EPSON_LX800)
SLOT_INTERFACE("lx810l", EPSON_LX810L)
SLOT_INTERFACE("ap2000", EPSON_AP2000)
SLOT_INTERFACE("p72", NEC_P72)
SLOT_INTERFACE("printer", CENTRONICS_PRINTER)
SLOT_INTERFACE("covox", CENTRONICS_COVOX)
SLOT_INTERFACE("covox_stereo", CENTRONICS_COVOX_STEREO)
SLOT_INTERFACE_END
void centronics_devices(device_slot_interface &device)
{
device.option_add("pl80", COMX_PL80);
device.option_add("ex800", EPSON_EX800);
device.option_add("lx800", EPSON_LX800);
device.option_add("lx810l", EPSON_LX810L);
device.option_add("ap2000", EPSON_AP2000);
device.option_add("p72", NEC_P72);
device.option_add("printer", CENTRONICS_PRINTER);
device.option_add("covox", CENTRONICS_COVOX);
device.option_add("covox_stereo", CENTRONICS_COVOX_STEREO);
}

2
src/devices/bus/centronics/ctronics.h
View File

@ -216,6 +216,6 @@ protected:
};
SLOT_INTERFACE_EXTERN( centronics_devices );
void centronics_devices(device_slot_interface &device);
#endif // MAME_BUS_CENTRONICS_CTRONICS_H

2
src/devices/bus/centronics/digiblst.cpp
View File

@ -43,7 +43,7 @@ MACHINE_CONFIG_START(centronics_digiblaster_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("speaker")
MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
void centronics_digiblaster_device::device_start()

2
src/devices/bus/centronics/epson_lx810l.cpp
View File

@ -144,7 +144,7 @@ MACHINE_CONFIG_START(epson_lx810l_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("speaker")
MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
/* gate array */
MCFG_DEVICE_ADD("e05a30", E05A30, 0)

7
src/devices/bus/cgenie/expansion/carts.cpp
View File

@ -11,6 +11,7 @@
#include "floppy.h"
SLOT_INTERFACE_START( cg_exp_slot_carts )
SLOT_INTERFACE("floppy", CGENIE_FDC)
SLOT_INTERFACE_END
void cg_exp_slot_carts(device_slot_interface &device)
{
device.option_add("floppy", CGENIE_FDC);
}

2
src/devices/bus/cgenie/expansion/carts.h
View File

@ -12,6 +12,6 @@
#pragma once
SLOT_INTERFACE_EXTERN( cg_exp_slot_carts );
void cg_exp_slot_carts(device_slot_interface &device);
#endif // MAME_BUS_CGENIE_EXPANSION_CARTS_H

17
src/devices/bus/cgenie/expansion/floppy.cpp
View File

@ -43,14 +43,15 @@ FLOPPY_FORMATS_MEMBER( cgenie_fdc_device::floppy_formats )
FLOPPY_CGENIE_FORMAT
FLOPPY_FORMATS_END
static SLOT_INTERFACE_START( cgenie_floppies )
SLOT_INTERFACE("sssd", FLOPPY_525_SSSD)
SLOT_INTERFACE("sd", FLOPPY_525_SD)
SLOT_INTERFACE("ssdd", FLOPPY_525_SSDD)
SLOT_INTERFACE("dd", FLOPPY_525_DD)
SLOT_INTERFACE("ssqd", FLOPPY_525_SSQD)
SLOT_INTERFACE("qd", FLOPPY_525_QD)
SLOT_INTERFACE_END
static void cgenie_floppies(device_slot_interface &device)
{
device.option_add("sssd", FLOPPY_525_SSSD);
device.option_add("sd", FLOPPY_525_SD);
device.option_add("ssdd", FLOPPY_525_SSDD);
device.option_add("dd", FLOPPY_525_DD);
device.option_add("ssqd", FLOPPY_525_SSQD);
device.option_add("qd", FLOPPY_525_QD);
}
//-------------------------------------------------
// rom_region - device-specific ROM region

9
src/devices/bus/cgenie/parallel/carts.cpp
View File

@ -12,7 +12,8 @@
#include "printer.h"
SLOT_INTERFACE_START( cg_parallel_slot_carts )
SLOT_INTERFACE("joystick", CGENIE_JOYSTICK)
SLOT_INTERFACE("printer", CGENIE_PRINTER)
SLOT_INTERFACE_END
void cg_parallel_slot_carts(device_slot_interface &device)
{
device.option_add("joystick", CGENIE_JOYSTICK);
device.option_add("printer", CGENIE_PRINTER);
}

2
src/devices/bus/cgenie/parallel/carts.h
View File

@ -12,6 +12,6 @@
#pragma once
SLOT_INTERFACE_EXTERN( cg_parallel_slot_carts );
void cg_parallel_slot_carts(device_slot_interface &device);
#endif // MAME_BUS_CGENIE_PARALLEL_CARTS_H

7
src/devices/bus/coco/coco_fdc.cpp
View File

@ -121,9 +121,10 @@ FLOPPY_FORMATS_MEMBER( coco_family_fdc_device_base::floppy_formats )
FLOPPY_SDF_FORMAT
FLOPPY_FORMATS_END
static SLOT_INTERFACE_START( coco_fdc_floppies )
SLOT_INTERFACE("qd", FLOPPY_525_QD)
SLOT_INTERFACE_END
static void coco_fdc_floppies(device_slot_interface &device)
{
device.option_add("qd", FLOPPY_525_QD);
}
MACHINE_CONFIG_START(coco_fdc_device_base::device_add_mconfig)
MCFG_WD1773_ADD(WD_TAG, XTAL(8'000'000))

44
src/devices/bus/coco/coco_multi.cpp
View File

@ -156,27 +156,29 @@ namespace
IMPLEMENTATION
***************************************************************************/
static SLOT_INTERFACE_START(coco_cart_slot1_3)
SLOT_INTERFACE("rs232", COCO_RS232)
SLOT_INTERFACE("dcmodem", COCO_DCMODEM)
SLOT_INTERFACE("orch90", COCO_ORCH90)
SLOT_INTERFACE("ssc", COCO_SSC) MCFG_SLOT_OPTION_CLOCK("ssc", DERIVED_CLOCK(1, 1))
SLOT_INTERFACE("games_master", COCO_PAK_GMC)
SLOT_INTERFACE("banked_16k", COCO_PAK_BANKED)
SLOT_INTERFACE("pak", COCO_PAK)
SLOT_INTERFACE_END
static SLOT_INTERFACE_START(coco_cart_slot4)
SLOT_INTERFACE("cc2hdb1", COCO2_HDB1)
SLOT_INTERFACE("cc3hdb1", COCO3_HDB1)
SLOT_INTERFACE("fdcv11", COCO_FDC_V11)
SLOT_INTERFACE("rs232", COCO_RS232)
SLOT_INTERFACE("dcmodem", COCO_DCMODEM)
SLOT_INTERFACE("orch90", COCO_ORCH90)
SLOT_INTERFACE("ssc", COCO_SSC) MCFG_SLOT_OPTION_CLOCK("ssc", DERIVED_CLOCK(1, 1))
SLOT_INTERFACE("games_master", COCO_PAK_GMC)
SLOT_INTERFACE("banked_16k", COCO_PAK_BANKED)
SLOT_INTERFACE("pak", COCO_PAK)
SLOT_INTERFACE_END
static void coco_cart_slot1_3(device_slot_interface &device)
{
device.option_add("rs232", COCO_RS232);
device.option_add("dcmodem", COCO_DCMODEM);
device.option_add("orch90", COCO_ORCH90);
device.option_add("ssc", COCO_SSC).clock(DERIVED_CLOCK(1, 1));
device.option_add("games_master", COCO_PAK_GMC);
device.option_add("banked_16k", COCO_PAK_BANKED);
device.option_add("pak", COCO_PAK);
}
static void coco_cart_slot4(device_slot_interface &device)
{
device.option_add("cc2hdb1", COCO2_HDB1);
device.option_add("cc3hdb1", COCO3_HDB1);
device.option_add("fdcv11", COCO_FDC_V11);
device.option_add("rs232", COCO_RS232);
device.option_add("dcmodem", COCO_DCMODEM);
device.option_add("orch90", COCO_ORCH90);
device.option_add("ssc", COCO_SSC).clock(DERIVED_CLOCK(1, 1));
device.option_add("games_master", COCO_PAK_GMC);
device.option_add("banked_16k", COCO_PAK_BANKED);
device.option_add("pak", COCO_PAK);
}
MACHINE_CONFIG_START(coco_multipak_device::device_add_mconfig)

4
src/devices/bus/coco/coco_orch90.cpp
View File

@ -112,8 +112,8 @@ MACHINE_CONFIG_START(coco_orch90_device::device_add_mconfig)
MCFG_SOUND_ADD("ldac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.5) // ls374.ic5 + r7 (8x20k) + r9 (8x10k)
MCFG_SOUND_ADD("rdac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.5) // ls374.ic4 + r6 (8x20k) + r8 (8x10k)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE_EX(0, "ldac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "ldac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE_EX(0, "rdac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "rdac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "ldac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "ldac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "rdac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "rdac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END

23
src/devices/bus/coco/dragon_fdc.cpp
View File

@ -143,9 +143,10 @@ namespace
LOCAL VARIABLES
***************************************************************************/
static SLOT_INTERFACE_START(dragon_fdc_device_base)
SLOT_INTERFACE("qd", FLOPPY_525_QD)
SLOT_INTERFACE_END
static void dragon_fdc_drives(device_slot_interface &device)
{
device.option_add("qd", FLOPPY_525_QD);
}
MACHINE_CONFIG_START(dragon_fdc_device_base::device_add_mconfig)
@ -154,13 +155,13 @@ MACHINE_CONFIG_START(dragon_fdc_device_base::device_add_mconfig)
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(dragon_fdc_device_base, fdc_drq_w))
MCFG_WD_FDC_FORCE_READY
MCFG_FLOPPY_DRIVE_ADD(WD2797_TAG ":0", dragon_fdc_device_base, "qd", dragon_fdc_device_base::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(WD2797_TAG ":0", dragon_fdc_drives, "qd", dragon_fdc_device_base::floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_FLOPPY_DRIVE_ADD(WD2797_TAG ":1", dragon_fdc_device_base, "qd", dragon_fdc_device_base::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(WD2797_TAG ":1", dragon_fdc_drives, "qd", dragon_fdc_device_base::floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_FLOPPY_DRIVE_ADD(WD2797_TAG ":2", dragon_fdc_device_base, "", dragon_fdc_device_base::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(WD2797_TAG ":2", dragon_fdc_drives, "", dragon_fdc_device_base::floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_FLOPPY_DRIVE_ADD(WD2797_TAG ":3", dragon_fdc_device_base, "", dragon_fdc_device_base::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(WD2797_TAG ":3", dragon_fdc_drives, "", dragon_fdc_device_base::floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MACHINE_CONFIG_END
@ -169,13 +170,13 @@ MACHINE_CONFIG_START(premier_fdc_device_base::device_add_mconfig)
MCFG_WD2791_ADD(WD2791_TAG, XTAL(2'000'000) / 2)
MCFG_WD_FDC_FORCE_READY
MCFG_FLOPPY_DRIVE_ADD(WD2791_TAG ":0", dragon_fdc_device_base, "qd", dragon_fdc_device_base::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(WD2791_TAG ":0", dragon_fdc_drives, "qd", dragon_fdc_device_base::floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_FLOPPY_DRIVE_ADD(WD2791_TAG ":1", dragon_fdc_device_base, "qd", dragon_fdc_device_base::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(WD2791_TAG ":1", dragon_fdc_drives, "qd", dragon_fdc_device_base::floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_FLOPPY_DRIVE_ADD(WD2791_TAG ":2", dragon_fdc_device_base, "", dragon_fdc_device_base::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(WD2791_TAG ":2", dragon_fdc_drives, "", dragon_fdc_device_base::floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_FLOPPY_DRIVE_ADD(WD2791_TAG ":3", dragon_fdc_device_base, "", dragon_fdc_device_base::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(WD2791_TAG ":3", dragon_fdc_drives, "", dragon_fdc_device_base::floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MACHINE_CONFIG_END

9
src/devices/bus/coleco/ctrl.cpp
View File

@ -73,7 +73,8 @@ void colecovision_control_port_device::device_start()
#include "hand.h"
#include "sac.h"
SLOT_INTERFACE_START( colecovision_control_port_devices )
SLOT_INTERFACE("hand", COLECO_HAND_CONTROLLER)
SLOT_INTERFACE("sac", COLECO_SUPER_ACTION_CONTROLLER)
SLOT_INTERFACE_END
void colecovision_control_port_devices(device_slot_interface &device)
{
device.option_add("hand", COLECO_HAND_CONTROLLER);
device.option_add("sac", COLECO_SUPER_ACTION_CONTROLLER);
}

2
src/devices/bus/coleco/ctrl.h
View File

@ -95,7 +95,7 @@ private:
// device type definition
DECLARE_DEVICE_TYPE(COLECOVISION_CONTROL_PORT, colecovision_control_port_device)
SLOT_INTERFACE_EXTERN( colecovision_control_port_devices );
void colecovision_control_port_devices(device_slot_interface &device);
#endif // MAME_BUS_COLECO_CTRL_H

9
src/devices/bus/coleco/exp.cpp
View File

@ -136,8 +136,9 @@ uint8_t colecovision_cartridge_slot_device::bd_r(address_space &space, offs_t of
#include "std.h"
#include "xin1.h"
SLOT_INTERFACE_START( colecovision_cartridges )
void colecovision_cartridges(device_slot_interface &device)
{
// the following need ROMs from the software list
SLOT_INTERFACE_INTERNAL("standard", COLECOVISION_STANDARD)
SLOT_INTERFACE_INTERNAL("xin1", COLECOVISION_XIN1)
SLOT_INTERFACE_END
device.option_add_internal("standard", COLECOVISION_STANDARD);
device.option_add_internal("xin1", COLECOVISION_XIN1);
}

2
src/devices/bus/coleco/exp.h
View File

@ -120,7 +120,7 @@ protected:
// device type definition
DECLARE_DEVICE_TYPE(COLECOVISION_CARTRIDGE_SLOT, colecovision_cartridge_slot_device)
SLOT_INTERFACE_EXTERN( colecovision_cartridges );
void colecovision_cartridges(device_slot_interface &device);
#endif // MAME_BUS_COLECO_EXP_H

9
src/devices/bus/compis/graphics.cpp
View File

@ -67,7 +67,8 @@ void compis_graphics_slot_device::device_start()
// slot devices
#include "hrg.h"
SLOT_INTERFACE_START( compis_graphics_cards )
SLOT_INTERFACE("hrg", COMPIS_HRG)
SLOT_INTERFACE("uhrg", COMPIS_UHRG)
SLOT_INTERFACE_END
void compis_graphics_cards(device_slot_interface &device)
{
device.option_add("hrg", COMPIS_HRG);
device.option_add("uhrg", COMPIS_UHRG);
}

2
src/devices/bus/compis/graphics.h
View File

@ -101,7 +101,7 @@ protected:
DECLARE_DEVICE_TYPE(COMPIS_GRAPHICS_SLOT, compis_graphics_slot_device)
SLOT_INTERFACE_EXTERN( compis_graphics_cards );
void compis_graphics_cards(device_slot_interface &device);
#endif // MAME_BUS_COMPIS_GRAPHICS_H

14
src/devices/bus/compucolor/floppy.cpp
View File

@ -23,9 +23,10 @@ DEFINE_DEVICE_TYPE(COMPUCOLOR_FLOPPY, compucolor_floppy_device, "compc
// SLOT_INTERFACE( compucolor_floppy_port_devices )
//-------------------------------------------------
SLOT_INTERFACE_START( compucolor_floppy_port_devices )
SLOT_INTERFACE("floppy", COMPUCOLOR_FLOPPY)
SLOT_INTERFACE_END
void compucolor_floppy_port_devices(device_slot_interface &device)
{
device.option_add("floppy", COMPUCOLOR_FLOPPY);
}
//-------------------------------------------------
@ -41,9 +42,10 @@ FLOPPY_FORMATS_END
// SLOT_INTERFACE( compucolor_floppies )
//-------------------------------------------------
static SLOT_INTERFACE_START( compucolor_floppies )
SLOT_INTERFACE_INTERNAL( "525sssd", FLOPPY_525_SSSD )
SLOT_INTERFACE_END
static void compucolor_floppies(device_slot_interface &device)
{
device.option_add_internal("525sssd", FLOPPY_525_SSSD);
}
//-------------------------------------------------

2
src/devices/bus/compucolor/floppy.h
View File

@ -116,6 +116,6 @@ DECLARE_DEVICE_TYPE(COMPUCOLOR_FLOPPY, compucolor_floppy_device)
// slot devices
SLOT_INTERFACE_EXTERN( compucolor_floppy_port_devices );
void compucolor_floppy_port_devices(device_slot_interface &device);
#endif // MAME_BUS_COMPUCOLOR_FLOPPY_H

21
src/devices/bus/comx35/exp.cpp
View File

@ -176,13 +176,14 @@ READ_LINE_MEMBER( comx_expansion_slot_device::ef4_r )
#include "ram.h"
#include "thermal.h"
SLOT_INTERFACE_START( comx_expansion_cards )
SLOT_INTERFACE("eb", COMX_EB)
SLOT_INTERFACE("fd", COMX_FD)
SLOT_INTERFACE("clm", COMX_CLM)
SLOT_INTERFACE("ram", COMX_RAM)
SLOT_INTERFACE("joy", COMX_JOY)
SLOT_INTERFACE("prn", COMX_PRN)
SLOT_INTERFACE("thm", COMX_THM)
SLOT_INTERFACE("epr", COMX_EPR)
SLOT_INTERFACE_END
void comx_expansion_cards(device_slot_interface &device)
{
device.option_add("eb", COMX_EB);
device.option_add("fd", COMX_FD);
device.option_add("clm", COMX_CLM);
device.option_add("ram", COMX_RAM);
device.option_add("joy", COMX_JOY);
device.option_add("prn", COMX_PRN);
device.option_add("thm", COMX_THM);
device.option_add("epr", COMX_EPR);
}

2
src/devices/bus/comx35/exp.h
View File

@ -135,7 +135,7 @@ protected:
DECLARE_DEVICE_TYPE(COMX_EXPANSION_SLOT, comx_expansion_slot_device)
SLOT_INTERFACE_EXTERN( comx_expansion_cards );
void comx_expansion_cards(device_slot_interface &device);
#endif // MAME_BUS_COMX35_EXP_H

9
src/devices/bus/comx35/fdc.cpp
View File

@ -85,10 +85,11 @@ FLOPPY_FORMATS_MEMBER( comx_fd_device::floppy_formats )
FLOPPY_COMX35_FORMAT
FLOPPY_FORMATS_END
static SLOT_INTERFACE_START( comx_fd_floppies )
SLOT_INTERFACE( "525sd35t", FLOPPY_525_SD_35T )
SLOT_INTERFACE( "525qd", FLOPPY_525_QD )
SLOT_INTERFACE_END
static void comx_fd_floppies(device_slot_interface &device)
{
device.option_add("525sd35t", FLOPPY_525_SD_35T);
device.option_add("525qd", FLOPPY_525_QD);
}
//-------------------------------------------------

2
src/devices/bus/cpc/amdrum.cpp
View File

@ -24,7 +24,7 @@ MACHINE_CONFIG_START(cpc_amdrum_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("speaker")
MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
// no pass-through
MACHINE_CONFIG_END

2
src/devices/bus/cpc/cpc_rom.cpp
View File

@ -11,7 +11,7 @@
DEFINE_DEVICE_TYPE(CPC_ROM, cpc_rom_device, "cpc_rom", "CPC ROM Box")
SLOT_INTERFACE_EXTERN(cpc_exp_cards);
void cpc_exp_cards(device_slot_interface &device);
//**************************************************************************
// DEVICE CONFIG INTERFACE

2
src/devices/bus/cpc/cpc_rs232.cpp
View File

@ -9,7 +9,7 @@
#include "emu.h"
#include "cpc_rs232.h"
SLOT_INTERFACE_EXTERN(cpc_exp_cards);
void cpc_exp_cards(device_slot_interface &device);
//**************************************************************************
// DEVICE DEFINITIONS

2
src/devices/bus/cpc/cpc_ssa1.cpp
View File

@ -13,7 +13,7 @@
#include "speaker.h"
SLOT_INTERFACE_EXTERN(cpc_exp_cards);
void cpc_exp_cards(device_slot_interface &device);
//**************************************************************************
// DEVICE DEFINITIONS

9
src/devices/bus/cpc/ddi1.cpp
View File

@ -8,7 +8,7 @@
#include "ddi1.h"
#include "softlist.h"
SLOT_INTERFACE_EXTERN(cpc_exp_cards);
void cpc_exp_cards(device_slot_interface &device);
//**************************************************************************
// DEVICE DEFINITIONS
@ -16,9 +16,10 @@ SLOT_INTERFACE_EXTERN(cpc_exp_cards);
DEFINE_DEVICE_TYPE(CPC_DDI1, cpc_ddi1_device, "cpc_ddi1", "Amstrad DDI-1")
static SLOT_INTERFACE_START( ddi1_floppies )
SLOT_INTERFACE( "3ssdd", FLOPPY_3_SSDD )
SLOT_INTERFACE_END
static void ddi1_floppies(device_slot_interface &device)
{
device.option_add("3ssdd", FLOPPY_3_SSDD);
}
//-------------------------------------------------
// Device ROM definition

2
src/devices/bus/cpc/magicsound.cpp
View File

@ -59,7 +59,7 @@ MACHINE_CONFIG_START(al_magicsound_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("speaker")
MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
// no pass-through(?)
MACHINE_CONFIG_END

2
src/devices/bus/cpc/mface2.cpp
View File

@ -9,7 +9,7 @@
#include "emu.h"
#include "mface2.h"
SLOT_INTERFACE_EXTERN(cpc_exp_cards);
void cpc_exp_cards(device_slot_interface &device);
//**************************************************************************
// DEVICE DEFINITIONS

Some files were not shown because too many files have changed in this diff Show More