summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/econet
diff options
context:
space:
mode:
author Ivan Vangelista <mesgnet@yahoo.it>2017-06-08 17:20:12 +0200
committer Ivan Vangelista <mesgnet@yahoo.it>2017-06-08 17:20:12 +0200
commitf31b1520801a4848a15a0cbb646797f44e476d33 (patch)
tree3e8ca203dd87896a83313aee59b37db865663bbc /src/devices/bus/econet
parent89f35e6fcc3eb050e96fff6c185b15c8db477954 (diff)
device_add_mconfig up to devices/bus/h* (nw)
Diffstat (limited to 'src/devices/bus/econet')
-rw-r--r--src/devices/bus/econet/e01.cpp17
-rw-r--r--src/devices/bus/econet/e01.h26
2 files changed, 17 insertions, 26 deletions
diff --git a/src/devices/bus/econet/e01.cpp b/src/devices/bus/econet/e01.cpp
index 760df651bc5..0a5f8eef283 100644
--- a/src/devices/bus/econet/e01.cpp
+++ b/src/devices/bus/econet/e01.cpp
@@ -169,7 +169,7 @@ WRITE_LINE_MEMBER( econet_e01_device::clk_en_w )
m_clk_en = state;
}
-FLOPPY_FORMATS_MEMBER( floppy_formats_afs )
+FLOPPY_FORMATS_MEMBER( econet_e01_device::floppy_formats_afs )
FLOPPY_AFS_FORMAT
FLOPPY_FORMATS_END0
@@ -238,10 +238,10 @@ ADDRESS_MAP_END
//-------------------------------------------------
-// MACHINE_DRIVER( e01 )
+// device_add_mconfig - add device configuration
//-------------------------------------------------
-static MACHINE_CONFIG_START( e01 )
+MACHINE_CONFIG_MEMBER( econet_e01_device::device_add_mconfig )
// basic machine hardware
MCFG_CPU_ADD(R65C102_TAG, M65C02, XTAL_8MHz/4) // Rockwell R65C102P3
MCFG_CPU_PROGRAM_MAP(e01_mem)
@@ -292,17 +292,6 @@ MACHINE_CONFIG_END
//-------------------------------------------------
-// machine_config_additions - device-specific
-// machine configurations
-//-------------------------------------------------
-
-machine_config_constructor econet_e01_device::device_mconfig_additions() const
-{
- return MACHINE_CONFIG_NAME( e01 );
-}
-
-
-//-------------------------------------------------
// INPUT_PORTS( e01 )
//-------------------------------------------------
diff --git a/src/devices/bus/econet/e01.h b/src/devices/bus/econet/e01.h
index dd9eab8fc4f..20508313538 100644
--- a/src/devices/bus/econet/e01.h
+++ b/src/devices/bus/econet/e01.h
@@ -31,8 +31,6 @@ public:
// construction/destruction
econet_e01_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- DECLARE_FLOPPY_FORMATS(floppy_formats_afs);
-
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
DECLARE_READ8_MEMBER( ram_select_r );
@@ -49,15 +47,6 @@ public:
DECLARE_WRITE8_MEMBER( rtc_address_w );
DECLARE_READ8_MEMBER( rtc_data_r );
DECLARE_WRITE8_MEMBER( rtc_data_w );
- DECLARE_WRITE_LINE_MEMBER( rtc_irq_w );
- DECLARE_WRITE_LINE_MEMBER( adlc_irq_w );
- DECLARE_WRITE_LINE_MEMBER( econet_data_w );
- DECLARE_WRITE_LINE_MEMBER( via_irq_w );
- DECLARE_WRITE_LINE_MEMBER( clk_en_w );
- DECLARE_WRITE_LINE_MEMBER( fdc_irq_w );
- DECLARE_WRITE_LINE_MEMBER( fdc_drq_w );
- DECLARE_WRITE_LINE_MEMBER( scsi_bsy_w );
- DECLARE_WRITE_LINE_MEMBER( scsi_req_w );
protected:
enum
@@ -75,13 +64,26 @@ protected:
// 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_econet_interface overrides
virtual void econet_data(int state) override;
virtual void econet_clk(int state) override;
+private:
+ DECLARE_WRITE_LINE_MEMBER( rtc_irq_w );
+ DECLARE_WRITE_LINE_MEMBER( adlc_irq_w );
+ DECLARE_WRITE_LINE_MEMBER( econet_data_w );
+ DECLARE_WRITE_LINE_MEMBER( via_irq_w );
+ DECLARE_WRITE_LINE_MEMBER( clk_en_w );
+ DECLARE_WRITE_LINE_MEMBER( fdc_irq_w );
+ DECLARE_WRITE_LINE_MEMBER( fdc_drq_w );
+ DECLARE_WRITE_LINE_MEMBER( scsi_bsy_w );
+ DECLARE_WRITE_LINE_MEMBER( scsi_req_w );
+
+ DECLARE_FLOPPY_FORMATS(floppy_formats_afs);
+
required_device<m65c02_device> m_maincpu;
required_device<wd2793_device> m_fdc;
required_device<mc6854_device> m_adlc;