summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatarGravatar Miodrag Milanovic <mmicko@gmail.com>2015-03-25 08:16:51 +0100
committerGravatarGravatar Miodrag Milanovic <mmicko@gmail.com>2015-03-25 08:16:51 +0100
commit0147bb4cc82e642cf75151f039f240eb20989fbc (patch)
tree1da79e38b3eb810f9f5ab9f6f4853defad55792d
parentfda60d87eb9228d923fd33130671b2c5de881683 (diff)
Cleanups and version bumpmame0160
-rw-r--r--hash/nes.xml4
-rw-r--r--hash/pasogo.xml2
-rw-r--r--src/emu/bus/a2bus/ezcgi.c5
-rw-r--r--src/emu/bus/scsi/omti5100.c4
-rw-r--r--src/emu/cpu/hmcs40/hmcs40.c72
-rw-r--r--src/emu/cpu/hmcs40/hmcs40.h4
-rw-r--r--src/emu/cpu/hmcs40/hmcs40d.c90
-rw-r--r--src/emu/cpu/hmcs40/hmcs40op.inc10
-rw-r--r--src/emu/cpu/i386/i386ops.h2
-rw-r--r--src/emu/cpu/i386/pentops.inc8
-rw-r--r--src/emu/cpu/nec/v53.c49
-rw-r--r--src/emu/cpu/nec/v53.h32
-rw-r--r--src/emu/cpu/pic16c5x/pic16c5x.c2
-rw-r--r--src/emu/cpu/pic16c5x/pic16c5x.h4
-rw-r--r--src/emu/cpu/z80/kl5c80a12.c12
-rw-r--r--src/emu/cpu/z80/kl5c80a12.h12
-rw-r--r--src/emu/machine/am9517a.c40
-rw-r--r--src/emu/machine/am9517a.h2
-rw-r--r--src/emu/machine/i8251.c132
-rw-r--r--src/emu/machine/i8257.c2
-rw-r--r--src/emu/machine/mcf5206e.c2
-rw-r--r--src/emu/machine/tmp68301.c2
-rw-r--r--src/emu/machine/upd71071.c10
-rw-r--r--src/emu/machine/vrc4373.c9
-rw-r--r--src/emu/machine/vrc4373.h16
-rw-r--r--src/emu/mame.c4
-rw-r--r--src/emu/render.c6
-rw-r--r--src/emu/sound/es1373.h40
-rw-r--r--src/emu/sound/flt_rc.c2
-rw-r--r--src/emu/sound/okim9810.c4
-rw-r--r--src/emu/sound/okim9810.h2
-rw-r--r--src/emu/video.c2
-rw-r--r--src/emu/video.h4
-rw-r--r--src/emu/video/tms34061.c4
-rw-r--r--src/emu/video/voodoo_pci.c2
-rw-r--r--src/lib/formats/d88_dsk.c4
-rw-r--r--src/lib/formats/flex_dsk.c2
-rw-r--r--src/lib/formats/fmtowns_dsk.c4
-rw-r--r--src/lib/formats/nfd_dsk.c4
-rw-r--r--src/mame/audio/hng64.c24
-rw-r--r--src/mame/drivers/argus.c6
-rw-r--r--src/mame/drivers/astrcorp.c160
-rw-r--r--src/mame/drivers/cabal.c2
-rw-r--r--src/mame/drivers/capbowl.c2
-rw-r--r--src/mame/drivers/cocoloco.c10
-rw-r--r--src/mame/drivers/dynax.c18
-rw-r--r--src/mame/drivers/fgoal.c2
-rw-r--r--src/mame/drivers/flyball.c14
-rw-r--r--src/mame/drivers/goldstar.c44
-rw-r--r--src/mame/drivers/hng64.c7
-rw-r--r--src/mame/drivers/hotblock.c8
-rw-r--r--src/mame/drivers/iteagle.c12
-rw-r--r--src/mame/drivers/jankenmn.c4
-rw-r--r--src/mame/drivers/jchan.c6
-rw-r--r--src/mame/drivers/junofrst.c4
-rw-r--r--src/mame/drivers/m72.c14
-rw-r--r--src/mame/drivers/madalien.c2
-rw-r--r--src/mame/drivers/mgolf.c12
-rw-r--r--src/mame/drivers/neogeo.c26
-rw-r--r--src/mame/drivers/neogeo_noslot.c28
-rw-r--r--src/mame/drivers/paradise.c2
-rw-r--r--src/mame/drivers/peplus.c2
-rw-r--r--src/mame/drivers/playmark.c6
-rw-r--r--src/mame/drivers/psychic5.c8
-rw-r--r--src/mame/drivers/pturn.c8
-rw-r--r--src/mame/drivers/re900.c8
-rw-r--r--src/mame/drivers/rltennis.c2
-rw-r--r--src/mame/drivers/sandscrp.c10
-rw-r--r--src/mame/drivers/scobra.c1
-rw-r--r--src/mame/drivers/seta.c56
-rw-r--r--src/mame/drivers/seta2.c2
-rw-r--r--src/mame/drivers/shougi.c8
-rw-r--r--src/mame/drivers/sidearms.c8
-rw-r--r--src/mame/drivers/simple_st0016.c6
-rw-r--r--src/mame/drivers/sothello.c6
-rw-r--r--src/mame/drivers/speglsht.c6
-rw-r--r--src/mame/drivers/srmp2.c20
-rw-r--r--src/mame/drivers/srmp5.c6
-rw-r--r--src/mame/drivers/srmp6.c8
-rw-r--r--src/mame/drivers/srumbler.c14
-rw-r--r--src/mame/drivers/sstrangr.c8
-rw-r--r--src/mame/drivers/ssv.c2
-rw-r--r--src/mame/drivers/sub.c8
-rw-r--r--src/mame/drivers/suna16.c26
-rw-r--r--src/mame/drivers/suna8.c22
-rw-r--r--src/mame/drivers/supdrapo.c10
-rw-r--r--src/mame/drivers/supertnk.c8
-rw-r--r--src/mame/drivers/superwng.c6
-rw-r--r--src/mame/drivers/suprgolf.c30
-rw-r--r--src/mame/drivers/suprslam.c4
-rw-r--r--src/mame/drivers/tankbust.c8
-rw-r--r--src/mame/drivers/taotaido.c2
-rw-r--r--src/mame/drivers/tbowl.c2
-rw-r--r--src/mame/drivers/tgtpanic.c10
-rw-r--r--src/mame/drivers/thunderx.c2
-rw-r--r--src/mame/drivers/tryout.c4
-rw-r--r--src/mame/drivers/tsamurai.c6
-rw-r--r--src/mame/drivers/ttchamp.c57
-rw-r--r--src/mame/drivers/tugboat.c10
-rw-r--r--src/mame/drivers/twins.c34
-rw-r--r--src/mame/drivers/usgames.c4
-rw-r--r--src/mame/drivers/vamphalf.c6
-rw-r--r--src/mame/drivers/vigilant.c4
-rw-r--r--src/mame/drivers/wc90b.c2
-rw-r--r--src/mame/drivers/xain.c4
-rw-r--r--src/mame/drivers/xtheball.c12
-rw-r--r--src/mame/includes/argus.h26
-rw-r--r--src/mame/includes/bbusters.h8
-rw-r--r--src/mame/includes/cabal.h10
-rw-r--r--src/mame/includes/capbowl.h12
-rw-r--r--src/mame/includes/fgoal.h4
-rw-r--r--src/mame/includes/hng64.h5
-rw-r--r--src/mame/includes/ironhors.h8
-rw-r--r--src/mame/includes/mosaic.h10
-rw-r--r--src/mame/includes/paradise.h4
-rw-r--r--src/mame/includes/pooyan.h8
-rw-r--r--src/mame/includes/psychic5.h6
-rw-r--r--src/mame/includes/realbrk.h2
-rw-r--r--src/mame/includes/rltennis.h4
-rw-r--r--src/mame/includes/seta2.h4
-rw-r--r--src/mame/includes/shuuz.h10
-rw-r--r--src/mame/includes/sidearms.h6
-rw-r--r--src/mame/includes/simple_st0016.h4
-rw-r--r--src/mame/includes/speedbal.h2
-rw-r--r--src/mame/includes/srmp2.h4
-rw-r--r--src/mame/includes/srumbler.h8
-rw-r--r--src/mame/includes/ssozumo.h12
-rw-r--r--src/mame/includes/ssrj.h8
-rw-r--r--src/mame/includes/ssv.h10
-rw-r--r--src/mame/includes/subs.h10
-rw-r--r--src/mame/includes/suna16.h12
-rw-r--r--src/mame/includes/suprloco.h10
-rw-r--r--src/mame/includes/suprridr.h12
-rw-r--r--src/mame/includes/tankbatt.h14
-rw-r--r--src/mame/includes/tankbust.h14
-rw-r--r--src/mame/includes/taotaido.h10
-rw-r--r--src/mame/includes/tbowl.h8
-rw-r--r--src/mame/includes/thunderx.h2
-rw-r--r--src/mame/includes/timelimt.h8
-rw-r--r--src/mame/includes/tryout.h6
-rw-r--r--src/mame/includes/tsamurai.h24
-rw-r--r--src/mame/includes/usgames.h4
-rw-r--r--src/mame/includes/vigilant.h4
-rw-r--r--src/mame/includes/vulgus.h2
-rw-r--r--src/mame/includes/wc90b.h6
-rw-r--r--src/mame/machine/hng64_net.c2
-rw-r--r--src/mame/machine/iteagle_fpga.c24
-rw-r--r--src/mame/machine/iteagle_fpga.h2
-rw-r--r--src/mame/mame.lst12
-rw-r--r--src/mame/video/bbusters.c4
-rw-r--r--src/mame/video/deadang.c2
-rw-r--r--src/mame/video/decmxc06.c6
-rw-r--r--src/mame/video/dynax.c10
-rw-r--r--src/mame/video/hng64.c3
-rw-r--r--src/mame/video/hng64_3d.c10
-rw-r--r--src/mame/video/hng64_sprite.c1
-rw-r--r--src/mame/video/jalblend.c2
-rw-r--r--src/mame/video/jalblend.h8
-rw-r--r--src/mame/video/pc080sn.c2
-rw-r--r--src/mame/video/psychic5.c12
-rw-r--r--src/mame/video/realbrk.c2
-rw-r--r--src/mame/video/rltennis.c2
-rw-r--r--src/mame/video/seta001.c2
-rw-r--r--src/mame/video/seta2.c4
-rw-r--r--src/mame/video/sidearms.c2
-rw-r--r--src/mame/video/srumbler.c2
-rw-r--r--src/mame/video/ssv.c4
-rw-r--r--src/mame/video/suna16.c2
-rw-r--r--src/mame/video/suprloco.c2
-rw-r--r--src/mame/video/suprridr.c2
-rw-r--r--src/mame/video/tankbust.c2
-rw-r--r--src/mame/video/tbowl.c2
-rw-r--r--src/mame/video/thedeep.c1
-rw-r--r--src/mame/video/timelimt.c2
-rw-r--r--src/mame/video/tryout.c2
-rw-r--r--src/mame/video/tsamurai.c6
-rw-r--r--src/mame/video/vulgus.c2
-rw-r--r--src/mame/video/xain.c2
-rw-r--r--src/mess/audio/gamate.c6
-rw-r--r--src/mess/drivers/a7800.c10
-rw-r--r--src/mess/drivers/apple2.c6
-rw-r--r--src/mess/drivers/apple2e.c6
-rw-r--r--src/mess/drivers/gamate.c11
-rw-r--r--src/mess/drivers/hh_hmcs40.c50
-rw-r--r--src/mess/drivers/hh_pic16.c14
-rw-r--r--src/mess/drivers/hh_tms1k.c70
-rw-r--r--src/mess/drivers/hh_ucom4.c48
-rw-r--r--src/mess/drivers/imds2.c910
-rw-r--r--src/mess/drivers/mbdtower.c32
-rw-r--r--src/mess/drivers/snes.c6
-rw-r--r--src/mess/drivers/ticalc1x.c20
-rw-r--r--src/mess/drivers/tispeak.c10
-rw-r--r--src/mess/includes/hh_tms1k.h6
-rw-r--r--src/mess/includes/imds2.h198
-rw-r--r--src/mess/layout/mbdtower.lay4
-rw-r--r--src/mess/mess.mak34
-rw-r--r--src/osd/modules/opengl/osd_opengl.h10
-rw-r--r--src/osd/modules/osdwindow.h6
-rw-r--r--src/osd/modules/render/draw13.c2
-rw-r--r--src/osd/modules/render/drawogl.c80
-rw-r--r--src/osd/sdl/sdl.mak4
-rw-r--r--src/osd/sdl/video.h8
-rw-r--r--src/osd/sdl/window.c4
-rw-r--r--src/osd/windows/video.h8
-rw-r--r--src/osd/windows/windows.mak4
-rw-r--r--src/version.c2
206 files changed, 1754 insertions, 1773 deletions
diff --git a/hash/nes.xml b/hash/nes.xml
index cac46e99d03..d007b53569b 100644
--- a/hash/nes.xml
+++ b/hash/nes.xml
@@ -57391,7 +57391,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
<publisher>Union Bond</publisher>
<info name="serial" value="G-0005"/>
<part name="cart" interface="nes_cart">
- <feature name="slot" value="nanjing" /> <!-- header actually says 164... -->
+ <feature name="slot" value="nanjing" /> <!-- header actually says 164... -->
<feature name="pcb" value="UNL-NANJING" />
<dataarea name="prg" size="524288">
<rom name="ying tao xiao wan zi (g-005) (ch).prg" size="524288" crc="8209ba79" sha1="fa56608d8dcf5a144dd1fc81282cd86fd51060fe" offset="00000" status="baddump" />
@@ -75420,7 +75420,7 @@ be better to redump them properly. -->
<year>19??</year>
<publisher>&lt;unknown&gt;</publisher>
<part name="cart" interface="nes_cart">
- <feature name="slot" value="fk23ca" /> <!-- UNIF header pointed to FK23C, but the menu does not appear with that mapper... investigate! -->
+ <feature name="slot" value="fk23ca" /> <!-- UNIF header pointed to FK23C, but the menu does not appear with that mapper... investigate! -->
<feature name="pcb" value="BMC-FK23C" />
<dataarea name="prg" size="8388608">
<rom name="120-in-1 (unl)[u].prg" size="8388608" crc="678de5aa" sha1="01da22ddf1897b47d6b03ecb4ff0c093f9b39dfc" offset="00000" status="baddump" />
diff --git a/hash/pasogo.xml b/hash/pasogo.xml
index e1242fb909f..b2544669957 100644
--- a/hash/pasogo.xml
+++ b/hash/pasogo.xml
@@ -9,7 +9,7 @@
歴代棋聖戦名曲集 (Rekidai Kisei Sen Meikyokushuu)
棋界覇王伝・古典編 (Kikai Haoh Den - Koten-hen)
棋界覇王伝・現代編 (Kikai Haoh Den - Gendai-hen)
-
+
The undumped cart numbers are KS-1005, KS-1006, KS-1007 and KS-1008
For the remaining undumped games, the game to cart number match is unknown.
-->
diff --git a/src/emu/bus/a2bus/ezcgi.c b/src/emu/bus/a2bus/ezcgi.c
index d7a9cf3d469..3c3a937b781 100644
--- a/src/emu/bus/a2bus/ezcgi.c
+++ b/src/emu/bus/a2bus/ezcgi.c
@@ -43,7 +43,7 @@ MACHINE_CONFIG_END
#define MSX2_VISIBLE_YBORDER_PIXELS 14 * 2
MACHINE_CONFIG_FRAGMENT( ezcgi9938 )
- MCFG_V9938_ADD(TMS_TAG, SCREEN_TAG, 0x30000) // 192K of VRAM
+ MCFG_V9938_ADD(TMS_TAG, SCREEN_TAG, 0x30000) // 192K of VRAM
MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(a2bus_ezcgi_9938_device, tms_irq_w))
MCFG_SCREEN_ADD(SCREEN_TAG, RASTER)
@@ -57,7 +57,7 @@ MACHINE_CONFIG_FRAGMENT( ezcgi9938 )
MACHINE_CONFIG_END
MACHINE_CONFIG_FRAGMENT( ezcgi9958 )
- MCFG_V9958_ADD(TMS_TAG, SCREEN_TAG, 0x30000) // 192K of VRAM
+ MCFG_V9958_ADD(TMS_TAG, SCREEN_TAG, 0x30000) // 192K of VRAM
MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(a2bus_ezcgi_9958_device, tms_irq_w))
MCFG_SCREEN_ADD(SCREEN_TAG, RASTER)
@@ -311,4 +311,3 @@ WRITE_LINE_MEMBER( a2bus_ezcgi_9958_device::tms_irq_w )
lower_slot_irq();
}
}
-
diff --git a/src/emu/bus/scsi/omti5100.c b/src/emu/bus/scsi/omti5100.c
index a3f00560f73..0d7ed1567ab 100644
--- a/src/emu/bus/scsi/omti5100.c
+++ b/src/emu/bus/scsi/omti5100.c
@@ -20,8 +20,8 @@ const rom_entry *omti5100_device::device_rom_region() const
omti5100_device::omti5100_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: scsihd_device(mconfig, OMTI5100, "OMTI 5100", tag, owner, clock, "omti5100", __FILE__),
- m_image0(*this, "image0"),
- m_image1(*this, "image1")
+ m_image0(*this, "image0"),
+ m_image1(*this, "image1")
{
}
diff --git a/src/emu/cpu/hmcs40/hmcs40.c b/src/emu/cpu/hmcs40/hmcs40.c
index c279f07aec0..da878129069 100644
--- a/src/emu/cpu/hmcs40/hmcs40.c
+++ b/src/emu/cpu/hmcs40/hmcs40.c
@@ -187,7 +187,7 @@ void hmcs40_cpu_device::device_start()
m_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(hmcs40_cpu_device::simple_timer_cb), this));
reset_prescaler();
-
+
m_read_r0.resolve_safe(0);
m_read_r1.resolve_safe(0);
m_read_r2.resolve_safe(0);
@@ -196,7 +196,7 @@ void hmcs40_cpu_device::device_start()
m_read_r5.resolve_safe(0);
m_read_r6.resolve_safe(0);
m_read_r7.resolve_safe(0);
-
+
m_write_r0.resolve_safe();
m_write_r1.resolve_safe();
m_write_r2.resolve_safe();
@@ -290,15 +290,15 @@ void hmcs40_cpu_device::device_reset()
{
m_pc = m_pcmask;
m_prev_op = m_op = 0;
-
+
// clear i/o
m_d = m_polarity;
for (int i = 0; i < 16; i++)
hmcs40_cpu_device::write_d(i, 0);
-
+
for (int i = 0; i < 8; i++)
hmcs40_cpu_device::write_r(i, 0);
-
+
// clear interrupts
m_cf = 0;
m_ie = 0;
@@ -316,7 +316,7 @@ UINT8 hmcs40_cpu_device::read_r(int index)
{
index &= 7;
UINT8 inp = 0;
-
+
switch (index)
{
case 0: inp = m_read_r0(index, 0xff); break;
@@ -328,7 +328,7 @@ UINT8 hmcs40_cpu_device::read_r(int index)
case 6: inp = m_read_r6(index, 0xff); break;
case 7: inp = m_read_r7(index, 0xff); break;
}
-
+
return ((inp ^ m_polarity) | m_r[index]) & 0xf;
}
@@ -337,7 +337,7 @@ void hmcs40_cpu_device::write_r(int index, UINT8 data)
index &= 7;
data = (data ^ m_polarity) & 0xf;
m_r[index] = data;
-
+
switch (index)
{
case 0: m_write_r0(index, data, 0xff); break;
@@ -354,7 +354,7 @@ void hmcs40_cpu_device::write_r(int index, UINT8 data)
int hmcs40_cpu_device::read_d(int index)
{
index &= 15;
-
+
return ((m_read_d(index, 0xffff) ^ m_polarity) | m_d) >> index & 1;
}
@@ -362,7 +362,7 @@ void hmcs40_cpu_device::write_d(int index, int state)
{
index &= 15;
state = (((state) ? 1 : 0) ^ m_polarity) & 1;
-
+
m_d = (m_d & ~(1 << index)) | state << index;
m_write_d(index, m_d, 0xffff);
}
@@ -374,7 +374,7 @@ void hmcs40_cpu_device::write_d(int index, int state)
UINT8 hmcs43_cpu_device::read_r(int index)
{
index &= 7;
-
+
if (index >= 2)
logerror("%s read from %s port R%d at $%04X\n", tag(), (index >= 4) ? "unknown" : "output", index, m_prev_pc);
@@ -394,7 +394,7 @@ void hmcs43_cpu_device::write_r(int index, UINT8 data)
int hmcs43_cpu_device::read_d(int index)
{
index &= 15;
-
+
if (index >= 4)
logerror("%s read from output pin D%d at $%04X\n", tag(), index, m_prev_pc);
@@ -408,10 +408,10 @@ int hmcs43_cpu_device::read_d(int index)
UINT8 hmcs44_cpu_device::read_r(int index)
{
index &= 7;
-
+
if (index >= 6)
logerror("%s read from unknown port R%d at $%04X\n", tag(), index, m_prev_pc);
-
+
return hmcs40_cpu_device::read_r(index);
}
@@ -432,10 +432,10 @@ void hmcs44_cpu_device::write_r(int index, UINT8 data)
UINT8 hmcs45_cpu_device::read_r(int index)
{
index &= 7;
-
+
if (index >= 6)
logerror("%s read from %s port R%d at $%04X\n", tag(), (index == 7) ? "unknown" : "output", index, m_prev_pc);
-
+
return hmcs40_cpu_device::read_r(index);
}
@@ -460,10 +460,10 @@ void hmcs40_cpu_device::do_interrupt()
m_icount--;
push_stack();
m_ie = 0;
-
+
// line 0/1 for external interrupt, let's use 2 for t/c interrupt
int line = (m_iri) ? m_eint_line : 2;
-
+
// vector $3f, on page 0(timer/counter), or page 1(external)
// external interrupt has priority over t/c interrupt
m_pc = 0x3f | (m_iri ? 0x40 : 0);
@@ -480,7 +480,7 @@ void hmcs40_cpu_device::execute_set_input(int line, int state)
if (line != 0 && line != 1)
return;
state = (state) ? 1 : 0;
-
+
// external interrupt request on rising edge
if (state && !m_int[line])
{
@@ -490,12 +490,12 @@ void hmcs40_cpu_device::execute_set_input(int line, int state)
m_iri = 1;
m_if[line] = 1;
}
-
+
// clock tc if it is in counter mode
if (m_cf && line == 1)
increment_tc();
}
-
+
m_int[line] = state;
}
@@ -511,7 +511,7 @@ TIMER_CALLBACK_MEMBER( hmcs40_cpu_device::simple_timer_cb )
// timer prescaler overflow
if (!m_cf)
increment_tc();
-
+
reset_prescaler();
}
@@ -519,7 +519,7 @@ void hmcs40_cpu_device::increment_tc()
{
// increment timer/counter
m_tc = (m_tc + 1) & 0xf;
-
+
// timer interrupt request on overflow
if (m_tc == 0 && !m_tf)
{
@@ -554,7 +554,7 @@ void hmcs40_cpu_device::execute_run()
while (m_icount > 0)
{
m_icount--;
-
+
// LPU is handled 1 cycle later
if ((m_prev_op & 0x3e0) == 0x340)
{
@@ -571,7 +571,7 @@ void hmcs40_cpu_device::execute_run()
// remember previous state
m_prev_op = m_op;
m_prev_pc = m_pc;
-
+
// fetch next opcode
debugger_instruction_hook(this, m_pc);
m_op = m_program->read_word(m_pc << 1) & 0x3ff;
@@ -582,7 +582,7 @@ void hmcs40_cpu_device::execute_run()
switch (m_op)
{
/* 0x000 */
-
+
case 0x000: case 0x001: case 0x002: case 0x003:
op_xsp(); break;
case 0x004: case 0x005: case 0x006: case 0x007:
@@ -602,7 +602,7 @@ void hmcs40_cpu_device::execute_run()
op_am(); break;
case 0x03c:
op_lta(); break;
-
+
case 0x040:
op_lxa(); break;
case 0x045:
@@ -626,7 +626,7 @@ void hmcs40_cpu_device::execute_run()
case 0x070: case 0x071: case 0x072: case 0x073: case 0x074: case 0x075: case 0x076: case 0x077:
case 0x078: case 0x079: case 0x07a: case 0x07b: case 0x07c: case 0x07d: case 0x07e: case 0x07f:
op_lai(); break;
-
+
case 0x080: case 0x081: case 0x082: case 0x083: case 0x084: case 0x085: case 0x086: case 0x087:
case 0x088: case 0x089: case 0x08a: case 0x08b: case 0x08c: case 0x08d: case 0x08e: case 0x08f:
op_ai(); break;
@@ -655,10 +655,10 @@ void hmcs40_cpu_device::execute_run()
case 0x0f0: case 0x0f1: case 0x0f2: case 0x0f3: case 0x0f4: case 0x0f5: case 0x0f6: case 0x0f7:
case 0x0f8: case 0x0f9: case 0x0fa: case 0x0fb: case 0x0fc: case 0x0fd: case 0x0fe: case 0x0ff:
op_xamr(); break;
-
-
+
+
/* 0x100 */
-
+
case 0x110: case 0x111:
op_lmaiy(); break;
case 0x114: case 0x115:
@@ -682,7 +682,7 @@ void hmcs40_cpu_device::execute_run()
case 0x170: case 0x171: case 0x172: case 0x173: case 0x174: case 0x175: case 0x176: case 0x177:
case 0x178: case 0x179: case 0x17a: case 0x17b: case 0x17c: case 0x17d: case 0x17e: case 0x17f:
op_lti(); break;
-
+
case 0x1a0:
op_tif1(); break;
case 0x1a1:
@@ -706,7 +706,7 @@ void hmcs40_cpu_device::execute_run()
/* 0x200 */
-
+
case 0x200: case 0x201: case 0x202: case 0x203:
op_tm(); break;
case 0x204: case 0x205: case 0x206: case 0x207:
@@ -728,7 +728,7 @@ void hmcs40_cpu_device::execute_run()
op_alem(); break;
case 0x23c:
op_lat(); break;
-
+
case 0x240:
op_laspx(); break;
case 0x244:
@@ -804,8 +804,8 @@ void hmcs40_cpu_device::execute_run()
case 0x3f0: case 0x3f1: case 0x3f2: case 0x3f3: case 0x3f4: case 0x3f5: case 0x3f6: case 0x3f7:
case 0x3f8: case 0x3f9: case 0x3fa: case 0x3fb: case 0x3fc: case 0x3fd: case 0x3fe: case 0x3ff:
op_cal(); break;
-
-
+
+
default:
op_illegal(); break;
} /* big switch */
diff --git a/src/emu/cpu/hmcs40/hmcs40.h b/src/emu/cpu/hmcs40/hmcs40.h
index 6dd5166df87..a7e34173306 100644
--- a/src/emu/cpu/hmcs40/hmcs40.h
+++ b/src/emu/cpu/hmcs40/hmcs40.h
@@ -182,7 +182,7 @@ protected:
int m_eint_line; // which input_line caused an interrupt
emu_timer *m_timer;
int m_icount;
-
+
UINT16 m_pc; // Program Counter
UINT16 m_prev_pc;
UINT8 m_page; // LPU prepared page
@@ -213,7 +213,7 @@ protected:
// misc internal helpers
void increment_pc();
-
+
UINT8 ram_r();
void ram_w(UINT8 data);
void pop_stack();
diff --git a/src/emu/cpu/hmcs40/hmcs40d.c b/src/emu/cpu/hmcs40/hmcs40d.c
index e16fa8ed618..d01382e0b8d 100644
--- a/src/emu/cpu/hmcs40/hmcs40d.c
+++ b/src/emu/cpu/hmcs40/hmcs40d.c
@@ -3,7 +3,7 @@
/*
Hitachi HMCS40 MCU family disassembler
-
+
NOTE: start offset(basepc) is $3F, not 0
*/
@@ -92,42 +92,42 @@ static const UINT8 hmcs40_mnemonic[0x400] =
{
/* 0 1 2 3 4 5 6 7 8 9 A B C D E F */
/* 0x000 */
- mNOP, mXSP, mXSP, mXSP, mSEM, mSEM, mSEM, mSEM, mLAM, mLAM, mLAM, mLAM, m, m, m, m,
+ mNOP, mXSP, mXSP, mXSP, mSEM, mSEM, mSEM, mSEM, mLAM, mLAM, mLAM, mLAM, m, m, m, m,
mLMIIY,mLMIIY,mLMIIY,mLMIIY,mLMIIY,mLMIIY,mLMIIY,mLMIIY,mLMIIY,mLMIIY,mLMIIY,mLMIIY,mLMIIY,mLMIIY,mLMIIY,mLMIIY,
- mLBM, mLBM, mLBM, mLBM, mBLEM, m, m, m, m, m, m, m, m, m, m, m,
- mAMC, m, m, m, mAM, m, m, m, m, m, m, m, mLTA, m, m, m,
+ mLBM, mLBM, mLBM, mLBM, mBLEM, m, m, m, m, m, m, m, m, m, m, m,
+ mAMC, m, m, m, mAM, m, m, m, m, m, m, m, mLTA, m, m, m,
/* 0x040 */
mLXA, m, m, m, m, mDAS, mDAA, m, m, m, m, m, mREC, m, m, mSEC,
- mLYA, m, m, m, mIY, m, m, m, mAYY, m, m, m, m, m, m, m,
- mLBA, m, m, m, mIB, m, m, m, m, m, m, m, m, m, m, m,
+ mLYA, m, m, m, mIY, m, m, m, mAYY, m, m, m, m, m, m, m,
+ mLBA, m, m, m, mIB, m, m, m, m, m, m, m, m, m, m, m,
mLAI, mLAI, mLAI, mLAI, mLAI, mLAI, mLAI, mLAI, mLAI, mLAI, mLAI, mLAI, mLAI, mLAI, mLAI, mLAI,
/* 0x080 */
mAI, mAI, mAI, mAI, mAI, mAI, mAI, mAI, mAI, mAI, mAI, mAI, mAI, mAI, mAI, mAI,
- mSED, m, m, m, mTD, m, m, m, m, m, m, m, m, m, m, m,
- mSEIF1,mSECF, mSEIF0,m, mSEIE, mSETF, m, m, m, m, m, m, m, m, m, m,
- m, m, m, m, m, m, m, m, m, m, m, m, m, m, m, m,
+ mSED, m, m, m, mTD, m, m, m, m, m, m, m, m, m, m, m,
+ mSEIF1,mSECF, mSEIF0,m, mSEIE, mSETF, m, m, m, m, m, m, m, m, m, m,
+ m, m, m, m, m, m, m, m, m, m, m, m, m, m, m, m,
/* 0x0c0 */
- mLAR, mLAR, mLAR, mLAR, mLAR, mLAR, mLAR, mLAR, m, m, m, m, m, m, m, m,
+ mLAR, mLAR, mLAR, mLAR, mLAR, mLAR, mLAR, mLAR, m, m, m, m, m, m, m, m,
mSEDD, mSEDD, mSEDD, mSEDD, mSEDD, mSEDD, mSEDD, mSEDD, mSEDD, mSEDD, mSEDD, mSEDD, mSEDD, mSEDD, mSEDD, mSEDD,
- mLBR, mLBR, mLBR, mLBR, mLBR, mLBR, mLBR, mLBR, m, m, m, m, m, m, m, m,
+ mLBR, mLBR, mLBR, mLBR, mLBR, mLBR, mLBR, mLBR, m, m, m, m, m, m, m, m,
mXAMR, mXAMR, mXAMR, mXAMR, mXAMR, mXAMR, mXAMR, mXAMR, mXAMR, mXAMR, mXAMR, mXAMR, mXAMR, mXAMR, mXAMR, mXAMR,
/* 0 1 2 3 4 5 6 7 8 9 A B C D E F */
/* 0x100 */
- m, m, m, m, m, m, m, m, m, m, m, m, m, m, m, m,
- mLMAIY,mLMAIY,m, m, mLMADY,mLMADY,m, m, mLAY, m, m, m, m, m, m, m,
- mOR, m, m, m, mANEM, m, m, m, m, m, m, m, m, m, m, m,
- m, m, m, m, m, m, m, m, m, m, m, m, m, m, m, m,
+ m, m, m, m, m, m, m, m, m, m, m, m, m, m, m, m,
+ mLMAIY,mLMAIY,m, m, mLMADY,mLMADY,m, m, mLAY, m, m, m, m, m, m, m,
+ mOR, m, m, m, mANEM, m, m, m, m, m, m, m, m, m, m, m,
+ m, m, m, m, m, m, m, m, m, m, m, m, m, m, m, m,
/* 0x140 */
mLXI, mLXI, mLXI, mLXI, mLXI, mLXI, mLXI, mLXI, mLXI, mLXI, mLXI, mLXI, mLXI, mLXI, mLXI, mLXI,
mLYI, mLYI, mLYI, mLYI, mLYI, mLYI, mLYI, mLYI, mLYI, mLYI, mLYI, mLYI, mLYI, mLYI, mLYI, mLYI,
mLBI, mLBI, mLBI, mLBI, mLBI, mLBI, mLBI, mLBI, mLBI, mLBI, mLBI, mLBI, mLBI, mLBI, mLBI, mLBI,
mLTI, mLTI, mLTI, mLTI, mLTI, mLTI, mLTI, mLTI, mLTI, mLTI, mLTI, mLTI, mLTI, mLTI, mLTI, mLTI,
/* 0x180 */
- m, m, m, m, m, m, m, m, m, m, m, m, m, m, m, m,
- m, m, m, m, m, m, m, m, m, m, m, m, m, m, m, m,
- mTIF1, mTI1, mTIF0, mTI0, m, mTTF, m, m, m, m, m, m, m, m, m, m,
- m, m, m, m, m, m, m, m, m, m, m, m, m, m, m, m,
+ m, m, m, m, m, m, m, m, m, m, m, m, m, m, m, m,
+ m, m, m, m, m, m, m, m, m, m, m, m, m, m, m, m,
+ mTIF1, mTI1, mTIF0, mTI0, m, mTTF, m, m, m, m, m, m, m, m, m, m,
+ m, m, m, m, m, m, m, m, m, m, m, m, m, m, m, m,
/* 0x1c0 */
mBR, mBR, mBR, mBR, mBR, mBR, mBR, mBR, mBR, mBR, mBR, mBR, mBR, mBR, mBR, mBR,
mBR, mBR, mBR, mBR, mBR, mBR, mBR, mBR, mBR, mBR, mBR, mBR, mBR, mBR, mBR, mBR,
@@ -136,42 +136,42 @@ static const UINT8 hmcs40_mnemonic[0x400] =
/* 0 1 2 3 4 5 6 7 8 9 A B C D E F */
/* 0x200 */
- mTM, mTM, mTM, mTM, mREM, mREM, mREM, mREM, mXMA, mXMA, mXMA, mXMA, m, m, m, m,
+ mTM, mTM, mTM, mTM, mREM, mREM, mREM, mREM, mXMA, mXMA, mXMA, mXMA, m, m, m, m,
mMNEI, mMNEI, mMNEI, mMNEI, mMNEI, mMNEI, mMNEI, mMNEI, mMNEI, mMNEI, mMNEI, mMNEI, mMNEI, mMNEI, mMNEI, mMNEI,
- mXMB, mXMB, mXMB, mXMB, mROTR, mROTL, m, m, m, m, m, m, m, m, m, m,
- mSMC, m, m, m, mALEM, m, m, m, m, m, m, m, mLAT, m, m, m,
+ mXMB, mXMB, mXMB, mXMB, mROTR, mROTL, m, m, m, m, m, m, m, m, m, m,
+ mSMC, m, m, m, mALEM, m, m, m, m, m, m, m, mLAT, m, m, m,
/* 0x240 */
mLASPX,m, m, m, mNEGA, m, m, m, m, m, m, m, m, m, m, mTC,
- mLASPY,m, m, m, mDY, m, m, m, mSYY, m, m, m, m, m, m, m,
- mLAB, m, m, m, m, m, m, mDB, m, m, m, m, m, m, m, m,
+ mLASPY,m, m, m, mDY, m, m, m, mSYY, m, m, m, m, m, m, m,
+ mLAB, m, m, m, m, m, m, mDB, m, m, m, m, m, m, m, m,
mALEI, mALEI, mALEI, mALEI, mALEI, mALEI, mALEI, mALEI, mALEI, mALEI, mALEI, mALEI, mALEI, mALEI, mALEI, mALEI,
/* 0x280 */
mYNEI, mYNEI, mYNEI, mYNEI, mYNEI, mYNEI, mYNEI, mYNEI, mYNEI, mYNEI, mYNEI, mYNEI, mYNEI, mYNEI, mYNEI, mYNEI,
- mRED, m, m, m, m, m, m, m, m, m, m, m, m, m, m, m,
- mREIF1,mRECF, mREIF0,m, mREIE, mRETF, m, m, m, m, m, m, m, m, m, m,
- m, m, m, m, m, m, m, m, m, m, m, m, m, m, m, m,
+ mRED, m, m, m, m, m, m, m, m, m, m, m, m, m, m, m,
+ mREIF1,mRECF, mREIF0,m, mREIE, mRETF, m, m, m, m, m, m, m, m, m, m,
+ m, m, m, m, m, m, m, m, m, m, m, m, m, m, m, m,
/* 0x2c0 */
- mLRA, mLRA, mLRA, mLRA, mLRA, mLRA, mLRA, mLRA, m, m, m, m, m, m, m, m,
+ mLRA, mLRA, mLRA, mLRA, mLRA, mLRA, mLRA, mLRA, m, m, m, m, m, m, m, m,
mREDD, mREDD, mREDD, mREDD, mREDD, mREDD, mREDD, mREDD, mREDD, mREDD, mREDD, mREDD, mREDD, mREDD, mREDD, mREDD,
- mLRB, mLRB, mLRB, mLRB, mLRB, mLRB, mLRB, mLRB, m, m, m, m, m, m, m, m,
- m, m, m, m, m, m, m, m, m, m, m, m, m, m, m, m,
+ mLRB, mLRB, mLRB, mLRB, mLRB, mLRB, mLRB, mLRB, m, m, m, m, m, m, m, m,
+ m, m, m, m, m, m, m, m, m, m, m, m, m, m, m, m,
/* 0 1 2 3 4 5 6 7 8 9 A B C D E F */
/* 0x300 */
- m, m, m, m, m, m, m, m, m, m, m, m, m, m, m, m,
- m, m, m, m, m, m, m, m, m, m, m, m, m, m, m, m,
- mCOMB, m, m, m, mBNEM, m, m, m, m, m, m, m, m, m, m, m,
- m, m, m, m, m, m, m, m, m, m, m, m, m, m, m, m,
+ m, m, m, m, m, m, m, m, m, m, m, m, m, m, m, m,
+ m, m, m, m, m, m, m, m, m, m, m, m, m, m, m, m,
+ mCOMB, m, m, m, mBNEM, m, m, m, m, m, m, m, m, m, m, m,
+ m, m, m, m, m, m, m, m, m, m, m, m, m, m, m, m,
/* 0x340 */
mLPU, mLPU, mLPU, mLPU, mLPU, mLPU, mLPU, mLPU, mLPU, mLPU, mLPU, mLPU, mLPU, mLPU, mLPU, mLPU,
mLPU, mLPU, mLPU, mLPU, mLPU, mLPU, mLPU, mLPU, mLPU, mLPU, mLPU, mLPU, mLPU, mLPU, mLPU, mLPU,
mTBR, mTBR, mTBR, mTBR, mTBR, mTBR, mTBR, mTBR, mP, mP, mP, mP, mP, mP, mP, mP,
- m, m, m, m, m, m, m, m, m, m, m, m, m, m, m, m,
+ m, m, m, m, m, m, m, m, m, m, m, m, m, m, m, m,
/* 0x380 */
- m, m, m, m, m, m, m, m, m, m, m, m, m, m, m, m,
- m, m, m, m, m, m, m, m, m, m, m, m, m, m, m, m,
- m, m, m, m, mRTNI, m, m, mRTN, m, m, m, m, m, m, m, m,
- m, m, m, m, m, m, m, m, m, m, m, m, m, m, m, m,
+ m, m, m, m, m, m, m, m, m, m, m, m, m, m, m, m,
+ m, m, m, m, m, m, m, m, m, m, m, m, m, m, m, m,
+ m, m, m, m, mRTNI, m, m, mRTN, m, m, m, m, m, m, m, m,
+ m, m, m, m, m, m, m, m, m, m, m, m, m, m, m, m,
/* 0x3c0 */
mCAL, mCAL, mCAL, mCAL, mCAL, mCAL, mCAL, mCAL, mCAL, mCAL, mCAL, mCAL, mCAL, mCAL, mCAL, mCAL,
mCAL, mCAL, mCAL, mCAL, mCAL, mCAL, mCAL, mCAL, mCAL, mCAL, mCAL, mCAL, mCAL, mCAL, mCAL, mCAL,
@@ -188,7 +188,7 @@ CPU_DISASSEMBLE(hmcs40)
char *dst = buffer;
UINT8 instr = hmcs40_mnemonic[op];
INT8 bits = s_bits[instr];
-
+
// special case for (XY) opcode
if (bits == 99)
{
@@ -202,12 +202,12 @@ CPU_DISASSEMBLE(hmcs40)
else
{
dst += sprintf(dst, "%-6s ", s_mnemonics[instr]);
-
+
// opcode parameter
if (bits != 0)
{
UINT8 param = op;
-
+
// reverse bits
if (bits < 0)
{
@@ -215,16 +215,16 @@ CPU_DISASSEMBLE(hmcs40)
param >>= (8 + bits);
bits = -bits;
}
-
+
param &= ((1 << bits) - 1);
-
+
if (bits > 5)
dst += sprintf(dst, "$%02X", param);
else
dst += sprintf(dst, "%d", param);
}
}
-
+
int pos = s_next_pc[pc & 0x3f] & DASMFLAG_LENGTHMASK;
return pos | s_flags[instr] | DASMFLAG_SUPPORTED;
}
diff --git a/src/emu/cpu/hmcs40/hmcs40op.inc b/src/emu/cpu/hmcs40/hmcs40op.inc
index 9732d86f53f..1887c3c0105 100644
--- a/src/emu/cpu/hmcs40/hmcs40op.inc
+++ b/src/emu/cpu/hmcs40/hmcs40op.inc
@@ -73,19 +73,19 @@ void hmcs40_cpu_device::op_laspy()
void hmcs40_cpu_device::op_xamr()
{
// XAMR m: Exchange A and MR(m)
-
+
// determine MR(Memory Register) location
UINT8 address = m_op & 0xf;
-
+
// HMCS42: MR0 on file 0, MR4-MR15 on file 4 (there is no file 1-3)
// HMCS43: MR0-MR3 on file 0-3, MR4-MR15 on file 4
if (m_family == FAMILY_HMCS42 || m_family == FAMILY_HMCS43)
address |= (address < 4) ? (address << 4) : 0x40;
-
+
// HMCS44/45/46/47: all on last file
else
address |= 0xf0;
-
+
address &= m_datamask;
UINT8 old_a = m_a;
m_a = m_data->read_byte(address) & 0xf;
@@ -657,7 +657,7 @@ void hmcs40_cpu_device::op_p()
m_icount--;
UINT16 address = m_a | m_b << 4 | m_c << 8 | (m_op & 7) << 9 | (m_pc & ~0x3f);
UINT16 o = m_program->read_word((address & m_prgmask) << 1);
-
+
// destination is determined by the 2 highest bits
if (o & 0x100)
{
diff --git a/src/emu/cpu/i386/i386ops.h b/src/emu/cpu/i386/i386ops.h
index c540a7d3c16..31f6b349721 100644
--- a/src/emu/cpu/i386/i386ops.h
+++ b/src/emu/cpu/i386/i386ops.h
@@ -333,7 +333,7 @@ const i386_device::X86_OPCODE i386_device::s_x86_opcode_table[] =
{ 0x3B, OP_2BYTE|OP_CYRIX, &i386_device::i386_cyrix_special, &i386_device::i386_cyrix_special, false},
{ 0x3C, OP_2BYTE|OP_CYRIX, &i386_device::i386_cyrix_special, &i386_device::i386_cyrix_special, false},
{ 0x3D, OP_2BYTE|OP_CYRIX, &i386_device::i386_cyrix_special, &i386_device::i386_cyrix_special, false},
- { 0x40, OP_2BYTE|OP_PENTIUM, &i386_device::pentium_cmovo_r16_rm16, &i386_device::pentium_cmovo_r32_rm32, false},
+ { 0x40, OP_2BYTE|OP_PENTIUM, &i386_device::pentium_cmovo_r16_rm16, &i386_device::pentium_cmovo_r32_rm32, false},
{ 0x41, OP_2BYTE|OP_PENTIUM, &i386_device::pentium_cmovno_r16_rm16, &i386_device::pentium_cmovno_r32_rm32, false},
{ 0x42, OP_2BYTE|OP_PENTIUM, &i386_device::pentium_cmovb_r16_rm16, &i386_device::pentium_cmovb_r32_rm32, false},
{ 0x43, OP_2BYTE|OP_PENTIUM, &i386_device::pentium_cmovae_r16_rm16, &i386_device::pentium_cmovae_r32_rm32, false},
diff --git a/src/emu/cpu/i386/pentops.inc b/src/emu/cpu/i386/pentops.inc
index c7a341d9ba7..f1b64aafb42 100644
--- a/src/emu/cpu/i386/pentops.inc
+++ b/src/emu/cpu/i386/pentops.inc
@@ -1065,10 +1065,10 @@ void i386_device::pentium_movnti_m32_r32() // Opcode 0f c3
void i386_device::i386_cyrix_special() // Opcode 0x0f 3a-3d
{
/*
-0f 3a BB0_RESET (set BB0 pointer = base)
-0f 3b BB1_RESET (set BB1 pointer = base)
-0f 3c CPU_WRITE (write special CPU memory-mapped register, [ebx] = eax)
-0f 3d CPU_READ (read special CPU memory-mapped register, eax, = [ebx])
+0f 3a BB0_RESET (set BB0 pointer = base)
+0f 3b BB1_RESET (set BB1 pointer = base)
+0f 3c CPU_WRITE (write special CPU memory-mapped register, [ebx] = eax)
+0f 3d CPU_READ (read special CPU memory-mapped register, eax, = [ebx])
*/
CYCLES(1);
diff --git a/src/emu/cpu/nec/v53.c b/src/emu/cpu/nec/v53.c
index 0019f5bd959..a99d3bad960 100644
--- a/src/emu/cpu/nec/v53.c
+++ b/src/emu/cpu/nec/v53.c
@@ -237,9 +237,8 @@ void v53_base_device::install_peripheral_io()
if (m_SCTL & 0x02) // uPD71037 mode
{
- if (IOAG) // 8-bit
+ if (IOAG) // 8-bit
{
-
}
else
{
@@ -256,9 +255,8 @@ void v53_base_device::install_peripheral_io()
UINT16 base = (m_OPHA << 8) | m_IULA;
base &= 0xfffe;
- if (IOAG) // 8-bit
+ if (IOAG) // 8-bit
{
-
}
else
{
@@ -272,9 +270,8 @@ void v53_base_device::install_peripheral_io()
//printf("installing TCU to %04x\n", base);
base &= 0xfffe;
- if (IOAG) // 8-bit
+ if (IOAG) // 8-bit
{
-
}
else
{
@@ -290,9 +287,8 @@ void v53_base_device::install_peripheral_io()
UINT16 base = (m_OPHA << 8) | m_SULA;
base &= 0xfffe;
- if (IOAG) // 8-bit
+ if (IOAG) // 8-bit
{
-
}
else
{
@@ -333,9 +329,9 @@ WRITE8_MEMBER(v53_base_device::tmu_tct2_w) { m_v53tcu->write(space, 2, data); }
WRITE8_MEMBER(v53_base_device::tmu_tmd_w) { m_v53tcu->write(space, 3, data); }
-READ8_MEMBER(v53_base_device::tmu_tst0_r) { return m_v53tcu->read(space, 0); }
-READ8_MEMBER(v53_base_device::tmu_tst1_r) { return m_v53tcu->read(space, 1); }
-READ8_MEMBER(v53_base_device::tmu_tst2_r) { return m_v53tcu->read(space, 2); }
+READ8_MEMBER(v53_base_device::tmu_tst0_r) { return m_v53tcu->read(space, 0); }
+READ8_MEMBER(v53_base_device::tmu_tst1_r) { return m_v53tcu->read(space, 1); }
+READ8_MEMBER(v53_base_device::tmu_tst2_r) { return m_v53tcu->read(space, 2); }
@@ -343,7 +339,7 @@ READ8_MEMBER(v53_base_device::tmu_tst2_r) { return m_v53tcu->read(space, 2); }
/*** DMA ***/
-// could be wrong / nonexistent
+// could be wrong / nonexistent
WRITE_LINE_MEMBER(v53_base_device::dreq0_w)
{
if (!(m_SCTL & 0x02))
@@ -409,20 +405,20 @@ WRITE_LINE_MEMBER(v53_base_device::hack_w)
static ADDRESS_MAP_START( v53_internal_port_map, AS_IO, 16, v53_base_device )
AM_RANGE(0xffe0, 0xffe1) AM_WRITE8( BSEL_w, 0x00ff) // 0xffe0 // uPD71037 DMA mode bank selection register
AM_RANGE(0xffe0, 0xffe1) AM_WRITE8( BADR_w, 0xff00) // 0xffe1 // uPD71037 DMA mode bank register peripheral mapping (also uses OPHA)
-// AM_RANGE(0xffe2, 0xffe3) // (reserved , 0x00ff) // 0xffe2
-// AM_RANGE(0xffe2, 0xffe3) // (reserved , 0xff00) // 0xffe3
-// AM_RANGE(0xffe4, 0xffe5) // (reserved , 0x00ff) // 0xffe4
-// AM_RANGE(0xffe4, 0xffe5) // (reserved , 0xff00) // 0xffe5
-// AM_RANGE(0xffe6, 0xffe7) // (reserved , 0x00ff) // 0xffe6
-// AM_RANGE(0xffe6, 0xffe7) // (reserved , 0xff00) // 0xffe7
-// AM_RANGE(0xffe8, 0xffe9) // (reserved , 0x00ff) // 0xffe8
+// AM_RANGE(0xffe2, 0xffe3) // (reserved , 0x00ff) // 0xffe2
+// AM_RANGE(0xffe2, 0xffe3) // (reserved , 0xff00) // 0xffe3
+// AM_RANGE(0xffe4, 0xffe5) // (reserved , 0x00ff) // 0xffe4
+// AM_RANGE(0xffe4, 0xffe5) // (reserved , 0xff00) // 0xffe5
+// AM_RANGE(0xffe6, 0xffe7) // (reserved , 0x00ff) // 0xffe6
+// AM_RANGE(0xffe6, 0xffe7) // (reserved , 0xff00) // 0xffe7
+// AM_RANGE(0xffe8, 0xffe9) // (reserved , 0x00ff) // 0xffe8
AM_RANGE(0xffe8, 0xffe9) AM_WRITE8( BRC_w , 0xff00) // 0xffe9 // baud rate counter (used for serial peripheral)
AM_RANGE(0xffea, 0xffeb) AM_WRITE8( WMB0_w, 0x00ff) // 0xffea // waitstate control
AM_RANGE(0xffea, 0xffeb) AM_WRITE8( WCY1_w, 0xff00) // 0xffeb // waitstate control
AM_RANGE(0xffec, 0xffed) AM_WRITE8( WCY0_w, 0x00ff) // 0xffec // waitstate control
AM_RANGE(0xffec, 0xffed) AM_WRITE8( WAC_w, 0xff00) // 0xffed // waitstate control
-// AM_RANGE(0xffee, 0xffef) // (reserved , 0x00ff) // 0xffee
-// AM_RANGE(0xffee, 0xffef) // (reserved , 0xff00) // 0xffef
+// AM_RANGE(0xffee, 0xffef) // (reserved , 0x00ff) // 0xffee
+// AM_RANGE(0xffee, 0xffef) // (reserved , 0xff00) // 0xffef
AM_RANGE(0xfff0, 0xfff1) AM_WRITE8( TCKS_w, 0x00ff) // 0xfff0 // timer clocks
AM_RANGE(0xfff0, 0xfff1) AM_WRITE8( SBCR_w, 0xff00) // 0xfff1 // internal clock divider, halt behavior etc.
AM_RANGE(0xfff2, 0xfff3) AM_WRITE8( REFC_w, 0x00ff) // 0xfff2 // ram refresh control
@@ -430,7 +426,7 @@ static ADDRESS_MAP_START( v53_internal_port_map, AS_IO, 16, v53_base_device )
AM_RANGE(0xfff4, 0xfff5) AM_WRITE8( WCY2_w, 0x00ff) // 0xfff4 // waitstate control
AM_RANGE(0xfff4, 0xfff5) AM_WRITE8( WCY3_w, 0xff00) // 0xfff5 // waitstate control
AM_RANGE(0xfff6, 0xfff7) AM_WRITE8( WCY4_w, 0x00ff) // 0xfff6 // waitstate control
-// AM_RANGE(0xfff6, 0xfff7) // (reserved , 0xff00) // 0xfff7
+// AM_RANGE(0xfff6, 0xfff7) // (reserved , 0xff00) // 0xfff7
AM_RANGE(0xfff8, 0xfff9) AM_WRITE8( SULA_w, 0x00ff) // 0xfff8 // peripheral mapping
AM_RANGE(0xfff8, 0xfff9) AM_WRITE8( TULA_w, 0xff00) // 0xfff9 // peripheral mapping
AM_RANGE(0xfffa, 0xfffb) AM_WRITE8( IULA_w, 0x00ff) // 0xfffa // peripheral mapping
@@ -438,7 +434,7 @@ static ADDRESS_MAP_START( v53_internal_port_map, AS_IO, 16, v53_base_device )
AM_RANGE(0xfffc, 0xfffd) AM_WRITE8( OPHA_w, 0x00ff) // 0xfffc // peripheral mapping (upper bits, common)
AM_RANGE(0xfffc, 0xfffd) AM_WRITE8( OPSEL_w, 0xff00) // 0xfffd // peripheral enabling
AM_RANGE(0xfffe, 0xffff) AM_WRITE8( SCTL_w, 0x00ff) // 0xfffe // peripheral configuration (& byte / word mapping)
-// AM_RANGE(0xfffe, 0xffff) // (reserved , 0xff00) // 0xffff
+// AM_RANGE(0xfffe, 0xffff) // (reserved , 0xff00) // 0xffff
ADDRESS_MAP_END
@@ -486,7 +482,7 @@ static MACHINE_CONFIG_FRAGMENT( v53 )
MCFG_PIT8253_OUT0_HANDLER(WRITELINE( v53_base_device, tcu_out0_trampoline_cb ))
MCFG_PIT8253_OUT1_HANDLER(WRITELINE( v53_base_device, tcu_out1_trampoline_cb ))
MCFG_PIT8253_OUT2_HANDLER(WRITELINE( v53_base_device, tcu_out2_trampoline_cb ))
-
+
MCFG_DEVICE_ADD("upd71071dma", V53_DMAU, 4000000)
MCFG_AM9517A_OUT_HREQ_CB(WRITELINE(v53_base_device, hreq_trampoline_cb))
@@ -506,12 +502,12 @@ static MACHINE_CONFIG_FRAGMENT( v53 )
MCFG_AM9517A_OUT_DACK_2_CB(WRITELINE(v53_base_device, dma_dack2_trampoline_w))
MCFG_AM9517A_OUT_DACK_3_CB(WRITELINE(v53_base_device, dma_dack3_trampoline_w))
-
+
MCFG_PIC8259_ADD( "upd71059pic", WRITELINE(v53_base_device, internal_irq_w), VCC, READ8(v53_base_device,get_pic_ack))
- MCFG_DEVICE_ADD("v53scu", V53_SCU, 0)
+ MCFG_DEVICE_ADD("v53scu", V53_SCU, 0)
MCFG_I8251_TXD_HANDLER(WRITELINE(v53_base_device, scu_txd_trampoline_cb))
MCFG_I8251_DTR_HANDLER(WRITELINE(v53_base_device, scu_dtr_trampoline_cb))
MCFG_I8251_RTS_HANDLER(WRITELINE(v53_base_device, scu_rts_trampoline_cb))
@@ -578,4 +574,3 @@ v53a_device::v53a_device(const machine_config &mconfig, const char *tag, device_
: v53_base_device(mconfig, V53A, "V53A", tag, owner, clock, "v53a", BYTE_XOR_LE(0), 6, 1, V33_TYPE)
{
}
-
diff --git a/src/emu/cpu/nec/v53.h b/src/emu/cpu/nec/v53.h
index dbaa7778773..05611e5503f 100644
--- a/src/emu/cpu/nec/v53.h
+++ b/src/emu/cpu/nec/v53.h
@@ -131,7 +131,7 @@ public:
UINT8 m_SCTL;
UINT8 m_OPSEL;
-
+
UINT8 m_SULA;
UINT8 m_TULA;
UINT8 m_IULA;
@@ -151,10 +151,10 @@ public:
template<class _Object> static devcb_base &set_syndet_handler(device_t &device, _Object object) { return downcast<v53_base_device &>(device).m_syndet_handler.set_callback(object); }
DECLARE_WRITE_LINE_MEMBER(scu_txd_trampoline_cb) { m_txd_handler(state); }
DECLARE_WRITE_LINE_MEMBER(scu_dtr_trampoline_cb) { m_dtr_handler(state); }
- DECLARE_WRITE_LINE_MEMBER(scu_rts_trampoline_cb) { m_rts_handler(state); }
+ DECLARE_WRITE_LINE_MEMBER(scu_rts_trampoline_cb) { m_rts_handler(state); }
DECLARE_WRITE_LINE_MEMBER(scu_rxrdy_trampoline_cb) { m_rxrdy_handler(state); } /* should we mask this here based on m_simk? it can mask the interrupt */
DECLARE_WRITE_LINE_MEMBER(scu_txrdy_trampoline_cb) { m_txrdy_handler(state); } /* should we mask this here based on m_simk? it can mask the interrupt */
- DECLARE_WRITE_LINE_MEMBER(scu_txempty_trampoline_cb) { m_txempty_handler(state); }
+ DECLARE_WRITE_LINE_MEMBER(scu_txempty_trampoline_cb) { m_txempty_handler(state); }
DECLARE_WRITE_LINE_MEMBER(scu_syndet_trampoline_cb) { m_syndet_handler(state); }
// TCU
@@ -165,9 +165,9 @@ public:
DECLARE_READ8_MEMBER(tmu_tst2_r);
DECLARE_WRITE8_MEMBER(tmu_tct2_w);
DECLARE_WRITE8_MEMBER(tmu_tmd_w);
-// static void set_clk0(device_t &device, double clk0) { downcast<v53_base_device &>(device).m_clk0 = clk0; }
-// static void set_clk1(device_t &device, double clk1) { downcast<v53_base_device &>(device).m_clk1 = clk1; }
-// static void set_clk2(device_t &device, double clk2) { downcast<v53_base_device &>(device).m_clk2 = clk2; }
+// static void set_clk0(device_t &device, double clk0) { downcast<v53_base_device &>(device).m_clk0 = clk0; }
+// static void set_clk1(device_t &device, double clk1) { downcast<v53_base_device &>(device).m_clk1 = clk1; }
+// static void set_clk2(device_t &device, double clk2) { downcast<v53_base_device &>(device).m_clk2 = clk2; }
template<class _Object> static devcb_base &set_out0_handler(device_t &device, _Object object) { return downcast<v53_base_device &>(device).m_out0_handler.set_callback(object); }
template<class _Object> static devcb_base &set_out1_handler(device_t &device, _Object object) { return downcast<v53_base_device &>(device).m_out1_handler.set_callback(object); }
template<class _Object> static devcb_base &set_out2_handler(device_t &device, _Object object) { return downcast<v53_base_device &>(device).m_out2_handler.set_callback(object); }
@@ -195,7 +195,7 @@ public:
DECLARE_WRITE_LINE_MEMBER(hreq_trampoline_cb) { m_out_hreq_cb(state); }
DECLARE_WRITE_LINE_MEMBER(eop_trampoline_cb) { m_out_eop_cb(state); }
DECLARE_READ8_MEMBER(dma_memr_trampoline_r) { return m_in_memr_cb(space, offset); }
- DECLARE_WRITE8_MEMBER(dma_memw_trampoline_w) { m_out_memw_cb(space, offset, data); }
+ DECLARE_WRITE8_MEMBER(dma_memw_trampoline_w) { m_out_memw_cb(space, offset, data); }
DECLARE_READ8_MEMBER(dma_io_0_trampoline_r) { return m_in_ior_0_cb(space, offset); }
DECLARE_READ8_MEMBER(dma_io_1_trampoline_r) { return m_in_ior_1_cb(space, offset); }
DECLARE_READ8_MEMBER(dma_io_2_trampoline_r) { return m_in_ior_2_cb(space, offset); }
@@ -204,10 +204,10 @@ public:
DECLARE_WRITE8_MEMBER(dma_io_1_trampoline_w) { m_out_iow_1_cb(space, offset, data); }
DECLARE_WRITE8_MEMBER(dma_io_2_trampoline_w) { m_out_iow_2_cb(space, offset, data); }
DECLARE_WRITE8_MEMBER(dma_io_3_trampoline_w) { m_out_iow_3_cb(space, offset, data); }
- DECLARE_WRITE_LINE_MEMBER(dma_dack0_trampoline_w) { m_out_dack_0_cb(state); }
- DECLARE_WRITE_LINE_MEMBER(dma_dack1_trampoline_w) { m_out_dack_1_cb(state); }
- DECLARE_WRITE_LINE_MEMBER(dma_dack2_trampoline_w) { m_out_dack_2_cb(state); }
- DECLARE_WRITE_LINE_MEMBER(dma_dack3_trampoline_w) { m_out_dack_3_cb(state); }
+ DECLARE_WRITE_LINE_MEMBER(dma_dack0_trampoline_w) { m_out_dack_0_cb(state); }
+ DECLARE_WRITE_LINE_MEMBER(dma_dack1_trampoline_w) { m_out_dack_1_cb(state); }
+ DECLARE_WRITE_LINE_MEMBER(dma_dack2_trampoline_w) { m_out_dack_2_cb(state); }
+ DECLARE_WRITE_LINE_MEMBER(dma_dack3_trampoline_w) { m_out_dack_3_cb(state); }
DECLARE_WRITE_LINE_MEMBER(dreq0_w);
@@ -221,7 +221,7 @@ public:
void install_peripheral_io();
const address_space_config m_io_space_config;
-
+
const address_space_config *memory_space_config(address_spacenum spacenum) const
{
switch (spacenum)
@@ -260,9 +260,9 @@ protected:
devcb_write_line m_syndet_handler;
// TCU
-// double m_clk0;
-// double m_clk1;
-// double m_clk2;
+// double m_clk0;
+// double m_clk1;
+// double m_clk2;
devcb_write_line m_out0_handler;
devcb_write_line m_out1_handler;
devcb_write_line m_out2_handler;
@@ -285,7 +285,7 @@ protected:
devcb_write_line m_out_dack_1_cb;
devcb_write_line m_out_dack_2_cb;
devcb_write_line m_out_dack_3_cb;
-
+
};
diff --git a/src/emu/cpu/pic16c5x/pic16c5x.c b/src/emu/cpu/pic16c5x/pic16c5x.c
index 6820bad7c74..c39324a0a69 100644
--- a/src/emu/cpu/pic16c5x/pic16c5x.c
+++ b/src/emu/cpu/pic16c5x/pic16c5x.c
@@ -799,7 +799,7 @@ void pic16c5x_device::device_start()
m_program = &space(AS_PROGRAM);
m_direct = &m_program->direct();
m_data = &space(AS_DATA);
-
+
m_read_a.resolve_safe(0);
m_read_b.resolve_safe(0);
m_read_c.resolve_safe(0);
diff --git a/src/emu/cpu/pic16c5x/pic16c5x.h b/src/emu/cpu/pic16c5x/pic16c5x.h
index 92a62d3f207..779d7a12a5d 100644
--- a/src/emu/cpu/pic16c5x/pic16c5x.h
+++ b/src/emu/cpu/pic16c5x/pic16c5x.h
@@ -81,7 +81,7 @@ public:
* the value if known (available in HEX dumps of the ROM).
*/
void pic16c5x_set_config(UINT16 data);
-
+
// or with a macro
static void set_config_static(device_t &device, UINT16 data) { downcast<pic16c5x_device &>(device).m_temp_config = data; }
@@ -155,7 +155,7 @@ private:
address_space *m_program;
direct_read_data *m_direct;
address_space *m_data;
-
+
// i/o handlers
devcb_read8 m_read_a;
devcb_read8 m_read_b;
diff --git a/src/emu/cpu/z80/kl5c80a12.c b/src/emu/cpu/z80/kl5c80a12.c
index 4be701168f3..ddf40bd8612 100644
--- a/src/emu/cpu/z80/kl5c80a12.c
+++ b/src/emu/cpu/z80/kl5c80a12.c
@@ -1,13 +1,13 @@
/***************************************************************************
- Kawasaki LSI
- KL5C80A12 CPU (KL5C80A12CFP on hng64.c)
+ Kawasaki LSI
+ KL5C80A12 CPU (KL5C80A12CFP on hng64.c)
- Binary compatible with Z80, significantly faster opcode timings, operating at up to 10Mhz
- Timers / Counters, Parrallel / Serial ports/ MMU, Interrupt Controller
+ Binary compatible with Z80, significantly faster opcode timings, operating at up to 10Mhz
+ Timers / Counters, Parrallel / Serial ports/ MMU, Interrupt Controller
- (is this different enough to need it's own core?)
- (todo: everything, some code currently lives in machine/hng64_net.c but not much)
+ (is this different enough to need it's own core?)
+ (todo: everything, some code currently lives in machine/hng64_net.c but not much)
***************************************************************************/
diff --git a/src/emu/cpu/z80/kl5c80a12.h b/src/emu/cpu/z80/kl5c80a12.h
index 14fa9cc86dc..6f6683ecb59 100644
--- a/src/emu/cpu/z80/kl5c80a12.h
+++ b/src/emu/cpu/z80/kl5c80a12.h
@@ -1,13 +1,13 @@
/***************************************************************************
- Kawasaki LSI
- KL5C80A12 CPU (KL5C80A12CFP on hng64.c)
+ Kawasaki LSI
+ KL5C80A12 CPU (KL5C80A12CFP on hng64.c)
- Binary compatible with Z80, significantly faster opcode timings, operating at up to 10Mhz
- Timers / Counters, Parrallel / Serial ports/ MMU, Interrupt Controller
+ Binary compatible with Z80, significantly faster opcode timings, operating at up to 10Mhz
+ Timers / Counters, Parrallel / Serial ports/ MMU, Interrupt Controller
- (is this different enough to need it's own core?)
- (todo: everything, some code currently lives in machine/hng64_net.c but not much)
+ (is this different enough to need it's own core?)
+ (todo: everything, some code currently lives in machine/hng64_net.c but not much)
***************************************************************************/
diff --git a/src/emu/machine/am9517a.c b/src/emu/machine/am9517a.c
index 0104ff077d6..15dafeb0362 100644
--- a/src/emu/machine/am9517a.c
+++ b/src/emu/machine/am9517a.c
@@ -3,15 +3,15 @@
/***************************************************************************
AMD AM9517A
- Intel 8237A
- NEC uPD71037
+ Intel 8237A
+ NEC uPD71037
- NEC uPD71071 (extended version of above)
+ NEC uPD71071 (extended version of above)
- a variant is used in the V53 CPU which offers subsets of both the
- uPD71071 and uPD71037 functionality depending on a mode bit.
-
- Multimode DMA Controller emulation
+ a variant is used in the V53 CPU which offers subsets of both the
+ uPD71071 and uPD71037 functionality depending on a mode bit.
+
+ Multimode DMA Controller emulation
Copyright the MESS Team.
Visit http://mamedev.org for licensing and usage restrictions.
@@ -28,17 +28,17 @@
/*
- When the V53 operates in uPD71071 compatible mode there are the following
- differences from a real uPD71071
+ When the V53 operates in uPD71071 compatible mode there are the following
+ differences from a real uPD71071
- V53 Real uPD71071
- Software Reqs No Yes
- Memory-to-Memory DMA No Yes
- DMARQ active level High programmable
- DMAAK active level Low programmable
- Bus Cycle 4 4 or 3
+ V53 Real uPD71071
+ Software Reqs No Yes
+ Memory-to-Memory DMA No Yes
+ DMARQ active level High programmable
+ DMAAK active level Low programmable
+ Bus Cycle 4 4 or 3
- we don't currently handle the differences
+ we don't currently handle the differences
*/
@@ -1158,7 +1158,7 @@ READ8_MEMBER(upd71071_v53_device::read)
ret = m_command & 0xff;
break;
case 0x09: // Device control (high) // UPD71071 only?
- ret = m_command_high & 0xff;
+ ret = m_command_high & 0xff;
break;
case 0x0b: // Status
ret = m_status;
@@ -1187,14 +1187,14 @@ READ8_MEMBER(upd71071_v53_device::read)
WRITE8_MEMBER(upd71071_v53_device::write)
{
int channel = m_selected_channel;
-
+
switch (offset)
{
case 0x00: // Initialise
// TODO: reset (bit 0)
//m_buswidth = data & 0x02;
//if (data & 0x01)
- // soft_reset();
+ // soft_reset();
logerror("DMA: Initialise [%02x]\n", data);
break;
case 0x01: // Channel
@@ -1279,4 +1279,4 @@ WRITE8_MEMBER(upd71071_v53_device::write)
}
trigger(1);
-} \ No newline at end of file
+}
diff --git a/src/emu/machine/am9517a.h b/src/emu/machine/am9517a.h
index 3a0eb2a6432..3ba47c35f96 100644
--- a/src/emu/machine/am9517a.h
+++ b/src/emu/machine/am9517a.h
@@ -172,7 +172,7 @@ protected:
virtual void device_start();
virtual void device_reset();
- int m_selected_channel;
+ int m_selected_channel;
int m_base;
UINT8 m_command_high;
diff --git a/src/emu/machine/i8251.c b/src/emu/machine/i8251.c
index 59da201a4d5..622605453ca 100644
--- a/src/emu/machine/i8251.c
+++ b/src/emu/machine/i8251.c
@@ -3,10 +3,10 @@
i8251.c
Intel 8251 Universal Synchronous/Asynchronous Receiver Transmitter code
- NEC uPD71051 is a clone
+ NEC uPD71051 is a clone
- The V53/V53A use a customized version with only the Asynchronous mode
- and a split command / mode register
+ The V53/V53A use a customized version with only the Asynchronous mode
+ and a split command / mode register
@@ -428,29 +428,29 @@ WRITE8_MEMBER(i8251_device::command_w)
/* bit 7:
- 0 = normal operation
- 1 = hunt mode
- bit 6:
- 0 = normal operation
- 1 = internal reset
- bit 5:
- 0 = /RTS set to 1
- 1 = /RTS set to 0
- bit 4:
- 0 = normal operation
- 1 = reset error flag
- bit 3:
- 0 = normal operation
- 1 = send break character
- bit 2:
- 0 = receive disable
- 1 = receive enable
- bit 1:
- 0 = /DTR set to 1
- 1 = /DTR set to 0
- bit 0:
- 0 = transmit disable
- 1 = transmit enable
+ 0 = normal operation
+ 1 = hunt mode
+ bit 6:
+ 0 = normal operation
+ 1 = internal reset
+ bit 5:
+ 0 = /RTS set to 1
+ 1 = /RTS set to 0
+ bit 4:
+ 0 = normal operation
+ 1 = reset error flag
+ bit 3:
+ 0 = normal operation
+ 1 = send break character
+ bit 2:
+ 0 = receive disable
+ 1 = receive enable
+ bit 1:
+ 0 = /DTR set to 1
+ 1 = /DTR set to 0
+ bit 0:
+ 0 = transmit disable
+ 1 = transmit enable
*/
m_rts_handler(!BIT(data, 5));
@@ -484,28 +484,28 @@ WRITE8_MEMBER(i8251_device::mode_w)
{
/* Asynchronous
- bit 7,6: stop bit length
- 0 = inhibit
- 1 = 1 bit
- 2 = 1.5 bits
- 3 = 2 bits
- bit 5: parity type
- 0 = parity odd
- 1 = parity even
- bit 4: parity test enable
- 0 = disable
- 1 = enable
- bit 3,2: character length
- 0 = 5 bits
- 1 = 6 bits
- 2 = 7 bits
- 3 = 8 bits
- bit 1,0: baud rate factor
- 0 = defines command byte for synchronous or asynchronous
- 1 = x1
- 2 = x16
- 3 = x64
- */
+ bit 7,6: stop bit length
+ 0 = inhibit
+ 1 = 1 bit
+ 2 = 1.5 bits
+ 3 = 2 bits
+ bit 5: parity type
+ 0 = parity odd
+ 1 = parity even
+ bit 4: parity test enable
+ 0 = disable
+ 1 = enable
+ bit 3,2: character length
+ 0 = 5 bits
+ 1 = 6 bits
+ 2 = 7 bits
+ 3 = 8 bits
+ bit 1,0: baud rate factor
+ 0 = defines command byte for synchronous or asynchronous
+ 1 = x1
+ 2 = x16
+ 3 = x64
+ */
LOG(("I8251: Asynchronous operation\n"));
@@ -597,24 +597,24 @@ WRITE8_MEMBER(i8251_device::mode_w)
else
{
/* bit 7: Number of sync characters
- 0 = 1 character
- 1 = 2 character
- bit 6: Synchronous mode
- 0 = Internal synchronisation
- 1 = External synchronisation
- bit 5: parity type
- 0 = parity odd
- 1 = parity even
- bit 4: parity test enable
- 0 = disable
- 1 = enable
- bit 3,2: character length
- 0 = 5 bits
- 1 = 6 bits
- 2 = 7 bits
- 3 = 8 bits
- bit 1,0 = 0
- */
+ 0 = 1 character
+ 1 = 2 character
+ bit 6: Synchronous mode
+ 0 = Internal synchronisation
+ 1 = External synchronisation
+ bit 5: parity type
+ 0 = parity odd
+ 1 = parity even
+ bit 4: parity test enable
+ 0 = disable
+ 1 = enable
+ bit 3,2: character length
+ 0 = 5 bits
+ 1 = 6 bits
+ 2 = 7 bits
+ 3 = 8 bits
+ bit 1,0 = 0
+ */
LOG(("I8251: Synchronous operation\n"));
/* setup for sync byte(s) */
diff --git a/src/emu/machine/i8257.c b/src/emu/machine/i8257.c
index 791a040295f..404e3066b15 100644
--- a/src/emu/machine/i8257.c
+++ b/src/emu/machine/i8257.c
@@ -79,7 +79,7 @@ inline void i8257_device::dma_request(int channel, int state)
}
else
{
- m_request &= ~(1 << channel);
+ m_request &= ~(1 << channel);
}
trigger(1);
}
diff --git a/src/emu/machine/mcf5206e.c b/src/emu/machine/mcf5206e.c
index d7b99c42483..f19684f71a0 100644
--- a/src/emu/machine/mcf5206e.c
+++ b/src/emu/machine/mcf5206e.c
@@ -860,7 +860,7 @@ void mcf5206e_peripheral_device::device_start()
init_regs(true);
m_timer1 = machine().scheduler().timer_alloc( timer_expired_delegate( FUNC( mcf5206e_peripheral_device::timer1_callback ), this) );
-
+
save_item(NAME(m_ICR));
save_item(NAME(m_CSAR));
save_item(NAME(m_CSMR));
diff --git a/src/emu/machine/tmp68301.c b/src/emu/machine/tmp68301.c
index 9795e075b4a..4594ea0397f 100644
--- a/src/emu/machine/tmp68301.c
+++ b/src/emu/machine/tmp68301.c
@@ -123,7 +123,7 @@ void tmp68301_device::device_start()
m_in_parallel_cb.resolve_safe(0);
m_out_parallel_cb.resolve_safe();
-
+
save_item(NAME(m_regs));
save_item(NAME(m_IE));
save_item(NAME(m_irq_vector));
diff --git a/src/emu/machine/upd71071.c b/src/emu/machine/upd71071.c
index 62214ef9e91..0a4484b607f 100644
--- a/src/emu/machine/upd71071.c
+++ b/src/emu/machine/upd71071.c
@@ -1,7 +1,7 @@
/*
- am9517a.c is a more complete implementation of this, the uPD71071 appears to be a clone of it
+ am9517a.c is a more complete implementation of this, the uPD71071 appears to be a clone of it
NEC uPD71071 DMA Controller
Used on the Fujitsu FM-Towns
@@ -31,8 +31,8 @@
Self-explanatory, I hope. :)
NOTE: Datasheet clearly shows this as 24-bit, with register 7 unused.
But the FM-Towns definitely uses reg 7 as bits 24-31.
- The documentation on the V53A manual doesn't show these bits either, maybe it's
- an external connection on the FMT? might be worth checking overflow behavior etc.
+ The documentation on the V53A manual doesn't show these bits either, maybe it's
+ an external connection on the FMT? might be worth checking overflow behavior etc.
0x08:
0x09: Device Control register (16-bit)
@@ -77,8 +77,8 @@
0x0f: Mask register
bit 0-3: DMARQ mask
bits 1 and 0 only in MTM transfers
-
- Note, the uPD71071 compatible mode of the V53 CPU differs from a real uPD71071 in the following ways
+
+ Note, the uPD71071 compatible mode of the V53 CPU differs from a real uPD71071 in the following ways
diff --git a/src/emu/machine/vrc4373.c b/src/emu/machine/vrc4373.c
index b1e5c6e8928..e91c2f2a8c4 100644
--- a/src/emu/machine/vrc4373.c
+++ b/src/emu/machine/vrc4373.c
@@ -111,7 +111,7 @@ void vrc4373_device::map_extra(UINT64 memory_window_start, UINT64 memory_window_
if (LOG_NILE)
logerror("%s: map_extra Master Window 2 start=%08X end=%08X size=%08X laddr=%08X\n", tag(), winStart, winEnd, winSize, m_pci2_laddr);
}
- // PCI IO Window
+ // PCI IO Window
if (m_cpu_regs[NREG_PCIMIOW]&0x1000) {
winStart = m_cpu_regs[NREG_PCIMIOW]&0xff000000;
winEnd = winStart | (~(0x80000000 | (((m_cpu_regs[NREG_PCIMIOW]>>13)&0x7f)<<24)));
@@ -122,7 +122,7 @@ void vrc4373_device::map_extra(UINT64 memory_window_start, UINT64 memory_window_
logerror("%s: map_extra IO Window start=%08X end=%08X size=%08X laddr=%08X\n", tag(), winStart, winEnd, winSize, m_pci_io_laddr);
}
// PCI Target Window 1
- if (m_cpu_regs[NREG_PCITW1]&0x1000) {
+ if (m_cpu_regs[NREG_PCITW1]&0x1000) {
winStart = m_cpu_regs[NREG_PCITW1]&0xffe00000;
winEnd = winStart | (~(0xf0000000 | (((m_cpu_regs[NREG_PCITW1]>>13)&0x7f)<<21)));
winSize = winEnd - winStart + 1;
@@ -242,7 +242,7 @@ WRITE32_MEMBER (vrc4373_device::target2_w)
logerror("%06X:nile target2 write to offset %02X = %08X & %08X\n", space.device().safe_pc(), offset*4, data, mem_mask);
}
-// CPU I/F
+// CPU I/F
READ32_MEMBER (vrc4373_device::cpu_if_r)
{
UINT32 result = m_cpu_regs[offset];
@@ -290,7 +290,7 @@ WRITE32_MEMBER(vrc4373_device::cpu_if_w)
case NREG_PCICAR:
// Bits in reserved area are used for device selection of type 0 config transactions
// Assuming 23:11 get mapped into device number for configuration
- if ((data&0x3) == 0x0) {
+ if ((data&0x3) == 0x0) {
// Type 0 transaction
modData = 0;
// Select the device based on one hot bit
@@ -341,4 +341,3 @@ WRITE32_MEMBER(vrc4373_device::cpu_if_w)
}
}
-
diff --git a/src/emu/machine/vrc4373.h b/src/emu/machine/vrc4373.h
index 17fa5de7e9c..998bea71832 100644
--- a/src/emu/machine/vrc4373.h
+++ b/src/emu/machine/vrc4373.h
@@ -10,13 +10,13 @@
downcast<vrc4373_device *>(device)->set_cpu_tag(_cpu_tag);
#define VRC4373_PAGESHIFT 12
-
+
/* NILE 3 registers 0x000-0x0ff */
-#define NREG_BMCR (0x000/4)
-#define NREG_SIMM1 (0x004/4)
-#define NREG_SIMM2 (0x008/4)
-#define NREG_SIMM3 (0x00C/4)
-#define NREG_SIMM4 (0x010/4)
+#define NREG_BMCR (0x000/4)
+#define NREG_SIMM1 (0x004/4)
+#define NREG_SIMM2 (0x008/4)
+#define NREG_SIMM3 (0x00C/4)
+#define NREG_SIMM4 (0x010/4)
#define NREG_PCIMW1 (0x014/4)
#define NREG_PCIMW2 (0x018/4)
#define NREG_PCITW1 (0x01C/4)
@@ -57,7 +57,7 @@ public:
void set_cpu_tag(const char *tag);
virtual DECLARE_ADDRESS_MAP(config_map, 32);
-
+
DECLARE_READ32_MEMBER( pcictrl_r);
DECLARE_WRITE32_MEMBER( pcictrl_w);
//cpu bus registers
@@ -76,7 +76,7 @@ public:
virtual DECLARE_ADDRESS_MAP(target1_map, 32);
DECLARE_READ32_MEMBER (target1_r);
DECLARE_WRITE32_MEMBER(target1_w);
-
+
virtual DECLARE_ADDRESS_MAP(target2_map, 32);
DECLARE_READ32_MEMBER (target2_r);
DECLARE_WRITE32_MEMBER(target2_w);
diff --git a/src/emu/mame.c b/src/emu/mame.c
index 3d8380d8666..b2df26d661b 100644
--- a/src/emu/mame.c
+++ b/src/emu/mame.c
@@ -286,11 +286,11 @@ void CLIB_DECL popmessage(const char *format, ...)
// pop it in the UI
machine_manager::instance()->machine()->ui().popup_time(temp.len() / 40 + 2, "%s", temp.cstr());
-
+
/*
// also write to error.log
logerror("popmessage: %s\n", temp.cstr());
-
+
#ifdef MAME_DEBUG
// and to command-line in a DEBUG build
osd_printf_info("popmessage: %s\n", temp.cstr());
diff --git a/src/emu/render.c b/src/emu/render.c
index 46ae77e8909..af95b896cf5 100644
--- a/src/emu/render.c
+++ b/src/emu/render.c
@@ -2494,13 +2494,13 @@ float render_manager::ui_aspect(render_container *rc)
orient = orientation_add(m_ui_target->orientation(), m_ui_container->orientation());
// based on the orientation of the target, compute height/width or width/height
if (!(orient & ORIENTATION_SWAP_XY))
- aspect = (float)m_ui_target->height() / (float)m_ui_target->width();
+ aspect = (float)m_ui_target->height() / (float)m_ui_target->width();
else
- aspect = (float)m_ui_target->width() / (float)m_ui_target->height();
+ aspect = (float)m_ui_target->width() / (float)m_ui_target->height();
// if we have a valid pixel aspect, apply that and return
if (m_ui_target->pixel_aspect() != 0.0f)
- return (aspect / m_ui_target->pixel_aspect());
+ return (aspect / m_ui_target->pixel_aspect());
} else {
// single screen container
diff --git a/src/emu/sound/es1373.h b/src/emu/sound/es1373.h
index b2ee13f1feb..46a2e4180d3 100644
--- a/src/emu/sound/es1373.h
+++ b/src/emu/sound/es1373.h
@@ -9,26 +9,26 @@
MCFG_PCI_DEVICE_ADD(_tag, ES1373, 0x12741371, 0x04, 0x040100, 0x12741371)
/* Ensonic ES1373 registers 0x00-0x3f */
-#define ES_INT_CS_CTRL (0x00/4)
-#define ES_INT_CS_STATUS (0x04/4)
-#define ES_UART_DATA (0x08/4)
-#define ES_UART_STATUS (0x09/4)
-#define ES_UART_CTRL (0x09/4)
-#define ES_UART_RSVD (0x0A/4)
-#define ES_MEM_PAGE (0x0C/4)
-#define ES_SRC_IF (0x10/4)
-#define ES_CODEC (0x14/4)
-#define ES_LEGACY (0x18/4)
-#define ES_CHAN_CTRL (0x1C/4)
-#define ES_SERIAL_CTRL (0x20/4)
-#define ES_DAC1_CNT (0x24/4)
-#define ES_DAC2_CNT (0x28/4)
-#define ES_ADC_CNT (0x2C/4)
-#define ES_ADC_CNT (0x2C/4)
-#define ES_HOST_IF0 (0x30/4)
-#define ES_HOST_IF1 (0x34/4)
-#define ES_HOST_IF2 (0x38/4)
-#define ES_HOST_IF3 (0x3C/4)
+#define ES_INT_CS_CTRL (0x00/4)
+#define ES_INT_CS_STATUS (0x04/4)
+#define ES_UART_DATA (0x08/4)
+#define ES_UART_STATUS (0x09/4)
+#define ES_UART_CTRL (0x09/4)
+#define ES_UART_RSVD (0x0A/4)
+#define ES_MEM_PAGE (0x0C/4)
+#define ES_SRC_IF (0x10/4)
+#define ES_CODEC (0x14/4)
+#define ES_LEGACY (0x18/4)
+#define ES_CHAN_CTRL (0x1C/4)
+#define ES_SERIAL_CTRL (0x20/4)
+#define ES_DAC1_CNT (0x24/4)
+#define ES_DAC2_CNT (0x28/4)
+#define ES_ADC_CNT (0x2C/4)
+#define ES_ADC_CNT (0x2C/4)
+#define ES_HOST_IF0 (0x30/4)
+#define ES_HOST_IF1 (0x34/4)
+#define ES_HOST_IF2 (0x38/4)
+#define ES_HOST_IF3 (0x3C/4)
struct frame_reg {
UINT32 pci_addr;
diff --git a/src/emu/sound/flt_rc.c b/src/emu/sound/flt_rc.c
index 806792ccc17..cec4ebd6bc4 100644
--- a/src/emu/sound/flt_rc.c
+++ b/src/emu/sound/flt_rc.c
@@ -37,7 +37,7 @@ void filter_rc_device::device_start()
{
m_stream = stream_alloc(1, 1, machine().sample_rate());
recalc();
-
+
save_item(NAME(m_k));
save_item(NAME(m_memory));
save_item(NAME(m_type));
diff --git a/src/emu/sound/okim9810.c b/src/emu/sound/okim9810.c
index 3370ee460e8..b18894e71a3 100644
--- a/src/emu/sound/okim9810.c
+++ b/src/emu/sound/okim9810.c
@@ -115,11 +115,11 @@ void okim9810_device::device_start()
save_item(NAME(m_global_volume));
save_item(NAME(m_filter_type));
save_item(NAME(m_output_level));
-
+
for (int i = 0; i < OKIM9810_VOICES; i++)
{
okim_voice *voice = get_voice(i);
-
+
save_item(NAME(voice->m_adpcm.m_signal), i);
save_item(NAME(voice->m_adpcm.m_step), i);
save_item(NAME(voice->m_adpcm2.m_signal), i);
diff --git a/src/emu/sound/okim9810.h b/src/emu/sound/okim9810.h
index 823a8e25f59..4d1f3da7b71 100644
--- a/src/emu/sound/okim9810.h
+++ b/src/emu/sound/okim9810.h
@@ -135,7 +135,7 @@ protected:
};
okim_voice *get_voice(int which);
-
+
// internal state
const address_space_config m_space_config;
diff --git a/src/emu/video.c b/src/emu/video.c
index 11dc4545540..f332e75eac7 100644
--- a/src/emu/video.c
+++ b/src/emu/video.c
@@ -153,7 +153,7 @@ video_manager::video_manager(running_machine &machine)
filename = machine.options().avi_write();
if (filename[0] != 0)
begin_recording(filename, MF_AVI);
-
+
#ifdef MAME_DEBUG
m_dummy_recording = machine.options().dummy_write();
#endif
diff --git a/src/emu/video.h b/src/emu/video.h
index c5ca9c9e27b..31e115870ef 100644
--- a/src/emu/video.h
+++ b/src/emu/video.h
@@ -176,9 +176,9 @@ private:
attotime m_avi_frame_period; // period of a single movie frame
attotime m_avi_next_frame_time; // time of next frame
UINT32 m_avi_frame; // current movie frame number
-
+
// movie recording - dummy
- bool m_dummy_recording; // indicates if snapshot should be created of every frame
+ bool m_dummy_recording; // indicates if snapshot should be created of every frame
static const UINT8 s_skiptable[FRAMESKIP_LEVELS][FRAMESKIP_LEVELS];
diff --git a/src/emu/video/tms34061.c b/src/emu/video/tms34061.c
index ffcb01d99ad..2e1667d991f 100644
--- a/src/emu/video/tms34061.c
+++ b/src/emu/video/tms34061.c
@@ -60,7 +60,7 @@ void tms34061_device::device_start()
/* allocate memory for VRAM */
m_vram = auto_alloc_array_clear(machine(), UINT8, m_vramsize + 256 * 2);
-
+
/* allocate memory for latch RAM */
m_latchram = auto_alloc_array_clear(machine(), UINT8, m_vramsize + 256 * 2);
@@ -93,7 +93,7 @@ void tms34061_device::device_start()
/* start vertical interrupt timer */
m_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(tms34061_device::interrupt), this));
-
+
save_item(NAME(m_regs));
save_item(NAME(m_xmask));
save_item(NAME(m_yshift));
diff --git a/src/emu/video/voodoo_pci.c b/src/emu/video/voodoo_pci.c
index 2b7a6f07433..e1e02e2260e 100644
--- a/src/emu/video/voodoo_pci.c
+++ b/src/emu/video/voodoo_pci.c
@@ -56,7 +56,7 @@ void voodoo_pci_device::map_extra(UINT64 memory_window_start, UINT64 memory_wind
return;
if(UINT32(bi.adr) == UINT32(~(bi.size - 1)))
return;
-
+
UINT64 start;
address_space *space;
if(bi.flags & M_IO) {
diff --git a/src/lib/formats/d88_dsk.c b/src/lib/formats/d88_dsk.c
index abb2eac3079..23363acdcc1 100644
--- a/src/lib/formats/d88_dsk.c
+++ b/src/lib/formats/d88_dsk.c
@@ -27,8 +27,8 @@
*
*/
- #include <assert.h>
-
+ #include <assert.h>
+
#include "flopimg.h"
#include "imageutl.h"
diff --git a/src/lib/formats/flex_dsk.c b/src/lib/formats/flex_dsk.c
index 34aa965643d..f4934d8e436 100644
--- a/src/lib/formats/flex_dsk.c
+++ b/src/lib/formats/flex_dsk.c
@@ -4,7 +4,7 @@
* Created on: 24/06/2014
*/
- #include "emu.h" // logerror
+ #include "emu.h" // logerror
#include "flex_dsk.h"
flex_format::flex_format()
diff --git a/src/lib/formats/fmtowns_dsk.c b/src/lib/formats/fmtowns_dsk.c
index 83bfd2fbd51..6baede6fb07 100644
--- a/src/lib/formats/fmtowns_dsk.c
+++ b/src/lib/formats/fmtowns_dsk.c
@@ -6,8 +6,8 @@
* Created on: 23/03/2014
*/
- #include <assert.h>
-
+ #include <assert.h>
+
#include "formats/fmtowns_dsk.h"
fmtowns_format::fmtowns_format() : wd177x_format(formats)
diff --git a/src/lib/formats/nfd_dsk.c b/src/lib/formats/nfd_dsk.c
index 083d59417b2..7702d3814a5 100644
--- a/src/lib/formats/nfd_dsk.c
+++ b/src/lib/formats/nfd_dsk.c
@@ -77,8 +77,8 @@
*********************************************************************/
- #include <assert.h>
-
+ #include <assert.h>
+
#include "nfd_dsk.h"
nfd_format::nfd_format()
diff --git a/src/mame/audio/hng64.c b/src/mame/audio/hng64.c
index 2cc54a21ed2..ed44a57893e 100644
--- a/src/mame/audio/hng64.c
+++ b/src/mame/audio/hng64.c
@@ -191,12 +191,12 @@ ADDRESS_MAP_END
WRITE16_MEMBER(hng64_state::hng64_sound_port_0008_w)
{
-// logerror("hng64_sound_port_0008_w %04x %04x\n", data, mem_mask);
+// logerror("hng64_sound_port_0008_w %04x %04x\n", data, mem_mask);
// seems to one or more of the DMARQ on the V53, writes here when it expects DMA channel 3 to transfer ~0x20 bytes just after startup
m_audiocpu->dreq3_w(data&1);
-// m_audiocpu->hack_w(1);
+// m_audiocpu->hack_w(1);
}
@@ -262,23 +262,23 @@ WRITE16_MEMBER(hng64_state::hng64_sound_data_02_w)
{
m_audiodat[m_audiochannel].dat[2] = data;
-// if ((m_audiochannel & 0xff00) == 0x0a00)
-// printf("write port 0x0002 chansel %04x data %04x (%04x%04x%04x)\n", m_audiochannel, data, m_audiodat[m_audiochannel].dat[0], m_audiodat[m_audiochannel].dat[1], m_audiodat[m_audiochannel].dat[2]);
+// if ((m_audiochannel & 0xff00) == 0x0a00)
+// printf("write port 0x0002 chansel %04x data %04x (%04x%04x%04x)\n", m_audiochannel, data, m_audiodat[m_audiochannel].dat[0], m_audiodat[m_audiochannel].dat[1], m_audiodat[m_audiochannel].dat[2]);
}
WRITE16_MEMBER(hng64_state::hng64_sound_data_04_w)
{
m_audiodat[m_audiochannel].dat[1] = data;
-// if ((m_audiochannel & 0xff00) == 0x0a00)
-// printf("write port 0x0004 chansel %04x data %04x (%04x%04x%04x)\n", m_audiochannel, data, m_audiodat[m_audiochannel].dat[0], m_audiodat[m_audiochannel].dat[1], m_audiodat[m_audiochannel].dat[2]);
+// if ((m_audiochannel & 0xff00) == 0x0a00)
+// printf("write port 0x0004 chansel %04x data %04x (%04x%04x%04x)\n", m_audiochannel, data, m_audiodat[m_audiochannel].dat[0], m_audiodat[m_audiochannel].dat[1], m_audiodat[m_audiochannel].dat[2]);
}
WRITE16_MEMBER(hng64_state::hng64_sound_data_06_w)
{
m_audiodat[m_audiochannel].dat[0] = data;
-// if ((m_audiochannel & 0xff00) == 0x0a00)
-// printf("write port 0x0006 chansel %04x data %04x (%04x%04x%04x)\n", m_audiochannel, data, m_audiodat[m_audiochannel].dat[0], m_audiodat[m_audiochannel].dat[1], m_audiodat[m_audiochannel].dat[2]);
+// if ((m_audiochannel & 0xff00) == 0x0a00)
+// printf("write port 0x0006 chansel %04x data %04x (%04x%04x%04x)\n", m_audiochannel, data, m_audiodat[m_audiochannel].dat[0], m_audiodat[m_audiochannel].dat[1], m_audiodat[m_audiochannel].dat[2]);
}
// but why not just use the V33/V53 XA mode??
@@ -414,18 +414,18 @@ WRITE_LINE_MEMBER(hng64_state::tcu_tm0_cb)
WRITE_LINE_MEMBER(hng64_state::tcu_tm1_cb)
{
// these are very active, maybe they feed back into the v53 via one of the IRQ pins? TM2 toggles more rapidly than TM1
-// logerror("tcu_tm1_cb %02x\n", state);
+// logerror("tcu_tm1_cb %02x\n", state);
m_audiocpu->set_input_line(5, state? ASSERT_LINE:CLEAR_LINE); // not accurate, just so we have a trigger
}
WRITE_LINE_MEMBER(hng64_state::tcu_tm2_cb)
{
// these are very active, maybe they feed back into the v53 via one of the IRQ pins? TM2 toggles more rapidly than TM1
-// logerror("tcu_tm2_cb %02x\n", state);
+// logerror("tcu_tm2_cb %02x\n", state);
// NOT ACCURATE, just so that all the interrupts get triggered for now.
static int i = 0;
- m_audiocpu->set_input_line(i, state? ASSERT_LINE:CLEAR_LINE);
+ m_audiocpu->set_input_line(i, state? ASSERT_LINE:CLEAR_LINE);
i++;
if (i == 3) i = 0;
}
@@ -445,5 +445,3 @@ MACHINE_CONFIG_FRAGMENT( hng64_audio )
MCFG_V53_TCU_OUT2_HANDLER(WRITELINE(hng64_state, tcu_tm2_cb))
MACHINE_CONFIG_END
-
-
diff --git a/src/mame/drivers/argus.c b/src/mame/drivers/argus.c
index 4704d27ce10..295b924d51d 100644
--- a/src/mame/drivers/argus.c
+++ b/src/mame/drivers/argus.c
@@ -548,7 +548,7 @@ static MACHINE_CONFIG_START( argus, argus_state )
MCFG_GFXDECODE_ADD("gfxdecode", "palette", argus)
MCFG_PALETTE_ADD("palette", 896)
-
+
MCFG_DEVICE_ADD("blend", JALECO_BLEND, 0)
MCFG_VIDEO_START_OVERRIDE(argus_state,argus)
@@ -594,7 +594,7 @@ static MACHINE_CONFIG_START( valtric, argus_state )
MCFG_GFXDECODE_ADD("gfxdecode", "palette", valtric)
MCFG_PALETTE_ADD("palette", 768)
-
+
MCFG_DEVICE_ADD("blend", JALECO_BLEND, 0)
MCFG_VIDEO_START_OVERRIDE(argus_state,valtric)
@@ -640,7 +640,7 @@ static MACHINE_CONFIG_START( butasan, argus_state )
MCFG_GFXDECODE_ADD("gfxdecode", "palette", butasan)
MCFG_PALETTE_ADD("palette", 768)
-
+
MCFG_DEVICE_ADD("blend", JALECO_BLEND, 0)
MCFG_VIDEO_START_OVERRIDE(argus_state,butasan)
diff --git a/src/mame/drivers/astrcorp.c b/src/mame/drivers/astrcorp.c
index 8ee006d0f17..3c02d436ebd 100644
--- a/src/mame/drivers/astrcorp.c
+++ b/src/mame/drivers/astrcorp.c
@@ -1159,130 +1159,130 @@ DRIVER_INIT_MEMBER(astrocorp_state,astoneag)
for (i = 0x25100/2; i < 0x25200/2; i++)
{
x = 0x0000;
- if ( (i & 0x0001) ) x |= 0x0200;
- if ( (i & 0x0004) && !(i & 0x0001) ) x |= 0x0080;
- if ( (i & 0x0040) || (i & 0x0001) ) x |= 0x0040;
- if ( (i & 0x0010) && !(i & 0x0001) ) x |= 0x0020;
- if ( !(i & 0x0020) || (i & 0x0001) ) x |= 0x0010;
- if ( (i & 0x0002) || (i & 0x0001) ) x |= 0x0008;
- if ( (i & 0x0008) && !(i & 0x0001) ) x |= 0x0004;
- if ( !(i & 0x0040) && !(i & 0x0001) ) x |= 0x0002;
- if ( (i & 0x0040) && !(i & 0x0001) ) x |= 0x0001;
+ if ( (i & 0x0001) ) x |= 0x0200;
+ if ( (i & 0x0004) && !(i & 0x0001) ) x |= 0x0080;
+ if ( (i & 0x0040) || (i & 0x0001) ) x |= 0x0040;
+ if ( (i & 0x0010) && !(i & 0x0001) ) x |= 0x0020;
+ if ( !(i & 0x0020) || (i & 0x0001) ) x |= 0x0010;
+ if ( (i & 0x0002) || (i & 0x0001) ) x |= 0x0008;
+ if ( (i & 0x0008) && !(i & 0x0001) ) x |= 0x0004;
+ if ( !(i & 0x0040) && !(i & 0x0001) ) x |= 0x0002;
+ if ( (i & 0x0040) && !(i & 0x0001) ) x |= 0x0001;
rom[i] ^= x;
}
/*
- for (i = 0x25300/2; i < 0x25400/2; i++)
- {
- x = 0x1300;
- rom[i] ^= x;
- }
+ for (i = 0x25300/2; i < 0x25400/2; i++)
+ {
+ x = 0x1300;
+ rom[i] ^= x;
+ }
*/
for (i = 0x25400/2; i < 0x25500/2; i++)
{
x = 0x4200;
- if ( (i & 0x0001) ) x |= 0x0400;
- if ( (i & 0x0020) && !(i & 0x0001) ) x |= 0x0080;
- if ( !(i & 0x0010) || (i & 0x0001) ) x |= 0x0040;
- if ( (i & 0x0040) && !(i & 0x0001) ) x |= 0x0020;
- if ( !(i & 0x0004) || (i & 0x0001) ) x |= 0x0010;
- if ( !(i & 0x0040) && !(i & 0x0001) ) x |= 0x0004;
- if ( (i & 0x0008) && !(i & 0x0001) ) x |= 0x0002;
- if ( (i & 0x0002) || (i & 0x0001) ) x |= 0x0001;
+ if ( (i & 0x0001) ) x |= 0x0400;
+ if ( (i & 0x0020) && !(i & 0x0001) ) x |= 0x0080;
+ if ( !(i & 0x0010) || (i & 0x0001) ) x |= 0x0040;
+ if ( (i & 0x0040) && !(i & 0x0001) ) x |= 0x0020;
+ if ( !(i & 0x0004) || (i & 0x0001) ) x |= 0x0010;
+ if ( !(i & 0x0040) && !(i & 0x0001) ) x |= 0x0004;
+ if ( (i & 0x0008) && !(i & 0x0001) ) x |= 0x0002;
+ if ( (i & 0x0002) || (i & 0x0001) ) x |= 0x0001;
rom[i] ^= x;
}
for (i = 0x25500/2; i < 0x25600/2; i++)
{
x = 0x4200;
- if ( (i & 0x0001) ) x |= 0x0400;
- if ( (i & 0x0010) && !(i & 0x0001) ) x |= 0x0080;
- if ( (i & 0x0040) && !(i & 0x0001) ) x |= 0x0040;
- if ( !(i & 0x0002) && !(i & 0x0001) ) x |= 0x0020;
- if ( !(i & 0x0040) && !(i & 0x0001) ) x |= 0x0010;
- if ( (i & 0x0008) && !(i & 0x0001) ) x |= 0x0008;
- if ( (i & 0x0020) && !(i & 0x0001) ) x |= 0x0004;
- if ( (i & 0x0004) && !(i & 0x0001) ) x |= 0x0002;
- if ( (i & 0x0001) ) x |= 0x0001;
+ if ( (i & 0x0001) ) x |= 0x0400;
+ if ( (i & 0x0010) && !(i & 0x0001) ) x |= 0x0080;
+ if ( (i & 0x0040) && !(i & 0x0001) ) x |= 0x0040;
+ if ( !(i & 0x0002) && !(i & 0x0001) ) x |= 0x0020;
+ if ( !(i & 0x0040) && !(i & 0x0001) ) x |= 0x0010;
+ if ( (i & 0x0008) && !(i & 0x0001) ) x |= 0x0008;
+ if ( (i & 0x0020) && !(i & 0x0001) ) x |= 0x0004;
+ if ( (i & 0x0004) && !(i & 0x0001) ) x |= 0x0002;
+ if ( (i & 0x0001) ) x |= 0x0001;
rom[i] ^= x;
}
/*
- for (i = 0x25700/2; i < 0x25800/2; i++)
- {
- x = 0x6800;
- if ( !(i & 0x0001) ) x |= 0x8000;
+ for (i = 0x25700/2; i < 0x25800/2; i++)
+ {
+ x = 0x6800;
+ if ( !(i & 0x0001) ) x |= 0x8000;
- if ( !(i & 0x0040) || ((i & 0x0001) || !(i & 0x0001)) ) x |= 0x0100;
+ if ( !(i & 0x0040) || ((i & 0x0001) || !(i & 0x0001)) ) x |= 0x0100;
- rom[i] ^= x;
- }
+ rom[i] ^= x;
+ }
*/
for (i = 0x25800/2; i < 0x25900/2; i++)
{
x = 0x8300;
- if ( (i & 0x0040) || (i & 0x0001) ) x |= 0x2000;
- if ( (i & 0x0002) || (i & 0x0001) ) x |= 0x0080;
- if ( !(i & 0x0040) && !(i & 0x0001) ) x |= 0x0040;
- if ( (i & 0x0020) && !(i & 0x0001) ) x |= 0x0020;
- if ( !(i & 0x0004) || (i & 0x0001) ) x |= 0x0010;
- if ( !(i & 0x0040) && !(i & 0x0001) ) x |= 0x0008;
- if ( (i & 0x0010) && !(i & 0x0001) ) x |= 0x0004;
- if ( (i & 0x0008) && !(i & 0x0001) ) x |= 0x0002;
- if ( !(i & 0x0040) && !(i & 0x0001) ) x |= 0x0001;
+ if ( (i & 0x0040) || (i & 0x0001) ) x |= 0x2000;
+ if ( (i & 0x0002) || (i & 0x0001) ) x |= 0x0080;
+ if ( !(i & 0x0040) && !(i & 0x0001) ) x |= 0x0040;
+ if ( (i & 0x0020) && !(i & 0x0001) ) x |= 0x0020;
+ if ( !(i & 0x0004) || (i & 0x0001) ) x |= 0x0010;
+ if ( !(i & 0x0040) && !(i & 0x0001) ) x |= 0x0008;
+ if ( (i & 0x0010) && !(i & 0x0001) ) x |= 0x0004;
+ if ( (i & 0x0008) && !(i & 0x0001) ) x |= 0x0002;
+ if ( !(i & 0x0040) && !(i & 0x0001) ) x |= 0x0001;
rom[i] ^= x;
}
-// for (i = 0x25900/2; i < 0x25a00/2; i++)
+// for (i = 0x25900/2; i < 0x25a00/2; i++)
for (i = 0x25c00/2; i < 0x25d00/2; i++)
{
// changed from 25400
-// x = 0x4200;
+// x = 0x4200;
x = 0x4000;
-// if ( (i & 0x0001) ) x |= 0x0400;
- if ( (i & 0x0020) && !(i & 0x0001) ) x |= 0x0080;
- if ( !(i & 0x0010) || (i & 0x0001) ) x |= 0x0040;
- if ( (i & 0x0040) && !(i & 0x0001) ) x |= 0x0020;
- if ( !(i & 0x0004) || (i & 0x0001) ) x |= 0x0010;
- if ( !(i & 0x0040) && !(i & 0x0001) ) x |= 0x0004;
- if ( (i & 0x0008) && !(i & 0x0001) ) x |= 0x0002;
- if ( (i & 0x0002) || (i & 0x0001) ) x |= 0x0001;
+// if ( (i & 0x0001) ) x |= 0x0400;
+ if ( (i & 0x0020) && !(i & 0x0001) ) x |= 0x0080;
+ if ( !(i & 0x0010) || (i & 0x0001) ) x |= 0x0040;
+ if ( (i & 0x0040) && !(i & 0x0001) ) x |= 0x0020;
+ if ( !(i & 0x0004) || (i & 0x0001) ) x |= 0x0010;
+ if ( !(i & 0x0040) && !(i & 0x0001) ) x |= 0x0004;
+ if ( (i & 0x0008) && !(i & 0x0001) ) x |= 0x0002;
+ if ( (i & 0x0002) || (i & 0x0001) ) x |= 0x0001;
rom[i] ^= x;
}
/*
- for (i = 0x25d00/2; i < 0x25e00/2; i++)
- {
- x = 0x4000;
- if ( !(i & 0x0040) ) x |= 0x0800;
-
- if ( !(i & 0x0040) && !(i & 0x0001) ) x |= 0x0100; // almost!!
-
- if ( ((i & 0x0040)&&((i & 0x0020)||(i & 0x0010))) || !(i & 0x0001) ) x |= 0x0200; // almost!!
- if ( (!(i & 0x0040) || !(i & 0x0008)) && !(i & 0x0001) ) x |= 0x0008;
- if ( (i & 0x0040) || !(i & 0x0020) || (i & 0x0001) ) x |= 0x0001; // almost!!
- rom[i] ^= x;
- }
+ for (i = 0x25d00/2; i < 0x25e00/2; i++)
+ {
+ x = 0x4000;
+ if ( !(i & 0x0040) ) x |= 0x0800;
+
+ if ( !(i & 0x0040) && !(i & 0x0001) ) x |= 0x0100; // almost!!
+
+ if ( ((i & 0x0040)&&((i & 0x0020)||(i & 0x0010))) || !(i & 0x0001) ) x |= 0x0200; // almost!!
+ if ( (!(i & 0x0040) || !(i & 0x0008)) && !(i & 0x0001) ) x |= 0x0008;
+ if ( (i & 0x0040) || !(i & 0x0020) || (i & 0x0001) ) x |= 0x0001; // almost!!
+ rom[i] ^= x;
+ }
*/
/*
- for (i = 0x25e00/2; i < 0x25f00/2; i++)
- {
- x = 0xa600;
+ for (i = 0x25e00/2; i < 0x25f00/2; i++)
+ {
+ x = 0xa600;
- if ( (i & 0x0040) && (i & 0x0001) ) x |= 0x4000;
- if ( (i & 0x0040) && (i & 0x0001) ) x |= 0x0800;
- if ( !(i & 0x0001) ) x |= 0x0100;
+ if ( (i & 0x0040) && (i & 0x0001) ) x |= 0x4000;
+ if ( (i & 0x0040) && (i & 0x0001) ) x |= 0x0800;
+ if ( !(i & 0x0001) ) x |= 0x0100;
- if ( ( (i & 0x0040) && (i & 0x0008) && !(i & 0x0001)) ||
- ( !(i & 0x0040) && ((i & 0x0004) ^ (i & 0x0002)) && !(i & 0x0001) ) ) x |= 0x0002; // almost!!
+ if ( ( (i & 0x0040) && (i & 0x0008) && !(i & 0x0001)) ||
+ ( !(i & 0x0040) && ((i & 0x0004) ^ (i & 0x0002)) && !(i & 0x0001) ) ) x |= 0x0002; // almost!!
- if ( !(i & 0x0040) || !(i & 0x0002) || (i & 0x0001) ) x |= 0x0001;
- rom[i] ^= x;
- }
+ if ( !(i & 0x0040) || !(i & 0x0002) || (i & 0x0001) ) x |= 0x0001;
+ rom[i] ^= x;
+ }
*/
for (i = 0x26f00/2; i < 0x27000/2; i++)
diff --git a/src/mame/drivers/cabal.c b/src/mame/drivers/cabal.c
index 1ac68036d78..bc8b2ce317c 100644
--- a/src/mame/drivers/cabal.c
+++ b/src/mame/drivers/cabal.c
@@ -475,7 +475,7 @@ static MACHINE_CONFIG_START( cabal, cabal_state )
MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(sound_map)
-
+
MCFG_MACHINE_START_OVERRIDE(cabal_state,cabal)
/* video hardware */
diff --git a/src/mame/drivers/capbowl.c b/src/mame/drivers/capbowl.c
index 2e23106f9ae..196e48cb9a1 100644
--- a/src/mame/drivers/capbowl.c
+++ b/src/mame/drivers/capbowl.c
@@ -293,7 +293,7 @@ INPUT_PORTS_END
void capbowl_state::machine_start()
{
m_update_timer = timer_alloc(TIMER_UPDATE);
-
+
save_item(NAME(m_blitter_addr));
save_item(NAME(m_last_trackball_val));
}
diff --git a/src/mame/drivers/cocoloco.c b/src/mame/drivers/cocoloco.c
index 8932025cc9b..e50969abada 100644
--- a/src/mame/drivers/cocoloco.c
+++ b/src/mame/drivers/cocoloco.c
@@ -192,21 +192,21 @@ public:
required_device<cpu_device> m_maincpu;
required_device<palette_device> m_palette;
-
+
UINT8 *m_videoram;
UINT8 m_videobank;
-
+
DECLARE_READ8_MEMBER(vram_r);
DECLARE_WRITE8_MEMBER(vram_w);
DECLARE_WRITE8_MEMBER(vbank_w);
DECLARE_WRITE8_MEMBER(vram_clear_w);
DECLARE_WRITE8_MEMBER(coincounter_w);
-
+
DECLARE_INPUT_CHANGED_MEMBER(coin_inserted);
-
+
virtual void video_start();
DECLARE_PALETTE_INIT(cocoloco);
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
};
diff --git a/src/mame/drivers/dynax.c b/src/mame/drivers/dynax.c
index 7570f3ea052..a565d8b502c 100644
--- a/src/mame/drivers/dynax.c
+++ b/src/mame/drivers/dynax.c
@@ -1564,14 +1564,14 @@ static ADDRESS_MAP_START( cdracula_io_map, AS_IO, 8, dynax_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE( 0x01, 0x07 ) AM_WRITE(cdracula_blitter_rev2_w) // Blitter + Destination Layers
AM_RANGE( 0x10, 0x10 ) AM_DEVREADWRITE("oki", okim6295_device, read, write)
- AM_RANGE( 0x11, 0x11 ) AM_NOP // unpopulated oki
+ AM_RANGE( 0x11, 0x11 ) AM_NOP // unpopulated oki
// AM_RANGE( 0x12, 0x12 ) AM_WRITENOP // CRT Controller
// AM_RANGE( 0x13, 0x13 ) AM_WRITENOP // CRT Controller
AM_RANGE( 0x20, 0x20 ) AM_READ_PORT("P1") // P1
AM_RANGE( 0x21, 0x21 ) AM_READ_PORT("P2") // P2
AM_RANGE( 0x22, 0x22 ) AM_READ_PORT("COINS") // Coins
AM_RANGE( 0x30, 0x30 ) AM_WRITE(dynax_layer_enable_w) // Layers Enable
-// AM_RANGE( 0x31, 0x31 ) AM_WRITE(dynax_rombank_w) // BANK ROM Select
+// AM_RANGE( 0x31, 0x31 ) AM_WRITE(dynax_rombank_w) // BANK ROM Select
AM_RANGE( 0x32, 0x32 ) AM_WRITE(dynax_blit_pen_w) // Destination Pen
AM_RANGE( 0x33, 0x33 ) AM_WRITE(dynax_blit_flags_w) // Flags + Do Blit
AM_RANGE( 0x34, 0x34 ) AM_WRITE(dynax_blit_palette01_w) // Layers Palettes (Low Bits)
@@ -2042,7 +2042,7 @@ static INPUT_PORTS_START( cdracula )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START("DSW1") // port $61 -> c217
+ PORT_START("DSW1") // port $61 -> c217
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Difficulty ) ) PORT_DIPLOCATION( "SW1:1,2" )
PORT_DIPSETTING( 0x03, DEF_STR( Easy ) ) // 44
PORT_DIPSETTING( 0x02, DEF_STR( Normal ) ) // 47
@@ -2062,9 +2062,9 @@ static INPUT_PORTS_START( cdracula )
PORT_DIPNAME( 0x40, 0x40, "Unknown 1-7" ) PORT_DIPLOCATION( "SW1:7" )
PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_SERVICE( 0x80, IP_ACTIVE_LOW ) PORT_DIPLOCATION( "SW1:8" )
+ PORT_SERVICE( 0x80, IP_ACTIVE_LOW ) PORT_DIPLOCATION( "SW1:8" )
- PORT_START("DSW2") // port $60 -> c216
+ PORT_START("DSW2") // port $60 -> c216
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) ) PORT_DIPLOCATION( "SW2:1,2" )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
@@ -3190,7 +3190,7 @@ static INPUT_PORTS_START( jantouki )
PORT_DIPSETTING( 0x00, "12:00" )
PORT_DIPNAME( 0x08, 0x00, "Nudity" )
PORT_DIPSETTING( 0x00, DEF_STR( Yes ) )
- PORT_DIPSETTING( 0x08, DEF_STR( No ) ) // Moles On Gal's Face
+ PORT_DIPSETTING( 0x08, DEF_STR( No ) ) // Moles On Gal's Face
PORT_DIPNAME( 0x10, 0x10, "Buy Screen Bonus Points" ) /* Sets your points to 100 every time you arrive at the screen for buying special items. */
PORT_DIPSETTING( 0x10, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -3363,7 +3363,7 @@ static INPUT_PORTS_START( mjembase )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPNAME( 0x80, 0x00, "Nudity" )
PORT_DIPSETTING( 0x00, DEF_STR( Yes ) )
- PORT_DIPSETTING( 0x80, DEF_STR( No ) ) // Moles On Gal's Face
+ PORT_DIPSETTING( 0x80, DEF_STR( No ) ) // Moles On Gal's Face
PORT_START("FAKE") /* IN10 - Fake DSW */
PORT_DIPNAME( 0xff, 0xff, "Allow Bets" )
@@ -3500,7 +3500,7 @@ static INPUT_PORTS_START( mjelct3 )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPNAME( 0x80, 0x00, "Nudity" )
PORT_DIPSETTING( 0x00, DEF_STR( Yes ) )
- PORT_DIPSETTING( 0x80, DEF_STR( No ) ) // Moles On Gal's Face
+ PORT_DIPSETTING( 0x80, DEF_STR( No ) ) // Moles On Gal's Face
PORT_START("FAKE") /* IN10 - Fake DSW */
PORT_DIPNAME( 0xff, 0xff, "Allow Bets" )
@@ -4354,7 +4354,7 @@ static MACHINE_CONFIG_START( cdracula, dynax_state )
MCFG_MACHINE_START_OVERRIDE(dynax_state,dynax)
MCFG_MACHINE_RESET_OVERRIDE(dynax_state,dynax)
-// MCFG_NVRAM_ADD_0FILL("nvram") // no battery
+// MCFG_NVRAM_ADD_0FILL("nvram") // no battery
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/fgoal.c b/src/mame/drivers/fgoal.c
index f1856cdb40a..804a3228031 100644
--- a/src/mame/drivers/fgoal.c
+++ b/src/mame/drivers/fgoal.c
@@ -339,7 +339,7 @@ GFXDECODE_END
void fgoal_state::machine_start()
{
m_interrupt_timer = timer_alloc(TIMER_INTERRUPT);
-
+
save_item(NAME(m_xpos));
save_item(NAME(m_ypos));
save_item(NAME(m_current_color));
diff --git a/src/mame/drivers/flyball.c b/src/mame/drivers/flyball.c
index bd64e087f4a..4d06d03db9f 100644
--- a/src/mame/drivers/flyball.c
+++ b/src/mame/drivers/flyball.c
@@ -61,10 +61,10 @@ public:
/* misc */
UINT8 m_potmask;
UINT8 m_potsense;
-
+
emu_timer *m_pot_clear_timer;
emu_timer *m_quarter_timer;
-
+
DECLARE_READ8_MEMBER(input_r);
DECLARE_READ8_MEMBER(scanline_r);
DECLARE_READ8_MEMBER(potsense_r);
@@ -75,17 +75,17 @@ public:
DECLARE_WRITE8_MEMBER(pitcher_vert_w);
DECLARE_WRITE8_MEMBER(pitcher_horz_w);
DECLARE_WRITE8_MEMBER(misc_w);
-
+
TILEMAP_MAPPER_MEMBER(get_memory_offset);
TILE_GET_INFO_MEMBER(get_tile_info);
-
+
virtual void machine_start();
virtual void machine_reset();
virtual void video_start();
DECLARE_PALETTE_INIT(flyball);
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-
+
TIMER_CALLBACK_MEMBER(joystick_callback);
TIMER_CALLBACK_MEMBER(quarter_callback);
@@ -428,7 +428,7 @@ void flyball_state::machine_start()
for (int i = 0; i < len; i++)
buf[i ^ 0x1ff] = ROM[i];
memcpy(ROM, buf, len);
-
+
m_pot_clear_timer = timer_alloc(TIMER_POT_CLEAR);
m_quarter_timer = timer_alloc(TIMER_QUARTER);
diff --git a/src/mame/drivers/goldstar.c b/src/mame/drivers/goldstar.c
index f1868c108a5..7daa0f8d626 100644
--- a/src/mame/drivers/goldstar.c
+++ b/src/mame/drivers/goldstar.c
@@ -2993,8 +2993,8 @@ static INPUT_PORTS_START( ns8linew )
PORT_DIPSETTING( 0x08, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x10, DEF_STR( 1C_4C ) )
PORT_DIPSETTING( 0x18, DEF_STR( 1C_5C ) )
- PORT_DIPSETTING( 0x20, DEF_STR( 1C_6C ) ) // manual says 1c/8c
- PORT_DIPSETTING( 0x28, "1 Coin/10 Credits" )
+ PORT_DIPSETTING( 0x20, DEF_STR( 1C_6C ) ) // manual says 1c/8c
+ PORT_DIPSETTING( 0x28, "1 Coin/10 Credits" )
PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) PORT_DIPLOCATION("DSW4:7") /* not checked */
PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -3375,12 +3375,12 @@ static INPUT_PORTS_START( bingowng )
PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) PORT_DIPLOCATION("DSW1:8")
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
-/* On a W-4 PCB these are used as: "Special Odds-Prohibition Of Winning...(Odds B)" - see DSW2-7
- PORT_DIPNAME( 0x80, 0x00, "Special Odds" ) PORT_DIPLOCATION("DSW1:7,8")
- PORT_DIPSETTING( 0x00, "None" )
- PORT_DIPSETTING( 0x40, "x300 (x1000)" )
- PORT_DIPSETTING( 0x80, "x500 (x5000" )
- PORT_DIPSETTING( 0xc0, "x1000 (x10000)
+/* On a W-4 PCB these are used as: "Special Odds-Prohibition Of Winning...(Odds B)" - see DSW2-7
+ PORT_DIPNAME( 0x80, 0x00, "Special Odds" ) PORT_DIPLOCATION("DSW1:7,8")
+ PORT_DIPSETTING( 0x00, "None" )
+ PORT_DIPSETTING( 0x40, "x300 (x1000)" )
+ PORT_DIPSETTING( 0x80, "x500 (x5000" )
+ PORT_DIPSETTING( 0xc0, "x1000 (x10000)
*/
PORT_START("DSW2")
@@ -3406,13 +3406,13 @@ static INPUT_PORTS_START( bingowng )
PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) PORT_DIPLOCATION("DSW2:8")
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
-/* On a W-4 PCB these are used as:
- PORT_DIPNAME( 0x40, 0x40, "Odds" ) PORT_DIPLOCATION("DSW2:7")
- PORT_DIPSETTING( 0x40, "Type A" )
- PORT_DIPSETTING( 0x00, "Type B" )
- PORT_DIPNAME( 0x80, 0x80, "Type Of W-Up Game" ) PORT_DIPLOCATION("DSW2:8")
- PORT_DIPSETTING( 0x80, "Slots" )
- PORT_DIPSETTING( 0x00, "Big/Small Card" )
+/* On a W-4 PCB these are used as:
+ PORT_DIPNAME( 0x40, 0x40, "Odds" ) PORT_DIPLOCATION("DSW2:7")
+ PORT_DIPSETTING( 0x40, "Type A" )
+ PORT_DIPSETTING( 0x00, "Type B" )
+ PORT_DIPNAME( 0x80, 0x80, "Type Of W-Up Game" ) PORT_DIPLOCATION("DSW2:8")
+ PORT_DIPSETTING( 0x80, "Slots" )
+ PORT_DIPSETTING( 0x00, "Big/Small Card" )
*/
/* On a W-4 PCB DSW3 & DSW4 are reversed and all dips on DSW4 are set to off! */
@@ -3672,7 +3672,7 @@ static INPUT_PORTS_START( schery97 )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_GAMBLE_KEYOUT ) PORT_NAME("Key Out / Attendant")
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_GAMBLE_SERVICE ) PORT_NAME("Settings")
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_GAMBLE_BOOK ) PORT_NAME("Stats") // doesn't work in v352c4
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_GAMBLE_BOOK ) PORT_NAME("Stats") // doesn't work in v352c4
PORT_START("DSW1")
PORT_DIPNAME( 0x07, 0x03, "Game Level (Difficulty)" ) PORT_DIPLOCATION("DSW1:1,2,3") /* OK */
@@ -4335,14 +4335,14 @@ static INPUT_PORTS_START( roypok96a )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x10, DEF_STR( On ) )
PORT_DIPNAME( 0x20, 0x00, "Unused - leave off" ) PORT_DIPLOCATION("DSW5:6")
- PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x20, DEF_STR( On ) )
PORT_DIPNAME( 0x40, 0x00, "Reset Remaining Score To Zero" ) PORT_DIPLOCATION("DSW5:7")
- PORT_DIPSETTING( 0x00, DEF_STR( No ) )
- PORT_DIPSETTING( 0x40, DEF_STR( Yes ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( No ) )
+ PORT_DIPSETTING( 0x40, DEF_STR( Yes ) )
PORT_DIPNAME( 0x80, 0x00, "Count Game To Issue Ticket" ) PORT_DIPLOCATION("DSW5:8")
- PORT_DIPSETTING( 0x00, DEF_STR( No ) )
- PORT_DIPSETTING( 0x80, DEF_STR( Yes ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( No ) )
+ PORT_DIPSETTING( 0x80, DEF_STR( Yes ) )
INPUT_PORTS_END
@@ -4472,7 +4472,7 @@ static INPUT_PORTS_START( pokonl97 )
PORT_DIPNAME( 0x10, 0x10, "Auto Ticket Dispense" ) PORT_DIPLOCATION("DSW4:5") /* not checked */
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x10, DEF_STR( Yes ) )
- PORT_DIPNAME( 0xe0, 0xe0, "Ticket Dispense Mode" ) PORT_DIPLOCATION("DSW4:6,7,8")
+ PORT_DIPNAME( 0xe0, 0xe0, "Ticket Dispense Mode" ) PORT_DIPLOCATION("DSW4:6,7,8")
PORT_DIPSETTING( 0xe0, "Continuous" )
PORT_DIPSETTING( 0xc0, "Max 1 Ticket Per Game" )
PORT_DIPSETTING( 0xa0, "Max 2 Ticket Per Game" )
diff --git a/src/mame/drivers/hng64.c b/src/mame/drivers/hng64.c
index 7749e0aa4eb..0b01b59c823 100644
--- a/src/mame/drivers/hng64.c
+++ b/src/mame/drivers/hng64.c
@@ -918,7 +918,7 @@ WRITE32_MEMBER(hng64_state::hng64_sprite_clear_odd_w)
WRITE32_MEMBER(hng64_state::hng64_vregs_w)
{
-// printf("hng64_vregs_w %02x, %08x %08x\n", offset * 4, data, mem_mask);
+// printf("hng64_vregs_w %02x, %08x %08x\n", offset * 4, data, mem_mask);
COMBINE_DATA(&m_videoregs[offset]);
}
@@ -1503,7 +1503,7 @@ void hng64_state::machine_start()
{
m_videoregs[i] = 0xdeadbeef;
}
-
+
}
@@ -1569,8 +1569,7 @@ MACHINE_CONFIG_END
ROM_REGION( 0x0100000, "user2", 0 ) /* KL5C80 BIOS */ \
ROM_LOAD ( "from1.bin", 0x000000, 0x080000, CRC(6b933005) SHA1(e992747f46c48b66e5509fe0adf19c91250b00c7) ) \
ROM_REGION( 0x0100000, "fpga", 0 ) /* FPGA data */ \
- ROM_LOAD ( "rom1.bin", 0x000000, 0x01ff32, CRC(4a6832dc) SHA1(ae504f7733c2f40450157cd1d3b85bc83fac8569) ) \
-
+ ROM_LOAD ( "rom1.bin", 0x000000, 0x01ff32, CRC(4a6832dc) SHA1(ae504f7733c2f40450157cd1d3b85bc83fac8569) )
ROM_START( hng64 )
/* BIOS */
diff --git a/src/mame/drivers/hotblock.c b/src/mame/drivers/hotblock.c
index bd6725d711a..9759df963e2 100644
--- a/src/mame/drivers/hotblock.c
+++ b/src/mame/drivers/hotblock.c
@@ -57,7 +57,7 @@ public:
/* devices */
required_device<cpu_device> m_maincpu;
required_device<palette_device> m_palette;
-
+
/* memory pointers */
required_shared_ptr<UINT8> m_vram;
@@ -67,15 +67,15 @@ public:
/* memory */
UINT8 m_pal[0x10000];
-
+
DECLARE_READ8_MEMBER(video_read);
DECLARE_READ8_MEMBER(port4_r);
DECLARE_WRITE8_MEMBER(port4_w);
DECLARE_WRITE8_MEMBER(port0_w);
DECLARE_WRITE8_MEMBER(video_write);
-
+
virtual void video_start();
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
};
diff --git a/src/mame/drivers/iteagle.c b/src/mame/drivers/iteagle.c
index dfcf369441e..9d541054843 100644
--- a/src/mame/drivers/iteagle.c
+++ b/src/mame/drivers/iteagle.c
@@ -105,9 +105,9 @@ class iteagle_state : public driver_device
public:
iteagle_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
- m_maincpu(*this, "maincpu")
+ m_maincpu(*this, "maincpu")
{}
-
+
required_device<mips3_device> m_maincpu;
virtual void machine_start();
@@ -129,7 +129,7 @@ static MACHINE_CONFIG_START( gtfore, iteagle_state )
MCFG_CPU_ADD("maincpu", VR4310LE, 166666666)
MCFG_MIPS3_ICACHE_SIZE(16384)
MCFG_MIPS3_DCACHE_SIZE(16384)
-
+
MCFG_PCI_ROOT_ADD( ":pci")
MCFG_VRC4373_ADD( ":pci:00.0", ":maincpu")
MCFG_ITEAGLE_FPGA_ADD( ":pci:06.0")
@@ -144,7 +144,7 @@ static MACHINE_CONFIG_START( gtfore, iteagle_state )
MCFG_SCREEN_SIZE(640, 350)
MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 349)
MCFG_SCREEN_UPDATE_DEVICE(":pci:09.0", voodoo_pci_device, screen_update)
-
+
MACHINE_CONFIG_END
@@ -167,7 +167,7 @@ static INPUT_PORTS_START( iteagle )
PORT_DIPNAME( 0x0F00, 0x0000, "GAME" )
PORT_DIPNAME( 0x00F0, 0x0000, "MAJOR" )
PORT_DIPNAME( 0x000F, 0x0000, "MINOR" )
-
+
INPUT_PORTS_END
static INPUT_PORTS_START( gtfore05 )
@@ -263,7 +263,7 @@ ROM_START( gtfore02 )
DISK_REGION( ":pci:06.1:ide:0:hdd:image" )
DISK_IMAGE( "golf_fore_2002_v2.01.04_umv", 0, SHA1(e902b91bd739daee0b95b10e5cf33700dd63a76b) ) /* Labeled Golf Fore! V2.01.04 UMV */
//DISK_REGION( "ide:1:cdrom" ) // program CD-ROM
-
+
ROM_END
ROM_START( gtfore02o )
diff --git a/src/mame/drivers/jankenmn.c b/src/mame/drivers/jankenmn.c
index c28b74a276c..fe874996a79 100644
--- a/src/mame/drivers/jankenmn.c
+++ b/src/mame/drivers/jankenmn.c
@@ -153,11 +153,11 @@ public:
m_maincpu(*this, "maincpu") { }
required_device<cpu_device> m_maincpu;
-
+
DECLARE_WRITE8_MEMBER(lamps1_w);
DECLARE_WRITE8_MEMBER(lamps2_w);
DECLARE_WRITE8_MEMBER(lamps3_w);
-
+
DECLARE_CUSTOM_INPUT_MEMBER(hopper_status_r);
};
diff --git a/src/mame/drivers/jchan.c b/src/mame/drivers/jchan.c
index 5a32033f88c..14be78b6dbb 100644
--- a/src/mame/drivers/jchan.c
+++ b/src/mame/drivers/jchan.c
@@ -228,9 +228,9 @@ public:
DECLARE_DRIVER_INIT(jchan);
virtual void video_start();
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-
+
TIMER_DEVICE_CALLBACK_MEMBER(vblank);
};
@@ -290,7 +290,7 @@ void jchan_state::video_start()
m_spritegen1->skns_sprite_kludge(0,0);
m_spritegen2->skns_sprite_kludge(0,0);
-
+
save_item(NAME(m_irq_sub_enable));
save_pointer(NAME(m_sprite_ram32_1), 0x4000/4);
save_pointer(NAME(m_sprite_ram32_2), 0x4000/4);
diff --git a/src/mame/drivers/junofrst.c b/src/mame/drivers/junofrst.c
index 538671d705d..36f18235a0b 100644
--- a/src/mame/drivers/junofrst.c
+++ b/src/mame/drivers/junofrst.c
@@ -105,11 +105,11 @@ public:
required_device<filter_rc_device> m_filter_0_0;
required_device<filter_rc_device> m_filter_0_1;
required_device<filter_rc_device> m_filter_0_2;
-
+
UINT8 m_blitterdata[4];
int m_i8039_status;
int m_last_irq;
-
+
DECLARE_WRITE8_MEMBER(blitter_w);
DECLARE_WRITE8_MEMBER(bankselect_w);
DECLARE_WRITE8_MEMBER(sh_irqtrigger_w);
diff --git a/src/mame/drivers/m72.c b/src/mame/drivers/m72.c
index e26226b702e..8fa6c0cb04c 100644
--- a/src/mame/drivers/m72.c
+++ b/src/mame/drivers/m72.c
@@ -1785,7 +1785,7 @@ static MACHINE_CONFIG_START( m72_base, m72_state )
MCFG_CPU_ADD("soundcpu",Z80, SOUND_CLOCK)
MCFG_CPU_PROGRAM_MAP(sound_ram_map)
MCFG_CPU_IO_MAP(sound_portmap)
-
+
/* video hardware */
MCFG_GFXDECODE_ADD("gfxdecode", "palette", m72)
@@ -1834,7 +1834,7 @@ static MACHINE_CONFIG_DERIVED( xmultiplm72, m72_8751 )
MCFG_CPU_PERIODIC_INT_DRIVER(m72_state, nmi_line_pulse, 128*55) /* clocked by V1? (Vigilante) */
/* IRQs are generated by main Z80 and YM2151 */
-
+
MCFG_MACHINE_RESET_OVERRIDE(m72_state,xmultipl)
MACHINE_CONFIG_END
@@ -1852,7 +1852,7 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( dkgenm72, m72 ) // dervices from 'm72' because we use 'fake nmi' on the soundcpu
-
+
MCFG_MACHINE_RESET_OVERRIDE(m72_state,xmultipl)
MACHINE_CONFIG_END
@@ -1871,7 +1871,7 @@ static MACHINE_CONFIG_DERIVED( xmultipl, m72 )
MCFG_CPU_PERIODIC_INT_DRIVER(m72_state, nmi_line_pulse, 128*55) /* clocked by V1? (Vigilante) */
/* IRQs are generated by main Z80 and YM2151 */
-
+
MCFG_MACHINE_RESET_OVERRIDE(m72_state,xmultipl)
MCFG_VIDEO_START_OVERRIDE(m72_state,xmultipl)
@@ -1948,7 +1948,7 @@ static MACHINE_CONFIG_START( dbreed, m72_state )
MCFG_CPU_PERIODIC_INT_DRIVER(m72_state, nmi_line_pulse, 128*55) /* clocked by V1? (Vigilante) */
/* IRQs are generated by main Z80 and YM2151 */
-
+
MCFG_MACHINE_RESET_OVERRIDE(m72_state,xmultipl)
/* video hardware */
@@ -1979,7 +1979,7 @@ static MACHINE_CONFIG_START( hharry, m72_state )
MCFG_CPU_PERIODIC_INT_DRIVER(m72_state, nmi_line_pulse, 128*55) /* clocked by V1? (Vigilante) */
/* IRQs are generated by main Z80 and YM2151 */
-
+
MCFG_MACHINE_RESET_OVERRIDE(m72_state,xmultipl)
/* video hardware */
@@ -2011,7 +2011,7 @@ static MACHINE_CONFIG_START( hharryu, m72_state )
MCFG_CPU_PERIODIC_INT_DRIVER(m72_state, nmi_line_pulse, 128*55) /* clocked by V1? (Vigilante) */
/* IRQs are generated by main Z80 and YM2151 */
-
+
MCFG_MACHINE_RESET_OVERRIDE(m72_state,xmultipl)
/* video hardware */
diff --git a/src/mame/drivers/madalien.c b/src/mame/drivers/madalien.c
index d58ca5a2213..27134b2843b 100644
--- a/src/mame/drivers/madalien.c
+++ b/src/mame/drivers/madalien.c
@@ -437,7 +437,7 @@ ROM_START( madalienb )
ROM_LOAD( "mc-1.3k", 0x0000, 0x0400, BAD_DUMP CRC(2710c47e) SHA1(337e4f160c7db143ec3bfae3e08e8789b9e41cc5) ) // taken from chwy, see below, tile 2 is mismatched with the 2 roms from the actual PCB.
ROM_LOAD( "me-1.3l", 0x0400, 0x0400, CRC(7328a425) SHA1(327adc8b0e25d93f1ae98a44c26d0aaaac1b1a9c) )
ROM_LOAD( "md-1.3m", 0x0800, 0x0400, CRC(b5329929) SHA1(86890e1b7cc8cb31fc0dcbc2d3cff02e4cf95619) )
-
+
/* for reference, this is the data used by Highway Chase on the cassette system when extracted
ROM_REGION( 0x0400, "user1", 0 ) // background tile map
ROM_LOAD( "rom1", 0x0000, 0x0400, CRC(9b04c446) SHA1(918013f3c0244ab6a670b9d1b6b642298e2c5ab8) )
diff --git a/src/mame/drivers/mgolf.c b/src/mame/drivers/mgolf.c
index 5baa1d7c4d0..b8e72700fd2 100644
--- a/src/mame/drivers/mgolf.c
+++ b/src/mame/drivers/mgolf.c
@@ -47,18 +47,18 @@ public:
DECLARE_READ8_MEMBER(dial_r);
DECLARE_READ8_MEMBER(misc_r);
DECLARE_WRITE8_MEMBER(wram_w);
-
+
TILE_GET_INFO_MEMBER(get_tile_info);
-
+
virtual void machine_start();
virtual void machine_reset();
virtual void video_start();
DECLARE_PALETTE_INIT(mgolf);
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-
+
TIMER_CALLBACK_MEMBER(interrupt_callback);
-
+
void update_plunger( );
double calc_plunger_pos();
@@ -343,7 +343,7 @@ GFXDECODE_END
void mgolf_state::machine_start()
{
m_interrupt_timer = timer_alloc(TIMER_INTERRUPT);
-
+
save_item(NAME(m_prev));
save_item(NAME(m_mask));
save_item(NAME(m_time_pushed));
diff --git a/src/mame/drivers/neogeo.c b/src/mame/drivers/neogeo.c
index 52918dd89b1..9357761b511 100644
--- a/src/mame/drivers/neogeo.c
+++ b/src/mame/drivers/neogeo.c
@@ -238,9 +238,9 @@
. NEO-AEG CHA42G-3
. NEO-AEG CHA42G-4
. NEO-AEG CHA256
- . NEO-AEG CHA256 B
+ . NEO-AEG CHA256 B
. NEO-AEG CHA256[B]
- . NEO-AEG CHA256BY
+ . NEO-AEG CHA256BY
. NEO-AEG CHA256RY
. NEO-AEG CHA512Y
. NEO-AEG CHAFIO (1999.8.10) - used with NEO-CMC 90G06C7042 or NEO-CMC 90G06C7050
@@ -263,7 +263,7 @@
. NEO-AEG PROG4096 B
. NEO-AEG PROGGS
. NEO-AEG PROGTOP2
- . NEO-AEG PROGTOP2Y
+ . NEO-AEG PROGTOP2Y
. NEO-AEG PROGEOP (1999.4.2)
. NEO-AEG PROGLBA (1999.7.6)
. NEO-AEG PROGRK
@@ -310,16 +310,16 @@
GIGA PROG Board 1.0
GIGA PROG Board 1.5
-
- Unofficial pcb's from NEOBITZ:
-
- MVS CHA:
- CHARBITZ1 2013.12.01
-
- MVS PROG:
- PROGBITZ1 2013.12.01
-
-
+
+ Unofficial pcb's from NEOBITZ:
+
+ MVS CHA:
+ CHARBITZ1 2013.12.01
+
+ MVS PROG:
+ PROGBITZ1 2013.12.01
+
+
Neo-Geo game PCB infos by Johnboy
diff --git a/src/mame/drivers/neogeo_noslot.c b/src/mame/drivers/neogeo_noslot.c
index dea6d008728..9c839f06fd8 100644
--- a/src/mame/drivers/neogeo_noslot.c
+++ b/src/mame/drivers/neogeo_noslot.c
@@ -1237,7 +1237,7 @@ ROM_END
ID-0023
. NGM-023
NEO-MVS PROG42G / NEO-MVS CHA42G
- NEO-MVS PROGTOP / NEO-MVS CHA-256
+ NEO-MVS PROGTOP / NEO-MVS CHA-256
Boards used for the Korean release
. NGH-023
NEO-AEG PROG42G-1 / NEO-AEG CHA42G-1
@@ -1915,7 +1915,7 @@ ROM_START( aof ) /* MVS AND AES VERSION */
ROM_REGION( 0x100000, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "044-p1.p1", 0x000000, 0x080000, CRC(ca9f7a6d) SHA1(4d28ef86696f7e832510a66d3e8eb6c93b5b91a1) ) /* TC534200 */
/* also found sets with ep1 or p1 on eprom. */
-
+
NEO_SFIX_128K( "044-s1.s1", CRC(89903f39) SHA1(a04a0c244a5d5c7a595fcf649107969635a6a8b6) ) /* TC531000 */
NEO_BIOS_AUDIO_128K( "044-m1.m1", CRC(0987e4bb) SHA1(8fae4b7fac09d46d4727928e609ed9d3711dbded) ) /* TC531001 */
@@ -1950,7 +1950,7 @@ ROM_START( samsho ) /* MVS VERSION */
ROM_LOAD16_WORD_SWAP( "045-p1.p1", 0x000000, 0x100000, CRC(dfe51bf0) SHA1(2243af3770a516ae698b69bcd9daf53632d9128d) ) /* TC538200 */
ROM_LOAD16_WORD_SWAP( "045-pg2.sp2", 0x100000, 0x100000, CRC(46745b94) SHA1(d9e959fd1f88c9402915c1d0dcdb4a9e3d49cdcb) ) /* TC538200 */
/* also found set with ep1 / ep2 on eprom and sp2 on maskrom; same rom data as samshoh is used. */
-
+
NEO_SFIX_128K( "045-s1.s1", CRC(9142a4d3) SHA1(54088e99fcfd75fd0f94852890a56350066a05a3) ) /* TC531000 */
NEO_BIOS_AUDIO_128K( "045-m1.m1", CRC(95170640) SHA1(125c502db0693e8d11cef619b090081c14a9a300) ) /* TC531001 */
@@ -2271,7 +2271,7 @@ ROM_START( wh1h ) /* AES VERSION */
ROM_REGION( 0x100000, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "053-p1.p1", 0x000000, 0x080000, CRC(95b574cb) SHA1(b7b7af6a04c3d902e7f8852897741ecaf0b1062c) ) /* TC534200 */
ROM_LOAD16_WORD_SWAP( "053-p2.p2", 0x080000, 0x080000, CRC(f198ed45) SHA1(24ccc091e97f63796562bb5b30df51f39bd504ef) ) /* TC534200 */
-
+
NEO_SFIX_128K( "053-s1.s1", CRC(8c2c2d6b) SHA1(87fa79611c6f8886dcc8766814829c669c65b40f) ) /* TC531000 */
NEO_BIOS_AUDIO_128K( "053-m1.m1", CRC(1bd9d04b) SHA1(65cd7b002123ed1a3111e3d942608d0082799ff3) ) /* TC531001 */
@@ -2615,7 +2615,7 @@ ROM_START( ssideki2 ) /* MVS AND AES VERSION */
ROM_REGION( 0x100000, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "061-p1.p1", 0x000000, 0x100000, CRC(5969e0dc) SHA1(78abea880c125ec5a85bef6404478512a34b5513) ) /* mask rom TC538200 */
/* also found MVS sets with ep1 / ep2 on eprom; correct chip label unknown. */
-
+
NEO_SFIX_128K( "061-s1.s1", CRC(226d1b68) SHA1(de010f6fda3ddadb181fe37daa6105f22e78b970) ) /* mask rom TC531000 */
NEO_BIOS_AUDIO_128K( "061-m1.m1", CRC(156f6951) SHA1(49686f615f109a02b4f23931f1c84fee13872ffd) ) /* mask rom TC531001 */
@@ -2679,7 +2679,7 @@ ROM_START( samsho2 ) /* MVS AND AES VERSION */
ROM_LOAD16_WORD_SWAP( "063-p1.p1", 0x100000, 0x100000, CRC(22368892) SHA1(0997f8284aa0f57a333be8a0fdea777d0d01afd6) ) /* TC5316200 */
ROM_CONTINUE( 0x000000, 0x100000 )
/* also found MVS sets with ep1 / ep2 on eprom and p1 / sp2 on maskrom; correct chip label unknown */
-
+
NEO_SFIX_128K( "063-s1.s1", CRC(64a5cd66) SHA1(12cdfb27bf9ccd5a8df6ddd4628ef7cf2c6d4964) ) /* TC531000 */
NEO_BIOS_AUDIO_128K( "063-m1.m1", CRC(56675098) SHA1(90429fc40d056d480d0e2bbefbc691d9fa260fc4) ) /* TC531001 */
@@ -2965,7 +2965,7 @@ ROM_END
BANK 3 NOT USED
****************************************/
- ROM_START( b2b )
+ ROM_START( b2b )
ROM_REGION( 0x100000, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "071.p1", 0x000000, 0x080000, CRC(7687197d) SHA1(4bb9cb7819807f7a7e1f85f1c4faac4a2f8761e8) )
@@ -4252,7 +4252,7 @@ ROM_START( kof96 ) /* MVS VERSION */
ROM_LOAD16_WORD_SWAP( "214-p1.p1", 0x000000, 0x100000, CRC(52755d74) SHA1(4232d627f1d2e6ea9fc8cf01571d77d4d5b8a1bb) ) /* TC538200 */
ROM_LOAD16_WORD_SWAP( "214-p2.sp2", 0x100000, 0x200000, CRC(002ccb73) SHA1(3ae8df682c75027ca82db25491021eeba00a267e) ) /* TC5316200 */
/* also found sets with ep1 / ep2 / ep3 / ep4 on eprom and 214-P5 on TC5316200; correct chip labels for eproms is unknown */
-
+
NEO_SFIX_128K( "214-s1.s1", CRC(1254cbdb) SHA1(fce5cf42588298711a3633e9c9c1d4dcb723ac76) ) /* TC531000 */
NEO_BIOS_AUDIO_128K( "214-m1.m1", CRC(dabc427c) SHA1(b76722ed142ee7addceb4757424870dbd003e8b3) ) /* TC531001 */
@@ -5013,9 +5013,9 @@ ROM_START( lastblad ) /* MVS VERSION */
ROM_REGION( 0x500000, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "234-p1.p1", 0x000000, 0x100000, CRC(e123a5a3) SHA1(a3ddabc00feeb54272b145246612ad4632b0e413) ) /* TC538200 */
ROM_LOAD16_WORD_SWAP( "234-p2.sp2", 0x100000, 0x400000, CRC(0fdc289e) SHA1(1ff31c0b0f4f9ddbedaf4bcf927faaae81892ec7) ) /* TC5332205 */
- /* also found sets with p1 / sp2 / ep1 / ep2 / m1 on eprom with sticker */
+ /* also found sets with p1 / sp2 / ep1 / ep2 / m1 on eprom with sticker */
/* chip label is 0234-P1, 0234-SP2, 0234-EP1, 0234-EP2 and 0234-M1 */
-
+
NEO_SFIX_128K( "234-s1.s1", CRC(95561412) SHA1(995de272f572fd08d909d3d0af4251b9957b3640) ) /* TC531000 */
NEO_BIOS_AUDIO_128K( "234-m1.m1", CRC(087628ea) SHA1(48dcf739bb16699af4ab8ed632b7dcb25e470e06) ) /* TC531001 */
@@ -6193,7 +6193,7 @@ ROM_START( mslug3 ) /* Original Version - Encrypted Code & GFX */ /* revision 20
/* The SMA for this release has a green colour marking; the older revision has a white colour marking */
ROM_LOAD16_WORD_SWAP( "256-pg1.p1", 0x100000, 0x400000, CRC(b07edfd5) SHA1(dcbd9e500bfae98d754e55cdbbbbf9401013f8ee) ) /* TC5332202 */
ROM_LOAD16_WORD_SWAP( "256-pg2.p2", 0x500000, 0x400000, CRC(6097c26b) SHA1(248ec29d21216f29dc6f5f3f0e1ad1601b3501b6) ) /* TC5332202 */
-
+
ROM_Y_ZOOM
/* The Encrypted Boards do not have an s1 rom, data for it comes from the Cx ROMs */
@@ -6230,7 +6230,7 @@ ROM_START( mslug3h ) /* Original Version - Encrypted GFX */ /* revision 2000.3.1
ROM_LOAD16_WORD_SWAP( "256-ph2.sp2", 0x100000, 0x400000, CRC(1f3d8ce8) SHA1(08b05a8abfb86ec09a5e758d6273acf1489961f9) )
/* also found AES set with p1 / p2 on maskrom on NEO-AEG PROGLBA (NEO-SMA); chip labels is 256-PG1 and 256-PG2 */
/* The SMA for this release has a pink color marking */
-
+
ROM_Y_ZOOM
/* The Encrypted Boards do not have an s1 rom, data for it comes from the Cx ROMs */
@@ -6748,7 +6748,7 @@ ROM_START( pnyaa ) /* Encrypted Set */ /* MVS ONLY RELEASE */
ROM_REGION( 0x100000, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "267-p1.p1", 0x000000, 0x100000, CRC(112fe2c0) SHA1(01420e051f0bdbd4f68ce306a3738161b96f8ba8) ) /* mask rom TC538200 */
/* also found set with p1 and m1 on eprom with sticker; chip labels is PN 2.02 and M1 */
-
+
ROM_Y_ZOOM
/* The Encrypted Boards do not have an s1 rom, data for it comes from the Cx ROMs */
@@ -6820,7 +6820,7 @@ ROM_START( mslug5h ) /* Encrypted Set */ /* AES release of the game but is also
ROM_LOAD32_WORD_SWAP( "268-p1c.p1", 0x000000, 0x400000, CRC(3636690a) SHA1(e0da714b4bdc6efffe1250ded02ebddb3ab6d7b3) )
ROM_LOAD32_WORD_SWAP( "268-p2c.p2", 0x000002, 0x400000, CRC(8dfc47a2) SHA1(27d618cfbd0107a4d2a836797e967b39d2eb4851) )
/* also found AES set with p1 / p2 on maskrom; chip labels is 268-P1CR2 and 268-P2CR2 */
-
+
ROM_Y_ZOOM
/* The Encrypted Boards do not have an s1 rom, data for it comes from the Cx ROMs */
diff --git a/src/mame/drivers/paradise.c b/src/mame/drivers/paradise.c
index a08aa36bb8c..bdb91cb46a0 100644
--- a/src/mame/drivers/paradise.c
+++ b/src/mame/drivers/paradise.c
@@ -660,7 +660,7 @@ GFXDECODE_END
void paradise_state::machine_start()
{
int bank_n = memregion("maincpu")->bytes() / 0x4000;
-
+
membank("prgbank")->configure_entries(0, bank_n, memregion("maincpu")->base(), 0x4000);
save_item(NAME(m_palbank));
diff --git a/src/mame/drivers/peplus.c b/src/mame/drivers/peplus.c
index 71a33461503..6cf5fd7c676 100644
--- a/src/mame/drivers/peplus.c
+++ b/src/mame/drivers/peplus.c
@@ -9256,7 +9256,7 @@ Joker Poker P17A 95.50%
ROM_REGION( 0x10000, "maincpu", 0 )
ROM_LOAD( "xmp00025.u67", 0x00000, 0x10000, CRC(5d39ff71) SHA1(0a5f67e61ae0e8a08cc551ab4271ffc97c343ae3) ) /* International multi currency version - Auto Hold always on */
/* Also compatible with XMP00002, XMP00003, XMP00004, XMP00006 and XMP00024 programs */
-
+
ROM_REGION( 0x10000, "user1", 0 )
ROM_LOAD( "xm00013p.u66", 0x00000, 0x10000, CRC(4fde73f9) SHA1(f8eb6fb0585e8df9a7eb2ddc65bb20b120753d7a) )
diff --git a/src/mame/drivers/playmark.c b/src/mame/drivers/playmark.c
index ac791c1b52f..7467d262c91 100644
--- a/src/mame/drivers/playmark.c
+++ b/src/mame/drivers/playmark.c
@@ -1375,7 +1375,7 @@ static MACHINE_CONFIG_START( hrdtimes, playmark_state )
MCFG_CPU_VBLANK_INT_DRIVER("screen", playmark_state, irq6_line_hold)
MCFG_CPU_ADD("audiocpu", PIC16C57, XTAL_24MHz/2) /* verified on pcb */
-// MCFG_PIC16C5x_WRITE_A_CB(WRITE8(playmark_state, playmark_oki_banking_w)) // Banking data output but not wired. Port C is wired to the OKI banking instead
+// MCFG_PIC16C5x_WRITE_A_CB(WRITE8(playmark_state, playmark_oki_banking_w)) // Banking data output but not wired. Port C is wired to the OKI banking instead
MCFG_PIC16C5x_READ_B_CB(READ8(playmark_state, playmark_snd_command_r))
MCFG_PIC16C5x_WRITE_B_CB(WRITE8(playmark_state, playmark_oki_w))
MCFG_PIC16C5x_READ_C_CB(READ8(playmark_state, playmark_snd_flag_r))
@@ -1416,7 +1416,7 @@ static MACHINE_CONFIG_START( hotmind, playmark_state )
MCFG_CPU_VBLANK_INT_DRIVER("screen", playmark_state, irq6_line_hold) // irq 2 and 6 point to the same location on hotmind
MCFG_CPU_ADD("audiocpu", PIC16C57, XTAL_24MHz/2) /* verified on pcb */
-// MCFG_PIC16C5x_WRITE_A_CB(WRITE8(playmark_state, playmark_oki_banking_w)) // Banking data output but not wired. Port C is wired to the OKI banking instead
+// MCFG_PIC16C5x_WRITE_A_CB(WRITE8(playmark_state, playmark_oki_banking_w)) // Banking data output but not wired. Port C is wired to the OKI banking instead
MCFG_PIC16C5x_READ_B_CB(READ8(playmark_state, playmark_snd_command_r))
MCFG_PIC16C5x_WRITE_B_CB(WRITE8(playmark_state, playmark_oki_w))
MCFG_PIC16C5x_READ_C_CB(READ8(playmark_state, playmark_snd_flag_r))
@@ -1462,7 +1462,7 @@ static MACHINE_CONFIG_START( luckboomh, playmark_state )
MCFG_CPU_VBLANK_INT_DRIVER("screen", playmark_state, irq6_line_hold)
MCFG_CPU_ADD("audiocpu", PIC16C57, XTAL_24MHz/2) /* verified on pcb */
-// MCFG_PIC16C5x_WRITE_A_CB(WRITE8(playmark_state, playmark_oki_banking_w)) // Banking data output but not wired. Port C is wired to the OKI banking instead
+// MCFG_PIC16C5x_WRITE_A_CB(WRITE8(playmark_state, playmark_oki_banking_w)) // Banking data output but not wired. Port C is wired to the OKI banking instead
MCFG_PIC16C5x_READ_B_CB(READ8(playmark_state, playmark_snd_command_r))
MCFG_PIC16C5x_WRITE_B_CB(WRITE8(playmark_state, playmark_oki_w))
MCFG_PIC16C5x_READ_C_CB(READ8(playmark_state, playmark_snd_flag_r))
diff --git a/src/mame/drivers/psychic5.c b/src/mame/drivers/psychic5.c
index 5998e87ba85..b7da83ebe5c 100644
--- a/src/mame/drivers/psychic5.c
+++ b/src/mame/drivers/psychic5.c
@@ -318,14 +318,14 @@ The first sprite data is located at f20b,then f21b and so on.
MACHINE_START_MEMBER(psychic5_state, psychic5)
{
membank("mainbank")->configure_entries(0, 4, memregion("maincpu")->base() + 0x10000, 0x4000);
-
+
save_item(NAME(m_bank_latch));
}
MACHINE_START_MEMBER(psychic5_state, bombsa)
{
membank("mainbank")->configure_entries(0, 8, memregion("maincpu")->base() + 0x10000, 0x4000);
-
+
save_item(NAME(m_bank_latch));
}
@@ -707,7 +707,7 @@ static MACHINE_CONFIG_START( psychic5, psychic5_state )
MCFG_CPU_IO_MAP(psychic5_soundport_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600)) /* Allow time for 2nd cpu to interleave */
-
+
MCFG_MACHINE_START_OVERRIDE(psychic5_state,psychic5)
/* video hardware */
@@ -763,7 +763,7 @@ static MACHINE_CONFIG_START( bombsa, psychic5_state )
MCFG_CPU_IO_MAP(bombsa_soundport_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
-
+
MCFG_MACHINE_START_OVERRIDE(psychic5_state,bombsa)
/* video hardware */
diff --git a/src/mame/drivers/pturn.c b/src/mame/drivers/pturn.c
index aeddf8a66a3..894102ea23c 100644
--- a/src/mame/drivers/pturn.c
+++ b/src/mame/drivers/pturn.c
@@ -123,14 +123,14 @@ public:
TILE_GET_INFO_MEMBER(get_tile_info);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
-
+
DECLARE_DRIVER_INIT(pturn);
virtual void machine_start();
virtual void machine_reset();
virtual void video_start();
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-
+
INTERRUPT_GEN_MEMBER(sub_intgen);
INTERRUPT_GEN_MEMBER(main_intgen);
};
@@ -174,7 +174,7 @@ void pturn_state::video_start()
m_fgmap->set_transparent_pen(0);
m_bgmap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(pturn_state::get_bg_tile_info),this),TILEMAP_SCAN_ROWS,8, 8,32,32*8);
m_bgmap->set_transparent_pen(0);
-
+
save_item(NAME(m_bgbank));
save_item(NAME(m_fgbank));
save_item(NAME(m_bgpalette));
diff --git a/src/mame/drivers/re900.c b/src/mame/drivers/re900.c
index 1c2cb63a56b..7d335f9c0fb 100644
--- a/src/mame/drivers/re900.c
+++ b/src/mame/drivers/re900.c
@@ -101,18 +101,18 @@ public:
UINT8 m_ledant;
UINT8 m_player;
UINT8 m_stat_a;
-
+
// common
DECLARE_READ8_MEMBER(rom_r);
DECLARE_WRITE8_MEMBER(cpu_port_0_w);
DECLARE_WRITE8_MEMBER(watchdog_reset_w);
-
+
// re900 specific
DECLARE_READ8_MEMBER(re_psg_portA_r);
DECLARE_READ8_MEMBER(re_psg_portB_r);
DECLARE_WRITE8_MEMBER(re_mux_port_A_w);
DECLARE_WRITE8_MEMBER(re_mux_port_B_w);
-
+
DECLARE_DRIVER_INIT(re900);
};
@@ -432,7 +432,7 @@ DRIVER_INIT_MEMBER(re900_state,re900)
m_player = 1;
m_stat_a = 1;
m_psg_pa = m_psg_pb = m_mux_data = m_ledant = 0;
-
+
save_item(NAME(m_psg_pa));
save_item(NAME(m_psg_pb));
save_item(NAME(m_mux_data));
diff --git a/src/mame/drivers/rltennis.c b/src/mame/drivers/rltennis.c
index 40f3558cddc..4523bd4c6dc 100644
--- a/src/mame/drivers/rltennis.c
+++ b/src/mame/drivers/rltennis.c
@@ -157,7 +157,7 @@ void rltennis_state::machine_start()
m_samples_2 = memregion("samples2")->base();
m_gfx = memregion("gfx1")->base();
m_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(rltennis_state::sample_player),this));
-
+
save_item(NAME(m_data760000));
save_item(NAME(m_data740000));
save_item(NAME(m_dac_counter));
diff --git a/src/mame/drivers/sandscrp.c b/src/mame/drivers/sandscrp.c
index 153ddbd73b6..baf5c66adbf 100644
--- a/src/mame/drivers/sandscrp.c
+++ b/src/mame/drivers/sandscrp.c
@@ -102,7 +102,7 @@ public:
UINT8 m_vblank_irq;
UINT8 m_latch1_full;
UINT8 m_latch2_full;
-
+
DECLARE_READ16_MEMBER(irq_cause_r);
DECLARE_WRITE16_MEMBER(irq_cause_w);
DECLARE_WRITE16_MEMBER(coincounter_w);
@@ -114,12 +114,12 @@ public:
DECLARE_READ8_MEMBER(latchstatus_r);
DECLARE_READ8_MEMBER(soundlatch_r);
DECLARE_WRITE8_MEMBER(soundlatch_w);
-
+
virtual void machine_start();
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void screen_eof(screen_device &screen, bool state);
-
+
INTERRUPT_GEN_MEMBER(interrupt);
void update_irq_state();
};
@@ -150,7 +150,7 @@ UINT32 sandscrp_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap
void sandscrp_state::machine_start()
{
membank("bank1")->configure_entries(0, 8, memregion("audiocpu")->base(), 0x4000);
-
+
save_item(NAME(m_sprite_irq));
save_item(NAME(m_unknown_irq));
save_item(NAME(m_vblank_irq));
diff --git a/src/mame/drivers/scobra.c b/src/mame/drivers/scobra.c
index aea64789de4..ead37d0d5f1 100644
--- a/src/mame/drivers/scobra.c
+++ b/src/mame/drivers/scobra.c
@@ -1253,4 +1253,3 @@ GAME( 1981, hustlerb4, hustler, hustlerb4, hustler, driver_device, 0,
GAME( 1982, mimonkey, 0, mimonkey, mimonkey, scramble_state, mimonkey, ROT90, "Universal Video Games", "Mighty Monkey", GAME_SUPPORTS_SAVE )
GAME( 1982, mimonsco, mimonkey, mimonkey, mimonsco, scramble_state, mimonsco, ROT90, "bootleg", "Mighty Monkey (bootleg on Super Cobra hardware)", GAME_SUPPORTS_SAVE )
-
diff --git a/src/mame/drivers/seta.c b/src/mame/drivers/seta.c
index 3b2ba24c92d..c41cbf515c0 100644
--- a/src/mame/drivers/seta.c
+++ b/src/mame/drivers/seta.c
@@ -7796,7 +7796,7 @@ static MACHINE_CONFIG_START( downtown, seta_state )
MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode")
MCFG_SETA001_SPRITE_PALETTE("palette")
MCFG_SETA001_SPRITE_GFXBANK_CB(seta_state, setac_gfxbank_callback)
-
+
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(57.42) /* verified on pcb */
@@ -7857,7 +7857,7 @@ static MACHINE_CONFIG_START( usclssic, seta_state )
MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode")
MCFG_SETA001_SPRITE_PALETTE("palette")
MCFG_SETA001_SPRITE_GFXBANK_CB(seta_state, setac_gfxbank_callback)
-
+
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
@@ -7912,7 +7912,7 @@ static MACHINE_CONFIG_START( calibr50, seta_state )
MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode")
MCFG_SETA001_SPRITE_PALETTE("palette")
MCFG_SETA001_SPRITE_GFXBANK_CB(seta_state, setac_gfxbank_callback)
-
+
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(57.42) /* verified on pcb */
@@ -7956,7 +7956,7 @@ static MACHINE_CONFIG_START( metafox, seta_state )
MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode")
MCFG_SETA001_SPRITE_PALETTE("palette")
MCFG_SETA001_SPRITE_GFXBANK_CB(seta_state, setac_gfxbank_callback)
-
+
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
@@ -8040,7 +8040,7 @@ static MACHINE_CONFIG_START( blandia, seta_state )
MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode")
MCFG_SETA001_SPRITE_PALETTE("palette")
MCFG_SETA001_SPRITE_GFXBANK_CB(seta_state, setac_gfxbank_callback)
-
+
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
@@ -8078,7 +8078,7 @@ static MACHINE_CONFIG_START( blandiap, seta_state )
MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode")
MCFG_SETA001_SPRITE_PALETTE("palette")
MCFG_SETA001_SPRITE_GFXBANK_CB(seta_state, setac_gfxbank_callback)
-
+
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
@@ -8196,7 +8196,7 @@ static MACHINE_CONFIG_START( daioh, seta_state )
MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode")
MCFG_SETA001_SPRITE_PALETTE("palette")
MCFG_SETA001_SPRITE_GFXBANK_CB(seta_state, setac_gfxbank_callback)
-
+
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(57.42) /* verified on PCB */
@@ -8235,7 +8235,7 @@ static MACHINE_CONFIG_START( daiohp, seta_state )
MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode")
MCFG_SETA001_SPRITE_PALETTE("palette")
MCFG_SETA001_SPRITE_GFXBANK_CB(seta_state, setac_gfxbank_callback)
-
+
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(57.42) /* verified on PCB */
@@ -8279,7 +8279,7 @@ static MACHINE_CONFIG_START( drgnunit, seta_state )
MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode")
MCFG_SETA001_SPRITE_PALETTE("palette")
MCFG_SETA001_SPRITE_GFXBANK_CB(seta_state, setac_gfxbank_callback)
-
+
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
@@ -8317,7 +8317,7 @@ static MACHINE_CONFIG_START( qzkklgy2, seta_state )
MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode")
MCFG_SETA001_SPRITE_PALETTE("palette")
MCFG_SETA001_SPRITE_GFXBANK_CB(seta_state, setac_gfxbank_callback)
-
+
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
@@ -8368,7 +8368,7 @@ static MACHINE_CONFIG_START( setaroul, seta_state )
MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode")
MCFG_SETA001_SPRITE_PALETTE("palette")
MCFG_SETA001_SPRITE_GFXBANK_CB(seta_state, setac_gfxbank_callback)
-
+
MCFG_NVRAM_ADD_RANDOM_FILL("nvram")
/* video hardware */
@@ -8412,7 +8412,7 @@ static MACHINE_CONFIG_START( eightfrc, seta_state )
MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode")
MCFG_SETA001_SPRITE_PALETTE("palette")
MCFG_SETA001_SPRITE_GFXBANK_CB(seta_state, setac_gfxbank_callback)
-
+
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
@@ -8456,7 +8456,7 @@ static MACHINE_CONFIG_START( extdwnhl, seta_state )
MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode")
MCFG_SETA001_SPRITE_PALETTE("palette")
MCFG_SETA001_SPRITE_GFXBANK_CB(seta_state, setac_gfxbank_callback)
-
+
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
@@ -8522,7 +8522,7 @@ static MACHINE_CONFIG_START( gundhara, seta_state )
MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode")
MCFG_SETA001_SPRITE_PALETTE("palette")
MCFG_SETA001_SPRITE_GFXBANK_CB(seta_state, setac_gfxbank_callback)
-
+
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
@@ -8568,7 +8568,7 @@ static MACHINE_CONFIG_START( jjsquawk, seta_state )
MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode")
MCFG_SETA001_SPRITE_PALETTE("palette")
MCFG_SETA001_SPRITE_GFXBANK_CB(seta_state, setac_gfxbank_callback)
-
+
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
@@ -8605,7 +8605,7 @@ static MACHINE_CONFIG_START( jjsquawb, seta_state )
MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode")
MCFG_SETA001_SPRITE_PALETTE("palette")
MCFG_SETA001_SPRITE_GFXBANK_CB(seta_state, setac_gfxbank_callback)
-
+
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
@@ -8651,7 +8651,7 @@ static MACHINE_CONFIG_START( kamenrid, seta_state )
MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode")
MCFG_SETA001_SPRITE_PALETTE("palette")
MCFG_SETA001_SPRITE_GFXBANK_CB(seta_state, setac_gfxbank_callback)
-
+
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
@@ -8820,7 +8820,7 @@ static MACHINE_CONFIG_START( madshark, seta_state )
MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode")
MCFG_SETA001_SPRITE_PALETTE("palette")
MCFG_SETA001_SPRITE_GFXBANK_CB(seta_state, setac_gfxbank_callback)
-
+
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
@@ -8866,7 +8866,7 @@ static MACHINE_CONFIG_START( magspeed, seta_state )
MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode")
MCFG_SETA001_SPRITE_PALETTE("palette")
MCFG_SETA001_SPRITE_GFXBANK_CB(seta_state, setac_gfxbank_callback)
-
+
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
@@ -8915,7 +8915,7 @@ static MACHINE_CONFIG_START( msgundam, seta_state )
MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode")
MCFG_SETA001_SPRITE_PALETTE("palette")
MCFG_SETA001_SPRITE_GFXBANK_CB(seta_state, setac_gfxbank_callback)
-
+
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(56.66) /* between 56 and 57 to match a real PCB's game speed */
@@ -8956,7 +8956,7 @@ static MACHINE_CONFIG_START( oisipuzl, seta_state )
MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode")
MCFG_SETA001_SPRITE_PALETTE("palette")
MCFG_SETA001_SPRITE_GFXBANK_CB(seta_state, setac_gfxbank_callback)
-
+
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
@@ -8996,7 +8996,7 @@ static MACHINE_CONFIG_START( triplfun, seta_state )
MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode")
MCFG_SETA001_SPRITE_PALETTE("palette")
MCFG_SETA001_SPRITE_GFXBANK_CB(seta_state, setac_gfxbank_callback)
-
+
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
@@ -9077,7 +9077,7 @@ static MACHINE_CONFIG_START( rezon, seta_state )
MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode")
MCFG_SETA001_SPRITE_PALETTE("palette")
MCFG_SETA001_SPRITE_GFXBANK_CB(seta_state, setac_gfxbank_callback)
-
+
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
@@ -9313,7 +9313,7 @@ static MACHINE_CONFIG_START( utoukond, seta_state )
MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode")
MCFG_SETA001_SPRITE_PALETTE("palette")
MCFG_SETA001_SPRITE_GFXBANK_CB(seta_state, setac_gfxbank_callback)
-
+
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
@@ -9365,7 +9365,7 @@ static MACHINE_CONFIG_START( wrofaero, seta_state )
MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode")
MCFG_SETA001_SPRITE_PALETTE("palette")
MCFG_SETA001_SPRITE_GFXBANK_CB(seta_state, setac_gfxbank_callback)
-
+
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
@@ -9411,7 +9411,7 @@ static MACHINE_CONFIG_START( zingzip, seta_state )
MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode")
MCFG_SETA001_SPRITE_PALETTE("palette")
MCFG_SETA001_SPRITE_GFXBANK_CB(seta_state, setac_gfxbank_callback)
-
+
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
@@ -9519,7 +9519,7 @@ static MACHINE_CONFIG_START( crazyfgt, seta_state )
MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode")
MCFG_SETA001_SPRITE_PALETTE("palette")
MCFG_SETA001_SPRITE_GFXBANK_CB(seta_state, setac_gfxbank_callback)
-
+
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
@@ -9585,7 +9585,7 @@ static MACHINE_CONFIG_START( inttoote, seta_state )
MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode")
MCFG_SETA001_SPRITE_PALETTE("palette")
MCFG_SETA001_SPRITE_GFXBANK_CB(seta_state, setac_gfxbank_callback)
-
+
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
diff --git a/src/mame/drivers/seta2.c b/src/mame/drivers/seta2.c
index 93d469a6e2a..9341a7c9392 100644
--- a/src/mame/drivers/seta2.c
+++ b/src/mame/drivers/seta2.c
@@ -585,7 +585,7 @@ void funcube_touchscreen_device::device_start()
emu_timer *tm = timer_alloc(0);
tm->adjust(attotime::from_ticks(1, clock()), 0, attotime::from_ticks(1, clock()));
m_tx_cb.resolve_safe();
-
+
save_item(NAME(m_button_state));
save_item(NAME(m_serial_pos));
save_item(NAME(m_serial));
diff --git a/src/mame/drivers/shougi.c b/src/mame/drivers/shougi.c
index e48adda2f6c..f438caacd98 100644
--- a/src/mame/drivers/shougi.c
+++ b/src/mame/drivers/shougi.c
@@ -107,7 +107,7 @@ public:
int m_r;
//UINT8 *m_cpu_sharedram;
//UINT8 m_cpu_sharedram_control_val;
-
+
DECLARE_WRITE8_MEMBER(cpu_sharedram_sub_w);
DECLARE_WRITE8_MEMBER(cpu_sharedram_main_w);
DECLARE_READ8_MEMBER(cpu_sharedram_r);
@@ -118,12 +118,12 @@ public:
DECLARE_WRITE8_MEMBER(nmi_disable_and_clear_line_w);
DECLARE_WRITE8_MEMBER(nmi_enable_w);
DECLARE_READ8_MEMBER(dummy_r);
-
+
DECLARE_PALETTE_INIT(shougi);
virtual void machine_start();
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-
+
INTERRUPT_GEN_MEMBER(vblank_nmi);
};
diff --git a/src/mame/drivers/sidearms.c b/src/mame/drivers/sidearms.c
index ef18f2bd45f..9b80a8d4d14 100644
--- a/src/mame/drivers/sidearms.c
+++ b/src/mame/drivers/sidearms.c
@@ -43,12 +43,12 @@ Notes:
void sidearms_state::machine_start()
{
- membank("bank1")->configure_entries(0, 16, memregion("maincpu")->base() + 0x8000, 0x4000);
+ membank("bank1")->configure_entries(0, 16, memregion("maincpu")->base() + 0x8000, 0x4000);
}
WRITE8_MEMBER(sidearms_state::bankswitch_w)
{
- membank("bank1")->set_entry(data & 0x07);
+ membank("bank1")->set_entry(data & 0x07);
}
@@ -119,7 +119,7 @@ ADDRESS_MAP_END
WRITE8_MEMBER(sidearms_state::whizz_bankswitch_w)
{
- int bank = 0;
+ int bank = 0;
switch (data & 0xC0)
{
case 0x00 : bank = 0; break;
@@ -127,7 +127,7 @@ WRITE8_MEMBER(sidearms_state::whizz_bankswitch_w)
case 0x80 : bank = 1; break;
case 0xC0 : bank = 3; break;
}
- membank("bank1")->set_entry(bank);
+ membank("bank1")->set_entry(bank);
}
static ADDRESS_MAP_START( whizz_map, AS_PROGRAM, 8, sidearms_state )
diff --git a/src/mame/drivers/simple_st0016.c b/src/mame/drivers/simple_st0016.c
index c6268e13c27..ebf65b0b8ab 100644
--- a/src/mame/drivers/simple_st0016.c
+++ b/src/mame/drivers/simple_st0016.c
@@ -33,7 +33,7 @@ Dips verified for Neratte Chu (nratechu) from manual
void st0016_state::machine_start()
{
- membank("bank1")->configure_entries(0, 256, memregion("maincpu")->base(), 0x4000);
+ membank("bank1")->configure_entries(0, 256, memregion("maincpu")->base(), 0x4000);
}
static ADDRESS_MAP_START( st0016_mem, AS_PROGRAM, 8, st0016_state )
@@ -81,8 +81,8 @@ WRITE8_MEMBER(st0016_state::mux_select_w)
WRITE8_MEMBER(st0016_state::st0016_rom_bank_w)
{
- membank("bank1")->set_entry(data);
- // st0016_rom_bank = data;
+ membank("bank1")->set_entry(data);
+ // st0016_rom_bank = data;
}
static ADDRESS_MAP_START( st0016_io, AS_IO, 8, st0016_state )
diff --git a/src/mame/drivers/sothello.c b/src/mame/drivers/sothello.c
index 0b48fd943cd..f8b3b8a4d70 100644
--- a/src/mame/drivers/sothello.c
+++ b/src/mame/drivers/sothello.c
@@ -72,7 +72,7 @@ public:
DECLARE_READ8_MEMBER(subcpu_status_r);
DECLARE_WRITE8_MEMBER(msm_cfg_w);
- virtual void machine_start();
+ virtual void machine_start();
virtual void machine_reset();
TIMER_CALLBACK_MEMBER(subcpu_suspend);
TIMER_CALLBACK_MEMBER(subcpu_resume);
@@ -101,7 +101,7 @@ public:
void sothello_state::machine_start()
{
- membank("bank1")->configure_entries(0, 4, memregion("maincpu")->base() + 0x8000, 0x4000);
+ membank("bank1")->configure_entries(0, 4, memregion("maincpu")->base() + 0x8000, 0x4000);
}
WRITE8_MEMBER(sothello_state::bank_w)
@@ -114,7 +114,7 @@ WRITE8_MEMBER(sothello_state::bank_w)
case 4: bank=2; break;
case 8: bank=3; break;
}
- membank("bank1")->set_entry(bank);
+ membank("bank1")->set_entry(bank);
}
TIMER_CALLBACK_MEMBER(sothello_state::subcpu_suspend)
diff --git a/src/mame/drivers/speglsht.c b/src/mame/drivers/speglsht.c
index 56197f2f321..4c8a7dd0cf8 100644
--- a/src/mame/drivers/speglsht.c
+++ b/src/mame/drivers/speglsht.c
@@ -134,7 +134,7 @@ public:
DECLARE_READ32_MEMBER(irq_ack_clear);
DECLARE_DRIVER_INIT(speglsht);
DECLARE_MACHINE_RESET(speglsht);
- virtual void machine_start();
+ virtual void machine_start();
DECLARE_VIDEO_START(speglsht);
UINT32 screen_update_speglsht(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
required_device<palette_device> m_palette;
@@ -160,13 +160,13 @@ ADDRESS_MAP_END
void speglsht_state::machine_start()
{
- membank("bank1")->configure_entries(0, 256, memregion("maincpu")->base(), 0x4000);
+ membank("bank1")->configure_entries(0, 256, memregion("maincpu")->base(), 0x4000);
}
// common rombank? should go in machine/st0016 with larger address space exposed?
WRITE8_MEMBER(speglsht_state::st0016_rom_bank_w)
{
- membank("bank1")->set_entry(data);
+ membank("bank1")->set_entry(data);
}
diff --git a/src/mame/drivers/srmp2.c b/src/mame/drivers/srmp2.c
index 85b7be44059..c0903ff5d4c 100644
--- a/src/mame/drivers/srmp2.c
+++ b/src/mame/drivers/srmp2.c
@@ -83,7 +83,7 @@ void srmp2_state::machine_start()
MACHINE_START_MEMBER(srmp2_state,srmp2)
{
machine_start();
-
+
m_iox.reset = 0x1f;
m_iox.ff_event = -1;
m_iox.ff_1 = 0x00;
@@ -92,14 +92,14 @@ MACHINE_START_MEMBER(srmp2_state,srmp2)
m_iox.protcheck[1] = -1; m_iox.protlatch[1] = -1;
m_iox.protcheck[2] = -1; m_iox.protlatch[2] = -1;
m_iox.protcheck[3] = -1; m_iox.protlatch[3] = -1;
-
+
save_item(NAME(m_color_bank));
}
MACHINE_START_MEMBER(srmp2_state,srmp3)
{
machine_start();
-
+
m_iox.reset = 0xc8;
m_iox.ff_event = 0xef;
m_iox.ff_1 = -1;
@@ -107,16 +107,16 @@ MACHINE_START_MEMBER(srmp2_state,srmp3)
m_iox.protcheck[1] = 0x4c; m_iox.protlatch[1] = 0x00;
m_iox.protcheck[2] = 0x1c; m_iox.protlatch[2] = 0x04;
m_iox.protcheck[3] = 0x45; m_iox.protlatch[3] = 0x00;
-
- membank("bank1")->configure_entries(0, 16, memregion("maincpu")->base(), 0x2000);
-
+
+ membank("bank1")->configure_entries(0, 16, memregion("maincpu")->base(), 0x2000);
+
save_item(NAME(m_gfx_bank));
}
MACHINE_START_MEMBER(srmp2_state,rmgoldyh)
{
machine_start();
-
+
m_iox.reset = 0xc8;
m_iox.ff_event = 0xff;
m_iox.ff_1 = -1;
@@ -125,15 +125,15 @@ MACHINE_START_MEMBER(srmp2_state,rmgoldyh)
m_iox.protcheck[2] = -1; m_iox.protlatch[2] = -1;
m_iox.protcheck[3] = -1; m_iox.protlatch[3] = -1;
- membank("bank1")->configure_entries(0, 32, memregion("maincpu")->base(), 0x2000);
-
+ membank("bank1")->configure_entries(0, 32, memregion("maincpu")->base(), 0x2000);
+
save_item(NAME(m_gfx_bank));
}
MACHINE_START_MEMBER(srmp2_state,mjyuugi)
{
machine_start();
-
+
m_iox.reset = 0x1f;
m_iox.ff_event = -1;
m_iox.ff_1 = 0x00;
diff --git a/src/mame/drivers/srmp5.c b/src/mame/drivers/srmp5.c
index ab4bf6885dc..04a278cf138 100644
--- a/src/mame/drivers/srmp5.c
+++ b/src/mame/drivers/srmp5.c
@@ -114,7 +114,7 @@ public:
DECLARE_READ8_MEMBER(cmd1_r);
DECLARE_READ8_MEMBER(cmd2_r);
DECLARE_READ8_MEMBER(cmd_stat8_r);
- virtual void machine_start();
+ virtual void machine_start();
DECLARE_DRIVER_INIT(srmp5);
UINT32 screen_update_srmp5(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
@@ -240,7 +240,7 @@ UINT32 srmp5_state::screen_update_srmp5(screen_device &screen, bitmap_rgb32 &bit
void srmp5_state::machine_start()
{
- membank("bank1")->configure_entries(0, 256, memregion("maincpu")->base(), 0x4000);
+ membank("bank1")->configure_entries(0, 256, memregion("maincpu")->base(), 0x4000);
}
WRITE32_MEMBER(srmp5_state::bank_w)
@@ -400,7 +400,7 @@ READ8_MEMBER(srmp5_state::cmd_stat8_r)
// common rombank? should go in machine/st0016 with larger address space exposed?
WRITE8_MEMBER(srmp5_state::st0016_rom_bank_w)
{
- membank("bank1")->set_entry(data);
+ membank("bank1")->set_entry(data);
}
diff --git a/src/mame/drivers/srmp6.c b/src/mame/drivers/srmp6.c
index e3c5c3860f5..ac2d05af386 100644
--- a/src/mame/drivers/srmp6.c
+++ b/src/mame/drivers/srmp6.c
@@ -107,7 +107,7 @@ public:
DECLARE_WRITE16_MEMBER(paletteram_w);
DECLARE_READ16_MEMBER(srmp6_irq_ack_r);
DECLARE_DRIVER_INIT(INIT);
- virtual void machine_start();
+ virtual void machine_start();
virtual void video_start();
UINT32 screen_update_srmp6(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
void update_palette();
@@ -309,7 +309,7 @@ UINT32 srmp6_state::screen_update_srmp6(screen_device &screen, bitmap_rgb32 &bit
void srmp6_state::machine_start()
{
- membank("bank1")->configure_entries(0, 16, memregion("nile")->base(), 0x200000);
+ membank("bank1")->configure_entries(0, 16, memregion("nile")->base(), 0x200000);
}
WRITE16_MEMBER(srmp6_state::srmp6_input_select_w)
@@ -340,8 +340,8 @@ WRITE16_MEMBER(srmp6_state::video_regs_w)
{
case 0x5e/2: // bank switch, used by ROM check
{
- LOG(("%x\n",data));
- membank("bank1")->set_entry(data & 0x0f);
+ LOG(("%x\n",data));
+ membank("bank1")->set_entry(data & 0x0f);
break;
}
diff --git a/src/mame/drivers/srumbler.c b/src/mame/drivers/srumbler.c
index be87dc9acf9..21c252d60e2 100644
--- a/src/mame/drivers/srumbler.c
+++ b/src/mame/drivers/srumbler.c
@@ -32,25 +32,25 @@ WRITE8_MEMBER(srumbler_state::bankswitch_w)
for (int i = 0x05;i < 0x10;i++)
{
- /* bit 2 of prom1 selects ROM or RAM - not supported */
+ /* bit 2 of prom1 selects ROM or RAM - not supported */
int bank = ((prom1[i] & 0x03) << 4) | (prom2[i] & 0x0f);
- char bankname[10];
+ char bankname[10];
sprintf(bankname, "%04x", i*0x1000);
- membank(bankname)->set_entry(bank);
+ membank(bankname)->set_entry(bank);
}
}
void srumbler_state::machine_start()
{
- for (int i = 0x05; i < 0x10; i++)
+ for (int i = 0x05; i < 0x10; i++)
{
- char bankname[10];
+ char bankname[10];
sprintf(bankname, "%04x", i*0x1000);
- membank(bankname)->configure_entries(0, 64, memregion("user1")->base(), 0x1000);
+ membank(bankname)->configure_entries(0, 64, memregion("user1")->base(), 0x1000);
}
- /* initialize banked ROM pointers */
+ /* initialize banked ROM pointers */
bankswitch_w(m_maincpu->space(AS_PROGRAM), 0, 0);
}
diff --git a/src/mame/drivers/sstrangr.c b/src/mame/drivers/sstrangr.c
index e30b534f7ad..35e002d6aa9 100644
--- a/src/mame/drivers/sstrangr.c
+++ b/src/mame/drivers/sstrangr.c
@@ -24,13 +24,13 @@ public:
required_device<cpu_device> m_maincpu;
required_shared_ptr<UINT8> m_ram;
-
+
UINT8 m_flip_screen;
-
+
DECLARE_WRITE8_MEMBER(port_w);
-
+
virtual void video_start();
-
+
UINT32 screen_update_sstrangr(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
UINT32 screen_update_sstrngr2(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
};
diff --git a/src/mame/drivers/ssv.c b/src/mame/drivers/ssv.c
index 70895a60be9..8ebeae48d5a 100644
--- a/src/mame/drivers/ssv.c
+++ b/src/mame/drivers/ssv.c
@@ -2491,7 +2491,7 @@ void ssv_state::init(int interrupt_ultrax)
( (i & 1) ? (8 << 16) : 0 ) ;
enable_video(1);
m_interrupt_ultrax = interrupt_ultrax;
-
+
save_item(NAME(m_requested_int));
save_item(NAME(m_irq_enable));
}
diff --git a/src/mame/drivers/sub.c b/src/mame/drivers/sub.c
index 11a3100c313..6927e1c1c55 100644
--- a/src/mame/drivers/sub.c
+++ b/src/mame/drivers/sub.c
@@ -139,15 +139,15 @@ public:
required_shared_ptr<UINT8> m_spriteram;
required_shared_ptr<UINT8> m_spriteram2;
required_shared_ptr<UINT8> m_scrolly;
-
+
UINT8 m_nmi_en;
-
+
DECLARE_WRITE8_MEMBER(to_sound_w);
DECLARE_WRITE8_MEMBER(nmi_mask_w);
-
+
virtual void machine_start();
DECLARE_PALETTE_INIT(sub);
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(sound_irq);
};
diff --git a/src/mame/drivers/suna16.c b/src/mame/drivers/suna16.c
index 2677c793f41..ae94711dba2 100644
--- a/src/mame/drivers/suna16.c
+++ b/src/mame/drivers/suna16.c
@@ -215,7 +215,7 @@ ADDRESS_MAP_END
MACHINE_START_MEMBER(suna16_state,bestbest)
{
- save_item(NAME(m_prot));
+ save_item(NAME(m_prot));
}
@@ -294,8 +294,8 @@ ADDRESS_MAP_END
MACHINE_START_MEMBER(suna16_state, bssoccer)
{
- membank("bank1")->configure_entries(0, 8, memregion("pcm1")->base() + 0x1000, 0x10000);
- membank("bank2")->configure_entries(0, 8, memregion("pcm2")->base() + 0x1000, 0x10000);
+ membank("bank1")->configure_entries(0, 8, memregion("pcm1")->base() + 0x1000, 0x10000);
+ membank("bank2")->configure_entries(0, 8, memregion("pcm2")->base() + 0x1000, 0x10000);
}
/* Bank Switching */
@@ -304,16 +304,16 @@ WRITE8_MEMBER(suna16_state::bssoccer_pcm_1_bankswitch_w)
{
const int bank = data & 7;
if (bank & ~7) logerror("CPU#2 PC %06X - ROM bank unknown bits: %02X\n", space.device().safe_pc(), data);
- printf("%d %d\n", 1, bank);
- membank("bank1")->set_entry(bank);
+ printf("%d %d\n", 1, bank);
+ membank("bank1")->set_entry(bank);
}
WRITE8_MEMBER(suna16_state::bssoccer_pcm_2_bankswitch_w)
{
const int bank = data & 7;
if (bank & ~7) logerror("CPU#3 PC %06X - ROM bank unknown bits: %02X\n", space.device().safe_pc(), data);
- printf("%d %d\n", 2, bank);
- membank("bank2")->set_entry(bank);
+ printf("%d %d\n", 2, bank);
+ membank("bank2")->set_entry(bank);
}
@@ -378,7 +378,7 @@ WRITE8_MEMBER(suna16_state::uballoon_pcm_1_bankswitch_w)
{
const int bank = data & 1;
if (bank & ~1) logerror("CPU#2 PC %06X - ROM bank unknown bits: %02X\n", space.device().safe_pc(), data);
- membank("bank1")->set_entry(bank);
+ membank("bank1")->set_entry(bank);
}
/* Memory maps: Yes, *no* RAM */
@@ -398,8 +398,8 @@ ADDRESS_MAP_END
MACHINE_START_MEMBER(suna16_state,uballoon)
{
- membank("bank1")->configure_entries(0, 2, memregion("pcm1")->base() + 0x400, 0x10000);
-
+ membank("bank1")->configure_entries(0, 2, memregion("pcm1")->base() + 0x400, 0x10000);
+
save_item(NAME(m_prot));
}
@@ -828,7 +828,7 @@ static MACHINE_CONFIG_START( bssoccer, suna16_state )
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
- MCFG_MACHINE_START_OVERRIDE(suna16_state,bssoccer)
+ MCFG_MACHINE_START_OVERRIDE(suna16_state,bssoccer)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -887,7 +887,7 @@ static MACHINE_CONFIG_START( uballoon, suna16_state )
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
- MCFG_MACHINE_START_OVERRIDE(suna16_state,uballoon)
+ MCFG_MACHINE_START_OVERRIDE(suna16_state,uballoon)
MCFG_MACHINE_RESET_OVERRIDE(suna16_state,uballoon)
/* video hardware */
@@ -992,7 +992,7 @@ static MACHINE_CONFIG_START( bestbest, suna16_state )
/* 2nd PCM Z80 missing */
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
-
+
MCFG_MACHINE_START_OVERRIDE(suna16_state, bestbest)
/* video hardware */
diff --git a/src/mame/drivers/suna8.c b/src/mame/drivers/suna8.c
index b6d128d8dea..a2d9412c31c 100644
--- a/src/mame/drivers/suna8.c
+++ b/src/mame/drivers/suna8.c
@@ -735,7 +735,7 @@ static ADDRESS_MAP_START( brickzn11_map, AS_PROGRAM, 8, suna8_state )
AM_RANGE(0xc060, 0xc060) AM_WRITE(brickzn_rombank_w ) // ROM Bank
AM_RANGE(0xc080, 0xc080) AM_WRITE(brickzn_leds_w ) // Leds
AM_RANGE(0xc0a0, 0xc0a0) AM_WRITE(brickzn_palbank_w ) // Palette RAM Bank
-// AM_RANGE(0xc0c0, 0xc0c0) AM_WRITE(brickzn_prot2_w ) // Protection 2
+// AM_RANGE(0xc0c0, 0xc0c0) AM_WRITE(brickzn_prot2_w ) // Protection 2
AM_RANGE(0xc100, 0xc100) AM_READ_PORT("P1") // P1 (Buttons)
AM_RANGE(0xc101, 0xc101) AM_READ_PORT("P2") // P2 (Buttons)
@@ -771,13 +771,13 @@ WRITE8_MEMBER(suna8_state::brickzn_multi_w)
else if (protselect == 0x90)
{
/*
- 0d brick hit NO! 25?
- 2c side wall hit OK
- 3b paddle hit OK
- 44 death OK?
- 53 death OK?
- 56 coin in OK?
- 70 monster hit NO? 58?
+ 0d brick hit NO! 25?
+ 2c side wall hit OK
+ 3b paddle hit OK
+ 44 death OK?
+ 53 death OK?
+ 56 coin in OK?
+ 70 monster hit NO? 58?
*/
UINT8 remap = (m_remap_sound ? BITSWAP8(data, 7,6,3,4,5,2,1,0) : data);
@@ -1975,7 +1975,7 @@ MACHINE_CONFIG_END
MACHINE_RESET_MEMBER(suna8_state,brickzn)
{
m_protection_val = m_prot2 = m_prot2_prev = 0xff;
- m_paletteram_enab = 1; // for brickzn11
+ m_paletteram_enab = 1; // for brickzn11
m_remap_sound = 0;
membank("bank1")->set_entry(0);
}
@@ -2015,12 +2015,12 @@ static MACHINE_CONFIG_START( brickzn11, suna8_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymsnd", YM3812, SUNA8_MASTER_CLOCK / 8) // 3MHz (measured)
+ MCFG_SOUND_ADD("ymsnd", YM3812, SUNA8_MASTER_CLOCK / 8) // 3MHz (measured)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MCFG_SOUND_ADD("aysnd", AY8910, SUNA8_MASTER_CLOCK / 16) // 1.5MHz (measured)
+ MCFG_SOUND_ADD("aysnd", AY8910, SUNA8_MASTER_CLOCK / 16) // 1.5MHz (measured)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.33)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.33)
diff --git a/src/mame/drivers/supdrapo.c b/src/mame/drivers/supdrapo.c
index 84c58873ec1..2507d625d67 100644
--- a/src/mame/drivers/supdrapo.c
+++ b/src/mame/drivers/supdrapo.c
@@ -82,13 +82,13 @@ public:
required_device<cpu_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
-
+
required_shared_ptr<UINT8> m_col_line;
required_shared_ptr<UINT8> m_videoram;
required_shared_ptr<UINT8> m_char_bank;
-
+
UINT8 m_wdog;
-
+
DECLARE_READ8_MEMBER(rng_r);
DECLARE_WRITE8_MEMBER(wdog8000_w);
DECLARE_WRITE8_MEMBER(debug8004_w);
@@ -97,12 +97,12 @@ public:
DECLARE_WRITE8_MEMBER(payout_w);
DECLARE_WRITE8_MEMBER(ay8910_outputa_w);
DECLARE_WRITE8_MEMBER(ay8910_outputb_w);
-
+
virtual void machine_start();
virtual void machine_reset();
virtual void video_start();
DECLARE_PALETTE_INIT(supdrapo);
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
};
diff --git a/src/mame/drivers/supertnk.c b/src/mame/drivers/supertnk.c
index 6e865850a85..38d3876e052 100644
--- a/src/mame/drivers/supertnk.c
+++ b/src/mame/drivers/supertnk.c
@@ -124,7 +124,7 @@ public:
DECLARE_WRITE8_MEMBER(supertnk_bitplane_select_0_w);
DECLARE_WRITE8_MEMBER(supertnk_bitplane_select_1_w);
DECLARE_DRIVER_INIT(supertnk);
- virtual void machine_start();
+ virtual void machine_start();
virtual void machine_reset();
virtual void video_start();
UINT32 screen_update_supertnk(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
@@ -135,7 +135,7 @@ public:
void supertnk_state::machine_start()
{
- membank("bank1")->configure_entries(0, 4, memregion("maincpu")->base() + 0x10000, 0x1000);
+ membank("bank1")->configure_entries(0, 4, memregion("maincpu")->base() + 0x10000, 0x1000);
}
@@ -148,14 +148,14 @@ void supertnk_state::machine_start()
WRITE8_MEMBER(supertnk_state::supertnk_bankswitch_0_w)
{
m_rom_bank = (m_rom_bank & 0x02) | ((data << 0) & 0x01);
- membank("bank1")->set_entry(m_rom_bank);
+ membank("bank1")->set_entry(m_rom_bank);
}
WRITE8_MEMBER(supertnk_state::supertnk_bankswitch_1_w)
{
m_rom_bank = (m_rom_bank & 0x01) | ((data << 1) & 0x02);
- membank("bank1")->set_entry(m_rom_bank);
+ membank("bank1")->set_entry(m_rom_bank);
}
diff --git a/src/mame/drivers/superwng.c b/src/mame/drivers/superwng.c
index 3b5c5f541de..364abd14ece 100644
--- a/src/mame/drivers/superwng.c
+++ b/src/mame/drivers/superwng.c
@@ -10,7 +10,7 @@ Hardware a bit (interrupts, sound) similar to mouser as well
TODO:
- unused rom 6.8s (located on the pcb near the gfx rom 7.8p, but contains
data (similar to the one in roms 4.5p and 5.5r)
-
+
The game currently crashes after the bonus round rather than moving on to
the next level, it writes 01 to 0xa187 which is probably ROM bank, however
banking the ROM in there results in the game crashing anyway, and looking
@@ -101,7 +101,7 @@ WRITE8_MEMBER(superwng_state::superwng_unk_a187_w)
WRITE8_MEMBER(superwng_state::superwng_unk_a185_w)
{
-// printf("superwng_unk_a185_w %02x\n", data);
+// printf("superwng_unk_a185_w %02x\n", data);
}
TILE_GET_INFO_MEMBER(superwng_state::get_bg_tile_info)
@@ -456,7 +456,7 @@ void superwng_state::machine_start()
save_item(NAME(m_tile_bank));
save_item(NAME(m_sound_byte));
save_item(NAME(m_nmi_enable));
- membank("bank1")->configure_entries(0, 2, memregion("maincpu")->base()+0x4000, 0x4000);
+ membank("bank1")->configure_entries(0, 2, memregion("maincpu")->base()+0x4000, 0x4000);
}
void superwng_state::machine_reset()
diff --git a/src/mame/drivers/suprgolf.c b/src/mame/drivers/suprgolf.c
index 368fe3ded91..21faaaadf9c 100644
--- a/src/mame/drivers/suprgolf.c
+++ b/src/mame/drivers/suprgolf.c
@@ -60,7 +60,7 @@ public:
UINT8 m_palette_switch;
UINT8 m_bg_vreg_test;
UINT8 m_toggle;
-
+
DECLARE_READ8_MEMBER(videoram_r);
DECLARE_WRITE8_MEMBER(videoram_w);
DECLARE_READ8_MEMBER(bg_vram_r);
@@ -78,14 +78,14 @@ public:
DECLARE_WRITE8_MEMBER(writeA);
DECLARE_WRITE8_MEMBER(writeB);
DECLARE_WRITE_LINE_MEMBER(adpcm_int);
-
+
TILE_GET_INFO_MEMBER(get_tile_info);
DECLARE_DRIVER_INIT(suprgolf);
- virtual void machine_start();
+ virtual void machine_start();
virtual void machine_reset();
virtual void video_start();
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
};
@@ -109,7 +109,7 @@ void suprgolf_state::video_start()
m_fg_fb = auto_alloc_array(machine(), UINT16, 0x2000*0x20);
m_tilemap->set_transparent_pen(15);
-
+
save_item(NAME(m_bg_bank));
save_item(NAME(m_vreg_bank));
save_item(NAME(m_vreg_pen));
@@ -267,9 +267,9 @@ WRITE8_MEMBER(suprgolf_state::bg_vram_w)
void suprgolf_state::machine_start()
{
- membank("bank1")->configure_entries(0, 16, memregion("user2")->base(), 0x4000);
- membank("bank2")->configure_entries(0, 64, memregion("user1")->base(), 0x4000);
-
+ membank("bank1")->configure_entries(0, 16, memregion("user2")->base(), 0x4000);
+ membank("bank2")->configure_entries(0, 64, memregion("user1")->base(), 0x4000);
+
save_item(NAME(m_rom_bank));
save_item(NAME(m_msm5205next));
save_item(NAME(m_msm_nmi_mask));
@@ -293,11 +293,11 @@ READ8_MEMBER(suprgolf_state::rom_bank_select_r)
WRITE8_MEMBER(suprgolf_state::rom_bank_select_w)
{
- m_rom_bank = data;
+ m_rom_bank = data;
- //popmessage("%08x %02x",((data & 0x3f) * 0x4000),data);
- //osd_printf_debug("ROM_BANK 0x8000 - %X @%X\n",data,space.device().safe_pcbase());
- membank("bank2")->set_entry(data & 0x3f);
+ //popmessage("%08x %02x",((data & 0x3f) * 0x4000),data);
+ //osd_printf_debug("ROM_BANK 0x8000 - %X @%X\n",data,space.device().safe_pcbase());
+ membank("bank2")->set_entry(data & 0x3f);
m_msm_nmi_mask = data & 0x40;
flip_screen_set(data & 0x80);
@@ -305,9 +305,9 @@ WRITE8_MEMBER(suprgolf_state::rom_bank_select_w)
WRITE8_MEMBER(suprgolf_state::rom2_bank_select_w)
{
- //osd_printf_debug("ROM_BANK 0x4000 - %X @%X\n",data,space.device().safe_pcbase());
- membank("bank1")->set_entry(data & 0x0f);
-
+ //osd_printf_debug("ROM_BANK 0x4000 - %X @%X\n",data,space.device().safe_pcbase());
+ membank("bank1")->set_entry(data & 0x0f);
+
if(data & 0xf0)
printf("Rom bank select 2 with data %02x activated\n",data);
}
diff --git a/src/mame/drivers/suprslam.c b/src/mame/drivers/suprslam.c
index 05a7a9f67da..3b7ef920770 100644
--- a/src/mame/drivers/suprslam.c
+++ b/src/mame/drivers/suprslam.c
@@ -115,7 +115,7 @@ WRITE8_MEMBER(suprslam_state::pending_command_clear_w)
WRITE8_MEMBER(suprslam_state::suprslam_sh_bankswitch_w)
{
- membank("bank1")->set_entry(data & 0x03);
+ membank("bank1")->set_entry(data & 0x03);
}
/*** MEMORY MAPS *************************************************************/
@@ -285,7 +285,7 @@ void suprslam_state::machine_start()
save_item(NAME(m_bg_bank));
save_item(NAME(m_pending_command));
- membank("bank1")->configure_entries(0, 4, memregion("audiocpu")->base() + 0x10000, 0x8000);
+ membank("bank1")->configure_entries(0, 4, memregion("audiocpu")->base() + 0x10000, 0x8000);
}
void suprslam_state::machine_reset()
diff --git a/src/mame/drivers/tankbust.c b/src/mame/drivers/tankbust.c
index d0f4766475e..4f46ce7bf3c 100644
--- a/src/mame/drivers/tankbust.c
+++ b/src/mame/drivers/tankbust.c
@@ -24,9 +24,9 @@ To do:
void tankbust_state::machine_start()
{
- membank("bank1")->configure_entries(0, 2, memregion("maincpu")->base() + 0x10000, 0x4000);
- membank("bank2")->configure_entries(0, 2, memregion("maincpu")->base() + 0x18000, 0x2000);
-
+ membank("bank1")->configure_entries(0, 2, memregion("maincpu")->base() + 0x10000, 0x4000);
+ membank("bank2")->configure_entries(0, 2, memregion("maincpu")->base() + 0x18000, 0x2000);
+
save_item(NAME(m_latch));
save_item(NAME(m_timer1));
save_item(NAME(m_e0xx_data));
@@ -107,7 +107,7 @@ WRITE8_MEMBER(tankbust_state::e0xx_w)
case 7: /* 0xe007 bankswitch */
/* bank 1 at 0x6000-9fff = from 0x10000 when bit0=0 else from 0x14000 */
- membank("bank1")->set_entry(data & 1);
+ membank("bank1")->set_entry(data & 1);
/* bank 2 at 0xa000-bfff = from 0x18000 when bit0=0 else from 0x1a000 */
membank("bank2")->set_entry(data & 1); /* verified (the game will reset after the "game over" otherwise) */
diff --git a/src/mame/drivers/taotaido.c b/src/mame/drivers/taotaido.c
index b011913e1ce..242f16cf8fa 100644
--- a/src/mame/drivers/taotaido.c
+++ b/src/mame/drivers/taotaido.c
@@ -76,7 +76,7 @@ zooming might be wrong
void taotaido_state::machine_start()
{
membank("soundbank")->configure_entries(0, 4, memregion("audiocpu")->base(), 0x8000);
-
+
save_item(NAME(m_pending_command));
}
diff --git a/src/mame/drivers/tbowl.c b/src/mame/drivers/tbowl.c
index 6f642fdd28a..1a6aefe439d 100644
--- a/src/mame/drivers/tbowl.c
+++ b/src/mame/drivers/tbowl.c
@@ -418,7 +418,7 @@ void tbowl_state::machine_start()
{
membank("mainbank")->configure_entries(0, 32, memregion("maincpu")->base() + 0x10000, 0x800);
membank("subbank")->configure_entries(0, 32, memregion("sub")->base() + 0x10000, 0x800);
-
+
save_item(NAME(m_adpcm_pos));
save_item(NAME(m_adpcm_end));
save_item(NAME(m_adpcm_data));
diff --git a/src/mame/drivers/tgtpanic.c b/src/mame/drivers/tgtpanic.c
index 73d58364756..b53dbf6d4d8 100644
--- a/src/mame/drivers/tgtpanic.c
+++ b/src/mame/drivers/tgtpanic.c
@@ -24,15 +24,15 @@ public:
required_device<cpu_device> m_maincpu;
required_device<screen_device> m_screen;
-
+
required_shared_ptr<UINT8> m_ram;
-
+
UINT8 m_color;
-
+
DECLARE_WRITE8_MEMBER(color_w);
-
+
virtual void machine_start();
-
+
UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
};
diff --git a/src/mame/drivers/thunderx.c b/src/mame/drivers/thunderx.c
index 77a82af1ec2..db00ce1cb0d 100644
--- a/src/mame/drivers/thunderx.c
+++ b/src/mame/drivers/thunderx.c
@@ -317,7 +317,7 @@ WRITE8_MEMBER(thunderx_state::thunderx_1f98_w)
WRITE8_MEMBER(thunderx_state::scontra_bankswitch_w)
{
// bits 0-3 select ROM bank at 6000-7fff
- m_rombank->set_entry(data & 0x0f);
+ m_rombank->set_entry(data & 0x0f);
// bit 4 selects work RAM or palette RAM at 5800-5fff
m_bank5800->set_bank((data & 0x10) >> 4);
diff --git a/src/mame/drivers/tryout.c b/src/mame/drivers/tryout.c
index 2b6db01e5f9..8b2259c7b43 100644
--- a/src/mame/drivers/tryout.c
+++ b/src/mame/drivers/tryout.c
@@ -45,12 +45,12 @@ WRITE8_MEMBER(tryout_state::sound_irq_ack_w)
void tryout_state::machine_start()
{
- membank("bank1")->configure_entries(0, 2, memregion("maincpu")->base() + 0x10000, 0x2000);
+ membank("bank1")->configure_entries(0, 2, memregion("maincpu")->base() + 0x10000, 0x2000);
}
WRITE8_MEMBER(tryout_state::bankswitch_w)
{
- membank("bank1")->set_entry(data & 0x01);
+ membank("bank1")->set_entry(data & 0x01);
}
static ADDRESS_MAP_START( main_cpu, AS_PROGRAM, 8, tryout_state )
diff --git a/src/mame/drivers/tsamurai.c b/src/mame/drivers/tsamurai.c
index 3020a719c31..9cda0ce3a86 100644
--- a/src/mame/drivers/tsamurai.c
+++ b/src/mame/drivers/tsamurai.c
@@ -711,7 +711,7 @@ static MACHINE_CONFIG_START( tsamurai, tsamurai_state )
MCFG_CPU_ADD("audio2", Z80, XTAL_24MHz/8)
MCFG_CPU_PROGRAM_MAP(sound2_map)
-
+
MCFG_MACHINE_START_OVERRIDE(tsamurai_state,tsamurai)
/* video hardware */
@@ -752,7 +752,7 @@ static MACHINE_CONFIG_START( vsgongf, tsamurai_state )
MCFG_CPU_PROGRAM_MAP(sound_vsgongf_map)
MCFG_CPU_IO_MAP(vsgongf_audio_io_map)
MCFG_CPU_PERIODIC_INT_DRIVER(tsamurai_state, vsgongf_sound_interrupt, 3*60)
-
+
MCFG_MACHINE_START_OVERRIDE(tsamurai_state,vsgongf)
/* video hardware */
@@ -797,7 +797,7 @@ static MACHINE_CONFIG_START( m660, tsamurai_state )
MCFG_CPU_PROGRAM_MAP(sound3_m660_map)
MCFG_CPU_IO_MAP(sound3_m660_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", tsamurai_state, nmi_line_pulse)
-
+
MCFG_MACHINE_START_OVERRIDE(tsamurai_state,m660)
/* video hardware */
diff --git a/src/mame/drivers/ttchamp.c b/src/mame/drivers/ttchamp.c
index 62346ae130a..c65d751fc98 100644
--- a/src/mame/drivers/ttchamp.c
+++ b/src/mame/drivers/ttchamp.c
@@ -51,7 +51,7 @@ Dumped by tirino73
-- works in a very similar way to 'Spider' (twins.c)
+- works in a very similar way to 'Spider' (twins.c)
including the blitter (seems to be doubled up hardware tho, twice as many layers?)
- need to work out how it selects between upper/lower
program roms as blitter source
@@ -85,7 +85,7 @@ public:
DECLARE_WRITE16_MEMBER(port20_w);
DECLARE_WRITE16_MEMBER(port62_w);
-
+
DECLARE_READ16_MEMBER(port1e_r);
@@ -100,7 +100,7 @@ public:
DECLARE_WRITE16_MEMBER(ttchamp_mem_w);
UINT16 m_videoram0[0x10000 / 2];
-// UINT16 m_videoram1[0x10000 / 2];
+// UINT16 m_videoram1[0x10000 / 2];
UINT16 m_videoram2[0x10000 / 2];
@@ -130,7 +130,6 @@ void ttchamp_state::machine_start()
void ttchamp_state::video_start()
{
-
}
UINT32 ttchamp_state::screen_update_ttchamp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
@@ -143,7 +142,7 @@ UINT32 ttchamp_state::screen_update_ttchamp(screen_device &screen, bitmap_ind16
bitmap.fill(m_palette->black_pen());
UINT8 *videoramfg;
UINT8* videorambg;
-
+
count=0;
videorambg = (UINT8*)m_videoram0;
videoramfg = (UINT8*)m_videoram2;
@@ -156,21 +155,21 @@ UINT32 ttchamp_state::screen_update_ttchamp(screen_device &screen, bitmap_ind16
count++;
}
}
-
+
/*
count=0;
videoram = (UINT8*)m_videoram1;
for (y=0;y<yyy;y++)
{
- for(x=0;x<xxx;x++)
- {
- UINT8 pix = videoram[BYTE_XOR_LE(count)];
- if (pix) bitmap.pix16(y, x) = pix+0x200;
- count++;
- }
+ for(x=0;x<xxx;x++)
+ {
+ UINT8 pix = videoram[BYTE_XOR_LE(count)];
+ if (pix) bitmap.pix16(y, x) = pix+0x200;
+ count++;
+ }
}
*/
-
+
count=0;
for (y=0;y<yyy;y++)
{
@@ -204,7 +203,7 @@ UINT32 ttchamp_state::screen_update_ttchamp(screen_device &screen, bitmap_ind16
count++;
}
}
-
+
#if 0
for (int i = 0; i < 0x8000; i++)
{
@@ -212,11 +211,11 @@ UINT32 ttchamp_state::screen_update_ttchamp(screen_device &screen, bitmap_ind16
// I think it actually does more blit operations with
// different bits of m_port10 set to redraw the backgrounds using the video ram data as a source rather than ROM - notice the garbage you see behind 'sprites' right now
// this method also removes the text layer, which we don't want
- // m_videoram1[i] = 0x0000;
- // m_videoram2[i] = 0x0000;
+ // m_videoram1[i] = 0x0000;
+ // m_videoram2[i] = 0x0000;
}
#endif
-
+
return 0;
}
@@ -289,18 +288,18 @@ WRITE16_MEMBER(ttchamp_state::ttchamp_mem_w)
if (m_spritesinit == 1)
{
- // printf("%06x: spider_blitter_w %08x %04x %04x (init?) (base?)\n", space.device().safe_pc(), offset * 2, data, mem_mask);
+ // printf("%06x: spider_blitter_w %08x %04x %04x (init?) (base?)\n", space.device().safe_pc(), offset * 2, data, mem_mask);
m_spritesinit = 2;
m_spritesaddr = offset;
-
+
}
else if (m_spritesinit == 2)
{
- // printf("%06x: spider_blitter_w %08x %04x %04x (init2) (width?)\n", space.device().safe_pc(), offset * 2, data, mem_mask);
+ // printf("%06x: spider_blitter_w %08x %04x %04x (init2) (width?)\n", space.device().safe_pc(), offset * 2, data, mem_mask);
m_spriteswidth = offset & 0xff;
//printf("%08x\n",(offset*2) & 0xfff00);
-
+
m_spritesinit = 3;
}
else
@@ -320,7 +319,7 @@ WRITE16_MEMBER(ttchamp_state::ttchamp_mem_w)
printf("blitter bus write but blitter unselected? %08x %04x\n",offset*2,data);
return;
}
-
+
m_spritesinit = 0;
// 0x30000-0x3ffff used, on Spider it's 0x20000-0x2ffff
@@ -331,7 +330,7 @@ WRITE16_MEMBER(ttchamp_state::ttchamp_mem_w)
if (m_rombank)
src += 0x100000;
- // printf("%06x: spider_blitter_w %08x %04x %04x (previous data width %d address %08x)\n", space.device().safe_pc(), offset * 2, data, mem_mask, m_spriteswidth, m_spritesaddr);
+ // printf("%06x: spider_blitter_w %08x %04x %04x (previous data width %d address %08x)\n", space.device().safe_pc(), offset * 2, data, mem_mask, m_spriteswidth, m_spritesaddr);
offset &= 0x7fff;
for (int i = 0; i < m_spriteswidth; i++)
@@ -347,7 +346,7 @@ WRITE16_MEMBER(ttchamp_state::ttchamp_mem_w)
data = (src[(m_spritesaddr * 2) + 1]);
//data |= vram[offset] >> 8;
-
+
/* bit 1 actually enables transparent pen */
if (data || (m_port10 & 2) == 0)
vram[offset] = (vram[offset] & 0x00ff) | data << 8;
@@ -397,7 +396,7 @@ WRITE16_MEMBER(ttchamp_state::port10_w)
{
UINT8 res;
COMBINE_DATA(&m_port10);
-
+
res = m_port10 & 0xf0;
/* Assume that both bits clears layers. */
if(res == 0x30)
@@ -444,7 +443,7 @@ static ADDRESS_MAP_START( ttchamp_io, AS_IO, 16, ttchamp_state )
AM_RANGE(0x0020, 0x0021) AM_WRITE(port20_w)
-// AM_RANGE(0x0034, 0x0035) AM_READ(peno_rand) AM_WRITENOP // eeprom (PIC?) / settings?
+// AM_RANGE(0x0034, 0x0035) AM_READ(peno_rand) AM_WRITENOP // eeprom (PIC?) / settings?
AM_RANGE(0x0062, 0x0063) AM_WRITE(port62_w)
@@ -577,9 +576,9 @@ ROM_END
DRIVER_INIT_MEMBER(ttchamp_state,ttchamp)
{
-// UINT8 *ROM1 = memregion("user1")->base();
-// membank("bank1")->set_base(&ROM1[0x100000]);
-// membank("bank2")->set_base(&ROM1[0x180000]);
+// UINT8 *ROM1 = memregion("user1")->base();
+// membank("bank1")->set_base(&ROM1[0x100000]);
+// membank("bank2")->set_base(&ROM1[0x180000]);
}
GAME( 1995, ttchamp, 0, ttchamp, ttchamp, ttchamp_state, ttchamp, ROT0, "Gamart", "Table Tennis Champions", GAME_NOT_WORKING ) // this has various advertising boards, including 'Electronic Devices' and 'Deniam'
diff --git a/src/mame/drivers/tugboat.c b/src/mame/drivers/tugboat.c
index 50c9690c31c..9c4d965ac3d 100644
--- a/src/mame/drivers/tugboat.c
+++ b/src/mame/drivers/tugboat.c
@@ -49,7 +49,7 @@ public:
required_device<gfxdecode_device> m_gfxdecode;
required_device<screen_device> m_screen;
required_device<palette_device> m_palette;
-
+
required_shared_ptr<UINT8> m_ram;
UINT8 m_hd46505_0_reg[18];
@@ -58,18 +58,18 @@ public:
int m_reg1;
int m_ctrl;
emu_timer *m_interrupt_timer;
-
+
DECLARE_WRITE8_MEMBER(hd46505_0_w);
DECLARE_WRITE8_MEMBER(hd46505_1_w);
DECLARE_WRITE8_MEMBER(score_w);
DECLARE_READ8_MEMBER(input_r);
DECLARE_WRITE8_MEMBER(ctrl_w);
-
+
virtual void machine_start();
virtual void video_start();
virtual void machine_reset();
DECLARE_PALETTE_INIT(tugboat);
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_tilemap(bitmap_ind16 &bitmap,const rectangle &cliprect,
int addr,int gfx0,int gfx1,int transparency);
@@ -82,7 +82,7 @@ protected:
void tugboat_state::machine_start()
{
m_interrupt_timer = timer_alloc(TIMER_INTERRUPT);
-
+
save_item(NAME(m_hd46505_0_reg));
save_item(NAME(m_hd46505_1_reg));
save_item(NAME(m_reg0));
diff --git a/src/mame/drivers/twins.c b/src/mame/drivers/twins.c
index 6ee893004dc..2aba06aa999 100644
--- a/src/mame/drivers/twins.c
+++ b/src/mame/drivers/twins.c
@@ -123,15 +123,15 @@ void twins_state::machine_start()
READ16_MEMBER(twins_state::twins_port4_r)
{
// doesn't work??
-// printf("%08x: twins_port4_r %04x\n", space.device().safe_pc(), mem_mask);
-// return m_i2cmem->read_sda();// | 0xfffe;
+// printf("%08x: twins_port4_r %04x\n", space.device().safe_pc(), mem_mask);
+// return m_i2cmem->read_sda();// | 0xfffe;
return 0x0001;
}
WRITE16_MEMBER(twins_state::twins_port4_w)
{
-// printf("%08x: twins_port4_w %04x %04x\n", space.device().safe_pc(), data, mem_mask);
+// printf("%08x: twins_port4_w %04x %04x\n", space.device().safe_pc(), data, mem_mask);
int i2c_clk = BIT(data, 1);
int i2c_mem = BIT(data, 0);
m_i2cmem->write_scl(i2c_clk);
@@ -165,7 +165,7 @@ WRITE16_MEMBER(twins_state::twins_pal_w)
/* ??? weird ..*/
WRITE16_MEMBER(twins_state::porte_paloff0_w)
{
-// printf("porte_paloff0_w %04x\n", data);
+// printf("porte_paloff0_w %04x\n", data);
m_paloff = 0;
}
@@ -205,14 +205,14 @@ WRITE16_MEMBER(twins_state::spider_blitter_w)
if (m_spritesinit == 1)
{
- // printf("spider_blitter_w %08x %04x %04x (init?) (base?)\n", offset * 2, data, mem_mask);
+ // printf("spider_blitter_w %08x %04x %04x (init?) (base?)\n", offset * 2, data, mem_mask);
m_spritesinit = 2;
m_spritesaddr = offset;
}
else if (m_spritesinit == 2)
{
- // printf("spider_blitter_w %08x %04x %04x (init2) (width?)\n", offset * 2, data, mem_mask);
+ // printf("spider_blitter_w %08x %04x %04x (init2) (width?)\n", offset * 2, data, mem_mask);
m_spriteswidth = offset & 0xff;
if (m_spriteswidth == 0)
m_spriteswidth = 80;
@@ -234,26 +234,26 @@ WRITE16_MEMBER(twins_state::spider_blitter_w)
{
UINT8 *src = m_rom8;
- // printf("spider_blitter_w %08x %04x %04x (previous data width %d address %08x)\n", offset * 2, data, mem_mask, m_spriteswidth, m_spritesaddr);
+ // printf("spider_blitter_w %08x %04x %04x (previous data width %d address %08x)\n", offset * 2, data, mem_mask, m_spriteswidth, m_spritesaddr);
offset &= 0x7fff;
for (int i = 0; i < m_spriteswidth; i++)
{
UINT8 data;
-
+
data = (src[(m_spritesaddr * 2) + 1]);
-
+
if (data)
vram[offset] = (vram[offset] & 0x00ff) | data << 8;
data = src[(m_spritesaddr*2)];
-
+
if (data)
vram[offset] = (vram[offset] & 0xff00) | data;
- m_spritesaddr ++;
+ m_spritesaddr ++;
offset++;
offset &= 0x7fff;
@@ -386,7 +386,7 @@ static MACHINE_CONFIG_START( twins, twins_state )
MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 200-1)
MCFG_SCREEN_UPDATE_DRIVER(twins_state, screen_update_twins)
MCFG_SCREEN_PALETTE("palette")
-
+
MCFG_24C02_ADD("i2cmem")
MCFG_PALETTE_ADD("palette", 0x100)
@@ -447,7 +447,7 @@ static MACHINE_CONFIG_START( twinsa, twins_state )
MCFG_PALETTE_ADD("palette", 256)
MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette")
MCFG_RAMDAC_SPLIT_READ(0)
-
+
MCFG_24C02_ADD("i2cmem")
MCFG_VIDEO_START_OVERRIDE(twins_state,twinsa)
@@ -477,9 +477,9 @@ WRITE16_MEMBER(twins_state::spider_pal_w)
}
else
{
- // printf("first palette write %04x\n", data);
+ // printf("first palette write %04x\n", data);
}
-
+
m_paloff++;
if (m_paloff == 0x101)
@@ -503,7 +503,7 @@ WRITE16_MEMBER(twins_state::spider_port_1c_w)
{
// done before the 'sprite' read / writes
// might clear a buffer?
-
+
// game is only animating sprites at 30fps, maybe there's some double buffering too?
UINT16* vram;
@@ -575,7 +575,7 @@ static MACHINE_CONFIG_START( spider, twins_state )
MCFG_PALETTE_ADD("palette", 0x100)
MCFG_VIDEO_START_OVERRIDE(twins_state,twins)
-
+
MCFG_24C02_ADD("i2cmem")
/* sound hardware */
diff --git a/src/mame/drivers/usgames.c b/src/mame/drivers/usgames.c
index e918370cb66..7110df01a46 100644
--- a/src/mame/drivers/usgames.c
+++ b/src/mame/drivers/usgames.c
@@ -32,12 +32,12 @@ Sound: AY-3-8912
void usgames_state::machine_start()
{
- membank("bank1")->configure_entries(0, 16, memregion("maincpu")->base() + 0x10000, 0x4000);
+ membank("bank1")->configure_entries(0, 16, memregion("maincpu")->base() + 0x10000, 0x4000);
}
WRITE8_MEMBER(usgames_state::usgames_rombank_w)
{
- membank("bank1")->set_entry(data);
+ membank("bank1")->set_entry(data);
}
WRITE8_MEMBER(usgames_state::lamps1_w)
diff --git a/src/mame/drivers/vamphalf.c b/src/mame/drivers/vamphalf.c
index b4195254753..41476df94f6 100644
--- a/src/mame/drivers/vamphalf.c
+++ b/src/mame/drivers/vamphalf.c
@@ -2754,10 +2754,10 @@ DRIVER_INIT_MEMBER(vamphalf_state,yorijori)
m_semicom_prot_data[0] = 2;
m_semicom_prot_data[1] = 1;
-// UINT8 *romx = (UINT8 *)memregion("user1")->base();
+// UINT8 *romx = (UINT8 *)memregion("user1")->base();
// prevent code dying after a trap 33 by patching it out, why?
-// romx[BYTE4_XOR_BE(0x8ff0)] = 3;
-// romx[BYTE4_XOR_BE(0x8ff1)] = 0;
+// romx[BYTE4_XOR_BE(0x8ff0)] = 3;
+// romx[BYTE4_XOR_BE(0x8ff1)] = 0;
// Configure the QS1000 ROM banking. Care must be taken not to overlap the 256b internal RAM
machine().device("qs1000:cpu")->memory().space(AS_IO).install_read_bank(0x0100, 0xffff, "data");
diff --git a/src/mame/drivers/vigilant.c b/src/mame/drivers/vigilant.c
index 242d6a2b362..62ea412c426 100644
--- a/src/mame/drivers/vigilant.c
+++ b/src/mame/drivers/vigilant.c
@@ -24,12 +24,12 @@ Buccaneers has a 5.6888 Mhz and a 18.432 Mhz OSC
void vigilant_state::machine_start()
{
- membank("bank1")->configure_entries(0, 8, memregion("maincpu")->base() + 0x10000, 0x4000);
+ membank("bank1")->configure_entries(0, 8, memregion("maincpu")->base() + 0x10000, 0x4000);
}
WRITE8_MEMBER(vigilant_state::vigilant_bank_select_w)
{
- membank("bank1")->set_entry(data & 0x07);
+ membank("bank1")->set_entry(data & 0x07);
}
/***************************************************************************
diff --git a/src/mame/drivers/wc90b.c b/src/mame/drivers/wc90b.c
index ddac4ad9c7f..e7d9f51ebcd 100644
--- a/src/mame/drivers/wc90b.c
+++ b/src/mame/drivers/wc90b.c
@@ -325,7 +325,7 @@ void wc90b_state::machine_start()
membank("mainbank")->configure_entries(0, 32, memregion("maincpu")->base() + 0x10000, 0x800);
membank("subbank")->configure_entries(0, 32, memregion("sub")->base() + 0x10000, 0x800);
membank("audiobank")->configure_entries(0, 2, memregion("audiocpu")->base() + 0x8000, 0x4000);
-
+
save_item(NAME(m_msm5205next));
save_item(NAME(m_toggle));
}
diff --git a/src/mame/drivers/xain.c b/src/mame/drivers/xain.c
index dbb3a9fb604..b13d6d334f0 100644
--- a/src/mame/drivers/xain.c
+++ b/src/mame/drivers/xain.c
@@ -555,9 +555,9 @@ void xain_state::machine_start()
membank("bank2")->configure_entries(0, 2, memregion("sub")->base() + 0x4000, 0xc000);
membank("bank1")->set_entry(0);
membank("bank2")->set_entry(0);
-
+
save_item(NAME(m_vblank));
-
+
if (m_mcu)
{
save_item(NAME(m_from_main));
diff --git a/src/mame/drivers/xtheball.c b/src/mame/drivers/xtheball.c
index 51f93712eca..6d67b7afa65 100644
--- a/src/mame/drivers/xtheball.c
+++ b/src/mame/drivers/xtheball.c
@@ -30,21 +30,21 @@ public:
required_device<cpu_device> m_maincpu;
required_device<tlc34076_device> m_tlc34076;
-
+
required_shared_ptr<UINT16> m_vram_bg;
required_shared_ptr<UINT16> m_vram_fg;
-
+
required_ioport m_analog_x;
required_ioport m_analog_y;
-
+
UINT8 m_bitvals[32];
-
+
DECLARE_WRITE16_MEMBER(bit_controls_w);
DECLARE_READ16_MEMBER(analogx_r);
DECLARE_READ16_MEMBER(analogy_watchdog_r);
-
+
virtual void machine_start();
-
+
TMS340X0_TO_SHIFTREG_CB_MEMBER(to_shiftreg);
TMS340X0_FROM_SHIFTREG_CB_MEMBER(from_shiftreg);
TMS340X0_SCANLINE_RGB32_CB_MEMBER(scanline_update);
diff --git a/src/mame/includes/argus.h b/src/mame/includes/argus.h
index 35710c2655f..6cf9cf2fd60 100644
--- a/src/mame/includes/argus.h
+++ b/src/mame/includes/argus.h
@@ -42,12 +42,12 @@ public:
UINT8 m_bg_status;
UINT8 m_flipscreen;
UINT16 m_palette_intensity;
-
+
// argus specific
UINT8 *m_dummy_bg0ram;
int m_lowbitscroll;
int m_prvscrollx;
-
+
// butasan specific
UINT8 *m_butasan_txram;
UINT8 *m_butasan_bg0ram;
@@ -57,17 +57,17 @@ public:
UINT8 m_butasan_page_latch;
UINT8 m_butasan_bg1_status;
UINT8 m_butasan_unknown;
-
+
// valtric specific
UINT8 m_valtric_mosaic;
bitmap_rgb32 m_mosaicbitmap;
UINT8 m_valtric_unknown;
int m_mosaic;
-
+
tilemap_t *m_tx_tilemap;
tilemap_t *m_bg0_tilemap;
tilemap_t *m_bg1_tilemap;
-
+
// common
DECLARE_WRITE8_MEMBER(bankselect_w);
DECLARE_WRITE8_MEMBER(valtric_mosaic_w);
@@ -94,7 +94,7 @@ public:
DECLARE_WRITE8_MEMBER(valtric_bg_status_w);
DECLARE_WRITE8_MEMBER(valtric_paletteram_w);
DECLARE_WRITE8_MEMBER(valtric_unknown_w);
-
+
TILE_GET_INFO_MEMBER(argus_get_tx_tile_info);
TILE_GET_INFO_MEMBER(argus_get_bg0_tile_info);
TILE_GET_INFO_MEMBER(argus_get_bg1_tile_info);
@@ -103,7 +103,7 @@ public:
TILE_GET_INFO_MEMBER(butasan_get_tx_tile_info);
TILE_GET_INFO_MEMBER(butasan_get_bg0_tile_info);
TILE_GET_INFO_MEMBER(butasan_get_bg1_tile_info);
-
+
virtual void machine_start();
DECLARE_VIDEO_START(argus);
DECLARE_VIDEO_RESET(argus);
@@ -111,28 +111,28 @@ public:
DECLARE_VIDEO_RESET(valtric);
DECLARE_VIDEO_START(butasan);
DECLARE_VIDEO_RESET(butasan);
-
+
UINT32 screen_update_argus(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
UINT32 screen_update_valtric(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
UINT32 screen_update_butasan(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
-
+
TIMER_DEVICE_CALLBACK_MEMBER(scanline);
TIMER_DEVICE_CALLBACK_MEMBER(butasan_scanline);
-
+
void reset_common();
void change_palette(int color, int lo_offs, int hi_offs);
void change_bg_palette(int color, int lo_offs, int hi_offs);
void bg_setting();
-
+
// argus specific
void argus_bg0_scroll_handle();
void argus_write_dummy_rams(int dramoffs, int vromoffs);
void argus_draw_sprites(bitmap_rgb32 &bitmap, const rectangle &cliprect, int priority);
-
+
// butasan specific
void butasan_draw_sprites(bitmap_rgb32 &bitmap, const rectangle &cliprect);
void butasan_log_vram();
-
+
// valtric specific
void valtric_draw_mosaic(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
void valtric_draw_sprites(bitmap_rgb32 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/bbusters.h b/src/mame/includes/bbusters.h
index 9e7dd060368..abcb8c1c8b8 100644
--- a/src/mame/includes/bbusters.h
+++ b/src/mame/includes/bbusters.h
@@ -23,7 +23,7 @@ public:
required_device<gfxdecode_device> m_gfxdecode;
required_device<buffered_spriteram16_device> m_spriteram;
optional_device<buffered_spriteram16_device> m_spriteram2;
-
+
optional_shared_ptr<UINT16> m_eprom_data;
required_shared_ptr<UINT16> m_ram;
required_shared_ptr<UINT16> m_videoram;
@@ -53,15 +53,15 @@ public:
DECLARE_WRITE16_MEMBER(video_w);
DECLARE_WRITE16_MEMBER(pf1_w);
DECLARE_WRITE16_MEMBER(pf2_w);
-
+
TILE_GET_INFO_MEMBER(get_tile_info);
TILE_GET_INFO_MEMBER(get_pf1_tile_info);
TILE_GET_INFO_MEMBER(get_pf2_tile_info);
-
+
virtual void machine_start();
DECLARE_VIDEO_START(bbuster);
DECLARE_VIDEO_START(mechatt);
-
+
UINT32 screen_update_bbuster(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
UINT32 screen_update_mechatt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void screen_eof_bbuster(screen_device &screen, bool state);
diff --git a/src/mame/includes/cabal.h b/src/mame/includes/cabal.h
index 6bd2ff2ebcd..244e294f30d 100644
--- a/src/mame/includes/cabal.h
+++ b/src/mame/includes/cabal.h
@@ -38,7 +38,7 @@ public:
int m_sound_command1;
int m_sound_command2;
int m_last[4];
-
+
// common
DECLARE_WRITE16_MEMBER(flipscreen_w);
DECLARE_WRITE16_MEMBER(background_videoram_w);
@@ -57,19 +57,19 @@ public:
DECLARE_WRITE8_MEMBER(cabalbl_coin_w);
DECLARE_WRITE8_MEMBER(cabalbl_1_adpcm_w);
DECLARE_WRITE8_MEMBER(cabalbl_2_adpcm_w);
-
+
DECLARE_DRIVER_INIT(cabal);
DECLARE_DRIVER_INIT(cabalbl2);
DECLARE_MACHINE_START(cabal);
DECLARE_MACHINE_START(cabalbl);
DECLARE_MACHINE_RESET(cabalbl);
virtual void video_start();
-
+
TILE_GET_INFO_MEMBER(get_back_tile_info);
TILE_GET_INFO_MEMBER(get_text_tile_info);
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);
-
+
void seibu_sound_bootleg(const char *cpu,int length);
};
diff --git a/src/mame/includes/capbowl.h b/src/mame/includes/capbowl.h
index 99ff693862a..25c51ee4acd 100644
--- a/src/mame/includes/capbowl.h
+++ b/src/mame/includes/capbowl.h
@@ -37,7 +37,7 @@ public:
/* input-related */
UINT8 m_last_trackball_val[2];
-
+
emu_timer *m_update_timer;
// common
@@ -47,21 +47,21 @@ public:
DECLARE_WRITE8_MEMBER(sndcmd_w);
DECLARE_WRITE8_MEMBER(tms34061_w);
DECLARE_READ8_MEMBER(tms34061_r);
-
+
// capbowl specific
DECLARE_WRITE8_MEMBER(capbowl_rom_select_w);
-
+
// bowlrama specific
DECLARE_WRITE8_MEMBER(bowlrama_blitter_w);
DECLARE_READ8_MEMBER(bowlrama_blitter_r);
-
+
DECLARE_DRIVER_INIT(capbowl);
virtual void machine_start();
virtual void machine_reset();
-
+
INTERRUPT_GEN_MEMBER(interrupt);
TIMER_CALLBACK_MEMBER(update);
-
+
UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
inline rgb_t pen_for_pixel( UINT8 *src, UINT8 pix );
diff --git a/src/mame/includes/fgoal.h b/src/mame/includes/fgoal.h
index b6257ba6153..c5076c17558 100644
--- a/src/mame/includes/fgoal.h
+++ b/src/mame/includes/fgoal.h
@@ -15,7 +15,7 @@ public:
m_gfxdecode(*this, "gfxdecode"),
m_screen(*this, "screen"),
m_palette(*this, "palette"),
- m_video_ram(*this, "video_ram") { }
+ m_video_ram(*this, "video_ram") { }
/* devices */
required_device<cpu_device> m_maincpu;
@@ -58,7 +58,7 @@ public:
DECLARE_WRITE8_MEMBER(xpos_w);
DECLARE_CUSTOM_INPUT_MEMBER(_80_r);
-
+
TIMER_CALLBACK_MEMBER(interrupt_callback);
virtual void machine_start();
diff --git a/src/mame/includes/hng64.h b/src/mame/includes/hng64.h
index c8c43c858c9..b2e03d86cb9 100644
--- a/src/mame/includes/hng64.h
+++ b/src/mame/includes/hng64.h
@@ -125,7 +125,7 @@ public:
m_generic_paletteram_32(*this, "paletteram")
{ }
-
+
required_device<mips3_device> m_maincpu;
required_device<v53a_device> m_audiocpu;
required_device<cpu_device> m_comm;
@@ -363,7 +363,7 @@ public:
DECLARE_WRITE_LINE_MEMBER(tcu_tm2_cb);
UINT16 m_audiochannel;
-
+
struct hng64_48bit_data {
UINT16 dat[3];
};
@@ -395,4 +395,3 @@ public:
DECLARE_WRITE16_MEMBER(hng64_sound_bank_w);
};
-
diff --git a/src/mame/includes/ironhors.h b/src/mame/includes/ironhors.h
index 0218f440fc2..5df3f1f5e66 100644
--- a/src/mame/includes/ironhors.h
+++ b/src/mame/includes/ironhors.h
@@ -48,21 +48,21 @@ public:
DECLARE_WRITE8_MEMBER(flipscreen_w);
DECLARE_WRITE8_MEMBER(filter_w);
DECLARE_READ8_MEMBER(farwest_soundlatch_r);
-
+
TILE_GET_INFO_MEMBER(get_bg_tile_info);
TILE_GET_INFO_MEMBER(farwest_get_bg_tile_info);
-
+
virtual void machine_start();
virtual void machine_reset();
virtual void video_start();
DECLARE_PALETTE_INIT(ironhors);
DECLARE_VIDEO_START(farwest);
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
UINT32 screen_update_farwest(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect );
void farwest_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect );
-
+
TIMER_DEVICE_CALLBACK_MEMBER(irq);
TIMER_DEVICE_CALLBACK_MEMBER(farwest_irq);
};
diff --git a/src/mame/includes/mosaic.h b/src/mame/includes/mosaic.h
index 75c90a19f0b..c28bda1a7ca 100644
--- a/src/mame/includes/mosaic.h
+++ b/src/mame/includes/mosaic.h
@@ -17,7 +17,7 @@ public:
/* devices */
required_device<cpu_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode;
-
+
/* memory pointers */
required_shared_ptr<UINT8> m_fgvideoram;
required_shared_ptr<UINT8> m_bgvideoram;
@@ -28,20 +28,20 @@ public:
/* misc */
int m_prot_val;
-
+
DECLARE_WRITE8_MEMBER(protection_w);
DECLARE_READ8_MEMBER(protection_r);
DECLARE_WRITE8_MEMBER(gfire2_protection_w);
DECLARE_READ8_MEMBER(gfire2_protection_r);
DECLARE_WRITE8_MEMBER(fgvideoram_w);
DECLARE_WRITE8_MEMBER(bgvideoram_w);
-
+
TILE_GET_INFO_MEMBER(get_fg_tile_info);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
-
+
virtual void machine_start();
virtual void machine_reset();
virtual void video_start();
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
};
diff --git a/src/mame/includes/paradise.h b/src/mame/includes/paradise.h
index a9e572def9f..af4dbc285df 100644
--- a/src/mame/includes/paradise.h
+++ b/src/mame/includes/paradise.h
@@ -54,10 +54,10 @@ public:
DECLARE_WRITE8_MEMBER(vram_2_w);
DECLARE_WRITE8_MEMBER(pixmap_w);
DECLARE_WRITE8_MEMBER(priority_w);
-
+
// paradise specific
DECLARE_WRITE8_MEMBER(paradise_okibank_w);
-
+
// torus specific
DECLARE_WRITE8_MEMBER(torus_coin_counter_w);
diff --git a/src/mame/includes/pooyan.h b/src/mame/includes/pooyan.h
index cbf490442a6..08ed9f48d3e 100644
--- a/src/mame/includes/pooyan.h
+++ b/src/mame/includes/pooyan.h
@@ -32,16 +32,16 @@ public:
DECLARE_WRITE8_MEMBER(videoram_w);
DECLARE_WRITE8_MEMBER(colorram_w);
DECLARE_WRITE8_MEMBER(flipscreen_w);
-
+
TILE_GET_INFO_MEMBER(get_bg_tile_info);
-
+
virtual void machine_start();
virtual void machine_reset();
virtual void video_start();
DECLARE_PALETTE_INIT(pooyan);
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect );
-
+
INTERRUPT_GEN_MEMBER(interrupt);
};
diff --git a/src/mame/includes/psychic5.h b/src/mame/includes/psychic5.h
index b422db24962..d3d8e9dc320 100644
--- a/src/mame/includes/psychic5.h
+++ b/src/mame/includes/psychic5.h
@@ -21,14 +21,14 @@ public:
m_ps5_palette_ram_tx(*this, "palette_ram_tx")
{ }
-
+
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
optional_device<address_map_bank_device> m_vrambank;
optional_device<jaleco_blend_device> m_blend;
-
+
required_shared_ptr<UINT8> m_spriteram;
required_shared_ptr<UINT8> m_fg_videoram;
required_shared_ptr<UINT8> m_bg_videoram;
@@ -78,7 +78,7 @@ public:
DECLARE_VIDEO_START(psychic5);
DECLARE_VIDEO_START(bombsa);
DECLARE_VIDEO_RESET(psychic5);
-
+
TIMER_DEVICE_CALLBACK_MEMBER(scanline);
UINT32 screen_update_psychic5(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/realbrk.h b/src/mame/includes/realbrk.h
index 4adbdbfe9d0..dca2c50ba7e 100644
--- a/src/mame/includes/realbrk.h
+++ b/src/mame/includes/realbrk.h
@@ -71,6 +71,6 @@ public:
UINT32 screen_update_dai2kaku(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect);
void dai2kaku_draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect, int layer);
-
+
INTERRUPT_GEN_MEMBER(interrupt);
};
diff --git a/src/mame/includes/rltennis.h b/src/mame/includes/rltennis.h
index fb02b1a41b5..fa8fa4c117d 100644
--- a/src/mame/includes/rltennis.h
+++ b/src/mame/includes/rltennis.h
@@ -18,7 +18,7 @@ public:
required_device<cpu_device> m_maincpu;
required_device<dac_device> m_dac_1;
required_device<dac_device> m_dac_2;
-
+
UINT16 m_blitter[RLT_NUM_BLITTER_REGS];
INT32 m_data760000;
INT32 m_data740000;
@@ -41,7 +41,7 @@ public:
virtual void machine_start();
virtual void machine_reset();
virtual void video_start();
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(interrupt);
diff --git a/src/mame/includes/seta2.h b/src/mame/includes/seta2.h
index 31c86630548..383f9c1b3d8 100644
--- a/src/mame/includes/seta2.h
+++ b/src/mame/includes/seta2.h
@@ -28,7 +28,7 @@ public:
required_device<gfxdecode_device> m_gfxdecode;
required_device<screen_device> m_screen;
required_device<palette_device> m_palette;
-
+
optional_shared_ptr<UINT16> m_nvram;
optional_shared_ptr<UINT16> m_spriteram;
optional_shared_ptr<UINT16> m_vregs;
@@ -39,7 +39,7 @@ public:
int m_yoffset;
int m_keyboard_row;
UINT16 *m_buffered_spriteram;
-
+
UINT64 m_funcube_coin_start_cycles;
UINT8 m_funcube_hopper_motor;
diff --git a/src/mame/includes/shuuz.h b/src/mame/includes/shuuz.h
index 715bf59a6ef..45828b0f9e5 100644
--- a/src/mame/includes/shuuz.h
+++ b/src/mame/includes/shuuz.h
@@ -19,17 +19,17 @@ public:
required_device<atari_vad_device> m_vad;
int m_cur[2];
-
+
virtual void update_interrupts();
-
+
DECLARE_WRITE16_MEMBER(latch_w);
DECLARE_READ16_MEMBER(leta_r);
DECLARE_READ16_MEMBER(special_port0_r);
-
+
virtual void machine_start();
-
+
TILE_GET_INFO_MEMBER(get_playfield_tile_info);
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
static const atari_motion_objects_config s_mob_config;
diff --git a/src/mame/includes/sidearms.h b/src/mame/includes/sidearms.h
index a46d6259c4e..fc42ebaef5d 100644
--- a/src/mame/includes/sidearms.h
+++ b/src/mame/includes/sidearms.h
@@ -54,9 +54,9 @@ public:
DECLARE_WRITE8_MEMBER(gfxctrl_w);
DECLARE_WRITE8_MEMBER(star_scrollx_w);
DECLARE_WRITE8_MEMBER(star_scrolly_w);
-
+
DECLARE_READ8_MEMBER(turtship_ports_r);
-
+
DECLARE_WRITE8_MEMBER(whizz_bankswitch_w);
DECLARE_DRIVER_INIT(dyger);
@@ -64,7 +64,7 @@ public:
DECLARE_DRIVER_INIT(whizz);
DECLARE_DRIVER_INIT(turtship);
virtual void machine_start();
- virtual void video_start();
+ virtual void video_start();
TILE_GET_INFO_MEMBER(get_sidearms_bg_tile_info);
TILE_GET_INFO_MEMBER(get_philko_bg_tile_info);
diff --git a/src/mame/includes/simple_st0016.h b/src/mame/includes/simple_st0016.h
index b78fdbb0fa8..9be37168154 100644
--- a/src/mame/includes/simple_st0016.h
+++ b/src/mame/includes/simple_st0016.h
@@ -12,7 +12,7 @@ public:
{ }
int mux_port;
- // UINT32 m_st0016_rom_bank;
+ // UINT32 m_st0016_rom_bank;
optional_device<st0016_cpu_device> m_maincpu;
DECLARE_READ8_MEMBER(mux_r);
@@ -27,7 +27,7 @@ public:
DECLARE_DRIVER_INIT(mayjinsn);
DECLARE_DRIVER_INIT(mayjisn2);
DECLARE_DRIVER_INIT(renju);
- virtual void machine_start();
+ virtual void machine_start();
DECLARE_VIDEO_START(st0016);
void st0016_draw_screen(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
UINT32 screen_update_st0016(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/speedbal.h b/src/mame/includes/speedbal.h
index 040335c94be..a6b2f397e66 100644
--- a/src/mame/includes/speedbal.h
+++ b/src/mame/includes/speedbal.h
@@ -39,7 +39,7 @@ public:
TILE_GET_INFO_MEMBER(get_tile_info_bg);
TILE_GET_INFO_MEMBER(get_tile_info_fg);
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);
};
diff --git a/src/mame/includes/srmp2.h b/src/mame/includes/srmp2.h
index 3c440148725..107b5344e59 100644
--- a/src/mame/includes/srmp2.h
+++ b/src/mame/includes/srmp2.h
@@ -21,7 +21,7 @@ public:
required_device<cpu_device> m_maincpu;
required_device<seta001_device> m_seta001;
required_device<msm5205_device> m_msm;
-
+
int m_color_bank;
int m_gfx_bank;
int m_adpcm_bank;
@@ -43,7 +43,7 @@ public:
DECLARE_WRITE16_MEMBER(mjyuugi_adpcm_bank_w);
DECLARE_READ8_MEMBER(mjyuugi_irq2_ack_r);
DECLARE_READ8_MEMBER(mjyuugi_irq4_ack_r);
-
+
// rmgoldyh
DECLARE_WRITE8_MEMBER(rmgoldyh_rombank_w);
diff --git a/src/mame/includes/srumbler.h b/src/mame/includes/srumbler.h
index 06dab337b2a..3d85800db5e 100644
--- a/src/mame/includes/srumbler.h
+++ b/src/mame/includes/srumbler.h
@@ -29,15 +29,15 @@ public:
DECLARE_WRITE8_MEMBER(background_w);
DECLARE_WRITE8_MEMBER(_4009_w);
DECLARE_WRITE8_MEMBER(scroll_w);
-
+
TILE_GET_INFO_MEMBER(get_fg_tile_info);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
-
+
virtual void machine_start();
virtual void video_start();
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);
-
+
TIMER_DEVICE_CALLBACK_MEMBER(interrupt);
};
diff --git a/src/mame/includes/ssozumo.h b/src/mame/includes/ssozumo.h
index 42771f95f7a..f8c30eb5534 100644
--- a/src/mame/includes/ssozumo.h
+++ b/src/mame/includes/ssozumo.h
@@ -29,7 +29,7 @@ public:
tilemap_t *m_bg_tilemap;
tilemap_t *m_fg_tilemap;
UINT8 m_sound_nmi_mask;
-
+
DECLARE_WRITE8_MEMBER(sh_command_w);
DECLARE_WRITE8_MEMBER(sound_nmi_mask_w);
DECLARE_WRITE8_MEMBER(videoram_w);
@@ -39,18 +39,18 @@ public:
DECLARE_WRITE8_MEMBER(paletteram_w);
DECLARE_WRITE8_MEMBER(scroll_w);
DECLARE_WRITE8_MEMBER(flipscreen_w);
-
+
DECLARE_INPUT_CHANGED_MEMBER(coin_inserted);
-
+
INTERRUPT_GEN_MEMBER(sound_timer_irq);
-
+
TILE_GET_INFO_MEMBER(get_bg_tile_info);
TILE_GET_INFO_MEMBER(get_fg_tile_info);
-
+
virtual void machine_start();
virtual void video_start();
DECLARE_PALETTE_INIT(ssozumo);
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);
};
diff --git a/src/mame/includes/ssrj.h b/src/mame/includes/ssrj.h
index b9175dcc172..d8c61ffed71 100644
--- a/src/mame/includes/ssrj.h
+++ b/src/mame/includes/ssrj.h
@@ -27,21 +27,21 @@ public:
tilemap_t *m_tilemap2;
tilemap_t *m_tilemap4;
UINT8 *m_buffer_spriteram;
-
+
DECLARE_READ8_MEMBER(wheel_r);
DECLARE_WRITE8_MEMBER(vram1_w);
DECLARE_WRITE8_MEMBER(vram2_w);
DECLARE_WRITE8_MEMBER(vram4_w);
-
+
TILE_GET_INFO_MEMBER(get_tile_info1);
TILE_GET_INFO_MEMBER(get_tile_info2);
TILE_GET_INFO_MEMBER(get_tile_info4);
-
+
virtual void machine_start();
virtual void machine_reset();
virtual void video_start();
DECLARE_PALETTE_INIT(ssrj);
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void screen_eof(screen_device &screen, bool state);
void draw_objects(bitmap_ind16 &bitmap, const rectangle &cliprect );
diff --git a/src/mame/includes/ssv.h b/src/mame/includes/ssv.h
index 2d5ac2fa60d..0627c79a39d 100644
--- a/src/mame/includes/ssv.h
+++ b/src/mame/includes/ssv.h
@@ -106,9 +106,9 @@ public:
DECLARE_WRITE16_MEMBER(scroll_w);
DECLARE_READ16_MEMBER(gdfs_eeprom_r);
DECLARE_WRITE16_MEMBER(gdfs_eeprom_w);
-
+
TILE_GET_INFO_MEMBER(get_tile_info_0);
-
+
DECLARE_DRIVER_INIT(gdfs);
DECLARE_DRIVER_INIT(sxyreac2);
DECLARE_DRIVER_INIT(hypreac2);
@@ -135,16 +135,16 @@ public:
virtual void video_start();
DECLARE_VIDEO_START(gdfs);
DECLARE_VIDEO_START(eaglshot);
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
UINT32 screen_update_gdfs(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
UINT32 screen_update_eaglshot(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-
+
TIMER_DEVICE_CALLBACK_MEMBER(interrupt);
TIMER_DEVICE_CALLBACK_MEMBER(gdfs_interrupt);
void update_irq_state();
IRQ_CALLBACK_MEMBER(irq_callback);
-
+
void drawgfx(bitmap_ind16 &bitmap, const rectangle &cliprect, gfx_element *gfx,UINT32 code,UINT32 color,int flipx,int flipy,int x0,int y0,int shadow);
void draw_row(bitmap_ind16 &bitmap, const rectangle &cliprect, int sx, int sy, int scroll);
void draw_layer(bitmap_ind16 &bitmap, const rectangle &cliprect, int nr);
diff --git a/src/mame/includes/subs.h b/src/mame/includes/subs.h
index 1b9629a7b29..523512951f2 100644
--- a/src/mame/includes/subs.h
+++ b/src/mame/includes/subs.h
@@ -42,7 +42,7 @@ public:
int m_steering_val2;
int m_last_val_1;
int m_last_val_2;
-
+
DECLARE_WRITE8_MEMBER(steer_reset_w);
DECLARE_READ8_MEMBER(control_r);
DECLARE_READ8_MEMBER(coin_r);
@@ -56,16 +56,16 @@ public:
DECLARE_WRITE8_MEMBER(crash_w);
DECLARE_WRITE8_MEMBER(explode_w);
DECLARE_WRITE8_MEMBER(noise_reset_w);
-
+
virtual void machine_start();
virtual void machine_reset();
DECLARE_PALETTE_INIT(subs);
-
+
UINT32 screen_update_left(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
UINT32 screen_update_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-
+
INTERRUPT_GEN_MEMBER(interrupt);
-
+
int steering_1();
int steering_2();
};
diff --git a/src/mame/includes/suna16.h b/src/mame/includes/suna16.h
index 6ccfc4f4045..7f641552bfe 100644
--- a/src/mame/includes/suna16.h
+++ b/src/mame/includes/suna16.h
@@ -40,7 +40,7 @@ public:
DECLARE_WRITE16_MEMBER(flipscreen_w);
DECLARE_WRITE8_MEMBER(DAC1_w);
DECLARE_WRITE8_MEMBER(DAC2_w);
-
+
// bestbest specific
DECLARE_WRITE16_MEMBER(bestbest_flipscreen_w);
DECLARE_WRITE16_MEMBER(bestbest_coin_w);
@@ -54,22 +54,22 @@ public:
DECLARE_WRITE8_MEMBER(bssoccer_pcm_2_bankswitch_w);
DECLARE_WRITE8_MEMBER(bssoccer_DAC3_w);
DECLARE_WRITE8_MEMBER(bssoccer_DAC4_w);
-
+
// uballoon specific
DECLARE_WRITE16_MEMBER(uballoon_leds_w);
DECLARE_WRITE8_MEMBER(uballoon_pcm_1_bankswitch_w);
DECLARE_READ8_MEMBER(uballoon_prot_r);
DECLARE_WRITE8_MEMBER(uballoon_prot_w);
-
+
TIMER_DEVICE_CALLBACK_MEMBER(bssoccer_interrupt);
-
+
DECLARE_DRIVER_INIT(uballoon);
virtual void video_start();
DECLARE_MACHINE_START(bestbest);
DECLARE_MACHINE_START(bssoccer);
- DECLARE_MACHINE_START(uballoon);
+ DECLARE_MACHINE_START(uballoon);
DECLARE_MACHINE_RESET(uballoon);
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
UINT32 screen_update_bestbest(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, UINT16 *sprites, int gfx);
diff --git a/src/mame/includes/suprloco.h b/src/mame/includes/suprloco.h
index a04d8166faa..13b534f793d 100644
--- a/src/mame/includes/suprloco.h
+++ b/src/mame/includes/suprloco.h
@@ -9,7 +9,7 @@ public:
m_spriteram(*this, "spriteram"),
m_videoram(*this, "videoram"),
m_scrollram(*this, "scrollram") { }
-
+
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
required_device<gfxdecode_device> m_gfxdecode;
@@ -17,7 +17,7 @@ public:
required_shared_ptr<UINT8> m_spriteram;
required_shared_ptr<UINT8> m_videoram;
required_shared_ptr<UINT8> m_scrollram;
-
+
tilemap_t *m_bg_tilemap;
int m_control;
@@ -26,13 +26,13 @@ public:
DECLARE_WRITE8_MEMBER(scrollram_w);
DECLARE_WRITE8_MEMBER(control_w);
DECLARE_READ8_MEMBER(control_r);
-
+
TILE_GET_INFO_MEMBER(get_tile_info);
-
+
virtual void video_start();
DECLARE_PALETTE_INIT(suprloco);
DECLARE_DRIVER_INIT(suprloco);
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
inline void draw_pixel(bitmap_ind16 &bitmap,const rectangle &cliprect,int x,int y,int color,int flip);
void draw_sprite(bitmap_ind16 &bitmap,const rectangle &cliprect,int spr_number);
diff --git a/src/mame/includes/suprridr.h b/src/mame/includes/suprridr.h
index fe39170bee4..29c34423e4b 100644
--- a/src/mame/includes/suprridr.h
+++ b/src/mame/includes/suprridr.h
@@ -35,7 +35,7 @@ public:
tilemap_t *m_bg_tilemap_noscroll;
UINT8 m_flipx;
UINT8 m_flipy;
-
+
DECLARE_WRITE8_MEMBER(nmi_enable_w);
DECLARE_WRITE8_MEMBER(sound_data_w);
DECLARE_WRITE8_MEMBER(sound_irq_ack_w);
@@ -48,19 +48,19 @@ public:
DECLARE_WRITE8_MEMBER(bgram_w);
DECLARE_WRITE8_MEMBER(fgram_w);
DECLARE_READ8_MEMBER(sound_data_r);
-
+
DECLARE_CUSTOM_INPUT_MEMBER(control_r);
-
+
TILE_GET_INFO_MEMBER(get_tile_info);
TILE_GET_INFO_MEMBER(get_tile_info2);
-
+
INTERRUPT_GEN_MEMBER(main_nmi_gen);
TIMER_CALLBACK_MEMBER(delayed_sound_w);
-
+
virtual void machine_start();
virtual void video_start();
DECLARE_PALETTE_INIT(suprridr);
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
int is_screen_flipped();
};
diff --git a/src/mame/includes/tankbatt.h b/src/mame/includes/tankbatt.h
index c7c9c39646a..d89621127f2 100644
--- a/src/mame/includes/tankbatt.h
+++ b/src/mame/includes/tankbatt.h
@@ -18,11 +18,11 @@ public:
required_shared_ptr<UINT8> m_bulletsram;
required_shared_ptr<UINT8> m_videoram;
-
+
int m_nmi_enable;
int m_sound_enable;
tilemap_t *m_bg_tilemap;
-
+
DECLARE_WRITE8_MEMBER(led_w);
DECLARE_READ8_MEMBER(in0_r);
DECLARE_READ8_MEMBER(in1_r);
@@ -36,17 +36,17 @@ public:
DECLARE_WRITE8_MEMBER(coincounter_w);
DECLARE_WRITE8_MEMBER(coinlockout_w);
DECLARE_WRITE8_MEMBER(videoram_w);
-
-
+
+
INTERRUPT_GEN_MEMBER(interrupt);
DECLARE_INPUT_CHANGED_MEMBER(coin_inserted);
-
+
TILE_GET_INFO_MEMBER(get_bg_tile_info);
-
+
virtual void machine_start();
virtual void video_start();
DECLARE_PALETTE_INIT(tankbatt);
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_bullets(bitmap_ind16 &bitmap, const rectangle &cliprect);
};
diff --git a/src/mame/includes/tankbust.h b/src/mame/includes/tankbust.h
index 2bf3f8bcc21..37e88e410de 100644
--- a/src/mame/includes/tankbust.h
+++ b/src/mame/includes/tankbust.h
@@ -31,7 +31,7 @@ public:
UINT8 m_xscroll[2];
UINT8 m_yscroll[2];
UINT8 m_irq_mask;
-
+
DECLARE_WRITE8_MEMBER(soundlatch_w);
DECLARE_WRITE8_MEMBER(e0xx_w);
DECLARE_READ8_MEMBER(debug_output_area_r);
@@ -44,18 +44,18 @@ public:
DECLARE_WRITE8_MEMBER(yscroll_w);
DECLARE_READ8_MEMBER(soundlatch_r);
DECLARE_READ8_MEMBER(soundtimer_r);
-
+
TILE_GET_INFO_MEMBER(get_bg_tile_info);
TILE_GET_INFO_MEMBER(get_txt_tile_info);
-
- virtual void machine_start();
- virtual void machine_reset();
+
+ virtual void machine_start();
+ virtual void machine_reset();
virtual void video_start();
DECLARE_PALETTE_INIT(tankbust);
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);
-
+
INTERRUPT_GEN_MEMBER(vblank_irq);
TIMER_CALLBACK_MEMBER(soundlatch_callback);
TIMER_CALLBACK_MEMBER(soundirqline_callback);
diff --git a/src/mame/includes/taotaido.h b/src/mame/includes/taotaido.h
index 56c75aa93a9..f4012287c16 100644
--- a/src/mame/includes/taotaido.h
+++ b/src/mame/includes/taotaido.h
@@ -21,7 +21,7 @@ public:
required_shared_ptr<UINT16> m_spriteram2;
required_shared_ptr<UINT16> m_scrollram;
required_shared_ptr<UINT16> m_bgram;
-
+
int m_pending_command;
UINT16 m_sprite_character_bank_select[8];
UINT16 m_video_bank_select[8];
@@ -30,7 +30,7 @@ public:
UINT16 *m_spriteram_older;
UINT16 *m_spriteram2_old;
UINT16 *m_spriteram2_older;
-
+
DECLARE_READ16_MEMBER(pending_command_r);
DECLARE_WRITE16_MEMBER(sound_command_w);
DECLARE_WRITE8_MEMBER(pending_command_clear_w);
@@ -38,13 +38,13 @@ public:
DECLARE_WRITE16_MEMBER(sprite_character_bank_select_w);
DECLARE_WRITE16_MEMBER(tileregs_w);
DECLARE_WRITE16_MEMBER(bgvideoram_w);
-
+
TILE_GET_INFO_MEMBER(bg_tile_info);
TILEMAP_MAPPER_MEMBER(tilemap_scan_rows);
-
+
virtual void machine_start();
virtual void video_start();
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void screen_eof(screen_device &screen, bool state);
UINT32 tile_callback( UINT32 code );
diff --git a/src/mame/includes/tbowl.h b/src/mame/includes/tbowl.h
index c6fbb1e0421..778e273c526 100644
--- a/src/mame/includes/tbowl.h
+++ b/src/mame/includes/tbowl.h
@@ -62,18 +62,18 @@ public:
DECLARE_WRITE8_MEMBER(bg2xscroll_hi);
DECLARE_WRITE8_MEMBER(bg2yscroll_lo);
DECLARE_WRITE8_MEMBER(bg2yscroll_hi);
-
+
TILE_GET_INFO_MEMBER(get_tx_tile_info);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
TILE_GET_INFO_MEMBER(get_bg2_tile_info);
-
+
virtual void machine_start();
virtual void machine_reset();
virtual void video_start();
-
+
UINT32 screen_update_left(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
UINT32 screen_update_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-
+
void adpcm_int(msm5205_device *device, int chip);
DECLARE_WRITE_LINE_MEMBER(adpcm_int_1);
DECLARE_WRITE_LINE_MEMBER(adpcm_int_2);
diff --git a/src/mame/includes/thunderx.h b/src/mame/includes/thunderx.h
index 8e42281322a..41d55201560 100644
--- a/src/mame/includes/thunderx.h
+++ b/src/mame/includes/thunderx.h
@@ -62,7 +62,7 @@ public:
virtual void machine_start();
virtual void machine_reset();
- virtual void video_start();
+ virtual void video_start();
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(vblank_interrupt);
diff --git a/src/mame/includes/timelimt.h b/src/mame/includes/timelimt.h
index b1390b0fd46..91a2894e0a9 100644
--- a/src/mame/includes/timelimt.h
+++ b/src/mame/includes/timelimt.h
@@ -33,17 +33,17 @@ public:
DECLARE_WRITE8_MEMBER(scroll_x_lsb_w);
DECLARE_WRITE8_MEMBER(scroll_x_msb_w);
DECLARE_WRITE8_MEMBER(scroll_y_w);
-
+
TILE_GET_INFO_MEMBER(get_bg_tile_info);
TILE_GET_INFO_MEMBER(get_fg_tile_info);
-
+
virtual void machine_start();
virtual void machine_reset();
virtual void video_start();
DECLARE_PALETTE_INIT(timelimt);
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);
-
+
INTERRUPT_GEN_MEMBER(irq);
};
diff --git a/src/mame/includes/tryout.h b/src/mame/includes/tryout.h
index 9d06817ef30..d8e63eade36 100644
--- a/src/mame/includes/tryout.h
+++ b/src/mame/includes/tryout.h
@@ -27,7 +27,7 @@ public:
UINT8 m_vram_bank;
UINT8 *m_vram;
UINT8 *m_vram_gfx;
-
+
DECLARE_WRITE8_MEMBER(nmi_ack_w);
DECLARE_WRITE8_MEMBER(sound_w);
DECLARE_WRITE8_MEMBER(sound_irq_ack_w);
@@ -45,8 +45,8 @@ public:
TILEMAP_MAPPER_MEMBER(get_fg_memory_offset);
TILEMAP_MAPPER_MEMBER(get_bg_memory_offset);
- virtual void machine_start();
- virtual void video_start();
+ virtual void machine_start();
+ virtual void video_start();
DECLARE_PALETTE_INIT(tryout);
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/tsamurai.h b/src/mame/includes/tsamurai.h
index 1a43871fea0..62983b0fb4d 100644
--- a/src/mame/includes/tsamurai.h
+++ b/src/mame/includes/tsamurai.h
@@ -28,26 +28,26 @@ public:
tilemap_t *m_background;
tilemap_t *m_foreground;
-
+
//common
int m_flicker;
int m_textbank1;
int m_nmi_enabled;
-
+
// tsamurai and m660 specific
int m_bgcolor;
int m_sound_command1;
int m_sound_command2;
-
+
//m660 specific
int m_textbank2;
int m_sound_command3;
-
+
//vsgongf specific
int m_vsgongf_sound_nmi_enabled;
int m_vsgongf_color;
int m_key_count; //debug only
-
+
// common
DECLARE_WRITE8_MEMBER(nmi_enable_w);
DECLARE_WRITE8_MEMBER(coincounter_w);
@@ -68,27 +68,27 @@ public:
DECLARE_WRITE8_MEMBER(sound_command2_w);
DECLARE_READ8_MEMBER(sound_command1_r);
DECLARE_READ8_MEMBER(sound_command2_r);
-
+
// tsamurai specific
DECLARE_READ8_MEMBER(tsamurai_unknown_d803_r);
-
+
// m660 specific
DECLARE_WRITE8_MEMBER(m660_textbank2_w);
DECLARE_READ8_MEMBER(m660_unknown_d803_r);
DECLARE_WRITE8_MEMBER(m660_sound_command3_w);
DECLARE_READ8_MEMBER(m660_sound_command3_r);
-
+
// vsgongf specific
DECLARE_WRITE8_MEMBER(vsgongf_color_w);
DECLARE_WRITE8_MEMBER(vsgongf_sound_nmi_enable_w);
DECLARE_READ8_MEMBER(vsgongf_a006_r);
DECLARE_READ8_MEMBER(vsgongf_a100_r);
DECLARE_WRITE8_MEMBER(vsgongf_sound_command_w);
-
+
TILE_GET_INFO_MEMBER(get_bg_tile_info);
TILE_GET_INFO_MEMBER(get_fg_tile_info);
TILE_GET_INFO_MEMBER(get_vsgongf_tile_info);
-
+
virtual void machine_start();
DECLARE_MACHINE_START(m660);
DECLARE_MACHINE_START(tsamurai);
@@ -97,11 +97,11 @@ public:
DECLARE_VIDEO_START(m660);
DECLARE_VIDEO_START(tsamurai);
DECLARE_VIDEO_START(vsgongf);
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
UINT32 screen_update_vsgongf(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect );
-
+
INTERRUPT_GEN_MEMBER(interrupt);
INTERRUPT_GEN_MEMBER(vsgongf_sound_interrupt);
};
diff --git a/src/mame/includes/usgames.h b/src/mame/includes/usgames.h
index f8f4e5bb83a..51316a7a165 100644
--- a/src/mame/includes/usgames.h
+++ b/src/mame/includes/usgames.h
@@ -17,8 +17,8 @@ public:
DECLARE_WRITE8_MEMBER(usgames_videoram_w);
DECLARE_WRITE8_MEMBER(usgames_charram_w);
TILE_GET_INFO_MEMBER(get_usgames_tile_info);
- virtual void machine_start();
- virtual void video_start();
+ virtual void machine_start();
+ virtual void video_start();
DECLARE_PALETTE_INIT(usgames);
UINT32 screen_update_usgames(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
required_device<cpu_device> m_maincpu;
diff --git a/src/mame/includes/vigilant.h b/src/mame/includes/vigilant.h
index 52b88897e7e..e1797090313 100644
--- a/src/mame/includes/vigilant.h
+++ b/src/mame/includes/vigilant.h
@@ -38,8 +38,8 @@ public:
DECLARE_WRITE8_MEMBER(vigilant_horiz_scroll_w);
DECLARE_WRITE8_MEMBER(vigilant_rear_horiz_scroll_w);
DECLARE_WRITE8_MEMBER(vigilant_rear_color_w);
- virtual void machine_start();
- virtual void video_start();
+ virtual void machine_start();
+ virtual void video_start();
virtual void video_reset();
UINT32 screen_update_vigilant(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
UINT32 screen_update_kikcubic(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/vulgus.h b/src/mame/includes/vulgus.h
index 2c4294cc75f..19383814077 100644
--- a/src/mame/includes/vulgus.h
+++ b/src/mame/includes/vulgus.h
@@ -48,6 +48,6 @@ public:
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect);
-
+
INTERRUPT_GEN_MEMBER(vblank_irq);
};
diff --git a/src/mame/includes/wc90b.h b/src/mame/includes/wc90b.h
index b81bc70feb5..b5d513d69dc 100644
--- a/src/mame/includes/wc90b.h
+++ b/src/mame/includes/wc90b.h
@@ -51,14 +51,14 @@ public:
DECLARE_WRITE8_MEMBER(txvideoram_w);
DECLARE_WRITE8_MEMBER(adpcm_control_w);
DECLARE_WRITE_LINE_MEMBER(adpcm_int);
-
+
TILE_GET_INFO_MEMBER(get_bg_tile_info);
TILE_GET_INFO_MEMBER(get_fg_tile_info);
TILE_GET_INFO_MEMBER(get_tx_tile_info);
-
+
virtual void machine_start();
virtual void video_start();
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int priority );
};
diff --git a/src/mame/machine/hng64_net.c b/src/mame/machine/hng64_net.c
index 8fedeccf250..190d992a9b2 100644
--- a/src/mame/machine/hng64_net.c
+++ b/src/mame/machine/hng64_net.c
@@ -141,4 +141,4 @@ MACHINE_CONFIG_FRAGMENT( hng64_network )
MCFG_CPU_ADD("network", KL5C80A12, HNG64_MASTER_CLOCK / 4) /* KL5C80A12CFP - binary compatible with Z80. */
MCFG_CPU_PROGRAM_MAP(hng_comm_map)
MCFG_CPU_IO_MAP(hng_comm_io_map)
-MACHINE_CONFIG_END \ No newline at end of file
+MACHINE_CONFIG_END
diff --git a/src/mame/machine/iteagle_fpga.c b/src/mame/machine/iteagle_fpga.c
index 22f907ddcdd..f72e62a4f26 100644
--- a/src/mame/machine/iteagle_fpga.c
+++ b/src/mame/machine/iteagle_fpga.c
@@ -35,15 +35,15 @@ void iteagle_fpga_device::device_start()
add_map(sizeof(m_ctrl_regs), M_IO, FUNC(iteagle_fpga_device::ctrl_map));
// ctrl defaults to base address 0x00000000
- bank_infos[0].adr = 0x00000000 & (~(bank_infos[0].size - 1));
+ bank_infos[0].adr = 0x00000000 & (~(bank_infos[0].size - 1));
add_map(sizeof(m_fpga_regs), M_IO, FUNC(iteagle_fpga_device::fpga_map));
// fpga defaults to base address 0x00000300
- bank_infos[1].adr = 0x00000300 & (~(bank_infos[1].size - 1));
+ bank_infos[1].adr = 0x00000300 & (~(bank_infos[1].size - 1));
add_map(sizeof(m_rtc_regs), M_MEM, FUNC(iteagle_fpga_device::rtc_map));
// RTC defaults to base address 0x000c0000
- bank_infos[2].adr = 0x000c0000 & (~(bank_infos[2].size - 1));
+ bank_infos[2].adr = 0x000c0000 & (~(bank_infos[2].size - 1));
}
void iteagle_fpga_device::device_reset()
@@ -106,7 +106,7 @@ READ32_MEMBER( iteagle_fpga_device::fpga_r )
if (LOG_FPGA && (m_prev_reg != offset && m_prev_reg != (0x08/4)))
logerror("%s:fpga read from offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, result, mem_mask);
break;
- case 0x04/4:
+ case 0x04/4:
result = (result & 0xFF0FFFFF) | (machine().root_device().ioport("SW5")->read()<<20); // Resolution
if (LOG_FPGA)
logerror("%s:fpga read from offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, result, mem_mask);
@@ -183,7 +183,7 @@ WRITE32_MEMBER( iteagle_fpga_device::rtc_w )
COMBINE_DATA(&m_rtc_regs[offset]);
switch (offset) {
- case 0x7F8/4: // M48T02 time
+ case 0x7F8/4: // M48T02 time
if (data & mem_mask & 0x40) {
// get the current date/time from the core
machine().current_datetime(systime);
@@ -191,7 +191,7 @@ WRITE32_MEMBER( iteagle_fpga_device::rtc_w )
raw[1] = dec_2_bcd(systime.local_time.second);
raw[2] = dec_2_bcd(systime.local_time.minute);
raw[3] = dec_2_bcd(systime.local_time.hour);
-
+
raw[4] = dec_2_bcd((systime.local_time.weekday != 0) ? systime.local_time.weekday : 7);
raw[5] = dec_2_bcd(systime.local_time.mday);
raw[6] = dec_2_bcd(systime.local_time.month + 1);
@@ -199,10 +199,10 @@ WRITE32_MEMBER( iteagle_fpga_device::rtc_w )
m_rtc_regs[0x7F8/4] = (raw[3]<<24) | (raw[2]<<16) | (raw[1]<<8) | (raw[0] <<0);
//m_rtc_regs[0x7FC/4] = (raw[7]<<24) | (raw[6]<<16) | (raw[5]<<8) | (raw[4] <<0);
m_rtc_regs[0x7FC/4] = (0x95<<24) | (raw[6]<<16) | (raw[5]<<8) | (raw[4] <<0);
- }
+ }
if (LOG_RTC)
logerror("%s:RTC write to offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, data, mem_mask);
-
+
break;
default:
if (LOG_RTC)
@@ -249,7 +249,7 @@ void iteagle_eeprom_device::device_reset()
pci_device::device_reset();
}
-READ32_MEMBER( iteagle_eeprom_device::eeprom_r )
+READ32_MEMBER( iteagle_eeprom_device::eeprom_r )
{
UINT32 result = 0;
@@ -257,7 +257,7 @@ READ32_MEMBER( iteagle_eeprom_device::eeprom_r )
case 0xC/4: // I2C Handler
if (ACCESSING_BITS_16_23) {
result = m_eeprom->do_read()<<(16+3);
- } else {
+ } else {
if (LOG_EEPROM)
logerror("%s:eeprom read from offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, result, mem_mask);
}
@@ -270,7 +270,7 @@ READ32_MEMBER( iteagle_eeprom_device::eeprom_r )
return result;
}
-WRITE32_MEMBER( iteagle_eeprom_device::eeprom_w )
+WRITE32_MEMBER( iteagle_eeprom_device::eeprom_w )
{
switch (offset) {
case 0xC/4: // I2C Handler
@@ -278,7 +278,7 @@ WRITE32_MEMBER( iteagle_eeprom_device::eeprom_w )
m_eeprom->di_write((data & 0x040000) >> (16+2));
m_eeprom->cs_write((data & 0x020000) ? ASSERT_LINE : CLEAR_LINE);
m_eeprom->clk_write((data & 0x010000) ? ASSERT_LINE : CLEAR_LINE);
- } else {
+ } else {
if (LOG_EEPROM)
logerror("%s:eeprom write to offset %04X = %08X & %08X\n", machine().describe_context(), offset*4, data, mem_mask);
}
diff --git a/src/mame/machine/iteagle_fpga.h b/src/mame/machine/iteagle_fpga.h
index acc4bd85b00..356c6517619 100644
--- a/src/mame/machine/iteagle_fpga.h
+++ b/src/mame/machine/iteagle_fpga.h
@@ -31,7 +31,7 @@ private:
UINT32 m_fpga_regs[0x20];
UINT32 m_rtc_regs[0x800];
UINT32 m_prev_reg;
-
+
DECLARE_ADDRESS_MAP(rtc_map, 32);
DECLARE_ADDRESS_MAP(fpga_map, 32);
DECLARE_ADDRESS_MAP(ctrl_map, 32);
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index cc31e505792..b6e570a8fe0 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -336,7 +336,7 @@ froggers // bootleg
frogf // bootleg
quaak // bootleg
froggeram // bootleg
-froggerv // bootleg
+froggerv // bootleg
amidars // GX337 (c) 1982 Konami
triplep // (c) 1982 KKI / made by Sanritsu?
triplepa // (c) 1982 KKI / made by Sanritsu?
@@ -6350,7 +6350,7 @@ combatsc // GX611 (c) 1988
combatsct // GX611 (c) 1987
combatscj // GX611 (c) 1987 (Japan)
bootcamp // GX611 (c) 1987
-bootcampa // GX611 (c) 1987
+bootcampa // GX611 (c) 1987
combatscb // bootleg
rockrage // GX620 (c) 1986 (World?)
rockragea // GX620 (c) 1986 (Prototype?)
@@ -7713,7 +7713,7 @@ kof2000 // 0257 (c) 2000 SNK
kof2000n // 0257 (c) 2000 SNK
// 0258 SNK vs. Capcom?
bangbead // 0259 (c) 2000 Visco
-b2b // 0071 (c) 2000 Visco (released by NCI in 2010)
+b2b // 0071 (c) 2000 Visco (released by NCI in 2010)
nitd // 0260 (c) 2000 Eleven / Gavaking
nitdbl // bootleg
sengoku3 // 0261 (c) 2001 Noise Factory / SNK
@@ -7910,7 +7910,7 @@ tstrike // East Coast Coin Company (Melbourne)
tstrikea // Game Room
ctribe // TA-0028 (c) 1990 (US)
ctribe1 // TA-0028 (c) 1990 (US)
-ctribeo // TA-0028 (c) 1990 (US)
+ctribeo // TA-0028 (c) 1990 (US)
ctribej // TA-0028 (c) 1990 (Japan)
ctribeb // bootleg
ctribeb2 // bootleg
@@ -8453,7 +8453,7 @@ raiden2ea // (c) 1993 Seibu Kaihatsu
raiden2eu // (c) 1993 Seibu Kaihatsu + Fabtek license
raiden2eua // (c) 1993 Seibu Kaihatsu + Fabtek license
raiden2nl // (c) 1993 Seibu Kaihatsu
-raiden2f // (c) 1993 Seibu Kaihatsu
+raiden2f // (c) 1993 Seibu Kaihatsu
raiden2g // (c) 1993 Seibu Kaihatsu + Tuning license
raiden2dx // (c) 1993 Seibu Kaihatsu
@@ -8777,7 +8777,7 @@ gunbird // (c) 1994
gunbirdk // (c) 1994
gunbirdj // (c) 1994
btlkroad // (c) 1994
-btlkroadk // (c) 1994
+btlkroadk // (c) 1994
s1945 // (c) 1995
s1945a // (c) 1995
s1945j // (c) 1995
diff --git a/src/mame/video/bbusters.c b/src/mame/video/bbusters.c
index 77c90356759..dcc064e8037 100644
--- a/src/mame/video/bbusters.c
+++ b/src/mame/video/bbusters.c
@@ -76,7 +76,7 @@ VIDEO_START_MEMBER(bbusters_state,bbuster)
m_pf1_tilemap->set_transparent_pen(15);
m_fix_tilemap->set_transparent_pen(15);
-
+
save_item(NAME(m_scale_line_count));
}
@@ -88,7 +88,7 @@ VIDEO_START_MEMBER(bbusters_state,mechatt)
m_pf1_tilemap->set_transparent_pen(15);
m_fix_tilemap->set_transparent_pen(15);
-
+
save_item(NAME(m_scale_line_count));
}
diff --git a/src/mame/video/deadang.c b/src/mame/video/deadang.c
index 606a7f08e8b..f1f9360798d 100644
--- a/src/mame/video/deadang.c
+++ b/src/mame/video/deadang.c
@@ -77,7 +77,7 @@ void deadang_state::video_start()
m_pf2_layer->set_transparent_pen(15);
m_pf1_layer->set_transparent_pen(15);
m_text_layer->set_transparent_pen(15);
-
+
save_item(NAME(m_tilebank));
save_item(NAME(m_oldtilebank));
}
diff --git a/src/mame/video/decmxc06.c b/src/mame/video/decmxc06.c
index 61cc9d03d93..e8c7a5972a8 100644
--- a/src/mame/video/decmxc06.c
+++ b/src/mame/video/decmxc06.c
@@ -110,14 +110,14 @@ void deco_mxc06_device::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cli
else
mult = -16;
-
+
// thedeep strongly suggests that this check goes here, otherwise the radar breaks
if (!(spriteram[offs] & 0x8000))
{
offs += 4;
continue;
}
-
+
for (x = 0; x < w; x++)
{
@@ -173,7 +173,7 @@ void deco_mxc06_device::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cli
offs += 4;
if (offs >= m_ramsize / 2)
return;
-
+
}
}
diff --git a/src/mame/video/dynax.c b/src/mame/video/dynax.c
index 86994063971..f588a436d2c 100644
--- a/src/mame/video/dynax.c
+++ b/src/mame/video/dynax.c
@@ -122,8 +122,8 @@ WRITE8_MEMBER(dynax_state::tenkai_blit_dest_w)
}
/*
-mjelctrn: 7 d e -> 1 - 4 8
-mjembase: b d e -> - 2 4 8
+mjelctrn: 7 d e -> 1 - 4 8
+mjembase: b d e -> - 2 4 8
*/
WRITE8_MEMBER(dynax_state::mjembase_blit_dest_w)
{
@@ -381,7 +381,7 @@ void dynax_state::blitter_plot_pixel( int layer, int mask, int x, int y, int pen
}
/*
- Flags:
+ Flags:
7654 ---- -
---- 3--- Rotation = SWAPXY + FLIPY
@@ -1223,9 +1223,9 @@ WRITE8_MEMBER(dynax_state::tenkai_priority_w)
}
/*
-mjembase: priority: 00 08 10 18 20 28; enable: 1,2,4
+mjembase: priority: 00 08 10 18 20 28; enable: 1,2,4
Convert to:
-mjelctrn: priority: 00 20 10 40 30 50; enable: 1,2,8
+mjelctrn: priority: 00 20 10 40 30 50; enable: 1,2,8
*/
WRITE8_MEMBER(dynax_state::mjembase_priority_w)
{
diff --git a/src/mame/video/hng64.c b/src/mame/video/hng64.c
index 74564860689..2446eb26365 100644
--- a/src/mame/video/hng64.c
+++ b/src/mame/video/hng64.c
@@ -660,7 +660,7 @@ void hng64_state::hng64_drawtilemap(screen_device &screen, bitmap_rgb32 &bitmap,
// xrally's pink tilemaps make me think this is a tilemap enable bit.
// fatfurwa makes me think otherwise.
-// if (!(tileregs & 0x0040)) return;
+// if (!(tileregs & 0x0040)) return;
// set the transmask so our manual copy is correct
if (tileregs & 0x0400)
@@ -1251,4 +1251,3 @@ void hng64_state::video_start()
m_vertsrom = (UINT16*)memregion("verts")->base();
m_vertsrom_size = memregion("verts")->bytes();
}
-
diff --git a/src/mame/video/hng64_3d.c b/src/mame/video/hng64_3d.c
index 0dbca3d24f7..3945a70dd4f 100644
--- a/src/mame/video/hng64_3d.c
+++ b/src/mame/video/hng64_3d.c
@@ -68,7 +68,7 @@ TIMER_CALLBACK_MEMBER(hng64_state::hng64_3dfifo_processed )
/* Note: Samurai Shodown games never calls bit 1, so it can't be framebuffer clear. It also calls bit 3 at start-up, meaning unknown */
WRITE32_MEMBER(hng64_state::dl_control_w) // This handles framebuffers
{
-// printf("dl_control_w %08x %08x\n", data, mem_mask);
+// printf("dl_control_w %08x %08x\n", data, mem_mask);
//if(data & 2) // swap buffers
//{
@@ -540,7 +540,7 @@ void hng64_state::recoverPolygonBlock(const UINT16* packet, struct polygon* poly
#if 0
if (((chunkOffset[2] & 0xc000) == 0x4000) && (m_screen->frame_number() & 1))
{
- // if (chunkOffset[2] == 0xd870)
+ // if (chunkOffset[2] == 0xd870)
{
polys[*numPolys].debugColor = 0xffff0000;
printf("%d (%08x) : %04x %04x %04x\n", k, address[k] * 3 * 2, chunkOffset[0], chunkOffset[1], chunkOffset[2]);
@@ -863,13 +863,12 @@ void hng64_state::recoverPolygonBlock(const UINT16* packet, struct polygon* poly
void hng64_state::hng64_command3d(const UINT16* packet)
{
-
/* A temporary place to put some polygons. This will optimize away if the compiler's any good. */
int numPolys = 0;
dynamic_array<polygon> polys(1024*5);
//printf("packet type : %04x %04x|%04x %04x|%04x %04x|%04x %04x | %04x %04x %04x %04x %04x %04x %04x %04x\n", packet[0],packet[1],packet[2],packet[3],packet[4],packet[5],packet[6],packet[7], packet[8], packet[9], packet[10], packet[11], packet[12], packet[13], packet[14], packet[15]);
-
+
switch (packet[0])
{
case 0x0000: // Appears to be a NOP.
@@ -1239,7 +1238,7 @@ inline void hng64_state::FillSmoothTexPCHorizontalLine(
UINT8 paletteEntry = 0;
float t_coord, s_coord;
- const UINT8 *gfx = m_texturerom;
+ const UINT8 *gfx = m_texturerom;
const UINT8 *textureOffset = &gfx[prOptions.texIndex * 1024 * 1024];
for (; x_start <= x_end; x_start++)
@@ -1702,4 +1701,3 @@ void hng64_state::drawShaded( struct polygon *p)
prOptions);
}
}
-
diff --git a/src/mame/video/hng64_sprite.c b/src/mame/video/hng64_sprite.c
index 0c6f6e37fc3..39827c4c79e 100644
--- a/src/mame/video/hng64_sprite.c
+++ b/src/mame/video/hng64_sprite.c
@@ -222,4 +222,3 @@ void hng64_state::draw_sprites(screen_device &screen, bitmap_rgb32 &bitmap, cons
if (!chaini) source +=8;
}
}
-
diff --git a/src/mame/video/jalblend.c b/src/mame/video/jalblend.c
index 6b6e6f8917a..1d96bc6dbbe 100644
--- a/src/mame/video/jalblend.c
+++ b/src/mame/video/jalblend.c
@@ -35,7 +35,7 @@ jaleco_blend_device::jaleco_blend_device(const machine_config &mconfig, const ch
void jaleco_blend_device::device_start()
{
m_table = auto_alloc_array_clear(machine(), UINT8, 0xc00);
-
+
save_pointer(NAME(m_table), 0xc00);
}
diff --git a/src/mame/video/jalblend.h b/src/mame/video/jalblend.h
index 2fb6a20b32e..f382d63ac9c 100644
--- a/src/mame/video/jalblend.h
+++ b/src/mame/video/jalblend.h
@@ -3,7 +3,7 @@ class jaleco_blend_device : public device_t
public:
jaleco_blend_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~jaleco_blend_device() {}
-
+
void set(int color, UINT8 val);
rgb_t func(rgb_t dest, rgb_t addMe, UINT8 alpha);
void drawgfx(palette_device &palette,bitmap_ind16 &dest_bmp,const rectangle &clip,gfx_element *gfx,
@@ -18,14 +18,14 @@ protected:
virtual void device_start();
virtual void device_reset();
-private:
+private:
/* each palette entry contains a fourth 'alpha' value */
UINT8 *m_table;
-
+
template<class _BitmapClass>
void drawgfx_common(palette_device &palette,_BitmapClass &dest_bmp,const rectangle &clip,gfx_element *gfx,
UINT32 code,UINT32 color,int flipx,int flipy,int offsx,int offsy,
int transparent_color);
};
-extern const device_type JALECO_BLEND; \ No newline at end of file
+extern const device_type JALECO_BLEND;
diff --git a/src/mame/video/pc080sn.c b/src/mame/video/pc080sn.c
index d0d3cbb5560..61e8ff45fbe 100644
--- a/src/mame/video/pc080sn.c
+++ b/src/mame/video/pc080sn.c
@@ -62,7 +62,7 @@ pc080sn_device::pc080sn_device(const machine_config &mconfig, const char *tag, d
{
for (int i = 0; i < 8; i++)
m_ctrl[i] = 0;
-
+
for (int i = 0; i < 2; i++)
{
m_bg_ram[i] = NULL;
diff --git a/src/mame/video/psychic5.c b/src/mame/video/psychic5.c
index 6a0b56d3931..40403564aac 100644
--- a/src/mame/video/psychic5.c
+++ b/src/mame/video/psychic5.c
@@ -24,10 +24,10 @@ void psychic5_state::change_palette(int offset, UINT8* palram, int palbase)
UINT8 hi = palram[(offset) | 1];
int color = offset >> 1;
-
+
if (m_blend)
m_blend->set(palbase + color, hi & 0x0f);
-
+
m_palette->set_pen_color(palbase + color, pal4bit(lo >> 4), pal4bit(lo), pal4bit(hi >> 4));
}
@@ -188,11 +188,11 @@ void psychic5_state::video_start()
VIDEO_START_MEMBER(psychic5_state,psychic5)
{
video_start();
-
+
m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(psychic5_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 64, 32);
m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(psychic5_state::get_fg_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32);
m_fg_tilemap->set_transparent_pen(15);
-
+
save_item(NAME(m_title_screen));
}
@@ -200,11 +200,11 @@ VIDEO_START_MEMBER(psychic5_state,psychic5)
VIDEO_START_MEMBER(psychic5_state,bombsa)
{
video_start();
-
+
m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(psychic5_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 128, 32);
m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(psychic5_state::get_fg_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32);
m_fg_tilemap->set_transparent_pen(15);
-
+
save_item(NAME(m_bombsa_unknown));
}
diff --git a/src/mame/video/realbrk.c b/src/mame/video/realbrk.c
index 0e17ba65769..683c38bc173 100644
--- a/src/mame/video/realbrk.c
+++ b/src/mame/video/realbrk.c
@@ -154,7 +154,7 @@ void realbrk_state::video_start()
m_tmpbitmap0 = auto_bitmap_ind16_alloc(machine(),32,32);
m_tmpbitmap1 = auto_bitmap_ind16_alloc(machine(),32,32);
-
+
save_item(NAME(m_disable_video));
}
diff --git a/src/mame/video/rltennis.c b/src/mame/video/rltennis.c
index 993e719d08a..e736e90a58d 100644
--- a/src/mame/video/rltennis.c
+++ b/src/mame/video/rltennis.c
@@ -224,7 +224,7 @@ void rltennis_state::video_start()
m_tmp_bitmap[BITMAP_FG_1] = auto_bitmap_ind16_alloc(machine(), 512, 256);
m_tmp_bitmap[BITMAP_FG_2] = auto_bitmap_ind16_alloc(machine(), 512, 256);
m_tmp_bitmap[BITMAP_FG_DISPLAY] = auto_bitmap_ind16_alloc(machine(), 512, 256);
-
+
save_item(NAME(m_blitter));
}
diff --git a/src/mame/video/seta001.c b/src/mame/video/seta001.c
index 796efafbd4a..9a5468e3857 100644
--- a/src/mame/video/seta001.c
+++ b/src/mame/video/seta001.c
@@ -84,7 +84,7 @@ void seta001_device::device_start()
m_spritelimit = 0x1ff;
m_bgflag = 0x00;
-
+
m_gfxbank_cb.bind_relative_to(*owner());
save_item(NAME(m_bgflag));
diff --git a/src/mame/video/seta2.c b/src/mame/video/seta2.c
index 333bf9daa0d..32a4e5055d1 100644
--- a/src/mame/video/seta2.c
+++ b/src/mame/video/seta2.c
@@ -457,14 +457,14 @@ void seta2_state::video_start()
VIDEO_START_MEMBER(seta2_state,xoffset)
{
video_start();
-
+
m_xoffset = 0x200;
}
VIDEO_START_MEMBER(seta2_state,yoffset)
{
video_start();
-
+
m_yoffset = 0x10;
}
diff --git a/src/mame/video/sidearms.c b/src/mame/video/sidearms.c
index 65daee439a9..5dbbc87cc74 100644
--- a/src/mame/video/sidearms.c
+++ b/src/mame/video/sidearms.c
@@ -159,7 +159,7 @@ void sidearms_state::video_start()
m_latch_374 = m_vcount_191 = m_hcount_191 = 0;
m_flipon = m_charon = m_staron = m_objon = m_bgon = 0;
-
+
save_item(NAME(m_bgon));
save_item(NAME(m_objon));
save_item(NAME(m_staron));
diff --git a/src/mame/video/srumbler.c b/src/mame/video/srumbler.c
index 61fa910b92c..4c3d722bc68 100644
--- a/src/mame/video/srumbler.c
+++ b/src/mame/video/srumbler.c
@@ -52,7 +52,7 @@ void srumbler_state::video_start()
m_bg_tilemap->set_transmask(0,0xffff,0x0000); /* split type 0 is totally transparent in front half */
m_bg_tilemap->set_transmask(1,0x07ff,0xf800); /* split type 1 has pens 0-10 transparent in front half */
-
+
save_item(NAME(m_scroll));
}
diff --git a/src/mame/video/ssv.c b/src/mame/video/ssv.c
index ab7b33888d9..6b48449c7af 100644
--- a/src/mame/video/ssv.c
+++ b/src/mame/video/ssv.c
@@ -194,7 +194,7 @@ void ssv_state::drawgfx(bitmap_ind16 &bitmap, const rectangle &cliprect, gfx_ele
void ssv_state::video_start()
{
m_gfxdecode->gfx(0)->set_granularity(64); /* 256 colour sprites with palette selectable on 64 colour boundaries */
-
+
save_item(NAME(m_enable_video));
save_item(NAME(m_shadow_pen_mask));
save_item(NAME(m_shadow_pen_shift));
@@ -208,7 +208,7 @@ VIDEO_START_MEMBER(ssv_state,eaglshot)
m_gfxdecode->gfx(0)->set_source((UINT8 *)m_eaglshot_gfxram);
m_gfxdecode->gfx(1)->set_source((UINT8 *)m_eaglshot_gfxram);
-
+
save_pointer(NAME(m_eaglshot_gfxram), 16 * 0x40000 / 2);
}
diff --git a/src/mame/video/suna16.c b/src/mame/video/suna16.c
index e58ce304103..777cfff419c 100644
--- a/src/mame/video/suna16.c
+++ b/src/mame/video/suna16.c
@@ -92,7 +92,7 @@ WRITE16_MEMBER(suna16_state::bestbest_flipscreen_w)
void suna16_state::video_start()
{
m_paletteram = auto_alloc_array(machine(), UINT16, m_palette->entries());
-
+
save_item(NAME(m_color_bank));
}
diff --git a/src/mame/video/suprloco.c b/src/mame/video/suprloco.c
index 6021a01a2bc..1c60380f5c9 100644
--- a/src/mame/video/suprloco.c
+++ b/src/mame/video/suprloco.c
@@ -98,7 +98,7 @@ void suprloco_state::video_start()
m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(suprloco_state::get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32);
m_bg_tilemap->set_scroll_rows(32);
-
+
save_item(NAME(m_control));
}
diff --git a/src/mame/video/suprridr.c b/src/mame/video/suprridr.c
index adaa1f4673f..de72518a1ce 100644
--- a/src/mame/video/suprridr.c
+++ b/src/mame/video/suprridr.c
@@ -44,7 +44,7 @@ void suprridr_state::video_start()
m_bg_tilemap_noscroll = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(suprridr_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8,8, 32,32);
m_fg_tilemap->set_transparent_pen(0);
-
+
save_item(NAME(m_flipx));
save_item(NAME(m_flipy));
}
diff --git a/src/mame/video/tankbust.c b/src/mame/video/tankbust.c
index f2b747881d0..e26cf97887f 100644
--- a/src/mame/video/tankbust.c
+++ b/src/mame/video/tankbust.c
@@ -83,7 +83,7 @@ void tankbust_state::video_start()
m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tankbust_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32);
m_txt_tilemap->set_transparent_pen(0);
-
+
save_item(NAME(m_xscroll));
save_item(NAME(m_yscroll));
}
diff --git a/src/mame/video/tbowl.c b/src/mame/video/tbowl.c
index 293f562f876..8d5b1a0c796 100644
--- a/src/mame/video/tbowl.c
+++ b/src/mame/video/tbowl.c
@@ -116,7 +116,7 @@ void tbowl_state::video_start()
m_tx_tilemap->set_transparent_pen(0);
m_bg_tilemap->set_transparent_pen(0);
m_bg2_tilemap->set_transparent_pen(0);
-
+
save_item(NAME(m_xscroll));
save_item(NAME(m_yscroll));
save_item(NAME(m_bg2xscroll));
diff --git a/src/mame/video/thedeep.c b/src/mame/video/thedeep.c
index 2c081a9a05b..9397957fe3c 100644
--- a/src/mame/video/thedeep.c
+++ b/src/mame/video/thedeep.c
@@ -134,4 +134,3 @@ UINT32 thedeep_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap,
m_tilemap_1->draw(screen, bitmap, cliprect, 0,0);
return 0;
}
-
diff --git a/src/mame/video/timelimt.c b/src/mame/video/timelimt.c
index 31412c8000e..282c85155b3 100644
--- a/src/mame/video/timelimt.c
+++ b/src/mame/video/timelimt.c
@@ -73,7 +73,7 @@ void timelimt_state::video_start()
8, 8, 32, 32);
m_fg_tilemap->set_transparent_pen(0);
-
+
save_item(NAME(m_scrollx));
save_item(NAME(m_scrolly));
}
diff --git a/src/mame/video/tryout.c b/src/mame/video/tryout.c
index 1b7f1fb841e..f7f284adc10 100644
--- a/src/mame/video/tryout.c
+++ b/src/mame/video/tryout.c
@@ -12,7 +12,7 @@
PALETTE_INIT_MEMBER(tryout_state, tryout)
{
const UINT8 *color_prom = memregion("proms")->base();
-
+
for (int i = 0;i < palette.entries();i++)
{
int bit0,bit1,bit2,r,g,b;
diff --git a/src/mame/video/tsamurai.c b/src/mame/video/tsamurai.c
index 1fb47e835b2..eede6d28503 100644
--- a/src/mame/video/tsamurai.c
+++ b/src/mame/video/tsamurai.c
@@ -55,7 +55,7 @@ VIDEO_START_MEMBER(tsamurai_state, tsamurai)
m_background->set_transparent_pen(0);
m_foreground->set_transparent_pen(0);
-
+
save_item(NAME(m_bgcolor));
video_start();
}
@@ -63,7 +63,7 @@ VIDEO_START_MEMBER(tsamurai_state, tsamurai)
VIDEO_START_MEMBER(tsamurai_state, m660)
{
VIDEO_START_CALL_MEMBER(tsamurai);
-
+
save_item(NAME(m_textbank2));
}
@@ -256,7 +256,7 @@ TILE_GET_INFO_MEMBER(tsamurai_state::get_vsgongf_tile_info)
VIDEO_START_MEMBER(tsamurai_state,vsgongf)
{
m_foreground = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tsamurai_state::get_vsgongf_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32);
-
+
save_item(NAME(m_vsgongf_color));
video_start();
}
diff --git a/src/mame/video/vulgus.c b/src/mame/video/vulgus.c
index 1c99617e85b..4cd5bdbe100 100644
--- a/src/mame/video/vulgus.c
+++ b/src/mame/video/vulgus.c
@@ -113,7 +113,7 @@ void vulgus_state::video_start()
m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(vulgus_state::get_bg_tile_info),this),TILEMAP_SCAN_COLS,16,16,32,32);
m_fg_tilemap->configure_groups(*m_gfxdecode->gfx(0), 47);
-
+
save_item(NAME(m_palette_bank));
}
diff --git a/src/mame/video/xain.c b/src/mame/video/xain.c
index fdd210c0640..810923e96f4 100644
--- a/src/mame/video/xain.c
+++ b/src/mame/video/xain.c
@@ -89,7 +89,7 @@ void xain_state::video_start()
m_bgram0_tilemap->set_transparent_pen(0);
m_bgram1_tilemap->set_transparent_pen(0);
m_char_tilemap->set_transparent_pen(0);
-
+
save_item(NAME(m_pri));
save_item(NAME(m_scrollxP0));
save_item(NAME(m_scrollyP0));
diff --git a/src/mess/audio/gamate.c b/src/mess/audio/gamate.c
index c49aeb72680..7e6a03c7be8 100644
--- a/src/mess/audio/gamate.c
+++ b/src/mess/audio/gamate.c
@@ -38,7 +38,7 @@ gamate_sound_device::gamate_sound_device(const machine_config &mconfig, const ch
void gamate_sound_device::device_start()
{
// bind callbacks
-// m_irq_cb.bind_relative_to(*owner());
+// m_irq_cb.bind_relative_to(*owner());
memset(m_channels, 0, sizeof(m_channels));
memset(reg, 0, sizeof(reg));
@@ -56,7 +56,7 @@ void gamate_sound_device::sound_stream_update(sound_stream &stream, stream_sampl
stream_sample_t *left=outputs[0], *right=outputs[1];
int i, j;
Tone *channel;
-
+
for (i = 0; i < samples; i++, left++, right++)
{
noise.pos += noise.step;
@@ -77,7 +77,7 @@ void gamate_sound_device::sound_stream_update(sound_stream &stream, stream_sampl
{
case 0: case 1: case 2: case 3:
case 4: case 5: case 6: case 7:
- case 8: case 9: case 0xb:
+ case 8: case 9: case 0xb:
case 0xd: case 0xf:
if (envelope.index>=ARRAY_LENGTH(EnvelopeVolumes)/2)
{
diff --git a/src/mess/drivers/a7800.c b/src/mess/drivers/a7800.c
index cffcd9c747b..4602c3ce941 100644
--- a/src/mess/drivers/a7800.c
+++ b/src/mess/drivers/a7800.c
@@ -286,11 +286,11 @@ static ADDRESS_MAP_START( a7800_mem, AS_PROGRAM, 8, a7800_state )
AM_RANGE(0x0480, 0x04ff) AM_RAM AM_SHARE("riot_ram") AM_MIRROR(0x100)
AM_RANGE(0x1800, 0x1fff) AM_RAM AM_SHARE("6116_1")
AM_RANGE(0x2000, 0x27ff) AM_RAM AM_SHARE("6116_2") AM_MIRROR(0x0800)
- // According to the official Software Guide, the RAM at 0x2000 is
- // repeatedly mirrored up to 0x3fff, but this is evidently incorrect
- // because the High Score Cartridge maps ROM at 0x3000-0x3fff
- // Hardware tests show that only the mirror at 0x2800-0x2fff actually
- // exists, and only on some hardware (MARIA? motherboard?) revisions
+ // According to the official Software Guide, the RAM at 0x2000 is
+ // repeatedly mirrored up to 0x3fff, but this is evidently incorrect
+ // because the High Score Cartridge maps ROM at 0x3000-0x3fff
+ // Hardware tests show that only the mirror at 0x2800-0x2fff actually
+ // exists, and only on some hardware (MARIA? motherboard?) revisions
AM_RANGE(0x4000, 0xffff) AM_DEVWRITE("cartslot", a78_cart_slot_device, write_40xx)
AM_RANGE(0x4000, 0xbfff) AM_DEVREAD("cartslot", a78_cart_slot_device, read_40xx)
AM_RANGE(0xc000, 0xffff) AM_READ(bios_or_cart_r) // here also the BIOS can be accessed
diff --git a/src/mess/drivers/apple2.c b/src/mess/drivers/apple2.c
index 15bbbc06559..4c06eac3b7b 100644
--- a/src/mess/drivers/apple2.c
+++ b/src/mess/drivers/apple2.c
@@ -1229,9 +1229,9 @@ static SLOT_INTERFACE_START(apple2_cards)
SLOT_INTERFACE("dx1", A2BUS_DX1) /* Decillonix DX-1 sampler card */
SLOT_INTERFACE("tm2ho", A2BUS_TIMEMASTERHO) /* Applied Engineering TimeMaster II H.O. */
SLOT_INTERFACE("mouse", A2BUS_MOUSE) /* Apple II Mouse Card */
- SLOT_INTERFACE("ezcgi", A2BUS_EZCGI) /* E-Z Color Graphics Interface */
- SLOT_INTERFACE("ezcgi9938", A2BUS_EZCGI_9938) /* E-Z Color Graphics Interface (TMS9938) */
- SLOT_INTERFACE("ezcgi9958", A2BUS_EZCGI_9958) /* E-Z Color Graphics Interface (TMS9958) */
+ SLOT_INTERFACE("ezcgi", A2BUS_EZCGI) /* E-Z Color Graphics Interface */
+ SLOT_INTERFACE("ezcgi9938", A2BUS_EZCGI_9938) /* E-Z Color Graphics Interface (TMS9938) */
+ SLOT_INTERFACE("ezcgi9958", A2BUS_EZCGI_9958) /* E-Z Color Graphics Interface (TMS9958) */
// SLOT_INTERFACE("magicmusician", A2BUS_MAGICMUSICIAN) /* Magic Musician Card */
SLOT_INTERFACE_END
diff --git a/src/mess/drivers/apple2e.c b/src/mess/drivers/apple2e.c
index 84b41de961a..e270fa4d6fa 100644
--- a/src/mess/drivers/apple2e.c
+++ b/src/mess/drivers/apple2e.c
@@ -3036,9 +3036,9 @@ static SLOT_INTERFACE_START(apple2_cards)
SLOT_INTERFACE("dx1", A2BUS_DX1) /* Decillonix DX-1 sampler card */
SLOT_INTERFACE("tm2ho", A2BUS_TIMEMASTERHO) /* Applied Engineering TimeMaster II H.O. */
SLOT_INTERFACE("mouse", A2BUS_MOUSE) /* Apple II Mouse Card */
- SLOT_INTERFACE("ezcgi", A2BUS_EZCGI) /* E-Z Color Graphics Interface */
- SLOT_INTERFACE("ezcgi9938", A2BUS_EZCGI_9938) /* E-Z Color Graphics Interface (TMS9938) */
- SLOT_INTERFACE("ezcgi9958", A2BUS_EZCGI_9958) /* E-Z Color Graphics Interface (TMS9958) */
+ SLOT_INTERFACE("ezcgi", A2BUS_EZCGI) /* E-Z Color Graphics Interface */
+ SLOT_INTERFACE("ezcgi9938", A2BUS_EZCGI_9938) /* E-Z Color Graphics Interface (TMS9938) */
+ SLOT_INTERFACE("ezcgi9958", A2BUS_EZCGI_9958) /* E-Z Color Graphics Interface (TMS9958) */
// SLOT_INTERFACE("magicmusician", A2BUS_MAGICMUSICIAN) /* Magic Musician Card */
SLOT_INTERFACE_END
diff --git a/src/mess/drivers/gamate.c b/src/mess/drivers/gamate.c
index 3953bc5b060..67cf8c29d91 100644
--- a/src/mess/drivers/gamate.c
+++ b/src/mess/drivers/gamate.c
@@ -4,7 +4,7 @@
Morten Shearman Kirkegaard morten+gamate@afdelingp.dk
Juan F??lix Mateos vectrex@hackermesh.org
- nmi unknown
+ nmi unknown
bomb blast top status line missing
******************************************************************************/
@@ -84,7 +84,7 @@ private:
WRITE8_MEMBER( gamate_state::gamate_cart_protection_w )
{
logerror("%.6f protection write %x %x address:%x data:%x shift:%d\n",machine().time().as_double(), offset, data, card_protection.address, card_protection.cartridge_byte, card_protection.bit_shifter);
-
+
switch (offset)
{
case 0:
@@ -118,7 +118,7 @@ READ8_MEMBER( gamate_state::gamate_cart_protection_r )
ret=(card_protection.cartridge_byte&0x80) ? 2 : 0;
if (card_protection.bit_shifter==7 && !card_protection.failed)
{ // now protection chip on cartridge activates cartridge chip select on cpu accesses
-// m_maincpu->space(AS_PROGRAM).install_read_handler(0x6000, 0x6000, READ8_DELEGATE(gamate_state, gamate_cart_protection_r)); // next time I will try to get this working
+// m_maincpu->space(AS_PROGRAM).install_read_handler(0x6000, 0x6000, READ8_DELEGATE(gamate_state, gamate_cart_protection_r)); // next time I will try to get this working
}
card_protection.cartridge_byte<<=1;
}
@@ -318,12 +318,12 @@ void gamate_state::machine_start()
m_cart_ptr = memregion("maincpu")->base() + 0x6000;
if (m_cart->exists())
{
-// m_maincpu->space(AS_PROGRAM).install_read_handler(0x6000, 0x6000, READ8_DELEGATE(gamate_state, gamate_cart_protection_r));
+// m_maincpu->space(AS_PROGRAM).install_read_handler(0x6000, 0x6000, READ8_DELEGATE(gamate_state, gamate_cart_protection_r));
m_cart_ptr = m_cart->get_rom_base();
membank("bankmulti")->set_base(m_cart->get_rom_base()+1);
membank("bank")->set_base(m_cart->get_rom_base()+0x4000); // bankswitched games in reality no offset
}
-// m_bios[0xdf1]=0xea; m_bios[0xdf2]=0xea; // default bios: $47 protection readback
+// m_bios[0xdf1]=0xea; m_bios[0xdf2]=0xea; // default bios: $47 protection readback
card_protection.set=false;
bank_multi=0;
card_protection.unprotected=false;
@@ -400,4 +400,3 @@ ROM_END
/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME */
CONS( 19??, gamate, 0, 0, gamate, gamate, gamate_state, gamate, "Bit Corp", "Gamate", 0)
-
diff --git a/src/mess/drivers/hh_hmcs40.c b/src/mess/drivers/hh_hmcs40.c
index 45bd3f76bc7..048ab43dede 100644
--- a/src/mess/drivers/hh_hmcs40.c
+++ b/src/mess/drivers/hh_hmcs40.c
@@ -66,7 +66,7 @@ public:
required_device<cpu_device> m_maincpu;
optional_ioport_array<7> m_inp_matrix; // max 7
optional_device<speaker_sound_device> m_speaker;
-
+
// misc common
UINT16 m_inp_mux; // multiplexed inputs mask
@@ -78,11 +78,11 @@ public:
int m_display_wait; // led/lamp off-delay in microseconds (default 33ms)
int m_display_maxy; // display matrix number of rows
int m_display_maxx; // display matrix number of columns
-
+
UINT32 m_grid; // VFD current row data
UINT64 m_plate; // VFD current column data
-
- UINT64 m_display_state[0x20]; // display matrix rows data
+
+ UINT64 m_display_state[0x20]; // display matrix rows data
UINT16 m_display_segmask[0x20]; // if not 0, display matrix row is a digit, mask indicates connected segments
UINT64 m_display_cache[0x20]; // (internal use)
UINT8 m_display_decay[0x20][0x40]; // (internal use)
@@ -95,7 +95,7 @@ public:
DECLARE_WRITE8_MEMBER(alnattck_plate_w);
DECLARE_WRITE16_MEMBER(alnattck_d_w);
DECLARE_READ16_MEMBER(alnattck_d_r);
-
+
void egalaxn2_display();
DECLARE_WRITE8_MEMBER(egalaxn2_plate_w);
DECLARE_WRITE16_MEMBER(egalaxn2_grid_w);
@@ -110,7 +110,7 @@ void hh_hmcs40_state::machine_start()
memset(m_display_cache, ~0, sizeof(m_display_cache));
memset(m_display_decay, 0, sizeof(m_display_decay));
memset(m_display_segmask, 0, sizeof(m_display_segmask));
-
+
m_inp_mux = 0;
m_grid = 0;
m_plate = 0;
@@ -191,7 +191,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(hh_hmcs40_state::display_decay_tick)
for (int x = 0; x < m_display_maxx; x++)
if (m_display_decay[y][x] != 0)
m_display_decay[y][x]--;
-
+
display_update();
}
@@ -204,7 +204,7 @@ void hh_hmcs40_state::display_matrix(int maxx, int maxy, UINT64 setx, UINT32 set
UINT64 mask = (1 << maxx) - 1;
for (int y = 0; y < maxy; y++)
m_display_state[y] = (sety >> y & 1) ? (setx & mask) : 0;
-
+
display_update();
}
@@ -249,7 +249,7 @@ static MACHINE_CONFIG_START( bambball, hh_hmcs40_state )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD38750, 400000) // approximation - RC osc.
-// MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_hmcs40_state, display_decay_tick, attotime::from_msec(1))
+// MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_hmcs40_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_hh_hmcs40_test)
/* no video! */
@@ -284,7 +284,7 @@ static MACHINE_CONFIG_START( packmon, hh_hmcs40_state )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD38800, 400000) // approximation - RC osc.
-// MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_hmcs40_state, display_decay_tick, attotime::from_msec(1))
+// MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_hmcs40_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_hh_hmcs40_test)
/* no video! */
@@ -318,7 +318,7 @@ static MACHINE_CONFIG_START( zackman, hh_hmcs40_state )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD38820, 400000) // approximation - RC osc.
-// MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_hmcs40_state, display_decay_tick, attotime::from_msec(1))
+// MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_hmcs40_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_hh_hmcs40_test)
/* no video! */
@@ -351,7 +351,7 @@ WRITE8_MEMBER(hh_hmcs40_state::alnattck_plate_w)
// update display
UINT32 plate = BITSWAP16(m_plate,11,9,8,10,7,2,0,1,3,4,5,6,12,13,14,15) | (m_plate & 0xf0000);
-
+
display_matrix(20, 10, plate, m_grid);
}
@@ -359,13 +359,13 @@ WRITE16_MEMBER(hh_hmcs40_state::alnattck_d_w)
{
// D4: speaker out
m_speaker->level_w(data >> 4 & 1);
-
+
// D7-D13: input mux
m_inp_mux = data >> 7 & 0x7f;
// D6-D15: vfd matrix grid
m_grid = data >> 6 & 0x3ff;
-
+
// D0-D3: plate 16-19 (update display there)
alnattck_plate_w(space, 4, data & 0xf);
}
@@ -449,7 +449,7 @@ static MACHINE_CONFIG_START( cdkong, hh_hmcs40_state )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD38820, 400000) // approximation - RC osc.
-// MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_hmcs40_state, display_decay_tick, attotime::from_msec(1))
+// MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_hmcs40_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_hh_hmcs40_test)
/* no video! */
@@ -484,7 +484,7 @@ static MACHINE_CONFIG_START( cgalaxn, hh_hmcs40_state )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD38800, 400000) // approximation - RC osc.
-// MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_hmcs40_state, display_decay_tick, attotime::from_msec(1))
+// MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_hmcs40_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_hh_hmcs40_test)
/* no video! */
@@ -519,7 +519,7 @@ static MACHINE_CONFIG_START( cpacman, hh_hmcs40_state )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD38820, 400000) // approximation - RC osc.
-// MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_hmcs40_state, display_decay_tick, attotime::from_msec(1))
+// MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_hmcs40_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_hh_hmcs40_test)
/* no video! */
@@ -554,7 +554,7 @@ static MACHINE_CONFIG_START( cmspacmn, hh_hmcs40_state )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD38820, 400000) // approximation - RC osc.
-// MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_hmcs40_state, display_decay_tick, attotime::from_msec(1))
+// MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_hmcs40_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_hh_hmcs40_test)
/* no video! */
@@ -583,7 +583,7 @@ void hh_hmcs40_state::egalaxn2_display()
{
UINT32 grid = BITSWAP16(m_grid,15,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14);
UINT32 plate = BITSWAP24(m_plate,23,22,21,20,15,14,13,12,7,6,5,4,3,2,1,0,19,18,17,16,11,10,9,8);
-
+
display_matrix(24, 15, plate, grid);
}
@@ -591,10 +591,10 @@ WRITE16_MEMBER(hh_hmcs40_state::egalaxn2_grid_w)
{
// D0: speaker out
m_speaker->level_w(data & 1);
-
+
// D1-D4: input mux
m_inp_mux = data >> 1 & 0xf;
-
+
// D1-D15: vfd matrix grid
m_grid = data >> 1;
egalaxn2_display();
@@ -766,7 +766,7 @@ static MACHINE_CONFIG_START( pbqbert, hh_hmcs40_state )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD38820, 400000) // approximation - RC osc.
-// MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_hmcs40_state, display_decay_tick, attotime::from_msec(1))
+// MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_hmcs40_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_hh_hmcs40_test)
/* no video! */
@@ -787,7 +787,7 @@ MACHINE_CONFIG_END
* boards are labeled THF-01II 2E138E01/2E128E02
* Hitachi HD38800B23 MCU
* cyan/red/blue VFD display Futaba DM-65ZK 3A
-
+
NOTE!: MESS external artwork is recommended
***************************************************************************/
@@ -801,7 +801,7 @@ static MACHINE_CONFIG_START( kingman, hh_hmcs40_state )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD38800, 400000) // approximation - RC osc.
-// MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_hmcs40_state, display_decay_tick, attotime::from_msec(1))
+// MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_hmcs40_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_hh_hmcs40_test)
/* no video! */
@@ -836,7 +836,7 @@ static MACHINE_CONFIG_START( tmtron, hh_hmcs40_state )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD38800, 400000) // approximation - RC osc.
-// MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_hmcs40_state, display_decay_tick, attotime::from_msec(1))
+// MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_hmcs40_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_hh_hmcs40_test)
/* no video! */
diff --git a/src/mess/drivers/hh_pic16.c b/src/mess/drivers/hh_pic16.c
index b8281a737e0..4ee9bf29385 100644
--- a/src/mess/drivers/hh_pic16.c
+++ b/src/mess/drivers/hh_pic16.c
@@ -57,8 +57,8 @@ public:
int m_display_wait; // led/lamp off-delay in microseconds (default 33ms)
int m_display_maxy; // display matrix number of rows
int m_display_maxx; // display matrix number of columns
-
- UINT32 m_display_state[0x20]; // display matrix rows data
+
+ UINT32 m_display_state[0x20]; // display matrix rows data
UINT16 m_display_segmask[0x20]; // if not 0, display matrix row is a digit, mask indicates connected segments
UINT32 m_display_cache[0x20]; // (internal use)
UINT8 m_display_decay[0x20][0x20]; // (internal use)
@@ -79,7 +79,7 @@ void hh_pic16_state::machine_start()
memset(m_display_cache, ~0, sizeof(m_display_cache));
memset(m_display_decay, 0, sizeof(m_display_decay));
memset(m_display_segmask, 0, sizeof(m_display_segmask));
-
+
m_b = 0;
m_c = 0;
@@ -158,7 +158,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(hh_pic16_state::display_decay_tick)
for (int x = 0; x < m_display_maxx; x++)
if (m_display_decay[y][x] != 0)
m_display_decay[y][x]--;
-
+
display_update();
}
@@ -171,7 +171,7 @@ void hh_pic16_state::display_matrix(int maxx, int maxy, UINT32 setx, UINT32 sety
UINT32 mask = (1 << maxx) - 1;
for (int y = 0; y < maxy; y++)
m_display_state[y] = (sety >> y & 1) ? (setx & mask) : 0;
-
+
display_update();
}
@@ -199,14 +199,14 @@ WRITE8_MEMBER(hh_pic16_state::maniac_output_w)
m_c = data;
else
m_b = data;
-
+
// d7: speaker out
m_speaker->level_w((m_b >> 7 & 1) | (m_c >> 6 & 2));
// d0-d6: 7seg
m_display_maxx = 7;
m_display_maxy = 2;
-
+
m_display_segmask[offset] = 0x7f;
m_display_state[offset] = ~data & 0x7f;
display_update();
diff --git a/src/mess/drivers/hh_tms1k.c b/src/mess/drivers/hh_tms1k.c
index 83d83023ef0..5d78b892de5 100644
--- a/src/mess/drivers/hh_tms1k.c
+++ b/src/mess/drivers/hh_tms1k.c
@@ -5,7 +5,7 @@
This driver is a collection of simple dedicated handheld and tabletop
toys based around the TMS1000 MCU series. Anything more complex or clearly
part of a series is (or will be) in its own driver.
-
+
Let's use this driver for a list of known devices and their serials,
excluding TI's own products (see for example ticalc1x.c, tispeak.c)
@@ -53,7 +53,7 @@
@MP7334 TMS1400 1981, Coleco Total Control 4
inconsistent:
-
+
@CD7282SL TMS1100 1981, Tandy/RadioShack Tandy-12 (serial is similar to TI Speak & Spell series?)
(* denotes not yet emulated by MESS, @ denotes it's in this driver)
@@ -102,7 +102,7 @@ void hh_tms1k_state::machine_start()
memset(m_display_cache, ~0, sizeof(m_display_cache));
memset(m_display_decay, 0, sizeof(m_display_decay));
memset(m_display_segmask, 0, sizeof(m_display_segmask));
-
+
m_o = 0;
m_r = 0;
m_inp_mux = 0;
@@ -190,7 +190,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(hh_tms1k_state::display_decay_tick)
for (int x = 0; x < m_display_maxx; x++)
if (m_display_decay[y][x] != 0)
m_display_decay[y][x]--;
-
+
display_update();
}
@@ -203,7 +203,7 @@ void hh_tms1k_state::display_matrix(int maxx, int maxy, UINT32 setx, UINT32 sety
UINT32 mask = (1 << maxx) - 1;
for (int y = 0; y < maxy; y++)
m_display_state[y] = (sety >> y & 1) ? (setx & mask) : 0;
-
+
display_update();
}
@@ -293,7 +293,7 @@ WRITE16_MEMBER(hh_tms1k_state::mathmagi_write_r)
{
// R3,R5-R7,R9,R10: input mux
m_inp_mux = (data >> 3 & 1) | (data >> 4 & 0xe) | (data >> 5 & 0x30);
-
+
// +others:
m_r = data;
mathmagi_display();
@@ -442,10 +442,10 @@ void hh_tms1k_state::amaztron_display()
m_display_segmask[y] = 0x7f;
m_display_state[y] = (m_r >> (y + 8) & 1) ? m_o : 0;
}
-
+
// R6,R7: lamps (-> lamp20,21)
m_display_state[2] = m_r >> 6 & 3;
-
+
display_update();
}
@@ -453,7 +453,7 @@ WRITE16_MEMBER(hh_tms1k_state::amaztron_write_r)
{
// R0-R5: input mux
m_inp_mux = data & 0x3f;
-
+
// R10: speaker out
m_speaker->level_w(data >> 10 & 1);
@@ -582,12 +582,12 @@ MACHINE_CONFIG_END
void hh_tms1k_state::tc4_display()
{
m_display_wait = 50;
-
+
// R5,7,8,9 are 7segs
for (int y = 0; y < 10; y++)
if (y >= 5 && y <= 9 && y != 6)
m_display_segmask[y] = 0x7f;
-
+
// update current state (note: R6 as extra column!)
display_matrix(9, 10, (m_o | (m_r << 2 & 0x100)), m_r);
}
@@ -600,7 +600,7 @@ WRITE16_MEMBER(hh_tms1k_state::tc4_write_r)
// R0-R5: input mux
// R9: to cartridge slot
m_inp_mux = data & 0x23f;
-
+
// R6: led column 8
// +other columns
m_r = data;
@@ -699,13 +699,13 @@ MACHINE_CONFIG_END
Entex Electronic Baseball (1)
* TMS1000NLP MP0914 (die labeled MP0914A)
-
+
This is a handheld LED baseball game. One player controls the batter, the CPU
or other player controls the pitcher. Pitcher throw buttons are on a 'joypad'
obtained from a compartment in the back. Player scores are supposed to be
written down manually, the game doesn't save scores or innings (this annoyance
was resolved in the sequel). For more information, refer to the official manual.
-
+
The overlay graphic is known to have 2 versions: one where the field players
are denoted by words ("left", "center", "short", etc), and an alternate one
with little guys drawn next to the LEDs.
@@ -730,7 +730,7 @@ void hh_tms1k_state::ebball_display()
{
// R8 is a 7seg
m_display_segmask[8] = 0x7f;
-
+
display_matrix(7, 9, ~m_o, m_r);
}
@@ -738,10 +738,10 @@ WRITE16_MEMBER(hh_tms1k_state::ebball_write_r)
{
// R1-R5: input mux
m_inp_mux = data >> 1 & 0x1f;
-
+
// R9: speaker out
m_speaker->level_w(data >> 9 & 1);
-
+
// R0-R8: led columns
m_r = data;
ebball_display();
@@ -821,15 +821,15 @@ MACHINE_CONFIG_END
Entex Electronic Baseball 2
* boards are labeled: ZENY
* TMS1000 MCU, MP0923 (die labeled MP0923)
-
+
The Japanese version was published by Gakken, black casing instead of white.
-
+
The sequel to Entex Baseball, this version keeps up with score and innings.
As its predecessor, the pitcher controls are on a separate joypad.
lamp translation table: led zz from game PCB = MESS lampyx:
-
+
00 = - 10 = lamp94 20 = lamp74 30 = lamp50
01 = lamp53 11 = lamp93 21 = lamp75 31 = lamp51
02 = lamp7 12 = lamp92 22 = lamp80 32 = lamp52
@@ -848,7 +848,7 @@ void hh_tms1k_state::ebball2_display()
// the first 3 are 7segs
for (int y = 0; y < 3; y++)
m_display_segmask[y] = 0x7f;
-
+
display_matrix(8, 10, ~m_o, m_r ^ 0x7f);
}
@@ -856,10 +856,10 @@ WRITE16_MEMBER(hh_tms1k_state::ebball2_write_r)
{
// R3-R6: input mux
m_inp_mux = data >> 3 & 0xf;
-
+
// R10: speaker out
m_speaker->level_w(data >> 10 & 1);
-
+
// R0-R9: led columns
m_r = data;
ebball2_display();
@@ -932,14 +932,14 @@ MACHINE_CONFIG_END
* boards are labeled: ZENY
* TMS1100NLL 6007 MP1204 (die labeled MP1204)
* 2*SN75492N LED display driver
-
+
This is another improvement over Entex Baseball, where gameplay is a bit more
varied. Like the others, the pitcher controls are on a separate joypad.
lamp translation table: led zz from game PCB = MESS lampyx:
note: unlabeled panel leds are listed here as Sz, Bz, Oz, Iz, z left-to-right
-
+
00 = - 10 = lamp75 20 = lamp72
01 = lamp60 11 = lamp65 21 = lamp84
02 = lamp61 12 = lamp55 22 = lamp85
@@ -969,12 +969,12 @@ void hh_tms1k_state::ebball3_display()
// R0,R1 are normal 7segs
m_display_segmask[0] = m_display_segmask[1] = 0x7f;
-
+
// R4,R7 contain segments(only F and B) for the two other digits
m_display_state[10] = (m_display_state[4] & 0x20) | (m_display_state[7] & 0x02);
m_display_state[11] = ((m_display_state[4] & 0x10) | (m_display_state[7] & 0x01)) << 1;
m_display_segmask[10] = m_display_segmask[11] = 0x22;
-
+
display_update();
}
@@ -982,10 +982,10 @@ WRITE16_MEMBER(hh_tms1k_state::ebball3_write_r)
{
// R0-R2: input mux
m_inp_mux = data & 7;
-
+
// R10: speaker out
m_speaker->level_w(data >> 10 & 1);
-
+
// R0-R9: led columns
m_r = data;
ebball3_display();
@@ -1118,7 +1118,7 @@ WRITE16_MEMBER(hh_tms1k_state::elecdet_write_o)
{
// O0,O1,O4,O6: input mux
m_inp_mux = (data & 3) | (data >> 2 & 4) | (data >> 3 & 8);
-
+
// O0-O6: led segments A-G
// O7: speaker out
m_o = data;
@@ -1218,7 +1218,7 @@ void hh_tms1k_state::starwbc_display()
{
// R6,R8 are 7segs
m_display_segmask[6] = m_display_segmask[8] = 0x7f;
-
+
display_matrix(8, 10, m_o, m_r);
}
@@ -1569,7 +1569,7 @@ WRITE16_MEMBER(hh_tms1k_state::cnsector_write_r)
// R6-R9: direction leds (-> lamp60-63)
m_display_state[6] = data >> 6 & 0xf;
-
+
display_update();
}
@@ -1577,7 +1577,7 @@ WRITE16_MEMBER(hh_tms1k_state::cnsector_write_o)
{
// O0-O4: input mux
m_inp_mux = data & 0x1f;
-
+
// O0-O7: digit segments
m_o = data;
}
@@ -1646,7 +1646,7 @@ MACHINE_CONFIG_END
Parker Bros Merlin handheld game, by Bob Doyle
* TMS1100NLL MP3404A-N2
* red LEDs and 1-bit sound
-
+
Also published in Japan by Tomy as "Dr. Smith", white case instead of red.
The one with dark-blue case is the rare sequel Master Merlin. More sequels
followed too, but on other hardware.
@@ -1780,7 +1780,7 @@ WRITE16_MEMBER(hh_tms1k_state::stopthief_write_o)
{
// O0,O6: input mux
m_inp_mux = (data & 1) | (data >> 5 & 2);
-
+
// O3: speaker out
// O0-O2,O4-O7: led segments A-G
m_o = data;
diff --git a/src/mess/drivers/hh_ucom4.c b/src/mess/drivers/hh_ucom4.c
index b258c942942..2c05bf02935 100644
--- a/src/mess/drivers/hh_ucom4.c
+++ b/src/mess/drivers/hh_ucom4.c
@@ -6,7 +6,7 @@
known chips:
-
+
serial device etc.
----------------------------------------------------------------
@031 uPD553C 1979, Bambino Superstar Football (ET-03)
@@ -52,7 +52,7 @@ public:
required_device<cpu_device> m_maincpu;
optional_ioport_array<5> m_inp_matrix; // max 5
optional_device<speaker_sound_device> m_speaker;
-
+
// misc common
UINT8 m_port[9]; // MCU port A-I write data
UINT16 m_inp_mux; // multiplexed inputs mask
@@ -65,11 +65,11 @@ public:
int m_display_wait; // led/lamp off-delay in microseconds (default 33ms)
int m_display_maxy; // display matrix number of rows
int m_display_maxx; // display matrix number of columns
-
+
UINT32 m_grid; // VFD current row data
UINT32 m_plate; // VFD current column data
-
- UINT32 m_display_state[0x20]; // display matrix rows data
+
+ UINT32 m_display_state[0x20]; // display matrix rows data
UINT16 m_display_segmask[0x20]; // if not 0, display matrix row is a digit, mask indicates connected segments
UINT32 m_display_cache[0x20]; // (internal use)
UINT8 m_display_decay[0x20][0x20]; // (internal use)
@@ -95,7 +95,7 @@ public:
DECLARE_WRITE8_MEMBER(edracula_grid_w);
DECLARE_WRITE8_MEMBER(edracula_plate_w);
-
+
DECLARE_WRITE8_MEMBER(tmtennis_grid_w);
DECLARE_WRITE8_MEMBER(tmtennis_plate_w);
DECLARE_WRITE8_MEMBER(tmtennis_port_e_w);
@@ -107,7 +107,7 @@ public:
void tmpacman_display();
DECLARE_WRITE8_MEMBER(tmpacman_grid_w);
DECLARE_WRITE8_MEMBER(tmpacman_plate_w);
-
+
DECLARE_WRITE8_MEMBER(alnchase_output_w);
DECLARE_READ8_MEMBER(alnchase_input_r);
};
@@ -120,7 +120,7 @@ void hh_ucom4_state::machine_start()
memset(m_display_cache, ~0, sizeof(m_display_cache));
memset(m_display_decay, 0, sizeof(m_display_decay));
memset(m_display_segmask, 0, sizeof(m_display_segmask));
-
+
memset(m_port, 0, sizeof(m_port));
m_inp_mux = 0;
m_grid = 0;
@@ -203,7 +203,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(hh_ucom4_state::display_decay_tick)
for (int x = 0; x < m_display_maxx; x++)
if (m_display_decay[y][x] != 0)
m_display_decay[y][x]--;
-
+
display_update();
}
@@ -216,7 +216,7 @@ void hh_ucom4_state::display_matrix(int maxx, int maxy, UINT32 setx, UINT32 sety
UINT32 mask = (1 << maxx) - 1;
for (int y = 0; y < maxy; y++)
m_display_state[y] = (sety >> y & 1) ? (setx & mask) : 0;
-
+
display_update();
}
@@ -247,7 +247,7 @@ UINT8 hh_ucom4_state::read_inputs(int columns)
* PCB label Emix Corp. ET-03
* NEC uCOM-43 MCU, labeled D553C 031
* green VFD display Emix-102
-
+
Press the Kick button to start the game, an automatic sequence follows.
Then choose a formation(A,B,C) and either pass the ball, and/or start
running. For more information, refer to the official manual.
@@ -274,15 +274,15 @@ WRITE8_MEMBER(hh_ucom4_state::ssfball_grid_w)
WRITE8_MEMBER(hh_ucom4_state::ssfball_plate_w)
{
m_port[offset] = data;
-
+
// E,F,G,H,I(not all!): vfd matrix plate
int shift = (offset - NEC_UCOM4_PORTE) * 4;
m_plate = (m_plate & ~(0xf << shift)) | (data << shift);
-
+
// F3,G3: input mux + speaker
m_inp_mux = (m_port[NEC_UCOM4_PORTF] >> 3 & 1) | (m_port[NEC_UCOM4_PORTG] >> 2 & 2);
m_speaker->level_w(m_inp_mux);
-
+
// E3: vfd matrix grid 8
if (offset == NEC_UCOM4_PORTE)
ssfball_grid_w(space, offset, data >> 3 & 1);
@@ -376,10 +376,10 @@ WRITE8_MEMBER(hh_ucom4_state::splasfgt_grid_w)
// G,H,I0: vfd matrix grid
int shift = (offset - NEC_UCOM4_PORTG) * 4;
m_grid = (m_grid & ~(0xf << shift)) | (data << shift);
-
+
// G(grid 0-3): input mux
m_inp_mux = m_grid & 0xf;
-
+
// I2: vfd matrix plate 6
if (offset == NEC_UCOM4_PORTI)
m_plate = (m_plate & 0xffff) | (data << 14 & 0x10000);
@@ -392,11 +392,11 @@ WRITE8_MEMBER(hh_ucom4_state::splasfgt_plate_w)
// C,D,E,F23: vfd matrix plate
int shift = (offset - NEC_UCOM4_PORTC) * 4;
m_plate = (m_plate & ~(0xf << shift)) | (data << shift);
-
+
// F01: speaker out
if (offset == NEC_UCOM4_PORTF)
m_speaker->level_w(data & 3);
-
+
ssfball_display();
}
@@ -408,7 +408,7 @@ READ8_MEMBER(hh_ucom4_state::splasfgt_input_b_r)
/* physical button layout and labels is like this:
-
+
* left = P1 side * * right = P2 side * (note: in 1P mode, switch sides between turns)
[ JUMP ] [ HIGH ] (players sw) [ HIGH ] [ JUMP ]
@@ -530,7 +530,7 @@ WRITE8_MEMBER(hh_ucom4_state::astrocmd_plate_w)
{
// E2: speaker out
m_speaker->level_w(data >> 2 & 1);
-
+
// E3: vfd matrix grid 8
astrocmd_grid_w(space, offset, data >> 3 & 1);
}
@@ -719,7 +719,7 @@ READ8_MEMBER(hh_ucom4_state::tmtennis_input_r)
/* Pro-Tennis physical button layout and labels is like this:
-
+
* left = P2/CPU side * * right = P1 side *
[SERVE] [1] [2] [3] [3] [2] [1] [SERVE]
@@ -818,7 +818,7 @@ MACHINE_CONFIG_END
- USA: Pac Man
- UK: Puckman (Tomy), and also published by Grandstand as Munchman
- Australia: Pac Man-1, published by Futuretronics
-
+
The game will start automatically after turning it on. This Pac Man refuses
to eat dots with his butt, you can only eat them going right-to-left.
@@ -830,7 +830,7 @@ void hh_ucom4_state::tmpacman_display()
{
UINT32 grid = BITSWAP8(m_grid,0,1,2,3,4,5,6,7);
UINT32 plate = BITSWAP24(m_plate,23,22,21,20,19,16,17,18,11,10,9,8,0,2,3,1,4,5,6,7,12,13,14,15);
-
+
display_matrix(19, 8, plate | 0x100, grid); // plate 8 (maze) is always on
}
@@ -930,7 +930,7 @@ WRITE8_MEMBER(hh_ucom4_state::alnchase_output_w)
// C0(grid 0): input enable PL1
// D0(grid 4): input enable PL2
m_inp_mux = (m_grid & 1) | (m_grid >> 3 & 2);
-
+
// E1: speaker out
if (offset == NEC_UCOM4_PORTE)
m_speaker->level_w(data >> 1 & 1);
diff --git a/src/mess/drivers/imds2.c b/src/mess/drivers/imds2.c
index cf192dd63e8..eac8f9b7bb0 100644
--- a/src/mess/drivers/imds2.c
+++ b/src/mess/drivers/imds2.c
@@ -89,543 +89,543 @@
#define IOC_BEEP_FREQ 3300
static ADDRESS_MAP_START(ipc_mem_map , AS_PROGRAM , 8 , imds2_state)
- AM_RANGE(0x0000 , 0xffff) AM_READWRITE(ipc_mem_read, ipc_mem_write)
+ AM_RANGE(0x0000 , 0xffff) AM_READWRITE(ipc_mem_read, ipc_mem_write)
ADDRESS_MAP_END
static ADDRESS_MAP_START(ipc_io_map , AS_IO , 8 , imds2_state)
- ADDRESS_MAP_UNMAP_LOW
- AM_RANGE(0xc0 , 0xc0) AM_READWRITE(imds2_ipc_dbbout_r , imds2_ipc_dbbin_data_w)
- AM_RANGE(0xc1 , 0xc1) AM_READWRITE(imds2_ipc_status_r , imds2_ipc_dbbin_cmd_w)
- AM_RANGE(0xfa , 0xfb) AM_READWRITE(imds2_ipclocpic_r , imds2_ipclocpic_w)
- AM_RANGE(0xfc , 0xfd) AM_READWRITE(imds2_ipcsyspic_r , imds2_ipcsyspic_w)
- AM_RANGE(0xff , 0xff) AM_WRITE(imds2_ipc_control_w)
+ ADDRESS_MAP_UNMAP_LOW
+ AM_RANGE(0xc0 , 0xc0) AM_READWRITE(imds2_ipc_dbbout_r , imds2_ipc_dbbin_data_w)
+ AM_RANGE(0xc1 , 0xc1) AM_READWRITE(imds2_ipc_status_r , imds2_ipc_dbbin_cmd_w)
+ AM_RANGE(0xfa , 0xfb) AM_READWRITE(imds2_ipclocpic_r , imds2_ipclocpic_w)
+ AM_RANGE(0xfc , 0xfd) AM_READWRITE(imds2_ipcsyspic_r , imds2_ipcsyspic_w)
+ AM_RANGE(0xff , 0xff) AM_WRITE(imds2_ipc_control_w)
ADDRESS_MAP_END
- static ADDRESS_MAP_START(ioc_mem_map , AS_PROGRAM , 8 , imds2_state)
- ADDRESS_MAP_UNMAP_HIGH
- AM_RANGE(0x0000 , 0x1fff) AM_ROM
- AM_RANGE(0x4000 , 0x5fff) AM_RAM
+ static ADDRESS_MAP_START(ioc_mem_map , AS_PROGRAM , 8 , imds2_state)
+ ADDRESS_MAP_UNMAP_HIGH
+ AM_RANGE(0x0000 , 0x1fff) AM_ROM
+ AM_RANGE(0x4000 , 0x5fff) AM_RAM
ADDRESS_MAP_END
static ADDRESS_MAP_START(ioc_io_map , AS_IO , 8 , imds2_state)
- ADDRESS_MAP_UNMAP_HIGH
- AM_RANGE(0x00 , 0x0f) AM_WRITE(imds2_ioc_dbbout_w)
- AM_RANGE(0x20 , 0x2f) AM_WRITE(imds2_ioc_f0_w)
- AM_RANGE(0x30 , 0x3f) AM_WRITE(imds2_ioc_set_f1_w)
- AM_RANGE(0x40 , 0x4f) AM_WRITE(imds2_ioc_reset_f1_w)
- AM_RANGE(0x50 , 0x5f) AM_WRITE(imds2_start_timer_w)
- AM_RANGE(0x60 , 0x6f) AM_WRITE(imds2_miscout_w)
- AM_RANGE(0x80 , 0x8f) AM_READ(imds2_miscin_r)
- AM_RANGE(0x90 , 0x9f) AM_READ(imds2_kb_read)
- AM_RANGE(0xa0 , 0xaf) AM_READ(imds2_ioc_status_r)
- AM_RANGE(0xb0 , 0xbf) AM_READ(imds2_ioc_dbbin_r)
- AM_RANGE(0xc0 , 0xcf) AM_DEVREADWRITE("iocfdc" , i8271_device , read , write)
- AM_RANGE(0xd0 , 0xdf) AM_DEVREADWRITE("ioccrtc" , i8275_device , read , write)
- AM_RANGE(0xe0 , 0xef) AM_DEVREADWRITE("ioctimer" , pit8253_device , read , write);
+ ADDRESS_MAP_UNMAP_HIGH
+ AM_RANGE(0x00 , 0x0f) AM_WRITE(imds2_ioc_dbbout_w)
+ AM_RANGE(0x20 , 0x2f) AM_WRITE(imds2_ioc_f0_w)
+ AM_RANGE(0x30 , 0x3f) AM_WRITE(imds2_ioc_set_f1_w)
+ AM_RANGE(0x40 , 0x4f) AM_WRITE(imds2_ioc_reset_f1_w)
+ AM_RANGE(0x50 , 0x5f) AM_WRITE(imds2_start_timer_w)
+ AM_RANGE(0x60 , 0x6f) AM_WRITE(imds2_miscout_w)
+ AM_RANGE(0x80 , 0x8f) AM_READ(imds2_miscin_r)
+ AM_RANGE(0x90 , 0x9f) AM_READ(imds2_kb_read)
+ AM_RANGE(0xa0 , 0xaf) AM_READ(imds2_ioc_status_r)
+ AM_RANGE(0xb0 , 0xbf) AM_READ(imds2_ioc_dbbin_r)
+ AM_RANGE(0xc0 , 0xcf) AM_DEVREADWRITE("iocfdc" , i8271_device , read , write)
+ AM_RANGE(0xd0 , 0xdf) AM_DEVREADWRITE("ioccrtc" , i8275_device , read , write)
+ AM_RANGE(0xe0 , 0xef) AM_DEVREADWRITE("ioctimer" , pit8253_device , read , write);
// DMA controller range doesn't extend to 0xff because register 0xfd needs to be read as 0xff
// This register is used by IOC firmware to detect DMA controller model (either 8237 or 8257)
- AM_RANGE(0xf0 , 0xf8) AM_DEVREADWRITE("iocdma" , i8257_device , read , write)
+ AM_RANGE(0xf0 , 0xf8) AM_DEVREADWRITE("iocdma" , i8257_device , read , write)
ADDRESS_MAP_END
-
+
static ADDRESS_MAP_START(kb_io_map , AS_IO , 8 , imds2_state)
- AM_RANGE(MCS48_PORT_P1 , MCS48_PORT_P1) AM_WRITE(imds2_kb_port_p1_w)
- AM_RANGE(MCS48_PORT_P2 , MCS48_PORT_P2) AM_READ(imds2_kb_port_p2_r)
- AM_RANGE(MCS48_PORT_T0 , MCS48_PORT_T0) AM_READ(imds2_kb_port_t0_r)
- AM_RANGE(MCS48_PORT_T1 , MCS48_PORT_T1) AM_READ(imds2_kb_port_t1_r)
+ AM_RANGE(MCS48_PORT_P1 , MCS48_PORT_P1) AM_WRITE(imds2_kb_port_p1_w)
+ AM_RANGE(MCS48_PORT_P2 , MCS48_PORT_P2) AM_READ(imds2_kb_port_p2_r)
+ AM_RANGE(MCS48_PORT_T0 , MCS48_PORT_T0) AM_READ(imds2_kb_port_t0_r)
+ AM_RANGE(MCS48_PORT_T1 , MCS48_PORT_T1) AM_READ(imds2_kb_port_t1_r)
ADDRESS_MAP_END
-
+
imds2_state::imds2_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig , type , tag),
- m_ipccpu(*this , "ipccpu"),
- m_ipcsyspic(*this , "ipcsyspic"),
- m_ipclocpic(*this , "ipclocpic"),
- m_ioccpu(*this , "ioccpu"),
- m_iocdma(*this , "iocdma"),
- m_ioccrtc(*this , "ioccrtc"),
- m_iocbeep(*this , "iocbeep"),
- m_ioctimer(*this , "ioctimer"),
- m_iocfdc(*this , "iocfdc"),
- m_kbcpu(*this , "kbcpu"),
- m_palette(*this , "palette"),
- m_gfxdecode(*this, "gfxdecode"),
- m_floppy0(*this , FLOPPY_0),
- m_io_key0(*this , "KEY0"),
- m_io_key1(*this , "KEY1"),
- m_io_key2(*this , "KEY2"),
- m_io_key3(*this , "KEY3"),
- m_io_key4(*this , "KEY4"),
- m_io_key5(*this , "KEY5"),
- m_io_key6(*this , "KEY6"),
- m_io_key7(*this , "KEY7"),
- m_ioc_options(*this , "IOC_OPTS")
+ : driver_device(mconfig , type , tag),
+ m_ipccpu(*this , "ipccpu"),
+ m_ipcsyspic(*this , "ipcsyspic"),
+ m_ipclocpic(*this , "ipclocpic"),
+ m_ioccpu(*this , "ioccpu"),
+ m_iocdma(*this , "iocdma"),
+ m_ioccrtc(*this , "ioccrtc"),
+ m_iocbeep(*this , "iocbeep"),
+ m_ioctimer(*this , "ioctimer"),
+ m_iocfdc(*this , "iocfdc"),
+ m_kbcpu(*this , "kbcpu"),
+ m_palette(*this , "palette"),
+ m_gfxdecode(*this, "gfxdecode"),
+ m_floppy0(*this , FLOPPY_0),
+ m_io_key0(*this , "KEY0"),
+ m_io_key1(*this , "KEY1"),
+ m_io_key2(*this , "KEY2"),
+ m_io_key3(*this , "KEY3"),
+ m_io_key4(*this , "KEY4"),
+ m_io_key5(*this , "KEY5"),
+ m_io_key6(*this , "KEY6"),
+ m_io_key7(*this , "KEY7"),
+ m_ioc_options(*this , "IOC_OPTS")
{
}
READ8_MEMBER(imds2_state::ipc_mem_read)
{
- if (imds2_in_ipc_rom(offset)) {
- return m_ipc_rom[ (offset & 0x07ff) | ((offset & 0x1000) >> 1) ];
- } else {
- return m_ipc_ram[ offset ];
- }
+ if (imds2_in_ipc_rom(offset)) {
+ return m_ipc_rom[ (offset & 0x07ff) | ((offset & 0x1000) >> 1) ];
+ } else {
+ return m_ipc_ram[ offset ];
+ }
}
WRITE8_MEMBER(imds2_state::ipc_mem_write)
{
- if (!imds2_in_ipc_rom(offset)) {
- m_ipc_ram[ offset ] = data;
- }
+ if (!imds2_in_ipc_rom(offset)) {
+ m_ipc_ram[ offset ] = data;
+ }
}
WRITE8_MEMBER(imds2_state::imds2_ipc_control_w)
{
- // See A84, pg 28 of [1]
- // b3 is ~(bit to be written)
- // b2-b0 is ~(no. of bit to be written)
- UINT8 mask = (1U << (~data & 0x07));
+ // See A84, pg 28 of [1]
+ // b3 is ~(bit to be written)
+ // b2-b0 is ~(no. of bit to be written)
+ UINT8 mask = (1U << (~data & 0x07));
- if (BIT(data , 3)) {
- m_ipc_control &= ~mask;
- } else {
- m_ipc_control |= mask;
- }
+ if (BIT(data , 3)) {
+ m_ipc_control &= ~mask;
+ } else {
+ m_ipc_control |= mask;
+ }
}
WRITE_LINE_MEMBER(imds2_state::imds2_ipc_intr)
{
- m_ipccpu->set_input_line(I8085_INTR_LINE , (state != 0) && BIT(m_ipc_control , 2));
+ m_ipccpu->set_input_line(I8085_INTR_LINE , (state != 0) && BIT(m_ipc_control , 2));
}
READ8_MEMBER(imds2_state::imds2_ipcsyspic_r)
{
- return m_ipcsyspic->read(space , offset == 0);
+ return m_ipcsyspic->read(space , offset == 0);
}
READ8_MEMBER(imds2_state::imds2_ipclocpic_r)
{
- return m_ipclocpic->read(space , offset == 0);
+ return m_ipclocpic->read(space , offset == 0);
}
WRITE8_MEMBER(imds2_state::imds2_ipcsyspic_w)
{
- m_ipcsyspic->write(space , offset == 0 , data);
+ m_ipcsyspic->write(space , offset == 0 , data);
}
WRITE8_MEMBER(imds2_state::imds2_ipclocpic_w)
{
- m_ipclocpic->write(space , offset == 0 , data);
+ m_ipclocpic->write(space , offset == 0 , data);
}
WRITE8_MEMBER(imds2_state::imds2_miscout_w)
{
- m_miscout = data;
- imds2_update_beeper();
- // Send INTR to IPC
- m_ipclocpic->ir6_w(BIT(m_miscout , 1));
+ m_miscout = data;
+ imds2_update_beeper();
+ // Send INTR to IPC
+ m_ipclocpic->ir6_w(BIT(m_miscout , 1));
}
READ8_MEMBER(imds2_state::imds2_miscin_r)
{
- UINT8 res = m_ioc_options->read();
- return res | ((m_beeper_timer == 0) << 2);
+ UINT8 res = m_ioc_options->read();
+ return res | ((m_beeper_timer == 0) << 2);
}
WRITE_LINE_MEMBER(imds2_state::imds2_beep_timer_w)
{
- m_beeper_timer = state;
- imds2_update_beeper();
+ m_beeper_timer = state;
+ imds2_update_beeper();
}
WRITE8_MEMBER(imds2_state::imds2_start_timer_w)
{
- // Trigger timer 2 of ioctimer
- m_ioctimer->write_gate2(0);
- m_ioctimer->write_gate2(1);
+ // Trigger timer 2 of ioctimer
+ m_ioctimer->write_gate2(0);
+ m_ioctimer->write_gate2(1);
}
READ8_MEMBER(imds2_state::imds2_kb_read)
{
- return m_kbcpu->upi41_master_r(space , (offset & 2) >> 1);
+ return m_kbcpu->upi41_master_r(space , (offset & 2) >> 1);
}
READ8_MEMBER(imds2_state::imds2_kb_port_p2_r)
{
- if ((m_kb_p1 & 3) == 0) {
- // Row selected
- // Row number is encoded on bits P15..P12, they are "backwards" (P15 is LSB) and keyboard rows are encoded starting with value 2 on these bits (see A4, pg 56 of [1])
- unsigned row = (m_kb_p1 >> 2) & 0x0f;
- ioport_value data;
-
- switch (row) {
- case 4:
- // Row 0
- data = m_io_key0->read();
- break;
-
- case 12:
- // Row 1
- data = m_io_key1->read();
- break;
-
- case 2:
- // Row 2
- data = m_io_key2->read();
- break;
-
- case 10:
- // Row 3
- data = m_io_key3->read();
- break;
-
- case 6:
- // Row 4
- data = m_io_key4->read();
- break;
-
- case 14:
- // Row 5
- data = m_io_key5->read();
- break;
-
- case 1:
- // Row 6
- data = m_io_key6->read();
- break;
-
- case 9:
- // Row 7
- data = m_io_key7->read();
- break;
-
- default:
- data = 0xff;
- break;
- }
- return data & 0xff;
- } else {
- // No row selected
- return 0xff;
- }
+ if ((m_kb_p1 & 3) == 0) {
+ // Row selected
+ // Row number is encoded on bits P15..P12, they are "backwards" (P15 is LSB) and keyboard rows are encoded starting with value 2 on these bits (see A4, pg 56 of [1])
+ unsigned row = (m_kb_p1 >> 2) & 0x0f;
+ ioport_value data;
+
+ switch (row) {
+ case 4:
+ // Row 0
+ data = m_io_key0->read();
+ break;
+
+ case 12:
+ // Row 1
+ data = m_io_key1->read();
+ break;
+
+ case 2:
+ // Row 2
+ data = m_io_key2->read();
+ break;
+
+ case 10:
+ // Row 3
+ data = m_io_key3->read();
+ break;
+
+ case 6:
+ // Row 4
+ data = m_io_key4->read();
+ break;
+
+ case 14:
+ // Row 5
+ data = m_io_key5->read();
+ break;
+
+ case 1:
+ // Row 6
+ data = m_io_key6->read();
+ break;
+
+ case 9:
+ // Row 7
+ data = m_io_key7->read();
+ break;
+
+ default:
+ data = 0xff;
+ break;
+ }
+ return data & 0xff;
+ } else {
+ // No row selected
+ return 0xff;
+ }
}
WRITE8_MEMBER(imds2_state::imds2_kb_port_p1_w)
{
- m_kb_p1 = data;
+ m_kb_p1 = data;
}
READ8_MEMBER(imds2_state::imds2_kb_port_t0_r)
{
- // T0 tied low
- // It appears to be some kind of strapping option on kb hw
- return 0;
+ // T0 tied low
+ // It appears to be some kind of strapping option on kb hw
+ return 0;
}
READ8_MEMBER(imds2_state::imds2_kb_port_t1_r)
{
- // T1 tied low
- // It appears to be some kind of strapping option on kb hw
- return 0;
+ // T1 tied low
+ // It appears to be some kind of strapping option on kb hw
+ return 0;
}
WRITE8_MEMBER(imds2_state::imds2_ioc_dbbout_w)
{
- m_ioc_obf = ~data;
- // Set/reset OBF flag (b0)
- m_ipc_ioc_status = ((offset & 1) == 0) | (m_ipc_ioc_status & ~0x01);
+ m_ioc_obf = ~data;
+ // Set/reset OBF flag (b0)
+ m_ipc_ioc_status = ((offset & 1) == 0) | (m_ipc_ioc_status & ~0x01);
}
WRITE8_MEMBER(imds2_state::imds2_ioc_f0_w)
{
- // Set/reset F0 flag (b2)
- m_ipc_ioc_status = ((offset & 1) << 2) | (m_ipc_ioc_status & ~0x04);
+ // Set/reset F0 flag (b2)
+ m_ipc_ioc_status = ((offset & 1) << 2) | (m_ipc_ioc_status & ~0x04);
}
WRITE8_MEMBER(imds2_state::imds2_ioc_set_f1_w)
{
- // Set F1 flag (b3)
- m_ipc_ioc_status |= 0x08;
+ // Set F1 flag (b3)
+ m_ipc_ioc_status |= 0x08;
}
WRITE8_MEMBER(imds2_state::imds2_ioc_reset_f1_w)
{
- // Reset F1 flag (b3)
- m_ipc_ioc_status &= ~0x08;
+ // Reset F1 flag (b3)
+ m_ipc_ioc_status &= ~0x08;
}
READ8_MEMBER(imds2_state::imds2_ioc_status_r)
{
- return (~m_ipc_ioc_status & 0x0f) | 0xf0;
+ return (~m_ipc_ioc_status & 0x0f) | 0xf0;
}
READ8_MEMBER(imds2_state::imds2_ioc_dbbin_r)
{
- // Reset IBF flag (b1)
- m_ipc_ioc_status &= ~0x02;
- return ~m_ioc_ibf;
+ // Reset IBF flag (b1)
+ m_ipc_ioc_status &= ~0x02;
+ return ~m_ioc_ibf;
}
READ8_MEMBER(imds2_state::imds2_ipc_dbbout_r)
{
- // Reset OBF flag (b0)
- m_ipc_ioc_status &= ~0x01;
- return m_ioc_obf;
+ // Reset OBF flag (b0)
+ m_ipc_ioc_status &= ~0x01;
+ return m_ioc_obf;
}
READ8_MEMBER(imds2_state::imds2_ipc_status_r)
{
- return m_ipc_ioc_status;
+ return m_ipc_ioc_status;
}
WRITE8_MEMBER(imds2_state::imds2_ipc_dbbin_data_w)
{
- // Set IBF flag (b1)
- m_ipc_ioc_status |= 0x02;
- // Reset F1 flag (b3)
- m_ipc_ioc_status &= ~0x08;
- m_ioc_ibf = data;
+ // Set IBF flag (b1)
+ m_ipc_ioc_status |= 0x02;
+ // Reset F1 flag (b3)
+ m_ipc_ioc_status &= ~0x08;
+ m_ioc_ibf = data;
}
WRITE8_MEMBER(imds2_state::imds2_ipc_dbbin_cmd_w)
{
- // Set IBF flag (b1)
- m_ipc_ioc_status |= 0x02;
- // Set F1 flag (b3)
- m_ipc_ioc_status |= 0x08;
- m_ioc_ibf = data;
+ // Set IBF flag (b1)
+ m_ipc_ioc_status |= 0x02;
+ // Set F1 flag (b3)
+ m_ipc_ioc_status |= 0x08;
+ m_ioc_ibf = data;
}
WRITE_LINE_MEMBER(imds2_state::imds2_hrq_w)
{
- // Should be propagated to HOLD input of IOC CPU
- m_iocdma->hlda_w(state);
+ // Should be propagated to HOLD input of IOC CPU
+ m_iocdma->hlda_w(state);
}
READ8_MEMBER(imds2_state::imds2_ioc_mem_r)
{
- address_space& prog_space = m_ioccpu->space(AS_PROGRAM);
- return prog_space.read_byte(offset);
+ address_space& prog_space = m_ioccpu->space(AS_PROGRAM);
+ return prog_space.read_byte(offset);
}
WRITE8_MEMBER(imds2_state::imds2_ioc_mem_w)
{
- address_space& prog_space = m_ioccpu->space(AS_PROGRAM);
- return prog_space.write_byte(offset , data);
+ address_space& prog_space = m_ioccpu->space(AS_PROGRAM);
+ return prog_space.write_byte(offset , data);
}
I8275_DRAW_CHARACTER_MEMBER(imds2_state::crtc_display_pixels)
{
- unsigned i;
- const rgb_t *palette = m_palette->palette()->entry_list_raw();
- UINT8 chargen_byte = m_chargen[ (linecount & 7) | ((unsigned)charcode << 3) ];
- UINT16 pixels;
-
- if (lten) {
- pixels = ~0;
- } else if (vsp != 0 || (linecount & 8) != 0) {
- pixels = 0;
- } else {
- // See [2], pg 58 for the very peculiar way of generating character images
- // Here each half-pixel is translated into a full pixel
- UINT16 exp_pix_l;
- UINT16 exp_pix_r;
-
- exp_pix_l = (UINT16)chargen_byte;
- exp_pix_l = ((exp_pix_l & 0x80) << 5) |
- ((exp_pix_l & 0x40) << 4) |
- ((exp_pix_l & 0x20) << 3) |
- ((exp_pix_l & 0x10) << 2) |
- ((exp_pix_l & 0x08) << 1) |
- (exp_pix_l & 0x04);
- exp_pix_l |= (exp_pix_l << 1);
- exp_pix_r = exp_pix_l;
-
- // Layout of exp_pix_l/r:
- // Bit # : F E D C B A 9 8 7 6 5 4 3 2 1 0
- // Bit of chargen_byte: 0 0 b7 b7 b6 b6 b5 b5 b4 b4 b3 b3 b2 b2 0 0
- if ((chargen_byte & 2) == 0) {
- exp_pix_l >>= 1;
- }
- exp_pix_l &= 0x3fc0;
-
- if ((chargen_byte & 1) == 0) {
- exp_pix_r >>= 1;
- }
- exp_pix_r &= 0x003e;
-
- pixels = exp_pix_l | exp_pix_r;
- }
-
- if (rvv) {
- pixels = ~pixels;
- }
-
- for (i = 0; i < 14; i++) {
- bitmap.pix32(y, x + i) = palette[ (pixels & (1U << (13 - i))) != 0 ];
- }
+ unsigned i;
+ const rgb_t *palette = m_palette->palette()->entry_list_raw();
+ UINT8 chargen_byte = m_chargen[ (linecount & 7) | ((unsigned)charcode << 3) ];
+ UINT16 pixels;
+
+ if (lten) {
+ pixels = ~0;
+ } else if (vsp != 0 || (linecount & 8) != 0) {
+ pixels = 0;
+ } else {
+ // See [2], pg 58 for the very peculiar way of generating character images
+ // Here each half-pixel is translated into a full pixel
+ UINT16 exp_pix_l;
+ UINT16 exp_pix_r;
+
+ exp_pix_l = (UINT16)chargen_byte;
+ exp_pix_l = ((exp_pix_l & 0x80) << 5) |
+ ((exp_pix_l & 0x40) << 4) |
+ ((exp_pix_l & 0x20) << 3) |
+ ((exp_pix_l & 0x10) << 2) |
+ ((exp_pix_l & 0x08) << 1) |
+ (exp_pix_l & 0x04);
+ exp_pix_l |= (exp_pix_l << 1);
+ exp_pix_r = exp_pix_l;
+
+ // Layout of exp_pix_l/r:
+ // Bit # : F E D C B A 9 8 7 6 5 4 3 2 1 0
+ // Bit of chargen_byte: 0 0 b7 b7 b6 b6 b5 b5 b4 b4 b3 b3 b2 b2 0 0
+ if ((chargen_byte & 2) == 0) {
+ exp_pix_l >>= 1;
+ }
+ exp_pix_l &= 0x3fc0;
+
+ if ((chargen_byte & 1) == 0) {
+ exp_pix_r >>= 1;
+ }
+ exp_pix_r &= 0x003e;
+
+ pixels = exp_pix_l | exp_pix_r;
+ }
+
+ if (rvv) {
+ pixels = ~pixels;
+ }
+
+ for (i = 0; i < 14; i++) {
+ bitmap.pix32(y, x + i) = palette[ (pixels & (1U << (13 - i))) != 0 ];
+ }
}
void imds2_state::driver_start()
{
- // Allocate 64k for IPC RAM
- m_ipc_ram.resize(0x10000);
+ // Allocate 64k for IPC RAM
+ m_ipc_ram.resize(0x10000);
- memory_region *ipcrom = memregion("ipcrom");
- if (ipcrom == NULL) {
- fatalerror("Unable to find IPC ROM region\n");
- } else {
- m_ipc_rom = ipcrom->base();
- }
+ memory_region *ipcrom = memregion("ipcrom");
+ if (ipcrom == NULL) {
+ fatalerror("Unable to find IPC ROM region\n");
+ } else {
+ m_ipc_rom = ipcrom->base();
+ }
}
void imds2_state::machine_start()
{
- m_floppy0->floppy_mon_w(0);
- m_floppy0->floppy_drive_set_ready_state(1 , 0);
+ m_floppy0->floppy_mon_w(0);
+ m_floppy0->floppy_drive_set_ready_state(1 , 0);
}
void imds2_state::video_start()
{
- m_chargen = memregion("gfx1")->base();
+ m_chargen = memregion("gfx1")->base();
}
void imds2_state::machine_reset()
{
- m_iocbeep->set_frequency(IOC_BEEP_FREQ);
- m_ipc_control = 0x00;
- m_ipc_ioc_status = 0x0f;
+ m_iocbeep->set_frequency(IOC_BEEP_FREQ);
+ m_ipc_control = 0x00;
+ m_ipc_ioc_status = 0x0f;
}
bool imds2_state::imds2_in_ipc_rom(offs_t offset) const
{
- offs_t masked_offset = offset & 0xf800;
+ offs_t masked_offset = offset & 0xf800;
- // Region 0000-07ff is in ROM when START_UP/ == 0 && SEL_BOOT/ == 0
- if (masked_offset == 0x0000 && (m_ipc_control & 0x28) == 0) {
- return true;
- }
+ // Region 0000-07ff is in ROM when START_UP/ == 0 && SEL_BOOT/ == 0
+ if (masked_offset == 0x0000 && (m_ipc_control & 0x28) == 0) {
+ return true;
+ }
- // Region e800-efff is in ROM when SEL_BOOT/ == 0
- if (masked_offset == 0xe800 && (m_ipc_control & 0x08) == 0) {
- return true;
- }
+ // Region e800-efff is in ROM when SEL_BOOT/ == 0
+ if (masked_offset == 0xe800 && (m_ipc_control & 0x08) == 0) {
+ return true;
+ }
- // Region f800-ffff is always in ROM
- if (masked_offset == 0xf800) {
- return true;
- }
+ // Region f800-ffff is always in ROM
+ if (masked_offset == 0xf800) {
+ return true;
+ }
- return false;
+ return false;
}
-
+
void imds2_state::imds2_update_beeper(void)
{
- m_iocbeep->set_state(m_beeper_timer == 0 && BIT(m_miscout , 0) == 0);
+ m_iocbeep->set_state(m_beeper_timer == 0 && BIT(m_miscout , 0) == 0);
}
static INPUT_PORTS_START(imds2)
- // See [1], pg 56 for key matrix layout
- // See [1], pg 57 for keyboard layout
- PORT_START("KEY0")
- PORT_BIT(0x01 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_TAB) PORT_CHAR('\t') // OK
- PORT_BIT(0x02 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_OPENBRACE) PORT_CHAR('@') PORT_CHAR('`')
- PORT_BIT(0x04 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_COMMA) PORT_CHAR(',') PORT_CHAR('<') // OK
- PORT_BIT(0x08 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_ENTER) PORT_CHAR(13) // OK
- PORT_BIT(0x10 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ')
- PORT_BIT(0x20 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_QUOTE) PORT_CHAR(':') PORT_CHAR('*') // '
- PORT_BIT(0x40 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_STOP) PORT_CHAR('.') PORT_CHAR('>') // .
- PORT_BIT(0x80 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_SLASH) PORT_CHAR('/') PORT_CHAR('?')
-
- PORT_START("KEY1")
- PORT_BIT(0x01 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_Z) PORT_CHAR('z') PORT_CHAR('Z') // OK
- PORT_BIT(0x02 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_X) PORT_CHAR('x') PORT_CHAR('X') // OK
- PORT_BIT(0x04 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_M) PORT_CHAR('m') PORT_CHAR('M') // OK
- PORT_BIT(0x08 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_V) PORT_CHAR('v') PORT_CHAR('V') // OK
- PORT_BIT(0x10 , IP_ACTIVE_LOW , IPT_UNUSED)
- PORT_BIT(0x20 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_C) PORT_CHAR('c') PORT_CHAR('C') // OK
- PORT_BIT(0x40 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_N) PORT_CHAR('n') PORT_CHAR('N') // OK
- PORT_BIT(0x80 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_B) PORT_CHAR('b') PORT_CHAR('B') // OK
-
- PORT_START("KEY2")
- PORT_BIT(0x01 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_0) PORT_CHAR('0') PORT_CHAR('~') // OK
- PORT_BIT(0x02 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_OPENBRACE) PORT_CHAR('[') PORT_CHAR('{')
- PORT_BIT(0x04 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_O) PORT_CHAR('o') PORT_CHAR('O') // OK
- PORT_BIT(0x08 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_L) PORT_CHAR('l') PORT_CHAR('L') // OK
- PORT_BIT(0x10 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_9) PORT_CHAR('9') PORT_CHAR(')') // OK
- PORT_BIT(0x20 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS) PORT_CHAR('-') PORT_CHAR('=') // OK
- PORT_BIT(0x40 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_P) PORT_CHAR('p') PORT_CHAR('P') // OK
- PORT_BIT(0x80 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_COLON) PORT_CHAR(';') PORT_CHAR('+')
-
- PORT_START("KEY3")
- PORT_BIT(0x01 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_S) PORT_CHAR('s') PORT_CHAR('S') // OK
- PORT_BIT(0x02 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_D) PORT_CHAR('d') PORT_CHAR('D') // OK
- PORT_BIT(0x04 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_K) PORT_CHAR('k') PORT_CHAR('K') // OK
- PORT_BIT(0x08 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_G) PORT_CHAR('g') PORT_CHAR('G') // OK
- PORT_BIT(0x10 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_A) PORT_CHAR('a') PORT_CHAR('A') // OK
- PORT_BIT(0x20 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_F) PORT_CHAR('f') PORT_CHAR('F') // OK
- PORT_BIT(0x40 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_J) PORT_CHAR('j') PORT_CHAR('J') // OK
- PORT_BIT(0x80 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_H) PORT_CHAR('h') PORT_CHAR('H') // OK
-
- PORT_START("KEY4")
- PORT_BIT(0x01 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_W) PORT_CHAR('w') PORT_CHAR('W') // OK
- PORT_BIT(0x02 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_E) PORT_CHAR('e') PORT_CHAR('E') // OK
- PORT_BIT(0x04 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_I) PORT_CHAR('i') PORT_CHAR('I') // OK
- PORT_BIT(0x08 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_T) PORT_CHAR('t') PORT_CHAR('T') // OK
- PORT_BIT(0x10 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_Q) PORT_CHAR('q') PORT_CHAR('Q') // OK
- PORT_BIT(0x20 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_R) PORT_CHAR('r') PORT_CHAR('R') // OK
- PORT_BIT(0x40 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_U) PORT_CHAR('u') PORT_CHAR('U') // OK
- PORT_BIT(0x80 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_Y) PORT_CHAR('y') PORT_CHAR('Y') // OK
-
- PORT_START("KEY5")
- PORT_BIT(0x01 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_2) PORT_CHAR('2') PORT_CHAR('"') // OK
- PORT_BIT(0x02 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_3) PORT_CHAR('3') PORT_CHAR('#') // OK
- PORT_BIT(0x04 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_8) PORT_CHAR('8') PORT_CHAR('(') // OK
- PORT_BIT(0x08 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_5) PORT_CHAR('5') PORT_CHAR('%') // OK
- PORT_BIT(0x10 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_1) PORT_CHAR('1') PORT_CHAR('!') // OK
- PORT_BIT(0x20 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_4) PORT_CHAR('4') PORT_CHAR('$') // OK
- PORT_BIT(0x40 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_7) PORT_CHAR('7') PORT_CHAR('\'') // OK
- PORT_BIT(0x80 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_6) PORT_CHAR('6') PORT_CHAR('&') // OK
-
- PORT_START("KEY6")
- PORT_BIT(0x01 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSPACE) PORT_CHAR(8) // BS
- PORT_BIT(0x02 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_HOME) PORT_CHAR(UCHAR_MAMEKEY(HOME)) // OK
- PORT_BIT(0x04 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSLASH) PORT_CHAR('\\') PORT_CHAR('|') // OK
- PORT_BIT(0x08 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_RIGHT) PORT_CHAR(UCHAR_MAMEKEY(RIGHT)) // OK
- PORT_BIT(0x10 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_LCONTROL) PORT_CHAR(UCHAR_SHIFT_2) // OK
- PORT_BIT(0x20 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_LEFT) PORT_CHAR(UCHAR_MAMEKEY(LEFT)) // OK
- PORT_BIT(0x40 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR(']') PORT_CHAR('}')
- PORT_BIT(0x80 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_UP) PORT_CHAR(UCHAR_MAMEKEY(UP)) // OK
-
- PORT_START("KEY7")
- PORT_BIT(0x01 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_ESC) PORT_CHAR(UCHAR_MAMEKEY(ESC)) // OK
- PORT_BIT(0x02 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_DOWN) PORT_CHAR(UCHAR_MAMEKEY(DOWN)) // OK
- PORT_BIT(0x04 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS) PORT_CHAR('_') PORT_CHAR('^')
- PORT_BIT(0x08 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_LSHIFT) PORT_CHAR(UCHAR_SHIFT_1) // OK
- PORT_BIT(0x10 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_LALT) PORT_CHAR(UCHAR_MAMEKEY(LALT)) // OK
- PORT_BIT(0x20 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_CAPSLOCK) PORT_TOGGLE PORT_CHAR(UCHAR_MAMEKEY(CAPSLOCK))
- PORT_BIT(0x40 , IP_ACTIVE_LOW , IPT_UNUSED)
- PORT_BIT(0x80 , IP_ACTIVE_LOW , IPT_UNUSED)
-
- // Options on IOC: see [1], pg 40
- PORT_START("IOC_OPTS")
- PORT_DIPNAME(0x80 , 0x80 , "Keyboard present")
- PORT_DIPSETTING(0x80 , DEF_STR(Yes))
- PORT_DIPSETTING(0x00 , DEF_STR(No))
- PORT_DIPNAME(0x28 , 0x00 , "IOC mode")
- PORT_DIPSETTING(0x00 , "On line")
- PORT_DIPSETTING(0x08 , "Local")
- PORT_DIPSETTING(0x20 , "Diagnostic")
- PORT_DIPNAME(0x02 , 0x00 , "Floppy present")
- PORT_DIPSETTING(0x02 , DEF_STR(Yes))
- PORT_DIPSETTING(0x00 , DEF_STR(No))
- PORT_DIPNAME(0x01 , 0x01 , "CRT frame frequency")
- PORT_DIPSETTING(0x01 , "50 Hz")
- PORT_DIPSETTING(0x00 , "60 Hz")
+ // See [1], pg 56 for key matrix layout
+ // See [1], pg 57 for keyboard layout
+ PORT_START("KEY0")
+ PORT_BIT(0x01 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_TAB) PORT_CHAR('\t') // OK
+ PORT_BIT(0x02 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_OPENBRACE) PORT_CHAR('@') PORT_CHAR('`')
+ PORT_BIT(0x04 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_COMMA) PORT_CHAR(',') PORT_CHAR('<') // OK
+ PORT_BIT(0x08 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_ENTER) PORT_CHAR(13) // OK
+ PORT_BIT(0x10 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ')
+ PORT_BIT(0x20 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_QUOTE) PORT_CHAR(':') PORT_CHAR('*') // '
+ PORT_BIT(0x40 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_STOP) PORT_CHAR('.') PORT_CHAR('>') // .
+ PORT_BIT(0x80 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_SLASH) PORT_CHAR('/') PORT_CHAR('?')
+
+ PORT_START("KEY1")
+ PORT_BIT(0x01 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_Z) PORT_CHAR('z') PORT_CHAR('Z') // OK
+ PORT_BIT(0x02 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_X) PORT_CHAR('x') PORT_CHAR('X') // OK
+ PORT_BIT(0x04 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_M) PORT_CHAR('m') PORT_CHAR('M') // OK
+ PORT_BIT(0x08 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_V) PORT_CHAR('v') PORT_CHAR('V') // OK
+ PORT_BIT(0x10 , IP_ACTIVE_LOW , IPT_UNUSED)
+ PORT_BIT(0x20 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_C) PORT_CHAR('c') PORT_CHAR('C') // OK
+ PORT_BIT(0x40 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_N) PORT_CHAR('n') PORT_CHAR('N') // OK
+ PORT_BIT(0x80 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_B) PORT_CHAR('b') PORT_CHAR('B') // OK
+
+ PORT_START("KEY2")
+ PORT_BIT(0x01 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_0) PORT_CHAR('0') PORT_CHAR('~') // OK
+ PORT_BIT(0x02 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_OPENBRACE) PORT_CHAR('[') PORT_CHAR('{')
+ PORT_BIT(0x04 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_O) PORT_CHAR('o') PORT_CHAR('O') // OK
+ PORT_BIT(0x08 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_L) PORT_CHAR('l') PORT_CHAR('L') // OK
+ PORT_BIT(0x10 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_9) PORT_CHAR('9') PORT_CHAR(')') // OK
+ PORT_BIT(0x20 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS) PORT_CHAR('-') PORT_CHAR('=') // OK
+ PORT_BIT(0x40 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_P) PORT_CHAR('p') PORT_CHAR('P') // OK
+ PORT_BIT(0x80 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_COLON) PORT_CHAR(';') PORT_CHAR('+')
+
+ PORT_START("KEY3")
+ PORT_BIT(0x01 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_S) PORT_CHAR('s') PORT_CHAR('S') // OK
+ PORT_BIT(0x02 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_D) PORT_CHAR('d') PORT_CHAR('D') // OK
+ PORT_BIT(0x04 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_K) PORT_CHAR('k') PORT_CHAR('K') // OK
+ PORT_BIT(0x08 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_G) PORT_CHAR('g') PORT_CHAR('G') // OK
+ PORT_BIT(0x10 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_A) PORT_CHAR('a') PORT_CHAR('A') // OK
+ PORT_BIT(0x20 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_F) PORT_CHAR('f') PORT_CHAR('F') // OK
+ PORT_BIT(0x40 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_J) PORT_CHAR('j') PORT_CHAR('J') // OK
+ PORT_BIT(0x80 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_H) PORT_CHAR('h') PORT_CHAR('H') // OK
+
+ PORT_START("KEY4")
+ PORT_BIT(0x01 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_W) PORT_CHAR('w') PORT_CHAR('W') // OK
+ PORT_BIT(0x02 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_E) PORT_CHAR('e') PORT_CHAR('E') // OK
+ PORT_BIT(0x04 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_I) PORT_CHAR('i') PORT_CHAR('I') // OK
+ PORT_BIT(0x08 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_T) PORT_CHAR('t') PORT_CHAR('T') // OK
+ PORT_BIT(0x10 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_Q) PORT_CHAR('q') PORT_CHAR('Q') // OK
+ PORT_BIT(0x20 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_R) PORT_CHAR('r') PORT_CHAR('R') // OK
+ PORT_BIT(0x40 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_U) PORT_CHAR('u') PORT_CHAR('U') // OK
+ PORT_BIT(0x80 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_Y) PORT_CHAR('y') PORT_CHAR('Y') // OK
+
+ PORT_START("KEY5")
+ PORT_BIT(0x01 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_2) PORT_CHAR('2') PORT_CHAR('"') // OK
+ PORT_BIT(0x02 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_3) PORT_CHAR('3') PORT_CHAR('#') // OK
+ PORT_BIT(0x04 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_8) PORT_CHAR('8') PORT_CHAR('(') // OK
+ PORT_BIT(0x08 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_5) PORT_CHAR('5') PORT_CHAR('%') // OK
+ PORT_BIT(0x10 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_1) PORT_CHAR('1') PORT_CHAR('!') // OK
+ PORT_BIT(0x20 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_4) PORT_CHAR('4') PORT_CHAR('$') // OK
+ PORT_BIT(0x40 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_7) PORT_CHAR('7') PORT_CHAR('\'') // OK
+ PORT_BIT(0x80 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_6) PORT_CHAR('6') PORT_CHAR('&') // OK
+
+ PORT_START("KEY6")
+ PORT_BIT(0x01 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSPACE) PORT_CHAR(8) // BS
+ PORT_BIT(0x02 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_HOME) PORT_CHAR(UCHAR_MAMEKEY(HOME)) // OK
+ PORT_BIT(0x04 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSLASH) PORT_CHAR('\\') PORT_CHAR('|') // OK
+ PORT_BIT(0x08 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_RIGHT) PORT_CHAR(UCHAR_MAMEKEY(RIGHT)) // OK
+ PORT_BIT(0x10 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_LCONTROL) PORT_CHAR(UCHAR_SHIFT_2) // OK
+ PORT_BIT(0x20 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_LEFT) PORT_CHAR(UCHAR_MAMEKEY(LEFT)) // OK
+ PORT_BIT(0x40 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR(']') PORT_CHAR('}')
+ PORT_BIT(0x80 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_UP) PORT_CHAR(UCHAR_MAMEKEY(UP)) // OK
+
+ PORT_START("KEY7")
+ PORT_BIT(0x01 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_ESC) PORT_CHAR(UCHAR_MAMEKEY(ESC)) // OK
+ PORT_BIT(0x02 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_DOWN) PORT_CHAR(UCHAR_MAMEKEY(DOWN)) // OK
+ PORT_BIT(0x04 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS) PORT_CHAR('_') PORT_CHAR('^')
+ PORT_BIT(0x08 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_LSHIFT) PORT_CHAR(UCHAR_SHIFT_1) // OK
+ PORT_BIT(0x10 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_LALT) PORT_CHAR(UCHAR_MAMEKEY(LALT)) // OK
+ PORT_BIT(0x20 , IP_ACTIVE_LOW , IPT_KEYBOARD) PORT_CODE(KEYCODE_CAPSLOCK) PORT_TOGGLE PORT_CHAR(UCHAR_MAMEKEY(CAPSLOCK))
+ PORT_BIT(0x40 , IP_ACTIVE_LOW , IPT_UNUSED)
+ PORT_BIT(0x80 , IP_ACTIVE_LOW , IPT_UNUSED)
+
+ // Options on IOC: see [1], pg 40
+ PORT_START("IOC_OPTS")
+ PORT_DIPNAME(0x80 , 0x80 , "Keyboard present")
+ PORT_DIPSETTING(0x80 , DEF_STR(Yes))
+ PORT_DIPSETTING(0x00 , DEF_STR(No))
+ PORT_DIPNAME(0x28 , 0x00 , "IOC mode")
+ PORT_DIPSETTING(0x00 , "On line")
+ PORT_DIPSETTING(0x08 , "Local")
+ PORT_DIPSETTING(0x20 , "Diagnostic")
+ PORT_DIPNAME(0x02 , 0x00 , "Floppy present")
+ PORT_DIPSETTING(0x02 , DEF_STR(Yes))
+ PORT_DIPSETTING(0x00 , DEF_STR(No))
+ PORT_DIPNAME(0x01 , 0x01 , "CRT frame frequency")
+ PORT_DIPSETTING(0x01 , "50 Hz")
+ PORT_DIPSETTING(0x00 , "60 Hz")
INPUT_PORTS_END
static GFXLAYOUT_RAW(imds2_charlayout , 8 , 8 , 8 , 64)
static GFXDECODE_START(imds2)
- GFXDECODE_ENTRY("gfx1" , 0x0000 , imds2_charlayout , 0 , 1)
+ GFXDECODE_ENTRY("gfx1" , 0x0000 , imds2_charlayout , 0 , 1)
GFXDECODE_END
static LEGACY_FLOPPY_OPTIONS_START(imds2)
@@ -633,106 +633,106 @@ LEGACY_FLOPPY_OPTIONS_END
static const floppy_interface imds2_floppy_interface =
{
- FLOPPY_STANDARD_8_SSSD,
- LEGACY_FLOPPY_OPTIONS_NAME(imds2),
- "floppy_8"
+ FLOPPY_STANDARD_8_SSSD,
+ LEGACY_FLOPPY_OPTIONS_NAME(imds2),
+ "floppy_8"
};
static MACHINE_CONFIG_START(imds2 , imds2_state)
- MCFG_CPU_ADD("ipccpu" , I8085A , IPC_XTAL_Y2 / 2) // 4 MHz
- MCFG_CPU_PROGRAM_MAP(ipc_mem_map)
- MCFG_CPU_IO_MAP(ipc_io_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("ipcsyspic" , pic8259_device , inta_cb)
- MCFG_QUANTUM_TIME(attotime::from_hz(100))
-
- MCFG_PIC8259_ADD("ipcsyspic" , WRITELINE(imds2_state , imds2_ipc_intr) , VCC , NULL)
- MCFG_PIC8259_ADD("ipclocpic" , DEVWRITELINE("ipcsyspic" , pic8259_device , ir7_w) , VCC , NULL)
-
- MCFG_CPU_ADD("ioccpu" , I8080A , IOC_XTAL_Y2 / 9) // 2.448 MHz
- MCFG_CPU_PROGRAM_MAP(ioc_mem_map)
- MCFG_CPU_IO_MAP(ioc_io_map)
- MCFG_QUANTUM_TIME(attotime::from_hz(100))
-
- // The IOC CRT hw is a bit complex, as the character clock (CCLK) to i8275
- // is varied according to the part of the video frame being scanned and according to
- // the 50/60 Hz option jumper (W8).
- // The basic clock (BCLK) runs at 22.032 MHz.
- // CCLK = BCLK / 14 when in the active region of video
- // CCLK = BCLK / 12 when in horizontal retrace (HRTC=1)
- // CCLK = BCLK / 10 when in horizontal retrace of "short scan lines" (50 Hz only)
- //
- // ***** 50 Hz timings *****
- // 80 chars/row, 26 chars/h. retrace, 11 scan lines/row, 25 active rows, 3 vertical retrace rows
- // Scan line: 80 chars * 14 BCLK + 26 chars * 12 BCLK = 1432 BCLK (64.996 usec)
- // Scan row: 11 * scan lines = 15752 BCLK (714.960 usec)
- // "Short" scan line: 80 chars * 14 BCLK + 26 chars * 10 BCLK = 1380 BCLK (62.636 usec)
- // Frame: 28 scan rows (8 scan lines of 27th row are short): 27 * scan row + 3 * scan line + 8 * short scan line: 440640 BCLK (20 msec)
- //
- // ***** 60 Hz timings *****
- // 80 chars/row, 20 chars/h. retrace, 10 scan lines/row, 25 active rows, 2 vertical retrace rows
- // Scan line: 80 chars * 14 BCLK + 20 chars * 12 BCLK = 1360 BCLK (61.728 usec)
- // Scan row: 10 * scan lines = 13600 BCLK (617.284 usec)
- // Frame: 27 scan rows : 367200 BCLK (16.667 msec)
- //
- // Clock here is semi-bogus: it gives the correct frame frequency at 50 Hz (with the incorrect
- // assumption that CCLK is fixed at BCLK / 14)
- MCFG_DEVICE_ADD("ioccrtc" , I8275 , 22853600 / 14)
- MCFG_I8275_CHARACTER_WIDTH(14)
- MCFG_I8275_DRAW_CHARACTER_CALLBACK_OWNER(imds2_state , crtc_display_pixels)
- MCFG_I8275_DRQ_CALLBACK(DEVWRITELINE("iocdma" , i8257_device , dreq2_w))
- MCFG_I8275_IRQ_CALLBACK(INPUTLINE("ioccpu" , I8085_INTR_LINE))
-
- MCFG_SCREEN_ADD("screen" , RASTER)
- MCFG_SCREEN_UPDATE_DEVICE("ioccrtc" , i8275_device , screen_update)
- MCFG_SCREEN_REFRESH_RATE(50)
- MCFG_GFXDECODE_ADD("gfxdecode" , "palette" , imds2)
- MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette")
-
- MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("iocbeep" , BEEP , 0)
- MCFG_SOUND_ROUTE(ALL_OUTPUTS , "mono" , 1.00)
-
- MCFG_DEVICE_ADD("iocdma" , I8257 , IOC_XTAL_Y2 / 9)
- MCFG_I8257_OUT_HRQ_CB(WRITELINE(imds2_state, imds2_hrq_w))
- MCFG_I8257_IN_MEMR_CB(READ8(imds2_state , imds2_ioc_mem_r))
- MCFG_I8257_OUT_MEMW_CB(WRITE8(imds2_state , imds2_ioc_mem_w))
- MCFG_I8257_IN_IOR_1_CB(DEVREAD8("iocfdc" , i8271_device , dack_r))
- MCFG_I8257_OUT_IOW_1_CB(DEVWRITE8("iocfdc" , i8271_device , dack_w))
- MCFG_I8257_OUT_IOW_2_CB(DEVWRITE8("ioccrtc" , i8275_device , dack_w))
-
- MCFG_DEVICE_ADD("ioctimer" , PIT8253 , 0)
- MCFG_PIT8253_CLK0(IOC_XTAL_Y1 / 4)
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("ioctimer" , pit8253_device , write_clk2));
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(imds2_state , imds2_beep_timer_w));
-
- MCFG_DEVICE_ADD("iocfdc" , I8271 , IOC_XTAL_Y1 / 2)
- MCFG_I8271_DRQ_CALLBACK(DEVWRITELINE("iocdma" , i8257_device , dreq1_w))
- MCFG_I8271_FLOPPIES(FLOPPY_0 , FLOPPY_1)
-
- MCFG_LEGACY_FLOPPY_DRIVE_ADD(FLOPPY_0, imds2_floppy_interface)
-
- MCFG_CPU_ADD("kbcpu", I8741, XTAL_3_579545MHz) /* 3.579545 MHz */
- MCFG_CPU_IO_MAP(kb_io_map)
- MCFG_QUANTUM_TIME(attotime::from_hz(100))
+ MCFG_CPU_ADD("ipccpu" , I8085A , IPC_XTAL_Y2 / 2) // 4 MHz
+ MCFG_CPU_PROGRAM_MAP(ipc_mem_map)
+ MCFG_CPU_IO_MAP(ipc_io_map)
+ MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("ipcsyspic" , pic8259_device , inta_cb)
+ MCFG_QUANTUM_TIME(attotime::from_hz(100))
+
+ MCFG_PIC8259_ADD("ipcsyspic" , WRITELINE(imds2_state , imds2_ipc_intr) , VCC , NULL)
+ MCFG_PIC8259_ADD("ipclocpic" , DEVWRITELINE("ipcsyspic" , pic8259_device , ir7_w) , VCC , NULL)
+
+ MCFG_CPU_ADD("ioccpu" , I8080A , IOC_XTAL_Y2 / 9) // 2.448 MHz
+ MCFG_CPU_PROGRAM_MAP(ioc_mem_map)
+ MCFG_CPU_IO_MAP(ioc_io_map)
+ MCFG_QUANTUM_TIME(attotime::from_hz(100))
+
+ // The IOC CRT hw is a bit complex, as the character clock (CCLK) to i8275
+ // is varied according to the part of the video frame being scanned and according to
+ // the 50/60 Hz option jumper (W8).
+ // The basic clock (BCLK) runs at 22.032 MHz.
+ // CCLK = BCLK / 14 when in the active region of video
+ // CCLK = BCLK / 12 when in horizontal retrace (HRTC=1)
+ // CCLK = BCLK / 10 when in horizontal retrace of "short scan lines" (50 Hz only)
+ //
+ // ***** 50 Hz timings *****
+ // 80 chars/row, 26 chars/h. retrace, 11 scan lines/row, 25 active rows, 3 vertical retrace rows
+ // Scan line: 80 chars * 14 BCLK + 26 chars * 12 BCLK = 1432 BCLK (64.996 usec)
+ // Scan row: 11 * scan lines = 15752 BCLK (714.960 usec)
+ // "Short" scan line: 80 chars * 14 BCLK + 26 chars * 10 BCLK = 1380 BCLK (62.636 usec)
+ // Frame: 28 scan rows (8 scan lines of 27th row are short): 27 * scan row + 3 * scan line + 8 * short scan line: 440640 BCLK (20 msec)
+ //
+ // ***** 60 Hz timings *****
+ // 80 chars/row, 20 chars/h. retrace, 10 scan lines/row, 25 active rows, 2 vertical retrace rows
+ // Scan line: 80 chars * 14 BCLK + 20 chars * 12 BCLK = 1360 BCLK (61.728 usec)
+ // Scan row: 10 * scan lines = 13600 BCLK (617.284 usec)
+ // Frame: 27 scan rows : 367200 BCLK (16.667 msec)
+ //
+ // Clock here is semi-bogus: it gives the correct frame frequency at 50 Hz (with the incorrect
+ // assumption that CCLK is fixed at BCLK / 14)
+ MCFG_DEVICE_ADD("ioccrtc" , I8275 , 22853600 / 14)
+ MCFG_I8275_CHARACTER_WIDTH(14)
+ MCFG_I8275_DRAW_CHARACTER_CALLBACK_OWNER(imds2_state , crtc_display_pixels)
+ MCFG_I8275_DRQ_CALLBACK(DEVWRITELINE("iocdma" , i8257_device , dreq2_w))
+ MCFG_I8275_IRQ_CALLBACK(INPUTLINE("ioccpu" , I8085_INTR_LINE))
+
+ MCFG_SCREEN_ADD("screen" , RASTER)
+ MCFG_SCREEN_UPDATE_DEVICE("ioccrtc" , i8275_device , screen_update)
+ MCFG_SCREEN_REFRESH_RATE(50)
+ MCFG_GFXDECODE_ADD("gfxdecode" , "palette" , imds2)
+ MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette")
+
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("iocbeep" , BEEP , 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS , "mono" , 1.00)
+
+ MCFG_DEVICE_ADD("iocdma" , I8257 , IOC_XTAL_Y2 / 9)
+ MCFG_I8257_OUT_HRQ_CB(WRITELINE(imds2_state, imds2_hrq_w))
+ MCFG_I8257_IN_MEMR_CB(READ8(imds2_state , imds2_ioc_mem_r))
+ MCFG_I8257_OUT_MEMW_CB(WRITE8(imds2_state , imds2_ioc_mem_w))
+ MCFG_I8257_IN_IOR_1_CB(DEVREAD8("iocfdc" , i8271_device , dack_r))
+ MCFG_I8257_OUT_IOW_1_CB(DEVWRITE8("iocfdc" , i8271_device , dack_w))
+ MCFG_I8257_OUT_IOW_2_CB(DEVWRITE8("ioccrtc" , i8275_device , dack_w))
+
+ MCFG_DEVICE_ADD("ioctimer" , PIT8253 , 0)
+ MCFG_PIT8253_CLK0(IOC_XTAL_Y1 / 4)
+ MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("ioctimer" , pit8253_device , write_clk2));
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(imds2_state , imds2_beep_timer_w));
+
+ MCFG_DEVICE_ADD("iocfdc" , I8271 , IOC_XTAL_Y1 / 2)
+ MCFG_I8271_DRQ_CALLBACK(DEVWRITELINE("iocdma" , i8257_device , dreq1_w))
+ MCFG_I8271_FLOPPIES(FLOPPY_0 , FLOPPY_1)
+
+ MCFG_LEGACY_FLOPPY_DRIVE_ADD(FLOPPY_0, imds2_floppy_interface)
+
+ MCFG_CPU_ADD("kbcpu", I8741, XTAL_3_579545MHz) /* 3.579545 MHz */
+ MCFG_CPU_IO_MAP(kb_io_map)
+ MCFG_QUANTUM_TIME(attotime::from_hz(100))
MACHINE_CONFIG_END
ROM_START(imds2)
- // ROM definition of IPC cpu (8085A)
- ROM_REGION(0x1000 , "ipcrom" , 0)
- ROM_LOAD("ipc_a82.bin" , 0x0000 , 0x1000 , CRC(0889394f) SHA1(b7525baf1884a7d67402dea4b5566016a9861ef2))
-
- // ROM definition of IOC cpu (8080A)
- ROM_REGION(0x2000 , "ioccpu" , 0)
- ROM_LOAD("ioc_a50.bin" , 0x0000 , 0x0800 , CRC(d9f926a1) SHA1(bd9d0f7458acc2806120a6dbaab9c48be315b060))
- ROM_LOAD("ioc_a51.bin" , 0x0800 , 0x0800 , CRC(6aa2f86c) SHA1(d3a5314d86e3366545b4c97b29e323dfab383d5f))
- ROM_LOAD("ioc_a52.bin" , 0x1000 , 0x0800 , CRC(b88a38d5) SHA1(934716a1daec852f4d1f846510f42408df0c9584))
- ROM_LOAD("ioc_a53.bin" , 0x1800 , 0x0800 , CRC(c8df4bb9) SHA1(2dfb921e94ae7033a7182457b2f00657674d1b77))
- // ROM definition of keyboard controller (8741)
- ROM_REGION(0x400 , "kbcpu" , 0)
- ROM_LOAD("kbd511.bin" , 0 , 0x400 , CRC(ba7c4303) SHA1(19899af732d0ae1247bfc79979b1ee5f339ee5cf))
- // ROM definition of character generator (2708, A19 on IOC)
- ROM_REGION(0x400 , "gfx1" , 0)
- ROM_LOAD ("ioc_a19.bin" , 0x0000 , 0x0400 , CRC(47487d0f) SHA1(0ed98f9f06622949ee3cc2ffc572fb9702db0f81))
+ // ROM definition of IPC cpu (8085A)
+ ROM_REGION(0x1000 , "ipcrom" , 0)
+ ROM_LOAD("ipc_a82.bin" , 0x0000 , 0x1000 , CRC(0889394f) SHA1(b7525baf1884a7d67402dea4b5566016a9861ef2))
+
+ // ROM definition of IOC cpu (8080A)
+ ROM_REGION(0x2000 , "ioccpu" , 0)
+ ROM_LOAD("ioc_a50.bin" , 0x0000 , 0x0800 , CRC(d9f926a1) SHA1(bd9d0f7458acc2806120a6dbaab9c48be315b060))
+ ROM_LOAD("ioc_a51.bin" , 0x0800 , 0x0800 , CRC(6aa2f86c) SHA1(d3a5314d86e3366545b4c97b29e323dfab383d5f))
+ ROM_LOAD("ioc_a52.bin" , 0x1000 , 0x0800 , CRC(b88a38d5) SHA1(934716a1daec852f4d1f846510f42408df0c9584))
+ ROM_LOAD("ioc_a53.bin" , 0x1800 , 0x0800 , CRC(c8df4bb9) SHA1(2dfb921e94ae7033a7182457b2f00657674d1b77))
+ // ROM definition of keyboard controller (8741)
+ ROM_REGION(0x400 , "kbcpu" , 0)
+ ROM_LOAD("kbd511.bin" , 0 , 0x400 , CRC(ba7c4303) SHA1(19899af732d0ae1247bfc79979b1ee5f339ee5cf))
+ // ROM definition of character generator (2708, A19 on IOC)
+ ROM_REGION(0x400 , "gfx1" , 0)
+ ROM_LOAD ("ioc_a19.bin" , 0x0000 , 0x0400 , CRC(47487d0f) SHA1(0ed98f9f06622949ee3cc2ffc572fb9702db0f81))
ROM_END
/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
diff --git a/src/mess/drivers/mbdtower.c b/src/mess/drivers/mbdtower.c
index 412cbf3a6a7..e9ff39fd798 100644
--- a/src/mess/drivers/mbdtower.c
+++ b/src/mess/drivers/mbdtower.c
@@ -14,7 +14,7 @@
The emulated part is the centerpiece, a black tower with a rotating card
panel and LED digits for displaying health, amount of gold, etc. As far
as MESS is concerned, the game works fine.
-
+
To start up the game, first press [MOVE], the machine now does a self-test.
Then select level and number of players and the game will start. Read the
official manual on how to play the game.
@@ -64,7 +64,7 @@ void mbdtower_state::mbdtower_display()
m_display_maxx = 7;
m_display_maxy = 3;
m_display_segmask[1] = m_display_segmask[2] = 0x7f;
-
+
// update current state
if (~m_r & 0x10)
{
@@ -89,7 +89,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(mbdtower_state::motor_sim_tick)
if (m_motor_on)
{
m_motor_pos = (m_motor_pos - 1) & 0x7f;
-
+
// give it some time to spin out when it's turned off
if (m_r & 0x200)
m_motor_decay += (m_motor_decay < 4);
@@ -105,23 +105,23 @@ TIMER_DEVICE_CALLBACK_MEMBER(mbdtower_state::motor_sim_tick)
m_sensor_blind = false;
else
m_sensor_blind = true;
-
+
// on change, output info
if (m_motor_pos != m_motor_pos_prev)
output_set_value("motor_pos", 100 * (m_motor_pos / (float)0x80));
-
+
/* 3 display cards per hole, like this:
-
+
(0) <---- display increments this way <---- (7)
- CURSED VICTORY WIZARD DRAGON GOLD KEY SCOUT WARRIOR (void)
- LOST WARRIORS BAZAAR CLOSED SWORD SILVER KEY HEALER FOOD (void)
- PLAGUE BRIGANDS KEY MISSING PEGASUS BRASS KEY GOLD BEAST (void)
+ CURSED VICTORY WIZARD DRAGON GOLD KEY SCOUT WARRIOR (void)
+ LOST WARRIORS BAZAAR CLOSED SWORD SILVER KEY HEALER FOOD (void)
+ PLAGUE BRIGANDS KEY MISSING PEGASUS BRASS KEY GOLD BEAST (void)
*/
int card_pos = m_motor_pos >> 4 & 7;
if (card_pos != (m_motor_pos_prev >> 4 & 7))
output_set_value("card_pos", card_pos);
-
+
m_motor_pos_prev = m_motor_pos;
}
@@ -137,7 +137,7 @@ WRITE16_MEMBER(mbdtower_state::write_r)
{
// R0-R2: input mux
m_inp_mux = data & 7;
-
+
// R9: motor on
if ((m_r ^ data) & 0x200)
output_set_value("motor_on", data >> 9 & 1);
@@ -150,7 +150,7 @@ WRITE16_MEMBER(mbdtower_state::write_r)
// R8: rotation sensor led
m_r = data;
mbdtower_display();
-
+
// R10: speaker out
m_speaker->level_w(~data >> 4 & data >> 10 & 1);
}
@@ -182,14 +182,14 @@ READ8_MEMBER(mbdtower_state::read_k)
(green) (l.blue) (red)
[YES/ [REPEAT] [NO/
BUY] END]
-
+
(yellow) (blue) (white)
[HAGGLE] [BAZAAR] [CLEAR]
-
+
(blue) (blue) (blue)
[TOMB/ [MOVE] [SANCTUARY/
RUIN] CITADEL]
-
+
(orange) (blue) (d.yellow)
[DARK [FRONTIER] [INVENTORY]
TOWER]
@@ -233,7 +233,7 @@ void mbdtower_state::machine_start()
m_motor_decay = 0;
m_motor_on = false;
m_sensor_blind = false;
-
+
save_item(NAME(m_motor_pos));
/* save_item(NAME(m_motor_pos_prev)); */ // don't save!
save_item(NAME(m_motor_decay));
diff --git a/src/mess/drivers/snes.c b/src/mess/drivers/snes.c
index aff5e20e5f0..1703d126789 100644
--- a/src/mess/drivers/snes.c
+++ b/src/mess/drivers/snes.c
@@ -1005,9 +1005,9 @@ WRITE8_MEMBER( snes_console_state::pfest94_lo_w )
*************************************/
static ADDRESS_MAP_START( snes_map, AS_PROGRAM, 8, snes_console_state )
-// AM_RANGE(0x000000, 0x7dffff) AM_READWRITE(snes20_lo_r, snes20_lo_w)
+// AM_RANGE(0x000000, 0x7dffff) AM_READWRITE(snes20_lo_r, snes20_lo_w)
AM_RANGE(0x7e0000, 0x7fffff) AM_RAM /* 8KB Low RAM, 24KB High RAM, 96KB Expanded RAM */
-// AM_RANGE(0x800000, 0xffffff) AM_READWRITE(snes20_hi_r, snes20_hi_w)
+// AM_RANGE(0x800000, 0xffffff) AM_READWRITE(snes20_hi_r, snes20_hi_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( spc_map, AS_PROGRAM, 8, snes_console_state )
@@ -1196,7 +1196,7 @@ void snes_console_state::machine_start()
m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x000000, 0x7dffff, read8_delegate(FUNC(snes_console_state::snes20_lo_r),this), write8_delegate(FUNC(snes_console_state::snes20_lo_w),this));
m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x800000, 0xffffff, read8_delegate(FUNC(snes_console_state::snes20_hi_r),this), write8_delegate(FUNC(snes_console_state::snes20_hi_w),this));
m_maincpu->set_5a22_map();
-
+
m_type = m_cartslot->get_type();
switch (m_type)
diff --git a/src/mess/drivers/ticalc1x.c b/src/mess/drivers/ticalc1x.c
index 37d90600162..eb7ee44940e 100644
--- a/src/mess/drivers/ticalc1x.c
+++ b/src/mess/drivers/ticalc1x.c
@@ -59,8 +59,8 @@ public:
int m_display_wait; // led/lamp off-delay in microseconds (default 33ms)
int m_display_maxy; // display matrix number of rows
int m_display_maxx; // display matrix number of columns
-
- UINT32 m_display_state[0x20]; // display matrix rows data
+
+ UINT32 m_display_state[0x20]; // display matrix rows data
UINT16 m_display_segmask[0x20]; // if not 0, display matrix row is a digit, mask indicates connected segments
UINT32 m_display_cache[0x20]; // (internal use)
UINT8 m_display_decay[0x20][0x20]; // (internal use)
@@ -68,7 +68,7 @@ public:
TIMER_DEVICE_CALLBACK_MEMBER(display_decay_tick);
void display_update();
void display_matrix_seg(int maxx, int maxy, UINT32 setx, UINT32 sety, UINT16 segmask);
-
+
// calculator-specific handlers
void tisr16_display();
DECLARE_WRITE16_MEMBER(tisr16_write_o);
@@ -105,7 +105,7 @@ void ticalc1x_state::machine_start()
memset(m_display_cache, ~0, sizeof(m_display_cache));
memset(m_display_decay, 0, sizeof(m_display_decay));
memset(m_display_segmask, ~0, sizeof(m_display_segmask)); // !
-
+
m_o = 0;
m_r = 0;
m_inp_mux = 0;
@@ -193,7 +193,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(ticalc1x_state::display_decay_tick)
for (int x = 0; x < m_display_maxx; x++)
if (m_display_decay[y][x] != 0)
m_display_decay[y][x]--;
-
+
display_update();
}
@@ -209,7 +209,7 @@ void ticalc1x_state::display_matrix_seg(int maxx, int maxy, UINT32 setx, UINT32
m_display_segmask[y] &= segmask;
m_display_state[y] = (sety >> y & 1) ? (setx & colmask) : 0;
}
-
+
display_update();
}
@@ -482,11 +482,11 @@ WRITE16_MEMBER(ticalc1x_state::wizatron_write_r)
// \./ GAB
// --- F
// /.\ EDC
-
+
// 3rd digit only has A and G for =, though some newer hardware revisions
// (goes for both wizatron and lilprof) use a custom equals-sign digit here
m_display_segmask[3] = 0x41;
-
+
// R0-R8: select digit (right-to-left)
display_matrix_seg(7, 9, m_o, data, 0x7f);
}
@@ -557,7 +557,7 @@ MACHINE_CONFIG_END
TI Little Professor (1976 version)
* TMS0970 MCU labeled TMS0975NL ZA0356, GP0975CS. die labeled 0970D-75C
-
+
The hardware is nearly identical to Wiz-A-Tron (or vice versa, since this
one is older).
@@ -631,7 +631,7 @@ WRITE16_MEMBER(ticalc1x_state::lilprof78_write_r)
// 3rd digit A/G(equals sign) is from O7
m_display_state[3] = (m_o & 0x80) ? 0x41 : 0;
-
+
// 6th digit is a custom 7seg for math symbols (see wizatron_write_r)
m_display_state[6] = BITSWAP8(m_display_state[6],7,6,1,4,2,3,5,0);
diff --git a/src/mess/drivers/tispeak.c b/src/mess/drivers/tispeak.c
index cc2b432106f..cdacaf54b9b 100644
--- a/src/mess/drivers/tispeak.c
+++ b/src/mess/drivers/tispeak.c
@@ -326,8 +326,8 @@ public:
int m_display_wait; // led/lamp off-delay in microseconds (default 33ms)
int m_display_maxy; // display matrix number of rows
int m_display_maxx; // display matrix number of columns
-
- UINT32 m_display_state[0x20]; // display matrix rows data
+
+ UINT32 m_display_state[0x20]; // display matrix rows data
UINT16 m_display_segmask[0x20]; // if not 0, display matrix row is a digit, mask indicates connected segments
UINT32 m_display_cache[0x20]; // (internal use)
UINT8 m_display_decay[0x20][0x20]; // (internal use)
@@ -454,7 +454,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(tispeak_state::display_decay_tick)
for (int x = 0; x < m_display_maxx; x++)
if (m_display_decay[y][x] != 0)
m_display_decay[y][x]--;
-
+
display_update();
}
@@ -470,7 +470,7 @@ void tispeak_state::display_matrix_seg(int maxx, int maxy, UINT32 setx, UINT32 s
m_display_segmask[y] &= segmask;
m_display_state[y] = (sety >> y & 1) ? (setx & colmask) : 0;
}
-
+
display_update();
}
@@ -501,7 +501,7 @@ WRITE16_MEMBER(tispeak_state::snspell_write_r)
{
// R15: filament on
m_filament_on = data & 0x8000;
-
+
// R13: power-off request, on falling edge
if ((m_r >> 13 & 1) && !(data >> 13 & 1))
power_off();
diff --git a/src/mess/includes/hh_tms1k.h b/src/mess/includes/hh_tms1k.h
index 1e10012bce0..1ab7b2cce90 100644
--- a/src/mess/includes/hh_tms1k.h
+++ b/src/mess/includes/hh_tms1k.h
@@ -32,7 +32,7 @@ public:
required_device<cpu_device> m_maincpu;
optional_ioport_array<7> m_inp_matrix; // max 7
optional_device<speaker_sound_device> m_speaker;
-
+
// misc common
UINT16 m_r; // MCU R-pins data
UINT16 m_o; // MCU O-pins data
@@ -47,8 +47,8 @@ public:
int m_display_wait; // led/lamp off-delay in microseconds (default 33ms)
int m_display_maxy; // display matrix number of rows
int m_display_maxx; // display matrix number of columns
-
- UINT32 m_display_state[0x20]; // display matrix rows data
+
+ UINT32 m_display_state[0x20]; // display matrix rows data
UINT16 m_display_segmask[0x20]; // if not 0, display matrix row is a digit, mask indicates connected segments
UINT32 m_display_cache[0x20]; // (internal use)
UINT8 m_display_decay[0x20][0x20]; // (internal use)
diff --git a/src/mess/includes/imds2.h b/src/mess/includes/imds2.h
index 62887b4b34e..5fb1b513ecf 100644
--- a/src/mess/includes/imds2.h
+++ b/src/mess/includes/imds2.h
@@ -18,105 +18,105 @@
class imds2_state : public driver_device
{
- public:
- imds2_state(const machine_config &mconfig, device_type type, const char *tag);
-
- DECLARE_READ8_MEMBER(ipc_mem_read);
- DECLARE_WRITE8_MEMBER(ipc_mem_write);
- DECLARE_WRITE8_MEMBER(imds2_ipc_control_w);
- DECLARE_WRITE_LINE_MEMBER(imds2_ipc_intr);
- DECLARE_READ8_MEMBER(imds2_ipcsyspic_r);
- DECLARE_READ8_MEMBER(imds2_ipclocpic_r);
- DECLARE_WRITE8_MEMBER(imds2_ipcsyspic_w);
- DECLARE_WRITE8_MEMBER(imds2_ipclocpic_w);
-
- DECLARE_WRITE8_MEMBER(imds2_miscout_w);
- DECLARE_READ8_MEMBER(imds2_miscin_r);
- DECLARE_WRITE_LINE_MEMBER(imds2_beep_timer_w);
- DECLARE_WRITE8_MEMBER(imds2_start_timer_w);
- DECLARE_READ8_MEMBER(imds2_kb_read);
- DECLARE_READ8_MEMBER(imds2_kb_port_p2_r);
- DECLARE_WRITE8_MEMBER(imds2_kb_port_p1_w);
- DECLARE_READ8_MEMBER(imds2_kb_port_t0_r);
- DECLARE_READ8_MEMBER(imds2_kb_port_t1_r);
- DECLARE_WRITE8_MEMBER(imds2_ioc_dbbout_w);
- DECLARE_WRITE8_MEMBER(imds2_ioc_f0_w);
- DECLARE_WRITE8_MEMBER(imds2_ioc_set_f1_w);
- DECLARE_WRITE8_MEMBER(imds2_ioc_reset_f1_w);
- DECLARE_READ8_MEMBER(imds2_ioc_status_r);
- DECLARE_READ8_MEMBER(imds2_ioc_dbbin_r);
- DECLARE_READ8_MEMBER(imds2_ipc_dbbout_r);
- DECLARE_READ8_MEMBER(imds2_ipc_status_r);
- DECLARE_WRITE8_MEMBER(imds2_ipc_dbbin_data_w);
- DECLARE_WRITE8_MEMBER(imds2_ipc_dbbin_cmd_w);
- DECLARE_WRITE_LINE_MEMBER(imds2_hrq_w);
-
- DECLARE_READ8_MEMBER(imds2_ioc_mem_r);
- DECLARE_WRITE8_MEMBER(imds2_ioc_mem_w);
-
- I8275_DRAW_CHARACTER_MEMBER(crtc_display_pixels);
-
- virtual void driver_start();
- virtual void machine_start();
- virtual void video_start();
- virtual void machine_reset();
-
- private:
- required_device<i8085a_cpu_device> m_ipccpu;
- required_device<pic8259_device> m_ipcsyspic;
- required_device<pic8259_device> m_ipclocpic;
- required_device<i8080a_cpu_device> m_ioccpu;
- required_device<i8257_device> m_iocdma;
- required_device<i8275_device> m_ioccrtc;
- required_device<beep_device> m_iocbeep;
- required_device<pit8253_device> m_ioctimer;
- required_device<i8271_device> m_iocfdc;
- required_device<i8741_device> m_kbcpu;
- required_device<palette_device> m_palette;
- required_device<gfxdecode_device> m_gfxdecode;
- required_device<legacy_floppy_image_device> m_floppy0;
- required_ioport m_io_key0;
- required_ioport m_io_key1;
- required_ioport m_io_key2;
- required_ioport m_io_key3;
- required_ioport m_io_key4;
- required_ioport m_io_key5;
- required_ioport m_io_key6;
- required_ioport m_io_key7;
- required_ioport m_ioc_options;
-
- dynamic_array<UINT8> m_ipc_ram;
-
- bool imds2_in_ipc_rom(offs_t offset) const;
-
- void imds2_update_beeper(void);
-
- // IPC control port
- UINT8 m_ipc_control;
-
- // IPC ROM content
- const UINT8 *m_ipc_rom;
-
- // Character generator
- const UINT8 *m_chargen;
-
- // MISCOUT state
- UINT8 m_miscout;
-
- // Beeper timer line
- int m_beeper_timer;
-
- // Keyboard state
- UINT8 m_kb_p1;
-
- // IPC to IOC buffer
- UINT8 m_ioc_ibf;
-
- // IOC to IPC buffer
- UINT8 m_ioc_obf;
-
- // IPC/IOC status
- UINT8 m_ipc_ioc_status;
+ public:
+ imds2_state(const machine_config &mconfig, device_type type, const char *tag);
+
+ DECLARE_READ8_MEMBER(ipc_mem_read);
+ DECLARE_WRITE8_MEMBER(ipc_mem_write);
+ DECLARE_WRITE8_MEMBER(imds2_ipc_control_w);
+ DECLARE_WRITE_LINE_MEMBER(imds2_ipc_intr);
+ DECLARE_READ8_MEMBER(imds2_ipcsyspic_r);
+ DECLARE_READ8_MEMBER(imds2_ipclocpic_r);
+ DECLARE_WRITE8_MEMBER(imds2_ipcsyspic_w);
+ DECLARE_WRITE8_MEMBER(imds2_ipclocpic_w);
+
+ DECLARE_WRITE8_MEMBER(imds2_miscout_w);
+ DECLARE_READ8_MEMBER(imds2_miscin_r);
+ DECLARE_WRITE_LINE_MEMBER(imds2_beep_timer_w);
+ DECLARE_WRITE8_MEMBER(imds2_start_timer_w);
+ DECLARE_READ8_MEMBER(imds2_kb_read);
+ DECLARE_READ8_MEMBER(imds2_kb_port_p2_r);
+ DECLARE_WRITE8_MEMBER(imds2_kb_port_p1_w);
+ DECLARE_READ8_MEMBER(imds2_kb_port_t0_r);
+ DECLARE_READ8_MEMBER(imds2_kb_port_t1_r);
+ DECLARE_WRITE8_MEMBER(imds2_ioc_dbbout_w);
+ DECLARE_WRITE8_MEMBER(imds2_ioc_f0_w);
+ DECLARE_WRITE8_MEMBER(imds2_ioc_set_f1_w);
+ DECLARE_WRITE8_MEMBER(imds2_ioc_reset_f1_w);
+ DECLARE_READ8_MEMBER(imds2_ioc_status_r);
+ DECLARE_READ8_MEMBER(imds2_ioc_dbbin_r);
+ DECLARE_READ8_MEMBER(imds2_ipc_dbbout_r);
+ DECLARE_READ8_MEMBER(imds2_ipc_status_r);
+ DECLARE_WRITE8_MEMBER(imds2_ipc_dbbin_data_w);
+ DECLARE_WRITE8_MEMBER(imds2_ipc_dbbin_cmd_w);
+ DECLARE_WRITE_LINE_MEMBER(imds2_hrq_w);
+
+ DECLARE_READ8_MEMBER(imds2_ioc_mem_r);
+ DECLARE_WRITE8_MEMBER(imds2_ioc_mem_w);
+
+ I8275_DRAW_CHARACTER_MEMBER(crtc_display_pixels);
+
+ virtual void driver_start();
+ virtual void machine_start();
+ virtual void video_start();
+ virtual void machine_reset();
+
+ private:
+ required_device<i8085a_cpu_device> m_ipccpu;
+ required_device<pic8259_device> m_ipcsyspic;
+ required_device<pic8259_device> m_ipclocpic;
+ required_device<i8080a_cpu_device> m_ioccpu;
+ required_device<i8257_device> m_iocdma;
+ required_device<i8275_device> m_ioccrtc;
+ required_device<beep_device> m_iocbeep;
+ required_device<pit8253_device> m_ioctimer;
+ required_device<i8271_device> m_iocfdc;
+ required_device<i8741_device> m_kbcpu;
+ required_device<palette_device> m_palette;
+ required_device<gfxdecode_device> m_gfxdecode;
+ required_device<legacy_floppy_image_device> m_floppy0;
+ required_ioport m_io_key0;
+ required_ioport m_io_key1;
+ required_ioport m_io_key2;
+ required_ioport m_io_key3;
+ required_ioport m_io_key4;
+ required_ioport m_io_key5;
+ required_ioport m_io_key6;
+ required_ioport m_io_key7;
+ required_ioport m_ioc_options;
+
+ dynamic_array<UINT8> m_ipc_ram;
+
+ bool imds2_in_ipc_rom(offs_t offset) const;
+
+ void imds2_update_beeper(void);
+
+ // IPC control port
+ UINT8 m_ipc_control;
+
+ // IPC ROM content
+ const UINT8 *m_ipc_rom;
+
+ // Character generator
+ const UINT8 *m_chargen;
+
+ // MISCOUT state
+ UINT8 m_miscout;
+
+ // Beeper timer line
+ int m_beeper_timer;
+
+ // Keyboard state
+ UINT8 m_kb_p1;
+
+ // IPC to IOC buffer
+ UINT8 m_ioc_ibf;
+
+ // IOC to IPC buffer
+ UINT8 m_ioc_obf;
+
+ // IPC/IOC status
+ UINT8 m_ipc_ioc_status;
};
#endif /* _IMDS2_H_ */
diff --git a/src/mess/layout/mbdtower.lay b/src/mess/layout/mbdtower.lay
index 98bbfc231a4..7dc9b1b61e7 100644
--- a/src/mess/layout/mbdtower.lay
+++ b/src/mess/layout/mbdtower.lay
@@ -22,7 +22,7 @@
<text state="6" string="WARRIOR"><color red="0.0" green="0.0" blue="0.0" /></text>
<text state="7" string=" "><color red="0.0" green="0.0" blue="0.0" /></text>
</element>
-
+
<element name="card2" defstate="0">
<rect><color red="1.0" green="1.0" blue="1.0" /></rect>
<text state="0" string="LOST"><color red="0.0" green="0.0" blue="0.0" /></text>
@@ -76,7 +76,7 @@
<bezel name="digit1" element="digit"><bounds x="10" y="3" width="10" height="15" /></bezel>
<bezel name="digit2" element="digit"><bounds x="20" y="3" width="10" height="15" /></bezel>
-
+
<!-- card lamps -->
<bezel element="static_white"><bounds x="1" y="28" width="38" height="25" /></bezel>
diff --git a/src/mess/mess.mak b/src/mess/mess.mak
index 69845afe992..bac7f3487c0 100644
--- a/src/mess/mess.mak
+++ b/src/mess/mess.mak
@@ -1335,7 +1335,7 @@ $(MESSOBJ)/intel.a: \
$(MESS_DRIVERS)/rex6000.o \
$(MESS_DRIVERS)/sdk85.o \
$(MESS_DRIVERS)/sdk86.o \
- $(MESS_DRIVERS)/imds2.o \
+ $(MESS_DRIVERS)/imds2.o \
$(MESSOBJ)/imp.a: \
$(MESS_DRIVERS)/tim011.o \
@@ -2137,22 +2137,22 @@ $(MESS_DRIVERS)/h8.o: $(MESS_LAYOUT)/h8.lh
$(MESS_DRIVERS)/hh_hmcs40.o:$(MESS_LAYOUT)/hh_hmcs40_test.lh
$(MESS_DRIVERS)/hh_pic16.o: $(MESS_LAYOUT)/maniac.lh
$(MESS_DRIVERS)/hh_tms1k.o: $(MESS_LAYOUT)/amaztron.lh \
- $(MESS_LAYOUT)/bankshot.lh \
- $(MESS_LAYOUT)/cnsector.lh \
- $(MESS_LAYOUT)/comp4.lh \
- $(MESS_LAYOUT)/ebball.lh \
- $(MESS_LAYOUT)/ebball2.lh \
- $(MESS_LAYOUT)/ebball3.lh \
- $(MESS_LAYOUT)/elecdet.lh \
- $(MESS_LAYOUT)/mathmagi.lh \
- $(MESS_LAYOUT)/merlin.lh \
- $(MESS_LAYOUT)/simon.lh \
- $(MESS_LAYOUT)/ssimon.lh \
- $(MESS_LAYOUT)/splitsec.lh \
- $(MESS_LAYOUT)/starwbc.lh \
- $(MESS_LAYOUT)/stopthie.lh \
- $(MESS_LAYOUT)/tandy12.lh \
- $(MESS_LAYOUT)/tc4.lh
+ $(MESS_LAYOUT)/bankshot.lh \
+ $(MESS_LAYOUT)/cnsector.lh \
+ $(MESS_LAYOUT)/comp4.lh \
+ $(MESS_LAYOUT)/ebball.lh \
+ $(MESS_LAYOUT)/ebball2.lh \
+ $(MESS_LAYOUT)/ebball3.lh \
+ $(MESS_LAYOUT)/elecdet.lh \
+ $(MESS_LAYOUT)/mathmagi.lh \
+ $(MESS_LAYOUT)/merlin.lh \
+ $(MESS_LAYOUT)/simon.lh \
+ $(MESS_LAYOUT)/ssimon.lh \
+ $(MESS_LAYOUT)/splitsec.lh \
+ $(MESS_LAYOUT)/starwbc.lh \
+ $(MESS_LAYOUT)/stopthie.lh \
+ $(MESS_LAYOUT)/tandy12.lh \
+ $(MESS_LAYOUT)/tc4.lh
$(MESS_DRIVERS)/hh_ucom4.o: $(MESS_LAYOUT)/hh_ucom4_test.lh
$(MESS_DRIVERS)/ie15.o: $(MESS_LAYOUT)/ie15.lh
$(MESS_DRIVERS)/instruct.o: $(MESS_LAYOUT)/instruct.lh
diff --git a/src/osd/modules/opengl/osd_opengl.h b/src/osd/modules/opengl/osd_opengl.h
index 829cad43bf5..a0084ebdb6d 100644
--- a/src/osd/modules/opengl/osd_opengl.h
+++ b/src/osd/modules/opengl/osd_opengl.h
@@ -61,11 +61,11 @@
virtual const char *LastErrorMsg() = 0;
virtual void *getProcAddress(const char *proc) = 0;
/*
- * 0 for immediate updates,
- * 1 for updates synchronized with the vertical retrace,
- * -1 for late swap tearing
+ * 0 for immediate updates,
+ * 1 for updates synchronized with the vertical retrace,
+ * -1 for late swap tearing
*
- * returns -1 if swap interval is not supported
+ * returns -1 if swap interval is not supported
*
*/
virtual int SetSwapInterval(const int swap) = 0;
@@ -99,7 +99,7 @@
#undef GET_GLFUNC
};
#ifdef _MSC_VER
- }
+ }
#endif
#undef OSD_GL
diff --git a/src/osd/modules/osdwindow.h b/src/osd/modules/osdwindow.h
index 993866984a2..edafeb303ca 100644
--- a/src/osd/modules/osdwindow.h
+++ b/src/osd/modules/osdwindow.h
@@ -78,9 +78,9 @@ public:
#endif
render_primitive_list *m_primlist;
- osd_window_config m_win_config;
+ osd_window_config m_win_config;
protected:
- int m_prescale;
+ int m_prescale;
};
class osd_renderer
@@ -131,7 +131,7 @@ protected:
private:
osd_window *m_window;
- int m_flags;
+ int m_flags;
};
diff --git a/src/osd/modules/render/draw13.c b/src/osd/modules/render/draw13.c
index acc64a1f982..fb52a725562 100644
--- a/src/osd/modules/render/draw13.c
+++ b/src/osd/modules/render/draw13.c
@@ -118,7 +118,7 @@ public:
private:
Uint32 m_sdl_access;
- sdl_info13 * m_renderer;
+ sdl_info13 * m_renderer;
render_texinfo m_texinfo; // copy of the texture info
HashT m_hash; // hash value for the texture (must be >= pointer size)
UINT32 m_flags; // rendering flags
diff --git a/src/osd/modules/render/drawogl.c b/src/osd/modules/render/drawogl.c
index 328310ba9c6..4a3bf4d1e45 100644
--- a/src/osd/modules/render/drawogl.c
+++ b/src/osd/modules/render/drawogl.c
@@ -281,50 +281,50 @@ private:
int setupPixelFormat(HDC hDC)
{
- PIXELFORMATDESCRIPTOR pfd = {
- sizeof(PIXELFORMATDESCRIPTOR), /* size */
- 1, /* version */
- PFD_SUPPORT_OPENGL |
- PFD_DRAW_TO_WINDOW |
- PFD_DOUBLEBUFFER, /* support double-buffering */
- PFD_TYPE_RGBA, /* color type */
- 32, /* prefered color depth */
- 0, 0, 0, 0, 0, 0, /* color bits (ignored) */
- 0, /* no alpha buffer */
- 0, /* alpha bits (ignored) */
- 0, /* no accumulation buffer */
- 0, 0, 0, 0, /* accum bits (ignored) */
- 16, /* depth buffer */
- 0, /* no stencil buffer */
- 0, /* no auxiliary buffers */
- PFD_MAIN_PLANE, /* main layer */
- 0, /* reserved */
- 0, 0, 0, /* no layer, visible, damage masks */
- };
- int pixelFormat;
-
- pixelFormat = ChoosePixelFormat(hDC, &pfd);
- if (pixelFormat == 0) {
- strcpy(m_error, "ChoosePixelFormat failed");
- return 1;
- }
-
- if (SetPixelFormat(hDC, pixelFormat, &pfd) != TRUE) {
- strcpy(m_error, "SetPixelFormat failed.");
- return 1;
- }
- return 0;
+ PIXELFORMATDESCRIPTOR pfd = {
+ sizeof(PIXELFORMATDESCRIPTOR), /* size */
+ 1, /* version */
+ PFD_SUPPORT_OPENGL |
+ PFD_DRAW_TO_WINDOW |
+ PFD_DOUBLEBUFFER, /* support double-buffering */
+ PFD_TYPE_RGBA, /* color type */
+ 32, /* prefered color depth */
+ 0, 0, 0, 0, 0, 0, /* color bits (ignored) */
+ 0, /* no alpha buffer */
+ 0, /* alpha bits (ignored) */
+ 0, /* no accumulation buffer */
+ 0, 0, 0, 0, /* accum bits (ignored) */
+ 16, /* depth buffer */
+ 0, /* no stencil buffer */
+ 0, /* no auxiliary buffers */
+ PFD_MAIN_PLANE, /* main layer */
+ 0, /* reserved */
+ 0, 0, 0, /* no layer, visible, damage masks */
+ };
+ int pixelFormat;
+
+ pixelFormat = ChoosePixelFormat(hDC, &pfd);
+ if (pixelFormat == 0) {
+ strcpy(m_error, "ChoosePixelFormat failed");
+ return 1;
+ }
+
+ if (SetPixelFormat(hDC, pixelFormat, &pfd) != TRUE) {
+ strcpy(m_error, "SetPixelFormat failed.");
+ return 1;
+ }
+ return 0;
}
bool WGLExtensionSupported(const char *extension_name)
{
- //if (pfn_wglGetExtensionsStringEXT != NULL)
- // printf("%s\n", this->pfn_wglGetExtensionsStringEXT());
+ //if (pfn_wglGetExtensionsStringEXT != NULL)
+ // printf("%s\n", this->pfn_wglGetExtensionsStringEXT());
- if (pfn_wglGetExtensionsStringEXT != NULL && strstr(pfn_wglGetExtensionsStringEXT(), extension_name) != NULL)
- return true;
- else
- return false;
+ if (pfn_wglGetExtensionsStringEXT != NULL && strstr(pfn_wglGetExtensionsStringEXT(), extension_name) != NULL)
+ return true;
+ else
+ return false;
}
HGLRC m_context;
@@ -589,7 +589,7 @@ private:
int m_height;
osd_dim m_blit_dim;
- osd_gl_context *m_gl_context;
+ osd_gl_context *m_gl_context;
int m_initialized; // is everything well initialized, i.e. all GL stuff etc.
// 3D info (GL mode only)
diff --git a/src/osd/sdl/sdl.mak b/src/osd/sdl/sdl.mak
index 2f188762da5..7f2de3c4300 100644
--- a/src/osd/sdl/sdl.mak
+++ b/src/osd/sdl/sdl.mak
@@ -429,7 +429,7 @@ OBJDIRS += $(SDLOBJ) \
$(OSDOBJ)/modules/netdev \
$(OSDOBJ)/modules/opengl \
$(OSDOBJ)/modules/render
-
+
#-------------------------------------------------
# OSD core library
#-------------------------------------------------
@@ -827,7 +827,7 @@ OSDOBJS += \
$(OSDOBJ)/modules/render/drawogl.o \
$(OSDOBJ)/modules/opengl/gl_shader_tool.o \
$(OSDOBJ)/modules/opengl/gl_shader_mgr.o
-
+
DEFS += -DUSE_OPENGL=1
ifeq ($(USE_DISPATCH_GL),1)
DEFS += -DUSE_DISPATCH_GL=1
diff --git a/src/osd/sdl/video.h b/src/osd/sdl/video.h
index 4a3d8b69f9d..913116f6b62 100644
--- a/src/osd/sdl/video.h
+++ b/src/osd/sdl/video.h
@@ -131,9 +131,9 @@ public:
osd_monitor_info *m_next; // pointer to next monitor in list
protected:
virtual void refresh() = 0;
- osd_rect m_pos_size;
- osd_rect m_usuable_pos_size;
- bool m_is_primary;
+ osd_rect m_pos_size;
+ osd_rect m_usuable_pos_size;
+ bool m_is_primary;
char m_name[64];
private:
@@ -185,7 +185,7 @@ struct osd_video_config
int syncrefresh; // sync only to refresh rate
int switchres; // switch resolutions
- int fullstretch; // FXIME: implement in windows!
+ int fullstretch; // FXIME: implement in windows!
// ddraw options
int hwstretch; // stretch using the hardware
diff --git a/src/osd/sdl/window.c b/src/osd/sdl/window.c
index 2f183ef447b..b41bf3bc7e5 100644
--- a/src/osd/sdl/window.c
+++ b/src/osd/sdl/window.c
@@ -1153,8 +1153,8 @@ OSDWORK_CALLBACK( sdl_window_info::complete_create_wt )
#ifdef SDLMAME_MACOSX
/* FIMXE: On OSX, SDL_WINDOW_FULLSCREEN_DESKTOP seems to be more reliable.
- * It however creates issues with white borders, i.e. the screen clear
- * does not work. This happens both with opengl and accel.
+ * It however creates issues with white borders, i.e. the screen clear
+ * does not work. This happens both with opengl and accel.
*/
#endif
diff --git a/src/osd/windows/video.h b/src/osd/windows/video.h
index ba00c6bf368..87ce0d8527c 100644
--- a/src/osd/windows/video.h
+++ b/src/osd/windows/video.h
@@ -131,9 +131,9 @@ public:
osd_monitor_info *m_next; // pointer to next monitor in list
protected:
virtual void refresh() = 0;
- osd_rect m_pos_size;
- osd_rect m_usuable_pos_size;
- bool m_is_primary;
+ osd_rect m_pos_size;
+ osd_rect m_usuable_pos_size;
+ bool m_is_primary;
char m_name[64];
private:
@@ -175,7 +175,7 @@ struct osd_video_config
int syncrefresh; // sync only to refresh rate
int switchres; // switch resolutions
- int fullstretch; // FXIME: implement in windows!
+ int fullstretch; // FXIME: implement in windows!
// ddraw options
int hwstretch; // stretch using the hardware
diff --git a/src/osd/windows/windows.mak b/src/osd/windows/windows.mak
index 53d8be9518a..633ae52b7b9 100644
--- a/src/osd/windows/windows.mak
+++ b/src/osd/windows/windows.mak
@@ -406,9 +406,9 @@ OSDOBJS += \
$(OSDOBJ)/modules/render/drawogl.o \
$(OSDOBJ)/modules/opengl/gl_shader_tool.o \
$(OSDOBJ)/modules/opengl/gl_shader_mgr.o
-
+
OBJDIRS += \
- $(OSDOBJ)/modules/opengl
+ $(OSDOBJ)/modules/opengl
DEFS += -DUSE_OPENGL=1
diff --git a/src/version.c b/src/version.c
index 5707b25f031..da26f7e0bbe 100644
--- a/src/version.c
+++ b/src/version.c
@@ -8,7 +8,7 @@
***************************************************************************/
-#define BARE_BUILD_VERSION "0.159"
+#define BARE_BUILD_VERSION "0.160"
extern const char bare_build_version[];
extern const char build_version[];