From b1c2c8daeeca433652f2a5055c9aeef27406c520 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Wed, 2 Apr 2014 11:59:10 +0000 Subject: modernized access for legacy floppy, quite straight forward thing (nw) --- src/mess/drivers/apf.c | 6 +++--- src/mess/drivers/fm7.c | 4 ++-- src/mess/drivers/mbc200.c | 8 ++++---- src/mess/drivers/ms0515.c | 2 +- src/mess/drivers/myb3k.c | 4 ++-- src/mess/drivers/mz2000.c | 4 ++-- src/mess/drivers/mz2500.c | 4 ++-- src/mess/drivers/rainbow.c | 20 ++++++++++---------- src/mess/drivers/smc777.c | 6 +++--- src/mess/drivers/thomson.c | 8 ++++---- src/mess/drivers/unixpc.c | 2 +- src/mess/drivers/vtech1.c | 2 +- src/mess/drivers/x1.c | 4 ++-- src/mess/drivers/z100.c | 4 ++-- 14 files changed, 39 insertions(+), 39 deletions(-) (limited to 'src/mess/drivers') diff --git a/src/mess/drivers/apf.c b/src/mess/drivers/apf.c index 60d92fdceeb..eecaa789820 100644 --- a/src/mess/drivers/apf.c +++ b/src/mess/drivers/apf.c @@ -260,9 +260,9 @@ WRITE8_MEMBER( apf_state::apf_dischw_w) m_fdc->set_drive(drive); floppy_image_legacy *floppy; - floppy = flopimg_get_image(floppy_get_device(machine(), drive)); - floppy_mon_w(floppy_get_device(machine(), drive), (floppy != NULL) ? 0 : 1); - floppy_drive_set_ready_state(floppy_get_device(machine(), drive), (floppy != NULL) ? 1 : 0,0); + floppy = floppy_get_device(machine(), drive)->flopimg_get_image(); + floppy_get_device(machine(), drive)->floppy_mon_w((floppy != NULL) ? 0 : 1); + floppy_get_device(machine(), drive)->floppy_drive_set_ready_state((floppy != NULL) ? 1 : 0,0); logerror("disc w %04x %04x\n",offset,data); diff --git a/src/mess/drivers/fm7.c b/src/mess/drivers/fm7.c index 96ea5e47b79..fd694d2b626 100644 --- a/src/mess/drivers/fm7.c +++ b/src/mess/drivers/fm7.c @@ -492,8 +492,8 @@ WRITE8_MEMBER(fm7_state::fm7_fdc_w) else { m_fdc->set_drive(data & 0x03); - floppy_mon_w(floppy_get_device(machine(), data & 0x03), !BIT(data, 7)); - floppy_drive_set_ready_state(floppy_get_device(machine(), data & 0x03), data & 0x80,0); + floppy_get_device(machine(), data & 0x03)->floppy_mon_w(!BIT(data, 7)); + floppy_get_device(machine(), data & 0x03)->floppy_drive_set_ready_state(data & 0x80,0); logerror("FDC: wrote %02x to 0x%04x (drive)\n",data,offset+0xfd18); } break; diff --git a/src/mess/drivers/mbc200.c b/src/mess/drivers/mbc200.c index b541abbd996..707dab8f473 100644 --- a/src/mess/drivers/mbc200.c +++ b/src/mess/drivers/mbc200.c @@ -127,10 +127,10 @@ INPUT_PORTS_END void mbc200_state::machine_start() { - floppy_mon_w(m_floppy0, CLEAR_LINE); - floppy_mon_w(m_floppy1, CLEAR_LINE); - floppy_drive_set_ready_state(m_floppy0, 1, 1); - floppy_drive_set_ready_state(m_floppy1, 1, 1); + m_floppy0->floppy_mon_w(CLEAR_LINE); + m_floppy1->floppy_mon_w(CLEAR_LINE); + m_floppy0->floppy_drive_set_ready_state(1, 1); + m_floppy1->floppy_drive_set_ready_state(1, 1); } MC6845_UPDATE_ROW( mbc200_update_row ) diff --git a/src/mess/drivers/ms0515.c b/src/mess/drivers/ms0515.c index 7de11d248f9..0317a9e7797 100644 --- a/src/mess/drivers/ms0515.c +++ b/src/mess/drivers/ms0515.c @@ -126,7 +126,7 @@ void ms0515_state::machine_reset() m_video_ram = ram + 0000000 + 0340000; m_blink = 0; - floppy_mon_w(machine().device(FLOPPY_0), 0); // turn it on + machine().device(FLOPPY_0)->floppy_mon_w(0); // turn it on } /* Input ports */ diff --git a/src/mess/drivers/myb3k.c b/src/mess/drivers/myb3k.c index ba169605f98..b787756d52b 100644 --- a/src/mess/drivers/myb3k.c +++ b/src/mess/drivers/myb3k.c @@ -127,8 +127,8 @@ WRITE8_MEMBER( myb3k_state::myb3k_fdc_output_w ) { /* TODO: complete guesswork! (it just does a 0x24 -> 0x20 in there) */ m_fdc->set_drive(data & 3); - floppy_mon_w(floppy_get_device(machine(), data & 3), !(data & 4) ? 1: 0); - floppy_drive_set_ready_state(floppy_get_device(machine(), data & 3), data & 0x4,0); + floppy_get_device(machine(), data & 3)->floppy_mon_w(!(data & 4) ? 1: 0); + floppy_get_device(machine(), data & 3)->floppy_drive_set_ready_state(data & 0x4,0); //m_fdc->set_side((data & 0x10)>>4); } diff --git a/src/mess/drivers/mz2000.c b/src/mess/drivers/mz2000.c index b9305d6013d..dbb7265127c 100644 --- a/src/mess/drivers/mz2000.c +++ b/src/mess/drivers/mz2000.c @@ -360,8 +360,8 @@ WRITE8_MEMBER(mz2000_state::mz2000_fdc_w) { case 0xdc: m_mb8877a->set_drive(data & 3); - floppy_mon_w(floppy_get_device(machine(), data & 3), (data & 0x80) ? CLEAR_LINE : ASSERT_LINE); - floppy_drive_set_ready_state(floppy_get_device(machine(), data & 3), 1,0); + floppy_get_device(machine(), data & 3)->floppy_mon_w((data & 0x80) ? CLEAR_LINE : ASSERT_LINE); + floppy_get_device(machine(), data & 3)->floppy_drive_set_ready_state(1,0); break; case 0xdd: m_mb8877a->set_side((data & 1)); diff --git a/src/mess/drivers/mz2500.c b/src/mess/drivers/mz2500.c index 0fcff111998..96168b24fa5 100644 --- a/src/mess/drivers/mz2500.c +++ b/src/mess/drivers/mz2500.c @@ -1190,8 +1190,8 @@ WRITE8_MEMBER(mz2500_state::mz2500_fdc_w) { case 0xdc: fdc->set_drive(data & 3); - floppy_mon_w(floppy_get_device(machine(), data & 3), (data & 0x80) ? CLEAR_LINE : ASSERT_LINE); - floppy_drive_set_ready_state(floppy_get_device(machine(), data & 3), 1,0); + floppy_get_device(machine(), data & 3)->floppy_mon_w((data & 0x80) ? CLEAR_LINE : ASSERT_LINE); + floppy_get_device(machine(), data & 3)->floppy_drive_set_ready_state(1,0); break; case 0xdd: fdc->set_side((data & 1)); diff --git a/src/mess/drivers/rainbow.c b/src/mess/drivers/rainbow.c index f2f0d4fc492..a618ec3b545 100644 --- a/src/mess/drivers/rainbow.c +++ b/src/mess/drivers/rainbow.c @@ -326,7 +326,7 @@ private: virtual void machine_reset(); int m_unit; - device_t *m_image[4]; + legacy_floppy_image_device *m_image[4]; int m_irq_high; UINT32 m_irq_mask; @@ -335,10 +335,10 @@ private: void rainbow_state::machine_start() { - m_image[0] = subdevice(FLOPPY_0); - m_image[1] = subdevice(FLOPPY_1); - m_image[2] = subdevice(FLOPPY_2); - m_image[3] = subdevice(FLOPPY_3); + m_image[0] = subdevice(FLOPPY_0); + m_image[1] = subdevice(FLOPPY_1); + m_image[2] = subdevice(FLOPPY_2); + m_image[3] = subdevice(FLOPPY_3); COLD_BOOT = 1; @@ -863,9 +863,9 @@ D0 : ZFLIP L: (read from the diagnostic control register of Z80A) NOTES: ALL LOW ACTIVE - EXCEPT TR00 */ // * TRACK 00 * signal for current drive - int tk00 = ( floppy_tk00_r( m_image[m_unit] ) == CLEAR_LINE ) ? 0x20 : 0x00; + int tk00 = ( m_image[m_unit]->floppy_tk00_r() == CLEAR_LINE ) ? 0x20 : 0x00; - int fdc_ready = floppy_drive_get_flag_state( m_image[m_unit] , FLOPPY_DRIVE_READY); + int fdc_ready = m_image[m_unit]->floppy_drive_get_flag_state( FLOPPY_DRIVE_READY); int data=( 0x80 | // (STEP L) // ( (fdc_write_gate) ) | @@ -958,7 +958,7 @@ WRITE8_MEMBER(rainbow_state::z80_diskcontrol_w) int selected_drive = 255; - if (flopimg_get_image( floppy_get_device( machine(), drive ) ) != NULL) + if (floppy_get_device( machine(), drive )->flopimg_get_image() != NULL) { selected_drive = drive; m_fdc->set_drive(selected_drive); } @@ -987,10 +987,10 @@ WRITE8_MEMBER(rainbow_state::z80_diskcontrol_w) { // Although 1773 does not feature 'motor on' this statement is required: // CLEAR_LINE = turn motor on - - floppy_mon_w(m_image[f_num], (f_num == selected_drive) ? CLEAR_LINE : ASSERT_LINE); + m_image[f_num]->floppy_mon_w((f_num == selected_drive) ? CLEAR_LINE : ASSERT_LINE); // Parameters: DRIVE, STATE, FLAG - floppy_drive_set_ready_state( m_image[f_num], + m_image[f_num]->floppy_drive_set_ready_state( (f_num == selected_drive) ? 1 : 0, (f_num == selected_drive) ? force_ready : 0 ); diff --git a/src/mess/drivers/smc777.c b/src/mess/drivers/smc777.c index 624219c8e08..a2d9cb76558 100644 --- a/src/mess/drivers/smc777.c +++ b/src/mess/drivers/smc777.c @@ -389,9 +389,9 @@ void smc777_state::check_floppy_inserted() /* FIXME: floppy drive 1 doesn't work? */ for(f_num=0;f_num<2;f_num++) { - floppy = flopimg_get_image(floppy_get_device(machine(), f_num)); - floppy_mon_w(floppy_get_device(machine(), f_num), (floppy != NULL) ? 0 : 1); - floppy_drive_set_ready_state(floppy_get_device(machine(), f_num), (floppy != NULL) ? 1 : 0,0); + floppy = floppy_get_device(machine(), f_num)->flopimg_get_image(); + floppy_get_device(machine(), f_num)->floppy_mon_w((floppy != NULL) ? 0 : 1); + floppy_get_device(machine(), f_num)->floppy_drive_set_ready_state((floppy != NULL) ? 1 : 0,0); } } diff --git a/src/mess/drivers/thomson.c b/src/mess/drivers/thomson.c index edaef42e427..2ddad236297 100644 --- a/src/mess/drivers/thomson.c +++ b/src/mess/drivers/thomson.c @@ -566,22 +566,22 @@ INPUT_PORTS_END WRITE_LINE_MEMBER( thomson_state::fdc_index_0_w ) { - thomson_index_callback(machine().device(FLOPPY_0), state); + thomson_index_callback(machine().device(FLOPPY_0), state); } WRITE_LINE_MEMBER( thomson_state::fdc_index_1_w ) { - thomson_index_callback(machine().device(FLOPPY_1), state); + thomson_index_callback(machine().device(FLOPPY_1), state); } WRITE_LINE_MEMBER( thomson_state::fdc_index_2_w ) { - thomson_index_callback(machine().device(FLOPPY_2), state); + thomson_index_callback(machine().device(FLOPPY_2), state); } WRITE_LINE_MEMBER( thomson_state::fdc_index_3_w ) { - thomson_index_callback(machine().device(FLOPPY_3), state); + thomson_index_callback(machine().device(FLOPPY_3), state); } static const floppy_interface thomson_floppy_interface_0 = diff --git a/src/mess/drivers/unixpc.c b/src/mess/drivers/unixpc.c index 50467ed9a0e..9e5e8dfb6a5 100644 --- a/src/mess/drivers/unixpc.c +++ b/src/mess/drivers/unixpc.c @@ -117,7 +117,7 @@ WRITE16_MEMBER( unixpc_state::disk_control_w ) { logerror("disk_control_w: %04x\n", data); - floppy_mon_w(m_floppy, !BIT(data, 5)); + m_floppy->floppy_mon_w(!BIT(data, 5)); // bit 6 = floppy selected / not selected m_wd2797->set_drive(0); diff --git a/src/mess/drivers/vtech1.c b/src/mess/drivers/vtech1.c index 5bb0f676869..7c0d10b3691 100644 --- a/src/mess/drivers/vtech1.c +++ b/src/mess/drivers/vtech1.c @@ -669,7 +669,7 @@ DRIVER_INIT_MEMBER(vtech1_state,vtech1) for(id=0;id<2;id++) { - floppy_install_load_proc(floppy_get_device(machine(), id), vtech1_load_proc); + floppy_get_device(machine(), id)->floppy_install_load_proc(vtech1_load_proc); } } diff --git a/src/mess/drivers/x1.c b/src/mess/drivers/x1.c index d01194ed654..810820f8d3f 100644 --- a/src/mess/drivers/x1.c +++ b/src/mess/drivers/x1.c @@ -1037,8 +1037,8 @@ WRITE8_MEMBER( x1_state::x1_fdc_w ) break; case 0x0ffc: m_fdc->set_drive(data & 3); - floppy_mon_w(floppy_get_device(machine(), data & 3), !BIT(data, 7)); - floppy_drive_set_ready_state(floppy_get_device(machine(), data & 3), data & 0x80,0); + floppy_get_device(machine(), data & 3)->floppy_mon_w(!BIT(data, 7)); + floppy_get_device(machine(), data & 3)->floppy_drive_set_ready_state(data & 0x80,0); m_fdc->set_side(BIT(data, 4)); break; case 0x0ffd: diff --git a/src/mess/drivers/z100.c b/src/mess/drivers/z100.c index ed97b353bbd..706e38c813f 100644 --- a/src/mess/drivers/z100.c +++ b/src/mess/drivers/z100.c @@ -380,8 +380,8 @@ WRITE8_MEMBER( z100_state::z207_fdc_w ) m_z207_cur_drive = data & 3; break; case 5: // aux control - floppy_mon_w(floppy_get_device(machine(), m_z207_cur_drive), !BIT(data, 1)); - floppy_drive_set_ready_state(floppy_get_device(machine(), m_z207_cur_drive), data & 2,0); + floppy_get_device(machine(), m_z207_cur_drive)->floppy_mon_w(!BIT(data, 1)); + floppy_get_device(machine(), m_z207_cur_drive)->floppy_drive_set_ready_state(data & 2,0); break; } -- cgit v1.2.3