summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/imagedev/floppy.cpp
diff options
context:
space:
mode:
author Olivier Galibert <galibert@pobox.com>2022-06-16 12:47:52 +0200
committer Olivier Galibert <galibert@pobox.com>2025-04-29 23:06:41 +0200
commit45d4cd52a8194f2ef9e0383cfb2e2a35634af6ff (patch)
tree4e8d8fcb7382a5e9e0bce5ec59939bcfbe67155a /src/devices/imagedev/floppy.cpp
parent5c14bcdfcb4aefb71b5b62387c4ad05dbeb3814e (diff)
full xtal conversionxtal
Diffstat (limited to 'src/devices/imagedev/floppy.cpp')
-rw-r--r--src/devices/imagedev/floppy.cpp84
1 files changed, 42 insertions, 42 deletions
diff --git a/src/devices/imagedev/floppy.cpp b/src/devices/imagedev/floppy.cpp
index 3c00336dcd8..4d26d44171f 100644
--- a/src/devices/imagedev/floppy.cpp
+++ b/src/devices/imagedev/floppy.cpp
@@ -208,7 +208,7 @@ void floppy_image_device::default_pc_floppy_formats(format_registration &fr)
fr.add_pc_formats();
}
-floppy_connector::floppy_connector(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+floppy_connector::floppy_connector(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, FLOPPY_CONNECTOR, tag, owner, clock),
device_slot_interface(mconfig, *this),
formats(nullptr),
@@ -248,7 +248,7 @@ floppy_image_device *floppy_connector::get_device()
// floppy_image_device - constructor
//-------------------------------------------------
-floppy_image_device::floppy_image_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+floppy_image_device::floppy_image_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, type, tag, owner, clock),
device_image_interface(mconfig, *this),
input_format(nullptr),
@@ -1500,7 +1500,7 @@ static const char *const floppy525_sample_names[] =
nullptr
};
-floppy_sound_device::floppy_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+floppy_sound_device::floppy_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: samples_device(mconfig, FLOPPYSOUND, tag, owner, clock),
m_sound(nullptr),
m_step_base(0),
@@ -1801,13 +1801,13 @@ void floppy_sound_device::sound_stream_update(sound_stream &stream, std::vector<
void floppy_image_device::device_add_mconfig(machine_config &config)
{
SPEAKER(config, FLOPSPK).front_center();
- FLOPPYSOUND(config, FLOPSND_TAG, 44100).add_route(ALL_OUTPUTS, FLOPSPK, 0.5);
+ FLOPPYSOUND(config, FLOPSND_TAG, XTAL::u(44100)).add_route(ALL_OUTPUTS, FLOPSPK, 0.5);
if (FLUX_SCREEN)
{
SCREEN(config, m_flux_screen, SCREEN_TYPE_RASTER);
m_flux_screen->set_screen_update(FUNC(floppy_image_device::flux_screen_update));
- m_flux_screen->set_raw(30*(flux_screen_sx+1)*(flux_screen_sy+1), flux_screen_sx+1, 0, flux_screen_sx, flux_screen_sy+1, 0, flux_screen_sy);
+ m_flux_screen->set_raw(XTAL::u(30*(flux_screen_sx+1)*(flux_screen_sy+1)), flux_screen_sx+1, 0, flux_screen_sx, flux_screen_sy+1, 0, flux_screen_sy);
m_flux_screen->set_physical_aspect(1, 2);
}
}
@@ -1824,7 +1824,7 @@ DEFINE_DEVICE_TYPE(FLOPPYSOUND, floppy_sound_device, "flopsnd", "Floppy sound")
// 3" single-sided double density
//-------------------------------------------------
-floppy_3_ssdd::floppy_3_ssdd(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+floppy_3_ssdd::floppy_3_ssdd(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
floppy_image_device(mconfig, FLOPPY_3_SSDD, tag, owner, clock)
{
}
@@ -1847,7 +1847,7 @@ void floppy_3_ssdd::setup_characteristics()
// 3" double-sided double density
//-------------------------------------------------
-floppy_3_dsdd::floppy_3_dsdd(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+floppy_3_dsdd::floppy_3_dsdd(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
floppy_image_device(mconfig, FLOPPY_3_DSDD, tag, owner, clock)
{
}
@@ -1871,7 +1871,7 @@ void floppy_3_dsdd::setup_characteristics()
// 3.5" single-sided double density
//-------------------------------------------------
-floppy_35_ssdd::floppy_35_ssdd(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+floppy_35_ssdd::floppy_35_ssdd(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
floppy_image_device(mconfig, FLOPPY_35_SSDD, tag, owner, clock)
{
}
@@ -1895,7 +1895,7 @@ void floppy_35_ssdd::setup_characteristics()
// 3.5" double-sided double density
//-------------------------------------------------
-floppy_35_dd::floppy_35_dd(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+floppy_35_dd::floppy_35_dd(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
floppy_image_device(mconfig, FLOPPY_35_DD, tag, owner, clock)
{
}
@@ -1920,7 +1920,7 @@ void floppy_35_dd::setup_characteristics()
// 3.5" high density
//-------------------------------------------------
-floppy_35_hd::floppy_35_hd(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+floppy_35_hd::floppy_35_hd(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
floppy_image_device(mconfig, FLOPPY_35_HD, tag, owner, clock)
{
}
@@ -1946,7 +1946,7 @@ void floppy_35_hd::setup_characteristics()
// 3.5" extended density
//-------------------------------------------------
-floppy_35_ed::floppy_35_ed(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+floppy_35_ed::floppy_35_ed(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
floppy_image_device(mconfig, FLOPPY_35_ED, tag, owner, clock)
{
}
@@ -1973,7 +1973,7 @@ void floppy_35_ed::setup_characteristics()
// 5.25" single-sided single density 35 tracks
//-------------------------------------------------
-floppy_525_sssd_35t::floppy_525_sssd_35t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+floppy_525_sssd_35t::floppy_525_sssd_35t(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
floppy_image_device(mconfig, FLOPPY_525_SSSD_35T, tag, owner, clock)
{
}
@@ -1996,7 +1996,7 @@ void floppy_525_sssd_35t::setup_characteristics()
// 5.25" double-sided single density 35 tracks
//-------------------------------------------------
-floppy_525_sd_35t::floppy_525_sd_35t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+floppy_525_sd_35t::floppy_525_sd_35t(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
floppy_image_device(mconfig, FLOPPY_525_SD_35T, tag, owner, clock)
{
}
@@ -2020,7 +2020,7 @@ void floppy_525_sd_35t::setup_characteristics()
// 5.25" single-sided single density, VTECH edition
//-------------------------------------------------
-floppy_525_vtech::floppy_525_vtech(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+floppy_525_vtech::floppy_525_vtech(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
floppy_image_device(mconfig, FLOPPY_525_VTECH, tag, owner, clock)
{
amplifier_freakout_time = attotime::from_usec(64);
@@ -2044,7 +2044,7 @@ void floppy_525_vtech::setup_characteristics()
// 5.25" single-sided single density
//-------------------------------------------------
-floppy_525_sssd::floppy_525_sssd(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+floppy_525_sssd::floppy_525_sssd(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
floppy_image_device(mconfig, FLOPPY_525_SSSD, tag, owner, clock)
{
}
@@ -2067,7 +2067,7 @@ void floppy_525_sssd::setup_characteristics()
// 5.25" double-sided single density
//-------------------------------------------------
-floppy_525_sd::floppy_525_sd(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+floppy_525_sd::floppy_525_sd(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
floppy_image_device(mconfig, FLOPPY_525_SD, tag, owner, clock)
{
}
@@ -2090,7 +2090,7 @@ void floppy_525_sd::setup_characteristics()
// 5.25" single-sided double density
//-------------------------------------------------
-floppy_525_ssdd::floppy_525_ssdd(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+floppy_525_ssdd::floppy_525_ssdd(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
floppy_image_device(mconfig, FLOPPY_525_SSDD, tag, owner, clock)
{
}
@@ -2114,7 +2114,7 @@ void floppy_525_ssdd::setup_characteristics()
// 5.25" double-sided double density
//-------------------------------------------------
-floppy_525_dd::floppy_525_dd(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+floppy_525_dd::floppy_525_dd(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
floppy_image_device(mconfig, FLOPPY_525_DD, tag, owner, clock)
{
}
@@ -2139,7 +2139,7 @@ void floppy_525_dd::setup_characteristics()
// 5.25" single-sided quad density
//-------------------------------------------------
-floppy_525_ssqd::floppy_525_ssqd(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+floppy_525_ssqd::floppy_525_ssqd(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
floppy_image_device(mconfig, FLOPPY_525_SSQD, tag, owner, clock)
{
}
@@ -2164,7 +2164,7 @@ void floppy_525_ssqd::setup_characteristics()
// 5.25" double-sided quad density
//-------------------------------------------------
-floppy_525_qd::floppy_525_qd(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+floppy_525_qd::floppy_525_qd(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
floppy_image_device(mconfig, FLOPPY_525_QD, tag, owner, clock)
{
}
@@ -2192,7 +2192,7 @@ void floppy_525_qd::setup_characteristics()
// 5.25" high density
//-------------------------------------------------
-floppy_525_hd::floppy_525_hd(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+floppy_525_hd::floppy_525_hd(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
floppy_image_device(mconfig, FLOPPY_525_HD, tag, owner, clock)
{
}
@@ -2220,7 +2220,7 @@ void floppy_525_hd::setup_characteristics()
// 8" single-sided single density
//-------------------------------------------------
-floppy_8_sssd::floppy_8_sssd(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+floppy_8_sssd::floppy_8_sssd(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
floppy_image_device(mconfig, FLOPPY_8_SSSD, tag, owner, clock)
{
}
@@ -2244,7 +2244,7 @@ void floppy_8_sssd::setup_characteristics()
// 8" double-sided single density
//-------------------------------------------------
-floppy_8_dssd::floppy_8_dssd(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+floppy_8_dssd::floppy_8_dssd(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
floppy_image_device(mconfig, FLOPPY_8_DSSD, tag, owner, clock)
{
}
@@ -2269,7 +2269,7 @@ void floppy_8_dssd::setup_characteristics()
// 8" single-sided double density
//-------------------------------------------------
-floppy_8_ssdd::floppy_8_ssdd(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+floppy_8_ssdd::floppy_8_ssdd(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
floppy_image_device(mconfig, FLOPPY_8_SSDD, tag, owner, clock)
{
}
@@ -2294,7 +2294,7 @@ void floppy_8_ssdd::setup_characteristics()
// 8" double-sided double density
//-------------------------------------------------
-floppy_8_dsdd::floppy_8_dsdd(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+floppy_8_dsdd::floppy_8_dsdd(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
floppy_image_device(mconfig, FLOPPY_8_DSDD, tag, owner, clock)
{
}
@@ -2331,7 +2331,7 @@ void floppy_8_dsdd::setup_characteristics()
//
//-------------------------------------------------
-epson_smd_165::epson_smd_165(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+epson_smd_165::epson_smd_165(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
floppy_image_device(mconfig, EPSON_SMD_165, tag, owner, clock)
{
}
@@ -2378,7 +2378,7 @@ void epson_smd_165::setup_characteristics()
//
//-------------------------------------------------
-epson_sd_320::epson_sd_320(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+epson_sd_320::epson_sd_320(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
floppy_image_device(mconfig, EPSON_SD_320, tag, owner, clock)
{
}
@@ -2406,7 +2406,7 @@ void epson_sd_320::setup_characteristics()
//
//-------------------------------------------------
-epson_sd_321::epson_sd_321(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+epson_sd_321::epson_sd_321(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
floppy_image_device(mconfig, EPSON_SD_321, tag, owner, clock)
{
}
@@ -2438,7 +2438,7 @@ void epson_sd_321::setup_characteristics()
//
//-------------------------------------------------
-pana_ju_363::pana_ju_363(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+pana_ju_363::pana_ju_363(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
floppy_image_device(mconfig, PANA_JU_363, tag, owner, clock)
{
}
@@ -2470,7 +2470,7 @@ void pana_ju_363::setup_characteristics()
//
//-------------------------------------------------
-sony_oa_d31v::sony_oa_d31v(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+sony_oa_d31v::sony_oa_d31v(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
floppy_image_device(mconfig, SONY_OA_D31V, tag, owner, clock)
{
}
@@ -2502,7 +2502,7 @@ void sony_oa_d31v::setup_characteristics()
//
//-------------------------------------------------
-sony_oa_d32w::sony_oa_d32w(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+sony_oa_d32w::sony_oa_d32w(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
floppy_image_device(mconfig, SONY_OA_D32W, tag, owner, clock)
{
}
@@ -2535,7 +2535,7 @@ void sony_oa_d32w::setup_characteristics()
//
//-------------------------------------------------
-sony_oa_d32v::sony_oa_d32v(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+sony_oa_d32v::sony_oa_d32v(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
floppy_image_device(mconfig, SONY_OA_D32V, tag, owner, clock)
{
}
@@ -2566,7 +2566,7 @@ void sony_oa_d32v::setup_characteristics()
//
//-------------------------------------------------
-teac_fd_30a::teac_fd_30a(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+teac_fd_30a::teac_fd_30a(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
floppy_image_device(mconfig, TEAC_FD_30A, tag, owner, clock)
{
}
@@ -2595,7 +2595,7 @@ void teac_fd_30a::setup_characteristics()
//
//-------------------------------------------------
-teac_fd_55e::teac_fd_55e(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+teac_fd_55e::teac_fd_55e(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
floppy_image_device(mconfig, TEAC_FD_55E, tag, owner, clock)
{
}
@@ -2626,7 +2626,7 @@ void teac_fd_55e::setup_characteristics()
//
//-------------------------------------------------
-teac_fd_55f::teac_fd_55f(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+teac_fd_55f::teac_fd_55f(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
floppy_image_device(mconfig, TEAC_FD_55F, tag, owner, clock)
{
}
@@ -2660,7 +2660,7 @@ void teac_fd_55f::setup_characteristics()
//
//-------------------------------------------------
-teac_fd_55g::teac_fd_55g(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+teac_fd_55g::teac_fd_55g(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
floppy_image_device(mconfig, TEAC_FD_55G, tag, owner, clock)
{
}
@@ -2690,7 +2690,7 @@ void teac_fd_55g::setup_characteristics()
// used in the Commodoere 1541 disk drive
//-------------------------------------------------
-alps_3255190x::alps_3255190x(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+alps_3255190x::alps_3255190x(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
floppy_image_device(mconfig, ALPS_3255190X, tag, owner, clock)
{
}
@@ -2714,7 +2714,7 @@ void alps_3255190x::setup_characteristics()
// IBM 6360 -- 8" single-sided single density
//-------------------------------------------------
-ibm_6360::ibm_6360(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+ibm_6360::ibm_6360(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
floppy_image_device(mconfig, IBM_6360, tag, owner, clock)
{
}
@@ -2740,7 +2740,7 @@ void ibm_6360::setup_characteristics()
// Variable-speed Macintosh drives
//-------------------------------------------------
-mac_floppy_device::mac_floppy_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) : floppy_image_device(mconfig, type, tag, owner, clock)
+mac_floppy_device::mac_floppy_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : floppy_image_device(mconfig, type, tag, owner, clock)
{
m_has_mfm = false;
dskchg_writable = true;
@@ -2963,7 +2963,7 @@ void mac_floppy_device::tfsel_w(int state)
}
}
-oa_d34v_device::oa_d34v_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : mac_floppy_device(mconfig, OAD34V, tag, owner, clock)
+oa_d34v_device::oa_d34v_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : mac_floppy_device(mconfig, OAD34V, tag, owner, clock)
{
}
@@ -2990,7 +2990,7 @@ void oa_d34v_device::track_changed()
floppy_image_device::track_changed();
}
-mfd51w_device::mfd51w_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : mac_floppy_device(mconfig, MFD51W, tag, owner, clock)
+mfd51w_device::mfd51w_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : mac_floppy_device(mconfig, MFD51W, tag, owner, clock)
{
}
void mfd51w_device::setup_characteristics()
@@ -3009,7 +3009,7 @@ bool mfd51w_device::is_2m() const
return true;
}
-mfd75w_device::mfd75w_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : mac_floppy_device(mconfig, MFD75W, tag, owner, clock)
+mfd75w_device::mfd75w_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : mac_floppy_device(mconfig, MFD75W, tag, owner, clock)
{
m_has_mfm = true;
}