From aa156019687769f53662df692de5c26538e82f99 Mon Sep 17 00:00:00 2001 From: Curt Coder Date: Thu, 12 Jun 2008 19:34:37 +0000 Subject: [PATCH] Added a validity check against reading input ports at init time. --- src/emu/inptport.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/emu/inptport.c b/src/emu/inptport.c index d7ba349762d..064c79bd7c7 100644 --- a/src/emu/inptport.c +++ b/src/emu/inptport.c @@ -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) { 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) fatalerror("Unable to locate input port '%s'", tag); 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) { 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); } @@ -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) { 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); }