Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-06 17:08:28 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

More this==NULL stuff

Browse Source
This commit is contained in:
therealmogminer@gmail.com 2015-11-29 23:56:22 +01:00 committed by Miodrag Milanovic
parent 177eaa4208
commit 1f685be195
10 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/devices/sound/c140.cpp
View File

@ -95,7 +95,7 @@ c140_device::c140_device(const machine_config &mconfig, const char *tag, device_
, m_mixer_buffer_left(nullptr), , m_mixer_buffer_left(nullptr),
, m_mixer_buffer_right(nullptr), , m_mixer_buffer_right(nullptr),
, m_baserate(0), , m_baserate(0),
, m_rom_region(*this, tag) , m_rom_region(*this, this->tag())
, m_pRom(nullptr) , m_pRom(nullptr)
{ {
memset(m_REG, 0, sizeof(UINT8)*0x200); memset(m_REG, 0, sizeof(UINT8)*0x200);

8
src/devices/sound/namco.cpp
View File

@ -38,7 +38,7 @@ const device_type NAMCO_CUS30 = &device_creator<namco_cus30_device>;
namco_audio_device::namco_audio_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) namco_audio_device::namco_audio_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, __FILE__), : device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__),
, device_sound_interface(mconfig, *this) , device_sound_interface(mconfig, *this)
, m_wave_region(*this, tag) , m_wave_region(*this, this->tag())
, m_last_channel(nullptr) , m_last_channel(nullptr)
, m_soundregs(nullptr) , m_soundregs(nullptr)
, m_wavedata(nullptr) , m_wavedata(nullptr)
@ -110,11 +110,7 @@ void namco_audio_device::device_start()
/* register with the save state system */ /* register with the save state system */
save_pointer(NAME(m_soundregs), 0x400); save_pointer(NAME(m_soundregs), 0x400);
<<<<<<< HEAD if (m_wave_region == nullptr)
if (region() == nullptr)
=======
if (m_wave_region == NULL)
>>>>>>> Yet more this==NULL fixes
save_pointer(NAME(m_wavedata), 0x400); save_pointer(NAME(m_wavedata), 0x400);
save_item(NAME(m_voices)); save_item(NAME(m_voices));

10
src/devices/sound/scsp.cpp
View File

