summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/machine
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2022-05-24 01:20:18 +1000
committer Vas Crabb <vas@vastheman.com>2022-05-24 01:20:18 +1000
commit09062b24a3be57139beaf823af3d7c5532ab256f (patch)
tree1180e80c618d62cdf57825eec0a953d1b07fabb9 /src/mame/machine
parent641c55693bbbe35b8044d960ad5b65d65e322c23 (diff)
parente98578053392a69f4145e9a018f5ecb93b939ac3 (diff)
Merge branch 'release0244' into mainline-master
Diffstat (limited to 'src/mame/machine')
-rw-r--r--src/mame/machine/cps2comm.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/mame/machine/cps2comm.cpp b/src/mame/machine/cps2comm.cpp
index a7fe8f2ac65..95701ef264d 100644
--- a/src/mame/machine/cps2comm.cpp
+++ b/src/mame/machine/cps2comm.cpp
@@ -638,8 +638,8 @@ void cps2_comm_device::usart_control_w(offs_t offset, u16 data, u16 mem_mask)
LOG("%s: USART mode = 0x%02X: Synchronous, %d-bit, %s Parity, %s Sync Detect, %d Sync Characters\n",
machine().describe_context(),
m_usart_mode,
- std::array{ 5, 6, 7, 8 }[BIT(m_usart_mode, 2, 2)],
- std::array{ "No", "Odd", "No", "Even" }[BIT(m_usart_mode, 4, 2)],
+ std::array<int, 4>{ 5, 6, 7, 8 }[BIT(m_usart_mode, 2, 2)],
+ std::array<char const *, 4>{ "No", "Odd", "No", "Even" }[BIT(m_usart_mode, 4, 2)],
BIT(m_usart_mode, 6) ? "External" : "Internal",
BIT(m_usart_mode, 7) ? 1 : 2);
m_usart_control_phase = CTRL_SYNC1;
@@ -649,10 +649,10 @@ void cps2_comm_device::usart_control_w(offs_t offset, u16 data, u16 mem_mask)
LOG("%s: USART mode = 0x%02X: Asynchronous, x %d Clock, %d-bit, %s Parity, %s Transmit Stop Bits\n",
machine().describe_context(),
m_usart_mode,
- std::array{ -1, 1, 16, 64 }[BIT(m_usart_mode, 0, 2)],
- std::array{ 5, 6, 7, 8 }[BIT(m_usart_mode, 2, 2)],
- std::array{ "No", "Odd", "No", "Even" }[BIT(m_usart_mode, 4, 2)],
- std::array{ "Illegal", "1", "1-1/2", "2" }[BIT(m_usart_mode, 6, 2)]);
+ std::array<int, 4>{ -1, 1, 16, 64 }[BIT(m_usart_mode, 0, 2)],
+ std::array<int, 4>{ 5, 6, 7, 8 }[BIT(m_usart_mode, 2, 2)],
+ std::array<char const *, 4>{ "No", "Odd", "No", "Even" }[BIT(m_usart_mode, 4, 2)],
+ std::array<char const *, 4>{ "Illegal", "1", "1-1/2", "2" }[BIT(m_usart_mode, 6, 2)]);
m_usart_control_phase = CTRL_COMMAND;
m_usart_status |= 0x01U;
}
@@ -715,9 +715,9 @@ void cps2_comm_device::route_w(offs_t offset, u16 data, u16 mem_mask)
machine().describe_context(),
m_route,
BIT(m_route, 4) ? "low" : "high",
- std::array{ "1", "TxD & OUT", "1", "TxD" }[BIT(m_route, 0, 2)],
- std::array{ "1", "IN", "TxD", "1" }[BIT(m_route, 0, 2)],
- std::array{ "1", "IN", "OUT", "IN" }[BIT(m_route, 0, 2)]);
+ std::array<char const *, 4>{ "1", "TxD & OUT", "1", "TxD" }[BIT(m_route, 0, 2)],
+ std::array<char const *, 4>{ "1", "IN", "TxD", "1" }[BIT(m_route, 0, 2)],
+ std::array<char const *, 4>{ "1", "IN", "OUT", "IN" }[BIT(m_route, 0, 2)]);
}
}