summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatarGravatar Aaron Giles <aaron@aarongiles.com>2008-04-03 07:57:25 +0000
committerGravatarGravatar Aaron Giles <aaron@aarongiles.com>2008-04-03 07:57:25 +0000
commit31336e491e1280636e44cb68de3f6f9e3091261c (patch)
treee0932c6dbaec5354d0034526cf28e9a8646db14c
parentefbe64428a6f906768333dc49f44cf5e37ac0c34 (diff)
Cleanups and version bump to 0.124u1.mame0124u1
-rw-r--r--src/emu/cpu/cop400/410ops.c626
-rw-r--r--src/emu/cpu/cop400/420ops.c162
-rw-r--r--src/emu/cpu/cop400/cop410.c10
-rw-r--r--src/emu/cpu/cop400/cop420.c22
-rw-r--r--src/emu/debug/debugcpu.c2
-rw-r--r--src/emu/inptport.c2
-rw-r--r--src/emu/input.c2
-rw-r--r--src/emu/input.h6
-rw-r--r--src/emu/machine/6840ptm.c2
-rw-r--r--src/emu/machine/pit8253.c20
-rw-r--r--src/emu/machine/pit8253.h4
-rw-r--r--src/emu/machine/scsicd.c2
-rw-r--r--src/emu/memory.c2
-rw-r--r--src/emu/sound/disc_flt.c2
-rw-r--r--src/emu/sound/discrete.c4
-rw-r--r--src/emu/sound/discrete.h30
-rw-r--r--src/emu/video/cdp1869.c14
-rw-r--r--src/mame/audio/galaxian.c8
-rw-r--r--src/mame/drivers/astrocorp.c52
-rw-r--r--src/mame/drivers/badlands.c22
-rw-r--r--src/mame/drivers/bfcobra.c28
-rw-r--r--src/mame/drivers/bishi.c2
-rw-r--r--src/mame/drivers/bloodbro.c26
-rw-r--r--src/mame/drivers/blueprnt.c4
-rw-r--r--src/mame/drivers/cidelsa.c12
-rw-r--r--src/mame/drivers/circusc.c12
-rw-r--r--src/mame/drivers/ddragon.c52
-rw-r--r--src/mame/drivers/flkatck.c4
-rw-r--r--src/mame/drivers/galaxian.c390
-rw-r--r--src/mame/drivers/galdrvr.c40
-rw-r--r--src/mame/drivers/guab.c26
-rw-r--r--src/mame/drivers/ironhors.c8
-rw-r--r--src/mame/drivers/mpu4.c4
-rw-r--r--src/mame/drivers/mpu4drvr.c8
-rw-r--r--src/mame/drivers/multigam.c4
-rw-r--r--src/mame/drivers/neodrvr.c292
-rw-r--r--src/mame/drivers/undrfire.c14
-rw-r--r--src/mame/drivers/vigilant.c2
-rw-r--r--src/mame/drivers/wgp.c2
-rw-r--r--src/mame/includes/galaxian.h6
-rw-r--r--src/mame/video/aerofgt.c12
-rw-r--r--src/mame/video/galaxian.c590
-rw-r--r--src/mame/video/mermaid.c4
-rw-r--r--src/mame/video/namcona1.c12
-rw-r--r--src/mame/video/undrfire.c4
-rw-r--r--src/version.c2
46 files changed, 1277 insertions, 1277 deletions
diff --git a/src/emu/cpu/cop400/410ops.c b/src/emu/cpu/cop400/410ops.c
index 3e1aeef34d3..c02d24fd1f7 100644
--- a/src/emu/cpu/cop400/410ops.c
+++ b/src/emu/cpu/cop400/410ops.c
@@ -52,7 +52,7 @@
static TIMER_CALLBACK(cop410_serial_tick)
{
int cpunum = param;
-
+
cpuintrf_push_context(cpunum);
if (BIT(EN, 0))
@@ -81,7 +81,7 @@ static TIMER_CALLBACK(cop410_serial_tick)
}
else
{
- /* SIO is a shift register */
+ /* SIO is a shift register */
// serial output
@@ -140,17 +140,17 @@ INSTRUCTION(illegal)
/*
- Mnemonic: ASC
-
- Hex Code: 30
- Binary: 0 0 1 1 0 0 0 0
+ Mnemonic: ASC
+
+ Hex Code: 30
+ Binary: 0 0 1 1 0 0 0 0
- Data Flow: A + C + RAM(B) -> A
- Carry -> C
+ Data Flow: A + C + RAM(B) -> A
+ Carry -> C
- Skip Conditions: Carry
+ Skip Conditions: Carry
- Description: Add with Carry, Skip on Carry
+ Description: Add with Carry, Skip on Carry
*/
@@ -172,35 +172,35 @@ INSTRUCTION(asc)
/*
- Mnemonic: ADD
-
- Hex Code: 31
- Binary: 0 0 1 1 0 0 0 1
+ Mnemonic: ADD
+
+ Hex Code: 31
+ Binary: 0 0 1 1 0 0 0 1
- Data Flow: A + RAM(B) -> A
+ Data Flow: A + RAM(B) -> A
- Description: Add RAM to A
+ Description: Add RAM to A
*/
INSTRUCTION(add)
{
- A = (A + RAM_R(B)) & 0x0F;
+ A = (A + RAM_R(B)) & 0x0F;
}
/*
- Mnemonic: AISC
-
- Operand: y
- Hex Code: 5-
- Binary: 0 1 0 1 y3 y2 y1 y0
+ Mnemonic: AISC
- Data Flow: A + y -> A
+ Operand: y
+ Hex Code: 5-
+ Binary: 0 1 0 1 y3 y2 y1 y0
- Skip Conditions: Carry
+ Data Flow: A + y -> A
- Description: Add Immediate, Skip on Carry (y != 0)
+ Skip Conditions: Carry
+
+ Description: Add Immediate, Skip on Carry (y != 0)
*/
@@ -219,14 +219,14 @@ INSTRUCTION(aisc)
/*
- Mnemonic: CLRA
-
- Hex Code: 00
- Binary: 0 0 0 0 0 0 0 0
+ Mnemonic: CLRA
+
+ Hex Code: 00
+ Binary: 0 0 0 0 0 0 0 0
- Data Flow: 0 -> A
+ Data Flow: 0 -> A
- Description: Clear A
+ Description: Clear A
*/
@@ -237,14 +237,14 @@ INSTRUCTION(clra)
/*
- Mnemonic: COMP
-
- Hex Code: 40
- Binary: 0 1 0 0 0 0 0 0
+ Mnemonic: COMP
+
+ Hex Code: 40
+ Binary: 0 1 0 0 0 0 0 0
- Data Flow: ~A -> A
+ Data Flow: ~A -> A
- Description: Ones Complement of A to A
+ Description: Ones Complement of A to A
*/
@@ -255,12 +255,12 @@ INSTRUCTION(comp)
/*
- Mnemonic: NOP
-
- Hex Code: 44
- Binary: 0 1 0 0 0 1 0 0
+ Mnemonic: NOP
- Description: No Operation
+ Hex Code: 44
+ Binary: 0 1 0 0 0 1 0 0
+
+ Description: No Operation
*/
@@ -271,14 +271,14 @@ INSTRUCTION(nop)
/*
- Mnemonic: RC
-
- Hex Code: 32
- Binary: 0 0 1 1 0 0 1 0
+ Mnemonic: RC
+
+ Hex Code: 32
+ Binary: 0 0 1 1 0 0 1 0
- Data Flow: "0" -> C
+ Data Flow: "0" -> C
- Description: Reset C
+ Description: Reset C
*/
@@ -289,14 +289,14 @@ INSTRUCTION(rc)
/*
- Mnemonic: SC
-
- Hex Code: 22
- Binary: 0 0 1 0 0 0 1 0
+ Mnemonic: SC
+
+ Hex Code: 22
+ Binary: 0 0 1 0 0 0 1 0
- Data Flow: "1" -> C
+ Data Flow: "1" -> C
- Description: Set C
+ Description: Set C
*/
@@ -307,14 +307,14 @@ INSTRUCTION(sc)
/*
- Mnemonic: XOR
-
- Hex Code: 02
- Binary: 0 0 0 0 0 0 1 0
+ Mnemonic: XOR
- Data Flow: A ^ RAM(B) -> A
+ Hex Code: 02
+ Binary: 0 0 0 0 0 0 1 0
- Description: Exclusive-OR RAM with A
+ Data Flow: A ^ RAM(B) -> A
+
+ Description: Exclusive-OR RAM with A
*/
@@ -327,14 +327,14 @@ INSTRUCTION(xor)
/*
- Mnemonic: JID
-
- Hex Code: FF
- Binary: 1 1 1 1 1 1 1 1
+ Mnemonic: JID
+
+ Hex Code: FF
+ Binary: 1 1 1 1 1 1 1 1
- Data Flow: ROM(PC9:8,A,M) -> PC7:0
+ Data Flow: ROM(PC9:8,A,M) -> PC7:0
- Description: Jump Indirect
+ Description: Jump Indirect
*/
@@ -346,15 +346,15 @@ INSTRUCTION(jid)
/*
- Mnemonic: JMP
-
- Operand: a
- Hex Code: 6- --
- Binary: 0 1 1 0 0 0 a9 a8 a7 a6 a5 a4 a3 a2 a1 a0
+ Mnemonic: JMP
- Data Flow: a -> PC
+ Operand: a
+ Hex Code: 6- --
+ Binary: 0 1 1 0 0 0 a9 a8 a7 a6 a5 a4 a3 a2 a1 a0
- Description: Jump
+ Data Flow: a -> PC
+
+ Description: Jump
*/
@@ -367,21 +367,21 @@ INSTRUCTION(jmp)
/*
- Mnemonic: JP
-
- Operand: a
- Hex Code: --
- Binary: 1 a6 a5 a4 a3 a2 a1 a0
- (pages 2,3 only)
+ Mnemonic: JP
+
+ Operand: a
+ Hex Code: --
+ Binary: 1 a6 a5 a4 a3 a2 a1 a0
+ (pages 2,3 only)
- 1 1 a5 a4 a3 a2 a1 a0
- (all other pages)
+ 1 1 a5 a4 a3 a2 a1 a0
+ (all other pages)
- Data Flow: a -> PC6:0
+ Data Flow: a -> PC6:0
- a -> PC5:0
+ a -> PC5:0
- Description: Jump within Page
+ Description: Jump within Page
*/
@@ -410,16 +410,16 @@ INSTRUCTION(jp)
/*
- Mnemonic: JSR
-
- Operand: a
- Hex Code: 6- --
- Binary: 0 1 1 0 1 0 a9 a8 a7 a6 a5 a4 a3 a2 a1 a0
+ Mnemonic: JSR
+
+ Operand: a
+ Hex Code: 6- --
+ Binary: 0 1 1 0 1 0 a9 a8 a7 a6 a5 a4 a3 a2 a1 a0
- Data Flow: PC + 1 -> SA -> SB -> SC
- a -> PC
+ Data Flow: PC + 1 -> SA -> SB -> SC
+ a -> PC
- Description: Jump to Subroutine
+ Description: Jump to Subroutine
*/
@@ -433,14 +433,14 @@ INSTRUCTION(jsr)
/*
- Mnemonic: RET
-
- Hex Code: 48
- Binary: 0 1 0 0 1 0 0 0
+ Mnemonic: RET
- Data Flow: SC -> SB -> SA -> PC
+ Hex Code: 48
+ Binary: 0 1 0 0 1 0 0 0
- Description: Return from Subroutine
+ Data Flow: SC -> SB -> SA -> PC
+
+ Description: Return from Subroutine
*/
@@ -451,16 +451,16 @@ INSTRUCTION(ret)
/*
- Mnemonic: RETSK
-
- Hex Code: 49
- Binary: 0 1 0 0 1 0 0 1
+ Mnemonic: RETSK
+
+ Hex Code: 49
+ Binary: 0 1 0 0 1 0 0 1
- Data Flow: SC -> SB -> SA -> PC
+ Data Flow: SC -> SB -> SA -> PC
- Skip Conditions: Always Skip on Return
+ Skip Conditions: Always Skip on Return
- Description: Return from Subroutine then Skip
+ Description: Return from Subroutine then Skip
*/
@@ -474,15 +474,15 @@ INSTRUCTION(retsk)
/*
- Mnemonic: CAMQ
-
- Hex Code: 33 3C
- Binary: 0 0 1 1 0 0 1 1 0 0 1 1 1 1 0 0
+ Mnemonic: CAMQ
- Data Flow: A -> Q7:4
- RAM(B) -> Q3:0
+ Hex Code: 33 3C
+ Binary: 0 0 1 1 0 0 1 1 0 0 1 1 1 1 0 0
- Description: Copy A, RAM to Q
+ Data Flow: A -> Q7:4
+ RAM(B) -> Q3:0
+
+ Description: Copy A, RAM to Q
*/
@@ -493,16 +493,16 @@ INSTRUCTION(camq)
/*
- Mnemonic: LD
-
- Operand: r
- Hex Code: -5
- Binary: 0 0 r1 r0 0 1 0 1
+ Mnemonic: LD
+
+ Operand: r
+ Hex Code: -5
+ Binary: 0 0 r1 r0 0 1 0 1
- Data Flow: RAM(B) -> A
- Br ^ r -> Br
+ Data Flow: RAM(B) -> A
+ Br ^ r -> Br
- Description: Load RAM into A, Exclusive-OR Br with r
+ Description: Load RAM into A, Exclusive-OR Br with r
*/
@@ -516,15 +516,15 @@ INSTRUCTION(ld)
/*
- Mnemonic: LQID
-
- Hex Code: BF
- Binary: 1 0 1 1 1 1 1 1
+ Mnemonic: LQID
+
+ Hex Code: BF
+ Binary: 1 0 1 1 1 1 1 1
- Data Flow: ROM(PC9:8,A,M) -> Q
- SB -> SC
+ Data Flow: ROM(PC9:8,A,M) -> Q
+ SB -> SC
- Description: Load Q Indirect
+ Description: Load Q Indirect
*/
@@ -538,29 +538,29 @@ INSTRUCTION(lqid)
/*
- Mnemonic: RMB
-
- Operand: 0
- 1
- 2
- 3
+ Mnemonic: RMB
- Hex Code: 4C
- 45
- 42
- 43
+ Operand: 0
+ 1
+ 2
+ 3
- Binary: 0 1 0 0 1 1 0 0
- 0 1 0 0 0 1 0 1
- 0 1 0 0 0 0 1 0
- 0 1 0 0 0 0 1 1
+ Hex Code: 4C
+ 45
+ 42
+ 43
- Data Flow: 0 -> RAM(B)0
- 0 -> RAM(B)1
- 0 -> RAM(B)2
- 0 -> RAM(B)3
+ Binary: 0 1 0 0 1 1 0 0
+ 0 1 0 0 0 1 0 1
+ 0 1 0 0 0 0 1 0
+ 0 1 0 0 0 0 1 1
- Description: Reset RAM Bit
+ Data Flow: 0 -> RAM(B)0
+ 0 -> RAM(B)1
+ 0 -> RAM(B)2
+ 0 -> RAM(B)3
+
+ Description: Reset RAM Bit
*/
@@ -571,29 +571,29 @@ INSTRUCTION(rmb3) { RAM_W(B, RAM_R(B) & 0x7); }
/*
- Mnemonic: SMB
-
- Operand: 0
- 1
- 2
- 3
+ Mnemonic: SMB
+
+ Operand: 0
+ 1
+ 2
+ 3
- Hex Code: 4D
- 47
- 46
- 4B
+ Hex Code: 4D
+ 47
+ 46
+ 4B
- Binary: 0 1 0 0 1 1 0 1
- 0 1 0 0 0 1 1 1
- 0 1 0 0 0 1 1 0
- 0 1 0 0 1 0 1 1
+ Binary: 0 1 0 0 1 1 0 1
+ 0 1 0 0 0 1 1 1
+ 0 1 0 0 0 1 1 0
+ 0 1 0 0 1 0 1 1
- Data Flow: 1 -> RAM(B)0
- 1 -> RAM(B)1
- 1 -> RAM(B)2
- 1 -> RAM(B)3
+ Data Flow: 1 -> RAM(B)0
+ 1 -> RAM(B)1
+ 1 -> RAM(B)2
+ 1 -> RAM(B)3
- Description: Set RAM Bit
+ Description: Set RAM Bit
*/
@@ -604,16 +604,16 @@ INSTRUCTION(smb3) { RAM_W(B, RAM_R(B) | 0x8); }
/*
- Mnemonic: STII
-
- Operand: y
- Hex Code: 7-
- Binary: 0 1 1 1 y3 y2 y1 y0
+ Mnemonic: STII
- Data Flow: y -> RAM(B)
- Bd + 1 -> Bd
+ Operand: y
+ Hex Code: 7-
+ Binary: 0 1 1 1 y3 y2 y1 y0
- Description: Store Memory Immediate and Increment Bd
+ Data Flow: y -> RAM(B)
+ Bd + 1 -> Bd
+
+ Description: Store Memory Immediate and Increment Bd
*/
@@ -630,16 +630,16 @@ INSTRUCTION(stii)
/*
- Mnemonic: X
-
- Operand: r
- Hex Code: -6
- Binary: 0 0 r1 r0 0 1 1 0
+ Mnemonic: X
+
+ Operand: r
+ Hex Code: -6
+ Binary: 0 0 r1 r0 0 1 1 0
- Data Flow: RAM(B) <-> A
- Br ^ r -> Br
+ Data Flow: RAM(B) <-> A
+ Br ^ r -> Br
- Description: Exchange RAM with A, Exclusive-OR Br with r
+ Description: Exchange RAM with A, Exclusive-OR Br with r
*/
@@ -656,15 +656,15 @@ INSTRUCTION(x)
/*
- Mnemonic: XAD
-
- Operand: r,d
- Hex Code: 23 --
- Binary: 0 0 1 0 0 0 1 1 1 0 r1 r0 d3 d2 d1 d0
+ Mnemonic: XAD
+
+ Operand: r,d
+ Hex Code: 23 --
+ Binary: 0 0 1 0 0 0 1 1 1 0 r1 r0 d3 d2 d1 d0
- Data Flow: RAM(r,d) <-> A
+ Data Flow: RAM(r,d) <-> A
- Description: Exchange A with RAM pointed to directly by r,d
+ Description: Exchange A with RAM pointed to directly by r,d
*/
@@ -680,19 +680,19 @@ INSTRUCTION(xad)
/*
- Mnemonic: XDS
-
- Operand: r
- Hex Code: -7
- Binary: 0 0 r1 r0 0 1 1 1
+ Mnemonic: XDS
- Data Flow: RAM(B) <-> A
- Bd - 1 -> Bd
- Br ^ r -> Br
+ Operand: r
+ Hex Code: -7
+ Binary: 0 0 r1 r0 0 1 1 1
- Skip Conditions: Bd decrements past 0
+ Data Flow: RAM(B) <-> A
+ Bd - 1 -> Bd
+ Br ^ r -> Br
- Description: Exchange RAM with A and Decrement Bd, Exclusive-OR Br with r
+ Skip Conditions: Bd decrements past 0
+
+ Description: Exchange RAM with A and Decrement Bd, Exclusive-OR Br with r
*/
@@ -715,19 +715,19 @@ INSTRUCTION(xds)
/*
- Mnemonic: XIS
-
- Operand: r
- Hex Code: -4
- Binary: 0 0 r1 r0 0 1 0 0
+ Mnemonic: XIS
+
+ Operand: r
+ Hex Code: -4
+ Binary: 0 0 r1 r0 0 1 0 0
- Data Flow: RAM(B) <-> A
- Bd + 1 -> Bd
- Br ^ r -> Br
+ Data Flow: RAM(B) <-> A
+ Bd + 1 -> Bd
+ Br ^ r -> Br
- Skip Conditions: Bd increments past 15
+ Skip Conditions: Bd increments past 15
- Description: Exchange RAM with A and Increment Bd, Exclusive-OR Br with r
+ Description: Exchange RAM with A and Increment Bd, Exclusive-OR Br with r
*/
@@ -752,14 +752,14 @@ INSTRUCTION(xis)
/*
- Mnemonic: CAB
-
- Hex Code: 50
- Binary: 0 1 0 1 0 0 0 0 0
+ Mnemonic: CAB
- Data Flow: A -> Bd
+ Hex Code: 50
+ Binary: 0 1 0 1 0 0 0 0 0
- Description: Copy A to Bd
+ Data Flow: A -> Bd
+
+ Description: Copy A to Bd
*/
@@ -770,14 +770,14 @@ INSTRUCTION(cab)
/*
- Mnemonic: CBA
-
- Hex Code: 4E
- Binary: 0 1 0 0 1 1 1 0
+ Mnemonic: CBA
+
+ Hex Code: 4E
+ Binary: 0 1 0 0 1 1 1 0
- Data Flow: Bd -> A
+ Data Flow: Bd -> A
- Description: Copy Bd to A
+ Description: Copy Bd to A
*/
@@ -788,20 +788,20 @@ INSTRUCTION(cba)
/*
- Mnemonic: LBI
-
- Operand: r,d
- Hex Code: --
- 33 --
+ Mnemonic: LBI
+
+ Operand: r,d
+ Hex Code: --
+ 33 --
- Binary: 0 0 r1 r0 d3 d2 d1 d0 (d-1)
- 0 0 1 1 0 0 1 1 1 0 r1 r0 d3 d2 d1 d0
+ Binary: 0 0 r1 r0 d3 d2 d1 d0 (d-1)
+ 0 0 1 1 0 0 1 1 1 0 r1 r0 d3 d2 d1 d0
- Data Flow: r,d -> B
+ Data Flow: r,d -> B
- Skip Conditions: Skip until not a LBI
+ Skip Conditions: Skip until not a LBI
- Description: Load B Immediate with r,d
+ Description: Load B Immediate with r,d
*/
@@ -821,15 +821,15 @@ INSTRUCTION(lbi)
/*
- Mnemonic: LEI
-
- Operand: y
- Hex Code: 33 6-
- Binary: 0 0 1 1 0 0 1 1 0 1 1 0 y3 y2 y1 y0
+ Mnemonic: LEI
- Data Flow: y -> EN
+ Operand: y
+ Hex Code: 33 6-
+ Binary: 0 0 1 1 0 0 1 1 0 1 1 0 y3 y2 y1 y0
- Description: Load EN Immediate
+ Data Flow: y -> EN
+
+ Description: Load EN Immediate
*/
@@ -849,32 +849,32 @@ INSTRUCTION(lei)
/*
- Mnemonic: SKC
-
- Hex Code: 20
- Binary: 0 0 1 0 0 0 0 0
+ Mnemonic: SKC
+
+ Hex Code: 20
+ Binary: 0 0 1 0 0 0 0 0
- Skip Conditions: C = "1"
+ Skip Conditions: C = "1"
- Description: Skip if C is True
+ Description: Skip if C is True
*/
INSTRUCTION(skc)
{
- if (C == 1) skip = 1;
+ if (C == 1) skip = 1;
}
/*
- Mnemonic: SKE
-
- Hex Code: 21
- Binary: 0 0 1 0 0 0 0 1
+ Mnemonic: SKE
- Skip Conditions: A = RAM(B)
+ Hex Code: 21
+ Binary: 0 0 1 0 0 0 0 1
- Description: Skip if A Equals RAM
+ Skip Conditions: A = RAM(B)
+
+ Description: Skip if A Equals RAM
*/
@@ -885,14 +885,14 @@ INSTRUCTION(ske)
/*
- Mnemonic: SKGZ
-
- Hex Code: 33 21
- Binary: 00 0 1 1 0 0 1 1 0 0 1 0 0 0 0 1
+ Mnemonic: SKGZ
+
+ Hex Code: 33 21
+ Binary: 00 0 1 1 0 0 1 1 0 0 1 0 0 0 0 1
- Skip Conditions: G3:0 = 0
+ Skip Conditions: G3:0 = 0
- Description: Skip if G is Zero (all 4 bits)
+ Description: Skip if G is Zero (all 4 bits)
*/
@@ -903,21 +903,21 @@ INSTRUCTION(skgz)
/*
- Mnemonic: SKGBZ
-
- Hex Code: 33 01
- 33 11
- 33 03
- 33 13
-
- Binary:
+ Mnemonic: SKGBZ
+
+ Hex Code: 33 01
+ 33 11
+ 33 03
+ 33 13
- Skip Conditions: G0 = 0
- G1 = 0
- G2 = 0
- G3 = 0
+ Binary:
- Description: Skip if G Bit is Zero
+ Skip Conditions: G0 = 0
+ G1 = 0
+ G2 = 0
+ G3 = 0
+
+ Description: Skip if G Bit is Zero
*/
@@ -933,21 +933,21 @@ INSTRUCTION(skgbz3) { skgbz(3); }
/*
- Mnemonic: SKMBZ
-
- Hex Code: 01
- 11
- 03
- 13
+ Mnemonic: SKMBZ
+
+ Hex Code: 01
+ 11
+ 03
+ 13
- Binary:
+ Binary:
- Skip Conditions: RAM(B)0 = 0
- RAM(B)0 = 1
- RAM(B)0 = 2
- RAM(B)0 = 3
+ Skip Conditions: RAM(B)0 = 0
+ RAM(B)0 = 1
+ RAM(B)0 = 2
+ RAM(B)0 = 3
- Description: Skip if RAM Bit is Zero
+ Description: Skip if RAM Bit is Zero
*/
@@ -965,14 +965,14 @@ INSTRUCTION(skmbz3) { skmbz(3); }
/*
- Mnemonic: ING
-
- Hex Code: 33 2A
- Binary:
+ Mnemonic: ING
- Data Flow: G -> A
+ Hex Code: 33 2A
+ Binary:
- Description: Input G Ports to A
+ Data Flow: G -> A
+
+ Description: Input G Ports to A
*/
@@ -983,15 +983,15 @@ INSTRUCTION(ing)
/*
- Mnemonic: INL
-
- Hex Code: 33 2E
- Binary:
+ Mnemonic: INL
+
+ Hex Code: 33 2E
+ Binary:
- Data Flow: L7:4 -> RAM(B)
- L3:0 -> A
+ Data Flow: L7:4 -> RAM(B)
+ L3:0 -> A
- Description: Input L Ports to RAM,A
+ Description: Input L Ports to RAM,A
*/
@@ -1005,14 +1005,14 @@ INSTRUCTION(inl)
/*
- Mnemonic: OBD
-
- Hex Code: 33 3E
- Binary:
+ Mnemonic: OBD
+
+ Hex Code: 33 3E
+ Binary:
- Data Flow: Bd -> D
+ Data Flow: Bd -> D
- Description: Output Bd to D Outputs
+ Description: Output Bd to D Outputs
*/
@@ -1023,14 +1023,14 @@ INSTRUCTION(obd)
/*
- Mnemonic: OMG
-
- Hex Code: 33 3A
- Binary:
+ Mnemonic: OMG
- Data Flow: RAM(B) -> G
+ Hex Code: 33 3A
+ Binary:
- Description: Output RAM to G Ports
+ Data Flow: RAM(B) -> G
+
+ Description: Output RAM to G Ports
*/
@@ -1041,15 +1041,15 @@ INSTRUCTION(omg)
/*
- Mnemonic: XAS
-
- Hex Code: 4F
- Binary: 0 1 0 0 1 1 1 1
+ Mnemonic: XAS
+
+ Hex Code: 4F
+ Binary: 0 1 0 0 1 1 1 1
- Data Flow: A <-> SIO
- C -> SK
+ Data Flow: A <-> SIO
+ C -> SK
- Description: Exchange A with SIO
+ Description: Exchange A with SIO
*/
diff --git a/src/emu/cpu/cop400/420ops.c b/src/emu/cpu/cop400/420ops.c
index 2fd351a2c3c..9dc6645d25d 100644
--- a/src/emu/cpu/cop400/420ops.c
+++ b/src/emu/cpu/cop400/420ops.c
@@ -23,14 +23,14 @@
/*
- Mnemonic: ADT
-
- Hex Code: 4A
- Binary: 0 1 0 0 1 0 1 0
+ Mnemonic: ADT
- Data Flow: A + 10 -> A
+ Hex Code: 4A
+ Binary: 0 1 0 0 1 0 1 0
- Description: Add Ten to A
+ Data Flow: A + 10 -> A
+
+ Description: Add Ten to A
*/
@@ -41,17 +41,17 @@ INSTRUCTION(adt)
/*
- Mnemonic: CASC
-
- Hex Code: 10
- Binary: 0 0 0 1 0 0 0 0
+ Mnemonic: CASC
+
+ Hex Code: 10
+ Binary: 0 0 0 1 0 0 0 0
- Data Flow: ~A + RAM(B) + C -> A
- Carry -> C
+ Data Flow: ~A + RAM(B) + C -> A
+ Carry -> C
- Skip Conditions: Carry
+ Skip Conditions: Carry
- Description: Complement and Add with Carry, Skip on Carry
+ Description: Complement and Add with Carry, Skip on Carry
*/
@@ -75,14 +75,14 @@ INSTRUCTION(casc)
/*
- Mnemonic: RET
-
- Hex Code: 48
- Binary: 0 1 0 0 1 0 0 0
+ Mnemonic: RET
- Data Flow: SC -> SB -> SA -> PC
+ Hex Code: 48
+ Binary: 0 1 0 0 1 0 0 0
- Description: Return from Subroutine, restore Skip logic
+ Data Flow: SC -> SB -> SA -> PC
+
+ Description: Return from Subroutine, restore Skip logic
*/
@@ -96,15 +96,15 @@ INSTRUCTION(cop420_ret)
/*
- Mnemonic: CQMA
-
- Hex Code: 33 2C
- Binary: 0 0 1 1 0 0 1 1 0 0 1 0 1 1 0 0
+ Mnemonic: CQMA
+
+ Hex Code: 33 2C
+ Binary: 0 0 1 1 0 0 1 1 0 0 1 0 1 1 0 0
- Data Flow: Q7:4 -> RAM(B)
- Q3:0 -> A
+ Data Flow: Q7:4 -> RAM(B)
+ Q3:0 -> A
- Description: Copy Q to RAM, A
+ Description: Copy Q to RAM, A
*/
@@ -116,22 +116,22 @@ INSTRUCTION(cqma)
/*
- Mnemonic: LDD
-
- Operand: r, d
- Hex Code: 23 --
- Binary: 0 0 1 0 0 0 1 1 0 0 r1 r0 d3 d2 d1 d0
+ Mnemonic: LDD
- Data Flow: RAM(r,d) -> A
+ Operand: r, d
+ Hex Code: 23 --
+ Binary: 0 0 1 0 0 0 1 1 0 0 r1 r0 d3 d2 d1 d0
- Description: Load A with RAM pointed to directly by r,d
+ Data Flow: RAM(r,d) -> A
+
+ Description: Load A with RAM pointed to directly by r,d
*/
INSTRUCTION(ldd)
{
UINT8 rd = opcode & 0x3f;
-
+
A = RAM_R(rd);
}
@@ -139,14 +139,14 @@ INSTRUCTION(ldd)
/*
- Mnemonic: XABR
-
- Hex Code: 12
- Binary: 0 0 0 1 0 0 1 0
+ Mnemonic: XABR
+
+ Hex Code: 12
+ Binary: 0 0 0 1 0 0 1 0
- Data Flow: A <-> Br(0,0 -> A3,A2)
+ Data Flow: A <-> Br(0,0 -> A3,A2)
- Description: Exchange A with Br
+ Description: Exchange A with Br
*/
@@ -163,14 +163,14 @@ INSTRUCTION(xabr)
/*
- Mnemonic: SKT
-
- Hex Code: 41
- Binary: 0 1 0 0 0 0 0 1
+ Mnemonic: SKT
- Skip Conditions: A time-base counter carry has occurred since last test
+ Hex Code: 41
+ Binary: 0 1 0 0 0 0 0 1
- Description: Skip on Timer
+ Skip Conditions: A time-base counter carry has occurred since last test
+
+ Description: Skip on Timer
*/
@@ -187,14 +187,14 @@ INSTRUCTION(skt)
/*
- Mnemonic: ININ
-
- Hex Code: 33 28
- Binary:
+ Mnemonic: ININ
+
+ Hex Code: 33 28
+ Binary:
- Data Flow: IN -> A
+ Data Flow: IN -> A
- Description: Input IN Inputs to A
+ Description: Input IN Inputs to A
*/
@@ -205,16 +205,16 @@ INSTRUCTION(inin)
/*
- Processor: COP402M
+ Processor: COP402M
- Mnemonic: ININ
-
- Hex Code: 33 28
- Binary:
+ Mnemonic: ININ
- Data Flow: IN -> A, A1 = "1"
+ Hex Code: 33 28
+ Binary:
- Description: Input IN Inputs to A
+ Data Flow: IN -> A, A1 = "1"
+
+ Description: Input IN Inputs to A
*/
@@ -225,36 +225,36 @@ INSTRUCTION(cop402m_inin)
/*
- Mnemonic: INIL
-
- Hex Code: 33 29
- Binary:
+ Mnemonic: INIL
+
+ Hex Code: 33 29
+ Binary:
- Data Flow: IL3,"1","0",IL0 -> A
+ Data Flow: IL3,"1","0",IL0 -> A
- Description: Input IL Latches to A
+ Description: Input IL Latches to A
*/
INSTRUCTION(inil)
{
// NOT PROPERLY IMPLEMENTED
-
+
A = (IN_IN() & 0x09) | 0x04;
}
/*
- Processor: COP421
+ Processor: COP421
+
+ Mnemonic: INIL
- Mnemonic: INIL
-
- Hex Code: 33 29
- Binary:
+ Hex Code: 33 29
+ Binary:
- Data Flow: "0",CKO,"0","0" -> A
+ Data Flow: "0",CKO,"0","0" -> A
- Description: Input CKO to A
+ Description: Input CKO to A
*/
@@ -267,15 +267,15 @@ INSTRUCTION(cop421_inil)
/*
- Mnemonic: OGI
-
- Operand: y
- Hex Code: 33 5-
- Binary: 0 0 1 1 0 0 1 1 0 1 0 1 y3 y2 y1 y0
+ Mnemonic: OGI
+
+ Operand: y
+ Hex Code: 33 5-
+ Binary: 0 0 1 1 0 0 1 1 0 1 0 1 y3 y2 y1 y0
- Data Flow: y -> G
+ Data Flow: y -> G
- Description: Output to G Ports Immediate
+ Description: Output to G Ports Immediate
*/
diff --git a/src/emu/cpu/cop400/cop410.c b/src/emu/cpu/cop400/cop410.c
index 85d22bc1859..05185849622 100644
--- a/src/emu/cpu/cop400/cop410.c
+++ b/src/emu/cpu/cop400/cop410.c
@@ -13,8 +13,8 @@
TODO:
- - remove LBIops
- - JP/JSR/JSRP
+ - remove LBIops
+ - JP/JSR/JSRP
*/
@@ -326,7 +326,7 @@ static int cop410_execute(int cycles)
cop410_ICount -= opcode_map[opcode].cycles;
}
PC += InstLen[opcode];
-
+
skip = 0;
}
}
@@ -439,8 +439,8 @@ void cop410_get_info(UINT32 state, cpuinfo *info)
#endif /* ENABLE_DEBUGGER */
case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cop410_ICount; break;
-/* case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM:
- info->internal_map8 = address_map_cop410_internal_rom; break;*/
+/* case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM:
+ info->internal_map8 = address_map_cop410_internal_rom; break;*/
case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:
info->internal_map8 = address_map_cop410_internal_ram; break;
diff --git a/src/emu/cpu/cop400/cop420.c b/src/emu/cpu/cop400/cop420.c
index 48c2a4296d3..cff9a762be4 100644
--- a/src/emu/cpu/cop400/cop420.c
+++ b/src/emu/cpu/cop400/cop420.c
@@ -13,8 +13,8 @@
TODO:
- - remove LBIops
- - INIL
+ - remove LBIops
+ - INIL
*/
@@ -366,9 +366,9 @@ static int cop420_execute(int cycles)
if (skipLBI == 0)
{
int inst_cycles = opcode_map[opcode].cycles;
-
+
PC++;
-
+
(*(opcode_map[opcode].function))(opcode);
cop420_ICount -= inst_cycles;
@@ -419,7 +419,7 @@ static int cop420_execute(int cycles)
cop420_ICount -= opcode_map[opcode].cycles;
}
PC += InstLen[opcode];
-
+
skip = 0;
}
}
@@ -534,8 +534,8 @@ void cop420_get_info(UINT32 state, cpuinfo *info)
#endif /* ENABLE_DEBUGGER */
case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cop420_ICount; break;
-/* case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM:
- info->internal_map8 = address_map_cop420_internal_rom; break;*/
+/* case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM:
+ info->internal_map8 = address_map_cop420_internal_rom; break;*/
case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:
info->internal_map8 = address_map_cop420_internal_ram; break;
@@ -597,7 +597,7 @@ void cop422_get_info(UINT32 state, cpuinfo *info)
}
void cop402_get_info(UINT32 state, cpuinfo *info)
-{
+{
// COP402 is a ROMless version of the COP420
switch (state)
@@ -615,7 +615,7 @@ void cop402_get_info(UINT32 state, cpuinfo *info)
}
void cop444_get_info(UINT32 state, cpuinfo *info)
-{
+{
// COP444 is functionally equivalent to COP420, but with twice the RAM/ROM
switch (state)
@@ -635,7 +635,7 @@ void cop444_get_info(UINT32 state, cpuinfo *info)
}
void cop445_get_info(UINT32 state, cpuinfo *info)
-{
+{
// COP445 is a 24-pin package version of the COP444, lacking the IN ports
switch (state)
@@ -652,7 +652,7 @@ void cop445_get_info(UINT32 state, cpuinfo *info)
}
void cop404_get_info(UINT32 state, cpuinfo *info)
-{
+{
// COP404 is a ROMless version of the COP444
switch (state)
diff --git a/src/emu/debug/debugcpu.c b/src/emu/debug/debugcpu.c
index 9ca8e278108..7ff14e6e603 100644
--- a/src/emu/debug/debugcpu.c
+++ b/src/emu/debug/debugcpu.c
@@ -1327,7 +1327,7 @@ static void check_watchpoints(int cpunum, int spacenum, int type, offs_t address
int bus_size = info->space[spacenum].databytes;
while (address_offset < bus_size && (mem_mask & 0xff) == 0)
- {
+ {
address_offset++;
value_to_write >>= 8;
mem_mask >>= 8;
diff --git a/src/emu/inptport.c b/src/emu/inptport.c
index bfbba7e57a9..284d5476247 100644
--- a/src/emu/inptport.c
+++ b/src/emu/inptport.c
@@ -2000,7 +2000,7 @@ static void input_port_detokenize(input_port_init_params *param, const input_por
port = input_port_initialize(param, type, modify_tag, mask, defval);
seq_index[0] = seq_index[1] = seq_index[2] = 0;
break;
-
+
case INPUT_TOKEN_SPECIAL_ONOFF:
TOKEN_UNGET_UINT32(ipt);
TOKEN_GET_UINT32_UNPACK3(ipt, entrytype, 8, hasdiploc, 1, strindex, 23);
diff --git a/src/emu/input.c b/src/emu/input.c
index b192f6177ce..24b49a88edb 100644
--- a/src/emu/input.c
+++ b/src/emu/input.c
@@ -314,7 +314,7 @@ static const code_string_table itemid_token_table[] =
{ ITEM_ID_BUTTON16, "BUTTON16" },
{ ITEM_ID_START, "START" },
{ ITEM_ID_SELECT, "SELECT" },
-
+
/* Hats */
{ ITEM_ID_HAT1UP, "HAT1UP" },
{ ITEM_ID_HAT1DOWN, "HAT1DOWN" },
diff --git a/src/emu/input.h b/src/emu/input.h
index d8bc0c07dc8..73bae31305c 100644
--- a/src/emu/input.h
+++ b/src/emu/input.h
@@ -288,7 +288,7 @@ enum _input_item_id
ITEM_ID_ADD_SWITCH14,
ITEM_ID_ADD_SWITCH15,
ITEM_ID_ADD_SWITCH16,
-
+
ITEM_ID_ADD_ABSOLUTE1,
ITEM_ID_ADD_ABSOLUTE2,
ITEM_ID_ADD_ABSOLUTE3,
@@ -305,7 +305,7 @@ enum _input_item_id
ITEM_ID_ADD_ABSOLUTE14,
ITEM_ID_ADD_ABSOLUTE15,
ITEM_ID_ADD_ABSOLUTE16,
-
+
ITEM_ID_ADD_RELATIVE1,
ITEM_ID_ADD_RELATIVE2,
ITEM_ID_ADD_RELATIVE3,
@@ -322,7 +322,7 @@ enum _input_item_id
ITEM_ID_ADD_RELATIVE14,
ITEM_ID_ADD_RELATIVE15,
ITEM_ID_ADD_RELATIVE16,
-
+
/* generic other IDs */
ITEM_ID_OTHER_SWITCH,
ITEM_ID_OTHER_AXIS_ABSOLUTE,
diff --git a/src/emu/machine/6840ptm.c b/src/emu/machine/6840ptm.c
index f5ea53ea2e6..7669052ceb3 100644
--- a/src/emu/machine/6840ptm.c
+++ b/src/emu/machine/6840ptm.c
@@ -251,7 +251,7 @@ INLINE void update_interrupts(int which)
((currptr->status_reg & 0x02) && (currptr->control_reg[1] & 0x40)) ||
((currptr->status_reg & 0x04) && (currptr->control_reg[2] & 0x40));
-// if (new_state != currptr->IRQ)
+// if (new_state != currptr->IRQ)
{
currptr->IRQ = new_state;
diff --git a/src/emu/machine/pit8253.c b/src/emu/machine/pit8253.c
index f4ff14e5d52..a54d6edda14 100644
--- a/src/emu/machine/pit8253.c
+++ b/src/emu/machine/pit8253.c
@@ -1097,21 +1097,21 @@ static void common_start( const device_config *device, int device_type ) {
pit8253_t *pit8253 = get_safe_token(device);
char unique_tag[30];
int timerno;
-
+
pit8253->config = device->static_config;
pit8253->device_type = device_type;
-
+
/* register for state saving */
state_save_combine_module_and_tag(unique_tag, device_tags[device_type], device->tag);
-
+
for (timerno = 0; timerno < MAX_TIMER; timerno++)
{
struct pit8253_timer *timer = get_timer(pit8253,timerno);
-
+
timer->clockin = pit8253->config->timer[timerno].clockin;
timer->output_changed = pit8253->config->timer[timerno].output_changed;
timer->frequency_changed = pit8253->config->timer[timerno].frequency_changed;
-
+
if (timer->output_changed == NULL)
timer->outputtimer = NULL;
else
@@ -1126,7 +1126,7 @@ static void common_start( const device_config *device, int device_type ) {
timer->freqtimer = timer_alloc(frequency_changed, (void *)device);
timer_adjust_oneshot(timer->freqtimer, attotime_never, timerno);
}
-
+
/* set up state save values */
state_save_register_item(unique_tag, timerno, timer->clockin);
state_save_register_item(unique_tag, timerno, timer->control);
@@ -1150,8 +1150,8 @@ static void common_start( const device_config *device, int device_type ) {
state_save_register_item(unique_tag, timerno, timer->last_updated.attoseconds);
}
}
-
-
+
+
static DEVICE_START( pit8253 ) {
common_start( device, TYPE_PIT8253 );
}
@@ -1170,8 +1170,8 @@ static DEVICE_RESET( pit8253 ) {
{
struct pit8253_timer *timer = get_timer(pit,i);
/* According to Intel's 8254 docs, the state of a timer is undefined
- until the first mode control word is written. Here we define this
- undefined behaviour */
+ until the first mode control word is written. Here we define this
+ undefined behaviour */
timer->control = timer->status = 0x30;
timer->rmsb = timer->wmsb = 0;
timer->count = timer->value = timer->latch = 0;
diff --git a/src/emu/machine/pit8253.h b/src/emu/machine/pit8253.h
index 189140229cb..b2d68d5b454 100644
--- a/src/emu/machine/pit8253.h
+++ b/src/emu/machine/pit8253.h
@@ -29,8 +29,8 @@ struct pit8253_config
pit8253_output_changed_func output_changed;
/* If specified, this gets called whenever the frequency of the output for this
- timer changes. */
- pit8253_frequency_changed_func frequency_changed;
+ timer changes. */
+ pit8253_frequency_changed_func frequency_changed;
} timer[3];
};
diff --git a/src/emu/machine/scsicd.c b/src/emu/machine/scsicd.c
index d2e1e7bc1b5..0aa1c2986c9 100644
--- a/src/emu/machine/scsicd.c
+++ b/src/emu/machine/scsicd.c
@@ -735,7 +735,7 @@ static int scsicd_dispatch(int operation, void *file, INT64 intparm, void *ptrpa
case SCSIOP_READ_DATA:
scsicd_read_data( file, ptrparm, intparm );
return 0;
-
+
case SCSIOP_WRITE_DATA:
scsicd_write_data( file, ptrparm, intparm );
return 0;
diff --git a/src/emu/memory.c b/src/emu/memory.c
index 33ac74fa4fa..677b8f75ddc 100644
--- a/src/emu/memory.c
+++ b/src/emu/memory.c
@@ -736,7 +736,7 @@ static void address_map_detokenize(address_map *map, const addrmap_token *tokens
while (entrytype != ADDRMAP_TOKEN_END)
{
const char *tag;
-
+
/* unpack the token from the first entry */
TOKEN_GET_UINT32_UNPACK1(tokens, entrytype, 8);
switch (entrytype)
diff --git a/src/emu/sound/disc_flt.c b/src/emu/sound/disc_flt.c
index b8a2cc6b47a..d332596d330 100644
--- a/src/emu/sound/disc_flt.c
+++ b/src/emu/sound/disc_flt.c
@@ -1136,7 +1136,7 @@ static void dst_rcfilter_sw_reset(node_description *node)
{
struct dst_rcfilter_sw_context *context = node->context;
int i;
-
+
for (i=0;i<4;i++)
context->vCap[i] = 0;
node->output[0] = 0;
diff --git a/src/emu/sound/discrete.c b/src/emu/sound/discrete.c
index 6cd59e96eea..bb5ec8a9149 100644
--- a/src/emu/sound/discrete.c
+++ b/src/emu/sound/discrete.c
@@ -330,7 +330,7 @@ static void *discrete_start(int sndindex, int clock, const void *config)
if (NODE_CHILD_NODE_NUM(intf[info->node_count].node) > 0)
fatalerror("discrete_start() - Child node number on NODE_%02d", NODE_INDEX(intf[info->node_count].node) );
-
+
}
info->node_count++;
discrete_log("discrete_start() - Sanity check counted %d nodes", info->node_count);
@@ -671,7 +671,7 @@ static void find_input_nodes(discrete_info *info, discrete_sound_block *block_li
if (NODE_CHILD_NODE_NUM(inputnode) >= node_ref->module.num_output)
fatalerror("discrete_start - Node NODE_%02d referenced non existent output %d on node NODE_%02d", NODE_INDEX(node->node), NODE_CHILD_NODE_NUM(inputnode), NODE_INDEX(inputnode));
-
+
node->input[inputnum] = &(node_ref->output[NODE_CHILD_NODE_NUM(inputnode)]); // Link referenced node out to input
node->input_is_node |= 1 << inputnum; // Bit flag if input is node
}
diff --git a/src/emu/sound/discrete.h b/src/emu/sound/discrete.h
index bfb04d37cb2..f0b74ae583e 100644
--- a/src/emu/sound/discrete.h
+++ b/src/emu/sound/discrete.h
@@ -41,16 +41,16 @@
* does not do individual device emulation, but instead does a function
* emulation. So you will need to convert the schematic design into
* a logic block representation.
- *
+ *
* There is the possibility to support multiple outputs per module.
* In this case, NODE_XXX is the default ouput. Alternative outputs may
* be accessed by using NODE_XXX_YY where 00<=Y<08.
- *
+ *
* You may also access nodes with a macros:
- *
+ *
* NODE_XXX = NODE_SUB(XXX, 0)
- * NODE_XXX = NODE(XXX)
- * NODE_XXX_YY = NODE_SUB(XXX, YY) with YY != 00
+ * NODE_XXX = NODE(XXX)
+ * NODE_XXX_YY = NODE_SUB(XXX, YY) with YY != 00
*
* One node point may feed a number of inputs, for example you could
* connect the output of a DISCRETE_SINEWAVE to the AMPLITUDE input
@@ -2596,11 +2596,11 @@
*
***********************************************************************
*
- * DISCRETE_RCFILTER_SW - Multiple switchable RC filters
+ * DISCRETE_RCFILTER_SW - Multiple switchable RC filters
*
- * R
- * INPUT >-----------ZZZZ-+-------+----......-----> Output
- * | |
+ * R
+ * INPUT >-----------ZZZZ-+-------+----......-----> Output
+ * | |
* +-+ +-+
* SWITCH > Bit 0 ---->F1 | | F2 | |
* '-' ^ '-'
@@ -2611,7 +2611,7 @@
* | |
* GND GND
*
- *
+ *
* Declaration syntax
*
* DISCRETE_RCFILTER_SW(name of node,
@@ -2624,11 +2624,11 @@
* C3 in Farads,
* C4 in Farads)
*
- * This is a typical filter circuit in circusc or scramble.
- * Switches are usually CD4066 with a "open" resistance of
+ * This is a typical filter circuit in circusc or scramble.
+ * Switches are usually CD4066 with a "open" resistance of
* typical 470 Ohms at 5V.
* This circuit supports up to 4 filters.
- *
+ *
* EXAMPLES: see circusc
*
***********************************************************************
@@ -3690,7 +3690,7 @@ typedef struct _discrete_inverter_osc_desc discrete_inverter_osc_desc;
NODE_ ## _x ## _01, NODE_ ## _x ## _02, NODE_ ## _x ## _03, NODE_ ## _x ## _04, \
NODE_ ## _x ## _05, NODE_ ## _x ## _06, NODE_ ## _x ## _07
-enum {
+enum {
NODE0_DEF(0), NODE0_DEF(1), NODE0_DEF(2), NODE0_DEF(3), NODE0_DEF(4), NODE0_DEF(5), NODE0_DEF(6), NODE0_DEF(7), NODE0_DEF(8), NODE0_DEF(9),
NODE_DEF(10), NODE_DEF(11), NODE_DEF(12), NODE_DEF(13), NODE_DEF(14), NODE_DEF(15), NODE_DEF(16), NODE_DEF(17), NODE_DEF(18), NODE_DEF(19),
NODE_DEF(20), NODE_DEF(21), NODE_DEF(22), NODE_DEF(23), NODE_DEF(24), NODE_DEF(25), NODE_DEF(26), NODE_DEF(27), NODE_DEF(28), NODE_DEF(29),
@@ -3731,7 +3731,7 @@ enum {
#if DISCRETE_MAX_NODE_OUTPUTS == 8
#define NODE_CHILD_NODE_NUM(_x) ((_x) & 7)
#define NODE_DEFAULT_NODE(_x) ((_x) & ~7)
-#define NODE_INDEX(_x) (((_x) - NODE_START)>>3)
+#define NODE_INDEX(_x) (((_x) - NODE_START)>>3)
#else
#error "DISCRETE_MAX_NODE_OUTPUTS != 8"
#endif
diff --git a/src/emu/video/cdp1869.c b/src/emu/video/cdp1869.c
index 82563f3ab20..2c648b6eda9 100644
--- a/src/emu/video/cdp1869.c
+++ b/src/emu/video/cdp1869.c
@@ -10,10 +10,10 @@
TODO:
- connect to sound system when possible
- - white noise
- - scanline based update
- - fix flashing spaceship in destryer/altair
- - fix flashing player in draco
+ - white noise
+ - scanline based update
+ - fix flashing spaceship in destryer/altair
+ - fix flashing player in draco
*/
@@ -104,7 +104,7 @@ static void update_prd_changed_timer(cdp1869_t *cdp1869)
start = CDP1869_SCANLINE_PREDISPLAY_START_PAL;
end = CDP1869_SCANLINE_PREDISPLAY_END_PAL;
}
-
+
if (scanline < start)
{
next_scanline = start;
@@ -460,7 +460,7 @@ WRITE8_DEVICE_HANDLER( cdp1869_out5_w )
cdp1869->wnamp = (word & 0x0f00) >> 8;
cdp1869->wnfreq = (word & 0x7000) >> 12;
cdp1869->wnoff = BIT(word, 15);
-
+
// fork out to CDP1869 sound core
cdp1869_set_wnamp(0, cdp1869->wnamp);
cdp1869_set_wnfreq(0, cdp1869->wnfreq);
@@ -794,7 +794,7 @@ static DEVICE_START( cdp1869 )
assert(cdp1869->screen != NULL);
// allocate timers
-
+
if (cdp1869->intf->on_prd_changed != NULL)
{
cdp1869->prd_changed_timer = timer_alloc(prd_changed_tick, (void *)device);
diff --git a/src/mame/audio/galaxian.c b/src/mame/audio/galaxian.c
index cd19662b2b1..b05b6e93f61 100644
--- a/src/mame/audio/galaxian.c
+++ b/src/mame/audio/galaxian.c
@@ -115,18 +115,18 @@ WRITE8_HANDLER( galaxian_sound_w )
case 2: /* FS3 (controls 555 timer at 8T) */
galaxian_background_enable_w(machine, offset, data);
break;
-
+
case 3: /* HIT */
galaxian_noise_enable_w(machine, 0, data);
break;
-
+
case 4: /* n/c */
break;
-
+
case 5: /* FIRE */
galaxian_shoot_enable_w(machine, 0, data);
break;
-
+
case 6: /* VOL1 */
case 7: /* VOL2 */
galaxian_vol_w(machine, offset & 1, data);
diff --git a/src/mame/drivers/astrocorp.c b/src/mame/drivers/astrocorp.c
index ee541ef0374..080026fb698 100644
--- a/src/mame/drivers/astrocorp.c
+++ b/src/mame/drivers/astrocorp.c
@@ -291,27 +291,27 @@ Show Hand
PCB CHE-B50-4002A 88 94V-0 0002
-CPU 1x MC68HC000FN12 (main)
- 1x pLSI1016-60LJ (main)
- 1x ASTRO V01 0005 (custom)
- 1x AD-65 (equivalent to OKI6295)(sound)
- 1x ASTRO 0001B (custom)
- 1x oscillator 20.000MHz
- 1x oscillator 25.601712MHz
-
-ROMs 2x 27C512 (1,2)
- 2x M27C801 (3,4)
- 1x M27C4001 (5)
- 1x 93C46 (not dumped)
-
-Note 1x 28x2 JAMMA edge connector
- 1x 18x2 edge connector
- 1x 10x2 edge connector
- 1x pushbutton
- 1x trimmer (volume)
- 1x 2x2 switches dip
-
-Hardware info by f205v
+CPU 1x MC68HC000FN12 (main)
+ 1x pLSI1016-60LJ (main)
+ 1x ASTRO V01 0005 (custom)
+ 1x AD-65 (equivalent to OKI6295)(sound)
+ 1x ASTRO 0001B (custom)
+ 1x oscillator 20.000MHz
+ 1x oscillator 25.601712MHz
+
+ROMs 2x 27C512 (1,2)
+ 2x M27C801 (3,4)
+ 1x M27C4001 (5)
+ 1x 93C46 (not dumped)
+
+Note 1x 28x2 JAMMA edge connector
+ 1x 18x2 edge connector
+ 1x 10x2 edge connector
+ 1x pushbutton
+ 1x trimmer (volume)
+ 1x 2x2 switches dip
+
+Hardware info by f205v
***************************************************************************/
@@ -331,14 +331,14 @@ ROM_END
static DRIVER_INIT( showhand )
{
/*
- UINT16 *rom = (UINT16*)memory_region(REGION_CPU1);
+ UINT16 *rom = (UINT16*)memory_region(REGION_CPU1);
- rom[0x0a1a/2] = 0x6000; // hopper jam
+ rom[0x0a1a/2] = 0x6000; // hopper jam
- rom[0x1494/2] = 0x4e71; // enable full test mode
+ rom[0x1494/2] = 0x4e71; // enable full test mode
- rom[0x12f6/2] = 0x6000; // rom error
- rom[0x4916/2] = 0x6000; // rom error
+ rom[0x12f6/2] = 0x6000; // rom error
+ rom[0x4916/2] = 0x6000; // rom error
*/
}
diff --git a/src/mame/drivers/badlands.c b/src/mame/drivers/badlands.c
index 56dde650eb9..dbe11e67733 100644
--- a/src/mame/drivers/badlands.c
+++ b/src/mame/drivers/badlands.c
@@ -618,8 +618,8 @@ static void update_interrupts_bootleg(running_machine *machine)
if (atarigen_video_int_state)
newstate = 1;
-// if (atarigen_sound_int_state)
-// newstate = 2;
+// if (atarigen_sound_int_state)
+// newstate = 2;
if (newstate)
cpunum_set_input_line(machine, 0, newstate, ASSERT_LINE);
@@ -631,24 +631,24 @@ static void update_interrupts_bootleg(running_machine *machine)
static void scanline_update_bootleg(const device_config *screen, int scanline)
{
/* sound IRQ is on 32V */
-// if (scanline & 32)
-// atarigen_6502_irq_ack_r(screen->machine, 0);
-// else if (!(readinputport(0) & 0x40))
-// atarigen_6502_irq_gen(screen->machine, 0);
+// if (scanline & 32)
+// atarigen_6502_irq_ack_r(screen->machine, 0);
+// else if (!(readinputport(0) & 0x40))
+// atarigen_6502_irq_gen(screen->machine, 0);
}
static MACHINE_RESET( badlandb )
{
-// pedal_value[0] = pedal_value[1] = 0x80;
+// pedal_value[0] = pedal_value[1] = 0x80;
atarigen_eeprom_reset();
atarigen_interrupt_reset(update_interrupts_bootleg);
atarigen_scanline_timer_reset(machine->primary_screen, scanline_update_bootleg, 32);
-// atarigen_sound_io_reset(1);
-// memcpy(bank_base, &bank_source_data[0x0000], 0x1000);
+// atarigen_sound_io_reset(1);
+// memcpy(bank_base, &bank_source_data[0x0000], 0x1000);
}
static MACHINE_DRIVER_START( badlandb )
@@ -658,8 +658,8 @@ static MACHINE_DRIVER_START( badlandb )
MDRV_CPU_PROGRAM_MAP(bootleg_map,0)
MDRV_CPU_VBLANK_INT("main", vblank_int)
-// MDRV_CPU_ADD(Z80, 2800000/8)
-// MDRV_CPU_PROGRAM_MAP(bootleg_soundmap,0)
+// MDRV_CPU_ADD(Z80, 2800000/8)
+// MDRV_CPU_PROGRAM_MAP(bootleg_soundmap,0)
MDRV_MACHINE_RESET(badlandb)
MDRV_NVRAM_HANDLER(atarigen)
diff --git a/src/mame/drivers/bfcobra.c b/src/mame/drivers/bfcobra.c
index 0cbd3999dd2..dd8105f83ee 100644
--- a/src/mame/drivers/bfcobra.c
+++ b/src/mame/drivers/bfcobra.c
@@ -64,7 +64,7 @@
* All games bar qos: NVRAM not saved
* Viper does not have a colour palette - the Flare chipset drives RGB direct.
- To fix this I set default values in the palette when the machine is initialised
+ To fix this I set default values in the palette when the machine is initialised
* CPU execution rate is wrong, the hardware adds 1 TCycle to each access which is unaccounted for.
* Plane priority is probably wrong but it's only used in Treble Top.
* Blitter loop counts and step are wrong - they are 9 bit counts, not 8.
@@ -309,9 +309,9 @@ static VIDEO_UPDATE( bfcobra )
UINT8 *lorescol;
/*
- The following is a dirty hack to init the palette index tables
- this should really be done elsewhere, preferably at compile time.
- */
+ The following is a dirty hack to init the palette index tables
+ this should really be done elsewhere, preferably at compile time.
+ */
if (init_colour_indexes == 1)
{
init_colour_indexes = 0;
@@ -783,20 +783,20 @@ static WRITE8_HANDLER( ramdac_w )
03 Bank control for Z80 region 0xc000-0xffff (16kB) WR
06 Interrupt status....................................WR
- 07 Interrupt ack.......................................WR
- Writing here sets the line number that vertical interrupt is generated at.
- cmd1, bit2 is the 9th bit of the line number
+ 07 Interrupt ack.......................................WR
+ Writing here sets the line number that vertical interrupt is generated at.
+ cmd1, bit2 is the 9th bit of the line number
???? Written with 0x21
08 cmd1 WR * bit 6 = screen select
- bit2 = 9th bit of vertical interrupt line number
- bit6 = 1 = select screen 1 else screen 0
+ bit2 = 9th bit of vertical interrupt line number
+ bit6 = 1 = select screen 1 else screen 0
09 cmd2 Linked with c001...............................W * bit 0 = 1 = hires
- bit0=1=hi res else lo res (as long as bit7 is 0)
- bit5=mask msb of each pixel
- bit6=mask 2 msbits of each lores pixel
- bit7=1=variable resolution - resolution is set by bit 7 of each vram byte. bit7=1=2 hires pixels
+ bit0=1=hi res else lo res (as long as bit7 is 0)
+ bit5=mask msb of each pixel
+ bit6=mask 2 msbits of each lores pixel
+ bit7=1=variable resolution - resolution is set by bit 7 of each vram byte. bit7=1=2 hires pixels
0A ???? Written with 0 and 1...........................W
- color of border
+ color of border
0B Horizontal frame buffer scroll .....................W
0C Vertical frame buffer scroll .......................W
diff --git a/src/mame/drivers/bishi.c b/src/mame/drivers/bishi.c
index 6a35ade2751..c1ac2d60541 100644
--- a/src/mame/drivers/bishi.c
+++ b/src/mame/drivers/bishi.c
@@ -76,7 +76,7 @@ Notes:
CN7/8 - 8 pin connector for power
4AK16 - power amp IC tied to CN5/6
675* - 27C240 EPROMs
-
+
***************************************************************************/
#define CPU_CLOCK (XTAL_24MHz / 2) /* 68000 clock */
diff --git a/src/mame/drivers/bloodbro.c b/src/mame/drivers/bloodbro.c
index f52db13e0c2..06a77759f04 100644
--- a/src/mame/drivers/bloodbro.c
+++ b/src/mame/drivers/bloodbro.c
@@ -103,7 +103,7 @@ Stephh's notes (based on the games M68000 code and some tests) :
DIP locations verified for:
- - bloodbro (manual)
+ - bloodbro (manual)
**************************************************************************/
@@ -211,24 +211,24 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( weststry )
PORT_START_TAG("DSW")
BLOODBRO_COINAGE
- /* SW1:7,8 is listed as "ROM change option", "optional"
+ /* SW1:7,8 is listed as "ROM change option", "optional"
A B C D
- Coin Up 0 1 1 1
- Screen Complete 0 0 0 1
- Stage Complete 1 1 3 1
- Top 10 1 3 3 3
- High Score 1 4 5 4
- Complete Game 5 5 10 15
+ Coin Up 0 1 1 1
+ Screen Complete 0 0 0 1
+ Stage Complete 1 1 3 1
+ Top 10 1 3 3 3
+ High Score 1 4 5 4
+ Complete Game 5 5 10 15
- D limits 8 tickets/coin except completion
+ D limits 8 tickets/coin except completion
- The sets handled in MAME don't seem to have this "feature"
+ The sets handled in MAME don't seem to have this "feature"
PORT_DIPNAME( 0x00c0, 0x00c0, "Ticket Dispenser Payout Mode" ) PORT_DIPLOCATION("SW1:7,8")
PORT_DIPSETTING( 0x00c0, "A" )
PORT_DIPSETTING( 0x0080, "B" )
- PORT_DIPSETTING( 0x0040, "C" )
- PORT_DIPSETTING( 0x0000, "D" )
- */
+ PORT_DIPSETTING( 0x0040, "C" )
+ PORT_DIPSETTING( 0x0000, "D" )
+ */
PORT_DIPUNKNOWN_DIPLOC( 0x0040, IP_ACTIVE_LOW, "SW1:7" )
PORT_DIPUNKNOWN_DIPLOC( 0x0080, IP_ACTIVE_LOW, "SW1:8" )
PORT_DIPNAME( 0x0300, 0x0300, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:1,2")
diff --git a/src/mame/drivers/blueprnt.c b/src/mame/drivers/blueprnt.c
index 676b1b86ca9..921fb8dba84 100644
--- a/src/mame/drivers/blueprnt.c
+++ b/src/mame/drivers/blueprnt.c
@@ -49,8 +49,8 @@ write:
should take 15 seconds according to the service manual
- DIP locations verified for:
- - blueprnt (manual)
+ DIP locations verified for:
+ - blueprnt (manual)
*/
diff --git a/src/mame/drivers/cidelsa.c b/src/mame/drivers/cidelsa.c
index be055a3c384..cf75bba7a88 100644
--- a/src/mame/drivers/cidelsa.c
+++ b/src/mame/drivers/cidelsa.c
@@ -62,14 +62,14 @@ static WRITE8_HANDLER( draco_sound_bankswitch_w )
{
/*
- pin description
+ pin description
- D0 not connected
- D1 not connected
- D2 not connected
- D3 2716 A10
+ D0 not connected
+ D1 not connected
+ D2 not connected
+ D3 2716 A10
- */
+ */
int bank = BIT(data, 3);
diff --git a/src/mame/drivers/circusc.c b/src/mame/drivers/circusc.c
index bc392039ce8..541d277b8e2 100644
--- a/src/mame/drivers/circusc.c
+++ b/src/mame/drivers/circusc.c
@@ -112,7 +112,7 @@ static WRITE8_HANDLER(circusc_sound_w)
discrete_sound_w(machine, NODE_07, (offset & 0x40) >> 6);
break;
}
-}
+}
@@ -304,7 +304,7 @@ static DISCRETE_SOUND_START( circusc )
DISCRETE_INPUTX_STREAM(NODE_01, 0, 1.0, 0)
DISCRETE_INPUTX_STREAM(NODE_02, 1, 1.0, 0)
DISCRETE_INPUTX_DATA(NODE_03, 255, 0, 0) //DAC
-
+
DISCRETE_INPUT_DATA(NODE_05)
DISCRETE_INPUT_DATA(NODE_06)
DISCRETE_INPUT_DATA(NODE_07)
@@ -316,7 +316,7 @@ static DISCRETE_SOUND_START( circusc )
DISCRETE_MIXER3(NODE_20, 1, NODE_10, NODE_11, NODE_12, &circusc_mixer_desc)
DISCRETE_OUTPUT(NODE_20, 10.0 )
-
+
DISCRETE_SOUND_END
static MACHINE_DRIVER_START( circusc )
@@ -354,12 +354,12 @@ static MACHINE_DRIVER_START( circusc )
MDRV_SOUND_ADD(SN76496, 14318180/8)
MDRV_SOUND_ROUTE_EX(0, "fltdisc", 1.0, 0)
-
+
MDRV_SOUND_ADD(SN76496, 14318180/8)
MDRV_SOUND_ROUTE_EX(0, "fltdisc", 1.0, 1)
-
+
MDRV_SOUND_ADD_TAG("fltdisc", DISCRETE, 0)
-
+
MDRV_SOUND_CONFIG_DISCRETE(circusc)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/drivers/ddragon.c b/src/mame/drivers/ddragon.c
index b8adcb9ce4e..e6be65f3140 100644
--- a/src/mame/drivers/ddragon.c
+++ b/src/mame/drivers/ddragon.c
@@ -910,7 +910,7 @@ INPUT_PORTS_END
*
*************************************/
-
+
static const gfx_layout char_layout =
{
8,8,
@@ -1441,16 +1441,16 @@ ROM_END
/* this is a well known italian bootleg of Double Dragon it can be identified by the following gameplay trait
- -- The Boss of level 4 is coloured like level 1 and 5 instead of green, and is invulnerable to rocks attack.
+ -- The Boss of level 4 is coloured like level 1 and 5 instead of green, and is invulnerable to rocks attack.
in terms of code the game code has been heavily modified, banking writes appear to have been removed, and
the graphic roms are all scrambled. The game also runs on 3x M6809 rather than the original CPUs.
-
+
I'm not 100% convinced the program roms are good dumps, apprently ROM3 fails on the original board (could just
be due to the rom hacking, as the game runs fine) but there is a jump to the 0x2000 region in the code, although
this could be additional protection / rom scrambling. Also the sound roms seem too small. If you have this
PCB please verify.
-
+
*/
ROM_START( ddgn6809 )
ROM_REGION( 0x30000, REGION_CPU1, 0 ) /* 64k for code + bankswitched memory */
@@ -1464,35 +1464,35 @@ ROM_START( ddgn6809 )
ROM_REGION( 0x10000, REGION_CPU3, 0 ) /* audio cpu */
ROM_LOAD( "21.bin", 0x08000, 0x08000, CRC(4437fc51) SHA1(fffcf2bec50d0b79861904b4abc607206b7794e6) )
-
+
/* all the gfx roms are scrambled on this set */
ROM_REGION( 0x08000, REGION_GFX1, ROMREGION_DISPOSE )
ROM_LOAD( "13.bin", 0x00000, 0x08000, CRC(b5a54537) SHA1(a6157cde4f9738565008d11a4a6d8576ae3abfef) ) /* chars */
ROM_REGION( 0x80000, REGION_GFX2, ROMREGION_DISPOSE )
- ROM_LOAD( "22.bin", 0x00000, 0x08000, CRC(fe08ef61) SHA1(50404936934dc61f3553add4d4b918529b3b5ef3) )
- ROM_LOAD( "23.bin", 0x08000, 0x08000, CRC(988bea93) SHA1(053ebb5a71dfdb68ae88ef49d8409a99f8c6926d) )
- ROM_LOAD( "24.bin", 0x10000, 0x08000, CRC(437501fc) SHA1(e7758e0fb226ae46eb398bd95f5e95c90b6adb93) )
- ROM_LOAD( "25.bin", 0x18000, 0x08000, CRC(d302f69b) SHA1(64d4d8ae38457ee6b361b5157ec0557f9a7639a8) )
- ROM_LOAD( "26.bin", 0x20000, 0x08000, CRC(8ece953e) SHA1(12a43e1ed1a99b04299941a9506228490649b181) )
- ROM_LOAD( "27.bin", 0x28000, 0x08000, CRC(15cd16cb) SHA1(ab2068ebba14da256e8f2600f34dca0e048a1de9) )
- ROM_LOAD( "28.bin", 0x30000, 0x08000, CRC(51b8a217) SHA1(60c067cd7272f856e29cdb64312535236656891a) )
- ROM_LOAD( "29.bin", 0x38000, 0x08000, CRC(e4ec2394) SHA1(43376ce2a07c1fc3053f7ac9b750e944d289105b) )
- ROM_LOAD( "1.bin", 0x40000, 0x08000, CRC(2485a71d) SHA1(3e987a2f3e9a59da5fdc7bb779a43736ca67aac7) )
- ROM_LOAD( "2.bin", 0x48000, 0x08000, CRC(6940120d) SHA1(bbe94f095ef983f54658c936f916ba6a72a84ead) )
- ROM_LOAD( "3.bin", 0x50000, 0x08000, CRC(c67aac12) SHA1(aab535507e3889bf1bdc2f4fe4828a70a350ba63) )
- ROM_LOAD( "4.bin", 0x58000, 0x08000, CRC(941dcd08) SHA1(266dee264f28affe8c3f57fe569929817ae16508) )
- ROM_LOAD( "5.bin", 0x60000, 0x08000, CRC(42d36bc3) SHA1(080cbc3ffda8ab26dc65a8e9eaf948c509d064b3) )
- ROM_LOAD( "6.bin", 0x68000, 0x08000, CRC(d5d19a8d) SHA1(c4b044dd12d6468c0ad114644f01813d4fe9a673) )
- ROM_LOAD( "7.bin", 0x70000, 0x08000, CRC(d4e350cd) SHA1(78ed2baa8c52b766f998091e7ce9e1a2941352e7) )
- ROM_LOAD( "8.bin", 0x78000, 0x08000, CRC(204fdb7d) SHA1(f75b1bc6f65e7a33927cd451267fcd7e2aa44f7e) )
+ ROM_LOAD( "22.bin", 0x00000, 0x08000, CRC(fe08ef61) SHA1(50404936934dc61f3553add4d4b918529b3b5ef3) )
+ ROM_LOAD( "23.bin", 0x08000, 0x08000, CRC(988bea93) SHA1(053ebb5a71dfdb68ae88ef49d8409a99f8c6926d) )
+ ROM_LOAD( "24.bin", 0x10000, 0x08000, CRC(437501fc) SHA1(e7758e0fb226ae46eb398bd95f5e95c90b6adb93) )
+ ROM_LOAD( "25.bin", 0x18000, 0x08000, CRC(d302f69b) SHA1(64d4d8ae38457ee6b361b5157ec0557f9a7639a8) )
+ ROM_LOAD( "26.bin", 0x20000, 0x08000, CRC(8ece953e) SHA1(12a43e1ed1a99b04299941a9506228490649b181) )
+ ROM_LOAD( "27.bin", 0x28000, 0x08000, CRC(15cd16cb) SHA1(ab2068ebba14da256e8f2600f34dca0e048a1de9) )
+ ROM_LOAD( "28.bin", 0x30000, 0x08000, CRC(51b8a217) SHA1(60c067cd7272f856e29cdb64312535236656891a) )
+ ROM_LOAD( "29.bin", 0x38000, 0x08000, CRC(e4ec2394) SHA1(43376ce2a07c1fc3053f7ac9b750e944d289105b) )
+ ROM_LOAD( "1.bin", 0x40000, 0x08000, CRC(2485a71d) SHA1(3e987a2f3e9a59da5fdc7bb779a43736ca67aac7) )
+ ROM_LOAD( "2.bin", 0x48000, 0x08000, CRC(6940120d) SHA1(bbe94f095ef983f54658c936f916ba6a72a84ead) )
+ ROM_LOAD( "3.bin", 0x50000, 0x08000, CRC(c67aac12) SHA1(aab535507e3889bf1bdc2f4fe4828a70a350ba63) )
+ ROM_LOAD( "4.bin", 0x58000, 0x08000, CRC(941dcd08) SHA1(266dee264f28affe8c3f57fe569929817ae16508) )
+ ROM_LOAD( "5.bin", 0x60000, 0x08000, CRC(42d36bc3) SHA1(080cbc3ffda8ab26dc65a8e9eaf948c509d064b3) )
+ ROM_LOAD( "6.bin", 0x68000, 0x08000, CRC(d5d19a8d) SHA1(c4b044dd12d6468c0ad114644f01813d4fe9a673) )
+ ROM_LOAD( "7.bin", 0x70000, 0x08000, CRC(d4e350cd) SHA1(78ed2baa8c52b766f998091e7ce9e1a2941352e7) )
+ ROM_LOAD( "8.bin", 0x78000, 0x08000, CRC(204fdb7d) SHA1(f75b1bc6f65e7a33927cd451267fcd7e2aa44f7e) )
ROM_REGION( 0x40000, REGION_GFX3, ROMREGION_DISPOSE )
- ROM_LOAD( "9.bin", 0x00000, 0x10000, CRC(736eff0f) SHA1(ae2ec2d5c8ab1db579a08256d874426dc5d889c6) )
- ROM_LOAD( "10.bin", 0x10000, 0x10000, CRC(a670d088) SHA1(27e7b49645753dd039f104c3e0a7e6513a98710d) )
- ROM_LOAD( "11.bin", 0x20000, 0x10000, CRC(4171b70d) SHA1(dc300c9bca6481417e97ad03c973e47389f261c1) )
- ROM_LOAD( "12.bin", 0x30000, 0x10000, CRC(5f6a6d6f) SHA1(7d546a226cda81c28e7ccfb4c5daebc65072198d) )
-
+ ROM_LOAD( "9.bin", 0x00000, 0x10000, CRC(736eff0f) SHA1(ae2ec2d5c8ab1db579a08256d874426dc5d889c6) )
+ ROM_LOAD( "10.bin", 0x10000, 0x10000, CRC(a670d088) SHA1(27e7b49645753dd039f104c3e0a7e6513a98710d) )
+ ROM_LOAD( "11.bin", 0x20000, 0x10000, CRC(4171b70d) SHA1(dc300c9bca6481417e97ad03c973e47389f261c1) )
+ ROM_LOAD( "12.bin", 0x30000, 0x10000, CRC(5f6a6d6f) SHA1(7d546a226cda81c28e7ccfb4c5daebc65072198d) )
+
ROM_REGION( 0x20000, REGION_SOUND1, 0 ) /* adpcm samples -- roms too small? (please check) */
ROM_LOAD( "14.bin", 0x00000, 0x08000, BAD_DUMP CRC(678f8657) SHA1(2652fdc6719d2c889ca87802f6e2cefae59fc2eb) )
ROM_LOAD( "15.bin", 0x10000, 0x08000, BAD_DUMP CRC(10f21dea) SHA1(739cf649f91490384297a81a2cc9855acb58a1c0) )
diff --git a/src/mame/drivers/flkatck.c b/src/mame/drivers/flkatck.c
index 0d67ddd7a27..2cbd86b8376 100644
--- a/src/mame/drivers/flkatck.c
+++ b/src/mame/drivers/flkatck.c
@@ -131,7 +131,7 @@ static ADDRESS_MAP_START( flkatck_readmem_sound, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) /* ROM */
AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) /* RAM */
AM_RANGE(0x9000, 0x9000) AM_READ(multiply_r) /* ??? */
-// AM_RANGE(0x9001, 0x9001) AM_READ(SMH_RAM) /* ??? */
+// AM_RANGE(0x9001, 0x9001) AM_READ(SMH_RAM) /* ??? */
AM_RANGE(0x9004, 0x9004) AM_READ(SMH_RAM) /* ??? */
AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) /* soundlatch_r */
AM_RANGE(0xb000, 0xb00d) AM_READ(K007232_read_port_0_r) /* 007232 registers */
@@ -142,7 +142,7 @@ static ADDRESS_MAP_START( flkatck_writemem_sound, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) /* ROM */
AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) /* RAM */
AM_RANGE(0x9000, 0x9001) AM_WRITE(multiply_w) /* ??? */
-// AM_RANGE(0x9001, 0x9001) AM_WRITE(SMH_RAM) /* ??? */
+// AM_RANGE(0x9001, 0x9001) AM_WRITE(SMH_RAM) /* ??? */
AM_RANGE(0x9006, 0x9006) AM_WRITE(SMH_RAM) /* ??? */
AM_RANGE(0xb000, 0xb00d) AM_WRITE(K007232_write_port_0_w) /* 007232 registers */
AM_RANGE(0xc000, 0xc000) AM_WRITE(YM2151_register_port_0_w) /* YM2151 */
diff --git a/src/mame/drivers/galaxian.c b/src/mame/drivers/galaxian.c
index c7f966d7236..1e7edc6f358 100644
--- a/src/mame/drivers/galaxian.c
+++ b/src/mame/drivers/galaxian.c
@@ -1,57 +1,57 @@
/***************************************************************************
- Galaxian-derived hardware
-
- Galaxian is the root hardware for many, many systems developed in the
- 1980-1982 timeframe. The basic design, which originated with Namco(?),
- was replicated, tweaked, bootlegged, and used numerous times.
-
- The basic hardware design comprises three sections on a single PCB:
- a CPU section, a sound section, and a video section.
-
- The CPU section is based around a Z80 (though there are modified
- designed that changed this to an S2650). The base galaxian hardware
- is designed to allow access to up to 16k of program ROM and 2k of
- working RAM.
-
- The sound section consists of three parts. The first part is
- a programmable 8-bit down counter that clocks a 4-bit counter which
- generates a primitive waveform whose shape is hardcoded but can be
- controlled by a pair of variable resistors. The second part is
- a set of three 555 timers which can be individually enabled and
- combined to produce square waves at fixed separated pitches. A
- fourth 555 timer is configured via a 4-bit frequency parameter to
- control the overall pitch of the other three. Finally, two single
- bit-triggered noise circuits are available. A 17-bit noise LFSR
- (which also generates stars for the video circuit) feeds into both
- circuits. A "HIT" line enables a simple on/off control of one
- filtered output, while a "FIRE" line triggers a fixed short duration
- pulse (controlled by another 555 timer) of modulated noise.
-
- See video/galaxian.c for a description of the video section.
+ Galaxian-derived hardware
+
+ Galaxian is the root hardware for many, many systems developed in the
+ 1980-1982 timeframe. The basic design, which originated with Namco(?),
+ was replicated, tweaked, bootlegged, and used numerous times.
+
+ The basic hardware design comprises three sections on a single PCB:
+ a CPU section, a sound section, and a video section.
+
+ The CPU section is based around a Z80 (though there are modified
+ designed that changed this to an S2650). The base galaxian hardware
+ is designed to allow access to up to 16k of program ROM and 2k of
+ working RAM.
+
+ The sound section consists of three parts. The first part is
+ a programmable 8-bit down counter that clocks a 4-bit counter which
+ generates a primitive waveform whose shape is hardcoded but can be
+ controlled by a pair of variable resistors. The second part is
+ a set of three 555 timers which can be individually enabled and
+ combined to produce square waves at fixed separated pitches. A
+ fourth 555 timer is configured via a 4-bit frequency parameter to
+ control the overall pitch of the other three. Finally, two single
+ bit-triggered noise circuits are available. A 17-bit noise LFSR
+ (which also generates stars for the video circuit) feeds into both
+ circuits. A "HIT" line enables a simple on/off control of one
+ filtered output, while a "FIRE" line triggers a fixed short duration
+ pulse (controlled by another 555 timer) of modulated noise.
+
+ See video/galaxian.c for a description of the video section.
****************************************************************************
- Schematics are known to exist for these games:
- * Galaxian
- * Moon Alien Part 2
- * King and Balloon
+ Schematics are known to exist for these games:
+ * Galaxian
+ * Moon Alien Part 2
+ * King and Balloon
- * Moon Cresta
- * Moon Shuttle
+ * Moon Cresta
+ * Moon Shuttle
- * Frogger
- * Amidar
- * Turtles
+ * Frogger
+ * Amidar
+ * Turtles
- * Scramble
- * The End
+ * Scramble
+ * The End
- * Super Cobra
- * Dark Planet
- * Lost Tomb
-
- * Dambusters
+ * Super Cobra
+ * Dark Planet
+ * Lost Tomb
+
+ * Dambusters
****************************************************************************
@@ -221,7 +221,7 @@ static WRITE8_HANDLER( irq_enable_w )
{
/* the latched D0 bit here goes to the CLEAR line on the interrupt flip-flop */
irq_enabled = data & 1;
-
+
/* if CLEAR is held low, we must make sure the interrupt signal is clear */
if (!irq_enabled)
cpunum_set_input_line(machine, 0, irq_line, CLEAR_LINE);
@@ -293,7 +293,7 @@ static WRITE8_HANDLER( konami_sound_control_w )
{
UINT8 old = konami_sound_control;
konami_sound_control = data;
-
+
/* the inverse of bit 3 clocks the flip flop to signal an INT */
/* it is automatically cleared on the acknowledge */
if ((old & 0x08) && !(data & 0x08))
@@ -307,22 +307,22 @@ static WRITE8_HANDLER( konami_sound_control_w )
static READ8_HANDLER( konami_sound_timer_r )
{
/*
- The timer is clocked at KONAMI_SOUND_CLOCK and cascades through a
- series of counters. It first encounters a chained pair of 4-bit
- counters in an LS393, which produce an effective divide-by-256. Next
- it enters the divide-by-2 counter in an LS93, followed by the
- divide-by-8 counter. Finally, it clocks a divide-by-5 counter in an
- LS90, followed by the divide-by-2 counter. This produces an effective
- period of 16*16*2*8*5*2 = 40960 clocks.
-
- The clock for the sound CPU comes from output C of the first
- divide-by-16 counter, or KONAMI_SOUND_CLOCK/8. To recover the
- current counter index, we use the sound cpu clock times 8 mod
- 16*16*2*8*5*2.
- */
+ The timer is clocked at KONAMI_SOUND_CLOCK and cascades through a
+ series of counters. It first encounters a chained pair of 4-bit
+ counters in an LS393, which produce an effective divide-by-256. Next
+ it enters the divide-by-2 counter in an LS93, followed by the
+ divide-by-8 counter. Finally, it clocks a divide-by-5 counter in an
+ LS90, followed by the divide-by-2 counter. This produces an effective
+ period of 16*16*2*8*5*2 = 40960 clocks.
+
+ The clock for the sound CPU comes from output C of the first
+ divide-by-16 counter, or KONAMI_SOUND_CLOCK/8. To recover the
+ current counter index, we use the sound cpu clock times 8 mod
+ 16*16*2*8*5*2.
+ */
UINT32 cycles = (cpunum_gettotalcycles(1) * 8) % (UINT64)(16*16*2*8*5*2);
UINT8 hibit = 0;
-
+
/* separate the high bit from the others */
if (cycles >= 16*16*2*8*5)
{
@@ -342,7 +342,7 @@ static READ8_HANDLER( konami_sound_timer_r )
static WRITE8_HANDLER( konami_sound_filter_w )
{
int which, chan;
-
+
/* the offset is used as data, 6 channels * 2 bits each */
for (which = 0; which < 2; which++)
if (sndti_exists(SOUND_AY8910, which))
@@ -359,14 +359,14 @@ static WRITE8_HANDLER( konami_sound_filter_w )
static READ8_HANDLER( konami_porta_0_r )
{
-// logerror("%04X:ppi0_porta_r\n", activecpu_get_pc());
+// logerror("%04X:ppi0_porta_r\n", activecpu_get_pc());
return readinputportbytag("IN0");
}
static READ8_HANDLER( konami_portb_0_r )
{
-// logerror("%04X:ppi0_portb_r\n", activecpu_get_pc());
+// logerror("%04X:ppi0_portb_r\n", activecpu_get_pc());
return readinputportbytag("IN1");
}
@@ -443,18 +443,18 @@ static WRITE8_HANDLER( theend_coin_counter_w )
/*************************************
*
- * Scramble I/O
+ * Scramble I/O
*
*************************************/
static WRITE8_HANDLER( scramble_protection_w )
{
- /*
- This is not fully understood; the low 4 bits of port C are
- inputs; the upper 4 bits are outputs. Scramble main set always
- writes sequences of 3 or more nibbles to the low port and
- expects certain results in the upper nibble afterwards.
- */
+ /*
+ This is not fully understood; the low 4 bits of port C are
+ inputs; the upper 4 bits are outputs. Scramble main set always
+ writes sequences of 3 or more nibbles to the low port and
+ expects certain results in the upper nibble afterwards.
+ */
protection_state = (protection_state << 4) | (data & 0x0f);
switch (protection_state & 0xfff)
{
@@ -463,7 +463,7 @@ static WRITE8_HANDLER( scramble_protection_w )
case 0xa49: protection_result = 0xbf; break;
case 0x319: protection_result = 0x4f; break;
case 0x5c9: protection_result = 0x6f; break;
-
+
/* scrambls */
case 0x246: protection_result ^= 0x80; break;
case 0xb5f: protection_result = 0x6f; break;
@@ -480,10 +480,10 @@ static READ8_HANDLER( scramble_protection_r )
static CUSTOM_INPUT( scramble_protection_alt_r )
{
/*
- There are two additional bits that are derived from bit 7 of
- the protection result. This is just a guess but works well enough
- to boot scrambls.
- */
+ There are two additional bits that are derived from bit 7 of
+ the protection result. This is just a guess but works well enough
+ to boot scrambls.
+ */
return (protection_result >> 7) & 1;
}
@@ -491,7 +491,7 @@ static CUSTOM_INPUT( scramble_protection_alt_r )
/*************************************
*
- * Explorer I/O
+ * Explorer I/O
*
*************************************/
@@ -536,7 +536,7 @@ static WRITE8_HANDLER( sfx_sample_control_w )
{
UINT8 old = sfx_sample_control;
sfx_sample_control = data;
-
+
/* the inverse of bit 0 clocks the flip flop to signal an INT */
/* it is automatically cleared on the acknowledge */
if ((old & 0x01) && !(data & 0x01))
@@ -559,7 +559,7 @@ static const ppi8255_interface sfx_ppi8255_intf =
/*************************************
*
- * Frogger I/O
+ * Frogger I/O
*
*************************************/
@@ -615,7 +615,7 @@ static WRITE8_HANDLER( froggrmc_sound_control_w )
/*************************************
*
- * Frog (Falcon) I/O
+ * Frog (Falcon) I/O
*
*************************************/
@@ -640,7 +640,7 @@ static WRITE8_HANDLER( frogf_ppi8255_w )
/*************************************
*
- * Turtles I/O
+ * Turtles I/O
*
*************************************/
@@ -684,7 +684,7 @@ static READ8_HANDLER( scorpion_protection_r )
{
UINT16 paritybits;
UINT8 parity = 0;
-
+
/* compute parity of the current (bitmask & $CE29) */
for (paritybits = protection_state & 0xce29; paritybits != 0; paritybits >>= 1)
if (paritybits & 1)
@@ -700,7 +700,7 @@ static WRITE8_HANDLER( scorpion_protection_w )
/* bit 5 low is a reset */
if (!(data & 0x20))
protection_state = 0x0000;
-
+
/* bit 4 low is a clock */
if (!(data & 0x10))
{
@@ -720,7 +720,7 @@ static READ8_HANDLER( scorpion_sound_status_r )
static WRITE8_HANDLER( scorpion_sound_data_w )
{
scorpion_sound_data = data;
-// logerror("%04X:scorpion_sound_data_w(%02X)\n", safe_activecpu_get_pc(), data);
+// logerror("%04X:scorpion_sound_data_w(%02X)\n", safe_activecpu_get_pc(), data);
}
@@ -728,14 +728,14 @@ static WRITE8_HANDLER( scorpion_sound_control_w )
{
if (!(data & 0x04))
mame_printf_debug("Secondary sound = %02X\n", scorpion_sound_data);
-// logerror("%04X:scorpion_sound_control_w(%02X)\n", safe_activecpu_get_pc(), data);
+// logerror("%04X:scorpion_sound_control_w(%02X)\n", safe_activecpu_get_pc(), data);
}
/*************************************
*
- * Ghostmuncher Galaxian I/O
+ * Ghostmuncher Galaxian I/O
*
*************************************/
@@ -743,14 +743,14 @@ static INPUT_CHANGED( gmgalax_game_changed )
{
/* new value is the selected game */
gmgalax_selected_game = newval;
-
+
/* select the bank and graphics bank based on it */
memory_set_bank(1, gmgalax_selected_game);
galaxian_gfxbank_w(machine, 0, gmgalax_selected_game);
-
+
/* reset the starts */
galaxian_stars_enable_w(machine, 0, 0);
-
+
/* reset the CPU */
cpunum_set_input_line(machine, 0, INPUT_LINE_RESET, PULSE_LINE);
}
@@ -768,7 +768,7 @@ static CUSTOM_INPUT( gmgalax_port_r )
/*************************************
*
- * Zig Zag I/O
+ * Zig Zag I/O
*
*************************************/
@@ -795,12 +795,12 @@ static WRITE8_HANDLER( zigzag_ay8910_w )
AY8910_control_port_0_w(machine, 0, zigzag_ay8910_latch);
}
break;
-
+
case 0x100:
/* data latch */
zigzag_ay8910_latch = offset & 0xff;
break;
-
+
case 0x200:
/* unknown */
break;
@@ -811,7 +811,7 @@ static WRITE8_HANDLER( zigzag_ay8910_w )
/*************************************
*
- * Azurian I/O
+ * Azurian I/O
*
*************************************/
@@ -824,7 +824,7 @@ static CUSTOM_INPUT( azurian_port_r )
/*************************************
*
- * King & Balloon I/O
+ * King & Balloon I/O
*
*************************************/
@@ -872,7 +872,7 @@ static WRITE8_HANDLER( kingball_dac_w )
/*************************************
*
- * Moon Shuttle I/O
+ * Moon Shuttle I/O
*
*************************************/
@@ -907,7 +907,7 @@ static READ8_HANDLER( mshuttle_ay8910_data_r )
/*************************************
*
- * Jump Bug I/O
+ * Jump Bug I/O
*
*************************************/
@@ -929,7 +929,7 @@ static READ8_HANDLER( jumpbug_protection_r )
/*************************************
*
- * Checkman I/O
+ * Checkman I/O
*
*************************************/
@@ -967,7 +967,7 @@ static READ8_HANDLER( checkmaj_protection_r )
/*************************************
*
- * Dingo I/O
+ * Dingo I/O
*
*************************************/
@@ -992,13 +992,13 @@ static READ8_HANDLER( dingoe_3001_r )
/*************************************
*
- * Memory maps
+ * Memory maps
*
*************************************/
/*
0000-3fff
-
+
4000-7fff
4000-47ff -> RAM read/write (10 bits = 0x400)
@@ -1102,8 +1102,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( dambustr_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x7fff) AM_ROM
-// AM_RANGE(0x8000, 0x8000) AM_WRITE(dambustr_bg_color_w)
-// AM_RANGE(0x8001, 0x8001) AM_WRITE(dambustr_bg_split_line_w)
+// AM_RANGE(0x8000, 0x8000) AM_WRITE(dambustr_bg_color_w)
+// AM_RANGE(0x8001, 0x8001) AM_WRITE(dambustr_bg_split_line_w)
AM_RANGE(0xc000, 0xc3ff) AM_MIRROR(0x0400) AM_RAM
AM_RANGE(0xd000, 0xd3ff) AM_MIRROR(0x0400) AM_READWRITE(SMH_RAM, galaxian_videoram_w) AM_BASE(&videoram)
AM_RANGE(0xd800, 0xd8ff) AM_MIRROR(0x0700) AM_READWRITE(SMH_RAM, galaxian_objram_w) AM_BASE(&spriteram)
@@ -1221,13 +1221,13 @@ ADDRESS_MAP_END
/* changes from galaxian map:
- galaxian sound removed
- $4800-$57ff: cointains video and object RAM (normally at $5000-$5fff)
- $5800-$5fff: AY-8910 access added
- $6002-$6006: graphics banking controls replace coin lockout, coin counter, and lfo
- $7002: coin counter (moved from $6003)
- $8000-$afff: additional ROM area
- $b000-$bfff: protection
+ galaxian sound removed
+ $4800-$57ff: cointains video and object RAM (normally at $5000-$5fff)
+ $5800-$5fff: AY-8910 access added
+ $6002-$6006: graphics banking controls replace coin lockout, coin counter, and lfo
+ $7002: coin counter (moved from $6003)
+ $8000-$afff: additional ROM area
+ $b000-$bfff: protection
*/
static ADDRESS_MAP_START( jumpbug_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
@@ -1299,7 +1299,7 @@ ADDRESS_MAP_END
/*************************************
*
- * Sound CPU memory maps
+ * Sound CPU memory maps
*
*************************************/
@@ -1505,7 +1505,7 @@ static DISCRETE_SOUND_START( konami_sound )
DISCRETE_INPUTX_STREAM(NODE_01, 0, 1.0, 0)
DISCRETE_INPUTX_STREAM(NODE_02, 1, 1.0, 0)
DISCRETE_INPUTX_STREAM(NODE_03, 2, 1.0, 0)
-
+
DISCRETE_INPUTX_STREAM(NODE_04, 3, 1.0, 0)
DISCRETE_INPUTX_STREAM(NODE_05, 4, 1.0, 0)
DISCRETE_INPUTX_STREAM(NODE_06, 5, 1.0, 0)
@@ -1531,9 +1531,9 @@ static DISCRETE_SOUND_START( konami_sound )
/* FIXME the amplifier M51516L has a decay circuit */
/* This is handled with sound_global_enable but */
/* belongs here. */
-
+
DISCRETE_OUTPUT(NODE_30, 5.0 )
-
+
DISCRETE_SOUND_END
@@ -1550,7 +1550,7 @@ static MACHINE_DRIVER_START( galaxian_base )
MDRV_CPU_ADD_TAG("main", Z80, GALAXIAN_PIXEL_CLOCK/3/2)
MDRV_CPU_PROGRAM_MAP(galaxian_map,0)
MDRV_CPU_VBLANK_INT("main", interrupt_gen)
-
+
MDRV_WATCHDOG_VBLANK_INIT(8)
/* video hardware */
@@ -1564,7 +1564,7 @@ static MACHINE_DRIVER_START( galaxian_base )
MDRV_PALETTE_INIT(galaxian)
MDRV_VIDEO_START(galaxian)
MDRV_VIDEO_UPDATE(galaxian)
-
+
/* blinking frequency is determined by 555 counter with Ra=100k, Rb=10k, C=10uF */
MDRV_TIMER_ADD_PERIODIC("stars", galaxian_stars_blink_timer, NSEC(PERIOD_OF_555_ASTABLE_NSEC(100000, 10000, 0.00001)))
@@ -1620,7 +1620,7 @@ static MACHINE_DRIVER_START( konami_sound_2x_ay8910 )
MDRV_SOUND_ROUTE_EX(0, "konami", 1.0, 3)
MDRV_SOUND_ROUTE_EX(1, "konami", 1.0, 4)
MDRV_SOUND_ROUTE_EX(2, "konami", 1.0, 5)
-
+
MDRV_SOUND_ADD_TAG("konami", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(konami_sound)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -1650,7 +1650,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( zigzag )
MDRV_IMPORT_FROM(galaxian_base)
-
+
/* separate tile/sprite ROMs */
MDRV_GFXDECODE(pacmanbl)
@@ -1853,13 +1853,13 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( sfx )
MDRV_IMPORT_FROM(galaxian_base)
MDRV_IMPORT_FROM(konami_sound_2x_ay8910)
-
+
MDRV_WATCHDOG_VBLANK_INIT(0)
/* alternate memory map */
MDRV_CPU_MODIFY("main")
MDRV_CPU_PROGRAM_MAP(sfx_map,0)
-
+
/* 3rd CPU for the sample player */
MDRV_CPU_ADD(Z80, KONAMI_SOUND_CLOCK/8)
MDRV_CPU_PROGRAM_MAP(sfx_sample_map,0)
@@ -1888,7 +1888,7 @@ MACHINE_DRIVER_END
/*************************************
*
- * Decryption helpers
+ * Decryption helpers
*
*************************************/
@@ -1896,7 +1896,7 @@ static void decode_mooncrst(int length, UINT8 *dest)
{
UINT8 *rom = memory_region(REGION_CPU1);
int offs;
-
+
for (offs = 0; offs < length; offs++)
{
UINT8 data = rom[offs];
@@ -1912,39 +1912,39 @@ static void decode_mooncrst(int length, UINT8 *dest)
static void decode_checkman(void)
{
/*
- Encryption Table
- ----------------
- +---+---+---+------+------+------+------+------+------+------+------+
- |A2 |A1 |A0 |D7 |D6 |D5 |D4 |D3 |D2 |D1 |D0 |
- +---+---+---+------+------+------+------+------+------+------+------+
- | 0 | 0 | 0 |D7 |D6 |D5 |D4 |D3 |D2 |D1 |D0^^D6|
- | 0 | 0 | 1 |D7 |D6 |D5 |D4 |D3 |D2 |D1^^D5|D0 |
- | 0 | 1 | 0 |D7 |D6 |D5 |D4 |D3 |D2^^D4|D1^^D6|D0 |
- | 0 | 1 | 1 |D7 |D6 |D5 |D4^^D2|D3 |D2 |D1 |D0^^D5|
- | 1 | 0 | 0 |D7 |D6^^D4|D5^^D1|D4 |D3 |D2 |D1 |D0 |
- | 1 | 0 | 1 |D7 |D6^^D0|D5^^D2|D4 |D3 |D2 |D1 |D0 |
- | 1 | 1 | 0 |D7 |D6 |D5 |D4 |D3 |D2^^D0|D1 |D0 |
- | 1 | 1 | 1 |D7 |D6 |D5 |D4^^D1|D3 |D2 |D1 |D0 |
- +---+---+---+------+------+------+------+------+------+------+------+
-
- For example if A2=1, A1=1 and A0=0 then D2 to the CPU would be an XOR of
- D2 and D0 from the ROM's. Note that D7 and D3 are not encrypted.
-
- Encryption PAL 16L8 on cardridge
- +--- ---+
- OE --| U |-- VCC
- ROMD0 --| |-- D0
- ROMD1 --| |-- D1
- ROMD2 --|VER 5.2|-- D2
- A0 --| |-- NOT USED
- A1 --| |-- A2
- ROMD4 --| |-- D4
- ROMD5 --| |-- D5
- ROMD6 --| |-- D6
- GND --| |-- M1 (NOT USED)
- +-------+
- Pin layout is such that links can replace the PAL if encryption is not used.
- */
+ Encryption Table
+ ----------------
+ +---+---+---+------+------+------+------+------+------+------+------+
+ |A2 |A1 |A0 |D7 |D6 |D5 |D4 |D3 |D2 |D1 |D0 |
+ +---+---+---+------+------+------+------+------+------+------+------+
+ | 0 | 0 | 0 |D7 |D6 |D5 |D4 |D3 |D2 |D1 |D0^^D6|
+ | 0 | 0 | 1 |D7 |D6 |D5 |D4 |D3 |D2 |D1^^D5|D0 |
+ | 0 | 1 | 0 |D7 |D6 |D5 |D4 |D3 |D2^^D4|D1^^D6|D0 |
+ | 0 | 1 | 1 |D7 |D6 |D5 |D4^^D2|D3 |D2 |D1 |D0^^D5|
+ | 1 | 0 | 0 |D7 |D6^^D4|D5^^D1|D4 |D3 |D2 |D1 |D0 |
+ | 1 | 0 | 1 |D7 |D6^^D0|D5^^D2|D4 |D3 |D2 |D1 |D0 |
+ | 1 | 1 | 0 |D7 |D6 |D5 |D4 |D3 |D2^^D0|D1 |D0 |
+ | 1 | 1 | 1 |D7 |D6 |D5 |D4^^D1|D3 |D2 |D1 |D0 |
+ +---+---+---+------+------+------+------+------+------+------+------+
+
+ For example if A2=1, A1=1 and A0=0 then D2 to the CPU would be an XOR of
+ D2 and D0 from the ROM's. Note that D7 and D3 are not encrypted.
+
+ Encryption PAL 16L8 on cardridge
+ +--- ---+
+ OE --| U |-- VCC
+ ROMD0 --| |-- D0
+ ROMD1 --| |-- D1
+ ROMD2 --|VER 5.2|-- D2
+ A0 --| |-- NOT USED
+ A1 --| |-- A2
+ ROMD4 --| |-- D4
+ ROMD5 --| |-- D5
+ ROMD6 --| |-- D6
+ GND --| |-- M1 (NOT USED)
+ +-------+
+ Pin layout is such that links can replace the PAL if encryption is not used.
+ */
static const UINT8 xortable[8][4] =
{
{ 6,0,6,0 },
@@ -1998,7 +1998,7 @@ static void decode_frogger_sound(void)
{
UINT8 *rombase = memory_region(REGION_CPU2);
UINT32 offs;
-
+
/* the first ROM of the sound CPU has data lines D0 and D1 swapped */
for (offs = 0; offs < 0x0800; offs++)
rombase[offs] = BITSWAP8(rombase[offs], 7,6,5,4,3,2,0,1);
@@ -2009,7 +2009,7 @@ static void decode_frogger_gfx(void)
{
UINT8 *rombase = memory_region(REGION_GFX1);
UINT32 offs;
-
+
/* the 2nd gfx ROM has data lines D0 and D1 swapped */
for (offs = 0x0800; offs < 0x1000; offs++)
rombase[offs] = BITSWAP8(rombase[offs], 7,6,5,4,3,2,0,1);
@@ -2059,7 +2059,7 @@ static void decode_losttomb_gfx(void)
/*************************************
*
- * Driver configuration
+ * Driver configuration
*
*************************************/
@@ -2067,7 +2067,7 @@ static void common_init(
running_machine *machine,
galaxian_draw_bullet_func draw_bullet,
galaxian_draw_background_func draw_background,
- galaxian_extend_tile_info_func extend_tile_info,
+ galaxian_extend_tile_info_func extend_tile_info,
galaxian_extend_sprite_info_func extend_sprite_info)
{
irq_line = INPUT_LINE_NMI;
@@ -2086,12 +2086,12 @@ static void konami_common_init(
running_machine *machine,
galaxian_draw_bullet_func draw_bullet,
galaxian_draw_background_func draw_background,
- galaxian_extend_tile_info_func extend_tile_info,
+ galaxian_extend_tile_info_func extend_tile_info,
galaxian_extend_sprite_info_func extend_sprite_info)
{
/* basic configuration */
common_init(machine, draw_bullet, draw_background, extend_tile_info, extend_sprite_info);
-
+
/* configure Konami sound */
ppi8255_init(&konami_ppi8255_intf);
}
@@ -2108,7 +2108,7 @@ static void unmap_galaxian_sound(offs_t base)
/*************************************
*
- * Galaxian-derived games
+ * Galaxian-derived games
*
*************************************/
@@ -2177,7 +2177,7 @@ static DRIVER_INIT( frogg )
{
/* same as galaxian... */
common_init(machine, galaxian_draw_bullet, frogger_draw_background, frogger_extend_tile_info, frogger_extend_sprite_info);
-
+
/* ...but needs a full 2k of RAM */
memory_install_readwrite8_handler(0, ADDRESS_SPACE_PROGRAM, 0x4000, 0x47ff, 0, 0, SMH_BANK1, SMH_BANK1);
memory_set_bankptr(1, auto_malloc(0x800));
@@ -2187,7 +2187,7 @@ static DRIVER_INIT( frogg )
/*************************************
*
- * Moon Cresta-derived games
+ * Moon Cresta-derived games
*
*************************************/
@@ -2195,7 +2195,7 @@ static DRIVER_INIT( mooncrst )
{
/* video extensions */
common_init(machine, galaxian_draw_bullet, galaxian_draw_background, mooncrst_extend_tile_info, mooncrst_extend_sprite_info);
-
+
/* decrypt program code */
decode_mooncrst(0x8000, memory_region(REGION_CPU1));
}
@@ -2212,7 +2212,7 @@ static DRIVER_INIT( mooncrgx )
{
/* video extensions */
common_init(machine, galaxian_draw_bullet, galaxian_draw_background, mooncrst_extend_tile_info, mooncrst_extend_sprite_info);
-
+
/* LEDs and coin lockout replaced by graphics banking */
memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x6000, 0x6002, 0, 0x7f8, galaxian_gfxbank_w);
}
@@ -2224,7 +2224,7 @@ static DRIVER_INIT( moonqsr )
/* video extensions */
common_init(machine, galaxian_draw_bullet, galaxian_draw_background, moonqsr_extend_tile_info, moonqsr_extend_sprite_info);
-
+
/* decrypt program code */
decode_mooncrst(0x8000, decrypt);
memory_set_decrypted_region(0, 0x0000, 0x7fff, decrypt);
@@ -2259,7 +2259,7 @@ static DRIVER_INIT( zigzag )
{
/* video extensions */
common_init(machine, NULL, galaxian_draw_background, NULL, NULL);
-
+
/* make ROMs 2 & 3 swappable */
memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x2000, 0x2fff, 0, 0, SMH_BANK1);
memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x3000, 0x3fff, 0, 0, SMH_BANK2);
@@ -2272,11 +2272,11 @@ static DRIVER_INIT( zigzag )
/* coin lockout disabled */
memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x6002, 0x6002, 0, 0x7f8, SMH_UNMAP);
-
+
/* remove the galaxian sound hardware */
unmap_galaxian_sound(0x6000);
- /* install our AY-8910 handler */
+ /* install our AY-8910 handler */
memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x4800, 0x4fff, 0, 0, zigzag_ay8910_w);
}
@@ -2292,14 +2292,14 @@ static DRIVER_INIT( checkman )
{
/* video extensions */
common_init(machine, galaxian_draw_bullet, galaxian_draw_background, mooncrst_extend_tile_info, mooncrst_extend_sprite_info);
-
+
/* move the interrupt enable from $b000 to $b001 */
memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0xb000, 0xb000, 0, 0x7f8, SMH_UNMAP);
memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0xb001, 0xb001, 0, 0x7f8, irq_enable_w);
/* attach the sound command handler */
memory_install_write8_handler(0, ADDRESS_SPACE_IO, 0x00, 0x00, 0, 0xffff, checkman_sound_command_w);
-
+
/* decrypt program code */
decode_checkman();
}
@@ -2312,7 +2312,7 @@ static DRIVER_INIT( checkmaj )
/* attach the sound command handler */
memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x7800, 0x7800, 0, 0x7ff, checkman_sound_command_w);
-
+
/* for the title screen */
memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x3800, 0x3800, 0, 0, checkmaj_protection_r);
}
@@ -2325,7 +2325,7 @@ static DRIVER_INIT( dingo )
/* attach the sound command handler */
memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x7800, 0x7800, 0, 0x7ff, checkman_sound_command_w);
-
+
memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x3000, 0x3000, 0, 0, dingo_3000_r);
memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x3035, 0x3035, 0, 0, dingo_3035_r);
}
@@ -2335,7 +2335,7 @@ static DRIVER_INIT( dingoe )
{
/* video extensions */
common_init(machine, galaxian_draw_bullet, galaxian_draw_background, mooncrst_extend_tile_info, mooncrst_extend_sprite_info);
-
+
/* move the interrupt enable from $b000 to $b001 */
memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0xb000, 0xb000, 0, 0x7f8, SMH_UNMAP);
memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0xb001, 0xb001, 0, 0x7f8, irq_enable_w);
@@ -2344,7 +2344,7 @@ static DRIVER_INIT( dingoe )
memory_install_write8_handler(0, ADDRESS_SPACE_IO, 0x00, 0x00, 0, 0xffff, checkman_sound_command_w);
memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x3001, 0x3001, 0, 0, dingoe_3001_r); /* Protection check */
-
+
/* decrypt program code */
decode_dingoe();
}
@@ -2425,7 +2425,7 @@ static DRIVER_INIT( scorpnmc )
/* install RAM at $4000-$4800 */
memory_install_readwrite8_handler(0, ADDRESS_SPACE_PROGRAM, 0x4000, 0x47ff, 0, 0, SMH_BANK2, SMH_BANK2);
memory_set_bankptr(2, auto_malloc(0x800));
-
+
/* doesn't appear to use original RAM */
memory_install_readwrite8_handler(0, ADDRESS_SPACE_PROGRAM, 0x8000, 0x87ff, 0, 0, SMH_UNMAP, SMH_UNMAP);
}
@@ -2434,7 +2434,7 @@ static DRIVER_INIT( scorpnmc )
/*************************************
*
- * Konami games
+ * Konami games
*
*************************************/
@@ -2442,7 +2442,7 @@ static DRIVER_INIT( theend )
{
/* video extensions */
konami_common_init(machine, theend_draw_bullet, galaxian_draw_background, NULL, NULL);
-
+
/* coin counter on the upper bit of port C */
memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x6802, 0x6802, 0, 0x7f8, SMH_UNMAP);
ppi8255_set_portCwrite(0, theend_coin_counter_w);
@@ -2453,7 +2453,7 @@ static DRIVER_INIT( scramble )
{
/* video extensions */
konami_common_init(machine, scramble_draw_bullet, scramble_draw_background, NULL, NULL);
-
+
/* configure protection */
ppi8255_set_portCread (1, scramble_protection_r);
ppi8255_set_portCwrite(1, scramble_protection_w);
@@ -2516,7 +2516,7 @@ static DRIVER_INIT( losttomb )
{
/* video extensions */
konami_common_init(machine, scramble_draw_bullet, scramble_draw_background, NULL, NULL);
-
+
/* decrypt */
decode_losttomb_gfx();
}
@@ -2588,30 +2588,30 @@ static DRIVER_INIT( scorpion )
/* configure protection */
ppi8255_set_portCwrite(1, scorpion_protection_w);
ppi8255_set_portCread(1, scorpion_protection_r);
-
+
/* extra ROM */
memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x5800, 0x67ff, 0, 0, SMH_BANK1);
memory_set_bankptr(1, memory_region(REGION_CPU1) + 0x5800);
/* no background related */
-// memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x6803, 0x6803, 0, 0, SMH_NOP);
+// memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x6803, 0x6803, 0, 0, SMH_NOP);
memory_install_read8_handler(1, ADDRESS_SPACE_PROGRAM, 0x3000, 0x3000, 0, 0, scorpion_sound_status_r);
/*
{
- const UINT8 *rom = memory_region(REGION_SOUND1);
- int i;
-
- for (i = 0; i < 0x2c; i++)
- {
- UINT16 addr = (rom[2*i] << 8) | rom[2*i+1];
- UINT16 endaddr = (rom[2*i+2] << 8) | rom[2*i+3];
- int j;
- printf("Cmd %02X -> %04X-%04X:", i, addr, endaddr - 1);
- for (j = 0; j < 32 && addr < endaddr; j++)
- printf(" %02X", rom[addr++]);
- printf("\n");
- }
+ const UINT8 *rom = memory_region(REGION_SOUND1);
+ int i;
+
+ for (i = 0; i < 0x2c; i++)
+ {
+ UINT16 addr = (rom[2*i] << 8) | rom[2*i+1];
+ UINT16 endaddr = (rom[2*i+2] << 8) | rom[2*i+3];
+ int j;
+ printf("Cmd %02X -> %04X-%04X:", i, addr, endaddr - 1);
+ for (j = 0; j < 32 && addr < endaddr; j++)
+ printf(" %02X", rom[addr++]);
+ printf("\n");
+ }
}
*/
}
diff --git a/src/mame/drivers/galdrvr.c b/src/mame/drivers/galdrvr.c
index fd89dd2cc67..b0ee5ae5ccb 100644
--- a/src/mame/drivers/galdrvr.c
+++ b/src/mame/drivers/galdrvr.c
@@ -1,7 +1,7 @@
/*************************************
*
- * Input Ports
- * Galaxian-derived games
+ * Input Ports
+ * Galaxian-derived games
*
*************************************/
@@ -213,7 +213,7 @@ INPUT_PORTS_END
INPUT_PORTS_START( catacomb )
PORT_INCLUDE(galaxian)
-
+
PORT_MODIFY("IN0")
PORT_DIPUNKNOWN( 0x40, 0x00 )
PORT_DIPUNKNOWN( 0x80, 0x00 )
@@ -402,7 +402,7 @@ INPUT_PORTS_START( pisces )
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0xe0, IP_ACTIVE_HIGH, IPT_UNUSED )
-
+
PORT_MODIFY("IN1")
PORT_DIPNAME( 0x40, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
@@ -441,7 +441,7 @@ INPUT_PORTS_START( gteikokb )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED ) /* Not tested due to code removed at 0x00ab, 0x1b26 and 0x1c97*/
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED ) /* Not tested due to code removed at 0x1901*/
-
+
PORT_MODIFY("IN1")
PORT_DIPNAME( 0x40, 0x40, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
@@ -764,8 +764,8 @@ INPUT_PORTS_END
/*************************************
*
- * Input Ports
- * Moon Cresta-derived games
+ * Input Ports
+ * Moon Cresta-derived games
*
*************************************/
@@ -1233,8 +1233,8 @@ INPUT_PORTS_END
/*************************************
*
- * Input Ports
- * Konami games
+ * Input Ports
+ * Konami games
*
*************************************/
@@ -1318,7 +1318,7 @@ INPUT_PORTS_END
INPUT_PORTS_START( frogg )
PORT_INCLUDE(froggrmc)
-
+
PORT_MODIFY("IN0")
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_SPECIAL ) // See notes
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL
@@ -2064,7 +2064,7 @@ INPUT_PORTS_END
/*************************************
*
* ROM definitions
- * Galaxian-derived games
+ * Galaxian-derived games
*
*************************************/
@@ -2902,7 +2902,7 @@ ROM_END
/*************************************
*
* ROM definitions
- * Moon Cresta-derived games
+ * Moon Cresta-derived games
*
*************************************/
@@ -3647,7 +3647,7 @@ ROM_END
/*************************************
*
* ROM definitions
- * Konami games
+ * Konami games
*
*************************************/
@@ -4581,7 +4581,7 @@ ROM_END
/*************************************
*
* Game drivers
- * Galaxian-derived games
+ * Galaxian-derived games
*
*************************************/
@@ -4656,7 +4656,7 @@ GAME( 1981, gmgalax, 0, gmgalax, gmgalax, gmgalax, ROT90, "bootleg",
/*************************************
*
* Game drivers
- * Moon Cresta-derived games
+ * Moon Cresta-derived games
*
*************************************/
@@ -4713,7 +4713,7 @@ GAME( 1980, kingbalj, kingball, kingball, kingball, kingball, ROT90, "Namco", "
/*************************************
*
* Game drivers
- * Konami games
+ * Konami games
*
*************************************/
@@ -4794,9 +4794,9 @@ GAME( 1982, anteater, 0, scobra, anteater, anteater, ROT90, "[Stern] (
//GAME( 1984, drivfrcg, drivfrcp, drivfrcg, drivfrcg, galaxian, ROT90, "Shinkai Inc. (Magic Eletronics USA licence)", "Driving Force (Galaxian conversion)", GAME_SUPPORTS_SAVE )
//GAME( 1985, drivfrcb, drivfrcp, drivfrcg, drivfrcg, galaxian, ROT90, "bootleg", "Driving Force (Galaxian conversion bootleg)", GAME_SUPPORTS_SAVE )
//GAME( 1983, bongo, 0, bongo, bongo, galaxian, ROT90, "Jetsoft", "Bongo", GAME_SUPPORTS_SAVE )
-//GAME( 1983, hunchbkg, hunchbak, hunchbkg, hunchbkg, galaxian, ROT90, "Century Electronics", "Hunchback (Galaxian hardware)", GAME_SUPPORTS_SAVE )
+//GAME( 1983, hunchbkg, hunchbak, hunchbkg, hunchbkg, galaxian, ROT90, "Century Electronics", "Hunchback (Galaxian hardware)", GAME_SUPPORTS_SAVE )
//GAME( 1983, harem, 0, harem, harem, galaxian, ROT90, "I.G.R.", "Harem", GAME_NO_SOUND | GAME_NOT_WORKING | GAME_SUPPORTS_SAVE )
-//GAME( 1982, tazzmang, tazmania, tazzmang, tazzmang, galaxian, ROT90, "bootleg", "Tazz-Mania (Galaxian Hardware)", GAME_SUPPORTS_SAVE )
+//GAME( 1982, tazzmang, tazmania, tazzmang, tazzmang, galaxian, ROT90, "bootleg", "Tazz-Mania (Galaxian Hardware)", GAME_SUPPORTS_SAVE )
//GAME( 1986, racknrol, 0, racknrol, racknrol, galaxian, ROT0, "Status (Shinkai License)", "Rack + Roll", GAME_SUPPORTS_SAVE )
//GAME( 1986, hexpool, racknrol, racknrol, racknrol, galaxian, ROT90, "Shinkai", "Hex Pool (Shinkai)", GAME_SUPPORTS_SAVE )
//GAME( 1985, hexpoola, racknrol, hexpoola, racknrol, galaxian, ROT90, "Senko", "Hex Pool (Senko)", GAME_SUPPORTS_SAVE )
@@ -4825,7 +4825,7 @@ GAME( 1982, anteater, 0, scobra, anteater, anteater, ROT90, "[Stern] (
//GAME( 1983, cavelon, 0, theend /*cavelon*/, cavelon, cavelon, ROT90, "Jetsoft", "Cavelon", GAME_SUPPORTS_SAVE )
//GAME( 198?, mimonscr, mimonkey, theend /*mimonscr*/, mimonscr, mimonscr, ROT90, "bootleg", "Mighty Monkey (bootleg on Scramble hardware)", GAME_SUPPORTS_SAVE )
//GAME( 1983, ad2083, 0, theend /*ad2083*/, ad2083, ad2083, ROT90, "Midcoin", "A. D. 2083", GAME_IMPERFECT_SOUND | GAME_SUPPORTS_SAVE)
-//GAME( 1981, turpins, turtles, turtles, turpins, 0, ROT90, "[Sega] (bootleg)", "Turpin (bootleg on Scramble hardware)", GAME_NO_SOUND | GAME_SUPPORTS_SAVE ) // haven't hooked up the sound CPU yet
+//GAME( 1981, turpins, turtles, turtles, turpins, 0, ROT90, "[Sega] (bootleg)", "Turpin (bootleg on Scramble hardware)", GAME_NO_SOUND | GAME_SUPPORTS_SAVE ) // haven't hooked up the sound CPU yet
/* currently in scobra.c and should be moved here */
//GAME( 1981, stratgyx, 0, scobra/*stratgyx*/, stratgyx, stratgyx, ROT0, "Konami", "Strategy X", GAME_SUPPORTS_SAVE )
@@ -4845,7 +4845,7 @@ GAME( 1982, anteater, 0, scobra, anteater, anteater, ROT90, "[Stern] (
//GAME( 1981, hustler, 0, scobra/*hustler*/, hustler, hustler, ROT90, "Konami", "Video Hustler", GAME_SUPPORTS_SAVE )
//GAME( 1981, billiard, hustler, scobra/*hustler*/, hustler, billiard, ROT90, "bootleg", "The Billiards", GAME_SUPPORTS_SAVE )
//GAME( 1981, hustlerb, hustler, scobra/*hustlerb*/, hustler, scramble_ppi, ROT90, "bootleg", "Video Hustler (bootleg)", GAME_SUPPORTS_SAVE )
-//GAME( 198?, mimonkey, 0, scobra/*mimonkey*/, mimonkey, mimonkey, ROT90, "Universal Video Games", "Mighty Monkey", GAME_SUPPORTS_SAVE )
+//GAME( 198?, mimonkey, 0, scobra/*mimonkey*/, mimonkey, mimonkey, ROT90, "Universal Video Games", "Mighty Monkey", GAME_SUPPORTS_SAVE )
//GAME( 198?, mimonsco, mimonkey, scobra/*mimonkey*/, mimonsco, mimonsco, ROT90, "bootleg", "Mighty Monkey (bootleg on Super Cobra hardware)", GAME_SUPPORTS_SAVE )
/* currently in dambustr.c and should be moved here */
diff --git a/src/mame/drivers/guab.c b/src/mame/drivers/guab.c
index 2a31f15828a..6b945ba76a1 100644
--- a/src/mame/drivers/guab.c
+++ b/src/mame/drivers/guab.c
@@ -99,7 +99,7 @@ static const struct tms34061_interface tms34061intf =
static WRITE16_HANDLER( guab_tms34061_w )
{
- int func = (offset >> 19) & 3;
+ int func = (offset >> 19) & 3;
int row = (offset >> 7) & 0xff;
int col;
@@ -119,10 +119,10 @@ static WRITE16_HANDLER( guab_tms34061_w )
static READ16_HANDLER( guab_tms34061_r )
{
UINT16 data = 0;
- int func = (offset >> 19) & 3;
+ int func = (offset >> 19) & 3;
int row = (offset >> 7) & 0xff;
int col;
-
+
if (func == 0 || func == 2)
col = offset & 0xff;
else
@@ -218,7 +218,7 @@ static VIDEO_START( guab )
static VIDEO_UPDATE( guab )
{
int x, y;
- struct tms34061_display state;
+ struct tms34061_display state;
tms34061_get_display_state(&state);
@@ -235,7 +235,7 @@ static VIDEO_UPDATE( guab )
UINT16 *dest = BITMAP_ADDR16(bitmap, y, 0);
for (x = cliprect->min_x; x <= cliprect->max_x; x += 2)
- {
+ {
UINT8 pen = src[x >> 1];
/* Draw two 4-bit pixels */
@@ -300,14 +300,14 @@ static TIMER_CALLBACK( fdc_data_callback )
int more_data = 0;
/*
- Disk dumps are organised as:
+ Disk dumps are organised as:
- Side 0, Track 0: Sectors 0 - 17
- Side 1, Track 0: Sectors 0 - 17
- Side 0, Track 1: Sectors 0 - 17
- Side 1, Track 1: Sectors 0 - 17
- etc.
- */
+ Side 0, Track 0: Sectors 0 - 17
+ Side 1, Track 0: Sectors 0 - 17
+ Side 0, Track 1: Sectors 0 - 17
+ Side 1, Track 1: Sectors 0 - 17
+ etc.
+ */
int idx = 2 * fdc.track * (DISK_TRACK_SIZE) + (fdc.side ? DISK_TRACK_SIZE : 0)+
fdc.sector * (DISK_SECTOR_SIZE) +
@@ -615,7 +615,7 @@ static WRITE16_HANDLER( io_w )
case 0x31:
{
/* Only JPM knows about the other bits... */
- fdc.side = (data >> 3) & 1;
+ fdc.side = (data >> 3) & 1;
break;
}
case 0x32:
diff --git a/src/mame/drivers/ironhors.c b/src/mame/drivers/ironhors.c
index 9fbf00013ea..8635bf37f49 100644
--- a/src/mame/drivers/ironhors.c
+++ b/src/mame/drivers/ironhors.c
@@ -415,14 +415,14 @@ static DISCRETE_SOUND_START( ironhors )
DISCRETE_RCFILTER_SW(NODE_21, 1, NODE_01, NODE_11, 1000, CAP_U(0.22), 0, 0, 0)
DISCRETE_RCFILTER_SW(NODE_22, 1, NODE_02, NODE_12, 1000, CAP_U(0.22), 0, 0, 0)
DISCRETE_RCFILTER_SW(NODE_23, 1, NODE_03, NODE_13, 1000, CAP_U(0.22), 0, 0, 0)
-
+
DISCRETE_MIXER3(NODE_30, 1, NODE_21, NODE_22, NODE_23, &ironhors_mixer_desc)
DISCRETE_RCFILTER(NODE_31,1,NODE_04, RES_K(1), CAP_N(33) )
DISCRETE_MIXER2(NODE_33, 1, NODE_30, NODE_31, &ironhors_mixer_desc_final)
-
+
DISCRETE_OUTPUT(NODE_33, 5.0 )
-
+
DISCRETE_SOUND_END
static const struct YM2203interface ym2203_interface =
@@ -466,7 +466,7 @@ static MACHINE_DRIVER_START( ironhors )
MDRV_SOUND_ADD_TAG("ym2203", YM2203, 18432000/6)
MDRV_SOUND_CONFIG(ym2203_interface)
-
+
MDRV_SOUND_ROUTE_EX(0, "disc_ih", 1.0, 0)
MDRV_SOUND_ROUTE_EX(1, "disc_ih", 1.0, 1)
MDRV_SOUND_ROUTE_EX(2, "disc_ih", 1.0, 2)
diff --git a/src/mame/drivers/mpu4.c b/src/mame/drivers/mpu4.c
index 423fbdbcb9d..0953ed10691 100644
--- a/src/mame/drivers/mpu4.c
+++ b/src/mame/drivers/mpu4.c
@@ -483,7 +483,7 @@ static WRITE8_HANDLER( ic2_o1_callback )
ptm6840_set_c2(0,data);
/* copy output value to IC2 c2
- this output is the clock for timer2 */
+ this output is the clock for timer2 */
}
@@ -499,7 +499,7 @@ static WRITE8_HANDLER( ic2_o2_callback )
static WRITE8_HANDLER( ic2_o3_callback )
{
/* the output from timer3 is used as a square wave for the alarm output
- and as an external clock source for timer 1! */
+ and as an external clock source for timer 1! */
ptm6840_set_c1( 0, data);
}
diff --git a/src/mame/drivers/mpu4drvr.c b/src/mame/drivers/mpu4drvr.c
index 2a10c66ea71..b3dde1b28ab 100644
--- a/src/mame/drivers/mpu4drvr.c
+++ b/src/mame/drivers/mpu4drvr.c
@@ -14,11 +14,11 @@ This version of the game card does not have the OKI chip, or the characteriser.
The VIDEO BOARD is driven by a 10mhz 68000 processor, and contains a 6840PTM, 6850 serial IO
(the other end of the communications), an SAA1099 for stereo sound and SCN2674 gfx chip.
-The VIDEO CARTRIDGE plugs into the video board, and contains the program roms for the video based game.
+The VIDEO CARTRIDGE plugs into the video board, and contains the program roms for the video based game.
Like the MPU4 game card, in some cases an extra OKI sound chip is added to the video board's game card,
as well as extra RAM.
There is a protection chip similar to and replacing the MPU4 Characteriser, which is often fed question
-data to descramble (unknown how it works). In non-question cases, however, the protection chip works
+data to descramble (unknown how it works). In non-question cases, however, the protection chip works
near identically to the original.
No video card schematics ever left the PCB factory, but some decent scans of the board have been made,
@@ -1446,7 +1446,7 @@ static ADDRESS_MAP_START( mpu4_68k_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x900002, 0x900003) AM_WRITE(saa1099_write_port_0_lsb_w)
AM_RANGE(0xa00000, 0xa00003) AM_READWRITE(ef9369_r, ef9369_w) /* the palette chip */
-/* AM_RANGE(0xa00004, 0xa0000f) AM_READWRITE(mpu4_vid_unmap_r, mpu4_vid_unmap_w) */
+/* AM_RANGE(0xa00004, 0xa0000f) AM_READWRITE(mpu4_vid_unmap_r, mpu4_vid_unmap_w) */
AM_RANGE(0xb00000, 0xb0000f) AM_READWRITE(mpu4_vid_scn2674_r, mpu4_vid_scn2674_w)
@@ -1500,7 +1500,7 @@ static ADDRESS_MAP_START( vp_68k_map, ADDRESS_SPACE_PROGRAM, 16 )
/* the palette chip */
AM_RANGE(0xa00000, 0xa00003) AM_READWRITE(ef9369_r, ef9369_w) /* the palette chip */
-/* AM_RANGE(0xa00004, 0xa0000f) AM_READWRITE(mpu4_vid_unmap_r, mpu4_vid_unmap_w) */
+/* AM_RANGE(0xa00004, 0xa0000f) AM_READWRITE(mpu4_vid_unmap_r, mpu4_vid_unmap_w) */
AM_RANGE(0xb00000, 0xb0000f) AM_READWRITE(mpu4_vid_scn2674_r, mpu4_vid_scn2674_w)
diff --git a/src/mame/drivers/multigam.c b/src/mame/drivers/multigam.c
index 129fac5edad..7b74cfbdb80 100644
--- a/src/mame/drivers/multigam.c
+++ b/src/mame/drivers/multigam.c
@@ -35,8 +35,8 @@
- ROM at 0x80000: Several things patched and/or relocated.
Most original NOPs were replaced by proper code.
- Multi Game III: 21 games included, hardware features MMC3 NES mapper and additional
- RAM used by Super Mario Bros 3.
+ Multi Game III: 21 games included, hardware features MMC3 NES mapper and additional
+ RAM used by Super Mario Bros 3.
*/
#include "driver.h"
diff --git a/src/mame/drivers/neodrvr.c b/src/mame/drivers/neodrvr.c
index aecc0224cbe..4c375de75d0 100644
--- a/src/mame/drivers/neodrvr.c
+++ b/src/mame/drivers/neodrvr.c
@@ -404,145 +404,145 @@ INPUT_PORTS_END
/***************************************************************************
- Neo-Geo game pcb infos:
- =======================
-
- The Neo-Geo games for AES (home) and MVS (arcade) systems are cartridge based.
-
- Each cartridge consists of two pcb's: CHA and PROG.
-
- CHA pcb contains gfx data ('C' - rom), text layer data ('S' - rom) and sound driver ('M' - rom).
- PROG pcb contains sample data ('V' - rom) and program code ('P' - rom).
-
- On most pcb's various custom/protection chips can also be found:
-
- CHA:
- . NEO-273
- . NEO-CMC
- . NEO-ZMC
- . NEO-ZMC2
- . PRO-CT0
- . SNK-9201
-
- PROG:
- . ALTERA
- . NEO-COMA
- . NEO-PCM2 (SNK 1999)
- . NEO-PCM2 (PLAYMORE 2002)
- . NEO-PVC
- . NEO-SMA
- . PCM
- . PRO-CT0
- . SNK-9201
-
-
- Known pcb's:
- ============
-
- MVS CHA:
- -- SNK --
- . NEO-MVS CHA-8M
- . NEO-MVS CHA42G
- . NEO-MVS CHA42G-1
- . NEO-MVS CHA 42G-2
- . NEO-MVS CHA 42G-3
- . NEO-MVS CHA42G-3B
- . NEO-MVS CHA256
- . NEO-MVS CHA256B
- . NEO-MVS PSTM CHA136
- . NEO-MVS CHA512Y
- . NEO-MVS CHAFIO (1999.6.14)
- . NEO-MVS CHAFIO (SNK 2002) - MADE IN KOREA
- -- SNKPLAYMORE --
- . NEO-MVS CHAFIO (2003.7.24)
-
- MVS PROG:
- -- SNK --
- . NEO-MVS PROG-EP
- . NEO-MVS PROG8M42
- . NEO-MVS PROG16
- . NEO-MVS PROG42G
- . NEO-MVS PROG42G-1
- . NEO-MVS PROG-G2
- . NEO-MVS PROG 4096
- . NEO-MVS PROG 4096 B
- . NEO-MVS PROGGSC
- . NEO-MVS PROGTOP
- . NEO-MVS PROGSF1 (1998.6.17)
- . NEO-MVS PROGEOP (1999.2.2)
- . NEO-MVS PROGLBA (1999.4.12) - LBA-SUB (2000.2.24)
- . NEO-MVS PROGBK1
- . NEO-MVS PROGBK2 (2000.3.21)
- . NEO-MVS PROGBK2 (SNK 2002) - MADE IN KOREA
- -- SNKPLAYMORE --
- . NEO-MVS PROGBK2R (2003.8.26) - NEO-HYCS (2003.9.29)
- . NEO-MVS PROGBK3R (2003.9.2) - NEO-HYCS (2003.9.29)
- . NEO-MVS PROGBK3S (2003.10.1)
- . NEO-MVS PROGBK2S (2003.10.xx)
-
-
- AES CHA:
- -- SNK --
- . NEO-AEG CHA-32
- . NEO-AEG CHA-8M
- . NEO-AEG CHA42G
- . NEO-AEG CHA42G-1
- . NEO-AEG CHA42G-2B
- . NEO-AEG CHA42G-3
- . NEO-AEG CHA42G-4
- . NEO-AEG CHA256
- . NEO-AEG CHA256[B]
- . NEO-AEG CHA256RY
- . NEO-AEG CHA512Y
- . NEO-AEG CHAFIO (1999.8.10)
- -- SNKPLAYMORE --
- . NEO-AEG CHAFIO (2003.7.24)
-
- AES PROG:
- -- SNK --
- . NEO-AEG PROG-NAM
- . NEO-AEG PROG-HERO
- . NEO-AEG PROG-4A
- . NEO-AEG PROG-4B
- . NEO-AEG PROG 8M42
- . NEO-AEG PROG B
- . NEO-AEG PROG16
- . NEO-AEG PROG42G
- . NEO-AEG PROG42G-COM
- . NEO-AEG PROG42G-1
- . NEO-AEG PROG-G2
- . NEO-AEG PROG4096 B
- . NEO-AEG PROGGS
- . NEO-AEG PROGTOP2
- . NEO-AEG PROGLBA (1999.7.6)
- . NEO-AEG PROGRK
- . NEO-AEG PROGRKB
- . NEO-AEG PROGBK1Y
- -- PLAYMORE --
- . NEO-AEG PROGBK2 (2002.4.1)
- -- SNKPLAYMORE --
- . NEO-AEG PROGBK3R (2003.8.29) - NEO-HYCS (2003.9.29)
-
-
- Cartridge colours:
- ==================
-
- MVS cartridges were produced in different colours.
-
- Known cartridge colours:
- . Black
- . Green
- . Grey
- . Transparent
- . Transparent Blue
- . Transparent Green
- . White
- . Yellow
-
- The above listed only covers SNK / PLAYMORE / SNKPLAYMORE pcb's. There also exists a
- wide range of 'bootleg' pcb's.
-
- Neo-Geo game pcb infos by Johnboy
+ Neo-Geo game pcb infos:
+ =======================
+
+ The Neo-Geo games for AES (home) and MVS (arcade) systems are cartridge based.
+
+ Each cartridge consists of two pcb's: CHA and PROG.
+
+ CHA pcb contains gfx data ('C' - rom), text layer data ('S' - rom) and sound driver ('M' - rom).
+ PROG pcb contains sample data ('V' - rom) and program code ('P' - rom).
+
+ On most pcb's various custom/protection chips can also be found:
+
+ CHA:
+ . NEO-273
+ . NEO-CMC
+ . NEO-ZMC
+ . NEO-ZMC2
+ . PRO-CT0
+ . SNK-9201
+
+ PROG:
+ . ALTERA
+ . NEO-COMA
+ . NEO-PCM2 (SNK 1999)
+ . NEO-PCM2 (PLAYMORE 2002)
+ . NEO-PVC
+ . NEO-SMA
+ . PCM
+ . PRO-CT0
+ . SNK-9201
+
+
+ Known pcb's:
+ ============
+
+ MVS CHA:
+ -- SNK --
+ . NEO-MVS CHA-8M
+ . NEO-MVS CHA42G
+ . NEO-MVS CHA42G-1
+ . NEO-MVS CHA 42G-2
+ . NEO-MVS CHA 42G-3
+ . NEO-MVS CHA42G-3B
+ . NEO-MVS CHA256
+ . NEO-MVS CHA256B
+ . NEO-MVS PSTM CHA136
+ . NEO-MVS CHA512Y
+ . NEO-MVS CHAFIO (1999.6.14)
+ . NEO-MVS CHAFIO (SNK 2002) - MADE IN KOREA
+ -- SNKPLAYMORE --
+ . NEO-MVS CHAFIO (2003.7.24)
+
+ MVS PROG:
+ -- SNK --
+ . NEO-MVS PROG-EP
+ . NEO-MVS PROG8M42
+ . NEO-MVS PROG16
+ . NEO-MVS PROG42G
+ . NEO-MVS PROG42G-1
+ . NEO-MVS PROG-G2
+ . NEO-MVS PROG 4096
+ . NEO-MVS PROG 4096 B
+ . NEO-MVS PROGGSC
+ . NEO-MVS PROGTOP
+ . NEO-MVS PROGSF1 (1998.6.17)
+ . NEO-MVS PROGEOP (1999.2.2)
+ . NEO-MVS PROGLBA (1999.4.12) - LBA-SUB (2000.2.24)
+ . NEO-MVS PROGBK1
+ . NEO-MVS PROGBK2 (2000.3.21)
+ . NEO-MVS PROGBK2 (SNK 2002) - MADE IN KOREA
+ -- SNKPLAYMORE --
+ . NEO-MVS PROGBK2R (2003.8.26) - NEO-HYCS (2003.9.29)
+ . NEO-MVS PROGBK3R (2003.9.2) - NEO-HYCS (2003.9.29)
+ . NEO-MVS PROGBK3S (2003.10.1)
+ . NEO-MVS PROGBK2S (2003.10.xx)
+
+
+ AES CHA:
+ -- SNK --
+ . NEO-AEG CHA-32
+ . NEO-AEG CHA-8M
+ . NEO-AEG CHA42G
+ . NEO-AEG CHA42G-1
+ . NEO-AEG CHA42G-2B
+ . NEO-AEG CHA42G-3
+ . NEO-AEG CHA42G-4
+ . NEO-AEG CHA256
+ . NEO-AEG CHA256[B]
+ . NEO-AEG CHA256RY
+ . NEO-AEG CHA512Y
+ . NEO-AEG CHAFIO (1999.8.10)
+ -- SNKPLAYMORE --
+ . NEO-AEG CHAFIO (2003.7.24)
+
+ AES PROG:
+ -- SNK --
+ . NEO-AEG PROG-NAM
+ . NEO-AEG PROG-HERO
+ . NEO-AEG PROG-4A
+ . NEO-AEG PROG-4B
+ . NEO-AEG PROG 8M42
+ . NEO-AEG PROG B
+ . NEO-AEG PROG16
+ . NEO-AEG PROG42G
+ . NEO-AEG PROG42G-COM
+ . NEO-AEG PROG42G-1
+ . NEO-AEG PROG-G2
+ . NEO-AEG PROG4096 B
+ . NEO-AEG PROGGS
+ . NEO-AEG PROGTOP2
+ . NEO-AEG PROGLBA (1999.7.6)
+ . NEO-AEG PROGRK
+ . NEO-AEG PROGRKB
+ . NEO-AEG PROGBK1Y
+ -- PLAYMORE --
+ . NEO-AEG PROGBK2 (2002.4.1)
+ -- SNKPLAYMORE --
+ . NEO-AEG PROGBK3R (2003.8.29) - NEO-HYCS (2003.9.29)
+
+
+ Cartridge colours:
+ ==================
+
+ MVS cartridges were produced in different colours.
+
+ Known cartridge colours:
+ . Black
+ . Green
+ . Grey
+ . Transparent
+ . Transparent Blue
+ . Transparent Green
+ . White
+ . Yellow
+
+ The above listed only covers SNK / PLAYMORE / SNKPLAYMORE pcb's. There also exists a
+ wide range of 'bootleg' pcb's.
+
+ Neo-Geo game pcb infos by Johnboy
****************************************************************************/
@@ -1690,13 +1690,13 @@ ROM_END
/* Old version looked like this; p's on eprom?
- ROM_START( samsho )
- ROM_REGION( 0x180000, NEOGEO_REGION_MAIN_CPU_CARTRIDGE, 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, NEOGEO_REGION_MAIN_CPU_CARTRIDGE, 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, NEOGEO_REGION_MAIN_CPU_CARTRIDGE, 0 )
@@ -2164,7 +2164,7 @@ ROM_START( fightfva ) /* MVS VERSION */
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) )
diff --git a/src/mame/drivers/undrfire.c b/src/mame/drivers/undrfire.c
index 6169a4e8bea..b0df874ebe5 100644
--- a/src/mame/drivers/undrfire.c
+++ b/src/mame/drivers/undrfire.c
@@ -514,7 +514,7 @@ static ADDRESS_MAP_START( cbombers_readmem, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0x300000, 0x303fff) AM_READ(SMH_RAM) /* Sprite ram */
AM_RANGE(0x800000, 0x80ffff) AM_READ(TC0480SCP_long_r)
AM_RANGE(0x830000, 0x83002f) AM_READ(TC0480SCP_ctrl_long_r)
-// AM_RANGE(0x340000, 0x340003) AM_READ(superchs_stick_r) /* stick coord read */
+// AM_RANGE(0x340000, 0x340003) AM_READ(superchs_stick_r) /* stick coord read */
AM_RANGE(0x500000, 0x500007) AM_READ(undrfire_input_r)
AM_RANGE(0xc00000, 0xc00007) AM_READ(undrfire_input_r)
@@ -539,12 +539,12 @@ static ADDRESS_MAP_START( cbombers_writemem, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0x400000, 0x400003) AM_WRITE(cbombers_cpua_ctrl_w)
AM_RANGE(0x2c0000, 0x2c07ff) AM_WRITE(SMH_RAM) AM_BASE(&f3_shared_ram)
-// AM_RANGE(0x340000, 0x340003) AM_WRITE(superchs_stick_w) /* stick int request */
+// AM_RANGE(0x340000, 0x340003) AM_WRITE(superchs_stick_w) /* stick int request */
-// AM_RANGE(0x500000, 0x500003) AM_WRITE(MWA32_NOP)
+// AM_RANGE(0x500000, 0x500003) AM_WRITE(MWA32_NOP)
AM_RANGE(0x500000, 0x500007) AM_WRITE(undrfire_input_w) /* eerom etc. */
-// AM_RANGE(0x600000, 0x600007) AM_WRITE(unknown_int_req_w) /* int request for unknown hardware */
+// AM_RANGE(0x600000, 0x600007) AM_WRITE(unknown_int_req_w) /* int request for unknown hardware */
AM_RANGE(0x700000, 0x7007ff) AM_WRITE(SMH_RAM) AM_BASE(&f3_shared_ram)
@@ -558,15 +558,15 @@ static ADDRESS_MAP_START( cbombers_cpub_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM)
AM_RANGE(0x400000, 0x40ffff) AM_READ(SMH_RAM) /* local ram */
AM_RANGE(0x800000, 0x80ffff) AM_READ(shared_ram_r)
-// AM_RANGE(0xa00000, 0xa001ff) AM_READ(SMH_RAM)
+// AM_RANGE(0xa00000, 0xa001ff) AM_READ(SMH_RAM)
ADDRESS_MAP_END
static ADDRESS_MAP_START( cbombers_cpub_writemem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM)
AM_RANGE(0x400000, 0x40ffff) AM_WRITE(SMH_RAM)
-// AM_RANGE(0x600000, 0x60ffff) AM_WRITE(TC0480SCP_word_w) /* Only written upon errors */
+// AM_RANGE(0x600000, 0x60ffff) AM_WRITE(TC0480SCP_word_w) /* Only written upon errors */
AM_RANGE(0x800000, 0x80ffff) AM_WRITE(shared_ram_w)
-// AM_RANGE(0xa00000, 0xa001ff) AM_WRITE(SMH_RAM) /* Extra road control?? */
+// AM_RANGE(0xa00000, 0xa001ff) AM_WRITE(SMH_RAM) /* Extra road control?? */
ADDRESS_MAP_END
diff --git a/src/mame/drivers/vigilant.c b/src/mame/drivers/vigilant.c
index 87e11b1fcbf..58d79c487b6 100644
--- a/src/mame/drivers/vigilant.c
+++ b/src/mame/drivers/vigilant.c
@@ -108,7 +108,7 @@ static ADDRESS_MAP_START( kikcubic_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x03, 0x03) AM_READ(input_port_1_r)
AM_RANGE(0x04, 0x04) AM_READWRITE(input_port_2_r, vigilant_bank_select_w)
AM_RANGE(0x06, 0x06) AM_WRITE(m72_sound_command_byte_w)
-// AM_RANGE(0x07, 0x07) AM_WRITE(SMH_NOP) /* ?? */
+// AM_RANGE(0x07, 0x07) AM_WRITE(SMH_NOP) /* ?? */
ADDRESS_MAP_END
static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
diff --git a/src/mame/drivers/wgp.c b/src/mame/drivers/wgp.c
index ec672181082..5c3584c1793 100644
--- a/src/mame/drivers/wgp.c
+++ b/src/mame/drivers/wgp.c
@@ -677,7 +677,7 @@ static ADDRESS_MAP_START( cpu2_map, ADDRESS_SPACE_PROGRAM, 16 ) /* LAN areas not
AM_RANGE(0x100000, 0x103fff) AM_RAM
AM_RANGE(0x140000, 0x143fff) AM_READWRITE(sharedram_r,sharedram_w)
AM_RANGE(0x200000, 0x200003) AM_READWRITE(wgp_sound_r,wgp_sound_w)
-// AM_RANGE(0x380000, 0x383fff) AM_READ(SMH_RAM) // LAN RAM
+// AM_RANGE(0x380000, 0x383fff) AM_READ(SMH_RAM) // LAN RAM
// AM_RANGE(0x380000, 0x383fff) AM_WRITE(SMH_RAM) // LAN RAM
AM_RANGE(0x380000, 0x380001) AM_READ(lan_status_r) // ??
// a lan input area is read somewhere above the status
diff --git a/src/mame/includes/galaxian.h b/src/mame/includes/galaxian.h
index c25a6fc0921..a2c1fb9884c 100644
--- a/src/mame/includes/galaxian.h
+++ b/src/mame/includes/galaxian.h
@@ -1,6 +1,6 @@
/***************************************************************************
- Galaxian hardware family
+ Galaxian hardware family
***************************************************************************/
@@ -16,8 +16,8 @@
/* from 264-383 */
#define GALAXIAN_HTOTAL (384*GALAXIAN_XSCALE)
#define GALAXIAN_HBEND (0*GALAXIAN_XSCALE)
-//#define GALAXIAN_H0START (6*GALAXIAN_XSCALE)
-//#define GALAXIAN_HBSTART (264*GALAXIAN_XSCALE)
+//#define GALAXIAN_H0START (6*GALAXIAN_XSCALE)
+//#define GALAXIAN_HBSTART (264*GALAXIAN_XSCALE)
#define GALAXIAN_H0START (0*GALAXIAN_XSCALE)
#define GALAXIAN_HBSTART (256*GALAXIAN_XSCALE)
diff --git a/src/mame/video/aerofgt.c b/src/mame/video/aerofgt.c
index d7c1177c6a0..66141411bd5 100644
--- a/src/mame/video/aerofgt.c
+++ b/src/mame/video/aerofgt.c
@@ -479,7 +479,7 @@ static void pspikesb_draw_sprites(running_machine *machine, bitmap_t *bitmap,con
static void aerfboot_draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectangle *cliprect)
{
int attr_start;//,base,first;
-// int notdraw = 0;
+// int notdraw = 0;
// base = chip * 0x0200;
// first = 4 * aerofgt_spriteram3[0x1fe + base];
@@ -500,13 +500,13 @@ static void aerfboot_draw_sprites(running_machine *machine, bitmap_t *bitmap,con
zoomx = (aerofgt_spriteram3[attr_start + 1] & 0xf000) >> 12;
zoomy = (aerofgt_spriteram3[attr_start + 0] & 0xf000) >> 12;
pri = aerofgt_spriteram3[attr_start + 2] & 0x0010;
-// code = aerofgt_spriteram3[attr_start + 3] & 0x3fff;
+// code = aerofgt_spriteram3[attr_start + 3] & 0x3fff;
code = aerofgt_spriteram3[attr_start + 3] & 0x1fff;
-// if ((!(aerofgt_spriteram3[attr_start + 0])) & (!(aerofgt_spriteram3[attr_start + 1])) &
-// (!(aerofgt_spriteram3[attr_start + 2])) & (!(aerofgt_spriteram3[attr_start + 3]))) notdraw = 1;
+// if ((!(aerofgt_spriteram3[attr_start + 0])) & (!(aerofgt_spriteram3[attr_start + 1])) &
+// (!(aerofgt_spriteram3[attr_start + 2])) & (!(aerofgt_spriteram3[attr_start + 3]))) notdraw = 1;
-// if (notdraw) continue;
+// if (notdraw) continue;
if (!(aerofgt_spriteram3[attr_start + 2] & 0x0040)) code |= 0x2000;
@@ -514,7 +514,7 @@ static void aerfboot_draw_sprites(running_machine *machine, bitmap_t *bitmap,con
zoomy = 32 + zoomy;
sy = ((oy + 16) & 0x1ff) - 16;
-
+
sx = ((ox + 16) & 0x1ff) - 16;
pdrawgfxzoom(bitmap,machine->gfx[sprite_gfx + (code >= 0x1000 ? 0 : 1)],
diff --git a/src/mame/video/galaxian.c b/src/mame/video/galaxian.c
index aaeaf1d1a4b..279469e4b03 100644
--- a/src/mame/video/galaxian.c
+++ b/src/mame/video/galaxian.c
@@ -1,169 +1,169 @@
/***************************************************************************
- Galaxian-derived video hardware
+ Galaxian-derived video hardware
****************************************************************************
- Video timing:
-
- The master clock is an 18.432MHz crystal. It is divided by 3 by
- a pair of J/K flip-flops to 6.144MHz. This 6MHz signal is used to
- drive most of the video logic. Note that due to the way the
- divide-by-3 circuit is implemented, the duty cycle of the 6MHz
- signal is 66% (i.e., it is high for 2 18MHz clocks and low for 1).
- This is important for accurate stars rendering.
-
-
- Horizontal timing:
-
- H counts from 010000000 (128) to 111111111 (511), giving 384
- total H clocks per scanline
-
- However, the top bit is inverted to become 256H, so when reading
- the schematics it's really counting from:
- 110000000 -> 111111111 (blanking period)
- and then from:
- 000000000 -> 011111111 (main portion of screen = 256 pixels)
-
- HBLANK is a flip-flop clocked by 2H:
- * It is held clear when 256H = 0 (main portion of screen)
- * The D input is connected to !(64H & 32H & 16H & 8H)
- * It is clocked to 1 when H=130
- * It is clocked to 0 when H=250
- * This gives 264 total non-blanked pixels:
- 6 additional pixels on the left (H=250..255)
- 256 main area pixels (H=256..511)
- 2 additional pixels on the right (H=128..129)
-
- HSYNC is a flip-flop clocked by 16H:
- * It is held clear when 256H = 0 (main portion of screen)
- * The D input is connected to !(!64H & 32H)
- * HSYNC is the /Q output
- * It is clocked to 1 when H=176
- * It is clocked to 0 when H=208
-
-
- Vertical timing:
-
- V counts from 011111000 (248) to 111111111 (511), giving 264
- total V clocks per frame
-
- IMPORTANT: the V sync chain is clocked by HSYNC. This means
- that for the first 48 H clocks of the blanking period, the
- V counter is one behind. This is important to take into account
- for sprite and missile positioning.
-
- VBLANK is a flip-flop clocked by 16V:
- * The D input is connected to !(128V & 64V & 32V)
- * It is clocked to 1 when V=496
- * It is clocked to 0 when V=272
- * This gives 224 total non-blanked pixels
-
- VSYNC is set to !256V:
- * It is set to 1 when V=248
- * It is cleared to 0 when V=256
-
-
- Sprites and missiles:
-
- During the HBLANK period, sprites and missiles are processed.
- Sprites are rendered into the line buffer, which was cleared
- during the visible portion of the previous scanline.
-
- It takes 8 H clocks to set up a sprite, and 16 to render it
- to the line buffer. The setup clocks are overlapped with the
- rendering clocks. In theory this would result in enough time
- to render 128/16 = 8 sprites. However, the setup does not
- begin until after HBLANK, so there is only enough time to
- render the first 7 1/2 entries.
-
- Interleaved with the setup for sprites is setup for the
- shell and missile rendering. Shells and missiles are rendered
- realtime during the visible portion of the frame, and are
- effectively color-ORed directly into the final RGB output.
- During the HBLANK setup period, each shell/missile entry is
- compared against the current V position; if an exact match
- is found, the H position is loaded into a dedicated 8-bit
- counter. The counter clocks each pixel during the active video
- period; when it reaches $FC it enables the output until it
- hits zero, at which point it shuts itself off. Because there
- is only one counter for shells and one for missiles, only one
- shell and one missile can be specified per scanline. The last
- matching entry found will always win.
-
- The difference between shell and missile is that shells
- populate the first 7 entries and are rendered as white,
- whereas missiles populate the final entry and are rendered
- as yellow.
-
- Here is the detailed sequence of events for sprite and
- missile/shell rendering during the first 24 H clocks of
- HBLANK:
-
- H=080: HPOSI=objram[40], /VPL latches V+objram[40]
- H=081: HPOSI=objram[40]
- H=082: HPOSI=objram[41], /OBJ DATA L latches picture number, H/V flip
- H=083: HPOSI=objram[41]
- H=084: HPOSI=objram[42], /COL L latches low 3 bits as color
- H=085: HPOSI=objram[42]
- H=086: HPOSI=objram[43]
- H=087: HPOSI=objram[43], /CNTR LD latches X position
- <sprite 0 begins rendering>
- H=088: HPOSI=objram[40], /VPL latches V+objram[40]
- H=089: HPOSI=objram[40]
- H=08A: HPOSI=objram[61]
- H=08B: HPOSI=objram[61], MSLD is latched if Y position matches shell
- H=08C: HPOSI=objram[42]
- H=08D: HPOSI=objram[42]
- H=08E: HPOSI=objram[63]
- H=08F: HPOSI=objram[63], /SLD fires to latch down shell counter value
- H=090: HPOSI=objram[44], /VPL latches V+objram[44]
- H=091: HPOSI=objram[44]
- H=092: HPOSI=objram[45], /OBJ DATA L latches picture number, H/V flip
- H=093: HPOSI=objram[45]
- H=094: HPOSI=objram[46], /COL L latches low 3 bits as color
- H=095: HPOSI=objram[46]
- H=096: HPOSI=objram[47]
- H=097: HPOSI=objram[47], /CNTR LD latches X position
- <sprite 1 begins rendering>
-
- From this, you can see the object RAM layout looks like:
-
- objram[40] = vertical position of sprite 0
- objram[41] = picture number and H/V flip of sprite 0
- objram[42] = color of sprite 0
- objram[43] = horizontal position of sprite 0
-
- objram[61] = vertical position of shell 0
- objram[63] = horizontal count until shell 0 starts rendering
-
- A vertical match for a sprite is true if ((V + vpos) & 0xf0) == 0xf0.
- A vertical match for a shell/missile is if ((V + vpos) & 0xff) == 0xff.
-
- Overall, the process for sprites and missiles during HBLANK looks
- like this:
-
- H=080: begin setup sprite 0
- H=082: begin HBLANK
- H=088: begin render sprite 0; begin setup shell 0
- H=090: begin setup sprite 1
- H=098: begin render sprite 1; begin setup shell 1
- H=0A0: begin setup sprite 2
- H=0A8: begin render sprite 2; begin setup shell 2
- H=0B0: VSYNC increments V counter; subsequent sprites match V+1
- H=0B0: begin setup sprite 3
- H=0B8: begin render sprite 3; begin setup shell 3
- H=0C0: begin setup sprite 4
- H=0C8: begin render sprite 4; begin setup shell 4
- H=0D0: begin setup sprite 5
- H=0D8: begin render sprite 5; begin setup shell 5
- H=0E0: begin setup sprite 6
- H=0E8: begin render sprite 6; begin setup shell 6
- H=0F0: begin setup sprite 7
- H=0F8: begin render sprite 7; begin setup missile
- H=0FA: end HBLANK
- H=100: finish render sprite 7 (only 1/2 way through)
-
+ Video timing:
+
+ The master clock is an 18.432MHz crystal. It is divided by 3 by
+ a pair of J/K flip-flops to 6.144MHz. This 6MHz signal is used to
+ drive most of the video logic. Note that due to the way the
+ divide-by-3 circuit is implemented, the duty cycle of the 6MHz
+ signal is 66% (i.e., it is high for 2 18MHz clocks and low for 1).
+ This is important for accurate stars rendering.
+
+
+ Horizontal timing:
+
+ H counts from 010000000 (128) to 111111111 (511), giving 384
+ total H clocks per scanline
+
+ However, the top bit is inverted to become 256H, so when reading
+ the schematics it's really counting from:
+ 110000000 -> 111111111 (blanking period)
+ and then from:
+ 000000000 -> 011111111 (main portion of screen = 256 pixels)
+
+ HBLANK is a flip-flop clocked by 2H:
+ * It is held clear when 256H = 0 (main portion of screen)
+ * The D input is connected to !(64H & 32H & 16H & 8H)
+ * It is clocked to 1 when H=130
+ * It is clocked to 0 when H=250
+ * This gives 264 total non-blanked pixels:
+ 6 additional pixels on the left (H=250..255)
+ 256 main area pixels (H=256..511)
+ 2 additional pixels on the right (H=128..129)
+
+ HSYNC is a flip-flop clocked by 16H:
+ * It is held clear when 256H = 0 (main portion of screen)
+ * The D input is connected to !(!64H & 32H)
+ * HSYNC is the /Q output
+ * It is clocked to 1 when H=176
+ * It is clocked to 0 when H=208
+
+
+ Vertical timing:
+
+ V counts from 011111000 (248) to 111111111 (511), giving 264
+ total V clocks per frame
+
+ IMPORTANT: the V sync chain is clocked by HSYNC. This means
+ that for the first 48 H clocks of the blanking period, the
+ V counter is one behind. This is important to take into account
+ for sprite and missile positioning.
+
+ VBLANK is a flip-flop clocked by 16V:
+ * The D input is connected to !(128V & 64V & 32V)
+ * It is clocked to 1 when V=496
+ * It is clocked to 0 when V=272
+ * This gives 224 total non-blanked pixels
+
+ VSYNC is set to !256V:
+ * It is set to 1 when V=248
+ * It is cleared to 0 when V=256
+
+
+ Sprites and missiles:
+
+ During the HBLANK period, sprites and missiles are processed.
+ Sprites are rendered into the line buffer, which was cleared
+ during the visible portion of the previous scanline.
+
+ It takes 8 H clocks to set up a sprite, and 16 to render it
+ to the line buffer. The setup clocks are overlapped with the
+ rendering clocks. In theory this would result in enough time
+ to render 128/16 = 8 sprites. However, the setup does not
+ begin until after HBLANK, so there is only enough time to
+ render the first 7 1/2 entries.
+
+ Interleaved with the setup for sprites is setup for the
+ shell and missile rendering. Shells and missiles are rendered
+ realtime during the visible portion of the frame, and are
+ effectively color-ORed directly into the final RGB output.
+ During the HBLANK setup period, each shell/missile entry is
+ compared against the current V position; if an exact match
+ is found, the H position is loaded into a dedicated 8-bit
+ counter. The counter clocks each pixel during the active video
+ period; when it reaches $FC it enables the output until it
+ hits zero, at which point it shuts itself off. Because there
+ is only one counter for shells and one for missiles, only one
+ shell and one missile can be specified per scanline. The last
+ matching entry found will always win.
+
+ The difference between shell and missile is that shells
+ populate the first 7 entries and are rendered as white,
+ whereas missiles populate the final entry and are rendered
+ as yellow.
+
+ Here is the detailed sequence of events for sprite and
+ missile/shell rendering during the first 24 H clocks of
+ HBLANK:
+
+ H=080: HPOSI=objram[40], /VPL latches V+objram[40]
+ H=081: HPOSI=objram[40]
+ H=082: HPOSI=objram[41], /OBJ DATA L latches picture number, H/V flip
+ H=083: HPOSI=objram[41]
+ H=084: HPOSI=objram[42], /COL L latches low 3 bits as color
+ H=085: HPOSI=objram[42]
+ H=086: HPOSI=objram[43]
+ H=087: HPOSI=objram[43], /CNTR LD latches X position
+ <sprite 0 begins rendering>
+ H=088: HPOSI=objram[40], /VPL latches V+objram[40]
+ H=089: HPOSI=objram[40]
+ H=08A: HPOSI=objram[61]
+ H=08B: HPOSI=objram[61], MSLD is latched if Y position matches shell
+ H=08C: HPOSI=objram[42]
+ H=08D: HPOSI=objram[42]
+ H=08E: HPOSI=objram[63]
+ H=08F: HPOSI=objram[63], /SLD fires to latch down shell counter value
+ H=090: HPOSI=objram[44], /VPL latches V+objram[44]
+ H=091: HPOSI=objram[44]
+ H=092: HPOSI=objram[45], /OBJ DATA L latches picture number, H/V flip
+ H=093: HPOSI=objram[45]
+ H=094: HPOSI=objram[46], /COL L latches low 3 bits as color
+ H=095: HPOSI=objram[46]
+ H=096: HPOSI=objram[47]
+ H=097: HPOSI=objram[47], /CNTR LD latches X position
+ <sprite 1 begins rendering>
+
+ From this, you can see the object RAM layout looks like:
+
+ objram[40] = vertical position of sprite 0
+ objram[41] = picture number and H/V flip of sprite 0
+ objram[42] = color of sprite 0
+ objram[43] = horizontal position of sprite 0
+
+ objram[61] = vertical position of shell 0
+ objram[63] = horizontal count until shell 0 starts rendering
+
+ A vertical match for a sprite is true if ((V + vpos) & 0xf0) == 0xf0.
+ A vertical match for a shell/missile is if ((V + vpos) & 0xff) == 0xff.
+
+ Overall, the process for sprites and missiles during HBLANK looks
+ like this:
+
+ H=080: begin setup sprite 0
+ H=082: begin HBLANK
+ H=088: begin render sprite 0; begin setup shell 0
+ H=090: begin setup sprite 1
+ H=098: begin render sprite 1; begin setup shell 1
+ H=0A0: begin setup sprite 2
+ H=0A8: begin render sprite 2; begin setup shell 2
+ H=0B0: VSYNC increments V counter; subsequent sprites match V+1
+ H=0B0: begin setup sprite 3
+ H=0B8: begin render sprite 3; begin setup shell 3
+ H=0C0: begin setup sprite 4
+ H=0C8: begin render sprite 4; begin setup shell 4
+ H=0D0: begin setup sprite 5
+ H=0D8: begin render sprite 5; begin setup shell 5
+ H=0E0: begin setup sprite 6
+ H=0E8: begin render sprite 6; begin setup shell 6
+ H=0F0: begin setup sprite 7
+ H=0F8: begin render sprite 7; begin setup missile
+ H=0FA: end HBLANK
+ H=100: finish render sprite 7 (only 1/2 way through)
+
/VPL: H=xxxxxx000 -> latches sum of V+HPOSI for vertical positioning
@@ -310,38 +310,38 @@ PALETTE_INIT( galaxian )
double rweights[3], gweights[3], bweights[2];
int i, minval, midval, maxval;
UINT8 starmap[4];
-
+
/*
- Sprite/tilemap colors are mapped through a color PROM as follows:
-
- bit 7 -- 220 ohm resistor -- BLUE
- -- 470 ohm resistor -- BLUE
- -- 220 ohm resistor -- GREEN
- -- 470 ohm resistor -- GREEN
- -- 1 kohm resistor -- GREEN
- -- 220 ohm resistor -- RED
- -- 470 ohm resistor -- RED
- bit 0 -- 1 kohm resistor -- RED
-
- In parallel with these resistors are a pair of 150 ohm and 100 ohm
- resistors on each R,G,B component that are connected to the star
- generator.
-
- And in parallel with the whole mess are a set of 100 ohm resistors
- on each R,G,B component that are enabled when a shell/missile is
- enabled.
-
- When computing weights, we use RGB_MAXIMUM as the maximum to give
- headroom for stars and shells/missiles. This is not fully accurate,
- but if we included all possible sources in parallel, the brightness
- of the main game would be very low to allow for all the oversaturation
- of the stars and shells/missiles.
- */
+ Sprite/tilemap colors are mapped through a color PROM as follows:
+
+ bit 7 -- 220 ohm resistor -- BLUE
+ -- 470 ohm resistor -- BLUE
+ -- 220 ohm resistor -- GREEN
+ -- 470 ohm resistor -- GREEN
+ -- 1 kohm resistor -- GREEN
+ -- 220 ohm resistor -- RED
+ -- 470 ohm resistor -- RED
+ bit 0 -- 1 kohm resistor -- RED
+
+ In parallel with these resistors are a pair of 150 ohm and 100 ohm
+ resistors on each R,G,B component that are connected to the star
+ generator.
+
+ And in parallel with the whole mess are a set of 100 ohm resistors
+ on each R,G,B component that are enabled when a shell/missile is
+ enabled.
+
+ When computing weights, we use RGB_MAXIMUM as the maximum to give
+ headroom for stars and shells/missiles. This is not fully accurate,
+ but if we included all possible sources in parallel, the brightness
+ of the main game would be very low to allow for all the oversaturation
+ of the stars and shells/missiles.
+ */
compute_resistor_weights(0, RGB_MAXIMUM, -1.0,
3, &rgb_resistances[0], rweights, 470, 0,
3, &rgb_resistances[0], gweights, 470, 0,
2, &rgb_resistances[1], bweights, 470, 0);
-
+
/* decode the palette first */
for (i = 0; i < memory_region_length(REGION_PROMS); i++)
{
@@ -358,7 +358,7 @@ PALETTE_INIT( galaxian )
bit1 = BIT(color_prom[i],4);
bit2 = BIT(color_prom[i],5);
g = combine_3_weights(gweights, bit0, bit1, bit2);
-
+
/* blue component */
bit0 = BIT(color_prom[i],6);
bit1 = BIT(color_prom[i],7);
@@ -366,26 +366,26 @@ PALETTE_INIT( galaxian )
palette_set_color(machine, i, MAKE_RGB(r,g,b));
}
-
+
/*
- The maximum sprite/tilemap resistance is ~130 Ohms with all RGB
- outputs enabled (1/(1/1000 + 1/470 + 1/220)). Since we normalized
- to RGB_MAXIMUM, this maps RGB_MAXIMUM -> 130 Ohms.
+ The maximum sprite/tilemap resistance is ~130 Ohms with all RGB
+ outputs enabled (1/(1/1000 + 1/470 + 1/220)). Since we normalized
+ to RGB_MAXIMUM, this maps RGB_MAXIMUM -> 130 Ohms.
- The stars are at 150 Ohms for the LSB, and 100 Ohms for the MSB.
- This means the 3 potential values are:
+ The stars are at 150 Ohms for the LSB, and 100 Ohms for the MSB.
+ This means the 3 potential values are:
- 150 Ohms -> RGB_MAXIMUM * 130 / 150
- 100 Ohms -> RGB_MAXIMUM * 130 / 100
- 60 Ohms -> RGB_MAXIMUM * 130 / 60
+ 150 Ohms -> RGB_MAXIMUM * 130 / 150
+ 100 Ohms -> RGB_MAXIMUM * 130 / 100
+ 60 Ohms -> RGB_MAXIMUM * 130 / 60
- Since we can't saturate that high, we instead approximate this
- by compressing the values proportionally into the 194->255 range.
- */
+ Since we can't saturate that high, we instead approximate this
+ by compressing the values proportionally into the 194->255 range.
+ */
minval = RGB_MAXIMUM * 130 / 150;
midval = RGB_MAXIMUM * 130 / 100;
maxval = RGB_MAXIMUM * 130 / 60;
-
+
/* compute the values for each of 4 possible star values */
starmap[0] = 0;
starmap[1] = minval;
@@ -411,7 +411,7 @@ PALETTE_INIT( galaxian )
bit0 = BIT(i,1);
bit1 = BIT(i,0);
b = starmap[(bit1 << 1) | bit0];
-
+
/* set the RGB color */
star_color[i] = MAKE_RGB(r, g, b);
}
@@ -458,7 +458,7 @@ VIDEO_START( galaxian )
background_blue = 0;
background_red = 0;
background_green = 0;
-
+
/* initialize stars */
stars_init();
@@ -502,7 +502,7 @@ VIDEO_UPDATE( galaxian )
/* render the sprites next */
sprites_draw(screen->machine, bitmap, cliprect, &spriteram[0x40]);
-
+
/* if we have bullets to draw, render them following */
if (galaxian_draw_bullet_ptr != NULL)
bullets_draw(screen->machine, bitmap, cliprect, &spriteram[0x60]);
@@ -537,7 +537,7 @@ WRITE8_HANDLER( galaxian_videoram_w )
{
/* update any video up to the current scanline */
video_screen_update_now(machine->primary_screen);
-
+
/* store the data and mark the corresponding tile dirty */
videoram[offset] = data;
tilemap_mark_tile_dirty(bg_tilemap, offset);
@@ -548,10 +548,10 @@ WRITE8_HANDLER( galaxian_objram_w )
{
/* update any video up to the current scanline */
video_screen_update_now(machine->primary_screen);
-
+
/* store the data */
spriteram[offset] = data;
-
+
/* the first $40 bytes affect the tilemap */
if (offset < 0x40)
{
@@ -566,7 +566,7 @@ WRITE8_HANDLER( galaxian_objram_w )
else
tilemap_set_scrollx(bg_tilemap, offset >> 1, GALAXIAN_XSCALE*data);
}
-
+
/* odd entries control the color base for the row */
else
{
@@ -588,13 +588,13 @@ static void sprites_draw(running_machine *machine, bitmap_t *bitmap, const recta
{
rectangle clip = *cliprect;
int sprnum;
-
+
/* 16 of the 256 pixels of the sprites are hard-clipped at the line buffer */
/* according to the schematics, it should be the first 16 pixels; however, */
/* some bootlegs demonstrate that this can be shifted to other positions. */
clip.min_x = MAX(clip.min_x, galaxian_sprite_clip_start * GALAXIAN_XSCALE);
clip.max_x = MIN(clip.max_x, (galaxian_sprite_clip_end + 1) * GALAXIAN_XSCALE - 1);
-
+
/* The line buffer is only written if it contains a '0' currently; */
/* it is cleared during the visible area, and populated during HBLANK */
/* To simulate this, we render backwards so that lower numbered sprites */
@@ -651,14 +651,14 @@ static void sprites_draw(running_machine *machine, bitmap_t *bitmap, const recta
static void bullets_draw(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, const UINT8 *base)
{
int y;
-
+
/* iterate over scanlines */
for (y = cliprect->min_y; y <= cliprect->max_y; y++)
{
UINT8 shell = 0xff, missile = 0xff;
UINT8 effy;
int which;
-
+
/* the first 3 entries match Y-1 */
effy = flipscreen_y ? ((y - 1) ^ 255) : (y - 1);
for (which = 0; which < 3; which++)
@@ -675,7 +675,7 @@ static void bullets_draw(running_machine *machine, bitmap_t *bitmap, const recta
else
missile = which;
}
-
+
/* draw the shell */
if (shell != 0xff)
(*galaxian_draw_bullet_ptr)(machine, bitmap, cliprect, shell, 255 - base[shell*4+3], y);
@@ -688,7 +688,7 @@ static void bullets_draw(running_machine *machine, bitmap_t *bitmap, const recta
/*************************************
*
- * Screen orientation
+ * Screen orientation
*
*************************************/
@@ -728,7 +728,7 @@ WRITE8_HANDLER( galaxian_flip_screen_xy_w )
/*************************************
*
- * Background controls
+ * Background controls
*
*************************************/
@@ -779,7 +779,7 @@ WRITE8_HANDLER( scramble_background_blue_w )
/*************************************
*
- * Graphics banking
+ * Graphics banking
*
*************************************/
@@ -809,7 +809,7 @@ static void stars_init(void)
/* reset the blink and enabled states */
stars_enabled = FALSE;
stars_blink_state = 0;
-
+
/* precalculate the RNG */
stars = auto_malloc(STAR_RNG_PERIOD);
shiftreg = 0;
@@ -817,13 +817,13 @@ static void stars_init(void)
{
/* stars are enabled if the upper 8 bits are 1 and the low bit is 0 */
int enabled = ((shiftreg & 0x1fe01) == 0x1fe00);
-
+
/* color comes from the 6 bits below the top 8 bits */
int color = (~shiftreg & 0x1f8) >> 3;
-
+
/* store the color value in the low 6 bits and the enable in the upper bit */
stars[i] = color | (enabled << 7);
-
+
/* the LFSR is fed based on the XOR of bit 12 and the inverse of bit 0 */
shiftreg = (shiftreg >> 1) | ((((shiftreg >> 12) ^ ~shiftreg) & 1) << 16);
}
@@ -840,7 +840,7 @@ static void stars_init(void)
static void stars_update_origin(running_machine *machine)
{
int curframe = video_screen_get_frame_number(machine->primary_screen);
-
+
/* only update on a different frame */
if (curframe != star_rng_origin_frame)
{
@@ -852,7 +852,7 @@ static void stars_update_origin(running_machine *machine)
/* of these off-by-one countings produce the horizontal star scrolling. */
int per_frame_delta = flipscreen_x ? 1 : -1;
int total_delta = per_frame_delta * (curframe - star_rng_origin_frame);
-
+
/* we can't just use % here because mod of a negative number is undefined */
while (total_delta < 0)
total_delta += STAR_RNG_PERIOD;
@@ -887,41 +887,41 @@ TIMER_CALLBACK( galaxian_stars_blink_timer )
static void stars_draw_row(bitmap_t *bitmap, int maxx, int y, UINT32 star_offs, UINT8 starmask)
{
int x;
-
+
/* ensure our star offset is valid */
star_offs %= STAR_RNG_PERIOD;
-
+
/* iterate over the specified number of 6MHz pixels */
for (x = 0; x < maxx; x++)
{
/* stars are suppressed unless V1 ^ H8 == 1 */
int enable_star = (y ^ (x >> 3)) & 1;
UINT8 star;
-
- /*
- The RNG clock is the master clock (18MHz) ANDed with the pixel clock (6MHz).
- The divide-by-3 circuit that produces the pixel clock generates a square wave
- with a 2/3 duty cycle, so the result of the AND generates a clock like this:
- _ _ _ _ _ _ _ _
- MASTER: _| |_| |_| |_| |_| |_| |_| |_| |
- _______ _______ ______
- PIXEL: _| |___| |___|
- _ _ _ _ _ _
- RNG: _| |_| |_____| |_| |_____| |_| |
-
- Thus for each pixel, there are 3 master clocks and 2 RNG clocks, and the RNG
- is clocked asymmetrically. To simulate this, we expand the horizontal screen
- size by 3 and handle the first RNG clock with one pixel and the second RNG
- clock with two pixels.
- */
-
+
+ /*
+ The RNG clock is the master clock (18MHz) ANDed with the pixel clock (6MHz).
+ The divide-by-3 circuit that produces the pixel clock generates a square wave
+ with a 2/3 duty cycle, so the result of the AND generates a clock like this:
+ _ _ _ _ _ _ _ _
+ MASTER: _| |_| |_| |_| |_| |_| |_| |_| |
+ _______ _______ ______
+ PIXEL: _| |___| |___|
+ _ _ _ _ _ _
+ RNG: _| |_| |_____| |_| |_____| |_| |
+
+ Thus for each pixel, there are 3 master clocks and 2 RNG clocks, and the RNG
+ is clocked asymmetrically. To simulate this, we expand the horizontal screen
+ size by 3 and handle the first RNG clock with one pixel and the second RNG
+ clock with two pixels.
+ */
+
/* first RNG clock: one pixel */
star = stars[star_offs++];
if (star_offs >= STAR_RNG_PERIOD)
star_offs = 0;
if (enable_star && (star & 0x80) != 0 && (star & starmask) != 0)
*BITMAP_ADDR32(bitmap, y, GALAXIAN_XSCALE*x + 0) = star_color[star & 0x3f];
-
+
/* second RNG clock: two pixels */
star = stars[star_offs++];
if (star_offs >= STAR_RNG_PERIOD)
@@ -938,7 +938,7 @@ static void stars_draw_row(bitmap_t *bitmap, int maxx, int y, UINT32 star_offs,
/*************************************
*
- * Background rendering
+ * Background rendering
*
*************************************/
@@ -967,12 +967,12 @@ void galaxian_draw_background(running_machine *machine, bitmap_t *bitmap, const
/* update the star origin to the current frame */
stars_update_origin(machine);
-
+
/* render stars if enabled */
if (stars_enabled)
{
int y;
-
+
/* iterate over scanlines */
for (y = cliprect->min_y; y <= cliprect->max_y; y++)
{
@@ -986,7 +986,7 @@ void galaxian_draw_background(running_machine *machine, bitmap_t *bitmap, const
void frogger_draw_background(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect)
{
rectangle draw;
-
+
/* color split point verified on real machine */
/* hmmm, according to schematics it is at 128+8; which is right? */
draw = *cliprect;
@@ -1010,20 +1010,20 @@ void amidar_draw_background(running_machine *machine, bitmap_t *bitmap, const re
for (x = 0; x < 32; x++)
if (flip_and_clip(&draw, x * 8, x * 8 + 7, cliprect))
{
- /*
- The background PROM is connected the following way:
+ /*
+ The background PROM is connected the following way:
- bit 0 = 0 enables the blue gun if BCB is asserted
- bit 1 = 0 enables the red gun if BCR is asserted and
- the green gun if BCG is asserted
- bits 2-7 are unconnected
+ bit 0 = 0 enables the blue gun if BCB is asserted
+ bit 1 = 0 enables the red gun if BCR is asserted and
+ the green gun if BCG is asserted
+ bits 2-7 are unconnected
- The background color generator is connected this way:
+ The background color generator is connected this way:
- RED - 270 ohm resistor
- GREEN - 560 ohm resistor
- BLUE - 470 ohm resistor
- */
+ RED - 270 ohm resistor
+ GREEN - 560 ohm resistor
+ BLUE - 470 ohm resistor
+ */
UINT8 red = ((~prom[x] & 0x02) && background_red) ? 0x7c : 0x00;
UINT8 green = ((~prom[x] & 0x02) && background_green) ? 0x3c : 0x00;
UINT8 blue = ((~prom[x] & 0x01) && background_blue) ? 0x47 : 0x00;
@@ -1035,11 +1035,11 @@ void amidar_draw_background(running_machine *machine, bitmap_t *bitmap, const re
void turtles_draw_background(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect)
{
/*
- The background color generator is connected this way:
+ The background color generator is connected this way:
- RED - 390 ohm resistor
- GREEN - 470 ohm resistor
- BLUE - 390 ohm resistor
+ RED - 390 ohm resistor
+ GREEN - 470 ohm resistor
+ BLUE - 390 ohm resistor
*/
fillbitmap(bitmap, MAKE_RGB(background_red * 0x55, background_green * 0x47, background_blue * 0x55), cliprect);
}
@@ -1052,13 +1052,13 @@ void scramble_draw_background(running_machine *machine, bitmap_t *bitmap, const
/* update the star origin to the current frame */
stars_update_origin(machine);
-
+
/* render stars if enabled */
if (stars_enabled)
{
int blink_state = stars_blink_state & 3;
int y;
-
+
/* iterate over scanlines */
for (y = cliprect->min_y; y <= cliprect->max_y; y++)
{
@@ -1081,13 +1081,13 @@ void jumpbug_draw_background(running_machine *machine, bitmap_t *bitmap, const r
/* update the star origin to the current frame */
stars_update_origin(machine);
-
+
/* render stars if enabled -- same as scramble but nothing in the status area */
if (stars_enabled)
{
int blink_state = stars_blink_state & 3;
int y;
-
+
/* iterate over scanlines */
for (y = cliprect->min_y; y <= cliprect->max_y; y++)
{
@@ -1106,7 +1106,7 @@ void jumpbug_draw_background(running_machine *machine, bitmap_t *bitmap, const r
/*************************************
*
- * Bullet rendering
+ * Bullet rendering
*
*************************************/
@@ -1116,15 +1116,15 @@ INLINE void galaxian_draw_pixel(bitmap_t *bitmap, const rectangle *cliprect, int
{
x *= GALAXIAN_XSCALE;
x += GALAXIAN_H0START;
- if (x >= cliprect->min_x && x <= cliprect->max_x)
+ if (x >= cliprect->min_x && x <= cliprect->max_x)
*BITMAP_ADDR32(bitmap, y, x) = color;
-
+
x++;
- if (x >= cliprect->min_x && x <= cliprect->max_x)
+ if (x >= cliprect->min_x && x <= cliprect->max_x)
*BITMAP_ADDR32(bitmap, y, x) = color;
-
+
x++;
- if (x >= cliprect->min_x && x <= cliprect->max_x)
+ if (x >= cliprect->min_x && x <= cliprect->max_x)
*BITMAP_ADDR32(bitmap, y, x) = color;
}
}
@@ -1133,11 +1133,11 @@ INLINE void galaxian_draw_pixel(bitmap_t *bitmap, const rectangle *cliprect, int
void galaxian_draw_bullet(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int offs, int x, int y)
{
/*
- Both "shells" and "missiles" begin displaying when the horizontal counter
- reaches $FC, and they stop displaying when it reaches $00, resulting in
- 4-pixel-long shots. The first 7 entries are called "shells" and render as
- white; the final entry is called a "missile" and renders as yellow.
- */
+ Both "shells" and "missiles" begin displaying when the horizontal counter
+ reaches $FC, and they stop displaying when it reaches $00, resulting in
+ 4-pixel-long shots. The first 7 entries are called "shells" and render as
+ white; the final entry is called a "missile" and renders as yellow.
+ */
x -= 4;
galaxian_draw_pixel(bitmap, cliprect, y, x++, bullet_color[offs]);
galaxian_draw_pixel(bitmap, cliprect, y, x++, bullet_color[offs]);
@@ -1149,10 +1149,10 @@ void galaxian_draw_bullet(running_machine *machine, bitmap_t *bitmap, const rect
void mshuttle_draw_bullet(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int offs, int x, int y)
{
/* verified by schematics:
- * both "W" and "Y" bullets are 4 pixels long
- * "W" bullets are enabled when H6 == 0, and are always purple
- * "Y" bullets are enabled when H6 == 1, and vary in color based on H4,H3,H2
- */
+ * both "W" and "Y" bullets are 4 pixels long
+ * "W" bullets are enabled when H6 == 0, and are always purple
+ * "Y" bullets are enabled when H6 == 1, and vary in color based on H4,H3,H2
+ */
static const rgb_t colors[8] =
{
MAKE_RGB(0xff,0xff,0xff),
@@ -1178,10 +1178,10 @@ void mshuttle_draw_bullet(running_machine *machine, bitmap_t *bitmap, const rect
void scramble_draw_bullet(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int offs, int x, int y)
{
/*
- Scramble only has "shells", which begin displaying when the counter
- reaches $FA, and stop displaying one pixel clock layer. All shells are
- rendered as yellow.
- */
+ Scramble only has "shells", which begin displaying when the counter
+ reaches $FA, and stop displaying one pixel clock layer. All shells are
+ rendered as yellow.
+ */
x -= 6;
galaxian_draw_pixel(bitmap, cliprect, y, x, MAKE_RGB(0xff,0xff,0x00));
}
@@ -1201,7 +1201,7 @@ void theend_draw_bullet(running_machine *machine, bitmap_t *bitmap, const rectan
/*************************************
*
- * Generic extensions
+ * Generic extensions
*
*************************************/
@@ -1222,7 +1222,7 @@ void upper_extend_sprite_info(const UINT8 *base, UINT8 *sx, UINT8 *sy, UINT8 *fl
/*************************************
*
- * Frogger extensions
+ * Frogger extensions
*
*************************************/
@@ -1240,14 +1240,14 @@ void frogger_extend_sprite_info(const UINT8 *base, UINT8 *sx, UINT8 *sy, UINT8 *
/*************************************
*
- * Ghostmuncher Galaxian extensions
+ * Ghostmuncher Galaxian extensions
*
*************************************/
void gmgalax_extend_tile_info(UINT16 *code, UINT8 *color, UINT8 attrib, UINT8 x)
{
*code |= gfxbank[0] << 9;
-// *color |= gfxbank[0] << 3;
+// *color |= gfxbank[0] << 3;
}
void gmgalax_extend_sprite_info(const UINT8 *base, UINT8 *sx, UINT8 *sy, UINT8 *flipx, UINT8 *flipy, UINT16 *code, UINT8 *color)
@@ -1260,7 +1260,7 @@ void gmgalax_extend_sprite_info(const UINT8 *base, UINT8 *sx, UINT8 *sy, UINT8 *
/*************************************
*
- * Pisces extensions
+ * Pisces extensions
*
*************************************/
@@ -1278,7 +1278,7 @@ void pisces_extend_sprite_info(const UINT8 *base, UINT8 *sx, UINT8 *sy, UINT8 *f
/*************************************
*
- * Batman Part 2 extensions
+ * Batman Part 2 extensions
*
*************************************/
@@ -1292,7 +1292,7 @@ void batman2_extend_tile_info(UINT16 *code, UINT8 *color, UINT8 attrib, UINT8 x)
/*************************************
*
- * Moon Cresta extensions
+ * Moon Cresta extensions
*
*************************************/
@@ -1312,7 +1312,7 @@ void mooncrst_extend_sprite_info(const UINT8 *base, UINT8 *sx, UINT8 *sy, UINT8
/*************************************
*
- * Moon Quasar extensions
+ * Moon Quasar extensions
*
*************************************/
@@ -1330,7 +1330,7 @@ void moonqsr_extend_sprite_info(const UINT8 *base, UINT8 *sx, UINT8 *sy, UINT8 *
/*************************************
*
- * Moon Shuttle extensions
+ * Moon Shuttle extensions
*
*************************************/
diff --git a/src/mame/video/mermaid.c b/src/mame/video/mermaid.c
index 6a21326d822..fb3f979a240 100644
--- a/src/mame/video/mermaid.c
+++ b/src/mame/video/mermaid.c
@@ -109,7 +109,7 @@ READ8_HANDLER( mermaid_collision_r )
/*
collision register active LOW:
- with coll = spriteram[offs + 2] & 0xc0
+ with coll = spriteram[offs + 2] & 0xc0
Bit 0 - Sprite (coll = 0x40) - Sprite (coll = 0x00)
Bit 1 - Sprite (coll = 0x40) - Foreground
@@ -119,7 +119,7 @@ READ8_HANDLER( mermaid_collision_r )
Bit 5
Bit 6 - Sprite (coll = 0x40) - Sprite (coll = 0x80)
Bit 7
- */
+ */
int collision = 0xff;
diff --git a/src/mame/video/namcona1.c b/src/mame/video/namcona1.c
index c6491dbca58..a536efab77d 100644
--- a/src/mame/video/namcona1.c
+++ b/src/mame/video/namcona1.c
@@ -1,7 +1,7 @@
/* Namco System NA1/2 Video Hardware */
-/*
-TODO:
+/*
+TODO:
- dynamic screen resolution
- bg pen (or the pen of the lower tilemap?)
- hook up roz tilemaps with roz enable / disable and tweak it (mainly missing offsets)
@@ -390,7 +390,7 @@ static void pdraw_tile(running_machine *machine,
if (pri[x] <= priority)
{
int c = source[x_index>>16];
- dest[x] = pal_base + c;
+ dest[x] = pal_base + c;
}
pri[x] = 0xff;
@@ -591,7 +591,7 @@ static void draw_background(running_machine *machine, bitmap_t *bitmap, const re
tilemap_set_scrollx( bg_tilemap[which], 0, scrollx );
tilemap_set_scrolly( bg_tilemap[which], 0, scrolly );
tilemap_draw_primask( bitmap, &clip, bg_tilemap[which], 0, primask, 0 );
-
+
#if 0
INT16 incxy, incyx, incxx, incyy;
INT16 xoffset, yoffset;
@@ -615,7 +615,7 @@ static void draw_background(running_machine *machine, bitmap_t *bitmap, const re
incxx << 8, incxy << 8, incyx << 8, incyy << 8,
0, 0, primask, 0);
#endif
-
+
}
}
}
@@ -651,7 +651,7 @@ VIDEO_UPDATE( namcona1 )
} /* next tilemap */
fillbitmap( priority_bitmap,0,cliprect );
- // It fixes bg in emeralda
+ // It fixes bg in emeralda
fillbitmap( bitmap,/* 0 */ 0xff,cliprect );
for( priority = 0; priority<8; priority++ )
diff --git a/src/mame/video/undrfire.c b/src/mame/video/undrfire.c
index aeeba27116e..d4390b77812 100644
--- a/src/mame/video/undrfire.c
+++ b/src/mame/video/undrfire.c
@@ -262,11 +262,11 @@ static void draw_sprites_cbombers(running_machine *machine, bitmap_t *bitmap,con
color /= 2; /* as sprites are 5bpp */
flipy = !flipy;
-// y = (-y &0x3ff);
+// y = (-y &0x3ff);
if (!tilenum) continue;
-// flipy = !flipy;
+// flipy = !flipy;
zoomx += 1;
zoomy += 1;
diff --git a/src/version.c b/src/version.c
index e7f1741caf2..8b38d653af4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -9,4 +9,4 @@
***************************************************************************/
-const char build_version[] = "0.124 ("__DATE__")";
+const char build_version[] = "0.124u1 ("__DATE__")";