From a81a5dac636dbe4adf30c1759ea3192629a41bdb Mon Sep 17 00:00:00 2001 From: AJR Date: Fri, 29 Mar 2019 18:50:23 -0400 Subject: flopdrv: Eliminate floppy_get_count (nw) --- src/devices/imagedev/flopdrv.cpp | 10 ---------- src/devices/imagedev/flopdrv.h | 2 -- src/mame/drivers/apple2gs.cpp | 2 +- src/mame/machine/thomflop.cpp | 25 +++++++++++-------------- 4 files changed, 12 insertions(+), 27 deletions(-) diff --git a/src/devices/imagedev/flopdrv.cpp b/src/devices/imagedev/flopdrv.cpp index cc8f693ca84..bf42b1070ea 100644 --- a/src/devices/imagedev/flopdrv.cpp +++ b/src/devices/imagedev/flopdrv.cpp @@ -533,16 +533,6 @@ int floppy_get_drive_by_type(legacy_floppy_image_device *image,int ftype) return -1; } -int floppy_get_count(running_machine &machine) -{ - int cnt = 0; - if (machine.device(FLOPPY_0)) cnt++; - if (machine.device(FLOPPY_1)) cnt++; - if (machine.device(FLOPPY_2)) cnt++; - if (machine.device(FLOPPY_3)) cnt++; - return cnt; -} - /* drive select 0 */ WRITE_LINE_MEMBER( legacy_floppy_image_device::floppy_ds0_w ) diff --git a/src/devices/imagedev/flopdrv.h b/src/devices/imagedev/flopdrv.h index 5751365260d..97ae6a77859 100644 --- a/src/devices/imagedev/flopdrv.h +++ b/src/devices/imagedev/flopdrv.h @@ -1,7 +1,6 @@ // license:BSD-3-Clause // copyright-holders:Nathan Woods, Miodrag Milanovic /* flopdrv provides simple emulation of a disc drive */ -/* the 8271, upd765 and wd179x use this */ #ifndef MAME_DEVICES_IMAGEDV_FLOPDRV_H #define MAME_DEVICES_IMAGEDV_FLOPDRV_H @@ -251,6 +250,5 @@ protected: legacy_floppy_image_device *floppy_get_device(running_machine &machine,int drive); legacy_floppy_image_device *floppy_get_device_by_type(running_machine &machine,int ftype,int drive); int floppy_get_drive_by_type(legacy_floppy_image_device *image,int ftype); -int floppy_get_count(running_machine &machine); #endif // MAME_DEVICES_IMAGEDV_FLOPDRV_H diff --git a/src/mame/drivers/apple2gs.cpp b/src/mame/drivers/apple2gs.cpp index 7830a9601f2..02c24e34e1e 100644 --- a/src/mame/drivers/apple2gs.cpp +++ b/src/mame/drivers/apple2gs.cpp @@ -4042,7 +4042,7 @@ READ8_MEMBER(apple2gs_state::doc_adc_read) int apple2gs_state::apple2_fdc_has_35() { - return (floppy_get_count(machine())); // - apple525_get_count(machine)) > 0; + return device_type_iterator(*this).count(); // - apple525_get_count(machine)) > 0; } int apple2gs_state::apple2_fdc_has_525() diff --git a/src/mame/machine/thomflop.cpp b/src/mame/machine/thomflop.cpp index 2f935851f88..d5f8f5713f2 100644 --- a/src/mame/machine/thomflop.cpp +++ b/src/mame/machine/thomflop.cpp @@ -412,12 +412,11 @@ void thomson_state::to7_5p14_index_pulse_callback( int state ) void thomson_state::to7_5p14sd_reset() { - int i; LOG(( "to7_5p14sd_reset: CD 90-015 controller\n" )); - for ( i = 0; i < floppy_get_count( machine() ); i++ ) + for (auto &img : m_floppy_image) { - legacy_floppy_image_device * img = floppy_get_device( machine(), i ); - if (img) { + if (img.found()) + { img->floppy_drive_set_ready_state( FLOPPY_DRIVE_READY, 0 ); img->floppy_drive_set_rpm( 300. ); img->floppy_drive_seek( - img->floppy_drive_get_current_track() ); @@ -521,7 +520,7 @@ void thomson_state::to7_qdd_index_pulse_cb( int state ) legacy_floppy_image_device * thomson_state::to7_qdd_image() { - return floppy_get_device( machine(), 0 ); + return m_floppy_image[0].target(); } @@ -807,13 +806,12 @@ WRITE8_MEMBER( thomson_state::to7_qdd_w ) void thomson_state::to7_qdd_reset() { - int i; LOG(( "to7_qdd_reset: CQ 90-028 controller\n" )); - for ( i = 0; i < floppy_get_count( machine() ); i++ ) + for (auto &img : m_floppy_image) { - legacy_floppy_image_device * img = floppy_get_device( machine(), i ); - if (img) { + if (img.found()) + { img->floppy_drive_set_ready_state( FLOPPY_DRIVE_READY, 0 ); motor_on = CLEAR_LINE; @@ -916,7 +914,7 @@ static emu_timer* thmfc_floppy_cmd; legacy_floppy_image_device * thomson_state::thmfc_floppy_image() { - return floppy_get_device( machine(), thmfc1->drive ); + return m_floppy_image[thmfc1->drive].target(); } @@ -1498,13 +1496,12 @@ WRITE8_MEMBER( thomson_state::thmfc_floppy_w ) void thomson_state::thmfc_floppy_reset() { - int i; LOG(( "thmfc_floppy_reset: THMFC1 controller\n" )); - for ( i = 0; i < floppy_get_count( machine() ); i++ ) + for (auto &img : m_floppy_image) { - legacy_floppy_image_device * img = floppy_get_device( machine(), i ); - if (img) { + if (img.found()) + { img->floppy_drive_set_ready_state( FLOPPY_DRIVE_READY, 0 ); img->floppy_drive_seek( - img->floppy_drive_get_current_track() ); } -- cgit v1.2.3-70-g09d2