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/ldvp931.c | |
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/ldvp931.c')
-rw-r--r-- | src/emu/machine/ldvp931.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/emu/machine/ldvp931.c b/src/emu/machine/ldvp931.c index e01a3f07541..d3b5d0005f7 100644 --- a/src/emu/machine/ldvp931.c +++ b/src/emu/machine/ldvp931.c @@ -234,7 +234,7 @@ static void vp931_vsync(laserdisc_state *ld, const vbi_metadata *vbi, int fieldn /* set the ERP signal to 1 to indicate start of frame, and set a timer to turn it off */ ld->player->daticerp = 1; - ld->device->machine->scheduler().timer_set(ld->screen->time_until_pos(15*2), FUNC(erp_off), 0, ld); + ld->device->machine().scheduler().timer_set(ld->screen->time_until_pos(15*2), FUNC(erp_off), 0, ld); } @@ -246,7 +246,7 @@ static void vp931_vsync(laserdisc_state *ld, const vbi_metadata *vbi, int fieldn static INT32 vp931_update(laserdisc_state *ld, const vbi_metadata *vbi, int fieldnum, attotime curtime) { /* set the first VBI timer to go at the start of line 16 */ - ld->device->machine->scheduler().timer_set(ld->screen->time_until_pos(16*2), FUNC(vbi_data_fetch), LASERDISC_CODE_LINE16 << 2, ld); + ld->device->machine().scheduler().timer_set(ld->screen->time_until_pos(16*2), FUNC(vbi_data_fetch), LASERDISC_CODE_LINE16 << 2, ld); /* play forward by default */ return fieldnum; @@ -261,7 +261,7 @@ static INT32 vp931_update(laserdisc_state *ld, const vbi_metadata *vbi, int fiel static void vp931_data_w(laserdisc_state *ld, UINT8 prev, UINT8 data) { /* set a timer to synchronize execution before sending the data */ - ld->device->machine->scheduler().synchronize(FUNC(deferred_data_w), data, ld); + ld->device->machine().scheduler().synchronize(FUNC(deferred_data_w), data, ld); } @@ -283,7 +283,7 @@ static UINT8 vp931_data_r(laserdisc_state *ld) } /* also boost interleave for 4 scanlines to ensure proper communications */ - ld->device->machine->scheduler().boost_interleave(attotime::zero, ld->screen->scan_period() * 4); + ld->device->machine().scheduler().boost_interleave(attotime::zero, ld->screen->scan_period() * 4); return player->tocontroller; } @@ -336,7 +336,7 @@ static TIMER_CALLBACK( vbi_data_fetch ) if (which == 0) { device_set_input_line(player->cpu, MCS48_INPUT_IRQ, ASSERT_LINE); - machine->scheduler().timer_set(attotime::from_nsec(5580), FUNC(irq_off), 0, ld); + machine.scheduler().timer_set(attotime::from_nsec(5580), FUNC(irq_off), 0, ld); } /* clock the data strobe on each subsequent callback */ @@ -344,7 +344,7 @@ static TIMER_CALLBACK( vbi_data_fetch ) { player->daticval = code >> (8 * (3 - which)); player->datastrobe = 1; - machine->scheduler().timer_set(attotime::from_nsec(5000), FUNC(datastrobe_off), 0, ld); + machine.scheduler().timer_set(attotime::from_nsec(5000), FUNC(datastrobe_off), 0, ld); } /* determine the next bit to fetch and reprime ourself */ @@ -354,7 +354,7 @@ static TIMER_CALLBACK( vbi_data_fetch ) line++; } if (line <= LASERDISC_CODE_LINE18 + 1) - machine->scheduler().timer_set(ld->screen->time_until_pos(line*2, which * 2 * ld->screen->width() / 4), FUNC(vbi_data_fetch), (line << 2), ld); + machine.scheduler().timer_set(ld->screen->time_until_pos(line*2, which * 2 * ld->screen->width() / 4), FUNC(vbi_data_fetch), (line << 2), ld); } @@ -617,7 +617,7 @@ static WRITE8_HANDLER( to_controller_w ) (*player->data_ready_cb)(ld->device, TRUE); /* also boost interleave for 4 scanlines to ensure proper communications */ - ld->device->machine->scheduler().boost_interleave(attotime::zero, ld->screen->scan_period() * 4); + ld->device->machine().scheduler().boost_interleave(attotime::zero, ld->screen->scan_period() * 4); } |