summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/bus/abcbus
diff options
context:
space:
mode:
author Curt Coder <curtcoder@mail.com>2013-11-01 19:08:17 +0000
committer Curt Coder <curtcoder@mail.com>2013-11-01 19:08:17 +0000
commit1a090ca06ef82c14301db4e497d4032b1fc20851 (patch)
tree764c9121f6a2a7e427c9c647673cf54f701f6857 /src/emu/bus/abcbus
parentea3352b618f2b49bef1045766d73784be2f6021f (diff)
(MESS) abc800: Cleanup. (nw)
Diffstat (limited to 'src/emu/bus/abcbus')
-rw-r--r--src/emu/bus/abcbus/abcbus.h2
-rw-r--r--src/emu/bus/abcbus/fd2.c12
-rw-r--r--src/emu/bus/abcbus/lux21056.c3
3 files changed, 11 insertions, 6 deletions
diff --git a/src/emu/bus/abcbus/abcbus.h b/src/emu/bus/abcbus/abcbus.h
index c26103e1ea2..7374cd70209 100644
--- a/src/emu/bus/abcbus/abcbus.h
+++ b/src/emu/bus/abcbus/abcbus.h
@@ -86,7 +86,7 @@
CS* --- * 23 * --- DSTB*
NMI*^ --- * 24 * --- 0 V
OPS* --- * 25 * --- A4
- --- * 26 * --- A3
+ R/W* --- * 26 * --- A3
TREN* --- * 27 * --- A2
TRRQ* --- * 28 * --- A1
PRAC* --- * 29 * --- A0
diff --git a/src/emu/bus/abcbus/fd2.c b/src/emu/bus/abcbus/fd2.c
index 19669b3394f..b689162c307 100644
--- a/src/emu/bus/abcbus/fd2.c
+++ b/src/emu/bus/abcbus/fd2.c
@@ -89,6 +89,7 @@ const rom_entry *abc_fd2_device::device_rom_region() const
static ADDRESS_MAP_START( abc_fd2_mem, AS_PROGRAM, 8, abc_fd2_device )
AM_RANGE(0x0000, 0x03ff) AM_ROM AM_REGION(Z80_TAG, 0)
+ AM_RANGE(0x0800, 0x0bff) AM_RAM
ADDRESS_MAP_END
@@ -97,6 +98,9 @@ ADDRESS_MAP_END
//-------------------------------------------------
static ADDRESS_MAP_START( abc_fd2_io, AS_IO, 8, abc_fd2_device )
+ ADDRESS_MAP_GLOBAL_MASK(0xff)
+ AM_RANGE(0xb0, 0xb3) AM_DEVREADWRITE(Z80PIO_TAG, z80pio_device, read_alt, write_alt)
+ AM_RANGE(0xd0, 0xd3) AM_DEVREADWRITE(FD1771_TAG, fd1771_t, read, write)
ADDRESS_MAP_END
@@ -141,13 +145,13 @@ SLOT_INTERFACE_END
//-------------------------------------------------
static MACHINE_CONFIG_FRAGMENT( abc_fd2 )
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_4MHz/2) // ?
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(abc_fd2_mem)
MCFG_CPU_IO_MAP(abc_fd2_io)
MCFG_CPU_CONFIG(daisy_chain)
- MCFG_Z80PIO_ADD(Z80PIO_TAG, XTAL_4MHz/2, pio_intf) // ?
- MCFG_FD1771x_ADD(FD1771_TAG, XTAL_4MHz/2) // ?
+ MCFG_Z80PIO_ADD(Z80PIO_TAG, XTAL_4MHz, pio_intf)
+ MCFG_FD1771x_ADD(FD1771_TAG, XTAL_4MHz/2)
MCFG_FLOPPY_DRIVE_ADD(FD1771_TAG":0", abc_fd2_floppies, "525sssd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(FD1771_TAG":1", abc_fd2_floppies, "525sssd", floppy_image_device::default_floppy_formats)
@@ -182,7 +186,7 @@ abc_fd2_device::abc_fd2_device(const machine_config &mconfig, const char *tag, d
m_fdc(*this, FD1771_TAG),
m_floppy0(*this, FD1771_TAG":0"),
m_floppy1(*this, FD1771_TAG":1"),
- m_rom(*this, "dos")
+ m_rom(*this, "abc80")
{
}
diff --git a/src/emu/bus/abcbus/lux21056.c b/src/emu/bus/abcbus/lux21056.c
index 8e3326d44c2..ed193de8cc6 100644
--- a/src/emu/bus/abcbus/lux21056.c
+++ b/src/emu/bus/abcbus/lux21056.c
@@ -260,7 +260,7 @@ luxor_55_21056_device::luxor_55_21056_device(const machine_config &mconfig, cons
m_dma(*this, Z80DMA_TAG),
m_sasibus(*this, SASIBUS_TAG ":host"),
m_s1(*this, "S1"),
- m_cs(0),
+ m_cs(false),
m_rdy(0),
m_req(0),
m_stat(0),
@@ -292,6 +292,7 @@ void luxor_55_21056_device::device_start()
void luxor_55_21056_device::device_reset()
{
+ m_cs = false;
m_stat = 0;
m_sasi_data = 0;
}