Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-29 11:30:28 +03:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Fixes to bring in line with master

Browse Source
This commit is contained in:
therealmogminer@gmail.com 2016-01-18 18:13:20 +01:00 committed by Miodrag Milanovic
parent ffce2c3b08
commit 9db461c3bc
7 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,7 +36,7 @@ const device_type NAMCO_15XX = &device_creator<namco_15xx_device>;
const device_type NAMCO_CUS30 = &device_creator<namco_cus30_device>; 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_ptr(*this, DEVICE_SELF) , m_wave_ptr(*this, DEVICE_SELF)
, m_last_channel(nullptr) , m_last_channel(nullptr)

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

@ -1529,7 +1529,7 @@ WRITE_LINE_MEMBER( tmsprom_device::enable_w )
const device_type TMS5110 = &device_creator<tms5110_device>; 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(*this, DEVICE_SELF) , m_table(*this, DEVICE_SELF)
, m_m0_cb(*this) , m_m0_cb(*this)

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

@ -171,9 +171,8 @@ 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, DEVICE_SELF) , m_rombase(*this, DEVICE_SELF)
, m_rom(nullptr) , m_rom(nullptr)
, m_rombase(nullptr)
, m_romoffset(0) , m_romoffset(0)
, m_rommask(0) , m_rommask(0)
, m_drqcallback(*this) , m_drqcallback(*this)

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

@ -16,8 +16,7 @@
#define MCFG_YMF271_EXT_WRITE_HANDLER(_devcb) \ #define MCFG_YMF271_EXT_WRITE_HANDLER(_devcb) \
devcb = &ymf271_device::set_ext_write_handler(*device, DEVCB_##_devcb); devcb = &ymf271_device::set_ext_write_handler(*device, DEVCB_##_devcb);
class ymf271_device : public device_t, class ymf271_device : public device_t, public device_sound_interface
public device_sound_interface
{ {
public: public:
ymf271_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ymf271_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);

2
src/mame/drivers/arsystems.cpp
View File

@ -67,8 +67,6 @@ public:
{ {
} }
UINT8 m_coin_counter[2];
DECLARE_WRITE16_MEMBER(arcadia_multibios_change_game); DECLARE_WRITE16_MEMBER(arcadia_multibios_change_game);
DECLARE_CUSTOM_INPUT_MEMBER(coin_counter_r); DECLARE_CUSTOM_INPUT_MEMBER(coin_counter_r);
DECLARE_INPUT_CHANGED_MEMBER(coin_changed_callback); DECLARE_INPUT_CHANGED_MEMBER(coin_changed_callback);

3
src/mame/drivers/igs011.cpp
View File

@ -108,12 +108,11 @@ public:
optional_shared_ptr<UINT16> m_vbowl_trackball; optional_shared_ptr<UINT16> m_vbowl_trackball;
required_shared_ptr<UINT16> m_generic_paletteram_16; required_shared_ptr<UINT16> m_generic_paletteram_16;
std::unique_ptr<UINT8[]> m_layer[8];
/* memory regions */ /* memory regions */
required_memory_region m_gfx_region; required_memory_region m_gfx_region;
optional_memory_region m_gfx2_region; optional_memory_region m_gfx2_region;
UINT8 *m_layer[8]; std::unique_ptr<UINT8[]> m_layer[8];
UINT16 m_priority; UINT16 m_priority;
UINT8 m_lhb2_pen_hi; UINT8 m_lhb2_pen_hi;
UINT16 m_igs_dips_sel; UINT16 m_igs_dips_sel;

3
src/mame/includes/n64.h
View File

@ -25,9 +25,6 @@ public:
{ {
} }
/* video-related */
n64_rdp *m_rdp;
virtual void machine_start() override; virtual void machine_start() override;
virtual void machine_reset() override; virtual void machine_reset() override;
virtual void video_start() override; virtual void video_start() override;