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/sound/c6280.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/sound/c6280.c')
-rw-r--r-- | src/emu/sound/c6280.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/emu/sound/c6280.c b/src/emu/sound/c6280.c index 0412d014dab..64a9a0dda10 100644 --- a/src/emu/sound/c6280.c +++ b/src/emu/sound/c6280.c @@ -26,7 +26,7 @@ game will reset the index prior to playback so this isn't an issue. - While the noise emulation is complete, the data for the pseudo-random - bitstream is calculated by machine->rand() and is not a representation of what + bitstream is calculated by machine.rand() and is not a representation of what the actual hardware does. For some background on Hudson Soft's C62 chipset: @@ -107,7 +107,7 @@ static void c6280_init(device_t *device, c6280_t *p, double clk, double rate) memset(p, 0, sizeof(c6280_t)); p->device = device; - p->cpudevice = device->machine->device(intf->cpu); + p->cpudevice = device->machine().device(intf->cpu); if (p->cpudevice == NULL) fatalerror("c6280_init: no CPU found with tag of '%s'\n", device->tag()); @@ -277,7 +277,7 @@ static STREAM_UPDATE( c6280_update ) p->channel[ch].noise_counter += step; if(p->channel[ch].noise_counter >= 0x800) { - data = (p->device->machine->rand() & 1) ? 0x1F : 0; + data = (p->device->machine().rand() & 1) ? 0x1F : 0; } p->channel[ch].noise_counter &= 0x7FF; outputs[0][i] += (INT16)(vll * (data - 16)); @@ -328,7 +328,7 @@ static DEVICE_START( c6280 ) c6280_init(device, info, device->clock(), rate); /* Create stereo stream */ - info->stream = device->machine->sound().stream_alloc(*device, 0, 2, rate, info, c6280_update); + info->stream = device->machine().sound().stream_alloc(*device, 0, 2, rate, info, c6280_update); } READ8_DEVICE_HANDLER( c6280_r ) |