diff options
author | 2016-01-16 12:24:11 +0100 | |
---|---|---|
committer | 2016-01-16 14:54:42 +0100 | |
commit | 1f90ceab075c4869298e963bf0a14a0aac2f1caa (patch) | |
tree | 49984b30e3c6da6a0be068dbfcd02882bdafdc08 /src/devices/imagedev/floppy.cpp | |
parent | 34161178c431b018cba0d0286951c69aee80e968 (diff) |
tags are now strings (nw)
fix start project for custom builds in Visual Studio (nw)
Diffstat (limited to 'src/devices/imagedev/floppy.cpp')
-rw-r--r-- | src/devices/imagedev/floppy.cpp | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/src/devices/imagedev/floppy.cpp b/src/devices/imagedev/floppy.cpp index 2d6eb4d5460..066866c843f 100644 --- a/src/devices/imagedev/floppy.cpp +++ b/src/devices/imagedev/floppy.cpp @@ -123,7 +123,7 @@ const floppy_format_type floppy_image_device::default_floppy_formats[] = { nullptr }; -floppy_connector::floppy_connector(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +floppy_connector::floppy_connector(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : device_t(mconfig, FLOPPY_CONNECTOR, "Floppy drive connector abstraction", tag, owner, clock, "floppy_connector", __FILE__), device_slot_interface(mconfig, *this), formats(nullptr), @@ -163,7 +163,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 *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +floppy_image_device::floppy_image_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_image_interface(mconfig, *this), device_slot_card_interface(mconfig, *this), @@ -625,7 +625,7 @@ void floppy_image_device::stp_w(int state) } if(ocyl != cyl) { - if (TRACE_STEP) logerror("%s: track %d\n", tag(), cyl); + if (TRACE_STEP) logerror("%s: track %d\n", tag().c_str(), cyl); // Do we want a stepper sound? if (m_make_sound) m_sound_out->step(); } @@ -672,7 +672,7 @@ void floppy_image_device::seek_phase_w(int phases) subcyl = next_pos & 3; if(TRACE_STEP && (next_pos != cur_pos)) - logerror("%s: track %d.%d\n", tag(), cyl, subcyl); + logerror("%s: track %d.%d\n", tag().c_str(), cyl, subcyl); /* Update disk detection if applicable */ if (exists()) @@ -1101,7 +1101,7 @@ void ui_menu_control_floppy_image::handle() // MZ, Aug 2015 //=================================================================== -floppy_sound_device::floppy_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +floppy_sound_device::floppy_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : samples_device(mconfig, FLOPPYSOUND, "Floppy sound", tag, owner, clock, "flopsnd", __FILE__), m_sound(nullptr), m_is525(false), @@ -1148,7 +1148,7 @@ void floppy_sound_device::device_start() m_step_playback_state = 0; // 0 == currently not playing, > 0 = playing one of the step samples from start to end m_motor_on = false; - m_is525 = strstr(tag(), "525") != nullptr; + m_is525 = strstr(tag().c_str(), "525") != nullptr; if (m_is525) { m_sampleindex_motor_start = 2; @@ -1337,7 +1337,7 @@ const device_type FLOPPYSOUND = &device_creator<floppy_sound_device>; // 3" single-sided double density //------------------------------------------------- -floppy_3_ssdd::floppy_3_ssdd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +floppy_3_ssdd::floppy_3_ssdd(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : floppy_image_device(mconfig, FLOPPY_3_SSDD, "3\" single sided floppy drive", tag, owner, clock, "floppy_3_ssdd", __FILE__) { } @@ -1364,7 +1364,7 @@ void floppy_3_ssdd::handled_variants(UINT32 *variants, int &var_count) const // 3" double-sided double density //------------------------------------------------- -floppy_3_dsdd::floppy_3_dsdd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +floppy_3_dsdd::floppy_3_dsdd(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : floppy_image_device(mconfig, FLOPPY_3_DSDD, "3\" double sided floppy drive", tag, owner, clock, "floppy_3_dsdd", __FILE__) { } @@ -1392,7 +1392,7 @@ void floppy_3_dsdd::handled_variants(UINT32 *variants, int &var_count) const // 3.5" single-sided double density //------------------------------------------------- -floppy_35_ssdd::floppy_35_ssdd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +floppy_35_ssdd::floppy_35_ssdd(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : floppy_image_device(mconfig, FLOPPY_35_SSDD, "3.5\" single-sided double density floppy drive", tag, owner, clock, "floppy_35_ssdd", __FILE__) { } @@ -1420,7 +1420,7 @@ void floppy_35_ssdd::handled_variants(UINT32 *variants, int &var_count) const // 3.5" double-sided double density //------------------------------------------------- -floppy_35_dd::floppy_35_dd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +floppy_35_dd::floppy_35_dd(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : floppy_image_device(mconfig, FLOPPY_35_DD, "3.5\" double density floppy drive", tag, owner, clock, "floppy_35_dd", __FILE__) { } @@ -1449,7 +1449,7 @@ void floppy_35_dd::handled_variants(UINT32 *variants, int &var_count) const // 3.5" high density //------------------------------------------------- -floppy_35_hd::floppy_35_hd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +floppy_35_hd::floppy_35_hd(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : floppy_image_device(mconfig, FLOPPY_35_HD, "3.5\" high density floppy drive", tag, owner, clock, "floppy_35_hd", __FILE__) { } @@ -1479,7 +1479,7 @@ void floppy_35_hd::handled_variants(UINT32 *variants, int &var_count) const // 3.5" extended density //------------------------------------------------- -floppy_35_ed::floppy_35_ed(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +floppy_35_ed::floppy_35_ed(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : floppy_image_device(mconfig, FLOPPY_35_ED, "3.5\" extended density floppy drive", tag, owner, clock, "floppy_35_ed", __FILE__) { } @@ -1510,7 +1510,7 @@ void floppy_35_ed::handled_variants(UINT32 *variants, int &var_count) const // 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 clock) : +floppy_525_sssd_35t::floppy_525_sssd_35t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : floppy_image_device(mconfig, FLOPPY_525_SSSD_35T, "5.25\" single-sided single density 35-track floppy drive", tag, owner, clock, "floppy_525_sssd_35t", __FILE__) { } @@ -1537,7 +1537,7 @@ void floppy_525_sssd_35t::handled_variants(UINT32 *variants, int &var_count) con // 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 clock) : +floppy_525_sd_35t::floppy_525_sd_35t(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : floppy_image_device(mconfig, FLOPPY_525_SD_35T, "5.25\" single density 35-track floppy drive", tag, owner, clock, "floppy_525_sd_35t", __FILE__) { } @@ -1564,7 +1564,7 @@ void floppy_525_sd_35t::handled_variants(UINT32 *variants, int &var_count) const // 5.25" single-sided single density //------------------------------------------------- -floppy_525_sssd::floppy_525_sssd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +floppy_525_sssd::floppy_525_sssd(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : floppy_image_device(mconfig, FLOPPY_525_SSSD, "5.25\" single-sided single density floppy drive", tag, owner, clock, "floppy_525_sssd", __FILE__) { } @@ -1591,7 +1591,7 @@ void floppy_525_sssd::handled_variants(UINT32 *variants, int &var_count) const // 5.25" double-sided single density //------------------------------------------------- -floppy_525_sd::floppy_525_sd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +floppy_525_sd::floppy_525_sd(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : floppy_image_device(mconfig, FLOPPY_525_SD, "5.25\" single density floppy drive", tag, owner, clock, "floppy_525_sd", __FILE__) { } @@ -1618,7 +1618,7 @@ void floppy_525_sd::handled_variants(UINT32 *variants, int &var_count) const // 5.25" single-sided double density //------------------------------------------------- -floppy_525_ssdd::floppy_525_ssdd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +floppy_525_ssdd::floppy_525_ssdd(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : floppy_image_device(mconfig, FLOPPY_525_SSDD, "5.25\" single-sided double density floppy drive", tag, owner, clock, "floppy_525_ssdd", __FILE__) { } @@ -1646,7 +1646,7 @@ void floppy_525_ssdd::handled_variants(UINT32 *variants, int &var_count) const // 5.25" double-sided double density //------------------------------------------------- -floppy_525_dd::floppy_525_dd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +floppy_525_dd::floppy_525_dd(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : floppy_image_device(mconfig, FLOPPY_525_DD, "5.25\" double density floppy drive", tag, owner, clock, "floppy_525_dd", __FILE__) { } @@ -1675,7 +1675,7 @@ void floppy_525_dd::handled_variants(UINT32 *variants, int &var_count) const // 5.25" single-sided quad density //------------------------------------------------- -floppy_525_ssqd::floppy_525_ssqd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +floppy_525_ssqd::floppy_525_ssqd(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : floppy_image_device(mconfig, FLOPPY_525_QD, "5.25\" single-sided quad density floppy drive", tag, owner, clock, "floppy_525_ssqd", __FILE__) { } @@ -1704,7 +1704,7 @@ void floppy_525_ssqd::handled_variants(UINT32 *variants, int &var_count) const // 5.25" double-sided quad density //------------------------------------------------- -floppy_525_qd::floppy_525_qd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +floppy_525_qd::floppy_525_qd(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : floppy_image_device(mconfig, FLOPPY_525_QD, "5.25\" quad density floppy drive", tag, owner, clock, "floppy_525_qd", __FILE__) { } @@ -1736,7 +1736,7 @@ void floppy_525_qd::handled_variants(UINT32 *variants, int &var_count) const // 5.25" high density //------------------------------------------------- -floppy_525_hd::floppy_525_hd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +floppy_525_hd::floppy_525_hd(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : floppy_image_device(mconfig, FLOPPY_525_HD, "5.25\" high density floppy drive", tag, owner, clock, "floppy_525_hd", __FILE__) { } @@ -1768,7 +1768,7 @@ void floppy_525_hd::handled_variants(UINT32 *variants, int &var_count) const // 8" single-sided single density //------------------------------------------------- -floppy_8_sssd::floppy_8_sssd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +floppy_8_sssd::floppy_8_sssd(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : floppy_image_device(mconfig, FLOPPY_8_SSSD, "8\" single density single sided floppy drive", tag, owner, clock, "floppy_8_sssd", __FILE__) { } @@ -1796,7 +1796,7 @@ void floppy_8_sssd::handled_variants(UINT32 *variants, int &var_count) const // 8" double-sided single density //------------------------------------------------- -floppy_8_dssd::floppy_8_dssd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +floppy_8_dssd::floppy_8_dssd(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : floppy_image_device(mconfig, FLOPPY_8_DSSD, "8\" single density double sided floppy drive", tag, owner, clock, "floppy_8_dssd", __FILE__) { } @@ -1825,7 +1825,7 @@ void floppy_8_dssd::handled_variants(UINT32 *variants, int &var_count) const // 8" single-sided double density //------------------------------------------------- -floppy_8_ssdd::floppy_8_ssdd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +floppy_8_ssdd::floppy_8_ssdd(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : floppy_image_device(mconfig, FLOPPY_8_DSDD, "8\" double density single sided floppy drive", tag, owner, clock, "floppy_8_ssdd", __FILE__) { } @@ -1854,7 +1854,7 @@ void floppy_8_ssdd::handled_variants(UINT32 *variants, int &var_count) const // 8" double-sided double density //------------------------------------------------- -floppy_8_dsdd::floppy_8_dsdd(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +floppy_8_dsdd::floppy_8_dsdd(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : floppy_image_device(mconfig, FLOPPY_8_DSDD, "8\" double density double sided floppy drive", tag, owner, clock, "floppy_8_dsdd", __FILE__) { } @@ -1895,7 +1895,7 @@ void floppy_8_dsdd::handled_variants(UINT32 *variants, int &var_count) const // //------------------------------------------------- -epson_smd_165::epson_smd_165(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +epson_smd_165::epson_smd_165(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : floppy_image_device(mconfig, EPSON_SD_321, "EPSON SMD-165 Floppy Disk Drive", tag, owner, clock, "epson_smd_165", __FILE__) { } @@ -1946,7 +1946,7 @@ void epson_smd_165::handled_variants(UINT32 *variants, int &var_count) const // //------------------------------------------------- -epson_sd_320::epson_sd_320(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +epson_sd_320::epson_sd_320(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : floppy_image_device(mconfig, EPSON_SD_320, "EPSON SD-320 Mini-Floppy Disk Drive", tag, owner, clock, "epson_sd_320", __FILE__) { } @@ -1978,7 +1978,7 @@ void epson_sd_320::handled_variants(UINT32 *variants, int &var_count) const // //------------------------------------------------- -epson_sd_321::epson_sd_321(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +epson_sd_321::epson_sd_321(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : floppy_image_device(mconfig, EPSON_SD_321, "EPSON SD-321 Mini-Floppy Disk Drive", tag, owner, clock, "epson_sd_321", __FILE__) { } @@ -2013,7 +2013,7 @@ void epson_sd_321::handled_variants(UINT32 *variants, int &var_count) const // //------------------------------------------------- -sony_oa_d31v::sony_oa_d31v(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +sony_oa_d31v::sony_oa_d31v(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : floppy_image_device(mconfig, SONY_OA_D31V, "Sony OA-D31V Micro Floppydisk Drive", tag, owner, clock, "sony_oa_d31v", __FILE__) { } @@ -2048,7 +2048,7 @@ void sony_oa_d31v::handled_variants(UINT32 *variants, int &var_count) const // //------------------------------------------------- -sony_oa_d32w::sony_oa_d32w(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +sony_oa_d32w::sony_oa_d32w(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : floppy_image_device(mconfig, SONY_OA_D32W, "Sony OA-D32W Micro Floppydisk Drive", tag, owner, clock, "sony_oa_d32w", __FILE__) { } @@ -2084,7 +2084,7 @@ void sony_oa_d32w::handled_variants(UINT32 *variants, int &var_count) const // //------------------------------------------------- -sony_oa_d32v::sony_oa_d32v(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +sony_oa_d32v::sony_oa_d32v(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : floppy_image_device(mconfig, SONY_OA_D32V, "Sony OA-D32V Micro Floppydisk Drive", tag, owner, clock, "sony_oa_d32v", __FILE__) { } @@ -2118,7 +2118,7 @@ void sony_oa_d32v::handled_variants(UINT32 *variants, int &var_count) const // //------------------------------------------------- -teac_fd_55e::teac_fd_55e(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +teac_fd_55e::teac_fd_55e(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : floppy_image_device(mconfig, TEAC_FD_55F, "TEAC FD-55E FDD", tag, owner, clock, "teac_fd_55e", __FILE__) { } @@ -2153,7 +2153,7 @@ void teac_fd_55e::handled_variants(UINT32 *variants, int &var_count) const // //------------------------------------------------- -teac_fd_55f::teac_fd_55f(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +teac_fd_55f::teac_fd_55f(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : floppy_image_device(mconfig, TEAC_FD_55F, "TEAC FD-55F FDD", tag, owner, clock, "teac_fd_55f", __FILE__) { } @@ -2191,7 +2191,7 @@ void teac_fd_55f::handled_variants(UINT32 *variants, int &var_count) const // //------------------------------------------------- -teac_fd_55g::teac_fd_55g(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +teac_fd_55g::teac_fd_55g(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : floppy_image_device(mconfig, TEAC_FD_55G, "TEAC FD-55G FDD", tag, owner, clock, "teac_fd_55g", __FILE__) { } @@ -2225,7 +2225,7 @@ void teac_fd_55g::handled_variants(UINT32 *variants, int &var_count) const // used in the Commodoere 1541 disk drive //------------------------------------------------- -alps_3255190x::alps_3255190x(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +alps_3255190x::alps_3255190x(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : floppy_image_device(mconfig, ALPS_3255190x, "ALPS 32551901/32551902 Floppy Drive", tag, owner, clock, "alps_3255190x", __FILE__) { } |