Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-05 08:41:31 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

devices\bus: some more MACHINE_CONFIG removal (nw)

Browse Source
This commit is contained in:
Ivan Vangelista 2019-02-10 10:00:52 +01:00
parent d98dda930b
commit fea0d694b3
28 changed files with 144 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/devices/bus/abckb/abc77.cpp
View File

@ -129,7 +129,8 @@ DISCRETE_SOUND_END
// device_add_mconfig - add device configuration // device_add_mconfig - add device configuration
//------------------------------------------------- //-------------------------------------------------
MACHINE_CONFIG_START(abc77_device::device_add_mconfig) void abc77_device::device_add_mconfig(machine_config &config)
{
// keyboard cpu // keyboard cpu
I8035(config, m_maincpu, XTAL(4'608'000)); I8035(config, m_maincpu, XTAL(4'608'000));
m_maincpu->set_addrmap(AS_PROGRAM, &abc77_device::abc77_map); m_maincpu->set_addrmap(AS_PROGRAM, &abc77_device::abc77_map);
@ -144,9 +145,8 @@ MACHINE_CONFIG_START(abc77_device::device_add_mconfig)
// discrete sound // discrete sound
SPEAKER(config, "mono").front_center(); SPEAKER(config, "mono").front_center();
MCFG_DEVICE_ADD(DISCRETE_TAG, DISCRETE, abc77_discrete) DISCRETE(config, m_discrete, abc77_discrete).add_route(ALL_OUTPUTS, "mono", 0.80);
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) }
MACHINE_CONFIG_END
//------------------------------------------------- //-------------------------------------------------

11
src/devices/bus/acorn/system/vdu40.cpp
View File

@ -25,12 +25,13 @@ DEFINE_DEVICE_TYPE(ACORN_VDU40, acorn_vdu40_device, "acorn_vdu40", "Acorn 40 Col
// device_add_mconfig - add device configuration // device_add_mconfig - add device configuration
//------------------------------------------------- //-------------------------------------------------
MACHINE_CONFIG_START(acorn_vdu40_device::device_add_mconfig) void acorn_vdu40_device::device_add_mconfig(machine_config &config)
device = &SCREEN(config, m_screen, SCREEN_TYPE_RASTER); {
SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
m_screen->set_raw(12_MHz_XTAL, 768, 132, 612, 311, 20, 270); m_screen->set_raw(12_MHz_XTAL, 768, 132, 612, 311, 20, 270);
MCFG_SCREEN_UPDATE_DEVICE("mc6845", mc6845_device, screen_update) m_screen->set_screen_update("mc6845", FUNC(mc6845_device::screen_update));
MCFG_PALETTE_ADD("palette", 8) PALETTE(config, "palette").set_entries(8);
HD6845(config, m_crtc, 12_MHz_XTAL / 6); HD6845(config, m_crtc, 12_MHz_XTAL / 6);
m_crtc->set_screen("screen"); m_crtc->set_screen("screen");
@ -41,7 +42,7 @@ MACHINE_CONFIG_START(acorn_vdu40_device::device_add_mconfig)
SAA5050(config, m_trom, 12_MHz_XTAL / 2); SAA5050(config, m_trom, 12_MHz_XTAL / 2);
m_trom->set_screen_size(40, 25, 40); m_trom->set_screen_size(40, 25, 40);
MACHINE_CONFIG_END }
//************************************************************************** //**************************************************************************

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

@ -205,11 +205,12 @@ ioport_constructor apricot_keyboard_hle_device::device_input_ports() const
return INPUT_PORTS_NAME( keyboard ); return INPUT_PORTS_NAME( keyboard );
} }
MACHINE_CONFIG_START(apricot_keyboard_hle_device::device_add_mconfig) void apricot_keyboard_hle_device::device_add_mconfig(machine_config &config)
MCFG_DEVICE_ADD("rtc", MSM5832, 32.768_kHz_XTAL) {
MSM5832(config, m_rtc, 32.768_kHz_XTAL);
TIMER(config, "timer").configure_periodic(FUNC(apricot_keyboard_hle_device::mouse_callback), attotime::from_hz(60)); TIMER(config, "timer").configure_periodic(FUNC(apricot_keyboard_hle_device::mouse_callback), attotime::from_hz(60));
MACHINE_CONFIG_END }
//************************************************************************** //**************************************************************************

