summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/sound/es5506.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/sound/es5506.cpp')
-rw-r--r--src/devices/sound/es5506.cpp36
1 files changed, 18 insertions, 18 deletions
diff --git a/src/devices/sound/es5506.cpp b/src/devices/sound/es5506.cpp
index d6e1865b8ae..6e47ed7977d 100644
--- a/src/devices/sound/es5506.cpp
+++ b/src/devices/sound/es5506.cpp
@@ -130,7 +130,7 @@ Ensoniq OTIS - ES5505 Ensoniq OTTO -
es550x_device::es550x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_sound_interface(mconfig, *this),
- m_stream(NULL),
+ m_stream(nullptr),
m_sample_rate(0),
m_write_latch(0),
m_read_latch(0),
@@ -142,24 +142,24 @@ es550x_device::es550x_device(const machine_config &mconfig, device_type type, co
m_wend(0),
m_lrend(0),
m_irqv(0),
- m_scratch(NULL),
- m_ulaw_lookup(NULL),
- m_volume_lookup(NULL),
+ m_scratch(nullptr),
+ m_ulaw_lookup(nullptr),
+ m_volume_lookup(nullptr),
#if MAKE_WAVS
m_wavraw(NULL),
#endif
- m_eslog(NULL),
- m_region0(NULL),
- m_region1(NULL),
- m_region2(NULL),
- m_region3(NULL),
+ m_eslog(nullptr),
+ m_region0(nullptr),
+ m_region1(nullptr),
+ m_region2(nullptr),
+ m_region3(nullptr),
m_channels(0),
m_irq_cb(*this),
m_read_port_cb(*this)
{
- for (int i = 0; i < 4; i++)
+ for (auto & elem : m_region_base)
{
- m_region_base[i] = NULL;
+ elem = nullptr;
}
}
@@ -195,10 +195,10 @@ void es5506_device::device_start()
m_stream = machine().sound().stream_alloc(*this, 0, 2 * channels, clock() / (16*32));
/* initialize the regions */
- m_region_base[0] = m_region0 ? (UINT16 *)machine().root_device().memregion(m_region0)->base() : NULL;
- m_region_base[1] = m_region1 ? (UINT16 *)machine().root_device().memregion(m_region1)->base() : NULL;
- m_region_base[2] = m_region2 ? (UINT16 *)machine().root_device().memregion(m_region2)->base() : NULL;
- m_region_base[3] = m_region3 ? (UINT16 *)machine().root_device().memregion(m_region3)->base() : NULL;
+ m_region_base[0] = m_region0 ? (UINT16 *)machine().root_device().memregion(m_region0)->base() : nullptr;
+ m_region_base[1] = m_region1 ? (UINT16 *)machine().root_device().memregion(m_region1)->base() : nullptr;
+ m_region_base[2] = m_region2 ? (UINT16 *)machine().root_device().memregion(m_region2)->base() : nullptr;
+ m_region_base[3] = m_region3 ? (UINT16 *)machine().root_device().memregion(m_region3)->base() : nullptr;
/* initialize the rest of the structure */
m_master_clock = clock();
@@ -292,7 +292,7 @@ void es550x_device::device_stop()
if (LOG_COMMANDS && m_eslog)
{
fclose(m_eslog);
- m_eslog = NULL;
+ m_eslog = nullptr;
}
#if MAKE_WAVS
@@ -337,8 +337,8 @@ void es5505_device::device_start()
m_stream = machine().sound().stream_alloc(*this, 0, 2 * channels, clock() / (16*32));
/* initialize the regions */
- m_region_base[0] = m_region0 ? (UINT16 *)machine().root_device().memregion(m_region0)->base() : NULL;
- m_region_base[1] = m_region1 ? (UINT16 *)machine().root_device().memregion(m_region1)->base() : NULL;
+ m_region_base[0] = m_region0 ? (UINT16 *)machine().root_device().memregion(m_region0)->base() : nullptr;
+ m_region_base[1] = m_region1 ? (UINT16 *)machine().root_device().memregion(m_region1)->base() : nullptr;
/* initialize the rest of the structure */
m_master_clock = clock();