diff options
author | Aaron Giles <aaron@aarongiles.com> | 2011-03-29 15:50:04 +0000 |
---|---|---|
committer | Aaron Giles <aaron@aarongiles.com> | 2011-03-29 15:50:04 +0000 |
commit | 2ad50720237fdd19cf5ab45b8cb6bb21119c00b8 (patch) | |
tree | db21eee69668a06abc3f310ebbd51f5dbadf2de7 /src/mame/machine/midwayic.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/mame/machine/midwayic.h')
-rw-r--r-- | src/mame/machine/midwayic.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mame/machine/midwayic.h b/src/mame/machine/midwayic.h index 23522f9c828..61cfda69cdd 100644 --- a/src/mame/machine/midwayic.h +++ b/src/mame/machine/midwayic.h @@ -6,7 +6,7 @@ /* 1st generation Midway serial PIC */ -void midway_serial_pic_init(running_machine *machine, int upper); +void midway_serial_pic_init(running_machine &machine, int upper); void midway_serial_pic_reset_w(int state); UINT8 midway_serial_pic_status_r(void); UINT8 midway_serial_pic_r(address_space *space); @@ -14,7 +14,7 @@ void midway_serial_pic_w(address_space *space, UINT8 data); /* 2nd generation Midway serial/NVRAM/RTC PIC */ -void midway_serial_pic2_init(running_machine *machine, int upper, int yearoffs); +void midway_serial_pic2_init(running_machine &machine, int upper, int yearoffs); void midway_serial_pic2_set_default_nvram(const UINT8 *nvram); UINT8 midway_serial_pic2_status_r(address_space *space); UINT8 midway_serial_pic2_r(address_space *space); @@ -23,13 +23,13 @@ NVRAM_HANDLER( midway_serial_pic2 ); /* I/O ASIC connected to 2nd generation PIC */ -void midway_ioasic_init(running_machine *machine, int shuffle, int upper, int yearoffs, void (*irq_callback)(running_machine *, int)); +void midway_ioasic_init(running_machine &machine, int shuffle, int upper, int yearoffs, void (*irq_callback)(running_machine &, int)); void midway_ioasic_set_auto_ack(int auto_ack); void midway_ioasic_set_shuffle_state(int state); -void midway_ioasic_reset(running_machine *machine); -void midway_ioasic_fifo_w(running_machine *machine, UINT16 data); -void midway_ioasic_fifo_reset_w(running_machine *machine, int state); -void midway_ioasic_fifo_full_w(running_machine *machine, UINT16 data); +void midway_ioasic_reset(running_machine &machine); +void midway_ioasic_fifo_w(running_machine &machine, UINT16 data); +void midway_ioasic_fifo_reset_w(running_machine &machine, int state); +void midway_ioasic_fifo_full_w(running_machine &machine, UINT16 data); READ32_HANDLER( midway_ioasic_r ); WRITE32_HANDLER( midway_ioasic_w ); READ32_HANDLER( midway_ioasic_packed_r ); |