diff options
Diffstat (limited to 'src/devices/bus/adamnet')
-rw-r--r-- | src/devices/bus/adamnet/adamnet.h | 11 | ||||
-rw-r--r-- | src/devices/bus/adamnet/ddp.cpp | 27 | ||||
-rw-r--r-- | src/devices/bus/adamnet/spi.cpp | 8 |
3 files changed, 19 insertions, 27 deletions
diff --git a/src/devices/bus/adamnet/adamnet.h b/src/devices/bus/adamnet/adamnet.h index c9090bf5482..51fc46a38dd 100644 --- a/src/devices/bus/adamnet/adamnet.h +++ b/src/devices/bus/adamnet/adamnet.h @@ -21,17 +21,6 @@ #define ADAMNET_TAG "adamnet" - -//************************************************************************** -// INTERFACE CONFIGURATION MACROS -//************************************************************************** - -#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, false) - - - //************************************************************************** // TYPE DEFINITIONS //************************************************************************** diff --git a/src/devices/bus/adamnet/ddp.cpp b/src/devices/bus/adamnet/ddp.cpp index cf267e95a36..ede3719c910 100644 --- a/src/devices/bus/adamnet/ddp.cpp +++ b/src/devices/bus/adamnet/ddp.cpp @@ -70,7 +70,8 @@ static const struct CassetteOptions adam_cassette_options = // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_START(adam_digital_data_pack_device::device_add_mconfig) +void adam_digital_data_pack_device::device_add_mconfig(machine_config &config) +{ M6801(config, m_maincpu, XTAL(4'000'000)); m_maincpu->set_addrmap(AS_PROGRAM, &adam_digital_data_pack_device::adam_ddp_mem); m_maincpu->out_p1_cb().set(FUNC(adam_digital_data_pack_device::p1_w)); @@ -79,18 +80,18 @@ MACHINE_CONFIG_START(adam_digital_data_pack_device::device_add_mconfig) // Port 3 = Multiplexed Address/Data m_maincpu->in_p4_cb().set(FUNC(adam_digital_data_pack_device::p4_r)); - MCFG_CASSETTE_ADD("cassette") - MCFG_CASSETTE_FORMATS(coleco_adam_cassette_formats) - MCFG_CASSETTE_CREATE_OPTS(&adam_cassette_options) - MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_PLAY | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_MUTED) - MCFG_CASSETTE_INTERFACE("adam_cass") - - MCFG_CASSETTE_ADD("cassette2") - MCFG_CASSETTE_FORMATS(coleco_adam_cassette_formats) - MCFG_CASSETTE_CREATE_OPTS(&adam_cassette_options) - MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_PLAY | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_MUTED) - MCFG_CASSETTE_INTERFACE("adam_cass") -MACHINE_CONFIG_END + CASSETTE(config, m_ddp0); + m_ddp0->set_formats(coleco_adam_cassette_formats); + m_ddp0->set_create_opts(&adam_cassette_options); + m_ddp0->set_default_state(CASSETTE_PLAY | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_MUTED); + m_ddp0->set_interface("adam_cass"); + + CASSETTE(config, m_ddp1); + m_ddp1->set_formats(coleco_adam_cassette_formats); + m_ddp1->set_create_opts(&adam_cassette_options); + m_ddp1->set_default_state(CASSETTE_PLAY | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_MUTED); + m_ddp1->set_interface("adam_cass"); +} diff --git a/src/devices/bus/adamnet/spi.cpp b/src/devices/bus/adamnet/spi.cpp index 612bb11c547..6ad84bbed7c 100644 --- a/src/devices/bus/adamnet/spi.cpp +++ b/src/devices/bus/adamnet/spi.cpp @@ -64,7 +64,8 @@ void adam_spi_device::adam_spi_mem(address_map &map) // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_START(adam_spi_device::device_add_mconfig) +void adam_spi_device::device_add_mconfig(machine_config &config) +{ M6801(config, m_maincpu, XTAL(4'000'000)); m_maincpu->set_addrmap(AS_PROGRAM, &adam_spi_device::adam_spi_mem); m_maincpu->in_p2_cb().set(FUNC(adam_spi_device::p2_r)); @@ -78,8 +79,9 @@ MACHINE_CONFIG_START(adam_spi_device::device_add_mconfig) centronics_device ¢ronics(CENTRONICS(config, "centronics", centronics_devices, "printer")); centronics.set_data_input_buffer("cent_data_in"); INPUT_BUFFER(config, "cent_data_in"); - MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") -MACHINE_CONFIG_END + output_latch_device ¢_data_out(OUTPUT_LATCH(config, "cent_data_out")); + centronics.set_output_latch(cent_data_out); +} |