Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-27 18:53:05 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

null this pointer, bad format string (nw)

Browse Source
This commit is contained in:
Vas Crabb 2018-09-01 18:43:54 +10:00
parent 42d424bf91
commit 009e2243fb
5 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mame/audio/midway.cpp
View File

@ -376,7 +376,7 @@ void midway_ssio_device::ssio_map(address_map &map)
// default ports map // default ports map
//------------------------------------------------- //-------------------------------------------------
void midway_ssio_device::ssio_input_ports(address_map &map, const char *ssio) const void midway_ssio_device::ssio_input_ports(address_map &map, const char *ssio)
{ {
map(0x00, 0x04).mirror(0x18).r(ssio, FUNC(midway_ssio_device::ioport_read)); map(0x00, 0x04).mirror(0x18).r(ssio, FUNC(midway_ssio_device::ioport_read));
map(0x07, 0x07).mirror(0x18).r(ssio, FUNC(midway_ssio_device::read)); map(0x07, 0x07).mirror(0x18).r(ssio, FUNC(midway_ssio_device::read));

2
src/mame/audio/midway.h
View File

@ -67,7 +67,7 @@ public:
DECLARE_READ8_MEMBER(data_r); DECLARE_READ8_MEMBER(data_r);
void ssio_map(address_map &map); void ssio_map(address_map &map);
void ssio_input_ports(address_map &map, const char *ssio) const; static void ssio_input_ports(address_map &map, const char *ssio);
protected: protected:
// device-level overrides // device-level overrides

6
src/mame/drivers/mcr.cpp
View File

@ -707,7 +707,7 @@ void mcr_state::cpu_90009_portmap(address_map &map)
{ {
map.unmap_value_high(); map.unmap_value_high();
map.global_mask(0xff); map.global_mask(0xff);
m_ssio->ssio_input_ports(map, "ssio"); midway_ssio_device::ssio_input_ports(map, "ssio");
map(0xe0, 0xe0).w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0xe0, 0xe0).w("watchdog", FUNC(watchdog_timer_device::reset_w));
map(0xe8, 0xe8).nopw(); map(0xe8, 0xe8).nopw();
map(0xf0, 0xf3).rw(m_ctc, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); map(0xf0, 0xf3).rw(m_ctc, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write));
@ -736,7 +736,7 @@ void mcr_state::cpu_90010_portmap(address_map &map)
{ {
map.unmap_value_high(); map.unmap_value_high();
map.global_mask(0xff); map.global_mask(0xff);
m_ssio->ssio_input_ports(map, "ssio"); midway_ssio_device::ssio_input_ports(map, "ssio");
map(0xe0, 0xe0).w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0xe0, 0xe0).w("watchdog", FUNC(watchdog_timer_device::reset_w));
map(0xe8, 0xe8).nopw(); map(0xe8, 0xe8).nopw();
map(0xf0, 0xf3).rw(m_ctc, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); map(0xf0, 0xf3).rw(m_ctc, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write));
@ -766,7 +766,7 @@ void mcr_state::cpu_91490_portmap(address_map &map)
{ {
map.unmap_value_high(); map.unmap_value_high();
map.global_mask(0xff); map.global_mask(0xff);
m_ssio->ssio_input_ports(map, "ssio"); midway_ssio_device::ssio_input_ports(map, "ssio");
map(0xe0, 0xe0).w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0xe0, 0xe0).w("watchdog", FUNC(watchdog_timer_device::reset_w));
map(0xe8, 0xe8).nopw(); map(0xe8, 0xe8).nopw();
map(0xf0, 0xf3).rw(m_ctc, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); map(0xf0, 0xf3).rw(m_ctc, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write));

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

@ -526,7 +526,7 @@ void mcr3_state::spyhunt_portmap(address_map &map)
{ {
map.unmap_value_high(); map.unmap_value_high();
map.global_mask(0xff); map.global_mask(0xff);
m_ssio->ssio_input_ports(map, "ssio"); midway_ssio_device::ssio_input_ports(map, "ssio");
map(0x84, 0x86).w(FUNC(mcr3_state::spyhunt_scroll_value_w)); map(0x84, 0x86).w(FUNC(mcr3_state::spyhunt_scroll_value_w));
map(0xe0, 0xe0).w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0xe0, 0xe0).w("watchdog", FUNC(watchdog_timer_device::reset_w));
map(0xe8, 0xe8).nopw(); map(0xe8, 0xe8).nopw();

30
src/mame/includes/astrocde.h
View File

@ -5,6 +5,10 @@
Bally Astrocade-based hardware Bally Astrocade-based hardware
***************************************************************************/ ***************************************************************************/
#ifndef MAME_INCLUDES_ASTROCDE_H
#define MAME_INCLUDES_ASTROCDE_H
#pragma once
#include "cpu/z80/z80.h" #include "cpu/z80/z80.h"
#include "machine/bankdev.h" #include "machine/bankdev.h"
@ -32,8 +36,8 @@ public:
TIMER_SCANLINE TIMER_SCANLINE
}; };
astrocde_state(const machine_config &mconfig, device_type type, const char *tag) astrocde_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"),
m_votrax(*this, "votrax"), m_votrax(*this, "votrax"),
m_astrocade_sound1(*this, "astrocade1"), m_astrocade_sound1(*this, "astrocade1"),
@ -181,9 +185,9 @@ protected:
class seawolf2_state : public astrocde_state class seawolf2_state : public astrocde_state
{ {
public: public:
seawolf2_state(const machine_config &mconfig, device_type type, const char *tag) seawolf2_state(const machine_config &mconfig, device_type type, const char *tag) :
: astrocde_state(mconfig, type, tag) astrocde_state(mconfig, type, tag),
, m_samples(*this, "samples") m_samples(*this, "samples")
{ } { }
void seawolf2(machine_config &config); void seawolf2(machine_config &config);
@ -203,9 +207,9 @@ private:
class ebases_state : public astrocde_state class ebases_state : public astrocde_state
{ {
public: public:
ebases_state(const machine_config &mconfig, device_type type, const char *tag) ebases_state(const machine_config &mconfig, device_type type, const char *tag) :
: astrocde_state(mconfig, type, tag) astrocde_state(mconfig, type, tag),
, m_trackball(*this, {"TRACKX2", "TRACKY2", "TRACKX1", "TRACKY1"}) m_trackball(*this, {"TRACKX2", "TRACKY2", "TRACKX1", "TRACKY1"})
{ } { }
void ebases(machine_config &config); void ebases(machine_config &config);
@ -242,10 +246,10 @@ private:
class tenpindx_state : public astrocde_state class tenpindx_state : public astrocde_state
{ {
public: public:
tenpindx_state(const machine_config &mconfig, device_type type, const char *tag) tenpindx_state(const machine_config &mconfig, device_type type, const char *tag) :
: astrocde_state(mconfig, type, tag) astrocde_state(mconfig, type, tag),
, m_subcpu(*this, "sub") m_subcpu(*this, "sub"),
, m_lamps(*this, "lamp%0", 0U) m_lamps(*this, "lamp%u", 0U)
{ } { }
void tenpindx(machine_config &config); void tenpindx(machine_config &config);
@ -263,3 +267,5 @@ private:
required_device<z80_device> m_subcpu; required_device<z80_device> m_subcpu;
output_finder<19> m_lamps; output_finder<19> m_lamps;
}; };
#endif // MAME_INCLUDES_ASTROCDE_H