11
src/devices/bus/centronics/comxpl80.cpp
View File

@ -86,11 +86,12 @@ void comx_pl80_device::comxpl80_mem(address_map &map)
// device_add_mconfig - add device configuration // device_add_mconfig - add device configuration
//------------------------------------------------- //-------------------------------------------------
MACHINE_CONFIG_START(comx_pl80_device::device_add_mconfig) void comx_pl80_device::device_add_mconfig(machine_config &config)
MCFG_DEVICE_ADD(CX005_TAG, M6805, 4000000) // CX005: some kind of MC6805/MC68HC05 clone {
MCFG_DEVICE_PROGRAM_MAP(comxpl80_mem) m6805_device &cx005(M6805(config, CX005_TAG, 4000000)); // CX005: some kind of MC6805/MC68HC05 clone
MCFG_DEVICE_DISABLE() cx005.set_addrmap(AS_PROGRAM, &comx_pl80_device::comxpl80_mem);
MACHINE_CONFIG_END cx005.set_disable();
}
//------------------------------------------------- //-------------------------------------------------

10
src/devices/bus/centronics/nec_p72.cpp
View File

@ -49,12 +49,12 @@ void nec_p72_device::p72_mem(address_map &map)
// device_add_mconfig - add device configuration // device_add_mconfig - add device configuration
//------------------------------------------------- //-------------------------------------------------
MACHINE_CONFIG_START(nec_p72_device::device_add_mconfig) void nec_p72_device::device_add_mconfig(machine_config &config)
{
/* basic machine hardware */ /* basic machine hardware */
MCFG_DEVICE_ADD("maincpu", V33, XTAL(16'000'000)/2) /* TODO it's actually a V40 */ V33(config, m_maincpu, XTAL(16'000'000)/2); /* TODO it's actually a V40 */
MCFG_DEVICE_PROGRAM_MAP(p72_mem) m_maincpu->set_addrmap(AS_PROGRAM, &nec_p72_device::p72_mem);
}
MACHINE_CONFIG_END
//------------------------------------------------- //-------------------------------------------------

8
src/devices/bus/coco/coco_gmc.cpp
View File

@ -51,11 +51,11 @@ namespace
}; };
MACHINE_CONFIG_START(coco_pak_gmc_device::device_add_mconfig) void coco_pak_gmc_device::device_add_mconfig(machine_config &config)
{
SPEAKER(config, "gmc_speaker").front_center(); SPEAKER(config, "gmc_speaker").front_center();
MCFG_DEVICE_ADD(SN76489AN_TAG, SN76489A, 4_MHz_XTAL) SN76489A(config, m_psg, 4_MHz_XTAL).add_route(ALL_OUTPUTS, "gmc_speaker", 1.0);
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "gmc_speaker", 1.0) }
MACHINE_CONFIG_END
//************************************************************************** //**************************************************************************

9
src/devices/bus/coco/coco_ssc.cpp
View File

@ -152,7 +152,8 @@ DEFINE_DEVICE_TYPE(COCOSSC_SAC, cocossc_sac_device, "cocossc_sac", "CoCo SSC Sou
// MACHINE FRAGMENTS AND ADDRESS MAPS // MACHINE FRAGMENTS AND ADDRESS MAPS
//************************************************************************** //**************************************************************************
MACHINE_CONFIG_START(coco_ssc_device::device_add_mconfig) void coco_ssc_device::device_add_mconfig(machine_config &config)
{
TMS7040(config, m_tms7040, DERIVED_CLOCK(2, 1)); TMS7040(config, m_tms7040, DERIVED_CLOCK(2, 1));
m_tms7040->in_porta().set(FUNC(coco_ssc_device::ssc_port_a_r)); m_tms7040->in_porta().set(FUNC(coco_ssc_device::ssc_port_a_r));
m_tms7040->out_portb().set(FUNC(coco_ssc_device::ssc_port_b_w)); m_tms7040->out_portb().set(FUNC(coco_ssc_device::ssc_port_b_w));
@ -173,9 +174,9 @@ MACHINE_CONFIG_START(coco_ssc_device::device_add_mconfig)
m_ay->set_flags(AY8910_SINGLE_OUTPUT); m_ay->set_flags(AY8910_SINGLE_OUTPUT);
m_ay->add_route(ALL_OUTPUTS, "coco_sac_tag", AY8913_GAIN); m_ay->add_route(ALL_OUTPUTS, "coco_sac_tag", AY8913_GAIN);
MCFG_DEVICE_ADD("coco_sac_tag", COCOSSC_SAC, DERIVED_CLOCK(2, 1)) COCOSSC_SAC(config, m_sac, DERIVED_CLOCK(2, 1));
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "ssc_audio", 1.0) m_sac->add_route(ALL_OUTPUTS, "ssc_audio", 1.0);
MACHINE_CONFIG_END }
ROM_START(coco_ssc) ROM_START(coco_ssc)
ROM_REGION(0x1000, PIC_TAG, 0) ROM_REGION(0x1000, PIC_TAG, 0)

