summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author cracyc <cracyc@users.noreply.github.com>2017-09-25 12:38:31 -0500
committer cracyc <cracyc@users.noreply.github.com>2017-09-25 12:38:31 -0500
commitc4b230dcb986b00b0bc4c1e2ea7f9e12b8922738 (patch)
tree061cdca806d2d1daa30148f7091320e621d70f23
parented739f022dabb6ae6660765f1dc0c00108df32d3 (diff)
altos8600: move default terminal to ics as xenix expects (nw)
z80sio: invert dcd status bit (nw)
-rw-r--r--src/devices/machine/z80sio.cpp2
-rw-r--r--src/mame/drivers/altos8600.cpp12
-rw-r--r--src/mame/machine/acs8600_ics.cpp12
3 files changed, 13 insertions, 13 deletions
diff --git a/src/devices/machine/z80sio.cpp b/src/devices/machine/z80sio.cpp
index 83a8479f638..4b9ee65b981 100644
--- a/src/devices/machine/z80sio.cpp
+++ b/src/devices/machine/z80sio.cpp
@@ -1342,7 +1342,7 @@ WRITE_LINE_MEMBER( z80sio_channel::dcd_w )
if (!m_rx_rr0_latch)
{
- if (m_dcd)
+ if (!m_dcd)
m_rr0 |= RR0_DCD;
else
m_rr0 &= ~RR0_DCD;
diff --git a/src/mame/drivers/altos8600.cpp b/src/mame/drivers/altos8600.cpp
index 1aaf57d85a4..beeb2c466f3 100644
--- a/src/mame/drivers/altos8600.cpp
+++ b/src/mame/drivers/altos8600.cpp
@@ -436,15 +436,6 @@ static SLOT_INTERFACE_START(altos8600_floppies)
SLOT_INTERFACE( "8dd", FLOPPY_8_DSDD )
SLOT_INTERFACE_END
-static DEVICE_INPUT_DEFAULTS_START(altos8600_terminal)
- DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_9600 )
- DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_9600 )
- DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 )
- DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_8 )
- DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_NONE )
- DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 )
-DEVICE_INPUT_DEFAULTS_END
-
static MACHINE_CONFIG_START(altos8600)
MCFG_CPU_ADD("maincpu", I8086, XTAL_5MHz)
MCFG_CPU_PROGRAM_MAP(cpu_mem)
@@ -494,11 +485,10 @@ static MACHINE_CONFIG_START(altos8600)
MCFG_RS232_DCD_HANDLER(DEVWRITELINE("uart8274", i8274_new_device, dcda_w))
MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart8274", i8274_new_device, ctsa_w))
- MCFG_RS232_PORT_ADD("rs232b", default_rs232_devices, "terminal")
+ MCFG_RS232_PORT_ADD("rs232b", default_rs232_devices, nullptr)
MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart8274", i8274_new_device, rxb_w))
MCFG_RS232_DCD_HANDLER(DEVWRITELINE("uart8274", i8274_new_device, dcdb_w))
MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart8274", i8274_new_device, ctsb_w))
- MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("terminal", altos8600_terminal)
MCFG_DEVICE_ADD("ppi", I8255A, 0)
diff --git a/src/mame/machine/acs8600_ics.cpp b/src/mame/machine/acs8600_ics.cpp
index 13d2b02728f..1419f6badea 100644
--- a/src/mame/machine/acs8600_ics.cpp
+++ b/src/mame/machine/acs8600_ics.cpp
@@ -56,6 +56,15 @@ WRITE_LINE_MEMBER(acs8600_ics_device::attn_w)
m_icscpu->set_input_line(INPUT_LINE_NMI, state);
}
+static DEVICE_INPUT_DEFAULTS_START(altos8600_terminal)
+ DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_9600 )
+ DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_9600 )
+ DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 )
+ DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_7 )
+ DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_EVEN )
+ DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 )
+DEVICE_INPUT_DEFAULTS_END
+
static ADDRESS_MAP_START(ics_mem, AS_PROGRAM, 8, acs8600_ics_device)
AM_RANGE(0x0000, 0x0fff) AM_ROM AM_REGION("icscpu", 0)
AM_RANGE(0x1000, 0x17ff) AM_RAM
@@ -113,10 +122,11 @@ MACHINE_CONFIG_MEMBER( acs8600_ics_device::device_add_mconfig )
MCFG_Z80SIO_OUT_RTSB_CB(DEVWRITELINE("rs2321b", rs232_port_device, write_rts))
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("icscpu", INPUT_LINE_IRQ0))
MCFG_Z80SIO_CPU("icscpu")
- MCFG_RS232_PORT_ADD("rs2321a", default_rs232_devices, nullptr)
+ MCFG_RS232_PORT_ADD("rs2321a", default_rs232_devices, "terminal")
MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio1", z80sio_device, rxa_w))
MCFG_RS232_DCD_HANDLER(DEVWRITELINE("sio1", z80sio_device, dcda_w))
MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio1", z80sio_device, ctsa_w))
+ MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("terminal", altos8600_terminal)
MCFG_RS232_PORT_ADD("rs2321b", default_rs232_devices, nullptr)
MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio1", z80sio_device, rxb_w))