summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--src/emu/cpu/t11/t11ops.c20
-rw-r--r--src/emu/machine/68681.c28
-rw-r--r--src/emu/machine/microtch.c12
-rw-r--r--src/emu/sound/2203intf.c4
-rw-r--r--src/emu/sound/2608intf.c4
-rw-r--r--src/emu/sound/2610intf.c8
-rw-r--r--src/emu/sound/ay8910.c130
-rw-r--r--src/mame/drivers/aerofgt.c2
-rw-r--r--src/mame/drivers/changela.c4
-rw-r--r--src/mame/drivers/cps1.c2
-rw-r--r--src/mame/drivers/funworld.c14
-rw-r--r--src/mame/drivers/galaxian.c14
-rw-r--r--src/mame/drivers/gng.c4
-rw-r--r--src/mame/drivers/gyruss.c6
-rw-r--r--src/mame/drivers/igs_180.c6
-rw-r--r--src/mame/drivers/mosaic.c2
-rw-r--r--src/mame/drivers/pushman.c2
-rw-r--r--src/mame/drivers/snookr10.c10
-rw-r--r--src/mame/drivers/tmaster.c4
-rw-r--r--src/mame/video/aerofgt.c2
-rw-r--r--src/mame/video/cps1.c28
-rw-r--r--src/mame/video/popper.c12
-rw-r--r--src/osd/windows/winmain.c4
23 files changed, 161 insertions, 161 deletions
diff --git a/src/emu/cpu/t11/t11ops.c b/src/emu/cpu/t11/t11ops.c
index 80af765ac1f..4d6d850e7b3 100644
--- a/src/emu/cpu/t11/t11ops.c
+++ b/src/emu/cpu/t11/t11ops.c
@@ -268,13 +268,13 @@ static void op_0000(void)
static void halt(void)
{
- t11_ICount -= 48;
- PUSH(PSW);
- PUSH(PC);
- PC = RWORD(0x04);
- PSW = RWORD(0x06);
- change_pc(PC);
- t11_check_irqs();
+ t11_ICount -= 48;
+ PUSH(PSW);
+ PUSH(PC);
+ PC = RWORD(0x04);
+ PSW = RWORD(0x06);
+ change_pc(PC);
+ t11_check_irqs();
}
static void illegal(void)
@@ -291,11 +291,11 @@ static void illegal(void)
static void mark(void)
{
t11_ICount -= 36;
-
+
SP = SP + 2 * (t11.op & 0x3f);
PC = REGW(5);
- REGW(5) = POP();
-
+ REGW(5) = POP();
+
change_pc(PC);
}
diff --git a/src/emu/machine/68681.c b/src/emu/machine/68681.c
index 897c8845730..e6a318bf0e0 100644
--- a/src/emu/machine/68681.c
+++ b/src/emu/machine/68681.c
@@ -1,19 +1,19 @@
/*
- 68681 DUART
+ 68681 DUART
- Written by Mariusz Wojcieszek
+ Written by Mariusz Wojcieszek
- Emulation is preliminary, only features required by Touch Master games are implemented
+ Emulation is preliminary, only features required by Touch Master games are implemented
- ToDo:
- - interrupts other than RXRDY
- - timer/counter
- - input port
- - input port change
- - output port
- - output port when used as control signals
- - MAME device interface
- - multiple instances
+ ToDo:
+ - interrupts other than RXRDY
+ - timer/counter
+ - input port
+ - input port change
+ - output port
+ - output port when used as control signals
+ - MAME device interface
+ - multiple instances
*/
#include "driver.h"
@@ -336,7 +336,7 @@ WRITE16_HANDLER(duart_68681_w)
break;
case 0x04: /* ACR */
duart_68681.ACR = data;
- // TODO:
+ // TODO:
// bits 6-4: Counter/Timer Mode And Clock Source Select
// bits 3-0: IP3-0 Change-Of-State Interrupt Enable
duart_68681_write_CSR(0, duart_68681.channel[0].CSR, data);
@@ -368,7 +368,7 @@ WRITE16_HANDLER(duart_68681_w)
// TODO: bits set to 1 causes corresponding output port bit to be set to 0
break;
case 0x0f: /* Reset Output Port Bits */
- // TODO: bits set to 1 causes corresponding output port bit to be set to 1
+ // TODO: bits set to 1 causes corresponding output port bit to be set to 1
break;
default:
logerror( "Writing 68681 reg %x with %04x\n", offset, data );
diff --git a/src/emu/machine/microtch.c b/src/emu/machine/microtch.c
index e2efc101028..a6e407afd25 100644
--- a/src/emu/machine/microtch.c
+++ b/src/emu/machine/microtch.c
@@ -1,11 +1,11 @@
/*
- Microtouch touch screen controller
+ Microtouch touch screen controller
- Written by Mariusz Wojcieszek
+ Written by Mariusz Wojcieszek
- Notes/ToDo:
- - calibration mode (command CX)
- - only tablet format is supported for returning touch screen state
+ Notes/ToDo:
+ - calibration mode (command CX)
+ - only tablet format is supported for returning touch screen state
*/
@@ -144,7 +144,7 @@ void microtouch_rx(int count, UINT8* data)
microtouch.rx_buffer[i+microtouch.rx_buffer_ptr] = data[i];
microtouch.rx_buffer_ptr++;
}
-
+
if (microtouch.rx_buffer_ptr > 0 && (microtouch.rx_buffer[microtouch.rx_buffer_ptr-1] == 0x0d))
{
// check command
diff --git a/src/emu/sound/2203intf.c b/src/emu/sound/2203intf.c
index 74061b958da..45c03438c32 100644
--- a/src/emu/sound/2203intf.c
+++ b/src/emu/sound/2203intf.c
@@ -107,9 +107,9 @@ static STATE_POSTLOAD( ym2203_postload )
static void *ym2203_start(int sndindex, int clock, const void *config)
{
- static const struct YM2203interface generic_2203 =
+ static const struct YM2203interface generic_2203 =
{
- {
+ {
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
NULL, NULL, NULL, NULL
diff --git a/src/emu/sound/2608intf.c b/src/emu/sound/2608intf.c
index 36353700f22..f574590b189 100644
--- a/src/emu/sound/2608intf.c
+++ b/src/emu/sound/2608intf.c
@@ -120,9 +120,9 @@ static STATE_POSTLOAD( ym2608_postload )
static void *ym2608_start(int sndindex, int clock, const void *config)
{
- static const struct YM2608interface generic_2608 =
+ static const struct YM2608interface generic_2608 =
{
- {
+ {
AY8910_LEGACY_OUTPUT | AY8910_SINGLE_OUTPUT,
AY8910_DEFAULT_LOADS,
NULL, NULL, NULL, NULL
diff --git a/src/emu/sound/2610intf.c b/src/emu/sound/2610intf.c
index c6e10dc3c19..ccf6da883f3 100644
--- a/src/emu/sound/2610intf.c
+++ b/src/emu/sound/2610intf.c
@@ -123,8 +123,8 @@ static STATE_POSTLOAD( ym2610_postload )
static void *ym2610_start(int sndindex, int clock, const void *config)
{
static const struct YM2610interface generic_2610 = { 0 };
- static const struct AY8910interface generic_ay8910 =
- {
+ static const struct AY8910interface generic_ay8910 =
+ {
AY8910_LEGACY_OUTPUT | AY8910_SINGLE_OUTPUT,
AY8910_DEFAULT_LOADS,
NULL, NULL, NULL, NULL
@@ -181,8 +181,8 @@ static void ym2610b_stream_update(void *param, stream_sample_t **inputs, stream_
static void *ym2610b_start(int sndindex, int clock, const void *config)
{
static const struct YM2610interface generic_2610 = { 0 };
- static const struct AY8910interface generic_ay8910 =
- {
+ static const struct AY8910interface generic_ay8910 =
+ {
AY8910_LEGACY_OUTPUT | AY8910_SINGLE_OUTPUT,
AY8910_DEFAULT_LOADS,
NULL, NULL, NULL, NULL
diff --git a/src/emu/sound/ay8910.c b/src/emu/sound/ay8910.c
index 0b21254bb54..1fa3ce8fc4f 100644
--- a/src/emu/sound/ay8910.c
+++ b/src/emu/sound/ay8910.c
@@ -7,41 +7,41 @@
Based on various code snippets by Ville Hallik, Michael Cuddy,
Tatsuyuki Satoh, Fabrice Frances, Nicola Salmoria.
-
+
Mostly rewritten by couriersud in 2008
-
+
TODO:
- * The AY8930 has an extended mode which is currently
+ * The AY8930 has an extended mode which is currently
not emulated.
* The YMZ284 only has one 1 output channel (mixed chan A,B,C).
This should be forced.
* YM2610 & YM2608 will need a separate flag in their config structures
to distinguish between legacy and discrete mode.
-
+
The rewrite also introduces a generic model for the DAC. This model is
not perfect, but allows channel mixing based on a parametrized approach.
- This model also allows to factor in different loads on individual channels.
+ This model also allows to factor in different loads on individual channels.
If a better model is developped in the future or better measurements are
available, the driver should be easy to change. The model is described
later.
-
+
In order to not break hundreds of existing drivers by default the flag
AY8910_LEGACY_OUTPUT is used by drivers not changed to take into account the
new model. All outputs are normalized to the old output range (i.e. 0 .. 7ffff).
In the case of channel mixing, output range is 0...3 * 7fff.
-
- The main difference between the AY-3-8910 and the YM2149 is, that the
- AY-3-8910 datasheet mentions, that fixed volume level 0, which is set by
+
+ The main difference between the AY-3-8910 and the YM2149 is, that the
+ AY-3-8910 datasheet mentions, that fixed volume level 0, which is set by
registers 8 to 10 is "channel off". The YM2149 mentions, that the generated
signal has a 2V DC component. This is confirmed by measurements. The approach
taken here is to assume the 2V DC offset for all outputs for the YM2149.
- For the AY-3-8910, an offset is used if envelope is active for a channel.
- This is backed by oscilloscope pictures from the datasheet. If a fixed volume
+ For the AY-3-8910, an offset is used if envelope is active for a channel.
+ This is backed by oscilloscope pictures from the datasheet. If a fixed volume
is set, i.e. enveloppe is disabled, the output voltage is set to 0V. Recordings
I found on the web for gyruss indicate, that the AY-3-8910 offset should
be around 1.5V. This will also make sound levels more compatible with
user descriptions.
-
+
The Model:
5V 5V
| |
@@ -148,7 +148,7 @@ struct AY8910
#define ENVELOPE_PERIOD(_psg) (((_psg)->regs[AY_EFINE] | ((_psg)->regs[AY_ECOARSE]<<8)))
-static ay_ym_param ym2149_param =
+static ay_ym_param ym2149_param =
{
630, 801,
16,
@@ -156,7 +156,7 @@ static ay_ym_param ym2149_param =
4763, 3521, 2403, 1737, 1123, 762, 438, 251 },
};
-static ay_ym_param ym2149_paramE =
+static ay_ym_param ym2149_paramE =
{
630, 801,
32,
@@ -168,7 +168,7 @@ static ay_ym_param ym2149_paramE =
#if 0
/* RL = 1000, Hacker Kay normalized, 2.1V to 3.2V */
-static ay_ym_param ay8910_param =
+static ay_ym_param ay8910_param =
{
664, 913,
16,
@@ -176,12 +176,12 @@ static ay_ym_param ay8910_param =
4120, 2512, 1737, 1335, 1005, 747, 586, 451 },
};
-/*
+/*
* RL = 3000, Hacker Kay normalized pattern, 1.5V to 2.8V
* These values correspond with guesses based on Gyruss schematics
* They work well with scramble as well.
*/
-static ay_ym_param ay8910_param =
+static ay_ym_param ay8910_param =
{
930, 454,
16,
@@ -189,12 +189,12 @@ static ay_ym_param ay8910_param =
4189, 2557, 1772, 1363, 1028, 766, 602, 464 },
};
-/*
+/*
* RL = 1000, Hacker Kay normalized pattern, 0.75V to 2.05V
* These values correspond with guesses based on Gyruss schematics
* They work well with scramble as well.
*/
-static ay_ym_param ay8910_param =
+static ay_ym_param ay8910_param =
{
1371, 313,
16,
@@ -203,10 +203,10 @@ static ay_ym_param ay8910_param =
};
#endif
-/*
+/*
* RL = 1000, Hacker Kay normalized pattern, 0.2V to 1.5V
*/
-static ay_ym_param ay8910_param =
+static ay_ym_param ay8910_param =
{
5806, 300,
16,
@@ -252,7 +252,7 @@ static void AY8910_write_reg(struct AY8910 *PSG, int r, int v)
if (PSG->intf->portAwrite)
(*PSG->intf->portAwrite)(Machine, 0, (PSG->regs[AY_ENABLE] & 0x40) ? PSG->regs[AY_PORTA] : 0xff);
}
-
+
if ((PSG->lastEnable == -1) ||
((PSG->lastEnable & 0x80) != (PSG->regs[AY_ENABLE] & 0x80)))
{
@@ -260,7 +260,7 @@ static void AY8910_write_reg(struct AY8910 *PSG, int r, int v)
if (PSG->intf->portBwrite)
(*PSG->intf->portBwrite)(Machine, 0, (PSG->regs[AY_ENABLE] & 0x80) ? PSG->regs[AY_PORTB] : 0xff);
}
-
+
PSG->lastEnable = PSG->regs[AY_ENABLE];
break;
case AY_AVOL:
@@ -274,20 +274,20 @@ static void AY8910_write_reg(struct AY8910 *PSG, int r, int v)
break;
case AY_ESHAPE:
/* envelope shapes:
- C AtAlH
- 0 0 x x \___
- 0 1 x x /___
- 1 0 0 0 \\\\
- 1 0 0 1 \___
- 1 0 1 0 \/\/
- 1 0 1 1 \¯¯¯
- 1 1 0 0 ////
- 1 1 0 1 /¯¯¯
- 1 1 1 0 /\/\
- 1 1 1 1 /___
- The envelope counter on the AY-3-8910 has 16 steps. On the YM2149 it
- has twice the steps, happening twice as fast.
- */
+ C AtAlH
+ 0 0 x x \___
+ 0 1 x x /___
+ 1 0 0 0 \\\\
+ 1 0 0 1 \___
+ 1 0 1 0 \/\/
+ 1 0 1 1 \??????
+ 1 1 0 0 ////
+ 1 1 0 1 /??????
+ 1 1 1 0 /\/\
+ 1 1 1 1 /___
+ The envelope counter on the AY-3-8910 has 16 steps. On the YM2149 it
+ has twice the steps, happening twice as fast.
+ */
PSG->Attack = (PSG->regs[AY_ESHAPE] & 0x04) ? PSG->EnvP : 0x00;
if ((PSG->regs[AY_ESHAPE] & 0x08) == 0)
{
@@ -379,7 +379,7 @@ static void AY8910_update(void *param,stream_sample_t **inputs, stream_sample_t
/* (ToneOn | ToneDisable) & (NoiseOn | NoiseDisable). */
/* Note that this means that if both tone and noise are disabled, the output */
/* is 1, not 0, and can be modulated changing the volume. */
-
+
/* buffering loop */
while (length)
{
@@ -411,7 +411,7 @@ static void AY8910_update(void *param,stream_sample_t **inputs, stream_sample_t
/* bit0, relying on the fact that after three shifts of the */
/* register, what now is bit3 will become bit0, and will */
/* invert, if necessary, bit14, which previously was bit17. */
- if (PSG->RNG & 1)
+ if (PSG->RNG & 1)
PSG->RNG ^= 0x24000; /* This version is called the "Galois configuration". */
PSG->RNG >>= 1;
PSG->CountN = 0;
@@ -425,7 +425,7 @@ static void AY8910_update(void *param,stream_sample_t **inputs, stream_sample_t
/* update envelope */
if (PSG->Holding == 0)
{
- PSG->CountE++;
+ PSG->CountE++;
if (PSG->CountE >= ENVELOPE_PERIOD(PSG))
{
PSG->CountE = 0;
@@ -473,8 +473,8 @@ static void AY8910_update(void *param,stream_sample_t **inputs, stream_sample_t
{
*(buf[0]++) = mix_3D(PSG);
#if 0
- *(buf[0]) = ( vol_enabled[0] * PSG->VolTable[PSG->Vol[0]]
- + vol_enabled[1] * PSG->VolTable[PSG->Vol[1]]
+ *(buf[0]) = ( vol_enabled[0] * PSG->VolTable[PSG->Vol[0]]
+ + vol_enabled[1] * PSG->VolTable[PSG->Vol[1]]
+ vol_enabled[2] * PSG->VolTable[PSG->Vol[2]]) / PSG->step;
#endif
}
@@ -511,7 +511,7 @@ INLINE void build_single_table(double rl, ay_ym_param *par, int normalize, INT32
rw += 1.0 / par->r_up;
rt += 1.0 / par->r_up;
}
-
+
temp[j] = rw / rt;
if (temp[j] < min)
min = temp[j];
@@ -528,7 +528,7 @@ INLINE void build_single_table(double rl, ay_ym_param *par, int normalize, INT32
for (j=0; j < par->N; j++)
tab[j] = MAX_OUTPUT * temp[j];
}
-
+
}
INLINE void build_3D_table(double rl, ay_ym_param *par, ay_ym_param *parE, int normalize, double factor, int zero_is_off, INT32 *tab)
@@ -539,7 +539,7 @@ INLINE void build_3D_table(double rl, ay_ym_param *par, ay_ym_param *parE, int n
double *temp;
temp = malloc(8*32*32*32*sizeof(*temp));
-
+
for (e=0; e < 8; e++)
for (j1=0; j1 < 32; j1++)
for (j2=0; j2 < 32; j2++)
@@ -547,23 +547,23 @@ INLINE void build_3D_table(double rl, ay_ym_param *par, ay_ym_param *parE, int n
{
if (zero_is_off)
{
- n = (j1 != 0 || (e & 0x01)) ? 1 : 0;
- n += (j2 != 0 || (e & 0x02)) ? 1 : 0;
- n += (j3 != 0 || (e & 0x04)) ? 1 : 0;
+ n = (j1 != 0 || (e & 0x01)) ? 1 : 0;
+ n += (j2 != 0 || (e & 0x02)) ? 1 : 0;
+ n += (j3 != 0 || (e & 0x04)) ? 1 : 0;
}
else
n = 3.0;
-
+
rt = n / par->r_up + 3.0 / par->r_down + 1.0 / rl;
rw = n / par->r_up;
-
+
rw += 1.0 / ( (e & 0x01) ? parE->res[j1] : par->res[j1]);
rt += 1.0 / ( (e & 0x01) ? parE->res[j1] : par->res[j1]);
rw += 1.0 / ( (e & 0x02) ? parE->res[j2] : par->res[j2]);
rt += 1.0 / ( (e & 0x02) ? parE->res[j2] : par->res[j2]);
rw += 1.0 / ( (e & 0x04) ? parE->res[j3] : par->res[j3]);
rt += 1.0 / ( (e & 0x04) ? parE->res[j3] : par->res[j3]);
-
+
indx = (e << 15) | (j3<<10) | (j2<<5) | j1;
temp[indx] = rw / rt;
if (temp[indx] < min)
@@ -582,9 +582,9 @@ INLINE void build_3D_table(double rl, ay_ym_param *par, ay_ym_param *parE, int n
for (j=0; j < 32*32*32*8; j++)
tab[j] = MAX_OUTPUT * temp[j];
}
-
+
/* for (e=0;e<16;e++) printf("%d %d\n",e<<10, tab[e<<10]); */
-
+
free(temp);
}
@@ -593,13 +593,13 @@ static void build_mixer_table(struct AY8910 *PSG)
{
int normalize = 0;
int chan;
-
+
if ((PSG->intf->flags & AY8910_LEGACY_OUTPUT) != 0)
{
logerror("AY-3-8910/YM2149 using legacy output levels!\n");
normalize = 1;
}
-
+
for (chan=0; chan < NUM_CHANNELS; chan++)
{
build_single_table(PSG->intf->res_load[chan], PSG->par, normalize, PSG->VolTable[chan], PSG->zero_is_off);
@@ -648,7 +648,7 @@ void *ay8910_start_ym(sound_type chip_type, int sndindex, int clock, const struc
}
else
info->streams = 3;
-
+
switch (chip_type)
{
case SOUND_AY8910:
@@ -673,7 +673,7 @@ void *ay8910_start_ym(sound_type chip_type, int sndindex, int clock, const struc
info->zero_is_off = 0;
break;
}
- info->EnvP = info->step * 16 - 1;
+ info->EnvP = info->step * 16 - 1;
build_mixer_table(info);
@@ -710,7 +710,7 @@ void ay8910_reset_ym(void *chip)
PSG->OutputN = 0x01;
PSG->lastEnable = -1; /* force a write */
for (i = 0;i < AY_PORTA;i++)
- AY8910_write_reg(PSG,i,0);
+ AY8910_write_reg(PSG,i,0);
PSG->ready = 1;
}
@@ -761,15 +761,15 @@ int ay8910_read_ym(void *chip)
*/
if (PSG->intf->portAread)
PSG->regs[AY_PORTA] = (*PSG->intf->portAread)(Machine, 0);
- else
+ else
logerror("PC %04x: warning - read 8910 #%d Port A\n",activecpu_get_pc(),PSG->index);
break;
case AY_PORTB:
if ((PSG->regs[AY_ENABLE] & 0x80) != 0)
logerror("warning: read from 8910 #%d Port B set as output\n",PSG->index);
- if (PSG->intf->portBread)
+ if (PSG->intf->portBread)
PSG->regs[AY_PORTB] = (*PSG->intf->portBread)(Machine, 0);
- else
+ else
logerror("PC %04x: warning - read 8910 #%d Port B\n",activecpu_get_pc(),PSG->index);
break;
}
@@ -779,8 +779,8 @@ int ay8910_read_ym(void *chip)
static void *ay8910_start(int sndindex, int clock, const void *config)
{
- static const struct AY8910interface generic_ay8910 =
- {
+ static const struct AY8910interface generic_ay8910 =
+ {
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
NULL, NULL, NULL, NULL
@@ -791,8 +791,8 @@ static void *ay8910_start(int sndindex, int clock, const void *config)
static void *ym2149_start(int sndindex, int clock, const void *config)
{
- static const struct AY8910interface generic_ay8910 =
- {
+ static const struct AY8910interface generic_ay8910 =
+ {
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
NULL, NULL, NULL, NULL
diff --git a/src/mame/drivers/aerofgt.c b/src/mame/drivers/aerofgt.c
index 6d8b5ad477c..a016c36e76a 100644
--- a/src/mame/drivers/aerofgt.c
+++ b/src/mame/drivers/aerofgt.c
@@ -374,7 +374,7 @@ static ADDRESS_MAP_START( aerfboo2_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x0fe006, 0x0fe007) AM_WRITE(aerofgt_bg2scrolly_w)
AM_RANGE(0x0fe008, 0x0fe00b) AM_WRITE(turbofrc_gfxbank_w)
AM_RANGE(0x0fe010, 0x0fe011) AM_WRITENOP
-// AM_RANGE(0x0fe012, 0x0fe013) AM_WRITE(aerfboot_soundlatch_w)
+// AM_RANGE(0x0fe012, 0x0fe013) AM_WRITE(aerfboot_soundlatch_w)
AM_RANGE(0x0fe400, 0x0fe401) AM_WRITENOP
AM_RANGE(0x0fe402, 0x0fe403) AM_WRITENOP
AM_RANGE(0x0ff000, 0x0fffff) AM_RAM AM_BASE(&aerofgt_rasterram) /* used only for the scroll registers */
diff --git a/src/mame/drivers/changela.c b/src/mame/drivers/changela.c
index 9bf138d8a0e..cacb4ab95ea 100644
--- a/src/mame/drivers/changela.c
+++ b/src/mame/drivers/changela.c
@@ -449,7 +449,7 @@ static INPUT_PORTS_START( changela )
INPUT_PORTS_END
-static const struct AY8910interface ay8910_interface_1 =
+static const struct AY8910interface ay8910_interface_1 =
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
@@ -459,7 +459,7 @@ static const struct AY8910interface ay8910_interface_1 =
NULL
};
-static const struct AY8910interface ay8910_interface_2 =
+static const struct AY8910interface ay8910_interface_2 =
{
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
diff --git a/src/mame/drivers/cps1.c b/src/mame/drivers/cps1.c
index 643dfd2b70b..3a1a2bd1b6e 100644
--- a/src/mame/drivers/cps1.c
+++ b/src/mame/drivers/cps1.c
@@ -7506,7 +7506,7 @@ GAME( 1992, sf2m6, sf2ce, cps1_12MHz, sf2, cps1, ROT0, "bootleg
GAME( 1992, sf2m7, sf2ce, cps1_12MHz, sf2, cps1, ROT0, "bootleg","Street Fighter II' - Champion Edition (M7)", 0 )
GAME( 1992, sf2yyc, sf2ce, cps1_12MHz, sf2, cps1, ROT0, "bootleg","Street Fighter II' - Champion Edition (YYC)", 0 )
GAME( 1992, sf2koryu, sf2ce, cps1_12MHz, sf2, cps1, ROT0, "bootleg","Street Fighter II' - Champion Edition (Kouryu)", 0 )
-GAME( 1992, varth, 0, cps1_12MHz, varth, cps1, ROT270, "Capcom", "Varth - Operation Thunderstorm (World 920714)" , 0) // "ETC" 12MHz not verified but game slows down at 10MHz
+GAME( 1992, varth, 0, cps1_12MHz, varth, cps1, ROT270, "Capcom", "Varth - Operation Thunderstorm (World 920714)" , 0) // "ETC" 12MHz not verified but game slows down at 10MHz
GAME( 1992, varthr1, varth, cps1_12MHz, varth, cps1, ROT270, "Capcom", "Varth - Operation Thunderstorm (World 920612)" , 0) // "ETC"
GAME( 1992, varthu, varth, cps1_12MHz, varth, cps1, ROT270, "Capcom (Romstar license)", "Varth - Operation Thunderstorm (US 920612)", 0 )
GAME( 1992, varthj, varth, cps1_12MHz, varth, cps1, ROT270, "Capcom", "Varth - Operation Thunderstorm (Japan 920714)", 0 )
diff --git a/src/mame/drivers/funworld.c b/src/mame/drivers/funworld.c
index 70afea0e24d..d6f971e0cf2 100644
--- a/src/mame/drivers/funworld.c
+++ b/src/mame/drivers/funworld.c
@@ -2351,11 +2351,11 @@ static DRIVER_INIT( jolyc980 )
*************************************************************************************************/
-// UINT8 *ROM = memory_region(REGION_CPU1);
+// UINT8 *ROM = memory_region(REGION_CPU1);
-// ROM[0xc1fc] = 0x4c;
-// ROM[0xc1fd] = 0x1c;
-// ROM[0xc1fe] = 0x80;
+// ROM[0xc1fc] = 0x4c;
+// ROM[0xc1fd] = 0x1c;
+// ROM[0xc1fe] = 0x80;
/* Initializing PIAs... */
pia_config(0, &pia0_intf);
@@ -2367,15 +2367,15 @@ static DRIVER_INIT( magiccda )
For a serie of Mexican Rockwell's 65c02
seems that opcode 0x91 is STA ($zp) instead of STA ($zp),y
- ...or is patched with the correct opcode (0x92) by PLDs...
+ ...or is patched with the correct opcode (0x92) by PLDs...
In offset $C1C4, the code is trying to initialize both PIAs
putting value 0x34 in $0800-$0803 & $0A00-$0A03.
-
+
The code use STA ($zp),y (opcode 0x91). As soon as register 'y'
increments, almost all writes goes out of range.
-******************************************************************/
+******************************************************************/
{
UINT8 *ROM = memory_region(REGION_CPU1);
diff --git a/src/mame/drivers/galaxian.c b/src/mame/drivers/galaxian.c
index 2103f8d12fc..6ad9cf92f99 100644
--- a/src/mame/drivers/galaxian.c
+++ b/src/mame/drivers/galaxian.c
@@ -282,14 +282,14 @@ static READ8_HANDLER( konami_ay8910_r )
static WRITE8_HANDLER( konami_ay8910_w )
{
/* the decoding here is very simplistic, and you can address two simultaneously */
- if (offset & 0x10)
+ if (offset & 0x10)
AY8910_control_port_0_w(machine, 0, data);
- else if (offset & 0x20)
+ else if (offset & 0x20)
AY8910_write_port_0_w(machine, 0, data);
- if (offset & 0x40)
+ if (offset & 0x40)
AY8910_control_port_1_w(machine, 0, data);
- else if (offset & 0x80)
+ else if (offset & 0x80)
AY8910_write_port_1_w(machine, 0, data);
}
@@ -665,9 +665,9 @@ static READ8_HANDLER( frogger_ay8910_r )
static WRITE8_HANDLER( frogger_ay8910_w )
{
/* the decoding here is very simplistic */
- if (offset & 0x40)
+ if (offset & 0x40)
AY8910_write_port_0_w(machine, 0, data);
- else if (offset & 0x80)
+ else if (offset & 0x80)
AY8910_control_port_0_w(machine, 0, data);
}
@@ -1627,7 +1627,7 @@ static const discrete_mixer_desc konami_sound_mixer_desc =
{RES_K(5.1), RES_K(5.1), RES_K(5.1), RES_K(5.1), RES_K(5.1), RES_K(5.1)},
{0,0,0,0,0,0}, /* no variable resistors */
{0,0,0,0,0,0}, /* no node capacitors */
- 0, RES_K(2.2),
+ 0, RES_K(2.2),
0,
CAP_U(0.15),
0, 1};
diff --git a/src/mame/drivers/gng.c b/src/mame/drivers/gng.c
index 7de52a75dce..1ae269e7851 100644
--- a/src/mame/drivers/gng.c
+++ b/src/mame/drivers/gng.c
@@ -496,9 +496,9 @@ ROM_END
ROM_START( gngblita )
ROM_REGION( 0x18000, REGION_CPU1, 0 )
- ROM_LOAD( "3", 0x04000, 0x4000, CRC(4859d068) SHA1(8b22772ea383ecaee01da696c0c7b568ab1e4615) )
+ ROM_LOAD( "3", 0x04000, 0x4000, CRC(4859d068) SHA1(8b22772ea383ecaee01da696c0c7b568ab1e4615) )
ROM_LOAD( "4-5", 0x08000, 0x8000, CRC(233a4589) SHA1(c95c4dcbf53fac5a0c11466bc27369bf8328bd01) )
- ROM_LOAD( "1-2", 0x10000, 0x8000, CRC(ed28e86e) SHA1(064871918547a56be330c6994d4db2c9932e14db) )
+ ROM_LOAD( "1-2", 0x10000, 0x8000, CRC(ed28e86e) SHA1(064871918547a56be330c6994d4db2c9932e14db) )
ROM_REGION( 0x10000, REGION_CPU2, 0 )
ROM_LOAD( "gg2.bin", 0x0000, 0x8000, CRC(615f5b6f) SHA1(7ef9ec5c2072e21c787a6bbf700033f50c759c1d) )
diff --git a/src/mame/drivers/gyruss.c b/src/mame/drivers/gyruss.c
index 77f0340f54c..c3c19e694a6 100644
--- a/src/mame/drivers/gyruss.c
+++ b/src/mame/drivers/gyruss.c
@@ -455,8 +455,8 @@ static DISCRETE_SOUND_START( gyruss_sound )
/* Chip 3 right */
/* Outputs are tied together after 3.3k resistor on each channel.
- * A/R + B/R + C/R = (A + B + C) / 3 * (1/(R/3))
- */
+ * A/R + B/R + C/R = (A + B + C) / 3 * (1/(R/3))
+ */
DISCRETE_INPUTX_STREAM(NODE_07, 6, 0.33, 0)
DISCRETE_INPUTX_STREAM(NODE_08, 7, 0.33, 0)
DISCRETE_INPUTX_STREAM(NODE_09, 8, 0.33, 0)
@@ -473,7 +473,7 @@ static DISCRETE_SOUND_START( gyruss_sound )
/* DAC left */
/* Output voltage depends on load. Datasheet gives 2.4 as minimum.
- * This is in line with TTL, so 4V with no load seems adequate */
+ * This is in line with TTL, so 4V with no load seems adequate */
DISCRETE_INPUTX_DATA(NODE_16, 256.0 * 4.0 / 5.0, 0.0, 0.0)
/* Chip 1 Filter enable */
diff --git a/src/mame/drivers/igs_180.c b/src/mame/drivers/igs_180.c
index 255f93fe4e6..48be62545e3 100644
--- a/src/mame/drivers/igs_180.c
+++ b/src/mame/drivers/igs_180.c
@@ -122,9 +122,9 @@ static void expand_sprites(void)
7.b 765- ---- Color
---4 ---- Flip X
- ---- 3210 Code (high)
+ ---- 3210 Code (high)
- Code = ROM Address / 2 = Pixel / 3
+ Code = ROM Address / 2 = Pixel / 3
***************************************************************************/
@@ -244,7 +244,7 @@ static VIDEO_UPDATE(igs_180)
if (mask != 0) layers_ctrl &= mask;
}
#endif
-
+
if (debug_viewer(bitmap,cliprect))
return 0;
diff --git a/src/mame/drivers/mosaic.c b/src/mame/drivers/mosaic.c
index 186383ab80a..59324c307fc 100644
--- a/src/mame/drivers/mosaic.c
+++ b/src/mame/drivers/mosaic.c
@@ -284,7 +284,7 @@ static const struct YM2203interface ym2203_interface =
NULL,
NULL
},
- NULL
+ NULL
};
diff --git a/src/mame/drivers/pushman.c b/src/mame/drivers/pushman.c
index 51d634e92af..060203d05a4 100644
--- a/src/mame/drivers/pushman.c
+++ b/src/mame/drivers/pushman.c
@@ -430,7 +430,7 @@ static const struct YM2203interface ym2203_interface =
AY8910_LEGACY_OUTPUT,
AY8910_DEFAULT_LOADS,
NULL, NULL, NULL, NULL,
- },
+ },
irqhandler
};
diff --git a/src/mame/drivers/snookr10.c b/src/mame/drivers/snookr10.c
index 84869601bdf..12470780401 100644
--- a/src/mame/drivers/snookr10.c
+++ b/src/mame/drivers/snookr10.c
@@ -27,8 +27,8 @@
HD-PLD: 2x AMD MACH231-15-JC/1-18JI/1
(2x Lattice ispLSI1024-60LJ for earlier revisions)
-
- RAM: 1x 76C88AL-15, SRAM 8Kx8
+
+ RAM: 1x 76C88AL-15, SRAM 8Kx8
NVRAM: 1x 76C88AL-15, SRAM 8Kx8 (battery backed)
ROMs: 4x 27C256
(3x 27C256 for earlier revisions)
@@ -147,9 +147,9 @@ VIDEO_UPDATE( snookr10 );
static ADDRESS_MAP_START( snookr10_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
-// AM_RANGE(0x1000, 0x1000) AM_READNOP /* R/W */
-// AM_RANGE(0x3000, 0x3004) AM_READNOP /* reads (input port) */
-// AM_RANGE(0x5000, 0x5001) AM_READNOP /* writes */
+// AM_RANGE(0x1000, 0x1000) AM_READNOP /* R/W */
+// AM_RANGE(0x3000, 0x3004) AM_READNOP /* reads (input port) */
+// AM_RANGE(0x5000, 0x5001) AM_READNOP /* writes */
AM_RANGE(0x6000, 0x6fff) AM_RAM_WRITE(snookr10_videoram_w) AM_BASE(&videoram)
AM_RANGE(0x7000, 0x7fff) AM_RAM AM_WRITE(snookr10_colorram_w) AM_BASE(&colorram)
AM_RANGE(0x8000, 0xffff) AM_ROM
diff --git a/src/mame/drivers/tmaster.c b/src/mame/drivers/tmaster.c
index e1bb91a8f69..dc28bd87736 100644
--- a/src/mame/drivers/tmaster.c
+++ b/src/mame/drivers/tmaster.c
@@ -93,13 +93,13 @@ static WRITE16_HANDLER( tmaster_oki_bank_w )
/***************************************************************************
- 68681 DUART <-> Microtouch touch screen controller communication
+ 68681 DUART <-> Microtouch touch screen controller communication
***************************************************************************/
static void duart_irq_handler(UINT8 vector)
{
- cpunum_set_input_line_and_vector(Machine, 0, 4, HOLD_LINE, vector);
+ cpunum_set_input_line_and_vector(Machine, 0, 4, HOLD_LINE, vector);
};
static void duart_tx(int channel, UINT8 data)
diff --git a/src/mame/video/aerofgt.c b/src/mame/video/aerofgt.c
index e70e7097372..912794a81fe 100644
--- a/src/mame/video/aerofgt.c
+++ b/src/mame/video/aerofgt.c
@@ -452,7 +452,7 @@ static void aerfboo2_draw_sprites(running_machine *machine, bitmap_t *bitmap,con
int attr_start,base,first;
base = chip * 0x0200;
-// first = 4 * aerofgt_spriteram3[0x1fe + base];
+// first = 4 * aerofgt_spriteram3[0x1fe + base];
first = 0;
for (attr_start = base + 0x0200-4;attr_start >= first + base;attr_start -= 4)
diff --git a/src/mame/video/cps1.c b/src/mame/video/cps1.c
index 1f29c136576..b3aa1ed113a 100644
--- a/src/mame/video/cps1.c
+++ b/src/mame/video/cps1.c
@@ -1330,13 +1330,13 @@ WRITE16_HANDLER( cps1_cps_a_w )
data = COMBINE_DATA(&cps1_cps_a_regs[offset]);
/*
- The main CPU writes the palette to gfxram, and the CPS-B custom copies it
- to the real palette RAM, which is separated from gfxram.
- This is done ONLY after the palette base register is written to. It is not
- known what the exact timing should be, how long it should take and when it
- should happen. We are assuming that the copy happens immediately, since it
- fixes glitches in the ghouls intro, but it might happen at next vblank.
- */
+ The main CPU writes the palette to gfxram, and the CPS-B custom copies it
+ to the real palette RAM, which is separated from gfxram.
+ This is done ONLY after the palette base register is written to. It is not
+ known what the exact timing should be, how long it should take and when it
+ should happen. We are assuming that the copy happens immediately, since it
+ fixes glitches in the ghouls intro, but it might happen at next vblank.
+ */
if (offset == CPS1_PALETTE_BASE)
cps1_build_palette(machine, cps1_base(CPS1_PALETTE_BASE,cps1_palette_align));
@@ -1679,7 +1679,7 @@ static int gfxrom_bank_mapper(running_machine *machine, int type, int code)
}
#ifdef MAME_DEBUG
-// popmessage("tile %02x/%04x out of range", type,code>>shift);
+// popmessage("tile %02x/%04x out of range", type,code>>shift);
#endif
return -1;
@@ -1721,8 +1721,8 @@ static TILE_GET_INFO( get_tile0_info )
code = gfxrom_bank_mapper(machine, GFXTYPE_SCROLL1, code);
/* allows us to reproduce a problem seen with a ffight board where USA and Japanese
- roms have been mixed to be reproduced (ffightua) -- it looks like each column
- should alternate between the left and right side of the 16x16 tiles */
+ roms have been mixed to be reproduced (ffightua) -- it looks like each column
+ should alternate between the left and right side of the 16x16 tiles */
gfxset = (tile_index & 0x20) >> 5;
SET_TILE_INFO(
@@ -1879,10 +1879,10 @@ static void cps1_build_palette(running_machine *machine, const UINT16* const pal
int ctrl = cps1_cps_b_regs[cps1_game_config->palette_control/2];
/*
- The palette is copied only for pages that are enabled in the ctrl
- register. Note that if the first palette pages are skipped, all
- the following pages are scaled down.
- */
+ The palette is copied only for pages that are enabled in the ctrl
+ register. Note that if the first palette pages are skipped, all
+ the following pages are scaled down.
+ */
for (page = 0; page < 6; ++page)
{
if (BIT(ctrl,page))
diff --git a/src/mame/video/popper.c b/src/mame/video/popper.c
index 7512820865d..73e77511698 100644
--- a/src/mame/video/popper.c
+++ b/src/mame/video/popper.c
@@ -14,9 +14,9 @@ static rectangle tilemap_clip;
/***************************************************************************
- *
+ *
* Color guns - from schematics
- *
+ *
***************************************************************************/
static const res_net_decode_info popper_decode_info =
@@ -24,7 +24,7 @@ static const res_net_decode_info popper_decode_info =
1, // there may be two proms needed to construct color
0, // start at 0
63, // end at 255
- // R, G, B,
+ // R, G, B,
{ 0, 0, 0, }, // offsets
{ 0, 3, 6, }, // shifts
{0x07,0x07,0x03, } // masks
@@ -36,14 +36,14 @@ static const res_net_info popper_net_info =
{
{ RES_NET_AMP_NONE, 0, 0, 3, { 1000, 470, 220 } },
{ RES_NET_AMP_NONE, 0, 0, 3, { 1000, 470, 220 } },
- { RES_NET_AMP_NONE, 0, 0, 2, { 470, 220, 0 } }
+ { RES_NET_AMP_NONE, 0, 0, 2, { 470, 220, 0 } }
}
};
/***************************************************************************
- *
+ *
* PALETTE_INIT
- *
+ *
***************************************************************************/
PALETTE_INIT( popper )
diff --git a/src/osd/windows/winmain.c b/src/osd/windows/winmain.c
index 1f0558dff60..029f868a2f3 100644
--- a/src/osd/windows/winmain.c
+++ b/src/osd/windows/winmain.c
@@ -274,7 +274,7 @@ static void output_oslog(running_machine *machine, const char *buffer)
void osd_init(running_machine *machine)
{
int watchdog = options_get_int(mame_options(), WINOPTION_WATCHDOG);
-
+
// thread priority
if (!options_get_bool(mame_options(), OPTION_DEBUG))
SetThreadPriority(GetCurrentThread(), options_get_int(mame_options(), WINOPTION_PRIORITY));
@@ -398,7 +398,7 @@ static DWORD WINAPI watchdog_thread_entry(LPVOID lpParameter)
{
DWORD timeout = (int)(FPTR)lpParameter * 1000;
DWORD wait_result;
-
+
wait_result = WaitForSingleObject(watchdog_exit_event, timeout);
if (wait_result == WAIT_TIMEOUT)
TerminateProcess(GetCurrentProcess(), -1);