@ -149,7 +149,7 @@ scsp_device::scsp_device(const machine_config &mconfig, const char *tag, device_
m_roffset(0), m_roffset(0),
m_irq_cb(*this), m_irq_cb(*this),
m_main_irq_cb(*this), m_main_irq_cb(*this),
m_ram_region(*this, tag), m_ram_region(*this, this->tag()),
m_BUFPTR(0), m_BUFPTR(0),
m_SCSPRAM(nullptr), m_SCSPRAM(nullptr),
m_SCSPRAM_LENGTH(0), m_SCSPRAM_LENGTH(0),
@ -503,17 +503,17 @@ void scsp_device::init()
SCSPDSP_Init(&m_DSP); SCSPDSP_Init(&m_DSP);
m_IrqTimA = m_IrqTimBC = m_IrqMidi = 0; m_IrqTimA = m_IrqTimBC = m_IrqMidi = 0;
m_MidiR=m_MidiW=0; m_MidiR=m_MidiW = 0;
m_MidiOutR=m_MidiOutW=0; m_MidiOutR = m_MidiOutW = 0;
// get SCSP RAM // get SCSP RAM
if (strcmp(tag(), ":scsp") == 0 || strcmp(tag(), ":scsp1") == 0) if (strcmp(tag(), ":scsp") == 0 || strcmp(tag(), ":scsp1") == 0)
{ {
m_Master=1; m_Master = 1;
} }
else else
{ {
m_Master=0; m_Master = 0;
} }
if (m_ram_region) if (m_ram_region)

2
src/devices/sound/scsp.h
View File

@ -104,7 +104,7 @@ private:
int m_roffset; /* offset in the region */ int m_roffset; /* offset in the region */
devcb_write8 m_irq_cb; /* irq callback */ devcb_write8 m_irq_cb; /* irq callback */
devcb_write_line m_main_irq_cb; devcb_write_line m_main_irq_cb;
optional_memory_region m_ram_region; required_memory_region m_ram_region;
union union
{ {

4
src/devices/sound/tms5110.cpp
View File

@ -1537,7 +1537,7 @@ const device_type TMS5110 = &device_creator<tms5110_device>;
tms5110_device::tms5110_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) tms5110_device::tms5110_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TMS5110, "TMS5110", tag, owner, clock, "tms5110", __FILE__), : device_t(mconfig, TMS5110, "TMS5110", tag, owner, clock, "tms5110", __FILE__),
, device_sound_interface(mconfig, *this) , device_sound_interface(mconfig, *this)
, m_table_region(*this, tag) , m_table_region(*this, this->tag())
, m_m0_cb(*this) , m_m0_cb(*this)
, m_m1_cb(*this) , m_m1_cb(*this)
, m_addr_cb(*this) , m_addr_cb(*this)
@ -1549,7 +1549,7 @@ tms5110_device::tms5110_device(const machine_config &mconfig, const char *tag, d
tms5110_device::tms5110_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) tms5110_device::tms5110_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_t(mconfig, type, name, tag, owner, clock, shortname, source)
, device_sound_interface(mconfig, *this) , device_sound_interface(mconfig, *this)
, m_table_region(*this, tag) , m_table_region(*this, this->tag())
, m_m0_cb(*this) , m_m0_cb(*this)
, m_m1_cb(*this) , m_m1_cb(*this)
, m_addr_cb(*this) , m_addr_cb(*this)

2
src/devices/sound/upd7759.cpp
View File

@ -171,7 +171,7 @@ upd775x_device::upd775x_device(const machine_config &mconfig, device_type type,
, m_adpcm_state(0) , m_adpcm_state(0)
, m_adpcm_data(0) , m_adpcm_data(0)
, m_sample(0) , m_sample(0)
, m_rom_region(*this, tag) , m_rom_region(*this, this->tag())
, m_rom(nullptr) , m_rom(nullptr)
, m_rombase(nullptr) , m_rombase(nullptr)
, m_romoffset(0) , m_romoffset(0)

3
src/devices/sound/ymf271.cpp
View File

@ -1749,7 +1749,6 @@ void ymf271_device::device_reset()
const device_type YMF271 = &device_creator<ymf271_device>; const device_type YMF271 = &device_creator<ymf271_device>;
<<<<<<< HEAD
ymf271_device::ymf271_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) ymf271_device::ymf271_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, YMF271, "YMF271", tag, owner, clock, "ymf271", __FILE__) : device_t(mconfig, YMF271, "YMF271", tag, owner, clock, "ymf271", __FILE__)
, device_sound_interface(mconfig, *this) , device_sound_interface(mconfig, *this)
@ -1766,7 +1765,7 @@ ymf271_device::ymf271_device(const machine_config &mconfig, const char *tag, dev
, m_irq_handler(*this) , m_irq_handler(*this)
, m_ext_read_handler(*this) , m_ext_read_handler(*this)
, m_ext_write_handler(*this) , m_ext_write_handler(*this)
, m_mem_region(*this, tag) , m_mem_region(*this, this->tag())
, m_clock(0) , m_clock(0)
, m_timA(nullptr) , m_timA(nullptr)
, m_timB(nullptr) , m_timB(nullptr)

1
src/mame/includes/btime.h
View File

@ -9,7 +9,6 @@
class btime_state : public driver_device class btime_state : public driver_device
{ {
public: public:
<<<<<<< HEAD
btime_state(const machine_config &mconfig, device_type type, const char *tag) btime_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag) : driver_device(mconfig, type, tag)
, m_rambase(*this, "rambase") , m_rambase(*this, "rambase")

1
src/mame/includes/cps3.h
View File

@ -14,7 +14,6 @@
class cps3_state : public driver_device class cps3_state : public driver_device
{ {
public: public:
<<<<<<< HEAD
cps3_state(const machine_config &mconfig, device_type type, const char *tag) cps3_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag) : driver_device(mconfig, type, tag)
, m_maincpu(*this, "maincpu") , m_maincpu(*this, "maincpu")

2
src/mame/video/sega16sp.cpp
View File

@ -826,7 +826,7 @@ void bootleg_sys16a_sprite_device::draw(bitmap_ind16 &bitmap, const rectangle &c
sega_sys16b_sprite_device::sega_sys16b_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) sega_sys16b_sprite_device::sega_sys16b_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: sega_16bit_sprite_device(mconfig, SEGA_SYS16B_SPRITES, "Sega System 16B Sprites", tag, owner, "sega_16bit_sprite", __FILE__) : sega_16bit_sprite_device(mconfig, SEGA_SYS16B_SPRITES, "Sega System 16B Sprites", tag, owner, "sega_16bit_sprite", __FILE__)
, m_sprite_region(*this, tag) , m_sprite_region(*this, this->tag())
{ {
set_local_origin(184, 0x00, -184, 0); set_local_origin(184, 0x00, -184, 0);
} }