mirror of
https://github.com/mamedev/mame.git
synced 2024-11-16 07:48:32 +01:00
lux21046: Cleanup. (nw)
This commit is contained in:
Curt Coder
parent
96468022ed
commit
4d3621ed1f
2 changed files with 125 additions and 119 deletions
|
|
@ -94,12 +94,12 @@ Notes:
|
|||
// DEVICE DEFINITIONS
|
||||
//**************************************************************************
|
||||
|
||||
const device_type LUXOR_55_21046 = &device_creator<luxor_55_21046_device>;
|
||||
const device_type ABC830 = &device_creator<abc830_device>;
|
||||
const device_type ABC832 = &device_creator<abc832_device>;
|
||||
const device_type ABC834 = &device_creator<abc834_device>;
|
||||
const device_type LUXOR_55_21046 = &device_creator<luxor_55_21046_t>;
|
||||
const device_type ABC830 = &device_creator<abc830_t>;
|
||||
const device_type ABC832 = &device_creator<abc832_t>;
|
||||
const device_type ABC834 = &device_creator<abc834_t>;
|
||||
const device_type ABC838 = &device_creator<abc838_device>;
|
||||
const device_type ABC850_FLOPPY = &device_creator<abc850_floppy_device>;
|
||||
const device_type ABC850_FLOPPY = &device_creator<abc850_floppy_t>;
|
||||
|
||||
|
||||
//-------------------------------------------------
|
||||
|
|
@ -108,7 +108,7 @@ const device_type ABC850_FLOPPY = &device_creator<abc850_floppy_device>;
|
|||
|
||||
ROM_START( luxor_55_21046 )
|
||||
ROM_REGION( 0x4000, Z80_TAG, 0 )
|
||||
ROM_DEFAULT_BIOS( "v107" )
|
||||
ROM_DEFAULT_BIOS( "v207" )
|
||||
ROM_SYSTEM_BIOS( 0, "v105", "Luxor v1.05 (1984-10-04)" )
|
||||
ROMX_LOAD( "cntr 105.6cd", 0x2000, 0x2000, CRC(44043025) SHA1(17487ca35b399bb49d4015bbeede0809db8e772f), ROM_BIOS(1) )
|
||||
ROM_SYSTEM_BIOS( 1, "v107", "Luxor v1.07 (1985-07-03)" )
|
||||
|
|
@ -127,7 +127,7 @@ ROM_END
|
|||
// rom_region - device-specific ROM region
|
||||
//-------------------------------------------------
|
||||
|
||||
const tiny_rom_entry *luxor_55_21046_device::device_rom_region() const
|
||||
const tiny_rom_entry *luxor_55_21046_t::device_rom_region() const
|
||||
{
|
||||
return ROM_NAME( luxor_55_21046 );
|
||||
}
|
||||
|
|
@ -137,7 +137,7 @@ const tiny_rom_entry *luxor_55_21046_device::device_rom_region() const
|
|||
// ADDRESS_MAP( luxor_55_21046_mem )
|
||||
//-------------------------------------------------
|
||||
|
||||
static ADDRESS_MAP_START( luxor_55_21046_mem, AS_PROGRAM, 8, luxor_55_21046_device )
|
||||
static ADDRESS_MAP_START( luxor_55_21046_mem, AS_PROGRAM, 8, luxor_55_21046_t )
|
||||
ADDRESS_MAP_UNMAP_HIGH
|
||||
ADDRESS_MAP_GLOBAL_MASK(0x3fff)
|
||||
AM_RANGE(0x0000, 0x1fff) AM_ROM AM_REGION(Z80_TAG, 0x2000) // A13 pull-up
|
||||
|
|
@ -149,7 +149,7 @@ ADDRESS_MAP_END
|
|||
// ADDRESS_MAP( luxor_55_21046_io )
|
||||
//-------------------------------------------------
|
||||
|
||||
static ADDRESS_MAP_START( luxor_55_21046_io, AS_IO, 8, luxor_55_21046_device )
|
||||
static ADDRESS_MAP_START( luxor_55_21046_io, AS_IO, 8, luxor_55_21046_t )
|
||||
ADDRESS_MAP_UNMAP_HIGH
|
||||
AM_RANGE(0x0c, 0x0c) AM_MIRROR(0xff03) AM_READ(out_r)
|
||||
AM_RANGE(0x1c, 0x1c) AM_MIRROR(0xff03) AM_WRITE(inp_w)
|
||||
|
|
@ -222,7 +222,7 @@ ADDRESS_MAP_END
|
|||
|
||||
*/
|
||||
|
||||
WRITE_LINE_MEMBER( luxor_55_21046_device::dma_int_w )
|
||||
WRITE_LINE_MEMBER( luxor_55_21046_t::dma_int_w )
|
||||
{
|
||||
m_dma_irq = state;
|
||||
|
||||
|
|
@ -230,27 +230,27 @@ WRITE_LINE_MEMBER( luxor_55_21046_device::dma_int_w )
|
|||
m_maincpu->set_input_line(INPUT_LINE_IRQ0, m_fdc_irq || m_dma_irq);
|
||||
}
|
||||
|
||||
READ8_MEMBER( luxor_55_21046_device::memory_read_byte )
|
||||
READ8_MEMBER( luxor_55_21046_t::memory_read_byte )
|
||||
{
|
||||
return m_maincpu->space(AS_PROGRAM).read_byte(offset);
|
||||
}
|
||||
|
||||
WRITE8_MEMBER( luxor_55_21046_device::memory_write_byte )
|
||||
WRITE8_MEMBER( luxor_55_21046_t::memory_write_byte )
|
||||
{
|
||||
return m_maincpu->space(AS_PROGRAM).write_byte(offset, data);
|
||||
}
|
||||
|
||||
READ8_MEMBER( luxor_55_21046_device::io_read_byte )
|
||||
READ8_MEMBER( luxor_55_21046_t::io_read_byte )
|
||||
{
|
||||
return m_maincpu->space(AS_IO).read_byte(offset);
|
||||
}
|
||||
|
||||
WRITE8_MEMBER( luxor_55_21046_device::io_write_byte )
|
||||
WRITE8_MEMBER( luxor_55_21046_t::io_write_byte )
|
||||
{
|
||||
return m_maincpu->space(AS_IO).write_byte(offset, data);
|
||||
}
|
||||
|
||||
FLOPPY_FORMATS_MEMBER( luxor_55_21046_device::floppy_formats )
|
||||
FLOPPY_FORMATS_MEMBER( luxor_55_21046_t::floppy_formats )
|
||||
FLOPPY_ABC800_FORMAT
|
||||
FLOPPY_FORMATS_END
|
||||
|
||||
|
|
@ -263,7 +263,7 @@ static SLOT_INTERFACE_START( abc_floppies )
|
|||
SLOT_INTERFACE( "8dsdd", FLOPPY_8_DSDD )
|
||||
SLOT_INTERFACE_END
|
||||
|
||||
WRITE_LINE_MEMBER( luxor_55_21046_device::fdc_intrq_w )
|
||||
WRITE_LINE_MEMBER( luxor_55_21046_t::fdc_intrq_w )
|
||||
{
|
||||
m_fdc_irq = state;
|
||||
|
||||
|
|
@ -295,14 +295,14 @@ static MACHINE_CONFIG_FRAGMENT( luxor_55_21046 )
|
|||
|
||||
MCFG_DEVICE_ADD(Z80DMA_TAG, Z80DMA, XTAL_16MHz/4)
|
||||
MCFG_Z80DMA_OUT_BUSREQ_CB(INPUTLINE(Z80_TAG, INPUT_LINE_HALT))
|
||||
MCFG_Z80DMA_OUT_INT_CB(WRITELINE(luxor_55_21046_device, dma_int_w))
|
||||
MCFG_Z80DMA_IN_MREQ_CB(READ8(luxor_55_21046_device, memory_read_byte))
|
||||
MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(luxor_55_21046_device, memory_write_byte))
|
||||
MCFG_Z80DMA_IN_IORQ_CB(READ8(luxor_55_21046_device, io_read_byte))
|
||||
MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(luxor_55_21046_device, io_write_byte))
|
||||
MCFG_Z80DMA_OUT_INT_CB(WRITELINE(luxor_55_21046_t, dma_int_w))
|
||||
MCFG_Z80DMA_IN_MREQ_CB(READ8(luxor_55_21046_t, memory_read_byte))
|
||||
MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(luxor_55_21046_t, memory_write_byte))
|
||||
MCFG_Z80DMA_IN_IORQ_CB(READ8(luxor_55_21046_t, io_read_byte))
|
||||
MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(luxor_55_21046_t, io_write_byte))
|
||||
|
||||
MCFG_FD1793_ADD(SAB1793_TAG, XTAL_16MHz/16)
|
||||
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(luxor_55_21046_device, fdc_intrq_w))
|
||||
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(luxor_55_21046_t, fdc_intrq_w))
|
||||
MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE(Z80DMA_TAG, z80dma_device, rdy_w))
|
||||
MACHINE_CONFIG_END
|
||||
|
||||
|
|
@ -312,8 +312,8 @@ MACHINE_CONFIG_END
|
|||
//-------------------------------------------------
|
||||
|
||||
static MACHINE_CONFIG_DERIVED( abc830, luxor_55_21046 )
|
||||
MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":0", abc_floppies, "525ssdd", luxor_55_21046_device::floppy_formats)
|
||||
MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":1", abc_floppies, "525ssdd", luxor_55_21046_device::floppy_formats)
|
||||
MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":0", abc_floppies, "525ssdd", luxor_55_21046_t::floppy_formats)
|
||||
MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":1", abc_floppies, "525ssdd", luxor_55_21046_t::floppy_formats)
|
||||
MACHINE_CONFIG_END
|
||||
|
||||
|
||||
|
|
@ -322,8 +322,8 @@ MACHINE_CONFIG_END
|
|||
//-------------------------------------------------
|
||||
|
||||
static MACHINE_CONFIG_DERIVED( abc832, luxor_55_21046 )
|
||||
MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":0", abc_floppies, "525qd", luxor_55_21046_device::floppy_formats)
|
||||
MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":1", abc_floppies, "525qd", luxor_55_21046_device::floppy_formats)
|
||||
MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":0", abc_floppies, "525qd", luxor_55_21046_t::floppy_formats)
|
||||
MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":1", abc_floppies, "525qd", luxor_55_21046_t::floppy_formats)
|
||||
MACHINE_CONFIG_END
|
||||
|
||||
|
||||
|
|
@ -332,8 +332,8 @@ MACHINE_CONFIG_END
|
|||
//-------------------------------------------------
|
||||
|
||||
static MACHINE_CONFIG_DERIVED( abc838, luxor_55_21046 )
|
||||
MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":0", abc_floppies, "8dsdd", luxor_55_21046_device::floppy_formats)
|
||||
MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":1", abc_floppies, "8dsdd", luxor_55_21046_device::floppy_formats)
|
||||
MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":0", abc_floppies, "8dsdd", luxor_55_21046_t::floppy_formats)
|
||||
MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":1", abc_floppies, "8dsdd", luxor_55_21046_t::floppy_formats)
|
||||
MACHINE_CONFIG_END
|
||||
|
||||
|
||||
|
|
@ -342,8 +342,8 @@ MACHINE_CONFIG_END
|
|||
//-------------------------------------------------
|
||||
|
||||
static MACHINE_CONFIG_DERIVED( abc850, luxor_55_21046 )
|
||||
MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":0", abc_floppies, "525qd", luxor_55_21046_device::floppy_formats)
|
||||
MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":1", abc_floppies, nullptr, luxor_55_21046_device::floppy_formats)
|
||||
MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":0", abc_floppies, "525qd", luxor_55_21046_t::floppy_formats)
|
||||
MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":1", abc_floppies, nullptr, luxor_55_21046_t::floppy_formats)
|
||||
MACHINE_CONFIG_END
|
||||
|
||||
|
||||
|
|
@ -352,22 +352,22 @@ MACHINE_CONFIG_END
|
|||
// machine configurations
|
||||
//-------------------------------------------------
|
||||
|
||||
machine_config_constructor luxor_55_21046_device::device_mconfig_additions() const
|
||||
machine_config_constructor luxor_55_21046_t::device_mconfig_additions() const
|
||||
{
|
||||
return MACHINE_CONFIG_NAME( luxor_55_21046 );
|
||||
}
|
||||
|
||||
machine_config_constructor abc830_device::device_mconfig_additions() const
|
||||
machine_config_constructor abc830_t::device_mconfig_additions() const
|
||||
{
|
||||
return MACHINE_CONFIG_NAME( abc830 );
|
||||
}
|
||||
|
||||
machine_config_constructor abc832_device::device_mconfig_additions() const
|
||||
machine_config_constructor abc832_t::device_mconfig_additions() const
|
||||
{
|
||||
return MACHINE_CONFIG_NAME( abc832 );
|
||||
}
|
||||
|
||||
machine_config_constructor abc834_device::device_mconfig_additions() const
|
||||
machine_config_constructor abc834_t::device_mconfig_additions() const
|
||||
{
|
||||
return MACHINE_CONFIG_NAME( abc832 );
|
||||
}
|
||||
|
|
@ -377,7 +377,7 @@ machine_config_constructor abc838_device::device_mconfig_additions() const
|
|||
return MACHINE_CONFIG_NAME( abc838 );
|
||||
}
|
||||
|
||||
machine_config_constructor abc850_floppy_device::device_mconfig_additions() const
|
||||
machine_config_constructor abc850_floppy_t::device_mconfig_additions() const
|
||||
{
|
||||
return MACHINE_CONFIG_NAME( abc850 );
|
||||
}
|
||||
|
|
@ -703,22 +703,22 @@ INPUT_PORTS_END
|
|||
// input_ports - device-specific input ports
|
||||
//-------------------------------------------------
|
||||
|
||||
ioport_constructor luxor_55_21046_device::device_input_ports() const
|
||||
ioport_constructor luxor_55_21046_t::device_input_ports() const
|
||||
{
|
||||
return INPUT_PORTS_NAME( luxor_55_21046 );
|
||||
}
|
||||
|
||||
ioport_constructor abc830_device::device_input_ports() const
|
||||
ioport_constructor abc830_t::device_input_ports() const
|
||||
{
|
||||
return INPUT_PORTS_NAME( abc830 );
|
||||
}
|
||||
|
||||
ioport_constructor abc832_device::device_input_ports() const
|
||||
ioport_constructor abc832_t::device_input_ports() const
|
||||
{
|
||||
return INPUT_PORTS_NAME( abc832 );
|
||||
}
|
||||
|
||||
ioport_constructor abc834_device::device_input_ports() const
|
||||
ioport_constructor abc834_t::device_input_ports() const
|
||||
{
|
||||
return INPUT_PORTS_NAME( abc834 );
|
||||
}
|
||||
|
|
@ -728,7 +728,7 @@ ioport_constructor abc838_device::device_input_ports() const
|
|||
return INPUT_PORTS_NAME( abc838 );
|
||||
}
|
||||
|
||||
ioport_constructor abc850_floppy_device::device_input_ports() const
|
||||
ioport_constructor abc850_floppy_t::device_input_ports() const
|
||||
{
|
||||
return INPUT_PORTS_NAME( abc850 );
|
||||
}
|
||||
|
|
@ -740,71 +740,77 @@ ioport_constructor abc850_floppy_device::device_input_ports() const
|
|||
//**************************************************************************
|
||||
|
||||
//-------------------------------------------------
|
||||
// luxor_55_21046_device - constructor
|
||||
// luxor_55_21046_t - constructor
|
||||
//-------------------------------------------------
|
||||
|
||||
luxor_55_21046_device::luxor_55_21046_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
|
||||
: device_t(mconfig, LUXOR_55_21046, "Luxor 55 21046", tag, owner, clock, "lux21046", __FILE__),
|
||||
device_abcbus_card_interface(mconfig, *this),
|
||||
m_maincpu(*this, Z80_TAG),
|
||||
m_dma(*this, Z80DMA_TAG),
|
||||
m_fdc(*this, SAB1793_TAG),
|
||||
m_floppy0(*this, SAB1793_TAG":0"),
|
||||
m_floppy1(*this, SAB1793_TAG":1"),
|
||||
m_floppy(nullptr),
|
||||
m_sw1(*this, "SW1"),
|
||||
m_sw2(*this, "SW2"),
|
||||
m_sw3(*this, "SW3"),
|
||||
m_cs(false), m_status(0), m_out(0), m_inp(0),
|
||||
m_fdc_irq(0),
|
||||
m_dma_irq(0),
|
||||
m_busy(0),
|
||||
m_force_busy(0)
|
||||
luxor_55_21046_t::luxor_55_21046_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
|
||||
device_t(mconfig, LUXOR_55_21046, "Luxor 55 21046", tag, owner, clock, "lux21046", __FILE__),
|
||||
device_abcbus_card_interface(mconfig, *this),
|
||||
m_maincpu(*this, Z80_TAG),
|
||||
m_dma(*this, Z80DMA_TAG),
|
||||
m_fdc(*this, SAB1793_TAG),
|
||||
m_floppy0(*this, SAB1793_TAG":0"),
|
||||
m_floppy1(*this, SAB1793_TAG":1"),
|
||||
m_floppy(nullptr),
|
||||
m_sw1(*this, "SW1"),
|
||||
m_sw2(*this, "SW2"),
|
||||
m_sw3(*this, "SW3"),
|
||||
m_cs(false),
|
||||
m_status(0),
|
||||
m_out(0),
|
||||
m_inp(0),
|
||||
m_fdc_irq(0),
|
||||
m_dma_irq(0),
|
||||
m_busy(0),
|
||||
m_force_busy(0)
|
||||
{
|
||||
}
|
||||
|
||||
luxor_55_21046_device::luxor_55_21046_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
|
||||
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
|
||||
device_abcbus_card_interface(mconfig, *this),
|
||||
m_maincpu(*this, Z80_TAG),
|
||||
m_dma(*this, Z80DMA_TAG),
|
||||
m_fdc(*this, SAB1793_TAG),
|
||||
m_floppy0(*this, SAB1793_TAG":0"),
|
||||
m_floppy1(*this, SAB1793_TAG":1"),
|
||||
m_floppy(nullptr),
|
||||
m_sw1(*this, "SW1"),
|
||||
m_sw2(*this, "SW2"),
|
||||
m_sw3(*this, "SW3"),
|
||||
m_cs(false), m_status(0), m_out(0), m_inp(0),
|
||||
m_fdc_irq(0),
|
||||
m_dma_irq(0),
|
||||
m_busy(0),
|
||||
m_force_busy(0)
|
||||
luxor_55_21046_t::luxor_55_21046_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
|
||||
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
|
||||
device_abcbus_card_interface(mconfig, *this),
|
||||
m_maincpu(*this, Z80_TAG),
|
||||
m_dma(*this, Z80DMA_TAG),
|
||||
m_fdc(*this, SAB1793_TAG),
|
||||
m_floppy0(*this, SAB1793_TAG":0"),
|
||||
m_floppy1(*this, SAB1793_TAG":1"),
|
||||
m_floppy(nullptr),
|
||||
m_sw1(*this, "SW1"),
|
||||
m_sw2(*this, "SW2"),
|
||||
m_sw3(*this, "SW3"),
|
||||
m_cs(false),
|
||||
m_status(0),
|
||||
m_out(0),
|
||||
m_inp(0),
|
||||
m_fdc_irq(0),
|
||||
m_dma_irq(0),
|
||||
m_busy(0),
|
||||
m_force_busy(0)
|
||||
{
|
||||
}
|
||||
|
||||
abc830_device::abc830_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
|
||||
: luxor_55_21046_device(mconfig, ABC830, "ABC 830", tag, owner, clock, "abc830", __FILE__)
|
||||
abc830_t::abc830_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
|
||||
luxor_55_21046_t(mconfig, ABC830, "ABC 830", tag, owner, clock, "abc830", __FILE__)
|
||||
{
|
||||
}
|
||||
|
||||
abc832_device::abc832_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
|
||||
: luxor_55_21046_device(mconfig, ABC832, "ABC 832", tag, owner, clock, "abc832", __FILE__)
|
||||
abc832_t::abc832_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
|
||||
luxor_55_21046_t(mconfig, ABC832, "ABC 832", tag, owner, clock, "abc832", __FILE__)
|
||||
{
|
||||
}
|
||||
|
||||
abc834_device::abc834_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
|
||||
: luxor_55_21046_device(mconfig, ABC834, "ABC 834", tag, owner, clock, "abc834", __FILE__)
|
||||
abc834_t::abc834_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
|
||||
luxor_55_21046_t(mconfig, ABC834, "ABC 834", tag, owner, clock, "abc834", __FILE__)
|
||||
{
|
||||
}
|
||||
|
||||
abc838_device::abc838_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
|
||||
: luxor_55_21046_device(mconfig, ABC838, "ABC 838", tag, owner, clock, "abc838", __FILE__)
|
||||
abc838_device::abc838_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
|
||||
luxor_55_21046_t(mconfig, ABC838, "ABC 838", tag, owner, clock, "abc838", __FILE__)
|
||||
{
|
||||
}
|
||||
|
||||
abc850_floppy_device::abc850_floppy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
|
||||
: luxor_55_21046_device(mconfig, ABC850_FLOPPY, "ABC 850 floppy", tag, owner, clock, "lux21046", __FILE__)
|
||||
abc850_floppy_t::abc850_floppy_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
|
||||
luxor_55_21046_t(mconfig, ABC850_FLOPPY, "ABC 850 floppy", tag, owner, clock, "lux21046", __FILE__)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -813,7 +819,7 @@ abc850_floppy_device::abc850_floppy_device(const machine_config &mconfig, const
|
|||
// device_start - device-specific startup
|
||||
//-------------------------------------------------
|
||||
|
||||
void luxor_55_21046_device::device_start()
|
||||
void luxor_55_21046_t::device_start()
|
||||
{
|
||||
// state saving
|
||||
save_item(NAME(m_cs));
|
||||
|
|
@ -831,7 +837,7 @@ void luxor_55_21046_device::device_start()
|
|||
// device_reset - device-specific reset
|
||||
//-------------------------------------------------
|
||||
|
||||
void luxor_55_21046_device::device_reset()
|
||||
void luxor_55_21046_t::device_reset()
|
||||
{
|
||||
m_cs = false;
|
||||
m_out = 0;
|
||||
|
|
@ -854,7 +860,7 @@ void luxor_55_21046_device::device_reset()
|
|||
// abcbus_cs -
|
||||
//-------------------------------------------------
|
||||
|
||||
void luxor_55_21046_device::abcbus_cs(uint8_t data)
|
||||
void luxor_55_21046_t::abcbus_cs(uint8_t data)
|
||||
{
|
||||
m_cs = (data == m_sw3->read());
|
||||
}
|
||||
|
|
@ -864,7 +870,7 @@ void luxor_55_21046_device::abcbus_cs(uint8_t data)
|
|||
// abcbus_csb -
|
||||
//-------------------------------------------------
|
||||
|
||||
int luxor_55_21046_device::abcbus_csb()
|
||||
int luxor_55_21046_t::abcbus_csb()
|
||||
{
|
||||
return m_cs ? 0 : 1;
|
||||
}
|
||||
|
|
@ -874,7 +880,7 @@ int luxor_55_21046_device::abcbus_csb()
|
|||
// abcbus_stat -
|
||||
//-------------------------------------------------
|
||||
|
||||
uint8_t luxor_55_21046_device::abcbus_stat()
|
||||
uint8_t luxor_55_21046_t::abcbus_stat()
|
||||
{
|
||||
/*
|
||||
|
||||
|
|
@ -907,7 +913,7 @@ uint8_t luxor_55_21046_device::abcbus_stat()
|
|||
// abcbus_inp -
|
||||
//-------------------------------------------------
|
||||
|
||||
uint8_t luxor_55_21046_device::abcbus_inp()
|
||||
uint8_t luxor_55_21046_t::abcbus_inp()
|
||||
{
|
||||
uint8_t data = 0xff;
|
||||
|
||||
|
|
@ -925,7 +931,7 @@ uint8_t luxor_55_21046_device::abcbus_inp()
|
|||
// abcbus_out -
|
||||
//-------------------------------------------------
|
||||
|
||||
void luxor_55_21046_device::abcbus_out(uint8_t data)
|
||||
void luxor_55_21046_t::abcbus_out(uint8_t data)
|
||||
{
|
||||
if (m_cs)
|
||||
{
|
||||
|
|
@ -939,7 +945,7 @@ void luxor_55_21046_device::abcbus_out(uint8_t data)
|
|||
// abcbus_c1 -
|
||||
//-------------------------------------------------
|
||||
|
||||
void luxor_55_21046_device::abcbus_c1(uint8_t data)
|
||||
void luxor_55_21046_t::abcbus_c1(uint8_t data)
|
||||
{
|
||||
if (m_cs)
|
||||
{
|
||||
|
|
@ -953,7 +959,7 @@ void luxor_55_21046_device::abcbus_c1(uint8_t data)
|
|||
// abcbus_c3 -
|
||||
//-------------------------------------------------
|
||||
|
||||
void luxor_55_21046_device::abcbus_c3(uint8_t data)
|
||||
void luxor_55_21046_t::abcbus_c3(uint8_t data)
|
||||
{
|
||||
if (m_cs)
|
||||
{
|
||||
|
|
@ -966,7 +972,7 @@ void luxor_55_21046_device::abcbus_c3(uint8_t data)
|
|||
// abcbus_c4 -
|
||||
//-------------------------------------------------
|
||||
|
||||
void luxor_55_21046_device::abcbus_c4(uint8_t data)
|
||||
void luxor_55_21046_t::abcbus_c4(uint8_t data)
|
||||
{
|
||||
// TODO connected to PAL16R4 pin 2
|
||||
}
|
||||
|
|
@ -981,7 +987,7 @@ void luxor_55_21046_device::abcbus_c4(uint8_t data)
|
|||
// 3d_r -
|
||||
//-------------------------------------------------
|
||||
|
||||
READ8_MEMBER( luxor_55_21046_device::out_r )
|
||||
READ8_MEMBER( luxor_55_21046_t::out_r )
|
||||
{
|
||||
if (m_busy)
|
||||
{
|
||||
|
|
@ -996,7 +1002,7 @@ READ8_MEMBER( luxor_55_21046_device::out_r )
|
|||
// 4d_w -
|
||||
//-------------------------------------------------
|
||||
|
||||
WRITE8_MEMBER( luxor_55_21046_device::inp_w )
|
||||
WRITE8_MEMBER( luxor_55_21046_t::inp_w )
|
||||
{
|
||||
if (m_busy)
|
||||
{
|
||||
|
|
@ -1011,7 +1017,7 @@ WRITE8_MEMBER( luxor_55_21046_device::inp_w )
|
|||
// 4b_w -
|
||||
//-------------------------------------------------
|
||||
|
||||
WRITE8_MEMBER( luxor_55_21046_device::_4b_w )
|
||||
WRITE8_MEMBER( luxor_55_21046_t::_4b_w )
|
||||
{
|
||||
/*
|
||||
|
||||
|
|
@ -1042,7 +1048,7 @@ WRITE8_MEMBER( luxor_55_21046_device::_4b_w )
|
|||
// 9b_w -
|
||||
//-------------------------------------------------
|
||||
|
||||
WRITE8_MEMBER( luxor_55_21046_device::_9b_w )
|
||||
WRITE8_MEMBER( luxor_55_21046_t::_9b_w )
|
||||
{
|
||||
/*
|
||||
|
||||
|
|
@ -1082,7 +1088,7 @@ WRITE8_MEMBER( luxor_55_21046_device::_9b_w )
|
|||
// 8a_w -
|
||||
//-------------------------------------------------
|
||||
|
||||
WRITE8_MEMBER( luxor_55_21046_device::_8a_w )
|
||||
WRITE8_MEMBER( luxor_55_21046_t::_8a_w )
|
||||
{
|
||||
/*
|
||||
|
||||
|
|
@ -1122,7 +1128,7 @@ WRITE8_MEMBER( luxor_55_21046_device::_8a_w )
|
|||
// 9a_r -
|
||||
//-------------------------------------------------
|
||||
|
||||
READ8_MEMBER( luxor_55_21046_device::_9a_r )
|
||||
READ8_MEMBER( luxor_55_21046_t::_9a_r )
|
||||
{
|
||||
/*
|
||||
|
||||
|
|
|
|||
|
|
@ -45,15 +45,15 @@
|
|||
// TYPE DEFINITIONS
|
||||
//**************************************************************************
|
||||
|
||||
// ======================> luxor_55_21046_device
|
||||
// ======================> luxor_55_21046_t
|
||||
|
||||
class luxor_55_21046_device : public device_t,
|
||||
public device_abcbus_card_interface
|
||||
class luxor_55_21046_t : public device_t,
|
||||
public device_abcbus_card_interface
|
||||
{
|
||||
public:
|
||||
// construction/destruction
|
||||
luxor_55_21046_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
|
||||
luxor_55_21046_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
|
||||
luxor_55_21046_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
|
||||
luxor_55_21046_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
|
||||
|
||||
// optional information overrides
|
||||
virtual const tiny_rom_entry *device_rom_region() const override;
|
||||
|
|
@ -116,13 +116,13 @@ private:
|
|||
};
|
||||
|
||||
|
||||
// ======================> abc830_device
|
||||
// ======================> abc830_t
|
||||
|
||||
class abc830_device : public luxor_55_21046_device
|
||||
class abc830_t : public luxor_55_21046_t
|
||||
{
|
||||
public:
|
||||
// construction/destruction
|
||||
abc830_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
|
||||
abc830_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
|
||||
|
||||
// optional information overrides
|
||||
virtual machine_config_constructor device_mconfig_additions() const override;
|
||||
|
|
@ -130,13 +130,13 @@ public:
|
|||
};
|
||||
|
||||
|
||||
// ======================> abc832_device
|
||||
// ======================> abc832_t
|
||||
|
||||
class abc832_device : public luxor_55_21046_device
|
||||
class abc832_t : public luxor_55_21046_t
|
||||
{
|
||||
public:
|
||||
// construction/destruction
|
||||
abc832_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
|
||||
abc832_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
|
||||
|
||||
// optional information overrides
|
||||
virtual machine_config_constructor device_mconfig_additions() const override;
|
||||
|
|
@ -144,13 +144,13 @@ public:
|
|||
};
|
||||
|
||||
|
||||
// ======================> abc834_device
|
||||
// ======================> abc834_t
|
||||
|
||||
class abc834_device : public luxor_55_21046_device
|
||||
class abc834_t : public luxor_55_21046_t
|
||||
{
|
||||
public:
|
||||
// construction/destruction
|
||||
abc834_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
|
||||
abc834_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
|
||||
|
||||
// optional information overrides
|
||||
virtual machine_config_constructor device_mconfig_additions() const override;
|
||||
|
|
@ -160,7 +160,7 @@ public:
|
|||
|
||||
// ======================> abc838_device
|
||||
|
||||
class abc838_device : public luxor_55_21046_device
|
||||
class abc838_device : public luxor_55_21046_t
|
||||
{
|
||||
public:
|
||||
// construction/destruction
|
||||
|
|
@ -172,13 +172,13 @@ public:
|
|||
};
|
||||
|
||||
|
||||
// ======================> abc850_floppy_device
|
||||
// ======================> abc850_floppy_t
|
||||
|
||||
class abc850_floppy_device : public luxor_55_21046_device
|
||||
class abc850_floppy_t : public luxor_55_21046_t
|
||||
{
|
||||
public:
|
||||
// construction/destruction
|
||||
abc850_floppy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
|
||||
abc850_floppy_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
|
||||
|
||||
// optional information overrides
|
||||
virtual machine_config_constructor device_mconfig_additions() const override;
|
||||
|
|
|
|||
Loading…
Reference in a new issue