Previous 199869 Revisions Next

r44374 Saturday 23rd January, 2016 at 17:01:38 UTC by Miodrag Milanović
- Removed this == nullptr checks and fixed most of the resulting crashes. [MooglyGuy, Tafoid]

Fix merge errors (nw)
[src/devices/sound]c140.cpp upd7759.cpp

trunk/src/devices/sound/c140.cpp
r252885r252886
8787//-------------------------------------------------
8888
8989c140_device::c140_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
90   : device_t(mconfig, C140, "C140", tag, owner, clock, "c140", __FILE__),
91   , device_sound_interface(mconfig, *this),
92   , m_sample_rate(0),
93   , m_stream(nullptr),
94   , m_banking_type(0),
95   , m_mixer_buffer_left(nullptr),
96   , m_mixer_buffer_right(nullptr),
97   , m_baserate(0),
98   , m_rom_region(*this, DEVICE_SELF)
90   : device_t(mconfig, C140, "C140", tag, owner, clock, "c140", __FILE__)
91   , device_sound_interface(mconfig, *this)
92   , m_sample_rate(0)
93   , m_stream(nullptr)
94   , m_banking_type(0)
95   , m_mixer_buffer_left(nullptr)
96   , m_mixer_buffer_right(nullptr)
97   , m_baserate(0)
98   , m_rom_ptr(*this, DEVICE_SELF)
9999   , m_pRom(nullptr)
100100{
101101   memset(m_REG, 0, sizeof(UINT8)*0x200);
trunk/src/devices/sound/upd7759.cpp
r252885r252886
189189
190190
191191upd7759_device::upd7759_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)
192   : upd775x_device(mconfig, type, name, tag, owner, clock, shortname, source),
192   : upd775x_device(mconfig, type, name, tag, owner, clock, shortname, source)
193193   , m_timer(nullptr)
194194{
195195}


Previous 199869 Revisions Next


© 1997-2024 The MAME Team