summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatarGravatar Angelo Salese <angelosa@users.noreply.github.com>2012-03-11 17:17:00 +0000
committerGravatarGravatar Angelo Salese <angelosa@users.noreply.github.com>2012-03-11 17:17:00 +0000
commitd2c052dbefdee4f936874c138e6c072b1d3d4d67 (patch)
tree0d8b34aeb0ee241d97fcac8a3f0e95915a5a7ce6
parenta62e7d8be4b3fa00129edb870165edf95710c654 (diff)
Clean-ups and version bump (yes, I know, it's too late)mame0145u4
-rw-r--r--src/emu/cpu/i386/i386.c2
-rw-r--r--src/emu/cpu/lr35902/lr35902.c2
-rw-r--r--src/emu/cpu/m6502/ill02.h2
-rw-r--r--src/emu/cpu/m68000/m68kcpu.c6
-rw-r--r--src/emu/cpu/powerpc/ppcdrc.c4
-rw-r--r--src/emu/device.h4
-rw-r--r--src/emu/imagedev/flopdrv.c4
-rw-r--r--src/emu/imagedev/flopdrv.h8
-rw-r--r--src/emu/machine/ins8250.c16
-rw-r--r--src/emu/machine/nscsi_hd.c2
-rw-r--r--src/emu/save.h2
-rw-r--r--src/emu/sound/k054539.c16
-rw-r--r--src/emu/sound/k054539.h20
-rw-r--r--src/emu/sound/votrax.c382
-rw-r--r--src/emu/sound/votrax.h34
-rw-r--r--src/emu/video/bufsprite.h8
-rw-r--r--src/lib/lib.mak2
-rw-r--r--src/lib/util/cdrom.c4
-rw-r--r--src/mame/audio/gottlieb.c56
-rw-r--r--src/mame/drivers/armedf.c2
-rw-r--r--src/mame/drivers/bbusters.c2
-rw-r--r--src/mame/drivers/bfm_sc1.c24
-rw-r--r--src/mame/drivers/bionicc.c2
-rw-r--r--src/mame/drivers/blktiger.c2
-rw-r--r--src/mame/drivers/boogwing.c2
-rw-r--r--src/mame/drivers/cninja.c2
-rw-r--r--src/mame/drivers/commando.c2
-rw-r--r--src/mame/drivers/crshrace.c2
-rw-r--r--src/mame/drivers/darkseal.c2
-rw-r--r--src/mame/drivers/dassault.c2
-rw-r--r--src/mame/drivers/dec8.c24
-rw-r--r--src/mame/drivers/deco32.c4
-rw-r--r--src/mame/drivers/gottlieb.c16
-rw-r--r--src/mame/drivers/lastduel.c2
-rw-r--r--src/mame/drivers/m90.c4
-rw-r--r--src/mame/drivers/megatech.c4
-rw-r--r--src/mame/drivers/namcops2.c4
-rw-r--r--src/mame/drivers/naomi.c22
-rw-r--r--src/mame/drivers/neodrvr.c8
-rw-r--r--src/mame/drivers/popobear.c54
-rw-r--r--src/mame/drivers/pyson.c34
-rw-r--r--src/mame/drivers/seibuspi.c8
-rw-r--r--src/mame/drivers/taitotz.c4
-rw-r--r--src/mame/drivers/tnzs.c2
-rw-r--r--src/mame/drivers/undrfire.c2
-rw-r--r--src/mame/includes/actfancr.h2
-rw-r--r--src/mame/includes/armedf.h2
-rw-r--r--src/mame/includes/bbusters.h2
-rw-r--r--src/mame/includes/bionicc.h2
-rw-r--r--src/mame/includes/exedexes.h2
-rw-r--r--src/mame/includes/galaga.h2
-rw-r--r--src/mame/includes/gng.h2
-rw-r--r--src/mame/includes/gottlieb.h38
-rw-r--r--src/mame/includes/hcastle.h2
-rw-r--r--src/mame/includes/lwings.h2
-rw-r--r--src/mame/includes/m92.h2
-rw-r--r--src/mame/includes/sidearms.h2
-rw-r--r--src/mame/mame.lst7
58 files changed, 441 insertions, 436 deletions
diff --git a/src/emu/cpu/i386/i386.c b/src/emu/cpu/i386/i386.c
index c187d4f3cb1..c8e3b51ae51 100644
--- a/src/emu/cpu/i386/i386.c
+++ b/src/emu/cpu/i386/i386.c
@@ -406,7 +406,7 @@ static int i386_limit_check(i386_state *cpustate, int seg, UINT32 offset)
if((cpustate->sreg[seg].flags & 0x0018) == 0x0010 && cpustate->sreg[seg].flags & 0x0004) // if expand-down data segment
{
// compare if greater then 0xffffffff when we're passed the access size
- if((offset <= cpustate->sreg[seg].limit) || ((cpustate->sreg[seg].d)?0:(offset > 0xffff)))
+ if((offset <= cpustate->sreg[seg].limit) || ((cpustate->sreg[seg].d)?0:(offset > 0xffff)))
{
logerror("Limit check at 0x%08x failed. Segment %04x, limit %08x, offset %08x (expand-down)\n",cpustate->pc,cpustate->sreg[seg].selector,cpustate->sreg[seg].limit,offset);
return 1;
diff --git a/src/emu/cpu/lr35902/lr35902.c b/src/emu/cpu/lr35902/lr35902.c
index 04b182de438..bce0d609671 100644
--- a/src/emu/cpu/lr35902/lr35902.c
+++ b/src/emu/cpu/lr35902/lr35902.c
@@ -157,7 +157,7 @@ void lr35902_cpu_device::device_start()
state_add(STATE_GENPC, "curpc", m_PC).callimport().callexport().formatstr("%8s").noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_F).mask(0xf0).formatstr("%8s").noshow();
-
+
m_icountptr = &m_icount;
}
diff --git a/src/emu/cpu/m6502/ill02.h b/src/emu/cpu/m6502/ill02.h
index b47a161f07d..fa21452c444 100644
--- a/src/emu/cpu/m6502/ill02.h
+++ b/src/emu/cpu/m6502/ill02.h
@@ -175,7 +175,7 @@
/* 6510 ********************************************************
* OAL load accumulator and index X
***************************************************************/
-#define OAL_6510 \
+#define OAL_6510 \
A = X = (UINT8)((A|0xee)&tmp); \
SET_NZ(A)
diff --git a/src/emu/cpu/m68000/m68kcpu.c b/src/emu/cpu/m68000/m68kcpu.c
index cac4f1e45ef..18b6ab54e7c 100644
--- a/src/emu/cpu/m68000/m68kcpu.c
+++ b/src/emu/cpu/m68000/m68kcpu.c
@@ -1911,7 +1911,7 @@ CPU_GET_INFO( m68000 )
static CPU_INIT( m68301 )
{
-// m68ki_cpu_core *m68k = get_safe_token(device);
+// m68ki_cpu_core *m68k = get_safe_token(device);
CPU_INIT_CALL(m68000);
@@ -1941,8 +1941,8 @@ static CPU_INIT( m68307 )
CPU_INIT_CALL(m68000);
/* basic CS logic, timers, mbus, serial logic
- set via remappable register
- */
+ set via remappable register
+ */
new(&m68k->memory) m68k_memory_interface;
m68k->memory.init16_68307(*m68k->program);
diff --git a/src/emu/cpu/powerpc/ppcdrc.c b/src/emu/cpu/powerpc/ppcdrc.c
index 3620f4f45d6..5768cce5302 100644
--- a/src/emu/cpu/powerpc/ppcdrc.c
+++ b/src/emu/cpu/powerpc/ppcdrc.c
@@ -2270,9 +2270,9 @@ static void generate_compute_flags(powerpc_state *ppc, drcuml_block *block, cons
if (xermask & XER_OV)
{
UML_ROLAND(block, I0, I0, 31, 1); // roland i0,i0,31,0x0001
- UML_OR(block, XERSO32, XERSO32, I0); // or [xerso],i0
+ UML_OR(block, XERSO32, XERSO32, I0); // or [xerso],i0
UML_AND(block, CR32(0), CR32(0), 0xfffffffe); // and [cr0], [cr0], 0xfffffffe (clear SO copy in CR32)
- UML_OR(block, CR32(0), I1, XERSO32); // or [cr0],i1,[xerso]
+ UML_OR(block, CR32(0), I1, XERSO32); // or [cr0],i1,[xerso]
}
else
{
diff --git a/src/emu/device.h b/src/emu/device.h
index 3decd2e6cf5..b45a21aecdf 100644
--- a/src/emu/device.h
+++ b/src/emu/device.h
@@ -365,7 +365,7 @@ protected:
optional_shared_ptr(device_t &base, const char *tag) : auto_finder_type<_PointerType *, false>(base, tag), m_bytes(0) { }
virtual void findit(device_t &base) { this->set_target(reinterpret_cast<_PointerType *>(this->find_shared_ptr(base, this->m_tag, m_bytes))); }
UINT32 bytes() const { return m_bytes; }
-
+
private:
// internal state
size_t m_bytes;
@@ -379,7 +379,7 @@ protected:
required_shared_ptr(device_t &base, const char *tag) : auto_finder_type<_PointerType *, true>(base, tag), m_bytes(0) { }
virtual void findit(device_t &base) { this->set_target(reinterpret_cast<_PointerType *>(this->find_shared_ptr(base, this->m_tag, m_bytes))); }
UINT32 bytes() const { return m_bytes; }
-
+
private:
// internal state
size_t m_bytes;
diff --git a/src/emu/imagedev/flopdrv.c b/src/emu/imagedev/flopdrv.c
index 8ef5b40eb2b..d73cd441df8 100644
--- a/src/emu/imagedev/flopdrv.c
+++ b/src/emu/imagedev/flopdrv.c
@@ -963,8 +963,8 @@ void legacy_floppy_image_device::device_config_complete()
cnt++;
}
image_specify_extension( m_extension_list, 256, floppy_options[i].extensions );
- }
-
+ }
+
// set brief and instance name
update_names();
}
diff --git a/src/emu/imagedev/flopdrv.h b/src/emu/imagedev/flopdrv.h
index 00150fa4288..8f113b711f6 100644
--- a/src/emu/imagedev/flopdrv.h
+++ b/src/emu/imagedev/flopdrv.h
@@ -191,7 +191,7 @@ public:
~legacy_floppy_image_device();
virtual bool call_load();
- virtual bool call_softlist_load(char *swlist, char *swname, rom_entry *start_entry) { return load_software(swlist, swname, start_entry); }
+ virtual bool call_softlist_load(char *swlist, char *swname, rom_entry *start_entry) { return load_software(swlist, swname, start_entry); }
virtual bool call_create(int format_type, option_resolution *format_options);
virtual void call_unload();
virtual void call_display_info();
@@ -206,14 +206,14 @@ public:
virtual const char *image_interface() const;
virtual const char *file_extensions() const { return m_extension_list; }
virtual const option_guide *create_option_guide() const { return floppy_option_guide; }
-
+
// access to legacy token
- void *token() const { assert(m_token != NULL); return m_token; }
+ void *token() const { assert(m_token != NULL); return m_token; }
protected:
// device overrides
virtual void device_config_complete();
virtual void device_start();
-
+
void *m_token;
char m_extension_list[256];
};
diff --git a/src/emu/machine/ins8250.c b/src/emu/machine/ins8250.c
index 9e69a11c154..6b6d07fb369 100644
--- a/src/emu/machine/ins8250.c
+++ b/src/emu/machine/ins8250.c
@@ -21,7 +21,7 @@ the BIOS dependent on the flaws being present, so subsequent parts like the
The original 8250 pulses the interrupt line if a higher priority interrupt is
cleared but a lower priority one is still active. It also clears the tsre bit
-for a moment before loading the tsr from the thr. These may be the bugs the
+for a moment before loading the tsr from the thr. These may be the bugs the
PC and XT depend on as the 8250A and up fix them.
INS8250-B
@@ -140,7 +140,7 @@ void ins8250_uart_device::update_interrupt()
{
m_regs.iir |=0x04;
if ((m_int_pending & COM_INT_PENDING_CHAR_TIMEOUT) == 0x11)
- m_regs.iir |= 0x08;
+ m_regs.iir |= 0x08;
}
else if (m_regs.ier & m_int_pending & COM_INT_PENDING_TRANSMITTER_HOLDING_REGISTER_EMPTY)
m_regs.iir |=0x02;
@@ -390,16 +390,16 @@ void ns16550_device::rcv_complete()
{
if(!(m_regs.fcr & 1))
return ins8250_uart_device::rcv_complete();
-
+
receive_register_extract();
-
+
if(m_rnum == 16)
{
m_regs.lsr |= 0x02; //overrun
trigger_int(COM_INT_PENDING_RECEIVER_LINE_STATUS);
return;
}
-
+
m_regs.lsr |= 0x01;
m_rfifo[m_rhead] = get_received_char();
++m_rhead &= 0x0f;
@@ -568,7 +568,7 @@ UINT8 ns16550_device::pop_rx()
{
UINT8 data = m_rfifo[m_rtail];
clear_int(COM_INT_PENDING_CHAR_TIMEOUT & ~1); // don't clear bit 1 yet
-
+
if(m_rnum)
{
++m_rtail &= 0x0f;
@@ -576,13 +576,13 @@ UINT8 ns16550_device::pop_rx()
}
else
data = 0;
-
+
if(m_rnum < m_rintlvl)
clear_int(COM_INT_PENDING_RECEIVED_DATA_AVAILABLE);
if(m_rnum)
set_timer();
- else
+ else
{
m_timeout->adjust(attotime::never);
m_regs.lsr &= ~1;
diff --git a/src/emu/machine/nscsi_hd.c b/src/emu/machine/nscsi_hd.c
index 911c68edf0a..4138cc96127 100644
--- a/src/emu/machine/nscsi_hd.c
+++ b/src/emu/machine/nscsi_hd.c
@@ -161,7 +161,7 @@ void nscsi_harddisk_device::scsi_command()
scsi_cmdbuf[pos++] = 0x00; // Meh
scsi_cmdbuf[pos++] = 0x00; // Double meh
break;
-
+
case 0x03: { // Format parameters page
scsi_cmdbuf[pos++] = 0x83; // PS, page id
scsi_cmdbuf[pos++] = 0x16; // Page length
diff --git a/src/emu/save.h b/src/emu/save.h
index 95c619464f6..17131178ae4 100644
--- a/src/emu/save.h
+++ b/src/emu/save.h
@@ -307,7 +307,7 @@ inline void save_manager::save_item(const char *module, const char *tag, int ind
//-------------------------------------------------
-// save_item - specialized save_item for
+// save_item - specialized save_item for
// dynamic_arrays
//-------------------------------------------------
diff --git a/src/emu/sound/k054539.c b/src/emu/sound/k054539.c
index eac3b10d314..25bad3fc9c9 100644
--- a/src/emu/sound/k054539.c
+++ b/src/emu/sound/k054539.c
@@ -123,7 +123,7 @@ void k054539_device::sound_stream_update(sound_stream &stream, stream_sample_t *
else
lval = rval = 0;
rbase[reverb_pos] = 0;
-
+
for(int ch=0; ch<8; ch++)
if(regs[0x22c] & (1<<ch)) {
unsigned char *base1 = regs + 0x20*ch;
@@ -165,7 +165,7 @@ void k054539_device::sound_stream_update(sound_stream &stream, stream_sample_t *
rdelta = (rdelta + reverb_pos) & 0x3fff;
int cur_pos = (base1[0x0c] | (base1[0x0d] << 8) | (base1[0x0e] << 16)) & rom_mask;
-
+
int fdelta, pdelta;
if(base2[0] & 0x20) {
delta = -delta;
@@ -281,12 +281,12 @@ void k054539_device::sound_stream_update(sound_stream &stream, stream_sample_t *
lval += cur_val * lvol;
rval += cur_val * rvol;
rbase[(rdelta + reverb_pos) & 0x1fff] += INT16(cur_val*rbvol);
-
+
chan->pos = cur_pos;
chan->pfrac = cur_pfrac;
chan->pval = cur_pval;
chan->val = cur_val;
-
+
if(regupdate()) {
base1[0x0c] = cur_pos & 0xff;
base1[0x0d] = cur_pos>> 8 & 0xff;
@@ -349,11 +349,11 @@ WRITE8_MEMBER(k054539_device::write)
int voice, reg;
/* The K054539 has behavior like many other wavetable chips including
- the Ensoniq 550x and Gravis GF-1: if a voice is active, writing
- to it's current position is silently ignored.
+ the Ensoniq 550x and Gravis GF-1: if a voice is active, writing
+ to it's current position is silently ignored.
- Dadandaan depends on this or the vocals go wrong.
- */
+ Dadandaan depends on this or the vocals go wrong.
+ */
if (offset < 8*0x20)
{
voice = offset / 0x20;
diff --git a/src/emu/sound/k054539.h b/src/emu/sound/k054539.h
index 898fea4413b..f49ab6d0098 100644
--- a/src/emu/sound/k054539.h
+++ b/src/emu/sound/k054539.h
@@ -55,16 +55,16 @@ public:
void init_flags(int flags);
/*
- Note that the eight PCM channels of a K054539 do not have separate
- volume controls. Considering the global attenuation equation may not
- be entirely accurate, k054539_set_gain() provides means to control
- channel gain. It can be called anywhere but preferrably from
- DRIVER_INIT().
-
- Parameters:
- channel : 0 - 7
- gain : 0.0=silent, 1.0=no gain, 2.0=twice as loud, etc.
- */
+ Note that the eight PCM channels of a K054539 do not have separate
+ volume controls. Considering the global attenuation equation may not
+ be entirely accurate, k054539_set_gain() provides means to control
+ channel gain. It can be called anywhere but preferrably from
+ DRIVER_INIT().
+
+ Parameters:
+ channel : 0 - 7
+ gain : 0.0=silent, 1.0=no gain, 2.0=twice as loud, etc.
+ */
void set_gain(int channel, double gain);
protected:
diff --git a/src/emu/sound/votrax.c b/src/emu/sound/votrax.c
index b25ad8ef8ae..83e06859da1 100644
--- a/src/emu/sound/votrax.c
+++ b/src/emu/sound/votrax.c
@@ -95,21 +95,21 @@ const char *const votrax_sc01_device::s_phoneme_table[64] =
// it is only an approximation
const double votrax_sc01_device::s_glottal_wave[16] =
{
- 0,
- 16.0/22.0,
- -22.0/22.0,
- -17.0/22.0,
- -15.0/22.0,
- -10.0/22.0,
- -7.0/22.0,
+ 0,
+ 16.0/22.0,
+ -22.0/22.0,
+ -17.0/22.0,
+ -15.0/22.0,
+ -10.0/22.0,
+ -7.0/22.0,
-4.0/22.0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
0
};
@@ -161,14 +161,14 @@ WRITE8_MEMBER( votrax_sc01_device::write )
// only 6 bits matter
m_phoneme = data & 0x3f;
const UINT8 *rom = m_rom + (m_phoneme << 3);
-mame_printf_debug("%s: STROBE %s (F1=%X F2=%X FC=%X F3=%X F2Q=%X VA=%X FA=%X CL=%X CLD=%X VD=%X PAC=%X PH=%02X)\n",
+mame_printf_debug("%s: STROBE %s (F1=%X F2=%X FC=%X F3=%X F2Q=%X VA=%X FA=%X CL=%X CLD=%X VD=%X PAC=%X PH=%02X)\n",
machine().time().as_string(3), s_phoneme_table[m_phoneme],
rom[0] >> 4, rom[1] >> 4, rom[2] >> 4, rom[3] >> 4, rom[4] >> 4, rom[5] >> 4, rom[6] >> 4,
rom[3] & 0xf, rom[4] & 0xf, rom[5] & 0xf, rom[6] & 0xf, rom[7]);
-
+
// the STROBE signal resets the phoneme counter
m_counter_84 = 0xf;
-
+
// not in the schematics, but necessary to fully reset the request latch
m_latch_92 = 0;
@@ -179,8 +179,8 @@ mame_printf_debug("%s: STROBE %s (F1=%X F2=%X FC=%X F3=%X F2Q=%X VA=%X FA=%X CL=
//-------------------------------------------------
-// inflection_w - handle a write to the
-// inflection bits
+// inflection_w - handle a write to the
+// inflection bits
//-------------------------------------------------
WRITE8_MEMBER( votrax_sc01_device::inflection_w )
@@ -189,7 +189,7 @@ WRITE8_MEMBER( votrax_sc01_device::inflection_w )
data &= 3;
if (m_inflection == data)
return;
-
+
// append an inflection marker
m_stream->update();
m_inflection = data;
@@ -202,83 +202,83 @@ WRITE8_MEMBER( votrax_sc01_device::inflection_w )
//**************************************************************************
//-------------------------------------------------
-// update_subphoneme_clock_period - re-compute the
-// period of the sub-phoneme clock, as a multiple
+// update_subphoneme_clock_period - re-compute the
+// period of the sub-phoneme clock, as a multiple
// of the master clock
//-------------------------------------------------
void votrax_sc01_device::update_subphoneme_clock_period()
{
assert(m_latch_80 < 128);
-
+
/*
- The sub-phoneme timing circuit is based off the switching capacitor
- technique described in the Votrax patent. Replacing the capacitor
- ladder with [Rx] representing the effective resistance, the circuit
- becomes essentially a pair of op-amps:
-
- VM
- | i1
- [R1]
- | Vc
- +----------------------+
- | +---|C1|---+ |
- [R2] | | | |\
- |Vb i2 | |\ | +--++\
- +--[Rx]--+----+-\ | | >
- | | >--+-----+-/
- [R3] +----++/ Vc |/
- |i3 | |/
- +--------+ Va
- |
- [R4]
- |
- 0
-
- We have two op-amps, the left used as a standard amplifier, the right
- one as a comparator. The circuit triggers when the two inputs of the
- right op-amp are equal.
-
- The left part of the circuit (before C1) is simply a current injector.
- It's all made of resistors, there's no modulated input, so everything
- is going to be constant. If you don't know about op-amps used as
- amplifiers, you just need to know that it forces its two inputs to
- have the same voltage while not sending or providing any current
- through there (only though its output in fact).
-
- In the schema, the injected current is i2. Basic equations apply:
- Va = R4.i3
- Vb = Va + R3.i3
- Vb = Va + Rx.i2
- Vc = Vb + R2.i1
- VM = Vc + R1.i1
- i1 = i2 + i3
-
- And the tipping happens when the voltage on the right of C1 reaches
- Vc, so:
- Vc = Va + i2.T/C1
-
- (i2 being a constant, the integration is kinda easy)
-
- Some maths later:
- R3.i3 = Rx.i2 -> i3 = Rx/R3.i2
- i1 = (1+Rx/R3).i2
- Va + (Rx + R2 + R2.Rx/R3).i2 = Va + T/C1.i2
- T = C1*(Rx*(1+R2/R3) + R2)
-
- Which isn't, interestingly though not surprisingly, dependant on Vm,
- R1 or R4. And you have to round it to the next multiple of
- 0.2ms+0.1ms due to the clocking on p2 and its offset to p1 (charging
- only happens on p1 active), and add one p1/p2 cycle (0.2ms) for the
- discharge.
-
- So now you have your base clock, which you have to multiply by 16 to
- get the phoneme length.
-
- r2 = 9e3
- r3 = 1e3
- c1 = 1000e-12
- rx = 1/(5KHz * cx)
+ The sub-phoneme timing circuit is based off the switching capacitor
+ technique described in the Votrax patent. Replacing the capacitor
+ ladder with [Rx] representing the effective resistance, the circuit
+ becomes essentially a pair of op-amps:
+
+ VM
+ | i1
+ [R1]
+ | Vc
+ +----------------------+
+ | +---|C1|---+ |
+ [R2] | | | |\
+ |Vb i2 | |\ | +--++\
+ +--[Rx]--+----+-\ | | >
+ | | >--+-----+-/
+ [R3] +----++/ Vc |/
+ |i3 | |/
+ +--------+ Va
+ |
+ [R4]
+ |
+ 0
+
+ We have two op-amps, the left used as a standard amplifier, the right
+ one as a comparator. The circuit triggers when the two inputs of the
+ right op-amp are equal.
+
+ The left part of the circuit (before C1) is simply a current injector.
+ It's all made of resistors, there's no modulated input, so everything
+ is going to be constant. If you don't know about op-amps used as
+ amplifiers, you just need to know that it forces its two inputs to
+ have the same voltage while not sending or providing any current
+ through there (only though its output in fact).
+
+ In the schema, the injected current is i2. Basic equations apply:
+ Va = R4.i3
+ Vb = Va + R3.i3
+ Vb = Va + Rx.i2
+ Vc = Vb + R2.i1
+ VM = Vc + R1.i1
+ i1 = i2 + i3
+
+ And the tipping happens when the voltage on the right of C1 reaches
+ Vc, so:
+ Vc = Va + i2.T/C1
+
+ (i2 being a constant, the integration is kinda easy)
+
+ Some maths later:
+ R3.i3 = Rx.i2 -> i3 = Rx/R3.i2
+ i1 = (1+Rx/R3).i2
+ Va + (Rx + R2 + R2.Rx/R3).i2 = Va + T/C1.i2
+ T = C1*(Rx*(1+R2/R3) + R2)
+
+ Which isn't, interestingly though not surprisingly, dependant on Vm,
+ R1 or R4. And you have to round it to the next multiple of
+ 0.2ms+0.1ms due to the clocking on p2 and its offset to p1 (charging
+ only happens on p1 active), and add one p1/p2 cycle (0.2ms) for the
+ discharge.
+
+ So now you have your base clock, which you have to multiply by 16 to
+ get the phoneme length.
+
+ r2 = 9e3
+ r3 = 1e3
+ c1 = 1000e-12
+ rx = 1/(5KHz * cx)
*/
// determine total capacitance
@@ -290,7 +290,7 @@ void votrax_sc01_device::update_subphoneme_clock_period()
if ((m_latch_80 & 0x10) != 0) cx += 86e-12;
if ((m_latch_80 & 0x20) != 0) cx += 173e-12;
if ((m_latch_80 & 0x40) != 0) cx += 345e-12;
-
+
// apply the equation above to determine charging time
// note that the 5kHz listed above for P1 is for a nominal master
// clock frequency of 1.28MHz, meaning it is master clock / 128
@@ -298,7 +298,7 @@ void votrax_sc01_device::update_subphoneme_clock_period()
double p1_frequency = double(m_master_clock_freq) / double(1 << (P_CLOCK_BIT + 2));
double rx = 1.0 / (p1_frequency * cx);
double period = 1000e-12 * (rx * (1.0 + 9e3 / 1e3) + 9e3);
-
+
// convert to master clock cycles and round up
m_subphoneme_period = UINT32(ceil(period * double(m_master_clock_freq)));
}
@@ -489,9 +489,9 @@ void votrax_sc01_device::filter_s_to_z(const double *k, double fs, double *a, do
double fpeak = sqrt(fabs(k[0]*k[1]-k[2]))/(2*M_PI*k[2]);
double zc = 2*M_PI*fpeak/tan(M_PI*fpeak/fs);
- double m0 = zc*k[0];
- double m1 = zc*k[1];
- double m2 = zc*zc*k[2];
+ double m0 = zc*k[0];
+ double m1 = zc*k[1];
+ double m2 = zc*zc*k[2];
a[0] = 1+m0;
a[1] = 3+m0;
@@ -578,7 +578,7 @@ if (LOG_TIMING | LOG_LOWPARAM | LOG_GLOTTAL | LOG_TRANSITION)
// update master clock
m_master_clock ^= 1;
-
+
// on the falling edge of the master clock, advance the 10-bit counter at 34
UINT8 old_latch_72 = m_latch_72;
if (m_master_clock == 0)
@@ -590,41 +590,41 @@ if (LOG_TIMING | LOG_LOWPARAM | LOG_GLOTTAL | LOG_TRANSITION)
}
// derive beta 1 clock:
- // set if m_latch_70.0 == 1
- // reset if m_latch_70.0 == 0
-// UINT8 old_beta1 = m_beta1;
+ // set if m_latch_70.0 == 1
+ // reset if m_latch_70.0 == 0
+// UINT8 old_beta1 = m_beta1;
m_beta1 = BIT(m_latch_70, 0);
// derive p2 clock:
- // set if (m_counter_34.P_CLOCK_BIT & clock) == 1
- // reset if (m_counter_34.P_CLOCK_BIT == 0)
+ // set if (m_counter_34.P_CLOCK_BIT & clock) == 1
+ // reset if (m_counter_34.P_CLOCK_BIT == 0)
UINT8 old_p2 = m_p2;
if (BIT(m_counter_34, P_CLOCK_BIT) & m_master_clock)
m_p2 = 1;
else if (!BIT(m_counter_34, P_CLOCK_BIT))
m_p2 = 0;
-
+
// derive p1 clock:
- // set if (!m_counter_34.P_CLOCK_BIT & clock) == 1
- // reset if (m_counter_34.P_CLOCK_BIT == 1)
-// UINT8 old_p1 = m_p1;
+ // set if (!m_counter_34.P_CLOCK_BIT & clock) == 1
+ // reset if (m_counter_34.P_CLOCK_BIT == 1)
+// UINT8 old_p1 = m_p1;
if (BIT(~m_counter_34, P_CLOCK_BIT) & m_master_clock)
m_p1 = 1;
else if (BIT(m_counter_34, P_CLOCK_BIT))
m_p1 = 0;
-
+
// derive phi2 clock:
- // set if (m_counter_34.PHI_CLOCK_BIT & clock) == 1
- // reset if (m_counter_34.PHI_CLOCK_BIT == 0)
+ // set if (m_counter_34.PHI_CLOCK_BIT & clock) == 1
+ // reset if (m_counter_34.PHI_CLOCK_BIT == 0)
UINT8 old_phi2 = m_phi2;
if (BIT(m_counter_34, PHI_CLOCK_BIT) & m_master_clock)
m_phi2 = 1;
else if (!BIT(m_counter_34, PHI_CLOCK_BIT))
m_phi2 = 0;
-
+
// derive phi1 clock:
- // set if (!m_counter_34.PHI_CLOCK_BIT & clock) == 1
- // reset if (m_counter_34.PHI_CLOCK_BIT == 1)
+ // set if (!m_counter_34.PHI_CLOCK_BIT & clock) == 1
+ // reset if (m_counter_34.PHI_CLOCK_BIT == 1)
UINT8 old_phi1 = m_phi1;
if (BIT(~m_counter_34, PHI_CLOCK_BIT) & m_master_clock)
m_phi1 = 1;
@@ -632,31 +632,31 @@ if (LOG_TIMING | LOG_LOWPARAM | LOG_GLOTTAL | LOG_TRANSITION)
m_phi1 = 0;
// derive alternate phi2 clock:
- // set if (m_counter_34.PHI_CLOCK_BIT & clock) == 1
- // reset if (m_counter_34.PHI_CLOCK_BIT == 0)
+ // set if (m_counter_34.PHI_CLOCK_BIT & clock) == 1
+ // reset if (m_counter_34.PHI_CLOCK_BIT == 0)
UINT8 old_phi2_20 = m_phi2_20;
if (BIT(m_counter_34, PHI_CLOCK_BIT + 2) & m_master_clock)
m_phi2_20 = 1;
else if (!BIT(m_counter_34, PHI_CLOCK_BIT + 2))
m_phi2_20 = 0;
-
+
// derive alternate phi1 clock:
- // set if (!m_counter_34.PHI_CLOCK_BIT & clock) == 1
- // reset if (m_counter_34.PHI_CLOCK_BIT == 1)
-// UINT8 old_phi1_20 = m_phi1_20;
+ // set if (!m_counter_34.PHI_CLOCK_BIT & clock) == 1
+ // reset if (m_counter_34.PHI_CLOCK_BIT == 1)
+// UINT8 old_phi1_20 = m_phi1_20;
if (BIT(~m_counter_34, PHI_CLOCK_BIT + 2) & m_master_clock)
m_phi1_20 = 1;
else if (BIT(m_counter_34, PHI_CLOCK_BIT + 2))
m_phi1_20 = 0;
// determine rising edges of each clock of interest
-// UINT8 beta1_rising = (old_beta1 ^ m_beta1) & m_beta1;
+// UINT8 beta1_rising = (old_beta1 ^ m_beta1) & m_beta1;
UINT8 p2_rising = (old_p2 ^ m_p2) & m_p2;
-// UINT8 p1_rising = (old_p1 ^ m_p1) & m_p1;
+// UINT8 p1_rising = (old_p1 ^ m_p1) & m_p1;
UINT8 phi2_rising = (old_phi2 ^ m_phi2) & m_phi2;
UINT8 phi1_rising = (old_phi1 ^ m_phi1) & m_phi1;
UINT8 phi2_20_rising = (old_phi2_20 ^ m_phi2_20) & m_phi2_20;
-// UINT8 phi1_20_rising = (old_phi1_20 ^ m_phi1_20) & m_phi1_20;
+// UINT8 phi1_20_rising = (old_phi1_20 ^ m_phi1_20) & m_phi1_20;
UINT8 a0_rising = BIT((old_latch_72 ^ m_latch_72) & m_latch_72, 0);
UINT8 a2_rising = BIT((old_latch_72 ^ m_latch_72) & m_latch_72, 2);
UINT8 _125k_rising = BIT((old_latch_72 ^ m_latch_72) & m_latch_72, 3);
@@ -673,7 +673,7 @@ if (LOG_TIMING | LOG_LOWPARAM | LOG_GLOTTAL | LOG_TRANSITION)
UINT8 old_clock_88 = m_clock_88;
m_clock_88 = !m_latch_42; //!(m_latch_42 | m_phi1); -- figure 7 seems to be wrong here
UINT8 clock_88_rising = (old_clock_88 ^ m_clock_88) & m_clock_88;
-
+
// the A/R line holds the counter in reset except during phoneme processing,
// when it is clocked on the rising edge of the subphoneme timer clock
if (m_internal_request != CLEAR_LINE)
@@ -683,11 +683,11 @@ if (LOG_TIMING | LOG_LOWPARAM | LOG_GLOTTAL | LOG_TRANSITION)
m_counter_84 = (m_counter_84 - 1) & 0x0f;
mame_printf_debug("counter=%d\n", m_counter_84);
}
-
+
// clock the zero count latch
if (p2_rising)
m_latch_92 = ((m_counter_84 == 0) | (m_latch_92 << 1)) & 3;
-
+
// once both bits are set, the request line goes high
if (m_latch_92 == 3)
{
@@ -708,15 +708,15 @@ mame_printf_debug("counter=%d\n", m_counter_84);
UINT8 romdata = m_rom[(m_phoneme << 3) | ((m_counter_34 >> 4) & 7)];
// update the ROM data; ROM format is (upper nibble/lower nibble)
- // +00 = F1 parameter / 0
- // +01 = F2 parameter / 0
- // +02 = FC parameter / 0
- // +03 = F3 parameter / CL
- // +04 = F2Q Parameter / CLD
- // +05 = VA Parameter / VD
- // +06 = FA Parameter / PAC
- // +07 = Phoneme timing (full 7 bits)
-
+ // +00 = F1 parameter / 0
+ // +01 = F2 parameter / 0
+ // +02 = FC parameter / 0
+ // +03 = F3 parameter / CL
+ // +04 = F2Q Parameter / CLD
+ // +05 = VA Parameter / VD
+ // +06 = FA Parameter / PAC
+ // +07 = Phoneme timing (full 7 bits)
+
// latch a new value from ROM on phi2
UINT8 a = m_latch_72 & 7;
UINT8 romdata_swapped;
@@ -728,26 +728,26 @@ mame_printf_debug("counter=%d\n", m_counter_84);
case 3:
m_srff_132 = m_srff_114 & BIT(~romdata, 3);
break;
-
+
// update CLD
case 4:
romdata_swapped = (BIT(romdata, 0) << 3) | (BIT(romdata, 1) << 2) | (BIT(romdata, 2) << 1) | (BIT(romdata, 3) << 0);
if (m_counter_84 != 0 && romdata_swapped == (m_counter_84 ^ 0xf))
m_srff_114 = 1;
break;
-
+
// update VD
case 5:
romdata_swapped = (BIT(romdata, 0) << 3) | (BIT(romdata, 1) << 2) | (BIT(romdata, 2) << 1) | (BIT(romdata, 3) << 0);
if (m_counter_84 != 0 && romdata_swapped == (m_counter_84 ^ 0xf))
m_srff_112 = 1;
break;
-
+
// update FF == PAC & (VA | FA)
case 6:
m_srff_142 = BIT(romdata, 3);
break;
-
+
// update PH
case 7:
if (m_latch_80 != (romdata & 0x7f))
@@ -762,7 +762,7 @@ mame_printf_debug("[PH=%02X]\n", m_latch_80);
break;
}
}
-
+
//==============================================
//
// Glottal circuit (patent figure 6)
@@ -787,7 +787,7 @@ mame_printf_debug("[PH=%02X]\n", m_latch_80);
m_counter_224 = (m_counter_224 + 1) & 0xf;
}
}
-
+
// clock remaining glottal counters (220, 222, 236) on rising edge of phi2
if (phi2_20_rising)
{
@@ -800,7 +800,7 @@ mame_printf_debug("[PH=%02X]\n", m_latch_80);
else
m_counter_220 = (m_counter_220 + 1) & 0xf;
}
-
+
// counter 222 is always enabled
if (1)
{
@@ -810,12 +810,12 @@ mame_printf_debug("[PH=%02X]\n", m_latch_80);
else
m_counter_222 = (m_counter_222 + 1) & 0xf;
}
-
+
// counter 236 is always enabled
if (1)
{
m_counter_236 = (m_counter_236 + 1) & 0xf;
-
+
// rising edge of Q1 from counter 236 clocks counter 234
if ((m_counter_236 & 0x3) == 0x2)
{
@@ -825,36 +825,36 @@ mame_printf_debug("[PH=%02X]\n", m_latch_80);
}
}
}
-
+
// update FGATE state
if (counter_220_tc)
m_fgate = 0;
if (counter_224_tc)
m_fgate = 1;
-
+
// apply asynchronous clear to counters 234/236
if (counter_220_tc && m_phi1_20)
m_counter_236 = m_counter_234 = 0;
-
+
// derive glottal circuit output signals
#if !TEMP_HACKS
UINT8 old_glottal_sync = m_glottal_sync;
#endif
m_glottal_sync = (m_counter_234 == 0);
glottal_out = s_glottal_wave[m_counter_234];
-
+
//==============================================
//
// Transition circuit (patent figure 3a/3b)
//
//==============================================
-
+
// divide 1.25k clock by 2 (lower-left of 46)
UINT8 old_0625_clock = m_0625_clock;
if (_125k_rising)
m_0625_clock = !m_0625_clock;
UINT8 _0625_rising = (old_0625_clock ^ m_0625_clock) & m_0625_clock;
-
+
// update counter above
if (_0625_rising)
{
@@ -863,7 +863,7 @@ mame_printf_debug("[PH=%02X]\n", m_latch_80);
else
m_counter_46 = (m_counter_46 + 1) & 0xf;
}
-
+
// and then the latch to the right
if (a2_rising)
m_latch_46 = (BIT(m_counter_46, 1) << 0) |
@@ -885,21 +885,21 @@ mame_printf_debug("[PH=%02X]\n", m_latch_80);
if (!(m_srff_142 & !((m_fa == 0) & (m_va == 0))) && (m_latch_46 & 0x3) == 0x3)
ram_write = 1;
break;
-
+
case 5:
if ((m_latch_46 & 0xc) == 0xc && m_srff_112)
ram_write = 1;
break;
-
+
case 6:
if ((m_latch_46 & 0xc) == 0xc && m_srff_114)
ram_write = 1;
break;
}
-
+
// gate on the phi2 clock (OR gate @ 172)
ram_write &= m_phi2;
-
+
// write the transitioned values to RAM if requested
// (note we consolidate the serial addition and clocking steps here)
if (ram_write)
@@ -907,7 +907,7 @@ mame_printf_debug("[PH=%02X]\n", m_latch_80);
UINT8 old = (m_latch_168 << 4) | m_latch_170;
m_ram[a] = old - (old >> 3) + ((romdata & 0xf0) >> 3);
}
-
+
// latch some parameter values on rising edge of phi2
if (phi2_rising)
{
@@ -916,17 +916,17 @@ mame_printf_debug("[PH=%02X]\n", m_latch_80);
case 2:
m_fc = m_latch_168;
break;
-
+
case 5:
m_va = m_latch_168;
break;
-
+
case 6:
m_fa = m_latch_168;
break;
}
}
-
+
// latch remaining parameter values on rising edge of (phi2 & glottal sync)
#if TEMP_HACKS
if (phi2_rising)
@@ -940,20 +940,20 @@ mame_printf_debug("[PH=%02X]\n", m_latch_80);
case 0:
m_f1 = m_latch_168;
break;
-
+
case 1:
m_f2 = (m_latch_168 << 1) | (m_latch_170 >> 3);
break;
-
+
case 3:
m_f3 = m_latch_168;
break;
-
+
case 4:
m_f2q = m_latch_168;
break;
}
-
+
// latch value from RAM on rising edge of phi1
if (phi1_rising)
{
@@ -966,13 +966,13 @@ mame_printf_debug("[PH=%02X]\n", m_latch_80);
// Noise generator circuit (patent figure 8)
//
//==============================================
-
+
// nose is clocked by the NOR of /FA and P1
UINT8 old_noise_clock = m_noise_clock;
m_noise_clock = !((m_fa == 0) | m_p1);
UINT8 noise_clock_rising = (old_noise_clock ^ m_noise_clock) & m_noise_clock;
UINT8 noise_clock_falling = (old_noise_clock ^ m_noise_clock) & old_noise_clock;
-
+
// falling edge clocks the shift register
if (noise_clock_falling)
{
@@ -981,20 +981,20 @@ mame_printf_debug("[PH=%02X]\n", m_latch_80);
// XOR'ed input goes into d4, which shifts in to d2, then d3, then d1
// thus the full 18-bit value is effectively
//
- // d4 = (m_shift_252 >> 0) & 0x1f;
- // d2 = (m_shift_252 >> 5) & 0x1f;
- // d3 = (m_shift_252 >> 10) & 0xf;
- // d1 = (m_shift_252 >> 14) & 0xf;
+ // d4 = (m_shift_252 >> 0) & 0x1f;
+ // d2 = (m_shift_252 >> 5) & 0x1f;
+ // d3 = (m_shift_252 >> 10) & 0xf;
+ // d1 = (m_shift_252 >> 14) & 0xf;
//
// input at the low end is ((d1+4 ^ d2+5) ^ (d4+4 ^ d4+5)) ^ !(counter2 | counter3)
// output is tapped at d3+4
UINT32 old_shift = m_shift_252;
m_shift_252 <<= 1;
- m_shift_252 |= ((BIT(old_shift, 17) ^ BIT(old_shift, 9)) ^ (BIT(old_shift, 3) ^ BIT(old_shift, 4))) ^
+ m_shift_252 |= ((BIT(old_shift, 17) ^ BIT(old_shift, 9)) ^ (BIT(old_shift, 3) ^ BIT(old_shift, 4))) ^
((m_counter_250 & 0xc) == 0);
}
-
+
// rising edge clocks the counter
if (noise_clock_rising)
{
@@ -1004,7 +1004,7 @@ mame_printf_debug("[PH=%02X]\n", m_latch_80);
else
m_counter_250 = (m_counter_250 + 1) & 0xf;
}
-
+
// compute final noise out signal
noise_out_digital = !(BIT(m_shift_252, 13) & (m_fgate | (m_va == 0)));
}
@@ -1132,9 +1132,9 @@ mame_printf_debug("[PH=%02X]\n", m_latch_80);
double s4_out = apply_filter(m_s4i_hist, m_s4_hist, a, b);
shift_hist(s4_out, m_s4_hist, 4);
-
+
// TODO: apply closure circuit (undocumented)
-
+
// output the current result
*dest++ = INT16(s4_out * 4000);
}
@@ -1168,24 +1168,24 @@ void votrax_sc01_device::device_start()
m_stream = stream_alloc(0, 1, m_master_clock_freq / 16);
m_phoneme_timer = timer_alloc();
m_rom = subregion("phoneme")->base();
-
+
// reset inputs
m_inflection = 0;
m_phoneme = 0x3f;
-
+
// reset outputs
m_request_func.resolve(m_request_cb, *this);
m_request_state = ASSERT_LINE;
m_internal_request = ASSERT_LINE;
-
+
// save inputs
save_item(NAME(m_inflection));
save_item(NAME(m_phoneme));
-
+
// save outputs
save_item(NAME(m_request_state));
save_item(NAME(m_internal_request));
-
+
// save timing circuit
save_item(NAME(m_master_clock_freq));
save_item(NAME(m_master_clock));
@@ -1203,14 +1203,14 @@ void votrax_sc01_device::device_start()
save_item(NAME(m_latch_42));
save_item(NAME(m_counter_84));
save_item(NAME(m_latch_92));
-
+
// save low parameter clocking
save_item(NAME(m_srff_132));
save_item(NAME(m_srff_114));
save_item(NAME(m_srff_112));
save_item(NAME(m_srff_142));
save_item(NAME(m_latch_80));
-
+
// save glottal circuit
save_item(NAME(m_counter_220));
save_item(NAME(m_counter_222));
@@ -1234,7 +1234,7 @@ void votrax_sc01_device::device_start()
save_item(NAME(m_f2q));
save_item(NAME(m_va));
save_item(NAME(m_fa));
-
+
// save noise generator circuit
save_item(NAME(m_noise_clock));
save_item(NAME(m_shift_252));
@@ -1263,11 +1263,11 @@ void votrax_sc01_device::device_reset()
{
// set the initial state
m_stream->update();
-
+
// reset inputs
m_phoneme = 0x3f;
m_request_func(m_internal_request = m_request_state = ASSERT_LINE);
-
+
// reset timing circuit
m_master_clock = 0;
m_counter_34 = 0;
@@ -1284,7 +1284,7 @@ void votrax_sc01_device::device_reset()
m_latch_42 = 0;
m_counter_84 = 0;
m_latch_92 = 0;
-
+
// reset low parameter clocking
m_srff_132 = 0;
m_srff_114 = 0;
@@ -1292,7 +1292,7 @@ void votrax_sc01_device::device_reset()
m_srff_142 = 0;
m_latch_80 = 50;
update_subphoneme_clock_period();
-
+
// reset glottal circuit
m_counter_220 = 0;
m_counter_222 = 0;
@@ -1301,7 +1301,7 @@ void votrax_sc01_device::device_reset()
m_counter_236 = 0;
m_fgate = 0;
m_glottal_sync = 0;
-
+
// reset transition circuit
m_0625_clock = 0;
m_counter_46 = 0;
@@ -1316,7 +1316,7 @@ void votrax_sc01_device::device_reset()
m_f2q = 0;
m_va = 0;
m_fa = 0;
-
+
// reset noise circuit
m_noise_clock = 0;
m_shift_252 = 0;
@@ -1339,7 +1339,7 @@ void votrax_sc01_device::device_reset()
//-------------------------------------------------
// device_clock_changed - handle dynamic clock
-// changes by altering our output frequency
+// changes by altering our output frequency
//-------------------------------------------------
void votrax_sc01_device::device_clock_changed()
@@ -1354,10 +1354,10 @@ void votrax_sc01_device::device_clock_changed()
m_stream->update();
m_stream->set_sample_rate(newfreq / 16);
}
-
+
// determine how many clock ticks remained on the phoneme timer
UINT64 remaining = m_phoneme_timer->remaining().as_ticks(m_master_clock_freq);
-
+
// recompute the master clock
m_master_clock_freq = newfreq;
@@ -1376,11 +1376,11 @@ void votrax_sc01_device::device_timer(emu_timer &timer, device_timer_id id, int
{
// force a stream update
m_stream->update();
-
+
// if we're requesting more data, no need for timing
if (m_request_state == ASSERT_LINE)
return;
-
+
// if we're supposed to have fired, do it now
if (m_internal_request == ASSERT_LINE)
{
@@ -1397,7 +1397,7 @@ mame_printf_debug("%s: REQUEST\n", timer.machine().time().as_string(3));
clocks_until_request += m_subphoneme_period - m_subphoneme_count;
clocks_until_request += m_subphoneme_period * (m_counter_84 - 1);
}
-
+
// plus 1/2
clocks_until_request = MAX(clocks_until_request, (1 << P_CLOCK_BIT) / 2);
timer.adjust(attotime::from_ticks(clocks_until_request, m_master_clock_freq));
diff --git a/src/emu/sound/votrax.h b/src/emu/sound/votrax.h
index cc757cf2905..f3cb53eb210 100644
--- a/src/emu/sound/votrax.h
+++ b/src/emu/sound/votrax.h
@@ -52,7 +52,7 @@
#define MCFG_VOTRAX_SC01_ADD(_tag, _clock, _interface) \
MCFG_DEVICE_ADD(_tag, VOTRAX_SC01, _clock) \
votrax_sc01_device::static_set_interface(*device, _interface); \
-
+
//**************************************************************************
@@ -117,7 +117,7 @@ private:
devcb_resolved_write_line m_request_func; // request callback
UINT8 m_request_state; // request as seen to the outside world
UINT8 m_internal_request; // request managed by stream timing
-
+
// timing circuit
UINT32 m_master_clock_freq; // frequency of the master clock
UINT8 m_master_clock; // master clock
@@ -137,14 +137,14 @@ private:
UINT8 m_latch_42; // D flip-flop @ 42
UINT8 m_counter_84; // 4-bit phoneme counter @ 84
UINT8 m_latch_92; // 2-bit latch @ 92
-
+
// low parameter clocking
UINT8 m_srff_132; // S/R flip-flop @ 132
UINT8 m_srff_114; // S/R flip-flop @ 114
UINT8 m_srff_112; // S/R flip-flop @ 112
UINT8 m_srff_142; // S/R flip-flop @ 142
UINT8 m_latch_80; // phoneme timing latch @ 80
-
+
// glottal circuit
UINT8 m_counter_220; // 4-bit counter @ 220
UINT8 m_counter_222; // 4-bit counter @ 222
@@ -153,7 +153,7 @@ private:
UINT8 m_counter_236; // 4-bit counter @ 236
UINT8 m_fgate; // FGATE signal
UINT8 m_glottal_sync; // Glottal Sync signal
-
+
// transition circuit
UINT8 m_0625_clock; // state of 0.625kHz clock
UINT8 m_counter_46; // 4-bit counter in block @ 46
@@ -168,24 +168,24 @@ private:
UINT8 m_f2q; // latched 4-bit F2Q value
UINT8 m_va; // latched 4-bit VA value
UINT8 m_fa; // latched 4-bit FA value
-
+
// noise generator circuit
UINT8 m_noise_clock; // clock input to noise generator
UINT32 m_shift_252; // shift register @ 252
UINT8 m_counter_250; // 4-bit counter @ 250
// stages outputs history
- double m_ni_hist[4];
- double m_no_hist[4];
- double m_va_hist[4];
- double m_s1_hist[4];
- double m_s2g_hist[4];
- double m_s2ni_hist[4];
- double m_s2n_hist[4];
- double m_s2_hist[4];
- double m_s3_hist[4];
- double m_s4i_hist[4];
- double m_s4_hist[4];
+ double m_ni_hist[4];
+ double m_no_hist[4];
+ double m_va_hist[4];
+ double m_s1_hist[4];
+ double m_s2g_hist[4];
+ double m_s2ni_hist[4];
+ double m_s2n_hist[4];
+ double m_s2_hist[4];
+ double m_s3_hist[4];
+ double m_s4i_hist[4];
+ double m_s4_hist[4];
// static tables
static const char *const s_phoneme_table[64];
diff --git a/src/emu/video/bufsprite.h b/src/emu/video/bufsprite.h
index 70efca6bda0..c841cf5bf79 100644
--- a/src/emu/video/bufsprite.h
+++ b/src/emu/video/bufsprite.h
@@ -89,12 +89,12 @@ public:
buffered_spriteram_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, type, "Buffered Sprite RAM", tag, owner, clock),
m_spriteram(*owner, tag) { }
-
+
// getters
_Type *live() const { return m_spriteram; }
_Type *buffer() { return m_buffered; }
UINT32 bytes() const { return m_spriteram.bytes(); }
-
+
// operations
_Type *copy(UINT32 srcoffset = 0, UINT32 srclength = 0x7fffffff)
{
@@ -103,7 +103,7 @@ public:
memcpy(m_buffered, m_spriteram + srcoffset, MIN(srclength, m_spriteram.bytes() / sizeof(_Type) - srcoffset) * sizeof(_Type));
return m_buffered;
}
-
+
// read/write handlers
void write(address_space &space, offs_t offset, _Type data, _Type mem_mask = ~_Type(0)) { copy(); }
@@ -124,7 +124,7 @@ protected:
private:
// internal state
- required_shared_ptr<_Type> m_spriteram;
+ required_shared_ptr<_Type> m_spriteram;
dynamic_array<_Type> m_buffered;
};
diff --git a/src/lib/lib.mak b/src/lib/lib.mak
index ffada7357ef..2f12baf23de 100644
--- a/src/lib/lib.mak
+++ b/src/lib/lib.mak
@@ -295,7 +295,7 @@ else
ARCHFLAGS = -m32 -arch i386 -DWORDS_BIGENDIAN=0
endif
endif # BIGENDIAN
-else # ifeq ($(TARGETOS),macosx)
+else # ifeq ($(TARGETOS),macosx)
ARCHFLAGS = -DWORDS_BIGENDIAN=0
endif # ifeq ($(TARGETOS),macosx)
diff --git a/src/lib/util/cdrom.c b/src/lib/util/cdrom.c
index 9178fb5e5b3..a17bb7d38ff 100644
--- a/src/lib/util/cdrom.c
+++ b/src/lib/util/cdrom.c
@@ -864,8 +864,8 @@ chd_error cdrom_write_metadata(chd_file *chd, const cdrom_toc *toc)
else
{
metadata.format(GDROM_TRACK_METADATA_FORMAT, i + 1, cdrom_get_type_string(toc->tracks[i].trktype),
- cdrom_get_subtype_string(toc->tracks[i].subtype), toc->tracks[i].frames, toc->tracks[i].padframes,
- toc->tracks[i].pregap, cdrom_get_type_string(toc->tracks[i].pgtype),
+ cdrom_get_subtype_string(toc->tracks[i].subtype), toc->tracks[i].frames, toc->tracks[i].padframes,
+ toc->tracks[i].pregap, cdrom_get_type_string(toc->tracks[i].pgtype),
cdrom_get_subtype_string(toc->tracks[i].pgsub), toc->tracks[i].postgap);
err = chd->write_metadata(GDROM_TRACK_METADATA_TAG, i, metadata);
diff --git a/src/mame/audio/gottlieb.c b/src/mame/audio/gottlieb.c
index a4d24bd9b86..fd7e809f9a6 100644
--- a/src/mame/audio/gottlieb.c
+++ b/src/mame/audio/gottlieb.c
@@ -4,7 +4,7 @@
Gottlieb 6502-based sound hardware implementations.
- Dedicated to Warren Davis, Jeff Lee, Tim Skelly & David Thiel
+ Dedicated to Warren Davis, Jeff Lee, Tim Skelly & David Thiel
****************************************************************************
@@ -361,7 +361,7 @@ WRITE_LINE_MEMBER( gottlieb_sound_r1_device::snd_interrupt )
//-------------------------------------------------
// r6532_portb_w - handle writes to the RIOT's
-// port B
+// port B
//-------------------------------------------------
WRITE8_MEMBER( gottlieb_sound_r1_device::r6532_portb_w )
@@ -372,7 +372,7 @@ WRITE8_MEMBER( gottlieb_sound_r1_device::r6532_portb_w )
//-------------------------------------------------
-// votrax_data_w - write data to the Votrax SC-01
+// votrax_data_w - write data to the Votrax SC-01
// speech chip
//-------------------------------------------------
@@ -392,7 +392,7 @@ WRITE8_MEMBER( gottlieb_sound_r1_device::votrax_data_w )
//-------------------------------------------------
// speech_clock_dac_w - modify the clock driving
-// the Votrax SC-01 speech chip
+// the Votrax SC-01 speech chip
//-------------------------------------------------
WRITE8_MEMBER( gottlieb_sound_r1_device::speech_clock_dac_w )
@@ -403,7 +403,7 @@ WRITE8_MEMBER( gottlieb_sound_r1_device::speech_clock_dac_w )
if (data != m_last_speech_clock)
{
mame_printf_debug("clock = %02X\n", data);
-
+
// totally random guesswork; would like to get real measurements on a board
if (m_votrax != NULL)
m_votrax->set_unscaled_clock(600000 + (data - 0xa0) * 10000);
@@ -415,7 +415,7 @@ WRITE8_MEMBER( gottlieb_sound_r1_device::speech_clock_dac_w )
//-------------------------------------------------
// votrax_request - map the VOTRAX SC-01 request
-// line to the NMI pin on the sound chip
+// line to the NMI pin on the sound chip
//-------------------------------------------------
WRITE_LINE_MEMBER( gottlieb_sound_r1_device::votrax_request )
@@ -483,7 +483,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_FRAGMENT( gottlieb_sound_r1_with_votrax )
MCFG_FRAGMENT_ADD(gottlieb_sound_r1)
-
+
// add the VOTRAX
MCFG_VOTRAX_SC01_ADD("votrax", 720000, gottlieb_votrax_interface)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, DEVICE_SELF_OWNER, 0.50)
@@ -552,8 +552,8 @@ void gottlieb_sound_r1_device::device_start()
//**************************************************************************
//-------------------------------------------------
-// gottlieb_sound_r1_with_votrax_device -
-// constructor
+// gottlieb_sound_r1_with_votrax_device -
+// constructor
//-------------------------------------------------
gottlieb_sound_r1_with_votrax_device::gottlieb_sound_r1_with_votrax_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
@@ -618,7 +618,7 @@ gottlieb_sound_r2_device::gottlieb_sound_r2_device(const machine_config &mconfig
//-------------------------------------------------
// static_enable_cobram3_mods - enable changes
-// for cobram3
+// for cobram3
//-------------------------------------------------
void gottlieb_sound_r2_device::static_enable_cobram3_mods(device_t &device)
@@ -652,7 +652,7 @@ WRITE8_MEMBER( gottlieb_sound_r2_device::write )
//-------------------------------------------------
// nmi_timer_adjust - adjust the NMI timer to
-// fire based on its configured rate
+// fire based on its configured rate
//-------------------------------------------------
inline void gottlieb_sound_r2_device::nmi_timer_adjust()
@@ -664,7 +664,7 @@ inline void gottlieb_sound_r2_device::nmi_timer_adjust()
//-------------------------------------------------
// nmi_state_update - update the NMI state based
-// on the timer firing and the enable control
+// on the timer firing and the enable control
//-------------------------------------------------
inline void gottlieb_sound_r2_device::nmi_state_update()
@@ -676,7 +676,7 @@ inline void gottlieb_sound_r2_device::nmi_state_update()
//-------------------------------------------------
// speech_data_r - read the input command latch
-// from the audio CPU
+// from the audio CPU
//-------------------------------------------------
READ8_MEMBER( gottlieb_sound_r2_device::audio_data_r )
@@ -688,7 +688,7 @@ READ8_MEMBER( gottlieb_sound_r2_device::audio_data_r )
//-------------------------------------------------
// speech_data_r - read the input command latch
-// from the speech CPU
+// from the speech CPU
//-------------------------------------------------
READ8_MEMBER( gottlieb_sound_r2_device::speech_data_r )
@@ -700,7 +700,7 @@ READ8_MEMBER( gottlieb_sound_r2_device::speech_data_r )
//-------------------------------------------------
// signal_audio_nmi_w - signal an NMI from the
-// speech CPU to the audio CPU
+// speech CPU to the audio CPU
//-------------------------------------------------
WRITE8_MEMBER( gottlieb_sound_r2_device::signal_audio_nmi_w )
@@ -712,7 +712,7 @@ WRITE8_MEMBER( gottlieb_sound_r2_device::signal_audio_nmi_w )
//-------------------------------------------------
// nmi_rate_w - adjust the NMI rate on the speech
-// CPU
+// CPU
//-------------------------------------------------
WRITE8_MEMBER( gottlieb_sound_r2_device::nmi_rate_w )
@@ -723,8 +723,8 @@ WRITE8_MEMBER( gottlieb_sound_r2_device::nmi_rate_w )
//-------------------------------------------------
-// speech_drq_custom_r - return the SP0250
-// request line as an input port bit
+// speech_drq_custom_r - return the SP0250
+// request line as an input port bit
//-------------------------------------------------
CUSTOM_INPUT_MEMBER( gottlieb_sound_r2_device::speech_drq_custom_r )
@@ -735,7 +735,7 @@ CUSTOM_INPUT_MEMBER( gottlieb_sound_r2_device::speech_drq_custom_r )
//-------------------------------------------------
// dac_w - write to one of the two DACs on the
-// board
+// board
//-------------------------------------------------
WRITE8_MEMBER( gottlieb_sound_r2_device::dac_w )
@@ -748,8 +748,8 @@ WRITE8_MEMBER( gottlieb_sound_r2_device::dac_w )
//-------------------------------------------------
-// speech_control_w - primary audio control
-// register on the speech board
+// speech_control_w - primary audio control
+// register on the speech board
//-------------------------------------------------
WRITE8_MEMBER( gottlieb_sound_r2_device::speech_control_w )
@@ -761,7 +761,7 @@ WRITE8_MEMBER( gottlieb_sound_r2_device::speech_control_w )
nmi_state_update();
// bit 1 controls a LED on the sound board
-
+
// bits 2-4 control the AY-8913, but act differently between the
// standard sound board and the modified Cobra Command board
if (!m_cobram3_mod)
@@ -805,7 +805,7 @@ WRITE8_MEMBER( gottlieb_sound_r2_device::speech_control_w )
//-------------------------------------------------
// psg_latch_w - store an 8-bit value in the PSG
-// latch register
+// latch register
//-------------------------------------------------
WRITE8_MEMBER( gottlieb_sound_r2_device::psg_latch_w )
@@ -815,8 +815,8 @@ WRITE8_MEMBER( gottlieb_sound_r2_device::psg_latch_w )
//-------------------------------------------------
-// psg_latch_w - store an 8-bit value in the
-// SP0250 latch register
+// psg_latch_w - store an 8-bit value in the
+// SP0250 latch register
//-------------------------------------------------
WRITE8_MEMBER( gottlieb_sound_r2_device::sp0250_latch_w )
@@ -935,7 +935,7 @@ void gottlieb_sound_r2_device::device_start()
// reset the DACs
m_dac_data[0] = m_dac_data[1] = 0xff;
-
+
// disable the non-speech CPU for cobram3
if (m_cobram3_mod)
m_audiocpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE);
@@ -967,13 +967,13 @@ void gottlieb_sound_r2_device::device_timer(emu_timer &timer, device_timer_id id
// adjust the NMI timer for the next time
nmi_timer_adjust();
break;
-
+
case TID_NMI_CLEAR:
// update state
m_nmi_state = 0;
nmi_state_update();
break;
-
+
case TID_SOUND_LATCH_WRITE:
// each CPU has its own latch
m_audiocpu_latch = param;
diff --git a/src/mame/drivers/armedf.c b/src/mame/drivers/armedf.c
index 9c9dec92eed..e13caa663d3 100644
--- a/src/mame/drivers/armedf.c
+++ b/src/mame/drivers/armedf.c
@@ -1265,7 +1265,7 @@ static MACHINE_CONFIG_START( terrafb, armedf_state )
MCFG_GFXDECODE(armedf)
MCFG_PALETTE_LENGTH(2048)
-
+
MCFG_BUFFERED_SPRITERAM16_ADD("spriteram")
/* sound hardware */
diff --git a/src/mame/drivers/bbusters.c b/src/mame/drivers/bbusters.c
index 4b992069849..f98295a3509 100644
--- a/src/mame/drivers/bbusters.c
+++ b/src/mame/drivers/bbusters.c
@@ -696,7 +696,7 @@ static MACHINE_CONFIG_START( bbusters, bbusters_state )
MCFG_PALETTE_LENGTH(2048)
MCFG_VIDEO_START(bbuster)
-
+
MCFG_BUFFERED_SPRITERAM16_ADD("spriteram")
MCFG_BUFFERED_SPRITERAM16_ADD("spriteram2")
diff --git a/src/mame/drivers/bfm_sc1.c b/src/mame/drivers/bfm_sc1.c
index 8a42542d44e..251fbba3e31 100644
--- a/src/mame/drivers/bfm_sc1.c
+++ b/src/mame/drivers/bfm_sc1.c
@@ -1402,7 +1402,7 @@ ROM_START( sc1cshat )
ROM_REGION( 0x10000, "maincpu", 0 )
ROM_LOAD( "cash_attraction_b", 0x0000, 0x8000, CRC(79870574) SHA1(89e5db89064a9e24bc37389d78f4defb7d2f479b) )
ROM_LOAD( "cash_attraction_a", 0x8000, 0x8000, CRC(fab3283c) SHA1(669b425687faad0ebf88c1aaaafa40c446fa2e24) )
-
+
ROM_REGION( 0x10000, "altrevs", 0 )
ROM_LOAD( "957172.40 b std var%.bin", 0x0000, 0x008000, CRC(5e4381f9) SHA1(ae6d64c42ae7ddc2ed0ab5c3b56222090004d88a) )
ROM_LOAD( "957182.20 var% proto a.bin", 0x0000, 0x008000, CRC(3a2dd72d) SHA1(29d962702095aa0f252210da68a89c557fa9db69) )
@@ -1466,7 +1466,7 @@ ROM_START( sc1cexpl )
ROM_REGION( 0x10000, "maincpu", 0 )
ROM_LOAD( "cashxpl2.bin", 0x0000, 0x8000, CRC(0199136c) SHA1(bed1df64ecc0d7ef951a59717e219e6fe7ebf99c) )
ROM_LOAD( "cashxpl1.bin", 0x8000, 0x8000, CRC(0fe62ead) SHA1(bd56a216292e9bf2b7753616a6cd25b37e22095f) )
-
+
ROM_REGION( 0x10000, "altrevs", 0 ) // i think some of this is on different hw (SC2?)
ROM_LOAD( "cash_explosion_dat_ac_8_10pnd_20p_a.bin", 0x0000, 0x010000, CRC(1d155799) SHA1(4e76328a4d093d1f9c64c633c3558db2dce4e219) )
ROM_LOAD( "cash_explosion_dat_ac_var_8pnd_a.bin", 0x0000, 0x010000, CRC(4aa53121) SHA1(cf0510e224de62b837915d39c2fe3559cfe8c85f) )
@@ -1504,7 +1504,7 @@ ROM_START( sc1cshwz )
ROM_REGION( 0x10000, "maincpu", 0 )
ROM_LOAD( "95717206b std.bin", 0x0000, 0x8000, CRC(2478530f) SHA1(be82a4e36a3c076b9e94fa2364904ca463b6b4ed) )
ROM_LOAD( "95717205a std.bin", 0x8000, 0x8000, CRC(795bbeea) SHA1(22e0fc9bc3c70e05e51cb98837a9c706eb2ca080) )
-
+
ROM_REGION( 0x10000, "altrevs", 0 )//these seem to be halves without a partner, do these share the same b ROM?
ROM_LOAD( "95718205a std ptel.bin", 0x0000, 0x008000, CRC(c88f476c) SHA1(a5d8f12ade77bdb100ece5f2eecec35ae09f3b0e) )
ROM_LOAD( "95718210a proto var.bin", 0x0000, 0x008000, CRC(0997c4e9) SHA1(1013a12803796d3926cceeb671c7c07cc66d418e) )
@@ -1571,7 +1571,7 @@ ROM_START( sc1chinab )
ROM_REGION( 0x10000, "maincpu", 0 )
ROM_LOAD( "club-china-town_std_ac_150pnd_lfj_bss.bin", 0x0000, 0x8000, CRC(d41c6999) SHA1(cc2eb2e74ca3bfa78d74dd08f83acb2fe650e13d) )
ROM_LOAD( "club-china-town_std_ac_150pnd_lfj_ass.bin", 0x8000, 0x8000, CRC(8c3e69f1) SHA1(cb0cbf7a6039549b969160a162a0cd5511b24cd3) )
-
+
sc1_china_sound
ROM_END
@@ -1679,7 +1679,7 @@ ROM_START( sc1cl65d )
ROM_REGION( 0x10000, "maincpu", 0 )
ROM_LOAD( "club-six-five-special_std_ac_rot_10po_bss.bin", 0x0000, 0x8000, CRC(3371dc55) SHA1(52d75a90933acc7a03821e5c2821df6126c72a6c) )
ROM_LOAD( "club-six-five-special_std_ac_rot_10po_ass.bin", 0x8000, 0x8000, CRC(cf48ba99) SHA1(5da4321ff349964e903f1bebd3e5ddd0799fc478) )
-
+
sc1_cl65_sound_alt
ROM_END
@@ -1687,7 +1687,7 @@ ROM_START( sc1cl65dp )
ROM_REGION( 0x10000, "maincpu", 0 )
ROM_LOAD( "club-six-five-special_std_ac_rot_10po_bss.bin", 0x0000, 0x8000, CRC(3371dc55) SHA1(52d75a90933acc7a03821e5c2821df6126c72a6c) )
ROM_LOAD( "club-six-five-special_dat_ac_rot_10po_ass.bin", 0x8000, 0x8000, CRC(77ddf81d) SHA1(522d9f84ab6e31586f371548e2f146ac193f06f5) )
-
+
sc1_cl65_sound_alt
ROM_END
@@ -1752,7 +1752,7 @@ ROM_START( sc1clbtma )
ROM_REGION( 0x10000, "maincpu", 0 )
ROM_LOAD( "temptp2", 0x0000, 0x8000, CRC(d165fa87) SHA1(aef8a4af8b6e83ef09dffc8aca305eaf7dd3936b) )
ROM_LOAD( "temptp1", 0x8000, 0x8000, CRC(6f03648d) SHA1(a6402c94ebf4d570d1d3fb462eb621566c27f307) )
-
+
ROM_REGION( 0x40000, "upd", 0 )
ROM_LOAD( "tempsnd1.bin", 0x00000, 0x10000, CRC(168e2a18) SHA1(db97acf9131b1a54efe1cd375aecae1679bab19e) )
ROM_LOAD( "tempsnd2.bin", 0x00000, 0x10000, CRC(b717f347) SHA1(189c82318d622f18580a23eed48b17c0c34dedd5) )
@@ -1859,7 +1859,7 @@ ROM_START( sc1dblch )
ROM_REGION( 0x10000, "maincpu", 0 )
ROM_LOAD( "doublechancegame2.bin", 0x0000, 0x008000, CRC(d4f49454) SHA1(53b97f941a4abfeb3e498b4295f98e80bd182b7e) )
ROM_LOAD( "doublechancegame1.bin", 0x8000, 0x008000, CRC(9e24e0e3) SHA1(fff1fe9219c052750709d13c06148c7926a22910) )
-
+
ROM_REGION( 0x40000, "altrevs", 0 )//orphans?
ROM_LOAD( "95717787 10p20p.bin", 0x0000, 0x008000, CRC(69ba126c) SHA1(f59aa5a632d0bc5102c206f986f86b6c7c1352fb) )
ROM_LOAD( "95717789 10p.bin", 0x0000, 0x008000, CRC(fc338d38) SHA1(65457f2611ffa22ac35f1e7ad10c290c01b9c3ac) )
@@ -2409,7 +2409,7 @@ ROM_START( sc1winst )
sc1_winst_sound
ROM_END
-
+
ROM_START( sc1winstp )
ROM_REGION( 0x10000, "maincpu", 0 )
ROM_LOAD( "95717110 var% b.bin", 0x0000, 0x8000, CRC(1c2ebd26) SHA1(462baa4df7c01d101798df1d90bb5719cdc9647e) )
@@ -2601,10 +2601,10 @@ ROM_START( sc1drivc )
ROM_REGION( 0x10000, "maincpu", 0 )
ROM_LOAD( "dsnl1-6.p2", 0x0000, 0x8000, CRC(0eb10c01) SHA1(16456ec1e32bfbd873bdebd6a760041bc9cd8648) )
ROM_LOAD( "dsnl1-6.p1", 0x8000, 0x8000, CRC(174c4432) SHA1(82519ede8220d3d717ee0ebe57374357afe38949) )
-
+
sc1_driv_sound
ROM_END
-
+
ROM_START( sc1vsd )
ROM_REGION( 0x10000, "maincpu", 0 )
ROM_LOAD( "supd1-4n.p1", 0x8000, 0x8000, CRC(ad581f7d) SHA1(99b9bf1016cd52467f5c9f6e427305e81033e82f) )
@@ -2733,7 +2733,7 @@ ROM_START( sc1btclk )
ROM_LOAD( "bc6-4_0b.bin", 0x0000, 0x8000, CRC(106265c8) SHA1(6465f7e868c5b04776fee69295a52197abb45ad0) )
ROM_LOAD( "bc6-4_0a.bin", 0x8000, 0x8000, CRC(750645e7) SHA1(65eee2a00a1914bb8dc989b131eaa39d2881105d) )
-// ROM_REGION( 0x80000, "altrevs", 0 )
+// ROM_REGION( 0x80000, "altrevs", 0 )
ROM_REGION( 0x200000, "upd", ROMREGION_ERASE00 )
ROM_END
diff --git a/src/mame/drivers/bionicc.c b/src/mame/drivers/bionicc.c
index a59d4e4ca3d..45d2273a67e 100644
--- a/src/mame/drivers/bionicc.c
+++ b/src/mame/drivers/bionicc.c
@@ -387,7 +387,7 @@ static MACHINE_CONFIG_START( bionicc, bionicc_state )
MCFG_PALETTE_LENGTH(1024)
MCFG_VIDEO_START(bionicc)
-
+
MCFG_BUFFERED_SPRITERAM16_ADD("spriteram")
MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/mame/drivers/blktiger.c b/src/mame/drivers/blktiger.c
index 50d755d85fb..2aeb19f8f34 100644
--- a/src/mame/drivers/blktiger.c
+++ b/src/mame/drivers/blktiger.c
@@ -349,7 +349,7 @@ static MACHINE_CONFIG_START( blktiger, blktiger_state )
MCFG_PALETTE_LENGTH(1024)
MCFG_VIDEO_START(blktiger)
-
+
MCFG_BUFFERED_SPRITERAM8_ADD("spriteram")
/* sound hardware */
diff --git a/src/mame/drivers/boogwing.c b/src/mame/drivers/boogwing.c
index f415ecc0b7f..fcce6388f59 100644
--- a/src/mame/drivers/boogwing.c
+++ b/src/mame/drivers/boogwing.c
@@ -361,7 +361,7 @@ static MACHINE_CONFIG_START( boogwing, boogwing_state )
MCFG_GFXDECODE(boogwing)
MCFG_VIDEO_START(boogwing)
-
+
MCFG_BUFFERED_SPRITERAM16_ADD("spriteram")
MCFG_BUFFERED_SPRITERAM16_ADD("spriteram2")
diff --git a/src/mame/drivers/cninja.c b/src/mame/drivers/cninja.c
index f598889232f..70d47958538 100644
--- a/src/mame/drivers/cninja.c
+++ b/src/mame/drivers/cninja.c
@@ -932,7 +932,7 @@ static MACHINE_CONFIG_START( cninja, cninja_state )
MCFG_GFXDECODE(cninja)
MCFG_PALETTE_LENGTH(2048)
-
+
MCFG_BUFFERED_SPRITERAM16_ADD("spriteram")
MCFG_DECOCOMN_ADD("deco_common", cninja_decocomn_intf)
diff --git a/src/mame/drivers/commando.c b/src/mame/drivers/commando.c
index 533d8c082f1..236a860bc0f 100644
--- a/src/mame/drivers/commando.c
+++ b/src/mame/drivers/commando.c
@@ -272,7 +272,7 @@ static MACHINE_CONFIG_START( commando, commando_state )
MCFG_PALETTE_INIT(RRRR_GGGG_BBBB)
MCFG_VIDEO_START(commando)
-
+
MCFG_BUFFERED_SPRITERAM8_ADD("spriteram")
/* sound hardware */
diff --git a/src/mame/drivers/crshrace.c b/src/mame/drivers/crshrace.c
index b559a9c4af1..0e199dc7d05 100644
--- a/src/mame/drivers/crshrace.c
+++ b/src/mame/drivers/crshrace.c
@@ -487,7 +487,7 @@ static MACHINE_CONFIG_START( crshrace, crshrace_state )
MCFG_GFXDECODE(crshrace)
MCFG_PALETTE_LENGTH(2048)
-
+
MCFG_BUFFERED_SPRITERAM16_ADD("spriteram")
MCFG_BUFFERED_SPRITERAM16_ADD("spriteram2")
diff --git a/src/mame/drivers/darkseal.c b/src/mame/drivers/darkseal.c
index 4632598f4f9..ee2d560b1d0 100644
--- a/src/mame/drivers/darkseal.c
+++ b/src/mame/drivers/darkseal.c
@@ -279,7 +279,7 @@ static MACHINE_CONFIG_START( darkseal, darkseal_state )
MCFG_GFXDECODE(darkseal)
MCFG_PALETTE_LENGTH(2048)
-
+
MCFG_BUFFERED_SPRITERAM16_ADD("spriteram")
MCFG_DECO16IC_ADD("tilegen1", darkseal_deco16ic_tilegen1_intf)
diff --git a/src/mame/drivers/dassault.c b/src/mame/drivers/dassault.c
index 02dacc51425..1f407ea80c9 100644
--- a/src/mame/drivers/dassault.c
+++ b/src/mame/drivers/dassault.c
@@ -593,7 +593,7 @@ static MACHINE_CONFIG_START( dassault, dassault_state )
MCFG_GFXDECODE(dassault)
MCFG_PALETTE_LENGTH(4096)
-
+
MCFG_BUFFERED_SPRITERAM16_ADD("spriteram")
MCFG_BUFFERED_SPRITERAM16_ADD("spriteram2")
diff --git a/src/mame/drivers/dec8.c b/src/mame/drivers/dec8.c
index 7ac913b02d1..89d25fa8725 100644
--- a/src/mame/drivers/dec8.c
+++ b/src/mame/drivers/dec8.c
@@ -339,7 +339,7 @@ static WRITE8_HANDLER( csilver_i8751_w )
static WRITE8_HANDLER( srdarwin_i8751_w )
{
dec8_state *state = space->machine().driver_data<dec8_state>();
-
+
/* Japan coinage first, then World coinage - US coinage shall be the same as the Japan one */
int lneed1[2][4] = {{1, 1, 1, 2}, {1, 1, 1, 1}}; /* slot 1 : coins needed */
int lcred1[2][4] = {{1, 2, 3, 1}, {2, 3, 4, 6}}; /* slot 1 : credits awarded */
@@ -398,8 +398,8 @@ static WRITE8_HANDLER( srdarwin_i8751_w )
if (state->m_i8751_value == 0x5000) { state->m_i8751_return = ((state->m_credits / 10) << 4) | (state->m_credits % 10); } /* Credits request */
if (state->m_i8751_value == 0x6000 && state->m_credits) { state->m_i8751_value = -1; state->m_credits--; } /* Credits clear */
-/*
- This next value is the index to a series of tables,
+/*
+ This next value is the index to a series of tables,
each table controls the end of level bad guy,
wrong values crash the cpu right away via a bogus jump.
@@ -2065,7 +2065,7 @@ static MACHINE_CONFIG_START( lastmisn, dec8_state )
/* video hardware */
MCFG_BUFFERED_SPRITERAM8_ADD("spriteram")
-
+
MCFG_DEVICE_ADD("spritegen", DECO_KARNOVSPRITES, 0)
deco_karnovsprites_device::set_gfx_region(*device, 1);
@@ -2114,7 +2114,7 @@ static MACHINE_CONFIG_START( shackled, dec8_state )
/* video hardware */
MCFG_BUFFERED_SPRITERAM8_ADD("spriteram")
-
+
MCFG_DEVICE_ADD("spritegen", DECO_KARNOVSPRITES, 0)
deco_karnovsprites_device::set_gfx_region(*device, 1);
@@ -2163,7 +2163,7 @@ static MACHINE_CONFIG_START( gondo, dec8_state )
/* video hardware */
MCFG_BUFFERED_SPRITERAM8_ADD("spriteram")
-
+
MCFG_DEVICE_ADD("spritegen", DECO_KARNOVSPRITES, 0)
deco_karnovsprites_device::set_gfx_region(*device, 1);
@@ -2213,7 +2213,7 @@ static MACHINE_CONFIG_START( garyoret, dec8_state )
/* video hardware */
MCFG_BUFFERED_SPRITERAM8_ADD("spriteram")
-
+
MCFG_DEVICE_ADD("spritegen", DECO_KARNOVSPRITES, 0)
deco_karnovsprites_device::set_gfx_region(*device, 1);
@@ -2263,7 +2263,7 @@ static MACHINE_CONFIG_START( ghostb, dec8_state )
/* video hardware */
MCFG_BUFFERED_SPRITERAM8_ADD("spriteram")
-
+
MCFG_DEVICE_ADD("tilegen1", DECO_BAC06, 0)
deco_bac06_device::set_gfx_region_wide(*device, 2,2,0);
@@ -2318,7 +2318,7 @@ static MACHINE_CONFIG_START( csilver, dec8_state )
/* video hardware */
MCFG_BUFFERED_SPRITERAM8_ADD("spriteram")
-
+
MCFG_DEVICE_ADD("spritegen", DECO_KARNOVSPRITES, 0)
deco_karnovsprites_device::set_gfx_region(*device, 1);
@@ -2372,7 +2372,7 @@ static MACHINE_CONFIG_START( oscar, dec8_state )
/* video hardware */
MCFG_BUFFERED_SPRITERAM8_ADD("spriteram")
-
+
MCFG_DEVICE_ADD("tilegen1", DECO_BAC06, 0)
deco_bac06_device::set_gfx_region_wide(*device, 2,2,0);
@@ -2421,7 +2421,7 @@ static MACHINE_CONFIG_START( srdarwin, dec8_state )
/* video hardware */
MCFG_BUFFERED_SPRITERAM8_ADD("spriteram")
-
+
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(58)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529) /* 58Hz, 529ms Vblank duration */)
@@ -2464,7 +2464,7 @@ static MACHINE_CONFIG_START( cobracom, dec8_state )
/* video hardware */
MCFG_BUFFERED_SPRITERAM8_ADD("spriteram")
-
+
MCFG_DEVICE_ADD("tilegen1", DECO_BAC06, 0)
deco_bac06_device::set_gfx_region_wide(*device, 2,2,0);
MCFG_DEVICE_ADD("tilegen2", DECO_BAC06, 0)
diff --git a/src/mame/drivers/deco32.c b/src/mame/drivers/deco32.c
index de860d910d5..1ce19ce97e3 100644
--- a/src/mame/drivers/deco32.c
+++ b/src/mame/drivers/deco32.c
@@ -1965,7 +1965,7 @@ static MACHINE_CONFIG_START( dragngun, dragngun_state )
MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
MCFG_SCREEN_UPDATE_STATIC(dragngun)
MCFG_SCREEN_VBLANK_STATIC(dragngun)
-
+
MCFG_BUFFERED_SPRITERAM32_ADD("spriteram")
MCFG_DECO16IC_ADD("tilegen1", dragngun_deco16ic_tilegen1_intf)
@@ -2038,7 +2038,7 @@ static MACHINE_CONFIG_START( lockload, dragngun_state )
MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
MCFG_SCREEN_UPDATE_STATIC(dragngun)
MCFG_SCREEN_VBLANK_STATIC(dragngun)
-
+
MCFG_BUFFERED_SPRITERAM32_ADD("spriteram")
MCFG_DECO16IC_ADD("tilegen1", lockload_deco16ic_tilegen1_intf)
diff --git a/src/mame/drivers/gottlieb.c b/src/mame/drivers/gottlieb.c
index c6b727d31a5..6606873a015 100644
--- a/src/mame/drivers/gottlieb.c
+++ b/src/mame/drivers/gottlieb.c
@@ -692,7 +692,7 @@ static INTERRUPT_GEN( gottlieb_interrupt )
* Main CPU memory handlers
*
*************************************/
-
+
static WRITE8_HANDLER( gottlieb_sh_w )
{
gottlieb_state *state = space->machine().driver_data<gottlieb_state>();
@@ -2485,12 +2485,12 @@ static DRIVER_INIT( vidvince )
/* games using rev 1 sound board */
GAME( 1982, reactor, 0, reactor, reactor, ramtiles, ROT0, "Gottlieb", "Reactor", GAME_IMPERFECT_SOUND )
-GAME( 1982, qbert, 0, qbert, qbert, romtiles, ROT270, "Gottlieb", "Q*bert (US set 1)", GAME_IMPERFECT_SOUND )
+GAME( 1982, qbert, 0, qbert, qbert, romtiles, ROT270, "Gottlieb", "Q*bert (US set 1)", GAME_IMPERFECT_SOUND )
GAME( 1982, qberta, qbert, qbert, qbert, romtiles, ROT270, "Gottlieb", "Q*bert (US set 2)", GAME_IMPERFECT_SOUND )
-GAME( 1982, qbertj, qbert, qbert, qbert, romtiles, ROT270, "Gottlieb (Konami license)", "Q*bert (Japan)", GAME_IMPERFECT_SOUND )
-GAME( 1982, myqbert, qbert, qbert, qbert, romtiles, ROT270, "Gottlieb", "Mello Yello Q*bert", GAME_IMPERFECT_SOUND )
-GAME( 1982, qberttst, qbert, qbert, qbert, romtiles, ROT270, "Gottlieb", "Q*bert (early test version)", GAME_IMPERFECT_SOUND )
-GAME( 1982, qbtrktst, qbert, qbert, qbert, romtiles, ROT270, "Gottlieb", "Q*bert Board Input Test Rom", GAME_IMPERFECT_SOUND )
+GAME( 1982, qbertj, qbert, qbert, qbert, romtiles, ROT270, "Gottlieb (Konami license)", "Q*bert (Japan)", GAME_IMPERFECT_SOUND )
+GAME( 1982, myqbert, qbert, qbert, qbert, romtiles, ROT270, "Gottlieb", "Mello Yello Q*bert", GAME_IMPERFECT_SOUND )
+GAME( 1982, qberttst, qbert, qbert, qbert, romtiles, ROT270, "Gottlieb", "Q*bert (early test version)", GAME_IMPERFECT_SOUND )
+GAME( 1982, qbtrktst, qbert, qbert, qbert, romtiles, ROT270, "Gottlieb", "Q*bert Board Input Test Rom", GAME_IMPERFECT_SOUND )
GAME( 1982, insector, 0, gottlieb1, insector, romtiles, ROT0, "Gottlieb", "Insector (prototype)", 0 )
GAME( 1982, tylz, 0, gottlieb1_votrax, tylz, romtiles, ROT0, "Mylstar", "Tylz (prototype)", GAME_IMPERFECT_SOUND ) // modified sound hw?
GAME( 1984, argusg, 0, gottlieb1, argusg, ramtiles, ROT0, "Gottlieb", "Argus (Gottlieb, prototype)" , 0) // aka Guardian / Protector?
@@ -2498,8 +2498,8 @@ GAME( 1983, mplanets, 0, gottlieb1, mplanets, romtiles, ROT270, "Gottl
GAME( 1983, mplanetsuk,mplanets, gottlieb1, mplanets, romtiles, ROT270, "Gottlieb (Taitel license)", "Mad Planets (UK)", 0 )
GAME( 1983, krull, 0, gottlieb1, krull, ramtiles, ROT270, "Gottlieb", "Krull", 0 )
GAME( 1983, kngtmare, 0, gottlieb1, kngtmare, romtiles, ROT0, "Gottlieb", "Knightmare (prototype)", GAME_NO_SOUND )
-GAME( 1983, sqbert, 0, qbert, qbert, romtiles, ROT270, "Mylstar", "Faster, Harder, More Challenging Q*bert (prototype)", GAME_IMPERFECT_SOUND )
-GAME( 1983, qbertqub, 0, qbert, qbertqub, romtiles, ROT270, "Mylstar", "Q*bert's Qubes", GAME_IMPERFECT_SOUND )
+GAME( 1983, sqbert, 0, qbert, qbert, romtiles, ROT270, "Mylstar", "Faster, Harder, More Challenging Q*bert (prototype)", GAME_IMPERFECT_SOUND )
+GAME( 1983, qbertqub, 0, qbert, qbertqub, romtiles, ROT270, "Mylstar", "Q*bert's Qubes", GAME_IMPERFECT_SOUND )
GAME( 1984, curvebal, 0, gottlieb1, curvebal, romtiles, ROT270, "Mylstar", "Curve Ball", 0 )
/* games using rev 2 sound board */
diff --git a/src/mame/drivers/lastduel.c b/src/mame/drivers/lastduel.c
index dd169ff7d53..762d31749a0 100644
--- a/src/mame/drivers/lastduel.c
+++ b/src/mame/drivers/lastduel.c
@@ -521,7 +521,7 @@ static MACHINE_CONFIG_START( lastduel, lastduel_state )
MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 1*8, 31*8-1 )
MCFG_SCREEN_UPDATE_STATIC(lastduel)
MCFG_SCREEN_VBLANK_DEVICE("spriteram", buffered_spriteram16_device, vblank_copy_rising)
-
+
MCFG_BUFFERED_SPRITERAM16_ADD("spriteram")
MCFG_GFXDECODE(lastduel)
diff --git a/src/mame/drivers/m90.c b/src/mame/drivers/m90.c
index db56b24022a..90c0611c254 100644
--- a/src/mame/drivers/m90.c
+++ b/src/mame/drivers/m90.c
@@ -950,8 +950,8 @@ ROM_END
ROM_START( dynablstb2 )
ROM_REGION( CODE_SIZE, "maincpu", 0 )
- ROM_LOAD16_BYTE( "2.bin", 0x000001, 0x020000, CRC(9c3e996a) SHA1(9244f6a8b498d0f488bbfc68465916ea0560f3be) )
- ROM_LOAD16_BYTE( "3.bin", 0x000000, 0x020000, CRC(697a2ed9) SHA1(d329987f7a0321414347b8e6a6dfc4304fbe4987) )
+ ROM_LOAD16_BYTE( "2.bin", 0x000001, 0x020000, CRC(9c3e996a) SHA1(9244f6a8b498d0f488bbfc68465916ea0560f3be) )
+ ROM_LOAD16_BYTE( "3.bin", 0x000000, 0x020000, CRC(697a2ed9) SHA1(d329987f7a0321414347b8e6a6dfc4304fbe4987) )
ROM_COPY( "maincpu", 0x3fff0, 0xffff0, 0x10 ) /* start vector */
ROM_REGION( 0x10000, "soundcpu", 0 )
diff --git a/src/mame/drivers/megatech.c b/src/mame/drivers/megatech.c
index e42573e06cd..3cc34a13db8 100644
--- a/src/mame/drivers/megatech.c
+++ b/src/mame/drivers/megatech.c
@@ -314,7 +314,7 @@ static READ8_HANDLER( bios_ctrl_r )
static WRITE8_HANDLER( bios_ctrl_w )
{
mtech_state *state = space->machine().driver_data<mtech_state>();
-
+
if (offset == 1)
{
output_set_value("Alarm_sound", data>>7 & 0x01);
@@ -324,7 +324,7 @@ static WRITE8_HANDLER( bios_ctrl_w )
{
output_set_value("Flash_screen", data>>1 & 0x01);
}
-
+
state->m_bios_ctrl[offset] = data;
}
diff --git a/src/mame/drivers/namcops2.c b/src/mame/drivers/namcops2.c
index ef95bcf5bc0..ee9f40be517 100644
--- a/src/mame/drivers/namcops2.c
+++ b/src/mame/drivers/namcops2.c
@@ -208,7 +208,7 @@ ROM_START( soulclb3a )
SYSTEM246_BIOS
ROM_REGION(0x840000, "key", ROMREGION_ERASE00)
- ROM_LOAD( "sc31002-na-a.ic002", 0x000000, 0x840000, CRC(2ebf91ff) SHA1(01e628344b2cde2edbda9ffea53af6a63e3bddf1) )
+ ROM_LOAD( "sc31002-na-a.ic002", 0x000000, 0x840000, CRC(2ebf91ff) SHA1(01e628344b2cde2edbda9ffea53af6a63e3bddf1) )
DISK_REGION("dvd")
DISK_IMAGE_READONLY( "sc31001-na-dvd0-b", 0, SHA1(b46ee35083f8fcc091ce562951c55fbdbb929e4b) )
@@ -291,7 +291,7 @@ ROM_START( tekken4c )
SYSTEM246_BIOS
ROM_REGION(0x840000, "key", ROMREGION_ERASE00)
- ROM_LOAD( "tef1verc.ic002", 0x000000, 0x840000, CRC(92697a2b) SHA1(e9ec254d52187f5be0d9be58b25821c1e63bba8e) )
+ ROM_LOAD( "tef1verc.ic002", 0x000000, 0x840000, CRC(92697a2b) SHA1(e9ec254d52187f5be0d9be58b25821c1e63bba8e) )
DISK_REGION("dvd")
DISK_IMAGE_READONLY( "tef1dvd0", 0, SHA1(f39aa37156245f622a6e19e8a0e081418e247b36) )
diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c
index c043c0a6c67..010e13f64bf 100644
--- a/src/mame/drivers/naomi.c
+++ b/src/mame/drivers/naomi.c
@@ -5524,19 +5524,19 @@ ROM_START( mazan )
NAOMI_DEFAULT_EEPROM
ROM_REGION( 0x10000000, "rom_board", ROMREGION_ERASEFF)
- ROM_LOAD( "maz1fl1.2d", 0x0000000, 0x0800000, CRC(620cdbb6) SHA1(95e9d0858e1d3060b3c1c41adfff0539185fb03d) )
+ ROM_LOAD( "maz1fl1.2d", 0x0000000, 0x0800000, CRC(620cdbb6) SHA1(95e9d0858e1d3060b3c1c41adfff0539185fb03d) )
ROM_RELOAD( 0x800000, 0x800000 )
- ROM_LOAD( "maz1ma1.4m", 0x1000000, 0x1000000, CRC(68e12189) SHA1(5a434bd0305189620a62c785c5ac2812dae033d6) )
- ROM_LOAD( "maz1ma2.4l", 0x2000000, 0x1000000, CRC(c7a05b44) SHA1(dfbeb3be5adfdf3d4f1d330f3654a5532eb28cc2) )
- ROM_LOAD( "maz1ma3.4k", 0x3000000, 0x1000000, CRC(48e1a8a5) SHA1(8b0d83c02ab576d90c95aad297c7447326154c0e) )
- ROM_LOAD( "maz1ma4.4j", 0x4000000, 0x1000000, CRC(0187cdab) SHA1(aaa9fd208103426eb0eee58ae0a64a191abcd126) )
- ROM_LOAD( "maz1ma5.4h", 0x5000000, 0x1000000, CRC(c6885ee7) SHA1(14e7e017438adcbe0136d7d863af95fe65bd15d8) )
- ROM_LOAD( "maz1ma6.4f", 0x6000000, 0x1000000, CRC(a6593c36) SHA1(627bf19d960037ea92b673b786a9da7208acd447) )
- ROM_LOAD( "maz1ma7.4e", 0x7000000, 0x1000000, CRC(6103ad9c) SHA1(e4abbb5867cae6a9bf9067ab3a091ef7b18fa0cd) )
- ROM_LOAD( "maz1ma8.4d", 0x8000000, 0x1000000, CRC(d46c9f40) SHA1(45eec7fa3d4261f12438e841254fa75d572331b3) )
+ ROM_LOAD( "maz1ma1.4m", 0x1000000, 0x1000000, CRC(68e12189) SHA1(5a434bd0305189620a62c785c5ac2812dae033d6) )
+ ROM_LOAD( "maz1ma2.4l", 0x2000000, 0x1000000, CRC(c7a05b44) SHA1(dfbeb3be5adfdf3d4f1d330f3654a5532eb28cc2) )
+ ROM_LOAD( "maz1ma3.4k", 0x3000000, 0x1000000, CRC(48e1a8a5) SHA1(8b0d83c02ab576d90c95aad297c7447326154c0e) )
+ ROM_LOAD( "maz1ma4.4j", 0x4000000, 0x1000000, CRC(0187cdab) SHA1(aaa9fd208103426eb0eee58ae0a64a191abcd126) )
+ ROM_LOAD( "maz1ma5.4h", 0x5000000, 0x1000000, CRC(c6885ee7) SHA1(14e7e017438adcbe0136d7d863af95fe65bd15d8) )
+ ROM_LOAD( "maz1ma6.4f", 0x6000000, 0x1000000, CRC(a6593c36) SHA1(627bf19d960037ea92b673b786a9da7208acd447) )
+ ROM_LOAD( "maz1ma7.4e", 0x7000000, 0x1000000, CRC(6103ad9c) SHA1(e4abbb5867cae6a9bf9067ab3a091ef7b18fa0cd) )
+ ROM_LOAD( "maz1ma8.4d", 0x8000000, 0x1000000, CRC(d46c9f40) SHA1(45eec7fa3d4261f12438e841254fa75d572331b3) )
ROM_REGION( 4, "rom_key", 0 )
- ROM_LOAD( "maz1-key.bin", 0x000000, 0x000004, CRC(79ebd41a) SHA1(3545dacdeac66b46e8706565f0eca784291040d1) )
+ ROM_LOAD( "maz1-key.bin", 0x000000, 0x000004, CRC(79ebd41a) SHA1(3545dacdeac66b46e8706565f0eca784291040d1) )
ROM_END
ROM_START( vtenis2c )
@@ -7907,7 +7907,7 @@ ROM_END
/* 25349801 */ GAME( 2000, toukon4, naomi, naomim2, naomi, naomi, ROT0, "Capcom / Namco", "Shin Nihon Pro Wrestling Toukon Retsuden 4 Arcade Edition (TRF1 Ver. A)", GAME_UNEMULATED_PROTECTION|GAME_FLAGS )
// 25469801 Ninja Assault
/* 25709801 */ GAME( 2001, gunsur2, naomi, naomi, naomi, naomi, ROT0, "Capcom / Namco", "Gun Survivor 2 Biohazard Code: Veronica (BHF1 Ver. A)", GAME_UNEMULATED_PROTECTION|GAME_FLAGS )
-/* 25869812 */ GAME( 2002, mazan, naomi, naomim2, naomi, naomi, ROT0, "Capcom / Namco", "Mazan: Flash of the Blade (MAZ1 Ver. A)", GAME_UNEMULATED_PROTECTION|GAME_FLAGS )
+/* 25869812 */ GAME( 2002, mazan, naomi, naomim2, naomi, naomi, ROT0, "Capcom / Namco", "Mazan: Flash of the Blade (MAZ1 Ver. A)", GAME_UNEMULATED_PROTECTION|GAME_FLAGS )
/* GDS-xxxx (Sega GD-ROM games) */
/* 0001 */ GAME( 2000, confmiss, naomigd, naomigd, hotd2, naomigd, ROT0, "Sega", "Confidential Mission (GDS-0001)", GAME_FLAGS )
diff --git a/src/mame/drivers/neodrvr.c b/src/mame/drivers/neodrvr.c
index 7d0b6adc10d..d544c9123eb 100644
--- a/src/mame/drivers/neodrvr.c
+++ b/src/mame/drivers/neodrvr.c
@@ -427,8 +427,8 @@
-- SNKPLAYMORE --
. NEO-MVS CHAFIO (2003.7.24) - used only with NEO-CMC 90G06C7050
- -- SNK development boards --
- . NEO-MVS CHAMC2
+ -- SNK development boards --
+ . NEO-MVS CHAMC2
MVS PROG:
-- SNK --
@@ -463,8 +463,8 @@
. NEO-MVS PROGBK3S (2003.10.1)
. NEO-MVS PROGBK2S (2003.10.18)
- -- SNK development boards --
- . NEO-MVS PROGMC2
+ -- SNK development boards --
+ . NEO-MVS PROGMC2
AES CHA:
diff --git a/src/mame/drivers/popobear.c b/src/mame/drivers/popobear.c
index 039e44d2d52..5d8f4846a22 100644
--- a/src/mame/drivers/popobear.c
+++ b/src/mame/drivers/popobear.c
@@ -1,17 +1,17 @@
/*******************************************************************************************
- Popo Bear (c) 2000 BMC
+ Popo Bear (c) 2000 BMC
- preliminary driver by Angelo Salese
+ preliminary driver by Angelo Salese
- TODO:
- - auto-animation speed is erratic (way too fast);
- - sprites;
- - tilemap effects (scrolling, colscroll, linescroll);
- - BGM seems quite off, YM2413 core bug?
- - I/Os;
- - IRQ generation;
- - Port 0x620000 is quite a mystery, some silly protection?
+ TODO:
+ - auto-animation speed is erratic (way too fast);
+ - sprites;
+ - tilemap effects (scrolling, colscroll, linescroll);
+ - BGM seems quite off, YM2413 core bug?
+ - I/Os;
+ - IRQ generation;
+ - Port 0x620000 is quite a mystery, some silly protection?
============================================================================================
Popo Bear - BMC-A00211
@@ -106,8 +106,8 @@ static void draw_layer(running_machine &machine, bitmap_ind16 &bitmap,const rect
const UINT8 vreg_base[] = { 0x10/2, 0x14/2 };
int xscroll,yscroll;
-// count = (state->m_vregs[vreg_base[layer_n]]<<5);
-// count &= 0xfc000;
+// count = (state->m_vregs[vreg_base[layer_n]]<<5);
+// count &= 0xfc000;
count = (0xf0000+layer_n*0x4000);
if(layer_n & 2)
{
@@ -153,7 +153,7 @@ static void draw_layer(running_machine &machine, bitmap_ind16 &bitmap,const rect
bitmap.pix16(yoffs+512, xoffs+1) = machine.pens[color];
//if(cliprect.contains(xoffs+1, yoffs+256) && color)
- // bitmap.pix16(yoffs+512, xoffs+1) = machine.pens[color];
+ // bitmap.pix16(yoffs+512, xoffs+1) = machine.pens[color];
color = (vram[((xi+1+yi*1024)+xtile+ytile) & 0xfffff] & 0xff);
@@ -188,14 +188,14 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,const re
#endif
/*
- ???? ---- ---- ---- unused?
- ---- xxxx ---- ---- priority?
- ---- ---- x--- ---- Y direction
- ---- ---- -x-- ---- X direction
- ---- ---- --xx ---- width
- ---- ---- ---- xx-- color bank
- ---- ---- ---- --xx height?
- */
+ ???? ---- ---- ---- unused?
+ ---- xxxx ---- ---- priority?
+ ---- ---- x--- ---- Y direction
+ ---- ---- -x-- ---- X direction
+ ---- ---- --xx ---- width
+ ---- ---- ---- xx-- color bank
+ ---- ---- ---- --xx height?
+ */
/* 0x106 = 8 x 8 */
/* 0x*29 = 32 x 32 */
@@ -218,7 +218,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,const re
continue;
//if(param & bank_test)
- // continue;
+ // continue;
spr_num <<= 3;
@@ -251,7 +251,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,const re
SCREEN_UPDATE_IND16( popobear )
{
-// popobear_state *state = screen.machine().driver_data<popobear_state>();
+// popobear_state *state = screen.machine().driver_data<popobear_state>();
bitmap.fill(0, cliprect);
@@ -295,9 +295,9 @@ static ADDRESS_MAP_START( popobear_mem, AS_PROGRAM, 16 )
AM_RANGE(0x480000, 0x48001f) AM_RAM AM_BASE_MEMBER(popobear_state, m_vregs)
AM_RANGE(0x480020, 0x480023) AM_RAM
AM_RANGE(0x480028, 0x48002d) AM_RAM
-// AM_RANGE(0x480020, 0x480021) AM_NOP //AM_READ(popo_480020_r) AM_WRITE(popo_480020_w)
-// AM_RANGE(0x480028, 0x480029) AM_NOP //AM_WRITE(popo_480028_w)
-// AM_RANGE(0x48002c, 0x48002d) AM_NOP //AM_WRITE(popo_48002c_w)
+// AM_RANGE(0x480020, 0x480021) AM_NOP //AM_READ(popo_480020_r) AM_WRITE(popo_480020_w)
+// AM_RANGE(0x480028, 0x480029) AM_NOP //AM_WRITE(popo_480028_w)
+// AM_RANGE(0x48002c, 0x48002d) AM_NOP //AM_WRITE(popo_48002c_w)
AM_RANGE(0x480030, 0x480031) AM_WRITE8(popobear_irq_ack_w, 0x00ff)
AM_RANGE(0x480034, 0x480035) AM_RAM // coin counter or coin lockout
AM_RANGE(0x48003a, 0x48003b) AM_RAM //AM_READ(popo_48003a_r) AM_WRITE(popo_48003a_w)
@@ -461,7 +461,7 @@ static MACHINE_CONFIG_START( popobear, popobear_state )
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */
MCFG_SCREEN_UPDATE_STATIC(popobear)
-// MCFG_GFXDECODE(popobear)
+// MCFG_GFXDECODE(popobear)
MCFG_SCREEN_SIZE(128*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 32*8-1)
diff --git a/src/mame/drivers/pyson.c b/src/mame/drivers/pyson.c
index d941eb8b8b7..ab6df7d5be9 100644
--- a/src/mame/drivers/pyson.c
+++ b/src/mame/drivers/pyson.c
@@ -3,19 +3,19 @@
Konami Pyson Hardware Overview
Konami 2001-2005
-This system uses a standard GH-006 PS2 main board (the older Playstation 2 square type) with a
-Sony-supplied PS2 power supply which bolts onto the top of the main board. This power supply
-has a single 12 volt power input and creates all of the voltages for the PS2. The same 12 volt input
-extends via a splitter to the Konami interface PCB into CN3. The PS2 main board is connected to the
-custom Konami interface PCB via the PS2 main board AV connector and the IEEE 1394 'i.LINK' connector.
+This system uses a standard GH-006 PS2 main board (the older Playstation 2 square type) with a
+Sony-supplied PS2 power supply which bolts onto the top of the main board. This power supply
+has a single 12 volt power input and creates all of the voltages for the PS2. The same 12 volt input
+extends via a splitter to the Konami interface PCB into CN3. The PS2 main board is connected to the
+custom Konami interface PCB via the PS2 main board AV connector and the IEEE 1394 'i.LINK' connector.
A security dongle with no label on the top which looks like a PS2 memory card is plugged into the left
PS2 memory card slot. This card is identical to the dongles used in Namco System 246/256. Note that the
-two games dumped so far have the same label on the security dongle (KN00002) but the ROM inside is not
-identical. So far all the Konami game software resides on a 128M CF card. However there are probably
+two games dumped so far have the same label on the security dongle (KN00002) but the ROM inside is not
+identical. So far all the Konami game software resides on a 128M CF card. However there are probably
HDD/CDROM/DVDROM-based games too since the Konami interface board has connectors for IDE drives.
Games known to run on this system include.... DIN5
- CF Card Dongle PS2 Cart
+ CF Card Dongle PS2 Cart
Game Title Label Label Label (bottom)
---------------------------------------------------------------------------------------------------------
*Baseball Heroes 2005
@@ -30,12 +30,12 @@ Game Title Label Label
*Paintball Mania
*Perfect Pool
*Pool Pocket Fortunes
-*R.P.M. Red
+*R.P.M. Red
World Soccer Winning Eleven Arcade Game Style C18JAA03 DIN5 dongle GCC27JA KN00002
World Soccer Winning Eleven Arcade Game Style 2003 C27JAA03 not used KN00002
---------------------------------------------------------------------------------------------------------
-* denotes not dumped. If you can help with the remaining undumped games
+* denotes not dumped. If you can help with the remaining undumped games
please contact us via http://mamedev.org or http://guru.mameworld.info
@@ -90,12 +90,12 @@ Notes:
TMPR3927 - Toshiba TMPR3927 32-bit R3000A-based RISC micro-controller (QFP240)
48LC2M32B2 - Micron 48LC2M32B2 512k x32-bit x4-banks (64MBit) SDRAM (TSOP86)
XC9536 - Xilinx XC9536XL CPLD stamped 'QB22A1' (PLCC44)
- B22A01.U42 - Fujitsu MBM29F400 512k x8-bit flash ROM stamped 'B22A01' (TSOP48). This is probably
+ B22A01.U42 - Fujitsu MBM29F400 512k x8-bit flash ROM stamped 'B22A01' (TSOP48). This is probably
the common-to-all-games Pyson BIOS for the TMPR3927
XCS10XL - Xilinx Spartan XCS10XL FPGA (TQFP144)
M48T58Y - ST Microelectronics M48T58Y 8k Timekeeper/NVRAM (DIP28). As well as being used for protection
- with the Konami game code/year etc (the usual first 16 bytes) it also seems to contain code
- or other data in some of the games, meaning it's not possible to hand-create the NVRAMs.
+ with the Konami game code/year etc (the usual first 16 bytes) it also seems to contain code
+ or other data in some of the games, meaning it's not possible to hand-create the NVRAMs.
The same 'extended usage' of this chip is also present on Konami Viper PCBs.
DS2430 - Dallas DS2430 256-bit EEPROM and silicon serial number (3 pin TO-92 package)
CN2 - RJ45 network connector
@@ -107,13 +107,13 @@ Notes:
CN15 - 28 way edge connector which connects to the filter board along with the JAMMA edge connector
CN16 - 40 pin standard IDE connector (for CDROM/DVDROM or 3.5" IDE HDD)
CN17 - 44 pin standard IDE connector (for 2.5" IDE HDD)
- CN19 - DIN5 connector for plug-in security module. The module contains a Dallas DS2430 which
+ CN19 - DIN5 connector for plug-in security module. The module contains a Dallas DS2430 which
effectively replaces the common-to-most-games one on the main board (same a Viper h/w)
CN20 - 4 pin connector
CN21 - Standard Compact Flash card slot
SW4 - 4 position DIP switch
-
-
+
+
Filter Board
------------
@@ -133,7 +133,7 @@ PWB0000121667 2002 KONAMI
|-------------------------------------------------------------------------|
Notes:
CN4 - 8-pin mini-DIN connector
- CN5/7 - 15-pin VGA connectors
+ CN5/7 - 15-pin VGA connectors
CN14 - Standard USB connector. This connects to a standard JVS I/O board. It was tested with
a common Sega JVS I/O and works fine however Konami probably have their own JVS I/O board
for use with this system
diff --git a/src/mame/drivers/seibuspi.c b/src/mame/drivers/seibuspi.c
index 81ba2a20f34..fd06435000a 100644
--- a/src/mame/drivers/seibuspi.c
+++ b/src/mame/drivers/seibuspi.c
@@ -3402,10 +3402,10 @@ ROM_END
ROM_START( rfjett ) /* SPI Cart, Taiwan */
ROM_REGION32_LE(0x200000, "user1", 0) /* i386 program */
- ROM_LOAD32_BYTE( "prg0.u0211", 0x000000, 0x080000, CRC(a4734579) SHA1(dfbd8e2a3178c7cfd7bd3698999f14bc80f5212f) )
- ROM_LOAD32_BYTE( "prg1.u0212", 0x000001, 0x080000, CRC(5e4ad3a4) SHA1(ff66e16f48978b88b298c78e21309208ccb3ff15) )
- ROM_LOAD32_BYTE( "prg2.u0221", 0x000002, 0x080000, CRC(21c9942e) SHA1(ededa05a4b5dae2dec5c4409f22e9a66d2c8e98e) )
- ROM_LOAD32_BYTE( "prg3.u0220", 0x000003, 0x080000, CRC(ea3657f4) SHA1(2291e31243af7d2e79ae727d9b5484e8d49cc7d9) )
+ ROM_LOAD32_BYTE( "prg0.u0211", 0x000000, 0x080000, CRC(a4734579) SHA1(dfbd8e2a3178c7cfd7bd3698999f14bc80f5212f) )
+ ROM_LOAD32_BYTE( "prg1.u0212", 0x000001, 0x080000, CRC(5e4ad3a4) SHA1(ff66e16f48978b88b298c78e21309208ccb3ff15) )
+ ROM_LOAD32_BYTE( "prg2.u0221", 0x000002, 0x080000, CRC(21c9942e) SHA1(ededa05a4b5dae2dec5c4409f22e9a66d2c8e98e) )
+ ROM_LOAD32_BYTE( "prg3.u0220", 0x000003, 0x080000, CRC(ea3657f4) SHA1(2291e31243af7d2e79ae727d9b5484e8d49cc7d9) )
ROM_REGION( 0x30000, "gfx1", ROMREGION_ERASEFF)
ROM_LOAD24_BYTE("fix0.u0524", 0x000001, 0x10000, CRC(8bc080be) SHA1(ad296fb98242c963072346a8de289e704b445ad4) )
diff --git a/src/mame/drivers/taitotz.c b/src/mame/drivers/taitotz.c
index c2958103659..9b3ac858329 100644
--- a/src/mame/drivers/taitotz.c
+++ b/src/mame/drivers/taitotz.c
@@ -520,8 +520,8 @@ ROM_START( pwrshovl )
TAITOTZ_BIOS
ROM_REGION( 0x40000, "io_cpu", 0 )
- ROM_LOAD16_BYTE( "e74-04.ic14", 0x000000, 0x020000, CRC(ef21a261) SHA1(7398826dbf48014b9c7e9454f978f3e419ebc64b) )
- ROM_LOAD16_BYTE( "e74-05.ic15", 0x000001, 0x020000, CRC(2466217d) SHA1(dc814da3a1679cff001f179d3c1641af985a6490) )
+ ROM_LOAD16_BYTE( "e74-04.ic14", 0x000000, 0x020000, CRC(ef21a261) SHA1(7398826dbf48014b9c7e9454f978f3e419ebc64b) )
+ ROM_LOAD16_BYTE( "e74-05.ic15", 0x000001, 0x020000, CRC(2466217d) SHA1(dc814da3a1679cff001f179d3c1641af985a6490) )
ROM_REGION( 0x10000, "sound_cpu", 0 ) /* Internal ROM :( */
ROM_LOAD( "e68-01.ic7", 0x000000, 0x010000, NO_DUMP )
diff --git a/src/mame/drivers/tnzs.c b/src/mame/drivers/tnzs.c
index 0b1e8eac923..1149355bec7 100644
--- a/src/mame/drivers/tnzs.c
+++ b/src/mame/drivers/tnzs.c
@@ -2138,7 +2138,7 @@ ROM_END
ROM_START( arknoid2b )
ROM_REGION( 0x30000, "maincpu", 0 ) /* Region 0 - main cpu */
- ROM_LOAD( "boot.11c", 0x00000, 0x08000, CRC(3847dfb0) SHA1(993c8af3df7a4d5a2523f0e31a6df1c07ba13c7d) )
+ ROM_LOAD( "boot.11c", 0x00000, 0x08000, CRC(3847dfb0) SHA1(993c8af3df7a4d5a2523f0e31a6df1c07ba13c7d) )
ROM_CONTINUE( 0x18000, 0x08000 ) /* banked at 8000-bfff */
/* 20000-2ffff empty */
diff --git a/src/mame/drivers/undrfire.c b/src/mame/drivers/undrfire.c
index 38b3bb247ed..48ffb994819 100644
--- a/src/mame/drivers/undrfire.c
+++ b/src/mame/drivers/undrfire.c
@@ -457,7 +457,7 @@ static WRITE32_HANDLER( cbombers_cpua_ctrl_w )
output_set_value("Lamp_5", (data >> 4) & 1 );
output_set_value("Lamp_6", (data >> 5) & 1 );
output_set_value("Wheel_vibration", (data >> 6) & 1 );
-
+
cputag_set_input_line(space->machine(), "sub", INPUT_LINE_RESET, (data & 0x1000) ? CLEAR_LINE : ASSERT_LINE);
}
diff --git a/src/mame/includes/actfancr.h b/src/mame/includes/actfancr.h
index 0460d7f25e4..ec812854645 100644
--- a/src/mame/includes/actfancr.h
+++ b/src/mame/includes/actfancr.h
@@ -15,7 +15,7 @@ public:
UINT16 m_spriteram16[0x800/2]; // a 16-bit copy of spriteram for use with the MXC06 code
/* video-related */
- int m_flipscreen;
+ int m_flipscreen;
/* misc */
int m_trio_control_select;
diff --git a/src/mame/includes/armedf.h b/src/mame/includes/armedf.h
index 650f36e6d34..9c85a4d7a7c 100644
--- a/src/mame/includes/armedf.h
+++ b/src/mame/includes/armedf.h
@@ -29,7 +29,7 @@ public:
int m_sprite_offy;
int m_old_mcu_mode;
int m_waiting_msb;
-
+
required_device<buffered_spriteram16_device> m_spriteram;
};
diff --git a/src/mame/includes/bbusters.h b/src/mame/includes/bbusters.h
index 54feb5aa4cc..83068115943 100644
--- a/src/mame/includes/bbusters.h
+++ b/src/mame/includes/bbusters.h
@@ -25,7 +25,7 @@ public:
UINT16 *m_pf2_data;
UINT16 *m_pf1_scroll_data;
UINT16 *m_pf2_scroll_data;
-
+
required_device<buffered_spriteram16_device> m_spriteram;
optional_device<buffered_spriteram16_device> m_spriteram2;
};
diff --git a/src/mame/includes/bionicc.h b/src/mame/includes/bionicc.h
index c6736ecd4f8..cbba0345614 100644
--- a/src/mame/includes/bionicc.h
+++ b/src/mame/includes/bionicc.h
@@ -27,7 +27,7 @@ public:
UINT16 m_inp[3];
UINT16 m_soundcommand;
-
+
required_device<buffered_spriteram16_device> m_spriteram;
};
diff --git a/src/mame/includes/exedexes.h b/src/mame/includes/exedexes.h
index 60d346ea9d6..596dfa6cd00 100644
--- a/src/mame/includes/exedexes.h
+++ b/src/mame/includes/exedexes.h
@@ -28,7 +28,7 @@ public:
int m_objon;
int m_sc1on;
int m_sc2on;
-
+
required_device<buffered_spriteram8_device> m_spriteram;
};
diff --git a/src/mame/includes/galaga.h b/src/mame/includes/galaga.h
index 32b9680179d..edee6e21fc5 100644
--- a/src/mame/includes/galaga.h
+++ b/src/mame/includes/galaga.h
@@ -65,7 +65,7 @@ public:
UINT8 *m_bosco_radarx;
UINT8 *m_bosco_radary;
-
+
UINT8 *m_spriteram;
UINT8 *m_spriteram2;
UINT32 m_spriteram_size;
diff --git a/src/mame/includes/gng.h b/src/mame/includes/gng.h
index 58f617afdad..548350d403c 100644
--- a/src/mame/includes/gng.h
+++ b/src/mame/includes/gng.h
@@ -24,7 +24,7 @@ public:
tilemap_t *m_fg_tilemap;
UINT8 m_scrollx[2];
UINT8 m_scrolly[2];
-
+
required_device<buffered_spriteram8_device> m_spriteram;
};
diff --git a/src/mame/includes/gottlieb.h b/src/mame/includes/gottlieb.h
index 414382fb0c2..cc4f23c0ed9 100644
--- a/src/mame/includes/gottlieb.h
+++ b/src/mame/includes/gottlieb.h
@@ -62,7 +62,7 @@ extern const device_type GOTTLIEB_SOUND_REV2;
// ======================> gottlieb_sound_r1_device
// rev 1 sound board, with unpopulated VOTRAX
-class gottlieb_sound_r1_device : public device_t,
+class gottlieb_sound_r1_device : public device_t,
public device_mixer_interface
{
public:
@@ -72,7 +72,7 @@ public:
// read/write
DECLARE_WRITE8_MEMBER( write );
-
+
// internal communications
DECLARE_WRITE_LINE_MEMBER( snd_interrupt );
DECLARE_WRITE8_MEMBER( r6532_portb_w );
@@ -88,14 +88,14 @@ protected:
private:
// devices
- required_device<m6502_device> m_audiocpu;
- required_device<riot6532_device> m_riot;
+ required_device<m6502_device> m_audiocpu;
+ required_device<riot6532_device> m_riot;
required_device<dac_device> m_dac;
optional_device<votrax_sc01_device> m_votrax;
// internal state
bool m_populate_votrax;
- UINT8 m_last_speech_clock;
+ UINT8 m_last_speech_clock;
#if USE_FAKE_VOTRAX
protected:
@@ -128,7 +128,7 @@ protected:
// ======================> gottlieb_sound_r2_device
// fully populated rev 2 sound board
-class gottlieb_sound_r2_device : public device_t,
+class gottlieb_sound_r2_device : public device_t,
public device_mixer_interface
{
public:
@@ -140,7 +140,7 @@ public:
// read/write
DECLARE_WRITE8_MEMBER( write );
-
+
// internal communications
DECLARE_READ8_MEMBER( speech_data_r );
DECLARE_READ8_MEMBER( audio_data_r );
@@ -171,27 +171,27 @@ private:
TID_NMI_CLEAR,
TID_SOUND_LATCH_WRITE
};
-
+
// devices
- required_device<m6502_device> m_audiocpu;
- required_device<m6502_device> m_speechcpu;
+ required_device<m6502_device> m_audiocpu;
+ required_device<m6502_device> m_speechcpu;
required_device<dac_device> m_dac;
- required_device<ay8913_device> m_ay1;
- required_device<ay8913_device> m_ay2;
- optional_device<sp0250_device> m_sp0250;
+ required_device<ay8913_device> m_ay1;
+ required_device<ay8913_device> m_ay2;
+ optional_device<sp0250_device> m_sp0250;
// internal state
bool m_cobram3_mod;
emu_timer * m_nmi_timer;
- UINT8 m_nmi_rate;
- UINT8 m_nmi_state;
+ UINT8 m_nmi_rate;
+ UINT8 m_nmi_state;
UINT8 m_audiocpu_latch;
UINT8 m_speechcpu_latch;
- UINT8 m_speech_control;
- UINT8 m_last_command;
- UINT8 m_dac_data[2];
+ UINT8 m_speech_control;
+ UINT8 m_last_command;
+ UINT8 m_dac_data[2];
UINT8 m_psg_latch;
- UINT8 m_psg_data_latch;
+ UINT8 m_psg_data_latch;
UINT8 m_sp0250_latch;
};
diff --git a/src/mame/includes/hcastle.h b/src/mame/includes/hcastle.h
index 6b6b15c22bb..67a29bb9881 100644
--- a/src/mame/includes/hcastle.h
+++ b/src/mame/includes/hcastle.h
@@ -32,7 +32,7 @@ public:
device_t *m_audiocpu;
device_t *m_k007121_1;
device_t *m_k007121_2;
-
+
required_device<buffered_spriteram8_device> m_spriteram;
required_device<buffered_spriteram8_device> m_spriteram2;
};
diff --git a/src/mame/includes/lwings.h b/src/mame/includes/lwings.h
index 515594b2455..00839ee8228 100644
--- a/src/mame/includes/lwings.h
+++ b/src/mame/includes/lwings.h
@@ -29,7 +29,7 @@ public:
UINT8 m_soundstate;
UINT8 m_adpcm;
UINT8 m_nmi_mask;
-
+
required_device<buffered_spriteram8_device> m_spriteram;
};
diff --git a/src/mame/includes/m92.h b/src/mame/includes/m92.h
index 0ee562fefd2..97c4ffe76b1 100644
--- a/src/mame/includes/m92.h
+++ b/src/mame/includes/m92.h
@@ -33,7 +33,7 @@ public:
UINT16 m_pf_master_control[4];
INT32 m_sprite_list;
UINT8 m_palette_bank;
-
+
required_device<buffered_spriteram16_device> m_spriteram;
};
diff --git a/src/mame/includes/sidearms.h b/src/mame/includes/sidearms.h
index 5d46a6f77c3..320965727c9 100644
--- a/src/mame/includes/sidearms.h
+++ b/src/mame/includes/sidearms.h
@@ -27,7 +27,7 @@ public:
UINT32 m_hcount_191;
UINT32 m_vcount_191;
UINT32 m_latch_374;
-
+
required_device<buffered_spriteram8_device> m_spriteram;
};
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index 364a6b0dba0..007db3aa744 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -2356,7 +2356,7 @@ batlgear // E68 (c) 1999 Taito
pwrshovl // E74 (c) 1999 Taito
landhigh // E82 (c) 1999 Taito
batlgr2 // E87 (c) 2000 Taito (2.04J)
-batlgr2a // E87 (c) 2000 Taito (2.01J)
+batlgr2a // E87 (c) 2000 Taito (2.01J)
// Toaplan games
perfrman // (c) 1985 Data East Corporation (Japan)
@@ -11900,8 +11900,11 @@ sc1bartk
sc1barcd
sc1barcda
sc1bigmt
+sc1btclka
+sc1btclkb
sc1calyp
sc1carro
+sc1cdmp
sc1cshat
sc1cshata
sc1cshatb
@@ -11964,6 +11967,7 @@ sc1dblcha
sc1dream // Dream Machine (Bellfruit)
sc1final // Final Touch (Bellfruit)
sc1flash // Flash (Bellfruit)
+sc1frpusa
sc1fruit // Fruit Lines (Bellfruit)
sc1frtln // Fruitlines (Bellfruit)
sc1funh // Fun House Club (Bellfruit)
@@ -11975,6 +11979,7 @@ sc1tiara // Tiara (Elam)
sc1gprix // Grand Prix (Bellfruit)
sc1gslam // Grand Slam (Bellfruit) (Dutch)
sc1happy // Happy Hour (Bellfruit - Elam)
+sc1hfccp
sc1impc // Impact (Bellfruit)
sc1kings // Kings Club (Bellfruit)
sc1linx // Linx (Bellfruit)