summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/czk80.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/czk80.cpp')
-rw-r--r--src/mame/drivers/czk80.cpp43
1 files changed, 21 insertions, 22 deletions
diff --git a/src/mame/drivers/czk80.cpp b/src/mame/drivers/czk80.cpp
index 0606970f2c7..b0dc831d6e1 100644
--- a/src/mame/drivers/czk80.cpp
+++ b/src/mame/drivers/czk80.cpp
@@ -45,7 +45,7 @@ I/O ports: These ranges are what is guessed
#include "machine/upd765.h"
#include "cpu/z80/z80daisy.h"
#include "machine/z80pio.h"
-#include "machine/z80dart.h"
+#include "machine/z80sio.h"
#include "machine/z80ctc.h"
#include "machine/terminal.h"
@@ -55,12 +55,11 @@ class czk80_state : public driver_device
{
public:
czk80_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
- m_maincpu(*this, "maincpu"),
- m_terminal(*this, TERMINAL_TAG),
- m_fdc(*this, "fdc")
- {
- }
+ : driver_device(mconfig, type, tag)
+ , m_maincpu(*this, "maincpu")
+ , m_terminal(*this, "terminal")
+ , m_fdc(*this, "fdc")
+ { }
DECLARE_DRIVER_INIT(czk80);
DECLARE_MACHINE_RESET(czk80);
@@ -112,10 +111,10 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START(czk80_io, AS_IO, 8, czk80_state)
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x40, 0x40) AM_WRITE(port40_w)
- AM_RANGE(0x4c, 0x4f) AM_DEVREADWRITE("z80pio", z80pio_device, read, write)
- AM_RANGE(0x50, 0x53) AM_DEVREADWRITE("z80dart", z80dart_device, cd_ba_r, cd_ba_w)
- AM_RANGE(0x54, 0x57) AM_DEVREADWRITE("z80ctc", z80ctc_device, read, write)
- AM_RANGE(0x80, 0x80) AM_READ(port80_r) AM_DEVWRITE(TERMINAL_TAG, generic_terminal_device, write)
+ AM_RANGE(0x4c, 0x4f) AM_DEVREADWRITE("pio", z80pio_device, read, write)
+ AM_RANGE(0x50, 0x53) AM_DEVREADWRITE("dart", z80sio_device, cd_ba_r, cd_ba_w)
+ AM_RANGE(0x54, 0x57) AM_DEVREADWRITE("ctc", z80ctc_device, read, write)
+ AM_RANGE(0x80, 0x80) AM_READ(port80_r) AM_DEVWRITE("terminal", generic_terminal_device, write)
AM_RANGE(0x81, 0x81) AM_READ(port81_r)
/* Select one of the below */
//AM_RANGE(0xc0, 0xc0) AM_READ(portc0_r)
@@ -130,9 +129,9 @@ INPUT_PORTS_END
static const z80_daisy_config daisy_chain[] =
{
- { "z80pio" },
- { "z80dart" },
- { "z80ctc" },
+ { "pio" },
+ { "dart" },
+ { "ctc" },
{ nullptr }
};
@@ -196,24 +195,24 @@ static MACHINE_CONFIG_START( czk80 )
MCFG_Z80_DAISY_CHAIN(daisy_chain)
MCFG_MACHINE_RESET_OVERRIDE(czk80_state, czk80)
- MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
+ MCFG_DEVICE_ADD("terminal", GENERIC_TERMINAL, 0)
MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(czk80_state, kbd_put))
MCFG_UPD765A_ADD("fdc", false, true)
MCFG_FLOPPY_DRIVE_ADD("fdc:0", czk80_floppies, "525dd", floppy_image_device::default_floppy_formats)
- MCFG_DEVICE_ADD("z80ctc", Z80CTC, XTAL_16MHz / 4)
+ MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL_16MHz / 4)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80CTC_ZC0_CB(WRITELINE(czk80_state, ctc_z0_w))
MCFG_Z80CTC_ZC1_CB(WRITELINE(czk80_state, ctc_z1_w))
MCFG_Z80CTC_ZC2_CB(WRITELINE(czk80_state, ctc_z2_w))
- MCFG_DEVICE_ADD("z80dart", Z80DART, XTAL_16MHz / 4)
- //MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- //MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
- //MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE("rs232", rs232_port_device, write_rts))
- MCFG_Z80DART_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
+ MCFG_DEVICE_ADD("dart", Z80SIO, XTAL_16MHz / 4)
+ //MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
+ //MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
+ //MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD("z80pio", Z80PIO, XTAL_16MHz/4)
+ MCFG_DEVICE_ADD("pio", Z80PIO, XTAL_16MHz/4)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MACHINE_CONFIG_END