Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-01 16:19:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added a validity check against reading input ports at init time.

Browse Source
This commit is contained in:
Curt Coder 2008-06-16 15:05:06 +00:00
parent 6a1d0b762c
commit a93fb6b1bf
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/emu/inptport.c
View File

@ -1275,6 +1275,7 @@ input_port_value input_port_read_direct(const input_port_config *port)
input_port_value input_port_read(running_machine *machine, const char *tag) input_port_value input_port_read(running_machine *machine, const char *tag)
{ {
const input_port_config *port = input_port_by_tag(machine->portconfig, tag); const input_port_config *port = input_port_by_tag(machine->portconfig, tag);
assert_always(mame_get_phase(machine) != MAME_PHASE_INIT, "Input ports cannot be read at init time!");
if (port == NULL) if (port == NULL)
fatalerror("Unable to locate input port '%s'", tag); fatalerror("Unable to locate input port '%s'", tag);
return input_port_read_direct(port); return input_port_read_direct(port);
@ -1290,6 +1291,7 @@ input_port_value input_port_read(running_machine *machine, const char *tag)
input_port_value input_port_read_safe(running_machine *machine, const char *tag, UINT32 defvalue) input_port_value input_port_read_safe(running_machine *machine, const char *tag, UINT32 defvalue)
{ {
const input_port_config *port = input_port_by_tag(machine->portconfig, tag); const input_port_config *port = input_port_by_tag(machine->portconfig, tag);
assert_always(mame_get_phase(machine) != MAME_PHASE_INIT, "Input ports cannot be read at init time!");
return (port == NULL) ? defvalue : input_port_read_direct(port); return (port == NULL) ? defvalue : input_port_read_direct(port);
} }
@ -1302,6 +1304,7 @@ input_port_value input_port_read_safe(running_machine *machine, const char *tag,
input_port_value input_port_read_indexed(running_machine *machine, int portnum) input_port_value input_port_read_indexed(running_machine *machine, int portnum)
{ {
const input_port_config *port = input_port_by_index(machine->portconfig, portnum); const input_port_config *port = input_port_by_index(machine->portconfig, portnum);
assert_always(mame_get_phase(machine) != MAME_PHASE_INIT, "Input ports cannot be read at init time!");
return (port == NULL) ? 0 : input_port_read_direct(port); return (port == NULL) ? 0 : input_port_read_direct(port);
} }