15
src/devices/bus/ekara/rom.cpp
View File

@ -140,21 +140,24 @@ bool ekara_rom_i2c_24c08_epitch_device::is_write_access_not_rom(void)
return (m_buscontrol[1] & 0x04) ? true : false; return (m_buscontrol[1] & 0x04) ? true : false;
} }
MACHINE_CONFIG_START(ekara_rom_i2c_24c08_epitch_device::device_add_mconfig) void ekara_rom_i2c_24c08_epitch_device::device_add_mconfig(machine_config &config)
{
I2CMEM(config, "i2cmem", 0)/*.set_page_size(16)*/.set_data_size(0x400); // 24C08 I2CMEM(config, "i2cmem", 0)/*.set_page_size(16)*/.set_data_size(0x400); // 24C08
MACHINE_CONFIG_END }
// i2c 24lc04 // i2c 24lc04
MACHINE_CONFIG_START(ekara_rom_i2c_24lc04_device::device_add_mconfig) void ekara_rom_i2c_24lc04_device::device_add_mconfig(machine_config &config)
{
I2CMEM(config, "i2cmem", 0)/*.set_page_size(16)*/.set_data_size(0x200); // 24LC04 I2CMEM(config, "i2cmem", 0)/*.set_page_size(16)*/.set_data_size(0x200); // 24LC04
MACHINE_CONFIG_END }
// i2c 24lc02 // i2c 24lc02
MACHINE_CONFIG_START(ekara_rom_i2c_24lc02_device::device_add_mconfig) void ekara_rom_i2c_24lc02_device::device_add_mconfig(machine_config &config)
{
I2CMEM(config, "i2cmem", 0)/*.set_page_size(16)*/.set_data_size(0x100); // 24LC02 I2CMEM(config, "i2cmem", 0)/*.set_page_size(16)*/.set_data_size(0x100); // 24LC02
MACHINE_CONFIG_END }
/*------------------------------------------------- /*-------------------------------------------------

7
src/devices/bus/gamate/rom.cpp
View File

@ -168,9 +168,10 @@ WRITE8_MEMBER(gamate_rom_4in1_device::write_rom)
} }
} }
MACHINE_CONFIG_START(gamate_rom_plain_device::device_add_mconfig) void gamate_rom_plain_device::device_add_mconfig(machine_config &config)
MCFG_DEVICE_ADD("protection", GAMATE_PROT, 0) {
MACHINE_CONFIG_END GAMATE_PROT(config, m_protection, 0);
}
/*------------------------------------------------- /*-------------------------------------------------

5
src/devices/bus/hp9845_io/98032.cpp
View File

@ -56,12 +56,13 @@ hp98032_io_card_device::~hp98032_io_card_device()
{ {
} }
MACHINE_CONFIG_START(hp98032_io_card_device::device_add_mconfig) void hp98032_io_card_device::device_add_mconfig(machine_config &config)
{
HP98032_GPIO_SLOT(config , m_gpio , 0); HP98032_GPIO_SLOT(config , m_gpio , 0);
m_gpio->pflg_cb().set(FUNC(hp98032_io_card_device::pflg_w)); m_gpio->pflg_cb().set(FUNC(hp98032_io_card_device::pflg_w));
m_gpio->psts_cb().set(FUNC(hp98032_io_card_device::psts_w)); m_gpio->psts_cb().set(FUNC(hp98032_io_card_device::psts_w));
m_gpio->eir_cb().set(FUNC(hp98032_io_card_device::eir_w)); m_gpio->eir_cb().set(FUNC(hp98032_io_card_device::eir_w));
MACHINE_CONFIG_END }
static INPUT_PORTS_START(hp98032_port) static INPUT_PORTS_START(hp98032_port)
MCFG_HP9845_IO_SC(2) MCFG_HP9845_IO_SC(2)

25
src/devices/bus/ieee488/hardbox.cpp
View File

@ -267,11 +267,12 @@ WRITE8_MEMBER( hardbox_device::ppi1_pc_w )
// device_add_mconfig - add device configuration // device_add_mconfig - add device configuration
//------------------------------------------------- //-------------------------------------------------
MACHINE_CONFIG_START(hardbox_device::device_add_mconfig) void hardbox_device::device_add_mconfig(machine_config &config)
{
// basic machine hardware // basic machine hardware
MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(8'000'000)/2) Z80(config, m_maincpu, XTAL(8'000'000)/2);
MCFG_DEVICE_PROGRAM_MAP(hardbox_mem) m_maincpu->set_addrmap(AS_PROGRAM, &hardbox_device::hardbox_mem);
MCFG_DEVICE_IO_MAP(hardbox_io) m_maincpu->set_addrmap(AS_IO, &hardbox_device::hardbox_io);
// devices // devices
i8255_device &ppi0(I8255A(config, I8255_0_TAG)); i8255_device &ppi0(I8255A(config, I8255_0_TAG));
@ -285,16 +286,12 @@ MACHINE_CONFIG_START(hardbox_device::device_add_mconfig)
ppi1.in_pc_callback().set(FUNC(hardbox_device::ppi1_pc_r)); ppi1.in_pc_callback().set(FUNC(hardbox_device::ppi1_pc_r));
ppi1.out_pc_callback().set(FUNC(hardbox_device::ppi1_pc_w)); ppi1.out_pc_callback().set(FUNC(hardbox_device::ppi1_pc_w));
MCFG_DEVICE_ADD(CORVUS_HDC_TAG, CORVUS_HDC, 0) CORVUS_HDC(config, m_hdc, 0);
MCFG_HARDDISK_ADD("harddisk1") HARDDISK(config, "harddisk1", "corvus_hdd");
MCFG_HARDDISK_INTERFACE("corvus_hdd") HARDDISK(config, "harddisk2", "corvus_hdd");
MCFG_HARDDISK_ADD("harddisk2") HARDDISK(config, "harddisk3", "corvus_hdd");
MCFG_HARDDISK_INTERFACE("corvus_hdd") HARDDISK(config, "harddisk4", "corvus_hdd");
MCFG_HARDDISK_ADD("harddisk3") }
MCFG_HARDDISK_INTERFACE("corvus_hdd")
MCFG_HARDDISK_ADD("harddisk4")
MCFG_HARDDISK_INTERFACE("corvus_hdd")
MACHINE_CONFIG_END
//------------------------------------------------- //-------------------------------------------------

4
src/devices/bus/interpro/sr/edge.cpp
View File

@ -475,7 +475,7 @@ void mpcb828_device::device_add_mconfig(machine_config &config)
TMS32030(config, m_dsp, 30_MHz_XTAL); TMS32030(config, m_dsp, 30_MHz_XTAL);
m_dsp->holda().set(FUNC(mpcb828_device::holda)); m_dsp->holda().set(FUNC(mpcb828_device::holda));
m_dsp->set_disable(); m_dsp->set_disable();
//MCFG_DEVICE_ADDRESS_MAP(0, map_dynamic<2>) //m_dsp->set_addrmap(0, map_dynamic<2>);
BT458(config, "ramdac", 83'020'800); BT458(config, "ramdac", 83'020'800);
@ -484,7 +484,7 @@ void mpcb828_device::device_add_mconfig(machine_config &config)
m_scc->out_txda_callback().set("kbd", FUNC(interpro_keyboard_port_device::write_txd)); m_scc->out_txda_callback().set("kbd", FUNC(interpro_keyboard_port_device::write_txd));
INTERPRO_KEYBOARD_PORT(config, "kbd", interpro_keyboard_devices, "hle_en_us").rxd_handler_cb().set(m_scc, FUNC(z80scc_device::rxa_w)); INTERPRO_KEYBOARD_PORT(config, "kbd", interpro_keyboard_devices, "hle_en_us").rxd_handler_cb().set(m_scc, FUNC(z80scc_device::rxa_w));
MACHINE_CONFIG_END }
/* /*
* MPCB849: EDGE-1 graphics, 2 megapixels, single screen, 60Hz refresh. * MPCB849: EDGE-1 graphics, 2 megapixels, single screen, 60Hz refresh.

11
src/devices/bus/odyssey2/chess.cpp
View File

@ -45,8 +45,9 @@ void o2_chess_device::chess_io(address_map &map)
// device_add_mconfig - add device configuration // device_add_mconfig - add device configuration
//------------------------------------------------- //-------------------------------------------------
MACHINE_CONFIG_START(o2_chess_device::device_add_mconfig) void o2_chess_device::device_add_mconfig(machine_config &config)
MCFG_DEVICE_ADD("subcpu", NSC800, XTAL(4'000'000)) {
MCFG_DEVICE_PROGRAM_MAP(chess_mem) NSC800(config, m_cpu, XTAL(4'000'000));
MCFG_DEVICE_IO_MAP(chess_io) m_cpu->set_addrmap(AS_PROGRAM, &o2_chess_device::chess_mem);
MACHINE_CONFIG_END m_cpu->set_addrmap(AS_IO, &o2_chess_device::chess_io);
}

11
src/devices/bus/psi_kbd/ergoline.cpp
View File

@ -58,11 +58,12 @@ const tiny_rom_entry *ergoline_keyboard_device::device_rom_region() const
return ROM_NAME(kbd_pcb); return ROM_NAME(kbd_pcb);
} }
MACHINE_CONFIG_START(ergoline_keyboard_device::device_add_mconfig) void ergoline_keyboard_device::device_add_mconfig(machine_config &config)
MCFG_DEVICE_ADD("maincpu", I8031, XTAL(5'529'600)) {
MCFG_DEVICE_PROGRAM_MAP(kbd_mem) i8031_device &maincpu(I8031(config, "maincpu", XTAL(5'529'600)));
MCFG_DEVICE_IO_MAP(kbd_io) maincpu.set_addrmap(AS_PROGRAM, &ergoline_keyboard_device::kbd_mem);
MACHINE_CONFIG_END maincpu.set_addrmap(AS_IO, &ergoline_keyboard_device::kbd_io);
}
//************************************************************************** //**************************************************************************

9
src/devices/bus/scsi/omti5100.cpp
View File

@ -176,7 +176,8 @@ void omti5100_device::WriteData( uint8_t *data, int dataLength )
} }
} }
MACHINE_CONFIG_START(omti5100_device::device_add_mconfig) void omti5100_device::device_add_mconfig(machine_config &config)
MCFG_HARDDISK_ADD("image0") {
MCFG_HARDDISK_ADD("image1") HARDDISK(config, m_image0);
MACHINE_CONFIG_END HARDDISK(config, m_image1);
}

15
src/devices/bus/scsi/s1410.cpp
View File

@ -165,14 +165,15 @@ void s1410_device::s1410_io(address_map &map)
// device_add_mconfig - add device configuration // device_add_mconfig - add device configuration
//------------------------------------------------- //-------------------------------------------------
MACHINE_CONFIG_START(s1410_device::device_add_mconfig) void s1410_device::device_add_mconfig(machine_config &config)
MCFG_DEVICE_ADD(Z8400A_TAG, Z80, XTAL(16'000'000)/4) {
MCFG_DEVICE_PROGRAM_MAP(s1410_mem) z80_device &z8400a(Z80(config, Z8400A_TAG, XTAL(16'000'000)/4));
MCFG_DEVICE_IO_MAP(s1410_io) z8400a.set_addrmap(AS_PROGRAM, &s1410_device::s1410_mem);
MCFG_DEVICE_DISABLE() z8400a.set_addrmap(AS_IO, &s1410_device::s1410_io);
z8400a.set_disable();
MCFG_HARDDISK_ADD("image") HARDDISK(config, "image");
MACHINE_CONFIG_END }

7
src/devices/bus/scsi/sa1403d.cpp
View File

@ -57,9 +57,10 @@ const tiny_rom_entry *sa1403d_device::device_rom_region() const
// device_add_mconfig - add device configuration // device_add_mconfig - add device configuration
//------------------------------------------------- //-------------------------------------------------
MACHINE_CONFIG_START(sa1403d_device::device_add_mconfig) void sa1403d_device::device_add_mconfig(machine_config &config)
MCFG_HARDDISK_ADD("image") {
MACHINE_CONFIG_END HARDDISK(config, "image");
}
//------------------------------------------------- //-------------------------------------------------

8
src/devices/bus/scsi/scsihd.cpp
View File

@ -29,7 +29,7 @@ void scsihd_device::device_start()
scsihle_device::device_start(); scsihle_device::device_start();
} }
MACHINE_CONFIG_START(scsihd_device::device_add_mconfig) void scsihd_device::device_add_mconfig(machine_config &config)
MCFG_HARDDISK_ADD("image") {
MCFG_HARDDISK_INTERFACE("scsi_hdd") HARDDISK(config, "image", "scsi_hdd");
MACHINE_CONFIG_END }

9
src/devices/bus/sg1000_exp/fm_unit.cpp
View File

@ -50,12 +50,13 @@ SMS version is not playing PSG sound on his Mark III with the FM unit.
DEFINE_DEVICE_TYPE(SEGA_FM_UNIT, sega_fm_unit_device, "sega_fm_unit", "SG-1000 FM Sound Unit") DEFINE_DEVICE_TYPE(SEGA_FM_UNIT, sega_fm_unit_device, "sega_fm_unit", "SG-1000 FM Sound Unit")
MACHINE_CONFIG_START(sega_fm_unit_device::device_add_mconfig) void sega_fm_unit_device::device_add_mconfig(machine_config &config)
MCFG_DEVICE_ADD("ym2413", YM2413, XTAL(10'738'635)/3) {
YM2413(config, m_ym, XTAL(10'738'635)/3);
// if this output gain is changed, the gain set when unmute the output need // if this output gain is changed, the gain set when unmute the output need
// to be changed too, probably along the gain set for SMSJ/SMSKRFM drivers. // to be changed too, probably along the gain set for SMSJ/SMSKRFM drivers.
MCFG_SOUND_ROUTE(ALL_OUTPUTS, ":mono", 1.00) m_ym->add_route(ALL_OUTPUTS, ":mono", 1.00);
MACHINE_CONFIG_END }
//************************************************************************** //**************************************************************************

11
src/devices/bus/snes/event.cpp
View File

@ -221,11 +221,12 @@ void sns_pfest94_device::dsp_data_map_lorom(address_map &map)
// device_add_mconfig - add device configuration // device_add_mconfig - add device configuration
//------------------------------------------------- //-------------------------------------------------
MACHINE_CONFIG_START(sns_pfest94_device::device_add_mconfig) void sns_pfest94_device::device_add_mconfig(machine_config &config)
MCFG_DEVICE_ADD("dsp", UPD7725, 8000000) {
MCFG_DEVICE_PROGRAM_MAP(dsp_prg_map_lorom) UPD7725(config, m_upd7725, 8000000);
MCFG_DEVICE_DATA_MAP(dsp_data_map_lorom) m_upd7725->set_addrmap(AS_PROGRAM, &sns_pfest94_device::dsp_prg_map_lorom);
MACHINE_CONFIG_END m_upd7725->set_addrmap(AS_DATA, &sns_pfest94_device::dsp_data_map_lorom);
}
//------------------------------------------------- //-------------------------------------------------
// Dipswitch // Dipswitch

9
src/devices/bus/snes/sa1.cpp
View File

@ -1143,7 +1143,8 @@ void sns_sa1_device::sa1_map(address_map &map)
} }
MACHINE_CONFIG_START(sns_sa1_device::device_add_mconfig) void sns_sa1_device::device_add_mconfig(machine_config &config)
MCFG_DEVICE_ADD("sa1cpu", G65816, 10000000) {
MCFG_DEVICE_PROGRAM_MAP(sa1_map) G65816(config, m_sa1, 10000000);
MACHINE_CONFIG_END m_sa1->set_addrmap(AS_PROGRAM, &sns_sa1_device::sa1_map);
}

8
src/devices/bus/sunkbd/hlekbd.cpp
View File

@ -789,11 +789,11 @@ WRITE_LINE_MEMBER( hle_device_base::input_txd )
add machine configuration add machine configuration
--------------------------------------------------*/ --------------------------------------------------*/
MACHINE_CONFIG_START(hle_device_base::device_add_mconfig) void hle_device_base::device_add_mconfig(machine_config &config)
{
SPEAKER(config, "bell").front_center(); SPEAKER(config, "bell").front_center();
MCFG_DEVICE_ADD("beeper", BEEP, ATTOSECONDS_TO_HZ(480 * ATTOSECONDS_PER_MICROSECOND)) BEEP(config, m_beeper, ATTOSECONDS_TO_HZ(480 * ATTOSECONDS_PER_MICROSECOND)).add_route(ALL_OUTPUTS, "bell", 1.0);
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "bell", 1.0) }
MACHINE_CONFIG_END
/*-------------------------------------------------- /*--------------------------------------------------

19
src/devices/bus/ti8x/tispeaker.cpp
View File

@ -26,16 +26,15 @@ stereo_speaker_device::stereo_speaker_device(
} }
MACHINE_CONFIG_START(stereo_speaker_device::device_add_mconfig) void stereo_speaker_device::device_add_mconfig(machine_config &config)
{
SPEAKER(config, "outl").front_left(); SPEAKER(config, "outl").front_left();
SPEAKER(config, "outr").front_right(); SPEAKER(config, "outr").front_right();
MCFG_DEVICE_ADD("lspkr", SPEAKER_SOUND, 0) SPEAKER_SOUND(config, m_left_speaker, 0).add_route(ALL_OUTPUTS, "outl", 0.50);
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "outl", 0.50)
MCFG_DEVICE_ADD("rspkr", SPEAKER_SOUND, 0) SPEAKER_SOUND(config, m_right_speaker, 0).add_route(ALL_OUTPUTS, "outr", 0.50);
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "outr", 0.50) }
MACHINE_CONFIG_END
void stereo_speaker_device::device_start() void stereo_speaker_device::device_start()
@ -70,12 +69,12 @@ mono_speaker_device::mono_speaker_device(
} }
MACHINE_CONFIG_START(mono_speaker_device::device_add_mconfig) void mono_speaker_device::device_add_mconfig(machine_config &config)
{
SPEAKER(config, "mono").front_center(); SPEAKER(config, "mono").front_center();
MCFG_DEVICE_ADD("spkr", SPEAKER_SOUND, 0) SPEAKER_SOUND(config, m_speaker, 0).add_route(ALL_OUTPUTS, "mono", 0.50);
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) }
MACHINE_CONFIG_END
void mono_speaker_device::device_start() void mono_speaker_device::device_start()

5
src/devices/bus/ti99/peb/memex.cpp
View File

@ -152,11 +152,12 @@ INPUT_PORTS_START( memex )
PORT_DIPSETTING( MDIP8, "Lock out pages FC-FF") PORT_DIPSETTING( MDIP8, "Lock out pages FC-FF")
INPUT_PORTS_END INPUT_PORTS_END
MACHINE_CONFIG_START(geneve_memex_device::device_add_mconfig) void geneve_memex_device::device_add_mconfig(machine_config &config)
{
RAM(config, m_ram, 0); RAM(config, m_ram, 0);
m_ram->set_default_size("2M"); m_ram->set_default_size("2M");
m_ram->set_default_value(0); m_ram->set_default_value(0);
MACHINE_CONFIG_END }
ioport_constructor geneve_memex_device::device_input_ports() const ioport_constructor geneve_memex_device::device_input_ports() const
{ {

5
src/devices/bus/ti99/peb/ti_32kmem.cpp
View File

@ -100,10 +100,11 @@ void ti_32k_expcard_device::device_start()
{ {
} }
MACHINE_CONFIG_START(ti_32k_expcard_device::device_add_mconfig) void ti_32k_expcard_device::device_add_mconfig(machine_config &config)
{
RAM(config, m_ram, 0); RAM(config, m_ram, 0);
m_ram->set_default_size("32k"); m_ram->set_default_size("32k");
m_ram->set_default_value(0); m_ram->set_default_value(0);
MACHINE_CONFIG_END }
} } } // end namespace bus::ti99::peb } } } // end namespace bus::ti99::peb

5
src/devices/bus/ti99/peb/ti_rs232.cpp
View File

@ -1101,7 +1101,8 @@ INPUT_PORTS_START( ti_rs232 )
PORT_CONFSETTING( 0x02, "5-20" ) PORT_CONFSETTING( 0x02, "5-20" )
INPUT_PORTS_END INPUT_PORTS_END
MACHINE_CONFIG_START(ti_rs232_pio_device::device_add_mconfig) void ti_rs232_pio_device::device_add_mconfig(machine_config &config)
{
TMS9902(config, m_uart0, 3000000); TMS9902(config, m_uart0, 3000000);
m_uart0->int_cb().set(FUNC(ti_rs232_pio_device::int0_callback)); m_uart0->int_cb().set(FUNC(ti_rs232_pio_device::int0_callback));
m_uart0->rcv_cb().set(FUNC(ti_rs232_pio_device::rcv0_callback)); m_uart0->rcv_cb().set(FUNC(ti_rs232_pio_device::rcv0_callback));
@ -1128,7 +1129,7 @@ MACHINE_CONFIG_START(ti_rs232_pio_device::device_add_mconfig)
m_crulatch->q_out_cb<5>().set(FUNC(ti_rs232_pio_device::cts0_w)); m_crulatch->q_out_cb<5>().set(FUNC(ti_rs232_pio_device::cts0_w));
m_crulatch->q_out_cb<6>().set(FUNC(ti_rs232_pio_device::cts1_w)); m_crulatch->q_out_cb<6>().set(FUNC(ti_rs232_pio_device::cts1_w));
m_crulatch->q_out_cb<7>().set(FUNC(ti_rs232_pio_device::led_w)); m_crulatch->q_out_cb<7>().set(FUNC(ti_rs232_pio_device::led_w));
MACHINE_CONFIG_END }
const tiny_rom_entry *ti_rs232_pio_device::device_rom_region() const const tiny_rom_entry *ti_rs232_pio_device::device_rom_region() const
{ {

5
src/devices/bus/ti99/peb/tn_usbsm.cpp
View File

@ -366,12 +366,13 @@ INPUT_PORTS_START( tn_usbsm )
PORT_DIPSETTING( 0x01, "Geneve mode") PORT_DIPSETTING( 0x01, "Geneve mode")
INPUT_PORTS_END INPUT_PORTS_END
MACHINE_CONFIG_START(nouspikel_usb_smartmedia_device::device_add_mconfig) void nouspikel_usb_smartmedia_device::device_add_mconfig(machine_config &config)
{
SMARTMEDIA(config, "smartmedia", 0); SMARTMEDIA(config, "smartmedia", 0);
STRATAFLASH(config, STRATA_TAG, 0); STRATAFLASH(config, STRATA_TAG, 0);
RAM(config, RAM1_TAG).set_default_size("512K").set_default_value(0); RAM(config, RAM1_TAG).set_default_size("512K").set_default_value(0);
RAM(config, RAM2_TAG).set_default_size("512K").set_default_value(0); RAM(config, RAM2_TAG).set_default_size("512K").set_default_value(0);
MACHINE_CONFIG_END }
ioport_constructor nouspikel_usb_smartmedia_device::device_input_ports() const ioport_constructor nouspikel_usb_smartmedia_device::device_input_ports() const
{ {

16
src/devices/bus/ti99x/990_tap.cpp
View File

@ -956,9 +956,6 @@ void ti990_tape_image_device::call_unload()
tpc->set_tape(tape_get_id(), this, false, false, true); tpc->set_tape(tape_get_id(), this, false, false, true);
} }
#define MCFG_TI990_TAPE_ADD(_tag) \
MCFG_DEVICE_ADD((_tag), TI990_TAPE, 0)
DEFINE_DEVICE_TYPE(TI990_TAPE_CTRL, tap_990_device, "ti990_tap", "Generic TI-900 Tape Controller") DEFINE_DEVICE_TYPE(TI990_TAPE_CTRL, tap_990_device, "ti990_tap", "Generic TI-900 Tape Controller")
@ -989,9 +986,10 @@ void tap_990_device::device_start()
// device_add_mconfig - add device configuration // device_add_mconfig - add device configuration
//------------------------------------------------- //-------------------------------------------------
MACHINE_CONFIG_START(tap_990_device::device_add_mconfig) void tap_990_device::device_add_mconfig(machine_config &config)
MCFG_TI990_TAPE_ADD("tape0") {
MCFG_TI990_TAPE_ADD("tape1") TI990_TAPE(config, "tape0", 0);
MCFG_TI990_TAPE_ADD("tape2") TI990_TAPE(config, "tape1", 0);
MCFG_TI990_TAPE_ADD("tape3") TI990_TAPE(config, "tape2", 0);
MACHINE_CONFIG_END TI990_TAPE(config, "tape3", 0);
}