From db1759b74cb42b1971d85238238d3542cc3fb223 Mon Sep 17 00:00:00 2001 From: Curt Coder Date: Thu, 6 Dec 2012 08:50:17 +0000 Subject: [PATCH] (MESS) v1050: Fixed floppy variant. (nw) --- src/mess/drivers/v1050.c | 8 ++++---- src/mess/includes/v1050.h | 4 +--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/mess/drivers/v1050.c b/src/mess/drivers/v1050.c index f5d24af43e9..c7d677fed40 100644 --- a/src/mess/drivers/v1050.c +++ b/src/mess/drivers/v1050.c @@ -459,7 +459,7 @@ static ADDRESS_MAP_START( v1050_io, AS_IO, 8, v1050_state ) AM_RANGE(0x8c, 0x8c) AM_DEVREADWRITE(I8251A_SIO_TAG, i8251_device, data_r, data_w) AM_RANGE(0x8d, 0x8d) AM_DEVREADWRITE(I8251A_SIO_TAG, i8251_device, status_r, control_w) AM_RANGE(0x90, 0x93) AM_DEVREADWRITE(I8255A_MISC_TAG, i8255_device, read, write) - AM_RANGE(0x94, 0x97) AM_DEVREADWRITE(MB8877_TAG, fd1793_t, read, write) + AM_RANGE(0x94, 0x97) AM_DEVREADWRITE(MB8877_TAG, mb8877_t, read, write) AM_RANGE(0x9c, 0x9f) AM_DEVREADWRITE(I8255A_RTC_TAG, i8255_device, read, write) AM_RANGE(0xa0, 0xa0) AM_READWRITE(vint_clr_r, vint_clr_w) AM_RANGE(0xb0, 0xb0) AM_READWRITE(dint_clr_r, dint_clr_w) @@ -999,8 +999,8 @@ void v1050_state::machine_start() address_space &program = m_maincpu->space(AS_PROGRAM); // floppy callbacks - m_fdc->setup_intrq_cb(fd1793_t::line_cb(FUNC(v1050_state::fdc_intrq_w), this)); - m_fdc->setup_drq_cb(fd1793_t::line_cb(FUNC(v1050_state::fdc_drq_w), this)); + m_fdc->setup_intrq_cb(wd_fdc_t::line_cb(FUNC(v1050_state::fdc_intrq_w), this)); + m_fdc->setup_drq_cb(wd_fdc_t::line_cb(FUNC(v1050_state::fdc_drq_w), this)); // initialize I8214 m_pic->etlg_w(1); @@ -1087,7 +1087,7 @@ static MACHINE_CONFIG_START( v1050, v1050_state ) MCFG_I8255A_ADD(I8255A_M6502_TAG, m6502_ppi_intf) MCFG_I8251_ADD(I8251A_KB_TAG, /*XTAL_16MHz/8,*/ kb_8251_intf) MCFG_I8251_ADD(I8251A_SIO_TAG, /*XTAL_16MHz/8,*/ sio_8251_intf) - MCFG_FD1793x_ADD(MB8877_TAG, XTAL_16MHz/16) + MCFG_MB8877x_ADD(MB8877_TAG, XTAL_16MHz/16) MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":0", v1050_floppies, "525dd", NULL, floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":1", v1050_floppies, "525dd", NULL, floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":2", v1050_floppies, NULL, NULL, floppy_image_device::default_floppy_formats) diff --git a/src/mess/includes/v1050.h b/src/mess/includes/v1050.h index 65ef56ee860..d582a31d142 100644 --- a/src/mess/includes/v1050.h +++ b/src/mess/includes/v1050.h @@ -7,8 +7,6 @@ #include "emu.h" #include "cpu/z80/z80.h" #include "cpu/m6502/m6502.h" -#include "imagedev/flopdrv.h" -#include "formats/basicdsk.h" #include "machine/ctronics.h" #include "machine/i8214.h" #include "machine/i8251.h" @@ -89,7 +87,7 @@ public: required_device m_rtc; required_device m_uart_kb; required_device m_uart_sio; - required_device m_fdc; + required_device m_fdc; required_device m_crtc; required_device m_centronics; required_device m_ram;