diff options
| author | 2015-12-28 11:27:47 +0100 | |
|---|---|---|
| committer | 2015-12-28 11:27:47 +0100 | |
| commit | 2a5e044fc23624a388bdb5f82ef9c11cbed6a9c7 (patch) | |
| tree | b468f54cdcbb7252d14790a7a013b138b1bd9b03 /src/devices/machine/mc6854.cpp | |
| parent | 077fe7ad89d65bbeafde141c9b3f71ca8df42f1c (diff) | |
| parent | 11fcbaa28583023ea93a8f0c1f3fb9082d3295ab (diff) | |
Merge https://github.com/mamedev/mame
# Conflicts:
# src/devices/video/ef9365.cpp
Diffstat (limited to 'src/devices/machine/mc6854.cpp')
| -rw-r--r-- | src/devices/machine/mc6854.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/devices/machine/mc6854.cpp b/src/devices/machine/mc6854.cpp index 7ed16885b19..3461d58dde5 100644 --- a/src/devices/machine/mc6854.cpp +++ b/src/devices/machine/mc6854.cpp @@ -183,7 +183,7 @@ mc6854_device::mc6854_device(const machine_config &mconfig, const char *tag, dev m_dcd(0), m_tstate(0), m_tones(0), - m_ttimer(NULL), + m_ttimer(nullptr), m_rstate(0), m_rreg(0), m_rones(0), @@ -197,9 +197,9 @@ mc6854_device::mc6854_device(const machine_config &mconfig, const char *tag, dev m_rfifo[i] = 0; } - for (int i = 0; i < MAX_FRAME_LENGTH; i++) + for (auto & elem : m_frame) { - m_frame[i] = 0; + elem = 0; } } |
