Previous 199869 Revisions Next

r44365 Saturday 23rd January, 2016 at 16:30:14 UTC by Ryan Holtz
More this==NULL stuff
[src/devices/sound]c140.cpp namco.cpp scsp.cpp scsp.h tms5110.cpp upd7759.cpp ymf271.cpp
[src/mame/includes]btime.h cps3.h
[src/mame/video]sega16sp.cpp

trunk/src/devices/sound/c140.cpp
r252876r252877
9595   , m_mixer_buffer_left(nullptr),
9696   , m_mixer_buffer_right(nullptr),
9797   , m_baserate(0),
98   , m_rom_region(*this, tag)
98   , m_rom_region(*this, this->tag())
9999   , m_pRom(nullptr)
100100{
101101   memset(m_REG, 0, sizeof(UINT8)*0x200);
trunk/src/devices/sound/namco.cpp
r252876r252877
3838namco_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)
3939   : device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__),
4040   , device_sound_interface(mconfig, *this)
41   , m_wave_region(*this, tag)
41   , m_wave_region(*this, this->tag())
4242   , m_last_channel(nullptr)
4343   , m_soundregs(nullptr)
4444   , m_wavedata(nullptr)
r252876r252877
110110   /* register with the save state system */
111111   save_pointer(NAME(m_soundregs), 0x400);
112112
113<<<<<<< HEAD
114   if (region() == nullptr)
115=======
116   if (m_wave_region == NULL)
117>>>>>>> Yet more this==NULL fixes
113   if (m_wave_region == nullptr)
118114      save_pointer(NAME(m_wavedata), 0x400);
119115
120116   save_item(NAME(m_voices));
trunk/src/devices/sound/scsp.cpp
r252876r252877
149149      m_roffset(0),
150150      m_irq_cb(*this),
151151      m_main_irq_cb(*this),
152      m_ram_region(*this, tag),
152      m_ram_region(*this, this->tag()),
153153      m_BUFPTR(0),
154154      m_SCSPRAM(nullptr),
155155      m_SCSPRAM_LENGTH(0),
r252876r252877
503503   SCSPDSP_Init(&m_DSP);
504504
505505   m_IrqTimA = m_IrqTimBC = m_IrqMidi = 0;
506   m_MidiR=m_MidiW=0;
507   m_MidiOutR=m_MidiOutW=0;
506   m_MidiR=m_MidiW = 0;
507   m_MidiOutR = m_MidiOutW = 0;
508508
509509   // get SCSP RAM
510510   if (strcmp(tag(), ":scsp") == 0 || strcmp(tag(), ":scsp1") == 0)
511511   {
512      m_Master=1;
512      m_Master = 1;
513513   }
514514   else
515515   {
516      m_Master=0;
516      m_Master = 0;
517517   }
518518
519519   if (m_ram_region)
trunk/src/devices/sound/scsp.h
r252876r252877
104104   int m_roffset;                /* offset in the region */
105105   devcb_write8       m_irq_cb;  /* irq callback */
106106   devcb_write_line   m_main_irq_cb;
107   optional_memory_region m_ram_region;
107   required_memory_region m_ram_region;
108108
109109   union
110110   {
trunk/src/devices/sound/tms5110.cpp
r252876r252877
15371537tms5110_device::tms5110_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
15381538   : device_t(mconfig, TMS5110, "TMS5110", tag, owner, clock, "tms5110", __FILE__),
15391539   , device_sound_interface(mconfig, *this)
1540   , m_table_region(*this, tag)
1540   , m_table_region(*this, this->tag())
15411541   , m_m0_cb(*this)
15421542   , m_m1_cb(*this)
15431543   , m_addr_cb(*this)
r252876r252877
15491549tms5110_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)
15501550   : device_t(mconfig, type, name, tag, owner, clock, shortname, source)
15511551   , device_sound_interface(mconfig, *this)
1552   , m_table_region(*this, tag)
1552   , m_table_region(*this, this->tag())
15531553   , m_m0_cb(*this)
15541554   , m_m1_cb(*this)
15551555   , m_addr_cb(*this)
trunk/src/devices/sound/upd7759.cpp
r252876r252877
171171   , m_adpcm_state(0)
172172   , m_adpcm_data(0)
173173   , m_sample(0)
174   , m_rom_region(*this, tag)
174   , m_rom_region(*this, this->tag())
175175   , m_rom(nullptr)
176176   , m_rombase(nullptr)
177177   , m_romoffset(0)
trunk/src/devices/sound/ymf271.cpp
r252876r252877
17491749
17501750const device_type YMF271 = &device_creator<ymf271_device>;
17511751
1752<<<<<<< HEAD
17531752ymf271_device::ymf271_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
17541753   : device_t(mconfig, YMF271, "YMF271", tag, owner, clock, "ymf271", __FILE__)
17551754   , device_sound_interface(mconfig, *this)
r252876r252877
17661765   , m_irq_handler(*this)
17671766   , m_ext_read_handler(*this)
17681767   , m_ext_write_handler(*this)
1769   , m_mem_region(*this, tag)
1768   , m_mem_region(*this, this->tag())
17701769   , m_clock(0)
17711770   , m_timA(nullptr)
17721771   , m_timB(nullptr)
trunk/src/mame/includes/btime.h
r252876r252877
99class btime_state : public driver_device
1010{
1111public:
12<<<<<<< HEAD
1312   btime_state(const machine_config &mconfig, device_type type, const char *tag)
1413      : driver_device(mconfig, type, tag)
1514      , m_rambase(*this, "rambase")
trunk/src/mame/includes/cps3.h
r252876r252877
1414class cps3_state : public driver_device
1515{
1616public:
17<<<<<<< HEAD
1817   cps3_state(const machine_config &mconfig, device_type type, const char *tag)
1918      : driver_device(mconfig, type, tag)
2019      , m_maincpu(*this, "maincpu")
trunk/src/mame/video/sega16sp.cpp
r252876r252877
826826
827827sega_sys16b_sprite_device::sega_sys16b_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
828828   : sega_16bit_sprite_device(mconfig, SEGA_SYS16B_SPRITES, "Sega System 16B Sprites", tag, owner, "sega_16bit_sprite", __FILE__)
829   , m_sprite_region(*this, tag)
829   , m_sprite_region(*this, this->tag())
830830{
831831   set_local_origin(184, 0x00, -184, 0);
832832}

https://github.com/mamedev/mame/commit/1f685be195d042f84755e70318b8d1a23f515276

Previous 199869 Revisions Next

© 1997-2024 The MAME Team