From 0229ff2fb678b4dd6705e64442a9c03742774f6a Mon Sep 17 00:00:00 2001 From: Dirk Best Date: Mon, 8 Jun 2015 13:18:39 +0200 Subject: [PATCH] vtech1/floppy: cleanup --- src/emu/bus/vtech/memexp/floppy.c | 12 ++++-------- src/emu/bus/vtech/memexp/floppy.h | 4 +--- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/emu/bus/vtech/memexp/floppy.c b/src/emu/bus/vtech/memexp/floppy.c index 201f91d8a92..ef169703035 100644 --- a/src/emu/bus/vtech/memexp/floppy.c +++ b/src/emu/bus/vtech/memexp/floppy.c @@ -1,5 +1,5 @@ // license:GPL-2.0+ -// copyright-holders:Dirk Best +// copyright-holders:Dirk Best, Olivier Galibert /*************************************************************************** VTech Laser/VZ Floppy Controller Cartridge @@ -44,18 +44,14 @@ const rom_entry *floppy_controller_device::device_rom_region() const // machine configurations //------------------------------------------------- -FLOPPY_FORMATS_MEMBER( floppy_controller_device::floppy_formats ) - FLOPPY_MFI_FORMAT -FLOPPY_FORMATS_END - static SLOT_INTERFACE_START( laser_floppies ) - SLOT_INTERFACE( "525", FLOPPY_525_SSSD ) + SLOT_INTERFACE("525", FLOPPY_525_SSSD) SLOT_INTERFACE_END static MACHINE_CONFIG_FRAGMENT( floppy_controller ) MCFG_MEMEXP_SLOT_ADD("mem") - MCFG_FLOPPY_DRIVE_ADD("0", laser_floppies, "525", floppy_controller_device::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("1", laser_floppies, "525", floppy_controller_device::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("0", laser_floppies, "525", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("1", laser_floppies, "525", floppy_image_device::default_floppy_formats) MACHINE_CONFIG_END machine_config_constructor floppy_controller_device::device_mconfig_additions() const diff --git a/src/emu/bus/vtech/memexp/floppy.h b/src/emu/bus/vtech/memexp/floppy.h index 940c6abc2ea..91c332332c1 100644 --- a/src/emu/bus/vtech/memexp/floppy.h +++ b/src/emu/bus/vtech/memexp/floppy.h @@ -1,5 +1,5 @@ // license:GPL-2.0+ -// copyright-holders:Dirk Best +// copyright-holders:Dirk Best, Olivier Galibert /*************************************************************************** VTech Laser/VZ Floppy Controller Cartridge @@ -38,8 +38,6 @@ public: DECLARE_READ8_MEMBER(rd_r); DECLARE_READ8_MEMBER(wpt_r); - DECLARE_FLOPPY_FORMATS( floppy_formats ); - protected: virtual const rom_entry *device_rom_region() const; virtual machine_config_constructor device_mconfig_additions() const;