From 4afaaedddfcc8449d6e2a442fba17a77b1b23656 Mon Sep 17 00:00:00 2001 From: Ivan Vangelista Date: Tue, 13 Jun 2017 16:47:41 +0200 Subject: device_add_mconfig up to devices/bus/q* (nw) --- src/devices/bus/pc_kbd/ec1841.cpp | 15 ++------------- src/devices/bus/pc_kbd/ec1841.h | 22 +++++++++++----------- src/devices/bus/pc_kbd/iskr1030.cpp | 15 ++------------- src/devices/bus/pc_kbd/iskr1030.h | 19 ++++++++++--------- src/devices/bus/pc_kbd/keytro.cpp | 23 ++++++----------------- src/devices/bus/pc_kbd/keytro.h | 10 +++++----- src/devices/bus/pc_kbd/msnat.cpp | 21 +++++---------------- src/devices/bus/pc_kbd/msnat.h | 10 +++++----- src/devices/bus/pc_kbd/pc83.cpp | 15 ++------------- src/devices/bus/pc_kbd/pc83.h | 20 ++++++++++---------- src/devices/bus/pc_kbd/pcat84.cpp | 15 ++------------- src/devices/bus/pc_kbd/pcat84.h | 26 +++++++++++++------------- src/devices/bus/pc_kbd/pcxt83.cpp | 15 ++------------- src/devices/bus/pc_kbd/pcxt83.h | 22 +++++++++++----------- src/devices/bus/pet/2joysnd.cpp | 19 +++++++------------ src/devices/bus/pet/2joysnd.h | 9 ++++----- src/devices/bus/pet/c2n.cpp | 15 ++------------- src/devices/bus/pet/c2n.h | 6 +++--- src/devices/bus/pet/cb2snd.cpp | 17 ++++++----------- src/devices/bus/pet/cb2snd.h | 4 ++-- src/devices/bus/pet/hsg.cpp | 27 +++------------------------ src/devices/bus/pet/hsg.h | 6 ++++-- src/devices/bus/pet/superpet.cpp | 15 ++------------- src/devices/bus/pet/superpet.h | 13 +++++++------ src/devices/bus/plus4/c1551.cpp | 15 ++------------- src/devices/bus/plus4/c1551.h | 29 +++++++++++++++-------------- src/devices/bus/plus4/sid.cpp | 15 ++------------- src/devices/bus/plus4/sid.h | 8 ++++---- src/devices/bus/pofo/hpc101.cpp | 15 ++------------- src/devices/bus/pofo/hpc101.h | 6 +++--- src/devices/bus/pofo/hpc102.cpp | 15 ++------------- src/devices/bus/pofo/hpc102.h | 6 +++--- src/devices/bus/pofo/hpc104.cpp | 15 ++------------- src/devices/bus/pofo/hpc104.h | 8 ++++---- src/devices/bus/psx/ctlrport.cpp | 7 +------ src/devices/bus/psx/ctlrport.h | 3 ++- src/devices/bus/psx/multitap.cpp | 7 +------ src/devices/bus/psx/multitap.h | 3 ++- src/devices/bus/ql/cst_q_plus4.cpp | 15 ++------------- src/devices/bus/ql/cst_q_plus4.h | 18 +++++++++--------- src/devices/bus/ql/qubide.cpp | 14 ++------------ src/devices/bus/ql/qubide.h | 10 +++++----- src/devices/bus/ql/sandy_superdisk.cpp | 15 ++------------- src/devices/bus/ql/sandy_superdisk.h | 16 ++++++++-------- src/devices/bus/ql/sandy_superqboard.cpp | 15 ++------------- src/devices/bus/ql/sandy_superqboard.h | 16 ++++++++-------- src/devices/bus/ql/trumpcard.cpp | 16 ++-------------- src/devices/bus/ql/trumpcard.h | 13 +++++++------ 48 files changed, 218 insertions(+), 461 deletions(-) diff --git a/src/devices/bus/pc_kbd/ec1841.cpp b/src/devices/bus/pc_kbd/ec1841.cpp index 494ba0b9f00..8b4ee8f57cf 100644 --- a/src/devices/bus/pc_kbd/ec1841.cpp +++ b/src/devices/bus/pc_kbd/ec1841.cpp @@ -63,10 +63,10 @@ const tiny_rom_entry *ec_1841_keyboard_device::device_rom_region() const //------------------------------------------------- -// MACHINE_DRIVER( ec_1841_keyboard ) +// device_add_mconfig - add device configuration //------------------------------------------------- -static MACHINE_CONFIG_START( ec_1841_keyboard ) +MACHINE_CONFIG_MEMBER( ec_1841_keyboard_device::device_add_mconfig ) MCFG_CPU_ADD(I8048_TAG, I8048, XTAL_5_46MHz) MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(ec_1841_keyboard_device, bus_w)) MCFG_MCS48_PORT_P1_IN_CB(READ8(ec_1841_keyboard_device, p1_r)) @@ -76,17 +76,6 @@ static MACHINE_CONFIG_START( ec_1841_keyboard ) MACHINE_CONFIG_END -//------------------------------------------------- -// machine_config_additions - device-specific -// machine configurations -//------------------------------------------------- - -machine_config_constructor ec_1841_keyboard_device::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( ec_1841_keyboard ); -} - - //------------------------------------------------- // INPUT_PORTS( ec_1841_keyboard ) //------------------------------------------------- diff --git a/src/devices/bus/pc_kbd/ec1841.h b/src/devices/bus/pc_kbd/ec1841.h index 401452ac019..29fdff447ac 100644 --- a/src/devices/bus/pc_kbd/ec1841.h +++ b/src/devices/bus/pc_kbd/ec1841.h @@ -28,27 +28,27 @@ public: // construction/destruction ec_1841_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - // optional information overrides - virtual const tiny_rom_entry *device_rom_region() const override; - virtual machine_config_constructor device_mconfig_additions() const override; - virtual ioport_constructor device_input_ports() const override; - - DECLARE_WRITE8_MEMBER( bus_w ); - DECLARE_READ8_MEMBER( p1_r ); - DECLARE_WRITE8_MEMBER( p1_w ); - DECLARE_WRITE8_MEMBER( p2_w ); - DECLARE_READ_LINE_MEMBER( t1_r ); - protected: // device-level overrides virtual void device_start() override; virtual void device_reset() override; + // optional information overrides + virtual const tiny_rom_entry *device_rom_region() const override; + virtual void device_add_mconfig(machine_config &config) override; + virtual ioport_constructor device_input_ports() const override; + // device_pc_kbd_interface overrides virtual DECLARE_WRITE_LINE_MEMBER( clock_write ) override; virtual DECLARE_WRITE_LINE_MEMBER( data_write ) override; private: + DECLARE_WRITE8_MEMBER( bus_w ); + DECLARE_READ8_MEMBER( p1_r ); + DECLARE_WRITE8_MEMBER( p1_w ); + DECLARE_WRITE8_MEMBER( p2_w ); + DECLARE_READ_LINE_MEMBER( t1_r ); + required_device m_maincpu; required_ioport_array<16> m_kbd; diff --git a/src/devices/bus/pc_kbd/iskr1030.cpp b/src/devices/bus/pc_kbd/iskr1030.cpp index 88b22ea8968..db2a99a79b8 100644 --- a/src/devices/bus/pc_kbd/iskr1030.cpp +++ b/src/devices/bus/pc_kbd/iskr1030.cpp @@ -67,10 +67,10 @@ ADDRESS_MAP_END //------------------------------------------------- -// MACHINE_DRIVER( iskr_1030_keyboard ) +// device_add_mconfig - add device configuration //------------------------------------------------- -static MACHINE_CONFIG_START( iskr_1030_keyboard ) +MACHINE_CONFIG_MEMBER( iskr_1030_keyboard_device::device_add_mconfig ) MCFG_CPU_ADD(I8048_TAG, I8048, XTAL_5MHz) MCFG_CPU_IO_MAP(iskr_1030_keyboard_io) MCFG_MCS48_PORT_P1_IN_CB(READ8(iskr_1030_keyboard_device, p1_r)) @@ -80,17 +80,6 @@ static MACHINE_CONFIG_START( iskr_1030_keyboard ) MACHINE_CONFIG_END -//------------------------------------------------- -// machine_config_additions - device-specific -// machine configurations -//------------------------------------------------- - -machine_config_constructor iskr_1030_keyboard_device::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( iskr_1030_keyboard ); -} - - //------------------------------------------------- // INPUT_PORTS( iskr_1030_keyboard ) //------------------------------------------------- diff --git a/src/devices/bus/pc_kbd/iskr1030.h b/src/devices/bus/pc_kbd/iskr1030.h index 3dd0f670479..de20866ab93 100644 --- a/src/devices/bus/pc_kbd/iskr1030.h +++ b/src/devices/bus/pc_kbd/iskr1030.h @@ -29,28 +29,29 @@ public: // construction/destruction iskr_1030_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - // optional information overrides - virtual const tiny_rom_entry *device_rom_region() const override; - virtual machine_config_constructor device_mconfig_additions() const override; - virtual ioport_constructor device_input_ports() const override; - DECLARE_READ8_MEMBER( ram_r ); DECLARE_WRITE8_MEMBER( ram_w ); - DECLARE_READ8_MEMBER( p1_r ); - DECLARE_WRITE8_MEMBER( p1_w ); - DECLARE_WRITE8_MEMBER( p2_w ); - DECLARE_READ_LINE_MEMBER( t1_r ); protected: // device-level overrides virtual void device_start() override; virtual void device_reset() override; + // optional information overrides + virtual const tiny_rom_entry *device_rom_region() const override; + virtual void device_add_mconfig(machine_config &config) override; + virtual ioport_constructor device_input_ports() const override; + // device_pc_kbd_interface overrides virtual DECLARE_WRITE_LINE_MEMBER( clock_write ) override; virtual DECLARE_WRITE_LINE_MEMBER( data_write ) override; private: + DECLARE_READ8_MEMBER( p1_r ); + DECLARE_WRITE8_MEMBER( p1_w ); + DECLARE_WRITE8_MEMBER( p2_w ); + DECLARE_READ_LINE_MEMBER( t1_r ); + required_device m_maincpu; required_ioport m_md00; required_ioport m_md01; diff --git a/src/devices/bus/pc_kbd/keytro.cpp b/src/devices/bus/pc_kbd/keytro.cpp index 67a23e505a9..0d01789f493 100644 --- a/src/devices/bus/pc_kbd/keytro.cpp +++ b/src/devices/bus/pc_kbd/keytro.cpp @@ -356,17 +356,6 @@ static ADDRESS_MAP_START( keytronic_pc3270_io, AS_IO, 8, pc_kbd_keytronic_pc3270 ADDRESS_MAP_END -/***************************************************************************** - MACHINE CONFIG -*****************************************************************************/ - -MACHINE_CONFIG_START( keytronic_pc3270 ) - MCFG_CPU_ADD("kb_keytr", I8051, 11060250) - MCFG_CPU_PROGRAM_MAP(keytronic_pc3270_program) - MCFG_CPU_IO_MAP(keytronic_pc3270_io) -MACHINE_CONFIG_END - - /*************************************************************************** ROM DEFINITIONS ***************************************************************************/ @@ -430,14 +419,14 @@ void pc_kbd_keytronic_pc3270_device::device_reset() //------------------------------------------------- -// machine_config_additions - device-specific -// machine configurations +// device_add_mconfig - add device configuration //------------------------------------------------- -machine_config_constructor pc_kbd_keytronic_pc3270_device::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( keytronic_pc3270 ); -} +MACHINE_CONFIG_MEMBER( pc_kbd_keytronic_pc3270_device::device_add_mconfig ) + MCFG_CPU_ADD("kb_keytr", I8051, 11060250) + MCFG_CPU_PROGRAM_MAP(keytronic_pc3270_program) + MCFG_CPU_IO_MAP(keytronic_pc3270_io) +MACHINE_CONFIG_END ioport_constructor pc_kbd_keytronic_pc3270_device::device_input_ports() const diff --git a/src/devices/bus/pc_kbd/keytro.h b/src/devices/bus/pc_kbd/keytro.h index 6043b21b110..4ba92b7fcbb 100644 --- a/src/devices/bus/pc_kbd/keytro.h +++ b/src/devices/bus/pc_kbd/keytro.h @@ -28,11 +28,6 @@ public: required_device m_cpu; - // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const override; - virtual ioport_constructor device_input_ports() const override; - virtual const tiny_rom_entry *device_rom_region() const override; - virtual DECLARE_WRITE_LINE_MEMBER(clock_write) override; virtual DECLARE_WRITE_LINE_MEMBER(data_write) override; @@ -57,6 +52,11 @@ protected: virtual void device_start() override; virtual void device_reset() override; + // optional information overrides + virtual void device_add_mconfig(machine_config &config) override; + virtual ioport_constructor device_input_ports() const override; + virtual const tiny_rom_entry *device_rom_region() const override; + uint8_t m_p1; uint8_t m_p1_data; uint8_t m_p2; diff --git a/src/devices/bus/pc_kbd/msnat.cpp b/src/devices/bus/pc_kbd/msnat.cpp index ece7f3b8527..4383081e034 100644 --- a/src/devices/bus/pc_kbd/msnat.cpp +++ b/src/devices/bus/pc_kbd/msnat.cpp @@ -208,16 +208,6 @@ static ADDRESS_MAP_START( microsoft_natural_io, AS_IO, 8, pc_kbd_microsoft_natur ADDRESS_MAP_END -/***************************************************************************** - MACHINE CONFIG -*****************************************************************************/ - -MACHINE_CONFIG_START( microsoft_natural ) - MCFG_CPU_ADD("ms_natrl_cpu", I8051, XTAL_6MHz) - MCFG_CPU_IO_MAP(microsoft_natural_io) -MACHINE_CONFIG_END - - /*************************************************************************** ROM DEFINITIONS ***************************************************************************/ @@ -264,14 +254,13 @@ void pc_kbd_microsoft_natural_device::device_reset() //------------------------------------------------- -// machine_config_additions - device-specific -// machine configurations +// device_add_mconfig - add device configuration //------------------------------------------------- -machine_config_constructor pc_kbd_microsoft_natural_device::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( microsoft_natural ); -} +MACHINE_CONFIG_MEMBER( pc_kbd_microsoft_natural_device::device_add_mconfig ) + MCFG_CPU_ADD("ms_natrl_cpu", I8051, XTAL_6MHz) + MCFG_CPU_IO_MAP(microsoft_natural_io) +MACHINE_CONFIG_END ioport_constructor pc_kbd_microsoft_natural_device::device_input_ports() const diff --git a/src/devices/bus/pc_kbd/msnat.h b/src/devices/bus/pc_kbd/msnat.h index 0b0f240b646..312ca3d0e41 100644 --- a/src/devices/bus/pc_kbd/msnat.h +++ b/src/devices/bus/pc_kbd/msnat.h @@ -24,11 +24,6 @@ public: // construction/destruction pc_kbd_microsoft_natural_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const override; - virtual ioport_constructor device_input_ports() const override; - virtual const tiny_rom_entry *device_rom_region() const override; - virtual DECLARE_WRITE_LINE_MEMBER(clock_write) override; virtual DECLARE_WRITE_LINE_MEMBER(data_write) override; @@ -44,6 +39,11 @@ protected: virtual void device_start() override; virtual void device_reset() override; + // optional information overrides + virtual void device_add_mconfig(machine_config &config) override; + virtual ioport_constructor device_input_ports() const override; + virtual const tiny_rom_entry *device_rom_region() const override; + required_device m_cpu; required_ioport_array<8> m_p2_r; diff --git a/src/devices/bus/pc_kbd/pc83.cpp b/src/devices/bus/pc_kbd/pc83.cpp index 651d0d8d042..60b8151b135 100644 --- a/src/devices/bus/pc_kbd/pc83.cpp +++ b/src/devices/bus/pc_kbd/pc83.cpp @@ -47,10 +47,10 @@ const tiny_rom_entry *ibm_pc_83_keyboard_device::device_rom_region() const //------------------------------------------------- -// MACHINE_DRIVER( ibm_pc_83_keyboard ) +// device_add_mconfig - add device configuration //------------------------------------------------- -static MACHINE_CONFIG_START( ibm_pc_83_keyboard ) +MACHINE_CONFIG_MEMBER( ibm_pc_83_keyboard_device::device_add_mconfig ) MCFG_CPU_ADD(I8048_TAG, I8048, MCS48_LC_CLOCK(IND_U(47), CAP_P(20))) MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(ibm_pc_83_keyboard_device, bus_w)) MCFG_MCS48_PORT_P1_IN_CB(READ8(ibm_pc_83_keyboard_device, p1_r)) @@ -59,17 +59,6 @@ static MACHINE_CONFIG_START( ibm_pc_83_keyboard ) MACHINE_CONFIG_END -//------------------------------------------------- -// machine_config_additions - device-specific -// machine configurations -//------------------------------------------------- - -machine_config_constructor ibm_pc_83_keyboard_device::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( ibm_pc_83_keyboard ); -} - - //------------------------------------------------- // INPUT_PORTS( ibm_pc_83_keyboard ) //------------------------------------------------- diff --git a/src/devices/bus/pc_kbd/pc83.h b/src/devices/bus/pc_kbd/pc83.h index a9718fc40de..dc33096c437 100644 --- a/src/devices/bus/pc_kbd/pc83.h +++ b/src/devices/bus/pc_kbd/pc83.h @@ -30,26 +30,26 @@ public: // construction/destruction ibm_pc_83_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - // optional information overrides - virtual const tiny_rom_entry *device_rom_region() const override; - virtual machine_config_constructor device_mconfig_additions() const override; - virtual ioport_constructor device_input_ports() const override; - - DECLARE_WRITE8_MEMBER( bus_w ); - DECLARE_READ8_MEMBER( p1_r ); - DECLARE_WRITE8_MEMBER( p2_w ); - DECLARE_READ_LINE_MEMBER( t0_r ); - protected: // device-level overrides virtual void device_start() override; virtual void device_reset() override; + // optional information overrides + virtual const tiny_rom_entry *device_rom_region() const override; + virtual void device_add_mconfig(machine_config &config) override; + virtual ioport_constructor device_input_ports() const override; + // device_pc_kbd_interface overrides virtual DECLARE_WRITE_LINE_MEMBER( clock_write ) override { }; virtual DECLARE_WRITE_LINE_MEMBER( data_write ) override { }; private: + DECLARE_WRITE8_MEMBER( bus_w ); + DECLARE_READ8_MEMBER( p1_r ); + DECLARE_WRITE8_MEMBER( p2_w ); + DECLARE_READ_LINE_MEMBER( t0_r ); + required_device m_maincpu; required_ioport_array<24> m_dr; diff --git a/src/devices/bus/pc_kbd/pcat84.cpp b/src/devices/bus/pc_kbd/pcat84.cpp index 13ae2571f81..d4d6c4e98de 100644 --- a/src/devices/bus/pc_kbd/pcat84.cpp +++ b/src/devices/bus/pc_kbd/pcat84.cpp @@ -100,10 +100,10 @@ const tiny_rom_entry *ibm_3270pc_122_keyboard_device::device_rom_region() const //------------------------------------------------- -// MACHINE_DRIVER( ibm_pc_at_84_keyboard ) +// device_add_mconfig - add device configuration //------------------------------------------------- -static MACHINE_CONFIG_START( ibm_pc_at_84_keyboard ) +MACHINE_CONFIG_MEMBER( ibm_pc_at_84_keyboard_device::device_add_mconfig ) MCFG_CPU_ADD(I8048_TAG, I8048, 5364000) MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(ibm_pc_at_84_keyboard_device, bus_w)) MCFG_MCS48_PORT_P1_IN_CB(READ8(ibm_pc_at_84_keyboard_device, p1_r)) @@ -115,17 +115,6 @@ static MACHINE_CONFIG_START( ibm_pc_at_84_keyboard ) MACHINE_CONFIG_END -//------------------------------------------------- -// machine_config_additions - device-specific -// machine configurations -//------------------------------------------------- - -machine_config_constructor ibm_pc_at_84_keyboard_device::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( ibm_pc_at_84_keyboard ); -} - - //------------------------------------------------- // INPUT_PORTS( ibm_pc_at_84_keyboard ) //------------------------------------------------- diff --git a/src/devices/bus/pc_kbd/pcat84.h b/src/devices/bus/pc_kbd/pcat84.h index e15d5624af1..8c4baed317b 100644 --- a/src/devices/bus/pc_kbd/pcat84.h +++ b/src/devices/bus/pc_kbd/pcat84.h @@ -30,19 +30,6 @@ public: // construction/destruction ibm_pc_at_84_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - // optional information overrides - virtual const tiny_rom_entry *device_rom_region() const override; - virtual machine_config_constructor device_mconfig_additions() const override; - virtual ioport_constructor device_input_ports() const override; - - DECLARE_WRITE8_MEMBER( bus_w ); - DECLARE_READ8_MEMBER( p1_r ); - DECLARE_WRITE8_MEMBER( p1_w ); - DECLARE_READ8_MEMBER( p2_r ); - DECLARE_WRITE8_MEMBER( p2_w ); - DECLARE_READ_LINE_MEMBER( t0_r ); - DECLARE_READ_LINE_MEMBER( t1_r ); - protected: ibm_pc_at_84_keyboard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -50,11 +37,24 @@ protected: virtual void device_start() override; virtual void device_reset() override; + // optional information overrides + virtual const tiny_rom_entry *device_rom_region() const override; + virtual void device_add_mconfig(machine_config &config) override; + virtual ioport_constructor device_input_ports() const override; + // device_pc_kbd_interface overrides virtual DECLARE_WRITE_LINE_MEMBER( clock_write ) override { m_maincpu->set_input_line(MCS48_INPUT_IRQ, state); }; virtual DECLARE_WRITE_LINE_MEMBER( data_write ) override { }; private: + DECLARE_WRITE8_MEMBER( bus_w ); + DECLARE_READ8_MEMBER( p1_r ); + DECLARE_WRITE8_MEMBER( p1_w ); + DECLARE_READ8_MEMBER( p2_r ); + DECLARE_WRITE8_MEMBER( p2_w ); + DECLARE_READ_LINE_MEMBER( t0_r ); + DECLARE_READ_LINE_MEMBER( t1_r ); + enum { LED_SCROLL, diff --git a/src/devices/bus/pc_kbd/pcxt83.cpp b/src/devices/bus/pc_kbd/pcxt83.cpp index 571f10ccb39..0255dfec141 100644 --- a/src/devices/bus/pc_kbd/pcxt83.cpp +++ b/src/devices/bus/pc_kbd/pcxt83.cpp @@ -69,10 +69,10 @@ const tiny_rom_entry *ibm_pc_xt_83_keyboard_device::device_rom_region() const //------------------------------------------------- -// MACHINE_DRIVER( ibm_pc_xt_83_keyboard ) +// device_add_mconfig - add device configuration //------------------------------------------------- -static MACHINE_CONFIG_START( ibm_pc_xt_83_keyboard ) +MACHINE_CONFIG_MEMBER( ibm_pc_xt_83_keyboard_device::device_add_mconfig ) MCFG_CPU_ADD(I8048_TAG, I8048, MCS48_LC_CLOCK(IND_U(47), CAP_P(20.7))) MCFG_MCS48_PORT_BUS_IN_CB(READ8(ibm_pc_xt_83_keyboard_device, bus_r)) MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(ibm_pc_xt_83_keyboard_device, bus_w)) @@ -83,17 +83,6 @@ static MACHINE_CONFIG_START( ibm_pc_xt_83_keyboard ) MACHINE_CONFIG_END -//------------------------------------------------- -// machine_config_additions - device-specific -// machine configurations -//------------------------------------------------- - -machine_config_constructor ibm_pc_xt_83_keyboard_device::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( ibm_pc_xt_83_keyboard ); -} - - //------------------------------------------------- // INPUT_PORTS( ibm_pc_xt_83_keyboard ) //------------------------------------------------- diff --git a/src/devices/bus/pc_kbd/pcxt83.h b/src/devices/bus/pc_kbd/pcxt83.h index 932d766106e..fd209d2e767 100644 --- a/src/devices/bus/pc_kbd/pcxt83.h +++ b/src/devices/bus/pc_kbd/pcxt83.h @@ -29,11 +29,21 @@ public: // construction/destruction ibm_pc_xt_83_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); +protected: + // device-level overrides + virtual void device_start() override; + virtual void device_reset() override; + // optional information overrides virtual const tiny_rom_entry *device_rom_region() const override; - virtual 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; + // device_pc_kbd_interface overrides + virtual DECLARE_WRITE_LINE_MEMBER( clock_write ) override; + virtual DECLARE_WRITE_LINE_MEMBER( data_write ) override; + +private: DECLARE_READ8_MEMBER( bus_r ); DECLARE_WRITE8_MEMBER( bus_w ); DECLARE_WRITE8_MEMBER( p1_w ); @@ -41,16 +51,6 @@ public: DECLARE_READ_LINE_MEMBER( t0_r ); DECLARE_READ_LINE_MEMBER( t1_r ); -protected: - // device-level overrides - virtual void device_start() override; - virtual void device_reset() override; - - // device_pc_kbd_interface overrides - virtual DECLARE_WRITE_LINE_MEMBER( clock_write ) override; - virtual DECLARE_WRITE_LINE_MEMBER( data_write ) override; - -private: required_device m_maincpu; required_ioport_array<12> m_md; diff --git a/src/devices/bus/pet/2joysnd.cpp b/src/devices/bus/pet/2joysnd.cpp index 90fee2c2694..62df82f5079 100644 --- a/src/devices/bus/pet/2joysnd.cpp +++ b/src/devices/bus/pet/2joysnd.cpp @@ -59,12 +59,6 @@ Connections DEFINE_DEVICE_TYPE(PET_USERPORT_JOYSTICK_AND_SOUND_DEVICE, pet_userport_joystick_and_sound_device, "2joysnd", "PET Dual Joysticks and Sound") -MACHINE_CONFIG_START( 2joysnd ) - MCFG_SPEAKER_STANDARD_MONO("speaker") - MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.99) - 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) -MACHINE_CONFIG_END //------------------------------------------------- // INPUT_PORTS( 2joysnd ) @@ -96,14 +90,15 @@ ioport_constructor pet_userport_joystick_and_sound_device::device_input_ports() } //------------------------------------------------- -// machine_config_additions - device-specific -// machine configurations +// device_add_mconfig - add device configuration //------------------------------------------------- -machine_config_constructor pet_userport_joystick_and_sound_device::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( 2joysnd ); -} +MACHINE_CONFIG_MEMBER( pet_userport_joystick_and_sound_device::device_add_mconfig ) + MCFG_SPEAKER_STANDARD_MONO("speaker") + MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.99) + 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) +MACHINE_CONFIG_END //************************************************************************** // LIVE DEVICE diff --git a/src/devices/bus/pet/2joysnd.h b/src/devices/bus/pet/2joysnd.h index 0f4d5a6e2f1..8dcff3d06a4 100644 --- a/src/devices/bus/pet/2joysnd.h +++ b/src/devices/bus/pet/2joysnd.h @@ -28,11 +28,6 @@ public: // construction/destruction pet_userport_joystick_and_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - // optional information overrides - virtual ioport_constructor device_input_ports() const override; - - virtual machine_config_constructor device_mconfig_additions() const override; - virtual DECLARE_WRITE_LINE_MEMBER( input_m ) override; // device_pet_user_port_interface overrides @@ -47,6 +42,10 @@ protected: // device-level overrides virtual void device_start() override; + // optional information overrides + virtual ioport_constructor device_input_ports() const override; + virtual void device_add_mconfig(machine_config &config) override; + void update_port1(); void update_port2(); diff --git a/src/devices/bus/pet/c2n.cpp b/src/devices/bus/pet/c2n.cpp index 4085a0ada88..990d17d0c9c 100644 --- a/src/devices/bus/pet/c2n.cpp +++ b/src/devices/bus/pet/c2n.cpp @@ -21,10 +21,10 @@ DEFINE_DEVICE_TYPE(C1531, c1531_device, "c1531", "Commodore 1531 Datassette") //------------------------------------------------- -// MACHINE_CONFIG( c2n ) +// device_add_mconfig - add device configuration //------------------------------------------------- -static MACHINE_CONFIG_START( c2n ) +MACHINE_CONFIG_MEMBER( c2n_device::device_add_mconfig ) MCFG_CASSETTE_ADD("cassette" ) MCFG_CASSETTE_FORMATS(cbm_cassette_formats) MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_MUTED) @@ -32,17 +32,6 @@ static MACHINE_CONFIG_START( c2n ) MACHINE_CONFIG_END -//------------------------------------------------- -// machine_config_additions - device-specific -// machine configurations -//------------------------------------------------- - -machine_config_constructor c2n_device::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( c2n ); -} - - //************************************************************************** // LIVE DEVICE diff --git a/src/devices/bus/pet/c2n.h b/src/devices/bus/pet/c2n.h index 9ba47475815..6430d1b01a0 100644 --- a/src/devices/bus/pet/c2n.h +++ b/src/devices/bus/pet/c2n.h @@ -30,9 +30,6 @@ public: // construction/destruction c2n_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const override; - protected: c2n_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -40,6 +37,9 @@ protected: virtual void device_start() override; virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + // optional information overrides + virtual void device_add_mconfig(machine_config &config) override; + // device_pet_datassette_port_interface overrides virtual int datassette_read() override; virtual void datassette_write(int state) override; diff --git a/src/devices/bus/pet/cb2snd.cpp b/src/devices/bus/pet/cb2snd.cpp index cf6ff2101f0..8a4fbe3ef76 100644 --- a/src/devices/bus/pet/cb2snd.cpp +++ b/src/devices/bus/pet/cb2snd.cpp @@ -21,23 +21,18 @@ DEFINE_DEVICE_TYPE(PET_USERPORT_CB2_SOUND_DEVICE, pet_userport_cb2_sound_device, "petucb2", "PET Userport 'CB2 Sound' Device") -MACHINE_CONFIG_START( cb2snd ) + +//------------------------------------------------- +// device_add_mconfig - add device configuration +//------------------------------------------------- + +MACHINE_CONFIG_MEMBER( pet_userport_cb2_sound_device::device_add_mconfig ) MCFG_SPEAKER_STANDARD_MONO("speaker") MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.99) 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) MACHINE_CONFIG_END -//------------------------------------------------- -// machine_config_additions - device-specific -// machine configurations -//------------------------------------------------- - -machine_config_constructor pet_userport_cb2_sound_device::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( cb2snd ); -} - //************************************************************************** // LIVE DEVICE //************************************************************************** diff --git a/src/devices/bus/pet/cb2snd.h b/src/devices/bus/pet/cb2snd.h index 86c48422421..cd39cc5bbb8 100644 --- a/src/devices/bus/pet/cb2snd.h +++ b/src/devices/bus/pet/cb2snd.h @@ -25,14 +25,14 @@ public: // construction/destruction pet_userport_cb2_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual machine_config_constructor device_mconfig_additions() const override; - virtual DECLARE_WRITE_LINE_MEMBER( input_m ) override; protected: // device-level overrides virtual void device_start() override; + virtual void device_add_mconfig(machine_config &config) override; + required_device m_dac; }; diff --git a/src/devices/bus/pet/hsg.cpp b/src/devices/bus/pet/hsg.cpp index 96ca651972e..c77246dc65b 100644 --- a/src/devices/bus/pet/hsg.cpp +++ b/src/devices/bus/pet/hsg.cpp @@ -86,10 +86,10 @@ ADDRESS_MAP_END //------------------------------------------------- -// MACHINE_CONFIG_START( cbm8000_hsg_a ) +// device_add_mconfig - add device configuration //------------------------------------------------- -static MACHINE_CONFIG_START( cbm8000_hsg_a ) +MACHINE_CONFIG_MEMBER( cbm8000_hsg_a_device::device_add_mconfig ) MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green()) MCFG_SCREEN_UPDATE_DEVICE(EF9365_TAG, ef9365_device, screen_update) MCFG_SCREEN_SIZE(512, 512) @@ -105,12 +105,7 @@ static MACHINE_CONFIG_START( cbm8000_hsg_a ) MCFG_EF936X_DISPLAYMODE(DISPLAY_MODE_512x512); MACHINE_CONFIG_END - -//------------------------------------------------- -// MACHINE_CONFIG_START( cbm8000_hsg_b ) -//------------------------------------------------- - -static MACHINE_CONFIG_START( cbm8000_hsg_b ) +MACHINE_CONFIG_MEMBER( cbm8000_hsg_b_device::device_add_mconfig ) MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green()) MCFG_SCREEN_UPDATE_DEVICE(EF9366_TAG, ef9365_device, screen_update) MCFG_SCREEN_SIZE(512, 256) @@ -127,22 +122,6 @@ static MACHINE_CONFIG_START( cbm8000_hsg_b ) MACHINE_CONFIG_END -//------------------------------------------------- -// machine_config_additions - device-specific -// machine configurations -//------------------------------------------------- - -machine_config_constructor cbm8000_hsg_a_device::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( cbm8000_hsg_a ); -} - -machine_config_constructor cbm8000_hsg_b_device::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( cbm8000_hsg_b ); -} - - //************************************************************************** // LIVE DEVICE diff --git a/src/devices/bus/pet/hsg.h b/src/devices/bus/pet/hsg.h index 0582f48d53f..a58aadca827 100644 --- a/src/devices/bus/pet/hsg.h +++ b/src/devices/bus/pet/hsg.h @@ -56,8 +56,9 @@ public: // construction/destruction cbm8000_hsg_a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); +protected: // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_add_mconfig(machine_config &config) override; }; @@ -69,8 +70,9 @@ public: // construction/destruction cbm8000_hsg_b_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); +protected: // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_add_mconfig(machine_config &config) override; }; diff --git a/src/devices/bus/pet/superpet.cpp b/src/devices/bus/pet/superpet.cpp index f2ed22faefc..e03d2081103 100644 --- a/src/devices/bus/pet/superpet.cpp +++ b/src/devices/bus/pet/superpet.cpp @@ -66,10 +66,10 @@ ADDRESS_MAP_END //------------------------------------------------- -// MACHINE_CONFIG_START( superpet ) +// device_add_mconfig - add device configuration //------------------------------------------------- -static MACHINE_CONFIG_START( superpet ) +MACHINE_CONFIG_MEMBER( superpet_device::device_add_mconfig ) MCFG_CPU_ADD(M6809_TAG, M6809, XTAL_16MHz/16) MCFG_CPU_PROGRAM_MAP(superpet_mem) @@ -88,17 +88,6 @@ static MACHINE_CONFIG_START( superpet ) MACHINE_CONFIG_END -//------------------------------------------------- -// machine_config_additions - device-specific -// machine configurations -//------------------------------------------------- - -machine_config_constructor superpet_device::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( superpet ); -} - - //------------------------------------------------- // INPUT_PORTS( superpet ) //------------------------------------------------- diff --git a/src/devices/bus/pet/superpet.h b/src/devices/bus/pet/superpet.h index bf0d4d79a59..ae113d5025a 100644 --- a/src/devices/bus/pet/superpet.h +++ b/src/devices/bus/pet/superpet.h @@ -30,20 +30,19 @@ public: // construction/destruction superpet_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - // optional information overrides - virtual const tiny_rom_entry *device_rom_region() const override; - virtual machine_config_constructor device_mconfig_additions() const override; - virtual ioport_constructor device_input_ports() const override; - DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); - DECLARE_WRITE_LINE_MEMBER( acia_irq_w ); protected: // device-level overrides virtual void device_start() override; virtual void device_reset() override; + // optional information overrides + virtual const tiny_rom_entry *device_rom_region() const override; + virtual void device_add_mconfig(machine_config &config) override; + virtual ioport_constructor device_input_ports() const override; + // device_pet_expansion_card_interface overrides virtual int pet_norom_r(address_space &space, offs_t offset, int sel) override; virtual uint8_t pet_bd_r(address_space &space, offs_t offset, uint8_t data, int &sel) override; @@ -52,6 +51,8 @@ protected: virtual void pet_irq_w(int state) override; private: + DECLARE_WRITE_LINE_MEMBER( acia_irq_w ); + required_device m_maincpu; required_device m_acia; required_device m_dongle; diff --git a/src/devices/bus/plus4/c1551.cpp b/src/devices/bus/plus4/c1551.cpp index c15932c30b2..5bc0e6b3d2c 100644 --- a/src/devices/bus/plus4/c1551.cpp +++ b/src/devices/bus/plus4/c1551.cpp @@ -340,10 +340,10 @@ FLOPPY_FORMATS_END //------------------------------------------------- -// MACHINE_DRIVER( c1551 ) +// device_add_mconfig - add device configuration //------------------------------------------------- -static MACHINE_CONFIG_START( c1551 ) +MACHINE_CONFIG_MEMBER( c1551_device::device_add_mconfig ) MCFG_CPU_ADD(M6510T_TAG, M6510T, XTAL_16MHz/8) MCFG_CPU_PROGRAM_MAP(c1551_mem) MCFG_M6510T_PORT_CALLBACKS(READ8(c1551_device, port_r), WRITE8(c1551_device, port_w)) @@ -372,17 +372,6 @@ static MACHINE_CONFIG_START( c1551 ) MACHINE_CONFIG_END -//------------------------------------------------- -// machine_config_additions - device-specific -// machine configurations -//------------------------------------------------- - -machine_config_constructor c1551_device::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( c1551 ); -} - - //------------------------------------------------- // INPUT_PORTS( c1551 ) //------------------------------------------------- diff --git a/src/devices/bus/plus4/c1551.h b/src/devices/bus/plus4/c1551.h index ae749c0e056..ddd09efe8cb 100644 --- a/src/devices/bus/plus4/c1551.h +++ b/src/devices/bus/plus4/c1551.h @@ -31,18 +31,30 @@ public: // construction/destruction c1551_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + DECLARE_READ8_MEMBER( tpi0_r ); + DECLARE_WRITE8_MEMBER( tpi0_w ); + +protected: + // device-level overrides + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + // optional information overrides virtual const tiny_rom_entry *device_rom_region() const override; - virtual 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; + // device_plus4_expansion_card_interface overrides + virtual uint8_t plus4_cd_r(address_space &space, offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h) override; + virtual void plus4_cd_w(address_space &space, offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h) override; + +private: DECLARE_READ8_MEMBER( port_r ); DECLARE_WRITE8_MEMBER( port_w ); DECLARE_READ8_MEMBER( tcbm_data_r ); DECLARE_WRITE8_MEMBER( tcbm_data_w ); - DECLARE_READ8_MEMBER( tpi0_r ); - DECLARE_WRITE8_MEMBER( tpi0_w ); DECLARE_READ8_MEMBER( tpi0_pc_r ); DECLARE_WRITE8_MEMBER( tpi0_pc_w ); @@ -52,17 +64,6 @@ public: DECLARE_FLOPPY_FORMATS( floppy_formats ); -protected: - // device-level overrides - virtual void device_start() override; - virtual void device_reset() override; - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; - - // device_plus4_expansion_card_interface overrides - virtual uint8_t plus4_cd_r(address_space &space, offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h) override; - virtual void plus4_cd_w(address_space &space, offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h) override; - -private: enum { LED_POWER = 0, diff --git a/src/devices/bus/plus4/sid.cpp b/src/devices/bus/plus4/sid.cpp index 4372c6ca710..a75b889ffcf 100644 --- a/src/devices/bus/plus4/sid.cpp +++ b/src/devices/bus/plus4/sid.cpp @@ -61,10 +61,10 @@ const tiny_rom_entry *plus4_sid_cartridge_device::device_rom_region() const //------------------------------------------------- -// MACHINE_CONFIG_START( plus4_sid ) +// device_add_mconfig - add device configuration //------------------------------------------------- -static MACHINE_CONFIG_START( plus4_sid ) +MACHINE_CONFIG_MEMBER( plus4_sid_cartridge_device::device_add_mconfig ) MCFG_SPEAKER_STANDARD_MONO("speaker") MCFG_SOUND_ADD(MOS8580_TAG, MOS8580, XTAL_17_73447MHz/20) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) @@ -73,17 +73,6 @@ static MACHINE_CONFIG_START( plus4_sid ) MACHINE_CONFIG_END -//------------------------------------------------- -// machine_config_additions - device-specific -// machine configurations -//------------------------------------------------- - -machine_config_constructor plus4_sid_cartridge_device::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( plus4_sid ); -} - - //************************************************************************** // LIVE DEVICE diff --git a/src/devices/bus/plus4/sid.h b/src/devices/bus/plus4/sid.h index 9136e0abc5b..90a22fa15c8 100644 --- a/src/devices/bus/plus4/sid.h +++ b/src/devices/bus/plus4/sid.h @@ -30,15 +30,15 @@ public: // construction/destruction plus4_sid_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - // optional information overrides - virtual const tiny_rom_entry *device_rom_region() const override; - virtual machine_config_constructor device_mconfig_additions() const override; - protected: // device-level overrides virtual void device_start() override; virtual void device_reset() override; + // optional information overrides + virtual const tiny_rom_entry *device_rom_region() const override; + virtual void device_add_mconfig(machine_config &config) override; + // device_plus4_expansion_card_interface overrides virtual uint8_t plus4_cd_r(address_space &space, offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h) override; virtual void plus4_cd_w(address_space &space, offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h) override; diff --git a/src/devices/bus/pofo/hpc101.cpp b/src/devices/bus/pofo/hpc101.cpp index 92eb5e1bdb7..8334f99b2d2 100644 --- a/src/devices/bus/pofo/hpc101.cpp +++ b/src/devices/bus/pofo/hpc101.cpp @@ -30,10 +30,10 @@ DEFINE_DEVICE_TYPE(POFO_HPC101, pofo_hpc101_device, "pofo_hpc101", "Atari Portfo //------------------------------------------------- -// MACHINE_CONFIG_START( hpc101 ) +// device_add_mconfig - add device configuration //------------------------------------------------- -static MACHINE_CONFIG_START( hpc101 ) +MACHINE_CONFIG_MEMBER( pofo_hpc101_device::device_add_mconfig ) MCFG_DEVICE_ADD(M82C55A_TAG, I8255A, 0) MCFG_I8255_OUT_PORTA_CB(DEVWRITE8("cent_data_out", output_latch_device, write)) MCFG_I8255_OUT_PORTB_CB(DEVWRITE8("cent_ctrl_out", output_latch_device, write)) @@ -57,17 +57,6 @@ static MACHINE_CONFIG_START( hpc101 ) MACHINE_CONFIG_END -//------------------------------------------------- -// machine_config_additions - device-specific -// machine configurations -//------------------------------------------------- - -machine_config_constructor pofo_hpc101_device::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( hpc101 ); -} - - //************************************************************************** // LIVE DEVICE //************************************************************************** diff --git a/src/devices/bus/pofo/hpc101.h b/src/devices/bus/pofo/hpc101.h index f5cc803b5bb..797f95c32d3 100644 --- a/src/devices/bus/pofo/hpc101.h +++ b/src/devices/bus/pofo/hpc101.h @@ -29,14 +29,14 @@ public: // construction/destruction pofo_hpc101_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const override; - protected: // device-level overrides virtual void device_start() override; virtual void device_reset() override; + // optional information overrides + virtual void device_add_mconfig(machine_config &config) override; + // device_portfolio_expansion_slot_interface overrides bool pdet() override { return 1; } diff --git a/src/devices/bus/pofo/hpc102.cpp b/src/devices/bus/pofo/hpc102.cpp index 91103772ebd..ff25d47d7a9 100644 --- a/src/devices/bus/pofo/hpc102.cpp +++ b/src/devices/bus/pofo/hpc102.cpp @@ -30,10 +30,10 @@ DEFINE_DEVICE_TYPE(POFO_HPC102, pofo_hpc102_device, "pofo_hpc102", "Atari Portfo //------------------------------------------------- -// MACHINE_CONFIG_START( hpc102 ) +// device_add_mconfig - add device configuration //------------------------------------------------- -static MACHINE_CONFIG_START( hpc102 ) +MACHINE_CONFIG_MEMBER( pofo_hpc102_device::device_add_mconfig ) MCFG_DEVICE_ADD(M82C50A_TAG, INS8250, XTAL_1_8432MHz) // should be INS8250A MCFG_INS8250_OUT_TX_CB(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd)) MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE(RS232_TAG, rs232_port_device, write_dtr)) @@ -49,17 +49,6 @@ static MACHINE_CONFIG_START( hpc102 ) MACHINE_CONFIG_END -//------------------------------------------------- -// machine_config_additions - device-specific -// machine configurations -//------------------------------------------------- - -machine_config_constructor pofo_hpc102_device::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( hpc102 ); -} - - //************************************************************************** // LIVE DEVICE //************************************************************************** diff --git a/src/devices/bus/pofo/hpc102.h b/src/devices/bus/pofo/hpc102.h index e0ba50074e4..bfe91e9f459 100644 --- a/src/devices/bus/pofo/hpc102.h +++ b/src/devices/bus/pofo/hpc102.h @@ -29,14 +29,14 @@ public: // construction/destruction pofo_hpc102_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const override; - protected: // device-level overrides virtual void device_start() override; virtual void device_reset() override; + // optional information overrides + virtual void device_add_mconfig(machine_config &config) override; + // device_portfolio_expansion_slot_interface overrides bool pdet() override { return 1; } diff --git a/src/devices/bus/pofo/hpc104.cpp b/src/devices/bus/pofo/hpc104.cpp index dd8a3164d07..0f4db13da9c 100644 --- a/src/devices/bus/pofo/hpc104.cpp +++ b/src/devices/bus/pofo/hpc104.cpp @@ -28,10 +28,10 @@ DEFINE_DEVICE_TYPE(POFO_HPC104_2, pofo_hpc104_2_device, "pofo_hpc104_2", "Atari //------------------------------------------------- -// MACHINE_CONFIG_START( hpc104 ) +// device_add_mconfig - add device configuration //------------------------------------------------- -static MACHINE_CONFIG_START( hpc104 ) +MACHINE_CONFIG_MEMBER( pofo_hpc104_device::device_add_mconfig ) MCFG_PORTFOLIO_MEMORY_CARD_SLOT_ADD(PORTFOLIO_MEMORY_CARD_SLOT_B_TAG, portfolio_memory_cards, nullptr) MCFG_PORTFOLIO_EXPANSION_SLOT_ADD(PORTFOLIO_EXPANSION_SLOT_TAG, XTAL_4_9152MHz, portfolio_expansion_cards, nullptr) @@ -41,17 +41,6 @@ static MACHINE_CONFIG_START( hpc104 ) MACHINE_CONFIG_END -//------------------------------------------------- -// machine_config_additions - device-specific -// machine configurations -//------------------------------------------------- - -machine_config_constructor pofo_hpc104_device::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( hpc104 ); -} - - //------------------------------------------------- // INPUT_PORTS( hpc104 ) //------------------------------------------------- diff --git a/src/devices/bus/pofo/hpc104.h b/src/devices/bus/pofo/hpc104.h index 50350490785..f863a45f39b 100644 --- a/src/devices/bus/pofo/hpc104.h +++ b/src/devices/bus/pofo/hpc104.h @@ -31,10 +31,6 @@ public: // construction/destruction pofo_hpc104_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const override; - virtual ioport_constructor device_input_ports() const override; - protected: pofo_hpc104_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -42,6 +38,10 @@ protected: virtual void device_start() override; virtual void device_reset() override; + // optional information overrides + virtual void device_add_mconfig(machine_config &config) override; + virtual ioport_constructor device_input_ports() const override; + // device_nvram_interface overrides virtual void nvram_default() override { } virtual void nvram_read(emu_file &file) override { if (m_nvram != nullptr) { file.read(m_nvram, m_nvram.bytes()); } } diff --git a/src/devices/bus/psx/ctlrport.cpp b/src/devices/bus/psx/ctlrport.cpp index 5876e631f1d..f41debd632c 100644 --- a/src/devices/bus/psx/ctlrport.cpp +++ b/src/devices/bus/psx/ctlrport.cpp @@ -25,15 +25,10 @@ void psx_controller_port_device::device_config_complete() m_dev = dynamic_cast(get_card_device()); } -static MACHINE_CONFIG_START( psx_memory_card ) +MACHINE_CONFIG_MEMBER( psx_controller_port_device::device_add_mconfig ) MCFG_PSXCARD_ADD("card") MACHINE_CONFIG_END -machine_config_constructor psx_controller_port_device::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( psx_memory_card ); -} - void psx_controller_port_device::disable_card(bool state) { if(state) diff --git a/src/devices/bus/psx/ctlrport.h b/src/devices/bus/psx/ctlrport.h index 04afc2e2e85..531c32a27dc 100644 --- a/src/devices/bus/psx/ctlrport.h +++ b/src/devices/bus/psx/ctlrport.h @@ -117,7 +117,6 @@ class psx_controller_port_device : public device_t, { public: psx_controller_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual machine_config_constructor device_mconfig_additions() const override; typedef delegate void_cb; void ack() { if(!ack_cb.isnull()) ack_cb(); } @@ -138,6 +137,8 @@ protected: virtual void device_reset() override { m_tx = true; } virtual void device_config_complete() override; + virtual void device_add_mconfig(machine_config &config) override; + private: void_cb ack_cb; bool m_tx; diff --git a/src/devices/bus/psx/multitap.cpp b/src/devices/bus/psx/multitap.cpp index 4c1907e4700..1a432b646a6 100644 --- a/src/devices/bus/psx/multitap.cpp +++ b/src/devices/bus/psx/multitap.cpp @@ -21,18 +21,13 @@ psx_multitap_device::psx_multitap_device(const machine_config& mconfig, const ch { } -static MACHINE_CONFIG_START( psx_multitap ) +MACHINE_CONFIG_MEMBER( psx_multitap_device::device_add_mconfig ) MCFG_PSX_CTRL_PORT_ADD("a", psx_controllers_nomulti, "digital_pad") MCFG_PSX_CTRL_PORT_ADD("b", psx_controllers_nomulti, nullptr) MCFG_PSX_CTRL_PORT_ADD("c", psx_controllers_nomulti, nullptr) MCFG_PSX_CTRL_PORT_ADD("d", psx_controllers_nomulti, nullptr) MACHINE_CONFIG_END -machine_config_constructor psx_multitap_device::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( psx_multitap ); -} - void psx_multitap_device::device_start() { m_porta->setup_ack_cb(psx_controller_port_device::void_cb(&psx_multitap_device::ack, this)); diff --git a/src/devices/bus/psx/multitap.h b/src/devices/bus/psx/multitap.h index 9c03d803181..bc020b339d5 100644 --- a/src/devices/bus/psx/multitap.h +++ b/src/devices/bus/psx/multitap.h @@ -12,7 +12,6 @@ class psx_multitap_device : public device_t, { public: psx_multitap_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual machine_config_constructor device_mconfig_additions() const override; protected: virtual void device_start() override; @@ -20,6 +19,8 @@ protected: virtual void device_reset() override { device_psx_controller_interface::m_owner->disable_card(true); } virtual void interface_pre_reset() override; + virtual void device_add_mconfig(machine_config &config) override; + private: virtual bool get_pad(int count, uint8_t *odata, uint8_t idata) override; virtual void do_pad() override; diff --git a/src/devices/bus/ql/cst_q_plus4.cpp b/src/devices/bus/ql/cst_q_plus4.cpp index 4de5675ba59..88fb8fdf3c7 100644 --- a/src/devices/bus/ql/cst_q_plus4.cpp +++ b/src/devices/bus/ql/cst_q_plus4.cpp @@ -47,10 +47,10 @@ const tiny_rom_entry *cst_q_plus4_device::device_rom_region() const //------------------------------------------------- -// MACHINE_CONFIG_START( cst_q_plus4 ) +// device_add_mconfig - add device configuration //------------------------------------------------- -static MACHINE_CONFIG_START( cst_q_plus4 ) +MACHINE_CONFIG_MEMBER( cst_q_plus4_device::device_add_mconfig ) MCFG_DEVICE_ADD(MC6821_TAG, PIA6821, 0) MCFG_QL_EXPANSION_SLOT_ADD("exp1", ql_expansion_cards, nullptr) @@ -67,17 +67,6 @@ static MACHINE_CONFIG_START( cst_q_plus4 ) MACHINE_CONFIG_END -//------------------------------------------------- -// machine_config_additions - device-specific -// machine configurations -//------------------------------------------------- - -machine_config_constructor cst_q_plus4_device::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( cst_q_plus4 ); -} - - //************************************************************************** // LIVE DEVICE diff --git a/src/devices/bus/ql/cst_q_plus4.h b/src/devices/bus/ql/cst_q_plus4.h index a9e5261bce7..0eff45e3840 100644 --- a/src/devices/bus/ql/cst_q_plus4.h +++ b/src/devices/bus/ql/cst_q_plus4.h @@ -28,24 +28,24 @@ public: // construction/destruction cst_q_plus4_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - // optional information overrides - virtual const tiny_rom_entry *device_rom_region() const override; - virtual machine_config_constructor device_mconfig_additions() const override; - - DECLARE_WRITE_LINE_MEMBER( exp1_extintl_w ) { m_exp1_extinl = state; update_extintl(); } - DECLARE_WRITE_LINE_MEMBER( exp2_extintl_w ) { m_exp2_extinl = state; update_extintl(); } - DECLARE_WRITE_LINE_MEMBER( exp3_extintl_w ) { m_exp3_extinl = state; update_extintl(); } - DECLARE_WRITE_LINE_MEMBER( exp4_extintl_w ) { m_exp4_extinl = state; update_extintl(); } - protected: // device-level overrides virtual void device_start() override; + // optional information overrides + virtual const tiny_rom_entry *device_rom_region() const override; + virtual void device_add_mconfig(machine_config &config) override; + // device_ql_expansion_card_interface overrides virtual uint8_t read(address_space &space, offs_t offset, uint8_t data) override; virtual void write(address_space &space, offs_t offset, uint8_t data) override; private: + DECLARE_WRITE_LINE_MEMBER( exp1_extintl_w ) { m_exp1_extinl = state; update_extintl(); } + DECLARE_WRITE_LINE_MEMBER( exp2_extintl_w ) { m_exp2_extinl = state; update_extintl(); } + DECLARE_WRITE_LINE_MEMBER( exp3_extintl_w ) { m_exp3_extinl = state; update_extintl(); } + DECLARE_WRITE_LINE_MEMBER( exp4_extintl_w ) { m_exp4_extinl = state; update_extintl(); } + void update_extintl() { m_slot->extintl_w(m_exp1_extinl || m_exp2_extinl || m_exp3_extinl || m_exp4_extinl); } required_device m_exp1; diff --git a/src/devices/bus/ql/qubide.cpp b/src/devices/bus/ql/qubide.cpp index cf0b7d37f8e..1459063f251 100644 --- a/src/devices/bus/ql/qubide.cpp +++ b/src/devices/bus/ql/qubide.cpp @@ -89,24 +89,14 @@ const tiny_rom_entry *qubide_device::device_rom_region() const //------------------------------------------------- -// MACHINE_CONFIG_START( qubide ) +// device_add_mconfig - add device configuration //------------------------------------------------- -static MACHINE_CONFIG_START( qubide ) +MACHINE_CONFIG_MEMBER( qubide_device::device_add_mconfig ) MCFG_ATA_INTERFACE_ADD("ata", ata_devices, "hdd", nullptr, false) MACHINE_CONFIG_END -//------------------------------------------------- -// machine_config_additions - device-specific -// machine configurations -//------------------------------------------------- - -machine_config_constructor qubide_device::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( qubide ); -} - //------------------------------------------------- // INPUT_PORTS( qubide ) diff --git a/src/devices/bus/ql/qubide.h b/src/devices/bus/ql/qubide.h index 2dd652d58a9..680e5e6b655 100644 --- a/src/devices/bus/ql/qubide.h +++ b/src/devices/bus/ql/qubide.h @@ -28,16 +28,16 @@ public: // construction/destruction qubide_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - // optional information overrides - virtual const tiny_rom_entry *device_rom_region() const override; - virtual machine_config_constructor device_mconfig_additions() const override; - virtual ioport_constructor device_input_ports() const override; - protected: // device-level overrides virtual void device_start() override; virtual void device_reset() override; + // optional information overrides + virtual const tiny_rom_entry *device_rom_region() const override; + virtual void device_add_mconfig(machine_config &config) override; + virtual ioport_constructor device_input_ports() const override; + // device_ql_expansion_card_interface overrides virtual uint8_t read(address_space &space, offs_t offset, uint8_t data) override; virtual void write(address_space &space, offs_t offset, uint8_t data) override; diff --git a/src/devices/bus/ql/sandy_superdisk.cpp b/src/devices/bus/ql/sandy_superdisk.cpp index 93ae5b23b8f..3c365d16619 100644 --- a/src/devices/bus/ql/sandy_superdisk.cpp +++ b/src/devices/bus/ql/sandy_superdisk.cpp @@ -78,10 +78,10 @@ WRITE_LINE_MEMBER( sandy_super_disk_device::busy_w ) //------------------------------------------------- -// MACHINE_CONFIG_START( sandy_super_disk ) +// device_add_mconfig - add device configuration //------------------------------------------------- -static MACHINE_CONFIG_START( sandy_super_disk ) +MACHINE_CONFIG_MEMBER( sandy_super_disk_device::device_add_mconfig ) MCFG_DEVICE_ADD(WD1772_TAG, WD1772, 8000000) MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG":0", sandy_super_disk_floppies, "35dd", sandy_super_disk_device::floppy_formats) MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG":1", sandy_super_disk_floppies, nullptr, sandy_super_disk_device::floppy_formats) @@ -92,17 +92,6 @@ static MACHINE_CONFIG_START( sandy_super_disk ) MACHINE_CONFIG_END -//------------------------------------------------- -// machine_config_additions - device-specific -// machine configurations -//------------------------------------------------- - -machine_config_constructor sandy_super_disk_device::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( sandy_super_disk ); -} - - //************************************************************************** // LIVE DEVICE diff --git a/src/devices/bus/ql/sandy_superdisk.h b/src/devices/bus/ql/sandy_superdisk.h index 1de35cba958..24d93ddf367 100644 --- a/src/devices/bus/ql/sandy_superdisk.h +++ b/src/devices/bus/ql/sandy_superdisk.h @@ -30,24 +30,24 @@ public: // construction/destruction sandy_super_disk_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - // optional information overrides - virtual const tiny_rom_entry *device_rom_region() const override; - virtual machine_config_constructor device_mconfig_additions() const override; - - WRITE_LINE_MEMBER( busy_w ); - - DECLARE_FLOPPY_FORMATS( floppy_formats ); - protected: // device-level overrides virtual void device_start() override; virtual void device_reset() override; + // optional information overrides + virtual const tiny_rom_entry *device_rom_region() const override; + virtual void device_add_mconfig(machine_config &config) override; + // device_ql_expansion_card_interface overrides virtual uint8_t read(address_space &space, offs_t offset, uint8_t data) override; virtual void write(address_space &space, offs_t offset, uint8_t data) override; private: + WRITE_LINE_MEMBER( busy_w ); + + DECLARE_FLOPPY_FORMATS( floppy_formats ); + void check_interrupt(); required_device m_fdc; diff --git a/src/devices/bus/ql/sandy_superqboard.cpp b/src/devices/bus/ql/sandy_superqboard.cpp index 22b88950df7..09d8677dc06 100644 --- a/src/devices/bus/ql/sandy_superqboard.cpp +++ b/src/devices/bus/ql/sandy_superqboard.cpp @@ -99,10 +99,10 @@ WRITE_LINE_MEMBER( sandy_superqboard_device::busy_w ) //------------------------------------------------- -// MACHINE_CONFIG_START( sandy_superqboard ) +// device_add_mconfig - add device configuration //------------------------------------------------- -static MACHINE_CONFIG_START( sandy_superqboard ) +MACHINE_CONFIG_MEMBER( sandy_superqboard_device::device_add_mconfig ) MCFG_DEVICE_ADD(WD1772_TAG, WD1772, XTAL_16MHz/2) MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG":0", sandy_superqboard_floppies, "35hd", sandy_superqboard_device::floppy_formats) MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG":1", sandy_superqboard_floppies, nullptr, sandy_superqboard_device::floppy_formats) @@ -113,17 +113,6 @@ static MACHINE_CONFIG_START( sandy_superqboard ) MACHINE_CONFIG_END -//------------------------------------------------- -// machine_config_additions - device-specific -// machine configurations -//------------------------------------------------- - -machine_config_constructor sandy_superqboard_device::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( sandy_superqboard ); -} - - //------------------------------------------------- // INPUT_CHANGED_MEMBER( mouse_x_changed ) //------------------------------------------------- diff --git a/src/devices/bus/ql/sandy_superqboard.h b/src/devices/bus/ql/sandy_superqboard.h index 7c18f96421d..c86241a4edb 100644 --- a/src/devices/bus/ql/sandy_superqboard.h +++ b/src/devices/bus/ql/sandy_superqboard.h @@ -30,14 +30,6 @@ public: // construction/destruction sandy_superqboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - // optional information overrides - virtual const tiny_rom_entry *device_rom_region() const override; - virtual machine_config_constructor device_mconfig_additions() const override; - - WRITE_LINE_MEMBER( busy_w ); - - DECLARE_FLOPPY_FORMATS( floppy_formats ); - DECLARE_INPUT_CHANGED_MEMBER( mouse_x_changed ); DECLARE_INPUT_CHANGED_MEMBER( mouse_y_changed ); @@ -48,11 +40,19 @@ protected: virtual void device_start() override; virtual void device_reset() override; + // optional information overrides + virtual const tiny_rom_entry *device_rom_region() const override; + virtual void device_add_mconfig(machine_config &config) override; + // device_ql_expansion_card_interface overrides virtual uint8_t read(address_space &space, offs_t offset, uint8_t data) override; virtual void write(address_space &space, offs_t offset, uint8_t data) override; private: + WRITE_LINE_MEMBER( busy_w ); + + DECLARE_FLOPPY_FORMATS( floppy_formats ); + enum { ST_BUSY = 0x01, diff --git a/src/devices/bus/ql/trumpcard.cpp b/src/devices/bus/ql/trumpcard.cpp index f56183e87d3..f91842e1d61 100644 --- a/src/devices/bus/ql/trumpcard.cpp +++ b/src/devices/bus/ql/trumpcard.cpp @@ -82,28 +82,16 @@ FLOPPY_FORMATS_END //------------------------------------------------- -// MACHINE_CONFIG_START( ql_trump_card ) +// device_add_mconfig - add device configuration //------------------------------------------------- -static MACHINE_CONFIG_START( ql_trump_card ) +MACHINE_CONFIG_MEMBER( ql_trump_card_device::device_add_mconfig ) MCFG_DEVICE_ADD(WD1772_TAG, WD1772, 8000000) MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG":0", ql_trump_card_floppies, "35dd", ql_trump_card_device::floppy_formats) MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG":1", ql_trump_card_floppies, nullptr, ql_trump_card_device::floppy_formats) MACHINE_CONFIG_END -//------------------------------------------------- -// machine_config_additions - device-specific -// machine configurations -//------------------------------------------------- - -machine_config_constructor ql_trump_card_device::device_mconfig_additions() const -{ - return MACHINE_CONFIG_NAME( ql_trump_card ); -} - - - //************************************************************************** // LIVE DEVICE //************************************************************************** diff --git a/src/devices/bus/ql/trumpcard.h b/src/devices/bus/ql/trumpcard.h index ff19af0bf07..ce9503d5503 100644 --- a/src/devices/bus/ql/trumpcard.h +++ b/src/devices/bus/ql/trumpcard.h @@ -29,12 +29,6 @@ public: // construction/destruction ql_trump_card_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - // optional information overrides - virtual const tiny_rom_entry *device_rom_region() const override; - virtual machine_config_constructor device_mconfig_additions() const override; - - DECLARE_FLOPPY_FORMATS( floppy_formats ); - protected: ql_trump_card_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, int ram_size); @@ -42,11 +36,18 @@ protected: virtual void device_start() override; virtual void device_reset() override; + // optional information overrides + virtual const tiny_rom_entry *device_rom_region() const override; + virtual void device_add_mconfig(machine_config &config) override; + // device_ql_expansion_card_interface overrides virtual uint8_t read(address_space &space, offs_t offset, uint8_t data) override; virtual void write(address_space &space, offs_t offset, uint8_t data) override; private: + + DECLARE_FLOPPY_FORMATS( floppy_formats ); + required_device m_fdc; required_device m_floppy0; required_device m_floppy1; -- cgit v1.2.3