diff options
author | Ivan Vangelista <mesgnet@yahoo.it> | 2017-05-27 10:43:32 +0200 |
---|---|---|
committer | Ivan Vangelista <mesgnet@yahoo.it> | 2017-05-27 10:43:32 +0200 |
commit | 95b2aa3dc30776e08c77f1707d5ce8d5af90c1b7 (patch) | |
tree | 46ea791671c2b7c030c695b5bc9dfa1da196602d | |
parent | 6c0ddbe07bfc9807eb2fa5f77f86e65051235892 (diff) |
some more device_add_mconfig. Done for the \mame tree. Will wait for freeze time before continuning in the \devices tree. (nw)
-rw-r--r-- | src/mame/drivers/cmi.cpp | 45 | ||||
-rw-r--r-- | src/mame/drivers/galgames.cpp | 48 | ||||
-rw-r--r-- | src/mame/drivers/harddriv.cpp | 252 | ||||
-rw-r--r-- | src/mame/drivers/indy_indigo2.cpp | 8 | ||||
-rw-r--r-- | src/mame/drivers/segaxbd.cpp | 172 | ||||
-rw-r--r-- | src/mame/drivers/vis.cpp | 20 | ||||
-rw-r--r-- | src/mame/includes/harddriv.h | 18 | ||||
-rw-r--r-- | src/mame/includes/segaxbd.h | 30 |
8 files changed, 247 insertions, 346 deletions
diff --git a/src/mame/drivers/cmi.cpp b/src/mame/drivers/cmi.cpp index 873fc44f8b3..f494cbfc3ab 100644 --- a/src/mame/drivers/cmi.cpp +++ b/src/mame/drivers/cmi.cpp @@ -222,34 +222,15 @@ public: static void set_channel_number(device_t &device, int channel) { dynamic_cast<cmi01a_device&>(device).m_channel = channel; } - DECLARE_WRITE_LINE_MEMBER( ptm_out0 ); - DECLARE_WRITE8_MEMBER( write ); DECLARE_READ8_MEMBER( read ); - DECLARE_WRITE8_MEMBER( rp_w ); - DECLARE_WRITE8_MEMBER( ws_dir_w ); - DECLARE_READ_LINE_MEMBER( tri_r ); - DECLARE_WRITE_LINE_MEMBER( pia_0_ca2_w ); - DECLARE_WRITE_LINE_MEMBER( pia_0_cb2_w ); - DECLARE_WRITE_LINE_MEMBER( pia_0_irqa ); - DECLARE_WRITE_LINE_MEMBER( pia_0_irqb ); - - DECLARE_READ_LINE_MEMBER( eosi_r ); - DECLARE_READ_LINE_MEMBER( zx_r ); - DECLARE_WRITE8_MEMBER( pia_1_a_w ); - DECLARE_WRITE8_MEMBER( pia_1_b_w ); - DECLARE_WRITE_LINE_MEMBER( pia_1_irqa ); - DECLARE_WRITE_LINE_MEMBER( pia_1_irqb ); - - DECLARE_WRITE_LINE_MEMBER( ptm_irq ); - virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; protected: virtual void device_start() override; virtual void device_reset() override; - machine_config_constructor device_mconfig_additions() const override; + virtual void device_add_mconfig(machine_config &config) override; virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; static const device_timer_id TIMER_ZX = 0; @@ -295,6 +276,24 @@ private: int m_pia_1_irqb; int m_ptm_irq; int m_irq_state; + + DECLARE_WRITE8_MEMBER( rp_w ); + DECLARE_WRITE8_MEMBER( ws_dir_w ); + DECLARE_READ_LINE_MEMBER( tri_r ); + DECLARE_WRITE_LINE_MEMBER( pia_0_ca2_w ); + DECLARE_WRITE_LINE_MEMBER( pia_0_cb2_w ); + DECLARE_WRITE_LINE_MEMBER( pia_0_irqa ); + DECLARE_WRITE_LINE_MEMBER( pia_0_irqb ); + + DECLARE_READ_LINE_MEMBER( eosi_r ); + DECLARE_READ_LINE_MEMBER( zx_r ); + DECLARE_WRITE8_MEMBER( pia_1_a_w ); + DECLARE_WRITE8_MEMBER( pia_1_b_w ); + DECLARE_WRITE_LINE_MEMBER( pia_1_irqa ); + DECLARE_WRITE_LINE_MEMBER( pia_1_irqb ); + + DECLARE_WRITE_LINE_MEMBER( ptm_irq ); + DECLARE_WRITE_LINE_MEMBER( ptm_out0 ); }; DEFINE_DEVICE_TYPE(CMI01A_CHANNEL_CARD, cmi01a_device, "cmi_01a", "Fairlight CMI-01A Channel Card") @@ -311,7 +310,7 @@ cmi01a_device::cmi01a_device(const machine_config &mconfig, const char *tag, dev { } -MACHINE_CONFIG_START( cmi01a_device ) +MACHINE_CONFIG_MEMBER( cmi01a_device::device_add_mconfig ) MCFG_DEVICE_ADD("cmi01a_pia_0", PIA6821, 0) // pia_cmi01a_1_config MCFG_PIA_READCB1_HANDLER(READLINE(cmi01a_device, tri_r)) MCFG_PIA_WRITEPA_HANDLER(WRITE8(cmi01a_device, ws_dir_w)) @@ -335,10 +334,6 @@ MACHINE_CONFIG_START( cmi01a_device ) MCFG_PTM6840_IRQ_CB(WRITELINE(cmi01a_device, ptm_irq)) MACHINE_CONFIG_END -machine_config_constructor cmi01a_device::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME(cmi01a_device); -} void cmi01a_device::sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) { diff --git a/src/mame/drivers/galgames.cpp b/src/mame/drivers/galgames.cpp index 663d2c81ea1..ab44b5053d1 100644 --- a/src/mame/drivers/galgames.cpp +++ b/src/mame/drivers/galgames.cpp @@ -143,10 +143,6 @@ DEFINE_DEVICE_TYPE(GALGAMES_CART, galgames_cart_device, "starpak_cart", "Galaxy // BIOS "cart" -static MACHINE_CONFIG_START( bios ) - MCFG_EEPROM_SERIAL_93C76_8BIT_ADD("eeprom") -MACHINE_CONFIG_END - class galgames_bios_cart_device : public galgames_cart_device { public: @@ -156,11 +152,15 @@ public: { } protected: // device-level overrides - virtual machine_config_constructor device_mconfig_additions() const override { return MACHINE_CONFIG_NAME(bios); } + virtual void device_add_mconfig(machine_config &config) override; }; DEFINE_DEVICE_TYPE(GALGAMES_BIOS_CART, galgames_bios_cart_device, "galgames_bios_cart", "Galaxy Games BIOS Cartridge") +MACHINE_CONFIG_MEMBER( galgames_bios_cart_device::device_add_mconfig ) + MCFG_EEPROM_SERIAL_93C76_8BIT_ADD("eeprom") +MACHINE_CONFIG_END + #define MCFG_GALGAMES_BIOS_CART_ADD(_tag, _cart) \ MCFG_DEVICE_ADD(_tag, GALGAMES_BIOS_CART, 0) \ MCFG_GALGAMES_CART_INDEX(_cart) @@ -169,14 +169,6 @@ DEFINE_DEVICE_TYPE(GALGAMES_BIOS_CART, galgames_bios_cart_device, "galgames_bios // STARPAK2 cart -static MACHINE_CONFIG_START( starpak2 ) - MCFG_CPU_ADD("pic", PIC16C56, XTAL_4MHz) // !! PIC12C508 !! 4MHz internal RC oscillator (selected by the configuration word) - MCFG_PIC16C5x_READ_B_CB( READ8( galgames_cart_device, int_pic_data_r)) - MCFG_PIC16C5x_WRITE_B_CB(WRITE8(galgames_cart_device, int_pic_data_w)) - - MCFG_EEPROM_SERIAL_93C76_8BIT_ADD("eeprom") -MACHINE_CONFIG_END - class galgames_starpak2_cart_device : public galgames_cart_device { public: @@ -186,11 +178,19 @@ public: { } protected: // device-level overrides - virtual machine_config_constructor device_mconfig_additions() const override { return MACHINE_CONFIG_NAME(starpak2); } + virtual void device_add_mconfig(machine_config &config) override; }; DEFINE_DEVICE_TYPE(GALGAMES_STARPAK2_CART, galgames_starpak2_cart_device, "starpak2_cart", "Galaxy Games StarPak 2 Cartridge") +MACHINE_CONFIG_MEMBER( galgames_starpak2_cart_device::device_add_mconfig ) + MCFG_CPU_ADD("pic", PIC16C56, XTAL_4MHz) // !! PIC12C508 !! 4MHz internal RC oscillator (selected by the configuration word) + MCFG_PIC16C5x_READ_B_CB( READ8( galgames_cart_device, int_pic_data_r)) + MCFG_PIC16C5x_WRITE_B_CB(WRITE8(galgames_cart_device, int_pic_data_w)) + + MCFG_EEPROM_SERIAL_93C76_8BIT_ADD("eeprom") +MACHINE_CONFIG_END + #define MCFG_GALGAMES_STARPAK2_CART_ADD(_tag, _cart) \ MCFG_DEVICE_ADD(_tag, GALGAMES_STARPAK2_CART, 0) \ MCFG_GALGAMES_CART_INDEX(_cart) \ @@ -200,15 +200,6 @@ DEFINE_DEVICE_TYPE(GALGAMES_STARPAK2_CART, galgames_starpak2_cart_device, "starp // STARPAK3 cart -static MACHINE_CONFIG_START( starpak3 ) - MCFG_CPU_ADD("pic", PIC16C56, XTAL_4MHz) - MCFG_PIC16C5x_WRITE_A_CB(WRITE8(galgames_cart_device, int_pic_bank_w)) - MCFG_PIC16C5x_READ_B_CB( READ8( galgames_cart_device, int_pic_data_r)) - MCFG_PIC16C5x_WRITE_B_CB(WRITE8(galgames_cart_device, int_pic_data_w)) - - MCFG_EEPROM_SERIAL_93C76_8BIT_ADD("eeprom") -MACHINE_CONFIG_END - class galgames_starpak3_cart_device : public galgames_cart_device { public: @@ -218,11 +209,20 @@ public: { } protected: // device-level overrides - virtual machine_config_constructor device_mconfig_additions() const override { return MACHINE_CONFIG_NAME(starpak3); } + virtual void device_add_mconfig(machine_config &config) override; }; DEFINE_DEVICE_TYPE(GALGAMES_STARPAK3_CART, galgames_starpak3_cart_device, "starpak3_cart", "Galaxy Games StarPak 3 Cartridge") +MACHINE_CONFIG_MEMBER( galgames_starpak3_cart_device::device_add_mconfig ) + MCFG_CPU_ADD("pic", PIC16C56, XTAL_4MHz) + MCFG_PIC16C5x_WRITE_A_CB(WRITE8(galgames_cart_device, int_pic_bank_w)) + MCFG_PIC16C5x_READ_B_CB( READ8( galgames_cart_device, int_pic_data_r)) + MCFG_PIC16C5x_WRITE_B_CB(WRITE8(galgames_cart_device, int_pic_data_w)) + + MCFG_EEPROM_SERIAL_93C76_8BIT_ADD("eeprom") +MACHINE_CONFIG_END + #define MCFG_GALGAMES_STARPAK3_CART_ADD(_tag, _cart) \ MCFG_DEVICE_ADD(_tag, GALGAMES_STARPAK3_CART, 0) \ MCFG_GALGAMES_CART_INDEX(_cart) \ diff --git a/src/mame/drivers/harddriv.cpp b/src/mame/drivers/harddriv.cpp index 62f2bf7bbb1..e6c3249dccf 100644 --- a/src/mame/drivers/harddriv.cpp +++ b/src/mame/drivers/harddriv.cpp @@ -1624,58 +1624,6 @@ static MACHINE_CONFIG_START( dsk2 ) MACHINE_CONFIG_END - -/************************************* - * - * Machine drivers - * - *************************************/ - -static MACHINE_CONFIG_START( harddriv ) - MCFG_FRAGMENT_ADD( driver_msp ) - /* basic machine hardware */ /* original driver board with MSP */ - MCFG_FRAGMENT_ADD( adsp ) /* ADSP board */ - MCFG_DEVICE_ADD("harddriv_sound", HARDDRIV_SOUND_BOARD, 0) /* driver sound board */ -MACHINE_CONFIG_END - -static MACHINE_CONFIG_START( harddrivc ) - MCFG_FRAGMENT_ADD( multisync_msp ) - - /* basic machine hardware */ /* multisync board with MSP */ - MCFG_FRAGMENT_ADD( adsp ) /* ADSP board */ - MCFG_DEVICE_ADD("harddriv_sound", HARDDRIV_SOUND_BOARD, 0) /* driver sound board */ -MACHINE_CONFIG_END - -static MACHINE_CONFIG_START( racedriv ) - MCFG_FRAGMENT_ADD( driver_nomsp ) - - /* basic machine hardware */ /* original driver board without MSP */ - MCFG_FRAGMENT_ADD( adsp ) /* ADSP board */ - MCFG_FRAGMENT_ADD( dsk ) /* DSK board */ - MCFG_DEVICE_ADD("harddriv_sound", HARDDRIV_SOUND_BOARD, 0) /* driver sound board */ -MACHINE_CONFIG_END - -static MACHINE_CONFIG_START( racedrivc ) - - MCFG_FRAGMENT_ADD( multisync_nomsp ) - - /* basic machine hardware */ /* multisync board without MSP */ - MCFG_FRAGMENT_ADD( adsp ) /* ADSP board */ - MCFG_FRAGMENT_ADD( dsk ) /* DSK board */ - MCFG_DEVICE_ADD("harddriv_sound", HARDDRIV_SOUND_BOARD, 0) /* driver sound board */ -MACHINE_CONFIG_END - - -static MACHINE_CONFIG_START( racedrivc_panorama_side ) - - MCFG_FRAGMENT_ADD( multisync_nomsp ) - - /* basic machine hardware */ /* multisync board without MSP */ - MCFG_FRAGMENT_ADD( adsp ) /* ADSP board */ -// MCFG_FRAGMENT_ADD( dsk ) /* DSK board */ -// MCFG_DEVICE_ADD("sound_board", HARDDRIV_SOUND_BOARD, 0) /* driver sound board */ -MACHINE_CONFIG_END - WRITE_LINE_MEMBER(harddriv_state::sound_int_write_line) { m_sound_int_state = state; @@ -1683,72 +1631,6 @@ WRITE_LINE_MEMBER(harddriv_state::sound_int_write_line) } -static MACHINE_CONFIG_START( stunrun ) - - MCFG_FRAGMENT_ADD( multisync_nomsp ) - - /* basic machine hardware */ /* multisync board without MSP */ - MCFG_CPU_MODIFY("gsp") - MCFG_TMS340X0_PIXEL_CLOCK(5000000) /* pixel clock */ - MCFG_FRAGMENT_ADD( adsp ) /* ADSP board */ - MCFG_DEVICE_REMOVE("slapstic") - - /* video hardware */ - MCFG_SCREEN_MODIFY("screen") - MCFG_SCREEN_RAW_PARAMS(5000000*2, 317*2, 0, 256*2, 262, 0, 228) - - /* sund hardware */ - MCFG_SPEAKER_STANDARD_MONO("mono") - - MCFG_ATARI_JSA_II_ADD("jsa", WRITELINE(harddriv_state, sound_int_write_line)) - MCFG_ATARI_JSA_TEST_PORT("IN0", 5) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) -MACHINE_CONFIG_END - -static MACHINE_CONFIG_START( steeltal ) - MCFG_FRAGMENT_ADD( multisync_msp ) - - /* basic machine hardware */ /* multisync board with MSP */ - MCFG_FRAGMENT_ADD( ds3 ) /* DS III board */ - MCFG_DEVICE_REMOVE("ds3sdsp") /* DS III sound components are not present */ - MCFG_DEVICE_REMOVE("ds3xdsp") - MCFG_DEVICE_REMOVE("ldac") - MCFG_DEVICE_REMOVE("rdac") - MCFG_DEVICE_REMOVE("vref") - MCFG_DEVICE_REMOVE("lspeaker") - MCFG_DEVICE_REMOVE("rspeaker") - - MCFG_ASIC65_ADD("asic65", ASIC65_STEELTAL) /* ASIC65 on DSPCOM board */ - - /* sund hardware */ - MCFG_SPEAKER_STANDARD_MONO("mono") - - MCFG_ATARI_JSA_III_ADD("jsa", WRITELINE(harddriv_state, sound_int_write_line)) - MCFG_ATARI_JSA_TEST_PORT("IN0", 5) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) -MACHINE_CONFIG_END - -static MACHINE_CONFIG_START( strtdriv ) - - MCFG_FRAGMENT_ADD( multisync_nomsp ) - - /* basic machine hardware */ /* multisync board */ - MCFG_FRAGMENT_ADD( ds3 ) /* DS III board */ - MCFG_CPU_MODIFY("ds3xdsp") /* DS III auxiliary sound DSP has no code */ - MCFG_DEVICE_DISABLE() - - MCFG_FRAGMENT_ADD( dsk ) /* DSK board */ -MACHINE_CONFIG_END - -static MACHINE_CONFIG_START( hdrivair ) - - MCFG_FRAGMENT_ADD( multisync2 ) - - /* basic machine hardware */ /* multisync II board */ - MCFG_FRAGMENT_ADD( ds3 ) /* DS IV board */ - MCFG_FRAGMENT_ADD( dsk2 ) /* DSK II board */ -MACHINE_CONFIG_END - DEFINE_DEVICE_TYPE(HARDDRIV_BOARD, harddriv_board_device_state, "harddriv_board", "Hard Drivin' Board Device") harddriv_board_device_state::harddriv_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) @@ -1756,10 +1638,12 @@ harddriv_board_device_state::harddriv_board_device_state(const machine_config &m { } -machine_config_constructor harddriv_board_device_state::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( harddriv ); -} +MACHINE_CONFIG_MEMBER( harddriv_board_device_state::device_add_mconfig ) + MCFG_FRAGMENT_ADD( driver_msp ) + /* basic machine hardware */ /* original driver board with MSP */ + MCFG_FRAGMENT_ADD( adsp ) /* ADSP board */ + MCFG_DEVICE_ADD("harddriv_sound", HARDDRIV_SOUND_BOARD, 0) /* driver sound board */ +MACHINE_CONFIG_END void harddriv_board_device_state::device_start() { @@ -1782,10 +1666,13 @@ harddrivc_board_device_state::harddrivc_board_device_state(const machine_config { } -machine_config_constructor harddrivc_board_device_state::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( harddrivc ); -} +MACHINE_CONFIG_MEMBER( harddrivc_board_device_state::device_add_mconfig ) + MCFG_FRAGMENT_ADD( multisync_msp ) + + /* basic machine hardware */ /* multisync board with MSP */ + MCFG_FRAGMENT_ADD( adsp ) /* ADSP board */ + MCFG_DEVICE_ADD("harddriv_sound", HARDDRIV_SOUND_BOARD, 0) /* driver sound board */ +MACHINE_CONFIG_END /* Race Drivin */ @@ -1820,11 +1707,14 @@ racedrivb1_board_device_state::racedrivb1_board_device_state(const machine_confi { } -machine_config_constructor racedriv_board_device_state::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( racedriv ); -} +MACHINE_CONFIG_MEMBER( racedriv_board_device_state::device_add_mconfig ) + MCFG_FRAGMENT_ADD( driver_nomsp ) + /* basic machine hardware */ /* original driver board without MSP */ + MCFG_FRAGMENT_ADD( adsp ) /* ADSP board */ + MCFG_FRAGMENT_ADD( dsk ) /* DSK board */ + MCFG_DEVICE_ADD("harddriv_sound", HARDDRIV_SOUND_BOARD, 0) /* driver sound board */ +MACHINE_CONFIG_END /* Race Drivin Compact */ @@ -1872,16 +1762,25 @@ racedrivc_panorama_side_board_device_state::racedrivc_panorama_side_board_device { } -machine_config_constructor racedrivc_board_device_state::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( racedrivc ); -} +MACHINE_CONFIG_MEMBER( racedrivc_board_device_state::device_add_mconfig ) -machine_config_constructor racedrivc_panorama_side_board_device_state::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( racedrivc_panorama_side ); -} + MCFG_FRAGMENT_ADD( multisync_nomsp ) + + /* basic machine hardware */ /* multisync board without MSP */ + MCFG_FRAGMENT_ADD( adsp ) /* ADSP board */ + MCFG_FRAGMENT_ADD( dsk ) /* DSK board */ + MCFG_DEVICE_ADD("harddriv_sound", HARDDRIV_SOUND_BOARD, 0) /* driver sound board */ +MACHINE_CONFIG_END +MACHINE_CONFIG_MEMBER( racedrivc_panorama_side_board_device_state::device_add_mconfig ) + + MCFG_FRAGMENT_ADD( multisync_nomsp ) + + /* basic machine hardware */ /* multisync board without MSP */ + MCFG_FRAGMENT_ADD( adsp ) /* ADSP board */ +// MCFG_FRAGMENT_ADD( dsk ) /* DSK board */ +// MCFG_DEVICE_ADD("sound_board", HARDDRIV_SOUND_BOARD, 0) /* driver sound board */ +MACHINE_CONFIG_END /* Stun Runner */ @@ -1898,10 +1797,27 @@ stunrun_board_device_state::stunrun_board_device_state(const machine_config &mco { } -machine_config_constructor stunrun_board_device_state::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( stunrun ); -} +MACHINE_CONFIG_MEMBER( stunrun_board_device_state::device_add_mconfig ) + + MCFG_FRAGMENT_ADD( multisync_nomsp ) + + /* basic machine hardware */ /* multisync board without MSP */ + MCFG_CPU_MODIFY("gsp") + MCFG_TMS340X0_PIXEL_CLOCK(5000000) /* pixel clock */ + MCFG_FRAGMENT_ADD( adsp ) /* ADSP board */ + MCFG_DEVICE_REMOVE("slapstic") + + /* video hardware */ + MCFG_SCREEN_MODIFY("screen") + MCFG_SCREEN_RAW_PARAMS(5000000*2, 317*2, 0, 256*2, 262, 0, 228) + + /* sund hardware */ + MCFG_SPEAKER_STANDARD_MONO("mono") + + MCFG_ATARI_JSA_II_ADD("jsa", WRITELINE(harddriv_state, sound_int_write_line)) + MCFG_ATARI_JSA_TEST_PORT("IN0", 5) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) +MACHINE_CONFIG_END /* Steel Talons */ @@ -1947,10 +1863,28 @@ steeltalp_board_device_state::steeltalp_board_device_state(const machine_config { } -machine_config_constructor steeltal_board_device_state::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( steeltal ); -} +MACHINE_CONFIG_MEMBER( steeltal_board_device_state::device_add_mconfig ) + MCFG_FRAGMENT_ADD( multisync_msp ) + + /* basic machine hardware */ /* multisync board with MSP */ + MCFG_FRAGMENT_ADD( ds3 ) /* DS III board */ + MCFG_DEVICE_REMOVE("ds3sdsp") /* DS III sound components are not present */ + MCFG_DEVICE_REMOVE("ds3xdsp") + MCFG_DEVICE_REMOVE("ldac") + MCFG_DEVICE_REMOVE("rdac") + MCFG_DEVICE_REMOVE("vref") + MCFG_DEVICE_REMOVE("lspeaker") + MCFG_DEVICE_REMOVE("rspeaker") + + MCFG_ASIC65_ADD("asic65", ASIC65_STEELTAL) /* ASIC65 on DSPCOM board */ + + /* sund hardware */ + MCFG_SPEAKER_STANDARD_MONO("mono") + + MCFG_ATARI_JSA_III_ADD("jsa", WRITELINE(harddriv_state, sound_int_write_line)) + MCFG_ATARI_JSA_TEST_PORT("IN0", 5) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) +MACHINE_CONFIG_END /* Street Drivin' */ @@ -1967,10 +1901,17 @@ strtdriv_board_device_state::strtdriv_board_device_state(const machine_config &m { } -machine_config_constructor strtdriv_board_device_state::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( strtdriv ); -} +MACHINE_CONFIG_MEMBER( strtdriv_board_device_state::device_add_mconfig ) + + MCFG_FRAGMENT_ADD( multisync_nomsp ) + + /* basic machine hardware */ /* multisync board */ + MCFG_FRAGMENT_ADD( ds3 ) /* DS III board */ + MCFG_CPU_MODIFY("ds3xdsp") /* DS III auxiliary sound DSP has no code */ + MCFG_DEVICE_DISABLE() + + MCFG_FRAGMENT_ADD( dsk ) /* DSK board */ +MACHINE_CONFIG_END /* Hard Drivin' Airbourne */ @@ -2004,11 +1945,14 @@ hdrivairp_board_device_state::hdrivairp_board_device_state(const machine_config { } -machine_config_constructor hdrivair_board_device_state::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( hdrivair ); -} +MACHINE_CONFIG_MEMBER( hdrivair_board_device_state::device_add_mconfig ) + MCFG_FRAGMENT_ADD( multisync2 ) + + /* basic machine hardware */ /* multisync II board */ + MCFG_FRAGMENT_ADD( ds3 ) /* DS IV board */ + MCFG_FRAGMENT_ADD( dsk2 ) /* DSK II board */ +MACHINE_CONFIG_END static MACHINE_CONFIG_START( harddriv_machine ) diff --git a/src/mame/drivers/indy_indigo2.cpp b/src/mame/drivers/indy_indigo2.cpp index d87d46fd97e..ff40428ce19 100644 --- a/src/mame/drivers/indy_indigo2.cpp +++ b/src/mame/drivers/indy_indigo2.cpp @@ -100,7 +100,7 @@ protected: virtual void device_start() override; virtual void device_reset() override; - machine_config_constructor device_mconfig_additions() const override; + virtual void device_add_mconfig(machine_config &config) override; virtual ioport_constructor device_input_ports() const override; required_device<mips3_device> m_maincpu; @@ -182,7 +182,7 @@ ioport_constructor ioc2_device::device_input_ports() const return INPUT_PORTS_NAME(front_panel); } -MACHINE_CONFIG_START( ioc2_device ) +MACHINE_CONFIG_MEMBER( ioc2_device::device_add_mconfig ) MCFG_SCC85230_ADD(SCC_TAG, SCC_PCLK, SCC_RXA_CLK, SCC_TXA_CLK, SCC_RXB_CLK, SCC_TXB_CLK) MCFG_Z80SCC_OUT_TXDA_CB(DEVWRITELINE(RS232A_TAG, rs232_port_device, write_txd)) MCFG_Z80SCC_OUT_DTRA_CB(DEVWRITELINE(RS232A_TAG, rs232_port_device, write_dtr)) @@ -214,10 +214,6 @@ MACHINE_CONFIG_START( ioc2_device ) MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE(KBDC_TAG, kbdc8042_device, write_out2)) MACHINE_CONFIG_END -machine_config_constructor ioc2_device::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME(ioc2_device); -} ioc2_device::ioc2_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, uint8_t id) : device_t(mconfig, type, tag, owner, clock) diff --git a/src/mame/drivers/segaxbd.cpp b/src/mame/drivers/segaxbd.cpp index 1c80e0f2bee..05cad06794b 100644 --- a/src/mame/drivers/segaxbd.cpp +++ b/src/mame/drivers/segaxbd.cpp @@ -1679,7 +1679,7 @@ GFXDECODE_END // GENERIC MACHINE DRIVERS //************************************************************************** -static MACHINE_CONFIG_START( xboard ) +MACHINE_CONFIG_MEMBER( segaxbd_state::xboard_base_mconfig ) // basic machine hardware MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK/4) @@ -1753,6 +1753,7 @@ static MACHINE_CONFIG_START( xboard ) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_CONFIG_END + DEFINE_DEVICE_TYPE(SEGA_XBD_REGULAR, segaxbd_regular_state, "segaxbd_pcb_reg", "Sega X-Board PCB (regular)") segaxbd_regular_state::segaxbd_regular_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) @@ -1760,25 +1761,16 @@ segaxbd_regular_state::segaxbd_regular_state(const machine_config &mconfig, cons { } -machine_config_constructor segaxbd_regular_state::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( xboard ); -} +MACHINE_CONFIG_MEMBER( segaxbd_regular_state::device_add_mconfig ) + + segaxbd_state::xboard_base_mconfig(config); +MACHINE_CONFIG_END static MACHINE_CONFIG_START( sega_xboard ) MCFG_DEVICE_ADD("mainpcb", SEGA_XBD_REGULAR, 0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( xboard_fd1094 ) - - MCFG_FRAGMENT_ADD( xboard ) - - MCFG_CPU_REPLACE("maincpu", FD1094, MASTER_CLOCK/4) - MCFG_CPU_PROGRAM_MAP(main_map) - MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map) -MACHINE_CONFIG_END - DEFINE_DEVICE_TYPE(SEGA_XBD_FD1094, segaxbd_fd1094_state, "segaxbd_pcb_fd1094", "Sega X-Board PCB (FD1094)") segaxbd_fd1094_state::segaxbd_fd1094_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) @@ -1786,10 +1778,15 @@ segaxbd_fd1094_state::segaxbd_fd1094_state(const machine_config &mconfig, const { } -machine_config_constructor segaxbd_fd1094_state::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( xboard_fd1094 ); -} +MACHINE_CONFIG_MEMBER( segaxbd_fd1094_state::device_add_mconfig ) + + segaxbd_state::xboard_base_mconfig(config); + + MCFG_CPU_REPLACE("maincpu", FD1094, MASTER_CLOCK/4) + MCFG_CPU_PROGRAM_MAP(main_map) + MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map) +MACHINE_CONFIG_END + static MACHINE_CONFIG_START( sega_xboard_fd1094 ) MCFG_DEVICE_ADD("mainpcb", SEGA_XBD_FD1094, 0) @@ -1807,15 +1804,6 @@ MACHINE_CONFIG_END // GAME-SPECIFIC MACHINE DRIVERS //************************************************************************** -static MACHINE_CONFIG_START( aburner2 ) - MCFG_FRAGMENT_ADD( xboard ) - - // basic machine hardware - MCFG_DEVICE_MODIFY("iochip_0") - MCFG_CXD1095_IN_PORTA_CB(READ8(segaxbd_state, aburner2_motor_r)) - MCFG_CXD1095_OUT_PORTB_CB(WRITE8(segaxbd_state, aburner2_motor_w)) -MACHINE_CONFIG_END - DEFINE_DEVICE_TYPE(SEGA_XBD_ABURNER2_DEVICE, segaxbd_aburner2_state, "segaxbd_pcb_aburner2", "Sega X-Board PCB (After Burner)") segaxbd_aburner2_state::segaxbd_aburner2_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) @@ -1823,19 +1811,34 @@ segaxbd_aburner2_state::segaxbd_aburner2_state(const machine_config &mconfig, co { } -machine_config_constructor segaxbd_aburner2_state::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( aburner2 ); -} +MACHINE_CONFIG_MEMBER( segaxbd_aburner2_state::device_add_mconfig ) + segaxbd_state::xboard_base_mconfig(config); + + // basic machine hardware + MCFG_DEVICE_MODIFY("iochip_0") + MCFG_CXD1095_IN_PORTA_CB(READ8(segaxbd_state, aburner2_motor_r)) + MCFG_CXD1095_OUT_PORTB_CB(WRITE8(segaxbd_state, aburner2_motor_w)) +MACHINE_CONFIG_END static MACHINE_CONFIG_START( sega_aburner2 ) MCFG_DEVICE_ADD("mainpcb", SEGA_XBD_ABURNER2_DEVICE, 0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( lastsurv_fd1094 ) +DEFINE_DEVICE_TYPE(SEGA_XBD_LASTSURV_FD1094, segaxbd_lastsurv_fd1094_state, "segaxbd_pcb_lastsurv_fd1094", "Sega X-Board PCB (Last Survivor, FD1094)") + +segaxbd_lastsurv_fd1094_state::segaxbd_lastsurv_fd1094_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) + : segaxbd_state(mconfig, SEGA_XBD_LASTSURV_FD1094, tag, owner, clock) +{ +} + +MACHINE_CONFIG_MEMBER( segaxbd_lastsurv_fd1094_state::device_add_mconfig ) - MCFG_FRAGMENT_ADD( xboard_fd1094 ) + segaxbd_state::xboard_base_mconfig(config); + + MCFG_CPU_REPLACE("maincpu", FD1094, MASTER_CLOCK/4) + MCFG_CPU_PROGRAM_MAP(main_map) + MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map) // basic machine hardware // TODO: network board @@ -1853,25 +1856,21 @@ static MACHINE_CONFIG_START( lastsurv_fd1094 ) MCFG_SOUND_ROUTE(1, "lspeaker", 0.43) MACHINE_CONFIG_END -DEFINE_DEVICE_TYPE(SEGA_XBD_LASTSURV_FD1094, segaxbd_lastsurv_fd1094_state, "segaxbd_pcb_lastsurv_fd1094", "Sega X-Board PCB (Last Survivor, FD1094)") +static MACHINE_CONFIG_START( sega_lastsurv_fd1094 ) + MCFG_DEVICE_ADD("mainpcb", SEGA_XBD_LASTSURV_FD1094, 0) +MACHINE_CONFIG_END -segaxbd_lastsurv_fd1094_state::segaxbd_lastsurv_fd1094_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : segaxbd_state(mconfig, SEGA_XBD_LASTSURV_FD1094, tag, owner, clock) -{ -} -machine_config_constructor segaxbd_lastsurv_fd1094_state::device_mconfig_additions() const +DEFINE_DEVICE_TYPE(SEGA_XBD_LASTSURV, segaxbd_lastsurv_state, "segaxbd_pcb_lastsurv", "Sega X-Board PCB (Last Survivor)") + +segaxbd_lastsurv_state::segaxbd_lastsurv_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) + : segaxbd_state(mconfig, SEGA_XBD_LASTSURV, tag, owner, clock) { - return MACHINE_CONFIG_NAME( lastsurv_fd1094 ); } -static MACHINE_CONFIG_START( sega_lastsurv_fd1094 ) - MCFG_DEVICE_ADD("mainpcb", SEGA_XBD_LASTSURV_FD1094, 0) -MACHINE_CONFIG_END - -static MACHINE_CONFIG_START( lastsurv ) +MACHINE_CONFIG_MEMBER( segaxbd_lastsurv_state::device_add_mconfig ) - MCFG_FRAGMENT_ADD( xboard ) + segaxbd_state::xboard_base_mconfig(config); // basic machine hardware // TODO: network board @@ -1889,26 +1888,24 @@ static MACHINE_CONFIG_START( lastsurv ) MCFG_SOUND_ROUTE(1, "lspeaker", 0.43) MACHINE_CONFIG_END -DEFINE_DEVICE_TYPE(SEGA_XBD_LASTSURV, segaxbd_lastsurv_state, "segaxbd_pcb_lastsurv", "Sega X-Board PCB (Last Survivor)") - -segaxbd_lastsurv_state::segaxbd_lastsurv_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : segaxbd_state(mconfig, SEGA_XBD_LASTSURV, tag, owner, clock) -{ -} - -machine_config_constructor segaxbd_lastsurv_state::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( lastsurv ); -} - static MACHINE_CONFIG_START( sega_lastsurv ) MCFG_DEVICE_ADD("mainpcb", SEGA_XBD_LASTSURV, 0) MACHINE_CONFIG_END +DEFINE_DEVICE_TYPE(SEGA_XBD_SMGP_FD1094, segaxbd_smgp_fd1094_state, "segaxbd_pcb_smgp_fd1094", "Sega X-Board PCB (SMGP, FD1094)") -static MACHINE_CONFIG_START( smgp_fd1094 ) - MCFG_FRAGMENT_ADD( xboard_fd1094 ) +segaxbd_smgp_fd1094_state::segaxbd_smgp_fd1094_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) + : segaxbd_state(mconfig, SEGA_XBD_SMGP_FD1094, tag, owner, clock) +{ +} + +MACHINE_CONFIG_MEMBER( segaxbd_smgp_fd1094_state::device_add_mconfig ) + segaxbd_state::xboard_base_mconfig(config); + + MCFG_CPU_REPLACE("maincpu", FD1094, MASTER_CLOCK/4) + MCFG_CPU_PROGRAM_MAP(main_map) + MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map) // basic machine hardware MCFG_CPU_ADD("soundcpu2", Z80, SOUND_CLOCK/4) @@ -1936,26 +1933,20 @@ static MACHINE_CONFIG_START( smgp_fd1094 ) MCFG_SOUND_ROUTE(1, "rearright", 1.0) MACHINE_CONFIG_END -DEFINE_DEVICE_TYPE(SEGA_XBD_SMGP_FD1094, segaxbd_smgp_fd1094_state, "segaxbd_pcb_smgp_fd1094", "Sega X-Board PCB (SMGP, FD1094)") - -segaxbd_smgp_fd1094_state::segaxbd_smgp_fd1094_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : segaxbd_state(mconfig, SEGA_XBD_SMGP_FD1094, tag, owner, clock) -{ -} - -machine_config_constructor segaxbd_smgp_fd1094_state::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( smgp_fd1094 ); -} - static MACHINE_CONFIG_START( sega_smgp_fd1094 ) MCFG_DEVICE_ADD("mainpcb", SEGA_XBD_SMGP_FD1094, 0) MACHINE_CONFIG_END +DEFINE_DEVICE_TYPE(SEGA_XBD_SMGP, segaxbd_smgp_state, "segaxbd_pcb_smgp", "Sega X-Board PCB (SMGP)") + +segaxbd_smgp_state::segaxbd_smgp_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) + : segaxbd_state(mconfig, SEGA_XBD_SMGP, tag, owner, clock) +{ +} -static MACHINE_CONFIG_START( smgp ) - MCFG_FRAGMENT_ADD( xboard ) +MACHINE_CONFIG_MEMBER( segaxbd_smgp_state::device_add_mconfig ) + segaxbd_state::xboard_base_mconfig(config); // basic machine hardware MCFG_CPU_ADD("soundcpu2", Z80, SOUND_CLOCK/4) @@ -1983,32 +1974,11 @@ static MACHINE_CONFIG_START( smgp ) MCFG_SOUND_ROUTE(1, "rearright", 1.0) MACHINE_CONFIG_END -DEFINE_DEVICE_TYPE(SEGA_XBD_SMGP, segaxbd_smgp_state, "segaxbd_pcb_smgp", "Sega X-Board PCB (SMGP)") - -segaxbd_smgp_state::segaxbd_smgp_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : segaxbd_state(mconfig, SEGA_XBD_SMGP, tag, owner, clock) -{ -} - -machine_config_constructor segaxbd_smgp_state::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( smgp ); -} - static MACHINE_CONFIG_START( sega_smgp ) MCFG_DEVICE_ADD("mainpcb", SEGA_XBD_SMGP, 0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( rascot ) - MCFG_FRAGMENT_ADD( xboard ) - - // basic machine hardware - MCFG_CPU_MODIFY("soundcpu") - MCFG_CPU_PROGRAM_MAP(rascot_z80_map) - MCFG_CPU_IO_MAP(rascot_z80_portmap) -MACHINE_CONFIG_END - DEFINE_DEVICE_TYPE(SEGA_XBD_RASCOT, segaxbd_rascot_state, "segaxbd_pcb_rascot", "Sega X-Board PCB (Royal Ascot)") segaxbd_rascot_state::segaxbd_rascot_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) @@ -2016,10 +1986,14 @@ segaxbd_rascot_state::segaxbd_rascot_state(const machine_config &mconfig, const { } -machine_config_constructor segaxbd_rascot_state::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( rascot ); -} +MACHINE_CONFIG_MEMBER( segaxbd_rascot_state::device_add_mconfig ) + segaxbd_state::xboard_base_mconfig(config); + + // basic machine hardware + MCFG_CPU_MODIFY("soundcpu") + MCFG_CPU_PROGRAM_MAP(rascot_z80_map) + MCFG_CPU_IO_MAP(rascot_z80_portmap) +MACHINE_CONFIG_END static MACHINE_CONFIG_START( sega_rascot ) MCFG_DEVICE_ADD("mainpcb", SEGA_XBD_RASCOT, 0) diff --git a/src/mame/drivers/vis.cpp b/src/mame/drivers/vis.cpp index e61fe6e2a6f..5a8399db147 100644 --- a/src/mame/drivers/vis.cpp +++ b/src/mame/drivers/vis.cpp @@ -25,7 +25,7 @@ protected: virtual void device_reset() override; virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; virtual void dack16_w(int line, uint16_t data) override; - virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_add_mconfig(machine_config &config) override; private: required_device<dac_word_interface> m_rdac; required_device<dac_word_interface> m_ldac; @@ -130,7 +130,7 @@ void vis_audio_device::device_timer(emu_timer &timer, device_timer_id id, int pa } } -static MACHINE_CONFIG_START( vis_pcm_config ) +MACHINE_CONFIG_MEMBER( vis_audio_device::device_add_mconfig ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("ymf262", YMF262, XTAL_14_31818MHz) MCFG_SOUND_ROUTE(0, "lspeaker", 1.00) @@ -144,11 +144,6 @@ static MACHINE_CONFIG_START( vis_pcm_config ) MCFG_SOUND_ROUTE_EX(0, "rdac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "rdac", -1.0, DAC_VREF_NEG_INPUT) MACHINE_CONFIG_END -machine_config_constructor vis_audio_device::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( vis_pcm_config ); -} - READ8_MEMBER(vis_audio_device::pcm_r) { switch(offset) @@ -234,15 +229,15 @@ public: DECLARE_WRITE8_MEMBER(vga_w); DECLARE_READ8_MEMBER(visvgamem_r); DECLARE_WRITE8_MEMBER(visvgamem_w); - virtual uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) override; protected: virtual void device_start() override; virtual void device_reset() override; - virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_add_mconfig(machine_config &config) override; virtual void recompute_params() override; private: void vga_vh_yuv8(bitmap_rgb32 &bitmap, const rectangle &cliprect); rgb_t yuv_to_rgb(int y, int u, int v) const; + virtual uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) override; int m_extcnt; uint8_t m_extreg; @@ -262,18 +257,13 @@ vis_vga_device::vis_vga_device(const machine_config &mconfig, const char *tag, d m_screen.set_tag("screen"); } -static MACHINE_CONFIG_START( vis_vga_config ) +MACHINE_CONFIG_MEMBER( vis_vga_device::device_add_mconfig ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, vis_vga_device, screen_update) MCFG_PALETTE_ADD("palette", 0x100) MACHINE_CONFIG_END -machine_config_constructor vis_vga_device::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( vis_vga_config ); -} - void vis_vga_device::recompute_params() { int vblank_period,hblank_period; diff --git a/src/mame/includes/harddriv.h b/src/mame/includes/harddriv.h index 909749d99ca..27a93988b7b 100644 --- a/src/mame/includes/harddriv.h +++ b/src/mame/includes/harddriv.h @@ -543,7 +543,7 @@ public: harddriv_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); protected: - virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_add_mconfig(machine_config &config) override; virtual void device_start() override; // virtual void device_reset(); }; @@ -556,7 +556,7 @@ public: harddrivc_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); protected: - virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_add_mconfig(machine_config &config) override; virtual void device_start() override; // virtual void device_reset(); }; @@ -571,7 +571,7 @@ public: protected: racedriv_board_device_state(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); - virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_add_mconfig(machine_config &config) override; virtual void device_start() override; // virtual void device_reset(); }; @@ -595,7 +595,7 @@ public: protected: racedrivc_board_device_state(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); - virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_add_mconfig(machine_config &config) override; virtual void device_start() override; // virtual void device_reset(); }; @@ -615,7 +615,7 @@ public: racedrivc_panorama_side_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); protected: - virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_add_mconfig(machine_config &config) override; virtual void device_start() override; }; @@ -628,7 +628,7 @@ public: stunrun_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); protected: - virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_add_mconfig(machine_config &config) override; virtual void device_start() override; // virtual void device_reset(); }; @@ -643,7 +643,7 @@ public: protected: steeltal_board_device_state(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); - virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_add_mconfig(machine_config &config) override; virtual void device_start() override; // virtual void device_reset(); }; @@ -676,7 +676,7 @@ public: strtdriv_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); protected: - virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_add_mconfig(machine_config &config) override; virtual void device_start() override; // virtual void device_reset(); }; @@ -691,7 +691,7 @@ public: protected: hdrivair_board_device_state(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); - virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_add_mconfig(machine_config &config) override; virtual void device_start() override; // virtual void device_reset(); }; diff --git a/src/mame/includes/segaxbd.h b/src/mame/includes/segaxbd.h index 7ee29f0d974..1652578e41a 100644 --- a/src/mame/includes/segaxbd.h +++ b/src/mame/includes/segaxbd.h @@ -33,15 +33,9 @@ public: // construction/destruction segaxbd_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - // compare/timer chip callbacks - void timer_ack_callback(); - void sound_data_w(uint8_t data); - // main CPU read/write handlers DECLARE_READ16_MEMBER(adc_r); DECLARE_WRITE16_MEMBER(adc_w); - DECLARE_WRITE8_MEMBER(pc_0_w); - DECLARE_WRITE8_MEMBER(pd_0_w); DECLARE_WRITE16_MEMBER(iocontrol_w); // game-specific main CPU read/write handlers @@ -94,6 +88,13 @@ protected: DECLARE_WRITE_LINE_MEMBER(m68k_reset_callback); void generic_iochip0_lamps_w(uint8_t data); + // compare/timer chip callbacks + void timer_ack_callback(); + void sound_data_w(uint8_t data); + + DECLARE_WRITE8_MEMBER(pc_0_w); + DECLARE_WRITE8_MEMBER(pd_0_w); + // devices public: required_device<m68000_device> m_maincpu; @@ -143,6 +144,7 @@ protected: protected: virtual void device_start() override; virtual void device_reset() override; + void xboard_base_mconfig(machine_config &config); }; @@ -152,7 +154,7 @@ public: segaxbd_regular_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); protected: - virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_add_mconfig(machine_config &config) override; }; @@ -163,7 +165,7 @@ public: segaxbd_fd1094_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); protected: - virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_add_mconfig(machine_config &config) override; }; class segaxbd_aburner2_state : public segaxbd_state @@ -172,7 +174,7 @@ public: segaxbd_aburner2_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); protected: - virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_add_mconfig(machine_config &config) override; // virtual void device_start(); // virtual void device_reset(); }; @@ -183,7 +185,7 @@ public: segaxbd_lastsurv_fd1094_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); protected: - virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_add_mconfig(machine_config &config) override; }; class segaxbd_lastsurv_state : public segaxbd_state @@ -192,7 +194,7 @@ public: segaxbd_lastsurv_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); protected: - virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_add_mconfig(machine_config &config) override; }; @@ -202,7 +204,7 @@ public: segaxbd_smgp_fd1094_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); protected: - virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_add_mconfig(machine_config &config) override; }; @@ -212,7 +214,7 @@ public: segaxbd_smgp_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); protected: - virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_add_mconfig(machine_config &config) override; }; @@ -222,7 +224,7 @@ public: segaxbd_rascot_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); protected: - virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_add_mconfig(machine_config &config) override; }; #endif // MAME_INCLUDES_SEGAXBD_H |