summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatarGravatar Miodrag Milanovic <mmicko@gmail.com>2012-08-20 06:39:53 +0000
committerGravatarGravatar Miodrag Milanovic <mmicko@gmail.com>2012-08-20 06:39:53 +0000
commitf54800c1f3f89877f977f1598edc07b93de2b509 (patch) (github)
tree7ab593d4ac62979cf0de70500ece0bd66df80222
parent1c13d140992aabea30a322bb26d0fe8c0133cd3f (diff)
downloadmame-f54800c1f3f89877f977f1598edc07b93de2b509.tar.bz2
mame-f54800c1f3f89877f977f1598edc07b93de2b509.zip
Clean-ups and version bumpmame0146u5
-rw-r--r--src/emu/cpu/h83002/h8ops.h6
-rw-r--r--src/emu/cpu/h83002/h8speriph.c2
-rw-r--r--src/emu/cpu/v30mz/v30mz.c8
-rw-r--r--src/emu/cpu/v810/v810.c2
-rw-r--r--src/emu/emuopts.c2
-rw-r--r--src/emu/emuopts.h2
-rw-r--r--src/emu/machine/msm6242.c28
-rw-r--r--src/emu/machine/z80ctc.c2
-rw-r--r--src/emu/machine/z80ctc.h2
-rw-r--r--src/emu/machine/z80pio.h2
-rw-r--r--src/emu/machine/z80sio.h2
-rw-r--r--src/emu/romload.c2
-rw-r--r--src/emu/sound/dac.c8
-rw-r--r--src/emu/ui.c4
-rw-r--r--src/emu/video/huc6202.c10
-rw-r--r--src/emu/video/huc6260.c30
-rw-r--r--src/emu/video/huc6260.h2
-rw-r--r--src/emu/video/huc6270.c32
-rw-r--r--src/emu/video/huc6270.h4
-rw-r--r--src/emu/video/saa5050.c2
-rw-r--r--src/emu/video/v9938.h4
-rw-r--r--src/lib/formats/g64_dsk.c10
-rw-r--r--src/lib/formats/x1_tap.c4
-rw-r--r--src/mame/drivers/acesp.c2
-rw-r--r--src/mame/drivers/alvg.c2
-rw-r--r--src/mame/drivers/astrafr.c58
-rw-r--r--src/mame/drivers/atari_s2.c2
-rw-r--r--src/mame/drivers/atari_s3.c2
-rw-r--r--src/mame/drivers/atarig1.c2
-rw-r--r--src/mame/drivers/atetris.c4
-rw-r--r--src/mame/drivers/atronic.c2
-rw-r--r--src/mame/drivers/bankp.c4
-rw-r--r--src/mame/drivers/bfm_sc1.c8
-rw-r--r--src/mame/drivers/bfm_sc5.c2
-rw-r--r--src/mame/drivers/bingo.c6
-rw-r--r--src/mame/drivers/blackt96.c8
-rw-r--r--src/mame/drivers/by17.c2
-rw-r--r--src/mame/drivers/by35.c2
-rw-r--r--src/mame/drivers/by6803.c2
-rw-r--r--src/mame/drivers/by68701.c2
-rw-r--r--src/mame/drivers/capcom.c2
-rw-r--r--src/mame/drivers/chsuper.c2
-rw-r--r--src/mame/drivers/cobra.c502
-rw-r--r--src/mame/drivers/cyclemb.c18
-rw-r--r--src/mame/drivers/de_1.c2
-rw-r--r--src/mame/drivers/de_2.c2
-rw-r--r--src/mame/drivers/de_3.c2
-rw-r--r--src/mame/drivers/de_3b.c2
-rw-r--r--src/mame/drivers/deco32.c2
-rw-r--r--src/mame/drivers/deco_ld.c16
-rw-r--r--src/mame/drivers/docastle.c6
-rw-r--r--src/mame/drivers/drmicro.c4
-rw-r--r--src/mame/drivers/ecoinfr.c2
-rw-r--r--src/mame/drivers/expro02.c2
-rw-r--r--src/mame/drivers/freekick.c6
-rw-r--r--src/mame/drivers/galpani3.c10
-rw-r--r--src/mame/drivers/galpanic.c4
-rw-r--r--src/mame/drivers/gp_1.c2
-rw-r--r--src/mame/drivers/gp_2.c2
-rw-r--r--src/mame/drivers/gts1.c2
-rw-r--r--src/mame/drivers/gts3.c2
-rw-r--r--src/mame/drivers/gts80.c2
-rw-r--r--src/mame/drivers/gts80a.c2
-rw-r--r--src/mame/drivers/gts80b.c2
-rw-r--r--src/mame/drivers/hng64.c42
-rw-r--r--src/mame/drivers/ikki.c4
-rw-r--r--src/mame/drivers/intrscti.c6
-rw-r--r--src/mame/drivers/invqix.c16
-rw-r--r--src/mame/drivers/itgambl2.c2
-rw-r--r--src/mame/drivers/jailbrek.c6
-rw-r--r--src/mame/drivers/jantotsu.c4
-rw-r--r--src/mame/drivers/jchan.c10
-rw-r--r--src/mame/drivers/jclub2.c10
-rw-r--r--src/mame/drivers/jpmimpct.c2
-rw-r--r--src/mame/drivers/kncljoe.c6
-rw-r--r--src/mame/drivers/konamim2.c2
-rw-r--r--src/mame/drivers/kontest.c6
-rw-r--r--src/mame/drivers/ladybug.c4
-rw-r--r--src/mame/drivers/markham.c6
-rw-r--r--src/mame/drivers/maygayep.c16
-rw-r--r--src/mame/drivers/micropin.c2
-rw-r--r--src/mame/drivers/midvunit.c2
-rw-r--r--src/mame/drivers/mikie.c6
-rw-r--r--src/mame/drivers/mjkjidai.c8
-rw-r--r--src/mame/drivers/mpu4.c34
-rw-r--r--src/mame/drivers/mpu4avan.c20
-rw-r--r--src/mame/drivers/mpu4bwb.c4
-rw-r--r--src/mame/drivers/mpu4crystal.c86
-rw-r--r--src/mame/drivers/mpu4hw.c4
-rw-r--r--src/mame/drivers/mpu4mod2sw.c6
-rw-r--r--src/mame/drivers/mpu4mod4yam.c6
-rw-r--r--src/mame/drivers/mpu4plasma.c24
-rw-r--r--src/mame/drivers/mpu4sw.c6
-rw-r--r--src/mame/drivers/mpu5.c28
-rw-r--r--src/mame/drivers/multfish.c6
-rw-r--r--src/mame/drivers/naomi.c6
-rw-r--r--src/mame/drivers/peplus.c14
-rw-r--r--src/mame/drivers/proconn.c24
-rw-r--r--src/mame/drivers/royalmah.c4
-rw-r--r--src/mame/drivers/s3.c2
-rw-r--r--src/mame/drivers/sandscrp.c6
-rw-r--r--src/mame/drivers/segac2.c16
-rw-r--r--src/mame/drivers/segahang.c90
-rw-r--r--src/mame/drivers/segaorun.c96
-rw-r--r--src/mame/drivers/segas16a.c80
-rw-r--r--src/mame/drivers/segas16b.c130
-rw-r--r--src/mame/drivers/segas18.c18
-rw-r--r--src/mame/drivers/segaxbd.c112
-rw-r--r--src/mame/drivers/segaybd.c78
-rw-r--r--src/mame/drivers/srmp2.c6
-rw-r--r--src/mame/drivers/ssv.c12
-rw-r--r--src/mame/drivers/tetrisp2.c4
-rw-r--r--src/mame/drivers/triforce.c2
-rw-r--r--src/mame/drivers/vega.c356
-rw-r--r--src/mame/drivers/wildpkr.c4
-rw-r--r--src/mame/includes/bfm_sc45.h2
-rw-r--r--src/mame/includes/cps1.h2
-rw-r--r--src/mame/includes/dynax.h2
-rw-r--r--src/mame/includes/galaga.h2
-rw-r--r--src/mame/includes/galaxian.h2
-rw-r--r--src/mame/includes/kickgoal.h2
-rw-r--r--src/mame/includes/megadriv.h12
-rw-r--r--src/mame/includes/n64.h2
-rw-r--r--src/mame/includes/neogeo.h2
-rw-r--r--src/mame/includes/pgm.h10
-rw-r--r--src/mame/includes/scramble.h4
-rw-r--r--src/mame/includes/segahang.h12
-rw-r--r--src/mame/includes/segaorun.h18
-rw-r--r--src/mame/includes/segas16a.h26
-rw-r--r--src/mame/includes/segas16b.h54
-rw-r--r--src/mame/includes/segas18.h38
-rw-r--r--src/mame/includes/segaxbd.h24
-rw-r--r--src/mame/includes/segaybd.h14
-rw-r--r--src/mame/includes/senjyo.h2
-rw-r--r--src/mame/includes/snes.h2
-rw-r--r--src/mame/includes/stv.h2
-rw-r--r--src/mame/machine/fd1089.c252
-rw-r--r--src/mame/machine/fd1089.h18
-rw-r--r--src/mame/machine/fd1094.c878
-rw-r--r--src/mame/machine/fd1094.h22
-rw-r--r--src/mame/machine/kaneko_calc3.c8
-rw-r--r--src/mame/machine/kaneko_hit.c18
-rw-r--r--src/mame/machine/kaneko_hit.h2
-rw-r--r--src/mame/machine/kaneko_toybox.c16
-rw-r--r--src/mame/machine/megadriv.c2
-rw-r--r--src/mame/machine/megavdp.c2
-rw-r--r--src/mame/machine/megavdp.h6
-rw-r--r--src/mame/machine/segaic16.c92
-rw-r--r--src/mame/machine/segaic16.h4
-rw-r--r--src/mame/machine/snes.c2
-rw-r--r--src/mame/mame.lst3
-rw-r--r--src/mame/mame.mak2
-rw-r--r--src/mame/video/kaneko16.c2
-rw-r--r--src/mame/video/kaneko_grap2.c4
-rw-r--r--src/mame/video/kaneko_grap2.h6
-rw-r--r--src/mame/video/kaneko_spr.c22
-rw-r--r--src/mame/video/kaneko_spr.h6
-rw-r--r--src/mame/video/kaneko_tmap.h2
-rw-r--r--src/mame/video/scn2674.c34
-rw-r--r--src/mame/video/scn2674.h4
-rw-r--r--src/mame/video/segaorun.c2
-rw-r--r--src/mame/video/segas18.c6
-rw-r--r--src/mame/video/st0020.c10
-rw-r--r--src/mame/video/st0020.h4
-rw-r--r--src/version.c2
165 files changed, 1994 insertions, 1993 deletions
diff --git a/src/emu/cpu/h83002/h8ops.h b/src/emu/cpu/h83002/h8ops.h
index d436c09f7de..707d6abdb93 100644
--- a/src/emu/cpu/h83002/h8ops.h
+++ b/src/emu/cpu/h83002/h8ops.h
@@ -1,5 +1,5 @@
/*
-
+
H8/3xx: Unknown opcode (PC=1c966) 10f - not a valid H8 or H8S opcode, either bad dump or banked ROM
maygayep.c ep_cfallc
@@ -13,8 +13,8 @@ H8/3xx: Unknown opcode (PC=8f91) aeb - ADD.L ERs, ERd
maygayep.c ep_hogmnc
H8/3xx: Unknown opcode (PC=20000) 6b6e - MOV.B @ERs, Rd
-maygayep.c ep_wordf
-
+maygayep.c ep_wordf
+
*/
static UINT32 udata32, address24;
diff --git a/src/emu/cpu/h83002/h8speriph.c b/src/emu/cpu/h83002/h8speriph.c
index e4120ffd15a..516aa01bc21 100644
--- a/src/emu/cpu/h83002/h8speriph.c
+++ b/src/emu/cpu/h83002/h8speriph.c
@@ -1591,7 +1591,7 @@ UINT8 h8s_onchip_reg_read_8_ddr(h83xx_state *h8, int offset)
{
int port = (offset - H8S_IO_P1DR);
data = h8->drs[port] & h8->ddrs[port];
- data |= (h8->io->read_byte(H8_PORT_1 + port) & (h8->ddrs[port] ^ 0xff));
+ data |= (h8->io->read_byte(H8_PORT_1 + port) & (h8->ddrs[port] ^ 0xff));
}
break;
diff --git a/src/emu/cpu/v30mz/v30mz.c b/src/emu/cpu/v30mz/v30mz.c
index 4484a465d24..7ee243d0ff4 100644
--- a/src/emu/cpu/v30mz/v30mz.c
+++ b/src/emu/cpu/v30mz/v30mz.c
@@ -155,7 +155,7 @@ void v30mz_cpu_device::device_start()
save_item(NAME(m_seg_prefix_next));
// Register state for debugger
-// state_add( NEC_PC, "PC", m_PC ).callimport().callexport().formatstr("%04X");
+// state_add( NEC_PC, "PC", m_PC ).callimport().callexport().formatstr("%04X");
state_add( NEC_IP, "IP", m_ip ).callimport().callexport().formatstr("%04X");
state_add( NEC_SP, "SP", m_regs.w[SP] ).callimport().callexport().formatstr("%04X");
state_add( NEC_AW, "AW", m_regs.w[AW] ).callimport().callexport().formatstr("%04X");
@@ -1369,7 +1369,7 @@ void v30mz_cpu_device::execute_run()
DEF_r8b();
ADDB();
RegByte(m_dst);
- CLKM(1,2);
+ CLKM(1,2);
break;
case 0x03: // i_add_r16w
@@ -2781,7 +2781,7 @@ void v30mz_cpu_device::execute_run()
ANDW();
CLK(1);
break;
-
+
case 0xaa: // i_stosb
i_stosb();
break;
@@ -3295,7 +3295,7 @@ void v30mz_cpu_device::execute_run()
m_sregs[CS] = tmp1;
m_ip = tmp;
- CLK(7);
+ CLK(7);
}
break;
diff --git a/src/emu/cpu/v810/v810.c b/src/emu/cpu/v810/v810.c
index 5ae880effeb..a848c365163 100644
--- a/src/emu/cpu/v810/v810.c
+++ b/src/emu/cpu/v810/v810.c
@@ -993,7 +993,7 @@ static UINT32 opBSU(v810_state *cpustate,UINT32 op)
UINT32 dsttmp,tmp;
UINT8 srctmp;
-// printf("BDST %08x BSRC %08x SIZE %08x DST %08x SRC %08x\n",cpustate->R26,cpustate->R27,cpustate->R28,cpustate->R29,cpustate->R30);
+// printf("BDST %08x BSRC %08x SIZE %08x DST %08x SRC %08x\n",cpustate->R26,cpustate->R27,cpustate->R28,cpustate->R29,cpustate->R30);
dstbit = cpustate->R26;
srcbit = cpustate->R27;
diff --git a/src/emu/emuopts.c b/src/emu/emuopts.c
index 0e26dfac56f..acfcd83b971 100644
--- a/src/emu/emuopts.c
+++ b/src/emu/emuopts.c
@@ -193,7 +193,7 @@ const options_entry emu_options::s_option_entries[] =
{ OPTION_UI_FONT, "default", OPTION_STRING, "specify a font to use" },
{ OPTION_RAMSIZE ";ram", NULL, OPTION_STRING, "size of RAM (if supported by driver)" },
{ OPTION_CONFIRM_QUIT, "0", OPTION_BOOLEAN, "display confirm quit screen on exit" },
- { OPTION_UI_MOUSE, "0", OPTION_BOOLEAN, "display ui mouse cursor" },
+ { OPTION_UI_MOUSE, "0", OPTION_BOOLEAN, "display ui mouse cursor" },
{ NULL }
};
diff --git a/src/emu/emuopts.h b/src/emu/emuopts.h
index 3f74b687b15..1de4aa8faee 100644
--- a/src/emu/emuopts.h
+++ b/src/emu/emuopts.h
@@ -348,7 +348,7 @@ public:
const char *ui_font() const { return value(OPTION_UI_FONT); }
const char *ram_size() const { return value(OPTION_RAMSIZE); }
- bool confirm_quit() const { return bool_value(OPTION_CONFIRM_QUIT); }
+ bool confirm_quit() const { return bool_value(OPTION_CONFIRM_QUIT); }
bool ui_mouse() const { return bool_value(OPTION_UI_MOUSE); }
// device-specific options
diff --git a/src/emu/machine/msm6242.c b/src/emu/machine/msm6242.c
index f081cff0627..d11c00def79 100644
--- a/src/emu/machine/msm6242.c
+++ b/src/emu/machine/msm6242.c
@@ -252,11 +252,11 @@ WRITE8_MEMBER( msm6242_device::write )
case MSM6242_REG_CD:
{
/*
- x--- 30s ADJ
- -x-- IRQ FLAG
- --x- BUSY
- ---x HOLD
- */
+ x--- 30s ADJ
+ -x-- IRQ FLAG
+ --x- BUSY
+ ---x HOLD
+ */
m_reg[0] = data & 0x0f;
@@ -279,10 +279,10 @@ WRITE8_MEMBER( msm6242_device::write )
case MSM6242_REG_CE:
{
/*
- xx-- t0,t1 (timing irq)
- --x- STD
- ---x MASK
- */
+ xx-- t0,t1 (timing irq)
+ --x- STD
+ ---x MASK
+ */
m_reg[1] = data & 0x0f;
if((data & 3) == 0) // MASK & STD = 0
@@ -304,11 +304,11 @@ WRITE8_MEMBER( msm6242_device::write )
case MSM6242_REG_CF:
{
/*
- x--- TEST
- -x-- 24/12
- --x- STOP
- ---x RESET
- */
+ x--- TEST
+ -x-- 24/12
+ --x- STOP
+ ---x RESET
+ */
/* the 12/24 mode bit can only be changed when RESET does a 1 -> 0 transition */
if (((data & 0x01) == 0x00) && (m_reg[2] & 0x01))
diff --git a/src/emu/machine/z80ctc.c b/src/emu/machine/z80ctc.c
index 9466e442392..a17f90ee964 100644
--- a/src/emu/machine/z80ctc.c
+++ b/src/emu/machine/z80ctc.c
@@ -108,7 +108,7 @@ WRITE8_MEMBER( z80ctc_device::write )
//-------------------------------------------------
// trg0-3 - standard write line handlers for each
-// trigger
+// trigger
//-------------------------------------------------
WRITE_LINE_MEMBER( z80ctc_device::trg0 ) { trigger(0, state); }
diff --git a/src/emu/machine/z80ctc.h b/src/emu/machine/z80ctc.h
index 567dfb677c3..066a4266462 100644
--- a/src/emu/machine/z80ctc.h
+++ b/src/emu/machine/z80ctc.h
@@ -78,7 +78,7 @@ public:
UINT8 read(int ch) { return m_channel[ch].read(); }
void write(int ch, UINT8 data) { m_channel[ch].write(data); }
void trigger(int ch, UINT8 data) { m_channel[ch].trigger(data); }
-
+
// read/write handlers
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
diff --git a/src/emu/machine/z80pio.h b/src/emu/machine/z80pio.h
index 203522ca8da..5f0388a50f2 100644
--- a/src/emu/machine/z80pio.h
+++ b/src/emu/machine/z80pio.h
@@ -117,7 +117,7 @@ public:
UINT8 port_b_read() { return port_read(PORT_B); }
void port_a_write(UINT8 data) { port_write(PORT_A, data); }
void port_b_write(UINT8 data) { port_write(PORT_B, data); }
-
+
// standard read/write, with C/D in bit 1, B/A in bit 0
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
diff --git a/src/emu/machine/z80sio.h b/src/emu/machine/z80sio.h
index 2c62ebefafc..501431d3bf1 100644
--- a/src/emu/machine/z80sio.h
+++ b/src/emu/machine/z80sio.h
@@ -66,7 +66,7 @@ public:
void set_cts(int ch, int state) { m_channel[ch].set_cts(state); }
void set_dcd(int ch, int state) { m_channel[ch].set_dcd(state); }
void receive_data(int ch, int data) { m_channel[ch].receive_data(data); }
-
+
// standard read/write, with C/D in bit 1, B/A in bit 0
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
diff --git a/src/emu/romload.c b/src/emu/romload.c
index 67ae2c249de..f16c27bbe22 100644
--- a/src/emu/romload.c
+++ b/src/emu/romload.c
@@ -1493,7 +1493,7 @@ int rom_load_warnings(running_machine &machine)
/*-------------------------------------------------
- software_load_warnings_message - return the
+ software_load_warnings_message - return the
software load warnings we generated
-------------------------------------------------*/
diff --git a/src/emu/sound/dac.c b/src/emu/sound/dac.c
index 3a4af9040ef..887676ac9c4 100644
--- a/src/emu/sound/dac.c
+++ b/src/emu/sound/dac.c
@@ -63,8 +63,8 @@ dac_device::dac_device(const machine_config &mconfig, const char *tag, device_t
//-------------------------------------------------
-// write_unsigned8 - write an 8-bit value,
-// keeping the scaled result unsigned
+// write_unsigned8 - write an 8-bit value,
+// keeping the scaled result unsigned
//-------------------------------------------------
WRITE8_MEMBER( dac_device::write_unsigned8 )
@@ -74,8 +74,8 @@ WRITE8_MEMBER( dac_device::write_unsigned8 )
//-------------------------------------------------
-// write_signed8 - write an 8-bit value,
-// keeping the scaled result signed
+// write_signed8 - write an 8-bit value,
+// keeping the scaled result signed
//-------------------------------------------------
WRITE8_MEMBER( dac_device::write_signed8 )
diff --git a/src/emu/ui.c b/src/emu/ui.c
index e5541f416e4..8a5c60c7e3b 100644
--- a/src/emu/ui.c
+++ b/src/emu/ui.c
@@ -437,7 +437,7 @@ void ui_update_and_render(running_machine &machine, render_container *container)
else
popup_text_end = 0;
- if (ui_mouse_show || (machine.options().ui_mouse() && ui_is_menu_active()))
+ if (ui_mouse_show || (machine.options().ui_mouse() && ui_is_menu_active()))
{
INT32 mouse_target_x, mouse_target_y;
int mouse_button;
@@ -915,7 +915,7 @@ void ui_show_menu(void)
/*-------------------------------------------------
- ui_show_mouse - change mouse status
+ ui_show_mouse - change mouse status
-------------------------------------------------*/
void ui_show_mouse(bool status)
diff --git a/src/emu/video/huc6202.c b/src/emu/video/huc6202.c
index 514acd0c099..07833a70d3a 100644
--- a/src/emu/video/huc6202.c
+++ b/src/emu/video/huc6202.c
@@ -106,10 +106,10 @@ READ16_MEMBER( huc6202_device::next_pixel )
break;
case 2: /* Back - BG0 + SP1 => BG0 - Front
- BG0 + BG1 => BG0
- BG1 + SP0 => BG1
- SP0 + SP1 => SP0
- */
+ BG0 + BG1 => BG0
+ BG1 + SP0 => BG1
+ SP0 + SP1 => SP0
+ */
if ( data_1 > huc6270_device::HUC6270_SPRITE )
{
if ( data_0 > huc6270_device::HUC6270_SPRITE )
@@ -201,7 +201,7 @@ READ8_MEMBER( huc6202_device::read )
break;
case 0x01: /* Priority register #1 */
- data = ( m_prio[2].prio_type << 2 ) |
+ data = ( m_prio[2].prio_type << 2 ) |
( m_prio[2].dev0_enabled ? 0x01 : 0 ) |
( m_prio[2].dev1_enabled ? 0x02 : 0 ) |
( m_prio[3].prio_type << 6 ) |
diff --git a/src/emu/video/huc6260.c b/src/emu/video/huc6260.c
index 53b3c0d5930..a543c28ce35 100644
--- a/src/emu/video/huc6260.c
+++ b/src/emu/video/huc6260.c
@@ -98,23 +98,23 @@ void huc6260_device::device_timer(emu_timer &timer, device_timer_id id, int para
{
case HUC6260_HSYNC_START: /* Start of HSync */
m_hsync_changed( 0 );
-// if ( v == 0 )
-// {
-// /* Check if the screen should be resized */
-// m_height = HUC6260_LPF - ( m_blur ? 1 : 0 );
-// if ( m_height != video_screen_get_height( m_screen ) )
-// {
-// rectangle visible_area;
+// if ( v == 0 )
+// {
+// /* Check if the screen should be resized */
+// m_height = HUC6260_LPF - ( m_blur ? 1 : 0 );
+// if ( m_height != video_screen_get_height( m_screen ) )
+// {
+// rectangle visible_area;
//
-// /* TODO: Set proper visible area parameters */
-// visible_area.min_x = 64;
-// visible_area.min_y = 18;
-// visible_area.max_x = 64 + 1024 + 64 - 1;
-// visible_area.max_y = 18 + 242 - 1;
+// /* TODO: Set proper visible area parameters */
+// visible_area.min_x = 64;
+// visible_area.min_y = 18;
+// visible_area.max_x = 64 + 1024 + 64 - 1;
+// visible_area.max_y = 18 + 242 - 1;
//
-// video_screen_configure( m_screen, HUC6260_WPF, m_height, &visible_area, HZ_TO_ATTOSECONDS( device->clock / ( HUC6260_WPF * m_height ) ) );
-// }
-// }
+// video_screen_configure( m_screen, HUC6260_WPF, m_height, &visible_area, HZ_TO_ATTOSECONDS( device->clock / ( HUC6260_WPF * m_height ) ) );
+// }
+// }
break;
case 0: /* End of HSync */
diff --git a/src/emu/video/huc6260.h b/src/emu/video/huc6260.h
index e4f1a64a906..1f2ce0cdaaa 100644
--- a/src/emu/video/huc6260.h
+++ b/src/emu/video/huc6260.h
@@ -47,7 +47,7 @@ struct _huc6260_interface
devcb_write_line hsync_changed;
};
-
+
class huc6260_device : public device_t,
public huc6260_interface
{
diff --git a/src/emu/video/huc6270.c b/src/emu/video/huc6270.c
index c6cfbd3b2ee..76b9f3e5bdd 100644
--- a/src/emu/video/huc6270.c
+++ b/src/emu/video/huc6270.c
@@ -115,7 +115,7 @@ huc6270_device::huc6270_device(const machine_config &mconfig, const char *tag, d
/*
- Read one row of tile data from video ram
+ Read one row of tile data from video ram
*/
inline void huc6270_device::fetch_bat_tile_row()
{
@@ -308,8 +308,8 @@ inline void huc6270_device::handle_vblank()
}
/* Should we initiate a VRAM->SATB DMA transfer.
- The timing for this is incorrect.
- */
+ The timing for this is incorrect.
+ */
if ( m_dvssr_written || ( m_dcr & 0x10 ) )
{
int i;
@@ -488,7 +488,7 @@ READ16_MEMBER( huc6270_device::next_pixel )
//inline READ16_MEMBER( huc6270_device::time_until_next_event )
//{
-// return m_horz_to_go * 8 + m_horz_steps;
+// return m_horz_to_go * 8 + m_horz_steps;
//}
@@ -512,8 +512,8 @@ WRITE_LINE_MEMBER( huc6270_device::vsync_changed )
handle_vblank();
/* Should we perform VRAM-VRAM dma.
- The timing for this is incorrect.
- */
+ The timing for this is incorrect.
+ */
if ( m_dma_enabled )
{
int desr_inc = ( m_dcr & 0x0008 ) ? -1 : +1;
@@ -649,11 +649,11 @@ WRITE8_MEMBER( huc6270_device::write )
case RCR: /* raster compare register LSB */
m_rcr = ( m_rcr & 0x0300 ) | data;
//printf("%s: RCR set to %03x\n", machine().describe_context(), m_rcr);
-// if ( m_raster_count == m_rcr && m_cr & 0x04 )
-// {
-// m_status |= HUC6270_RR;
-// m_irq_changed( ASSERT_LINE );
-// }
+// if ( m_raster_count == m_rcr && m_cr & 0x04 )
+// {
+// m_status |= HUC6270_RR;
+// m_irq_changed( ASSERT_LINE );
+// }
//if (LOG) printf("%04x: RCR (%03x) written at %d,%d\n", activecpu_get_pc(), huc6270->m_rcr, video_screen_get_vpos(device->machine->primary_screen), video_screen_get_hpos(device->machine->primary_screen) );
break;
@@ -740,11 +740,11 @@ WRITE8_MEMBER( huc6270_device::write )
case RCR: /* raster compare register MSB */
m_rcr = ( m_rcr & 0x00FF ) | ( ( data & 0x03 ) << 8 );
//printf("%s: RCR set to %03x\n", machine().describe_context(), m_rcr);
-// if ( m_raster_count == m_rcr && m_cr & 0x04 )
-// {
-// m_status |= HUC6270_RR;
-// m_irq_changed( ASSERT_LINE );
-// }
+// if ( m_raster_count == m_rcr && m_cr & 0x04 )
+// {
+// m_status |= HUC6270_RR;
+// m_irq_changed( ASSERT_LINE );
+// }
break;
case BXR: /* background x-scroll register MSB */
diff --git a/src/emu/video/huc6270.h b/src/emu/video/huc6270.h
index e6765382846..0d5686a1049 100644
--- a/src/emu/video/huc6270.h
+++ b/src/emu/video/huc6270.h
@@ -128,8 +128,8 @@ private:
UINT16 m_bat_column;
UINT8 m_bat_tile_row[8];
/* Internal sprite attribute table. SATB DMA is used to transfer data
- from VRAM to this internal table.
- */
+ from VRAM to this internal table.
+ */
UINT16 m_sat[4*64];
int m_sprites_this_line;
int m_sprite_row_index;
diff --git a/src/emu/video/saa5050.c b/src/emu/video/saa5050.c
index 2236bf1085d..0a11f045718 100644
--- a/src/emu/video/saa5050.c
+++ b/src/emu/video/saa5050.c
@@ -215,7 +215,7 @@ void saa5050_update( device_t *device, bitmap_ind16 &bitmap, const rectangle &cl
for (sy = 0; sy <= saa5050->y; sy++)
{
bool dblhi = false;
-
+
/* Set start of line state */
saa5050->flags = 0;
saa5050->prvchr = 32;
diff --git a/src/emu/video/v9938.h b/src/emu/video/v9938.h
index 1cf9280d242..83eda9a8042 100644
--- a/src/emu/video/v9938.h
+++ b/src/emu/video/v9938.h
@@ -132,8 +132,8 @@ private:
template<typename _PixelType, int _Width> void mode_graphic5(const pen_t *pens, _PixelType *ln, int line);
template<typename _PixelType, int _Width> void mode_graphic6(const pen_t *pens, _PixelType *ln, int line);
template<typename _PixelType, int _Width> void mode_graphic7(const pen_t *pens, _PixelType *ln, int line);
-// template<typename _PixelType, int _Width> void mode_yae(const pen_t *pens, _PixelType *ln, int line);
-// template<typename _PixelType, int _Width> void mode_yjk(const pen_t *pens, _PixelType *ln, int line);
+// template<typename _PixelType, int _Width> void mode_yae(const pen_t *pens, _PixelType *ln, int line);
+// template<typename _PixelType, int _Width> void mode_yjk(const pen_t *pens, _PixelType *ln, int line);
template<typename _PixelType, int _Width> void mode_unknown(const pen_t *pens, _PixelType *ln, int line);
template<typename _PixelType, int _Width> void default_draw_sprite(const pen_t *pens, _PixelType *ln, UINT8 *col);
template<typename _PixelType, int _Width> void graphic5_draw_sprite(const pen_t *pens, _PixelType *ln, UINT8 *col);
diff --git a/src/lib/formats/g64_dsk.c b/src/lib/formats/g64_dsk.c
index 6b89b266503..37617b769aa 100644
--- a/src/lib/formats/g64_dsk.c
+++ b/src/lib/formats/g64_dsk.c
@@ -137,14 +137,14 @@ static floperr_t g64_read_track(floppy_image_legacy *floppy, int head, int track
{
/*
- The following is written into the buffer:
+ The following is written into the buffer:
- n bytes of track data
- 1982 bytes of speed zone data
+ n bytes of track data
+ 1982 bytes of speed zone data
- get_track_size() returns n (size of track data)
+ get_track_size() returns n (size of track data)
- */
+ */
struct g64dsk_tag *tag = get_tag(floppy);
floperr_t err;
diff --git a/src/lib/formats/x1_tap.c b/src/lib/formats/x1_tap.c
index 5923a0dfdf4..795585fc4e5 100644
--- a/src/lib/formats/x1_tap.c
+++ b/src/lib/formats/x1_tap.c
@@ -83,11 +83,11 @@ static int x1_cas_to_wav_size (const UINT8 *casdata, int caslen)
{
ret = (caslen - 4) * 8; // each byte = 8 samples
cas_size = ret;
-
+
samplerate = casdata[0x00] | (casdata[0x01] << 8) | (casdata[0x02] << 16) | (casdata[0x03] << 24);
new_format = 0;
}
-
+
return ret;
}
diff --git a/src/mame/drivers/acesp.c b/src/mame/drivers/acesp.c
index 79a5bed73ed..243caac0dc2 100644
--- a/src/mame/drivers/acesp.c
+++ b/src/mame/drivers/acesp.c
@@ -30,7 +30,7 @@ protected:
// devices
required_device<cpu_device> m_maincpu;
-public:
+public:
DECLARE_DRIVER_INIT(ace_sp);
DECLARE_DRIVER_INIT(ace_cr);
};
diff --git a/src/mame/drivers/alvg.c b/src/mame/drivers/alvg.c
index 509e712e470..46693b3d17d 100644
--- a/src/mame/drivers/alvg.c
+++ b/src/mame/drivers/alvg.c
@@ -17,7 +17,7 @@ protected:
// driver_device overrides
virtual void machine_reset();
-public:
+public:
DECLARE_DRIVER_INIT(alvg);
};
diff --git a/src/mame/drivers/astrafr.c b/src/mame/drivers/astrafr.c
index 5ebb1643474..2ffcf92456f 100644
--- a/src/mame/drivers/astrafr.c
+++ b/src/mame/drivers/astrafr.c
@@ -2286,43 +2286,43 @@ GAME( 200?, as_rtrg, as_rtr , astra_single, astrafr, astrafr_state, as
GAME( 200?, as_rtrh, as_rtr , astra_single_2e, astrafr, astrafr_state, astradec, ROT0, "Astra", "Ready To Roll (Astra, V202)" , GAME_IS_SKELETON_MECHANICAL)
GAME( 200?, as_rab, 0 , astra_single_2e, astrafr, driver_device, 0, ROT0, "Astra", "Ring A Bell (Astra, V105)" , GAME_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_raba, as_rab , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Ring A Bell (Astra, V106)" , GAME_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_rabb, as_rab , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Ring A Bell (Astra, V107)" , GAME_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_rabc, as_rab , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Ring A Bell (Astra, V104)" , GAME_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_raba, as_rab , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Ring A Bell (Astra, V106)" , GAME_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_rabb, as_rab , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Ring A Bell (Astra, V107)" , GAME_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_rabc, as_rab , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Ring A Bell (Astra, V104)" , GAME_IS_SKELETON_MECHANICAL)
GAME( 200?, as_rbg, 0 , astra_single_2e, astrafr, driver_device, 0, ROT0, "Astra", "River Boat Gambler (Astra, V304)" , GAME_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_rbga, as_rab , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "River Boat Gambler (Astra, V303)" , GAME_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_rbgb, as_rab , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "River Boat Gambler (Astra, V104)" , GAME_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_rbgc, as_rab , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "River Boat Gambler (Astra, V102)" , GAME_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_rbgd, as_rab , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "River Boat Gambler (Astra, V101)" , GAME_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_rbge, as_rab , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "River Boat Gambler (Astra, V008)" , GAME_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_rbga, as_rab , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "River Boat Gambler (Astra, V303)" , GAME_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_rbgb, as_rab , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "River Boat Gambler (Astra, V104)" , GAME_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_rbgc, as_rab , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "River Boat Gambler (Astra, V102)" , GAME_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_rbgd, as_rab , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "River Boat Gambler (Astra, V101)" , GAME_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_rbge, as_rab , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "River Boat Gambler (Astra, V008)" , GAME_IS_SKELETON_MECHANICAL)
GAME( 200?, as_rbglo, 0 , astrafr_dual_37, astrafr, astrafr_state, astradec_sml_dual, ROT0, "Lowen", "River Boat Gambler (Lowen, V106)" , GAME_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_rox, 0 , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Roll X (Astra, V006)" , GAME_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_rox, 0 , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Roll X (Astra, V006)" , GAME_IS_SKELETON_MECHANICAL)
GAME( 200?, as_csv, 0 , astra_single_37, astrafr, driver_device, 0, ROT0, "Astra", "Slot Slant (?) (Astra, V202)" , GAME_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_sltcl, 0 , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Slots Classic (?) (Astra)" , GAME_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_sltcl, 0 , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Slots Classic (?) (Astra)" , GAME_IS_SKELETON_MECHANICAL)
GAME( 200?, as_stp, 0 , astra_single_2e, astrafr, astrafr_state, astradec, ROT0, "Astra", "Stampede (Astra, V103)" , GAME_IS_SKELETON_MECHANICAL)
GAME( 200?, as_stpa, as_stp , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Stampede (Astra, V102)" , GAME_IS_SKELETON_MECHANICAL)
GAME( 200?, as_stpb, as_stp , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Stampede (Astra, V105)" , GAME_IS_SKELETON_MECHANICAL)
GAME( 200?, as_siu, 0 , astra_single_37, astrafr, astrafr_state, astradec_sml, ROT0, "Astra", "Step It Up (Astra, V202)" , GAME_IS_SKELETON_MECHANICAL) // extra sound roms(?) in this set
GAME( 200?, as_siua, as_siu , astra_single, astrafr, astrafr_state, astradec_sml, ROT0, "Astra", "Step It Up (Astra, V203)" , GAME_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_sld, 0 , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Super Little Devil (Astra, V700)" , GAME_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_slda, as_sld , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Super Little Devil (Astra, V600)" , GAME_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_sldb, as_sld , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Super Little Devil (Astra, V500)" , GAME_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_sldc, as_sld , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Super Little Devil (Astra, V400)" , GAME_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_sldd, as_sld , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Super Little Devil (Astra, V200)" , GAME_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_slde, as_sld , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Super Little Devil (Astra, V101)" , GAME_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_sld, 0 , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Super Little Devil (Astra, V700)" , GAME_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_slda, as_sld , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Super Little Devil (Astra, V600)" , GAME_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_sldb, as_sld , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Super Little Devil (Astra, V500)" , GAME_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_sldc, as_sld , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Super Little Devil (Astra, V400)" , GAME_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_sldd, as_sld , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Super Little Devil (Astra, V200)" , GAME_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_slde, as_sld , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Super Little Devil (Astra, V101)" , GAME_IS_SKELETON_MECHANICAL)
GAME( 200?, as_tem, 0 , astra_single_alt_37, astrafr, astrafr_state, astradec, ROT0, "Astra", "Temptation (Astra, V101)" , GAME_IS_SKELETON_MECHANICAL)
GAME( 200?, as_tema, as_tem , astra_single_alt_37, astrafr, astrafr_state, astradec, ROT0, "Astra", "Temptation (Astra, V006)" , GAME_IS_SKELETON_MECHANICAL)
GAME( 200?, as_tbl, 0 , astra_single_2e, astrafr, driver_device, 0, ROT0, "Astra", "Triple Bells (Astra, V104)" , GAME_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_tbla, as_tbl , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Triple Bells (Astra, V105)" , GAME_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_tblb, as_tbl , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Triple Bells (Astra, V106)" , GAME_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_tblc, as_tbl , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Triple Bells (Astra, V103)" , GAME_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_tbld, as_tbl , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Triple Bells (Astra, V304)" , GAME_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_tble, as_tbl , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Triple Bells (Astra, V303)" , GAME_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_tblf, as_tbl , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Triple Bells (Astra, V301)" , GAME_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_tbla, as_tbl , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Triple Bells (Astra, V105)" , GAME_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_tblb, as_tbl , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Triple Bells (Astra, V106)" , GAME_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_tblc, as_tbl , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Triple Bells (Astra, V103)" , GAME_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_tbld, as_tbl , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Triple Bells (Astra, V304)" , GAME_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_tble, as_tbl , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Triple Bells (Astra, V303)" , GAME_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_tblf, as_tbl , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Triple Bells (Astra, V301)" , GAME_IS_SKELETON_MECHANICAL)
GAME( 200?, as_td, 0 , astra_single_2e, astrafr, astrafr_state, astradec, ROT0, "Astra", "Twin Dragons (Astra, V103)" , GAME_IS_SKELETON_MECHANICAL)
GAME( 200?, as_twp, 0 , astra_single_2e, astrafr, driver_device, 0, ROT0, "Astra", "Twin Pots (Astra, V106)" , GAME_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_twpa, as_twp , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Twin Pots (Astra, V104)" , GAME_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_twpa, as_twp , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Twin Pots (Astra, V104)" , GAME_IS_SKELETON_MECHANICAL)
GAME( 200?, as_vn, 0 , astrafr_dual_alt_37, astrafr, astrafr_state, astradec_dual, ROT0, "Astra", "Vegas Nights (Astra, V205)" , GAME_IS_SKELETON_MECHANICAL)
GAME( 200?, as_vcv, 0 , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Viva Cash Vegas (Astra, V005)" , GAME_IS_SKELETON_MECHANICAL)
GAME( 200?, as_vcva, as_vcv , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Viva Cash Vegas (Astra, V107)" , GAME_IS_SKELETON_MECHANICAL)
@@ -2330,11 +2330,11 @@ GAME( 200?, as_vcvb, as_vcv , astra_single, astrafr, astrafr_state, as
GAME( 200?, as_vcvc, as_vcv , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Viva Cash Vegas (Astra, V104)" , GAME_IS_SKELETON_MECHANICAL)
GAME( 200?, as_vcvd, as_vcv , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Viva Cash Vegas (Astra, V102)" , GAME_IS_SKELETON_MECHANICAL)
GAME( 200?, as_vcve, as_vcv , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Viva Cash Vegas (Astra, V101)" , GAME_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_ww, 0 , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Wicked Willy (Astra, V203)" , GAME_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_wwa, as_ww , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Wicked Willy (Astra, V204)" , GAME_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_wwb, as_ww , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Wicked Willy (Astra, V205)" , GAME_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_wwc, as_ww , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Wicked Willy (Astra, V104)" , GAME_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_wwd, as_ww , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Wicked Willy (Astra, V103)" , GAME_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_wwe, as_ww , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Wicked Willy (Astra, V102)" , GAME_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_ww, 0 , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Wicked Willy (Astra, V203)" , GAME_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_wwa, as_ww , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Wicked Willy (Astra, V204)" , GAME_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_wwb, as_ww , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Wicked Willy (Astra, V205)" , GAME_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_wwc, as_ww , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Wicked Willy (Astra, V104)" , GAME_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_wwd, as_ww , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Wicked Willy (Astra, V103)" , GAME_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_wwe, as_ww , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Wicked Willy (Astra, V102)" , GAME_IS_SKELETON_MECHANICAL)
GAME( 200?, as_ws, 0 , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Win Streak (Astra, V100)" , GAME_IS_SKELETON_MECHANICAL) // incomplete dump
diff --git a/src/mame/drivers/atari_s2.c b/src/mame/drivers/atari_s2.c
index 740e45b00b2..361b1e5d3b9 100644
--- a/src/mame/drivers/atari_s2.c
+++ b/src/mame/drivers/atari_s2.c
@@ -21,7 +21,7 @@ protected:
// driver_device overrides
virtual void machine_reset();
-public:
+public:
DECLARE_DRIVER_INIT(atari_s2);
};
diff --git a/src/mame/drivers/atari_s3.c b/src/mame/drivers/atari_s3.c
index 0f83a53070f..dfc7b0af09b 100644
--- a/src/mame/drivers/atari_s3.c
+++ b/src/mame/drivers/atari_s3.c
@@ -21,7 +21,7 @@ protected:
// driver_device overrides
virtual void machine_reset();
-public:
+public:
DECLARE_DRIVER_INIT(atari_s3);
};
diff --git a/src/mame/drivers/atarig1.c b/src/mame/drivers/atarig1.c
index b29b4d1e770..d2ca18a3a08 100644
--- a/src/mame/drivers/atarig1.c
+++ b/src/mame/drivers/atarig1.c
@@ -1232,7 +1232,7 @@ static void init_g1_common(running_machine &machine, offs_t slapstic_base, int s
DRIVER_INIT_MEMBER(atarig1_state,hydra) { init_g1_common(machine(), 0x078000, 116, 0); }
DRIVER_INIT_MEMBER(atarig1_state,hydrap) { init_g1_common(machine(), 0x000000, 0, 0); }
-
+
DRIVER_INIT_MEMBER(atarig1_state,pitfight9) { init_g1_common(machine(), 0x038000, 114, 1); }
DRIVER_INIT_MEMBER(atarig1_state,pitfight7) { init_g1_common(machine(), 0x038000, 112, 1); }
DRIVER_INIT_MEMBER(atarig1_state,pitfight) { init_g1_common(machine(), 0x038000, 111, 1); }
diff --git a/src/mame/drivers/atetris.c b/src/mame/drivers/atetris.c
index ee27515aecb..d92136de342 100644
--- a/src/mame/drivers/atetris.c
+++ b/src/mame/drivers/atetris.c
@@ -403,11 +403,11 @@ static MACHINE_CONFIG_START( atetrisb2, atetris_state )
MCFG_SOUND_ADD("sn1", SN76496_NEW, BOOTLEG_CLOCK/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_SOUND_CONFIG(psg_intf)
-
+
MCFG_SOUND_ADD("sn2", SN76496_NEW, BOOTLEG_CLOCK/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_SOUND_CONFIG(psg_intf)
-
+
MCFG_SOUND_ADD("sn3", SN76496_NEW, BOOTLEG_CLOCK/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_SOUND_CONFIG(psg_intf)
diff --git a/src/mame/drivers/atronic.c b/src/mame/drivers/atronic.c
index 5347390eb6e..01160ad31f9 100644
--- a/src/mame/drivers/atronic.c
+++ b/src/mame/drivers/atronic.c
@@ -45,7 +45,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( atronic_portmap, AS_IO, 8, atronic_state )
-// ADDRESS_MAP_GLOBAL_MASK(0xff)
+// ADDRESS_MAP_GLOBAL_MASK(0xff)
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x00, 0x3f) AM_RAM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/bankp.c b/src/mame/drivers/bankp.c
index 93f94f3b796..a4c0733f692 100644
--- a/src/mame/drivers/bankp.c
+++ b/src/mame/drivers/bankp.c
@@ -325,11 +325,11 @@ static MACHINE_CONFIG_START( bankp, bankp_state )
MCFG_SOUND_ADD("sn1", SN76489_NEW, MASTER_CLOCK/6)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_SOUND_CONFIG(psg_intf)
-
+
MCFG_SOUND_ADD("sn2", SN76489_NEW, MASTER_CLOCK/6)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_SOUND_CONFIG(psg_intf)
-
+
MCFG_SOUND_ADD("sn3", SN76489_NEW, MASTER_CLOCK/6)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_SOUND_CONFIG(psg_intf)
diff --git a/src/mame/drivers/bfm_sc1.c b/src/mame/drivers/bfm_sc1.c
index 924cda13096..1ecf9b041fc 100644
--- a/src/mame/drivers/bfm_sc1.c
+++ b/src/mame/drivers/bfm_sc1.c
@@ -3109,10 +3109,10 @@ GAME( 198?, sc1barcda , sc1barcd , scorpion1_viper , clatt , bfm_sc1_state, lo
GAME( 198?, sc1bigmt , 0 , scorpion1_viper , clatt , bfm_sc1_state, nocrypt , 0, "BFM", "The Big Match (Bellfruit) (Scorpion 1)", GAME_FLAGS )
GAME( 198?, sc1calyp , 0 , scorpion1 , scorpion1 , bfm_sc1_state, lotse , 0, "BFM/ELAM", "Calypso (Bellfruit) (Dutch) (Scorpion 1)", GAME_FLAGS )
GAME( 198?, sc1carro , 0 , scorpion1 , scorpion1 , bfm_sc1_state, nocrypt_bank0 , 0, "BFM/ELAM", "Carrousel (Bellfruit) (Scorpion 1)", GAME_FLAGS )
-GAME( 198?, sc1cshat , 0 , scorpion1 , scorpion1 , bfm_sc1_state, lotse , 0, "BFM", "Cash Attraction (Bellfruit) (set 1) (Scorpion 1)", GAME_FLAGS )
-GAME( 198?, sc1cshata , sc1cshat , scorpion1 , scorpion1 , bfm_sc1_state, lotse , 0, "BFM", "Cash Attraction (Bellfruit) (set 2) (Scorpion 1)", GAME_FLAGS )
-GAME( 198?, sc1cshatb , sc1cshat , scorpion1 , scorpion1 , bfm_sc1_state, lotse , 0, "BFM", "Cash Attraction (Bellfruit) (set 3) (Scorpion 1)", GAME_FLAGS )
-GAME( 198?, sc1cshatc , sc1cshat , scorpion1 , scorpion1 , bfm_sc1_state, lotse , 0, "BFM", "Cash Attraction (Bellfruit) (set 4) (Scorpion 1)", GAME_FLAGS )
+GAME( 198?, sc1cshat , 0 , scorpion1 , scorpion1 , bfm_sc1_state, lotse , 0, "BFM", "Cash Attraction (Bellfruit) (set 1) (Scorpion 1)", GAME_FLAGS )
+GAME( 198?, sc1cshata , sc1cshat , scorpion1 , scorpion1 , bfm_sc1_state, lotse , 0, "BFM", "Cash Attraction (Bellfruit) (set 2) (Scorpion 1)", GAME_FLAGS )
+GAME( 198?, sc1cshatb , sc1cshat , scorpion1 , scorpion1 , bfm_sc1_state, lotse , 0, "BFM", "Cash Attraction (Bellfruit) (set 3) (Scorpion 1)", GAME_FLAGS )
+GAME( 198?, sc1cshatc , sc1cshat , scorpion1 , scorpion1 , bfm_sc1_state, lotse , 0, "BFM", "Cash Attraction (Bellfruit) (set 4) (Scorpion 1)", GAME_FLAGS )
GAME( 198?, sc1cshcd , 0 , scorpion1 , scorpion1 , bfm_sc1_state, lotse , 0, "BFM/ELAM", "Cash Card (Bellfruit) (Dutch) (Scorpion 1)", GAME_FLAGS )
GAME( 198?, sc1cshcda , sc1cshcd , scorpion1 , scorpion1 , bfm_sc1_state, lotse , 0, "BFM", "Cash Card (Bellfruit) (set 1) (Scorpion 1)", GAME_FLAGS )
diff --git a/src/mame/drivers/bfm_sc5.c b/src/mame/drivers/bfm_sc5.c
index ddf91f65869..9e1bb01c32f 100644
--- a/src/mame/drivers/bfm_sc5.c
+++ b/src/mame/drivers/bfm_sc5.c
@@ -31,7 +31,7 @@ protected:
// devices
required_device<cpu_device> m_maincpu;
-public:
+public:
DECLARE_DRIVER_INIT(sc5);
};
diff --git a/src/mame/drivers/bingo.c b/src/mame/drivers/bingo.c
index 02fe22e8b94..187c7ac56a2 100644
--- a/src/mame/drivers/bingo.c
+++ b/src/mame/drivers/bingo.c
@@ -19,7 +19,7 @@ protected:
// driver_device overrides
virtual void machine_reset();
-public:
+public:
DECLARE_DRIVER_INIT(bingo);
};
@@ -63,7 +63,7 @@ protected:
// driver_device overrides
virtual void machine_reset();
public:
- DECLARE_DRIVER_INIT(seeben);
+ DECLARE_DRIVER_INIT(seeben);
};
@@ -102,7 +102,7 @@ protected:
// driver_device overrides
virtual void machine_reset();
-public:
+public:
DECLARE_DRIVER_INIT(splin);
};
diff --git a/src/mame/drivers/blackt96.c b/src/mame/drivers/blackt96.c
index b5699481915..5e367af4dd0 100644
--- a/src/mame/drivers/blackt96.c
+++ b/src/mame/drivers/blackt96.c
@@ -88,8 +88,8 @@ public:
m_spriteram4(*this, "spriteram4"),
m_spriteram5(*this, "spriteram5"),
m_spriteram6(*this, "spriteram6"),
- m_spriteram7(*this, "spriteram7")
- {
+ m_spriteram7(*this, "spriteram7")
+ {
}
required_shared_ptr<UINT16> m_tilemapram;
@@ -186,7 +186,7 @@ static void draw_strip(running_machine &machine, bitmap_ind16 &bitmap, const rec
base += page * 2;
/* ---- ---- ---x xxxx
- xxxx ---y yyyy yyyy */
+ xxxx ---y yyyy yyyy */
int xx= ((state->m_spriteram[0][base+0]&0x001f)<<4) | (state->m_spriteram[0][base+1]&0xf000)>>12;
int yy = ((state->m_spriteram[0][base+1]&0x1ff));
@@ -202,7 +202,7 @@ static void draw_strip(running_machine &machine, bitmap_ind16 &bitmap, const rec
for (int y=0;y<32;y++)
{
/* -Xtt tttt tttt tttt
- ---- ---- cccc cccc */
+ ---- ---- cccc cccc */
UINT16 tile = (base2[y*2+1]&0x3fff);
UINT16 flipx = (base2[y*2+1]&0x4000);
diff --git a/src/mame/drivers/by17.c b/src/mame/drivers/by17.c
index 2da2370ccde..89220f61314 100644
--- a/src/mame/drivers/by17.c
+++ b/src/mame/drivers/by17.c
@@ -21,7 +21,7 @@ protected:
// driver_device overrides
virtual void machine_reset();
-public:
+public:
DECLARE_DRIVER_INIT(by17);
};
diff --git a/src/mame/drivers/by35.c b/src/mame/drivers/by35.c
index 41b7d8cbac6..ddc2e775dbe 100644
--- a/src/mame/drivers/by35.c
+++ b/src/mame/drivers/by35.c
@@ -21,7 +21,7 @@ protected:
// driver_device overrides
virtual void machine_reset();
-public:
+public:
DECLARE_DRIVER_INIT(by35);
};
diff --git a/src/mame/drivers/by6803.c b/src/mame/drivers/by6803.c
index 8cee62cdb95..b4a5945d77d 100644
--- a/src/mame/drivers/by6803.c
+++ b/src/mame/drivers/by6803.c
@@ -22,7 +22,7 @@ protected:
// driver_device overrides
virtual void machine_reset();
-public:
+public:
DECLARE_DRIVER_INIT(by6803);
};
diff --git a/src/mame/drivers/by68701.c b/src/mame/drivers/by68701.c
index 3da6e507c82..517166be1b3 100644
--- a/src/mame/drivers/by68701.c
+++ b/src/mame/drivers/by68701.c
@@ -17,7 +17,7 @@ protected:
// driver_device overrides
virtual void machine_reset();
-public:
+public:
DECLARE_DRIVER_INIT(by68701);
};
diff --git a/src/mame/drivers/capcom.c b/src/mame/drivers/capcom.c
index 65f56ffa208..bf548735782 100644
--- a/src/mame/drivers/capcom.c
+++ b/src/mame/drivers/capcom.c
@@ -21,7 +21,7 @@ protected:
// driver_device overrides
virtual void machine_reset();
-public:
+public:
DECLARE_DRIVER_INIT(capcom);
};
diff --git a/src/mame/drivers/chsuper.c b/src/mame/drivers/chsuper.c
index c7f541316d6..f6b0ba2c162 100644
--- a/src/mame/drivers/chsuper.c
+++ b/src/mame/drivers/chsuper.c
@@ -44,7 +44,7 @@ protected:
//virtual void machine_reset();
virtual void video_start();
-public:
+public:
DECLARE_DRIVER_INIT(chsuper3);
DECLARE_DRIVER_INIT(chmpnum);
DECLARE_DRIVER_INIT(chsuper2);
diff --git a/src/mame/drivers/cobra.c b/src/mame/drivers/cobra.c
index 25e28daa623..c08be83ee87 100644
--- a/src/mame/drivers/cobra.c
+++ b/src/mame/drivers/cobra.c
@@ -2,55 +2,55 @@
Games on this hardware
- ----------------------
-
- Game ID Year Notes
- -----------------------------------------------------------------------
- Fighting Bujutsu / Fighting Wu-Shu | G?645 | 1997 |
- Racing Jam DX | GY676 | 1997 | GY676-PWB(F) LAN board
-
-
- Hardware overview:
-
- COBRA/603 GN645-PWB(A) CPU Board
- ----------------------------------
- IBM PowerPC 603EV
- Motorola XPC105ARX66CD
-
- COBRA/403 GN645-PWB(B) SUB Board
- ----------------------------------
- IBM PowerPC 403GA-JC33C1 (32MHz)
- TI TMS57002
- Ricoh RF5c400
- M48T58-70PC1 Timekeeper
- ADC1038CIN A/D Converter
- 2x AM7203A(?) FIFO (2K x 9)
-
- COBRA/604 GN645-PWB(C) GFX Board
- ----------------------------------
- IBM PowerPC 604
- Motorola XPC105ARX66CD
- Toshiba TMP47P241VM MCU (internal ROM?)
- 4x CY7C4231 FIFO (2K x 9)
- Xilinx XC4300E FPGA
- Xilinx XC9536 FPGA
-
- GN645-PWB(D) Video Board (Also labeled IBM 36H3800. Seems to be related to the RS/6000 OpenGL accelerators.)
- -----------------------------------
- 89G9380 (Xilinx part with an IBM sticker)
- PKA0702
- PLA0702 (4 dies on the chip)
- RAA0800
- BTA0803
- 4x TOA2602
- Bt121KPJ80 RAMDAC
-
- GY676-PWB(F) LAN Board
- ----------------------
- Xilinx XC5210 FPGA
- Xilinx XC5204 FPGA
- Konami K001604 (2D tilemaps + 2x ROZ)
- Bt121KPC80 RAMDAC
+ ----------------------
+
+ Game ID Year Notes
+ -----------------------------------------------------------------------
+ Fighting Bujutsu / Fighting Wu-Shu | G?645 | 1997 |
+ Racing Jam DX | GY676 | 1997 | GY676-PWB(F) LAN board
+
+
+ Hardware overview:
+
+ COBRA/603 GN645-PWB(A) CPU Board
+ ----------------------------------
+ IBM PowerPC 603EV
+ Motorola XPC105ARX66CD
+
+ COBRA/403 GN645-PWB(B) SUB Board
+ ----------------------------------
+ IBM PowerPC 403GA-JC33C1 (32MHz)
+ TI TMS57002
+ Ricoh RF5c400
+ M48T58-70PC1 Timekeeper
+ ADC1038CIN A/D Converter
+ 2x AM7203A(?) FIFO (2K x 9)
+
+ COBRA/604 GN645-PWB(C) GFX Board
+ ----------------------------------
+ IBM PowerPC 604
+ Motorola XPC105ARX66CD
+ Toshiba TMP47P241VM MCU (internal ROM?)
+ 4x CY7C4231 FIFO (2K x 9)
+ Xilinx XC4300E FPGA
+ Xilinx XC9536 FPGA
+
+ GN645-PWB(D) Video Board (Also labeled IBM 36H3800. Seems to be related to the RS/6000 OpenGL accelerators.)
+ -----------------------------------
+ 89G9380 (Xilinx part with an IBM sticker)
+ PKA0702
+ PLA0702 (4 dies on the chip)
+ RAA0800
+ BTA0803
+ 4x TOA2602
+ Bt121KPJ80 RAMDAC
+
+ GY676-PWB(F) LAN Board
+ ----------------------
+ Xilinx XC5210 FPGA
+ Xilinx XC5204 FPGA
+ Konami K001604 (2D tilemaps + 2x ROZ)
+ Bt121KPC80 RAMDAC
*/
/*
@@ -107,169 +107,169 @@
- Bujutsu GL functions (603 board):
-
- ? : glDebugSwitch
- 0x0000b784: glBindTexture?
- 0x0000d40c: glEnable?
- 0x0000d7f4: glDisable?
- 0x0000d840: glAlphaFunc
- 0x0000d9a4: glNewList
- 0x0000dab0: glMatrixMode
- ? : glOrtho
- ? : glViewport
- 0x0000db6c: glIdentity?
- 0x0000dbf0: glFrustum
- ? : glCullFace
- ? : glClear
- ? : glCallList
- ? : glLightfv
- ? : glMaterialfv
- 0x0001b5c8: glBlendFunc
- 0x0001b8b0: glStencilOp
- ? : glStencilFunc
- 0x000471e0: glTexParameterf
- 0x0004a228: glColorMaterial
- ? : glFogfv
- ? : glFogf
- 0x0004a7a8: glDepthFunc
- 0x000508a8: glMaterialf
- 0x000508fc: glLightModelfv
- 0x00050a50: glTexEnvf
- ? : glTexEnvfv
- 0x00050cc8: ? (param 0xff) could be glStencilMask
- 0x00050d54: glFogi
- 0x00050da0: glHint
- 0x000cba6c: glTexParameteri
-
-
-
- GFX Registers:
-
- 0x00090: Viewport width / 2?
- 0x0009c: Viewport center X
- 0x000a4: Viewport height / 2?
- 0x000ac: Viewport center Y
-
- 0x00114: High word: framebuffer pitch? Low word: framebuffer pixel size?
-
- 0x00118: xxxxxxxx xxxxxxxx -------- -------- Framebuffer pixel read X pos
- -------- -------- xxxxxxxx xxxxxxxx Framebuffer pixel read Y pos
-
- 0x0011c: Same as above?
-
- 0x00458: Set to 0x02100000 (0xff) by texselect()
-
- 0x02904: -------- ------xx xx------ -------- Tex mag filter?
- -------- -------- --xxxx-- -------- Tex min filter?
-
- 0x02908: -------- ----xxx- -------- -------- Tex wrap S (0 = repeat, 1 = mirror, 2 = clamp)
- -------- -------x xx------ -------- Tex wrap T
-
- 0x02910: xxxx---- -------- -------- -------- Texture width shift (size = 1 << X)
- ----xxxx -------- -------- -------- Texture height shift (size = 1 << X)
- -------- ----x--- -------- -------- ?
- -------- -------- -x------ -------- ?
- -------- -------- -------- xxx----- Texture format (texel size, 2 = 4-bit, 3 = 8-bit, 4 = 16-bit)
- -------- -------- -------- ---xxx-- Texture format param
-
- 0x02914: --xxxxxx xxxxxxxx xx------ -------- ? (texture param, set to 0x1243)
-
- 0x40018: Set to 0x0001040a (0xc0) by mode_stipple() (bits 24..27 = stipple pattern?)
- 0x400d0: Set to 0x80000000 (0x80) by mode_stipple()
- 0x400f4: Set to 0x40000000 (0x80) by texselect()
-
- 0x40114: -------- ----x--- -------- -------- Scissor enable
-
- 0x40138: Set to 0x88800000 (0xe0) by mode_viewclip()
-
- 0x40160: xxxxxxxx xxxxxxxx -------- -------- Scissor Left
- -------- -------- xxxxxxxx xxxxxxxx Scissor Top
-
- 0x40164: xxxxxxxx xxxxxxxx -------- -------- Scissor Right
- -------- -------- xxxxxxxx xxxxxxxx Scissor Bottom
-
- 0x40170: xxxxxxxx xxxxxxxx -------- -------- Viewport Left
- -------- -------- xxxxxxxx xxxxxxxx Viewport Top
-
- 0x40174: xxxxxxxx xxxxxxxx -------- -------- Viewport Right
- -------- -------- xxxxxxxx xxxxxxxx Viewport Bottom
-
- 0x40198: x------- -------- -------- -------- Alpha test enable?
- -------- xxx----- -------- -------- Alpha test function (0 = never, 1 = less, 2 = lequal, 3 = greater,
- 4 = gequal, 5 = equal, 6 = notequal, 7 = always)
-
- 0x4019c: x------- -------- -------- -------- Fog enable
- ----x--- -------- -------- -------- 0 = table fog, 1 = linear fog
-
- 0x401bc: Texture env mode
- xxx----- -------- -------- -------- ?
- ---xxx-- -------- -------- -------- ?
-
- 0x8001c: (mask 0xfe) 0xc1d60060 = (not equal, 6) Stencil register
- 0xca9b0010 = (not equal, 1)
- 0x037dfff0 = (never)
- 0x2616fff0 = (greater)
- 0x459cfff0 = (greater/equal)
- 0x6672fff0 = (less)
- 0x8827fff0 = (less/equal)
- 0xa92b0100 = (equal, 16)
-
- -------- -------- xxxxxxxx xxxx---- Stencil reference value?
- xxx----- -------- -------- -------- Stencil function?
-
-
- 0x80020: -------- ----xxx- -------- -------- Depth test function (7 = always?)
-
- 0x80050: (mask 0x7c) 0x04445500 = (As, 1-As) Blend register
- 0x04111100 = (1, 1)
- 0x04441100 = (As, 1)
- 0x04114400 = (1, As)
- 0x04681100 = (Cd, 1)
- 0x04680000 = (Cd, 0)
- 0x04002400 = (0, Cs)
- 0x04e11100 = (Ad, 1-Ad)
- 0x04889900 = (pseudo-fog)
-
- -----x-- -------- -------- -------- Blend enable?
- -------- xxxx---- -------- -------- source factor?
- -------- ----xxxx -------- -------- source?
- -------- -------- xxxx---- -------- dest factor?
- -------- -------- ----xxxx -------- dest?
-
+ Bujutsu GL functions (603 board):
- 0x80054: Set to 0x02400000 (0xe0) by mode_stencilmod()
+ ? : glDebugSwitch
+ 0x0000b784: glBindTexture?
+ 0x0000d40c: glEnable?
+ 0x0000d7f4: glDisable?
+ 0x0000d840: glAlphaFunc
+ 0x0000d9a4: glNewList
+ 0x0000dab0: glMatrixMode
+ ? : glOrtho
+ ? : glViewport
+ 0x0000db6c: glIdentity?
+ 0x0000dbf0: glFrustum
+ ? : glCullFace
+ ? : glClear
+ ? : glCallList
+ ? : glLightfv
+ ? : glMaterialfv
+ 0x0001b5c8: glBlendFunc
+ 0x0001b8b0: glStencilOp
+ ? : glStencilFunc
+ 0x000471e0: glTexParameterf
+ 0x0004a228: glColorMaterial
+ ? : glFogfv
+ ? : glFogf
+ 0x0004a7a8: glDepthFunc
+ 0x000508a8: glMaterialf
+ 0x000508fc: glLightModelfv
+ 0x00050a50: glTexEnvf
+ ? : glTexEnvfv
+ 0x00050cc8: ? (param 0xff) could be glStencilMask
+ 0x00050d54: glFogi
+ 0x00050da0: glHint
+ 0x000cba6c: glTexParameteri
- 0x800a4: x------- -------- -------- -------- Logic op enable?
- -----xxx x------- -------- -------- Logic op (0 = clear, 1 = and, 2 = and reverse, 3 = copy,
- 4 = and inverted, 5 = noop, 6 = xor, 7 = or inverted,
- 8 = nor, 9 = equiv, 10 = invert, 11 = or reverse,
- 12 = copy inverted, 13 = or inverted, 14 = nand, 15 = set)
-
- 0x80114: (0xcc) by mode_colormask()
- 0x80118: (0xcc) by mode_colormask()
-
- 0x8011c: xxxxxxxx xxxx---- -------- -------- Stencil mask
-
- 0x80120: -------- -------- xxxxxxxx xxxxxxxx Depth mask register
-
- 0xc0c00..fff: Texture RAM readback
- 0xc3020: Start address for texram writes?
- 0xc3028: Reads address from texram?
- 0xc4c00..fff: Texture RAM readback
- 0xc8c00..fff: Texture RAM readback
- 0xccc00..fff: Texture RAM readback
+ GFX Registers:
- Bujutsu status:
+ 0x00090: Viewport width / 2?
+ 0x0009c: Viewport center X
+ 0x000a4: Viewport height / 2?
+ 0x000ac: Viewport center Y
+
+ 0x00114: High word: framebuffer pitch? Low word: framebuffer pixel size?
+
+ 0x00118: xxxxxxxx xxxxxxxx -------- -------- Framebuffer pixel read X pos
+ -------- -------- xxxxxxxx xxxxxxxx Framebuffer pixel read Y pos
+
+ 0x0011c: Same as above?
+
+ 0x00458: Set to 0x02100000 (0xff) by texselect()
+
+ 0x02904: -------- ------xx xx------ -------- Tex mag filter?
+ -------- -------- --xxxx-- -------- Tex min filter?
+
+ 0x02908: -------- ----xxx- -------- -------- Tex wrap S (0 = repeat, 1 = mirror, 2 = clamp)
+ -------- -------x xx------ -------- Tex wrap T
+
+ 0x02910: xxxx---- -------- -------- -------- Texture width shift (size = 1 << X)
+ ----xxxx -------- -------- -------- Texture height shift (size = 1 << X)
+ -------- ----x--- -------- -------- ?
+ -------- -------- -x------ -------- ?
+ -------- -------- -------- xxx----- Texture format (texel size, 2 = 4-bit, 3 = 8-bit, 4 = 16-bit)
+ -------- -------- -------- ---xxx-- Texture format param
+
+ 0x02914: --xxxxxx xxxxxxxx xx------ -------- ? (texture param, set to 0x1243)
+
+ 0x40018: Set to 0x0001040a (0xc0) by mode_stipple() (bits 24..27 = stipple pattern?)
+ 0x400d0: Set to 0x80000000 (0x80) by mode_stipple()
+ 0x400f4: Set to 0x40000000 (0x80) by texselect()
+
+ 0x40114: -------- ----x--- -------- -------- Scissor enable
+
+ 0x40138: Set to 0x88800000 (0xe0) by mode_viewclip()
+
+ 0x40160: xxxxxxxx xxxxxxxx -------- -------- Scissor Left
+ -------- -------- xxxxxxxx xxxxxxxx Scissor Top
+
+ 0x40164: xxxxxxxx xxxxxxxx -------- -------- Scissor Right
+ -------- -------- xxxxxxxx xxxxxxxx Scissor Bottom
+
+ 0x40170: xxxxxxxx xxxxxxxx -------- -------- Viewport Left
+ -------- -------- xxxxxxxx xxxxxxxx Viewport Top
+
+ 0x40174: xxxxxxxx xxxxxxxx -------- -------- Viewport Right
+ -------- -------- xxxxxxxx xxxxxxxx Viewport Bottom
+
+ 0x40198: x------- -------- -------- -------- Alpha test enable?
+ -------- xxx----- -------- -------- Alpha test function (0 = never, 1 = less, 2 = lequal, 3 = greater,
+ 4 = gequal, 5 = equal, 6 = notequal, 7 = always)
+
+ 0x4019c: x------- -------- -------- -------- Fog enable
+ ----x--- -------- -------- -------- 0 = table fog, 1 = linear fog
+
+ 0x401bc: Texture env mode
+ xxx----- -------- -------- -------- ?
+ ---xxx-- -------- -------- -------- ?
+
+ 0x8001c: (mask 0xfe) 0xc1d60060 = (not equal, 6) Stencil register
+ 0xca9b0010 = (not equal, 1)
+ 0x037dfff0 = (never)
+ 0x2616fff0 = (greater)
+ 0x459cfff0 = (greater/equal)
+ 0x6672fff0 = (less)
+ 0x8827fff0 = (less/equal)
+ 0xa92b0100 = (equal, 16)
+
+ -------- -------- xxxxxxxx xxxx---- Stencil reference value?
+ xxx----- -------- -------- -------- Stencil function?
+
+
+ 0x80020: -------- ----xxx- -------- -------- Depth test function (7 = always?)
+
+ 0x80050: (mask 0x7c) 0x04445500 = (As, 1-As) Blend register
+ 0x04111100 = (1, 1)
+ 0x04441100 = (As, 1)
+ 0x04114400 = (1, As)
+ 0x04681100 = (Cd, 1)
+ 0x04680000 = (Cd, 0)
+ 0x04002400 = (0, Cs)
+ 0x04e11100 = (Ad, 1-Ad)
+ 0x04889900 = (pseudo-fog)
+
+ -----x-- -------- -------- -------- Blend enable?
+ -------- xxxx---- -------- -------- source factor?
+ -------- ----xxxx -------- -------- source?
+ -------- -------- xxxx---- -------- dest factor?
+ -------- -------- ----xxxx -------- dest?
+
+
+ 0x80054: Set to 0x02400000 (0xe0) by mode_stencilmod()
+
+ 0x800a4: x------- -------- -------- -------- Logic op enable?
+ -----xxx x------- -------- -------- Logic op (0 = clear, 1 = and, 2 = and reverse, 3 = copy,
+ 4 = and inverted, 5 = noop, 6 = xor, 7 = or inverted,
+ 8 = nor, 9 = equiv, 10 = invert, 11 = or reverse,
+ 12 = copy inverted, 13 = or inverted, 14 = nand, 15 = set)
+
+ 0x80114: (0xcc) by mode_colormask()
+ 0x80118: (0xcc) by mode_colormask()
+
+ 0x8011c: xxxxxxxx xxxx---- -------- -------- Stencil mask
+
+ 0x80120: -------- -------- xxxxxxxx xxxxxxxx Depth mask register
+
+ 0xc0c00..fff: Texture RAM readback
+ 0xc3020: Start address for texram writes?
+ 0xc3028: Reads address from texram?
+ 0xc4c00..fff: Texture RAM readback
+ 0xc8c00..fff: Texture RAM readback
+ 0xccc00..fff: Texture RAM readback
+
+
+
+ Bujutsu status:
+
+ Main:
+ 0xe948 -> 0x1ea4(): Waiting for [0x168700] != 1 @ 0x1ebc
+
+ Gfx:
+ 0x3b1a0 -> 0x3ad70(): Waiting for [0x132000] != 0 @ 0x3adf4
- Main:
- 0xe948 -> 0x1ea4(): Waiting for [0x168700] != 1 @ 0x1ebc
-
- Gfx:
- 0x3b1a0 -> 0x3ad70(): Waiting for [0x132000] != 0 @ 0x3adf4
-
*/
@@ -511,15 +511,15 @@ public:
void cobra_renderer::render_color_scan(INT32 scanline, const extent_t &extent, const cobra_polydata &extradata, int threadid)
{
/*
- UINT32 *fb = &m_framebuffer->pix32(scanline);
+ UINT32 *fb = &m_framebuffer->pix32(scanline);
- UINT32 color = 0xffff0000; // TODO
+ UINT32 color = 0xffff0000; // TODO
- for (int x = extent.startx; x < extent.stopx; x++)
- {
- fb[x] = color;
- }
- */
+ for (int x = extent.startx; x < extent.stopx; x++)
+ {
+ fb[x] = color;
+ }
+ */
}
void cobra_renderer::render_texture_scan(INT32 scanline, const extent_t &extent, const cobra_polydata &extradata, int threadid)
@@ -881,7 +881,7 @@ void cobra_state::m2sfifo_event_callback(cobra_fifo::EventType event)
cpu_set_reg(m_subcpu, PPC_EXISR, cpu_get_reg(m_subcpu, PPC_EXISR) & ~0x10);
break;
}
-
+
case cobra_fifo::EVENT_HALF_FULL:
break;
@@ -896,7 +896,7 @@ void cobra_state::s2mfifo_event_callback(cobra_fifo::EventType event)
{
case cobra_fifo::EVENT_EMPTY:
break;
-
+
case cobra_fifo::EVENT_HALF_FULL:
break;
@@ -1251,13 +1251,13 @@ ADDRESS_MAP_END
// Interrupts:
-// Serial Transmit JVS
-// DMA0: Sound-related (TMS57002?)
-// DMA2: SCSI?
-// DMA3: JVS
-// External IRQ0 M2SFIFO
-// External IRQ1 S2MFIFO (mostly dummy, only disables the interrupt)
-// External IRQ2 SCSI Interrupt?
+// Serial Transmit JVS
+// DMA0: Sound-related (TMS57002?)
+// DMA2: SCSI?
+// DMA3: JVS
+// External IRQ0 M2SFIFO
+// External IRQ1 S2MFIFO (mostly dummy, only disables the interrupt)
+// External IRQ2 SCSI Interrupt?
//static int ucount = 0;
@@ -1318,7 +1318,7 @@ READ32_MEMBER(cobra_state::sub_mainbd_r)
// x M2S FIFO full flag
// x M2S FIFO empty flag
// x M2S FIFO half-full flag
- // x Comram page
+ // x Comram page
UINT32 value = 0x00;
value |= m_s2mfifo->is_full() ? 0x00 : 0x01;
@@ -1559,7 +1559,7 @@ static void sub_jvs_w(device_t *device, UINT8 data)
static ADDRESS_MAP_START( cobra_sub_map, AS_PROGRAM, 32, cobra_state )
AM_RANGE(0x00000000, 0x003fffff) AM_MIRROR(0x80000000) AM_RAM // Main RAM
AM_RANGE(0x70000000, 0x7003ffff) AM_MIRROR(0x80000000) AM_READWRITE(sub_comram_r, sub_comram_w) // Double buffered shared RAM between Main and Sub
-// AM_RANGE(0x78000000, 0x780000ff) AM_MIRROR(0x80000000) AM_NOP // SCSI controller (unused)
+// AM_RANGE(0x78000000, 0x780000ff) AM_MIRROR(0x80000000) AM_NOP // SCSI controller (unused)
AM_RANGE(0x78040000, 0x7804ffff) AM_MIRROR(0x80000000) AM_DEVREADWRITE16_LEGACY("rfsnd", rf5c400_r, rf5c400_w, 0xffffffff)
AM_RANGE(0x78080000, 0x7808000f) AM_MIRROR(0x80000000) AM_READWRITE(sub_ata0_r, sub_ata0_w)
AM_RANGE(0x780c0010, 0x780c001f) AM_MIRROR(0x80000000) AM_READWRITE(sub_ata1_r, sub_ata1_w)
@@ -1618,24 +1618,24 @@ void cobra_renderer::gfx_init(running_machine &machine)
cobra_state *cobra = machine.driver_data<cobra_state>();
m_gfx_gram = auto_alloc_array(machine, UINT32, 0x40000);
-
+
cobra->m_gfx_register = auto_alloc_array(machine, UINT64, 0x3000);
}
void cobra_renderer::gfx_exit(running_machine &machine)
{
/*
- FILE *file;
- file = fopen("texture_ram.bin","wb");
- for (int i=0; i < 0x100000; i++)
- {
- fputc((UINT8)(m_texture_ram[i] >> 24), file);
- fputc((UINT8)(m_texture_ram[i] >> 16), file);
- fputc((UINT8)(m_texture_ram[i] >> 8), file);
- fputc((UINT8)(m_texture_ram[i] >> 0), file);
- }
- fclose(file);
- */
+ FILE *file;
+ file = fopen("texture_ram.bin","wb");
+ for (int i=0; i < 0x100000; i++)
+ {
+ fputc((UINT8)(m_texture_ram[i] >> 24), file);
+ fputc((UINT8)(m_texture_ram[i] >> 16), file);
+ fputc((UINT8)(m_texture_ram[i] >> 8), file);
+ fputc((UINT8)(m_texture_ram[i] >> 0), file);
+ }
+ fclose(file);
+ */
}
void cobra_renderer::gfx_reset(running_machine &machine)
@@ -1737,7 +1737,7 @@ void cobra_renderer::gfx_fifo_exec(running_machine &machine)
w2 = cobra->m_gfx_re_command_word2;
}
-
+
switch ((w1 >> 24) & 0xff)
{
@@ -1850,19 +1850,19 @@ void cobra_renderer::gfx_fifo_exec(running_machine &machine)
// Draw graphics primitives
// 0x00: xxxx---- -------- -------- -------- Command
- // 0x00: ----xxxx -------- -------- -------- Primitive type (0 = triangle, 2 = point, 3 = line)
- // 0x00: -------- xx------ -------- -------- ?
- // 0x00: -------- -------- -------- xxxxxxxx Number of units (amount of bits is uncertain)
+ // 0x00: ----xxxx -------- -------- -------- Primitive type (0 = triangle, 2 = point, 3 = line)
+ // 0x00: -------- xx------ -------- -------- ?
+ // 0x00: -------- -------- -------- xxxxxxxx Number of units (amount of bits is uncertain)
//
// 0x01: -x------ -------- -------- -------- Has extra flags word (used by lines only)
// 0x01: --x----- -------- -------- -------- Has extra unknown float (seems to be fog-related?)
// 0x01: ---x---- -------- -------- -------- Always 1?
// 0x01: -------- xx------ -------- -------- ?
// 0x01: -------- --x----- -------- -------- Has texture coords
- // 0x01: -------- ---x---- -------- -------- ?
- // 0x01: -------- ----x--- -------- -------- ?
- // 0x01: -------- -------- ------xx xx------ ? (always set to 1s?)
- // 0x01: -------- -------- -------- -------x Has extra unknown float
+ // 0x01: -------- ---x---- -------- -------- ?
+ // 0x01: -------- ----x--- -------- -------- ?
+ // 0x01: -------- -------- ------xx xx------ ? (always set to 1s?)
+ // 0x01: -------- -------- -------- -------x Has extra unknown float
int i;
int num = 0;
@@ -1893,12 +1893,12 @@ void cobra_renderer::gfx_fifo_exec(running_machine &machine)
{
fifo_in->pop(NULL, &in);
}
-
+
if (w2 & 0x20000000) // unknown float (0.0f ... 1.0f)
{
fifo_in->pop(NULL, &in);
}
-
+
fifo_in->pop(NULL, &vert[i].x); // X coord
fifo_in->pop(NULL, &vert[i].y); // Y coord
fifo_in->pop(NULL, &in); // coord?
@@ -2015,7 +2015,7 @@ void cobra_renderer::gfx_fifo_exec(running_machine &machine)
case 0x0e0000: buffer = &m_overlay->pix32(y); break;
case 0x000800: buffer = &m_zbuffer->pix32(y); break;
case 0x000200: buffer = &m_stencil->pix32(y); break;
-
+
default:
{
fatalerror("gfxfifo_exec: fb write to buffer %08X!\n", m_gfx_gram[0x80100/4]);
@@ -2047,7 +2047,7 @@ void cobra_renderer::gfx_fifo_exec(running_machine &machine)
{
// Read a specified pixel position from a pixelbuffer
-// printf("GFX: FB read X: %d, Y: %d\n", (UINT16)(m_gfx_gram[0x118/4] >> 16), (UINT16)(m_gfx_gram[0x118/4]));
+// printf("GFX: FB read X: %d, Y: %d\n", (UINT16)(m_gfx_gram[0x118/4] >> 16), (UINT16)(m_gfx_gram[0x118/4]));
int x = (m_gfx_gram[0x118/4] >> 16) & 0xffff;
int y = m_gfx_gram[0x118/4] & 0xffff;
@@ -2060,7 +2060,7 @@ void cobra_renderer::gfx_fifo_exec(running_machine &machine)
case 0x0e0000: buffer = &m_overlay->pix32(y); break;
case 0x000800: buffer = &m_zbuffer->pix32(y); break;
case 0x000200: buffer = &m_stencil->pix32(y); break;
-
+
default:
{
fatalerror("gfxfifo_exec: fb read from buffer %08X!\n", m_gfx_gram[0x80100/4]);
@@ -2194,7 +2194,7 @@ void cobra_renderer::gfx_fifo_exec(running_machine &machine)
UINT32 ret = gfx_read_gram(reg);
fifo_out->push(NULL, ret);
- // printf("GFX: reg read %08X\n", reg);
+ // printf("GFX: reg read %08X\n", reg);
cobra->m_gfx_re_status = RE_STATUS_IDLE;
break;
@@ -2774,7 +2774,7 @@ DRIVER_INIT_MEMBER(cobra_state,bujutsu)
}
// hd patches
- // 0x18932c = 0x38600000 skips check_one_scene()
+ // 0x18932c = 0x38600000 skips check_one_scene()
}
DRIVER_INIT_MEMBER(cobra_state,racjamdx)
diff --git a/src/mame/drivers/cyclemb.c b/src/mame/drivers/cyclemb.c
index 18cf4094328..27ae54ce18c 100644
--- a/src/mame/drivers/cyclemb.c
+++ b/src/mame/drivers/cyclemb.c
@@ -1,14 +1,14 @@
/***************************************************************************************************
Cycle Maabou (c) 1984 Taito Corporation / Seta
- Sky Destroyer (c) 1985 Taito Corporation
+ Sky Destroyer (c) 1985 Taito Corporation
appears to be in the exact middle between the gsword / josvolly HW and the ppking / gladiator HW
driver by Angelo Salese
TODO:
- - inputs in Cycle Maabou;
+ - inputs in Cycle Maabou;
- sound (controlled by three i8741);
- add flipscreen;
- color prom resistor network is guessed;
@@ -108,8 +108,8 @@ public:
UINT16 m_dsw_pc_hack;
DECLARE_WRITE8_MEMBER(cyclemb_bankswitch_w);
-// DECLARE_READ8_MEMBER(mcu_status_r);
-// DECLARE_WRITE8_MEMBER(sound_cmd_w);
+// DECLARE_READ8_MEMBER(mcu_status_r);
+// DECLARE_WRITE8_MEMBER(sound_cmd_w);
DECLARE_WRITE8_MEMBER(cyclemb_flip_w);
DECLARE_READ8_MEMBER(skydest_i8741_0_r);
DECLARE_WRITE8_MEMBER(skydest_i8741_0_w);
@@ -317,7 +317,7 @@ static void skydest_draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, co
UINT16 spr_offs,i;
INT16 x,y;
-// popmessage("%d %d",state->m_obj2_ram[0x0d], 0xf1 - state->m_obj2_ram[0x0c+1] + 68);
+// popmessage("%d %d",state->m_obj2_ram[0x0d], 0xf1 - state->m_obj2_ram[0x0c+1] + 68);
for(i=0;i<0x80;i+=2)
{
@@ -336,7 +336,7 @@ static void skydest_draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, co
if(region == 2)
{
spr_offs >>= 2;
- // spr_offs += ((state->m_obj3_ram[i+0] & 3) << 5);
+ // spr_offs += ((state->m_obj3_ram[i+0] & 3) << 5);
x-=16;
}
@@ -939,7 +939,7 @@ static MACHINE_CONFIG_DERIVED( skydest, cyclemb )
MCFG_SCREEN_VISIBLE_AREA(2*8, 34*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_STATIC(skydest)
-// MCFG_PALETTE_INIT(skydest)
+// MCFG_PALETTE_INIT(skydest)
MACHINE_CONFIG_END
/***************************************************************************
@@ -998,11 +998,11 @@ ROM_START( skydest )
ROM_REGION( 0x10000, "sprite_data", ROMREGION_ERASEFF )
ROM_LOAD( "pd0-7.1k", 0x000000, 0x002000, CRC(83137d42) SHA1(7e35f28577d6bfeee184a0ac3095b478999d6477) ) //ok
- ROM_LOAD( "pd1-8.1l", 0x002000, 0x002000, CRC(b810858b) SHA1(385e625fc989a1dfa18559a62c99363b62c66a67) ) //ok
+ ROM_LOAD( "pd1-8.1l", 0x002000, 0x002000, CRC(b810858b) SHA1(385e625fc989a1dfa18559a62c99363b62c66a67) ) //ok
ROM_LOAD( "pd0-9.1m", 0x004000, 0x002000, CRC(6f558bee) SHA1(0539feaa848d6cfb9f90a46a851f73fb74e82676) ) //ok
ROM_LOAD( "pd1-10.1n", 0x006000, 0x002000, CRC(5840b5b5) SHA1(1b5b188023c4d3198402c946b8c5a51d7f512a07) )
ROM_LOAD( "pd0-11.1r", 0x008000, 0x002000, CRC(29e5fce4) SHA1(59748e3a192a45dce7920e8d5a7a11d5145915b0) ) //ok
- ROM_LOAD( "pd0-12.1s", 0x00a000, 0x002000, CRC(06234942) SHA1(1cc40a8c8e24ab6db1dc7dc88979be23b7a9cab6) )
+ ROM_LOAD( "pd0-12.1s", 0x00a000, 0x002000, CRC(06234942) SHA1(1cc40a8c8e24ab6db1dc7dc88979be23b7a9cab6) )
ROM_LOAD( "pd1-13.1t", 0x00c000, 0x002000, CRC(3cca5b95) SHA1(74baec7c128254c394dd3162df7abacf5ed5a99b) ) //ok
ROM_LOAD( "pd0-14.1u", 0x00e000, 0x002000, CRC(7ef05b01) SHA1(f36ad1c0dac201729def78dc18feacda8fcf1a3f) )
diff --git a/src/mame/drivers/de_1.c b/src/mame/drivers/de_1.c
index 59fce04c3ca..9c1f98997e1 100644
--- a/src/mame/drivers/de_1.c
+++ b/src/mame/drivers/de_1.c
@@ -21,7 +21,7 @@ protected:
// driver_device overrides
virtual void machine_reset();
-public:
+public:
DECLARE_DRIVER_INIT(de_1);
};
diff --git a/src/mame/drivers/de_2.c b/src/mame/drivers/de_2.c
index 202f597a377..6cf2e29493e 100644
--- a/src/mame/drivers/de_2.c
+++ b/src/mame/drivers/de_2.c
@@ -21,7 +21,7 @@ protected:
// driver_device overrides
virtual void machine_reset();
-public:
+public:
DECLARE_DRIVER_INIT(de_2);
};
diff --git a/src/mame/drivers/de_3.c b/src/mame/drivers/de_3.c
index 57f9a24aa6d..ad8fed0dad8 100644
--- a/src/mame/drivers/de_3.c
+++ b/src/mame/drivers/de_3.c
@@ -25,7 +25,7 @@ protected:
// driver_device overrides
virtual void machine_reset();
-public:
+public:
DECLARE_DRIVER_INIT(de_3);
};
diff --git a/src/mame/drivers/de_3b.c b/src/mame/drivers/de_3b.c
index 7690affc5ca..9bb8c49ad05 100644
--- a/src/mame/drivers/de_3b.c
+++ b/src/mame/drivers/de_3b.c
@@ -25,7 +25,7 @@ protected:
// driver_device overrides
virtual void machine_reset();
-public:
+public:
DECLARE_DRIVER_INIT(de_3b);
};
diff --git a/src/mame/drivers/deco32.c b/src/mame/drivers/deco32.c
index 49841cfcbc9..54e8f304422 100644
--- a/src/mame/drivers/deco32.c
+++ b/src/mame/drivers/deco32.c
@@ -906,7 +906,7 @@ static ADDRESS_MAP_START( lockload_map, AS_PROGRAM, 32, dragngun_state )
AM_RANGE(0x300000, 0x3fffff) AM_ROM
-// AM_RANGE(0x400000, 0x400003) AM_DEVREADWRITE8("oki3", okim6295_device, read, write, 0x000000ff)
+// AM_RANGE(0x400000, 0x400003) AM_DEVREADWRITE8("oki3", okim6295_device, read, write, 0x000000ff)
AM_RANGE(0x420000, 0x420003) AM_READWRITE(dragngun_eeprom_r, dragngun_eeprom_w)
// AM_RANGE(0x430000, 0x43001f) AM_WRITE(dragngun_lightgun_w)
// AM_RANGE(0x438000, 0x438003) AM_READ(dragngun_lightgun_r)
diff --git a/src/mame/drivers/deco_ld.c b/src/mame/drivers/deco_ld.c
index bd7a73e2458..bf32eefb778 100644
--- a/src/mame/drivers/deco_ld.c
+++ b/src/mame/drivers/deco_ld.c
@@ -153,13 +153,13 @@ static void draw_sprites(running_machine &machine, bitmap_rgb32 &bitmap, const r
int i,spr_offs,x,y,col,fx,fy;
/*
- [+0] ---- -x-- flip X
- [+0] ---- --x- flip Y
- [+0] ---- ---x enable this sprite
- [+1] tile number
- [+2] y coord
- [+3] x coord
- */
+ [+0] ---- -x-- flip X
+ [+0] ---- --x- flip Y
+ [+0] ---- ---x enable this sprite
+ [+1] tile number
+ [+2] y coord
+ [+3] x coord
+ */
for(i=0;i<0x20;i+=4)
{
@@ -464,7 +464,7 @@ static MACHINE_CONFIG_START( rblaster, deco_ld_state )
MCFG_CPU_PROGRAM_MAP(rblaster_sound_map)
MCFG_CPU_PERIODIC_INT(sound_interrupt, 640)
-// MCFG_QUANTUM_TIME(attotime::from_hz(6000))
+// MCFG_QUANTUM_TIME(attotime::from_hz(6000))
MCFG_LASERDISC_LDV1000_ADD("laserdisc") //Sony LDP-1000A, is it truly compatible with the Pioneer?
MCFG_LASERDISC_OVERLAY_STATIC(256, 256, rblaster)
diff --git a/src/mame/drivers/docastle.c b/src/mame/drivers/docastle.c
index 3b1ac5cd9f1..ac5d0b5b127 100644
--- a/src/mame/drivers/docastle.c
+++ b/src/mame/drivers/docastle.c
@@ -639,15 +639,15 @@ static MACHINE_CONFIG_START( docastle, docastle_state )
MCFG_SOUND_ADD("sn1", SN76489A_NEW, XTAL_4MHz)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_SOUND_CONFIG(psg_intf)
-
+
MCFG_SOUND_ADD("sn2", SN76489A_NEW, XTAL_4MHz)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_SOUND_CONFIG(psg_intf)
-
+
MCFG_SOUND_ADD("sn3", SN76489A_NEW, XTAL_4MHz)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_SOUND_CONFIG(psg_intf)
-
+
MCFG_SOUND_ADD("sn4", SN76489A_NEW, XTAL_4MHz)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_SOUND_CONFIG(psg_intf)
diff --git a/src/mame/drivers/drmicro.c b/src/mame/drivers/drmicro.c
index 9310c2f1518..22a2f27dd3c 100644
--- a/src/mame/drivers/drmicro.c
+++ b/src/mame/drivers/drmicro.c
@@ -296,11 +296,11 @@ static MACHINE_CONFIG_START( drmicro, drmicro_state )
MCFG_SOUND_ADD("sn2", SN76496_NEW, MCLK/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_SOUND_CONFIG(psg_intf)
-
+
MCFG_SOUND_ADD("sn3", SN76496_NEW, MCLK/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_SOUND_CONFIG(psg_intf)
-
+
MCFG_SOUND_ADD("msm", MSM5205, 384000)
MCFG_SOUND_CONFIG(msm5205_config)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
diff --git a/src/mame/drivers/ecoinfr.c b/src/mame/drivers/ecoinfr.c
index b2ffb9c590b..4ceba485368 100644
--- a/src/mame/drivers/ecoinfr.c
+++ b/src/mame/drivers/ecoinfr.c
@@ -967,7 +967,7 @@ EC_SBARX_SET( 199?, ec_sbarx__ax, ec_sbarx, "iss9401.rom", 0x0000, 0x00800
EC_SBARX_SET( 199?, ec_sbarx__ay, ec_sbarx, "iss9405.rom", 0x0000, 0x008000, CRC(6435586d) SHA1(95f2cda1bc80bb8f7c3d2d2b41abbfd634a88237), "Electrocoin","Super Bar X (Electrocoin) (set 62)" ) // from unknown set
/* No header (all 0x00) space for one tho */
EC_SBARX_SET( 199?, ec_sbarx__az, ec_sbarx, "iss129.rom", 0x0000, 0x008000, CRC(b4adae28) SHA1(5d747624dafc8d65fd3b49ff3649ad9973d9271b), "Electrocoin","Super Bar X (Electrocoin) (set 63)" ) // superbarx_issue129_10cash.bin, doesn't do port09 0x40 changed 40
-EC_SBARX_SET( 199?, ec_sbarx__a0, ec_sbarx, "superbarx_issue158_sitdown10cash.bin", 0x0000, 0x008000, CRC(80c2d523) SHA1(1252bf66987aa9ac610c3e9f0919f29a6ad6cc52), "Electrocoin","Super Bar X (Electrocoin) (set 64)" ) // ^^
+EC_SBARX_SET( 199?, ec_sbarx__a0, ec_sbarx, "superbarx_issue158_sitdown10cash.bin", 0x0000, 0x008000, CRC(80c2d523) SHA1(1252bf66987aa9ac610c3e9f0919f29a6ad6cc52), "Electrocoin","Super Bar X (Electrocoin) (set 64)" ) // ^^
EC_SBARX_SET( 199?, ec_sbarx__a1, ec_sbarx, "iss173.rom", 0x0000, 0x008000, CRC(984f9c18) SHA1(f160eeee6ea70c79502fc68f70cb973e1ca029b8), "Electrocoin","Super Bar X (Electrocoin) (set 65)" )
EC_SBARX_SET( 199?, ec_sbarx__a2, ec_sbarx, "iss2012.rom", 0x0000, 0x008000, CRC(455cfdcb) SHA1(53fb0748a544b432b88455fa597b7017e06b3059), "Electrocoin","Super Bar X (Electrocoin) (set 66)" )
EC_SBARX_SET( 199?, ec_sbarx__a3, ec_sbarx, "sbx5red", 0x0000, 0x008000, CRC(7991231a) SHA1(cd1978c48a3c214666d51ca930d3d480540448ec), "Electrocoin","Super Bar X (Electrocoin) (set 67)" )
diff --git a/src/mame/drivers/expro02.c b/src/mame/drivers/expro02.c
index ddf1cda40d2..1f11df82def 100644
--- a/src/mame/drivers/expro02.c
+++ b/src/mame/drivers/expro02.c
@@ -508,7 +508,7 @@ static TIMER_DEVICE_CALLBACK( expro02_scanline )
static MACHINE_RESET( galsnew )
{
-// expro02_state *state = machine.driver_data<expro02_state>();
+// expro02_state *state = machine.driver_data<expro02_state>();
}
/*************************************
diff --git a/src/mame/drivers/freekick.c b/src/mame/drivers/freekick.c
index 9c9d1057336..27555e5c9b0 100644
--- a/src/mame/drivers/freekick.c
+++ b/src/mame/drivers/freekick.c
@@ -659,15 +659,15 @@ static MACHINE_CONFIG_START( base, freekick_state )
MCFG_SOUND_ADD("sn1", SN76496_NEW, 12000000/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_SOUND_CONFIG(psg_intf)
-
+
MCFG_SOUND_ADD("sn2", SN76496_NEW, 12000000/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_SOUND_CONFIG(psg_intf)
-
+
MCFG_SOUND_ADD("sn3", SN76496_NEW, 12000000/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_SOUND_CONFIG(psg_intf)
-
+
MCFG_SOUND_ADD("sn4", SN76496_NEW, 12000000/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_SOUND_CONFIG(psg_intf)
diff --git a/src/mame/drivers/galpani3.c b/src/mame/drivers/galpani3.c
index 035efcc008b..9864beb04d4 100644
--- a/src/mame/drivers/galpani3.c
+++ b/src/mame/drivers/galpani3.c
@@ -199,7 +199,7 @@ static SCREEN_UPDATE_RGB32(galpani3)
bitmap.fill(0x0000, cliprect);
-// popmessage("%02x %02x", state->m_grap2_0->m_framebuffer_bright2, state->m_grap2_1->m_framebuffer_bright2);
+// popmessage("%02x %02x", state->m_grap2_0->m_framebuffer_bright2, state->m_grap2_1->m_framebuffer_bright2);
@@ -475,10 +475,10 @@ static ADDRESS_MAP_START( galpani3_map, AS_PROGRAM, 16, galpani3_state )
AM_RANGE(0x400000, 0x40ffff) AM_DEVREADWRITE( "toybox", kaneko_toybox_device, toybox_mcu_ram_r, toybox_mcu_ram_w ) // area [C]
- AM_RANGE(0x580000, 0x580001) AM_DEVWRITE( "toybox", kaneko_toybox_device, toybox_mcu_com0_w)
- AM_RANGE(0x600000, 0x600001) AM_DEVWRITE( "toybox", kaneko_toybox_device, toybox_mcu_com1_w)
- AM_RANGE(0x680000, 0x680001) AM_DEVWRITE( "toybox", kaneko_toybox_device, toybox_mcu_com2_w)
- AM_RANGE(0x700000, 0x700001) AM_DEVWRITE( "toybox", kaneko_toybox_device, toybox_mcu_com3_w)
+ AM_RANGE(0x580000, 0x580001) AM_DEVWRITE( "toybox", kaneko_toybox_device, toybox_mcu_com0_w)
+ AM_RANGE(0x600000, 0x600001) AM_DEVWRITE( "toybox", kaneko_toybox_device, toybox_mcu_com1_w)
+ AM_RANGE(0x680000, 0x680001) AM_DEVWRITE( "toybox", kaneko_toybox_device, toybox_mcu_com2_w)
+ AM_RANGE(0x700000, 0x700001) AM_DEVWRITE( "toybox", kaneko_toybox_device, toybox_mcu_com3_w)
AM_RANGE(0x780000, 0x780001) AM_DEVREAD( "toybox", kaneko_toybox_device, toybox_mcu_status_r)
GRAP2_AREA( 0x800000, "grap2_0" )
diff --git a/src/mame/drivers/galpanic.c b/src/mame/drivers/galpanic.c
index 6d751958531..da17b48d52c 100644
--- a/src/mame/drivers/galpanic.c
+++ b/src/mame/drivers/galpanic.c
@@ -574,12 +574,12 @@ static MACHINE_CONFIG_START( galpanic, galpanic_state )
MCFG_PALETTE_LENGTH(1024 + 32768)
MCFG_KANEKO_PANDORA_ADD("pandora", galpanic_pandora_config)
-
+
MCFG_DEVICE_ADD("calc1_mcu", KANEKO_HIT, 0)
kaneko_hit_device::set_type(*device, 0);
-
+
MCFG_PALETTE_INIT(galpanic)
MCFG_VIDEO_START(galpanic)
diff --git a/src/mame/drivers/gp_1.c b/src/mame/drivers/gp_1.c
index 0f26c8bcc22..3b991a2b502 100644
--- a/src/mame/drivers/gp_1.c
+++ b/src/mame/drivers/gp_1.c
@@ -21,7 +21,7 @@ protected:
// driver_device overrides
virtual void machine_reset();
-public:
+public:
DECLARE_DRIVER_INIT(gp_1);
};
diff --git a/src/mame/drivers/gp_2.c b/src/mame/drivers/gp_2.c
index c2aba19e5b5..1453670dfbe 100644
--- a/src/mame/drivers/gp_2.c
+++ b/src/mame/drivers/gp_2.c
@@ -21,7 +21,7 @@ protected:
// driver_device overrides
virtual void machine_reset();
-public:
+public:
DECLARE_DRIVER_INIT(gp_2);
};
diff --git a/src/mame/drivers/gts1.c b/src/mame/drivers/gts1.c
index b4f94dd1217..98686f705ec 100644
--- a/src/mame/drivers/gts1.c
+++ b/src/mame/drivers/gts1.c
@@ -21,7 +21,7 @@ protected:
// driver_device overrides
virtual void machine_reset();
-public:
+public:
DECLARE_DRIVER_INIT(gts1);
};
diff --git a/src/mame/drivers/gts3.c b/src/mame/drivers/gts3.c
index da6bef9b654..012ee26236f 100644
--- a/src/mame/drivers/gts3.c
+++ b/src/mame/drivers/gts3.c
@@ -21,7 +21,7 @@ protected:
// driver_device overrides
virtual void machine_reset();
-public:
+public:
DECLARE_DRIVER_INIT(gts3);
};
diff --git a/src/mame/drivers/gts80.c b/src/mame/drivers/gts80.c
index 25d986ff98d..039728163c3 100644
--- a/src/mame/drivers/gts80.c
+++ b/src/mame/drivers/gts80.c
@@ -23,7 +23,7 @@ protected:
// driver_device overrides
virtual void machine_reset();
-public:
+public:
DECLARE_DRIVER_INIT(gts80);
};
diff --git a/src/mame/drivers/gts80a.c b/src/mame/drivers/gts80a.c
index b449f73541f..57ccb027dfe 100644
--- a/src/mame/drivers/gts80a.c
+++ b/src/mame/drivers/gts80a.c
@@ -24,7 +24,7 @@ protected:
// driver_device overrides
virtual void machine_reset();
-public:
+public:
DECLARE_DRIVER_INIT(gts80a);
};
diff --git a/src/mame/drivers/gts80b.c b/src/mame/drivers/gts80b.c
index e3e42317bdd..7f00d5fca95 100644
--- a/src/mame/drivers/gts80b.c
+++ b/src/mame/drivers/gts80b.c
@@ -23,7 +23,7 @@ protected:
// driver_device overrides
virtual void machine_reset();
-public:
+public:
DECLARE_DRIVER_INIT(gts80b);
};
diff --git a/src/mame/drivers/hng64.c b/src/mame/drivers/hng64.c
index 61fd06719d6..c756c119353 100644
--- a/src/mame/drivers/hng64.c
+++ b/src/mame/drivers/hng64.c
@@ -624,7 +624,7 @@ WRITE32_MEMBER(hng64_state::hng64_sysregs_w)
hng64_do_dma(&space);
break;
//default:
- // printf("HNG64 writing to SYSTEM Registers 0x%08x == 0x%08x. (PC=%08x)\n", offset*4, m_sysregs[offset], cpu_get_pc(&space.device()));
+ // printf("HNG64 writing to SYSTEM Registers 0x%08x == 0x%08x. (PC=%08x)\n", offset*4, m_sysregs[offset], cpu_get_pc(&space.device()));
}
}
@@ -1716,26 +1716,26 @@ static const mips3_config vr4300_config =
void hng64_state::m_set_irq(UINT32 irq_vector)
{
/*
- TODO:
- - irq sources;
- - irq priority;
- - is there an irq mask mechanism?
- - is irq level cleared too when the irq acks?
-
- This is written with irqs DISABLED
- HNG64 writing to SYSTEM Registers 0x0000111c == 0x00000001. (PC=80009b54) 0 vblank irq
- HNG64 writing to SYSTEM Registers 0x0000111c == 0x00000002. (PC=80009b5c) 1
- HNG64 writing to SYSTEM Registers 0x0000111c == 0x00000004. (PC=80009b64) 2
- HNG64 writing to SYSTEM Registers 0x0000111c == 0x00000008. (PC=80009b6c) 3 (actually this is cleared even if it isn't fired?)
- HNG64 writing to SYSTEM Registers 0x0000111c == 0x00000200. (PC=80009b70) 9
- HNG64 writing to SYSTEM Registers 0x0000111c == 0x00000400. (PC=80009b78) 10
- HNG64 writing to SYSTEM Registers 0x0000111c == 0x00020000. (PC=80009b80) 17
- HNG64 writing to SYSTEM Registers 0x0000111c == 0x00000800. (PC=80009b88) 11 network irq? needed by xrally and roadedge
-
- samsho64 / samsho64_2 does this during running:
- HNG64 writing to SYSTEM Registers 0x0000111c == 0x00000000. (PC=800008fc) just checking?
- HNG64 writing to SYSTEM Registers 0x0000111c == 0x00000040. (PC=800008fc) <- most notably causes TLBL error in fatfurwa
- */
+ TODO:
+ - irq sources;
+ - irq priority;
+ - is there an irq mask mechanism?
+ - is irq level cleared too when the irq acks?
+
+ This is written with irqs DISABLED
+ HNG64 writing to SYSTEM Registers 0x0000111c == 0x00000001. (PC=80009b54) 0 vblank irq
+ HNG64 writing to SYSTEM Registers 0x0000111c == 0x00000002. (PC=80009b5c) 1
+ HNG64 writing to SYSTEM Registers 0x0000111c == 0x00000004. (PC=80009b64) 2
+ HNG64 writing to SYSTEM Registers 0x0000111c == 0x00000008. (PC=80009b6c) 3 (actually this is cleared even if it isn't fired?)
+ HNG64 writing to SYSTEM Registers 0x0000111c == 0x00000200. (PC=80009b70) 9
+ HNG64 writing to SYSTEM Registers 0x0000111c == 0x00000400. (PC=80009b78) 10
+ HNG64 writing to SYSTEM Registers 0x0000111c == 0x00020000. (PC=80009b80) 17
+ HNG64 writing to SYSTEM Registers 0x0000111c == 0x00000800. (PC=80009b88) 11 network irq? needed by xrally and roadedge
+
+ samsho64 / samsho64_2 does this during running:
+ HNG64 writing to SYSTEM Registers 0x0000111c == 0x00000000. (PC=800008fc) just checking?
+ HNG64 writing to SYSTEM Registers 0x0000111c == 0x00000040. (PC=800008fc) <- most notably causes TLBL error in fatfurwa
+ */
m_irq_pending |= irq_vector;
diff --git a/src/mame/drivers/ikki.c b/src/mame/drivers/ikki.c
index 8de661fa229..2d8ec159431 100644
--- a/src/mame/drivers/ikki.c
+++ b/src/mame/drivers/ikki.c
@@ -207,8 +207,8 @@ GFXDECODE_END
* Sound definitions
*
*************************************/
-
-
+
+
//-------------------------------------------------
// sn76496_config psg_intf
//-------------------------------------------------
diff --git a/src/mame/drivers/intrscti.c b/src/mame/drivers/intrscti.c
index 1f3db7f3c08..0cd21d65953 100644
--- a/src/mame/drivers/intrscti.c
+++ b/src/mame/drivers/intrscti.c
@@ -23,7 +23,7 @@ public:
m_vram(*this, "vram"){ }
required_shared_ptr<UINT8> m_vram;
-// DECLARE_READ8_MEMBER(unk_r);
+// DECLARE_READ8_MEMBER(unk_r);
DECLARE_DRIVER_INIT(intrscti);
};
@@ -202,8 +202,8 @@ DRIVER_INIT_MEMBER(intrscti_state,intrscti)
cpu[i+0x8000]=0xc9; // ret
/*
- 0x8208 -> string copy
- */
+ 0x8208 -> string copy
+ */
/* one of the protection sub-routines does this */
for (i=0;i<0x400;i++)
diff --git a/src/mame/drivers/invqix.c b/src/mame/drivers/invqix.c
index 553472774f1..7f22fad1918 100644
--- a/src/mame/drivers/invqix.c
+++ b/src/mame/drivers/invqix.c
@@ -72,10 +72,10 @@ as well as Up Right, Cocktail or Flip Screen from the service menu.
400000-400003: OKI M9810
600000-61ffff: VRAM
620000-620005: video registers
-
+
I/O map:
port 1: player 2 inputs
-
+
port 2 bit 3: must be "1" to avoid SERVICE ERROR
port 2 bit 6: FPGA chip select
port 2 bit 7: FPGA clock in
@@ -86,9 +86,9 @@ as well as Up Right, Cocktail or Flip Screen from the service menu.
port 3 bit 3: EEPROM clock
port 3 bit 4: EEPROM data to EEPROM
port 3 bit 5: EEPROM data from EEPROM
-
+
port 4: player 1 inputs
-
+
port 6 bit 3: FPGA data bit in
port G bit 0: watchdog (toggled each frame)
@@ -273,8 +273,8 @@ static ADDRESS_MAP_START(invqix_io_map, AS_IO, 8, invqix_state)
AM_RANGE(H8_PORT_2, H8_PORT_2) AM_READ_PORT("SYSTEM") AM_WRITENOP
AM_RANGE(H8_PORT_3, H8_PORT_3) AM_READWRITE(port3_r, port3_w)
AM_RANGE(H8_PORT_4, H8_PORT_4) AM_READ_PORT("P4")
- AM_RANGE(H8_PORT_5, H8_PORT_5) AM_READWRITE(port5_r, port5_w)
- AM_RANGE(H8_PORT_6, H8_PORT_6) AM_READWRITE(port6_r, port6_w)
+ AM_RANGE(H8_PORT_5, H8_PORT_5) AM_READWRITE(port5_r, port5_w)
+ AM_RANGE(H8_PORT_6, H8_PORT_6) AM_READWRITE(port6_r, port6_w)
AM_RANGE(H8_PORT_A, H8_PORT_A) AM_READ(porta_r)
AM_RANGE(H8_PORT_G, H8_PORT_G) AM_READ(portg_r) AM_WRITENOP
ADDRESS_MAP_END
@@ -297,9 +297,9 @@ static INPUT_PORTS_START( invqix )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START4 ) PORT_NAME("Right 2 players start") // start B-2
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START4 ) PORT_NAME("Right 2 players start") // start B-2
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
-
+
PORT_START("P4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
diff --git a/src/mame/drivers/itgambl2.c b/src/mame/drivers/itgambl2.c
index 763e4b16ce7..69d93f95df5 100644
--- a/src/mame/drivers/itgambl2.c
+++ b/src/mame/drivers/itgambl2.c
@@ -936,7 +936,7 @@ GAME( 200?, millsun, 0, itgambl2, itgambl2, driver_device, 0, ROT0, "<un
GAME( 200?, sspac2k1, 0, itgambl2, itgambl2, driver_device, 0, ROT0, "<unknown>", "Super Space 2001", GAME_IS_SKELETON )
GAME( 200?, elvis, 0, itgambl2, itgambl2, driver_device, 0, ROT0, "<unknown>", "Elvis?", GAME_IS_SKELETON )
GAME( 200?, sstar, 0, itgambl2, itgambl2, driver_device, 0, ROT0, "<unknown>", "Super Star", GAME_IS_SKELETON )
-GAME( 2001, pirati, 0, itgambl2, itgambl2, driver_device, 0, ROT0, "Cin", "Pirati", GAME_IS_SKELETON )
+GAME( 2001, pirati, 0, itgambl2, itgambl2, driver_device, 0, ROT0, "Cin", "Pirati", GAME_IS_SKELETON )
GAME( 200?, mnumitg, 0, itgambl2, itgambl2, driver_device, 0, ROT0, "<unknown>", "Magic Number (Italian Gambling Game, Ver 1.5)", GAME_IS_SKELETON )
GAME( 200?, mclass, 0, itgambl2, itgambl2, driver_device, 0, ROT0, "<unknown>", "Magic Class (Ver 2.2)", GAME_IS_SKELETON )
GAME( 200?, europass, 0, itgambl2, itgambl2, driver_device, 0, ROT0, "<unknown>", "Euro Pass (Ver 1.1)", GAME_IS_SKELETON )
diff --git a/src/mame/drivers/jailbrek.c b/src/mame/drivers/jailbrek.c
index 7ac350db7a4..9c142eb4a07 100644
--- a/src/mame/drivers/jailbrek.c
+++ b/src/mame/drivers/jailbrek.c
@@ -242,8 +242,8 @@ GFXDECODE_END
* Sound definitions
*
*************************************/
-
-
+
+
//-------------------------------------------------
// sn76496_config psg_intf
//-------------------------------------------------
@@ -296,7 +296,7 @@ static MACHINE_CONFIG_START( jailbrek, jailbrek_state )
MCFG_SOUND_ADD("snsnd", SN76489A_NEW, MASTER_CLOCK/12)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_SOUND_CONFIG(psg_intf)
-
+
MCFG_SOUND_ADD("vlm", VLM5030, VOICE_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/jantotsu.c b/src/mame/drivers/jantotsu.c
index 39dee129d86..45cfe59573c 100644
--- a/src/mame/drivers/jantotsu.c
+++ b/src/mame/drivers/jantotsu.c
@@ -542,11 +542,11 @@ static MACHINE_CONFIG_START( jantotsu, jantotsu_state )
MCFG_SOUND_ADD("sn1", SN76489A_NEW, MAIN_CLOCK/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_SOUND_CONFIG(psg_intf)
-
+
MCFG_SOUND_ADD("sn2", SN76489A_NEW, MAIN_CLOCK/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_SOUND_CONFIG(psg_intf)
-
+
MCFG_SOUND_ADD("adpcm", MSM5205, XTAL_384kHz)
MCFG_SOUND_CONFIG(msm5205_config)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
diff --git a/src/mame/drivers/jchan.c b/src/mame/drivers/jchan.c
index afdf94596ce..33397f4444f 100644
--- a/src/mame/drivers/jchan.c
+++ b/src/mame/drivers/jchan.c
@@ -441,11 +441,11 @@ static ADDRESS_MAP_START( jchan_main, AS_PROGRAM, 16, jchan_state )
AM_RANGE(0x000000, 0x1fffff) AM_ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM // Work RAM - [A] grid tested, cleared ($9d6-$a54)
- AM_RANGE(0x300000, 0x30ffff) AM_DEVREADWRITE( "toybox", kaneko_toybox_device, toybox_mcu_ram_r, toybox_mcu_ram_w )// [G] MCU share
- AM_RANGE(0x330000, 0x330001) AM_DEVWRITE( "toybox", kaneko_toybox_device, toybox_mcu_com0_w)
- AM_RANGE(0x340000, 0x340001) AM_DEVWRITE( "toybox", kaneko_toybox_device, toybox_mcu_com1_w)
- AM_RANGE(0x350000, 0x350001) AM_DEVWRITE( "toybox", kaneko_toybox_device, toybox_mcu_com2_w)
- AM_RANGE(0x360000, 0x360001) AM_DEVWRITE( "toybox", kaneko_toybox_device, toybox_mcu_com3_w)
+ AM_RANGE(0x300000, 0x30ffff) AM_DEVREADWRITE( "toybox", kaneko_toybox_device, toybox_mcu_ram_r, toybox_mcu_ram_w )// [G] MCU share
+ AM_RANGE(0x330000, 0x330001) AM_DEVWRITE( "toybox", kaneko_toybox_device, toybox_mcu_com0_w)
+ AM_RANGE(0x340000, 0x340001) AM_DEVWRITE( "toybox", kaneko_toybox_device, toybox_mcu_com1_w)
+ AM_RANGE(0x350000, 0x350001) AM_DEVWRITE( "toybox", kaneko_toybox_device, toybox_mcu_com2_w)
+ AM_RANGE(0x360000, 0x360001) AM_DEVWRITE( "toybox", kaneko_toybox_device, toybox_mcu_com3_w)
AM_RANGE(0x370000, 0x370001) AM_DEVREAD( "toybox", kaneko_toybox_device, toybox_mcu_status_r)
AM_RANGE(0x400000, 0x403fff) AM_RAM AM_SHARE("mainsub_shared")
diff --git a/src/mame/drivers/jclub2.c b/src/mame/drivers/jclub2.c
index cd1c48a973e..a1f8e72b2fb 100644
--- a/src/mame/drivers/jclub2.c
+++ b/src/mame/drivers/jclub2.c
@@ -6,7 +6,7 @@
various hardware revisions
all use a MC68EC020FG16 CPU
- extra customs
+ extra customs
jclub2 : SETA ST-0032 (video + sound? **1), SETA ST-0013, SETA ST-0017 ( PCB E79-001 rev 01a )
jclub2o : SETA ST-0020 (video), SETA ST-0016 (sound + video? **2), SETA ST-0013, SETA ST-0017 ( E06-00409 / E06-00407 )
@@ -26,7 +26,7 @@
**1 ST-0032 seems to be similar to ST-0020 but the ram / list formats aren't the same, maybe it handles sound as there doesn't
seem to be any other dedicated sound chip
- **2 ST-0016 video functionality is probably not used
+ **2 ST-0016 video functionality is probably not used
@@ -883,7 +883,7 @@ Main CPU : MC68EC020FG16
Graphics : SETA ST-0032 70C600JF505
-Others :
+Others :
SETA ST-0013
SETA ST-0017
@@ -1001,14 +1001,14 @@ DRIVER_INIT_MEMBER(darkhors_state,darkhors)
// is there a way (key sequence) to reprogram it??
// I bet the original sets need similar get further in their boot sequence
UINT8 *eeprom = (UINT8 *) machine().root_device().memregion("eeprom")->base();
- if (eeprom != NULL)
+ if (eeprom != NULL)
{
size_t len = machine().root_device().memregion("eeprom")->bytes();
UINT8* temp = (UINT8*)auto_alloc_array(machine(), UINT8, len);
int i;
for (i = 0; i < len; i++)
temp[i] = eeprom[BITSWAP8(i,7,5,4,3,2,1,0,6)];
-
+
memcpy(eeprom, temp, len);
auto_free(machine(), temp);
}
diff --git a/src/mame/drivers/jpmimpct.c b/src/mame/drivers/jpmimpct.c
index 3928dfbce9a..416df27534e 100644
--- a/src/mame/drivers/jpmimpct.c
+++ b/src/mame/drivers/jpmimpct.c
@@ -5479,7 +5479,7 @@ DRIVER_INIT_MEMBER(jpmimpct_state,j6fbcrz)
GAME( 1995, cluedo, 0, jpmimpct, cluedo, driver_device, 0, ROT0, "JPM", "Cluedo (prod. 2D)", GAME_IMPERFECT_GRAPHICS | GAME_SUPPORTS_SAVE )
GAME( 1995, cluedod, cluedo, jpmimpct, cluedo, driver_device, 0, ROT0, "JPM", "Cluedo (prod. 2D) (Protocol)",GAME_IMPERFECT_GRAPHICS | GAME_SUPPORTS_SAVE )
GAME( 1995, cluedo2c, cluedo, jpmimpct, cluedo, driver_device, 0, ROT0, "JPM", "Cluedo (prod. 2C)", GAME_IMPERFECT_GRAPHICS | GAME_SUPPORTS_SAVE )
-GAME( 1995, cluedo2, cluedo, jpmimpct, cluedo, driver_device, 0, ROT0, "JPM", "Cluedo (prod. 2)", GAME_IMPERFECT_GRAPHICS | GAME_SUPPORTS_SAVE )
+GAME( 1995, cluedo2, cluedo, jpmimpct, cluedo, driver_device, 0, ROT0, "JPM", "Cluedo (prod. 2)", GAME_IMPERFECT_GRAPHICS | GAME_SUPPORTS_SAVE )
GAME( 1996, trivialp, 0, jpmimpct, trivialp, driver_device, 0, ROT0, "JPM", "Trivial Pursuit (New Edition) (prod. 1D)", GAME_SUPPORTS_SAVE )
GAME( 1996, trivialpd,trivialp,jpmimpct, trivialp, driver_device, 0, ROT0, "JPM", "Trivial Pursuit (New Edition) (prod. 1D) (Protocol)",GAME_SUPPORTS_SAVE )
GAME( 1996, trivialpo,trivialp,jpmimpct, trivialp, driver_device, 0, ROT0, "JPM", "Trivial Pursuit", GAME_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/kncljoe.c b/src/mame/drivers/kncljoe.c
index 26eae1bfb43..cfd15950ed9 100644
--- a/src/mame/drivers/kncljoe.c
+++ b/src/mame/drivers/kncljoe.c
@@ -235,8 +235,8 @@ GFXDECODE_END
* Sound interface
*
*************************************/
-
-
+
+
//-------------------------------------------------
// sn76496_config psg_intf
//-------------------------------------------------
@@ -327,7 +327,7 @@ static MACHINE_CONFIG_START( kncljoe, kncljoe_state )
MCFG_SOUND_ADD("sn1", SN76489_NEW, XTAL_3_579545MHz) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MCFG_SOUND_CONFIG(psg_intf)
-
+
MCFG_SOUND_ADD("sn2", SN76489_NEW, XTAL_3_579545MHz) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MCFG_SOUND_CONFIG(psg_intf)
diff --git a/src/mame/drivers/konamim2.c b/src/mame/drivers/konamim2.c
index f6c76ee049f..88ae13a902f 100644
--- a/src/mame/drivers/konamim2.c
+++ b/src/mame/drivers/konamim2.c
@@ -1314,4 +1314,4 @@ GAME( 1998, evilngt, 0, m2, m2, konamim2_state, m2, ROT0, "Konami", "Evi
GAME( 1998, evilngte, evilngt, m2, m2, konamim2_state, m2, ROT0, "Konami", "Evil Night (ver EAA)", GAME_NOT_WORKING | GAME_NO_SOUND )
GAME( 1998, hellngt, evilngt, m2, m2, konamim2_state, m2, ROT0, "Konami", "Hell Night (ver EAA)", GAME_NOT_WORKING | GAME_NO_SOUND )
-CONS( 199?, 3do_m2, 0, 0, m2, m2, driver_device, 0, "3DO", "3DO M2", GAME_NOT_WORKING | GAME_NO_SOUND )
+CONS( 199?, 3do_m2, 0, 0, m2, m2, driver_device, 0, "3DO", "3DO M2", GAME_NOT_WORKING | GAME_NO_SOUND )
diff --git a/src/mame/drivers/kontest.c b/src/mame/drivers/kontest.c
index bf3a4360872..ead408ef830 100644
--- a/src/mame/drivers/kontest.c
+++ b/src/mame/drivers/kontest.c
@@ -221,8 +221,8 @@ INPUT_PORTS_END
* Sound interface
*
*************************************/
-
-
+
+
//-------------------------------------------------
// sn76496_config psg_intf
//-------------------------------------------------
@@ -282,7 +282,7 @@ static MACHINE_CONFIG_START( kontest, kontest_state )
MCFG_SOUND_ADD("sn1", SN76489A_NEW, MAIN_CLOCK/16)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MCFG_SOUND_CONFIG(psg_intf)
-
+
MCFG_SOUND_ADD("sn2", SN76489A_NEW, MAIN_CLOCK/16)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
MCFG_SOUND_CONFIG(psg_intf)
diff --git a/src/mame/drivers/ladybug.c b/src/mame/drivers/ladybug.c
index 5ec953cd7da..8f5ed2c3dee 100644
--- a/src/mame/drivers/ladybug.c
+++ b/src/mame/drivers/ladybug.c
@@ -714,8 +714,8 @@ GFXDECODE_END
* Sound interface
*
*************************************/
-
-
+
+
//-------------------------------------------------
// sn76496_config psg_intf
//-------------------------------------------------
diff --git a/src/mame/drivers/markham.c b/src/mame/drivers/markham.c
index 061ed0156e2..1465c358b90 100644
--- a/src/mame/drivers/markham.c
+++ b/src/mame/drivers/markham.c
@@ -177,8 +177,8 @@ GFXDECODE_END
* Sound interface
*
*************************************/
-
-
+
+
//-------------------------------------------------
// sn76496_config psg_intf
//-------------------------------------------------
@@ -222,7 +222,7 @@ static MACHINE_CONFIG_START( markham, markham_state )
MCFG_SOUND_ADD("sn1", SN76496_NEW, 8000000/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MCFG_SOUND_CONFIG(psg_intf)
-
+
MCFG_SOUND_ADD("sn2", SN76496_NEW, 8000000/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MCFG_SOUND_CONFIG(psg_intf)
diff --git a/src/mame/drivers/maygayep.c b/src/mame/drivers/maygayep.c
index 70047cd4b83..a166dce1da5 100644
--- a/src/mame/drivers/maygayep.c
+++ b/src/mame/drivers/maygayep.c
@@ -62,9 +62,9 @@ INPUT_PORTS_END
/* in many sets the 0x100 - 0x1ff area contains revision information
and sometimes bugfix notes..
- in other sets 0x200 - 0x204 contains 'bank' or 'reels' maybe to
+ in other sets 0x200 - 0x204 contains 'bank' or 'reels' maybe to
indicate if the roms are for a topbox or the player unit?
-
+
there doesn't seem to be a hard defined standard for this header
information, it probably varies between manufacturer
@@ -349,7 +349,7 @@ ROM_START( ep_wipeoe )
ROM_LOAD16_BYTE( "i00pwo17.g1", 0x000001, 0x020000, CRC(026c77ac) SHA1(deee91163e955dcc58d78fb3bad266dbf8036913) )
EP_WIPEO_SOUND
ROM_END
-
+
#define EP_FUNNY_SOUND \
ROM_REGION( 0x100000, "ymz", 0 ) \
@@ -1641,7 +1641,7 @@ ROM_START( ep_cfall )
ROM_LOAD16_BYTE( "sa980008.g1", 0x00001, 0x020000, CRC(8366da15) SHA1(a7ca77ba8297df24e8f008844e25935848528613) )
EP_CFALL_SOUND
ROM_END
-
+
ROM_START( ep_cfalla )
ROM_REGION( 0x080000, "maincpu", 0 )
ROM_LOAD16_BYTE( "sa980170.g0", 0x00000, 0x020000, CRC(3625c374) SHA1(9559516ed6b3612749615ddc7638b0a26648d9e7) )
@@ -1920,7 +1920,7 @@ ROM_START( ep_mario )
ROM_LOAD16_BYTE( "970024g1", 0x00001, 0x020000, CRC(968cac01) SHA1(de032081acdbd7242cde168a0c70d87233cb6b48) )
EP_MARIO_SOUND
ROM_END
-
+
ROM_START( ep_marioa )
ROM_REGION( 0x080000, "maincpu", 0 )
ROM_LOAD16_BYTE( "970025g0", 0x00000, 0x020000, CRC(f2b71e7c) SHA1(b06f4fcc97b57b6ae4bbdaa7e99224c9af2d62df) )
@@ -2151,7 +2151,7 @@ ROM_START( ep_25crt )
ROM_LOAD16_BYTE( "1ba6.1g1", 0x000001, 0x020000, CRC(fcac8e99) SHA1(a5aeec7ba1415525ac57427c8eca2309377d1a42) )
EP_25CRT_SOUND
ROM_END
-
+
ROM_START( ep_25crta )
ROM_REGION( 0x080000, "maincpu", 0 )
ROM_LOAD16_BYTE( "msb02029.g0", 0x000000, 0x020000, CRC(0062a16b) SHA1(0025bca547826e47f27965284a6b9f5fe9394dc3) )
@@ -2858,7 +2858,7 @@ ROM_START( ep_fortg )
ROM_LOAD16_BYTE( "f_n_gl.g1", 0x000001, 0x020000, CRC(c35cbb80) SHA1(401e81a8ec2c23b3494f4603a4f9f6fb5f83c4dd) )
EP_FORTG_SOUND
ROM_END
-
+
ROM_START( ep_fortga )
ROM_REGION( 0x080000, "maincpu", 0 )
ROM_LOAD16_BYTE( "i01nfg35.g0", 0x000000, 0x020000, CRC(99fd5271) SHA1(331ae4edafb13caae93a2a4e3f9bc53a56a081fa) )
@@ -5913,7 +5913,7 @@ ROM_START( ep_fullm )
ROM_LOAD16_BYTE( "i00pff19.g3", 0x040001, 0x020000, CRC(d34de35f) SHA1(cc144e67153a329034cc54673c7c363c94be1b61) )
EP_FULLM_SOUND
ROM_END
-
+
ROM_START( ep_fullma )
ROM_REGION( 0x080000, "maincpu", 0 )
ROM_LOAD16_BYTE( "i00nff14.g0", 0x000000, 0x020000, CRC(825e2004) SHA1(5462c5b813799409ab44161b40fbf8ae00736444) )
diff --git a/src/mame/drivers/micropin.c b/src/mame/drivers/micropin.c
index 54ab6866c8e..038cb03ec44 100644
--- a/src/mame/drivers/micropin.c
+++ b/src/mame/drivers/micropin.c
@@ -17,7 +17,7 @@ protected:
// driver_device overrides
virtual void machine_reset();
-public:
+public:
DECLARE_DRIVER_INIT(micropin);
};
diff --git a/src/mame/drivers/midvunit.c b/src/mame/drivers/midvunit.c
index aca3c5a3719..cac3450b983 100644
--- a/src/mame/drivers/midvunit.c
+++ b/src/mame/drivers/midvunit.c
@@ -1755,7 +1755,7 @@ void midvunit_state::init_crusnwld_common(offs_t speedup)
m_generic_speedup = machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(speedup, speedup + 1, read32_delegate(FUNC(midvunit_state::generic_speedup_r),this));
}
DRIVER_INIT_MEMBER(midvunit_state,crusnwld) { init_crusnwld_common(0xd4c0); }
-#if 0
+#if 0
DRIVER_INIT_MEMBER(midvunit_state,crusnw20) { init_crusnwld_common(0xd49c); }
DRIVER_INIT_MEMBER(midvunit_state,crusnw13) { init_crusnwld_common(0); }
#endif
diff --git a/src/mame/drivers/mikie.c b/src/mame/drivers/mikie.c
index 301b1445887..8c707aa4cfe 100644
--- a/src/mame/drivers/mikie.c
+++ b/src/mame/drivers/mikie.c
@@ -229,8 +229,8 @@ GFXDECODE_END
* Sound interface
*
*************************************/
-
-
+
+
//-------------------------------------------------
// sn76496_config psg_intf
//-------------------------------------------------
@@ -307,7 +307,7 @@ static MACHINE_CONFIG_START( mikie, mikie_state )
MCFG_SOUND_ADD("sn1", SN76489A_NEW, XTAL/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MCFG_SOUND_CONFIG(psg_intf)
-
+
MCFG_SOUND_ADD("sn2", SN76489A_NEW, CLK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MCFG_SOUND_CONFIG(psg_intf)
diff --git a/src/mame/drivers/mjkjidai.c b/src/mame/drivers/mjkjidai.c
index 767f13c40d5..8ca3d5c0656 100644
--- a/src/mame/drivers/mjkjidai.c
+++ b/src/mame/drivers/mjkjidai.c
@@ -384,8 +384,8 @@ static INTERRUPT_GEN( vblank_irq )
* Sound interface
*
*************************************/
-
-
+
+
//-------------------------------------------------
// sn76496_config psg_intf
//-------------------------------------------------
@@ -426,11 +426,11 @@ static MACHINE_CONFIG_START( mjkjidai, mjkjidai_state )
MCFG_SOUND_ADD("sn1", SN76489_NEW, 10000000/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_SOUND_CONFIG(psg_intf)
-
+
MCFG_SOUND_ADD("sn2", SN76489_NEW, 10000000/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_SOUND_CONFIG(psg_intf)
-
+
MCFG_SOUND_ADD("adpcm", MJKJIDAI, 6000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mpu4.c b/src/mame/drivers/mpu4.c
index 876982d1686..42951994a94 100644
--- a/src/mame/drivers/mpu4.c
+++ b/src/mame/drivers/mpu4.c
@@ -2,10 +2,10 @@
/* todo: driver inits (basic hw reel, protection configs etc.) should probably be moved here
once the actual code for them is cleaned up and can be put into neater structures
- like bfm_sc4
-
- due to the vast number of sets here this might be further split up by manufacturer
-
+ like bfm_sc4
+
+ due to the vast number of sets here this might be further split up by manufacturer
+
*/
#include "emu.h"
@@ -434,7 +434,7 @@ ROM_END
ROM_START( m4crzjwlh )
ROM_REGION( 0x20000, "maincpu", 0 )
- ROM_LOAD( "cjg.p1", 0x0000, 0x020000, CRC(1f4743bf) SHA1(f9a0da2ed9cad5e6685c8a6d1d09e5d4bbcfacec) ) // Crown Jewels Deluxe (german)
+ ROM_LOAD( "cjg.p1", 0x0000, 0x020000, CRC(1f4743bf) SHA1(f9a0da2ed9cad5e6685c8a6d1d09e5d4bbcfacec) ) // Crown Jewels Deluxe (german)
M4CRZJWL_EXTRAS
ROM_END
@@ -2392,7 +2392,7 @@ GAME( 198?, m4clr, 0, mod2 , mpu4, driver_device, 0, ROT
// other issues
-GAME(199?, m4casmul ,0 ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0, "Barcrest","Casino Multiplay (Barcrest) (MPU4)",GAME_FLAGS )
+GAME(199?, m4casmul ,0 ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0, "Barcrest","Casino Multiplay (Barcrest) (MPU4)",GAME_FLAGS )
@@ -2608,13 +2608,13 @@ GAME(199?, m4sunscl ,0 ,mod2 ,mpu4 , mpu4_state,m4default ,ROT0, "Bw
GAME(199?, m4sunscla,m4sunscl ,mod2 ,mpu4 , mpu4_state,m4default ,ROT0, "Bwb","Sunset Club (Bwb) (MPU4) (set 2)",GAME_FLAGS )
GAME(199?, m4sunsclb,m4sunscl ,mod2 ,mpu4 , mpu4_state,m4default ,ROT0, "Bwb","Sunset Club (Bwb) (MPU4) (set 3)",GAME_FLAGS )
-GAME(199?, m4bigban ,0 ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0, "Nova","Big Bandit (Nova) (MPU4)",GAME_FLAGS )
-GAME(199?, m4crzcsn ,0 ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0, "Nova","Crazy Casino (Nova) (MPU4)",GAME_FLAGS )
-GAME(199?, m4crzcav ,0 ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0, "Nova","Crazy Cavern (Nova) (MPU4)",GAME_FLAGS )
-GAME(199?, m4dragon ,0 ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0, "Nova","Dragon (Nova) (MPU4)",GAME_FLAGS )
-GAME(199?, m4hilonv ,0 ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0, "Nova","Hi Lo Casino (Nova) (MPU4)",GAME_FLAGS )
-GAME(199?, m4octo ,0 ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0, "Nova","Octopus (Nova) (MPU4)",GAME_FLAGS )
-GAME(199?, m4sctagt ,0 ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0, "Nova","Secret Agent (Nova) (MPU4)",GAME_FLAGS )
+GAME(199?, m4bigban ,0 ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0, "Nova","Big Bandit (Nova) (MPU4)",GAME_FLAGS )
+GAME(199?, m4crzcsn ,0 ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0, "Nova","Crazy Casino (Nova) (MPU4)",GAME_FLAGS )
+GAME(199?, m4crzcav ,0 ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0, "Nova","Crazy Cavern (Nova) (MPU4)",GAME_FLAGS )
+GAME(199?, m4dragon ,0 ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0, "Nova","Dragon (Nova) (MPU4)",GAME_FLAGS )
+GAME(199?, m4hilonv ,0 ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0, "Nova","Hi Lo Casino (Nova) (MPU4)",GAME_FLAGS )
+GAME(199?, m4octo ,0 ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0, "Nova","Octopus (Nova) (MPU4)",GAME_FLAGS )
+GAME(199?, m4sctagt ,0 ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0, "Nova","Secret Agent (Nova) (MPU4)",GAME_FLAGS )
@@ -2736,7 +2736,7 @@ GAME( 199?, m4nod , 0 , mod4oki , mpu4 , mpu4_state, m4default , 0, "Eu
// not sure about several of the nova ones
GAME( 199?, m4aliz , 0 , mod4oki , mpu4 , mpu4_state, m4default , 0, "Qps", "AlizBaz (Qps) (German) (MPU4)",GAME_FLAGS|GAME_MECHANICAL|GAME_SUPPORTS_SAVE)
GAME( 199?, m4coney , 0 , mod4oki , mpu4 , mpu4_state, m4default , 0, "Qps", "Coney Island (Qps) (MPU4)",GAME_FLAGS|GAME_MECHANICAL|GAME_SUPPORTS_SAVE)
-GAME( 199?, m4crzjk , 0 , mod2 , mpu4 , mpu4_state, m4default , 0, "Nova?", "Crazy Jokers (Nova?) (MPU4)",GAME_FLAGS ) // COIN ALM
+GAME( 199?, m4crzjk , 0 , mod2 , mpu4 , mpu4_state, m4default , 0, "Nova?", "Crazy Jokers (Nova?) (MPU4)",GAME_FLAGS ) // COIN ALM
GAME( 199?, m4c2 , 0 , mod4oki , mpu4 , mpu4_state, m4default , 0, "Nova?", "Circus Circus 2 (Nova?) (MPU4)",GAME_FLAGS|GAME_MECHANICAL|GAME_SUPPORTS_SAVE) // COIN ALM
// regular barcrest structure
GAME( 199?, m4vivan , 0 , mod4oki , mpu4 , mpu4_state, m4default , 0, "Nova", "Viva Las Vegas (Nova) (MPU4)",GAME_FLAGS|GAME_MECHANICAL|GAME_SUPPORTS_SAVE)
@@ -2749,6 +2749,6 @@ GAME( 199?, m4goldnn , 0 , mod4oki , mpu4 , mpu4_state, m4default , 0, "
-GAME(199?, m4sunseta ,m4sunset ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0, "Barcrest","Sunset Boulevard (Barcrest) (MPU4) (B25 1.2, set 1)",GAME_FLAGS )
-GAME(199?, m4sunsetb ,m4sunset ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0, "Barcrest","Sunset Boulevard (Barcrest) (MPU4) (B25 1.2, set 2)",GAME_FLAGS )
-GAME(199?, m4sunsetc ,m4sunset ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0, "Barcrest","Sunset Boulevard (Barcrest) (MPU4) (OSB 0.2)",GAME_FLAGS ) // might be a mod 2
+GAME(199?, m4sunseta ,m4sunset ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0, "Barcrest","Sunset Boulevard (Barcrest) (MPU4) (B25 1.2, set 1)",GAME_FLAGS )
+GAME(199?, m4sunsetb ,m4sunset ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0, "Barcrest","Sunset Boulevard (Barcrest) (MPU4) (B25 1.2, set 2)",GAME_FLAGS )
+GAME(199?, m4sunsetc ,m4sunset ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0, "Barcrest","Sunset Boulevard (Barcrest) (MPU4) (OSB 0.2)",GAME_FLAGS ) // might be a mod 2
diff --git a/src/mame/drivers/mpu4avan.c b/src/mame/drivers/mpu4avan.c
index 98da9e3d50a..7c2874e73e0 100644
--- a/src/mame/drivers/mpu4avan.c
+++ b/src/mame/drivers/mpu4avan.c
@@ -530,7 +530,7 @@ M4MBEL_SET( 199?, m4mbel__a0, m4mbel, "mbpl3.3c", 0x0000, 0x020000, CRC(638903
ROM_REGION( 0x100000, "msm6376", 0 ) \
ROM_LOAD( "mcsnd1.dat", 0x000000, 0x080000, CRC(9477e648) SHA1(1abefced0cf708ad035720d5e58dc7dae50de5d1) ) \
ROM_LOAD( "mcsnd2.dat", 0x080000, 0x080000, CRC(088796bd) SHA1(877bf21add8ef95f5384a88e1287bd9aa5dbfa95) ) \
-
+
#define M4CMONT_SET(year, setname,parent,name,offset,length,hash,company,title) \
ROM_START( setname ) \
@@ -619,7 +619,7 @@ M4CMONT_SET( 199?, m4cmont_gt3, m4cmont, "gtr58gaa", 0x0000, 0x020000, CRC(ad20
#define M4BLKMGC_EXTRA_ROMS \
ROM_REGION( 0x100000, "msm6376", 0 ) \
ROM_LOAD( "bmsnd", 0x0000, 0x080000, CRC(81da8bc9) SHA1(a60fd689e2683b987f48e3a4c8817b169a9c3fdf) ) \
-
+
#define M4BLKMGC_SET(year, setname,parent,name,offset,length,hash,company,title) \
ROM_START( setname ) \
@@ -647,7 +647,7 @@ M4BLKMGC_SET( 199?, m4blkmgc_u6, m4blkmgc, "bau1b307.bin", 0x0000, 0x010000, CRC
#define M4AMALAD_EXTRA_ROMS \
ROM_REGION( 0x100000, "msm6376", 0 ) \
ROM_LOAD( "aasnd", 0x0000, 0x080000, CRC(6b78f3de) SHA1(4f10afdc5cf7c84e2d048f7c9c5f83323f1e5a6e) ) \
-
+
#define M4AMALAD_SET(year, setname,parent,name,offset,length,hash,company,title) \
ROM_START( setname ) \
@@ -680,7 +680,7 @@ M4AMALAD_SET( 199?, m4amalad__n, m4amalad, "jpaltst2.dat", 0x0000, 0x020000, CR
#define M4BBEN_EXTRA_ROMS \
ROM_REGION( 0x100000, "msm6376", 0 ) \
ROM_LOAD( "bben1s.bin", 0x0000, 0x02dbc5, CRC(9240317e) SHA1(d9167e52a09ff1783bb10e2e34fb80bdf555f00e) ) \
-
+
#define M4BBEN_SET(year, setname,parent,name,offset,length,hash,company,title) \
ROM_START( setname ) \
ROM_REGION( length, "maincpu", 0 ) \
@@ -702,13 +702,13 @@ M4BBEN_SET( 199?, m4bben__g, m4bben, "bbc1b105.bin", 0x0000, 0x010000, CRC(b31f3
M4BBEN_SET( 199?, m4bben__h, m4bben, "bbc2a106.bin", 0x0000, 0x010000, CRC(4929273e) SHA1(0703b89884a2d410854d813fe8304eac0dbfb30e), "Avantime?","Big Ben (Avantime?) (MPU4) (set 9)" )
M4BBEN_SET( 199?, m4bben__i, m4bben, "bbc2b106.bin", 0x0000, 0x010000, CRC(d06687ed) SHA1(2e5b32c772f47f3f10ee90cbc72c00995871c2c0), "Avantime?","Big Ben (Avantime?) (MPU4) (set 10)" )
-
+
#define M4BBOX_EXTRA_ROMS \
ROM_REGION( 0x100000, "msm6376", 0 ) \
ROM_LOAD( "bb1snd.bin", 0x0000, 0x068880, CRC(69d53f5a) SHA1(dd7958060804fda97a1fdf69c230bfab092b9707) ) \
-
+
#define M4BBOX_SET(year, setname,parent,name,offset,length,hash,company,title) \
ROM_START( setname ) \
ROM_REGION( length, "maincpu", 0 ) \
@@ -735,7 +735,7 @@ M4BBOX_SET( 199?, m4bbox__i, m4bbox, "bbb9.bin", 0x0000, 0x010000, CRC(191f3da0
#define M4FRNUDG_EXTRA_ROMS \
ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \
-
+
#define M4FRNUDG_SET(year, setname,parent,name,offset,length,hash,company,title) \
ROM_START( setname ) \
ROM_REGION( length, "maincpu", 0 ) \
@@ -749,14 +749,14 @@ M4FRNUDG_SET( 199?, m4frnudg, 0, "fanhc11.bin", 0x0000, 0x010000, CRC(d2fe9df
M4FRNUDG_SET( 199?, m4frnudg__a, m4frnudg, "fanhc12.bin", 0x0000, 0x010000, CRC(2b2176e0) SHA1(9acffc05c02e76a6cbe4cfd708ff2d94ecb6c308), "Avantime?","Fruit & Nudge (Avantime?) (MPU4) (set 2)" )
M4FRNUDG_SET( 199?, m4frnudg__b, m4frnudg, "fanhc8.bin", 0x0000, 0x010000, CRC(d1eecc15) SHA1(7dd3d218bc42ed7a92b8cd04b3de0eecda1d7eb0), "Avantime?","Fruit & Nudge (Avantime?) (MPU4) (set 3)" )
M4FRNUDG_SET( 199?, m4frnudg__c, m4frnudg, "fanhc9.bin", 0x0000, 0x010000, CRC(0b581d12) SHA1(e62c831d8d21eb3c9a15ebe7f0245e804f912e32), "Avantime?","Fruit & Nudge (Avantime?) (MPU4) (set 4)" )
-
+
#define M4FRMTX_EXTRA_ROMS \
ROM_REGION( 0x100000, "msm6376", 0 ) \
ROM_LOAD( "fmsnd1.bin", 0x0000, 0x080000, CRC(300fcb23) SHA1(c3a7424089e7893972e04a6a5e77cfb4e0ffc8ec)) \
ROM_REGION( 0x100000, "pals", 0 ) \
ROM_LOAD( "fm.jed", 0x0000, 0x000580, CRC(dc166c8e) SHA1(0cc49836b7ad57daa54e08f10f07aa279ccc53a0)) \
-
+
#define M4FRMTX_SET(year, setname,parent,name,offset,length,hash,company,title) \
ROM_START( setname ) \
ROM_REGION( length, "maincpu", 0 ) \
@@ -773,7 +773,7 @@ M4FRMTX_SET( 199?, m4frmtx__d, m4frmtx, "fm7.bin", 0x0000, 0x010000, CRC(760774
M4FRMTX_SET( 199?, m4frmtx__e, m4frmtx, "fmuk1.bin", 0x0000, 0x010000, CRC(1e798ba4) SHA1(e8d06f8281bc9bc52c7ddd3133abf7eaa231d731), "Avantime?","Fruit Matrix (Avantime?) (MPU4) (set 6)" )
M4FRMTX_SET( 199?, m4frmtx__f, m4frmtx, "frmatx3", 0x0000, 0x010000, CRC(d3c47cad) SHA1(e89d8df496405903f51c31bf48774bfa877d90c2), "Avantime?","Fruit Matrix (Avantime?) (MPU4) (set 7)" )
-
+
#define M4JOK2K_EXTRA_ROMS \
diff --git a/src/mame/drivers/mpu4bwb.c b/src/mame/drivers/mpu4bwb.c
index 4abdb09e9c0..0d240207a1b 100644
--- a/src/mame/drivers/mpu4bwb.c
+++ b/src/mame/drivers/mpu4bwb.c
@@ -2,7 +2,7 @@
- these are Bwb originals, not rebuilds..
typically they have large 0x3f fills in rom..
some have information about the various set
- types in unused areas
+ types in unused areas
some QPS sets also have large 0x3f fills but
seem to be unrelated.
@@ -1181,7 +1181,7 @@ M4XS_SET( 199?, m4xs__d, m4xs, "es_49bg_.3_0", 0x0000, 0x020000, CRC(b76f1d7d) S
M4XS_SET( 199?, m4xs__e, m4xs, "es_49bmd.3_0", 0x0000, 0x020000, CRC(1150e499) SHA1(25d2c37e5287f73d2b11608c50f21072422850f0), "Bwb","X-s (Bwb) (MPU4) (set 6)" )
M4XS_SET( 199?, m4xs__f, m4xs, "es_sja__.3_0", 0x0000, 0x020000, CRC(5909092d) SHA1(64df6ad5ba5ac74592b525af2f4cab8a092a5766), "Bwb","X-s (Bwb) (MPU4) (set 7)" )
-
+
#define M4XTRM_EXTRA_ROMS \
ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 ) \
/* missing? */ \
diff --git a/src/mame/drivers/mpu4crystal.c b/src/mame/drivers/mpu4crystal.c
index e95767b5f54..9bca5fbb541 100644
--- a/src/mame/drivers/mpu4crystal.c
+++ b/src/mame/drivers/mpu4crystal.c
@@ -722,7 +722,7 @@ ROM_START( m4rags )
ROM_LOAD( "ct15.bin", 0x8000, 0x008000, CRC(27eab355) SHA1(0ad6a09015b2ddfe87563f3d88f84d2d5b3c74a0) )
M4RAGS_SOUND
ROM_END
-
+
ROM_START( m4ragsa )
ROM_REGION( 0x010000, "maincpu", 0 )
ROM_LOAD( "ct15p.bin", 0x8000, 0x008000, CRC(7ea5df79) SHA1(d1c355db97010dc9075217efe40d6620258ae3e4) )
@@ -798,42 +798,42 @@ GAME(199?, m4frkstnf,m4frkstn ,mpu4crys ,mpu4 , mpu4_state,m_frkstn, ROT0, "C
GAME(199?, m4frkstng,m4frkstn ,mpu4crys ,mpu4 , mpu4_state,m_frkstn, ROT0, "Crystal","Frank 'n' Stein (Crystal) (MPU4, set 8)", GAME_FLAGS|GAME_NO_SOUND )
GAME(199?, m4frkstnh,m4frkstn ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Frank 'n' Stein (Crystal) (MPU4, set 9)", GAME_FLAGS|GAME_NO_SOUND ) // this set is encrypted
GAME(199?, m4aladn ,0 ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Aladdin's Cave (Crystal) (MPU4) (set 1)", GAME_FLAGS|GAME_NO_SOUND )
-GAME(199?, m4aladna ,m4aladn ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Aladdin's Cave (Crystal) (MPU4) (set 2)", GAME_FLAGS|GAME_NO_SOUND )
-GAME(199?, m4aladnb ,m4aladn ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Aladdin's Cave (Crystal) (MPU4) (set 3)", GAME_FLAGS|GAME_NO_SOUND )
-GAME(199?, m4aladnc ,m4aladn ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Aladdin's Cave (Crystal) (MPU4) (set 4)", GAME_FLAGS|GAME_NO_SOUND )
-GAME(199?, m4aladnd ,m4aladn ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Aladdin's Cave (Crystal) (MPU4) (set 5)", GAME_FLAGS|GAME_NO_SOUND )
-GAME(199?, m4aladne ,m4aladn ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Aladdin's Cave (Crystal) (MPU4) (set 6)", GAME_FLAGS|GAME_NO_SOUND )
-GAME(199?, m4aladnf ,m4aladn ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Aladdin's Cave (Crystal) (MPU4) (set 7)", GAME_FLAGS|GAME_NO_SOUND )
-GAME(199?, m4aladng ,m4aladn ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Aladdin's Cave (Crystal) (MPU4) (set 8)", GAME_FLAGS|GAME_NO_SOUND )
-GAME(199?, m4aladnh ,m4aladn ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Aladdin's Cave (Crystal) (MPU4) (set 9)", GAME_FLAGS|GAME_NO_SOUND )
-GAME(199?, m4aladni ,m4aladn ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Aladdin's Cave (Crystal) (MPU4) (set 10)", GAME_FLAGS|GAME_NO_SOUND )
+GAME(199?, m4aladna ,m4aladn ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Aladdin's Cave (Crystal) (MPU4) (set 2)", GAME_FLAGS|GAME_NO_SOUND )
+GAME(199?, m4aladnb ,m4aladn ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Aladdin's Cave (Crystal) (MPU4) (set 3)", GAME_FLAGS|GAME_NO_SOUND )
+GAME(199?, m4aladnc ,m4aladn ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Aladdin's Cave (Crystal) (MPU4) (set 4)", GAME_FLAGS|GAME_NO_SOUND )
+GAME(199?, m4aladnd ,m4aladn ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Aladdin's Cave (Crystal) (MPU4) (set 5)", GAME_FLAGS|GAME_NO_SOUND )
+GAME(199?, m4aladne ,m4aladn ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Aladdin's Cave (Crystal) (MPU4) (set 6)", GAME_FLAGS|GAME_NO_SOUND )
+GAME(199?, m4aladnf ,m4aladn ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Aladdin's Cave (Crystal) (MPU4) (set 7)", GAME_FLAGS|GAME_NO_SOUND )
+GAME(199?, m4aladng ,m4aladn ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Aladdin's Cave (Crystal) (MPU4) (set 8)", GAME_FLAGS|GAME_NO_SOUND )
+GAME(199?, m4aladnh ,m4aladn ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Aladdin's Cave (Crystal) (MPU4) (set 9)", GAME_FLAGS|GAME_NO_SOUND )
+GAME(199?, m4aladni ,m4aladn ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Aladdin's Cave (Crystal) (MPU4) (set 10)", GAME_FLAGS|GAME_NO_SOUND )
GAME(199?, m4bagcsh ,0 ,mpu4crys ,mpu4 , mpu4_state,m_frkstn, ROT0, "Crystal","Bags Of Cash Club (Crystal) (MPU4) (set 1)", GAME_FLAGS|GAME_NO_SOUND )
-GAME(199?, m4bagcsha,m4bagcsh ,mpu4crys ,mpu4 , mpu4_state,m_frkstn, ROT0, "Crystal","Bags Of Cash Club (Crystal) (MPU4) (set 2)", GAME_FLAGS|GAME_NO_SOUND )
+GAME(199?, m4bagcsha,m4bagcsh ,mpu4crys ,mpu4 , mpu4_state,m_frkstn, ROT0, "Crystal","Bags Of Cash Club (Crystal) (MPU4) (set 2)", GAME_FLAGS|GAME_NO_SOUND )
GAME(199?, m4bucclb ,0 ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Buccaneer Club (Crystal) (MPU4) (set 1)", GAME_FLAGS|GAME_NO_SOUND )
GAME(199?, m4bucclba,m4bucclb ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Buccaneer Club (Crystal) (MPU4) (set 2)", GAME_FLAGS|GAME_NO_SOUND )
GAME(199?, m4bucclbb,m4bucclb ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Buccaneer Club (Crystal) (MPU4) (set 3)", GAME_FLAGS|GAME_NO_SOUND )
GAME(199?, m4bucclbc,m4bucclb ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Buccaneer Club (Crystal) (MPU4) (set 4)", GAME_FLAGS|GAME_NO_SOUND )
GAME(199?, m4bullio ,0 ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Bullion Club (Crystal) (MPU4) (set 1)", GAME_FLAGS|GAME_NO_SOUND )
-GAME(199?, m4bullioa,m4bullio ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Bullion Club (Crystal) (MPU4) (set 2)", GAME_FLAGS|GAME_NO_SOUND )
-GAME(199?, m4bulliob,m4bullio ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Bullion Club (Crystal) (MPU4) (set 3)", GAME_FLAGS|GAME_NO_SOUND )
+GAME(199?, m4bullioa,m4bullio ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Bullion Club (Crystal) (MPU4) (set 2)", GAME_FLAGS|GAME_NO_SOUND )
+GAME(199?, m4bulliob,m4bullio ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Bullion Club (Crystal) (MPU4) (set 3)", GAME_FLAGS|GAME_NO_SOUND )
GAME(199?, m4carou ,0 ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Carousel Club (Crystal) (MPU4) (set 1)", GAME_FLAGS|GAME_NO_SOUND )
-GAME(199?, m4caroua ,m4carou ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Carousel Club (Crystal) (MPU4) (set 2)", GAME_FLAGS|GAME_NO_SOUND )
-GAME(199?, m4caroub ,m4carou ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Carousel Club (Crystal) (MPU4) (set 3)", GAME_FLAGS|GAME_NO_SOUND )
-GAME(199?, m4carouc ,m4carou ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Carousel Club (Crystal) (MPU4) (set 4)", GAME_FLAGS|GAME_NO_SOUND )
+GAME(199?, m4caroua ,m4carou ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Carousel Club (Crystal) (MPU4) (set 2)", GAME_FLAGS|GAME_NO_SOUND )
+GAME(199?, m4caroub ,m4carou ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Carousel Club (Crystal) (MPU4) (set 3)", GAME_FLAGS|GAME_NO_SOUND )
+GAME(199?, m4carouc ,m4carou ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Carousel Club (Crystal) (MPU4) (set 4)", GAME_FLAGS|GAME_NO_SOUND )
GAME(199?, m4cclimb ,0 ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Crazy Climber (Crystal) (MPU4) (set 1)", GAME_FLAGS|GAME_NO_SOUND )
-GAME(199?, m4cclimba,m4cclimb ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Crazy Climber (Crystal) (MPU4) (set 2)", GAME_FLAGS|GAME_NO_SOUND )
+GAME(199?, m4cclimba,m4cclimb ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Crazy Climber (Crystal) (MPU4) (set 2)", GAME_FLAGS|GAME_NO_SOUND )
GAME(199?, m4crzcl ,0 ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Crazy Climber Club (Crystal) (MPU4) (set 1)", GAME_FLAGS|GAME_NO_SOUND )
-GAME(199?, m4crzcla ,m4crzcl ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Crazy Climber Club (Crystal) (MPU4) (set 2)", GAME_FLAGS|GAME_NO_SOUND )
-GAME(199?, m4crzclb ,m4crzcl ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Crazy Climber Club (Crystal) (MPU4) (set 3)", GAME_FLAGS|GAME_NO_SOUND )
-GAME(199?, m4crzclc ,m4crzcl ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Crazy Climber Club (Crystal) (MPU4) (set 4)", GAME_FLAGS|GAME_NO_SOUND )
-GAME(199?, m4crzcld ,m4crzcl ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Crazy Climber Club (Crystal) (MPU4) (set 5)", GAME_FLAGS|GAME_NO_SOUND )
+GAME(199?, m4crzcla ,m4crzcl ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Crazy Climber Club (Crystal) (MPU4) (set 2)", GAME_FLAGS|GAME_NO_SOUND )
+GAME(199?, m4crzclb ,m4crzcl ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Crazy Climber Club (Crystal) (MPU4) (set 3)", GAME_FLAGS|GAME_NO_SOUND )
+GAME(199?, m4crzclc ,m4crzcl ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Crazy Climber Club (Crystal) (MPU4) (set 4)", GAME_FLAGS|GAME_NO_SOUND )
+GAME(199?, m4crzcld ,m4crzcl ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Crazy Climber Club (Crystal) (MPU4) (set 5)", GAME_FLAGS|GAME_NO_SOUND )
GAME(199?, m4elitc ,0 ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Elite Club (Crystal) (MPU4) (set 1)", GAME_FLAGS|GAME_NO_SOUND )
-GAME(199?, m4elitca ,m4elitc ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Elite Club (Crystal) (MPU4) (set 2)", GAME_FLAGS|GAME_NO_SOUND )
+GAME(199?, m4elitca ,m4elitc ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Elite Club (Crystal) (MPU4) (set 2)", GAME_FLAGS|GAME_NO_SOUND )
GAME(199?, m4fairg ,0 ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Fairground (Crystal) (MPU4)", GAME_FLAGS|GAME_NO_SOUND )
GAME(199?, m4frmani ,0 ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Fruit Mania (Crystal) (MPU4) (set 1)", GAME_FLAGS|GAME_NO_SOUND )
-GAME(199?, m4frmania,m4frmani ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Fruit Mania (Crystal) (MPU4) (set 2)", GAME_FLAGS|GAME_NO_SOUND )
-GAME(199?, m4frmanib,m4frmani ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Fruit Mania (Crystal) (MPU4) (set 3)", GAME_FLAGS|GAME_NO_SOUND )
-GAME(199?, m4frmanic,m4frmani ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Fruit Mania (Crystal) (MPU4) (set 4)", GAME_FLAGS|GAME_NO_SOUND )
+GAME(199?, m4frmania,m4frmani ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Fruit Mania (Crystal) (MPU4) (set 2)", GAME_FLAGS|GAME_NO_SOUND )
+GAME(199?, m4frmanib,m4frmani ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Fruit Mania (Crystal) (MPU4) (set 3)", GAME_FLAGS|GAME_NO_SOUND )
+GAME(199?, m4frmanic,m4frmani ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Fruit Mania (Crystal) (MPU4) (set 4)", GAME_FLAGS|GAME_NO_SOUND )
GAME(199?, m4goldxc ,0 ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Gold Exchange Club (Crystal) (MPU4) (set 1)", GAME_FLAGS|GAME_NO_SOUND )
GAME(199?, m4goldxca,m4goldxc ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Gold Exchange Club (Crystal) (MPU4) (set 2)", GAME_FLAGS|GAME_NO_SOUND )
GAME(199?, m4goldxcb,m4goldxc ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Gold Exchange Club (Crystal) (MPU4) (set 3)", GAME_FLAGS|GAME_NO_SOUND )
@@ -841,39 +841,39 @@ GAME(199?, m4goldxcc,m4goldxc ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "
GAME(199?, m4goldxcd,m4goldxc ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Gold Exchange Club (Crystal) (MPU4) (set 5)", GAME_FLAGS|GAME_NO_SOUND )
GAME(199?, m4goldxce,m4goldxc ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Gold Exchange Club (Crystal) (MPU4) (set 6)", GAME_FLAGS|GAME_NO_SOUND )
GAME(199?, m4goldfc ,0 ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Gold Fever (Crystal) (MPU4) (set 1)", GAME_FLAGS|GAME_NO_SOUND )
-GAME(199?, m4goldfca,m4goldfc ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Gold Fever (Crystal) (MPU4) (set 2)", GAME_FLAGS|GAME_NO_SOUND )
-GAME(199?, m4goldfcb,m4goldfc ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Gold Fever (Crystal) (MPU4) (set 3)", GAME_FLAGS|GAME_NO_SOUND )
+GAME(199?, m4goldfca,m4goldfc ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Gold Fever (Crystal) (MPU4) (set 2)", GAME_FLAGS|GAME_NO_SOUND )
+GAME(199?, m4goldfcb,m4goldfc ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Gold Fever (Crystal) (MPU4) (set 3)", GAME_FLAGS|GAME_NO_SOUND )
GAME(199?, m4hirol ,0 ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Hi Roller Club (Crystal) (MPU4) (set 1)", GAME_FLAGS|GAME_NO_SOUND )
-GAME(199?, m4hirola ,m4hirol ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Hi Roller Club (Crystal) (MPU4) (set 2)", GAME_FLAGS|GAME_NO_SOUND )
+GAME(199?, m4hirola ,m4hirol ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Hi Roller Club (Crystal) (MPU4) (set 2)", GAME_FLAGS|GAME_NO_SOUND )
GAME(199?, m4kingqn ,0 ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Kings & Queens Club (Crystal) (MPU4) (set 1)", GAME_FLAGS|GAME_NO_SOUND )
GAME(199?, m4kingqna,m4kingqn ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Kings & Queens Club (Crystal) (MPU4) (set 2)", GAME_FLAGS|GAME_NO_SOUND )
GAME(199?, m4lotclb ,0 ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Lottery Club (Crystal) (MPU4) (set 1)", GAME_FLAGS|GAME_NO_SOUND )
-GAME(199?, m4lotclba,m4lotclb ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Lottery Club (Crystal) (MPU4) (set 2)", GAME_FLAGS|GAME_NO_SOUND )
+GAME(199?, m4lotclba,m4lotclb ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Lottery Club (Crystal) (MPU4) (set 2)", GAME_FLAGS|GAME_NO_SOUND )
GAME(199?, m4montrl ,0 ,mpu4crys ,mpu4 , mpu4_state,crystali, ROT0, "Crystal","Money Trail (Crystal) (MPU4) (set 1)", GAME_FLAGS|GAME_NO_SOUND ) // encryption is inverted!
-GAME(199?, m4montrla,m4montrl ,mpu4crys ,mpu4 , mpu4_state,crystali, ROT0, "Crystal","Money Trail (Crystal) (MPU4) (set 2)", GAME_FLAGS|GAME_NO_SOUND ) // encryption is inverted!
-GAME(199?, m4montrlb,m4montrl ,mpu4crys ,mpu4 , mpu4_state,crystali, ROT0, "Crystal","Money Trail (Crystal) (MPU4) (set 3)", GAME_FLAGS|GAME_NO_SOUND ) // encryption is inverted!
-GAME(199?, m4montrlc,m4montrl ,mpu4crys ,mpu4 , mpu4_state,crystali, ROT0, "Crystal","Money Trail (Crystal) (MPU4) (set 4)", GAME_FLAGS|GAME_NO_SOUND ) // encryption is inverted!
-GAME(199?, m4montrld,m4montrl ,mpu4crys ,mpu4 , mpu4_state,crystali, ROT0, "Crystal","Money Trail (Crystal) (MPU4) (set 5)", GAME_FLAGS|GAME_NO_SOUND ) // encryption is inverted!
+GAME(199?, m4montrla,m4montrl ,mpu4crys ,mpu4 , mpu4_state,crystali, ROT0, "Crystal","Money Trail (Crystal) (MPU4) (set 2)", GAME_FLAGS|GAME_NO_SOUND ) // encryption is inverted!
+GAME(199?, m4montrlb,m4montrl ,mpu4crys ,mpu4 , mpu4_state,crystali, ROT0, "Crystal","Money Trail (Crystal) (MPU4) (set 3)", GAME_FLAGS|GAME_NO_SOUND ) // encryption is inverted!
+GAME(199?, m4montrlc,m4montrl ,mpu4crys ,mpu4 , mpu4_state,crystali, ROT0, "Crystal","Money Trail (Crystal) (MPU4) (set 4)", GAME_FLAGS|GAME_NO_SOUND ) // encryption is inverted!
+GAME(199?, m4montrld,m4montrl ,mpu4crys ,mpu4 , mpu4_state,crystali, ROT0, "Crystal","Money Trail (Crystal) (MPU4) (set 5)", GAME_FLAGS|GAME_NO_SOUND ) // encryption is inverted!
GAME(199?, m4mystiq ,0 ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Mystique Club (Crystal) (MPU4) (set 1)", GAME_FLAGS|GAME_NO_SOUND )
-GAME(199?, m4mystiqa,m4mystiq ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Mystique Club (Crystal) (MPU4) (set 2)", GAME_FLAGS|GAME_NO_SOUND )
-GAME(199?, m4mystiqb,m4mystiq ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Mystique Club (Crystal) (MPU4) (set 3)", GAME_FLAGS|GAME_NO_SOUND )
-GAME(199?, m4mystiqc,m4mystiq ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Mystique Club (Crystal) (MPU4) (set 4)", GAME_FLAGS|GAME_NO_SOUND )
+GAME(199?, m4mystiqa,m4mystiq ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Mystique Club (Crystal) (MPU4) (set 2)", GAME_FLAGS|GAME_NO_SOUND )
+GAME(199?, m4mystiqb,m4mystiq ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Mystique Club (Crystal) (MPU4) (set 3)", GAME_FLAGS|GAME_NO_SOUND )
+GAME(199?, m4mystiqc,m4mystiq ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Mystique Club (Crystal) (MPU4) (set 4)", GAME_FLAGS|GAME_NO_SOUND )
GAME(199?, m4nudwin ,0 ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Nudge & Win (Crystal) (MPU4) (set 1)", GAME_FLAGS|GAME_NO_SOUND )
GAME(199?, m4nudwina,m4nudwin ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Nudge & Win (Crystal) (MPU4) (set 2)", GAME_FLAGS|GAME_NO_SOUND )
GAME(199?, m4paracl ,0 ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Paradise Club (Crystal) (MPU4) (set 1)", GAME_FLAGS|GAME_NO_SOUND )
-GAME(199?, m4paracla,m4paracl ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Paradise Club (Crystal) (MPU4) (set 2)", GAME_FLAGS|GAME_NO_SOUND )
+GAME(199?, m4paracla,m4paracl ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Paradise Club (Crystal) (MPU4) (set 2)", GAME_FLAGS|GAME_NO_SOUND )
GAME(199?, m4rlpick ,0 ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Reel Picks (Crystal) (MPU4) (set 1)", GAME_FLAGS|GAME_NO_SOUND )
GAME(199?, m4rlpicka,m4rlpick ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Reel Picks (Crystal) (MPU4) (set 2)", GAME_FLAGS|GAME_NO_SOUND )
GAME(199?, m4rlpickb,m4rlpick ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Reel Picks (Crystal) (MPU4) (set 3)", GAME_FLAGS|GAME_NO_SOUND )
GAME(199?, m4rlpickc,m4rlpick ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Reel Picks (Crystal) (MPU4) (set 4)", GAME_FLAGS|GAME_NO_SOUND )
GAME(199?, m4twstr ,0 ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Twister (Crystal) (MPU4) (set 1)", GAME_FLAGS|GAME_NO_SOUND )
-GAME(199?, m4twstra ,m4twstr ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Twister (Crystal) (MPU4) (set 2)", GAME_FLAGS|GAME_NO_SOUND )
-GAME(199?, m4twstrb ,m4twstr ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Twister (Crystal) (MPU4) (set 3)", GAME_FLAGS|GAME_NO_SOUND )
-GAME(199?, m4twstrc ,m4twstr ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Twister (Crystal) (MPU4) (set 4)", GAME_FLAGS|GAME_NO_SOUND )
-GAME(199?, m4twstrd ,m4twstr ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Twister (Crystal) (MPU4) (set 5)", GAME_FLAGS|GAME_NO_SOUND )
+GAME(199?, m4twstra ,m4twstr ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Twister (Crystal) (MPU4) (set 2)", GAME_FLAGS|GAME_NO_SOUND )
+GAME(199?, m4twstrb ,m4twstr ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Twister (Crystal) (MPU4) (set 3)", GAME_FLAGS|GAME_NO_SOUND )
+GAME(199?, m4twstrc ,m4twstr ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Twister (Crystal) (MPU4) (set 4)", GAME_FLAGS|GAME_NO_SOUND )
+GAME(199?, m4twstrd ,m4twstr ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Twister (Crystal) (MPU4) (set 5)", GAME_FLAGS|GAME_NO_SOUND )
GAME(199?, m4twstcl ,0 ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Twister Club (Crystal) (MPU4) (set 1)", GAME_FLAGS|GAME_NO_SOUND )
-GAME(199?, m4twstcla,m4twstcl ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Twister Club (Crystal) (MPU4) (set 2)", GAME_FLAGS|GAME_NO_SOUND )
-GAME(199?, m4twstclb,m4twstcl ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Twister Club (Crystal) (MPU4) (set 3)", GAME_FLAGS|GAME_NO_SOUND )
+GAME(199?, m4twstcla,m4twstcl ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Twister Club (Crystal) (MPU4) (set 2)", GAME_FLAGS|GAME_NO_SOUND )
+GAME(199?, m4twstclb,m4twstcl ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Twister Club (Crystal) (MPU4) (set 3)", GAME_FLAGS|GAME_NO_SOUND )
GAME(199?, m4dz ,0 ,mpu4crys ,mpu4 , mpu4_state,crystal, ROT0, "Crystal","Danger Zone (Crystal) (MPU4)", GAME_FLAGS|GAME_NO_SOUND )
GAME(199?, m4tylb ,0 ,mod4oki ,mpu4 , mpu4_state,m4default, ROT0, "Crystal","Thank Your Lucky Bars (Crystal) (MPU4) (set 1)",GAME_FLAGS|GAME_NO_SOUND|GAME_MECHANICAL )
GAME(199?, m4tylba ,m4tylb ,mod4oki ,mpu4 , mpu4_state,m4default, ROT0, "Crystal","Thank Your Lucky Bars (Crystal) (MPU4) (set 2)",GAME_FLAGS|GAME_NO_SOUND|GAME_MECHANICAL )
diff --git a/src/mame/drivers/mpu4hw.c b/src/mame/drivers/mpu4hw.c
index e998fe81941..a844bf0c2d0 100644
--- a/src/mame/drivers/mpu4hw.c
+++ b/src/mame/drivers/mpu4hw.c
@@ -512,7 +512,7 @@ used in some cabinets instead of the main control.
*/
WRITE8_MEMBER(mpu4_state::bankswitch_w)
{
-// printf("bankswitch_w %02x\n", data);
+// printf("bankswitch_w %02x\n", data);
// m_pageset is never even set??
m_pageval = (data & 0x03);
@@ -529,7 +529,7 @@ READ8_MEMBER(mpu4_state::bankswitch_r)
WRITE8_MEMBER(mpu4_state::bankset_w)
{
-// printf("bankset_w %02x\n", data);
+// printf("bankset_w %02x\n", data);
// m_pageset is never even set??
diff --git a/src/mame/drivers/mpu4mod2sw.c b/src/mame/drivers/mpu4mod2sw.c
index 7d1e711d74a..24255a716af 100644
--- a/src/mame/drivers/mpu4mod2sw.c
+++ b/src/mame/drivers/mpu4mod2sw.c
@@ -456,7 +456,7 @@ ROM_START( m4cashzn )
ROM_REGION( 0x10000, "maincpu", 0 )
ROM_LOAD( "caz_1_2.p1", 0x0000, 0x010000, CRC(78383d52) SHA1(cd69d4e600273e3da7aa61e51266e8f1765ad5dc) )
ROM_END
-
+
ROM_START( m4cashzna )
ROM_REGION( 0x10000, "maincpu", 0 )
ROM_LOAD( "caz_1_5.p1", 0x0000, 0x010000, CRC(c0d80d62) SHA1(e062be12159a67b5da883345565f3a52a1dd2ebe) )
@@ -985,7 +985,7 @@ ROM_END
ROM_START( m4supjstb )
ROM_REGION( 0x10000, "maincpu", 0 )
ROM_LOAD( "super jester 2.1.90 10p 4.80 p1.bin", 0x8000, 0x008000, CRC(14f2dc51) SHA1(7dcf54a25bcaa2081f906d0ad44bcae183a32371) )
-// ROM_LOAD( "31.1.90cj10p4.80v6.bin", 0x8000, 0x008000, CRC(14f2dc51) SHA1(7dcf54a25bcaa2081f906d0ad44bcae183a32371) ) // marked crown jester?
+// ROM_LOAD( "31.1.90cj10p4.80v6.bin", 0x8000, 0x008000, CRC(14f2dc51) SHA1(7dcf54a25bcaa2081f906d0ad44bcae183a32371) ) // marked crown jester?
ROM_END
ROM_START( m4supjstc )
@@ -1867,7 +1867,7 @@ GAMEL(1989?, m4conn4, 0, mod2 , connect4, mpu4_state, connect4,
GAME(199?, m4ttak , 0, mod2 ,mpu4, mpu4_state, m4default, ROT0, "<unknown>","Tic Tac Take (unknown) (MPU4)",GAME_FLAGS )
GAME(199?, m4actbnka,m4actbnk ,mod2 ,mpu4jackpot8tkn , mpu4_state,m4default ,ROT0, "Barcrest","Action Bank (Barcrest) (Mod 2 type, AC3.0) (MPU4)",GAME_FLAGS ) // set jackpot key to 8GBP TOKEN & stake key
-GAME(199?, m4actbnkb,m4actbnk ,mod2 ,mpu4jackpot8tkn , mpu4_state,m4default ,ROT0, "Barcrest","Action Bank (Barcrest) (Mod 2 type, ACT2.0) (MPU4)",GAME_FLAGS )
+GAME(199?, m4actbnkb,m4actbnk ,mod2 ,mpu4jackpot8tkn , mpu4_state,m4default ,ROT0, "Barcrest","Action Bank (Barcrest) (Mod 2 type, ACT2.0) (MPU4)",GAME_FLAGS )
GAME(199?, m4actclb ,0 ,mod2 ,mpu4 , mpu4_state,m4default ,ROT0, "Barcrest","Action Club (Barcrest) (MPU4) (1.9)",GAME_FLAGS ) // set stake to boot
GAME(199?, m4actclba ,m4actclb ,mod2 ,mpu4 , mpu4_state,m4default ,ROT0, "Barcrest","Action Club (Barcrest) (MPU4) (1.1)",GAME_FLAGS ) // ^^
diff --git a/src/mame/drivers/mpu4mod4yam.c b/src/mame/drivers/mpu4mod4yam.c
index 18c14fc97a5..474af1cdc7f 100644
--- a/src/mame/drivers/mpu4mod4yam.c
+++ b/src/mame/drivers/mpu4mod4yam.c
@@ -17,7 +17,7 @@ DRIVER_INIT_MEMBER( mpu4_state, m4_debug_mod4yam )
// this helps with sorting
UINT8 *src = machine().root_device().memregion( "maincpu" )->base();
int size = machine().root_device().memregion( "maincpu" )->bytes();
-
+
for (int j=0;j<size;j+=0x10000)
{
if (size>0x10000) printf("\nblock 0x%06x:\n",j);
@@ -645,9 +645,9 @@ M4VIVALV_SET( 199?, m4vivalv__8, m4vivalv, "vvi05___.3_3", 0x0000, 0x010000,
GAME(199?, m4vivasx ,0 ,mod4yam ,mpu4 , mpu4_state,m4default ,ROT0, "Barcrest","Viva Las Vegas Six (Barcrest) (MPU4)",GAME_FLAGS)
-GAME(199?, m4stc ,0 ,mod4yam ,mpu4 , mpu4_state,m4default ,ROT0, "Barcrest","unknown MPU4 'STC 0.1' (Barcrest) (MPU4)",GAME_FLAGS)
+GAME(199?, m4stc ,0 ,mod4yam ,mpu4 , mpu4_state,m4default ,ROT0, "Barcrest","unknown MPU4 'STC 0.1' (Barcrest) (MPU4)",GAME_FLAGS)
GAME(199?, m4sstrek ,m4supst ,mod4yam ,mpu4 , mpu4_state,m4default ,ROT0, "bootleg","Super Streak (bootleg) (MPU4)",GAME_FLAGS)
GAME(199?, m4joljokd,m4joljok ,mod4yam ,mpu4 , mpu4_state,m4default ,ROT0, "Barcrest","Jolly Joker (Barcrest) [Dutch] (MPU4) (DJJ)",GAME_FLAGS)
GAME(199?, m4clbshf ,0 ,mod4yam ,mpu4 , mpu4_state,m4default ,ROT0, "Barcrest","Club Shuffle (Barcrest) (MPU4)",GAME_FLAGS) // set stake
-GAME(199?, m4voodoo ,0 ,mod4yam ,mpu4 , mpu4_state,m4altreels ,ROT0, "Barcrest","Voodoo 1000 (Barcrest) (Dutch) (MPU4) (DDO 3.2)",GAME_FLAGS )
+GAME(199?, m4voodoo ,0 ,mod4yam ,mpu4 , mpu4_state,m4altreels ,ROT0, "Barcrest","Voodoo 1000 (Barcrest) (Dutch) (MPU4) (DDO 3.2)",GAME_FLAGS )
GAME(199?, m4graffd ,m4graff ,mod4yam ,mpu4 , mpu4_state,m4default ,ROT0, "Barcrest","Grafitti (Barcrest) [Dutch] (MPU4)",GAME_FLAGS )
diff --git a/src/mame/drivers/mpu4plasma.c b/src/mame/drivers/mpu4plasma.c
index 1e212e99b66..25b7d482825 100644
--- a/src/mame/drivers/mpu4plasma.c
+++ b/src/mame/drivers/mpu4plasma.c
@@ -25,7 +25,7 @@ public:
{
return machine().rand();
}
-
+
DECLARE_WRITE16_MEMBER( mpu4plasma_unk_w )
{
@@ -40,11 +40,11 @@ INPUT_PORTS_EXTERN( mpu4 );
static ADDRESS_MAP_START( mpu4plasma_map, AS_PROGRAM, 16, mpu4plasma_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
-
+
// why does it test this much ram, just sloppy code expecting mirroring?
AM_RANGE(0x400000, 0x4fffff) AM_RAM AM_SHARE("plasmaram")
// comms?
- AM_RANGE(0xffff00, 0xffff01) AM_READ( mpu4plasma_unk_r )
+ AM_RANGE(0xffff00, 0xffff01) AM_READ( mpu4plasma_unk_r )
AM_RANGE(0xffff04, 0xffff05) AM_WRITE( mpu4plasma_unk_w )
ADDRESS_MAP_END
@@ -67,7 +67,7 @@ SCREEN_UPDATE_IND16( mpu4plasma )
for (x=0;x<128/16;x++)
{
UINT16 pix = rambase[base+i];
-
+
for (p=0;p<16;p++)
{
UINT16 bit = (pix << p)&0x8000;
@@ -79,7 +79,7 @@ SCREEN_UPDATE_IND16( mpu4plasma )
}
}
-
+
return 0;
}
@@ -170,7 +170,7 @@ ROM_END
ROM_REGION( 0x40000, "plasmacpu", 0 ) \
ROM_LOAD16_BYTE( "plasma.p0", 0x00000, 0x010000, NO_DUMP ) \
ROM_LOAD16_BYTE( "plasma.p1", 0x00001, 0x010000, NO_DUMP ) \
-
+
ROM_START( m4apach )
ROM_REGION( 0x10000, "maincpu", 0 )
@@ -196,14 +196,14 @@ ROM_END
#define GAME_FLAGS (GAME_NOT_WORKING|GAME_REQUIRES_ARTWORK)
-GAMEL(199?, m4bigchf ,0 ,mpu4plasma ,mpu4 , mpu4_state,m4default ,ROT0, "Barcrest","Big Chief (Barcrest) (MPU4 w/ Plasma DMD) (set 1)", GAME_FLAGS|GAME_NO_SOUND,layout_mpu4plasma )
-GAMEL(199?, m4bigchfa ,m4bigchf ,mpu4plasma ,mpu4 , mpu4_state,m4default ,ROT0, "Barcrest","Big Chief (Barcrest) (MPU4 w/ Plasma DMD) (set 2)", GAME_FLAGS|GAME_NO_SOUND,layout_mpu4plasma )
-GAMEL(199?, m4bigchfb ,m4bigchf ,mpu4plasma ,mpu4 , mpu4_state,m4default ,ROT0, "Barcrest","Big Chief (Barcrest) (MPU4 w/ Plasma DMD) (set 3)", GAME_FLAGS|GAME_NO_SOUND,layout_mpu4plasma )
-GAMEL(199?, m4bigchfc ,m4bigchf ,mpu4plasma ,mpu4 , mpu4_state,m4default ,ROT0, "Barcrest","Big Chief (Barcrest) (MPU4 w/ Plasma DMD) (set 4)", GAME_FLAGS|GAME_NO_SOUND,layout_mpu4plasma )
+GAMEL(199?, m4bigchf ,0 ,mpu4plasma ,mpu4 , mpu4_state,m4default ,ROT0, "Barcrest","Big Chief (Barcrest) (MPU4 w/ Plasma DMD) (set 1)", GAME_FLAGS|GAME_NO_SOUND,layout_mpu4plasma )
+GAMEL(199?, m4bigchfa ,m4bigchf ,mpu4plasma ,mpu4 , mpu4_state,m4default ,ROT0, "Barcrest","Big Chief (Barcrest) (MPU4 w/ Plasma DMD) (set 2)", GAME_FLAGS|GAME_NO_SOUND,layout_mpu4plasma )
+GAMEL(199?, m4bigchfb ,m4bigchf ,mpu4plasma ,mpu4 , mpu4_state,m4default ,ROT0, "Barcrest","Big Chief (Barcrest) (MPU4 w/ Plasma DMD) (set 3)", GAME_FLAGS|GAME_NO_SOUND,layout_mpu4plasma )
+GAMEL(199?, m4bigchfc ,m4bigchf ,mpu4plasma ,mpu4 , mpu4_state,m4default ,ROT0, "Barcrest","Big Chief (Barcrest) (MPU4 w/ Plasma DMD) (set 4)", GAME_FLAGS|GAME_NO_SOUND,layout_mpu4plasma )
GAMEL(199?, m4click ,0 ,mpu4plasma ,mpu4 , mpu4_state,m4default ,ROT0, "Barcrest","Clickity Click (Barcrest) (MPU4 w/ Plasma DMD)", GAME_FLAGS|GAME_NO_SOUND,layout_mpu4plasma )
// not confirmed to be plasma, is this an alt version of big chief? maybe it uses the same plasma roms?
-GAMEL(199?, m4apach ,0 ,mpu4plasma ,mpu4 , mpu4_state,m4default ,ROT0, "Barcrest","Apache (Barcrest) (MPU4 w/ Plasma DMD?)", GAME_FLAGS|GAME_NO_SOUND,layout_mpu4plasma )
+GAMEL(199?, m4apach ,0 ,mpu4plasma ,mpu4 , mpu4_state,m4default ,ROT0, "Barcrest","Apache (Barcrest) (MPU4 w/ Plasma DMD?)", GAME_FLAGS|GAME_NO_SOUND,layout_mpu4plasma )
// not confirmed to be plasma, but acts like it
-GAMEL(199?, m4elite ,0 ,mpu4plasma ,mpu4 , mpu4_state,m4default ,ROT0, "Barcrest","Elite (Barcrest) (MPU4 w/ Plasma DMD?)", GAME_FLAGS|GAME_NO_SOUND,layout_mpu4plasma )
+GAMEL(199?, m4elite ,0 ,mpu4plasma ,mpu4 , mpu4_state,m4default ,ROT0, "Barcrest","Elite (Barcrest) (MPU4 w/ Plasma DMD?)", GAME_FLAGS|GAME_NO_SOUND,layout_mpu4plasma )
diff --git a/src/mame/drivers/mpu4sw.c b/src/mame/drivers/mpu4sw.c
index 01524b9cebf..22ae0f6c4a8 100644
--- a/src/mame/drivers/mpu4sw.c
+++ b/src/mame/drivers/mpu4sw.c
@@ -1,5 +1,5 @@
/* mpu4 sets which have been split, and appear to do something useful
-
+
I'm trying to keep this file to official Barcrest / BwB rebuilds on mod4 hw
(licensed versions and bootlegs also included)
@@ -8,7 +8,7 @@
/* many sets have the BARCREST or BWB string at FFE0 replaced with other things
such at 'FATHER CHRISTMAS' are these hacked / bootlegs requiring special hw?
-
+
sets with 'D' in the ident code are Datapak sets, and do not play without a datapak connected
sets with 'Y' seem to require the % key to be set
@@ -33,7 +33,7 @@ DRIVER_INIT_MEMBER(mpu4_state,m4debug)
// this helps with sorting
UINT8 *src = machine().root_device().memregion( "maincpu" )->base();
int size = machine().root_device().memregion( "maincpu" )->bytes();
-
+
for (int j=0;j<size;j+=0x10000)
{
if (size>0x10000) printf("\nblock 0x%06x:\n",j);
diff --git a/src/mame/drivers/mpu5.c b/src/mame/drivers/mpu5.c
index 09fcdb08290..9cf6906f741 100644
--- a/src/mame/drivers/mpu5.c
+++ b/src/mame/drivers/mpu5.c
@@ -1579,7 +1579,7 @@ ROM_START( m5clbtro25 ) // or is it 24?
ROM_REGION( 0x400000, "maincpu", 0 )
ROM_LOAD16_BYTE( "trop2_5.p1", 0x000000, 0x080000, CRC(731f2cfe) SHA1(c0cecda77f6726631982c5342ec2740c86432594) ) // == "trop2_4.p1 ??
ROM_LOAD16_BYTE( "trop2_5.p2", 0x000001, 0x080000, CRC(665c2043) SHA1(32146abb066d50b901a110e8260c94ea4b9db4e9) )
-
+
ROM_REGION( 0x100000, "altrevs", 0 ) /* Alternate revision Prg ROMs, to be sorted into clones */
ROM_LOAD16_BYTE( "trop2_5d.p1", 0x000000, 0x080000, CRC(a5eac7a4) SHA1(77fa99ae3a2ee7d4856a3d9918086a471e161a91) ) // == trop2_4d.p1 ??
ROM_END
@@ -2272,7 +2272,7 @@ ROM_START( m5ggems )
ROM_LOAD16_BYTE( "gge_sjh2.2d1", 0x000000, 0x080000, CRC(8a2b8ebe) SHA1(b89bf6a8778421cf891cce8274d01b168e434e68) )
ROM_LOAD16_BYTE( "gge_sjk2.2_1", 0x000000, 0x080000, CRC(30e8d9aa) SHA1(cf70d3fb91d4f2f42af38293f218e14435f773f1) )
ROM_LOAD16_BYTE( "gge_sjl2.2d1", 0x000000, 0x080000, CRC(f755ffda) SHA1(b53ba6d4c6dda468997d9d36e2896a9a52bf8c26) )
-
+
// these just seem to be bad (sound) roms from something else
//ROM_LOAD16_BYTE( "gia_gems.p1", 0x000000, 0x080000, CRC(c841d2f7) SHA1(480397141c917bce26cfdc8ba7fa8d21ab741770) )
//ROM_LOAD16_BYTE( "gia_gems.p2", 0x000000, 0x080000, CRC(7824adf5) SHA1(99b59d28adb80d5cf3d70691cc134eba72288f20) )
@@ -3574,7 +3574,7 @@ ROM_START( m5mmak06 )
ROM_LOAD16_BYTE( "mmak06.p2", 0x000001, 0x080000, CRC(24ad42b1) SHA1(5189199316cf5f896fbdc00f15cf9abcba2489c6) )
ROM_LOAD16_BYTE( "mmak06.p3", 0x100000, 0x080000, CRC(1048ceca) SHA1(f6a6790ed3c7b60cbe31db9eb1ed7da5ac81c0fd) ) // == 05
ROM_LOAD16_BYTE( "mmak06.p4", 0x100001, 0x080000, CRC(50f7100c) SHA1(b7e0199bf183b7954416eb091a5aa8ed5c44143b) ) // == 05
-
+
ROM_REGION( 0x100000, "altrevs", 0 ) /* Alternate revision Prg ROMs, to be sorted into clones */
ROM_LOAD16_BYTE( "mmak06ad.p1", 0x000000, 0x080000, CRC(fe92d3b3) SHA1(70bade6ac8a524ff640923960d6b33720d10945e) )
ROM_LOAD16_BYTE( "mmak06b.p1", 0x000000, 0x080000, CRC(4c283966) SHA1(97a6d2b7778998067f9556f412cc116999a37fae) )
@@ -3817,7 +3817,7 @@ ROM_START( m5openbx06 )
ROM_LOAD16_BYTE( "oboj06.p6", 0x200001, 0x080000, CRC(b151d179) SHA1(0a3bfde2310478c341b5ddae142f5efc9469a51c) ) // == 02
ROM_LOAD16_BYTE( "obtr06.p7", 0x300000, 0x080000, CRC(163ba007) SHA1(94a8618143910b63f70cd0e7339b337d6e81ef33) ) // missing but assumed the same
ROM_LOAD16_BYTE( "oboj06.p8", 0x300001, 0x080000, CRC(5de27262) SHA1(c941275ce21506ab322ac0917725409a14660011) ) // == 02
-
+
ROM_REGION( 0x100000, "altrevs", 0 ) /* Alternate revision Prg ROMs, to be sorted into clones */
ROM_LOAD16_BYTE( "oboj06ad.p1", 0x000000, 0x080000, CRC(ebf9d0b2) SHA1(cf1d3378d8a6e42b267a8d3e5c8f1cd48cccf3c0) )
ROM_LOAD16_BYTE( "oboj06b.p1", 0x000000, 0x080000, CRC(bc0aaac3) SHA1(d22e9696e05fb57be8e01e0771678dec3a0d0080) )
@@ -3962,7 +3962,7 @@ ROM_START( m5ptyani01 )
ROM_LOAD16_BYTE( "patr01.p2", 0x000001, 0x080000, CRC(aacd9a52) SHA1(0bc676d9708148f02ae121185a5b4f6eae34f3d4) )
ROM_LOAD16_BYTE( "patr01.p3", 0x100000, 0x080000, CRC(76eb81df) SHA1(6fd6376eedf74330aa2b019ad0044ce39210610a) ) // == 03
ROM_LOAD16_BYTE( "patr01.p4", 0x100001, 0x080000, CRC(64f081ec) SHA1(22fc6ea30bb503247fe108e645c197e0fc90063a) ) // == 03
-
+
ROM_REGION( 0x100000, "altrevs", 0 ) /* Alternate revision Prg ROMs, to be sorted into clones */
ROM_LOAD16_BYTE( "patr01d.p1", 0x000000, 0x080000, CRC(71085bfa) SHA1(87dd1334077da967796c1847e3010de1acc8c32f) )
ROM_LOAD16_BYTE( "patr01dy.p1", 0x000000, 0x080000, CRC(a9be6297) SHA1(b5d8b6e26d19a9af98665429d29bfcda7f3d4bfa) )
@@ -4323,7 +4323,7 @@ ROM_START( m5redrck10 )
ROM_LOAD16_BYTE( "rttr10.p2", 0x000001, 0x080000, CRC(38066b10) SHA1(116b8dac97ed2060243e78ed94bc121076c66dfe) )
ROM_LOAD16_BYTE( "rttr10.p3", 0x100000, 0x080000, CRC(9519dc05) SHA1(32c46c95ccedb99f1e517242bc89249020fbd66c) )
ROM_LOAD16_BYTE( "rttr10.p4", 0x100001, 0x080000, CRC(5af465d8) SHA1(e484e495a4fe92ab6ccdfc3069ce528293d4f277) )
-
+
ROM_REGION( 0x100000, "altrevs", 0 ) /* Alternate revision Prg ROMs, to be sorted into clones */
ROM_LOAD16_BYTE( "rttr10ad.p1", 0x000000, 0x080000, CRC(28ebaa1a) SHA1(5f93efc9b089680cfcf854f9ce91a7fabcd0646c) )
ROM_LOAD16_BYTE( "rttr10b.p1", 0x000000, 0x080000, CRC(05e3597f) SHA1(fe5b6f71f1dc84be90ed4c687c0f07bed7ab9fce) )
@@ -4423,7 +4423,7 @@ ROM_START( m5rhrgt12 )
ROM_LOAD16_BYTE( "rhrt12.p2", 0x000001, 0x080000, CRC(9a9a9c45) SHA1(2b178bbc57a1dd8bf347002f9deb7f1690e89423) )
ROM_LOAD16_BYTE( "rhrt12.p3", 0x100000, 0x080000, CRC(77a16da8) SHA1(1598e547b39d4fe58e8f05aea5f949d2b0a9678d) ) // == 13
ROM_LOAD16_BYTE( "rhrt12.p4", 0x100001, 0x080000, CRC(eb880b1f) SHA1(65402cd0a5cdc95e5c3a7be2f100e1e19eb45152) ) // == 13
-
+
ROM_REGION( 0x100000, "altrevs", 0 ) /* Alternate revision Prg ROMs, to be sorted into clones */
ROM_LOAD16_BYTE( "rhrt12ad.p1", 0x000000, 0x080000, CRC(65d6d9dd) SHA1(d53278b0b5e8b3bcab8bc9da008b016e1b3a2dfa) )
ROM_LOAD16_BYTE( "rhrt12b.p1", 0x000000, 0x080000, CRC(7643fca7) SHA1(03916131ce827e2b903644b1857c20dc8af6dc20) )
@@ -4544,7 +4544,7 @@ ROM_START( m5revo13 )
ROM_LOAD16_BYTE( "revl13.p2", 0x000001, 0x080000, CRC(44bb41e0) SHA1(3a55312369e13f007e3541e6cbe4cf0694c681a4) )
ROM_LOAD16_BYTE( "revl13.p3", 0x100000, 0x080000, CRC(594cd05f) SHA1(6183a9e3c9c14e19245ca457a3267ceceb8490b3) ) // == 01
ROM_LOAD16_BYTE( "revl13.p4", 0x100001, 0x080000, CRC(d80f34a2) SHA1(87d3bd9809a1fa96217e27de3778b231ef6c41a1) ) // == 01
-
+
ROM_REGION( 0x100000, "altrevs", 0 ) /* Alternate revision Prg ROMs, to be sorted into clones */
ROM_LOAD16_BYTE( "revl13ad.p1", 0x000000, 0x080000, CRC(48eb39a1) SHA1(c78145688c66215d971d18fcf7a5ff593efe4aff) )
ROM_LOAD16_BYTE( "revl13b.p1", 0x000000, 0x080000, CRC(45555b0c) SHA1(6483bd52cc82f2943e261f9fd8ec0409222deb25) )
@@ -4657,7 +4657,7 @@ ROM_START( m5rgclb01 )
ROM_LOAD16_BYTE( "trgb0_1.p2", 0x000001, 0x080000, CRC(0b52162a) SHA1(41e84d3fa1f5ab148d59dadb91a1ce9690255a14) )
ROM_LOAD16_BYTE( "trgb0_1.p3", 0x100000, 0x080000, CRC(97d97647) SHA1(2dd1af527e614703690fb3c881c88602e6f7636e) ) // == 03
ROM_LOAD16_BYTE( "trgb0_1.p4", 0x100001, 0x080000, CRC(58a7a86f) SHA1(a5847bc90b6ae3f013b7954b6cdb379997f820c6) ) // == 03
-
+
ROM_REGION( 0x100000, "altrevs", 0 ) /* Alternate revision Prg ROMs, to be sorted into clones */
ROM_LOAD16_BYTE( "trgb0_1d.p1", 0x000000, 0x080000, CRC(5c3f22d9) SHA1(b5c09c5b913958ca723c6e15d29c57437e8bdf22) )
ROM_LOAD16_BYTE( "trgb0_1f.p1", 0x000000, 0x080000, CRC(d7a4f6c6) SHA1(666b9444e3d49bfc6754c4ca93eb0ccc80fd7db3) )
@@ -4904,7 +4904,7 @@ ROM_START( m5sondr05 )
ROM_LOAD16_BYTE( "sono05.p2", 0x000001, 0x080000, CRC(8ffae24a) SHA1(0a20ea91fb8241f9da665cc9b2bc86a66b153b8c) )
ROM_LOAD16_BYTE( "sono05.p3", 0x100000, 0x080000, CRC(868d1a96) SHA1(0ebca6a12b1ae912d836c2ee86b555dbdf6fe16f) ) // == 01
ROM_LOAD16_BYTE( "sono05.p4", 0x100001, 0x080000, CRC(b4a37232) SHA1(c85a185786ad5e0a0a2fb7c525f9be8c0c376d3e) ) // == 01
-
+
ROM_REGION( 0x100000, "altrevs", 0 ) /* Alternate revision Prg ROMs, to be sorted into clones */
ROM_LOAD16_BYTE( "sono05ad.p1", 0x000000, 0x080000, CRC(4e162d7f) SHA1(9533f8ac7ca385b9b5aeaa0767628e16a6ee8e5d) )
ROM_LOAD16_BYTE( "sono05b.p1", 0x000000, 0x080000, CRC(d62b4d88) SHA1(6760752341091c4aeb5b908c89de7c868af4e455) )
@@ -5006,7 +5006,7 @@ ROM_START( m5spiker02 )
ROM_LOAD16_BYTE( "sbtr02.p2", 0x000001, 0x080000, CRC(00ada2e2) SHA1(d6979b9d29d3a5da04d9d9910ca2f2af91f5531e) )
ROM_LOAD16_BYTE( "sbtr02.p3", 0x100000, 0x080000, CRC(cbd103db) SHA1(a4b49e74a5a37c8779d9f6e960c7d904fc9b4a9a) ) // == 03
ROM_LOAD16_BYTE( "sbtr02.p4", 0x100001, 0x080000, CRC(0d5a7af8) SHA1(14dde9f4f2437b40ad5756931bb4428b571acc2c) ) // == 03
-
+
ROM_REGION( 0x100000, "altrevs", 0 ) /* Alternate revision Prg ROMs, to be sorted into clones */
ROM_LOAD16_BYTE( "sbtr02ad.p1", 0x000000, 0x080000, CRC(cad3e3bd) SHA1(f6076754bcd560aaf09730bd23fb3c94138579c0) )
ROM_LOAD16_BYTE( "sbtr02b.p1", 0x000000, 0x080000, CRC(6a3bfc70) SHA1(202d453cd3e44337168e9e023f2d5daefcbe2c6c) )
@@ -5067,7 +5067,7 @@ ROM_START( m5squids05 )
ROM_LOAD16_BYTE( "sqid05.p2", 0x000001, 0x080000, CRC(3a5c50cc) SHA1(082b2918fbb0718d567bc4ed1f7f03034138f5c1) )
ROM_LOAD16_BYTE( "sqid05.p3", 0x100000, 0x080000, CRC(2808fd4a) SHA1(1f75987b42f83b54dd2eb376cc9ce0fccfbb693c) ) // == 04
ROM_LOAD16_BYTE( "sqid05.p4", 0x100001, 0x080000, CRC(5983db8c) SHA1(1cf396ea35a6b947fd7fd827fc79e8bf2ef95811) ) // == 04
-
+
ROM_REGION( 0x100000, "altrevs", 0 ) /* Alternate revision Prg ROMs, to be sorted into clones */
ROM_LOAD16_BYTE( "sqid05ad.p1", 0x000000, 0x080000, CRC(15051db0) SHA1(b4cfb41aa9f218144511e5e54630c67d8fd744c5) )
ROM_LOAD16_BYTE( "sqid05b.p1", 0x000000, 0x080000, CRC(6ea2eb9e) SHA1(28a1c92688daf90a8363798d797035b661282189) )
@@ -5672,7 +5672,7 @@ ROM_START( m5ultimo03a )
ROM_LOAD16_BYTE( "ultr03.p2", 0x000001, 0x080000, CRC(b78b8f57) SHA1(ce1c20e8a97727c2b37983edb47c0603ac21a59a) )
ROM_LOAD16_BYTE( "ultr03.p3", 0x100000, 0x080000, CRC(bfc649eb) SHA1(85f31848918e35385ab96cbadadbc33ddb1e42b1) ) // == 03
ROM_LOAD16_BYTE( "ultr03.p4", 0x100001, 0x080000, CRC(8579127e) SHA1(5ba966008c0f7b4c910eddc6400ed2178c70e096) ) // == 03
-
+
ROM_REGION( 0x100000, "altrevs", 0 ) /* Alternate revision Prg ROMs, to be sorted into clones */
ROM_LOAD16_BYTE( "ultr03ad.p1", 0x000000, 0x080000, CRC(94e18680) SHA1(80e7024464abff00a880c0f88f2b336e168ad025) )
ROM_LOAD16_BYTE( "ultr03b.p1", 0x000000, 0x080000, CRC(8c66b958) SHA1(cd6a5c931bb432169ffe337ca6b2ffdd08d3fc5a) )
@@ -5830,7 +5830,7 @@ ROM_START( m5xfact11 )
ROM_LOAD16_BYTE( "xfac1_1.p1", 0x000000, 0x080000, CRC(f3303449) SHA1(61284a5e950df86efc72aef436b81a80a8370380) )
ROM_LOAD16_BYTE( "xfac1_1.p2", 0x000001, 0x080000, CRC(c1508630) SHA1(1ad9f38ddef32bc5a64db434c681b06967edd988) )
/* 3+4 */
-
+
ROM_REGION( 0x100000, "altrevs", 0 ) /* Alternate revision Prg ROMs, to be sorted into clones */
ROM_LOAD16_BYTE( "xfac1_1d.p1", 0x000000, 0x080000, CRC(ffbcb9f2) SHA1(a57760ff5b092d7550a5b2d69065782cbdd056e4) )
ROM_END
diff --git a/src/mame/drivers/multfish.c b/src/mame/drivers/multfish.c
index 53be1fd7b53..8f0641c70b8 100644
--- a/src/mame/drivers/multfish.c
+++ b/src/mame/drivers/multfish.c
@@ -1934,7 +1934,7 @@ ROM_END
ROM_START( lhaunt_10 ) // 090712 entertainment
ROM_REGION( 0x40000, "maincpu", 0 ) // z80 code, banked
ROM_LOAD( "lh_e_090712.rom", 0x00000, 0x40000, CRC(16a3d1f3) SHA1(a1350d957d06a679db7f27eb949ddb3befe178d8) )
-
+
ROM_REGION( 0x400000, "gfx", 0 )
ROM_LOAD( "lh_ent.001", 0x000000, 0x80000, CRC(66de9088) SHA1(b8287b4d9eeeb6502b656dc9d104048364c55326) )
ROM_LOAD( "lh_ent.002", 0x100000, 0x80000, CRC(04df45d7) SHA1(f74d72244fb3cefc3599b68af0fec01f9d1a17a1) )
@@ -2275,7 +2275,7 @@ ROM_END
ROM_START( sweetl2_3 ) // 090525 lottery
ROM_REGION( 0x40000, "maincpu", 0 ) // z80 code, banked
ROM_LOAD( "sl2_l_090525.rom", 0x00000, 0x40000, CRC(79f878b4) SHA1(a21dc4a7986dab7ec9236b2c612c43c1604b5588) )
-
+
ROM_REGION( 0x400000, "gfx", 0 )
ROM_LOAD( "sweetlife2_loto.001", 0x000000, 0x80000, CRC(01b8bc85) SHA1(9c6475e8e6e01717d61b5f15f95748a66ea958b7) )
ROM_LOAD( "sweetlife2_loto.002", 0x100000, 0x80000, CRC(e95f1ecb) SHA1(a538c6df004129ccf54a09ab6dae79d301ee6966) )
@@ -2290,7 +2290,7 @@ ROM_END
ROM_START( sweetl2_4 ) // 090812 entertainment
ROM_REGION( 0x40000, "maincpu", 0 ) // z80 code, banked
ROM_LOAD( "sl2_e_090812.rom", 0x00000, 0x40000, CRC(1ee6b0c9) SHA1(481ec72b87e0419aa435e3876404c1b802aed7dd) )
-
+
ROM_REGION( 0x400000, "gfx", 0 )
ROM_LOAD( "sweetlife2_ent.001", 0x000000, 0x80000, CRC(378c185d) SHA1(3486bc353c2947375e0f60b6e0f188e95fb7ebcb) )
ROM_LOAD( "sweetlife2_ent.002", 0x100000, 0x80000, CRC(3f92e579) SHA1(0b1ddd294c6a8d7bb353965a7117ea336c577ff5) )
diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c
index 75422626136..a4957acecc5 100644
--- a/src/mame/drivers/naomi.c
+++ b/src/mame/drivers/naomi.c
@@ -4867,7 +4867,7 @@ ROM_START( sambap )
NAOMI_DEFAULT_EEPROM
ROM_REGION( 0x8800000, "rom_board", ROMREGION_ERASEFF)
- ROM_LOAD( "sambaproto.ic22",0x000000, 0x0400000, CRC(ca069449) SHA1(03c2498664df187a98b335f1757979ebcf45c591) )
+ ROM_LOAD( "sambaproto.ic22",0x000000, 0x0400000, CRC(ca069449) SHA1(03c2498664df187a98b335f1757979ebcf45c591) )
ROM_LOAD("mpr-22950.ic1", 0x0800000, 0x0800000, CRC(16dee15c) SHA1(b46849e492756ff406bf8956303472255fcf55a5) )
ROM_LOAD("mpr-22951.ic2", 0x1000000, 0x0800000, CRC(f509496f) SHA1(41281576f7d58c8ede9c0a89bfd46a98d5b97033) )
ROM_LOAD("mpr-22952.ic3", 0x1800000, 0x0800000, CRC(fb9b3ef0) SHA1(e9d44b673c273e97445a12186496a0594e291542) )
@@ -8040,7 +8040,7 @@ ROM_END
// 0023B Naomi DIMM Firmware Updater (Rev B)
/* 0023C */ GAME( 2001, ngdup23c, naomigd, naomigd, naomi, dc_state, naomigd, ROT0, "Sega", "Naomi DIMM Firmware Updater (Rev C) (GDS-0023C)", GAME_FLAGS )
// 0023D Naomi DIMM Firmware Updater (Rev D)
-/* 0023E */ GAME( 2001, ngdup23e, naomigd, naomigd, naomi, dc_state, naomigd, ROT0, "Sega", "Naomi DIMM Firmware Updater (Rev E) (GDS-0023E)", GAME_FLAGS )
+/* 0023E */ GAME( 2001, ngdup23e, naomigd, naomigd, naomi, dc_state, naomigd, ROT0, "Sega", "Naomi DIMM Firmware Updater (Rev E) (GDS-0023E)", GAME_FLAGS )
// 0024 Virtua Fighter 4 Evolution
/* 0024A */ GAME( 2002, vf4evoa, vf4evo, naomi2gd,naomi, dc_state, naomi2, ROT0, "Sega", "Virtua Fighter 4 Evolution (Rev A) (GDS-0024A)", GAME_FLAGS )
/* 0024B */ GAME( 2002, vf4evo, naomi2, naomi2gd,naomi, dc_state, naomi2, ROT0, "Sega", "Virtua Fighter 4 Evolution (Rev B) (GDS-0024B)", GAME_FLAGS )
@@ -8071,7 +8071,7 @@ ROM_END
// 0038
// 0039 Initial D: Arcade Stage Ver. 3 Cycraft Edition
// 0039A Initial D: Arcade Stage Ver. 3 Cycraft Edition (Rev A)
-/* 0039B */ GAME( 2006, inidv3cy, naomi2, naomigd, naomi, dc_state, naomi2, ROT0, "Sega", "Initial D Arcade Stage Ver. 3 Cycraft Edition (Rev. B) (GDS-0039B)", GAME_FLAGS )
+/* 0039B */ GAME( 2006, inidv3cy, naomi2, naomigd, naomi, dc_state, naomi2, ROT0, "Sega", "Initial D Arcade Stage Ver. 3 Cycraft Edition (Rev. B) (GDS-0039B)", GAME_FLAGS )
// 0040
// 0041 Dragon Treasure 3
// 0041A Dragon Treasure 3 (Rev A)
diff --git a/src/mame/drivers/peplus.c b/src/mame/drivers/peplus.c
index 29cd7374849..7406c105f41 100644
--- a/src/mame/drivers/peplus.c
+++ b/src/mame/drivers/peplus.c
@@ -574,10 +574,10 @@ READ8_MEMBER(peplus_state::peplus_input0_r)
{
/*
Emulating IGT IDO22 Pulse Protocol (IGT Smoke 2.2)
- ID022 protocol requires a 20ms on/off pulse x times for denomination followed by a 50ms stop pulse.
- The DBV then waits for at least 3 toggling (ACK) pulses of alternating 20ms each from the game.
- If no toggling received within 200ms, the bill was rejected by the game (e.g. Max Credits reached).
- Once toggling received, the DBV stacks the bill and sends two 10ms stacked pulses separated by a 10ms pause.
+ ID022 protocol requires a 20ms on/off pulse x times for denomination followed by a 50ms stop pulse.
+ The DBV then waits for at least 3 toggling (ACK) pulses of alternating 20ms each from the game.
+ If no toggling received within 200ms, the bill was rejected by the game (e.g. Max Credits reached).
+ Once toggling received, the DBV stacks the bill and sends two 10ms stacked pulses separated by a 10ms pause.
TODO: Will need to include IGT IDO23 (IGT 2.5) for Superboard games.
PE+ bill validators have a dip switch setting to switch between ID-022 and ID-023 protocols.
@@ -614,7 +614,7 @@ READ8_MEMBER(peplus_state::peplus_input0_r)
// Fetch Current Denomination
m_bv_denomination = ioport("BC")->read();
- m_bv_cycles = curr_cycles;
+ m_bv_cycles = curr_cycles;
m_bv_pulse = 1;
if (m_bv_denomination == 0)
@@ -623,7 +623,7 @@ READ8_MEMBER(peplus_state::peplus_input0_r)
m_bv_state = 1; // Greater than $1 Needs Credit Pulse
}
}
-
+
switch (m_bv_state)
{
case 0x00: // Not Active
@@ -642,7 +642,7 @@ READ8_MEMBER(peplus_state::peplus_input0_r)
m_bv_pulse = 1;
m_bv_denomination--;
-
+
if (m_bv_denomination == 0)
m_bv_state++; // Done with Credit Pulse
else
diff --git a/src/mame/drivers/proconn.c b/src/mame/drivers/proconn.c
index fc7c79f993d..7d3772ffcb4 100644
--- a/src/mame/drivers/proconn.c
+++ b/src/mame/drivers/proconn.c
@@ -464,7 +464,7 @@ ROM_START( pr_bearxk )
ROM_REGION( 0x80000, "maincpu", 0 )
ROM_LOAD( "bx8t10n6.bin", 0x0000, 0x008000, CRC(829dcc99) SHA1(014b53999becb241a3fcd34e802be8b58bfeb3c4) )
ROM_END
-
+
ROM_START( pr_bearxl )
ROM_REGION( 0x80000, "maincpu", 0 )
ROM_LOAD( "p_bx41.bin", 0x0000, 0x008000, CRC(e9212049) SHA1(215038324baa928b3c41495e78a2be68c8a1a767) )//bx1c20n7.bin
@@ -585,17 +585,17 @@ ROM_START( pr_7hvnc )
ROM_REGION( 0x80000, "maincpu", 0 )
ROM_LOAD( "7h10p3c_380.bin", 0x0000, 0x010000, CRC(9fafd2a1) SHA1(7da1fa02005e0e232b7bb01088b180c32f271b00) )//10p 3 pound cash rom 380
ROM_END
-
+
ROM_START( pr_7hvnd )
ROM_REGION( 0x80000, "maincpu", 0 )
ROM_LOAD( "7775prb", 0x0000, 0x010000, CRC(cc6cb41e) SHA1(7b9e4d9cfdb4071c83081a1306ffa7e0be3938aa) )//5p 3 pound cash 105
ROM_END
-
+
ROM_START( pr_7hvne )
ROM_REGION( 0x80000, "maincpu", 0 )
ROM_LOAD( "777 heaven 892a20pn-390 (27256)", 0x0000, 0x008000, CRC(ffd1a8e0) SHA1(4b3a72c855d5b28d8be5db13166c58a44a1cbb59) )
ROM_END
-
+
ROM_START( pr_7hvnf )
ROM_REGION( 0x80000, "maincpu", 0 )
ROM_LOAD( "777 heaven 892a10pn-380 (27256)", 0x0000, 0x008000, CRC(ca9d2108) SHA1(ebbb54c6640c67ce905a2dbf83f9f2fde31d342f) )
@@ -676,7 +676,7 @@ ROM_START( pr_7hvnu )
ROM_LOAD( "cl7h1020", 0x0000, 0x010000, CRC(b12e3219) SHA1(634f6984d9ef6ef9964841b5586143d82d8b52f7) )
ROM_END
-
+
ROM_START( pr_alwy9 )
ROM_REGION( 0x80000, "maincpu", 0 )
ROM_LOAD( "always 9 10p.bin", 0x0000, 0x010000, CRC(aff337c0) SHA1(a335a857c1bba696150d51cabfd39a2996c1092f) )
@@ -696,7 +696,7 @@ ROM_END
ROM_REGION( 0x80000, "snd", 0 )\
ROM_LOAD( "080snd1.bin", 0x0000, 0x020000, CRC(011170ab) SHA1(60a174c09261c2ee230c4194d918173b41f267de) )\
ROM_LOAD( "080snd2.bin", 0x020000, 0x020000, CRC(9189793b) SHA1(b47a3c214eb01595581f1e9d18c154560ee02ca1) )\
-
+
ROM_START( pr_batls )
ROM_REGION( 0x80000, "maincpu", 0 )
ROM_LOAD( "batt72c", 0x0000, 0x010000, CRC(6c6ab1f1) SHA1(6e0663fcdfa1948d9d74b6df388d09fed73f0ed2) )
@@ -757,8 +757,8 @@ ROM_END
ROM_REGION( 0x80000, "snd", 0 )\
ROM_LOAD( "010snd1 316e.bin" , 0x0000, 0x020000, CRC(5e3cfdc6) SHA1(32db10e7bacc6a4728d8821e77789cf146e2a277) )\
ROM_LOAD( "010snd2 9e9a.bin" , 0x0000, 0x020000, CRC(496a9d51) SHA1(703631d3cb2e3c7fa676cb5a31903bf39ee6c44f) )\
-
-
+
+
ROM_START( pr_bulls )
ROM_REGION( 0x80000, "maincpu", 0 )
ROM_LOAD( "beye58c", 0x0000, 0x010000, CRC(5fc52311) SHA1(dd4d3f29ec608c37d3d644bfbfa3ba06cc134b59) )
@@ -833,7 +833,7 @@ ROM_END
ROM_REGION( 0x80000, "snd", 0 )\
ROM_LOAD( "006snd1.000", 0x0000, 0x020000, CRC(f906857a) SHA1(cfa47a3e887e6788c577d31bb567f7fbaaf0bbf3) )\
ROM_LOAD( "006snd2.000", 0x0000, 0x020000, CRC(8445d0ef) SHA1(fd2ecc96f74e99e8f5ea7c7772fbd451ce52e889) )\
-
+
ROM_START( pr_chico )
ROM_REGION( 0x80000, "maincpu", 0 )
ROM_LOAD( "006a20pn.810", 0x0000, 0x010000, CRC(c4b491b7) SHA1(7629857cf6f1f69fb9ccf82a290a491cf695d373) )
@@ -844,13 +844,13 @@ ROM_END
ROM_START( pr_chicoa )
ROM_REGION( 0x80000, "maincpu", 0 )
ROM_LOAD( "006a25pn.810", 0x0000, 0x010000, CRC(d765215c) SHA1(22fe8d4b387e9fbc34a72ea1583b1c040f7761bc) )
-
+
pr_chico_sound
ROM_END
ROM_START( pr_chicob )
ROM_REGION( 0x80000, "maincpu", 0 )
- ROM_LOAD( "chic8c", 0x0000, 0x010000, CRC(2d5628be) SHA1(0c3f60f72a4d4eb458cac8ca4fe7d5584cbe4f18) )
+ ROM_LOAD( "chic8c", 0x0000, 0x010000, CRC(2d5628be) SHA1(0c3f60f72a4d4eb458cac8ca4fe7d5584cbe4f18) )
pr_chico_sound
ROM_END
@@ -867,7 +867,7 @@ ROM_END
ROM_START( pr_coolma )
ROM_REGION( 0x80000, "maincpu", 0 )
ROM_LOAD( "cm5pndan", 0x0000, 0x010000, CRC(e0697fe6) SHA1(d4b66272030dd64c86834f0546376dd02cfb0cc4) )
-
+
ROM_REGION( 0x80000, "snd", 0 )
ROM_LOAD( "cmsnd.bin", 0x0000, 0x080000, CRC(db79a326) SHA1(afe19eaa5d63c871ed80ffdfc8fb991a8c16cb36) )
ROM_END
diff --git a/src/mame/drivers/royalmah.c b/src/mame/drivers/royalmah.c
index cd0ccf10fdb..d8e31b1dd93 100644
--- a/src/mame/drivers/royalmah.c
+++ b/src/mame/drivers/royalmah.c
@@ -4711,8 +4711,8 @@ ROM_END
DRIVER_INIT_MEMBER(royalmah_state,ippatsu)
-{
- machine().root_device().membank("bank1")->set_base(machine().root_device().memregion("maincpu")->base() + 0x8000 );
+{
+ machine().root_device().membank("bank1")->set_base(machine().root_device().memregion("maincpu")->base() + 0x8000 );
}
DRIVER_INIT_MEMBER(royalmah_state,janptr96)
diff --git a/src/mame/drivers/s3.c b/src/mame/drivers/s3.c
index 7f1c3b6d490..39eb83a1c33 100644
--- a/src/mame/drivers/s3.c
+++ b/src/mame/drivers/s3.c
@@ -126,6 +126,6 @@ ROM_END
GAME( 1977, httip_l1, 0, williams_s3, williams_s3, williams_s3_state, williams_s3, ROT0, "Williams", "Hot Tip (L-1)", GAME_IS_SKELETON_MECHANICAL)
GAME( 1977, lucky_l1, 0, williams_s3, williams_s3, williams_s3_state, williams_s3, ROT0, "Williams", "Lucky Seven (L-1)", GAME_IS_SKELETON_MECHANICAL)
-GAME( 1978, wldcp_l1, 0, williams_s3, williams_s3, williams_s3_state, williams_s3, ROT0, "Williams", "World Cup Soccer (L-1)", GAME_IS_SKELETON_MECHANICAL)
+GAME( 1978, wldcp_l1, 0, williams_s3, williams_s3, williams_s3_state, williams_s3, ROT0, "Williams", "World Cup Soccer (L-1)", GAME_IS_SKELETON_MECHANICAL)
GAME( 1978, cntct_l1, 0, williams_s3, williams_s3, williams_s3_state, williams_s3, ROT0, "Williams", "Contact (L-1)", GAME_IS_SKELETON_MECHANICAL)
GAME( 1978, disco_l1, 0, williams_s3, williams_s3, williams_s3_state, williams_s3, ROT0, "Williams", "Disco Fever (L-1)", GAME_IS_SKELETON_MECHANICAL)
diff --git a/src/mame/drivers/sandscrp.c b/src/mame/drivers/sandscrp.c
index 921d8a044cc..0872500ceea 100644
--- a/src/mame/drivers/sandscrp.c
+++ b/src/mame/drivers/sandscrp.c
@@ -139,7 +139,7 @@ SCREEN_UPDATE_IND16( sandscrp )
static MACHINE_RESET( sandscrp )
{
-// sandscrp_state *state = machine.driver_data<sandscrp_state>();
+// sandscrp_state *state = machine.driver_data<sandscrp_state>();
}
/* Sand Scorpion */
@@ -196,8 +196,8 @@ WRITE16_MEMBER(sandscrp_state::sandscrp_irq_cause_w)
if (ACCESSING_BITS_0_7)
{
-// m_sprite_flipx = data & 1;
-// m_sprite_flipy = data & 1;
+// m_sprite_flipx = data & 1;
+// m_sprite_flipy = data & 1;
if (data & 0x08) m_sprite_irq = 0;
if (data & 0x10) m_unknown_irq = 0;
diff --git a/src/mame/drivers/segac2.c b/src/mame/drivers/segac2.c
index af07e44acb2..54c647f04e5 100644
--- a/src/mame/drivers/segac2.c
+++ b/src/mame/drivers/segac2.c
@@ -115,11 +115,11 @@ static MACHINE_START( segac2 )
static MACHINE_RESET( segac2 )
{
segac2_state *state = machine.driver_data<segac2_state>();
-// megadriv_framerate = 60;
+// megadriv_framerate = 60;
-// megadriv_scanline_timer = machine.device<timer_device>("md_scan_timer");
-// megadriv_scanline_timer->adjust(attotime::zero);
+// megadriv_scanline_timer = machine.device<timer_device>("md_scan_timer");
+// megadriv_scanline_timer->adjust(attotime::zero);
segac2_bg_pal_lookup[0] = 0x00;
segac2_bg_pal_lookup[1] = 0x10;
segac2_bg_pal_lookup[2] = 0x20;
@@ -236,8 +236,8 @@ static WRITE16_HANDLER( palette_w )
/* set the color */
palette_set_color_rgb(space->machine(), offset, pal5bit(r), pal5bit(g), pal5bit(b));
-// megadrive_vdp_palette_lookup[offset] = (b) | (g << 5) | (r << 10);
-// megadrive_vdp_palette_lookup_sprite[offset] = (b) | (g << 5) | (r << 10);
+// megadrive_vdp_palette_lookup[offset] = (b) | (g << 5) | (r << 10);
+// megadrive_vdp_palette_lookup_sprite[offset] = (b) | (g << 5) | (r << 10);
tmpr = r >> 1;
tmpg = g >> 1;
@@ -1274,7 +1274,7 @@ static VIDEO_START(segac2_new)
}
// C2 doesn't use the internal VDP CRAM, instead it uses the digital output of the chip
-// and applies it's own external colour circuity
+// and applies it's own external colour circuity
static SCREEN_UPDATE_RGB32(segac2_new)
{
const pen_t *paldata = screen.machine().pens;
@@ -1292,7 +1292,7 @@ static SCREEN_UPDATE_RGB32(segac2_new)
{
UINT32* desty = &bitmap.pix32(y, 0);
UINT16* srcy;
-
+
srcy = vdp->m_render_line_raw;
for (int x = cliprect.min_x; x <= cliprect.max_x; x++)
@@ -1373,7 +1373,7 @@ static MACHINE_CONFIG_START( segac, segac2_state )
MCFG_MACHINE_RESET(segac2)
MCFG_NVRAM_ADD_RANDOM_FILL("nvram")
-// MCFG_FRAGMENT_ADD(megadriv_timers)
+// MCFG_FRAGMENT_ADD(megadriv_timers)
MCFG_DEVICE_ADD("gen_vdp", SEGA_GEN_VDP, 0)
sega_genesis_vdp_device::set_genesis_vdp_sndirqline_callback(*device, genesis_vdp_sndirqline_callback_segac2);
diff --git a/src/mame/drivers/segahang.c b/src/mame/drivers/segahang.c
index 418bb2a1116..ffc7caaf2b0 100644
--- a/src/mame/drivers/segahang.c
+++ b/src/mame/drivers/segahang.c
@@ -59,7 +59,7 @@
//**************************************************************************
-// CONSTANTS
+// CONSTANTS
//**************************************************************************
const UINT32 MASTER_CLOCK_25MHz = 25174800;
@@ -69,7 +69,7 @@ const UINT32 MASTER_CLOCK_8MHz = 8000000;
//**************************************************************************
-// PPI INTERFACES
+// PPI INTERFACES
//**************************************************************************
static I8255_INTERFACE(hangon_ppi_intf_0)
@@ -95,12 +95,12 @@ static I8255_INTERFACE(hangon_ppi_intf_1)
//**************************************************************************
-// PPI READ/WRITE CALLBACKS
+// PPI READ/WRITE CALLBACKS
//**************************************************************************
//-------------------------------------------------
// video_lamps_w - screen flip, sprite shadows,
-// display enable, lamps, and coin counters
+// display enable, lamps, and coin counters
//-------------------------------------------------
WRITE8_MEMBER( segahang_state::video_lamps_w )
@@ -120,7 +120,7 @@ WRITE8_MEMBER( segahang_state::video_lamps_w )
// bit 7: screen flip
segaic16_tilemap_set_flip(machine(), 0, data & 0x80);
segaic16_sprites_set_flip(machine(), 0, data & 0x80);
-
+
// bit 6: shadow/highlight control
segaic16_sprites_set_shadow(machine(), 0, ~data & 0x40);
@@ -130,7 +130,7 @@ WRITE8_MEMBER( segahang_state::video_lamps_w )
// bits 2 & 3: control the lamps
set_led_status(machine(), 1, data & 0x08);
set_led_status(machine(), 0, data & 0x04);
-
+
// bits 0 & 1: update coin counters
coin_counter_w(machine(), 1, data & 0x02);
coin_counter_w(machine(), 0, data & 0x01);
@@ -139,7 +139,7 @@ WRITE8_MEMBER( segahang_state::video_lamps_w )
//-------------------------------------------------
// tilemap_sound_w - handshaking bits, plus
-// tilemap control and global sound mute
+// tilemap control and global sound mute
//-------------------------------------------------
WRITE8_MEMBER( segahang_state::tilemap_sound_w )
@@ -156,14 +156,14 @@ WRITE8_MEMBER( segahang_state::tilemap_sound_w )
// D1 : SCONT0 - Tilemap origin bit 0
// D0 : MUTE (1= audio on, 0= audio off)
//
-
+
// bit 7: NMI signal to the sound CPU
m_soundcpu->set_input_line(INPUT_LINE_NMI, (data & 0x80) ? CLEAR_LINE : ASSERT_LINE);
-
+
// bits 1 & 2: tilemap origin
segaic16_tilemap_set_colscroll(machine(), 0, ~data & 0x04);
segaic16_tilemap_set_rowscroll(machine(), 0, ~data & 0x02);
-
+
// bit 0: sound mute
machine().sound().system_enable(data & 0x01);
}
@@ -171,22 +171,22 @@ WRITE8_MEMBER( segahang_state::tilemap_sound_w )
//-------------------------------------------------
// sub_control_adc_w - sub CPU control and ADC
-// selects
+// selects
//-------------------------------------------------
WRITE8_MEMBER( segahang_state::sub_control_adc_w )
{
//
- // Sub PPI port A
+ // Sub PPI port A
//
// D6 : INTR line on second CPU
// D5 : RESET line on second CPU
// D3-D2 : ADC_SELECT
//
-
+
// bit 6: INTR line
m_subcpu->set_input_line(4, (data & 0x40) ? CLEAR_LINE : ASSERT_LINE);
-
+
// bit 5: RESET line
m_subcpu->set_input_line(INPUT_LINE_RESET, (data & 0x20) ? ASSERT_LINE : CLEAR_LINE);
@@ -213,7 +213,7 @@ READ8_MEMBER( segahang_state::adc_status_r )
//**************************************************************************
-// MAIN CPU READ/WRITE HANDLERS
+// MAIN CPU READ/WRITE HANDLERS
//**************************************************************************
//-------------------------------------------------
@@ -277,7 +277,7 @@ WRITE16_MEMBER( segahang_state::hangon_io_w )
//-------------------------------------------------
// sharrier_io_r - I/O handler for Space Harrier
-// boards
+// boards
//-------------------------------------------------
READ16_MEMBER( segahang_state::sharrier_io_r )
@@ -311,7 +311,7 @@ READ16_MEMBER( segahang_state::sharrier_io_r )
//-------------------------------------------------
// sharrier_io_w - I/O handler for Space Harrier
-// boards
+// boards
//-------------------------------------------------
WRITE16_MEMBER( segahang_state::sharrier_io_w )
@@ -354,7 +354,7 @@ static TIMER_DEVICE_CALLBACK( hangon_irq )
//**************************************************************************
-// Z80 SOUND CPU READ/WRITE HANDLERS
+// Z80 SOUND CPU READ/WRITE HANDLERS
//**************************************************************************
//-------------------------------------------------
@@ -381,12 +381,12 @@ WRITE_LINE_MEMBER( segahang_state::sound_irq )
//**************************************************************************
-// I8751-RELATED VBLANK INTERRUPT HANDLERS
+// I8751-RELATED VBLANK INTERRUPT HANDLERS
//**************************************************************************
//-------------------------------------------------
// i8751_main_cpu_vblank - if we have a fake
-// handler, we hook this to execute it
+// handler, we hook this to execute it
//-------------------------------------------------
INTERRUPT_GEN_MEMBER( segahang_state::i8751_main_cpu_vblank )
@@ -399,7 +399,7 @@ INTERRUPT_GEN_MEMBER( segahang_state::i8751_main_cpu_vblank )
//**************************************************************************
-// DRIVER OVERRIDES
+// DRIVER OVERRIDES
//**************************************************************************
//-------------------------------------------------
@@ -434,7 +434,7 @@ void segahang_state::device_timer(emu_timer &timer, device_timer_id id, int para
else if (m_mcu != NULL)
machine().scheduler().boost_interleave(attotime::zero, attotime::from_msec(10));
break;
-
+
// synchronize writes to the 8255 PPI
case TID_PPI_WRITE:
m_i8255_1->write(*m_maincpu->space(AS_PROGRAM), param >> 8, param & 0xff);
@@ -445,12 +445,12 @@ void segahang_state::device_timer(emu_timer &timer, device_timer_id id, int para
//**************************************************************************
-// I8751 SIMULATIONS
+// I8751 SIMULATIONS
//**************************************************************************
//-------------------------------------------------
// sharrier_i8751_sim - simulate the I8751
-// from Space Harrier
+// from Space Harrier
//-------------------------------------------------
void segahang_state::sharrier_i8751_sim()
@@ -465,7 +465,7 @@ void segahang_state::sharrier_i8751_sim()
//**************************************************************************
-// MAIN CPU ADDRESS MAPS
+// MAIN CPU ADDRESS MAPS
//**************************************************************************
static ADDRESS_MAP_START( hangon_map, AS_PROGRAM, 16, segahang_state )
@@ -498,7 +498,7 @@ ADDRESS_MAP_END
//**************************************************************************
-// SUB CPU ADDRESS MAPS
+// SUB CPU ADDRESS MAPS
//**************************************************************************
// On Super Hang On there is a memory mapper, like the System16 one, todo: emulate it!
@@ -513,7 +513,7 @@ ADDRESS_MAP_END
//**************************************************************************
-// SOUND CPU ADDRESS MAPS
+// SOUND CPU ADDRESS MAPS
//**************************************************************************
static ADDRESS_MAP_START( sound_map_2203, AS_PROGRAM, 8, segahang_state )
@@ -555,7 +555,7 @@ ADDRESS_MAP_END
//**************************************************************************
-// I8751 MCU ADDRESS MAPS
+// I8751 MCU ADDRESS MAPS
//**************************************************************************
static ADDRESS_MAP_START( mcu_io_map, AS_IO, 8, segahang_state )
@@ -564,7 +564,7 @@ ADDRESS_MAP_END
//**************************************************************************
-// GENERIC PORT DEFINITIONS
+// GENERIC PORT DEFINITIONS
//**************************************************************************
static INPUT_PORTS_START( hangon_generic )
@@ -627,7 +627,7 @@ INPUT_PORTS_END
//**************************************************************************
-// GAME-SPECIFIC PORT DEFINITIONS
+// GAME-SPECIFIC PORT DEFINITIONS
//**************************************************************************
static INPUT_PORTS_START( hangon )
@@ -789,7 +789,7 @@ INPUT_PORTS_END
//**************************************************************************
-// SOUND CONFIGURATIONS
+// SOUND CONFIGURATIONS
//**************************************************************************
static const ym2203_interface ym2203_config =
@@ -815,7 +815,7 @@ static const sega_pcm_interface segapcm_interface =
//**************************************************************************
-// GRAPHICS DECODING
+// GRAPHICS DECODING
//**************************************************************************
static GFXDECODE_START( segahang )
@@ -825,7 +825,7 @@ GFXDECODE_END
//**************************************************************************
-// GENERIC MACHINE DRIVERS
+// GENERIC MACHINE DRIVERS
//**************************************************************************
static MACHINE_CONFIG_START( shared_base, segahang_state )
@@ -973,7 +973,7 @@ MACHINE_CONFIG_END
//**************************************************************************
-// SPECIFIC MACHINE DRIVERS
+// SPECIFIC MACHINE DRIVERS
//**************************************************************************
static MACHINE_CONFIG_DERIVED( hangon, hangon_base )
@@ -1032,7 +1032,7 @@ MACHINE_CONFIG_END
//**************************************************************************
-// ROM definitions
+// ROM definitions
//**************************************************************************
@@ -1152,15 +1152,15 @@ ROM_END
//*************************************************************************************************************************
//*************************************************************************************************************************
//*************************************************************************************************************************
-// Super Hang-On (Japan Ver.)
-// (c)1987 Sega
-// Ride-on Type
+// Super Hang-On (Japan Ver.)
+// (c)1987 Sega
+// Ride-on Type
//
-// CPU: FD1094 317-0038
+// CPU: FD1094 317-0038
//
-// Top : Label 834-6273
-// Middle: 834-5704 (Label 837-6340)
-// Bottom: 834-5668 (Label 837-6341)
+// Top : Label 834-6273
+// Middle: 834-5704 (Label 837-6340)
+// Bottom: 834-5668 (Label 837-6341)
//
ROM_START( shangonro )
ROM_REGION( 0x40000, "maincpu", 0 ) // 68000 code
@@ -1353,7 +1353,7 @@ ROM_END
//*************************************************************************************************************************
// Space Harrier
-// CPU: 68000 + i8751 (315-5163)
+// CPU: 68000 + i8751 (315-5163)
//
// ASSY CPU BD 834-5797
// ASSY CONTROL BD 834-5798
@@ -1745,7 +1745,7 @@ ROM_END
//**************************************************************************
-// CONFIGURATION
+// CONFIGURATION
//**************************************************************************
//-------------------------------------------------
@@ -1809,7 +1809,7 @@ DRIVER_INIT_MEMBER(segahang_state,endurob2)
//**************************************************************************
-// GAME DRIVERS
+// GAME DRIVERS
//**************************************************************************
// YEAR, NAME, PARENT, MACHINE, INPUT, INIT, MONITOR,COMPANY,FULLNAME,FLAGS
diff --git a/src/mame/drivers/segaorun.c b/src/mame/drivers/segaorun.c
index 3fcf64a58e2..d813946f88b 100644
--- a/src/mame/drivers/segaorun.c
+++ b/src/mame/drivers/segaorun.c
@@ -312,7 +312,7 @@ Notes:
//**************************************************************************
-// CONSTANTS
+// CONSTANTS
//**************************************************************************
const UINT32 MASTER_CLOCK = XTAL_40MHz;
@@ -322,7 +322,7 @@ const UINT32 MASTER_CLOCK_25MHz = XTAL_25_1748MHz;
//**************************************************************************
-// PPI INTERFACES
+// PPI INTERFACES
//**************************************************************************
static I8255_INTERFACE(single_ppi_intf)
@@ -338,12 +338,12 @@ static I8255_INTERFACE(single_ppi_intf)
//**************************************************************************
-// PPI READ/WRITE CALLBACKS
+// PPI READ/WRITE CALLBACKS
//**************************************************************************
//-------------------------------------------------
// unknown_port*_r - loggers for reading
-// unknown ports
+// unknown ports
//-------------------------------------------------
READ8_MEMBER( segaorun_state::unknown_porta_r )
@@ -367,7 +367,7 @@ READ8_MEMBER( segaorun_state::unknown_portc_r )
//-------------------------------------------------
// unknown_port*_w - loggers for writing
-// unknown ports
+// unknown ports
//-------------------------------------------------
WRITE8_MEMBER( segaorun_state::unknown_porta_w )
@@ -383,7 +383,7 @@ WRITE8_MEMBER( segaorun_state::unknown_portb_w )
//-------------------------------------------------
// video_control_w - display enable, ADC select,
-// sound interrupt control
+// sound interrupt control
//-------------------------------------------------
WRITE8_MEMBER( segaorun_state::video_control_w )
@@ -395,7 +395,7 @@ WRITE8_MEMBER( segaorun_state::video_control_w )
// D4-D2: (ADC2-0)
// D1: (CONT) - affects sprite hardware
// D0: Sound section reset (1= normal operation, 0= reset)
-
+
segaic16_set_display_enable(machine(), data & 0x20);
m_adc_select = (data >> 2) & 7;
m_soundcpu->set_input_line(INPUT_LINE_RESET, (data & 0x01) ? CLEAR_LINE : ASSERT_LINE);
@@ -404,12 +404,12 @@ WRITE8_MEMBER( segaorun_state::video_control_w )
//**************************************************************************
-// MEMORY MAPPING
+// MEMORY MAPPING
//**************************************************************************
//-------------------------------------------------
// memory_mapper - callback to implement memory
-// mapping for a given index
+// mapping for a given index
//-------------------------------------------------
void segaorun_state::memory_mapper(sega_315_5195_mapper_device &mapper, UINT8 index)
@@ -422,24 +422,24 @@ void segaorun_state::memory_mapper(sega_315_5195_mapper_device &mapper, UINT8 in
mapper.map_as_ram(0x60000, 0x08000, 0xf18000, "cpu1ram", write16_delegate());
mapper.map_as_ram(0x00000, 0x60000, 0xf00000, "cpu1rom", write16_delegate(FUNC(segaorun_state::nop_w), this));
break;
-
+
case 4:
mapper.map_as_handler(0x90000, 0x10000, 0xf00000, read16_delegate(FUNC(segaorun_state::misc_io_r), this), write16_delegate(FUNC(segaorun_state::misc_io_w), this));
break;
-
+
case 3:
mapper.map_as_ram(0x00000, 0x01000, 0xfff000, "spriteram", write16_delegate());
break;
-
+
case 2:
mapper.map_as_ram(0x00000, 0x02000, 0xffe000, "paletteram", write16_delegate(FUNC(segaorun_state::legacy_wrapper<segaic16_paletteram_w>), this));
break;
-
+
case 1:
mapper.map_as_ram(0x00000, 0x10000, 0xfe0000, "tileram", write16_delegate(FUNC(segaorun_state::legacy_wrapper<segaic16_tileram_0_w>), this));
mapper.map_as_ram(0x10000, 0x01000, 0xfef000, "textram", write16_delegate(FUNC(segaorun_state::legacy_wrapper<segaic16_textram_0_w>), this));
break;
-
+
case 0:
mapper.map_as_ram(0x60000, 0x08000, 0xf98000, "workram", write16_delegate());
mapper.map_as_rom(0x00000, 0x60000, 0xf80000, "rom0base", 0x00000, write16_delegate());
@@ -450,7 +450,7 @@ void segaorun_state::memory_mapper(sega_315_5195_mapper_device &mapper, UINT8 in
//-------------------------------------------------
// mapper_sound_r - callback when the sound I/O
-// port on the memory mapper is read
+// port on the memory mapper is read
//-------------------------------------------------
UINT8 segaorun_state::mapper_sound_r()
@@ -461,7 +461,7 @@ UINT8 segaorun_state::mapper_sound_r()
//-------------------------------------------------
// mapper_sound_w - callback when the sound I/O
-// port on the memory mapper is written
+// port on the memory mapper is written
//-------------------------------------------------
void segaorun_state::mapper_sound_w(UINT8 data)
@@ -472,7 +472,7 @@ void segaorun_state::mapper_sound_w(UINT8 data)
//**************************************************************************
-// MAIN CPU READ/WRITE HANDLERS
+// MAIN CPU READ/WRITE HANDLERS
//**************************************************************************
//-------------------------------------------------
@@ -514,11 +514,11 @@ WRITE16_MEMBER( segaorun_state::nop_w )
//**************************************************************************
-// Z80 SOUND CPU READ/WRITE HANDLERS
+// Z80 SOUND CPU READ/WRITE HANDLERS
//**************************************************************************
//-------------------------------------------------
-// sound_data_r - handle sound board reads from
+// sound_data_r - handle sound board reads from
// the sound latch
//-------------------------------------------------
@@ -531,7 +531,7 @@ READ8_MEMBER( segaorun_state::sound_data_r )
//**************************************************************************
-// DRIVER OVERRIDES
+// DRIVER OVERRIDES
//**************************************************************************
//-------------------------------------------------
@@ -565,13 +565,13 @@ void segaorun_state::device_timer(emu_timer &timer, device_timer_id id, int para
soundlatch_write(param);
m_soundcpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE);
break;
-
+
case TID_IRQ2_GEN:
// set the IRQ2 line
m_irq2_state = 1;
update_main_irqs();
break;
-
+
case TID_SCANLINE:
{
int scanline = param;
@@ -624,12 +624,12 @@ void segaorun_state::device_timer(emu_timer &timer, device_timer_id id, int para
//**************************************************************************
-// CUSTOM I/O HANDLERS
+// CUSTOM I/O HANDLERS
//**************************************************************************
//-------------------------------------------------
// outrun_custom_io_r - custom I/O read handler
-// for Out Run
+// for Out Run
//-------------------------------------------------
READ16_MEMBER( segaorun_state::outrun_custom_io_r )
@@ -663,7 +663,7 @@ READ16_MEMBER( segaorun_state::outrun_custom_io_r )
//-------------------------------------------------
// outrun_custom_io_w - custom I/O write handler
-// for Out Run
+// for Out Run
//-------------------------------------------------
WRITE16_MEMBER( segaorun_state::outrun_custom_io_w )
@@ -704,7 +704,7 @@ WRITE16_MEMBER( segaorun_state::outrun_custom_io_w )
//-------------------------------------------------
// shangon_custom_io_r - custom I/O read handler
-// for Super Hang-On
+// for Super Hang-On
//-------------------------------------------------
READ16_MEMBER( segaorun_state::shangon_custom_io_r )
@@ -734,7 +734,7 @@ READ16_MEMBER( segaorun_state::shangon_custom_io_r )
//-------------------------------------------------
// shangon_custom_io_w - custom I/O write handler
-// for Super Hang-On
+// for Super Hang-On
//-------------------------------------------------
WRITE16_MEMBER( segaorun_state::shangon_custom_io_w )
@@ -770,12 +770,12 @@ WRITE16_MEMBER( segaorun_state::shangon_custom_io_w )
//**************************************************************************
-// INTERNAL HELPERS
+// INTERNAL HELPERS
//**************************************************************************
//-------------------------------------------------
// update_main_irqs - flush IRQ state to the
-// CPU device
+// CPU device
//-------------------------------------------------
void segaorun_state::update_main_irqs()
@@ -793,7 +793,7 @@ void segaorun_state::update_main_irqs()
//-------------------------------------------------
// m68k_reset_callback - callback for when the
-// main 68000 is reset
+// main 68000 is reset
//-------------------------------------------------
void segaorun_state::m68k_reset_callback(device_t *device)
@@ -805,13 +805,13 @@ void segaorun_state::m68k_reset_callback(device_t *device)
//**************************************************************************
-// MAIN CPU MEMORY MAP
+// MAIN CPU MEMORY MAP
//**************************************************************************
static ADDRESS_MAP_START( outrun_map, AS_PROGRAM, 16, segaorun_state )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x000000, 0xffffff) AM_DEVREADWRITE8("mapper", sega_315_5195_mapper_device, read, write, 0x00ff)
-
+
// these get overwritten by the memory mapper above, but we put them here
// so they are properly allocated and tracked for saving
AM_RANGE(0x100000, 0x100fff) AM_RAM AM_SHARE("spriteram")
@@ -824,7 +824,7 @@ ADDRESS_MAP_END
//**************************************************************************
-// SECOND CPU MEMORY MAP
+// SECOND CPU MEMORY MAP
//**************************************************************************
static ADDRESS_MAP_START( sub_map, AS_PROGRAM, 16, segaorun_state )
@@ -839,7 +839,7 @@ ADDRESS_MAP_END
//**************************************************************************
-// SOUND CPU MEMORY MAP
+// SOUND CPU MEMORY MAP
//**************************************************************************
static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, segaorun_state )
@@ -859,7 +859,7 @@ ADDRESS_MAP_END
//**************************************************************************
-// GENERIC PORT DEFINITIONS
+// GENERIC PORT DEFINITIONS
//**************************************************************************
static INPUT_PORTS_START( outrun_generic )
@@ -910,7 +910,7 @@ INPUT_PORTS_END
//**************************************************************************
-// GAME-SPECIFIC PORT DEFINITIONS
+// GAME-SPECIFIC PORT DEFINITIONS
//**************************************************************************
static INPUT_PORTS_START( outrun )
@@ -1041,7 +1041,7 @@ INPUT_PORTS_END
//**************************************************************************
-// SOUND DEFINITIONS
+// SOUND DEFINITIONS
//**************************************************************************
static const sega_pcm_interface segapcm_interface =
@@ -1052,7 +1052,7 @@ static const sega_pcm_interface segapcm_interface =
//**************************************************************************
-// GRAPHICS DEFINITIONS
+// GRAPHICS DEFINITIONS
//**************************************************************************
static GFXDECODE_START( segaorun )
@@ -1062,7 +1062,7 @@ GFXDECODE_END
//**************************************************************************
-// GENERIC MACHINE DRIVERS
+// GENERIC MACHINE DRIVERS
//**************************************************************************
static MACHINE_CONFIG_START( outrun_base, segaorun_state )
@@ -1107,7 +1107,7 @@ MACHINE_CONFIG_END
//**************************************************************************
-// GAME-SPECIFIC MACHINE DRIVERS
+// GAME-SPECIFIC MACHINE DRIVERS
//**************************************************************************
static MACHINE_CONFIG_DERIVED( outrundx, outrun_base )
@@ -1144,7 +1144,7 @@ MACHINE_CONFIG_END
//**************************************************************************
-// ROM DEFINITIONS
+// ROM DEFINITIONS
//**************************************************************************
@@ -1605,10 +1605,10 @@ ROM_END
// CPU BD SUPER HANG-ON 837-6278-01 (or 837-6278-03)
// VIDEO BD SUPER HANG-ON 837-6279 (or 837-6279-02, roms would be "OPR")
//
-// Manual states for this set:
-// 834-6277-01 (Object data (sprits) EPR type AKA EP-ROM type)
-// 834-6277-03 (Object data (sprits) MPR type AKA Mask-ROM type)
-// 834-6277-05 (Object data (sprits) OPR type AKA One Time ROM type)
+// Manual states for this set:
+// 834-6277-01 (Object data (sprits) EPR type AKA EP-ROM type)
+// 834-6277-03 (Object data (sprits) MPR type AKA Mask-ROM type)
+// 834-6277-05 (Object data (sprits) OPR type AKA One Time ROM type)
//
ROM_START( shangon3 )
ROM_REGION( 0x60000, "maincpu", 0 ) // 68000 code - protected
@@ -1794,7 +1794,7 @@ ROM_END
// VIDEO BD SUPER HANG-ON 837-6279 (or 837-6279-02, rom would be "OPR")
//
ROM_START( shangonle )
- ROM_REGION( 0x60000, "maincpu", 0 ) // 68000 code
+ ROM_REGION( 0x60000, "maincpu", 0 ) // 68000 code
ROM_LOAD16_BYTE( "epr-13944.133", 0x000000, 0x10000, CRC(989a80db) SHA1(5026e5cf52d4fd85a0bab6c4ea7a34cf266b2a3b) )
ROM_LOAD16_BYTE( "epr-13943.118", 0x000001, 0x10000, CRC(426e3050) SHA1(f332ea76285b4e1361d818cbe5aab0640b4185c3) )
ROM_LOAD16_BYTE( "epr-10899.132", 0x020000, 0x10000, CRC(bb3faa37) SHA1(ccf3352255503fd6619e6e116d187a8cd1ff75e6) )
@@ -2103,7 +2103,7 @@ ROM_END
//**************************************************************************
-// CONFIGURATION
+// CONFIGURATION
//**************************************************************************
//-------------------------------------------------
@@ -2193,7 +2193,7 @@ DRIVER_INIT_MEMBER(segaorun_state,shangon)
//**************************************************************************
-// GAME DRIVERS
+// GAME DRIVERS
//**************************************************************************
// YEAR, NAME, PARENT, MACHINE, INPUT, INIT, MONITOR,COMPANY,FULLNAME,FLAGS, LAYOUT
diff --git a/src/mame/drivers/segas16a.c b/src/mame/drivers/segas16a.c
index 3962051c17e..735c1ebdacb 100644
--- a/src/mame/drivers/segas16a.c
+++ b/src/mame/drivers/segas16a.c
@@ -185,7 +185,7 @@ Tetris - - - - EPR12169 EPR12170 -
//**************************************************************************
-// PPI INTERFACES
+// PPI INTERFACES
//**************************************************************************
static I8255_INTERFACE(single_ppi_intf)
@@ -201,7 +201,7 @@ static I8255_INTERFACE(single_ppi_intf)
//**************************************************************************
-// PPI READ/WRITE CALLBACKS
+// PPI READ/WRITE CALLBACKS
//**************************************************************************
//-------------------------------------------------
@@ -241,7 +241,7 @@ WRITE8_MEMBER( segas16a_state::misc_control_w )
// bit 4: enable display
segaic16_set_display_enable(machine(), data & 0x10);
-
+
// bits 0 & 1: update coin counters
coin_counter_w(machine(), 1, data & 0x02);
coin_counter_w(machine(), 0, data & 0x01);
@@ -276,7 +276,7 @@ WRITE8_MEMBER( segas16a_state::tilemap_sound_w )
//**************************************************************************
-// MAIN CPU READ/WRITE HANDLERS
+// MAIN CPU READ/WRITE HANDLERS
//**************************************************************************
//-------------------------------------------------
@@ -349,7 +349,7 @@ WRITE16_MEMBER( segas16a_state::misc_io_w )
//**************************************************************************
-// Z80 SOUND CPU READ/WRITE HANDLERS
+// Z80 SOUND CPU READ/WRITE HANDLERS
//**************************************************************************
//-------------------------------------------------
@@ -433,7 +433,7 @@ WRITE8_DEVICE_HANDLER( segas16a_state::static_n7751_rom_offset_w )
//**************************************************************************
-// N7751 SOUND GENERATOR CPU READ/WRITE HANDLERS
+// N7751 SOUND GENERATOR CPU READ/WRITE HANDLERS
//**************************************************************************
//-------------------------------------------------
@@ -486,7 +486,7 @@ READ8_MEMBER( segas16a_state::n7751_t1_r )
//**************************************************************************
-// I8751 MCU READ/WRITE HANDLERS
+// I8751 MCU READ/WRITE HANDLERS
//**************************************************************************
//-------------------------------------------------
@@ -501,7 +501,7 @@ WRITE8_MEMBER( segas16a_state::mcu_control_w )
// apply reset to the main CPU
m_maincpu->set_input_line(INPUT_LINE_RESET, (data & 0x40) ? ASSERT_LINE : CLEAR_LINE);
-
+
// apply IRQ bits to the main CPU
for (int irqline = 1; irqline <= 7; irqline++)
m_maincpu->set_input_line(irqline, ((~data & 7) == irqline) ? ASSERT_LINE : CLEAR_LINE);
@@ -521,7 +521,7 @@ WRITE8_MEMBER( segas16a_state::mcu_control_w )
//-------------------------------------------------
// mcu_io_w - handle I/O space writes, which map
-// to the 68000's address space
+// to the 68000's address space
//-------------------------------------------------
WRITE8_MEMBER( segas16a_state::mcu_io_w )
@@ -576,7 +576,7 @@ WRITE8_MEMBER( segas16a_state::mcu_io_w )
//-------------------------------------------------
// mcu_io_r - handle I/O space reads, which map
-// to the 68000's address space
+// to the 68000's address space
//-------------------------------------------------
READ8_MEMBER( segas16a_state::mcu_io_r )
@@ -586,12 +586,12 @@ READ8_MEMBER( segas16a_state::mcu_io_r )
case 0:
// access watchdog? (unsure about this one)
if (offset >= 0x0000 && offset < 0x3fff)
- return watchdog_reset_r(space, 0);
-
+ return watchdog_reset_r(space, 0);
+
// access main work RAM
else if (offset >= 0x4000 && offset < 0x8000)
return m_maincpu->space(AS_PROGRAM)->read_byte(0xc70001 ^ (offset & 0x3fff));
-
+
// access misc I/O space
else if (offset >= 0x8000 && offset < 0xc000)
return m_maincpu->space(AS_PROGRAM)->read_byte(0xc40001 ^ (offset & 0x3fff));
@@ -627,13 +627,13 @@ READ8_MEMBER( segas16a_state::mcu_io_r )
//**************************************************************************
-// I8751-RELATED VBLANK INTERRUPT HANDLERS
+// I8751-RELATED VBLANK INTERRUPT HANDLERS
//**************************************************************************
//-------------------------------------------------
// mcu_irq_assert - signal an interrupt to the
-// I8751 MCU, and boost interleave to ensure
-// good synchronization with the main CPU
+// I8751 MCU, and boost interleave to ensure
+// good synchronization with the main CPU
//-------------------------------------------------
INTERRUPT_GEN_MEMBER( segas16a_state::mcu_irq_assert )
@@ -649,7 +649,7 @@ INTERRUPT_GEN_MEMBER( segas16a_state::mcu_irq_assert )
//-------------------------------------------------
// i8751_main_cpu_vblank - if we have a fake
-// handler, we hook this to execute it
+// handler, we hook this to execute it
//-------------------------------------------------
INTERRUPT_GEN_MEMBER( segas16a_state::i8751_main_cpu_vblank )
@@ -662,7 +662,7 @@ INTERRUPT_GEN_MEMBER( segas16a_state::i8751_main_cpu_vblank )
//**************************************************************************
-// DRIVER OVERRIDES
+// DRIVER OVERRIDES
//**************************************************************************
//-------------------------------------------------
@@ -692,7 +692,7 @@ void segas16a_state::device_timer(emu_timer &timer, device_timer_id id, int para
else if (m_mcu != NULL)
machine().scheduler().boost_interleave(attotime::zero, attotime::from_msec(10));
break;
-
+
// synchronize writes to the 8255 PPI
case TID_PPI_WRITE:
m_i8255->write(*m_maincpu->space(AS_PROGRAM), param >> 8, param & 0xff);
@@ -703,12 +703,12 @@ void segas16a_state::device_timer(emu_timer &timer, device_timer_id id, int para
//**************************************************************************
-// I8751 SIMULATIONS
+// I8751 SIMULATIONS
//**************************************************************************
//-------------------------------------------------
// dumpmtmt_i8751_sim - simulate the I8751
-// from Dump Matsumoto
+// from Dump Matsumoto
//-------------------------------------------------
void segas16a_state::dumpmtmt_i8751_sim()
@@ -758,7 +758,7 @@ void segas16a_state::dumpmtmt_i8751_sim()
//-------------------------------------------------
// quartet_i8751_sim - simulate the I8751
-// from Quartet
+// from Quartet
//-------------------------------------------------
void segas16a_state::quartet_i8751_sim()
@@ -779,12 +779,12 @@ void segas16a_state::quartet_i8751_sim()
//**************************************************************************
-// CUSTOM I/O HANDLERS
+// CUSTOM I/O HANDLERS
//**************************************************************************
//-------------------------------------------------
// aceattaa_custom_io_r - custom I/O read handler
-// for Ace Attacker
+// for Ace Attacker
//-------------------------------------------------
READ16_MEMBER( segas16a_state::aceattaa_custom_io_r )
@@ -831,7 +831,7 @@ READ16_MEMBER( segas16a_state::aceattaa_custom_io_r )
//-------------------------------------------------
// mjleague_custom_io_r - custom I/O read handler
-// for Major League
+// for Major League
//-------------------------------------------------
READ16_MEMBER( segas16a_state::mjleague_custom_io_r )
@@ -911,7 +911,7 @@ READ16_MEMBER( segas16a_state::mjleague_custom_io_r )
//-------------------------------------------------
// passsht16a_custom_io_r - custom I/O read handler
-// for Passing Shot
+// for Passing Shot
//-------------------------------------------------
READ16_MEMBER( segas16a_state::passsht16a_custom_io_r )
@@ -944,7 +944,7 @@ READ16_MEMBER( segas16a_state::passsht16a_custom_io_r )
//-------------------------------------------------
// sdi_custom_io_r - custom I/O read handler
-// for SDI
+// for SDI
//-------------------------------------------------
READ16_MEMBER( segas16a_state::sdi_custom_io_r )
@@ -965,7 +965,7 @@ READ16_MEMBER( segas16a_state::sdi_custom_io_r )
//-------------------------------------------------
// sjryuko_custom_io_r - custom I/O read handler
-// for Sukeban Jansi Ryuko
+// for Sukeban Jansi Ryuko
//-------------------------------------------------
READ16_MEMBER( segas16a_state::sjryuko_custom_io_r )
@@ -999,7 +999,7 @@ void segas16a_state::sjryuko_lamp_changed_w(UINT8 changed, UINT8 newval)
//**************************************************************************
-// MAIN CPU ADDRESS MAPS
+// MAIN CPU ADDRESS MAPS
//**************************************************************************
static ADDRESS_MAP_START( system16a_map, AS_PROGRAM, 16, segas16a_state )
@@ -1017,7 +1017,7 @@ ADDRESS_MAP_END
//**************************************************************************
-// SOUND CPU ADDRESS MAPS
+// SOUND CPU ADDRESS MAPS
//**************************************************************************
static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, segas16a_state )
@@ -1038,7 +1038,7 @@ ADDRESS_MAP_END
//**************************************************************************
-// N7751 SOUND GENERATOR CPU ADDRESS MAPS
+// N7751 SOUND GENERATOR CPU ADDRESS MAPS
//**************************************************************************
static ADDRESS_MAP_START( n7751_portmap, AS_IO, 8, segas16a_state )
@@ -1052,7 +1052,7 @@ ADDRESS_MAP_END
//**************************************************************************
-// I8751 MCU ADDRESS MAPS
+// I8751 MCU ADDRESS MAPS
//**************************************************************************
static ADDRESS_MAP_START( mcu_io_map, AS_IO, 8, segas16a_state )
@@ -1065,7 +1065,7 @@ ADDRESS_MAP_END
//**************************************************************************
-// GENERIC PORT DEFINITIONS
+// GENERIC PORT DEFINITIONS
//**************************************************************************
static INPUT_PORTS_START( system16a_generic )
@@ -1119,7 +1119,7 @@ INPUT_PORTS_END
//**************************************************************************
-// GAME-SPECIFIC PORT DEFINITIONS
+// GAME-SPECIFIC PORT DEFINITIONS
//**************************************************************************
static INPUT_PORTS_START( aceattaa )
@@ -1917,7 +1917,7 @@ INPUT_PORTS_END
//**************************************************************************
-// SOUND CONFIGURATIONS
+// SOUND CONFIGURATIONS
//**************************************************************************
static const ym2151_interface ym2151_config =
@@ -1929,7 +1929,7 @@ static const ym2151_interface ym2151_config =
//**************************************************************************
-// GRAPHICS DECODING
+// GRAPHICS DECODING
//**************************************************************************
static GFXDECODE_START( segas16a )
@@ -1939,7 +1939,7 @@ GFXDECODE_END
//**************************************************************************
-// GENERIC MACHINE DRIVERS
+// GENERIC MACHINE DRIVERS
//**************************************************************************
static MACHINE_CONFIG_START( system16a, segas16a_state )
@@ -2050,7 +2050,7 @@ MACHINE_CONFIG_END
//**************************************************************************
-// ROM definitions
+// ROM definitions
//**************************************************************************
@@ -3443,7 +3443,7 @@ ROM_END
//**************************************************************************
-// CONFIGURATION
+// CONFIGURATION
//**************************************************************************
//-------------------------------------------------
@@ -3533,7 +3533,7 @@ DRIVER_INIT_MEMBER(segas16a_state,sjryukoa)
//**************************************************************************
-// GAME DRIVERS
+// GAME DRIVERS
//**************************************************************************
// YEAR, NAME, PARENT, MACHINE, INPUT, INIT, MONITOR,COMPANY,FULLNAME,FLAGS
diff --git a/src/mame/drivers/segas16b.c b/src/mame/drivers/segas16b.c
index 1cc316afbc1..72e830d1073 100644
--- a/src/mame/drivers/segas16b.c
+++ b/src/mame/drivers/segas16b.c
@@ -906,7 +906,7 @@ CPU - 317-0092 |--------------------------------------------------------------
//**************************************************************************
-// CONSTANTS
+// CONSTANTS
//**************************************************************************
#define MASTER_CLOCK_10MHz XTAL_10MHz
@@ -916,12 +916,12 @@ CPU - 317-0092 |--------------------------------------------------------------
//**************************************************************************
-// MEMORY MAPPING
+// MEMORY MAPPING
//**************************************************************************
//-------------------------------------------------
// memory_mapper - callback to handle mapping
-// requests
+// requests
//-------------------------------------------------
void segas16b_state::memory_mapper(sega_315_5195_mapper_device &mapper, UINT8 index)
@@ -931,24 +931,24 @@ void segas16b_state::memory_mapper(sega_315_5195_mapper_device &mapper, UINT8 in
case 7: // 16k of I/O space
mapper.map_as_handler(0x00000, 0x04000, 0xffc000, m_custom_io_r, m_custom_io_w);
break;
-
+
case 6: // 4k of paletteram
mapper.map_as_ram(0x00000, 0x01000, 0xfff000, "paletteram", write16_delegate(FUNC(segas16b_state::legacy_wrapper<segaic16_paletteram_w>), this));
break;
-
+
case 5: // 64k of tileram + 4k of textram
mapper.map_as_ram(0x00000, 0x10000, 0xfe0000, "tileram", write16_delegate(FUNC(segas16b_state::legacy_wrapper<segaic16_tileram_0_w>), this));
mapper.map_as_ram(0x10000, 0x01000, 0xfef000, "textram", write16_delegate(FUNC(segas16b_state::legacy_wrapper<segaic16_textram_0_w>), this));
break;
-
+
case 4: // 2k of spriteram
mapper.map_as_ram(0x00000, 0x00800, 0xfff800, "spriteram", write16_delegate());
break;
-
+
case 3: // 16k or 256k of work RAM
mapper.map_as_ram(0x00000, m_workram.bytes(), ~(m_workram.bytes() - 1), "workram", write16_delegate());
break;
-
+
case 2: // 3rd ROM base, or board-specific banking
switch (m_romboard)
{
@@ -961,7 +961,7 @@ void segas16b_state::memory_mapper(sega_315_5195_mapper_device &mapper, UINT8 in
default: assert(false);
}
break;
-
+
case 1: // 2nd ROM base, banking & math, or sound for Korean games
switch (m_romboard)
{
@@ -974,7 +974,7 @@ void segas16b_state::memory_mapper(sega_315_5195_mapper_device &mapper, UINT8 in
default: assert(false);
}
break;
-
+
case 0: // 1st ROM base
switch (m_romboard)
{
@@ -993,7 +993,7 @@ void segas16b_state::memory_mapper(sega_315_5195_mapper_device &mapper, UINT8 in
//-------------------------------------------------
// mapper_sound_r - sound port read from the
-// memory mapper chip
+// memory mapper chip
//-------------------------------------------------
UINT8 segas16b_state::mapper_sound_r()
@@ -1004,7 +1004,7 @@ UINT8 segas16b_state::mapper_sound_r()
//-------------------------------------------------
// mapper_sound_w - sound port write from the
-// memory mapper chip
+// memory mapper chip
//-------------------------------------------------
void segas16b_state::mapper_sound_w(UINT8 data)
@@ -1017,12 +1017,12 @@ void segas16b_state::mapper_sound_w(UINT8 data)
//**************************************************************************
-// MAIN CPU READ/WRITE HANDLERS
+// MAIN CPU READ/WRITE HANDLERS
//**************************************************************************
//-------------------------------------------------
-// rom_5704_bank_w - ROM board 5704 tile bank
-// selection
+// rom_5704_bank_w - ROM board 5704 tile bank
+// selection
//-------------------------------------------------
WRITE16_MEMBER( segas16b_state::rom_5704_bank_w )
@@ -1034,7 +1034,7 @@ WRITE16_MEMBER( segas16b_state::rom_5704_bank_w )
//-------------------------------------------------
// rom_5797_bank_math_r - ROM board 5797 custom
-// math chip reads
+// math chip reads
//-------------------------------------------------
READ16_MEMBER( segas16b_state::rom_5797_bank_math_r )
@@ -1056,7 +1056,7 @@ READ16_MEMBER( segas16b_state::rom_5797_bank_math_r )
//-------------------------------------------------
// rom_5797_bank_math_r - ROM board 5797 custom
-// math chip writes, plus tile bank selection
+// math chip writes, plus tile bank selection
//-------------------------------------------------
WRITE16_MEMBER( segas16b_state::rom_5797_bank_math_w )
@@ -1084,7 +1084,7 @@ WRITE16_MEMBER( segas16b_state::rom_5797_bank_math_w )
//-------------------------------------------------
// unknown_rgn2_r - unknown region 2 reads;
-// for now treat as a second compare/timer chip
+// for now treat as a second compare/timer chip
//-------------------------------------------------
READ16_MEMBER( segas16b_state::unknown_rgn2_r )
@@ -1096,7 +1096,7 @@ READ16_MEMBER( segas16b_state::unknown_rgn2_r )
//-------------------------------------------------
// unknown_rgn2_w - unknown region 2 writes;
-// for now treat as a second compare/timer chip
+// for now treat as a second compare/timer chip
//-------------------------------------------------
WRITE16_MEMBER( segas16b_state::unknown_rgn2_w )
@@ -1164,8 +1164,8 @@ WRITE16_MEMBER( segas16b_state::standard_io_w )
//-------------------------------------------------
-// atomicp_sound_w - write sound data to the
-// YM2413 directly from the main CPU
+// atomicp_sound_w - write sound data to the
+// YM2413 directly from the main CPU
//-------------------------------------------------
WRITE16_MEMBER( segas16b_state::atomicp_sound_w )
@@ -1176,12 +1176,12 @@ WRITE16_MEMBER( segas16b_state::atomicp_sound_w )
//**************************************************************************
-// SOUND CPU READ/WRITE HANDLERS
+// SOUND CPU READ/WRITE HANDLERS
//**************************************************************************
//-------------------------------------------------
-// upd7759_control_w - handle writes to the
-// uPD7759 control register
+// upd7759_control_w - handle writes to the
+// uPD7759 control register
//-------------------------------------------------
WRITE8_MEMBER( segas16b_state::upd7759_control_w )
@@ -1242,11 +1242,11 @@ WRITE8_MEMBER( segas16b_state::upd7759_control_w )
bankoffs += ((data & 0x10) >> 4) * 0x20000;
bankoffs += (data & 0x07) * 0x04000;
break;
-
+
default:
assert(false);
}
-
+
// set the final bank
membank("soundbank")->set_base(memregion("soundcpu")->base() + 0x10000 + (bankoffs % size));
}
@@ -1255,7 +1255,7 @@ WRITE8_MEMBER( segas16b_state::upd7759_control_w )
//-------------------------------------------------
// upd7759_status_r - return the uPD7759 busy
-// bit in the top bit
+// bit in the top bit
//-------------------------------------------------
READ8_MEMBER( segas16b_state::upd7759_status_r )
@@ -1266,12 +1266,12 @@ READ8_MEMBER( segas16b_state::upd7759_status_r )
//**************************************************************************
-// OTHER CALLBACKS
+// OTHER CALLBACKS
//**************************************************************************
//-------------------------------------------------
// upd7759_generate_nmi - callback to signal an
-// NMI to the sound CPU
+// NMI to the sound CPU
//-------------------------------------------------
void segas16b_state::upd7759_generate_nmi(device_t *device, int state)
@@ -1284,7 +1284,7 @@ void segas16b_state::upd7759_generate_nmi(device_t *device, int state)
//-------------------------------------------------
// i8751_main_cpu_vblank - update the fake i8751
-// state if we have a handler
+// state if we have a handler
//-------------------------------------------------
INTERRUPT_GEN_MEMBER( segas16b_state::i8751_main_cpu_vblank )
@@ -1297,7 +1297,7 @@ INTERRUPT_GEN_MEMBER( segas16b_state::i8751_main_cpu_vblank )
//**************************************************************************
-// DRIVER OVERRIDES
+// DRIVER OVERRIDES
//**************************************************************************
//-------------------------------------------------
@@ -1341,7 +1341,7 @@ void segas16b_state::device_timer(emu_timer &timer, device_timer_id id, int para
machine().scheduler().boost_interleave(attotime::zero, attotime::from_msec(10));
break;
- // generate a periodic IRQ to the sound CPU
+ // generate a periodic IRQ to the sound CPU
case TID_ATOMICP_SOUND_IRQ:
if (++m_atomicp_sound_count >= m_atomicp_sound_divisor)
{
@@ -1355,12 +1355,12 @@ void segas16b_state::device_timer(emu_timer &timer, device_timer_id id, int para
//**************************************************************************
-// I8751 SIMULATIONS
+// I8751 SIMULATIONS
//**************************************************************************
//-------------------------------------------------
// altbeast_common_i8751_sim - simulate the I8751
-// from Altered Beast
+// from Altered Beast
//-------------------------------------------------
void segas16b_state::altbeast_common_i8751_sim(offs_t soundoffs, offs_t inputoffs)
@@ -1402,7 +1402,7 @@ void segas16b_state::altbeast_i8751_sim()
//-------------------------------------------------
// ddux_i8751_sim - simulate the I8751
-// from Dynamite Dux
+// from Dynamite Dux
//-------------------------------------------------
void segas16b_state::ddux_i8751_sim()
@@ -1423,7 +1423,7 @@ void segas16b_state::ddux_i8751_sim()
//-------------------------------------------------
// goldnaxe_i8751_sim - simulate the I8751
-// from Golden Axe
+// from Golden Axe
//-------------------------------------------------
void segas16b_state::goldnaxe_i8751_sim()
@@ -1457,7 +1457,7 @@ void segas16b_state::goldnaxe_i8751_sim()
//-------------------------------------------------
// tturf_i8751_sim - simulate the I8751
-// from Tough Turf
+// from Tough Turf
//-------------------------------------------------
void segas16b_state::tturf_i8751_sim()
@@ -1485,7 +1485,7 @@ void segas16b_state::tturf_i8751_sim()
//-------------------------------------------------
// wb3_i8751_sim - simulate the I8751
-// from Wonderboy III
+// from Wonderboy III
//-------------------------------------------------
void segas16b_state::wb3_i8751_sim()
@@ -1506,12 +1506,12 @@ void segas16b_state::wb3_i8751_sim()
//**************************************************************************
-// CUSTOM I/O SPACE HANDLERS
+// CUSTOM I/O SPACE HANDLERS
//**************************************************************************
//-------------------------------------------------
// aceattac_custom_io_r - custom I/O read handler
-// for Ace Attacker
+// for Ace Attacker
//-------------------------------------------------
READ16_MEMBER( segas16b_state::aceattac_custom_io_r )
@@ -1555,7 +1555,7 @@ READ16_MEMBER( segas16b_state::aceattac_custom_io_r )
//-------------------------------------------------
// dunkshot_custom_io_r - custom I/O read handler
-// for Dunk Shot
+// for Dunk Shot
//-------------------------------------------------
READ16_MEMBER( segas16b_state::dunkshot_custom_io_r )
@@ -1582,7 +1582,7 @@ READ16_MEMBER( segas16b_state::dunkshot_custom_io_r )
//-------------------------------------------------
// hwchamp_custom_io_r/w - custom I/O read/write
-// handlers for Heavyweight Champ
+// handlers for Heavyweight Champ
//-------------------------------------------------
READ16_MEMBER( segas16b_state::hwchamp_custom_io_r )
@@ -1633,7 +1633,7 @@ WRITE16_MEMBER( segas16b_state::hwchamp_custom_io_w )
//-------------------------------------------------
// passshtj_custom_io_r - custom I/O read handler
-// for Passing Shot
+// for Passing Shot
//-------------------------------------------------
READ16_MEMBER( segas16b_state::passshtj_custom_io_r )
@@ -1656,7 +1656,7 @@ READ16_MEMBER( segas16b_state::passshtj_custom_io_r )
//-------------------------------------------------
// sdi_custom_io_r - custom I/O read handler
-// for SDI
+// for SDI
//-------------------------------------------------
READ16_MEMBER( segas16b_state::sdi_custom_io_r )
@@ -1678,8 +1678,8 @@ READ16_MEMBER( segas16b_state::sdi_custom_io_r )
//-------------------------------------------------
-// sdi_custom_io_r/w - custom I/O read/write
-// handlers for Sukeban Jansi Ryuko
+// sdi_custom_io_r/w - custom I/O read/write
+// handlers for Sukeban Jansi Ryuko
//-------------------------------------------------
READ16_MEMBER( segas16b_state::sjryuko_custom_io_r )
@@ -1721,13 +1721,13 @@ WRITE16_MEMBER( segas16b_state::sjryuko_custom_io_w )
//**************************************************************************
-// MAIN CPU ADDRESS MAPS
+// MAIN CPU ADDRESS MAPS
//**************************************************************************
static ADDRESS_MAP_START( system16b_map, AS_PROGRAM, 16, segas16b_state )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x000000, 0xffffff) AM_DEVREADWRITE8("mapper", sega_315_5195_mapper_device, read, write, 0x00ff)
-
+
// these get overwritten by the memory mapper above, but we put them here
// so they are properly allocated and tracked for saving
AM_RANGE(0x100000, 0x1007ff) AM_RAM AM_SHARE("spriteram")
@@ -1741,7 +1741,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( system16c_map, AS_PROGRAM, 16, segas16b_state )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x000000, 0xffffff) AM_DEVREADWRITE8("mapper", sega_315_5195_mapper_device, read, write, 0x00ff)
-
+
// these get overwritten by the memory mapper above, but we put them here
// so they are properly allocated and tracked for saving
AM_RANGE(0x100000, 0x1007ff) AM_RAM AM_SHARE("spriteram")
@@ -1754,7 +1754,7 @@ ADDRESS_MAP_END
//**************************************************************************
-// SOUND CPU ADDRESS MAPS
+// SOUND CPU ADDRESS MAPS
//**************************************************************************
static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, segas16b_state )
@@ -1777,7 +1777,7 @@ ADDRESS_MAP_END
//**************************************************************************
-// I8751 MCU ADDRESS MAPS
+// I8751 MCU ADDRESS MAPS
//**************************************************************************
static ADDRESS_MAP_START( mcu_io_map, AS_IO, 8, segas16b_state )
@@ -1789,7 +1789,7 @@ ADDRESS_MAP_END
//**************************************************************************
-// GENERIC PORT DEFINITIONS
+// GENERIC PORT DEFINITIONS
//**************************************************************************
static INPUT_PORTS_START( system16b_generic )
@@ -1843,7 +1843,7 @@ INPUT_PORTS_END
//**************************************************************************
-// GAME-SPECIFIC PORT DEFINITIONS
+// GAME-SPECIFIC PORT DEFINITIONS
//**************************************************************************
static INPUT_PORTS_START( aceattac )
@@ -3257,7 +3257,7 @@ INPUT_PORTS_END
//**************************************************************************
-// SOUND CONFIGURATIONS
+// SOUND CONFIGURATIONS
//**************************************************************************
static const upd7759_interface upd7759_config =
@@ -3268,7 +3268,7 @@ static const upd7759_interface upd7759_config =
//**************************************************************************
-// GRAPHICS DECODING
+// GRAPHICS DECODING
//**************************************************************************
static GFXDECODE_START( segas16b )
@@ -3278,7 +3278,7 @@ GFXDECODE_END
//**************************************************************************
-// GENERIC MACHINE DRIVERS
+// GENERIC MACHINE DRIVERS
//**************************************************************************
static MACHINE_CONFIG_START( system16b, segas16b_state )
@@ -3369,7 +3369,7 @@ MACHINE_CONFIG_END
//**************************************************************************
-// GAME-SPECIFIC MACHINE DRIVERS
+// GAME-SPECIFIC MACHINE DRIVERS
//**************************************************************************
static MACHINE_CONFIG_DERIVED( atomicp, system16b ) // 10MHz CPU Clock verified
@@ -3394,7 +3394,7 @@ MACHINE_CONFIG_END
//**************************************************************************
-// ROM definitions
+// ROM definitions
//**************************************************************************
@@ -3894,7 +3894,7 @@ ROM_END
//*************************************************************************************************************************
// Atomic Point
//
-// Custom Korean Board - NOT Sega:
+// Custom Korean Board - NOT Sega:
//
// CPU: TMP68000P-10
// OSC: 25.1748MHz & 20MHz
@@ -6369,7 +6369,7 @@ ROM_END
//**************************************************************************
-// CONFIGURATION
+// CONFIGURATION
//**************************************************************************
//-------------------------------------------------
@@ -6403,8 +6403,8 @@ void segas16b_state::init_generic(segas16b_rom_board rom_board)
//-------------------------------------------------
-// init_generic_* - ROM board-specific
-// initialization
+// init_generic_* - ROM board-specific
+// initialization
//-------------------------------------------------
DRIVER_INIT_MEMBER(segas16b_state,generic_5358_small) { init_generic(ROM_BOARD_171_5358_SMALL); }
@@ -6415,7 +6415,7 @@ DRIVER_INIT_MEMBER(segas16b_state,generic_5797) { init_generic(ROM_BOARD_171_579
DRIVER_INIT_MEMBER(segas16b_state,generic_korean)
{
init_generic(ROM_BOARD_KOREAN);
-
+
// configure special behaviors for the Korean boards
m_disable_screen_blanking = true;
m_atomicp_sound_divisor = 1;
@@ -6572,7 +6572,7 @@ DRIVER_INIT_MEMBER(segas16b_state,snapper)
//**************************************************************************
-// GAME DRIVERS
+// GAME DRIVERS
//**************************************************************************
// YEAR, NAME, PARENT, MACHINE, INPUT, INIT, MONITOR,COMPANY,FULLNAME,FLAGS
@@ -6682,7 +6682,7 @@ GAME( 2008, fantzn2xp, fantzn2x, system16c, fz2, segas16b_state,
// Custom Korean Board - these probably belong with the bootlegs...
GAME( 1990, atomicp, 0, atomicp, atomicp, segas16b_state,generic_korean, ROT0, "Philko", "Atomic Point (Korea)", 0) // korean clone board..
-GAME( 1990, snapper, 0, atomicp, snapper, segas16b_state,snapper, ROT0, "Philko", "Snapper (Korea)", 0) // korean clone board..
+GAME( 1990, snapper, 0, atomicp, snapper, segas16b_state,snapper, ROT0, "Philko", "Snapper (Korea)", 0) // korean clone board..
diff --git a/src/mame/drivers/segas18.c b/src/mame/drivers/segas18.c
index 0585e64247a..af970df6fc3 100644
--- a/src/mame/drivers/segas18.c
+++ b/src/mame/drivers/segas18.c
@@ -80,34 +80,34 @@ void segas18_state::memory_mapper(sega_315_5195_mapper_device &mapper, UINT8 ind
case 7:
mapper.map_as_handler(0x00000, 0x04000, 0xffc000, read16_delegate(FUNC(segas18_state::misc_io_r), this), write16_delegate(FUNC(segas18_state::misc_io_w), this));
break;
-
+
case 6:
mapper.map_as_ram(0x00000, 0x02000, 0xffe000, "paletteram", write16_delegate(FUNC(segas18_state::legacy_wrapper<segaic16_paletteram_w>), this));
break;
-
+
case 5:
mapper.map_as_ram(0x00000, 0x10000, 0xfe0000, "tileram", write16_delegate(FUNC(segas18_state::legacy_wrapper<segaic16_tileram_0_w>), this));
mapper.map_as_ram(0x10000, 0x01000, 0xfef000, "textram", write16_delegate(FUNC(segas18_state::legacy_wrapper<segaic16_textram_0_w>), this));
break;
-
+
case 4:
mapper.map_as_ram(0x00000, 0x00800, 0xfff800, "spriteram", write16_delegate());
break;
-
+
case 3:
mapper.map_as_ram(0x00000, 0x04000, 0xffc000, "workram", write16_delegate());
break;
-
+
case 2:
switch (m_romboard)
{
case ROM_BOARD_171_SHADOW: break; // ???
- case ROM_BOARD_171_5874:
+ case ROM_BOARD_171_5874:
case ROM_BOARD_171_5987: mapper.map_as_handler(0x00000, 0x00010, 0xfffff0, read16_delegate(FUNC(segas18_state::genesis_vdp_r), this), write16_delegate(FUNC(segas18_state::genesis_vdp_w), this)); break;
default: assert(false);
}
break;
-
+
case 1:
switch (m_romboard)
{
@@ -121,7 +121,7 @@ void segas18_state::memory_mapper(sega_315_5195_mapper_device &mapper, UINT8 ind
default: assert(false);
}
break;
-
+
case 0:
switch (m_romboard)
{
@@ -205,7 +205,7 @@ void segas18_state::machine_reset()
megadriv_reset_vdp(machine());
genvdp_use_cram = 1;
-
+
// if we are running with a real live 8751, we need to boost the interleave at startup
if (m_mcu != NULL && m_mcu->type() == I8751)
synchronize(TID_INITIAL_BOOST);
diff --git a/src/mame/drivers/segaxbd.c b/src/mame/drivers/segaxbd.c
index 9ef33e5d9d1..b32f0fce25a 100644
--- a/src/mame/drivers/segaxbd.c
+++ b/src/mame/drivers/segaxbd.c
@@ -302,7 +302,7 @@ ROMs:
//**************************************************************************
-// CONSTANTS
+// CONSTANTS
//**************************************************************************
const UINT32 MASTER_CLOCK = XTAL_50MHz;
@@ -311,12 +311,12 @@ const UINT32 SOUND_CLOCK = XTAL_16MHz;
//**************************************************************************
-// COMPARE/TIMER CHIP CALLBACKS
+// COMPARE/TIMER CHIP CALLBACKS
//**************************************************************************
//-------------------------------------------------
// timer_ack_callback - acknowledge a timer chip
-// interrupt signal
+// interrupt signal
//-------------------------------------------------
void segaxbd_state::timer_ack_callback()
@@ -339,7 +339,7 @@ void segaxbd_state::sound_data_w(UINT8 data)
//**************************************************************************
-// YM2151 CHIP CALLBACKS
+// YM2151 CHIP CALLBACKS
//**************************************************************************
//-------------------------------------------------
@@ -354,7 +354,7 @@ WRITE_LINE_MEMBER( segaxbd_state::sound_cpu_irq )
//**************************************************************************
-// MAIN CPU READ/WRITE CALLBACKS
+// MAIN CPU READ/WRITE CALLBACKS
//**************************************************************************
//-------------------------------------------------
@@ -427,7 +427,7 @@ inline UINT16 segaxbd_state::iochip_r(int which, int port, int inputval)
//-------------------------------------------------
// iochip_0_r - handle reads from the first I/O
-// chip
+// chip
//-------------------------------------------------
READ16_MEMBER( segaxbd_state::iochip_0_r )
@@ -465,7 +465,7 @@ READ16_MEMBER( segaxbd_state::iochip_0_r )
//-------------------------------------------------
// iochip_0_w - handle writes to the first I/O
-// chip
+// chip
//-------------------------------------------------
WRITE16_MEMBER( segaxbd_state::iochip_0_w )
@@ -508,7 +508,7 @@ WRITE16_MEMBER( segaxbd_state::iochip_0_w )
machine().sound().system_enable(data & 0x80);
break;
- default:
+ default:
break;
}
@@ -522,7 +522,7 @@ WRITE16_MEMBER( segaxbd_state::iochip_0_w )
//-------------------------------------------------
// iochip_1_r - handle reads from the second I/O
-// chip
+// chip
//-------------------------------------------------
READ16_MEMBER( segaxbd_state::iochip_1_r )
@@ -557,7 +557,7 @@ READ16_MEMBER( segaxbd_state::iochip_1_r )
//-------------------------------------------------
// iochip_1_w - handle writes to the second I/O
-// chip
+// chip
//-------------------------------------------------
WRITE16_MEMBER( segaxbd_state::iochip_1_w )
@@ -579,7 +579,7 @@ WRITE16_MEMBER( segaxbd_state::iochip_1_w )
//-------------------------------------------------
// iocontrol_w - handle writes to the I/O control
-// port
+// port
//-------------------------------------------------
WRITE16_MEMBER( segaxbd_state::iocontrol_w )
@@ -595,12 +595,12 @@ WRITE16_MEMBER( segaxbd_state::iocontrol_w )
//**************************************************************************
-// GAME-SPECIFIC MAIN CPU READ/WRITE HANDLERS
+// GAME-SPECIFIC MAIN CPU READ/WRITE HANDLERS
//**************************************************************************
//-------------------------------------------------
// loffire_sync0_w - force synchronization on
-// writes to this address for Line of Fire
+// writes to this address for Line of Fire
//-------------------------------------------------
WRITE16_MEMBER( segaxbd_state::loffire_sync0_w )
@@ -636,8 +636,8 @@ WRITE16_MEMBER( segaxbd_state::rascot_excs_w )
//-------------------------------------------------
-// smgp_excs_r - /EXCS region reads for
-// Super Monaco GP
+// smgp_excs_r - /EXCS region reads for
+// Super Monaco GP
//-------------------------------------------------
READ16_MEMBER( segaxbd_state::smgp_excs_r )
@@ -648,8 +648,8 @@ READ16_MEMBER( segaxbd_state::smgp_excs_r )
//-------------------------------------------------
-// smgp_excs_w - /EXCS region writes for
-// Super Monaco GP
+// smgp_excs_w - /EXCS region writes for
+// Super Monaco GP
//-------------------------------------------------
WRITE16_MEMBER( segaxbd_state::smgp_excs_w )
@@ -660,7 +660,7 @@ WRITE16_MEMBER( segaxbd_state::smgp_excs_w )
//**************************************************************************
-// SOUND Z80 CPU READ/WRITE CALLBACKS
+// SOUND Z80 CPU READ/WRITE CALLBACKS
//**************************************************************************
//-------------------------------------------------
@@ -676,7 +676,7 @@ READ8_MEMBER( segaxbd_state::sound_data_r )
//**************************************************************************
-// DRIVER OVERRIDES
+// DRIVER OVERRIDES
//**************************************************************************
//-------------------------------------------------
@@ -754,12 +754,12 @@ void segaxbd_state::device_timer(emu_timer &timer, device_timer_id id, int param
//**************************************************************************
-// CUSTOM I/O HANDLERS
+// CUSTOM I/O HANDLERS
//**************************************************************************
//-------------------------------------------------
// generic_iochip0_lamps_w - shared handler for
-// coin counters and lamps
+// coin counters and lamps
//-------------------------------------------------
void segaxbd_state::generic_iochip0_lamps_w(UINT8 data)
@@ -788,7 +788,7 @@ void segaxbd_state::generic_iochip0_lamps_w(UINT8 data)
//-------------------------------------------------
// aburner2_iochip0_motor_r - motor I/O reads
-// for Afterburner II
+// for Afterburner II
//-------------------------------------------------
UINT8 segaxbd_state::aburner2_iochip0_motor_r(UINT8 data)
@@ -802,7 +802,7 @@ UINT8 segaxbd_state::aburner2_iochip0_motor_r(UINT8 data)
//-------------------------------------------------
// aburner2_iochip0_motor_w - motor I/O writes
-// for Afterburner II
+// for Afterburner II
//-------------------------------------------------
void segaxbd_state::aburner2_iochip0_motor_w(UINT8 data)
@@ -813,7 +813,7 @@ void segaxbd_state::aburner2_iochip0_motor_w(UINT8 data)
//-------------------------------------------------
// smgp_iochip0_motor_r - motor I/O reads
-// for Super Monaco GP
+// for Super Monaco GP
//-------------------------------------------------
UINT8 segaxbd_state::smgp_iochip0_motor_r(UINT8 data)
@@ -827,7 +827,7 @@ UINT8 segaxbd_state::smgp_iochip0_motor_r(UINT8 data)
//-------------------------------------------------
// smgp_iochip0_motor_w - motor I/O reads
-// for Super Monaco GP
+// for Super Monaco GP
//-------------------------------------------------
void segaxbd_state::smgp_iochip0_motor_w(UINT8 data)
@@ -838,7 +838,7 @@ void segaxbd_state::smgp_iochip0_motor_w(UINT8 data)
//-------------------------------------------------
// lastsurv_iochip1_port_r - muxed I/O reads
-// for Last Survivor
+// for Last Survivor
//-------------------------------------------------
UINT8 segaxbd_state::lastsurv_iochip1_port_r(UINT8 data)
@@ -850,7 +850,7 @@ UINT8 segaxbd_state::lastsurv_iochip1_port_r(UINT8 data)
//-------------------------------------------------
// lastsurv_iochip0_muxer_w - muxed I/O writes
-// for Last Survivor
+// for Last Survivor
//-------------------------------------------------
void segaxbd_state::lastsurv_iochip0_muxer_w(UINT8 data)
@@ -862,12 +862,12 @@ void segaxbd_state::lastsurv_iochip0_muxer_w(UINT8 data)
//**************************************************************************
-// INTERNAL HELPERS
+// INTERNAL HELPERS
//**************************************************************************
//-------------------------------------------------
// update_main_irqs - flush IRQ state to the
-// CPU device
+// CPU device
//-------------------------------------------------
void segaxbd_state::update_main_irqs()
@@ -900,7 +900,7 @@ void segaxbd_state::update_main_irqs()
//-------------------------------------------------
// m68k_reset_callback - callback for when the
-// main 68000 is reset
+// main 68000 is reset
//-------------------------------------------------
void segaxbd_state::m68k_reset_callback(device_t *device)
@@ -913,7 +913,7 @@ void segaxbd_state::m68k_reset_callback(device_t *device)
//**************************************************************************
-// MAIN CPU ADDRESS MAPS
+// MAIN CPU ADDRESS MAPS
//**************************************************************************
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, segaxbd_state )
@@ -950,7 +950,7 @@ ADDRESS_MAP_END
//**************************************************************************
-// SUB CPU ADDRESS MAPS
+// SUB CPU ADDRESS MAPS
//**************************************************************************
static ADDRESS_MAP_START( sub_map, AS_PROGRAM, 16, segaxbd_state )
@@ -970,7 +970,7 @@ ADDRESS_MAP_END
//**************************************************************************
-// Z80 SOUND CPU ADDRESS MAPS
+// Z80 SOUND CPU ADDRESS MAPS
//**************************************************************************
static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, segaxbd_state )
@@ -990,7 +990,7 @@ ADDRESS_MAP_END
//**************************************************************************
-// SUPER MONACO GP 2ND SOUND CPU ADDRESS MAPS
+// SUPER MONACO GP 2ND SOUND CPU ADDRESS MAPS
//**************************************************************************
// Sound Board
@@ -1012,7 +1012,7 @@ ADDRESS_MAP_END
//**************************************************************************
-// SUPER MONACO GP MOTOR BOARD CPU ADDRESS MAPS
+// SUPER MONACO GP MOTOR BOARD CPU ADDRESS MAPS
//**************************************************************************
// Motor Board, not yet emulated
@@ -1032,7 +1032,7 @@ ADDRESS_MAP_END
//**************************************************************************
-// SUPER MONACO GP LINK BOARD CPU ADDRESS MAPS
+// SUPER MONACO GP LINK BOARD CPU ADDRESS MAPS
//**************************************************************************
// Link Board, not yet emulated
@@ -1051,7 +1051,7 @@ ADDRESS_MAP_END
//**************************************************************************
-// RASCOT UNKNOWN Z80 CPU ADDRESS MAPS
+// RASCOT UNKNOWN Z80 CPU ADDRESS MAPS
//**************************************************************************
// Z80, unknown function
@@ -1069,7 +1069,7 @@ ADDRESS_MAP_END
//**************************************************************************
-// GENERIC PORT DEFINITIONS
+// GENERIC PORT DEFINITIONS
//**************************************************************************
static INPUT_PORTS_START( xboard_generic )
@@ -1111,7 +1111,7 @@ INPUT_PORTS_END
//**************************************************************************
-// GAME-SPECIFIC PORT DEFINITIONS
+// GAME-SPECIFIC PORT DEFINITIONS
//**************************************************************************
static INPUT_PORTS_START( aburner )
@@ -1284,17 +1284,17 @@ static INPUT_PORTS_START( lastsurv )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SERVICE2 )
PORT_START("MUX0")
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0xf0, 0xf0 ^ 0x40, IPT_POSITIONAL ) PORT_PLAYER(2) PORT_POSITIONS(8) PORT_REMAP_TABLE(lastsurv_position_table) PORT_WRAPS PORT_SENSITIVITY(1) PORT_KEYDELTA(10) PORT_CENTERDELTA(0) PORT_CODE_DEC(KEYCODE_Q) PORT_CODE_INC(KEYCODE_W)
PORT_START("MUX1")
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0xf0, 0xf0 ^ 0x40, IPT_POSITIONAL ) PORT_PLAYER(1) PORT_POSITIONS(8) PORT_REMAP_TABLE(lastsurv_position_table) PORT_WRAPS PORT_SENSITIVITY(1) PORT_KEYDELTA(10) PORT_CENTERDELTA(0) PORT_CODE_DEC(KEYCODE_Z) PORT_CODE_INC(KEYCODE_X)
PORT_START("MUX2")
@@ -1316,7 +1316,7 @@ static INPUT_PORTS_START( lastsurv )
PORT_DIPSETTING( 0x0c, "Off" )
PORT_DIPSETTING( 0x08, "On (2)" )
PORT_DIPSETTING( 0x04, "On (4)" )
-// PORT_DIPSETTING( 0x00, "No Use" )
+// PORT_DIPSETTING( 0x00, "No Use" )
PORT_DIPNAME( 0x30, 0x30, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SWB:5,6")
PORT_DIPSETTING( 0x20, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x30, DEF_STR( Normal ) )
@@ -1548,7 +1548,7 @@ INPUT_PORTS_END
//**************************************************************************
-// SOUND DEFINITIONS
+// SOUND DEFINITIONS
//**************************************************************************
static const ym2151_interface ym2151_config =
@@ -1564,7 +1564,7 @@ static const sega_pcm_interface segapcm_interface =
//**************************************************************************
-// GRAPHICS DEFINITIONS
+// GRAPHICS DEFINITIONS
//**************************************************************************
static GFXDECODE_START( segaxbd )
@@ -1574,7 +1574,7 @@ GFXDECODE_END
//**************************************************************************
-// GENERIC MACHINE DRIVERS
+// GENERIC MACHINE DRIVERS
//**************************************************************************
static MACHINE_CONFIG_START( xboard, segaxbd_state )
@@ -1598,7 +1598,7 @@ static MACHINE_CONFIG_START( xboard, segaxbd_state )
MCFG_SEGA_315_5248_MULTIPLIER_ADD("multiplier_subx")
MCFG_SEGA_315_5249_DIVIDER_ADD("divider_main")
MCFG_SEGA_315_5249_DIVIDER_ADD("divider_subx")
-
+
MCFG_SEGA_315_5250_COMPARE_TIMER_ADD("cmptimer_main")
MCFG_SEGA_315_5250_TIMER_ACK(segaxbd_state, timer_ack_callback)
MCFG_SEGA_315_5250_SOUND_WRITE(segaxbd_state, sound_data_w)
@@ -1637,7 +1637,7 @@ MACHINE_CONFIG_END
//**************************************************************************
-// GAME-SPECIFIC MACHINE DRIVERS
+// GAME-SPECIFIC MACHINE DRIVERS
//**************************************************************************
static MACHINE_CONFIG_DERIVED( lastsurv_fd1094, xboard_fd1094 )
@@ -1687,7 +1687,7 @@ MACHINE_CONFIG_END
//**************************************************************************
-// ROM DEFINITIONS
+// ROM DEFINITIONS
//**************************************************************************
@@ -3165,7 +3165,7 @@ ROM_END
//*************************************************************************************************************************
//*************************************************************************************************************************
//*************************************************************************************************************************
-// Royal Ascot - should be X-Board, or closely related, although it's a main display / terminal setup,
+// Royal Ascot - should be X-Board, or closely related, although it's a main display / terminal setup,
// and we only have the ROMs for one of those parts..
//
ROM_START( rascot )
@@ -3202,7 +3202,7 @@ ROM_END
//**************************************************************************
-// CONFIGURATION
+// CONFIGURATION
//**************************************************************************
//-------------------------------------------------
@@ -3295,7 +3295,7 @@ DRIVER_INIT_MEMBER(segaxbd_state,gprider)
//**************************************************************************
-// GAME DRIVERS
+// GAME DRIVERS
//**************************************************************************
// YEAR, NAME, PARENT, MACHINE, INPUT, INIT, MONITOR,COMPANY,FULLNAME,FLAGS
diff --git a/src/mame/drivers/segaybd.c b/src/mame/drivers/segaybd.c
index 877c57b21ff..ede9e457fba 100644
--- a/src/mame/drivers/segaybd.c
+++ b/src/mame/drivers/segaybd.c
@@ -35,18 +35,18 @@
****************************************************************************
- Games supported:
+ Games supported:
- G-LOC Air Battle
- G-LOC R360
- Galaxy Force 2
- Power Drift
- Rail Chase
- Strike Fighter
+ G-LOC Air Battle
+ G-LOC R360
+ Galaxy Force 2
+ Power Drift
+ Rail Chase
+ Strike Fighter
- Known games currently not dumped:
+ Known games currently not dumped:
- Galaxy Force
+ Galaxy Force
****************************************************************************
@@ -69,7 +69,7 @@
//**************************************************************************
-// CONSTANTS
+// CONSTANTS
//**************************************************************************
const UINT32 MASTER_CLOCK = 50000000;
@@ -81,7 +81,7 @@ const UINT32 SOUND_CLOCK = 32215900;
//**************************************************************************
-// YM2151 CHIP CALLBACKS
+// YM2151 CHIP CALLBACKS
//**************************************************************************
//-------------------------------------------------
@@ -96,7 +96,7 @@ void segaybd_state::sound_cpu_irq(int state)
//**************************************************************************
-// MAIN CPU READ/WRITE HANDLERS
+// MAIN CPU READ/WRITE HANDLERS
//**************************************************************************
//-------------------------------------------------
@@ -218,7 +218,7 @@ WRITE16_MEMBER( segaybd_state::io_chip_w )
// D3 = XRES
// D2 = YRES
// D1-D0 = ADC0-1
- //
+ //
segaic16_set_display_enable(machine(), data & 0x80);
if (((old ^ data) & 0x20) && !(data & 0x20))
machine().watchdog_reset();
@@ -247,7 +247,7 @@ WRITE16_MEMBER( segaybd_state::io_chip_w )
//-------------------------------------------------
// sound_data_w - handle writes to sound control
-// port
+// port
//-------------------------------------------------
WRITE16_MEMBER( segaybd_state::sound_data_w )
@@ -259,7 +259,7 @@ WRITE16_MEMBER( segaybd_state::sound_data_w )
//**************************************************************************
-// SOUND Z80 CPU READ/WRITE CALLBACKS
+// SOUND Z80 CPU READ/WRITE CALLBACKS
//**************************************************************************
//-------------------------------------------------
@@ -275,7 +275,7 @@ READ8_MEMBER( segaybd_state::sound_data_r )
//**************************************************************************
-// DRIVER OVERRIDES
+// DRIVER OVERRIDES
//**************************************************************************
//-------------------------------------------------
@@ -394,7 +394,7 @@ void segaybd_state::device_timer(emu_timer &timer, device_timer_id id, int param
//**************************************************************************
-// GAME-SPECIFIC OUTPUT CALLBACKS
+// GAME-SPECIFIC OUTPUT CALLBACKS
//**************************************************************************
// TODO: kokoroj2 and jpark (SW2)
@@ -408,7 +408,7 @@ void segaybd_state::device_timer(emu_timer &timer, device_timer_id id, int param
//-------------------------------------------------
// gforce2_output_cb2 - output #2 handler for
-// Galaxy Force
+// Galaxy Force
//-------------------------------------------------
void segaybd_state::gforce2_output_cb2(UINT16 data)
@@ -419,7 +419,7 @@ void segaybd_state::gforce2_output_cb2(UINT16 data)
//-------------------------------------------------
// gloc_output_cb1 - output #1 handler for
-// G-Loc
+// G-Loc
//-------------------------------------------------
void segaybd_state::gloc_output_cb1(UINT16 data)
@@ -453,7 +453,7 @@ void segaybd_state::gloc_output_cb1(UINT16 data)
//-------------------------------------------------
// gloc_output_cb2 - output #2 handler for
-// G-Loc
+// G-Loc
//-------------------------------------------------
void segaybd_state::gloc_output_cb2(UINT16 data)
@@ -466,7 +466,7 @@ void segaybd_state::gloc_output_cb2(UINT16 data)
//-------------------------------------------------
// r360_output_cb2 - output #2 handler for
-// G-Loc R360
+// G-Loc R360
//-------------------------------------------------
void segaybd_state::r360_output_cb2(UINT16 data)
@@ -480,7 +480,7 @@ void segaybd_state::r360_output_cb2(UINT16 data)
//-------------------------------------------------
// pdrift_output_cb1 - output #1 handler for
-// Power Drift
+// Power Drift
//-------------------------------------------------
void segaybd_state::pdrift_output_cb1(UINT16 data)
@@ -639,7 +639,7 @@ void segaybd_state::pdrift_output_cb1(UINT16 data)
//-------------------------------------------------
// pdrift_output_cb2 - output #2 handler for
-// Power Drift
+// Power Drift
//-------------------------------------------------
void segaybd_state::pdrift_output_cb2(UINT16 data)
@@ -651,7 +651,7 @@ void segaybd_state::pdrift_output_cb2(UINT16 data)
//-------------------------------------------------
// rchase_output_cb2 - output #2 handler for
-// Rail Chase
+// Rail Chase
//-------------------------------------------------
void segaybd_state::rchase_output_cb2(UINT16 data)
@@ -666,12 +666,12 @@ void segaybd_state::rchase_output_cb2(UINT16 data)
//**************************************************************************
-// INTERNAL HELPERS
+// INTERNAL HELPERS
//**************************************************************************
//-------------------------------------------------
// update_irqs - flush IRQ state to the various
-// CPU devices
+// CPU devices
//-------------------------------------------------
void segaybd_state::update_irqs()
@@ -679,11 +679,11 @@ void segaybd_state::update_irqs()
m_maincpu->set_input_line(2, m_timer_irq_state ? ASSERT_LINE : CLEAR_LINE);
m_subx->set_input_line(2, m_timer_irq_state ? ASSERT_LINE : CLEAR_LINE);
m_suby->set_input_line(2, m_timer_irq_state ? ASSERT_LINE : CLEAR_LINE);
-
+
m_maincpu->set_input_line(4, m_vblank_irq_state ? ASSERT_LINE : CLEAR_LINE);
m_subx->set_input_line(4, m_vblank_irq_state ? ASSERT_LINE : CLEAR_LINE);
m_suby->set_input_line(4, m_vblank_irq_state ? ASSERT_LINE : CLEAR_LINE);
-
+
m_maincpu->set_input_line(6, m_timer_irq_state && m_vblank_irq_state ? ASSERT_LINE : CLEAR_LINE);
m_subx->set_input_line(6, m_timer_irq_state && m_vblank_irq_state ? ASSERT_LINE : CLEAR_LINE);
m_suby->set_input_line(6, m_timer_irq_state && m_vblank_irq_state ? ASSERT_LINE : CLEAR_LINE);
@@ -695,7 +695,7 @@ void segaybd_state::update_irqs()
//**************************************************************************
-// MAIN CPU ADDRESS MAPS
+// MAIN CPU ADDRESS MAPS
//**************************************************************************
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, segaybd_state )
@@ -715,7 +715,7 @@ ADDRESS_MAP_END
//**************************************************************************
-// SUB CPU ADDRESS MAPS
+// SUB CPU ADDRESS MAPS
//**************************************************************************
static ADDRESS_MAP_START( subx_map, AS_PROGRAM, 16, segaybd_state )
@@ -747,7 +747,7 @@ ADDRESS_MAP_END
//**************************************************************************
-// Z80 SOUND CPU ADDRESS MAPS
+// Z80 SOUND CPU ADDRESS MAPS
//**************************************************************************
static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, segaybd_state )
@@ -767,7 +767,7 @@ ADDRESS_MAP_END
//**************************************************************************
-// GENERIC PORT DEFINITIONS
+// GENERIC PORT DEFINITIONS
//**************************************************************************
static INPUT_PORTS_START( yboard_generic )
@@ -813,7 +813,7 @@ INPUT_PORTS_END
//**************************************************************************
-// GAME-SPECIFIC PORT DEFINITIONS
+// GAME-SPECIFIC PORT DEFINITIONS
//**************************************************************************
static INPUT_PORTS_START( gforce2 )
@@ -1183,7 +1183,7 @@ INPUT_PORTS_END
//**************************************************************************
-// SOUND DEFINITIONS
+// SOUND DEFINITIONS
//**************************************************************************
static const ym2151_interface ym2151_config =
@@ -1199,7 +1199,7 @@ static const sega_pcm_interface segapcm_interface =
//**************************************************************************
-// GENERIC MACHINE DRIVERS
+// GENERIC MACHINE DRIVERS
//**************************************************************************
static MACHINE_CONFIG_START( yboard, segaybd_state )
@@ -1257,7 +1257,7 @@ MACHINE_CONFIG_END
//**************************************************************************
-// ROM DEFINITIONS
+// ROM DEFINITIONS
//**************************************************************************
@@ -1814,7 +1814,7 @@ ROM_START( pdrifta )
ROM_END
//*************************************************************************************************************************
-// Earlier set based on eprom numbers & Sega Eprom/Mask Rom Locations sheet 421-7708
+// Earlier set based on eprom numbers & Sega Eprom/Mask Rom Locations sheet 421-7708
//
ROM_START( pdrifte )
ROM_REGION( 0x080000, "maincpu", 0 ) // M
@@ -2185,7 +2185,7 @@ ROM_END
//**************************************************************************
-// CONFIGURATION
+// CONFIGURATION
//**************************************************************************
//-------------------------------------------------
@@ -2258,7 +2258,7 @@ DRIVER_INIT_MEMBER(segaybd_state,rchase)
//**************************************************************************
-// GAME DRIVERS
+// GAME DRIVERS
//**************************************************************************
// YEAR, NAME, PARENT, MACHINE,INPUT, INIT, MONITOR,COMPANY,FULLNAME,FLAGS, LAYOUT
diff --git a/src/mame/drivers/srmp2.c b/src/mame/drivers/srmp2.c
index b4ad4925de2..2d0916bd06b 100644
--- a/src/mame/drivers/srmp2.c
+++ b/src/mame/drivers/srmp2.c
@@ -1566,9 +1566,9 @@ ROM_END
-GAME( 1987, srmp1, 0, srmp2, srmp2, driver_device, 0, ROT0, "Seta", "Super Real Mahjong Part 1 (Japan)", 0 )
-GAME( 1987, srmp2, 0, srmp2, srmp2, driver_device, 0, ROT0, "Seta", "Super Real Mahjong Part 2 (Japan)", 0 )
-GAME( 1988, srmp3, 0, srmp3, srmp3, driver_device, 0, ROT0, "Seta", "Super Real Mahjong Part 3 (Japan)", 0 )
+GAME( 1987, srmp1, 0, srmp2, srmp2, driver_device, 0, ROT0, "Seta", "Super Real Mahjong Part 1 (Japan)", 0 )
+GAME( 1987, srmp2, 0, srmp2, srmp2, driver_device, 0, ROT0, "Seta", "Super Real Mahjong Part 2 (Japan)", 0 )
+GAME( 1988, srmp3, 0, srmp3, srmp3, driver_device, 0, ROT0, "Seta", "Super Real Mahjong Part 3 (Japan)", 0 )
GAME( 1988, rmgoldyh, srmp3, rmgoldyh, rmgoldyh, driver_device, 0, ROT0, "Seta (Alba license)", "Real Mahjong Gold Yumehai / Super Real Mahjong GOLD part.2 [BET] (Japan)", 0 )
GAME( 1990, mjyuugi, 0, mjyuugi, mjyuugi, driver_device, 0, ROT0, "Visco", "Mahjong Yuugi (Japan set 1)", 0 )
GAME( 1990, mjyuugia, mjyuugi, mjyuugi, mjyuugi, driver_device, 0, ROT0, "Visco", "Mahjong Yuugi (Japan set 2)", 0 )
diff --git a/src/mame/drivers/ssv.c b/src/mame/drivers/ssv.c
index a5a78f13bfc..a5de0aef606 100644
--- a/src/mame/drivers/ssv.c
+++ b/src/mame/drivers/ssv.c
@@ -2580,12 +2580,12 @@ DRIVER_INIT_MEMBER(ssv_state,hypreact) { init_ssv(machine(), 0); }
DRIVER_INIT_MEMBER(ssv_state,hypreac2) { init_ssv(machine(), 0); init_hypreac2_common(machine()); }
DRIVER_INIT_MEMBER(ssv_state,janjans1) { init_ssv(machine(), 0); }
DRIVER_INIT_MEMBER(ssv_state,keithlcy) { init_ssv(machine(), 0); }
-DRIVER_INIT_MEMBER(ssv_state,meosism) { init_ssv(machine(), 0); }
-DRIVER_INIT_MEMBER(ssv_state,mslider) { init_ssv(machine(), 0); }
-DRIVER_INIT_MEMBER(ssv_state,ryorioh) { init_ssv(machine(), 0); }
+DRIVER_INIT_MEMBER(ssv_state,meosism) { init_ssv(machine(), 0); }
+DRIVER_INIT_MEMBER(ssv_state,mslider) { init_ssv(machine(), 0); }
+DRIVER_INIT_MEMBER(ssv_state,ryorioh) { init_ssv(machine(), 0); }
DRIVER_INIT_MEMBER(ssv_state,srmp4) { init_ssv(machine(), 0);
// ((UINT16 *)machine().root_device().memregion("user1")->base())[0x2b38/2] = 0x037a; /* patch to see gal test mode */
-}
+}
DRIVER_INIT_MEMBER(ssv_state,srmp7) { init_ssv(machine(), 0); }
DRIVER_INIT_MEMBER(ssv_state,stmblade) { init_ssv(machine(), 0); init_st010(machine()); }
DRIVER_INIT_MEMBER(ssv_state,survarts) { init_ssv(machine(), 0); }
@@ -2594,8 +2594,8 @@ DRIVER_INIT_MEMBER(ssv_state,sxyreact) { init_ssv(machine(), 0); init_hyprea
DRIVER_INIT_MEMBER(ssv_state,cairblad) { init_ssv(machine(), 0); init_hypreac2_common(machine()); }
DRIVER_INIT_MEMBER(ssv_state,sxyreac2) { init_ssv(machine(), 0); init_hypreac2_common(machine()); }
DRIVER_INIT_MEMBER(ssv_state,twineag2) { init_ssv(machine(), 1); init_st010(machine()); }
-DRIVER_INIT_MEMBER(ssv_state,ultrax) { init_ssv(machine(), 1); }
-DRIVER_INIT_MEMBER(ssv_state,vasara) { init_ssv(machine(), 0); }
+DRIVER_INIT_MEMBER(ssv_state,ultrax) { init_ssv(machine(), 1); }
+DRIVER_INIT_MEMBER(ssv_state,vasara) { init_ssv(machine(), 0); }
DRIVER_INIT_MEMBER(ssv_state,jsk) { init_ssv(machine(), 0); }
diff --git a/src/mame/drivers/tetrisp2.c b/src/mame/drivers/tetrisp2.c
index 5cc32f3f7a4..2bd496b1966 100644
--- a/src/mame/drivers/tetrisp2.c
+++ b/src/mame/drivers/tetrisp2.c
@@ -1756,7 +1756,7 @@ It sat at the back of an arcade repair workshop for about 15 years.
There's an external sound board. No ROMs on it but there's an NEC D78P014 MCU(?)
and an Altera FPGA and other sound related stuff, plus a Sony CXD1178Q (RGBDAC?)
-The game boots here to a message screen and complains and won't go further.
+The game boots here to a message screen and complains and won't go further.
Probably the external sound PCB is required to boot up.
It's missing the special cable so I can't connect it.
@@ -1794,7 +1794,7 @@ ROM_START( nndmseala )
ROM_REGION( 0x400000, "gfx3", 0 ) // 16x16x8 (Rotation)
ROM_LOAD( "mr97032-01.ic2", 0x000000, 0x400000, CRC(18c1a394) SHA1(491a2eb190efb5684f5eddb317adacd55afa727c) )
-
+
ROM_REGION( 0x100000, "gfx4", 0 ) // 8x8x8 (Foreground)
ROM_LOAD( "mr97032-03.ic8", 0x000000, 0x100000, CRC(5678a378) SHA1(306a3238590fa6e274e3c2ad334f5f210738dd7d) )
diff --git a/src/mame/drivers/triforce.c b/src/mame/drivers/triforce.c
index b7aa8982063..04dc157264e 100644
--- a/src/mame/drivers/triforce.c
+++ b/src/mame/drivers/triforce.c
@@ -474,7 +474,7 @@ static void descrambler(UINT8* data, UINT32 size)
UINT16 v = 0x3ff1;
UINT8 x = 1;
-
+
for (UINT32 it = 0; it < size;)
{
int t0 = t & 1;
diff --git a/src/mame/drivers/vega.c b/src/mame/drivers/vega.c
index bfdf652750d..fc6f8997f5a 100644
--- a/src/mame/drivers/vega.c
+++ b/src/mame/drivers/vega.c
@@ -83,7 +83,7 @@ enum
OBJ_1,
OBJ_2,
OBJ_PLAYER,
-
+
NUM_OBJ
};
@@ -97,41 +97,41 @@ public:
m_i8255(*this, "ppi8255"),
m_ins8154(*this, "ins8154"),
m_ay8910(*this, "ay8910") {}
-
- required_device<cpu_device> m_maincpu;
- required_device<i8255_device> m_i8255;
- required_device<ins8154_device> m_ins8154;
- required_device<ay8910_device> m_ay8910;
-
+
+ required_device<cpu_device> m_maincpu;
+ required_device<i8255_device> m_i8255;
+ required_device<ins8154_device> m_ins8154;
+ required_device<ay8910_device> m_ay8910;
+
int m_p2_data;
- int m_ext_offset_w;
- int m_ext_offset_r;
-
- int m_tmp;
- int m_t1;
-
- UINT8 m_ins8154_ram[0x80];
+ int m_ext_offset_w;
+ int m_ext_offset_r;
+
+ int m_tmp;
+ int m_t1;
+
+ UINT8 m_ins8154_ram[0x80];
UINT8 m_txt_ram[0x400];
-
- vega_obj m_obj[NUM_OBJ];
-
- int m_frame_counter;
-
- int m_tilemap_offset_x, m_tilemap_offset_y, m_tilemap_flags, m_tilemap_top;
-
- DECLARE_READ8_MEMBER( extern_r );
- DECLARE_WRITE8_MEMBER(extern_w);
- DECLARE_WRITE8_MEMBER(p2_w);
+
+ vega_obj m_obj[NUM_OBJ];
+
+ int m_frame_counter;
+
+ int m_tilemap_offset_x, m_tilemap_offset_y, m_tilemap_flags, m_tilemap_top;
+
+ DECLARE_READ8_MEMBER( extern_r );
+ DECLARE_WRITE8_MEMBER(extern_w);
+ DECLARE_WRITE8_MEMBER(p2_w);
DECLARE_READ8_MEMBER(p2_r);
DECLARE_READ8_MEMBER(t1_r);
DECLARE_WRITE8_MEMBER(rombank_w);
-
+
DECLARE_READ8_MEMBER(txtram_r);
DECLARE_READ8_MEMBER(randomizer);
DECLARE_WRITE8_MEMBER(txtram_w);
DECLARE_WRITE8_MEMBER(ppi_pb_w);
DECLARE_WRITE8_MEMBER(ppi_pc_w);
-
+
DECLARE_READ8_MEMBER(ins8154_pa_r);
DECLARE_WRITE8_MEMBER(ins8154_pa_w);
DECLARE_READ8_MEMBER(ins8154_pb_r);
@@ -141,7 +141,7 @@ public:
DECLARE_WRITE8_MEMBER(ay8910_pa_w);
DECLARE_READ8_MEMBER(ay8910_pb_r);
DECLARE_WRITE8_MEMBER(ay8910_pb_w);
-
+
DECLARE_DRIVER_INIT(vega);
@@ -150,28 +150,28 @@ public:
WRITE8_MEMBER(vega_state::extern_w)
{
m_ext_offset_w=offset;
-
+
switch((m_p2_data>>2)&7) /* 7442 = lines 2,3,4 - select device */
{
-
+
case 0: /* 00-03 */
{
/* PPI 8255 /CS */
m_i8255->write(space, (m_p2_data>>6)&3, data);
}
break;
-
+
case 1: /* 04-07 */
{
/* AY 3-8910 */
ay8910_address_w(m_ay8910, 0, offset);
}
break;
-
+
case 2: /* 08-0b */
{
/* INS 8154 /CS0 */
-
+
if(m_p2_data&0x40) /* P26 connected to M/IO pin */
{
m_ins8154_ram[offset&0x7f]=data;
@@ -183,24 +183,24 @@ WRITE8_MEMBER(vega_state::extern_w)
}
}
break;
-
+
case 3: /* 0c-0f */
{
if(offset&4)
{
int num=0; //?
-
+
switch(offset&3)
{
- case 0:
+ case 0:
m_obj[num].m_x=(m_obj[num].m_x&0x80)|(data>>1); //?
m_obj[num].m_enable=data&1;
break;
-
- case 1:
+
+ case 1:
m_obj[num].m_x=(m_obj[num].m_x&0x7f)|((data&1)<<7);
break;
-
+
case 2: m_obj[num].m_y=data; break;
case 3: m_obj[num].m_type=data&0x0f; break;
}
@@ -210,78 +210,78 @@ WRITE8_MEMBER(vega_state::extern_w)
// 0 - y ?
switch(offset&3)
{
- case 0:
+ case 0:
m_obj[OBJ_PLAYER].m_y=data;
break;
-
+
case 1:
m_tilemap_offset_y=data;
break;
-
+
case 2:
m_tilemap_offset_x=((m_tilemap_offset_x)&(~0xff))|data;
break;
-
+
case 3:
m_tilemap_top=data&0x0f;
m_tilemap_flags=data>>4;
break;
}
-
+
}
-
+
}
break;
-
+
case 4: /* 10-13 */
{
int num=(offset&4)?1:2;
-
+
switch(offset&3)
{
- case 0:
+ case 0:
m_obj[num].m_x=(m_obj[num].m_x&0x80)|(data>>1);
m_obj[num].m_enable=data&1;
break;
-
- case 1:
+
+ case 1:
m_obj[num].m_x=(m_obj[num].m_x&0x7f)|((data&1)<<7);
break;
-
+
case 2: m_obj[num].m_y=data; break;
case 3: m_obj[num].m_type=data&0x0f; break;
-
+
}
-
+
}
break;
-
- // case 5: /* 14-17 */
- // {
- //
- // }
- // break;
- //
- // case 6: /* 18-1b */
- // {
- //
- // }
- // break;
- //
- // case 7: /* 1c-1f */
- // {
- //
- // }
- // break;
-
+
+ // case 5: /* 14-17 */
+ // {
+ //
+ // }
+ // break;
+ //
+ // case 6: /* 18-1b */
+ // {
+ //
+ // }
+ // break;
+ //
+ // case 7: /* 1c-1f */
+ // {
+ //
+ // }
+ // break;
+
default: logerror("unknown w %x %x %x\n",m_p2_data,offset, data);
-
+
}
}
READ8_MEMBER(vega_state::extern_r)
{
m_ext_offset_r=offset;
-
+
switch((m_p2_data>>2)&7)
{
case 0: /* PPI 8255 /CS */
@@ -289,7 +289,7 @@ READ8_MEMBER(vega_state::extern_r)
return m_i8255->read( space, m_p2_data>>6); /* A6,A7 -> A0,A1 */
}
break;
-
+
case 1: /* 04-07 */
{
/* AY 3-8910 */
@@ -298,11 +298,11 @@ READ8_MEMBER(vega_state::extern_r)
}
break;
-
+
case 2: /* 08-0b */
{
/* INS 8154 /CS0 */
-
+
if(m_p2_data&0x40) /* P26 connected to M/IO pin */
{
return m_ins8154_ram[offset&0x7f];
@@ -312,44 +312,44 @@ READ8_MEMBER(vega_state::extern_r)
//register r ?
return ins8154_r(m_ins8154,offset&0x7f);
}
-
+
}
break;
-#if 0
+#if 0
case 3: /* 0c-0f */
{
-
-
+
+
}
break;
-
+
case 4: /* 10-13 */
{
-
+
}
break;
-
+
case 5: /* 14-17 */
{
-
+
}
break;
-
+
case 6: /* 18-1b */
{
-
+
}
break;
-
+
case 7: /* 1c-1f */
{
-
+
}
break;
#endif
- default: logerror("unknown r %x %x\n",m_p2_data,offset);
+ default: logerror("unknown r %x %x\n",m_p2_data,offset);
}
-
+
return 0;
}
@@ -380,14 +380,14 @@ static ADDRESS_MAP_START( vega_map, AS_PROGRAM, 8, vega_state )
ADDRESS_MAP_END
/*
-MCS48_PORT_P0 = 0x100,
- MCS48_PORT_P1 = 0x101,
- MCS48_PORT_P2 = 0x102,
- MCS48_PORT_T0 = 0x110,
- MCS48_PORT_T1 = 0x111,
- MCS48_PORT_BUS = 0x120,
- MCS48_PORT_PROG = 0x121 0/1
- */
+MCS48_PORT_P0 = 0x100,
+ MCS48_PORT_P1 = 0x101,
+ MCS48_PORT_P2 = 0x102,
+ MCS48_PORT_T0 = 0x110,
+ MCS48_PORT_T1 = 0x111,
+ MCS48_PORT_BUS = 0x120,
+ MCS48_PORT_PROG = 0x121 0/1
+ */
static ADDRESS_MAP_START( vega_io_map, AS_IO, 8, vega_state )
AM_RANGE(0x00, 0xff) AM_READWRITE(extern_r, extern_w)
AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_READ_PORT("DSW") AM_WRITE(rombank_w) //101
@@ -414,62 +414,62 @@ static INPUT_PORTS_START( vega )
PORT_DIPSETTING( 0x08, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x10, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x18, DEF_STR( 1C_3C ) )
-
+
PORT_DIPNAME( 0x20, 0x20, "Speed" ) PORT_DIPLOCATION("SW1:6")
PORT_DIPSETTING( 0x20, DEF_STR( Normal ) )
PORT_DIPSETTING( 0x00, DEF_STR( High ) )
-
+
PORT_DIPNAME( 0x40, 0x40, "Ext Play at" ) PORT_DIPLOCATION("SW1:7")
PORT_DIPSETTING( 0x40, "3.000" )
PORT_DIPSETTING( 0x00, "4.000" )
-
+
PORT_DIPNAME( 0x80, 0x80, "Bomb Speed" ) PORT_DIPLOCATION("SW1:8")
PORT_DIPSETTING( 0x80, DEF_STR( Normal ) )
PORT_DIPSETTING( 0x00, DEF_STR( High ) )
-
+
//PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unused ) ) /* output */
-
+
PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
-
+
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON2 )
-
+
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON3 )
-
+
PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x02, IP_ACTIVE_LOW,IPT_COIN1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW,IPT_COIN2 )
-
+
PORT_DIPNAME( 0x08, 0x00, "1-3" ) //unused ?
PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
-
+
PORT_DIPNAME( 0x10, 0x00, "1-4" ) //unused ?
PORT_DIPSETTING( 0x10, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
-
+
PORT_DIPNAME( 0x20, 0x00, "1-5" ) //unused ?
PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
-
+
PORT_DIPNAME( 0x40, 0x00, "1-6" ) //some video status ?
PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
-
+
PORT_DIPNAME( 0x80, 0x00, "1-7" ) //some video status ?
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
-
+
INPUT_PORTS_END
@@ -488,41 +488,41 @@ static PALETTE_INIT( vega )
static void draw_tilemap(vega_state *state, screen_device& screen, bitmap_ind16& bitmap, const rectangle& cliprect)
{
{
-
+
UINT8 *map_lookup = state->memregion("tilemaps")->base();
int offset_y=state->m_tilemap_offset_y;
int offset_x=state->m_tilemap_offset_x;
-
+
//logerror("%d %d\n",offset_x, offset_y);
-
+
for(int xx=0;xx<128;++xx)
{
for(int yy=0;yy<8;yy++)
{
-
+
int x0=xx*32;
int y0=yy*32;
-
-
+
+
int id=map_lookup[((yy+xx*8)+ ((state->m_tilemap_flags&2)?0x400:0) + (state->m_tilemap_top<<6 ) ) &0x7ff];
-
+
int flip=BIT(id,5);
-
+
int num=(BITSWAP8( ((id>>2) &7), 7,6,5,4,3,0,1,2 ));
-
+
int bank=id&3;
-
+
if(bank!=3)
{
-
+
num+=bank*8;
-
+
num*=8*4;
-
-
+
+
for(int x=0;x<8;++x)
for(int y=0;y<4;++y)
{
@@ -535,24 +535,24 @@ static void draw_tilemap(vega_state *state, screen_device& screen, bitmap_ind16&
}
}
}
-
-
+
+
}
-
-
-
-
+
+
+
+
}
static SCREEN_UPDATE_IND16( vega )
{
vega_state *state = screen.machine().driver_data<vega_state>();
++state->m_frame_counter;
-
+
bitmap.fill(0, cliprect);
-
+
draw_tilemap(state, screen, bitmap, cliprect);
-
+
{
int x,y;
@@ -562,39 +562,39 @@ static SCREEN_UPDATE_IND16( vega )
for(y=0;y<25;++y)
for(x=0;x<40;++x)
{
-
+
int character=state->m_txt_ram[idx];
//int color=BITSWAP8(color_lookup[character],7,6,5,4,0,1,2,3)>>1;
int color=color_lookup[character]&0xf;
- /*
- bit 0 - unknown
- bit 1 - blue
- bit 2 - green
- bit 3 - red
- */
-
+ /*
+ bit 0 - unknown
+ bit 1 - blue
+ bit 2 - green
+ bit 3 - red
+ */
+
color=BITSWAP8(color,7,6,5,4,0,1,2,3)&0x7;
-
+
color^=0xf;
-
- // if(color==0) color=0xf;
-
+
+ // if(color==0) color=0xf;
+
drawgfx_transpen(bitmap, cliprect, screen.machine().gfx[0], character, color, 0, 0, x*7, y*10,0);
-
+
++idx;
}
-
+
}
-
+
{
for(int i=OBJ_0;i<OBJ_PLAYER;++i)
{
-
+
int x0=255-state->m_obj[i].m_x;
int y0=255-state->m_obj[i].m_y;
int num=state->m_obj[i].m_type&7;
int flip=state->m_obj[i].m_type&8;
-
+
num*=4*8;
for(int x=0;x<8;++x)
for(int y=0;y<4;++y)
@@ -610,11 +610,11 @@ static SCREEN_UPDATE_IND16( vega )
/*
- 64 strips
-
- x - - x x x
-
-
+ 64 strips
+
+ x - - x x x
+
+
*/
@@ -624,24 +624,24 @@ static SCREEN_UPDATE_IND16( vega )
{
int x0=state->m_obj[OBJ_PLAYER].m_x;
int y0=255-state->m_obj[OBJ_PLAYER].m_y-32;
-
+
UINT8 *sprite_lookup = state->memregion("proms")->base();
-
+
for(int x=0;x<16;++x)
{
int prom_data=sprite_lookup[ ((state->m_obj[OBJ_PLAYER].m_type&0xf)<<2)|((x>>2)&3)|(((state->m_frame_counter>>1)&3)<<6) ];
-
+
int xor_line=( ! (( ! ((BIT(prom_data,1))&(BIT(prom_data,2))&(BIT(prom_data,3))&(BIT(x,2)) ) ) &
( (BIT(prom_data,2)) | (BIT(prom_data,3)) | ( BIT(state->m_obj[OBJ_PLAYER].m_type,4)) ) ));
-
+
int strip_num=((prom_data)&0x7)|( ((x&3)^(xor_line?0x3:0)) <<3)|((BIT(prom_data,3))<<5);
-
+
strip_num<<=2;
-
+
for(int y=0;y<4;++y)
{
-
+
drawgfx_transpen(bitmap, cliprect, screen.machine().gfx[3], strip_num, 0, !xor_line, 0, x*4+x0, y*8+y0, 0);
++strip_num;
}
@@ -662,7 +662,7 @@ static const gfx_layout text_charlayout =
{ 1,2,3,4,5,6,7 },
/* y offsets */
{ 0*8, 8*8, 4*8, 12*8, 2*8, 10*8, 6*8, 14*8, 1*8, 9*8 },
- 8*16
+ 8*16
};
static const gfx_layout tile_layout2 =
@@ -722,7 +722,7 @@ WRITE8_MEMBER(vega_state::txtram_w)
READ8_MEMBER(vega_state::txtram_r)
{
-
+
return m_txt_ram[m_ext_offset_r+((m_p2_data&3)<<8)];
}
@@ -830,22 +830,22 @@ static const ay8910_interface ay8910_inf =
static MACHINE_START( vega )
{
-
+
}
static MACHINE_CONFIG_START( vega, vega_state )
-
- MCFG_CPU_ADD("maincpu", I8035, 4000000)
+
+ MCFG_CPU_ADD("maincpu", I8035, 4000000)
MCFG_CPU_PROGRAM_MAP(vega_map)
MCFG_CPU_IO_MAP(vega_io_map)
MCFG_CPU_VBLANK_INT("screen",irq0_line_hold)
-
+
MCFG_MACHINE_START(vega)
MCFG_MACHINE_RESET(vega)
-
+
MCFG_I8255A_ADD( "ppi8255", ppi8255_intf )
MCFG_INS8154_ADD( "ins8154", ins8154_intf)
@@ -862,7 +862,7 @@ static MACHINE_CONFIG_START( vega, vega_state )
MCFG_PALETTE_INIT(vega)
MCFG_SCREEN_UPDATE_STATIC(vega)
-
+
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -870,27 +870,27 @@ static MACHINE_CONFIG_START( vega, vega_state )
MCFG_SOUND_ADD("ay8910", AY8910, 1500000 )
MCFG_SOUND_CONFIG(ay8910_inf)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
-
+
MACHINE_CONFIG_END
ROM_START( vega )
ROM_REGION( 0x10000, "maincpu", 0 )
ROM_LOAD( "rom9.bin", 0x0800, 0x0800, CRC(191c73cd) SHA1(17b1c3790f82b276e55d25ea8a38a3c9cf20bf12) )
ROM_LOAD( "rom10a.bin", 0x1000, 0x1000, CRC(fca9a570) SHA1(598772db11b32518ed6bf5155a19f4f1761a4831) )
-
+
ROM_REGION( 0x01000, "gfx1", ROMREGION_INVERT )
ROM_LOAD( "rom8.bin", 0x0000, 0x0800, CRC(ccb8598c) SHA1(8c4a702f0653bb189db7d8ac4c2a06aacecc0de0) )
ROM_LOAD( "rom7.bin", 0x0800, 0x0800, CRC(1de564cd) SHA1(7408cd29f1afc111aa695ecb00160d8f7fba7532) )
-
+
ROM_REGION( 0x01800, "gfx2", ROMREGION_INVERT )
ROM_LOAD( "rom2.bin", 0x0000, 0x0800, CRC(718da952) SHA1(1a0023be1ee3a48ed3ddb8daddbb49ca3f442d46) )
ROM_LOAD( "rom3.bin", 0x0800, 0x0800, CRC(37944311) SHA1(8b20be3d3ca5cb27bef78a73ee7e977fdf76c7f1) )
ROM_LOAD( "rom4.bin", 0x1000, 0x0800, CRC(09453d7a) SHA1(75fe96ae25467f82c0725834c6c04a197f50cce7) )
-
+
ROM_REGION( 0x01000, "gfx3", ROMREGION_INVERT )
ROM_LOAD( "rom5.bin", 0x0000, 0x0800, CRC(be3df449) SHA1(acba1e07bdf9c0e971f47f2433d2760472c4326a) )
ROM_LOAD( "rom6.bin", 0x0800, 0x0800, CRC(dc46527c) SHA1(d10a54d8d3ce9ffd8a53bede3d089625aff445a2) )
-
+
ROM_REGION( 0x01000, "gfx4", ROMREGION_INVERT )
ROM_LOAD( "rom11.bin", 0x0000, 0x0800, CRC(d1896f77) SHA1(5b80bf7aa81508edfae4fa583b4b0077575a300c) )
ROM_LOAD( "rom12.bin", 0x0800, 0x0800, CRC(f5f1df2f) SHA1(5851b468702e5e4f085b64afbe7d8b797bb109b5) )
@@ -900,7 +900,7 @@ ROM_START( vega )
ROM_LOAD( "r9.bin", 0x0100, 0x0100, CRC(db0bcea5) SHA1(692bea2d9e28985fe7270a940e9f48ac64bdeaa8) ) // FIXED BITS (0000xxxx)
ROM_LOAD( "r10.bin", 0x0200, 0x0100, CRC(ca5a3627) SHA1(8c632fa9174e336c588074f92f3519b0cf224852) ) // FIXED BITS (0000xxxx) - txt layer lookup table
ROM_LOAD( "r11.bin", 0x0300, 0x0100, CRC(d8aab14a) SHA1(798feaa929dd7b71266220b568826997acd2a93e) ) // FIXED BITS (000011xx) - RNG? not used
-
+
ROM_REGION( 0x800, "tilemaps", 0 )
ROM_LOAD( "rom1.bin", 0x0000, 0x0800, CRC(a0c0e0af) SHA1(7ccbfe3c23cda4c3a639c89ff4b2f554e2876c98) ) // FIXED BITS (00xxxxxx) (tile attribs?)
diff --git a/src/mame/drivers/wildpkr.c b/src/mame/drivers/wildpkr.c
index 42b4354c24a..512d14ef232 100644
--- a/src/mame/drivers/wildpkr.c
+++ b/src/mame/drivers/wildpkr.c
@@ -212,7 +212,7 @@ static PALETTE_INIT( wildpkr )
static ADDRESS_MAP_START( wildpkr_map, AS_PROGRAM, 16, wildpkr_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM
-// AM_RANGE(0x800000, 0x800003) ACRTC?
+// AM_RANGE(0x800000, 0x800003) ACRTC?
AM_RANGE(0x800180, 0x800181) AM_READNOP // protection, puts m68k code snippets to RAM
AM_RANGE(0x800200, 0x800201) AM_DEVWRITE8("ramdac", ramdac_device, index_w, 0xff00)
AM_RANGE(0x800202, 0x800203) AM_DEVWRITE8("ramdac", ramdac_device, pal_w, 0xff00)
@@ -273,7 +273,7 @@ static MACHINE_CONFIG_START( wildpkr, wildpkr_state )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, MAIN_CLOCK)
MCFG_CPU_PROGRAM_MAP(wildpkr_map)
-// MCFG_CPU_VBLANK_INT("screen", irq1_line_hold) //guess
+// MCFG_CPU_VBLANK_INT("screen", irq1_line_hold) //guess
MCFG_MACHINE_START(wildpkr)
diff --git a/src/mame/includes/bfm_sc45.h b/src/mame/includes/bfm_sc45.h
index ae89019d8e2..247714a2b97 100644
--- a/src/mame/includes/bfm_sc45.h
+++ b/src/mame/includes/bfm_sc45.h
@@ -57,7 +57,7 @@ public:
DECLARE_WRITE16_MEMBER(sc4_mem_w);
DECLARE_READ16_MEMBER(sc4_cs1_r);
-
+
DECLARE_DRIVER_INIT(sc4);
DECLARE_DRIVER_INIT(sc4mbus);
DECLARE_DRIVER_INIT(sc4cvani);
diff --git a/src/mame/includes/cps1.h b/src/mame/includes/cps1.h
index 1fb7c2f27ef..f0fa31d1da2 100644
--- a/src/mame/includes/cps1.h
+++ b/src/mame/includes/cps1.h
@@ -191,7 +191,7 @@ public:
DECLARE_DRIVER_INIT(cps2crpt);
DECLARE_DRIVER_INIT(ssf2tb);
DECLARE_DRIVER_INIT(pzloop2);
- DECLARE_DRIVER_INIT(gigaman2);
+ DECLARE_DRIVER_INIT(gigaman2);
};
/*----------- defined in drivers/cps1.c -----------*/
diff --git a/src/mame/includes/dynax.h b/src/mame/includes/dynax.h
index f89e7f2dde4..79cdde8f284 100644
--- a/src/mame/includes/dynax.h
+++ b/src/mame/includes/dynax.h
@@ -427,7 +427,7 @@ public:
DECLARE_DRIVER_INIT(maya);
DECLARE_DRIVER_INIT(rongrong);
DECLARE_DRIVER_INIT(momotaro);
-
+
};
//----------- defined in drivers/dynax.c -----------
diff --git a/src/mame/includes/galaga.h b/src/mame/includes/galaga.h
index 8b1595fe1d7..ec30b31df32 100644
--- a/src/mame/includes/galaga.h
+++ b/src/mame/includes/galaga.h
@@ -76,7 +76,7 @@ public:
INT32 m_xevious_bs[2];
DECLARE_DRIVER_INIT(xevious);
DECLARE_DRIVER_INIT(xevios);
- DECLARE_DRIVER_INIT(battles);
+ DECLARE_DRIVER_INIT(battles);
};
diff --git a/src/mame/includes/galaxian.h b/src/mame/includes/galaxian.h
index cd883ca53d4..cfecf607b99 100644
--- a/src/mame/includes/galaxian.h
+++ b/src/mame/includes/galaxian.h
@@ -217,7 +217,7 @@ public:
DECLARE_DRIVER_INIT(anteateruk);
DECLARE_DRIVER_INIT(superbon);
DECLARE_DRIVER_INIT(calipso);
- DECLARE_DRIVER_INIT(moonwar);
+ DECLARE_DRIVER_INIT(moonwar);
};
diff --git a/src/mame/includes/kickgoal.h b/src/mame/includes/kickgoal.h
index c7c89e72e01..56e3a8a2305 100644
--- a/src/mame/includes/kickgoal.h
+++ b/src/mame/includes/kickgoal.h
@@ -45,7 +45,7 @@ public:
int m_bg_base;
int m_bg_mask;
-
+
int m_bg2_base;
int m_bg2_mask;
int m_bg2_region;
diff --git a/src/mame/includes/megadriv.h b/src/mame/includes/megadriv.h
index f66f83971af..943f4b491db 100644
--- a/src/mame/includes/megadriv.h
+++ b/src/mame/includes/megadriv.h
@@ -189,12 +189,12 @@ public:
m_protcount = 0;
return ret;
}
-
+
DECLARE_DRIVER_INIT(aladmdb);
DECLARE_DRIVER_INIT(mk3mdb);
DECLARE_DRIVER_INIT(ssf2mdb);
DECLARE_DRIVER_INIT(srmdb);
- DECLARE_DRIVER_INIT(topshoot);
+ DECLARE_DRIVER_INIT(topshoot);
DECLARE_DRIVER_INIT(puckpkmn);
};
@@ -228,7 +228,7 @@ public:
/* sound-related variables */
UINT8 m_sound_banks; /* number of sound banks */
-
+
DECLARE_DRIVER_INIT(c2boot);
DECLARE_DRIVER_INIT(bloxeedc);
DECLARE_DRIVER_INIT(columns);
@@ -266,7 +266,7 @@ public:
m_vdp1(*this, "vdp1"),
m_bioscpu(*this, "mtbios")
-
+
{ }
UINT32 m_bios_mode; // determines whether ROM banks or Game data
@@ -364,10 +364,10 @@ public:
UINT8 m_jcart_io_data[2];
megadriv_cart m_md_cart;
-
+
DECLARE_DRIVER_INIT(hshavoc);
DECLARE_DRIVER_INIT(topshoot);
-
+
DECLARE_DRIVER_INIT(genesis);
DECLARE_DRIVER_INIT(mess_md_common);
DECLARE_DRIVER_INIT(_32x);
diff --git a/src/mame/includes/n64.h b/src/mame/includes/n64.h
index dc2f510c07c..fb5ec9768f3 100644
--- a/src/mame/includes/n64.h
+++ b/src/mame/includes/n64.h
@@ -19,7 +19,7 @@ public:
/* video-related */
n64_rdp *m_rdp;
DECLARE_DRIVER_INIT(aleck64);
-
+
};
/*----------- devices -----------*/
diff --git a/src/mame/includes/neogeo.h b/src/mame/includes/neogeo.h
index 9f3ff6fb464..660a368dfe6 100644
--- a/src/mame/includes/neogeo.h
+++ b/src/mame/includes/neogeo.h
@@ -200,7 +200,7 @@ public:
DECLARE_DRIVER_INIT(kog);
DECLARE_DRIVER_INIT(lans2004);
DECLARE_DRIVER_INIT(sbp);
- DECLARE_DRIVER_INIT(mvs);
+ DECLARE_DRIVER_INIT(mvs);
void mvs_install_protection(device_image_interface& image);
};
diff --git a/src/mame/includes/pgm.h b/src/mame/includes/pgm.h
index bdb566dadc0..44e3f27b01e 100644
--- a/src/mame/includes/pgm.h
+++ b/src/mame/includes/pgm.h
@@ -129,7 +129,7 @@ public:
UINT8 m_asic3_h1;
UINT8 m_asic3_h2;
UINT16 m_asic3_hold;
-
+
DECLARE_DRIVER_INIT(orlegend);
};
@@ -215,7 +215,7 @@ public:
required_shared_ptr<UINT32> m_arm7_shareram;
cpu_device *m_prot;
-
+
DECLARE_DRIVER_INIT(kov2);
DECLARE_DRIVER_INIT(kov2p);
DECLARE_DRIVER_INIT(martmast);
@@ -244,13 +244,13 @@ public:
required_shared_ptr<UINT32> m_arm_ram;
cpu_device *m_prot;
-
+
DECLARE_DRIVER_INIT(theglad);
DECLARE_DRIVER_INIT(svg);
DECLARE_DRIVER_INIT(svgpcb);
DECLARE_DRIVER_INIT(killbldp);
DECLARE_DRIVER_INIT(dmnfrnt);
- DECLARE_DRIVER_INIT(happy6);
+ DECLARE_DRIVER_INIT(happy6);
};
@@ -290,7 +290,7 @@ public:
UINT16 m_olds_bs;
UINT16 m_olds_cmd3;
required_shared_ptr<UINT16> m_sharedprotram;
-
+
DECLARE_DRIVER_INIT(olds);
};
diff --git a/src/mame/includes/scramble.h b/src/mame/includes/scramble.h
index 9cdd6540a6d..84bb5ac4043 100644
--- a/src/mame/includes/scramble.h
+++ b/src/mame/includes/scramble.h
@@ -39,7 +39,7 @@ public:
DECLARE_DRIVER_INIT(ad2083);
DECLARE_DRIVER_INIT(devilfsh);
DECLARE_DRIVER_INIT(mrkougar);
-
+
DECLARE_DRIVER_INIT(scobra);
DECLARE_DRIVER_INIT(stratgyx);
DECLARE_DRIVER_INIT(tazmani2);
@@ -51,7 +51,7 @@ public:
DECLARE_DRIVER_INIT(hustler);
DECLARE_DRIVER_INIT(hustlerd);
DECLARE_DRIVER_INIT(billiard);
-};
+};
/*----------- defined in machine/scramble.c -----------*/
diff --git a/src/mame/includes/segahang.h b/src/mame/includes/segahang.h
index 7493e1665b6..03a9f3759b8 100644
--- a/src/mame/includes/segahang.h
+++ b/src/mame/includes/segahang.h
@@ -67,7 +67,7 @@ public:
DECLARE_WRITE8_MEMBER( tilemap_sound_w );
DECLARE_WRITE8_MEMBER( sub_control_adc_w );
DECLARE_READ8_MEMBER( adc_status_r );
-
+
// main CPU read/write handlers
DECLARE_READ16_MEMBER( hangon_io_r );
DECLARE_WRITE16_MEMBER( hangon_io_w );
@@ -100,7 +100,7 @@ protected:
TID_INIT_I8751,
TID_PPI_WRITE
};
-
+
// driver overrides
virtual void video_start();
virtual void machine_reset();
@@ -116,14 +116,14 @@ protected:
optional_device<i8751_device> m_mcu;
required_device<i8255_device> m_i8255_1;
required_device<i8255_device> m_i8255_2;
-
- // memory pointers
+
+ // memory pointers
required_shared_ptr<UINT16> m_workram;
-
+
// configuration
bool m_sharrier_video;
i8751_sim_delegate m_i8751_vblank_hook;
// internal state
- UINT8 m_adc_select;
+ UINT8 m_adc_select;
};
diff --git a/src/mame/includes/segaorun.h b/src/mame/includes/segaorun.h
index e8e8de3ee3f..5a7f652bb77 100644
--- a/src/mame/includes/segaorun.h
+++ b/src/mame/includes/segaorun.h
@@ -83,7 +83,7 @@ public:
DECLARE_READ16_MEMBER( misc_io_r );
DECLARE_WRITE16_MEMBER( misc_io_w );
DECLARE_WRITE16_MEMBER( nop_w );
-
+
// Z80 sound CPU read/write handlers
DECLARE_READ8_MEMBER( sound_data_r );
@@ -111,7 +111,7 @@ protected:
TID_IRQ2_GEN,
TID_SOUND_WRITE
};
-
+
// device overrides
virtual void machine_reset();
virtual void video_start();
@@ -126,7 +126,7 @@ protected:
DECLARE_WRITE16_MEMBER( outrun_custom_io_w );
DECLARE_READ16_MEMBER( shangon_custom_io_r );
DECLARE_WRITE16_MEMBER( shangon_custom_io_w );
-
+
// devices
required_device<sega_315_5195_mapper_device> m_mapper;
required_device<m68000_device> m_maincpu;
@@ -137,16 +137,16 @@ protected:
// memory
required_shared_ptr<UINT16> m_workram;
-
+
// configuration
- read16_delegate m_custom_io_r;
- write16_delegate m_custom_io_w;
+ read16_delegate m_custom_io_r;
+ write16_delegate m_custom_io_w;
const UINT8 * m_custom_map;
bool m_shangon_video;
// internal state
emu_timer * m_scanline_timer;
- UINT8 m_irq2_state;
- UINT8 m_adc_select;
- UINT8 m_vblank_irq_state;
+ UINT8 m_irq2_state;
+ UINT8 m_adc_select;
+ UINT8 m_vblank_irq_state;
};
diff --git a/src/mame/includes/segas16a.h b/src/mame/includes/segas16a.h
index a9a9b07cc45..ebde15cbdfb 100644
--- a/src/mame/includes/segas16a.h
+++ b/src/mame/includes/segas16a.h
@@ -73,7 +73,7 @@ public:
m_read_port(0),
m_mj_input_num(0)
{ }
-
+
// PPI read/write callbacks
DECLARE_WRITE8_MEMBER( misc_control_w );
DECLARE_WRITE8_MEMBER( tilemap_sound_w );
@@ -83,7 +83,7 @@ public:
DECLARE_WRITE16_MEMBER( standard_io_w );
DECLARE_READ16_MEMBER( misc_io_r );
DECLARE_WRITE16_MEMBER( misc_io_w );
-
+
// Z80 sound CPU read/write handlers
DECLARE_READ8_MEMBER( sound_data_r );
DECLARE_WRITE8_MEMBER( n7751_command_w );
@@ -131,7 +131,7 @@ protected:
TID_INIT_I8751,
TID_PPI_WRITE
};
-
+
// driver overrides
virtual void video_start();
virtual void machine_reset();
@@ -140,7 +140,7 @@ protected:
// I8751 simulations
void dumpmtmt_i8751_sim();
void quartet_i8751_sim();
-
+
// custom I/O handlers
DECLARE_READ16_MEMBER( aceattaa_custom_io_r );
DECLARE_READ16_MEMBER( mjleague_custom_io_r );
@@ -159,7 +159,7 @@ protected:
optional_device<i8243_device> m_n7751_i8243;
required_device<nvram_device> m_nvram;
- // memory pointers
+ // memory pointers
required_shared_ptr<UINT16> m_workram;
// configuration
@@ -169,12 +169,12 @@ protected:
lamp_changed_delegate m_lamp_changed_w;
// internal state
- UINT8 m_video_control;
- UINT8 m_mcu_control;
- UINT8 m_n7751_command;
- UINT32 m_n7751_rom_address;
- UINT8 m_last_buttons1;
- UINT8 m_last_buttons2;
- UINT8 m_read_port;
- UINT8 m_mj_input_num;
+ UINT8 m_video_control;
+ UINT8 m_mcu_control;
+ UINT8 m_n7751_command;
+ UINT32 m_n7751_rom_address;
+ UINT8 m_last_buttons1;
+ UINT8 m_last_buttons2;
+ UINT8 m_read_port;
+ UINT8 m_mj_input_num;
};
diff --git a/src/mame/includes/segas16b.h b/src/mame/includes/segas16b.h
index f5a37c136a5..a923e13bed9 100644
--- a/src/mame/includes/segas16b.h
+++ b/src/mame/includes/segas16b.h
@@ -91,7 +91,7 @@ public:
DECLARE_READ16_MEMBER( standard_io_r );
DECLARE_WRITE16_MEMBER( standard_io_w );
DECLARE_WRITE16_MEMBER( atomicp_sound_w );
-
+
// sound CPU read/write handlers
DECLARE_WRITE8_MEMBER( upd7759_control_w );
DECLARE_READ8_MEMBER( upd7759_status_r );
@@ -107,7 +107,7 @@ public:
DECLARE_DRIVER_INIT(generic_5358_small);
DECLARE_DRIVER_INIT(generic_5797);
DECLARE_DRIVER_INIT(generic_korean);
-
+
// game-specific driver init
DECLARE_DRIVER_INIT(isgsm);
DECLARE_DRIVER_INIT(tturf_5704);
@@ -133,7 +133,7 @@ public:
DECLARE_DRIVER_INIT(shinobi3_5358);
DECLARE_DRIVER_INIT(goldnaxe_5797);
DECLARE_DRIVER_INIT(altbeas4_5521);
-
+
// video updates
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@@ -163,13 +163,13 @@ protected:
ROM_BOARD_171_5797, // 171-5797
ROM_BOARD_KOREAN // (custom Korean)
};
-
+
// device overrides
virtual void video_start();
virtual void machine_reset();
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
- // internal helpers
+ // internal helpers
void init_generic(segas16b_rom_board rom_board);
// i8751 simulations
@@ -191,7 +191,7 @@ protected:
DECLARE_READ16_MEMBER( sdi_custom_io_r );
DECLARE_READ16_MEMBER( sjryuko_custom_io_r );
DECLARE_WRITE16_MEMBER( sjryuko_custom_io_w );
-
+
// devices
required_device<sega_315_5195_mapper_device> m_mapper;
required_device<m68000_device> m_maincpu;
@@ -205,24 +205,24 @@ protected:
optional_device<sega_315_5250_compare_timer_device> m_cmptimer_2;
required_device<nvram_device> m_nvram;
- // memory pointers
+ // memory pointers
required_shared_ptr<UINT16> m_workram;
// configuration
segas16b_rom_board m_romboard;
int m_tilemap_type;
- read16_delegate m_custom_io_r;
- write16_delegate m_custom_io_w;
+ read16_delegate m_custom_io_r;
+ write16_delegate m_custom_io_w;
bool m_disable_screen_blanking;
const UINT8 * m_i8751_initial_config;
i8751_sim_delegate m_i8751_vblank_hook;
- UINT8 m_atomicp_sound_divisor;
+ UINT8 m_atomicp_sound_divisor;
// game-specific state
- UINT8 m_atomicp_sound_count;
- UINT8 m_hwc_input_value;
- UINT8 m_mj_input_num;
- UINT8 m_mj_last_val;
+ UINT8 m_atomicp_sound_count;
+ UINT8 m_hwc_input_value;
+ UINT8 m_mj_input_num;
+ UINT8 m_mj_last_val;
};
@@ -279,21 +279,21 @@ public:
virtual void machine_reset();
// configuration
- UINT8 m_read_xor;
+ UINT8 m_read_xor;
typedef delegate<UINT32 (UINT32)> security_callback_delegate;
security_callback_delegate m_security_callback;
// internal state
- UINT16 m_cart_addrlatch;
- UINT32 m_cart_addr;
- UINT8 m_data_type;
- UINT32 m_data_addr;
- UINT8 m_data_mode;
- UINT16 m_addr_latch;
- UINT32 m_security_value;
- UINT16 m_security_latch;
- UINT8 m_rle_control_position;
- UINT8 m_rle_control_byte;
- bool m_rle_latched;
- UINT8 m_rle_byte;
+ UINT16 m_cart_addrlatch;
+ UINT32 m_cart_addr;
+ UINT8 m_data_type;
+ UINT32 m_data_addr;
+ UINT8 m_data_mode;
+ UINT16 m_addr_latch;
+ UINT32 m_security_value;
+ UINT16 m_security_latch;
+ UINT8 m_rle_control_position;
+ UINT8 m_rle_control_byte;
+ bool m_rle_latched;
+ UINT8 m_rle_byte;
};
diff --git a/src/mame/includes/segas18.h b/src/mame/includes/segas18.h
index b6cb77e2304..657cd550817 100644
--- a/src/mame/includes/segas18.h
+++ b/src/mame/includes/segas18.h
@@ -72,7 +72,7 @@ public:
memset(m_wwally_last_x, 0, sizeof(m_wwally_last_x));
memset(m_wwally_last_y, 0, sizeof(m_wwally_last_y));
}
-
+
// driver init
DECLARE_DRIVER_INIT(ddcrew);
DECLARE_DRIVER_INIT(lghost);
@@ -80,7 +80,7 @@ public:
DECLARE_DRIVER_INIT(generic_5874);
DECLARE_DRIVER_INIT(wwally);
DECLARE_DRIVER_INIT(generic_5987);
-
+
// memory mapping
void memory_mapper(sega_315_5195_mapper_device &mapper, UINT8 index);
UINT8 mapper_sound_r();
@@ -130,13 +130,13 @@ protected:
ROM_BOARD_171_5874, // 171-5874
ROM_BOARD_171_5987 // 171-5987
};
-
+
// device overrides
virtual void machine_reset();
virtual void video_start();
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
- // internal helpers
+ // internal helpers
void init_generic(segas18_rom_board rom_board);
void set_grayscale(bool enable);
void set_vdp_enable(bool enable);
@@ -151,26 +151,26 @@ protected:
required_device<sega_genesis_vdp_device> m_vdp;
required_device<nvram_device> m_nvram;
- // memory pointers
+ // memory pointers
required_shared_ptr<UINT16> m_workram;
-
+
// configuration
segas18_rom_board m_romboard;
- read16_delegate m_custom_io_r;
- write16_delegate m_custom_io_w;
- bool m_has_guns;
+ read16_delegate m_custom_io_r;
+ write16_delegate m_custom_io_w;
+ bool m_has_guns;
// internal state
- bool m_grayscale_enable;
- bool m_vdp_enable;
- UINT8 m_vdp_mixing;
+ bool m_grayscale_enable;
+ bool m_vdp_enable;
+ UINT8 m_vdp_mixing;
bitmap_ind16 m_temp_bitmap;
- UINT8 m_mcu_data;
- UINT8 m_misc_io_data[0x10];
-
+ UINT8 m_mcu_data;
+ UINT8 m_misc_io_data[0x10];
+
// game-specific state
- UINT8 m_wwally_last_x[3];
- UINT8 m_wwally_last_y[3];
- UINT8 m_lghost_value;
- UINT8 m_lghost_select;
+ UINT8 m_wwally_last_x[3];
+ UINT8 m_wwally_last_y[3];
+ UINT8 m_lghost_value;
+ UINT8 m_lghost_select;
};
diff --git a/src/mame/includes/segaxbd.h b/src/mame/includes/segaxbd.h
index 4198d5928ee..45ba3f45cc2 100644
--- a/src/mame/includes/segaxbd.h
+++ b/src/mame/includes/segaxbd.h
@@ -68,10 +68,10 @@ public:
memset(m_iochip_regs, 0, sizeof(m_iochip_regs));
}
- // compare/timer chip callbacks
+ // compare/timer chip callbacks
void timer_ack_callback();
void sound_data_w(UINT8 data);
-
+
// YM2151 chip callbacks
WRITE_LINE_MEMBER( sound_cpu_irq );
@@ -84,17 +84,17 @@ public:
READ16_MEMBER( iochip_1_r );
WRITE16_MEMBER( iochip_1_w );
WRITE16_MEMBER( iocontrol_w );
-
+
// game-specific main CPU read/write handlers
WRITE16_MEMBER( loffire_sync0_w );
READ16_MEMBER( rascot_excs_r );
WRITE16_MEMBER( rascot_excs_w );
READ16_MEMBER( smgp_excs_r );
WRITE16_MEMBER( smgp_excs_w );
-
+
// sound Z80 CPU read/write handlers
READ8_MEMBER( sound_data_r );
-
+
// game-specific driver init
DECLARE_DRIVER_INIT(generic);
DECLARE_DRIVER_INIT(aburner2);
@@ -119,7 +119,7 @@ protected:
TID_IRQ2_GEN,
TID_SOUND_WRITE
};
-
+
// device overrides
virtual void machine_reset();
virtual void video_start();
@@ -148,16 +148,16 @@ protected:
// configuration
bool m_gprider_hack;
- bool m_adc_reverse[8];
+ bool m_adc_reverse[8];
ioread_delegate m_iochip_custom_io_r[2][8];
iowrite_delegate m_iochip_custom_io_w[2][8];
- UINT8 m_road_priority;
-
+ UINT8 m_road_priority;
+
// internal state
emu_timer * m_scanline_timer;
- UINT8 m_timer_irq_state;
- UINT8 m_vblank_irq_state;
- UINT8 m_iochip_regs[2][8];
+ UINT8 m_timer_irq_state;
+ UINT8 m_vblank_irq_state;
+ UINT8 m_iochip_regs[2][8];
// game-specific state
UINT16 * m_loffire_sync;
diff --git a/src/mame/includes/segaybd.h b/src/mame/includes/segaybd.h
index 08e87334e2e..8ca70dadbda 100644
--- a/src/mame/includes/segaybd.h
+++ b/src/mame/includes/segaybd.h
@@ -100,14 +100,14 @@ public:
protected:
// internal types
typedef delegate<void (UINT16)> output_delegate;
-
+
// timer IDs
enum
{
TID_IRQ2_GEN,
TID_SOUND_WRITE
};
-
+
// device overrides
virtual void machine_reset();
virtual void video_start();
@@ -127,12 +127,12 @@ protected:
output_delegate m_output_cb2;
// internal state
- UINT16 m_pdrift_bank;
+ UINT16 m_pdrift_bank;
emu_timer * m_scanline_timer;
- UINT8 m_analog_data[4];
+ UINT8 m_analog_data[4];
int m_irq2_scanline;
- UINT8 m_timer_irq_state;
- UINT8 m_vblank_irq_state;
- UINT8 m_misc_io_data[0x10];
+ UINT8 m_timer_irq_state;
+ UINT8 m_vblank_irq_state;
+ UINT8 m_misc_io_data[0x10];
bitmap_ind16 m_tmp_bitmap;
};
diff --git a/src/mame/includes/senjyo.h b/src/mame/includes/senjyo.h
index 7de6ddc617d..1d4079af798 100644
--- a/src/mame/includes/senjyo.h
+++ b/src/mame/includes/senjyo.h
@@ -31,7 +31,7 @@ public:
int m_single_rate;
int m_single_volume;
int m_sound_state;
-
+
required_device<dac_device> m_dac;
required_shared_ptr<UINT8> m_spriteram;
diff --git a/src/mame/includes/snes.h b/src/mame/includes/snes.h
index 57e36326e63..ed6c038f3f8 100644
--- a/src/mame/includes/snes.h
+++ b/src/mame/includes/snes.h
@@ -491,7 +491,7 @@ public:
DECLARE_DIRECT_UPDATE_MEMBER(snes_spc_direct);
DECLARE_DIRECT_UPDATE_MEMBER(snes_direct);
DECLARE_DRIVER_INIT(snes);
- DECLARE_DRIVER_INIT(snes_hirom);
+ DECLARE_DRIVER_INIT(snes_hirom);
DECLARE_DRIVER_INIT(snes_mess);
DECLARE_DRIVER_INIT(snesst);
};
diff --git a/src/mame/includes/stv.h b/src/mame/includes/stv.h
index ffccd6a8fc7..afbf7f31b33 100644
--- a/src/mame/includes/stv.h
+++ b/src/mame/includes/stv.h
@@ -189,7 +189,7 @@ public:
DECLARE_DRIVER_INIT(znpwfv);
DECLARE_DRIVER_INIT(othellos);
DECLARE_DRIVER_INIT(mausuke);
-
+
DECLARE_DRIVER_INIT(saturnus);
DECLARE_DRIVER_INIT(saturneu);
DECLARE_DRIVER_INIT(saturnjp);
diff --git a/src/mame/machine/fd1089.c b/src/mame/machine/fd1089.c
index d50769e2a0f..f2df406d035 100644
--- a/src/mame/machine/fd1089.c
+++ b/src/mame/machine/fd1089.c
@@ -10,120 +10,120 @@
****************************************************************************
- Decryption tables provided by Charles MacDonald
- Decryption algorithm by Nicola Salmoria
- LCG algorithm by Andreas Naive
-
- The FD1089 is a 68000 with built-in encryption.
- It contains some battery-backed RAM, when the battery dies the CPU stops
- working.
-
- Both opcodes and data are encrypted, using different (but related) mappings.
- Decryption works on 16-bit words, but only 8 bits are affected, the other 8 are
- left untouched. A special value in internal RAM disables the encryption, this
- is necessary otherwise RAM would not work as expected (writing data and reading
- it back would return a different number).
-
- The FD1089A and FD1089B work in the same way, but the decryption tables are
- different. The internal RAM contains the 8-bit key to use at every address
- (only 12 bits of the address are used, so the encryption repeats).
-
- The FD1089 design is clearly derived from the MC8123. The MC8123 is a Z80 so it
- made sense to encrypt all 8 data bits and use 12 of the 16 address bits. It makes
- a lot less sense to encrypt only half of the 16 data bits; using 12 of the 24
- address bits might be ok, but not in the way it was done. The choice of address
- bits to use was probably dictated by the need to not encrypt data in certain areas
- of the address space, so they had to include the top 8 bits of the address.
- However this means that if you pick e.g. area 000000-00FFFF, where most of the
- program code resides, just 4 address bits affect the encryption, making it very
- weak when compared to the MC8123. Out of the 16KB of internal RAM, you need less
- than 128 bytes to decrypt a whole game - the rest is not used. A waste of space
- and security. Also, since only 8 of the 16 bits are encrypted, it is very easy
- to use the unencrypted ones to search for known sequences of code or data.
-
- Like for the MC8123, the contents of the internal RAM were generated using a
- linear congruential generator, so the whole key can be generated starting from
- a single 24-bit seed. Note however that the "don't decrypt" data sections need
- special treatment so it's not possible to derive the precise key without access
- to the CPU.
-
- static int rndseed;
-
- int rnd()
- {
- rndseed = rndseed * 0x290029;
- return (rndseed >> 16) & 0xff;
- }
-
- void generate_key(int seed)
- {
- int i;
-
- rndseed = seed;
- for (i = 0; i < 0x1000; ++i)
- {
- if ("we must encrypt this data table position")
- {
- UINT8 byteval;
-
- do
- {
- byteval = rnd();
- } while (byteval == 0x40);
-
- opcode_key[i] = byteval;
-
- do
- {
- byteval = rnd();
- } while (byteval == 0x40);
-
- data_key[i] = byteval;
- }
- }
-
- for (i = 0; i < 0x1000; ++i)
- {
- if ("we mustn't encrypt this data table position")
- {
- UINT8 byteval;
-
- do
- {
- byteval = rnd();
- } while (byteval == 0x40);
-
- opcode_key[i] = byteval;
- data_key[i] = 0x40;
- }
- }
- }
-
-
- Note that when both FD1089A and FD1089B versions of a game exist, they use the
- same key.
-
- Known games that use this CPU:
-
- CPU # Type Status Game Seed Unencrypted data range
- --------- ------- --- -------------------- ------ -----------------------------------
- 317-0013A FD1089B [1] Enduro Racer 400001 030000-04ffff + 100000-1fffff
- 317-0018 FD1089A [1] Action Fighter 400003 400000-4fffff + 840000-8dffff + c00000-c4ffff + ff0000-ffffff
- 317-0021 FD1089A [2] Alex Kidd 40000b ?
- 317-0022 FD1089A [1] Dunk Shot 40000d 030000-ffffff
- 317-0024 FD1089B [2] Time Scanner 40000f ?
- 317-0027 FD1089B [2] SDI 400011 ?
- 317-0028 FD1089A [2] Defense 400011 ?
- 317-0033 FD1089A [1] Alien Syndrome 400013 030000-ffffff
- 317-0037 FD1089B [2] Alien Syndrome 400013 030000-ffffff
- 317-0034 FD1089B [1] Super Hang-On 400015 030000-06ffff + 100000-2fffff + ff0000-ffffff
- 317-0167 FD1089A [2] Aurail 400030 010000-ffffff
- 317-0168 FD1089B [1] Aurail 400030 010000-ffffff
- 317-???? FD1089A [2] Wonder Boy III 400043 ?
- 317-5021 FD1089B [2] Sukeban Jansi Ryuko 40004b ?
-
- [1] Complete
- [2] Partial
+ Decryption tables provided by Charles MacDonald
+ Decryption algorithm by Nicola Salmoria
+ LCG algorithm by Andreas Naive
+
+ The FD1089 is a 68000 with built-in encryption.
+ It contains some battery-backed RAM, when the battery dies the CPU stops
+ working.
+
+ Both opcodes and data are encrypted, using different (but related) mappings.
+ Decryption works on 16-bit words, but only 8 bits are affected, the other 8 are
+ left untouched. A special value in internal RAM disables the encryption, this
+ is necessary otherwise RAM would not work as expected (writing data and reading
+ it back would return a different number).
+
+ The FD1089A and FD1089B work in the same way, but the decryption tables are
+ different. The internal RAM contains the 8-bit key to use at every address
+ (only 12 bits of the address are used, so the encryption repeats).
+
+ The FD1089 design is clearly derived from the MC8123. The MC8123 is a Z80 so it
+ made sense to encrypt all 8 data bits and use 12 of the 16 address bits. It makes
+ a lot less sense to encrypt only half of the 16 data bits; using 12 of the 24
+ address bits might be ok, but not in the way it was done. The choice of address
+ bits to use was probably dictated by the need to not encrypt data in certain areas
+ of the address space, so they had to include the top 8 bits of the address.
+ However this means that if you pick e.g. area 000000-00FFFF, where most of the
+ program code resides, just 4 address bits affect the encryption, making it very
+ weak when compared to the MC8123. Out of the 16KB of internal RAM, you need less
+ than 128 bytes to decrypt a whole game - the rest is not used. A waste of space
+ and security. Also, since only 8 of the 16 bits are encrypted, it is very easy
+ to use the unencrypted ones to search for known sequences of code or data.
+
+ Like for the MC8123, the contents of the internal RAM were generated using a
+ linear congruential generator, so the whole key can be generated starting from
+ a single 24-bit seed. Note however that the "don't decrypt" data sections need
+ special treatment so it's not possible to derive the precise key without access
+ to the CPU.
+
+ static int rndseed;
+
+ int rnd()
+ {
+ rndseed = rndseed * 0x290029;
+ return (rndseed >> 16) & 0xff;
+ }
+
+ void generate_key(int seed)
+ {
+ int i;
+
+ rndseed = seed;
+ for (i = 0; i < 0x1000; ++i)
+ {
+ if ("we must encrypt this data table position")
+ {
+ UINT8 byteval;
+
+ do
+ {
+ byteval = rnd();
+ } while (byteval == 0x40);
+
+ opcode_key[i] = byteval;
+
+ do
+ {
+ byteval = rnd();
+ } while (byteval == 0x40);
+
+ data_key[i] = byteval;
+ }
+ }
+
+ for (i = 0; i < 0x1000; ++i)
+ {
+ if ("we mustn't encrypt this data table position")
+ {
+ UINT8 byteval;
+
+ do
+ {
+ byteval = rnd();
+ } while (byteval == 0x40);
+
+ opcode_key[i] = byteval;
+ data_key[i] = 0x40;
+ }
+ }
+ }
+
+
+ Note that when both FD1089A and FD1089B versions of a game exist, they use the
+ same key.
+
+ Known games that use this CPU:
+
+ CPU # Type Status Game Seed Unencrypted data range
+ --------- ------- --- -------------------- ------ -----------------------------------
+ 317-0013A FD1089B [1] Enduro Racer 400001 030000-04ffff + 100000-1fffff
+ 317-0018 FD1089A [1] Action Fighter 400003 400000-4fffff + 840000-8dffff + c00000-c4ffff + ff0000-ffffff
+ 317-0021 FD1089A [2] Alex Kidd 40000b ?
+ 317-0022 FD1089A [1] Dunk Shot 40000d 030000-ffffff
+ 317-0024 FD1089B [2] Time Scanner 40000f ?
+ 317-0027 FD1089B [2] SDI 400011 ?
+ 317-0028 FD1089A [2] Defense 400011 ?
+ 317-0033 FD1089A [1] Alien Syndrome 400013 030000-ffffff
+ 317-0037 FD1089B [2] Alien Syndrome 400013 030000-ffffff
+ 317-0034 FD1089B [1] Super Hang-On 400015 030000-06ffff + 100000-2fffff + ff0000-ffffff
+ 317-0167 FD1089A [2] Aurail 400030 010000-ffffff
+ 317-0168 FD1089B [1] Aurail 400030 010000-ffffff
+ 317-???? FD1089A [2] Wonder Boy III 400043 ?
+ 317-5021 FD1089B [2] Sukeban Jansi Ryuko 40004b ?
+
+ [1] Complete
+ [2] Partial
***************************************************************************/
@@ -133,7 +133,7 @@
//**************************************************************************
-// CONSTANTS
+// CONSTANTS
//**************************************************************************
// device type definition
@@ -206,7 +206,7 @@ const fd1089_base_device::decrypt_parameters fd1089_base_device::s_data_params_a
//**************************************************************************
-// CORE IMPLEMENTATION
+// CORE IMPLEMENTATION
//**************************************************************************
//-------------------------------------------------
@@ -245,10 +245,10 @@ void fd1089_base_device::device_start()
UINT32 romsize = region()->bytes();
m_plaintext.resize(romsize/2);
m_decrypted_opcodes.resize(romsize/2);
-
+
// copy the plaintext
memcpy(m_plaintext, rombase, romsize);
-
+
// decrypt it, overwriting original data with the decrypted data
decrypt(0x000000, romsize, m_plaintext, m_decrypted_opcodes, rombase);
@@ -261,13 +261,13 @@ void fd1089_base_device::device_start()
//**************************************************************************
-// INTERNAL HELPERS
+// INTERNAL HELPERS
//**************************************************************************
//-------------------------------------------------
// rearrange_key - shuffle bits in the table
-// based on whether this is an opcode or a data
-// decode
+// based on whether this is an opcode or a data
+// decode
//-------------------------------------------------
UINT8 fd1089_base_device::rearrange_key(UINT8 table, bool opcode)
@@ -324,7 +324,7 @@ UINT8 fd1089_base_device::rearrange_key(UINT8 table, bool opcode)
//-------------------------------------------------
// decode_fd1089a - decode an 8-bit value
-// according to FD1089A rules
+// according to FD1089A rules
//-------------------------------------------------
UINT8 fd1089_base_device::decode_fd1089a(UINT8 val, UINT8 key, bool opcode)
@@ -384,7 +384,7 @@ UINT8 fd1089_base_device::decode_fd1089a(UINT8 val, UINT8 key, bool opcode)
//-------------------------------------------------
// decode_fd1089b - decode an 8-bit value
-// according to FD1089B rules
+// according to FD1089B rules
//-------------------------------------------------
UINT8 fd1089_base_device::decode_fd1089b(UINT8 val, UINT8 key, bool opcode)
@@ -442,8 +442,8 @@ UINT8 fd1089_base_device::decode_fd1089b(UINT8 val, UINT8 key, bool opcode)
//-------------------------------------------------
// decrypt_one - decrypt a single 16-bit value
-// interpreted as being read at the given address
-// as either an opcode or as data
+// interpreted as being read at the given address
+// as either an opcode or as data
//-------------------------------------------------
UINT16 fd1089_base_device::decrypt_one(offs_t addr, UINT16 val, const UINT8 *key, bool opcode, char cputype)
@@ -475,7 +475,7 @@ UINT16 fd1089_base_device::decrypt_one(offs_t addr, UINT16 val, const UINT8 *key
//-------------------------------------------------
// decrypt - decrypt a buffers' worth of opcodes
-// and data
+// and data
//-------------------------------------------------
void fd1089_base_device::decrypt(offs_t baseaddr, UINT32 size, const UINT16 *srcptr, UINT16 *opcodesptr, UINT16 *dataptr)
diff --git a/src/mame/machine/fd1089.h b/src/mame/machine/fd1089.h
index c4e0fe9a6b8..5ee97095a7b 100644
--- a/src/mame/machine/fd1089.h
+++ b/src/mame/machine/fd1089.h
@@ -17,7 +17,7 @@
//**************************************************************************
-// CONSTANTS
+// CONSTANTS
//**************************************************************************
// device type definition
@@ -27,7 +27,7 @@ extern const device_type FD1089B;
//**************************************************************************
-// TYPE DEFINITIONS
+// TYPE DEFINITIONS
//**************************************************************************
// ======================> fd1089_base_device
@@ -38,7 +38,7 @@ class fd1089_base_device : public m68000_device
public:
// construction/destruction
fd1089_base_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock, char cputype);
-
+
// explicit decryption helpers
void decrypt(offs_t baseaddr, UINT32 size, offs_t regionoffs, UINT16 *opcodesptr, UINT16 *dataptr) { decrypt(baseaddr, size, &m_plaintext[regionoffs/2], opcodesptr, dataptr); }
@@ -52,13 +52,13 @@ protected:
UINT8 decode_fd1089b(UINT8 val, UINT8 key, bool opcode);
UINT16 decrypt_one(offs_t addr, UINT16 val, const UINT8 *key, bool opcode, char cputype);
void decrypt(offs_t baseaddr, UINT32 size, const UINT16 *srcptr, UINT16 *opcodesptr, UINT16 *dataptr);
-
+
// internal state
const UINT8 * m_key;
char m_cputype;
- dynamic_array<UINT16> m_plaintext;
- dynamic_array<UINT16> m_decrypted_opcodes;
-
+ dynamic_array<UINT16> m_plaintext;
+ dynamic_array<UINT16> m_decrypted_opcodes;
+
// internal types
struct decrypt_parameters
{
@@ -81,7 +81,7 @@ class fd1089a_device : public fd1089_base_device
public:
// construction/destruction
fd1089a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : fd1089_base_device(mconfig, FD1089A, tag, owner, clock, 'A') { }
+ : fd1089_base_device(mconfig, FD1089A, tag, owner, clock, 'A') { }
};
@@ -93,7 +93,7 @@ class fd1089b_device : public fd1089_base_device
public:
// construction/destruction
fd1089b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : fd1089_base_device(mconfig, FD1089B, tag, owner, clock, 'B') { }
+ : fd1089_base_device(mconfig, FD1089B, tag, owner, clock, 'B') { }
};
diff --git a/src/mame/machine/fd1094.c b/src/mame/machine/fd1094.c
index 96a0f7bbf05..223a1708de1 100644
--- a/src/mame/machine/fd1094.c
+++ b/src/mame/machine/fd1094.c
@@ -10,419 +10,419 @@
****************************************************************************
- The FD1094 is a custom CPU based on the 68000, which runs encrypted code.
- The decryption key is stored in 8KB of battery-backed RAM; when the battery
- dies, the CPU can no longer decrypt the program code and the game stops
- working (though the CPU itself still works - it just uses a wrong decryption
- key).
-
- Being a 68000, the encryption works on 16-bit words. Only words fetched from
- program space are decrypted; words fetched from data space are not affected.
-
- The decryption can logically be split in two parts. The first part consists
- of a series of conditional XORs and bitswaps, controlled by the decryption
- key, which will be described in the next paragraph. The second part does a
- couple more XORs which don't depend on the key, followed by the replacement
- of several values with FFFF. This last step is done to prevent usage of any
- PC-relative opcode, which would easily allow an intruder to dump decrypted
- values from program space. The FFFF replacement may affect either ~300 values
- or ~5000, depending on the decryption key.
-
- The main part of the decryption can itself be subdivided in four consecutive
- steps. The first one is executed only if bit 15 of the encrypted value is 1;
- the second one only if bit 14 of the _current_ value is 1; the third one only
- if bit 13 of the current value is 1; the fourth one is always executed. The
- first three steps consist of a few conditional XORs and a final conditional
- bitswap; the fourth one consists of a fixed XOR and a few conditional
- bitswaps. There is, however, a special case: if bits 15, 14 and 13 of the
- encrypted value are all 0, none of the above steps are executed, replaced by
- a single fixed bitswap.
-
- In the end, the decryption of a value at a given address is controlled by 32
- boolean variables; 8 of them change at every address (repeating after 0x2000
- words), and constitute the main key which is stored in the battery-backed
- RAM; the other 24 don't change with the address, and depend solely on bytes
- 1, 2, and 3 of the battery-backed RAM, modified by the "state" which the CPU
- is in.
-
- The CPU can be in one of 256 possible states. The 8 bits of the state modify
- the 24 bits of the global key in a fixed way, which isn't affected by the
- battery-backed RAM.
- On reset, the CPU goes in state 0x00. The state can then be modified by the
- program, executing the instruction
- CMPI.L #$00xxFFFF, D0
- where xx is the state.
- When an interrupt happens, the CPU enters "irq mode", forcing a specific
- state, which is stored in byte 0 of the battery-backed RAM. Irq mode can also
- be selected by the program with the instruction
- CMPI.L #$0200FFFF, D0
- When RTE is executed, the CPU leaves irq mode, restoring the previous state.
- This can also be done by the program with the instruction
- CMPI.L #$0300FFFF, D0
-
- Since bytes 0-3 of the battery-backed RAM are used to store the irq state and
- the global key, they have a double use: this one, and the normal 8-bit key
- that changes at every address. To prevent that double use, the CPU fetches
- the 8-bit key from a different place when decrypting words 0-3, but this only
- happens after wrapping around at least once; when decrypting the first four
- words of memory, which correspond the the initial SP and initial PC vectors,
- the 8-bit key is taken from bytes 0-3 of RAM. Instead, when fetching the
- vectors, the global key is handled differently, to prevent double use of
- those bytes. But this special handling of the global key doesn't apply to
- normal operations: reading words 1-3 from program space results in bytes 1-3
- of RAM being used both for the 8-bit key and for the 24-bit global key.
-
-
-
- There is still uncertainty about the assignment of two global key bits.
-
- key[1]
- ------
- key_0b invert; \ bits 7,5 always 1 for now (but 0 in a bad CPU)
- global_xor0; /
- key_5b invert; bit 6
- key_2b invert; bit 4
- key_1b invert; bit 3 always 1 for now (but 0 in a bad CPU)
- global_xor1; bit 2
- key_0c invert; bit 1
- global_swap2; bit 0
-
- key[2]
- ------
- key_1a invert; bit 7 always 1 for now (but 0 in a bad CPU)
- key_6b invert; bit 6 always 1 for now (but 0 in a bad CPU)
- global_swap0a; bit 5
- key_7a invert; bit 4
- key_4a invert; bit 3
- global_swap0b; bit 2
- key_6a invert; bit 1
- key_3a invert; bit 0
-
- key[3]
- ------
- key_2a invert; bit 7 always 1 for now (but 0 in a bad CPU)
- global_swap3; bit 6 always 1 for now (but 0 in a bad CPU)
- key_5a_invert; bit 5
- global_swap1; bit 4
- key_3b invert; bit 3
- global_swap4; bit 2
- key_0a invert; bit 1
- key_4b invert; bit 0
-
-
- Analysis of the data contained in the 8k key data indicates some regularities.
- To begin with, in all the keys seen so far, bit 7 ($80) in key values at
- addresses $0004-$0FFF is always set to 1. Similarly, bit 6 ($40) in key values
- at addresses $1000-$1FFF is always set to 1.
-
- Even more interesting, however, is that analyzing the low 6 bits of the key
- data reveals that a simple linear congruential generator has been used
- consistently to generate the key bits. The LCG is of the form:
-
- temp = A * val;
- val' = temp + (temp << 16);
-
- and it appears to be calculated to at least 22 bits. In all cases seen so far,
- the value of 'A' is fixed at $29. To generate the low 6 bits of the key, the
- result of the LCG is shifted right 16 bits and inverted.
-
- The following pseudo-code will generate 7 of the 8 bits of the key data
- successfully for all known keys, given the values of the 'shift' and 'B'
- parameters, as well as an initial 'seed' for the generator:
-
- void genkey(UINT32 seed, UINT8 *output)
- {
- int bytenum;
-
- for (bytenum = 4; bytenum < 8192; bytenum++)
- {
- UINT8 byteval;
-
- seed = seed * 0x29;
- seed += seed << 16;
-
- byteval = (~seed >> 16) & 0x3f;
- byteval |= (bytenum < 0x1000) ? 0x80 : 0x40;
-
- output[bytenum] = byteval;
- }
- }
-
- This only leaves one bit per key value (and the global key) left to determine.
- It is worth pointing out that this remaining bit is the same bit that controls
- how many opcodes to blank to $FFFF: 0 means a smaller subset (~300), while 1
- indicates a much larger subset (~5000). Looking at the correlations between
- where the key has this bit set to 0, and the presence of opcodes that would
- be blanked as a result, seems to imply that the key is generated based on the
- plaintext. That is, this final bit is set to 1 by default (hence blanking
- more aggressively), and cleared to 0 if any plaintext words affected by the
- byte in question would be incorrectly blanked.
-
-
- When the keys were generated, the LCG seed wasn't input directly. Instead,
- another value was entered, which in most cases was derived from the current
- date/time. The LCG seed is obtained from that value via a multiplication.
- The current date/time was also used in most cases to select the three bytes of
- the global key. Interestingly, the global key must be inverted and read in
- decimal representation to see this, while the seed must be read in hexadecimal
- representation.
-
- For some reason, bit 3 of the first byte of the global key was always set to 1
- regardless of the value input into the key generator program, so e.g. the
- input "88 01 23" would become "80 01 23".
-
- The very first byte of internal RAM, which indicates the IRQ state, doesn't
- seem to follow the same procedure. The IRQ state was probably decided at an
- earlier time, not during the final key generation.
-
-
- summary:
- --------
-
- +------------------------------------------------- 317- part #
- | +----------------------------------------- IRQ state (hex)
- | | +----------------------------------- global key (inverted, dec)
- | | | +-------------------------- main key seed (hex) (LCG seed = seed * 0x2F1E21)
- | | | | +----------------- game
- | | | | | +---------- year
- | | | | | | +- inferred key generation date
- | | | | | | |
- -------- -- -------- ------ -------- ---- --------------------------
- 0041 12 87 06 19 895963 bullet 1987 87/06/19 (atypical)
- 0045 34 97 02 39 384694 suprleag 1987 (atypical)
- 0049 F1 87 10 28 8932F7 shinobi2 1987 87/10/28 (atypical)
- 0050 F1 87 10 28 8932F7 shinobi1 1987 87/10/28 (atypical)
- 0053 00 00 00 00 020000 sonicbom 1987 atypical
- 0056 CD 80 01 23 032ABC thndrbld 1987 88/01/23 (atypical)
- 0059 aceattac 1988
- 0060 45 80 03 30 343210 aceattaa 1988 88/03/30 (atypical)
- 0065 altbeaj1 1988
- 0068 20 80 06 10 880610 altbeaj3 1988 88/06/10
- 0070 59 80 08 06 880806 passshtj 1988 88/08/06
- 0074 47 80 08 06 880806 passshta 1988 88/08/06
- 0071 20 80 08 09 880809 passsht 1988 88/08/09
- 0079 98 80 09 05 880906 exctleag 1988 88/09/05-88/09/06 (atypical)
- 0080 96 80 08 26 880826 passsht 1988 88/08/26
- 0058-02C FF 80 10 07 881007 sspirtfc 1988 88/10/07
- 0084 0E 80 10 31 881031 wb31 1988 88/10/31
- 0085 26 80 11 08 881108 wb32 1988 88/11/08
- 0087 69 80 11 08 881108 wb34 1988 88/11/08
- 0089 52 80 11 29 881129 wb33 1988 88/11/29
- 0058-03B 71 80 11 25 881125 ggroundj 1988 88/11/25
- 0058-03C 04 80 11 27 881127 gground 1988 88/11/27
- 0090 AB 80 01 27 247333 wrestwa1 1989 atypical
- 0091 68 80 11 27 881127 tetris1 1988 88/11/27
- 0092 10 80 11 28 881128 tetris2 1988 88/11/28
- 0093 25 80 11 29 881129 tetris 1988 88/11/29
- 0093A 35 02 09 17 900209 tetris3 1988 90/02/09
- 0096 21 80 11 21 881121 ddux 1988 88/11/21
- 0102 AB 80 02 03 04588A wrestwa2 1989 atypical
- 0058-04B 27 03 27 14 032714 crkdownj 1989 89/03/27 14:xx
- 0058-04C 19 03 27 05 032705 crkdown 1989 89/03/27 05:xx
- 0058-04D DC 03 27 06 032706 crkdownu 1989 89/03/27 06:xx
- 0110 19 81 03 29 032916 goldnax1 1989 89/03/29 16:xx
- 0115 12 04 05 11 040511 bayroutj 1989 89/04/05 11:xx
- 0116 11 03 30 09 033009 bayroute 1989 89/03/30 09:xx
- 0118 22 81 03 07 030719 toutrun 1989 89/03/07 19:xx
- toutrun2 22 81 03 07 031113 toutrun2 1989 89/03/11 13:xx (atypical)
- 0120 0D 81 03 29 032916 goldnax3 1989 89/03/29 16:xx
- 0121 35 81 03 29 032916 goldnaxj 1989 89/03/29 16:xx
- 0122 03 81 04 04 890404 goldnaxu 1989 89/04/04
- 0058-05B 92 81 06 09 890609 sgmastj 1989 89/06/09
- 0058-05C 30 81 06 13 890613 sgmastc 1989 89/06/13
- 0058-05D sgmast 1989
- 0124A 80 06 21 11 890621 smgpj 1989 89/06/21 11:xx
- 0125A DE 06 15 16 890615 smgpu 1989 89/06/15 16:xx
- 0126 54 05 28 01 890528 smgp5 1989 89/05/28 01:xx
- 0126A 74 06 16 15 890616 smgp 1989 89/06/16 15:xx
- 0127A 5F 81 07 06 890706 fpoint 1989 89/07/06
- 0128 55 00 28 20 890828 eswatj 1989 89/08/28 20:xx
- 0129 0A 00 28 20 890828 eswatu 1989 89/08/28 20:xx
- 0130 EC 00 28 19 890828 eswat 1989 89/08/28 19:xx
- 0134 DE 81 11 30 891130 loffirej 1989 89/11/30
- 0135 98 81 11 31 891131 loffireu 1989 89/11/31
- 0136 12 81 11 29 891129 loffire 1989 89/11/29
- 0139 49 03 25 15 891125 bloxeed 1990 89/11/25 15:xx
- 0142 91 01 24 17 900124 mvpj 1989 90/01/24 17:xx
- 0143 20 02 02 18 900202 mvp 1989 90/02/02 18:xx
- 0144 2E 02 23 18 022318 rachero 1989 90/02/23 18:xx
- 0058-06B 88 03 15 09 900315 roughrac 1990 90/03/15 09:xx
- 0146 10 04 26 17 900426 astormj 1990 90/04/26 17:xx
- 0147 2D 04 14 14 900414 astormu 1990 90/04/14 14:xx
- 0148 50 04 26 15 900426 astorm3 1990 90/04/26 15:xx
- 0153 FC 04 10 14 900410 pontoon 1990 90/04/10 14:xx
- 0157 20 07 20 10 900720 mwalkj 1990 90/07/20 10:xx
- 0158 DE 07 15 15 900715 mwalku 1990 90/07/15 15:xx
- 0159 39 07 20 10 900720 mwalk 1990 90/07/20 10:xx
- 0162 8F 01 14 15 900914 gprider1 1990 90/09/14 15:xx
- 0163 99 01 13 15 900913 gprider 1990 90/09/13 15:xx
- 5023 EF 04 18 05 900917 ryukyu 1990 90/09/17 12:18? (atypical)
- 0165 56 82 11 25 901125 lghostu 1990 90/11/25
- 0166 A2 82 11 24 901124 lghost 1990 90/11/24
- 0169B 48 06 35 32 901205 abcop 1990 90/12/05 14:35? (atypical)
- 0058-08B 4E 04 17 15 910206 qsww 1991 91/02/06 12:17? (atypical)
- 0175 91 83 03 22 910322 cltchtrj 1991 91/03/22
- 0176 FC 83 03 14 910314 cltchitr 1991 91/03/14
- 0179A 73 06 55 17 910318 cottonj 1991 91/03/18 14:55? (atypical)
- 0180 73 03 53 00 910403 cottonu 1991 91/04/03 11:53? (atypical)
- 0181A 73 06 55 17 910318 cotton 1991 91/03/18 14:55? (atypical)
- 0058-09D 91 83 06 26 910618 dcclubfd 1991 91/06/18-91/06/26 (atypical)
- 0182 07 07 12 14 921401 ddcrewj 1991 92/07/12 14:01? (atypical)
- 0184 07 07 12 16 921622 ddcrew2 1991 92/07/12 16:22? (atypical)
- 0186 5F 83 07 01 912030 ddcrewu 1991 92/07/01 20:30? (atypical)
- 0190 07 07 17 16 921716 ddcrew 1991 92/07/17 17:16? (atypical)
- ddcrew1 91 84 07 42 910744 ddcrew1 1991 92/07/xx 07:44? (atypical)
- 0196 4A 20 12 22 920623 desertbr 1992 92/06/23 20:12? (atypical)
- 0197A 3F 84 06 19 920612 wwallyja 1992 92/06/12-92/06/19 (atypical)
- 0197B 3F 84 06 19 920612 wwallyj 1992 92/06/12-92/06/19 (atypical)
-
- ----
-
- Bad CPUs that gave some more information about the global key:
-
- global01 global02 global03
- -------- -------- --------
- ..... .. ..
- unknown 11111111 11110110 10111110 (Shinobi 16A, part no. unreadable, could be dead)
- unknown 10101011 11111000 11010101 (unknown ddcrewa key)
- dead 00001111 00001111 00001111 (Alien Storm CPU with no battery)
- bad 11100000 10101011 10111001 (flaky 317-0049)
-
- ----
-
- Notes:
-
- We start in state 0.
- Vectors are fetched:
- SP.HI @ $000000 -> mainkey = key[0], globalkey = { $00, $00, $00 }, less aggressive blanking
- SP.LO @ $000002 -> mainkey = key[1], globalkey = { $00, $00, $00 }, less aggressive blanking
- PC.HI @ $000004 -> mainkey = key[2], globalkey = { key[1], $00, $00 }
- PC.LO @ $000006 -> mainkey = key[3], globalkey = { key[1], key[2], $00 }
-
- driver FD1094 SP plain SP enc PC plain PC enc States Used
- -------- -------- -------- -------- -------- -------- -----------
- aceattaa 317-0060 00000000 A711AF59 00000400 AF59EADD 00 17 31 45 90 FC
- altbeaj3 317-0068 FFFFFF00 B2F7F299 00000400 CCDDEF58 00 0F 18 20 93 A7 D8
- altbeaj1 317-0065 C9C5F299 CCDDECDD
- bayroute 317-0116 00504000 5EB40000 00001000 5533A184 00 04 11 18
- bayroutj 317-0115 00504000 56150000 00001000 85948DCF 00 05 12 16
- bullet 317-0041 00000000 57355D96 00001882 8DDC8CF4 (deduced, not 100% sure)
- cotton 317-0181a 00204000 5DB20000 00000716 CCDD0716 00 0E 73
- cottonu 317-0180 00204000 5DB20000 00000716 A1840716 00 0E 73
- cottonj 317-0179a 00204000 5DB20000 00000716 CCDD0716 00 0E 73
- ddux 317-0096 00000000 5F94AF59 00000406 AF5987A0 00 21 28 70 D9
- eswat 317-0130 00000000 A711AF59 00000400 5533BC59 00 05 0C EC FA
- eswatu 317-0129 00000000 5537AF59 00000400 55334735 00 0A 12 C3 CC
- eswatj 317-0128 00000000 A711AF59 00000400 55334735 00 63 CB D5
- exctleag 317-0079? 00000000 5537AF59 00000410 83018384 (deduced, not 100% sure)
- fpoint 317-0127A 00000000 AF59AF59 00001A40 8DDC9960 00 15 35 5F 82 DB
- fpoint1 317-0127A 00000000 AF59AF59 00001A40 8DDC9960 00 15 35 5F 82 DB
- goldnaxu 317-0122 FFFFFF00 E53AF2B9 00000400 A184A196 00 03 51 72 99 F6
- goldnaxj 317-0121 FFFFFF00 C9D6F2B9 00000400 AF59A785 00 12 35 58 7A 9E
- goldnax3 317-0120 FFFFFF00 ED62F2B9 00000400 AF59A785 00 0A 0D 44 C7 EF
- goldnax1 317-0110 FFFFFF00 ED62F2B9 00000400 AF59A785 00 19 2E 31 48 5D
- mvp 317-0143 00000000 5F94A711 00000416 BD59DC5B 00 19 20 88 98
- mvpj 317-0142 00000000 5F94AF59 00000416 BD599C7D 00 19 35 91 DA
- passsht 317-0080 00000000 AF59AF59 00003202 C2003923 00 11 52 96 EE
- passshta 317-0074 00000000 AF59AF59 000031E4 C2003F8C 00 12 47 83 A7
- passshtj 317-0070 00000000 5D92AF59 000031E4 C2003F8C 00 12 59 83 FE
- ryukyu 317-5023 00203800 AF49D30B 0000042E FC5863B5 00 DC EF
- shinobi2 317-0049 FFFFFF00 C9C5F25F 00000400 AF598395 00 53 88 9B 9C F1
- sonicbom 317-0053 00000000 5735AF59 00001000 FC587133 00
- suprleag 317-0045? 00000000 A711AF59 BD59CE5B
- tetris2 317-0092 00000000 5735AF59 00000410 AF598685 00 10 52 74 97 FC
- tetris1 317-0091 00000000 5D92AF59 00000410 AF59AE58 99 25 42 5B 68 FC
- wb34 317-0087 FFFFFF7E B2978997 00000500 AF590500 00 11 64 69 82
- wb33 317-0089 FFFFFF7E E5C78997 00000500 AF590500 00 23 40 52 71
- wb32 317-0085 FFFFFF7E B2F78997 00000500 AF590500 00 10 13 26 77
- wrestwa2 317-0102 00000000 5D96AF59 00000414 EE588E5B 00 12 A7 AB CC F9 FC
- wrestwa1 317-0090 00000000 5D96AF59 00000414 8301AE18 00 12 A7 AB CC F9 FC
-
- suprleag pc possibilities:
- 101E -> follows an RTS
- 108E -> follows 3 NOPs
- 11C4
- 11C8
- 1212
- 1214
- 1218
- 1282
- 1284
- 1288
- 1342
- 1416
- 141C
- 1486
- 148C
- 1606
- 1E52
- 1E54
-
- bullet pc possibilities:
- 0822
- 0824
- 0882
- 0884
- 0C08
- 137C
- 1822
- 1824
- 1882
- 1884
- 1C08
-
- tetris1:
- 410: 4ff9 0000 0000 lea $0.l, a7
- 416: 46fc 2700 move #$2700, sr
- 41a: 0c80 005b ffff cmpi.l #$5bffff, d0
-
- 400: 4e71 nop
- 402: 4e73 rte
-
- tetris2:
- 410: 4ff9 0000 0000 lea $0.l, a7
- 416: 46fc 2700 move #$2700, sr
- 41a: 0c80 0052 ffff cmpi.l #$52ffff, d0
-
- 400: 4e71 nop
- 402: 4e73 rte
-
- wrestwa1:
- 414: 4ff8 0000 lea $0.w, a7
- 418: 46fc 2700 move #$2700, sr
- 41c: 0c80 00fc ffff cmpi.l #$fcffff, d0
-
- mvp:
- 416: 4ff8 0000 lea $0.w, a7
- 41a: 46fc 2700 move #$2700, sr
- 41e: 7000 moveq #0, d0
- 420: 2200 move.l d0, d1
- ...
- 42c: 2e00 move.l d0, d7
- 42e: 2040 movea.l d0, a0
- ...
- 43a: 2c40 movea.l d0, a6
- 43c: 0c80 0098 ffff cmpi.l #$98ffff, d0
-
- wb34:
- 500: 46fc 2700 move #$2700, sr
- 504: 0c80 0064 ffff cmpi.l #$64ffff, d0
-
- goldnaxu:
- 400: 6000 000c bra $40e
- 40e: 4ff8 ff00 lea $ff00.w, a7
- 412: 46fc 2700 move #$2700, sr
- 416: 0c80 0072 ffff cmpi.l #$72ffff, d0
-
- ryukyu:
- 42e: 4e71 nop
- ...
- 440: 0c80 00dc ffff cmpi.l #$dcffff, d0
-
- eswat:
- 400: 4ff8 0000 lea $0.w, a7
- 404: 46fc 2700 move #$2700, sr
- 408: 0c80 000c ffff cmpi.l #$cffff, d0
+ The FD1094 is a custom CPU based on the 68000, which runs encrypted code.
+ The decryption key is stored in 8KB of battery-backed RAM; when the battery
+ dies, the CPU can no longer decrypt the program code and the game stops
+ working (though the CPU itself still works - it just uses a wrong decryption
+ key).
+
+ Being a 68000, the encryption works on 16-bit words. Only words fetched from
+ program space are decrypted; words fetched from data space are not affected.
+
+ The decryption can logically be split in two parts. The first part consists
+ of a series of conditional XORs and bitswaps, controlled by the decryption
+ key, which will be described in the next paragraph. The second part does a
+ couple more XORs which don't depend on the key, followed by the replacement
+ of several values with FFFF. This last step is done to prevent usage of any
+ PC-relative opcode, which would easily allow an intruder to dump decrypted
+ values from program space. The FFFF replacement may affect either ~300 values
+ or ~5000, depending on the decryption key.
+
+ The main part of the decryption can itself be subdivided in four consecutive
+ steps. The first one is executed only if bit 15 of the encrypted value is 1;
+ the second one only if bit 14 of the _current_ value is 1; the third one only
+ if bit 13 of the current value is 1; the fourth one is always executed. The
+ first three steps consist of a few conditional XORs and a final conditional
+ bitswap; the fourth one consists of a fixed XOR and a few conditional
+ bitswaps. There is, however, a special case: if bits 15, 14 and 13 of the
+ encrypted value are all 0, none of the above steps are executed, replaced by
+ a single fixed bitswap.
+
+ In the end, the decryption of a value at a given address is controlled by 32
+ boolean variables; 8 of them change at every address (repeating after 0x2000
+ words), and constitute the main key which is stored in the battery-backed
+ RAM; the other 24 don't change with the address, and depend solely on bytes
+ 1, 2, and 3 of the battery-backed RAM, modified by the "state" which the CPU
+ is in.
+
+ The CPU can be in one of 256 possible states. The 8 bits of the state modify
+ the 24 bits of the global key in a fixed way, which isn't affected by the
+ battery-backed RAM.
+ On reset, the CPU goes in state 0x00. The state can then be modified by the
+ program, executing the instruction
+ CMPI.L #$00xxFFFF, D0
+ where xx is the state.
+ When an interrupt happens, the CPU enters "irq mode", forcing a specific
+ state, which is stored in byte 0 of the battery-backed RAM. Irq mode can also
+ be selected by the program with the instruction
+ CMPI.L #$0200FFFF, D0
+ When RTE is executed, the CPU leaves irq mode, restoring the previous state.
+ This can also be done by the program with the instruction
+ CMPI.L #$0300FFFF, D0
+
+ Since bytes 0-3 of the battery-backed RAM are used to store the irq state and
+ the global key, they have a double use: this one, and the normal 8-bit key
+ that changes at every address. To prevent that double use, the CPU fetches
+ the 8-bit key from a different place when decrypting words 0-3, but this only
+ happens after wrapping around at least once; when decrypting the first four
+ words of memory, which correspond the the initial SP and initial PC vectors,
+ the 8-bit key is taken from bytes 0-3 of RAM. Instead, when fetching the
+ vectors, the global key is handled differently, to prevent double use of
+ those bytes. But this special handling of the global key doesn't apply to
+ normal operations: reading words 1-3 from program space results in bytes 1-3
+ of RAM being used both for the 8-bit key and for the 24-bit global key.
+
+
+
+ There is still uncertainty about the assignment of two global key bits.
+
+ key[1]
+ ------
+ key_0b invert; \ bits 7,5 always 1 for now (but 0 in a bad CPU)
+ global_xor0; /
+ key_5b invert; bit 6
+ key_2b invert; bit 4
+ key_1b invert; bit 3 always 1 for now (but 0 in a bad CPU)
+ global_xor1; bit 2
+ key_0c invert; bit 1
+ global_swap2; bit 0
+
+ key[2]
+ ------
+ key_1a invert; bit 7 always 1 for now (but 0 in a bad CPU)
+ key_6b invert; bit 6 always 1 for now (but 0 in a bad CPU)
+ global_swap0a; bit 5
+ key_7a invert; bit 4
+ key_4a invert; bit 3
+ global_swap0b; bit 2
+ key_6a invert; bit 1
+ key_3a invert; bit 0
+
+ key[3]
+ ------
+ key_2a invert; bit 7 always 1 for now (but 0 in a bad CPU)
+ global_swap3; bit 6 always 1 for now (but 0 in a bad CPU)
+ key_5a_invert; bit 5
+ global_swap1; bit 4
+ key_3b invert; bit 3
+ global_swap4; bit 2
+ key_0a invert; bit 1
+ key_4b invert; bit 0
+
+
+ Analysis of the data contained in the 8k key data indicates some regularities.
+ To begin with, in all the keys seen so far, bit 7 ($80) in key values at
+ addresses $0004-$0FFF is always set to 1. Similarly, bit 6 ($40) in key values
+ at addresses $1000-$1FFF is always set to 1.
+
+ Even more interesting, however, is that analyzing the low 6 bits of the key
+ data reveals that a simple linear congruential generator has been used
+ consistently to generate the key bits. The LCG is of the form:
+
+ temp = A * val;
+ val' = temp + (temp << 16);
+
+ and it appears to be calculated to at least 22 bits. In all cases seen so far,
+ the value of 'A' is fixed at $29. To generate the low 6 bits of the key, the
+ result of the LCG is shifted right 16 bits and inverted.
+
+ The following pseudo-code will generate 7 of the 8 bits of the key data
+ successfully for all known keys, given the values of the 'shift' and 'B'
+ parameters, as well as an initial 'seed' for the generator:
+
+ void genkey(UINT32 seed, UINT8 *output)
+ {
+ int bytenum;
+
+ for (bytenum = 4; bytenum < 8192; bytenum++)
+ {
+ UINT8 byteval;
+
+ seed = seed * 0x29;
+ seed += seed << 16;
+
+ byteval = (~seed >> 16) & 0x3f;
+ byteval |= (bytenum < 0x1000) ? 0x80 : 0x40;
+
+ output[bytenum] = byteval;
+ }
+ }
+
+ This only leaves one bit per key value (and the global key) left to determine.
+ It is worth pointing out that this remaining bit is the same bit that controls
+ how many opcodes to blank to $FFFF: 0 means a smaller subset (~300), while 1
+ indicates a much larger subset (~5000). Looking at the correlations between
+ where the key has this bit set to 0, and the presence of opcodes that would
+ be blanked as a result, seems to imply that the key is generated based on the
+ plaintext. That is, this final bit is set to 1 by default (hence blanking
+ more aggressively), and cleared to 0 if any plaintext words affected by the
+ byte in question would be incorrectly blanked.
+
+
+ When the keys were generated, the LCG seed wasn't input directly. Instead,
+ another value was entered, which in most cases was derived from the current
+ date/time. The LCG seed is obtained from that value via a multiplication.
+ The current date/time was also used in most cases to select the three bytes of
+ the global key. Interestingly, the global key must be inverted and read in
+ decimal representation to see this, while the seed must be read in hexadecimal
+ representation.
+
+ For some reason, bit 3 of the first byte of the global key was always set to 1
+ regardless of the value input into the key generator program, so e.g. the
+ input "88 01 23" would become "80 01 23".
+
+ The very first byte of internal RAM, which indicates the IRQ state, doesn't
+ seem to follow the same procedure. The IRQ state was probably decided at an
+ earlier time, not during the final key generation.
+
+
+ summary:
+ --------
+
+ +------------------------------------------------- 317- part #
+ | +----------------------------------------- IRQ state (hex)
+ | | +----------------------------------- global key (inverted, dec)
+ | | | +-------------------------- main key seed (hex) (LCG seed = seed * 0x2F1E21)
+ | | | | +----------------- game
+ | | | | | +---------- year
+ | | | | | | +- inferred key generation date
+ | | | | | | |
+ -------- -- -------- ------ -------- ---- --------------------------
+ 0041 12 87 06 19 895963 bullet 1987 87/06/19 (atypical)
+ 0045 34 97 02 39 384694 suprleag 1987 (atypical)
+ 0049 F1 87 10 28 8932F7 shinobi2 1987 87/10/28 (atypical)
+ 0050 F1 87 10 28 8932F7 shinobi1 1987 87/10/28 (atypical)
+ 0053 00 00 00 00 020000 sonicbom 1987 atypical
+ 0056 CD 80 01 23 032ABC thndrbld 1987 88/01/23 (atypical)
+ 0059 aceattac 1988
+ 0060 45 80 03 30 343210 aceattaa 1988 88/03/30 (atypical)
+ 0065 altbeaj1 1988
+ 0068 20 80 06 10 880610 altbeaj3 1988 88/06/10
+ 0070 59 80 08 06 880806 passshtj 1988 88/08/06
+ 0074 47 80 08 06 880806 passshta 1988 88/08/06
+ 0071 20 80 08 09 880809 passsht 1988 88/08/09
+ 0079 98 80 09 05 880906 exctleag 1988 88/09/05-88/09/06 (atypical)
+ 0080 96 80 08 26 880826 passsht 1988 88/08/26
+ 0058-02C FF 80 10 07 881007 sspirtfc 1988 88/10/07
+ 0084 0E 80 10 31 881031 wb31 1988 88/10/31
+ 0085 26 80 11 08 881108 wb32 1988 88/11/08
+ 0087 69 80 11 08 881108 wb34 1988 88/11/08
+ 0089 52 80 11 29 881129 wb33 1988 88/11/29
+ 0058-03B 71 80 11 25 881125 ggroundj 1988 88/11/25
+ 0058-03C 04 80 11 27 881127 gground 1988 88/11/27
+ 0090 AB 80 01 27 247333 wrestwa1 1989 atypical
+ 0091 68 80 11 27 881127 tetris1 1988 88/11/27
+ 0092 10 80 11 28 881128 tetris2 1988 88/11/28
+ 0093 25 80 11 29 881129 tetris 1988 88/11/29
+ 0093A 35 02 09 17 900209 tetris3 1988 90/02/09
+ 0096 21 80 11 21 881121 ddux 1988 88/11/21
+ 0102 AB 80 02 03 04588A wrestwa2 1989 atypical
+ 0058-04B 27 03 27 14 032714 crkdownj 1989 89/03/27 14:xx
+ 0058-04C 19 03 27 05 032705 crkdown 1989 89/03/27 05:xx
+ 0058-04D DC 03 27 06 032706 crkdownu 1989 89/03/27 06:xx
+ 0110 19 81 03 29 032916 goldnax1 1989 89/03/29 16:xx
+ 0115 12 04 05 11 040511 bayroutj 1989 89/04/05 11:xx
+ 0116 11 03 30 09 033009 bayroute 1989 89/03/30 09:xx
+ 0118 22 81 03 07 030719 toutrun 1989 89/03/07 19:xx
+ toutrun2 22 81 03 07 031113 toutrun2 1989 89/03/11 13:xx (atypical)
+ 0120 0D 81 03 29 032916 goldnax3 1989 89/03/29 16:xx
+ 0121 35 81 03 29 032916 goldnaxj 1989 89/03/29 16:xx
+ 0122 03 81 04 04 890404 goldnaxu 1989 89/04/04
+ 0058-05B 92 81 06 09 890609 sgmastj 1989 89/06/09
+ 0058-05C 30 81 06 13 890613 sgmastc 1989 89/06/13
+ 0058-05D sgmast 1989
+ 0124A 80 06 21 11 890621 smgpj 1989 89/06/21 11:xx
+ 0125A DE 06 15 16 890615 smgpu 1989 89/06/15 16:xx
+ 0126 54 05 28 01 890528 smgp5 1989 89/05/28 01:xx
+ 0126A 74 06 16 15 890616 smgp 1989 89/06/16 15:xx
+ 0127A 5F 81 07 06 890706 fpoint 1989 89/07/06
+ 0128 55 00 28 20 890828 eswatj 1989 89/08/28 20:xx
+ 0129 0A 00 28 20 890828 eswatu 1989 89/08/28 20:xx
+ 0130 EC 00 28 19 890828 eswat 1989 89/08/28 19:xx
+ 0134 DE 81 11 30 891130 loffirej 1989 89/11/30
+ 0135 98 81 11 31 891131 loffireu 1989 89/11/31
+ 0136 12 81 11 29 891129 loffire 1989 89/11/29
+ 0139 49 03 25 15 891125 bloxeed 1990 89/11/25 15:xx
+ 0142 91 01 24 17 900124 mvpj 1989 90/01/24 17:xx
+ 0143 20 02 02 18 900202 mvp 1989 90/02/02 18:xx
+ 0144 2E 02 23 18 022318 rachero 1989 90/02/23 18:xx
+ 0058-06B 88 03 15 09 900315 roughrac 1990 90/03/15 09:xx
+ 0146 10 04 26 17 900426 astormj 1990 90/04/26 17:xx
+ 0147 2D 04 14 14 900414 astormu 1990 90/04/14 14:xx
+ 0148 50 04 26 15 900426 astorm3 1990 90/04/26 15:xx
+ 0153 FC 04 10 14 900410 pontoon 1990 90/04/10 14:xx
+ 0157 20 07 20 10 900720 mwalkj 1990 90/07/20 10:xx
+ 0158 DE 07 15 15 900715 mwalku 1990 90/07/15 15:xx
+ 0159 39 07 20 10 900720 mwalk 1990 90/07/20 10:xx
+ 0162 8F 01 14 15 900914 gprider1 1990 90/09/14 15:xx
+ 0163 99 01 13 15 900913 gprider 1990 90/09/13 15:xx
+ 5023 EF 04 18 05 900917 ryukyu 1990 90/09/17 12:18? (atypical)
+ 0165 56 82 11 25 901125 lghostu 1990 90/11/25
+ 0166 A2 82 11 24 901124 lghost 1990 90/11/24
+ 0169B 48 06 35 32 901205 abcop 1990 90/12/05 14:35? (atypical)
+ 0058-08B 4E 04 17 15 910206 qsww 1991 91/02/06 12:17? (atypical)
+ 0175 91 83 03 22 910322 cltchtrj 1991 91/03/22
+ 0176 FC 83 03 14 910314 cltchitr 1991 91/03/14
+ 0179A 73 06 55 17 910318 cottonj 1991 91/03/18 14:55? (atypical)
+ 0180 73 03 53 00 910403 cottonu 1991 91/04/03 11:53? (atypical)
+ 0181A 73 06 55 17 910318 cotton 1991 91/03/18 14:55? (atypical)
+ 0058-09D 91 83 06 26 910618 dcclubfd 1991 91/06/18-91/06/26 (atypical)
+ 0182 07 07 12 14 921401 ddcrewj 1991 92/07/12 14:01? (atypical)
+ 0184 07 07 12 16 921622 ddcrew2 1991 92/07/12 16:22? (atypical)
+ 0186 5F 83 07 01 912030 ddcrewu 1991 92/07/01 20:30? (atypical)
+ 0190 07 07 17 16 921716 ddcrew 1991 92/07/17 17:16? (atypical)
+ ddcrew1 91 84 07 42 910744 ddcrew1 1991 92/07/xx 07:44? (atypical)
+ 0196 4A 20 12 22 920623 desertbr 1992 92/06/23 20:12? (atypical)
+ 0197A 3F 84 06 19 920612 wwallyja 1992 92/06/12-92/06/19 (atypical)
+ 0197B 3F 84 06 19 920612 wwallyj 1992 92/06/12-92/06/19 (atypical)
+
+ ----
+
+ Bad CPUs that gave some more information about the global key:
+
+ global01 global02 global03
+ -------- -------- --------
+ ..... .. ..
+ unknown 11111111 11110110 10111110 (Shinobi 16A, part no. unreadable, could be dead)
+ unknown 10101011 11111000 11010101 (unknown ddcrewa key)
+ dead 00001111 00001111 00001111 (Alien Storm CPU with no battery)
+ bad 11100000 10101011 10111001 (flaky 317-0049)
+
+ ----
+
+ Notes:
+
+ We start in state 0.
+ Vectors are fetched:
+ SP.HI @ $000000 -> mainkey = key[0], globalkey = { $00, $00, $00 }, less aggressive blanking
+ SP.LO @ $000002 -> mainkey = key[1], globalkey = { $00, $00, $00 }, less aggressive blanking
+ PC.HI @ $000004 -> mainkey = key[2], globalkey = { key[1], $00, $00 }
+ PC.LO @ $000006 -> mainkey = key[3], globalkey = { key[1], key[2], $00 }
+
+ driver FD1094 SP plain SP enc PC plain PC enc States Used
+ -------- -------- -------- -------- -------- -------- -----------
+ aceattaa 317-0060 00000000 A711AF59 00000400 AF59EADD 00 17 31 45 90 FC
+ altbeaj3 317-0068 FFFFFF00 B2F7F299 00000400 CCDDEF58 00 0F 18 20 93 A7 D8
+ altbeaj1 317-0065 C9C5F299 CCDDECDD
+ bayroute 317-0116 00504000 5EB40000 00001000 5533A184 00 04 11 18
+ bayroutj 317-0115 00504000 56150000 00001000 85948DCF 00 05 12 16
+ bullet 317-0041 00000000 57355D96 00001882 8DDC8CF4 (deduced, not 100% sure)
+ cotton 317-0181a 00204000 5DB20000 00000716 CCDD0716 00 0E 73
+ cottonu 317-0180 00204000 5DB20000 00000716 A1840716 00 0E 73
+ cottonj 317-0179a 00204000 5DB20000 00000716 CCDD0716 00 0E 73
+ ddux 317-0096 00000000 5F94AF59 00000406 AF5987A0 00 21 28 70 D9
+ eswat 317-0130 00000000 A711AF59 00000400 5533BC59 00 05 0C EC FA
+ eswatu 317-0129 00000000 5537AF59 00000400 55334735 00 0A 12 C3 CC
+ eswatj 317-0128 00000000 A711AF59 00000400 55334735 00 63 CB D5
+ exctleag 317-0079? 00000000 5537AF59 00000410 83018384 (deduced, not 100% sure)
+ fpoint 317-0127A 00000000 AF59AF59 00001A40 8DDC9960 00 15 35 5F 82 DB
+ fpoint1 317-0127A 00000000 AF59AF59 00001A40 8DDC9960 00 15 35 5F 82 DB
+ goldnaxu 317-0122 FFFFFF00 E53AF2B9 00000400 A184A196 00 03 51 72 99 F6
+ goldnaxj 317-0121 FFFFFF00 C9D6F2B9 00000400 AF59A785 00 12 35 58 7A 9E
+ goldnax3 317-0120 FFFFFF00 ED62F2B9 00000400 AF59A785 00 0A 0D 44 C7 EF
+ goldnax1 317-0110 FFFFFF00 ED62F2B9 00000400 AF59A785 00 19 2E 31 48 5D
+ mvp 317-0143 00000000 5F94A711 00000416 BD59DC5B 00 19 20 88 98
+ mvpj 317-0142 00000000 5F94AF59 00000416 BD599C7D 00 19 35 91 DA
+ passsht 317-0080 00000000 AF59AF59 00003202 C2003923 00 11 52 96 EE
+ passshta 317-0074 00000000 AF59AF59 000031E4 C2003F8C 00 12 47 83 A7
+ passshtj 317-0070 00000000 5D92AF59 000031E4 C2003F8C 00 12 59 83 FE
+ ryukyu 317-5023 00203800 AF49D30B 0000042E FC5863B5 00 DC EF
+ shinobi2 317-0049 FFFFFF00 C9C5F25F 00000400 AF598395 00 53 88 9B 9C F1
+ sonicbom 317-0053 00000000 5735AF59 00001000 FC587133 00
+ suprleag 317-0045? 00000000 A711AF59 BD59CE5B
+ tetris2 317-0092 00000000 5735AF59 00000410 AF598685 00 10 52 74 97 FC
+ tetris1 317-0091 00000000 5D92AF59 00000410 AF59AE58 99 25 42 5B 68 FC
+ wb34 317-0087 FFFFFF7E B2978997 00000500 AF590500 00 11 64 69 82
+ wb33 317-0089 FFFFFF7E E5C78997 00000500 AF590500 00 23 40 52 71
+ wb32 317-0085 FFFFFF7E B2F78997 00000500 AF590500 00 10 13 26 77
+ wrestwa2 317-0102 00000000 5D96AF59 00000414 EE588E5B 00 12 A7 AB CC F9 FC
+ wrestwa1 317-0090 00000000 5D96AF59 00000414 8301AE18 00 12 A7 AB CC F9 FC
+
+ suprleag pc possibilities:
+ 101E -> follows an RTS
+ 108E -> follows 3 NOPs
+ 11C4
+ 11C8
+ 1212
+ 1214
+ 1218
+ 1282
+ 1284
+ 1288
+ 1342
+ 1416
+ 141C
+ 1486
+ 148C
+ 1606
+ 1E52
+ 1E54
+
+ bullet pc possibilities:
+ 0822
+ 0824
+ 0882
+ 0884
+ 0C08
+ 137C
+ 1822
+ 1824
+ 1882
+ 1884
+ 1C08
+
+ tetris1:
+ 410: 4ff9 0000 0000 lea $0.l, a7
+ 416: 46fc 2700 move #$2700, sr
+ 41a: 0c80 005b ffff cmpi.l #$5bffff, d0
+
+ 400: 4e71 nop
+ 402: 4e73 rte
+
+ tetris2:
+ 410: 4ff9 0000 0000 lea $0.l, a7
+ 416: 46fc 2700 move #$2700, sr
+ 41a: 0c80 0052 ffff cmpi.l #$52ffff, d0
+
+ 400: 4e71 nop
+ 402: 4e73 rte
+
+ wrestwa1:
+ 414: 4ff8 0000 lea $0.w, a7
+ 418: 46fc 2700 move #$2700, sr
+ 41c: 0c80 00fc ffff cmpi.l #$fcffff, d0
+
+ mvp:
+ 416: 4ff8 0000 lea $0.w, a7
+ 41a: 46fc 2700 move #$2700, sr
+ 41e: 7000 moveq #0, d0
+ 420: 2200 move.l d0, d1
+ ...
+ 42c: 2e00 move.l d0, d7
+ 42e: 2040 movea.l d0, a0
+ ...
+ 43a: 2c40 movea.l d0, a6
+ 43c: 0c80 0098 ffff cmpi.l #$98ffff, d0
+
+ wb34:
+ 500: 46fc 2700 move #$2700, sr
+ 504: 0c80 0064 ffff cmpi.l #$64ffff, d0
+
+ goldnaxu:
+ 400: 6000 000c bra $40e
+ 40e: 4ff8 ff00 lea $ff00.w, a7
+ 412: 46fc 2700 move #$2700, sr
+ 416: 0c80 0072 ffff cmpi.l #$72ffff, d0
+
+ ryukyu:
+ 42e: 4e71 nop
+ ...
+ 440: 0c80 00dc ffff cmpi.l #$dcffff, d0
+
+ eswat:
+ 400: 4ff8 0000 lea $0.w, a7
+ 404: 46fc 2700 move #$2700, sr
+ 408: 0c80 000c ffff cmpi.l #$cffff, d0
*****************************************************************************/
@@ -431,7 +431,7 @@
//**************************************************************************
-// CONSTANTS
+// CONSTANTS
//**************************************************************************
// device type definition
@@ -531,7 +531,7 @@ const UINT16 fd1094_device::s_masked_opcodes[] =
//**************************************************************************
-// DECRYPTION CACHE HELPER
+// DECRYPTION CACHE HELPER
//**************************************************************************
//-------------------------------------------------
@@ -562,7 +562,7 @@ void fd1094_decryption_cache::reset()
//-------------------------------------------------
// configure - configure the address and size
-// of the region we are caching
+// of the region we are caching
//-------------------------------------------------
void fd1094_decryption_cache::configure(offs_t baseaddress, UINT32 size, offs_t rgnoffset)
@@ -580,7 +580,7 @@ void fd1094_decryption_cache::configure(offs_t baseaddress, UINT32 size, offs_t
//-------------------------------------------------
// decrypted_opcodes - return a pointer to the
-// decrypted opcodes for the given state
+// decrypted opcodes for the given state
//-------------------------------------------------
UINT16 *fd1094_decryption_cache::decrypted_opcodes(UINT8 state)
@@ -598,7 +598,7 @@ UINT16 *fd1094_decryption_cache::decrypted_opcodes(UINT8 state)
//**************************************************************************
-// CORE IMPLEMENTATION
+// CORE IMPLEMENTATION
//**************************************************************************
//-------------------------------------------------
@@ -625,7 +625,7 @@ fd1094_device::fd1094_device(const machine_config &mconfig, const char *tag, dev
m_masked_opcodes_lookup[0][opcode >> 4] |= 1 << ((opcode >> 1) & 7);
m_masked_opcodes_lookup[1][opcode >> 4] |= 1 << ((opcode >> 1) & 7);
}
-
+
// add some more opcodes for the more aggressive table
for (int opcode = 0; opcode < 65536; opcode += 2)
if ((opcode & 0xff80) == 0x4e80 || (opcode & 0xf0f8) == 0x50c8 || (opcode & 0xf000) == 0x6000)
@@ -634,8 +634,8 @@ fd1094_device::fd1094_device(const machine_config &mconfig, const char *tag, dev
//-------------------------------------------------
-// change_state - set the current state of the
-// chip
+// change_state - set the current state of the
+// chip
//-------------------------------------------------
void fd1094_device::change_state(int newstate)
@@ -671,7 +671,7 @@ void fd1094_device::change_state(int newstate)
//**************************************************************************
-// DEVICE OVERRIDES
+// DEVICE OVERRIDES
//**************************************************************************
//-------------------------------------------------
@@ -682,7 +682,7 @@ void fd1094_device::device_start()
{
// start the base device
m68000_device::device_start();
-
+
// find the key
m_key = memregion("key")->base();
if (m_key == NULL)
@@ -694,7 +694,7 @@ void fd1094_device::device_start()
m_srcbase = reinterpret_cast<UINT16 *>(region()->base());
m_srcbytes = region()->bytes();
}
-
+
// if no ROM region, see if there's a memory share with our name
else
{
@@ -705,7 +705,7 @@ void fd1094_device::device_start()
m_srcbytes = share->bytes();
}
}
-
+
// if we got nothing, error
if (m_srcbase == NULL)
throw emu_fatalerror("FD1094 found no data to decrypt!");
@@ -722,7 +722,7 @@ void fd1094_device::device_start()
m68k_set_cmpild_callback(this, &fd1094_device::cmp_callback);
m68k_set_rte_callback(this, &fd1094_device::rte_callback);
device_set_irq_callback(this, &fd1094_device::irq_callback);
-
+
// save state
save_item(NAME(m_state));
save_item(NAME(m_irqmode));
@@ -757,14 +757,14 @@ void fd1094_device::device_postload()
//**************************************************************************
-// INTERNAL HELPERS
+// INTERNAL HELPERS
//**************************************************************************
//-------------------------------------------------
// decrypt_one - decrypt a single opcode given
-// the address, data, and keys; note that the
-// address provided is the word address
-// (physical address / 2)
+// the address, data, and keys; note that the
+// address provided is the word address
+// (physical address / 2)
//-------------------------------------------------
UINT16 fd1094_device::decrypt_one(offs_t address, UINT16 val, const UINT8 *main_key, UINT8 state, bool vector_fetch)
@@ -821,14 +821,14 @@ UINT16 fd1094_device::decrypt_one(offs_t address, UINT16 val, const UINT8 *main_
gkey3 ^= 0x02; // key_0a invert
gkey3 ^= 0x40; // global_swap3
}
-
+
// for address xx0000-xx0006 (but only if >= 000008), use key xx2000-xx2006
UINT8 mainkey;
if ((address & 0x0ffc) == 0 && address >= 4)
mainkey = main_key[(address & 0x1fff) | 0x1000];
else
mainkey = main_key[address & 0x1fff];
-
+
UINT8 key_F;
if (address & 0x1000) key_F = BIT(mainkey,7);
else key_F = BIT(mainkey,6);
@@ -956,7 +956,7 @@ void fd1094_device::decrypt(offs_t baseaddr, UINT32 size, const UINT16 *srcptr,
//-------------------------------------------------
// default_state_change - handle state changes
-// for standard cases
+// for standard cases
//-------------------------------------------------
void fd1094_device::default_state_change(UINT8 state)
@@ -967,12 +967,12 @@ void fd1094_device::default_state_change(UINT8 state)
//**************************************************************************
-// STATIC CALLBACKS
+// STATIC CALLBACKS
//**************************************************************************
//-------------------------------------------------
-// cmp_callback - callback for CMP.L instructions
-// (state change)
+// cmp_callback - callback for CMP.L instructions
+// (state change)
//-------------------------------------------------
void fd1094_device::cmp_callback(device_t *device, UINT32 val, UINT8 reg)
@@ -983,8 +983,8 @@ void fd1094_device::cmp_callback(device_t *device, UINT32 val, UINT8 reg)
//-------------------------------------------------
-// irq_callback - callback when the FD1094 enters
-// interrupt code
+// irq_callback - callback when the FD1094 enters
+// interrupt code
//-------------------------------------------------
IRQ_CALLBACK( fd1094_device::irq_callback )
@@ -996,7 +996,7 @@ IRQ_CALLBACK( fd1094_device::irq_callback )
//-------------------------------------------------
// rte_callback - callback when an RTE instruction
-// is encountered
+// is encountered
//-------------------------------------------------
void fd1094_device::rte_callback(device_t *device)
diff --git a/src/mame/machine/fd1094.h b/src/mame/machine/fd1094.h
index 6568d5f00c8..30a3ca693c8 100644
--- a/src/mame/machine/fd1094.h
+++ b/src/mame/machine/fd1094.h
@@ -17,7 +17,7 @@
//**************************************************************************
-// CONSTANTS
+// CONSTANTS
//**************************************************************************
// device type definition
@@ -26,7 +26,7 @@ extern const device_type FD1094;
//**************************************************************************
-// TYPE DEFINITIONS
+// TYPE DEFINITIONS
//**************************************************************************
class fd1094_device;
@@ -39,11 +39,11 @@ class fd1094_decryption_cache
public:
// construction/destruction
fd1094_decryption_cache(fd1094_device &fd1094);
-
+
// getters
fd1094_device &fd1094() const { return m_fd1094; }
UINT16 *decrypted_opcodes(UINT8 state);
-
+
// operations
void reset();
void configure(offs_t baseaddress, UINT32 size, offs_t rgnoffset);
@@ -51,10 +51,10 @@ public:
protected:
// internal state
fd1094_device & m_fd1094;
- UINT32 m_baseaddress;
+ UINT32 m_baseaddress;
UINT32 m_size;
UINT32 m_rgnoffset;
- dynamic_array<UINT16> m_decrypted_opcodes[256];
+ dynamic_array<UINT16> m_decrypted_opcodes[256];
};
@@ -68,7 +68,7 @@ public:
// construction/destruction
fd1094_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// explicit decryption helpers
void decrypt(offs_t baseaddr, UINT32 size, offs_t regionoffs, UINT16 *opcodesptr, UINT8 state) { decrypt(baseaddr, size, m_srcbase + regionoffs/2, opcodesptr, state); }
@@ -84,7 +84,7 @@ public:
STATE_IRQ = 0x200,
STATE_RTE = 0x300
};
-
+
protected:
// device overrides
virtual void device_start();
@@ -100,7 +100,7 @@ protected:
static void cmp_callback(device_t *device, UINT32 val, UINT8 reg);
static IRQ_CALLBACK( irq_callback );
static void rte_callback(device_t *device);
-
+
// internal state
UINT8 m_state;
bool m_irqmode;
@@ -109,8 +109,8 @@ protected:
UINT16 * m_srcbase;
UINT32 m_srcbytes;
const UINT8 * m_key;
- UINT8 m_masked_opcodes_lookup[2][65536/8/2];
-
+ UINT8 m_masked_opcodes_lookup[2][65536/8/2];
+
// static tables
static const UINT16 s_masked_opcodes[];
};
diff --git a/src/mame/machine/kaneko_calc3.c b/src/mame/machine/kaneko_calc3.c
index 422dfba0098..05a19e8a493 100644
--- a/src/mame/machine/kaneko_calc3.c
+++ b/src/mame/machine/kaneko_calc3.c
@@ -12,13 +12,13 @@
/*
MCU Tasks:
- - Read Dipswitch
+ - Read Dipswitch
- Read / Write the EEPROM
- Supply code / data snippets to the 68000 by decrypting them from ROM
-
- may also be responsible for the hit detection (kaneko_hit.c)
-
+
+ may also be responsible for the hit detection (kaneko_hit.c)
+
*/
#include "emu.h"
diff --git a/src/mame/machine/kaneko_hit.c b/src/mame/machine/kaneko_hit.c
index 9f4acc03cdd..77f931d2938 100644
--- a/src/mame/machine/kaneko_hit.c
+++ b/src/mame/machine/kaneko_hit.c
@@ -3,13 +3,13 @@
It is thought that this is done by the 'CALC1' 'TOYBOX' and 'CALC3' protection chips found on the various boards
however we have 3 implementations, and they don't quite pair up with the chips at the moment, this might be
because our implementations are wrong / incomplete, or in some cases the newer chips are backwards compatible.
-
- galpanica - CALC1 - type 0
- sandscrp - CALC1 - type 0 ( only uses Random Number? )
- bonkadv - TOYBOX - type 0 ( only uses Random Number, XY Overlap Collision bit and register '0x02' )
- gtmr - TOYBOX - type 1 ( only uses Random Number )
- gtmr2 - TOYBOX - type 1 ( only uses Random Number )
- bloodwar - TOYBOX - type 1
+
+ galpanica - CALC1 - type 0
+ sandscrp - CALC1 - type 0 ( only uses Random Number? )
+ bonkadv - TOYBOX - type 0 ( only uses Random Number, XY Overlap Collision bit and register '0x02' )
+ gtmr - TOYBOX - type 1 ( only uses Random Number )
+ gtmr2 - TOYBOX - type 1 ( only uses Random Number )
+ bloodwar - TOYBOX - type 1
shogwarr - CALC3 - type 1
brapboys - CALC3 - type 2
@@ -118,7 +118,7 @@ READ16_MEMBER(kaneko_hit_device::kaneko_hit_r)
case 0: return kaneko_hit_type0_r(space,offset,mem_mask);
case 1: return kaneko_hit_type1_r(space,offset,mem_mask);
case 2: return kaneko_hit_type2_r(space,offset,mem_mask);
-
+
default:
fatalerror("kaneko_hit_r called, but m_hittype not set\n");
return 0;
@@ -132,7 +132,7 @@ WRITE16_MEMBER(kaneko_hit_device::kaneko_hit_w)
case 0: kaneko_hit_type0_w(space,offset,data, mem_mask); break;
case 1: kaneko_hit_type1_w(space,offset,data, mem_mask); break;
case 2: kaneko_hit_type2_w(space,offset,data, mem_mask); break;
-
+
default:
fatalerror("kaneko_hit_r called, but m_hittype not set\n");
break;
diff --git a/src/mame/machine/kaneko_hit.h b/src/mame/machine/kaneko_hit.h
index 1c7eafa1cc9..2cc1c3d4dca 100644
--- a/src/mame/machine/kaneko_hit.h
+++ b/src/mame/machine/kaneko_hit.h
@@ -37,7 +37,7 @@ class kaneko_hit_device : public device_t
{
public:
kaneko_hit_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
static void set_type(device_t &device, int hittype);
int m_hittype;
diff --git a/src/mame/machine/kaneko_toybox.c b/src/mame/machine/kaneko_toybox.c
index f5c87b77856..eb81826f458 100644
--- a/src/mame/machine/kaneko_toybox.c
+++ b/src/mame/machine/kaneko_toybox.c
@@ -1,5 +1,5 @@
/* Kaneko 'Toybox' protection
-
+
the following chips have been seen
TBSOP01 is a NEC uPD78324 series MCU with 32K internal rom & 1024 bytes of ram
@@ -14,7 +14,7 @@ Currently none of the MCUs' internal roms are dumped so simulation is used
94 Bonk's Adventure TOYBOX? TBSOP01
94 Blood Warrior TOYBOX? TBS0P01 452 9339PK001
94 Great 1000 Miles Rally TOYBOX "MM0525-TOYBOX199","USMM0713-TB1994 "
-94 Great 1000 Miles Rally EV/US TOYBOX
+94 Great 1000 Miles Rally EV/US TOYBOX
95 Great 1000 Miles Rally 2 TOYBOX KANEKO TBSOP02 454 9451MK002 (74 pin PQFP) "USMM0713-TB1994 "
95 Jackie Chan TOYBOX "USMM0713-TB1994 "
95 Gals Panic 3 TOYBOX? TBSOP01
@@ -22,8 +22,8 @@ Currently none of the MCUs' internal roms are dumped so simulation is used
todo:
bonk:
- Where does the hardcoded EEPROM default data come from (there is a command to restore defaults directly, not from RAM)
- Where does the data for the additional tables come from, a transfer mode none of the other games use is used. (related to src[offs+6] and src[offs+7] params? )
+ Where does the hardcoded EEPROM default data come from (there is a command to restore defaults directly, not from RAM)
+ Where does the data for the additional tables come from, a transfer mode none of the other games use is used. (related to src[offs+6] and src[offs+7] params? )
MCU parameters:
@@ -39,7 +39,7 @@ mcu_subcmd = kaneko16_mcu_ram[0x0014/2]; // sub-command parameter, happens o
- 0x03: read DSW
- 0x02: load game settings \ stored in ATMEL AT93C46 chip,
- 0x42: save game settings / 128 bytes serial EEPROM
- - 0x43: restore eeprom defaults (from internal ROM or data ROM?)
+ - 0x43: restore eeprom defaults (from internal ROM or data ROM?)
*/
@@ -208,7 +208,7 @@ void kaneko_toybox_device::toybox_mcu_run(running_machine &machine)
}
logerror("%s : MCU executed command: %04X %04X (load NVRAM settings)\n", machine.describe_context(), mcu_command, mcu_offset*2);
-
+
}
break;
@@ -231,8 +231,8 @@ void kaneko_toybox_device::toybox_mcu_run(running_machine &machine)
if (m_gametype == GAME_BONK)
{
//memcpy(m_nvram_save, bonkadv_mcu_43, sizeof(bonkadv_mcu_43));
-
-
+
+
address_space *eeprom_space = machine.device<eeprom_device>(":eeprom")->space();
UINT8* nvdat = (UINT8*)&bonkadv_mcu_43[0];
for (int i=0;i<0x80;i++)
diff --git a/src/mame/machine/megadriv.c b/src/mame/machine/megadriv.c
index c61b8615f7b..066044b3d92 100644
--- a/src/mame/machine/megadriv.c
+++ b/src/mame/machine/megadriv.c
@@ -941,7 +941,7 @@ SCREEN_UPDATE_RGB32(megadriv)
{
UINT32* desty = &bitmap.pix32(y, 0);
UINT16* srcy;
-
+
if (!vdp->m_use_alt_timing)
{
srcy = &vdp->m_render_bitmap->pix(y, 0);
diff --git a/src/mame/machine/megavdp.c b/src/mame/machine/megavdp.c
index 9c4c322ce96..d86290c51c9 100644
--- a/src/mame/machine/megavdp.c
+++ b/src/mame/machine/megavdp.c
@@ -2603,7 +2603,7 @@ void sega_genesis_vdp_device::genesis_render_videobuffer_to_screenbuffer(running
else
m_render_line_raw[x] = 0x000;
-
+
if (drawn==0)
{
if (dat&0x10000)
diff --git a/src/mame/machine/megavdp.h b/src/mame/machine/megavdp.h
index c842ffde9aa..d73c7c4bcca 100644
--- a/src/mame/machine/megavdp.h
+++ b/src/mame/machine/megavdp.h
@@ -155,7 +155,7 @@ class sega_genesis_vdp_device : public device_t
{
public:
sega_genesis_vdp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
static void set_genesis_vdp_sndirqline_callback(device_t &device, genesis_vdp_sndirqline_callback_func callback);
static void set_genesis_vdp_lv6irqline_callback(device_t &device, genesis_vdp_lv6irqline_callback_func callback);
static void set_genesis_vdp_lv4irqline_callback(device_t &device, genesis_vdp_lv4irqline_callback_func callback);
@@ -163,7 +163,7 @@ public:
static void set_genesis_vdp_palwrite_base(device_t &device, int palwrite_base);
int m_use_alt_timing; // use MAME scanline timer instead, render only one scanline to a single line buffer, to be rendered by a partial update call.. experimental
-
+
int m_palwrite_base; // if we want to write to the actual MAME palette..
DECLARE_READ16_MEMBER( megadriv_vdp_r );
@@ -228,7 +228,7 @@ private:
UINT16* m_cram;
UINT16* m_vsram;
/* The VDP keeps a 0x400 byte on-chip cache of the Sprite Attribute Table
- to speed up processing, Castlevania Bloodlines abuses this on the upside down level */
+ to speed up processing, Castlevania Bloodlines abuses this on the upside down level */
UINT16* m_internal_sprite_attribute_table;
// these are used internally by the VDP to schedule when after the start of a scanline
diff --git a/src/mame/machine/segaic16.c b/src/mame/machine/segaic16.c
index 28cab171e3d..2747caeaf02 100644
--- a/src/mame/machine/segaic16.c
+++ b/src/mame/machine/segaic16.c
@@ -41,7 +41,7 @@
//**************************************************************************
-// DEBUGGING
+// DEBUGGING
//**************************************************************************
#define LOG_MEMORY_MAP (0)
@@ -52,7 +52,7 @@
//**************************************************************************
-// CONSTANTS
+// CONSTANTS
//**************************************************************************
// device type definition
@@ -64,7 +64,7 @@ const device_type SEGA_315_5250_COMPARE_TIMER = &device_creator<sega_315_5250_co
//**************************************************************************
-// MISC HELPERS
+// MISC HELPERS
//**************************************************************************
READ16_HANDLER( segaic16_open_bus_r )
@@ -94,7 +94,7 @@ READ16_HANDLER( segaic16_open_bus_r )
//**************************************************************************
-// 315-5195 MEMORY MAPPER
+// 315-5195 MEMORY MAPPER
//**************************************************************************
//-------------------------------------------------
@@ -136,8 +136,8 @@ void sega_315_5195_mapper_device::static_set_mapper(device_t &device, mapper_del
//-------------------------------------------------
-// static_set_sound_readwrite - configuration
-// helper to set the sound read/write callbacks
+// static_set_sound_readwrite - configuration
+// helper to set the sound read/write callbacks
//-------------------------------------------------
void sega_315_5195_mapper_device::static_set_sound_readwrite(device_t &device, sound_read_delegate read, sound_write_delegate write)
@@ -292,7 +292,7 @@ void sega_315_5195_mapper_device::map_as_rom(UINT32 offset, UINT32 length, offs_
if (!whandler.isnull()) mame_printf_debug(" with handler=%s", whandler.name());
mame_printf_debug("\n");
}
-
+
// don't map if the start is past the end of the ROM region
offs_t romsize = m_cpu->region()->bytes();
if (rgnoffset < romsize)
@@ -309,7 +309,7 @@ void sega_315_5195_mapper_device::map_as_rom(UINT32 offset, UINT32 length, offs_
memory_bank *bank = owner()->membank(bank_name);
UINT8 *memptr = m_cpu->region()->base() + rgnoffset;
bank->set_base(memptr);
-
+
// remember this bank, and decrypt if necessary
m_banks[m_curregion].set(bank, info.start, romend, rgnoffset, memptr);
}
@@ -322,7 +322,7 @@ void sega_315_5195_mapper_device::map_as_rom(UINT32 offset, UINT32 length, offs_
//-------------------------------------------------
// map_as_ram - map a region as RAM, with an
-// optional write handler
+// optional write handler
//-------------------------------------------------
void sega_315_5195_mapper_device::map_as_ram(UINT32 offset, UINT32 length, offs_t mirror, const char *bank_share_name, write16_delegate whandler)
@@ -336,7 +336,7 @@ void sega_315_5195_mapper_device::map_as_ram(UINT32 offset, UINT32 length, offs_
if (!whandler.isnull()) mame_printf_debug(" with handler=%s", whandler.name());
mame_printf_debug("\n");
}
-
+
// map now
m_space->install_read_bank(info.start, info.end, 0, info.mirror, bank_share_name);
@@ -345,7 +345,7 @@ void sega_315_5195_mapper_device::map_as_ram(UINT32 offset, UINT32 length, offs_
m_space->install_write_handler(info.start, info.end, 0, info.mirror, whandler);
else
m_space->install_write_bank(info.start, info.end, 0, info.mirror, bank_share_name);
-
+
// configure the bank
memory_bank *bank = owner()->membank(bank_share_name);
bank->set_base(owner()->memshare(bank_share_name)->ptr());
@@ -356,7 +356,7 @@ void sega_315_5195_mapper_device::map_as_ram(UINT32 offset, UINT32 length, offs_
//-------------------------------------------------
-// map_as_handler - map a region as a pair of
+// map_as_handler - map a region as a pair of
// read write handlers
//-------------------------------------------------
@@ -372,7 +372,7 @@ void sega_315_5195_mapper_device::map_as_handler(UINT32 offset, UINT32 length, o
if (!whandler.isnull()) mame_printf_debug(" write=%s", whandler.name());
mame_printf_debug("\n");
}
-
+
// install read/write handlers
if (!rhandler.isnull())
m_space->install_read_handler(info.start, info.end, 0, info.mirror, rhandler);
@@ -383,10 +383,10 @@ void sega_315_5195_mapper_device::map_as_handler(UINT32 offset, UINT32 length, o
m_banks[m_curregion].clear();
}
-
+
//-------------------------------------------------
// configure_explicit - explicitly configure the
-// memory map
+// memory map
//-------------------------------------------------
void sega_315_5195_mapper_device::configure_explicit(const UINT8 *map_data)
@@ -398,7 +398,7 @@ void sega_315_5195_mapper_device::configure_explicit(const UINT8 *map_data)
//-------------------------------------------------
// fd1094_state_change - handle notifications
-// of state changes
+// of state changes
//-------------------------------------------------
void sega_315_5195_mapper_device::fd1094_state_change(UINT8 state)
@@ -424,7 +424,7 @@ void sega_315_5195_mapper_device::device_start()
m_cpu = siblingdevice<m68000_device>(m_cputag);
if (m_cpu == NULL)
throw emu_fatalerror("Unable to find sibling device '%s'", m_cputag);
-
+
// if we are mapping an FD1089, tell all the banks
fd1089_base_device *fd1089 = dynamic_cast<fd1089_base_device *>(m_cpu);
if (fd1089 != NULL)
@@ -444,7 +444,7 @@ void sega_315_5195_mapper_device::device_start()
m_space = m_cpu->space(AS_PROGRAM);
if (m_space == NULL)
throw emu_fatalerror("Unable to find program address space on device '%s'", m_cputag);
-
+
// register for saves
save_item(NAME(m_regs));
}
@@ -470,23 +470,23 @@ void sega_315_5195_mapper_device::device_reset()
//-------------------------------------------------
// compute_region - determine region parameters
-// based on current configuration registers and
-// actual underlying bus connections
+// based on current configuration registers and
+// actual underlying bus connections
//-------------------------------------------------
void sega_315_5195_mapper_device::compute_region(region_info &info, UINT8 index, UINT32 length, UINT32 mirror, UINT32 offset)
{
static const offs_t region_size_map[4] = { 0x00ffff, 0x01ffff, 0x07ffff, 0x1fffff };
info.size_mask = region_size_map[m_regs[0x10 + 2 * index] & 3];
- info.base = (m_regs[0x11 + 2 * index] << 16) & ~info.size_mask;
+ info.base = (m_regs[0x11 + 2 * index] << 16) & ~info.size_mask;
info.mirror = mirror & info.size_mask;
info.start = info.base + (offset & info.size_mask);
info.end = info.start + MIN(length - 1, info.size_mask);
}
-
+
//-------------------------------------------------
-// update_mapping - remap the entire CPU address
+// update_mapping - remap the entire CPU address
// space based on updated mappings
//-------------------------------------------------
@@ -509,7 +509,7 @@ void sega_315_5195_mapper_device::update_mapping()
//**************************************************************************
-// DECRYPT BANK HELPER CLASS
+// DECRYPT BANK HELPER CLASS
//**************************************************************************
//-------------------------------------------------
@@ -517,9 +517,9 @@ void sega_315_5195_mapper_device::update_mapping()
//-------------------------------------------------
sega_315_5195_mapper_device::decrypt_bank::decrypt_bank()
- : m_bank(NULL),
- m_start(0),
- m_end(0),
+ : m_bank(NULL),
+ m_start(0),
+ m_end(0),
m_rgnoffs(~0),
m_srcptr(NULL),
m_fd1089(NULL),
@@ -543,14 +543,14 @@ sega_315_5195_mapper_device::decrypt_bank::~decrypt_bank()
//-------------------------------------------------
// set_decrypt - configure the decryption target
-// CPU
+// CPU
//-------------------------------------------------
void sega_315_5195_mapper_device::decrypt_bank::set_decrypt(fd1089_base_device *fd1089)
{
// set the fd1089 pointer
m_fd1089 = fd1089;
-
+
// clear out all fd1094 stuff
delete m_fd1094_cache;
m_fd1094_cache = NULL;
@@ -560,7 +560,7 @@ void sega_315_5195_mapper_device::decrypt_bank::set_decrypt(fd1094_device *fd109
{
// set the fd1094 pointer and allocate a decryption cache
m_fd1094_cache = global_alloc(fd1094_decryption_cache(*fd1094));
-
+
// clear out all fd1089 stuff
m_fd1089 = NULL;
m_fd1089_decrypted.reset();
@@ -569,7 +569,7 @@ void sega_315_5195_mapper_device::decrypt_bank::set_decrypt(fd1094_device *fd109
//-------------------------------------------------
// set - set the parameters of this bank after
-// a change
+// a change
//-------------------------------------------------
void sega_315_5195_mapper_device::decrypt_bank::set(memory_bank *bank, offs_t start, offs_t end, offs_t rgnoffs, UINT8 *src)
@@ -577,7 +577,7 @@ void sega_315_5195_mapper_device::decrypt_bank::set(memory_bank *bank, offs_t st
// ignore if not encrypted
if (m_fd1089 == NULL && m_fd1094_cache == NULL)
return;
-
+
// ignore if nothing is changing
if (bank == m_bank && start == m_start && end == m_end && rgnoffs == m_rgnoffs && src == m_srcptr)
return;
@@ -591,7 +591,7 @@ void sega_315_5195_mapper_device::decrypt_bank::set(memory_bank *bank, offs_t st
m_end = end;
m_rgnoffs = rgnoffs;
m_srcptr = src;
-
+
// configure the fd1094 cache
if (m_fd1094_cache != NULL)
m_fd1094_cache->configure(m_start, m_end + 1 - m_start, m_rgnoffs);
@@ -603,7 +603,7 @@ void sega_315_5195_mapper_device::decrypt_bank::set(memory_bank *bank, offs_t st
//-------------------------------------------------
// update - update the decrypted memory base
-// if this rom bank has been assigned
+// if this rom bank has been assigned
//-------------------------------------------------
void sega_315_5195_mapper_device::decrypt_bank::update()
@@ -611,7 +611,7 @@ void sega_315_5195_mapper_device::decrypt_bank::update()
// if this isn't a valid state, don't try to do anything
if (m_bank == NULL || m_srcptr == NULL)
return;
-
+
// fd1089 case
if (m_fd1089 != NULL)
{
@@ -619,7 +619,7 @@ void sega_315_5195_mapper_device::decrypt_bank::update()
m_fd1089->decrypt(m_start, m_end + 1 - m_start, m_rgnoffs, m_fd1089_decrypted, reinterpret_cast<UINT16 *>(m_srcptr));
m_bank->set_base_decrypted(m_fd1089_decrypted);
}
-
+
// fd1094 case
if (m_fd1094_cache != NULL)
m_bank->set_base_decrypted(m_fd1094_cache->decrypted_opcodes(m_fd1094_cache->fd1094().state()));
@@ -628,7 +628,7 @@ void sega_315_5195_mapper_device::decrypt_bank::update()
//**************************************************************************
-// 315-5248 MULTIPLIER
+// 315-5248 MULTIPLIER
//**************************************************************************
//-------------------------------------------------
@@ -652,12 +652,12 @@ READ16_MEMBER( sega_315_5248_multiplier_device::read )
// if bit 1 is 0, just return register values
case 0: return m_regs[0];
case 1: return m_regs[1];
-
+
// if bit 1 is 1, return ther results
case 2: return (INT16(m_regs[0]) * INT16(m_regs[1])) >> 16;
case 3: return (INT16(m_regs[0]) * INT16(m_regs[1])) & 0xffff;
}
-
+
// should never get here
return 0xffff;
}
@@ -696,7 +696,7 @@ void sega_315_5248_multiplier_device::device_reset()
//**************************************************************************
-// 315-5249 DIVIDER
+// 315-5249 DIVIDER
//**************************************************************************
//-------------------------------------------------
@@ -788,7 +788,7 @@ void sega_315_5249_divider_device::execute(int mode)
INT32 dividend = INT32((m_regs[0] << 16) | m_regs[1]);
INT32 divisor = INT16(m_regs[2]);
INT32 quotient;
-
+
// check for divide by 0, signal if we did
if (divisor == 0)
{
@@ -840,12 +840,12 @@ void sega_315_5249_divider_device::execute(int mode)
//**************************************************************************
-// 315-5250 COMPARE/TIMER
+// 315-5250 COMPARE/TIMER
//**************************************************************************
//-------------------------------------------------
-// sega_315_5250_compare_timer_device -
-// constructor
+// sega_315_5250_compare_timer_device -
+// constructor
//-------------------------------------------------
sega_315_5250_compare_timer_device::sega_315_5250_compare_timer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
@@ -867,8 +867,8 @@ void sega_315_5250_compare_timer_device::static_set_timer_ack(device_t &device,
//-------------------------------------------------
-// static_set_sound_readwrite - configuration
-// helper to set the sound read/write callbacks
+// static_set_sound_readwrite - configuration
+// helper to set the sound read/write callbacks
//-------------------------------------------------
void sega_315_5250_compare_timer_device::static_set_sound_write(device_t &device, sound_write_delegate write)
diff --git a/src/mame/machine/segaic16.h b/src/mame/machine/segaic16.h
index 221b5675b42..5b189ba7742 100644
--- a/src/mame/machine/segaic16.h
+++ b/src/mame/machine/segaic16.h
@@ -132,7 +132,7 @@ private:
// construction/destruction
decrypt_bank();
~decrypt_bank();
-
+
// configuration
void set_decrypt(fd1089_base_device *fd1089);
void set_decrypt(fd1094_device *fd1094);
@@ -253,7 +253,7 @@ private:
// internal helpers
void execute(bool update_history = false);
void interrupt_ack() { if (!m_timer_ack.isnull()) m_timer_ack(); }
-
+
// configuration
timer_ack_delegate m_timer_ack;
sound_write_delegate m_sound_write;
diff --git a/src/mame/machine/snes.c b/src/mame/machine/snes.c
index 345ac8bfc60..586a5caeb7c 100644
--- a/src/mame/machine/snes.c
+++ b/src/mame/machine/snes.c
@@ -1991,7 +1991,7 @@ MACHINE_RESET( snes )
/* for mame we use an init, maybe we will need more for the different games */
DRIVER_INIT_MEMBER(snes_state,snes)
-{
+{
address_space *space = machine().device("maincpu")->memory().space(AS_PROGRAM);
UINT16 total_blocks, read_blocks;
UINT8 *rom;
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index 822cbaad8fa..41e2ed8d3c3 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -5035,6 +5035,7 @@ mbaa // 2008.09 Melty Blood Actress Again
// 2009.?? Project Cerberus (planned to be released in 2009)
ngdup23a // DIMM Firmware Updater (Rev A)
ngdup23c // DIMM Firmware Updater (Rev C)
+ngdup23e // DIMM Firmware Updater (Rev E)
// NAOMI based (System SP)
// 2004.10 Oshare Majo Love and Berry / Fashionable Witch Love and Berry
@@ -25935,7 +25936,7 @@ pr_nifty // Nifty Fifty (Project)
pr_upnun // Up & Under (Project)
pr_bears // Bear Streak (Coinworld)
pr_bearsa
-pr_bearsb
+pr_bearsb
pr_bearx // Bear X (Coinworld)
pr_bearxa
pr_bearxb
diff --git a/src/mame/mame.mak b/src/mame/mame.mak
index 285516a49b3..ba4146c69cb 100644
--- a/src/mame/mame.mak
+++ b/src/mame/mame.mak
@@ -2092,7 +2092,7 @@ $(DRIVERS)/mcr3.o: $(LAYOUT)/turbotag.lh
$(DRIVERS)/mpoker.o: $(LAYOUT)/mpoker.lh
$(DRIVERS)/mpu4mod2sw.o: $(LAYOUT)/connect4.lh \
-
+
$(DRIVERS)/mpu4mod4yam.o: $(LAYOUT)/gamball.lh \
$(DRIVERS)/mpu4hw.o: $(LAYOUT)/mpu4.lh \
diff --git a/src/mame/video/kaneko16.c b/src/mame/video/kaneko16.c
index 40d13719173..292e01b794f 100644
--- a/src/mame/video/kaneko16.c
+++ b/src/mame/video/kaneko16.c
@@ -37,7 +37,7 @@ static void kaneko16_fill_bitmap(running_machine &machine, bitmap_ind16 &bitmap,
}
-
+
/* Fill the bitmap with pen 0. This is wrong, but will work most of
the times. To do it right, each pixel should be drawn with pen 0
of the bottomost tile that covers it (which is pretty tricky to do) */
diff --git a/src/mame/video/kaneko_grap2.c b/src/mame/video/kaneko_grap2.c
index 51a38c407fc..7eb98406240 100644
--- a/src/mame/video/kaneko_grap2.c
+++ b/src/mame/video/kaneko_grap2.c
@@ -59,7 +59,7 @@ void kaneko_grap2_device::device_reset()
m_framebuffer_scrollx = 0;
m_framebuffer_enable = 0;
m_regs1_i = 0x0;
-
+
m_framebuffer_bright1 = 0;
m_framebuffer_bright2 = 0;
}
@@ -147,7 +147,7 @@ WRITE16_MEMBER(kaneko_grap2_device::galpani3_regs1_go_w)
UINT32 address = m_regs1_address_regs[1]| (m_regs1_address_regs[0]<<16);
UINT8* rledata = memregion(":gfx2")->base();
-// printf("galpani3_regs1_go_w? %08x\n",address );
+// printf("galpani3_regs1_go_w? %08x\n",address );
if ((data==0x2000) || (data==0x3000)) gp3_do_rle(address, m_framebuffer, rledata);
}
diff --git a/src/mame/video/kaneko_grap2.h b/src/mame/video/kaneko_grap2.h
index 280eab40a1e..bdc0d09cc00 100644
--- a/src/mame/video/kaneko_grap2.h
+++ b/src/mame/video/kaneko_grap2.h
@@ -22,7 +22,7 @@ class kaneko_grap2_device : public device_t
{
public:
kaneko_grap2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
int m_chipnum; // used to decide where we write the palette
@@ -41,12 +41,12 @@ public:
UINT16 m_framebuffer_scrollx;
UINT16 m_framebuffer_enable;
int m_regs1_i;
-
+
UINT16 m_framebuffer_bright1;
UINT16 m_framebuffer_bright2;
UINT16 m_regs1_address_regs[0x2];
-
+
DECLARE_WRITE16_MEMBER(galpani3_framebuffer1_enable_w) { m_framebuffer_enable = data; }
DECLARE_WRITE16_MEMBER(galpani3_framebuffer1_scrolly_w) { m_framebuffer_scrolly = data; }
diff --git a/src/mame/video/kaneko_spr.c b/src/mame/video/kaneko_spr.c
index 526c4b3556c..9026ea6fc9b 100644
--- a/src/mame/video/kaneko_spr.c
+++ b/src/mame/video/kaneko_spr.c
@@ -2,8 +2,8 @@
/*
Kaneko 16-bit sprites
- VU-002 052 151021 ('type 0') (blazeon, berlwall etc., confirmed)
- KC-002 L0002 023 9321EK702 ('type 1') (gtmr, bloodwar etc., confirmed)
+ VU-002 052 151021 ('type 0') (blazeon, berlwall etc., confirmed)
+ KC-002 L0002 023 9321EK702 ('type 1') (gtmr, bloodwar etc., confirmed)
[ 1024 Sprites ]
@@ -14,11 +14,11 @@
sprites on the screen
- Notes:
- - Blaze On has 2 sprite chips, with 2 sets of sprite registers, the
- existing code here just handles it as one, ignoring the second
- set of registers, we should really be producing 2 sprite bitmaps
- and manually mixing them.
+ Notes:
+ - Blaze On has 2 sprite chips, with 2 sets of sprite registers, the
+ existing code here just handles it as one, ignoring the second
+ set of registers, we should really be producing 2 sprite bitmaps
+ and manually mixing them.
*/
@@ -120,8 +120,8 @@ void kaneko16_sprite_device::set_offsets(device_t &device, int xoffs, int yoffs)
Each sprite is always stuffed in 4 words. There may be some extra
padding words though
-
- Examples are:
+
+ Examples are:
Type 0: shogwarr, blazeon, bakubrkr.
Type 1: gtmr.
@@ -170,7 +170,7 @@ void kaneko_kc002_sprite_device::get_sprite_attributes(struct tempsprite *s, UIN
s->flipx = (attr & 0x0200);
s->code += (s->y & 1) << 16; // bloodwar
}
-
+
void kaneko_vu002_sprite_device::get_sprite_attributes(struct tempsprite *s, UINT16 attr)
{
s->flipy = (attr & 0x0001);
@@ -346,7 +346,7 @@ void kaneko16_sprite_device::kaneko16_draw_sprites(running_machine &machine, bit
{
int flags;
- flags = kaneko16_parse_sprite_type012(machine, i,s, spriteram16, spriteram16_bytes);
+ flags = kaneko16_parse_sprite_type012(machine, i,s, spriteram16, spriteram16_bytes);
if (flags == -1) // End of Sprites
break;
diff --git a/src/mame/video/kaneko_spr.h b/src/mame/video/kaneko_spr.h
index ab1a35a6479..ed972fa1944 100644
--- a/src/mame/video/kaneko_spr.h
+++ b/src/mame/video/kaneko_spr.h
@@ -31,7 +31,7 @@ class kaneko16_sprite_device : public device_t
{
public:
kaneko16_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock, device_type type);
-
+
static void set_altspacing(device_t &device, int spacing);
static void set_fliptype(device_t &device, int fliptype);
static void set_offsets(device_t &device, int xoffs, int yoffs);
@@ -101,7 +101,7 @@ class kaneko_vu002_sprite_device : public kaneko16_sprite_device
public:
kaneko_vu002_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
void get_sprite_attributes(struct tempsprite *s, UINT16 attr);
- int get_sprite_type(void){ return 0; };
+ int get_sprite_type(void){ return 0; };
};
extern const device_type KANEKO_VU002_SPRITE;
@@ -111,7 +111,7 @@ class kaneko_kc002_sprite_device : public kaneko16_sprite_device
public:
kaneko_kc002_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
void get_sprite_attributes(struct tempsprite *s, UINT16 attr);
- int get_sprite_type(void){ return 1; };
+ int get_sprite_type(void){ return 1; };
};
extern const device_type KANEKO_KC002_SPRITE;
diff --git a/src/mame/video/kaneko_tmap.h b/src/mame/video/kaneko_tmap.h
index 96975a8cbc4..6c31cd1e528 100644
--- a/src/mame/video/kaneko_tmap.h
+++ b/src/mame/video/kaneko_tmap.h
@@ -4,7 +4,7 @@ class kaneko_view2_tilemap_device : public device_t
{
public:
kaneko_view2_tilemap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// used to set values when creating device
static void set_gfx_region(device_t &device, int region);
static void set_offset(device_t &device, int dx, int dy, int xdim, int ydim);
diff --git a/src/mame/video/scn2674.c b/src/mame/video/scn2674.c
index 350200f1c48..7e192a388df 100644
--- a/src/mame/video/scn2674.c
+++ b/src/mame/video/scn2674.c
@@ -1,28 +1,28 @@
/*
- SCN2674 - Advanced Video Display Controller (AVDC) (Video Chip)
+ SCN2674 - Advanced Video Display Controller (AVDC) (Video Chip)
- This is a somewhat terrible implementation and should probably just be rewritten from scratch
- it is currently used by mpu4vid.c and still quite heavily tied to the behavior of that.
+ This is a somewhat terrible implementation and should probably just be rewritten from scratch
+ it is currently used by mpu4vid.c and still quite heavily tied to the behavior of that.
- I don't know if the timing bugs with those games comes from this, or emulation of the other
- MPU4 devices tho because even some of the non-video games seem laggy and prone to failure.
+ I don't know if the timing bugs with those games comes from this, or emulation of the other
+ MPU4 devices tho because even some of the non-video games seem laggy and prone to failure.
- -- currently expects (from the host driver)
- decoded gfx in regions 0,1,2,3 in various formats (normal, double height etc.)
- eventually the chip should just handle this without the need to decode anything
+ -- currently expects (from the host driver)
+ decoded gfx in regions 0,1,2,3 in various formats (normal, double height etc.)
+ eventually the chip should just handle this without the need to decode anything
a callback function for when the irqs are changed / updated
- a call from the video start from your video start function
+ a call from the video start from your video start function
- a call to the scanline function each scanline
+ a call to the scanline function each scanline
- a call to the video draw (with ram pointer) from a screen update function
-
- video to be on the primary screen
+ a call to the video draw (with ram pointer) from a screen update function
- this could all be simplified / changed, the chip can actually be hooked up in various ways
- including working on a per scanline basis with almost no ram
+ video to be on the primary screen
+
+ this could all be simplified / changed, the chip can actually be hooked up in various ways
+ including working on a per scanline basis with almost no ram
*/
#include "emu.h"
@@ -35,7 +35,7 @@ const device_type SCN2674_VIDEO = &device_creator<scn2674_device>;
static void default_scn2674_callback(running_machine &machine)
{
-// logerror("no scn2674_callback\n");
+// logerror("no scn2674_callback\n");
}
@@ -697,7 +697,7 @@ void scn2674_device::scn2674_do_scanline(running_machine &machine, int scanline)
m_linecounter =297;//hold the counter in the vsync point, it's not clear whether this is done or not
}
scn2674_line(machine);
-// timer.machine().scheduler().synchronize();
+// timer.machine().scheduler().synchronize();
}
diff --git a/src/mame/video/scn2674.h b/src/mame/video/scn2674.h
index a4d33e59388..f79d3a67331 100644
--- a/src/mame/video/scn2674.h
+++ b/src/mame/video/scn2674.h
@@ -14,8 +14,8 @@ public:
static void set_irq_update_callback(device_t &device, s2574_interrupt_callback_func callback);
-// int m_gfx_index;
-
+// int m_gfx_index;
+
DECLARE_READ16_MEMBER( mpu4_vid_scn2674_r );
DECLARE_WRITE16_MEMBER( mpu4_vid_scn2674_w );
diff --git a/src/mame/video/segaorun.c b/src/mame/video/segaorun.c
index 1913d2239b6..2f8179e0718 100644
--- a/src/mame/video/segaorun.c
+++ b/src/mame/video/segaorun.c
@@ -48,7 +48,7 @@ void segaorun_state::video_start()
{
// compute palette info
segaic16_palette_init(0x1000);
-
+
if (m_shangon_video)
{
// initialize the tile/text layers
diff --git a/src/mame/video/segas18.c b/src/mame/video/segas18.c
index 098b05898ff..6a3b11f1255 100644
--- a/src/mame/video/segas18.c
+++ b/src/mame/video/segas18.c
@@ -133,8 +133,8 @@ void segas18_state::draw_vdp(screen_device &screen, bitmap_ind16 &bitmap, const
bitmap_ind8 &priority_bitmap = screen.machine().priority_bitmap;
for (int y = cliprect.min_y; y <= cliprect.max_y; y++)
{
- // UINT16 *src = vdp->m_render_line; // can't use this because we're not in RGB32, which we'll need to be if there are palette effects
- // UINT16 *src2 = vdp->m_render_line_raw;
+ // UINT16 *src = vdp->m_render_line; // can't use this because we're not in RGB32, which we'll need to be if there are palette effects
+ // UINT16 *src2 = vdp->m_render_line_raw;
UINT16 *dst = &bitmap.pix(y);
UINT8 *pri = &priority_bitmap.pix(y);
@@ -147,7 +147,7 @@ void segas18_state::draw_vdp(screen_device &screen, bitmap_ind16 &bitmap, const
{
switch (pix & 0xc0)
{
- case 0x00:
+ case 0x00:
dst[x] = pix + 0x2000; /* 0x2040 - would be shadow? */
break;
case 0x40:
diff --git a/src/mame/video/st0020.c b/src/mame/video/st0020.c
index 87cfb8b5b0d..662e1ee667d 100644
--- a/src/mame/video/st0020.c
+++ b/src/mame/video/st0020.c
@@ -1,5 +1,5 @@
/* ST0020 - Seta Zooming Sprites + Blitter
-
+
(gdfs also has a tilemap, I don't know if this chip supplies that)
The ST0032 seems very similar, used by the newer Jockey Club II boards
@@ -49,8 +49,8 @@ static const gfx_layout layout_16x8x8_2 =
void st0020_device::device_start()
{
m_st0020_gfxram = auto_alloc_array_clear(machine(), UINT16, 4 * 0x100000 / 2);
- m_st0020_spriteram = auto_alloc_array_clear(machine(), UINT16, 0x80000 / 2);
- m_st0020_blitram = auto_alloc_array_clear(machine(), UINT16, 0x100 / 2);
+ m_st0020_spriteram = auto_alloc_array_clear(machine(), UINT16, 0x80000 / 2);
+ m_st0020_blitram = auto_alloc_array_clear(machine(), UINT16, 0x100 / 2);
for (m_gfx_index = 0; m_gfx_index < MAX_GFX_ELEMENTS; m_gfx_index++)
if (machine().gfx[m_gfx_index] == 0)
@@ -200,7 +200,7 @@ WRITE16_MEMBER(st0020_device::st0020_blitram_w)
}
-
+
/*
Sprites RAM is 0x80000 bytes long. The first 0x2000? bytes hold a list
of sprites to display (the list can be made shorter using an end-of-list
@@ -381,7 +381,7 @@ void st0020_device::st0020_draw_zooming_sprites(running_machine &machine, bitmap
}
}
-
+
#if 0 /* doesn't compile in a device context (can't use ui_draw_text? */
if (machine.input().code_pressed(KEYCODE_Z)) /* Display some info on each sprite */
{
diff --git a/src/mame/video/st0020.h b/src/mame/video/st0020.h
index 028cc8fa88b..e0c129fbe0e 100644
--- a/src/mame/video/st0020.h
+++ b/src/mame/video/st0020.h
@@ -10,11 +10,11 @@ public:
static void set_is_jclub2o(device_t &device, int is_jclub2o);
int m_gfx_index;
-
+
// see if we can handle the difference between this and the st0032 in here, or if we need another
// device
int m_is_st0032;
-
+
// per-game hack
int m_is_jclub2;
diff --git a/src/version.c b/src/version.c
index 4922bd3832a..cc09c06e6e0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -38,4 +38,4 @@
***************************************************************************/
extern const char build_version[];
-const char build_version[] = "0.146u4 ("__DATE__")";
+const char build_version[] = "0.146u5 ("__DATE__")";