From bc0146c2038c46f789a246d5616afd7c425157f3 Mon Sep 17 00:00:00 2001 From: AJR Date: Sun, 14 Feb 2021 11:05:57 -0500 Subject: Eliminate ARRAY_LENGTH template in favor of C++17's std::size * osdcomm.h: Move definition of EQUIVALENT_ARRAY to coretmpl.h * sharc.cpp, gt64xxx.cpp, ym2413.cpp, gb_lcd.cpp, snes_ppu.cpp: Use STRUCT_MEMBER for save state registration * gio/newport.cpp, megadrive/svp.cpp, nes_ctrl/bcbattle.cpp, arm7.cpp, tms9995.cpp, pckeybrd.cpp, sa1110.cpp, sa1111.cpp, jangou_blitter.cpp, vic4567.cpp: Use std::fill(_n) instead of memset * emucore.h: Remove obsolete typedef --- src/devices/machine/z80sio.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/devices/machine/z80sio.cpp') diff --git a/src/devices/machine/z80sio.cpp b/src/devices/machine/z80sio.cpp index 8f5e9a145e0..5095dd4cb9b 100644 --- a/src/devices/machine/z80sio.cpp +++ b/src/devices/machine/z80sio.cpp @@ -506,7 +506,7 @@ int z80sio_device::z80daisy_irq_state() // loop over all interrupt sources int state = 0; - for (int i = 0; ARRAY_LENGTH(m_int_state) > i; ++i) + for (int i = 0; std::size(m_int_state) > i; ++i) { // if we're servicing a request, don't indicate more interrupts if (m_int_state[prio[i]] & Z80_DAISY_IEO) @@ -531,7 +531,7 @@ int z80sio_device::z80daisy_irq_ack() // loop over all interrupt sources int const *const prio = interrupt_priorities(); - for (int i = 0; ARRAY_LENGTH(m_int_state) > i; ++i) + for (int i = 0; std::size(m_int_state) > i; ++i) { // find the first channel with an interrupt requested if (m_int_state[prio[i]] & Z80_DAISY_INT) @@ -597,7 +597,7 @@ int i8274_device::z80daisy_irq_ack() { // loop over all interrupt sources int const *const prio = interrupt_priorities(); - for (int i = 0; ARRAY_LENGTH(m_int_state) > i; ++i) + for (int i = 0; std::size(m_int_state) > i; ++i) { // find the first channel with an interrupt requested if (m_int_state[prio[i]] & Z80_DAISY_INT) @@ -711,7 +711,7 @@ void z80sio_device::return_from_interrupt() { // loop over all interrupt sources int const *const prio = interrupt_priorities(); - for (int i = 0; ARRAY_LENGTH(m_int_state) > i; ++i) + for (int i = 0; std::size(m_int_state) > i; ++i) { // find the first channel with an interrupt requested if (m_int_state[prio[i]] & (Z80_DAISY_IEO)) @@ -741,7 +741,7 @@ uint8_t z80sio_device::read_vector() // modify vector for highest-priority pending interrupt int const *const prio = interrupt_priorities(); vec &= 0xf1U; - for (int i = 0; ARRAY_LENGTH(m_int_state) > i; ++i) + for (int i = 0; std::size(m_int_state) > i; ++i) { if (m_int_state[prio[i]] & Z80_DAISY_INT) { @@ -797,7 +797,7 @@ uint8_t i8274_device::read_vector() // modify vector for highest-priority pending interrupt int const *const prio = interrupt_priorities(); - for (int i = 0; ARRAY_LENGTH(m_int_state) > i; ++i) + for (int i = 0; std::size(m_int_state) > i; ++i) { if (m_int_state[prio[i]] & Z80_DAISY_INT) { -- cgit v1.2.3-70-g09d2