summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatarGravatar Aaron Giles <aaron@aarongiles.com>2009-09-24 07:56:15 +0000
committerGravatarGravatar Aaron Giles <aaron@aarongiles.com>2009-09-24 07:56:15 +0000
commit1f7a6caba98beb361787766d450bf8e684d18cb3 (patch)
treebe063f88b4aeb6fc06f3eb8d84986c21747438d0
parentd72571de57157c756c4669091d025dbf80ec7fb9 (diff)
Cleanups and version bump.mame0134u1
-rw-r--r--src/emu/cpu/dsp56k/dsp56dsm.c50
-rw-r--r--src/emu/cpu/dsp56k/dsp56ops.c10
-rw-r--r--src/emu/cpu/s2650/s2650.c52
-rw-r--r--src/emu/devintrf.c6
-rw-r--r--src/emu/eigccx86.h2
-rw-r--r--src/emu/info.c4
-rw-r--r--src/emu/machine/6532riot.c2
-rw-r--r--src/emu/sound/cdp1863.c6
-rw-r--r--src/emu/sound/cdp1863.h4
-rw-r--r--src/emu/sound/cdp1864.c16
-rw-r--r--src/emu/sound/cdp1864.h48
-rw-r--r--src/emu/sound/disc_dev.c4
-rw-r--r--src/emu/sound/discrete.h2
-rw-r--r--src/emu/sound/tms5110.c14
-rw-r--r--src/emu/sound/tms5220.c158
-rw-r--r--src/mame/audio/dkong.c14
-rw-r--r--src/mame/audio/skyraid.c20
-rw-r--r--src/mame/drivers/amaticmg.c114
-rw-r--r--src/mame/drivers/cvs.c32
-rw-r--r--src/mame/drivers/dkong.c16
-rw-r--r--src/mame/drivers/naomi.c24
-rw-r--r--src/mame/drivers/neodrvr.c32
-rw-r--r--src/mame/drivers/photon2.c2
-rw-r--r--src/mame/drivers/tomcat.c2
-rw-r--r--src/mame/drivers/xmen.c2
-rw-r--r--src/mame/drivers/zaccaria.c18
-rw-r--r--src/mame/machine/cx4data.c2
-rw-r--r--src/mame/machine/cx4oam.c2
-rw-r--r--src/mame/machine/cx4ops.c2
-rw-r--r--src/mame/machine/naomibd.c2
-rw-r--r--src/mame/machine/snes.c2
-rw-r--r--src/mame/machine/snescx4.c2
-rw-r--r--src/mame/machine/snescx4.h2
-rw-r--r--src/version.c2
34 files changed, 335 insertions, 335 deletions
diff --git a/src/emu/cpu/dsp56k/dsp56dsm.c b/src/emu/cpu/dsp56k/dsp56dsm.c
index 67952b92100..9ed61a38f66 100644
--- a/src/emu/cpu/dsp56k/dsp56dsm.c
+++ b/src/emu/cpu/dsp56k/dsp56dsm.c
@@ -1,8 +1,8 @@
/***************************************************************************
- dsp56dsm.c
- Disassembler for the portable Motorola/Freescale dsp56k emulator.
- Written by Andrew Gardner
+ dsp56dsm.c
+ Disassembler for the portable Motorola/Freescale dsp56k emulator.
+ Written by Andrew Gardner
***************************************************************************/
@@ -229,7 +229,7 @@ CPU_DISASSEMBLE( dsp56k )
if ((op & 0xe000) == 0x6000)
{
char d_register[32] = "";
-
+
/* Quote: (MOVE, MAC(R), MPY(R), ADD, SUB, TFR) */
UINT16 op_byte = op & 0x00ff;
@@ -259,11 +259,11 @@ CPU_DISASSEMBLE( dsp56k )
else if ((op & 0xe09f) == 0x6010)
{
/* Note: The opcode encoding : 011x xxxx 0xx1 0000 (move + double memory read)
- is .identical. to (tfr X0,A + two parallel reads). This sparks the notion
- that these 'move' opcodes don't actually exist and are just there as
- documentation. Real-world examples would need to be examined to come
- to a satisfactory conclusion, but as it stands, tfr will override this
- move operation. */
+ is .identical. to (tfr X0,A + two parallel reads). This sparks the notion
+ that these 'move' opcodes don't actually exist and are just there as
+ documentation. Real-world examples would need to be examined to come
+ to a satisfactory conclusion, but as it stands, tfr will override this
+ move operation. */
size = dsp56k_dasm_move_1(op_byte, opcode_str, arg_str, d_register);
}
/* MPY : 011m mKKK 1xx0 F0QQ : A-160 */
@@ -356,10 +356,10 @@ CPU_DISASSEMBLE( dsp56k )
/* Now check it against all the other potential collisions */
/* This is necessary because "don't care bits" get in the way. */
/*
- MOVE(M) : 0000 0101 BBBB BBBB 0000 001W --0- -HHH : A-152
- MOVE(C) : 0000 0101 BBBB BBBB 0011 1WDD DDD0 ---- : A-144
- MOVE : 0000 0101 BBBB BBBB ---- HHHW 0001 0001 : A-128
- */
+ MOVE(M) : 0000 0101 BBBB BBBB 0000 001W --0- -HHH : A-152
+ MOVE(C) : 0000 0101 BBBB BBBB 0011 1WDD DDD0 ---- : A-144
+ MOVE : 0000 0101 BBBB BBBB ---- HHHW 0001 0001 : A-128
+ */
if (((op2 & 0xfe20) != 0x0200) &&
((op2 & 0xf810) != 0x3800) &&
((op2 & 0x00ff) != 0x0011))
@@ -1426,7 +1426,7 @@ static size_t dsp56k_dasm_cmp(const UINT16 op_byte, char* opcode_str, char* arg_
char D[32];
char S1[32];
/* Note: This is a JJJF limited in the docs, but other opcodes sneak
- in before cmp, so the same decode function can be used. */
+ in before cmp, so the same decode function can be used. */
decode_JJJF_table(BITS(op_byte,0x07), BITS(op_byte,0x08), S1, D);
sprintf(opcode_str, "cmp");
sprintf(arg_str, "%s,%s", S1, D);
@@ -1529,7 +1529,7 @@ static size_t dsp56k_dasm_cmpm(const UINT16 op_byte, char* opcode_str, char* arg
char D[32];
char S1[32];
/* Note: This is a JJJF limited in the docs, but other opcodes sneak
- in before cmp, so the same decode function can be used. */
+ in before cmp, so the same decode function can be used. */
decode_JJJF_table(BITS(op_byte,0x07), BITS(op_byte,0x08), S1, D);
sprintf(opcode_str, "cmpm");
sprintf(arg_str, "%s,%s", S1, D);
@@ -1541,7 +1541,7 @@ static size_t dsp56k_dasm_cmpm(const UINT16 op_byte, char* opcode_str, char* arg
static size_t dsp56k_dasm_mpy(const UINT16 op_byte, char* opcode_str, char* arg_str, char* d_register)
{
/* There are inconsistencies with the S1 & S2 operand ordering in the docs,
- but since it's a multiply it doesn't matter */
+ but since it's a multiply it doesn't matter */
char D[32];
char S1[32];
char S2[32];
@@ -1561,7 +1561,7 @@ static size_t dsp56k_dasm_mpy(const UINT16 op_byte, char* opcode_str, char* arg_
static size_t dsp56k_dasm_mpyr(const UINT16 op_byte, char* opcode_str, char* arg_str, char* d_register)
{
/* There are inconsistencies with the S1 & S2 operand ordering in the docs,
- but since it's a multiply it doesn't matter */
+ but since it's a multiply it doesn't matter */
char D[32];
char S1[32];
char S2[32];
@@ -1599,7 +1599,7 @@ static size_t dsp56k_dasm_mac(const UINT16 op_byte, char* opcode_str, char* arg_
static size_t dsp56k_dasm_macr(const UINT16 op_byte, char* opcode_str, char* arg_str, char* d_register)
{
/* There are inconsistencies with the S1 & S2 operand ordering in the docs,
- but since it's a multiply it doesn't matter */
+ but since it's a multiply it doesn't matter */
char D[32];
char S1[32];
char S2[32];
@@ -1881,8 +1881,8 @@ static size_t dsp56k_dasm_debugcc(const UINT16 op, char* opcode_str, char* arg_s
/* DIV : 0001 0101 0--0 F1DD : A-76 */
static size_t dsp56k_dasm_div(const UINT16 op, char* opcode_str, char* arg_str)
{
- /* The docs on page A-76 claim there is potential for a parallel move here,
- but various other sources (including elsewhere in the family manual) disagree */
+ /* The docs on page A-76 claim there is potential for a parallel move here,
+ but various other sources (including elsewhere in the family manual) disagree */
char D[32];
char S1[32];
decode_DDF_table(BITS(op,0x0003), BITS(op,0x0008), S1, D);
@@ -2485,10 +2485,10 @@ static size_t dsp56k_dasm_tcc(const UINT16 op, char* opcode_str, char* arg_str)
sprintf(arg_str, "%s,%s R0,R%d", S, D, Rnum);
/* Note: S == 'A' && D == 'A' is used by the assembler when "no Data ALU
- transfer is specified in the instruction." The Data ALU contains the
- X,Y,A,B registers. The AGU holds the R registers. This comment means
- the assembler will create Tcc A,A when it wants to conditionally transfer
- only a R register to another R register. */
+ transfer is specified in the instruction." The Data ALU contains the
+ X,Y,A,B registers. The AGU holds the R registers. This comment means
+ the assembler will create Tcc A,A when it wants to conditionally transfer
+ only a R register to another R register. */
return 1;
}
@@ -3204,7 +3204,7 @@ static void assemble_reg_from_W_table(UINT16 W, char *args, char ma, char *SD, I
UINT8 abs_xx;
char operation[32];
- if(xx < 0)
+ if(xx < 0)
sprintf(operation,"-");
else
sprintf(operation,"+");
diff --git a/src/emu/cpu/dsp56k/dsp56ops.c b/src/emu/cpu/dsp56k/dsp56ops.c
index d4d6e923400..df4471132b0 100644
--- a/src/emu/cpu/dsp56k/dsp56ops.c
+++ b/src/emu/cpu/dsp56k/dsp56ops.c
@@ -284,11 +284,11 @@ static void execute_one(dsp56k_core* cpustate)
else if ((op & 0xe09f) == 0x6010)
{
/* Note: The opcode encoding : 011x xxxx 0xx1 0000 (move + double memory read)
- is .identical. to (tfr X0,A + two parallel reads). This sparks the notion
- that these 'move' opcodes don't actually exist and are just there as
- documentation. Real-world examples would need to be examined to come
- to a satisfactory conclusion, but as it stands, tfr will override this
- move operation. */
+ is .identical. to (tfr X0,A + two parallel reads). This sparks the notion
+ that these 'move' opcodes don't actually exist and are just there as
+ documentation. Real-world examples would need to be examined to come
+ to a satisfactory conclusion, but as it stands, tfr will override this
+ move operation. */
size = dsp56k_op_move_1(cpustate, op_byte, &d_register, &cycle_count);
}
/* MPY : 011m mKKK 1xx0 F0QQ : A-160 */
diff --git a/src/emu/cpu/s2650/s2650.c b/src/emu/cpu/s2650/s2650.c
index 7a4a96b5021..5dee5200c4a 100644
--- a/src/emu/cpu/s2650/s2650.c
+++ b/src/emu/cpu/s2650/s2650.c
@@ -178,36 +178,36 @@ INLINE void set_sp(s2650_regs *s2650c, UINT8 new_sp)
INLINE int check_irq_line(s2650_regs *s2650c)
{
int cycles = 0;
-
+
if (s2650c->irq_state != CLEAR_LINE)
- {
- if( (s2650c->psu & II) == 0 )
- {
- int vector;
- if (s2650c->halt)
- {
+ {
+ if( (s2650c->psu & II) == 0 )
+ {
+ int vector;
+ if (s2650c->halt)
+ {
s2650c->halt = 0;
- s2650c->iar = (s2650c->iar + 1) & PMSK;
- }
- vector = (*s2650c->irq_callback)(s2650c->device, 0) & 0xff;
- /* build effective address within first 8K page */
- s2650c->ea = S2650_relative[vector] & PMSK;
- if (vector & 0x80) /* indirect bit set ? */
- {
- int addr = s2650c->ea;
- cycles += 6;
- /* build indirect 32K address */
- s2650c->ea = RDMEM(addr) << 8;
- if (!(++addr & PMSK)) addr -= PLEN;
+ s2650c->iar = (s2650c->iar + 1) & PMSK;
+ }
+ vector = (*s2650c->irq_callback)(s2650c->device, 0) & 0xff;
+ /* build effective address within first 8K page */
+ s2650c->ea = S2650_relative[vector] & PMSK;
+ if (vector & 0x80) /* indirect bit set ? */
+ {
+ int addr = s2650c->ea;
+ cycles += 6;
+ /* build indirect 32K address */
+ s2650c->ea = RDMEM(addr) << 8;
+ if (!(++addr & PMSK)) addr -= PLEN;
s2650c->ea = (s2650c->ea + RDMEM(addr)) & AMSK;
- }
+ }
LOG(("S2650 interrupt to $%04x\n", s2650c->ea));
set_sp(s2650c, get_sp(s2650c) + 1);
- set_psu(s2650c, s2650c->psu | II);
- s2650c->ras[get_sp(s2650c)] = s2650c->page + s2650c->iar;
- s2650c->page = s2650c->ea & PAGE;
- s2650c->iar = s2650c->ea & PMSK;
- }
+ set_psu(s2650c, s2650c->psu | II);
+ s2650c->ras[get_sp(s2650c)] = s2650c->page + s2650c->iar;
+ s2650c->page = s2650c->ea & PAGE;
+ s2650c->iar = s2650c->ea & PMSK;
+ }
}
return cycles;
}
@@ -891,7 +891,7 @@ static CPU_EXECUTE( s2650 )
/* check for external irqs */
s2650c->icount -= check_irq_line(s2650c);
-
+
do
{
s2650c->ppc = s2650c->page + s2650c->iar;
diff --git a/src/emu/devintrf.c b/src/emu/devintrf.c
index 57397dd18a1..69002896b3b 100644
--- a/src/emu/devintrf.c
+++ b/src/emu/devintrf.c
@@ -361,15 +361,15 @@ const device_config *device_list_find_by_tag(const device_config *listhead, cons
/*-------------------------------------------------
- device_find_child_by_tag - retrieve a child
- device configuration based on a tag
+ device_find_child_by_tag - retrieve a child
+ device configuration based on a tag
-------------------------------------------------*/
const device_config *device_find_child_by_tag(const device_config *owner, const char *tag)
{
astring *tempstring;
const device_config *child;
-
+
assert(owner != NULL);
assert(tag != NULL);
diff --git a/src/emu/eigccx86.h b/src/emu/eigccx86.h
index ae1b7951660..f9a3c3dbe0d 100644
--- a/src/emu/eigccx86.h
+++ b/src/emu/eigccx86.h
@@ -681,7 +681,7 @@ INLINE INT64 ATTR_UNUSED ATTR_FORCE_INLINE _get_profile_ticks(void)
result = ((UINT64)r2<<32) | (UINT64)r1;
return (INT64) (result & U64(0x7fffffffffffffff));
-}
+}
#endif
#endif /* __EIGCCX86__ */
diff --git a/src/emu/info.c b/src/emu/info.c
index 63602465a1b..3b90f81e9ed 100644
--- a/src/emu/info.c
+++ b/src/emu/info.c
@@ -521,11 +521,11 @@ static void print_game_rom(FILE *out, const game_driver *game, const machine_con
/* for disk entries, add the disk index */
else
fprintf(out, " index=\"%x\"", DISK_GETINDEX(rom));
-
+
/* add optional flag */
if ((!is_disk && ROM_ISOPTIONAL(rom)) || (is_disk && DISK_ISOPTIONAL(rom)))
fprintf(out, " optional=\"yes\"");
-
+
fprintf(out, "/>\n");
}
}
diff --git a/src/emu/machine/6532riot.c b/src/emu/machine/6532riot.c
index e98c7709510..8a2c7350be8 100644
--- a/src/emu/machine/6532riot.c
+++ b/src/emu/machine/6532riot.c
@@ -54,7 +54,7 @@ struct _riot6532_state
int index;
riot6532_port port[2];
-
+
devcb_resolved_write_line irq_func;
UINT8 irqstate;
diff --git a/src/emu/sound/cdp1863.c b/src/emu/sound/cdp1863.c
index 4ea3db0ce5f..47927f00e09 100644
--- a/src/emu/sound/cdp1863.c
+++ b/src/emu/sound/cdp1863.c
@@ -9,9 +9,9 @@
/*
- TODO:
+ TODO:
- - what happens if you connect both clocks?
+ - what happens if you connect both clocks?
*/
@@ -74,7 +74,7 @@ INLINE cdp1863_config *get_safe_config(const device_config *device)
WRITE8_DEVICE_HANDLER( cdp1863_str_w )
{
cdp1863_t *cdp1863 = get_safe_token(device);
-
+
cdp1863->latch = data;
}
diff --git a/src/emu/sound/cdp1863.h b/src/emu/sound/cdp1863.h
index f366c3ca430..31d0cf5329c 100644
--- a/src/emu/sound/cdp1863.h
+++ b/src/emu/sound/cdp1863.h
@@ -7,12 +7,12 @@
**********************************************************************
_____ _____
- _RESET 1 |* \_/ | 16 Vdd
+ _RESET 1 |* \_/ | 16 Vdd
CLK 2 2 | | 15 OE
CLK 1 3 | | 14 OUT
STR 4 | CDP1863 | 13 DO7
DI0 5 | | 12 DI6
- DI1 6 | | 11 DI5
+ DI1 6 | | 11 DI5
DI2 7 | | 10 DI4
Vss 8 |_____________| 9 DI3
diff --git a/src/emu/sound/cdp1864.c b/src/emu/sound/cdp1864.c
index 6bc9233fd7c..c2fcc343e4e 100644
--- a/src/emu/sound/cdp1864.c
+++ b/src/emu/sound/cdp1864.c
@@ -11,14 +11,14 @@
TODO:
- - interlace mode
- - PAL output, currently using RGB
- - cpu synchronization
-
- SC1 and SC0 are used to provide CDP1864C-to-CPU synchronization for a jitter-free display.
- During every horizontal sync the CDP1864C samples SC0 and SC1 for SC0 = 1 and SC1 = 0
- (CDP1800 execute state). Detection of a fetch cycle causes the CDP1864C to skip cycles to
- attain synchronization. (i.e. picture moves 8 pixels to the right)
+ - interlace mode
+ - PAL output, currently using RGB
+ - cpu synchronization
+
+ SC1 and SC0 are used to provide CDP1864C-to-CPU synchronization for a jitter-free display.
+ During every horizontal sync the CDP1864C samples SC0 and SC1 for SC0 = 1 and SC1 = 0
+ (CDP1800 execute state). Detection of a fetch cycle causes the CDP1864C to skip cycles to
+ attain synchronization. (i.e. picture moves 8 pixels to the right)
*/
diff --git a/src/emu/sound/cdp1864.h b/src/emu/sound/cdp1864.h
index 49307630ec3..f27a6c8a699 100644
--- a/src/emu/sound/cdp1864.h
+++ b/src/emu/sound/cdp1864.h
@@ -6,30 +6,30 @@
Visit http://mamedev.org for licensing and usage restrictions.
**********************************************************************
- ________________
- INLACE 1 ---| \/ |--- 40 Vdd
- CLK IN_ 2 ---| |--- 39 AUD
- CLR OUT_ 3 ---| |--- 38 CLR IN_
- AOE 4 ---| |--- 37 DMA0_
- SC1 5 ---| |--- 36 INT_
- SC0 6 ---| |--- 35 TPA
- MRD_ 7 ---| |--- 34 TPB
- BUS 7 8 ---| |--- 33 EVS
- BUS 6 9 ---| |--- 32 V SYNC
- BUS 5 10 ---| CDP1864C |--- 31 H SYNC
- BUS 4 11 ---| top view |--- 30 C SYNC_
- BUS 3 12 ---| |--- 29 RED
- BUS 2 13 ---| |--- 28 BLUE
- BUS 1 14 ---| |--- 27 GREEN
- BUS 0 15 ---| |--- 26 BCK GND_
- CON_ 16 ---| |--- 25 BURST
- N2 17 ---| |--- 24 ALT
- EF_ 18 ---| |--- 23 R DATA
- N0 19 ---| |--- 22 G DATA
- Vss 20 ---|________________|--- 21 B DATA
-
-
- http://homepage.mac.com/ruske/cosmacelf/cdp1864.pdf
+ ________________
+ INLACE 1 ---| \/ |--- 40 Vdd
+ CLK IN_ 2 ---| |--- 39 AUD
+ CLR OUT_ 3 ---| |--- 38 CLR IN_
+ AOE 4 ---| |--- 37 DMA0_
+ SC1 5 ---| |--- 36 INT_
+ SC0 6 ---| |--- 35 TPA
+ MRD_ 7 ---| |--- 34 TPB
+ BUS 7 8 ---| |--- 33 EVS
+ BUS 6 9 ---| |--- 32 V SYNC
+ BUS 5 10 ---| CDP1864C |--- 31 H SYNC
+ BUS 4 11 ---| top view |--- 30 C SYNC_
+ BUS 3 12 ---| |--- 29 RED
+ BUS 2 13 ---| |--- 28 BLUE
+ BUS 1 14 ---| |--- 27 GREEN
+ BUS 0 15 ---| |--- 26 BCK GND_
+ CON_ 16 ---| |--- 25 BURST
+ N2 17 ---| |--- 24 ALT
+ EF_ 18 ---| |--- 23 R DATA
+ N0 19 ---| |--- 22 G DATA
+ Vss 20 ---|________________|--- 21 B DATA
+
+
+ http://homepage.mac.com/ruske/cosmacelf/cdp1864.pdf
**********************************************************************/
diff --git a/src/emu/sound/disc_dev.c b/src/emu/sound/disc_dev.c
index 00118b5fe4f..8a1ed05f36a 100644
--- a/src/emu/sound/disc_dev.c
+++ b/src/emu/sound/disc_dev.c
@@ -1583,8 +1583,8 @@ static DISCRETE_RESET(dsd_566)
* This approach gives a bit better results compared to the first approach.
*/
/* Original formula before optimization of static values
- #define LS624_F(_C, _VI, _VR) pow(10, -0.912029404 * log10(_C) + 0.243264328 * (_VI) \
- - 0.091695877 * (_VR) -0.014110946 * (_VI) * (_VR) - 3.207072925)
+ #define LS624_F(_C, _VI, _VR) pow(10, -0.912029404 * log10(_C) + 0.243264328 * (_VI) \
+ - 0.091695877 * (_VR) -0.014110946 * (_VI) * (_VR) - 3.207072925)
*/
#define LS624_F(_VI) pow(10, context->k1 + 0.243264328 * (_VI) + context->k2 * (_VI))
diff --git a/src/emu/sound/discrete.h b/src/emu/sound/discrete.h
index 77b9fa7fd3e..537f8d6ba9c 100644
--- a/src/emu/sound/discrete.h
+++ b/src/emu/sound/discrete.h
@@ -3552,7 +3552,7 @@ enum
#define DISC_SCHMITT_OSC_ENAB_IS_NOR 0x06
#define DISC_SCHMITT_OSC_ENAB_MASK 0x06 /* Bits that define output enable type.
- * Used only internally in module. */
+ * Used only internally in module. */
/* 555 Common output flags */
#define DISC_555_OUT_DC 0x00
diff --git a/src/emu/sound/tms5110.c b/src/emu/sound/tms5110.c
index 63c3e53aacc..aecfeb35934 100644
--- a/src/emu/sound/tms5110.c
+++ b/src/emu/sound/tms5110.c
@@ -32,8 +32,8 @@
PROM OUT | 13 16 | NC
VSS | 14 15 | M0
+-----------------+
-
- T11: Sync for serial data out
+
+ T11: Sync for serial data out
M58817
@@ -173,7 +173,7 @@ struct _tms5110_state
const UINT8 *table;
sound_stream *stream;
INT32 speech_rom_bitnum;
-
+
emu_timer *romclk_timer;
UINT8 romclk_state;
};
@@ -740,7 +740,7 @@ void tms5110_PDC_set(tms5110_state *tms, int data)
case TMS5110_CMD_TEST_TALK:
tms->state = CTL_STATE_NEXT_OUTPUT;
break;
-
+
default:
logerror("tms5110.c: unknown command: 0x%02x\n", tms->CTL_pins);
break;
@@ -962,7 +962,7 @@ static DEVICE_START( tms5110 )
tms->M0_callback = speech_rom_read_bit;
tms->set_load_address = speech_rom_set_addr;
}
-
+
tms->state = CTL_STATE_INPUT; /* most probably not defined */
register_for_save_states(tms);
@@ -1087,7 +1087,7 @@ WRITE8_DEVICE_HANDLER( tms5110_pdc_w )
immediately(?????? not TMS5110) by a RESET command.
TMS5110 datasheets mention this is only available as a result of executing
TEST TALK command.
-
+
FIXME: data read not implemented, CTL1 only available after TALK command
******************************************************************************/
@@ -1137,7 +1137,7 @@ READ8_DEVICE_HANDLER( tms5110_romclk_r )
/* bring up to date first */
stream_update(tms->stream);
-
+
/* create and start timer if necessary */
if (tms->romclk_timer == NULL)
{
diff --git a/src/emu/sound/tms5220.c b/src/emu/sound/tms5220.c
index 8573c1a443d..d96d2c6b8e7 100644
--- a/src/emu/sound/tms5220.c
+++ b/src/emu/sound/tms5220.c
@@ -39,101 +39,101 @@ Note the standard naming for d* data bits with 7 as MSB and 0 as LSB is in lower
TI's naming has D7 as LSB and D0 as MSB and is in uppercase
TODO:
- Implement a ready callback for pc interfaces
- - this will be quite a challenge since for it to be really accurate
- the whole emulation has to run in sync (lots of timers) with the
- cpu cores.
- If a command is still executing, /READY will be kept high until the command has
- finished if the next command is written.
- TMS5220C: see below.
- tomcat has a 5220 which is not hooked up at all
+ Implement a ready callback for pc interfaces
+ - this will be quite a challenge since for it to be really accurate
+ the whole emulation has to run in sync (lots of timers) with the
+ cpu cores.
+ If a command is still executing, /READY will be kept high until the command has
+ finished if the next command is written.
+ TMS5220C: see below.
+ tomcat has a 5220 which is not hooked up at all
Notes:
- Looping has the tms5220 hookep up directly to the cpu. However currently the
- tms9900 cpu core does not support a ready line.
-
- Email from Lord Nightmare having a lot more detail follows:
-
- Yes, there is at least two more differences:
-The 5220 is 'noisier' when playing unvoiced frames than the 5220C is; I
-think the 5220C may use a different energy table (or use one value lower
-in the normal energy table) than the 5220 does, possibly only when
-playing unvoiced frames, but I can't prove this without a decap; the
-5220C's PROMOUT pin (for dumping the lpc tables as played) is
+ Looping has the tms5220 hookep up directly to the cpu. However currently the
+ tms9900 cpu core does not support a ready line.
+
+ Email from Lord Nightmare having a lot more detail follows:
+
+ Yes, there is at least two more differences:
+The 5220 is 'noisier' when playing unvoiced frames than the 5220C is; I
+think the 5220C may use a different energy table (or use one value lower
+in the normal energy table) than the 5220 does, possibly only when
+playing unvoiced frames, but I can't prove this without a decap; the
+5220C's PROMOUT pin (for dumping the lpc tables as played) is
nonfunctional due to changed design or a die bug.
-In addition, the NOP commands on the FIFO interface have been changed
+In addition, the NOP commands on the FIFO interface have been changed
and data passed in the low bits has a meaning regarding frame length:
commands :
(lsb is right, msb is left; x means don't care)
-x0x0xbcc : (5220: NOP) (5220C: select frame length by cc, and b selects
-whether every frame is preceeded by 2 bits to select the frame length
-(instead of using the value set by cc)) (default is 00 for frame length
+x0x0xbcc : (5220: NOP) (5220C: select frame length by cc, and b selects
+whether every frame is preceeded by 2 bits to select the frame length
+(instead of using the value set by cc)) (default is 00 for frame length
(200 samples) and 0 for whether the preceeding 2 bits are enabled (off))
-x001xxxx: sends eight read bit commands (M0 high M1 low) to VSM and
-reads the resulting bits serially into a temporary register, which
-becomes readable as the next byte read from the tms52xx once ready goes
+x001xxxx: sends eight read bit commands (M0 high M1 low) to VSM and
+reads the resulting bits serially into a temporary register, which
+becomes readable as the next byte read from the tms52xx once ready goes
active.
-Note the bit order of the byte read from the TMS52xx is BACKWARDS as
-compared to the actual data order as in the rom on the VSM chips! This
-was IMHO a rather silly design decision of TI. (I asked Larry
-Brantingham about this but he wasn't involved with the TMS52xx chips,
+Note the bit order of the byte read from the TMS52xx is BACKWARDS as
+compared to the actual data order as in the rom on the VSM chips! This
+was IMHO a rather silly design decision of TI. (I asked Larry
+Brantingham about this but he wasn't involved with the TMS52xx chips,
just the 5100)
-There's ASCII data in the TI 99/4 speech module VSMs which has the bit
+There's ASCII data in the TI 99/4 speech module VSMs which has the bit
order reversed on purpose because of this!
-x011xxxx: sends a read and branch command (M0 high, M1 high) to force
-VSM to set its data pointer to whatever the data is at its current
+x011xxxx: sends a read and branch command (M0 high, M1 high) to force
+VSM to set its data pointer to whatever the data is at its current
pointer location is)
-x100aaaa: send a load address command (M0 low M1 high) to vsm with the 4
+x100aaaa: send a load address command (M0 low M1 high) to vsm with the 4
'a' bits
-x101xxxx: 'speak' begins speaking from current address in the data
+x101xxxx: 'speak' begins speaking from current address in the data
pointer of the vsms
x110xxxx: 'speak external' begins speaking from the 16 byte fifo
-x111xxxx: resets the speech synthesis core immediately; clears the bit
-offset counter in the fifo to the nearest byte 'forward ', but does NOT
+x111xxxx: resets the speech synthesis core immediately; clears the bit
+offset counter in the fifo to the nearest byte 'forward ', but does NOT
clear the fifo, annoyingly!
Its also possible but inconclusive that the chirp table was changed.
-The LPC tables between the 5220 and 5220C are MOSTLY the same of not
-completely so, but as mentioned above the energy table has some sort of
+The LPC tables between the 5220 and 5220C are MOSTLY the same of not
+completely so, but as mentioned above the energy table has some sort of
difference.
As for which games used which chips, from the TMS5220 wikipedia page:
-
+
TMS5200 AKA TMC0285: (1981 to 1983ish when supplies ran low)
- Arcade: Zaccaria's 'money money' and 'jack rabbit'; Bally/Midway's
-'Discs of Tron' (all environmental cabs and a few upright cabs; the code
-exists on all versions for the speech though, and upright cabs can be
-upgraded to add it by hacking on a 'Squawk & Talk' pinball speech board
+ Arcade: Zaccaria's 'money money' and 'jack rabbit'; Bally/Midway's
+'Discs of Tron' (all environmental cabs and a few upright cabs; the code
+exists on all versions for the speech though, and upright cabs can be
+upgraded to add it by hacking on a 'Squawk & Talk' pinball speech board
(which is also TMS5200 based) with a few modded components)
Pinball: All Bally/Midway machines which uses the 'Squawk & Talk' board.
- Home computer: TI 99/4 PHP1500 Speech module (along with two VSM
-serial chips); Street Electronics Corp.'s Apple II 'Echo 2' Speech
+ Home computer: TI 99/4 PHP1500 Speech module (along with two VSM
+serial chips); Street Electronics Corp.'s Apple II 'Echo 2' Speech
synthesizer (early cards only)
-TMS5220: (mostly on things made between 1982 and 1984-1985 when supplies
+TMS5220: (mostly on things made between 1982 and 1984-1985 when supplies
ran low)
- Arcade: Bally/Midway's 'NFL Football'; Atari's 'Star Wars',
-'Firefox', 'Return of the Jedi', 'Road Runner', 'The Empire Strikes
-Back' (all verified with schematics); Venture Line's 'Looping' and 'Sky
-Bumper' (need verify for both); Olympia's 'Portraits' (need verify);
+ Arcade: Bally/Midway's 'NFL Football'; Atari's 'Star Wars',
+'Firefox', 'Return of the Jedi', 'Road Runner', 'The Empire Strikes
+Back' (all verified with schematics); Venture Line's 'Looping' and 'Sky
+Bumper' (need verify for both); Olympia's 'Portraits' (need verify);
Exidy's 'Victory' and 'Victor Banana' (need verify for both)
Pinball: Several (don't know names offhand, have not checked schematics)
- Home computer: Street Electronics Corp.'s Apple II 'Echo 2' Speech
-synthesizer (later cards only); Texas Instruments' 'Speak and Learn'
+ Home computer: Street Electronics Corp.'s Apple II 'Echo 2' Speech
+synthesizer (later cards only); Texas Instruments' 'Speak and Learn'
scanner wand unit.
TMS5220C AKA TSP5220C: (on stuff made from 1984 to 1992 or so)
- Arcade: Atari's 'Indiana Jones and the Temple of Doom', '720',
-'Gauntlet', 'Gauntlet II', 'A.P.B.', 'Paperboy', 'RoadBlasters',
-'Vindicators Pt II'(verify?), and 'Escape from the Planet of the Robot
+ Arcade: Atari's 'Indiana Jones and the Temple of Doom', '720',
+'Gauntlet', 'Gauntlet II', 'A.P.B.', 'Paperboy', 'RoadBlasters',
+'Vindicators Pt II'(verify?), and 'Escape from the Planet of the Robot
Monsters' (all verified except for vindicators pt 2)
- Pinball: Several (less common than the tms5220? (not sure about
+ Pinball: Several (less common than the tms5220? (not sure about
this), mostly on later pinballs with LPC speech)
- Home computer: Street Electronics Corp.'s 'ECHO' parallel/hobbyist
-module (6511 based), IBM PS/2 Speech adapter (parallel port connection
+ Home computer: Street Electronics Corp.'s 'ECHO' parallel/hobbyist
+module (6511 based), IBM PS/2 Speech adapter (parallel port connection
device), PES Speech adapter (serial port connection)
@@ -177,7 +177,7 @@ struct _tms5220_state
{
/* callbacks */
devcb_resolved_write_line irq_func;
-
+
/* these contain data that describes the 128-bit data FIFO */
UINT8 fifo[FIFO_SIZE];
UINT8 fifo_head;
@@ -242,20 +242,20 @@ struct _tms5220_state
UINT8 RDB_flag; /* whether we should read data register or status register */
/* io_ready: page 3 of the datasheet specifies that READY will be asserted until
- * data is available or processed by the system.
- */
-
+ * data is available or processed by the system.
+ */
+
UINT8 io_ready;
-
+
/* flag for "true" timing involving rs/ws */
-
+
UINT8 true_timing;
-
+
/* rsws - state, rs bit 1, ws bit 0 */
UINT8 rs_ws;
UINT8 read_latch;
UINT8 write_latch;
-
+
/* flag for variant tmc0285/tms5200 emulation */
/* The TMC0285 AKA TMS5200 is an earlier variant of the TMS5220 used in
the early releases of the Speech Module for the TI-99/4(a) computer,
@@ -1220,7 +1220,7 @@ static DEVICE_START( tms5220 )
tms->clock = device->clock;
/* resolve */
-
+
devcb_resolve_write_line(&tms->irq_func, &tms->intf->irq_func, device);
/* initialize a stream */
@@ -1229,7 +1229,7 @@ static DEVICE_START( tms5220 )
/* not during reset which is called frm within a write! */
tms->io_ready = 1;
tms->true_timing = 0;
-
+
tms->variant = variant_tms5220;
register_for_save_states(tms);
}
@@ -1333,10 +1333,10 @@ WRITE_LINE_DEVICE_HANDLER( tms5220_rsq_w )
{
tms5220_state *tms = get_safe_token(device);
UINT8 new;
-
+
tms->true_timing = 1;
state &= 0x01;
-
+
new = (tms->rs_ws & 0x01) | (state<<1);
if (new != tms->rs_ws)
{
@@ -1345,11 +1345,11 @@ WRITE_LINE_DEVICE_HANDLER( tms5220_rsq_w )
{
if (tms->variant == variant_tms5220c)
device_reset(device);
- else
+ else
/* illegal */
LOG(("tms5220_rs_w: illegal\n"));
return;
- }
+ }
else if ( new == 3)
{
/* high impedance */
@@ -1359,7 +1359,7 @@ WRITE_LINE_DEVICE_HANDLER( tms5220_rsq_w )
if (state)
{
/* low to high */
- }
+ }
else
{
/* high to low - schedule ready cycle*/
@@ -1377,7 +1377,7 @@ WRITE_LINE_DEVICE_HANDLER( tms5220_wsq_w )
{
tms5220_state *tms = get_safe_token(device);
UINT8 new;
-
+
tms->true_timing = 1;
state &= 0x01;
new = (tms->rs_ws & 0x02) | (state<<0);
@@ -1388,11 +1388,11 @@ WRITE_LINE_DEVICE_HANDLER( tms5220_wsq_w )
{
if (tms->variant == variant_tms5220c)
device_reset(device);
- else
+ else
/* illegal */
LOG(("tms5220_ws_w: illegal\n"));
return;
- }
+ }
else if ( new == 3)
{
/* high impedance */
@@ -1402,7 +1402,7 @@ WRITE_LINE_DEVICE_HANDLER( tms5220_wsq_w )
if (state)
{
/* low to high */
- }
+ }
else
{
/* high to low - schedule ready cycle*/
@@ -1577,7 +1577,7 @@ static const char DEVTEMPLATE_SOURCE[] = __FILE__;
#include "devtempl.h"
#define DEVTEMPLATE_DERIVED_ID(p,s) p##tms5220c##s
-#define DEVTEMPLATE_DERIVED_FEATURES DT_HAS_START
+#define DEVTEMPLATE_DERIVED_FEATURES DT_HAS_START
#define DEVTEMPLATE_DERIVED_NAME "TMS5220C"
#include "devtempl.h"
diff --git a/src/mame/audio/dkong.c b/src/mame/audio/dkong.c
index 40d49689447..a08352e8412 100644
--- a/src/mame/audio/dkong.c
+++ b/src/mame/audio/dkong.c
@@ -879,28 +879,28 @@ static DISCRETE_SOUND_START(dkongjr)
DISCRETE_TASK_START()
DISCRETE_LOGIC_INVERT(DS_SOUND7,DS_SOUND7_INV)
DISCRETE_COUNTER(NODE_100,1,0,NODE_118,0xFFFF,DISC_COUNT_UP,0,DISC_CLK_BY_COUNT)
-
+
DISCRETE_BIT_DECODE(NODE_101, NODE_100, 6, 1) /*LS157 2A */
DISCRETE_BIT_DECODE(NODE_102, NODE_100, 3, 1) /*LS157 2B */
DISCRETE_BIT_DECODE(NODE_103, NODE_100, 12, 1) /*LS157 3A */
DISCRETE_BIT_DECODE(NODE_104, NODE_100, 11, 1) /*LS157 3B */
-
+
/* LS157 Switches */
DISCRETE_SWITCH(NODE_105, 1, DS_SOUND7_INV, GND, NODE_113) /* Switch 1 from LS624 */
DISCRETE_SWITCH(NODE_106, 1, DS_SOUND7_INV, NODE_101, NODE_102) /* Switch 2 */
DISCRETE_SWITCH(NODE_107, 1, DS_SOUND7_INV, NODE_103, NODE_104) /* Switch 3 */
-
+
DISCRETE_LS123(NODE_110, DS_SOUND0_INV, JR_R8, JR_C14)
DISCRETE_TRANSFORM2(NODE_111, TTL_HIGH, NODE_110, "01-")
DISCRETE_RCFILTER(NODE_112, 1, NODE_111, JR_R10, JR_C17)
DISCRETE_74LS624(NODE_113, NODE_112, DK_SUP_V, JR_C18, DISC_LS624_OUT_ENERGY)
-
+
DISCRETE_LOGIC_XOR(NODE_115, NODE_105, NODE_106)
-
+
DISCRETE_TRANSFORM2(NODE_116, NODE_107, TTL_HIGH, "0!1*")
DISCRETE_RCFILTER(NODE_117, 1, NODE_116, JR_R11, JR_C16)
DISCRETE_74LS624(NODE_118, NODE_117, DK_SUP_V, JR_C19, DISC_LS624_OUT_COUNT_F)
-
+
DISCRETE_LOGIC_NAND(NODE_120, NODE_115, NODE_110)
DISCRETE_MULTIPLY(DS_OUT_SOUND0, NODE_120, TTL_HIGH)
DISCRETE_TASK_END()
@@ -973,7 +973,7 @@ DISCRETE_TASK_START()
DISCRETE_SALLEN_KEY_FILTER(DS_OUT_DAC, 1, NODE_171, DISC_SALLEN_KEY_LOW_PASS, &dkong_sallen_key_info)
DISCRETE_TASK_END()
-
+
/************************************************/
/* Amplifier */
/************************************************/
diff --git a/src/mame/audio/skyraid.c b/src/mame/audio/skyraid.c
index 0d85c9b8a43..4cfca9c8c81 100644
--- a/src/mame/audio/skyraid.c
+++ b/src/mame/audio/skyraid.c
@@ -311,8 +311,8 @@ static const discrete_custom_info skyraid_missle_custom_charge =
DISCRETE_SOUND_START( skyraid )
/************************************************
- * Input register mapping
- ************************************************/
+ * Input register mapping
+ ************************************************/
/* convert the PLANE_SWEEP line to voltage*/
DISCRETE_INPUTX_LOGIC(SKYRAID_PLANE_SWEEP_EN, DEFAULT_TTL_V_LOGIC_1 * RES_VOLTAGE_DIVIDER(SKYRAID_R25, SKYRAID_R24), 0, 0)
DISCRETE_INPUT_LOGIC(SKYRAID_MISSILE_EN)
@@ -322,8 +322,8 @@ DISCRETE_SOUND_START( skyraid )
DISCRETE_INPUT_LOGIC(SKYRAID_ATTRACT_EN)
/************************************************
- * Noise Generator, Explosion sound
- ************************************************/
+ * Noise Generator, Explosion sound
+ ************************************************/
/* Note: the noise reset is not emulated 100% accurate */
/* According to the schematics, Attract only clears the lower 8 bits. */
/* I may modify the noise module in the future to properly emulate this, */
@@ -346,8 +346,8 @@ DISCRETE_SOUND_START( skyraid )
DISCRETE_CLAMP(SKYRAID_EXPLOSION_SND, 1, NODE_23, -5, 12.0 - 1.5, 0)
/************************************************
- * Jet, Plane sound
- ************************************************/
+ * Jet, Plane sound
+ ************************************************/
DISCRETE_RCFILTER(NODE_30, /* IC J6, pin 5 */
1, /* ENAB */
SKYRAID_PLANE_SWEEP_EN, /* IN0 */
@@ -368,8 +368,8 @@ DISCRETE_SOUND_START( skyraid )
DISCRETE_BIT_DECODE(SKYRAID_JET_B_SND, NODE_32, 15, DEFAULT_TTL_V_LOGIC_1) /* IC J7, pin 13 */
/************************************************
- * Missle sound
- ************************************************/
+ * Missle sound
+ ************************************************/
DISCRETE_CUSTOM5(NODE_40, SKYRAID_MISSILE_EN, SKYRAID_R12, SKYRAID_R14, SKYRAID_R13, SKYRAID_C44, &skyraid_missle_custom_charge)
DISCRETE_566(NODE_41, /* IC K6, pin 3 */
NODE_40, /* VMOD */
@@ -382,8 +382,8 @@ DISCRETE_SOUND_START( skyraid )
DISCRETE_BIT_DECODE(SKYRAID_MSL_B_SND, NODE_42, 15, DEFAULT_TTL_V_LOGIC_1) /* IC L7, pin 13 */
/************************************************
- * Final Mix
- ************************************************/
+ * Final Mix
+ ************************************************/
DISCRETE_LOGIC_INVERT(NODE_91, SKYRAID_ATTRACT_EN)
DISCRETE_MIXER6(NODE_92,
NODE_91, /* ENAB */
diff --git a/src/mame/drivers/amaticmg.c b/src/mame/drivers/amaticmg.c
index 52d15b1e6cd..95c114d301b 100644
--- a/src/mame/drivers/amaticmg.c
+++ b/src/mame/drivers/amaticmg.c
@@ -334,21 +334,21 @@ static PALETTE_INIT( amaticmg )
static ADDRESS_MAP_START( amaticmg_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x00000, 0x3ffff) AM_ROM
-// AM_RANGE(0x0000, 0x0000) AM_RAM // AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
-// AM_RANGE(0x0000, 0x0000) AM_DEVWRITE("crtc", mc6845_address_w)
-// AM_RANGE(0x0000, 0x0000) AM_DEVREADWRITE("crtc", mc6845_register_r, mc6845_register_w)
-// AM_RANGE(0x0000, 0x0000) AM_RAM_WRITE(amaticmg_videoram_w) AM_BASE(&videoram)
-// AM_RANGE(0x0000, 0x0000) AM_RAM_WRITE(amaticmg_colorram_w) AM_BASE(&colorram)
+// AM_RANGE(0x0000, 0x0000) AM_RAM // AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
+// AM_RANGE(0x0000, 0x0000) AM_DEVWRITE("crtc", mc6845_address_w)
+// AM_RANGE(0x0000, 0x0000) AM_DEVREADWRITE("crtc", mc6845_register_r, mc6845_register_w)
+// AM_RANGE(0x0000, 0x0000) AM_RAM_WRITE(amaticmg_videoram_w) AM_BASE(&videoram)
+// AM_RANGE(0x0000, 0x0000) AM_RAM_WRITE(amaticmg_colorram_w) AM_BASE(&colorram)
ADDRESS_MAP_END
static ADDRESS_MAP_START( amaticmg_portmap, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
-// AM_RANGE(0x00, 0x00) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w)
-// AM_RANGE(0x00, 0x00) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w)
-// AM_RANGE(0x00, 0x00) AM_DEVREADWRITE("ppi8255_2", ppi8255_r, ppi8255_w)
-// AM_RANGE(0x00, 0x00) AM_DEVWRITE("ym", ym3812_w)
-// AM_RANGE(0x00, 0x00) AM_DEVWRITE("dac1", dac_signed_w)
-// AM_RANGE(0x00, 0x00) AM_DEVWRITE("dac2", dac_signed_w)
+// AM_RANGE(0x00, 0x00) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w)
+// AM_RANGE(0x00, 0x00) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w)
+// AM_RANGE(0x00, 0x00) AM_DEVREADWRITE("ppi8255_2", ppi8255_r, ppi8255_w)
+// AM_RANGE(0x00, 0x00) AM_DEVWRITE("ym", ym3812_w)
+// AM_RANGE(0x00, 0x00) AM_DEVWRITE("dac1", dac_signed_w)
+// AM_RANGE(0x00, 0x00) AM_DEVWRITE("dac2", dac_signed_w)
ADDRESS_MAP_END
@@ -466,7 +466,7 @@ GFXDECODE_END
//static const ym3812_interface ym3812_config =
//{
-// sound_irq
+// sound_irq
//};
@@ -476,16 +476,16 @@ GFXDECODE_END
//static const mc6845_interface mc6845_intf =
//{
-// "screen", /* screen we are acting on */
-// 8, /* number of pixels per video memory address */
-// NULL, /* before pixel update callback */
-// NULL, /* row update callback */
-// NULL, /* after pixel update callback */
-// DEVCB_NULL, /* callback for display state changes */
-// DEVCB_NULL, /* callback for cursor state changes */
-// DEVCB_NULL, /* HSYNC callback */
-// DEVCB_NULL, /* VSYNC callback */
-// NULL /* update address callback */
+// "screen", /* screen we are acting on */
+// 8, /* number of pixels per video memory address */
+// NULL, /* before pixel update callback */
+// NULL, /* row update callback */
+// NULL, /* after pixel update callback */
+// DEVCB_NULL, /* callback for display state changes */
+// DEVCB_NULL, /* callback for cursor state changes */
+// DEVCB_NULL, /* HSYNC callback */
+// DEVCB_NULL, /* VSYNC callback */
+// NULL /* update address callback */
//};
@@ -495,30 +495,30 @@ GFXDECODE_END
//static const ppi8255_interface ppi8255_intf[3] =
//{
-// { /* (00-00) Mode X - Port X set as input */
-// DEVCB_NULL, /* Port A read */
-// DEVCB_NULL, /* Port B read */
-// DEVCB_NULL, /* Port C read */
-// DEVCB_NULL, /* Port A write */
-// DEVCB_NULL, /* Port B write */
-// DEVCB_NULL, /* Port C write */
-// },
-// { /* (00-00) Mode X - Port X set as input */
-// DEVCB_NULL, /* Port A read */
-// DEVCB_NULL, /* Port B read */
-// DEVCB_NULL, /* Port C read */
-// DEVCB_NULL, /* Port A write */
-// DEVCB_NULL, /* Port B write */
-// DEVCB_NULL, /* Port C write */
-// },
-// { /* (00-00) Mode X - Port X set as input */
-// DEVCB_NULL, /* Port A read */
-// DEVCB_NULL, /* Port B read */
-// DEVCB_NULL, /* Port C read */
-// DEVCB_NULL, /* Port A write */
-// DEVCB_NULL, /* Port B write */
-// DEVCB_NULL, /* Port C write */
-// }
+// { /* (00-00) Mode X - Port X set as input */
+// DEVCB_NULL, /* Port A read */
+// DEVCB_NULL, /* Port B read */
+// DEVCB_NULL, /* Port C read */
+// DEVCB_NULL, /* Port A write */
+// DEVCB_NULL, /* Port B write */
+// DEVCB_NULL, /* Port C write */
+// },
+// { /* (00-00) Mode X - Port X set as input */
+// DEVCB_NULL, /* Port A read */
+// DEVCB_NULL, /* Port B read */
+// DEVCB_NULL, /* Port C read */
+// DEVCB_NULL, /* Port A write */
+// DEVCB_NULL, /* Port B write */
+// DEVCB_NULL, /* Port C write */
+// },
+// { /* (00-00) Mode X - Port X set as input */
+// DEVCB_NULL, /* Port A read */
+// DEVCB_NULL, /* Port B read */
+// DEVCB_NULL, /* Port C read */
+// DEVCB_NULL, /* Port A write */
+// DEVCB_NULL, /* Port B write */
+// DEVCB_NULL, /* Port C write */
+// }
//};
/************************************
@@ -532,12 +532,12 @@ static MACHINE_DRIVER_START( amaticmg )
MDRV_CPU_IO_MAP(amaticmg_portmap)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
-// MDRV_NVRAM_HANDLER(generic_0fill)
+// MDRV_NVRAM_HANDLER(generic_0fill)
/* 3x 8255 */
-// MDRV_PPI8255_ADD( "ppi8255_0", ppi8255_intf[0] )
-// MDRV_PPI8255_ADD( "ppi8255_1", ppi8255_intf[1] )
-// MDRV_PPI8255_ADD( "ppi8255_2", ppi8255_intf[2] )
+// MDRV_PPI8255_ADD( "ppi8255_0", ppi8255_intf[0] )
+// MDRV_PPI8255_ADD( "ppi8255_1", ppi8255_intf[1] )
+// MDRV_PPI8255_ADD( "ppi8255_2", ppi8255_intf[2] )
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -547,7 +547,7 @@ static MACHINE_DRIVER_START( amaticmg )
MDRV_SCREEN_SIZE(512, 256)
MDRV_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1)
-// MDRV_MC6845_ADD("crtc", MC6845, CRTC_CLOCK, mc6845_intf)
+// MDRV_MC6845_ADD("crtc", MC6845, CRTC_CLOCK, mc6845_intf)
MDRV_GFXDECODE(amaticmg)
@@ -557,14 +557,14 @@ static MACHINE_DRIVER_START( amaticmg )
MDRV_VIDEO_UPDATE(amaticmg)
/* sound hardware */
-// MDRV_SPEAKER_STANDARD_MONO("mono")
+// MDRV_SPEAKER_STANDARD_MONO("mono")
-// MDRV_SOUND_ADD("ym", YM3812, SND_CLOCK)
-// MDRV_SOUND_CONFIG(ym3812_config)
-// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+// MDRV_SOUND_ADD("ym", YM3812, SND_CLOCK)
+// MDRV_SOUND_CONFIG(ym3812_config)
+// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
-// MDRV_SOUND_ADD("dac", DAC, 0) /* Y3014B */
-// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+// MDRV_SOUND_ADD("dac", DAC, 0) /* Y3014B */
+// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/cvs.c b/src/mame/drivers/cvs.c
index e3f7677a36d..0f3cd7975c6 100644
--- a/src/mame/drivers/cvs.c
+++ b/src/mame/drivers/cvs.c
@@ -81,13 +81,13 @@ Hardware Info
Malcolm & Darren
Additional work
- 2009 Couriersud
+ 2009 Couriersud
Todo & FIXME:
-- the board most probably has discrete circuits. The 393Hz tone used
+- the board most probably has discrete circuits. The 393Hz tone used
for shots (superbike) and collisions (8ball) is just a guess.
-
+
***************************************************************************/
#include "driver.h"
@@ -345,7 +345,7 @@ static WRITE8_DEVICE_HANDLER( cvs_4_bit_dac_data_w )
{
UINT8 dac_value;
static int old_data[4] = {0,0,0,0};
-
+
if (data != old_data[offset])
{
LOG(("4BIT: %02x %02x\n", offset, data));
@@ -366,12 +366,12 @@ static WRITE8_DEVICE_HANDLER( cvs_4_bit_dac_data_w )
static WRITE8_DEVICE_HANDLER( cvs_unknown_w )
{
/* offset 2 is used in 8ball
- * offset 0 is used in spacefrt
- * offset 3 is used in darkwar
- *
- * offset 1 is not used (no trace in disassembly
- */
-
+ * offset 0 is used in spacefrt
+ * offset 3 is used in darkwar
+ *
+ * offset 1 is not used (no trace in disassembly
+ */
+
if (data != dac3_state[offset])
{
if (offset != 2)
@@ -405,8 +405,8 @@ static WRITE8_HANDLER( cvs_speech_rom_address_hi_w )
static READ8_HANDLER( cvs_speech_command_r )
{
/* FIXME: this was by observation on board ???
- * -bit 7 is TMS status (active LO) */
- return ((tms5110_ctl_r(devtag_get_device(space->machine, "tms"), 0) ^ 1) << 7)
+ * -bit 7 is TMS status (active LO) */
+ return ((tms5110_ctl_r(devtag_get_device(space->machine, "tms"), 0) ^ 1) << 7)
| (soundlatch_r(space, 0) & 0x7f);
}
@@ -415,8 +415,8 @@ static WRITE8_DEVICE_HANDLER( cvs_tms5110_ctl_w )
{
UINT8 ctl;
/*
- * offset 0: CS ?
- */
+ * offset 0: CS ?
+ */
cvs_tms5110_ctl_data[offset] = (~data >> 7) & 0x01;
ctl = 0 | /* CTL1 */
@@ -497,7 +497,7 @@ MACHINE_START( cvs )
gfx_element_set_source(machine->gfx[1], cvs_character_ram);
start_393hz_timer(machine);
-
+
/* register state save */
state_save_register_global_pointer(machine, cvs_color_ram, 0x400);
state_save_register_global_pointer(machine, cvs_palette_ram, 0x10);
@@ -584,7 +584,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( cvs_speech_cpu_io_map, ADDRESS_SPACE_IO, 8 )
/* romclk is much more probable, 393 Hz results in timing issues */
-// AM_RANGE(S2650_SENSE_PORT, S2650_SENSE_PORT) AM_READ(cvs_393hz_clock_r)
+// AM_RANGE(S2650_SENSE_PORT, S2650_SENSE_PORT) AM_READ(cvs_393hz_clock_r)
AM_RANGE(S2650_SENSE_PORT, S2650_SENSE_PORT) AM_DEVREAD("tms", tms_clock_r)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/dkong.c b/src/mame/drivers/dkong.c
index 737b5b724bb..45084ae1821 100644
--- a/src/mame/drivers/dkong.c
+++ b/src/mame/drivers/dkong.c
@@ -654,7 +654,7 @@ static WRITE8_HANDLER( s2650_fo_w )
#endif
state->main_fo = data;
-
+
if (state->main_fo)
state->hunchloopback = 0xfb;
}
@@ -669,16 +669,16 @@ static READ8_HANDLER( s2650_port0_r )
switch (state->protect_type)
{
case DK2650_SHOOTGAL:
- case DK2650_HUNCHBKD:
+ case DK2650_HUNCHBKD:
if (state->main_fo)
return state->hunchloopback;
else
return state->hunchloopback--;
- case DK2650_SPCLFORC:
+ case DK2650_SPCLFORC:
if (!state->main_fo)
- return state->hunchloopback;
+ return state->hunchloopback;
else
- return state->hunchloopback--;
+ return state->hunchloopback--;
}
fatalerror("Unhandled read from port 0 : pc = %4x\n",cpu_get_pc(space->cpu));
}
@@ -687,17 +687,17 @@ static READ8_HANDLER( s2650_port0_r )
static READ8_HANDLER( s2650_port1_r )
{
dkong_state *state = (dkong_state *)space->machine->driver_data;
-
+
#if DEBUG_PROTECTION
logerror("port 1 : pc = %04x, loopback = %02x fo=%d\n",cpu_get_pc(space->cpu), state->hunchloopback, state->main_fo);
#endif
switch (state->protect_type)
{
- case DK2650_HUNCHBKD:
+ case DK2650_HUNCHBKD:
return state->hunchloopback--;
case DK2650_EIGHTACT:
- case DK2650_HERBIEDK:
+ case DK2650_HERBIEDK:
if (state->hunchloopback & 0x80)
return state->prot_cnt;
else
diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c
index 1ba0aeac888..c281c1c4ef8 100644
--- a/src/mame/drivers/naomi.c
+++ b/src/mame/drivers/naomi.c
@@ -3043,7 +3043,7 @@ ROM_START( hmgeo )
ROM_LOAD("mpr-23712.ic8", 0x4000000, 0x0800000, CRC(154f10ce) SHA1(67f6ff297f77632efe1965a81ed9f5c7dfa7a6b3) )
ROM_LOAD("mpr-23713.ic9", 0x4800000, 0x0800000, CRC(2969bac7) SHA1(5f1cf6ac726c2fe183d66e4022962e44592f9ccd) )
ROM_LOAD("mpr-23714.ic10",0x5000000, 0x0800000, CRC(da462c44) SHA1(ca450b6c07f939f96eba7b44c45b4e38abd598aa) )
- ROM_LOAD("mpr-23715.ic11",0x5800000, 0x0800000, CRC(c750abbd) SHA1(2a5bedc2b21cd3f991c7145ccfd8c7a9e7f647ae) )
+ ROM_LOAD("mpr-23715.ic11",0x5800000, 0x0800000, CRC(c750abbd) SHA1(2a5bedc2b21cd3f991c7145ccfd8c7a9e7f647ae) )
// trojaned protection data
ROM_REGION( 0x200000, "naomibd_prot", ROMREGION_ERASE00 )
ROM_LOAD( "a3075ac0.bin", 0x000000, 0x00ff04, CRC(440dca2a) SHA1(4e261ff309e7e774fa2061de30174b0e4e967c00) )
@@ -3475,11 +3475,11 @@ ROM_START( pstone2 )
ROM_LOAD( "a2765e00.bin", 0x010000, 0x00e47c, CRC(d9acaa94) SHA1(6ab7ebc2dd78c0bc007f3656a67f3c24d23d48ae) )
ROM_LOAD( "a2774280.bin", 0x020000, 0x00c61c, CRC(8dd9581f) SHA1(f852c44e423effa894769d3e156325a132b2df8e) )
ROM_LOAD( "a27808a0.bin", 0x030000, 0x005568, CRC(4f4aee03) SHA1(453c0ec08ca69ad844f24be290e92bf16231a713) )
- ROM_LOAD( "a154bdc0.bin", 0x040000, 0x00ec9c, CRC(755a7343) SHA1(a4355850e1cb6f81d53d461e70884a5c51083454) )
- ROM_LOAD( "a155aa60.bin", 0x050000, 0x00951c, CRC(fc7a23d8) SHA1(a428114d89471f4b4c8af6d932376e7b0887c4cc) )
- ROM_LOAD( "a1563f80.bin", 0x060000, 0x009f3c, CRC(90903b9c) SHA1(da6fcda74710497bab97c4c8342d93b5dfb14184) )
- ROM_LOAD( "a156dec0.bin", 0x070000, 0x00dbdc, CRC(fb7b0b77) SHA1(ace73e925e5ffa3f805ff0ef68b564119cf4ce41) )
- ROM_LOAD( "a157baa0.bin", 0x080000, 0x00cb3c, CRC(60e5dad6) SHA1(db8880ebbc3ebb02d861aa3bcf2cc34071d613e8) )
+ ROM_LOAD( "a154bdc0.bin", 0x040000, 0x00ec9c, CRC(755a7343) SHA1(a4355850e1cb6f81d53d461e70884a5c51083454) )
+ ROM_LOAD( "a155aa60.bin", 0x050000, 0x00951c, CRC(fc7a23d8) SHA1(a428114d89471f4b4c8af6d932376e7b0887c4cc) )
+ ROM_LOAD( "a1563f80.bin", 0x060000, 0x009f3c, CRC(90903b9c) SHA1(da6fcda74710497bab97c4c8342d93b5dfb14184) )
+ ROM_LOAD( "a156dec0.bin", 0x070000, 0x00dbdc, CRC(fb7b0b77) SHA1(ace73e925e5ffa3f805ff0ef68b564119cf4ce41) )
+ ROM_LOAD( "a157baa0.bin", 0x080000, 0x00cb3c, CRC(60e5dad6) SHA1(db8880ebbc3ebb02d861aa3bcf2cc34071d613e8) )
ROM_LOAD( "a15885e0.bin", 0x090000, 0x00e91c, CRC(6b2e1400) SHA1(8965e97e3d85a568c2bef2d1d0faf5b8aee289d0) )
ROM_LOAD( "a1596f00.bin", 0x0a0000, 0x00a3bc, CRC(cf538afa) SHA1(b7f94195760a0b14c18654823ead2e28fe526b07) )
ROM_LOAD( "a15a12c0.bin", 0x0b0000, 0x007f04, CRC(e07d589b) SHA1(60bc7f3e91d1f22b4854777644add346e5df58bb) )
@@ -5906,14 +5906,14 @@ GAME( 2001, awbios, 0, aw, aw, 0, ROT0, "Sammy",
GAME( 2002, sprtshot, awbios, aw, aw, sprtshot, ROT0, "Sammy USA", "Sports Shooting USA", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
GAME( 2003, demofist, awbios, aw, aw, demofist, ROT0, "Polygon Magic / Dimps", "Demolish Fist", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
-GAME( 2003, dolphin, awbios, aw, aw, dolphin, ROT0, "Sammy", "Dolphin Blue", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND )
-GAME( 2003, ggisuka, awbios, aw, aw, ggisuka, ROT0, "Sammy / Arc System Works", "Guilty Gear Isuka", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND )
-GAME( 2004, rumblef, awbios, aw, aw, rumblef, ROT0, "Sammy / Dimps", "The Rumble Fish", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND )
+GAME( 2003, dolphin, awbios, aw, aw, dolphin, ROT0, "Sammy", "Dolphin Blue", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND )
+GAME( 2003, ggisuka, awbios, aw, aw, ggisuka, ROT0, "Sammy / Arc System Works", "Guilty Gear Isuka", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND )
+GAME( 2004, rumblef, awbios, aw, aw, rumblef, ROT0, "Sammy / Dimps", "The Rumble Fish", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND )
GAME( 2004, rangrmsn, awbios, aw, aw, rangrmsn, ROT0, "Sammy", "Ranger Mission", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
GAME( 2004, salmankt, awbios, aw, aw, salmankt, ROT0, "Sammy", "Salary Man Kintarou", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
-GAME( 2004, kov7sprt, awbios, aw, aw, kov7sprt, ROT0, "Sammy / IGS", "Knights of Valour - The Seven Spirits", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND )
-GAME( 2005, vfurlong, awbios, aw, aw, vfurlong, ROT0, "Sammy", "Net Select Keiba Victory Furlong", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
-GAME( 2005, ngbc, awbios, aw, aw, ngbc, ROT0, "Sammy / SNK Playmore", "Neo-Geo Battle Coliseum", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
+GAME( 2004, kov7sprt, awbios, aw, aw, kov7sprt, ROT0, "Sammy / IGS", "Knights of Valour - The Seven Spirits", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND )
+GAME( 2005, vfurlong, awbios, aw, aw, vfurlong, ROT0, "Sammy", "Net Select Keiba Victory Furlong", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
+GAME( 2005, ngbc, awbios, aw, aw, ngbc, ROT0, "Sammy / SNK Playmore", "Neo-Geo Battle Coliseum", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
GAME( 2005, fotns, awbios, aw, aw, fotns, ROT0, "Sega / Arc System Works", "Fist Of The North Star", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
GAME( 2005, kofnw, awbios, aw, aw, kofnw, ROT0, "Sammy / SNK Playmore", "The King of Fighters Neowave", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
GAME( 2005, xtrmhunt, awbios, aw, aw, xtrmhunt, ROT0, "Sammy", "Extreme Hunting", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
diff --git a/src/mame/drivers/neodrvr.c b/src/mame/drivers/neodrvr.c
index 820c7da7210..5614d83ce74 100644
--- a/src/mame/drivers/neodrvr.c
+++ b/src/mame/drivers/neodrvr.c
@@ -703,18 +703,18 @@ INPUT_PORTS_END
MVS carts (arcade) were released before the AES carts (home)
The actual codepath taken depends entirely on the BIOS rom, not the roms in the cartridge, which (with
a few exceptions) support both codepaths.
-
+
The initial AES releases are therefore later revisions of the game, often with bug fixes over the
initial MVS releases. It isn't uncommon for later production runs and bootlegs to use these newer sets,
so all of them are supported in MAME.
-
+
Likewise, because the MVS carts were released first (and were produced in higher numbers and generally
have a lower cost) it's not uncommon for AES units to operate with converted MVS carts, so, with the
exception of the sets that specifically lock out the AES mode* these sets are all equally suitable
for MESS.
-
+
* nitd, kof2001 (initial release has no AES code), and a number of the hacked bootlegs.
-
+
*/
/* dummy entry for the dummy bios driver */
@@ -1921,12 +1921,12 @@ ROM_START( samshoh ) /* AES VERSION */
ROM_END
/* Old version looked like this; p's on eprom?
- ROM_START( samsho )
- ROM_REGION( 0x180000, "maincpu", 0 )
- ROM_LOAD16_WORD_SWAP( "045-p1.bin", 0x000000, 0x080000, CRC(80aa6c97) SHA1(6e07a4aa7b4719ae487a10cee9389cb55a370a7a) )
- ROM_LOAD16_WORD_SWAP( "045-p2.bin", 0x080000, 0x080000, CRC(71768728) SHA1(9ff0e01d3fb73ad04279d4fdf4c53c3160888179) )
- ROM_LOAD16_WORD_SWAP( "045-p3.bin", 0x100000, 0x080000, CRC(38ee9ba9) SHA1(48190699a6be83cb6257365ae81f93fdd23abe09) )
- */
+ ROM_START( samsho )
+ ROM_REGION( 0x180000, "maincpu", 0 )
+ ROM_LOAD16_WORD_SWAP( "045-p1.bin", 0x000000, 0x080000, CRC(80aa6c97) SHA1(6e07a4aa7b4719ae487a10cee9389cb55a370a7a) )
+ ROM_LOAD16_WORD_SWAP( "045-p2.bin", 0x080000, 0x080000, CRC(71768728) SHA1(9ff0e01d3fb73ad04279d4fdf4c53c3160888179) )
+ ROM_LOAD16_WORD_SWAP( "045-p3.bin", 0x100000, 0x080000, CRC(38ee9ba9) SHA1(48190699a6be83cb6257365ae81f93fdd23abe09) )
+ */
ROM_START( tophuntr ) /* MVS VERSION */
ROM_REGION( 0x200000, "maincpu", 0 )
@@ -2392,7 +2392,7 @@ ROM_START( fightfeva ) /* MVS VERSION */
ROM_REGION( 0x200000, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "060-p1.rom", 0x0000000, 0x100000, CRC(2a104b50) SHA1(3eb663d3df7074e1cdf4c0e450a35c9cf55d8979) )
/* There was also a copy of the 060-p1.bin with the name 060-p2.bin maybe it should be loaded over the top or this
- larger rom is an older revision... */
+ larger rom is an older revision... */
NEO_SFIX_128K( "060-s1.bin", CRC(7f012104) SHA1(f366dcc3923655dff16ec08a40d5fce22a84257d) )
@@ -2914,7 +2914,7 @@ ROM_END
ROM_START( pbobblen ) /* MVS VERSION */
/* This set uses CHA and PROG board from Power Spikes II. Six Power Spikes II prom's are replaced with
- Puzzle Bobble prom's. Confirmed on several original carts. Do other layouts also exist? */
+ Puzzle Bobble prom's. Confirmed on several original carts. Do other layouts also exist? */
ROM_REGION( 0x100000, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "d96-07.ep1", 0x000000, 0x080000, CRC(6102ca14) SHA1(328429d11de5b327a0654ae0548da4d0025a2ae6) )
@@ -5363,10 +5363,10 @@ ROM_END
ROM_START( mslug4 ) /* Original Version - Encrypted GFX */ /* MVS VERSION */
ROM_REGION( 0x500000, "maincpu", 0 )
/* There also exist carts where p1 label is pg1;
- The PG1 revision has a Japanese cart label, SN 02Jxxxxx
- The P1 revision has a US/EUR cart label, SN 02Txxxxx
- Rom data on both is identical.
- These carts were manufactured by Mega Enterprise, not SNK. */
+ The PG1 revision has a Japanese cart label, SN 02Jxxxxx
+ The P1 revision has a US/EUR cart label, SN 02Txxxxx
+ Rom data on both is identical.
+ These carts were manufactured by Mega Enterprise, not SNK. */
ROM_LOAD16_WORD_SWAP( "263-p1.bin", 0x000000, 0x100000, CRC(27e4def3) SHA1(a08785e8145981bb6b5332a3b2df7eb321253cca) )
ROM_LOAD16_WORD_SWAP( "263-p2.bin", 0x100000, 0x400000, CRC(fdb7aed8) SHA1(dbeaec38f44e58ffedba99e70fa1439c2bf0dfa3) )
diff --git a/src/mame/drivers/photon2.c b/src/mame/drivers/photon2.c
index 7a5afe19186..f1afcab600b 100644
--- a/src/mame/drivers/photon2.c
+++ b/src/mame/drivers/photon2.c
@@ -5,7 +5,7 @@
Russian arcade system based on ZX Spectrum home computer.
- Each coin buys you 1-6 minutes of game time.
+ Each coin buys you 1-6 minutes of game time.
*/
#include "driver.h"
diff --git a/src/mame/drivers/tomcat.c b/src/mame/drivers/tomcat.c
index 17679e45174..5f02c0be4d8 100644
--- a/src/mame/drivers/tomcat.c
+++ b/src/mame/drivers/tomcat.c
@@ -18,7 +18,7 @@
- current implementation of 68010 <-> tms32010 is a little bit hacky, after
tms32010 is started by 68010, 68010 is suspended until tms32010 reads command
and starts executing
- - hook up tms5220 - it is currently not used at all
+ - hook up tms5220 - it is currently not used at all
*/
diff --git a/src/mame/drivers/xmen.c b/src/mame/drivers/xmen.c
index 470ff02125c..23a5bf71da6 100644
--- a/src/mame/drivers/xmen.c
+++ b/src/mame/drivers/xmen.c
@@ -569,7 +569,7 @@ ROM_START( xmenj )
ROM_REGION( 0x200000, "konami", 0 ) /* samples for the 054539 */
ROM_LOAD( "065-a06.1f", 0x000000, 0x200000, CRC(5adbcee0) SHA1(435feda697193bc51db80eba46be474cbbc1de4b) )
ROM_END
-
+
ROM_START( xmen2pe )
ROM_REGION( 0x100000, "maincpu", 0 )
ROM_LOAD16_BYTE( "065-eaa04.10d", 0x00000, 0x20000, CRC(502861e7) SHA1(f96aab2d2006703065de5bd7e341f929d04f5f60) ) /* Europe 2 Player version */
diff --git a/src/mame/drivers/zaccaria.c b/src/mame/drivers/zaccaria.c
index 099e852077f..da27ae1b5c1 100644
--- a/src/mame/drivers/zaccaria.c
+++ b/src/mame/drivers/zaccaria.c
@@ -91,10 +91,10 @@ static READ8_HANDLER( zaccaria_dsw_r )
static WRITE8_DEVICE_HANDLER( ay8910_port0a_w )
{
/* bits 0-2 go to a 74LS156 with open collector outputs
- * one out of 8 Resitors is than used to form a resistor
- * divider with Analog input 5 (tromba)
- */
-
+ * one out of 8 Resitors is than used to form a resistor
+ * divider with Analog input 5 (tromba)
+ */
+
// bits 3-4 control the analog drum emulation on 8910 #0 ch. A
static const int table[8] = { 8200, 5600, 3300, 1500, 820, 390, 150, 47 };
@@ -110,14 +110,14 @@ static WRITE8_DEVICE_HANDLER( ay8910_port0a_w )
}
-static WRITE_LINE_DEVICE_HANDLER( zaccaria_irq0a )
-{
- cputag_set_input_line(device->machine, "audiocpu", INPUT_LINE_NMI, state ? ASSERT_LINE : CLEAR_LINE);
+static WRITE_LINE_DEVICE_HANDLER( zaccaria_irq0a )
+{
+ cputag_set_input_line(device->machine, "audiocpu", INPUT_LINE_NMI, state ? ASSERT_LINE : CLEAR_LINE);
}
-static WRITE_LINE_DEVICE_HANDLER( zaccaria_irq0b )
+static WRITE_LINE_DEVICE_HANDLER( zaccaria_irq0b )
{
- cputag_set_input_line(device->machine, "audiocpu", 0, state ? ASSERT_LINE : CLEAR_LINE);
+ cputag_set_input_line(device->machine, "audiocpu", 0, state ? ASSERT_LINE : CLEAR_LINE);
}
static READ8_DEVICE_HANDLER( zaccaria_port0a_r )
diff --git a/src/mame/machine/cx4data.c b/src/mame/machine/cx4data.c
index 6dca61d1708..65b343dcd34 100644
--- a/src/mame/machine/cx4data.c
+++ b/src/mame/machine/cx4data.c
@@ -3,7 +3,7 @@
cx4data.c
Code based on original work by zsKnight, anomie and Nach.
- This implementation is based on C++ "cx4*.cpp" by byuu
+ This implementation is based on C++ "cx4*.cpp" by byuu
(up to date with source v 0.49).
***************************************************************************/
diff --git a/src/mame/machine/cx4oam.c b/src/mame/machine/cx4oam.c
index 374fcc63d2a..8fd4225b7a6 100644
--- a/src/mame/machine/cx4oam.c
+++ b/src/mame/machine/cx4oam.c
@@ -3,7 +3,7 @@
cx4oam.c
Code based on original work by zsKnight, anomie and Nach.
- This implementation is based on C++ "cx4*.cpp" by byuu
+ This implementation is based on C++ "cx4*.cpp" by byuu
(up to date with source v 0.49).
***************************************************************************/
diff --git a/src/mame/machine/cx4ops.c b/src/mame/machine/cx4ops.c
index 97d67bdf8ab..218bfe94c77 100644
--- a/src/mame/machine/cx4ops.c
+++ b/src/mame/machine/cx4ops.c
@@ -3,7 +3,7 @@
cx4ops.c
Code based on original work by zsKnight, anomie and Nach.
- This implementation is based on C++ "cx4*.cpp" by byuu
+ This implementation is based on C++ "cx4*.cpp" by byuu
(up to date with source v 0.49).
***************************************************************************/
diff --git a/src/mame/machine/naomibd.c b/src/mame/machine/naomibd.c
index a79d8d0e561..ae95b760c5f 100644
--- a/src/mame/machine/naomibd.c
+++ b/src/mame/machine/naomibd.c
@@ -285,7 +285,7 @@ static const naomibd_config_table naomibd_translate_tbl[] =
-2, 0x63bae7, 0x100000, -2, 0x3e3685, 0x110000, -2, 0x6d08a9, 0x120000, -2, 0xfff85c5d, 0x130000,
-2, 0x5263bf, 0x140000, -2, 0x396180, 0x150000, -2, 0x73af6c, 0x160000, -2, 0xfffa8a76, 0x170000,
-2, 0xc2d9e0, 0x180000, -2, 0x33be72, 0x190000,
- 0xffffffff, 0xffffffff, 0xffffffff } },
+ 0xffffffff, 0xffffffff, 0xffffffff } },
{ "toyfight", 0,{ 0x0615, 0, 0x8f058, 0x1999, 0, 0x8ec58, 0x7510, 0, 0x8f458, 0x5736, 0, 0x8e858,
0xffffffff, 0xffffffff, 0xffffffff } },
{ "ggx", 0,{ -1, 0x200000, 0x100000, -1, 0x210004, 0x110000, -1, 0x220008, 0x120000, -1, 0x228000, 0x130000,
diff --git a/src/mame/machine/snes.c b/src/mame/machine/snes.c
index fc108045b0a..cfca37f3d72 100644
--- a/src/mame/machine/snes.c
+++ b/src/mame/machine/snes.c
@@ -674,7 +674,7 @@ READ8_HANDLER( snes_r_io )
case DMAP5:
case DMAP6:
case DMAP7:
-// return (snes_ram[offset] & 0xdf) | (snes_open_bus_r(space,0) & 0x20);
+// return (snes_ram[offset] & 0xdf) | (snes_open_bus_r(space,0) & 0x20);
case BBAD0: case A1T0L: case A1T0H: case A1B0: case DAS0L:
case DAS0H: case DSAB0: case A2A0L: case A2A0H: case NTRL0:
case BBAD1: case A1T1L: case A1T1H: case A1B1: case DAS1L:
diff --git a/src/mame/machine/snescx4.c b/src/mame/machine/snescx4.c
index 9baae8202c9..d215fac2ee1 100644
--- a/src/mame/machine/snescx4.c
+++ b/src/mame/machine/snescx4.c
@@ -5,7 +5,7 @@
File to handle emulation of the SNES "CX4" add-on chip.
Code based on original work by zsKnight, anomie and Nach.
- This implementation is based on C++ "cx4*.cpp" by byuu
+ This implementation is based on C++ "cx4*.cpp" by byuu
(up to date with source v 0.49).
***************************************************************************/
diff --git a/src/mame/machine/snescx4.h b/src/mame/machine/snescx4.h
index 272cd23ec07..b39468ef4fa 100644
--- a/src/mame/machine/snescx4.h
+++ b/src/mame/machine/snescx4.h
@@ -3,7 +3,7 @@
snescx4.h
Code based on original work by zsKnight, anomie and Nach.
- This implementation is based on C++ "cx4*.cpp" by byuu
+ This implementation is based on C++ "cx4*.cpp" by byuu
(up to date with source v 0.49).
***************************************************************************/
diff --git a/src/version.c b/src/version.c
index eb8ebc0046c..1145b040c50 100644
--- a/src/version.c
+++ b/src/version.c
@@ -10,4 +10,4 @@
***************************************************************************/
extern const char build_version[];
-const char build_version[] = "0.134 ("__DATE__")";
+const char build_version[] = "0.134u1 ("__DATE__")";