diff options
Diffstat (limited to 'src/devices/bus/cbmiec/fd2000.cpp')
-rw-r--r-- | src/devices/bus/cbmiec/fd2000.cpp | 58 |
1 files changed, 18 insertions, 40 deletions
diff --git a/src/devices/bus/cbmiec/fd2000.cpp b/src/devices/bus/cbmiec/fd2000.cpp index 3a9618bd61e..6f5cc650245 100644 --- a/src/devices/bus/cbmiec/fd2000.cpp +++ b/src/devices/bus/cbmiec/fd2000.cpp @@ -77,16 +77,13 @@ ROM_END const tiny_rom_entry *fd2000_device::device_rom_region() const { - switch (m_variant) - { - default: - return ROM_NAME( fd2000 ); - - case TYPE_FD4000: - return ROM_NAME( fd4000 ); - } + return ROM_NAME( fd2000 ); } +const tiny_rom_entry *fd4000_device::device_rom_region() const +{ + return ROM_NAME( fd4000 ); +} //------------------------------------------------- // ADDRESS_MAP( fd2000_mem ) @@ -209,11 +206,12 @@ FLOPPY_FORMATS_MEMBER( fd2000_device::floppy_formats ) FLOPPY_FORMATS_END */ + //------------------------------------------------- -// MACHINE_DRIVER( fd2000 ) +// device_add_mconfig - add device configuration //------------------------------------------------- -static MACHINE_CONFIG_START( fd2000 ) +MACHINE_CONFIG_MEMBER( fd2000_device::device_add_mconfig ) MCFG_CPU_ADD(G65SC02PI2_TAG, M65C02, XTAL_24MHz/12) MCFG_CPU_PROGRAM_MAP(fd2000_mem) @@ -229,11 +227,7 @@ static MACHINE_CONFIG_START( fd2000 ) MACHINE_CONFIG_END -//------------------------------------------------- -// MACHINE_DRIVER( fd4000 ) -//------------------------------------------------- - -static MACHINE_CONFIG_START( fd4000 ) +MACHINE_CONFIG_MEMBER( fd4000_device::device_add_mconfig ) MCFG_CPU_ADD(R65C02P4_TAG, M65C02, XTAL_24MHz/6) MCFG_CPU_PROGRAM_MAP(fd4000_mem) @@ -249,24 +243,6 @@ static MACHINE_CONFIG_START( fd4000 ) MACHINE_CONFIG_END -//------------------------------------------------- -// machine_config_additions - device-specific -// machine configurations -//------------------------------------------------- - -machine_config_constructor fd2000_device::device_mconfig_additions() const -{ - switch (m_variant) - { - default: - return MACHINE_CONFIG_NAME( fd2000 ); - - case TYPE_FD4000: - return MACHINE_CONFIG_NAME( fd4000 ); - } -} - - //************************************************************************** // LIVE DEVICE //************************************************************************** @@ -276,17 +252,16 @@ machine_config_constructor fd2000_device::device_mconfig_additions() const //------------------------------------------------- fd2000_device::fd2000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : fd2000_device(mconfig, FD2000, tag, owner, clock, TYPE_FD2000) + : fd2000_device(mconfig, FD2000, tag, owner, clock) { } -fd2000_device::fd2000_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, uint32_t variant) +fd2000_device::fd2000_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, type, tag, owner, clock) , device_cbm_iec_interface(mconfig, *this) - , m_maincpu(*this, R65C02P4_TAG) - , m_fdc(*this, PC8477AV1_TAG) - , m_floppy0(*this, PC8477AV1_TAG":0") - , m_variant(variant) + , m_maincpu(*this, G65SC02PI2_TAG) + , m_fdc(*this, DP8473V_TAG) + , m_floppy0(*this, DP8473V_TAG":0") { } @@ -296,8 +271,11 @@ fd2000_device::fd2000_device(const machine_config &mconfig, device_type type, co //------------------------------------------------- fd4000_device::fd4000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : fd2000_device(mconfig, FD4000, tag, owner, clock, TYPE_FD4000) + : fd2000_device(mconfig, FD4000, tag, owner, clock) { + m_maincpu.set_tag(R65C02P4_TAG); + m_fdc.set_tag(PC8477AV1_TAG); + m_floppy0.set_tag(PC8477AV1_TAG":0"); } |