Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-23 00:39:36 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Cleanup. (nw)

Browse Source
This commit is contained in:
Curt Coder 2015-05-22 22:44:48 +03:00
parent 15386fab3d
commit 518e038057
12 changed files with 452 additions and 452 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

224
src/emu/bus/cbmiec/c1541.c
View File

@ -160,17 +160,17 @@
// DEVICE DEFINITIONS
//**************************************************************************
const device_type C1540 = &device_creator<c1540_device>;
const device_type C1541 = &device_creator<c1541_device>;
const device_type C1541C = &device_creator<c1541c_device>;
const device_type C1541II = &device_creator<c1541ii_device>;
const device_type SX1541 = &device_creator<sx1541_device>;
const device_type FSD1 = &device_creator<fsd1_device>;
const device_type FSD2 = &device_creator<fsd2_device>;
const device_type CSD1 = &device_creator<csd1_device>;
const device_type C1541_DOLPHIN_DOS = &device_creator<c1541_dolphin_dos_device>;
const device_type C1541_PROFESSIONAL_DOS_V1 = &device_creator<c1541_professional_dos_v1_device>;
const device_type C1541_PROLOGIC_DOS_CLASSIC = &device_creator<c1541_prologic_dos_classic_device>;
const device_type C1540 = &device_creator<c1540_t>;
const device_type C1541 = &device_creator<c1541_t>;
const device_type C1541C = &device_creator<c1541c_t>;
const device_type C1541II = &device_creator<c1541ii_t>;
const device_type SX1541 = &device_creator<sx1541_t>;
const device_type FSD1 = &device_creator<fsd1_t>;
const device_type FSD2 = &device_creator<fsd2_t>;
const device_type CSD1 = &device_creator<csd1_t>;
const device_type C1541_DOLPHIN_DOS = &device_creator<c1541_dolphin_dos_t>;
const device_type C1541_PROFESSIONAL_DOS_V1 = &device_creator<c1541_professional_dos_v1_t>;
const device_type C1541_PROLOGIC_DOS_CLASSIC = &device_creator<c1541_prologic_dos_classic_t>;
const device_type INDUS_GT = &device_creator<indus_gt_t>;
@ -189,7 +189,7 @@ ROM_END
// rom_region - device-specific ROM region
//-------------------------------------------------
const rom_entry *c1540_device::device_rom_region() const
const rom_entry *c1540_t::device_rom_region() const
{
return ROM_NAME( c1540 );
}
@ -233,7 +233,7 @@ ROM_END
// rom_region - device-specific ROM region
//-------------------------------------------------
const rom_entry *c1541_device::device_rom_region() const
const rom_entry *c1541_t::device_rom_region() const
{
return ROM_NAME( c1541 );
}
@ -257,7 +257,7 @@ ROM_END
// rom_region - device-specific ROM region
//-------------------------------------------------
const rom_entry *c1541c_device::device_rom_region() const
const rom_entry *c1541c_t::device_rom_region() const
{
return ROM_NAME( c1541c );
}
@ -283,7 +283,7 @@ ROM_END
// rom_region - device-specific ROM region
//-------------------------------------------------
const rom_entry *c1541ii_device::device_rom_region() const
const rom_entry *c1541ii_t::device_rom_region() const
{
return ROM_NAME( c1541ii );
}
@ -311,7 +311,7 @@ ROM_END
// rom_region - device-specific ROM region
//-------------------------------------------------
const rom_entry *sx1541_device::device_rom_region() const
const rom_entry *sx1541_t::device_rom_region() const
{
return ROM_NAME( sx1541 );
}
@ -331,7 +331,7 @@ ROM_END
// rom_region - device-specific ROM region
//-------------------------------------------------
const rom_entry *fsd1_device::device_rom_region() const
const rom_entry *fsd1_t::device_rom_region() const
{
return ROM_NAME( fsd1 );
}
@ -359,7 +359,7 @@ ROM_END
// rom_region - device-specific ROM region
//-------------------------------------------------
const rom_entry *fsd2_device::device_rom_region() const
const rom_entry *fsd2_t::device_rom_region() const
{
return ROM_NAME( fsd2 );
}
@ -380,7 +380,7 @@ ROM_END
// rom_region - device-specific ROM region
//-------------------------------------------------
const rom_entry *csd1_device::device_rom_region() const
const rom_entry *csd1_t::device_rom_region() const
{
return ROM_NAME( csd1 );
}
@ -400,7 +400,7 @@ ROM_END
// rom_region - device-specific ROM region
//-------------------------------------------------
const rom_entry *c1541_dolphin_dos_device::device_rom_region() const
const rom_entry *c1541_dolphin_dos_t::device_rom_region() const
{
return ROM_NAME( c1541dd );
}
@ -421,7 +421,7 @@ ROM_END
// rom_region - device-specific ROM region
//-------------------------------------------------
const rom_entry *c1541_professional_dos_v1_device::device_rom_region() const
const rom_entry *c1541_professional_dos_v1_t::device_rom_region() const
{
return ROM_NAME( c1541pd );
}
@ -446,7 +446,7 @@ ROM_END
// rom_region - device-specific ROM region
//-------------------------------------------------
const rom_entry *c1541_prologic_dos_classic_device::device_rom_region() const
const rom_entry *c1541_prologic_dos_classic_t::device_rom_region() const
{
return ROM_NAME( c1541pdc );
}
@ -480,7 +480,7 @@ const rom_entry *indus_gt_t::device_rom_region() const
// read -
//-------------------------------------------------
READ8_MEMBER( c1541_prologic_dos_classic_device::read )
READ8_MEMBER( c1541_prologic_dos_classic_t::read )
{
return 0;
}
@ -490,7 +490,7 @@ READ8_MEMBER( c1541_prologic_dos_classic_device::read )
// write -
//-------------------------------------------------
WRITE8_MEMBER( c1541_prologic_dos_classic_device::write )
WRITE8_MEMBER( c1541_prologic_dos_classic_t::write )
{
}
@ -499,7 +499,7 @@ WRITE8_MEMBER( c1541_prologic_dos_classic_device::write )
// ADDRESS_MAP( c1541_mem )
//-------------------------------------------------
static ADDRESS_MAP_START( c1541_mem, AS_PROGRAM, 8, base_c1541_device )
static ADDRESS_MAP_START( c1541_mem, AS_PROGRAM, 8, c1541_base_t )
AM_RANGE(0x0000, 0x07ff) AM_MIRROR(0x6000) AM_RAM
AM_RANGE(0x1800, 0x180f) AM_MIRROR(0x63f0) AM_DEVREADWRITE(M6522_0_TAG, via6522_device, read, write)
AM_RANGE(0x1c00, 0x1c0f) AM_MIRROR(0x63f0) AM_DEVREADWRITE(M6522_1_TAG, via6522_device, read, write)
@ -511,7 +511,7 @@ ADDRESS_MAP_END
// ADDRESS_MAP( c1541dd_mem )
//-------------------------------------------------
static ADDRESS_MAP_START( c1541dd_mem, AS_PROGRAM, 8, base_c1541_device )
static ADDRESS_MAP_START( c1541dd_mem, AS_PROGRAM, 8, c1541_base_t )
AM_RANGE(0x0000, 0x07ff) AM_MIRROR(0x6000) AM_RAM
AM_RANGE(0x1800, 0x180f) AM_MIRROR(0x63f0) AM_DEVREADWRITE(M6522_0_TAG, via6522_device, read, write)
AM_RANGE(0x1c00, 0x1c0f) AM_MIRROR(0x63f0) AM_DEVREADWRITE(M6522_1_TAG, via6522_device, read, write)
@ -524,7 +524,7 @@ ADDRESS_MAP_END
// ADDRESS_MAP( c1541pd_mem )
//-------------------------------------------------
static ADDRESS_MAP_START( c1541pd_mem, AS_PROGRAM, 8, base_c1541_device )
static ADDRESS_MAP_START( c1541pd_mem, AS_PROGRAM, 8, c1541_base_t )
AM_RANGE(0x0000, 0x07ff) AM_MIRROR(0x6000) AM_RAM
AM_RANGE(0x1800, 0x180f) AM_MIRROR(0x63f0) AM_DEVREADWRITE(M6522_0_TAG, via6522_device, read, write)
AM_RANGE(0x1c00, 0x1c0f) AM_MIRROR(0x63f0) AM_DEVREADWRITE(M6522_1_TAG, via6522_device, read, write)
@ -539,7 +539,7 @@ ADDRESS_MAP_END
// ADDRESS_MAP( c1541pdc_mem )
//-------------------------------------------------
static ADDRESS_MAP_START( c1541pdc_mem, AS_PROGRAM, 8, c1541_prologic_dos_classic_device )
static ADDRESS_MAP_START( c1541pdc_mem, AS_PROGRAM, 8, c1541_prologic_dos_classic_t )
AM_RANGE(0x0000, 0xffff) AM_READWRITE(read, write)
/* AM_RANGE(0x0000, 0x07ff) AM_MIRROR(0x6000) AM_RAM AM_SHARE("share1")
AM_RANGE(0x1800, 0x180f) AM_MIRROR(0x63f0) AM_DEVREADWRITE(M6522_0_TAG, via6522_device, read, write)
@ -552,20 +552,20 @@ static ADDRESS_MAP_START( c1541pdc_mem, AS_PROGRAM, 8, c1541_prologic_dos_classi
ADDRESS_MAP_END
WRITE_LINE_MEMBER( base_c1541_device::via0_irq_w )
WRITE_LINE_MEMBER( c1541_base_t::via0_irq_w )
{
m_via0_irq = state;
m_maincpu->set_input_line(INPUT_LINE_IRQ0, (m_via0_irq || m_via1_irq) ? ASSERT_LINE : CLEAR_LINE);
}
READ8_MEMBER( base_c1541_device::via0_pa_r )
READ8_MEMBER( c1541_base_t::via0_pa_r )
{
// dummy read to acknowledge ATN IN interrupt
return m_parallel_data;
}
WRITE8_MEMBER( base_c1541_device::via0_pa_w )
WRITE8_MEMBER( c1541_base_t::via0_pa_w )
{
if (m_other != NULL)
{
@ -573,7 +573,7 @@ WRITE8_MEMBER( base_c1541_device::via0_pa_w )
}
}
READ8_MEMBER( base_c1541_device::via0_pb_r )
READ8_MEMBER( c1541_base_t::via0_pb_r )
{
/*
@ -607,7 +607,7 @@ READ8_MEMBER( base_c1541_device::via0_pb_r )
return data;
}
WRITE8_MEMBER( base_c1541_device::via0_pb_w )
WRITE8_MEMBER( c1541_base_t::via0_pb_w )
{
/*
@ -634,7 +634,7 @@ WRITE8_MEMBER( base_c1541_device::via0_pb_w )
m_bus->clk_w(this, !BIT(data, 3));
}
WRITE_LINE_MEMBER( base_c1541_device::via0_ca2_w )
WRITE_LINE_MEMBER( c1541_base_t::via0_ca2_w )
{
if (m_other != NULL)
{
@ -642,7 +642,7 @@ WRITE_LINE_MEMBER( base_c1541_device::via0_ca2_w )
}
}
READ8_MEMBER( c1541c_device::via0_pa_r )
READ8_MEMBER( c1541c_t::via0_pa_r )
{
/*
@ -663,14 +663,14 @@ READ8_MEMBER( c1541c_device::via0_pa_r )
}
WRITE_LINE_MEMBER( base_c1541_device::via1_irq_w )
WRITE_LINE_MEMBER( c1541_base_t::via1_irq_w )
{
m_via1_irq = state;
m_maincpu->set_input_line(INPUT_LINE_IRQ0, (m_via0_irq || m_via1_irq) ? ASSERT_LINE : CLEAR_LINE);
}
READ8_MEMBER( base_c1541_device::via1_pb_r )
READ8_MEMBER( c1541_base_t::via1_pb_r )
{
/*
@ -698,7 +698,7 @@ READ8_MEMBER( base_c1541_device::via1_pb_r )
return data;
}
WRITE8_MEMBER( base_c1541_device::via1_pb_w )
WRITE8_MEMBER( c1541_base_t::via1_pb_w )
{
/*
@ -733,12 +733,12 @@ WRITE8_MEMBER( base_c1541_device::via1_pb_w )
// C64H156_INTERFACE( ga_intf )
//-------------------------------------------------
WRITE_LINE_MEMBER( base_c1541_device::atn_w )
WRITE_LINE_MEMBER( c1541_base_t::atn_w )
{
set_iec_data();
}
WRITE_LINE_MEMBER( base_c1541_device::byte_w )
WRITE_LINE_MEMBER( c1541_base_t::byte_w )
{
m_maincpu->set_input_line(M6502_SET_OVERFLOW, state);
@ -759,23 +759,23 @@ SLOT_INTERFACE_END
// FLOPPY_FORMATS( floppy_formats )
//-------------------------------------------------
FLOPPY_FORMATS_MEMBER( base_c1541_device::floppy_formats )
FLOPPY_FORMATS_MEMBER( c1541_base_t::floppy_formats )
FLOPPY_D64_FORMAT,
FLOPPY_G64_FORMAT
FLOPPY_FORMATS_END
READ8_MEMBER( c1541_prologic_dos_classic_device::pia_r )
READ8_MEMBER( c1541_prologic_dos_classic_t::pia_r )
{
return m_pia->read(space, (offset >> 2) & 0x03);
}
WRITE8_MEMBER( c1541_prologic_dos_classic_device::pia_w )
WRITE8_MEMBER( c1541_prologic_dos_classic_t::pia_w )
{
m_pia->write(space, (offset >> 2) & 0x03, data);
}
WRITE8_MEMBER( c1541_prologic_dos_classic_device::pia_pa_w )
WRITE8_MEMBER( c1541_prologic_dos_classic_t::pia_pa_w )
{
/*
@ -793,12 +793,12 @@ WRITE8_MEMBER( c1541_prologic_dos_classic_device::pia_pa_w )
*/
}
READ8_MEMBER( c1541_prologic_dos_classic_device::pia_pb_r )
READ8_MEMBER( c1541_prologic_dos_classic_t::pia_pb_r )
{
return m_parallel_data;
}
WRITE8_MEMBER( c1541_prologic_dos_classic_device::pia_pb_w )
WRITE8_MEMBER( c1541_prologic_dos_classic_t::pia_pb_w )
{
m_parallel_data = data;
@ -816,26 +816,26 @@ static MACHINE_CONFIG_FRAGMENT( c1541 )
MCFG_QUANTUM_PERFECT_CPU(M6502_TAG)
MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL_16MHz/16)
MCFG_VIA6522_READPA_HANDLER(READ8(base_c1541_device, via0_pa_r))
MCFG_VIA6522_READPB_HANDLER(READ8(base_c1541_device, via0_pb_r))
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(base_c1541_device, via0_pa_w))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(base_c1541_device, via0_pb_w))
MCFG_VIA6522_CB2_HANDLER(WRITELINE(base_c1541_device, via0_ca2_w))
MCFG_VIA6522_IRQ_HANDLER(WRITELINE(base_c1541_device, via0_irq_w))
MCFG_VIA6522_READPA_HANDLER(READ8(c1541_base_t, via0_pa_r))
MCFG_VIA6522_READPB_HANDLER(READ8(c1541_base_t, via0_pb_r))
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(c1541_base_t, via0_pa_w))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c1541_base_t, via0_pb_w))
MCFG_VIA6522_CB2_HANDLER(WRITELINE(c1541_base_t, via0_ca2_w))
MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1541_base_t, via0_irq_w))
MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, XTAL_16MHz/16)
MCFG_VIA6522_READPA_HANDLER(DEVREAD8(C64H156_TAG, c64h156_device, yb_r))
MCFG_VIA6522_READPB_HANDLER(READ8(base_c1541_device, via1_pb_r))
MCFG_VIA6522_READPB_HANDLER(READ8(c1541_base_t, via1_pb_r))
MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8(C64H156_TAG, c64h156_device, yb_w))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(base_c1541_device, via1_pb_w))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c1541_base_t, via1_pb_w))
MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(C64H156_TAG, c64h156_device, soe_w))
MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(C64H156_TAG, c64h156_device, oe_w))
MCFG_VIA6522_IRQ_HANDLER(WRITELINE(base_c1541_device, via1_irq_w))
MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1541_base_t, via1_irq_w))
MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL_16MHz)
MCFG_64H156_ATN_CALLBACK(WRITELINE(base_c1541_device, atn_w))
MCFG_64H156_BYTE_CALLBACK(WRITELINE(base_c1541_device, byte_w))
MCFG_FLOPPY_DRIVE_ADD(C64H156_TAG":0", c1540_floppies, "525ssqd", base_c1541_device::floppy_formats)
MCFG_64H156_ATN_CALLBACK(WRITELINE(c1541_base_t, atn_w))
MCFG_64H156_BYTE_CALLBACK(WRITELINE(c1541_base_t, byte_w))
MCFG_FLOPPY_DRIVE_ADD(C64H156_TAG":0", c1540_floppies, "525ssqd", c1541_base_t::floppy_formats)
MACHINE_CONFIG_END
@ -844,7 +844,7 @@ MACHINE_CONFIG_END
// machine configurations
//-------------------------------------------------
machine_config_constructor base_c1541_device::device_mconfig_additions() const
machine_config_constructor c1541_base_t::device_mconfig_additions() const
{
return MACHINE_CONFIG_NAME( c1541 );
}
@ -864,7 +864,7 @@ MACHINE_CONFIG_END
// machine configurations
//-------------------------------------------------
machine_config_constructor c1541c_device::device_mconfig_additions() const
machine_config_constructor c1541c_t::device_mconfig_additions() const
{
return MACHINE_CONFIG_NAME( c1541c );
}
@ -887,7 +887,7 @@ MACHINE_CONFIG_END
// machine configurations
//-------------------------------------------------
machine_config_constructor c1541_dolphin_dos_device::device_mconfig_additions() const
machine_config_constructor c1541_dolphin_dos_t::device_mconfig_additions() const
{
return MACHINE_CONFIG_NAME( c1541dd );
}
@ -910,7 +910,7 @@ MACHINE_CONFIG_END
// machine configurations
//-------------------------------------------------
machine_config_constructor c1541_professional_dos_v1_device::device_mconfig_additions() const
machine_config_constructor c1541_professional_dos_v1_t::device_mconfig_additions() const
{
return MACHINE_CONFIG_NAME( c1541pd );
}
@ -927,9 +927,9 @@ static MACHINE_CONFIG_FRAGMENT( c1541pdc )
MCFG_CPU_PROGRAM_MAP(c1541pdc_mem)
MCFG_DEVICE_ADD(MC6821_TAG, PIA6821, 0)
MCFG_PIA_READPB_HANDLER(READ8(c1541_prologic_dos_classic_device, pia_pb_r))
MCFG_PIA_WRITEPA_HANDLER(WRITE8(c1541_prologic_dos_classic_device, pia_pa_w))
MCFG_PIA_WRITEPB_HANDLER(WRITE8(c1541_prologic_dos_classic_device, pia_pb_w))
MCFG_PIA_READPB_HANDLER(READ8(c1541_prologic_dos_classic_t, pia_pb_r))
MCFG_PIA_WRITEPA_HANDLER(WRITE8(c1541_prologic_dos_classic_t, pia_pa_w))
MCFG_PIA_WRITEPB_HANDLER(WRITE8(c1541_prologic_dos_classic_t, pia_pb_w))
MCFG_PIA_CA2_HANDLER(DEVWRITELINE(CENTRONICS_TAG, centronics_device, write_strobe))
MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer")
@ -943,7 +943,7 @@ MACHINE_CONFIG_END
// machine configurations
//-------------------------------------------------
machine_config_constructor c1541_prologic_dos_classic_device::device_mconfig_additions() const
machine_config_constructor c1541_prologic_dos_classic_t::device_mconfig_additions() const
{
return MACHINE_CONFIG_NAME( c1541pdc );
}
@ -967,7 +967,7 @@ INPUT_PORTS_END
// input_ports - device-specific input ports
//-------------------------------------------------
ioport_constructor base_c1541_device::device_input_ports() const
ioport_constructor c1541_base_t::device_input_ports() const
{
return INPUT_PORTS_NAME( c1541 );
}
@ -982,7 +982,7 @@ ioport_constructor base_c1541_device::device_input_ports() const
// set_iec_data -
//-------------------------------------------------
inline void base_c1541_device::set_iec_data()
inline void c1541_base_t::set_iec_data()
{
int data = !m_data_out && !m_ga->atn_r();
@ -996,10 +996,10 @@ inline void base_c1541_device::set_iec_data()
//**************************************************************************
//-------------------------------------------------
// base_c1541_device - constructor
// c1541_base_t - constructor
//-------------------------------------------------
base_c1541_device:: base_c1541_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) :
c1541_base_t:: c1541_base_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_cbm_iec_interface(mconfig, *this),
device_c64_floppy_parallel_interface(mconfig, *this),
@ -1017,91 +1017,91 @@ base_c1541_device:: base_c1541_device(const machine_config &mconfig, device_type
//-------------------------------------------------
// c1540_device - constructor
// c1540_t - constructor
//-------------------------------------------------
c1540_device::c1540_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: base_c1541_device(mconfig, C1540, "C1540", tag, owner, clock, "c1540", __FILE__) { }
c1540_t::c1540_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: c1541_base_t(mconfig, C1540, "C1540", tag, owner, clock, "c1540", __FILE__) { }
//-------------------------------------------------
// c1541_device - constructor
// c1541_t - constructor
//-------------------------------------------------
c1541_device::c1541_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: base_c1541_device(mconfig, C1541, "C1541", tag, owner, clock, "c1541", __FILE__) { }
c1541_t::c1541_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: c1541_base_t(mconfig, C1541, "C1541", tag, owner, clock, "c1541", __FILE__) { }
//-------------------------------------------------
// c1541c_device - constructor
// c1541c_t - constructor
//-------------------------------------------------
c1541c_device::c1541c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: base_c1541_device(mconfig, C1541C, "C1541C", tag, owner, clock, "c1541c", __FILE__) { }
c1541c_t::c1541c_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: c1541_base_t(mconfig, C1541C, "C1541C", tag, owner, clock, "c1541c", __FILE__) { }
//-------------------------------------------------
// c1541ii_device - constructor
// c1541ii_t - constructor
//-------------------------------------------------
c1541ii_device::c1541ii_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: base_c1541_device(mconfig, C1541II, "C1541-II", tag, owner, clock, "c1541ii", __FILE__) { }
c1541ii_t::c1541ii_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: c1541_base_t(mconfig, C1541II, "C1541-II", tag, owner, clock, "c1541ii", __FILE__) { }
//-------------------------------------------------
// sx1541_device - constructor
// sx1541_t - constructor
//-------------------------------------------------
sx1541_device::sx1541_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: base_c1541_device(mconfig, SX1541, "SX1541", tag, owner, clock, "sx1541", __FILE__) { }
sx1541_t::sx1541_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: c1541_base_t(mconfig, SX1541, "SX1541", tag, owner, clock, "sx1541", __FILE__) { }
//-------------------------------------------------
// fsd1_device - constructor
// fsd1_t - constructor
//-------------------------------------------------
fsd1_device::fsd1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: base_c1541_device(mconfig, FSD1, "FSD-1", tag, owner, clock, "fsd1", __FILE__) { }
fsd1_t::fsd1_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: c1541_base_t(mconfig, FSD1, "FSD-1", tag, owner, clock, "fsd1", __FILE__) { }
//-------------------------------------------------
// fsd2_device - constructor
// fsd2_t - constructor
//-------------------------------------------------
fsd2_device::fsd2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: base_c1541_device(mconfig, FSD2, "FSD-2", tag, owner, clock, "fsd2", __FILE__) { }
fsd2_t::fsd2_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: c1541_base_t(mconfig, FSD2, "FSD-2", tag, owner, clock, "fsd2", __FILE__) { }
//-------------------------------------------------
// csd1_device - constructor
// csd1_t - constructor
//-------------------------------------------------
csd1_device::csd1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: base_c1541_device(mconfig, CSD1, "CSD-1", tag, owner, clock, "csd1", __FILE__) { }
csd1_t::csd1_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: c1541_base_t(mconfig, CSD1, "CSD-1", tag, owner, clock, "csd1", __FILE__) { }
//-------------------------------------------------
// c1541_dolphin_dos_device - constructor
// c1541_dolphin_dos_t - constructor
//-------------------------------------------------
c1541_dolphin_dos_device::c1541_dolphin_dos_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: base_c1541_device(mconfig, C1541_DOLPHIN_DOS, "C1541 Dolphin-DOS 2.0", tag, owner, clock, "c1541dd", __FILE__) { }
c1541_dolphin_dos_t::c1541_dolphin_dos_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: c1541_base_t(mconfig, C1541_DOLPHIN_DOS, "C1541 Dolphin-DOS 2.0", tag, owner, clock, "c1541dd", __FILE__) { }
//-------------------------------------------------
// c1541_professional_dos_v1_device - constructor
// c1541_professional_dos_v1_t - constructor
//-------------------------------------------------
c1541_professional_dos_v1_device::c1541_professional_dos_v1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: base_c1541_device(mconfig, C1541_PROFESSIONAL_DOS_V1, "C1541 Professional-DOS v1", tag, owner, clock, "c1541pd", __FILE__) { }
c1541_professional_dos_v1_t::c1541_professional_dos_v1_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: c1541_base_t(mconfig, C1541_PROFESSIONAL_DOS_V1, "C1541 Professional-DOS v1", tag, owner, clock, "c1541pd", __FILE__) { }
//-------------------------------------------------
// c1541_prologic_dos_classic_device - constructor
// c1541_prologic_dos_classic_t - constructor
//-------------------------------------------------
c1541_prologic_dos_classic_device::c1541_prologic_dos_classic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: base_c1541_device(mconfig, C1541_PROLOGIC_DOS_CLASSIC, "C1541 ProLogic-DOS Classic", tag, owner, clock, "c1541pdc", __FILE__),
c1541_prologic_dos_classic_t::c1541_prologic_dos_classic_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: c1541_base_t(mconfig, C1541_PROLOGIC_DOS_CLASSIC, "C1541 ProLogic-DOS Classic", tag, owner, clock, "c1541pdc", __FILE__),
m_pia(*this, MC6821_TAG),
m_cent_data_out(*this, "cent_data_out"),
m_mmu_rom(*this, "mmu")
@ -1114,14 +1114,14 @@ c1541_prologic_dos_classic_device::c1541_prologic_dos_classic_device(const machi
//-------------------------------------------------
indus_gt_t::indus_gt_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: base_c1541_device(mconfig, INDUS_GT, "Indus GT", tag, owner, clock, "indusgt", __FILE__) { }
: c1541_base_t(mconfig, INDUS_GT, "Indus GT", tag, owner, clock, "indusgt", __FILE__) { }
//-------------------------------------------------
// device_start - device-specific startup
//-------------------------------------------------
void base_c1541_device::device_start()
void c1541_base_t::device_start()
{
// install image callbacks
m_ga->set_floppy(m_floppy);
@ -1132,9 +1132,9 @@ void base_c1541_device::device_start()
save_item(NAME(m_via1_irq));
}
void fsd2_device::device_start()
void fsd2_t::device_start()
{
base_c1541_device::device_start();
c1541_base_t::device_start();
// decrypt ROM
UINT8 *rom = memregion(M6502_TAG)->base();
@ -1152,7 +1152,7 @@ void fsd2_device::device_start()
// device_reset - device-specific reset
//-------------------------------------------------
void base_c1541_device::device_reset()
void c1541_base_t::device_reset()
{
m_maincpu->reset();
@ -1169,7 +1169,7 @@ void base_c1541_device::device_reset()
// iec_atn_w -
//-------------------------------------------------
void base_c1541_device::cbm_iec_atn(int state)
void c1541_base_t::cbm_iec_atn(int state)
{
m_via0->write_ca1(!state);
m_ga->atni_w(!state);
@ -1182,7 +1182,7 @@ void base_c1541_device::cbm_iec_atn(int state)
// iec_reset_w -
//-------------------------------------------------
void base_c1541_device::cbm_iec_reset(int state)
void c1541_base_t::cbm_iec_reset(int state)
{
if (!state)
{
@ -1195,7 +1195,7 @@ void base_c1541_device::cbm_iec_reset(int state)
// parallel_data_w -
//-------------------------------------------------
void base_c1541_device::parallel_data_w(UINT8 data)
void c1541_base_t::parallel_data_w(UINT8 data)
{
m_parallel_data = data;
}
@ -1205,7 +1205,7 @@ void base_c1541_device::parallel_data_w(UINT8 data)
// parallel_strobe_w -
//-------------------------------------------------
void base_c1541_device::parallel_strobe_w(int state)
void c1541_base_t::parallel_strobe_w(int state)
{
m_via0->write_cb1(state);
}

78
src/emu/bus/cbmiec/c1541.h
View File

@ -34,15 +34,15 @@
// TYPE DEFINITIONS
//**************************************************************************
// ======================> base_c1541_device
// ======================> c1541_base_t
class base_c1541_device : public device_t,
public device_cbm_iec_interface,
public device_c64_floppy_parallel_interface
class c1541_base_t : public device_t,
public device_cbm_iec_interface,
public device_c64_floppy_parallel_interface
{
public:
// construction/destruction
base_c1541_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);
c1541_base_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const;
@ -99,39 +99,39 @@ protected:
};
// ======================> c1540_device
// ======================> c1540_t
class c1540_device : public base_c1541_device
class c1540_t : public c1541_base_t
{
public:
// construction/destruction
c1540_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
c1540_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const;
};
// ======================> c1541_device
// ======================> c1541_t
class c1541_device : public base_c1541_device
class c1541_t : public c1541_base_t
{
public:
// construction/destruction
c1541_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
c1541_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const;
};
// ======================> c1541c_device
// ======================> c1541c_t
class c1541c_device : public base_c1541_device
class c1541c_t : public c1541_base_t
{
public:
// construction/destruction
c1541c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
c1541c_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const;
@ -142,52 +142,52 @@ public:
};
// ======================> c1541ii_device
// ======================> c1541ii_t
class c1541ii_device : public base_c1541_device
class c1541ii_t : public c1541_base_t
{
public:
// construction/destruction
c1541ii_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
c1541ii_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const;
};
// ======================> sx1541_device
// ======================> sx1541_t
class sx1541_device : public base_c1541_device
class sx1541_t : public c1541_base_t
{
public:
// construction/destruction
sx1541_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
sx1541_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const;
};
// ======================> fsd1_device
// ======================> fsd1_t
class fsd1_device : public base_c1541_device
class fsd1_t : public c1541_base_t
{
public:
// construction/destruction
fsd1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
fsd1_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const;
};
// ======================> fsd2_device
// ======================> fsd2_t
class fsd2_device : public base_c1541_device
class fsd2_t : public c1541_base_t
{
public:
// construction/destruction
fsd2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
fsd2_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const;
@ -197,26 +197,26 @@ public:
};
// ======================> csd1_device
// ======================> csd1_t
class csd1_device : public base_c1541_device
class csd1_t : public c1541_base_t
{
public:
// construction/destruction
csd1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
csd1_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const;
};
// ======================> c1541_dolphin_dos_device
// ======================> c1541_dolphin_dos_t
class c1541_dolphin_dos_device : public base_c1541_device
class c1541_dolphin_dos_t : public c1541_base_t
{
public:
// construction/destruction
c1541_dolphin_dos_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
c1541_dolphin_dos_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const;
@ -224,13 +224,13 @@ public:
};
// ======================> c1541_professional_dos_v1_device
// ======================> c1541_professional_dos_v1_t
class c1541_professional_dos_v1_device : public base_c1541_device
class c1541_professional_dos_v1_t : public c1541_base_t
{
public:
// construction/destruction
c1541_professional_dos_v1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
c1541_professional_dos_v1_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const;
@ -238,13 +238,13 @@ public:
};
// ======================> c1541_prologic_dos_classic_device
// ======================> c1541_prologic_dos_classic_t
class c1541_prologic_dos_classic_device : public base_c1541_device
class c1541_prologic_dos_classic_t : public c1541_base_t
{
public:
// construction/destruction
c1541_prologic_dos_classic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
c1541_prologic_dos_classic_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const;
@ -270,7 +270,7 @@ protected:
// ======================> indus_gt_t
class indus_gt_t : public base_c1541_device
class indus_gt_t : public c1541_base_t
{
public:
// construction/destruction

238
src/emu/bus/cbmiec/c1571.c
View File

@ -43,10 +43,10 @@
// DEVICE DEFINITIONS
//**************************************************************************
const device_type C1570 = &device_creator<c1570_device>;
const device_type C1571 = &device_creator<c1571_device>;
const device_type C1571CR = &device_creator<c1571cr_device>;
const device_type MINI_CHIEF = &device_creator<mini_chief_device>;
const device_type C1570 = &device_creator<c1570_t>;
const device_type C1571 = &device_creator<c1571_t>;
const device_type C1571CR = &device_creator<c1571cr_t>;
const device_type MINI_CHIEF = &device_creator<mini_chief_t>;
//-------------------------------------------------
@ -63,7 +63,7 @@ ROM_END
// rom_region - device-specific ROM region
//-------------------------------------------------
const rom_entry *c1570_device::device_rom_region() const
const rom_entry *c1570_t::device_rom_region() const
{
return ROM_NAME( c1570 );
}
@ -89,7 +89,7 @@ ROM_END
// rom_region - device-specific ROM region
//-------------------------------------------------
const rom_entry *c1571_device::device_rom_region() const
const rom_entry *c1571_t::device_rom_region() const
{
return ROM_NAME( c1571 );
}
@ -113,7 +113,7 @@ ROM_END
// rom_region - device-specific ROM region
//-------------------------------------------------
const rom_entry *c1571cr_device::device_rom_region() const
const rom_entry *c1571cr_t::device_rom_region() const
{
return ROM_NAME( c1571cr );
}
@ -133,7 +133,7 @@ ROM_END
// rom_region - device-specific ROM region
//-------------------------------------------------
const rom_entry *mini_chief_device::device_rom_region() const
const rom_entry *mini_chief_t::device_rom_region() const
{
return ROM_NAME( minichief );
}
@ -143,7 +143,7 @@ const rom_entry *mini_chief_device::device_rom_region() const
// ADDRESS_MAP( c1571_mem )
//-------------------------------------------------
static ADDRESS_MAP_START( c1571_mem, AS_PROGRAM, 8, c1571_device )
static ADDRESS_MAP_START( c1571_mem, AS_PROGRAM, 8, c1571_t )
AM_RANGE(0x0000, 0x07ff) AM_RAM
AM_RANGE(0x1800, 0x180f) AM_MIRROR(0x03f0) AM_DEVREADWRITE(M6522_0_TAG, via6522_device, read, write)
AM_RANGE(0x1c00, 0x1c0f) AM_MIRROR(0x03f0) AM_READWRITE(via1_r, via1_w)
@ -157,7 +157,7 @@ ADDRESS_MAP_END
// ADDRESS_MAP( mini_chief_mem )
//-------------------------------------------------
static ADDRESS_MAP_START( mini_chief_mem, AS_PROGRAM, 8, mini_chief_device )
static ADDRESS_MAP_START( mini_chief_mem, AS_PROGRAM, 8, mini_chief_t )
AM_RANGE(0x0000, 0x07ff) AM_RAM
AM_RANGE(0x1800, 0x180f) AM_MIRROR(0x03f0) AM_DEVREADWRITE(M6522_0_TAG, via6522_device, read, write)
AM_RANGE(0x1c00, 0x1c0f) AM_MIRROR(0x03f0) AM_READWRITE(via1_r, via1_w)
@ -169,14 +169,14 @@ static ADDRESS_MAP_START( mini_chief_mem, AS_PROGRAM, 8, mini_chief_device )
ADDRESS_MAP_END
WRITE_LINE_MEMBER( c1571_device::via0_irq_w )
WRITE_LINE_MEMBER( c1571_t::via0_irq_w )
{
m_via0_irq = state;
m_maincpu->set_input_line(INPUT_LINE_IRQ0, (m_via0_irq || m_via1_irq || m_cia_irq) ? ASSERT_LINE : CLEAR_LINE);
}
READ8_MEMBER( c1571_device::via0_pa_r )
READ8_MEMBER( c1571_t::via0_pa_r )
{
/*
@ -204,7 +204,7 @@ READ8_MEMBER( c1571_device::via0_pa_r )
return data;
}
WRITE8_MEMBER( c1571_device::via0_pa_w )
WRITE8_MEMBER( c1571_t::via0_pa_w )
{
/*
@ -249,7 +249,7 @@ WRITE8_MEMBER( c1571_device::via0_pa_w )
update_iec();
}
WRITE8_MEMBER( c1571cr_device::via0_pa_w )
WRITE8_MEMBER( c1571cr_t::via0_pa_w )
{
/*
@ -286,7 +286,7 @@ WRITE8_MEMBER( c1571cr_device::via0_pa_w )
}
}
READ8_MEMBER( c1571_device::via0_pb_r )
READ8_MEMBER( c1571_t::via0_pb_r )
{
/*
@ -320,7 +320,7 @@ READ8_MEMBER( c1571_device::via0_pb_r )
return data;
}
WRITE8_MEMBER( c1571_device::via0_pb_w )
WRITE8_MEMBER( c1571_t::via0_pb_w )
{
/*
@ -349,7 +349,7 @@ WRITE8_MEMBER( c1571_device::via0_pb_w )
update_iec();
}
WRITE8_MEMBER( c1571cr_device::via0_pb_w )
WRITE8_MEMBER( c1571cr_t::via0_pb_w )
{
/*
@ -379,7 +379,7 @@ WRITE8_MEMBER( c1571cr_device::via0_pb_w )
}
READ8_MEMBER( c1571_device::via1_r )
READ8_MEMBER( c1571_t::via1_r )
{
UINT8 data = m_via1->read(space, offset);
@ -389,7 +389,7 @@ READ8_MEMBER( c1571_device::via1_r )
return data;
}
WRITE8_MEMBER( c1571_device::via1_w )
WRITE8_MEMBER( c1571_t::via1_w )
{
m_via1->write(space, offset, data);
@ -397,14 +397,14 @@ WRITE8_MEMBER( c1571_device::via1_w )
m_ga->ted_w(1);
}
WRITE_LINE_MEMBER( c1571_device::via1_irq_w )
WRITE_LINE_MEMBER( c1571_t::via1_irq_w )
{
m_via1_irq = state;
m_maincpu->set_input_line(INPUT_LINE_IRQ0, (m_via0_irq || m_via1_irq || m_cia_irq) ? ASSERT_LINE : CLEAR_LINE);
}
READ8_MEMBER( c1571_device::via1_pb_r )
READ8_MEMBER( c1571_t::via1_pb_r )
{
/*
@ -432,7 +432,7 @@ READ8_MEMBER( c1571_device::via1_pb_r )
return data;
}
WRITE8_MEMBER( c1571_device::via1_pb_w )
WRITE8_MEMBER( c1571_t::via1_pb_w )
{
/*
@ -467,14 +467,14 @@ WRITE8_MEMBER( c1571_device::via1_pb_w )
// MOS6526_INTERFACE( cia_intf )
//-------------------------------------------------
WRITE_LINE_MEMBER( c1571_device::cia_irq_w )
WRITE_LINE_MEMBER( c1571_t::cia_irq_w )
{
m_cia_irq = state;
m_maincpu->set_input_line(INPUT_LINE_IRQ0, (m_via0_irq || m_via1_irq || m_cia_irq) ? ASSERT_LINE : CLEAR_LINE);
}
WRITE_LINE_MEMBER( c1571_device::cia_pc_w )
WRITE_LINE_MEMBER( c1571_t::cia_pc_w )
{
if (m_other != NULL)
{
@ -482,26 +482,26 @@ WRITE_LINE_MEMBER( c1571_device::cia_pc_w )
}
}
WRITE_LINE_MEMBER( c1571_device::cia_cnt_w )
WRITE_LINE_MEMBER( c1571_t::cia_cnt_w )
{
m_cnt_out = state;
update_iec();
}
WRITE_LINE_MEMBER( c1571_device::cia_sp_w )
WRITE_LINE_MEMBER( c1571_t::cia_sp_w )
{
m_sp_out = state;
update_iec();
}
READ8_MEMBER( c1571_device::cia_pb_r )
READ8_MEMBER( c1571_t::cia_pb_r )
{
return m_parallel_data;
}
WRITE8_MEMBER( c1571_device::cia_pb_w )
WRITE8_MEMBER( c1571_t::cia_pb_w )
{
if (m_other != NULL)
{
@ -514,19 +514,19 @@ WRITE8_MEMBER( c1571_device::cia_pb_w )
// MOS6526_INTERFACE( mini_chief_cia_intf )
//-------------------------------------------------
READ8_MEMBER( mini_chief_device::cia_pa_r )
READ8_MEMBER( mini_chief_t::cia_pa_r )
{
// TODO read from ISA bus @ 0x320 | A2 A1 A0
return 0;
}
WRITE8_MEMBER( mini_chief_device::cia_pa_w )
WRITE8_MEMBER( mini_chief_t::cia_pa_w )
{
// TODO write to ISA bus @ 0x320 | A2 A1 A0
}
WRITE8_MEMBER( mini_chief_device::cia_pb_w )
WRITE8_MEMBER( mini_chief_t::cia_pb_w )
{
/*
@ -549,7 +549,7 @@ WRITE8_MEMBER( mini_chief_device::cia_pb_w )
// C64H156_INTERFACE( ga_intf )
//-------------------------------------------------
WRITE_LINE_MEMBER( c1571_device::byte_w )
WRITE_LINE_MEMBER( c1571_t::byte_w )
{
m_via1->write_ca1(state);
@ -570,7 +570,7 @@ SLOT_INTERFACE_END
// floppy_interface c1571_floppy_interface
//-------------------------------------------------
void c1571_device::wpt_callback(floppy_image_device *floppy, int state)
void c1571_t::wpt_callback(floppy_image_device *floppy, int state)
{
m_via0->write_ca2(!state);
}
@ -580,7 +580,7 @@ void c1571_device::wpt_callback(floppy_image_device *floppy, int state)
// FLOPPY_FORMATS( floppy_formats )
//-------------------------------------------------
FLOPPY_FORMATS_MEMBER( c1571_device::floppy_formats )
FLOPPY_FORMATS_MEMBER( c1571_t::floppy_formats )
FLOPPY_D64_FORMAT,
FLOPPY_G64_FORMAT,
FLOPPY_D71_FORMAT
@ -605,33 +605,33 @@ static MACHINE_CONFIG_FRAGMENT( c1570 )
MCFG_QUANTUM_PERFECT_CPU(M6502_TAG)
MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL_16MHz/16)
MCFG_VIA6522_READPA_HANDLER(READ8(c1571_device, via0_pa_r))
MCFG_VIA6522_READPB_HANDLER(READ8(c1571_device, via0_pb_r))
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(c1571_device, via0_pa_w))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c1571_device, via0_pb_w))
MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1571_device, via0_irq_w))
MCFG_VIA6522_READPA_HANDLER(READ8(c1571_t, via0_pa_r))
MCFG_VIA6522_READPB_HANDLER(READ8(c1571_t, via0_pb_r))
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(c1571_t, via0_pa_w))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c1571_t, via0_pb_w))
MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1571_t, via0_irq_w))
MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, XTAL_16MHz/16)
MCFG_VIA6522_READPA_HANDLER(DEVREAD8(C64H156_TAG, c64h156_device, yb_r))
MCFG_VIA6522_READPB_HANDLER(READ8(c1571_device, via1_pb_r))
MCFG_VIA6522_READPB_HANDLER(READ8(c1571_t, via1_pb_r))
MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8(C64H156_TAG, c64h156_device, yb_w))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c1571_device, via1_pb_w))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c1571_t, via1_pb_w))
MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(C64H156_TAG, c64h156_device, soe_w))
MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(C64H156_TAG, c64h156_device, oe_w))
MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1571_device, via1_irq_w))
MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1571_t, via1_irq_w))
MCFG_DEVICE_ADD(M6526_TAG, MOS6526, XTAL_16MHz/16)
MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(c1571_device, cia_irq_w))
MCFG_MOS6526_CNT_CALLBACK(WRITELINE(c1571_device, cia_cnt_w))
MCFG_MOS6526_SP_CALLBACK(WRITELINE(c1571_device, cia_sp_w))
MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(c1571_device, cia_pb_r))
MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(c1571_device, cia_pb_w))
MCFG_MOS6526_PC_CALLBACK(WRITELINE(c1571_device, cia_pc_w))
MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(c1571_t, cia_irq_w))
MCFG_MOS6526_CNT_CALLBACK(WRITELINE(c1571_t, cia_cnt_w))
MCFG_MOS6526_SP_CALLBACK(WRITELINE(c1571_t, cia_sp_w))
MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(c1571_t, cia_pb_r))
MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(c1571_t, cia_pb_w))
MCFG_MOS6526_PC_CALLBACK(WRITELINE(c1571_t, cia_pc_w))
MCFG_WD1770x_ADD(WD1770_TAG, XTAL_16MHz/2)
MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL_16MHz)
MCFG_64H156_BYTE_CALLBACK(WRITELINE(c1571_device, byte_w))
MCFG_FLOPPY_DRIVE_ADD(C64H156_TAG":0", c1571_floppies, "525qd", c1571_device::floppy_formats)
MCFG_64H156_BYTE_CALLBACK(WRITELINE(c1571_t, byte_w))
MCFG_FLOPPY_DRIVE_ADD(C64H156_TAG":0", c1571_floppies, "525qd", c1571_t::floppy_formats)
MACHINE_CONFIG_END
@ -640,7 +640,7 @@ MACHINE_CONFIG_END
// machine configurations
//-------------------------------------------------
machine_config_constructor c1570_device::device_mconfig_additions() const
machine_config_constructor c1570_t::device_mconfig_additions() const
{
return MACHINE_CONFIG_NAME( c1570 );
}
@ -656,33 +656,33 @@ static MACHINE_CONFIG_FRAGMENT( c1571 )
MCFG_QUANTUM_PERFECT_CPU(M6502_TAG)
MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL_16MHz/16)
MCFG_VIA6522_READPA_HANDLER(READ8(c1571_device, via0_pa_r))
MCFG_VIA6522_READPB_HANDLER(READ8(c1571_device, via0_pb_r))
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(c1571_device, via0_pa_w))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c1571_device, via0_pb_w))
MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1571_device, via0_irq_w))
MCFG_VIA6522_READPA_HANDLER(READ8(c1571_t, via0_pa_r))
MCFG_VIA6522_READPB_HANDLER(READ8(c1571_t, via0_pb_r))
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(c1571_t, via0_pa_w))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c1571_t, via0_pb_w))
MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1571_t, via0_irq_w))
MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, XTAL_16MHz/16)
MCFG_VIA6522_READPA_HANDLER(DEVREAD8(C64H156_TAG, c64h156_device, yb_r))
MCFG_VIA6522_READPB_HANDLER(READ8(c1571_device, via1_pb_r))
MCFG_VIA6522_READPB_HANDLER(READ8(c1571_t, via1_pb_r))
MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8(C64H156_TAG, c64h156_device, yb_w))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c1571_device, via1_pb_w))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c1571_t, via1_pb_w))
MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(C64H156_TAG, c64h156_device, soe_w))
MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(C64H156_TAG, c64h156_device, oe_w))
MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1571_device, via1_irq_w))
MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1571_t, via1_irq_w))
MCFG_DEVICE_ADD(M6526_TAG, MOS6526, XTAL_16MHz/16)
MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(c1571_device, cia_irq_w))
MCFG_MOS6526_CNT_CALLBACK(WRITELINE(c1571_device, cia_cnt_w))
MCFG_MOS6526_SP_CALLBACK(WRITELINE(c1571_device, cia_sp_w))
MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(c1571_device, cia_pb_r))
MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(c1571_device, cia_pb_w))
MCFG_MOS6526_PC_CALLBACK(WRITELINE(c1571_device, cia_pc_w))
MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(c1571_t, cia_irq_w))
MCFG_MOS6526_CNT_CALLBACK(WRITELINE(c1571_t, cia_cnt_w))
MCFG_MOS6526_SP_CALLBACK(WRITELINE(c1571_t, cia_sp_w))
MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(c1571_t, cia_pb_r))
MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(c1571_t, cia_pb_w))
MCFG_MOS6526_PC_CALLBACK(WRITELINE(c1571_t, cia_pc_w))
MCFG_WD1770x_ADD(WD1770_TAG, XTAL_16MHz/2)
MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL_16MHz)
MCFG_64H156_BYTE_CALLBACK(WRITELINE(c1571_device, byte_w))
MCFG_FLOPPY_DRIVE_ADD(C64H156_TAG":0", c1571_floppies, "525qd", c1571_device::floppy_formats)
MCFG_64H156_BYTE_CALLBACK(WRITELINE(c1571_t, byte_w))
MCFG_FLOPPY_DRIVE_ADD(C64H156_TAG":0", c1571_floppies, "525qd", c1571_t::floppy_formats)
MACHINE_CONFIG_END
@ -691,7 +691,7 @@ MACHINE_CONFIG_END
// machine configurations
//-------------------------------------------------
machine_config_constructor c1571_device::device_mconfig_additions() const
machine_config_constructor c1571_t::device_mconfig_additions() const
{
return MACHINE_CONFIG_NAME( c1571 );
}
@ -707,27 +707,27 @@ static MACHINE_CONFIG_FRAGMENT( c1571cr )
MCFG_QUANTUM_PERFECT_CPU(M6502_TAG)
MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL_16MHz/16)
MCFG_VIA6522_READPA_HANDLER(READ8(c1571_device, via0_pa_r))
MCFG_VIA6522_READPB_HANDLER(READ8(c1571_device, via0_pb_r))
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(c1571cr_device, via0_pa_w))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c1571cr_device, via0_pb_w))
MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1571_device, via0_irq_w))
MCFG_VIA6522_READPA_HANDLER(READ8(c1571_t, via0_pa_r))
MCFG_VIA6522_READPB_HANDLER(READ8(c1571_t, via0_pb_r))
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(c1571cr_t, via0_pa_w))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c1571cr_t, via0_pb_w))
MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1571_t, via0_irq_w))
MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, XTAL_16MHz/16)
MCFG_VIA6522_READPA_HANDLER(DEVREAD8(C64H156_TAG, c64h156_device, yb_r))
MCFG_VIA6522_READPB_HANDLER(READ8(c1571_device, via1_pb_r))
MCFG_VIA6522_READPB_HANDLER(READ8(c1571_t, via1_pb_r))
MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8(C64H156_TAG, c64h156_device, yb_w))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c1571_device, via1_pb_w))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c1571_t, via1_pb_w))
MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(C64H156_TAG, c64h156_device, soe_w))
MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(C64H156_TAG, c64h156_device, oe_w))
MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1571_device, via1_irq_w))
MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1571_t, via1_irq_w))
//MCFG_MOS5710_ADD(M5710_TAG, XTAL_16MHz/16, 0)
MCFG_WD1770x_ADD(WD1770_TAG, XTAL_16MHz/2)
MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL_16MHz)
MCFG_64H156_BYTE_CALLBACK(WRITELINE(c1571_device, byte_w))
MCFG_FLOPPY_DRIVE_ADD(C64H156_TAG":0", c1571_floppies, "525qd", c1571_device::floppy_formats)
MCFG_64H156_BYTE_CALLBACK(WRITELINE(c1571_t, byte_w))
MCFG_FLOPPY_DRIVE_ADD(C64H156_TAG":0", c1571_floppies, "525qd", c1571_t::floppy_formats)
MACHINE_CONFIG_END
@ -736,7 +736,7 @@ MACHINE_CONFIG_END
// machine configurations
//-------------------------------------------------
machine_config_constructor c1571cr_device::device_mconfig_additions() const
machine_config_constructor c1571cr_t::device_mconfig_additions() const
{
return MACHINE_CONFIG_NAME( c1571cr );
}
@ -752,33 +752,33 @@ static MACHINE_CONFIG_FRAGMENT( mini_chief )
MCFG_QUANTUM_PERFECT_CPU(M6502_TAG)
MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL_16MHz/16)
MCFG_VIA6522_READPA_HANDLER(READ8(c1571_device, via0_pa_r))
MCFG_VIA6522_READPB_HANDLER(READ8(c1571_device, via0_pb_r))
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(c1571_device, via0_pa_w))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c1571_device, via0_pb_w))
MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1571_device, via0_irq_w))
MCFG_VIA6522_READPA_HANDLER(READ8(c1571_t, via0_pa_r))
MCFG_VIA6522_READPB_HANDLER(READ8(c1571_t, via0_pb_r))
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(c1571_t, via0_pa_w))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c1571_t, via0_pb_w))
MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1571_t, via0_irq_w))
MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, XTAL_16MHz/16)
MCFG_VIA6522_READPA_HANDLER(DEVREAD8(C64H156_TAG, c64h156_device, yb_r))
MCFG_VIA6522_READPB_HANDLER(READ8(c1571_device, via1_pb_r))
MCFG_VIA6522_READPB_HANDLER(READ8(c1571_t, via1_pb_r))
MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8(C64H156_TAG, c64h156_device, yb_w))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c1571_device, via1_pb_w))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c1571_t, via1_pb_w))
MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(C64H156_TAG, c64h156_device, soe_w))
MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(C64H156_TAG, c64h156_device, oe_w))
MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1571_device, via1_irq_w))
MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1571_t, via1_irq_w))
MCFG_DEVICE_ADD(M6526_TAG, MOS6526, XTAL_16MHz/16)
MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(c1571_device, cia_irq_w))
MCFG_MOS6526_CNT_CALLBACK(WRITELINE(c1571_device, cia_cnt_w))
MCFG_MOS6526_SP_CALLBACK(WRITELINE(c1571_device, cia_sp_w))
MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(c1571_device, cia_pb_r))
MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(c1571_device, cia_pb_w))
MCFG_MOS6526_PC_CALLBACK(WRITELINE(c1571_device, cia_pc_w))
MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(c1571_t, cia_irq_w))
MCFG_MOS6526_CNT_CALLBACK(WRITELINE(c1571_t, cia_cnt_w))
MCFG_MOS6526_SP_CALLBACK(WRITELINE(c1571_t, cia_sp_w))
MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(c1571_t, cia_pb_r))
MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(c1571_t, cia_pb_w))
MCFG_MOS6526_PC_CALLBACK(WRITELINE(c1571_t, cia_pc_w))
MCFG_WD1770x_ADD(WD1770_TAG, XTAL_16MHz/2)
MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL_16MHz)
MCFG_64H156_BYTE_CALLBACK(WRITELINE(c1571_device, byte_w))
MCFG_FLOPPY_DRIVE_ADD(C64H156_TAG":0", c1571_floppies, "525qd", c1571_device::floppy_formats)
MCFG_64H156_BYTE_CALLBACK(WRITELINE(c1571_t, byte_w))
MCFG_FLOPPY_DRIVE_ADD(C64H156_TAG":0", c1571_floppies, "525qd", c1571_t::floppy_formats)
MCFG_DEVICE_ADD(ISA_BUS_TAG, ISA8, 0)
MCFG_ISA8_CPU(M6502_TAG)
@ -791,7 +791,7 @@ MACHINE_CONFIG_END
// machine configurations
//-------------------------------------------------
machine_config_constructor mini_chief_device::device_mconfig_additions() const
machine_config_constructor mini_chief_t::device_mconfig_additions() const
{
return MACHINE_CONFIG_NAME( mini_chief );
}
@ -815,7 +815,7 @@ INPUT_PORTS_END
// input_ports - device-specific input ports
//-------------------------------------------------
ioport_constructor c1571_device::device_input_ports() const
ioport_constructor c1571_t::device_input_ports() const
{
return INPUT_PORTS_NAME( c1571 );
}
@ -827,10 +827,10 @@ ioport_constructor c1571_device::device_input_ports() const
//**************************************************************************
//-------------------------------------------------
// c1571_device - constructor
// c1571_t - constructor
//-------------------------------------------------
c1571_device::c1571_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)
c1571_t::c1571_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_cbm_iec_interface(mconfig, *this),
device_c64_floppy_parallel_interface(mconfig, *this),
@ -853,7 +853,7 @@ c1571_device::c1571_device(const machine_config &mconfig, device_type type, cons
{
}
c1571_device::c1571_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
c1571_t::c1571_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, C1571, "C1571", tag, owner, clock, "c1571", __FILE__),
device_cbm_iec_interface(mconfig, *this),
device_c64_floppy_parallel_interface(mconfig, *this),
@ -878,31 +878,31 @@ c1571_device::c1571_device(const machine_config &mconfig, const char *tag, devic
//-------------------------------------------------
// c1570_device - constructor
// c1570_t - constructor
//-------------------------------------------------
c1570_device::c1570_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: c1571_device(mconfig, C1570, "C1570", tag, owner, clock, "c1570", __FILE__)
c1570_t::c1570_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: c1571_t(mconfig, C1570, "C1570", tag, owner, clock, "c1570", __FILE__)
{
}
//-------------------------------------------------
// c1571cr_device - constructor
// c1571cr_t - constructor
//-------------------------------------------------
c1571cr_device::c1571cr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: c1571_device(mconfig, C1571CR, "C1571CR", tag, owner, clock, "c1571cr", __FILE__)
c1571cr_t::c1571cr_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: c1571_t(mconfig, C1571CR, "C1571CR", tag, owner, clock, "c1571cr", __FILE__)
{
}
//-------------------------------------------------
// mini_chief_device - constructor
// mini_chief_t - constructor
//-------------------------------------------------
mini_chief_device::mini_chief_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: c1571_device(mconfig, MINI_CHIEF, "ICT Mini Chief", tag, owner, clock, "minichif", __FILE__)
mini_chief_t::mini_chief_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: c1571_t(mconfig, MINI_CHIEF, "ICT Mini Chief", tag, owner, clock, "minichif", __FILE__)
{
}
@ -911,12 +911,12 @@ mini_chief_device::mini_chief_device(const machine_config &mconfig, const char *
// device_start - device-specific startup
//-------------------------------------------------
void c1571_device::device_start()
void c1571_t::device_start()
{
// install image callbacks
m_ga->set_floppy(m_floppy);
//m_fdc->set_floppy(m_floppy);
m_floppy->setup_wpt_cb(floppy_image_device::wpt_cb(FUNC(c1571_device::wpt_callback), this));
m_floppy->setup_wpt_cb(floppy_image_device::wpt_cb(FUNC(c1571_t::wpt_callback), this));
// register for state saving
save_item(NAME(m_1_2mhz));
@ -934,7 +934,7 @@ void c1571_device::device_start()
// device_reset - device-specific reset
//-------------------------------------------------
void c1571_device::device_reset()
void c1571_t::device_reset()
{
m_maincpu->reset();
@ -956,7 +956,7 @@ void c1571_device::device_reset()
// cbm_iec_srq -
//-------------------------------------------------
void c1571_device::cbm_iec_srq(int state)
void c1571_t::cbm_iec_srq(int state)
{
update_iec();
}
@ -966,7 +966,7 @@ void c1571_device::cbm_iec_srq(int state)
// cbm_iec_atn -
//-------------------------------------------------
void c1571_device::cbm_iec_atn(int state)
void c1571_t::cbm_iec_atn(int state)
{
update_iec();
}
@ -976,7 +976,7 @@ void c1571_device::cbm_iec_atn(int state)
// cbm_iec_data -
//-------------------------------------------------
void c1571_device::cbm_iec_data(int state)
void c1571_t::cbm_iec_data(int state)
{
update_iec();
}
@ -986,7 +986,7 @@ void c1571_device::cbm_iec_data(int state)
// cbm_iec_reset -
//-------------------------------------------------
void c1571_device::cbm_iec_reset(int state)
void c1571_t::cbm_iec_reset(int state)
{
if (!state)
{
@ -999,7 +999,7 @@ void c1571_device::cbm_iec_reset(int state)
// parallel_data_w -
//-------------------------------------------------
void c1571_device::parallel_data_w(UINT8 data)
void c1571_t::parallel_data_w(UINT8 data)
{
m_parallel_data = data;
}
@ -1009,7 +1009,7 @@ void c1571_device::parallel_data_w(UINT8 data)
// parallel_strobe_w -
//-------------------------------------------------
void c1571_device::parallel_strobe_w(int state)
void c1571_t::parallel_strobe_w(int state)
{
m_cia->flag_w(state);
}
@ -1019,7 +1019,7 @@ void c1571_device::parallel_strobe_w(int state)
// update_iec -
//-------------------------------------------------
void c1571_device::update_iec()
void c1571_t::update_iec()
{
m_cia->cnt_w(m_ser_dir || m_bus->srq_r());
m_cia->sp_w(m_ser_dir || m_bus->data_r());

30
src/emu/bus/cbmiec/c1571.h
View File

@ -36,16 +36,16 @@
// TYPE DEFINITIONS
//**************************************************************************
// ======================> c1571_device
// ======================> c1571_t
class c1571_device : public device_t,
public device_cbm_iec_interface,
public device_c64_floppy_parallel_interface
class c1571_t : public device_t,
public device_cbm_iec_interface,
public device_c64_floppy_parallel_interface
{
public:
// construction/destruction
c1571_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);
c1571_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
c1571_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
c1571_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const;
@ -127,13 +127,13 @@ protected:
};
// ======================> c1570_device
// ======================> c1570_t
class c1570_device : public c1571_device
class c1570_t : public c1571_t
{
public:
// construction/destruction
c1570_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
c1570_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const;
@ -141,13 +141,13 @@ public:
};
// ======================> c1571cr_device
// ======================> c1571cr_t
class c1571cr_device : public c1571_device
class c1571cr_t : public c1571_t
{
public:
// construction/destruction
c1571cr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
c1571cr_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const;
@ -158,13 +158,13 @@ public:
};
// ======================> mini_chief_device
// ======================> mini_chief_t
class mini_chief_device : public c1571_device
class mini_chief_t : public c1571_t
{
public:
// construction/destruction
mini_chief_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
mini_chief_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const;

70
src/emu/bus/cbmiec/c1581.c
View File

@ -32,8 +32,8 @@
// DEVICE DEFINITIONS
//**************************************************************************
const device_type C1563 = &device_creator<c1563_device>;
const device_type C1581 = &device_creator<c1581_device>;
const device_type C1563 = &device_creator<c1563_t>;
const device_type C1581 = &device_creator<c1581_t>;
//-------------------------------------------------
@ -58,7 +58,7 @@ ROM_END
// rom_region - device-specific ROM region
//-------------------------------------------------
const rom_entry *c1581_device::device_rom_region() const
const rom_entry *c1581_t::device_rom_region() const
{
return ROM_NAME( c1581 );
}
@ -78,7 +78,7 @@ ROM_END
// rom_region - device-specific ROM region
//-------------------------------------------------
const rom_entry *c1563_device::device_rom_region() const
const rom_entry *c1563_t::device_rom_region() const
{
return ROM_NAME( c1563 );
}
@ -88,7 +88,7 @@ const rom_entry *c1563_device::device_rom_region() const
// ADDRESS_MAP( c1581_mem )
//-------------------------------------------------
static ADDRESS_MAP_START( c1581_mem, AS_PROGRAM, 8, c1581_device )
static ADDRESS_MAP_START( c1581_mem, AS_PROGRAM, 8, c1581_t )
AM_RANGE(0x0000, 0x1fff) AM_MIRROR(0x2000) AM_RAM
AM_RANGE(0x4000, 0x400f) AM_MIRROR(0x1ff0) AM_DEVREADWRITE(M8520_TAG, mos8520_device, read, write)
AM_RANGE(0x6000, 0x6003) AM_MIRROR(0x1ffc) AM_DEVREADWRITE(WD1772_TAG, wd1772_t, read, write)
@ -100,21 +100,21 @@ ADDRESS_MAP_END
// MOS8520_INTERFACE( cia_intf )
//-------------------------------------------------
WRITE_LINE_MEMBER( c1581_device::cnt_w )
WRITE_LINE_MEMBER( c1581_t::cnt_w )
{
m_cnt_out = state;
update_iec();
}
WRITE_LINE_MEMBER( c1581_device::sp_w )
WRITE_LINE_MEMBER( c1581_t::sp_w )
{
m_sp_out = state;
update_iec();
}
READ8_MEMBER( c1581_device::cia_pa_r )
READ8_MEMBER( c1581_t::cia_pa_r )
{
/*
@ -145,7 +145,7 @@ READ8_MEMBER( c1581_device::cia_pa_r )
return data;
}
WRITE8_MEMBER( c1581_device::cia_pa_w )
WRITE8_MEMBER( c1581_t::cia_pa_w )
{
/*
@ -175,7 +175,7 @@ WRITE8_MEMBER( c1581_device::cia_pa_w )
output_set_led_value(LED_ACT, BIT(data, 6));
}
READ8_MEMBER( c1581_device::cia_pb_r )
READ8_MEMBER( c1581_t::cia_pb_r )
{
/*
@ -209,7 +209,7 @@ READ8_MEMBER( c1581_device::cia_pb_r )
return data;
}
WRITE8_MEMBER( c1581_device::cia_pb_w )
WRITE8_MEMBER( c1581_t::cia_pb_w )
{
/*
@ -252,10 +252,10 @@ SLOT_INTERFACE_END
//-------------------------------------------------
// FLOPPY_FORMATS( c1581_device::floppy_formats )
// FLOPPY_FORMATS( c1581_t::floppy_formats )
//-------------------------------------------------
FLOPPY_FORMATS_MEMBER( c1581_device::floppy_formats )
FLOPPY_FORMATS_MEMBER( c1581_t::floppy_formats )
FLOPPY_D81_FORMAT
FLOPPY_FORMATS_END
@ -270,15 +270,15 @@ static MACHINE_CONFIG_FRAGMENT( c1581 )
MCFG_DEVICE_ADD(M8520_TAG, MOS8520, XTAL_16MHz/8)
MCFG_MOS6526_IRQ_CALLBACK(INPUTLINE(M6502_TAG, INPUT_LINE_IRQ0))
MCFG_MOS6526_CNT_CALLBACK(WRITELINE(c1581_device, cnt_w))
MCFG_MOS6526_SP_CALLBACK(WRITELINE(c1581_device, sp_w))
MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(c1581_device, cia_pa_r))
MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(c1581_device, cia_pa_w))
MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(c1581_device, cia_pb_r))
MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(c1581_device, cia_pb_w))
MCFG_MOS6526_CNT_CALLBACK(WRITELINE(c1581_t, cnt_w))
MCFG_MOS6526_SP_CALLBACK(WRITELINE(c1581_t, sp_w))
MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(c1581_t, cia_pa_r))
MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(c1581_t, cia_pa_w))
MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(c1581_t, cia_pb_r))
MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(c1581_t, cia_pb_w))
MCFG_WD1772x_ADD(WD1772_TAG, XTAL_16MHz/2)
MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG":0", c1581_floppies, "35dd", c1581_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG":0", c1581_floppies, "35dd", c1581_t::floppy_formats)
MACHINE_CONFIG_END
@ -287,7 +287,7 @@ MACHINE_CONFIG_END
// machine configurations
//-------------------------------------------------
machine_config_constructor c1581_device::device_mconfig_additions() const
machine_config_constructor c1581_t::device_mconfig_additions() const
{
return MACHINE_CONFIG_NAME( c1581 );
}
@ -311,7 +311,7 @@ INPUT_PORTS_END
// input_ports - device-specific input ports
//-------------------------------------------------
ioport_constructor c1581_device::device_input_ports() const
ioport_constructor c1581_t::device_input_ports() const
{
return INPUT_PORTS_NAME( c1581 );
}
@ -323,10 +323,10 @@ ioport_constructor c1581_device::device_input_ports() const
//**************************************************************************
//-------------------------------------------------
// c1581_device - constructor
// c1581_t - constructor
//-------------------------------------------------
c1581_device::c1581_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)
c1581_t::c1581_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_cbm_iec_interface(mconfig, *this),
m_maincpu(*this, M6502_TAG),
@ -342,7 +342,7 @@ c1581_device::c1581_device(const machine_config &mconfig, device_type type, cons
{
}
c1581_device::c1581_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
c1581_t::c1581_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, C1581, "C1581", tag, owner, clock, "c1581", __FILE__),
device_cbm_iec_interface(mconfig, *this),
m_maincpu(*this, M6502_TAG),
@ -360,18 +360,18 @@ c1581_device::c1581_device(const machine_config &mconfig, const char *tag, devic
//-------------------------------------------------
// c1563_device - constructor
// c1563_t - constructor
//-------------------------------------------------
c1563_device::c1563_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: c1581_device(mconfig, C1563, "C1563", tag, owner, clock, "c1563", __FILE__) { }
c1563_t::c1563_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: c1581_t(mconfig, C1563, "C1563", tag, owner, clock, "c1563", __FILE__) { }
//-------------------------------------------------
// device_start - device-specific startup
//-------------------------------------------------
void c1581_device::device_start()
void c1581_t::device_start()
{
// state saving
save_item(NAME(m_data_out));
@ -386,7 +386,7 @@ void c1581_device::device_start()
// device_reset - device-specific reset
//-------------------------------------------------
void c1581_device::device_reset()
void c1581_t::device_reset()
{
m_maincpu->reset();
@ -407,7 +407,7 @@ void c1581_device::device_reset()
// cbm_iec_srq -
//-------------------------------------------------
void c1581_device::cbm_iec_srq(int state)
void c1581_t::cbm_iec_srq(int state)
{
update_iec();
}
@ -417,7 +417,7 @@ void c1581_device::cbm_iec_srq(int state)
// cbm_iec_atn -
//-------------------------------------------------
void c1581_device::cbm_iec_atn(int state)
void c1581_t::cbm_iec_atn(int state)
{
update_iec();
}
@ -427,7 +427,7 @@ void c1581_device::cbm_iec_atn(int state)
// cbm_iec_data -
//-------------------------------------------------
void c1581_device::cbm_iec_data(int state)
void c1581_t::cbm_iec_data(int state)
{
update_iec();
}
@ -437,7 +437,7 @@ void c1581_device::cbm_iec_data(int state)
// cbm_iec_reset -
//-------------------------------------------------
void c1581_device::cbm_iec_reset(int state)
void c1581_t::cbm_iec_reset(int state)
{
if (!state)
{
@ -450,7 +450,7 @@ void c1581_device::cbm_iec_reset(int state)
// update_iec -
//-------------------------------------------------
void c1581_device::update_iec()
void c1581_t::update_iec()
{
m_cia->cnt_w(m_fast_ser_dir || m_bus->srq_r());
m_cia->sp_w(m_fast_ser_dir || m_bus->data_r());

16
src/emu/bus/cbmiec/c1581.h
View File

@ -32,15 +32,15 @@
// TYPE DEFINITIONS
//**************************************************************************
// ======================> c1581_device
// ======================> c1581_t
class c1581_device : public device_t,
public device_cbm_iec_interface
class c1581_t : public device_t,
public device_cbm_iec_interface
{
public:
// construction/destruction
c1581_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);
c1581_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
c1581_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
c1581_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const;
@ -90,13 +90,13 @@ protected:
};
// ======================> c1563_device
// ======================> c1563_t
class c1563_device : public c1581_device
class c1563_t : public c1581_t
{
public:
// construction/destruction
c1563_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
c1563_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const;

60
src/emu/bus/ieee488/c8280.c
View File

@ -35,7 +35,7 @@ enum
// DEVICE DEFINITIONS
//**************************************************************************
const device_type C8280 = &device_creator<c8280_device>;
const device_type C8280 = &device_creator<c8280_t>;
//-------------------------------------------------
@ -62,7 +62,7 @@ ROM_END
// rom_region - device-specific ROM region
//-------------------------------------------------
const rom_entry *c8280_device::device_rom_region() const
const rom_entry *c8280_t::device_rom_region() const
{
return ROM_NAME( c8280 );
}
@ -72,7 +72,7 @@ const rom_entry *c8280_device::device_rom_region() const
// ADDRESS_MAP( c8280_main_mem )
//-------------------------------------------------
static ADDRESS_MAP_START( c8280_main_mem, AS_PROGRAM, 8, c8280_device )
static ADDRESS_MAP_START( c8280_main_mem, AS_PROGRAM, 8, c8280_t )
AM_RANGE(0x0000, 0x007f) AM_MIRROR(0x100) AM_DEVICE(M6532_0_TAG, mos6532_t, ram_map)
AM_RANGE(0x0080, 0x00ff) AM_MIRROR(0x100) AM_DEVICE(M6532_1_TAG, mos6532_t, ram_map)
AM_RANGE(0x0200, 0x021f) AM_MIRROR(0xd60) AM_DEVICE(M6532_0_TAG, mos6532_t, io_map)
@ -89,7 +89,7 @@ ADDRESS_MAP_END
// ADDRESS_MAP( c8280_fdc_mem )
//-------------------------------------------------
static ADDRESS_MAP_START( c8280_fdc_mem, AS_PROGRAM, 8, c8280_device )
static ADDRESS_MAP_START( c8280_fdc_mem, AS_PROGRAM, 8, c8280_t )
ADDRESS_MAP_GLOBAL_MASK(0x1fff)
AM_RANGE(0x0000, 0x007f) AM_MIRROR(0x300) AM_RAM
AM_RANGE(0x0080, 0x0083) AM_MIRROR(0x37c) AM_DEVREADWRITE(WD1797_TAG, fd1797_t, read, write)
@ -106,7 +106,7 @@ ADDRESS_MAP_END
// riot6532 0
//-------------------------------------------------
READ8_MEMBER( c8280_device::dio_r )
READ8_MEMBER( c8280_t::dio_r )
{
/*
@ -126,7 +126,7 @@ READ8_MEMBER( c8280_device::dio_r )
return m_bus->dio_r();
}
WRITE8_MEMBER( c8280_device::dio_w )
WRITE8_MEMBER( c8280_t::dio_w )
{
/*
@ -151,7 +151,7 @@ WRITE8_MEMBER( c8280_device::dio_w )
// riot6532 1
//-------------------------------------------------
READ8_MEMBER( c8280_device::riot1_pa_r )
READ8_MEMBER( c8280_t::riot1_pa_r )
{
/*
@ -182,7 +182,7 @@ READ8_MEMBER( c8280_device::riot1_pa_r )
return data;
}
WRITE8_MEMBER( c8280_device::riot1_pa_w )
WRITE8_MEMBER( c8280_t::riot1_pa_w )
{
/*
@ -217,7 +217,7 @@ WRITE8_MEMBER( c8280_device::riot1_pa_w )
update_ieee_signals();
}
READ8_MEMBER( c8280_device::riot1_pb_r )
READ8_MEMBER( c8280_t::riot1_pb_r )
{
/*
@ -248,7 +248,7 @@ READ8_MEMBER( c8280_device::riot1_pb_r )
return data;
}
WRITE8_MEMBER( c8280_device::riot1_pb_w )
WRITE8_MEMBER( c8280_t::riot1_pb_w )
{
/*
@ -279,7 +279,7 @@ static SLOT_INTERFACE_START( c8280_floppies )
SLOT_INTERFACE( "8dsdd", FLOPPY_8_DSDD )
SLOT_INTERFACE_END
FLOPPY_FORMATS_MEMBER( c8280_device::floppy_formats )
FLOPPY_FORMATS_MEMBER( c8280_t::floppy_formats )
FLOPPY_C8280_FORMAT
FLOPPY_FORMATS_END
@ -293,14 +293,14 @@ static MACHINE_CONFIG_FRAGMENT( c8280 )
MCFG_CPU_PROGRAM_MAP(c8280_main_mem)
MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532n, XTAL_12MHz/8)
MCFG_MOS6530n_IN_PA_CB(READ8(c8280_device, dio_r))
MCFG_MOS6530n_OUT_PB_CB(WRITE8(c8280_device, dio_w))
MCFG_MOS6530n_IN_PA_CB(READ8(c8280_t, dio_r))
MCFG_MOS6530n_OUT_PB_CB(WRITE8(c8280_t, dio_w))
MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532n, XTAL_12MHz/8)
MCFG_MOS6530n_IN_PA_CB(READ8(c8280_device, riot1_pa_r))
MCFG_MOS6530n_OUT_PA_CB(WRITE8(c8280_device, riot1_pa_w))
MCFG_MOS6530n_IN_PB_CB(READ8(c8280_device, riot1_pb_r))
MCFG_MOS6530n_OUT_PB_CB(WRITE8(c8280_device, riot1_pb_w))
MCFG_MOS6530n_IN_PA_CB(READ8(c8280_t, riot1_pa_r))
MCFG_MOS6530n_OUT_PA_CB(WRITE8(c8280_t, riot1_pa_w))
MCFG_MOS6530n_IN_PB_CB(READ8(c8280_t, riot1_pb_r))
MCFG_MOS6530n_OUT_PB_CB(WRITE8(c8280_t, riot1_pb_w))
MCFG_MOS6530n_IRQ_CB(INPUTLINE(M6502_DOS_TAG, INPUT_LINE_IRQ0))
MCFG_CPU_ADD(M6502_FDC_TAG, M6502, XTAL_12MHz/8)
@ -309,8 +309,8 @@ static MACHINE_CONFIG_FRAGMENT( c8280 )
MCFG_FD1797x_ADD(WD1797_TAG, XTAL_12MHz/6)
MCFG_WD_FDC_INTRQ_CALLBACK(INPUTLINE(M6502_FDC_TAG, M6502_IRQ_LINE))
MCFG_WD_FDC_DRQ_CALLBACK(INPUTLINE(M6502_FDC_TAG, M6502_SET_OVERFLOW))
MCFG_FLOPPY_DRIVE_ADD(WD1797_TAG ":0", c8280_floppies, "8dsdd", c8280_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(WD1797_TAG ":1", c8280_floppies, "8dsdd", c8280_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(WD1797_TAG ":0", c8280_floppies, "8dsdd", c8280_t::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(WD1797_TAG ":1", c8280_floppies, "8dsdd", c8280_t::floppy_formats)
MACHINE_CONFIG_END
@ -319,7 +319,7 @@ MACHINE_CONFIG_END
// machine configurations
//-------------------------------------------------
machine_config_constructor c8280_device::device_mconfig_additions() const
machine_config_constructor c8280_t::device_mconfig_additions() const
{
return MACHINE_CONFIG_NAME( c8280 );
}
@ -347,7 +347,7 @@ INPUT_PORTS_END
// input_ports - device-specific input ports
//-------------------------------------------------
ioport_constructor c8280_device::device_input_ports() const
ioport_constructor c8280_t::device_input_ports() const
{
return INPUT_PORTS_NAME( c8280 );
}
@ -362,7 +362,7 @@ ioport_constructor c8280_device::device_input_ports() const
// update_ieee_signals -
//-------------------------------------------------
inline void c8280_device::update_ieee_signals()
inline void c8280_t::update_ieee_signals()
{
int atn = m_bus->atn_r();
int nrfd = !(!(!(atn && m_atna) && m_rfdo) || !(atn || m_atna));
@ -379,10 +379,10 @@ inline void c8280_device::update_ieee_signals()
//**************************************************************************
//-------------------------------------------------
// c8280_device - constructor
// c8280_t - constructor
//-------------------------------------------------
c8280_device::c8280_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
c8280_t::c8280_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, C8280, "C8280", tag, owner, clock, "c8280", __FILE__),
device_ieee488_interface(mconfig, *this),
m_maincpu(*this, M6502_DOS_TAG),
@ -404,7 +404,7 @@ c8280_device::c8280_device(const machine_config &mconfig, const char *tag, devic
// device_start - device-specific startup
//-------------------------------------------------
void c8280_device::device_start()
void c8280_t::device_start()
{
// state saving
save_item(NAME(m_rfdo));
@ -419,7 +419,7 @@ void c8280_device::device_start()
// device_reset - device-specific reset
//-------------------------------------------------
void c8280_device::device_reset()
void c8280_t::device_reset()
{
m_maincpu->reset();
@ -446,7 +446,7 @@ void c8280_device::device_reset()
// ieee488_atn -
//-------------------------------------------------
void c8280_device::ieee488_atn(int state)
void c8280_t::ieee488_atn(int state)
{
update_ieee_signals();
@ -458,7 +458,7 @@ void c8280_device::ieee488_atn(int state)
// ieee488_ifc -
//-------------------------------------------------
void c8280_device::ieee488_ifc(int state)
void c8280_t::ieee488_ifc(int state)
{
if (!m_ifc && state)
{
@ -468,7 +468,7 @@ void c8280_device::ieee488_ifc(int state)
m_ifc = state;
}
READ8_MEMBER( c8280_device::fk5_r )
READ8_MEMBER( c8280_t::fk5_r )
{
/*
@ -493,7 +493,7 @@ READ8_MEMBER( c8280_device::fk5_r )
return data;
}
WRITE8_MEMBER( c8280_device::fk5_w )
WRITE8_MEMBER( c8280_t::fk5_w )
{
/*

8
src/emu/bus/ieee488/c8280.h
View File

@ -24,14 +24,14 @@
// TYPE DEFINITIONS
//**************************************************************************
// ======================> c8280_device
// ======================> c8280_t
class c8280_device : public device_t,
public device_ieee488_interface
class c8280_t : public device_t,
public device_ieee488_interface
{
public:
// construction/destruction
c8280_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
c8280_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const;

80
src/emu/bus/ieee488/d9060.c
View File

@ -60,8 +60,8 @@ enum
// DEVICE DEFINITIONS
//**************************************************************************
const device_type D9060 = &device_creator<d9060_device>;
const device_type D9090 = &device_creator<d9090_device>;
const device_type D9060 = &device_creator<d9060_t>;
const device_type D9090 = &device_creator<d9090_t>;
//-------------------------------------------------
@ -98,7 +98,7 @@ ROM_END
// rom_region - device-specific ROM region
//-------------------------------------------------
const rom_entry *base_d9060_device::device_rom_region() const
const rom_entry *d9060_base_t::device_rom_region() const
{
return ROM_NAME( d9060 );
}
@ -108,7 +108,7 @@ const rom_entry *base_d9060_device::device_rom_region() const
// ADDRESS_MAP( d9060_main_mem )
//-------------------------------------------------
static ADDRESS_MAP_START( d9060_main_mem, AS_PROGRAM, 8, base_d9060_device )
static ADDRESS_MAP_START( d9060_main_mem, AS_PROGRAM, 8, d9060_base_t )
AM_RANGE(0x0000, 0x007f) AM_MIRROR(0x0100) AM_DEVICE(M6532_0_TAG, mos6532_t, ram_map)
AM_RANGE(0x0080, 0x00ff) AM_MIRROR(0x0100) AM_DEVICE(M6532_1_TAG, mos6532_t, ram_map)
AM_RANGE(0x0200, 0x021f) AM_MIRROR(0x0d60) AM_DEVICE(M6532_0_TAG, mos6532_t, io_map)
@ -125,7 +125,7 @@ ADDRESS_MAP_END
// ADDRESS_MAP( d9060_hdc_mem )
//-------------------------------------------------
static ADDRESS_MAP_START( d9060_hdc_mem, AS_PROGRAM, 8, base_d9060_device )
static ADDRESS_MAP_START( d9060_hdc_mem, AS_PROGRAM, 8, d9060_base_t )
ADDRESS_MAP_GLOBAL_MASK(0x1fff)
AM_RANGE(0x0000, 0x007f) AM_MIRROR(0x300) AM_RAM
AM_RANGE(0x0080, 0x008f) AM_MIRROR(0x380) AM_DEVREADWRITE(M6522_TAG, via6522_device, read, write)
@ -141,7 +141,7 @@ ADDRESS_MAP_END
// riot6532 0
//-------------------------------------------------
READ8_MEMBER( base_d9060_device::dio_r )
READ8_MEMBER( d9060_base_t::dio_r )
{
/*
@ -162,7 +162,7 @@ READ8_MEMBER( base_d9060_device::dio_r )
}
WRITE8_MEMBER( base_d9060_device::dio_w )
WRITE8_MEMBER( d9060_base_t::dio_w )
{
/*
@ -187,7 +187,7 @@ WRITE8_MEMBER( base_d9060_device::dio_w )
// riot6532 1
//-------------------------------------------------
READ8_MEMBER( base_d9060_device::riot1_pa_r )
READ8_MEMBER( d9060_base_t::riot1_pa_r )
{
/*
@ -218,7 +218,7 @@ READ8_MEMBER( base_d9060_device::riot1_pa_r )
return data;
}
WRITE8_MEMBER( base_d9060_device::riot1_pa_w )
WRITE8_MEMBER( d9060_base_t::riot1_pa_w )
{
/*
@ -253,7 +253,7 @@ WRITE8_MEMBER( base_d9060_device::riot1_pa_w )
update_ieee_signals();
}
READ8_MEMBER( base_d9060_device::riot1_pb_r )
READ8_MEMBER( d9060_base_t::riot1_pb_r )
{
/*
@ -284,7 +284,7 @@ READ8_MEMBER( base_d9060_device::riot1_pb_r )
return data;
}
WRITE8_MEMBER( base_d9060_device::riot1_pb_w )
WRITE8_MEMBER( d9060_base_t::riot1_pb_w )
{
/*
@ -312,7 +312,7 @@ WRITE8_MEMBER( base_d9060_device::riot1_pb_w )
}
WRITE8_MEMBER( base_d9060_device::via_pb_w )
WRITE8_MEMBER( d9060_base_t::via_pb_w )
{
/*
@ -333,12 +333,12 @@ WRITE8_MEMBER( base_d9060_device::via_pb_w )
m_sasibus->write_rst(BIT(data, 1));
}
WRITE_LINE_MEMBER( base_d9060_device::ack_w )
WRITE_LINE_MEMBER( d9060_base_t::ack_w )
{
m_sasibus->write_ack(!state);
}
WRITE_LINE_MEMBER( base_d9060_device::enable_w )
WRITE_LINE_MEMBER( d9060_base_t::enable_w )
{
m_enable = state;
@ -352,7 +352,7 @@ WRITE_LINE_MEMBER( base_d9060_device::enable_w )
}
}
WRITE8_MEMBER( base_d9060_device::scsi_data_w )
WRITE8_MEMBER( d9060_base_t::scsi_data_w )
{
m_data = data;
@ -373,14 +373,14 @@ static MACHINE_CONFIG_FRAGMENT( d9060 )
MCFG_CPU_PROGRAM_MAP(d9060_main_mem)
MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532n, XTAL_4MHz/4)
MCFG_MOS6530n_IN_PA_CB(READ8(base_d9060_device, dio_r))
MCFG_MOS6530n_OUT_PB_CB(WRITE8(base_d9060_device, dio_w))
MCFG_MOS6530n_IN_PA_CB(READ8(d9060_base_t, dio_r))
MCFG_MOS6530n_OUT_PB_CB(WRITE8(d9060_base_t, dio_w))
MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532n, XTAL_4MHz/4)
MCFG_MOS6530n_IN_PA_CB(READ8(base_d9060_device, riot1_pa_r))
MCFG_MOS6530n_OUT_PA_CB(WRITE8(base_d9060_device, riot1_pa_w))
MCFG_MOS6530n_IN_PB_CB(READ8(base_d9060_device, riot1_pb_r))
MCFG_MOS6530n_OUT_PB_CB(WRITE8(base_d9060_device, riot1_pb_w))
MCFG_MOS6530n_IN_PA_CB(READ8(d9060_base_t, riot1_pa_r))
MCFG_MOS6530n_OUT_PA_CB(WRITE8(d9060_base_t, riot1_pa_w))
MCFG_MOS6530n_IN_PB_CB(READ8(d9060_base_t, riot1_pb_r))
MCFG_MOS6530n_OUT_PB_CB(WRITE8(d9060_base_t, riot1_pb_w))
MCFG_MOS6530n_IRQ_CB(INPUTLINE(M6502_DOS_TAG, INPUT_LINE_IRQ0))
// controller
@ -388,10 +388,10 @@ static MACHINE_CONFIG_FRAGMENT( d9060 )
MCFG_CPU_PROGRAM_MAP(d9060_hdc_mem)
MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL_4MHz/4)
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(base_d9060_device, scsi_data_w))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(base_d9060_device, via_pb_w))
MCFG_VIA6522_CA2_HANDLER(WRITELINE(base_d9060_device, ack_w))
MCFG_VIA6522_CB2_HANDLER(WRITELINE(base_d9060_device, enable_w))
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(d9060_base_t, scsi_data_w))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(d9060_base_t, via_pb_w))
MCFG_VIA6522_CA2_HANDLER(WRITELINE(d9060_base_t, ack_w))
MCFG_VIA6522_CB2_HANDLER(WRITELINE(d9060_base_t, enable_w))
MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE(M6502_HDC_TAG, m6502_device, irq_line))
MCFG_DEVICE_ADD(SASIBUS_TAG, SCSI_PORT, 0)
@ -420,7 +420,7 @@ MACHINE_CONFIG_END
// machine configurations
//-------------------------------------------------
machine_config_constructor base_d9060_device::device_mconfig_additions() const
machine_config_constructor d9060_base_t::device_mconfig_additions() const
{
return MACHINE_CONFIG_NAME( d9060 );
}
@ -448,7 +448,7 @@ INPUT_PORTS_END
// input_ports - device-specific input ports
//-------------------------------------------------
ioport_constructor base_d9060_device::device_input_ports() const
ioport_constructor d9060_base_t::device_input_ports() const
{
return INPUT_PORTS_NAME( d9060 );
}
@ -463,7 +463,7 @@ ioport_constructor base_d9060_device::device_input_ports() const
// update_ieee_signals -
//-------------------------------------------------
inline void base_d9060_device::update_ieee_signals()
inline void d9060_base_t::update_ieee_signals()
{
int atn = m_bus->atn_r();
int nrfd = !(!(!(atn && m_atna) && m_rfdo) || !(atn || m_atna));
@ -480,10 +480,10 @@ inline void base_d9060_device::update_ieee_signals()
//**************************************************************************
//-------------------------------------------------
// base_d9060_device - constructor
// d9060_base_t - constructor
//-------------------------------------------------
base_d9060_device::base_d9060_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
d9060_base_t::d9060_base_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_ieee488_interface(mconfig, *this),
m_maincpu(*this, M6502_DOS_TAG),
@ -504,26 +504,26 @@ base_d9060_device::base_d9060_device(const machine_config &mconfig, device_type
//-------------------------------------------------
// d9060_device - constructor
// d9060_t - constructor
//-------------------------------------------------
d9060_device::d9060_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: base_d9060_device(mconfig, D9060, "D9060", tag, owner, clock, TYPE_9060, "d9060", __FILE__) { }
d9060_t::d9060_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: d9060_base_t(mconfig, D9060, "D9060", tag, owner, clock, TYPE_9060, "d9060", __FILE__) { }
//-------------------------------------------------
// d9090_device - constructor
// d9090_t - constructor
//-------------------------------------------------
d9090_device::d9090_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: base_d9060_device(mconfig, D9090, "D9090", tag, owner, clock, TYPE_9090, "d9090", __FILE__) { }
d9090_t::d9090_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: d9060_base_t(mconfig, D9090, "D9090", tag, owner, clock, TYPE_9090, "d9090", __FILE__) { }
//-------------------------------------------------
// device_start - device-specific startup
//-------------------------------------------------
void base_d9060_device::device_start()
void d9060_base_t::device_start()
{
// state saving
save_item(NAME(m_rfdo));
@ -540,7 +540,7 @@ void base_d9060_device::device_start()
// device_reset - device-specific reset
//-------------------------------------------------
void base_d9060_device::device_reset()
void d9060_base_t::device_reset()
{
m_maincpu->set_input_line(M6502_SET_OVERFLOW, ASSERT_LINE);
m_maincpu->set_input_line(M6502_SET_OVERFLOW, CLEAR_LINE);
@ -555,7 +555,7 @@ void base_d9060_device::device_reset()
// ieee488_atn - attention
//-------------------------------------------------
void base_d9060_device::ieee488_atn(int state)
void d9060_base_t::ieee488_atn(int state)
{
update_ieee_signals();
@ -567,7 +567,7 @@ void base_d9060_device::ieee488_atn(int state)
// ieee488_ifc - interface clear
//-------------------------------------------------
void base_d9060_device::ieee488_ifc(int state)
void d9060_base_t::ieee488_ifc(int state)
{
if (!m_ifc && state)
{

20
src/emu/bus/ieee488/d9060.h
View File

@ -25,10 +25,10 @@
//**************************************************************************
// ======================> base_d9060_device
// ======================> d9060_base_t
class base_d9060_device : public device_t,
public device_ieee488_interface
class d9060_base_t : public device_t,
public device_ieee488_interface
{
public:
enum
@ -38,7 +38,7 @@ public:
};
// construction/destruction
base_d9060_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
d9060_base_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
// optional information overrides
virtual const rom_entry *device_rom_region() const;
@ -93,23 +93,23 @@ private:
};
// ======================> d9060_device
// ======================> d9060_t
class d9060_device : public base_d9060_device
class d9060_t : public d9060_base_t
{
public:
// construction/destruction
d9060_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
d9060_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
// ======================> d9090_device
// ======================> d9090_t
class d9090_device : public base_d9060_device
class d9090_t : public d9060_base_t
{
public:
// construction/destruction
d9090_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
d9090_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};

72
src/emu/bus/plus4/c1551.c
View File

@ -26,7 +26,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
const device_type C1551 = &device_creator<c1551_device>;
const device_type C1551 = &device_creator<c1551_t>;
//-------------------------------------------------
@ -46,7 +46,7 @@ ROM_END
// rom_region - device-specific ROM region
//-------------------------------------------------
const rom_entry *c1551_device::device_rom_region() const
const rom_entry *c1551_t::device_rom_region() const
{
return ROM_NAME( c1551 );
}
@ -56,7 +56,7 @@ const rom_entry *c1551_device::device_rom_region() const
// M6510_INTERFACE( cpu_intf )
//-------------------------------------------------
READ8_MEMBER( c1551_device::port_r )
READ8_MEMBER( c1551_t::port_r )
{
/*
@ -84,7 +84,7 @@ READ8_MEMBER( c1551_device::port_r )
return data;
}
WRITE8_MEMBER( c1551_device::port_w )
WRITE8_MEMBER( c1551_t::port_w )
{
/*
@ -119,7 +119,7 @@ WRITE8_MEMBER( c1551_device::port_w )
// tpi6525_interface tpi0_intf
//-------------------------------------------------
READ8_MEMBER( c1551_device::tcbm_data_r )
READ8_MEMBER( c1551_t::tcbm_data_r )
{
/*
@ -139,7 +139,7 @@ READ8_MEMBER( c1551_device::tcbm_data_r )
return m_tcbm_data;
}
WRITE8_MEMBER( c1551_device::tcbm_data_w )
WRITE8_MEMBER( c1551_t::tcbm_data_w )
{
/*
@ -159,7 +159,7 @@ WRITE8_MEMBER( c1551_device::tcbm_data_w )
m_tcbm_data = data;
}
READ8_MEMBER( c1551_device::tpi0_r )
READ8_MEMBER( c1551_t::tpi0_r )
{
UINT8 data = m_tpi0->read(space, offset);
@ -169,7 +169,7 @@ READ8_MEMBER( c1551_device::tpi0_r )
return data;
}
WRITE8_MEMBER( c1551_device::tpi0_w )
WRITE8_MEMBER( c1551_t::tpi0_w )
{
m_tpi0->write(space, offset, data);
@ -177,7 +177,7 @@ WRITE8_MEMBER( c1551_device::tpi0_w )
m_ga->ted_w(1);
}
READ8_MEMBER( c1551_device::tpi0_pc_r )
READ8_MEMBER( c1551_t::tpi0_pc_r )
{
/*
@ -208,7 +208,7 @@ READ8_MEMBER( c1551_device::tpi0_pc_r )
return data;
}
WRITE8_MEMBER( c1551_device::tpi0_pc_w )
WRITE8_MEMBER( c1551_t::tpi0_pc_w )
{
/*
@ -242,7 +242,7 @@ WRITE8_MEMBER( c1551_device::tpi0_pc_w )
// tpi6525_interface tpi1_intf
//-------------------------------------------------
READ8_MEMBER( c1551_device::tpi1_pb_r )
READ8_MEMBER( c1551_t::tpi1_pb_r )
{
/*
@ -262,7 +262,7 @@ READ8_MEMBER( c1551_device::tpi1_pb_r )
return m_status & 0x03;
}
READ8_MEMBER( c1551_device::tpi1_pc_r )
READ8_MEMBER( c1551_t::tpi1_pc_r )
{
/*
@ -287,7 +287,7 @@ READ8_MEMBER( c1551_device::tpi1_pc_r )
return data;
}
WRITE8_MEMBER( c1551_device::tpi1_pc_w )
WRITE8_MEMBER( c1551_t::tpi1_pc_w )
{
/*
@ -312,7 +312,7 @@ WRITE8_MEMBER( c1551_device::tpi1_pc_w )
// ADDRESS_MAP( c1551_mem )
//-------------------------------------------------
static ADDRESS_MAP_START( c1551_mem, AS_PROGRAM, 8, c1551_device )
static ADDRESS_MAP_START( c1551_mem, AS_PROGRAM, 8, c1551_t )
AM_RANGE(0x0000, 0x07ff) AM_MIRROR(0x0800) AM_RAM
AM_RANGE(0x4000, 0x4007) AM_MIRROR(0x3ff8) AM_READWRITE(tpi0_r, tpi0_w)
AM_RANGE(0xc000, 0xffff) AM_ROM AM_REGION(M6510T_TAG, 0)
@ -332,7 +332,7 @@ SLOT_INTERFACE_END
// FLOPPY_FORMATS( floppy_formats )
//-------------------------------------------------
FLOPPY_FORMATS_MEMBER( c1551_device::floppy_formats )
FLOPPY_FORMATS_MEMBER( c1551_t::floppy_formats )
FLOPPY_D64_FORMAT,
FLOPPY_G64_FORMAT
FLOPPY_FORMATS_END
@ -345,27 +345,27 @@ FLOPPY_FORMATS_END
static MACHINE_CONFIG_FRAGMENT( c1551 )
MCFG_CPU_ADD(M6510T_TAG, M6510T, XTAL_16MHz/8)
MCFG_CPU_PROGRAM_MAP(c1551_mem)
MCFG_M6510T_PORT_CALLBACKS(READ8(c1551_device, port_r), WRITE8(c1551_device, port_w))
MCFG_M6510T_PORT_CALLBACKS(READ8(c1551_t, port_r), WRITE8(c1551_t, port_w))
MCFG_QUANTUM_PERFECT_CPU(M6510T_TAG)
MCFG_PLS100_ADD(PLA_TAG)
MCFG_DEVICE_ADD(M6523_0_TAG, TPI6525, 0)
MCFG_TPI6525_IN_PA_CB(READ8(c1551_device, tcbm_data_r))
MCFG_TPI6525_OUT_PA_CB(WRITE8(c1551_device, tcbm_data_w))
MCFG_TPI6525_IN_PA_CB(READ8(c1551_t, tcbm_data_r))
MCFG_TPI6525_OUT_PA_CB(WRITE8(c1551_t, tcbm_data_w))
MCFG_TPI6525_IN_PB_CB(DEVREAD8(C64H156_TAG, c64h156_device, yb_r))
MCFG_TPI6525_OUT_PB_CB(DEVWRITE8(C64H156_TAG, c64h156_device, yb_w))
MCFG_TPI6525_IN_PC_CB(READ8(c1551_device, tpi0_pc_r))
MCFG_TPI6525_OUT_PC_CB(WRITE8(c1551_device, tpi0_pc_w))
MCFG_TPI6525_IN_PC_CB(READ8(c1551_t, tpi0_pc_r))
MCFG_TPI6525_OUT_PC_CB(WRITE8(c1551_t, tpi0_pc_w))
MCFG_DEVICE_ADD(M6523_1_TAG, TPI6525, 0)
MCFG_TPI6525_IN_PA_CB(READ8(c1551_device, tcbm_data_r))
MCFG_TPI6525_OUT_PA_CB(WRITE8(c1551_device, tcbm_data_w))
MCFG_TPI6525_IN_PB_CB(READ8(c1551_device, tpi1_pb_r))
MCFG_TPI6525_IN_PC_CB(READ8(c1551_device, tpi1_pc_r))
MCFG_TPI6525_OUT_PC_CB(WRITE8(c1551_device, tpi1_pc_w))
MCFG_TPI6525_IN_PA_CB(READ8(c1551_t, tcbm_data_r))
MCFG_TPI6525_OUT_PA_CB(WRITE8(c1551_t, tcbm_data_w))
MCFG_TPI6525_IN_PB_CB(READ8(c1551_t, tpi1_pb_r))
MCFG_TPI6525_IN_PC_CB(READ8(c1551_t, tpi1_pc_r))
MCFG_TPI6525_OUT_PC_CB(WRITE8(c1551_t, tpi1_pc_w))
MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL_16MHz)
MCFG_64H156_BYTE_CALLBACK(DEVWRITELINE(C64H156_TAG, c64h156_device, atni_w))
MCFG_FLOPPY_DRIVE_ADD(C64H156_TAG":0", c1551_floppies, "525ssqd", c1551_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(C64H156_TAG":0", c1551_floppies, "525ssqd", c1551_t::floppy_formats)
MCFG_PLUS4_PASSTHRU_EXPANSION_SLOT_ADD()
MACHINE_CONFIG_END
@ -376,7 +376,7 @@ MACHINE_CONFIG_END
// machine configurations
//-------------------------------------------------
machine_config_constructor c1551_device::device_mconfig_additions() const
machine_config_constructor c1551_t::device_mconfig_additions() const
{
return MACHINE_CONFIG_NAME( c1551 );
}
@ -398,7 +398,7 @@ INPUT_PORTS_END
// input_ports - device-specific input ports
//-------------------------------------------------
ioport_constructor c1551_device::device_input_ports() const
ioport_constructor c1551_t::device_input_ports() const
{
return INPUT_PORTS_NAME( c1551 );
}
@ -410,10 +410,10 @@ ioport_constructor c1551_device::device_input_ports() const
//**************************************************************************
//-------------------------------------------------
// c1551_device - constructor
// c1551_t - constructor
//-------------------------------------------------
c1551_device::c1551_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
c1551_t::c1551_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, C1551, "C1551", tag, owner, clock, "c1551", __FILE__),
device_plus4_expansion_card_interface(mconfig, *this),
m_maincpu(*this, M6510T_TAG),
@ -437,7 +437,7 @@ c1551_device::c1551_device(const machine_config &mconfig, const char *tag, devic
// device_start - device-specific startup
//-------------------------------------------------
void c1551_device::device_start()
void c1551_t::device_start()
{
// allocate timers
m_irq_timer = timer_alloc();
@ -459,7 +459,7 @@ void c1551_device::device_start()
// device_reset - device-specific reset
//-------------------------------------------------
void c1551_device::device_reset()
void c1551_t::device_reset()
{
m_maincpu->reset();
@ -479,7 +479,7 @@ void c1551_device::device_reset()
// device_timer - handler timer events
//-------------------------------------------------
void c1551_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
void c1551_t::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
{
m_maincpu->set_input_line(M6502_IRQ_LINE, param);
@ -500,7 +500,7 @@ void c1551_device::device_timer(emu_timer &timer, device_timer_id id, int param,
// tpi1_selected -
//-------------------------------------------------
bool c1551_device::tpi1_selected(offs_t offset)
bool c1551_t::tpi1_selected(offs_t offset)
{
#ifdef PLA_DUMPED
int mux = 0, ras = 0, phi0 = 0, f7 = 0;
@ -524,7 +524,7 @@ bool c1551_device::tpi1_selected(offs_t offset)
// plus4_cd_r - cartridge data read
//-------------------------------------------------
UINT8 c1551_device::plus4_cd_r(address_space &space, offs_t offset, UINT8 data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h)
UINT8 c1551_t::plus4_cd_r(address_space &space, offs_t offset, UINT8 data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h)
{
data = m_exp->cd_r(space, offset, data, ba, cs0, c1l, c2l, cs1, c1h, c2h);
@ -541,7 +541,7 @@ UINT8 c1551_device::plus4_cd_r(address_space &space, offs_t offset, UINT8 data,
// plus4_cd_w - cartridge data write
//-------------------------------------------------
void c1551_device::plus4_cd_w(address_space &space, offs_t offset, UINT8 data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h)
void c1551_t::plus4_cd_w(address_space &space, offs_t offset, UINT8 data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h)
{
if (tpi1_selected(offset))
{

8
src/emu/bus/plus4/c1551.h
View File

@ -24,14 +24,14 @@
// TYPE DEFINITIONS
//**************************************************************************
// ======================> c1551_device
// ======================> c1551_t
class c1551_device : public device_t,
public device_plus4_expansion_card_interface
class c1551_t : public device_t,
public device_plus4_expansion_card_interface
{
public:
// construction/destruction
c1551_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
c1551_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const;