diff options
author | 2011-03-29 15:50:04 +0000 | |
---|---|---|
committer | 2011-03-29 15:50:04 +0000 | |
commit | 2ad50720237fdd19cf5ab45b8cb6bb21119c00b8 (patch) | |
tree | db21eee69668a06abc3f310ebbd51f5dbadf2de7 /src/emu/machine/microtch.h | |
parent | b72cf3c5702b749c7bf26383ff05a9ab55022d31 (diff) |
BIG update.
Remove redundant machine items from address_space and device_t.
Neither machine nor m_machine are directly accessible anymore.
Instead a new getter machine() is available which returns a
machine reference. So:
space->machine->xxx ==> space->machine().xxx
device->machine->yyy ==> device->machine().yyy
Globally changed all running_machine pointers to running_machine
references. Any function/method that takes a running_machine takes
it as a required parameter (1 or 2 exceptions). Being consistent
here gets rid of a lot of odd &machine or *machine, but it does
mean a very large bulk change across the project.
Structs which have a running_machine * now have that variable
renamed to m_machine, and now have a shiny new machine() method
that works like the space and device methods above. Since most of
these are things that should eventually be devices anyway, consider
this a step in that direction.
98% of the update was done with regex searches. The changes are
architected such that the compiler will catch the remaining
errors:
// find things that use an embedded machine directly and replace
// with a machine() getter call
S: ->machine->
R: ->machine\(\)\.
// do the same if via a reference
S: \.machine->
R: \.machine\(\)\.
// convert function parameters to running_machine &
S: running_machine \*machine([^;])
R: running_machine \&machine\1
// replace machine-> with machine.
S: machine->
R: machine\.
// replace &machine() with machine()
S: \&([()->a-z0-9_]+machine\(\))
R: \1
// sanity check: look for this used as a cast
(running_machine &)
// and change to this:
*(running_machine *)
Diffstat (limited to 'src/emu/machine/microtch.h')
-rw-r--r-- | src/emu/machine/microtch.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/emu/machine/microtch.h b/src/emu/machine/microtch.h index efa6c2a4f12..d378c49eb91 100644 --- a/src/emu/machine/microtch.h +++ b/src/emu/machine/microtch.h @@ -3,10 +3,10 @@ INPUT_PORTS_EXTERN(microtouch); -typedef void (*microtouch_tx_func)(running_machine *machine, UINT8 data); -typedef int (*microtouch_touch_func)(running_machine *machine, int *touch_x, int *touch_y); +typedef void (*microtouch_tx_func)(running_machine &machine, UINT8 data); +typedef int (*microtouch_touch_func)(running_machine &machine, int *touch_x, int *touch_y); -void microtouch_init(running_machine *machine, microtouch_tx_func tx_cb, microtouch_touch_func touch_cb); +void microtouch_init(running_machine &machine, microtouch_tx_func tx_cb, microtouch_touch_func touch_cb); void microtouch_rx(int count, UINT8* data); #endif //_MICROTOUCH_H |