summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/imagedev/floppy.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/imagedev/floppy.cpp')
-rw-r--r--src/devices/imagedev/floppy.cpp122
1 files changed, 62 insertions, 60 deletions
diff --git a/src/devices/imagedev/floppy.cpp b/src/devices/imagedev/floppy.cpp
index 2e9b4e4d931..b4f9d88bfff 100644
--- a/src/devices/imagedev/floppy.cpp
+++ b/src/devices/imagedev/floppy.cpp
@@ -7,9 +7,11 @@
*********************************************************************/
#include "emu.h"
-#include "zippath.h"
#include "floppy.h"
+
+#include "speaker.cpp"
#include "formats/imageutl.h"
+#include "zippath.h"
/*
Debugging flags. Set to 0 or 1.
@@ -24,94 +26,94 @@
#define FLOPSND_TAG "floppysound"
// device type definition
-const device_type FLOPPY_CONNECTOR = &device_creator<floppy_connector>;
+const device_type FLOPPY_CONNECTOR = device_creator<floppy_connector>;
// generic 3" drives
-const device_type FLOPPY_3_SSDD = &device_creator<floppy_3_ssdd>;
-const device_type FLOPPY_3_DSDD = &device_creator<floppy_3_dsdd>;
+const device_type FLOPPY_3_SSDD = device_creator<floppy_3_ssdd>;
+const device_type FLOPPY_3_DSDD = device_creator<floppy_3_dsdd>;
// generic 3.5" drives
-const device_type FLOPPY_35_SSDD = &device_creator<floppy_35_ssdd>;
-const device_type FLOPPY_35_DD = &device_creator<floppy_35_dd>;
-const device_type FLOPPY_35_HD = &device_creator<floppy_35_hd>;
-const device_type FLOPPY_35_ED = &device_creator<floppy_35_ed>;
+const device_type FLOPPY_35_SSDD = device_creator<floppy_35_ssdd>;
+const device_type FLOPPY_35_DD = device_creator<floppy_35_dd>;
+const device_type FLOPPY_35_HD = device_creator<floppy_35_hd>;
+const device_type FLOPPY_35_ED = device_creator<floppy_35_ed>;
// generic 5.25" drives
-const device_type FLOPPY_525_SSSD_35T = &device_creator<floppy_525_sssd_35t>;
-const device_type FLOPPY_525_SD_35T = &device_creator<floppy_525_sd_35t>;
-const device_type FLOPPY_525_SSSD = &device_creator<floppy_525_sssd>;
-const device_type FLOPPY_525_SD = &device_creator<floppy_525_sd>;
-const device_type FLOPPY_525_SSDD = &device_creator<floppy_525_ssdd>;
-const device_type FLOPPY_525_DD = &device_creator<floppy_525_dd>;
-const device_type FLOPPY_525_SSQD = &device_creator<floppy_525_ssqd>;
-const device_type FLOPPY_525_QD = &device_creator<floppy_525_qd>;
-const device_type FLOPPY_525_HD = &device_creator<floppy_525_hd>;
+const device_type FLOPPY_525_SSSD_35T = device_creator<floppy_525_sssd_35t>;
+const device_type FLOPPY_525_SD_35T = device_creator<floppy_525_sd_35t>;
+const device_type FLOPPY_525_SSSD = device_creator<floppy_525_sssd>;
+const device_type FLOPPY_525_SD = device_creator<floppy_525_sd>;
+const device_type FLOPPY_525_SSDD = device_creator<floppy_525_ssdd>;
+const device_type FLOPPY_525_DD = device_creator<floppy_525_dd>;
+const device_type FLOPPY_525_SSQD = device_creator<floppy_525_ssqd>;
+const device_type FLOPPY_525_QD = device_creator<floppy_525_qd>;
+const device_type FLOPPY_525_HD = device_creator<floppy_525_hd>;
// generic 8" drives
-const device_type FLOPPY_8_SSSD = &device_creator<floppy_8_sssd>;
-const device_type FLOPPY_8_DSSD = &device_creator<floppy_8_dssd>;
-const device_type FLOPPY_8_SSDD = &device_creator<floppy_8_ssdd>;
-const device_type FLOPPY_8_DSDD = &device_creator<floppy_8_dsdd>;
+const device_type FLOPPY_8_SSSD = device_creator<floppy_8_sssd>;
+const device_type FLOPPY_8_DSSD = device_creator<floppy_8_dssd>;
+const device_type FLOPPY_8_SSDD = device_creator<floppy_8_ssdd>;
+const device_type FLOPPY_8_DSDD = device_creator<floppy_8_dsdd>;
// Epson 3.5" drives
#if 0
-const device_type EPSON_SMD_110 = &device_creator<epson_smd_110>;
-const device_type EPSON_SMD_120 = &device_creator<epson_smd_120>;
-const device_type EPSON_SMD_125 = &device_creator<epson_smd_125>;
-const device_type EPSON_SMD_130 = &device_creator<epson_smd_130>;
-const device_type EPSON_SMD_140 = &device_creator<epson_smd_140>;
-const device_type EPSON_SMD_150 = &device_creator<epson_smd_150>;
-const device_type EPSON_SMD_160 = &device_creator<epson_smd_160>;
+const device_type EPSON_SMD_110 = device_creator<epson_smd_110>;
+const device_type EPSON_SMD_120 = device_creator<epson_smd_120>;
+const device_type EPSON_SMD_125 = device_creator<epson_smd_125>;
+const device_type EPSON_SMD_130 = device_creator<epson_smd_130>;
+const device_type EPSON_SMD_140 = device_creator<epson_smd_140>;
+const device_type EPSON_SMD_150 = device_creator<epson_smd_150>;
+const device_type EPSON_SMD_160 = device_creator<epson_smd_160>;
#endif
-const device_type EPSON_SMD_165 = &device_creator<epson_smd_165>;
+const device_type EPSON_SMD_165 = device_creator<epson_smd_165>;
#if 0
-const device_type EPSON_SMD_170 = &device_creator<epson_smd_170>;
-const device_type EPSON_SMD_180 = &device_creator<epson_smd_180>;
-const device_type EPSON_SMD_240L = &device_creator<epson_smd_240l>;
-const device_type EPSON_SMD_280HL = &device_creator<epson_smd_280hl>;
-const device_type EPSON_SMD_440L = &device_creator<epson_smd_440l>;
-const device_type EPSON_SMD_449L = &device_creator<epson_smd_449l>;
-const device_type EPSON_SMD_480LM = &device_creator<epson_smd_480lm>;
-const device_type EPSON_SMD_489M = &device_creator<epson_smd_489m>;
+const device_type EPSON_SMD_170 = device_creator<epson_smd_170>;
+const device_type EPSON_SMD_180 = device_creator<epson_smd_180>;
+const device_type EPSON_SMD_240L = device_creator<epson_smd_240l>;
+const device_type EPSON_SMD_280HL = device_creator<epson_smd_280hl>;
+const device_type EPSON_SMD_440L = device_creator<epson_smd_440l>;
+const device_type EPSON_SMD_449L = device_creator<epson_smd_449l>;
+const device_type EPSON_SMD_480LM = device_creator<epson_smd_480lm>;
+const device_type EPSON_SMD_489M = device_creator<epson_smd_489m>;
#endif
// Epson 5.25" drives
#if 0
-const device_type EPSON_SD_311 = &device_creator<epson_sd_311>;
+const device_type EPSON_SD_311 = device_creator<epson_sd_311>;
#endif
-const device_type EPSON_SD_320 = &device_creator<epson_sd_320>;
-const device_type EPSON_SD_321 = &device_creator<epson_sd_321>;
+const device_type EPSON_SD_320 = device_creator<epson_sd_320>;
+const device_type EPSON_SD_321 = device_creator<epson_sd_321>;
#if 0
-const device_type EPSON_SD_521L = &device_creator<epson_sd_531l>;
-const device_type EPSON_SD_525 = &device_creator<epson_sd_525>;
-const device_type EPSON_SD_543 = &device_creator<epson_sd_543>;
-const device_type EPSON_SD_545 = &device_creator<epson_sd_545>;
-const device_type EPSON_SD_560 = &device_creator<epson_sd_560>;
-const device_type EPSON_SD_580L = &device_creator<epson_sd_580l>;
-const device_type EPSON_SD_581L = &device_creator<epson_sd_581l>;
-const device_type EPSON_SD_621L = &device_creator<epson_sd_621l>;
-const device_type EPSON_SD_680L = &device_creator<epson_sd_680l>;
+const device_type EPSON_SD_521L = device_creator<epson_sd_531l>;
+const device_type EPSON_SD_525 = device_creator<epson_sd_525>;
+const device_type EPSON_SD_543 = device_creator<epson_sd_543>;
+const device_type EPSON_SD_545 = device_creator<epson_sd_545>;
+const device_type EPSON_SD_560 = device_creator<epson_sd_560>;
+const device_type EPSON_SD_580L = device_creator<epson_sd_580l>;
+const device_type EPSON_SD_581L = device_creator<epson_sd_581l>;
+const device_type EPSON_SD_621L = device_creator<epson_sd_621l>;
+const device_type EPSON_SD_680L = device_creator<epson_sd_680l>;
#endif
// Sony 3.5" drives
-const device_type SONY_OA_D31V = &device_creator<sony_oa_d31v>;
-const device_type SONY_OA_D32W = &device_creator<sony_oa_d32w>;
-const device_type SONY_OA_D32V = &device_creator<sony_oa_d32v>;
+const device_type SONY_OA_D31V = device_creator<sony_oa_d31v>;
+const device_type SONY_OA_D32W = device_creator<sony_oa_d32w>;
+const device_type SONY_OA_D32V = device_creator<sony_oa_d32v>;
// TEAC 5.25" drives
#if 0
-const device_type TEAC_FD_55A = &device_creator<teac_fd_55a>;
-const device_type TEAC_FD_55B = &device_creator<teac_fd_55b>;
+const device_type TEAC_FD_55A = device_creator<teac_fd_55a>;
+const device_type TEAC_FD_55B = device_creator<teac_fd_55b>;
#endif
-const device_type TEAC_FD_55E = &device_creator<teac_fd_55e>;
-const device_type TEAC_FD_55F = &device_creator<teac_fd_55f>;
-const device_type TEAC_FD_55G = &device_creator<teac_fd_55g>;
+const device_type TEAC_FD_55E = device_creator<teac_fd_55e>;
+const device_type TEAC_FD_55F = device_creator<teac_fd_55f>;
+const device_type TEAC_FD_55G = device_creator<teac_fd_55g>;
// ALPS 5.25" drives
-const device_type ALPS_3255190x = &device_creator<alps_3255190x>;
+const device_type ALPS_3255190x = device_creator<alps_3255190x>;
// IBM 8" drives
-const device_type IBM_6360 = &device_creator<ibm_6360>;
+const device_type IBM_6360 = device_creator<ibm_6360>;
template class device_finder<floppy_connector, false>;
@@ -1358,7 +1360,7 @@ machine_config_constructor floppy_image_device::device_mconfig_additions() const
return MACHINE_CONFIG_NAME( floppy_img );
}
-const device_type FLOPPYSOUND = &device_creator<floppy_sound_device>;
+const device_type FLOPPYSOUND = device_creator<floppy_sound_device>;
//**************************************************************************