diff options
author | Aaron Giles <aaron@aarongiles.com> | 2008-05-15 16:25:03 +0000 |
---|---|---|
committer | Aaron Giles <aaron@aarongiles.com> | 2008-05-15 16:25:03 +0000 |
commit | 096331c8562467a67fb5674f46dbb26bb032d2a6 (patch) | |
tree | 1f9329631b6fb62a81f4bdd894403389d2f70759 /src/mame/drivers/exidy.c | |
parent | bc4b470ebbee405c6f48253acc225451f52a9b70 (diff) |
Restructured input port internals and cleaned up inptport.c:
* Input ports are now maintained hierarchically. At the top
level are input ports, which contain a list of fields. Each
field represents one or more bits of the port. Certain fields
such as DIP switches and configuration switches contain a
list of settings, which can be selected. DIP switch fields
can also contain a list of DIP switch locations.
* Normalized behavior of port overrides (via PORT_INCLUDE or
by defining multiple overlapping bits). All fields within a
port are kept in strict increasing bit order, so altered DIP
switches are now kept in the appropriate order. This addresses
MAMETesters bug 01671.
* Live port state is now fully separate from configured
state. This is manifested in a similar way to devices, where
a const list of ports can be managed either offline or live.
Each port has a pointer to an opaque set of live state which
is NULL when offline or valid when live. Each port also has
a running_machine * which is also NULL when offline.
* Because of this new arrangement, the conversion from tokens
to a list of ports now requires reasonably complex memory
allocation, so these port lists must be explicitly allocated
and freed (they are not mantained by automatic resource
allocation).
* Custom and changed callbacks now take a pointer to a field
config instead of a running machine. This provides more
information about what field triggered the change notification.
The machine can be found by referenced field->port->machine.
* The inptport.c module has been cleaned up and many
ambiguities resolved. Most of this is internal, though it did
result in osd_customize_inputport_list() being changed to
osd_customize_input_type_list(). The parameter to this function
is now a linked list instead of an array, and the structures
referenced have been reorganized somewhat.
* Updated config.c to pass machine parameters to its callbacks.
* Updated validity checks, XML output, and UI system to handle
the new structures.
* Moved large table of default input settings to a separate
include file inpttype.h.
* Removed gross hacks in trackfld and hyperspt NVRAM. These
may be broken as a result.
Diffstat (limited to 'src/mame/drivers/exidy.c')
-rw-r--r-- | src/mame/drivers/exidy.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mame/drivers/exidy.c b/src/mame/drivers/exidy.c index b35732c76cd..b65463849b9 100644 --- a/src/mame/drivers/exidy.c +++ b/src/mame/drivers/exidy.c @@ -145,7 +145,7 @@ static UINT8 last_dial; static CUSTOM_INPUT( teetert_input_direction_r ) { int result = 0; - UINT8 dial = input_port_read(machine, "DIAL"); + UINT8 dial = input_port_read(field->port->machine, "DIAL"); if (dial != last_dial) { @@ -164,7 +164,7 @@ static CUSTOM_INPUT( teetert_input_direction_r ) static CUSTOM_INPUT( teetert_input_movement_r ) { - UINT8 dial = input_port_read(machine, "DIAL"); + UINT8 dial = input_port_read(field->port->machine, "DIAL"); return (dial != last_dial) ? 1 : 0; } @@ -500,7 +500,7 @@ static INPUT_PORTS_START( mtrap ) PORT_START_TAG("IN2") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Yellow Button") PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Red Button") - PORT_BIT( 0x04, 0x04, IPT_DIPSWITCH_NAME ) PORT_NAME( DEF_STR( Free_Play )) + PORT_DIPNAME( 0x04, 0x04, DEF_STR( Free_Play ) ) PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Blue Button") |