summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatarGravatar Miodrag Milanovic <mmicko@gmail.com>2015-02-25 08:09:13 +0100
committerGravatarGravatar Miodrag Milanovic <mmicko@gmail.com>2015-02-25 08:09:13 +0100
commit6ae44e46f91aa2bd74d9895e6bfd345baebd3d22 (patch)
tree70be3ad6f499bb138c0335e8d2d16790f6f971b3
parent33c8d18d612786130c2baafd644604137f6f4ef8 (diff)
Cleanups and version bumpmame0159
-rw-r--r--src/emu/bus/a2bus/a2bus.h2
-rw-r--r--src/emu/bus/cpc/smartwatch.c12
-rw-r--r--src/emu/bus/cpc/smartwatch.h12
-rw-r--r--src/emu/bus/nes_ctrl/bcbattle.c2
-rw-r--r--src/emu/bus/nes_ctrl/miracle.c17
-rw-r--r--src/emu/bus/snes_ctrl/bcbattle.c24
-rw-r--r--src/emu/bus/snes_ctrl/bcbattle.h2
-rw-r--r--src/emu/bus/snes_ctrl/ctrl.h4
-rw-r--r--src/emu/bus/snes_ctrl/joypad.c5
-rw-r--r--src/emu/bus/snes_ctrl/joypad.h2
-rw-r--r--src/emu/bus/snes_ctrl/miracle.c23
-rw-r--r--src/emu/bus/snes_ctrl/mouse.c19
-rw-r--r--src/emu/bus/snes_ctrl/mouse.h2
-rw-r--r--src/emu/bus/snes_ctrl/multitap.c4
-rw-r--r--src/emu/bus/snes_ctrl/pachinko.c6
-rw-r--r--src/emu/bus/snes_ctrl/sscope.c21
-rw-r--r--src/emu/bus/snes_ctrl/sscope.h2
-rw-r--r--src/emu/bus/snes_ctrl/twintap.c10
-rw-r--r--src/emu/cpu/amis2000/amis2000.c10
-rw-r--r--src/emu/cpu/amis2000/amis2000.h10
-rw-r--r--src/emu/cpu/amis2000/amis2000d.c6
-rw-r--r--src/emu/cpu/amis2000/amis2000op.inc4
-rw-r--r--src/emu/cpu/i386/i386ops.h2
-rw-r--r--src/emu/cpu/m6502/m4510.c2
-rw-r--r--src/emu/cpu/m68000/m68000.h2
-rw-r--r--src/emu/cpu/m68000/m68kcpu.h4
-rw-r--r--src/emu/cpu/ucom4/ucom4.c24
-rw-r--r--src/emu/cpu/ucom4/ucom4.h4
-rw-r--r--src/emu/cpu/ucom4/ucom4d.c4
-rw-r--r--src/emu/cpu/ucom4/ucom4op.inc50
-rw-r--r--src/emu/debug/dvbpoints.c4
-rw-r--r--src/emu/debug/dvwpoints.c4
-rw-r--r--src/emu/drivers/xtal.h2
-rw-r--r--src/emu/fileio.h4
-rw-r--r--src/emu/machine/jvshost.c14
-rw-r--r--src/emu/render.h2
-rw-r--r--src/emu/sound/saa1099.c6
-rw-r--r--src/emu/video.c2
-rw-r--r--src/emu/video/scn2674.c20
-rw-r--r--src/emu/video/scn2674.h4
-rw-r--r--src/lib/formats/ap2_dsk.c2
-rw-r--r--src/lib/lib.mak22
-rw-r--r--src/mame/audio/seibu.c2
-rw-r--r--src/mame/audio/t5182.c4
-rw-r--r--src/mame/audio/t5182.h2
-rw-r--r--src/mame/drivers/armedf.c12
-rw-r--r--src/mame/drivers/bnstars.c2
-rw-r--r--src/mame/drivers/comebaby.c54
-rw-r--r--src/mame/drivers/cops.c12
-rw-r--r--src/mame/drivers/cps2.c2
-rw-r--r--src/mame/drivers/cyclemb.c6
-rw-r--r--src/mame/drivers/d9final.c12
-rw-r--r--src/mame/drivers/darkmist.c2
-rw-r--r--src/mame/drivers/dlair2.c4
-rw-r--r--src/mame/drivers/dreambal.c2
-rw-r--r--src/mame/drivers/exidyttl.c2
-rw-r--r--src/mame/drivers/expro02.c40
-rw-r--r--src/mame/drivers/fuukifg3.c2
-rw-r--r--src/mame/drivers/galivan.c4
-rw-r--r--src/mame/drivers/galpani2.c2
-rw-r--r--src/mame/drivers/galpani3.c4
-rw-r--r--src/mame/drivers/galpanic.c1
-rw-r--r--src/mame/drivers/gladiatr.c2
-rw-r--r--src/mame/drivers/gluck2.c10
-rw-r--r--src/mame/drivers/goodejan.c12
-rw-r--r--src/mame/drivers/gunsmoke.c2
-rw-r--r--src/mame/drivers/hornet.c4
-rw-r--r--src/mame/drivers/igs011.c6
-rw-r--r--src/mame/drivers/limenko.c18
-rw-r--r--src/mame/drivers/lordgun.c4
-rw-r--r--src/mame/drivers/mastboy.c8
-rw-r--r--src/mame/drivers/mcr.c4
-rw-r--r--src/mame/drivers/namcops2.c2
-rw-r--r--src/mame/drivers/naomi.c16
-rw-r--r--src/mame/drivers/nbmj9195.c4
-rw-r--r--src/mame/drivers/nwk-tr.c38
-rw-r--r--src/mame/drivers/panicr.c12
-rw-r--r--src/mame/drivers/peplus.c2
-rw-r--r--src/mame/drivers/pipeline.c12
-rw-r--r--src/mame/drivers/progolf.c12
-rw-r--r--src/mame/drivers/quizo.c2
-rw-r--r--src/mame/drivers/rabbit.c18
-rw-r--r--src/mame/drivers/raiden2.c14
-rw-r--r--src/mame/drivers/ramtek.c6
-rw-r--r--src/mame/drivers/retofinv.c2
-rw-r--r--src/mame/drivers/segaorun.c2
-rw-r--r--src/mame/drivers/sengokmj.c8
-rw-r--r--src/mame/drivers/sidepckt.c4
-rw-r--r--src/mame/drivers/silvmil.c4
-rw-r--r--src/mame/drivers/skeetsht.c8
-rw-r--r--src/mame/drivers/skyarmy.c12
-rw-r--r--src/mame/drivers/snowbros.c2
-rw-r--r--src/mame/drivers/statriv2.c2
-rw-r--r--src/mame/drivers/taitottl.c2
-rw-r--r--src/mame/drivers/tecmosys.c2
-rw-r--r--src/mame/drivers/tmmjprd.c6
-rw-r--r--src/mame/drivers/welltris.c2
-rw-r--r--src/mame/drivers/wink.c14
-rw-r--r--src/mame/drivers/xxmissio.c2
-rw-r--r--src/mame/includes/bloodbro.h10
-rw-r--r--src/mame/includes/chaknpop.h8
-rw-r--r--src/mame/includes/darkmist.h2
-rw-r--r--src/mame/includes/dcon.h4
-rw-r--r--src/mame/includes/exzisus.h6
-rw-r--r--src/mame/includes/fastfred.h6
-rw-r--r--src/mame/includes/fuukifg2.h8
-rw-r--r--src/mame/includes/fuukifg3.h8
-rw-r--r--src/mame/includes/galpani2.h4
-rw-r--r--src/mame/includes/gladiatr.h12
-rw-r--r--src/mame/includes/gsword.h4
-rw-r--r--src/mame/includes/iqblock.h2
-rw-r--r--src/mame/includes/kaneko16.h2
-rw-r--r--src/mame/includes/liberate.h2
-rw-r--r--src/mame/includes/lordgun.h2
-rw-r--r--src/mame/includes/mustache.h10
-rw-r--r--src/mame/includes/nb1414m4.h4
-rw-r--r--src/mame/includes/pirates.h2
-rw-r--r--src/mame/includes/quizpani.h12
-rw-r--r--src/mame/includes/raiden.h12
-rw-r--r--src/mame/includes/retofinv.h8
-rw-r--r--src/mame/includes/rollrace.h10
-rw-r--r--src/mame/includes/scotrsht.h2
-rw-r--r--src/mame/includes/seicross.h6
-rw-r--r--src/mame/includes/shadfrce.h2
-rw-r--r--src/mame/includes/shootout.h8
-rw-r--r--src/mame/includes/sidepckt.h10
-rw-r--r--src/mame/includes/silkroad.h12
-rw-r--r--src/mame/includes/skydiver.h10
-rw-r--r--src/mame/includes/snowbros.h10
-rw-r--r--src/mame/includes/speedatk.h8
-rw-r--r--src/mame/includes/tecmo.h10
-rw-r--r--src/mame/includes/tecmo16.h2
-rw-r--r--src/mame/includes/tecmosys.h8
-rw-r--r--src/mame/includes/tehkanwc.h6
-rw-r--r--src/mame/includes/thedeep.h6
-rw-r--r--src/mame/includes/tnzs.h8
-rw-r--r--src/mame/includes/vball.h10
-rw-r--r--src/mame/includes/wc90.h10
-rw-r--r--src/mame/includes/welltris.h8
-rw-r--r--src/mame/includes/wrally.h8
-rw-r--r--src/mame/includes/wwfsstar.h10
-rw-r--r--src/mame/includes/xorworld.h12
-rw-r--r--src/mame/includes/xxmissio.h12
-rw-r--r--src/mame/machine/mie.c2
-rw-r--r--src/mame/machine/nb1414m4.c3
-rw-r--r--src/mame/machine/tait8741.c6
-rw-r--r--src/mame/machine/tnzs.c2
-rw-r--r--src/mame/mame.lst10
-rw-r--r--src/mame/video/bloodbro.c2
-rw-r--r--src/mame/video/chaknpop.c2
-rw-r--r--src/mame/video/darkmist.c3
-rw-r--r--src/mame/video/dcon.c2
-rw-r--r--src/mame/video/decospr.c4
-rw-r--r--src/mame/video/fastfred.c4
-rw-r--r--src/mame/video/gladiatr.c4
-rw-r--r--src/mame/video/gsword.c2
-rw-r--r--src/mame/video/iqblock.c2
-rw-r--r--src/mame/video/kaneko_spr.c6
-rw-r--r--src/mame/video/liberate.c2
-rw-r--r--src/mame/video/mustache.c2
-rw-r--r--src/mame/video/quizpani.c2
-rw-r--r--src/mame/video/retofinv.c2
-rw-r--r--src/mame/video/scotrsht.c2
-rw-r--r--src/mame/video/shadfrce.c2
-rw-r--r--src/mame/video/shootout.c2
-rw-r--r--src/mame/video/skydiver.c2
-rw-r--r--src/mame/video/tecmo.c2
-rw-r--r--src/mame/video/tecmo16.c6
-rw-r--r--src/mame/video/tecmosys.c2
-rw-r--r--src/mame/video/tehkanwc.c2
-rw-r--r--src/mame/video/vball.c2
-rw-r--r--src/mame/video/welltris.c2
-rw-r--r--src/mame/video/wwfsstar.c2
-rw-r--r--src/mame/video/xxmissio.c2
-rw-r--r--src/mess/audio/gamate.c14
-rw-r--r--src/mess/drivers/alnchase.c22
-rw-r--r--src/mess/drivers/c65.c73
-rw-r--r--src/mess/drivers/c65_old.c2
-rw-r--r--src/mess/drivers/edracula.c10
-rw-r--r--src/mess/drivers/gamate.c118
-rw-r--r--src/mess/drivers/ngen.c30
-rw-r--r--src/mess/drivers/pc9801.c4
-rw-r--r--src/mess/drivers/pcd.c2
-rw-r--r--src/mess/drivers/snes.c8
-rw-r--r--src/mess/drivers/splitsec.c6
-rw-r--r--src/mess/drivers/tb303.c2
-rw-r--r--src/mess/drivers/tc4.c10
-rw-r--r--src/mess/drivers/tispeak.c10
-rw-r--r--src/mess/drivers/tmtennis.c12
-rw-r--r--src/mess/drivers/wildfire.c20
-rw-r--r--src/mess/includes/gamate.h10
-rw-r--r--src/mess/machine/amstrad.c34
-rw-r--r--src/mess/machine/apple3.c9
-rw-r--r--src/mess/machine/beta.c4
-rw-r--r--src/mess/machine/c65_old.c1
-rw-r--r--src/mess/osd/windows/windows.mak2
-rw-r--r--src/mess/video/apple3.c2
-rw-r--r--src/osd/modules/debugger/debugwin.c14
-rw-r--r--src/osd/modules/debugger/osx/debugcommandhistory.h6
-rw-r--r--src/osd/modules/debugger/osx/debugconsole.h12
-rw-r--r--src/osd/modules/debugger/osx/debugview.h20
-rw-r--r--src/osd/modules/debugger/osx/debugwindowhandler.h10
-rw-r--r--src/osd/modules/debugger/osx/deviceinfoviewer.h2
-rw-r--r--src/osd/modules/debugger/osx/devicesviewer.h4
-rw-r--r--src/osd/modules/debugger/osx/disassemblyviewer.h4
-rw-r--r--src/osd/modules/debugger/osx/errorlogviewer.h2
-rw-r--r--src/osd/modules/debugger/osx/memoryviewer.h4
-rw-r--r--src/osd/modules/debugger/osx/pointsviewer.h2
-rw-r--r--src/osd/modules/debugger/win/consolewininfo.c6
-rw-r--r--src/osd/modules/debugger/win/consolewininfo.h4
-rw-r--r--src/osd/modules/debugger/win/debugbaseinfo.c2
-rw-r--r--src/osd/modules/debugger/win/debugbaseinfo.h10
-rw-r--r--src/osd/modules/debugger/win/debugviewinfo.c39
-rw-r--r--src/osd/modules/debugger/win/debugviewinfo.h14
-rw-r--r--src/osd/modules/debugger/win/debugwin.h2
-rw-r--r--src/osd/modules/debugger/win/debugwininfo.c22
-rw-r--r--src/osd/modules/debugger/win/debugwininfo.h30
-rw-r--r--src/osd/modules/debugger/win/disasmbasewininfo.c2
-rw-r--r--src/osd/modules/debugger/win/disasmbasewininfo.h2
-rw-r--r--src/osd/modules/debugger/win/disasmviewinfo.c4
-rw-r--r--src/osd/modules/debugger/win/disasmviewinfo.h2
-rw-r--r--src/osd/modules/debugger/win/disasmwininfo.c2
-rw-r--r--src/osd/modules/debugger/win/disasmwininfo.h4
-rw-r--r--src/osd/modules/debugger/win/editwininfo.c6
-rw-r--r--src/osd/modules/debugger/win/editwininfo.h22
-rw-r--r--src/osd/modules/debugger/win/logwininfo.c2
-rw-r--r--src/osd/modules/debugger/win/logwininfo.h2
-rw-r--r--src/osd/modules/debugger/win/memoryviewinfo.c2
-rw-r--r--src/osd/modules/debugger/win/memoryviewinfo.h2
-rw-r--r--src/osd/modules/debugger/win/memorywininfo.c2
-rw-r--r--src/osd/modules/debugger/win/memorywininfo.h4
-rw-r--r--src/osd/modules/debugger/win/pointswininfo.c2
-rw-r--r--src/osd/modules/debugger/win/pointswininfo.h2
-rw-r--r--src/osd/modules/debugger/win/uimetrics.c2
-rw-r--r--src/osd/modules/debugger/win/uimetrics.h2
-rw-r--r--src/osd/modules/netdev/pcap.c13
-rw-r--r--src/osd/sdl/blit13.h62
-rw-r--r--src/osd/sdl/draw13.c110
-rw-r--r--src/osd/sdl/drawbgfx.c33
-rw-r--r--src/osd/sdl/drawogl.c82
-rw-r--r--src/osd/sdl/drawsdl.c6
-rw-r--r--src/osd/sdl/sdl.mak8
-rw-r--r--src/osd/sdl/video.h10
-rw-r--r--src/osd/sdl/window.c18
-rw-r--r--src/osd/sdl/window.h36
-rw-r--r--src/osd/windows/d3dhlsl.h4
-rw-r--r--src/osd/windows/drawbgfx.c116
-rw-r--r--src/osd/windows/drawdd.c4
-rw-r--r--src/osd/windows/drawgdi.c2
-rw-r--r--src/osd/windows/video.h2
-rw-r--r--src/osd/windows/window.h30
-rw-r--r--src/osd/windows/windows.mak4
-rw-r--r--src/version.c2
253 files changed, 1209 insertions, 1247 deletions
diff --git a/src/emu/bus/a2bus/a2bus.h b/src/emu/bus/a2bus/a2bus.h
index f14b1d40354..90ab602607d 100644
--- a/src/emu/bus/a2bus/a2bus.h
+++ b/src/emu/bus/a2bus/a2bus.h
@@ -176,7 +176,7 @@ public:
void recalc_slot_inh() { m_a2bus->recalc_inh(m_slot); }
void set_maincpu_halt(int state) { m_a2bus->set_maincpu_halt(state); }
- // pass through the original address space if any for debugger protection
+ // pass through the original address space if any for debugger protection
// when debugging e.g. coprocessor cards (Z80 SoftCard etc).
UINT8 slot_dma_read(address_space &space, UINT16 offset) { return m_a2bus->dma_r(space, offset); }
void slot_dma_write(address_space &space, UINT16 offset, UINT8 data) { m_a2bus->dma_w(space, offset, data); }
diff --git a/src/emu/bus/cpc/smartwatch.c b/src/emu/bus/cpc/smartwatch.c
index cb82fba853d..85a559bc0d0 100644
--- a/src/emu/bus/cpc/smartwatch.c
+++ b/src/emu/bus/cpc/smartwatch.c
@@ -1,10 +1,10 @@
/*
- Dobbertin Smartwatch
-
- Created: 23/2/2015
-
- TODO: setting the time (requires the DS1315 core to be able to do this,
- at the moment it just reads the current time)
+ Dobbertin Smartwatch
+
+ Created: 23/2/2015
+
+ TODO: setting the time (requires the DS1315 core to be able to do this,
+ at the moment it just reads the current time)
*/
#include "emu.h"
diff --git a/src/emu/bus/cpc/smartwatch.h b/src/emu/bus/cpc/smartwatch.h
index aacdd085981..8e2007f8a28 100644
--- a/src/emu/bus/cpc/smartwatch.h
+++ b/src/emu/bus/cpc/smartwatch.h
@@ -1,10 +1,10 @@
/*
- Dobbertin Smartwatch
-
- Dallas DS1216 Smartwatch + DS1315 Phantom Time chip
-
- Further info at: http://www.cpcwiki.eu/index.php/Dobbertin_Smart_Watch
-
+ Dobbertin Smartwatch
+
+ Dallas DS1216 Smartwatch + DS1315 Phantom Time chip
+
+ Further info at: http://www.cpcwiki.eu/index.php/Dobbertin_Smart_Watch
+
*/
#ifndef SMARTWATCH_H_
diff --git a/src/emu/bus/nes_ctrl/bcbattle.c b/src/emu/bus/nes_ctrl/bcbattle.c
index 81331440767..aa75aeddd39 100644
--- a/src/emu/bus/nes_ctrl/bcbattle.c
+++ b/src/emu/bus/nes_ctrl/bcbattle.c
@@ -35,7 +35,7 @@ machine_config_constructor nes_bcbattle_device::device_mconfig_additions() const
//-------------------------------------------------
// This part is the hacky replacement for the real Barcode unit [shared with SNES implementation]:
-// code periodically checks whether a new code has been scanned and it moves it to the
+// code periodically checks whether a new code has been scanned and it moves it to the
// m_current_barcode array
void nes_bcbattle_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
{
diff --git a/src/emu/bus/nes_ctrl/miracle.c b/src/emu/bus/nes_ctrl/miracle.c
index bcf596b8d72..ff122d09dfb 100644
--- a/src/emu/bus/nes_ctrl/miracle.c
+++ b/src/emu/bus/nes_ctrl/miracle.c
@@ -12,8 +12,8 @@
#include "miracle.h"
#define MIRACLE_MIDI_WAITING 0
-#define MIRACLE_MIDI_RECEIVE 1 // receive byte from piano
-#define MIRACLE_MIDI_SEND 2 // send byte to piano
+#define MIRACLE_MIDI_RECEIVE 1 // receive byte from piano
+#define MIRACLE_MIDI_SEND 2 // send byte to piano
//**************************************************************************
// DEVICE DEFINITIONS
@@ -141,7 +141,7 @@ UINT8 nes_miracle_device::read_bit0()
void nes_miracle_device::write(UINT8 data)
{
-// printf("write: %d (%d %02x %d)\n", data & 1, m_sent_bits, m_data_sent, m_midi_mode);
+// printf("write: %d (%d %02x %d)\n", data & 1, m_sent_bits, m_data_sent, m_midi_mode);
if (m_midi_mode == MIRACLE_MIDI_SEND)
{
@@ -154,7 +154,7 @@ void nes_miracle_device::write(UINT8 data)
// then we go back to waiting
if (m_sent_bits == 8)
{
-// printf("xmit MIDI byte %02x\n", m_data_sent);
+// printf("xmit MIDI byte %02x\n", m_data_sent);
xmit_char(m_data_sent);
m_midi_mode = MIRACLE_MIDI_WAITING;
m_sent_bits = 0;
@@ -175,7 +175,7 @@ void nes_miracle_device::write(UINT8 data)
// was timer running?
if (m_strobe_clock > 0)
{
-// printf("got strobe at %d clocks\n", m_strobe_clock);
+// printf("got strobe at %d clocks\n", m_strobe_clock);
if (m_strobe_clock < 66 && data == 0)
{
@@ -188,7 +188,7 @@ void nes_miracle_device::write(UINT8 data)
m_status_bit = true;
if (m_recv_read != m_recv_write)
{
-// printf("Getting %02x from Miracle[%d]\n", m_recvring[m_recv_read], m_recv_read);
+// printf("Getting %02x from Miracle[%d]\n", m_recvring[m_recv_read], m_recv_read);
m_data_sent = m_recvring[m_recv_read++];
if (m_recv_read >= RECV_RING_SIZE)
{
@@ -199,7 +199,7 @@ void nes_miracle_device::write(UINT8 data)
else
{
m_read_status = false;
-// printf("Miracle has no data\n");
+// printf("Miracle has no data\n");
}
return;
}
@@ -230,7 +230,7 @@ void nes_miracle_device::rcv_complete() // Rx completed receiving byte
receive_register_extract();
UINT8 rcv = get_received_char();
-// printf("Got %02x -> [%d]\n", rcv, m_recv_write);
+// printf("Got %02x -> [%d]\n", rcv, m_recv_write);
m_recvring[m_recv_write++] = rcv;
if (m_recv_write >= RECV_RING_SIZE)
{
@@ -282,4 +282,3 @@ void nes_miracle_device::xmit_char(UINT8 data)
}
}
}
-
diff --git a/src/emu/bus/snes_ctrl/bcbattle.c b/src/emu/bus/snes_ctrl/bcbattle.c
index 83682589c71..27d7dd1c71c 100644
--- a/src/emu/bus/snes_ctrl/bcbattle.c
+++ b/src/emu/bus/snes_ctrl/bcbattle.c
@@ -35,7 +35,7 @@ machine_config_constructor snes_bcbattle_device::device_mconfig_additions() cons
//-------------------------------------------------
// This part is the hacky replacement for the real Barcode unit [shared with NES implementation]:
-// code periodically checks whether a new code has been scanned and it moves it to the
+// code periodically checks whether a new code has been scanned and it moves it to the
// m_current_barcode array
void snes_bcbattle_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
{
@@ -140,7 +140,7 @@ int snes_bcbattle_device::read_current_bit()
m_cur_bit++;
return bit;
}
- if (m_cur_bit == 4) // only the low nibble is transmitted (this is the main action of the BBII interface for SNES)
+ if (m_cur_bit == 4) // only the low nibble is transmitted (this is the main action of the BBII interface for SNES)
{
m_cur_bit = 0;
//printf("%X ", m_current_barcode[m_cur_byte]);
@@ -175,26 +175,26 @@ void snes_bcbattle_device::port_poll()
UINT8 snes_bcbattle_device::read_pin4()
{
UINT8 ret = 0;
-
+
if (m_idx >= 80)
ret |= 0x00;
- else if (m_idx >= 28) // scan actual barcode
+ else if (m_idx >= 28) // scan actual barcode
{
- ret |= read_current_bit(); // if no code is pending transmission, the function returns 0
+ ret |= read_current_bit(); // if no code is pending transmission, the function returns 0
m_idx++;
}
- else if (m_idx >= 25) // unknown flags?
+ else if (m_idx >= 25) // unknown flags?
m_idx++;
- else if (m_idx == 24) // barcode present
+ else if (m_idx == 24) // barcode present
{
ret |= m_pending_code;
m_idx++;
}
- else if (m_idx >= 12) // controller ID
+ else if (m_idx >= 12) // controller ID
ret |= BIT(0x7000, m_idx++);
- else // first 12 bytes are unknown and probably always 0
+ else // first 12 bytes are unknown and probably always 0
m_idx++;
-
+
return ret;
}
@@ -207,7 +207,7 @@ void snes_bcbattle_device::write_strobe(UINT8 data)
{
int old = m_strobe;
m_strobe = data & 0x01;
-
- if (m_strobe < old) // 1 -> 0 transition
+
+ if (m_strobe < old) // 1 -> 0 transition
port_poll();
}
diff --git a/src/emu/bus/snes_ctrl/bcbattle.h b/src/emu/bus/snes_ctrl/bcbattle.h
index 00d653c5e29..e960b8ac134 100644
--- a/src/emu/bus/snes_ctrl/bcbattle.h
+++ b/src/emu/bus/snes_ctrl/bcbattle.h
@@ -45,7 +45,7 @@ protected:
int read_current_bit();
private:
-
+
static const device_timer_id TIMER_BATTLER = 1;
required_device<barcode_reader_device> m_reader;
UINT8 m_current_barcode[20];
diff --git a/src/emu/bus/snes_ctrl/ctrl.h b/src/emu/bus/snes_ctrl/ctrl.h
index d7f87ef5c42..2d6850806d7 100644
--- a/src/emu/bus/snes_ctrl/ctrl.h
+++ b/src/emu/bus/snes_ctrl/ctrl.h
@@ -29,13 +29,13 @@ public:
// construction/destruction
device_snes_control_port_interface(const machine_config &mconfig, device_t &device);
virtual ~device_snes_control_port_interface();
-
+
virtual UINT8 read_pin4() { return 0; };
virtual UINT8 read_pin5() { return 0; };
virtual void write_pin6(UINT8 data) { };
virtual void write_strobe(UINT8 data) { };
virtual void port_poll() { };
-
+
protected:
snes_control_port_device *m_port;
};
diff --git a/src/emu/bus/snes_ctrl/joypad.c b/src/emu/bus/snes_ctrl/joypad.c
index a8291c2dfdb..4b26d35b887 100644
--- a/src/emu/bus/snes_ctrl/joypad.c
+++ b/src/emu/bus/snes_ctrl/joypad.c
@@ -97,7 +97,7 @@ void snes_joypad_device::port_poll()
// if up, no down
if (temp & 0x10)
temp &= ~0x20;
-
+
m_latch = temp | 0xffff0000;
}
@@ -121,7 +121,6 @@ void snes_joypad_device::write_strobe(UINT8 data)
int old = m_strobe;
m_strobe = data & 0x01;
- if (m_strobe < old) // 1 -> 0 transition
+ if (m_strobe < old) // 1 -> 0 transition
port_poll();
}
-
diff --git a/src/emu/bus/snes_ctrl/joypad.h b/src/emu/bus/snes_ctrl/joypad.h
index 9c6920e7a18..bb0b36b6a4f 100644
--- a/src/emu/bus/snes_ctrl/joypad.h
+++ b/src/emu/bus/snes_ctrl/joypad.h
@@ -41,7 +41,7 @@ protected:
virtual UINT8 read_pin4();
virtual void write_strobe(UINT8 data);
virtual void port_poll();
-
+
private:
required_ioport m_joypad;
int m_strobe;
diff --git a/src/emu/bus/snes_ctrl/miracle.c b/src/emu/bus/snes_ctrl/miracle.c
index c7a25a630dd..081a2c5f030 100644
--- a/src/emu/bus/snes_ctrl/miracle.c
+++ b/src/emu/bus/snes_ctrl/miracle.c
@@ -4,17 +4,17 @@
Copyright MESS Team.
Visit http://mamedev.org for licensing and usage restrictions.
-
+
recv at PC = 008a4a
xmit at PC = 008adb
-
+
**********************************************************************/
#include "miracle.h"
#define MIRACLE_MIDI_WAITING 0
-#define MIRACLE_MIDI_RECEIVE 1 // receive byte from piano
-#define MIRACLE_MIDI_SEND 2 // send byte to piano
+#define MIRACLE_MIDI_RECEIVE 1 // receive byte from piano
+#define MIRACLE_MIDI_SEND 2 // send byte to piano
//**************************************************************************
// DEVICE DEFINITIONS
@@ -130,12 +130,12 @@ UINT8 snes_miracle_device::read_pin4()
void snes_miracle_device::write_pin6(UINT8 data)
{
-// printf("%02x to pin6\n", data);
+// printf("%02x to pin6\n", data);
}
void snes_miracle_device::write_strobe(UINT8 data)
{
-// printf("%02x to strobe\n", data);
+// printf("%02x to strobe\n", data);
if (m_midi_mode == MIRACLE_MIDI_SEND)
{
@@ -148,7 +148,7 @@ void snes_miracle_device::write_strobe(UINT8 data)
// then we go back to waiting
if (m_sent_bits == 8)
{
-// printf("xmit MIDI byte %02x\n", m_data_sent);
+// printf("xmit MIDI byte %02x\n", m_data_sent);
xmit_char(m_data_sent);
m_midi_mode = MIRACLE_MIDI_WAITING;
m_sent_bits = 0;
@@ -169,7 +169,7 @@ void snes_miracle_device::write_strobe(UINT8 data)
// was timer running?
if (m_strobe_clock > 0)
{
-// printf("got strobe at %d clocks\n", m_strobe_clock);
+// printf("got strobe at %d clocks\n", m_strobe_clock);
if (m_strobe_clock < 500 && data == 0)
{
@@ -182,7 +182,7 @@ void snes_miracle_device::write_strobe(UINT8 data)
m_status_bit = true;
if (m_recv_read != m_recv_write)
{
-// printf("Getting %02x from Miracle[%d]\n", m_recvring[m_recv_read], m_recv_read);
+// printf("Getting %02x from Miracle[%d]\n", m_recvring[m_recv_read], m_recv_read);
m_data_sent = m_recvring[m_recv_read++];
if (m_recv_read >= RECV_RING_SIZE)
{
@@ -193,7 +193,7 @@ void snes_miracle_device::write_strobe(UINT8 data)
else
{
m_read_status = false;
-// printf("Miracle has no data\n");
+// printf("Miracle has no data\n");
}
return;
}
@@ -225,7 +225,7 @@ void snes_miracle_device::rcv_complete() // Rx completed receiving byte
receive_register_extract();
UINT8 rcv = get_received_char();
-// printf("Got %02x -> [%d]\n", rcv, m_recv_write);
+// printf("Got %02x -> [%d]\n", rcv, m_recv_write);
m_recvring[m_recv_write++] = rcv;
if (m_recv_write >= RECV_RING_SIZE)
{
@@ -277,4 +277,3 @@ void snes_miracle_device::xmit_char(UINT8 data)
}
}
}
-
diff --git a/src/emu/bus/snes_ctrl/mouse.c b/src/emu/bus/snes_ctrl/mouse.c
index 1d6cb5b52f6..8337af09859 100644
--- a/src/emu/bus/snes_ctrl/mouse.c
+++ b/src/emu/bus/snes_ctrl/mouse.c
@@ -1,7 +1,7 @@
/**********************************************************************
Nintendo Super Famicom & SNES Mouse
-
+
Copyright MESS Team.
Visit http://mamedev.org for licensing and usage restrictions.
@@ -32,11 +32,11 @@ static INPUT_PORTS_START( snes_mouse )
// detect a sudden jump in the wrong direction, making the usage unfriendly...
PORT_START("MOUSE_X")
PORT_BIT( 0x1ff, 0x100, IPT_LIGHTGUN_X ) PORT_NAME("Superscope X Axis") PORT_SENSITIVITY(30) PORT_KEYDELTA(5)
-// PORT_BIT( 0xff, 0x00, IPT_MOUSE_X) PORT_SENSITIVITY(30) PORT_KEYDELTA(5)
+// PORT_BIT( 0xff, 0x00, IPT_MOUSE_X) PORT_SENSITIVITY(30) PORT_KEYDELTA(5)
PORT_START("MOUSE_Y")
PORT_BIT( 0x1ff, 0x100, IPT_LIGHTGUN_Y) PORT_NAME("Superscope Y Axis") PORT_SENSITIVITY(30) PORT_KEYDELTA(5)
-// PORT_BIT( 0xff, 0x00, IPT_MOUSE_Y) PORT_SENSITIVITY(30) PORT_KEYDELTA(5)
+// PORT_BIT( 0xff, 0x00, IPT_MOUSE_Y) PORT_SENSITIVITY(30) PORT_KEYDELTA(5)
INPUT_PORTS_END
@@ -155,7 +155,7 @@ void snes_mouse_device::port_poll()
m_deltax = var;
m_oldx = m_x;
}
-
+
var = m_y - m_oldy;
if (var)
{
@@ -163,7 +163,7 @@ void snes_mouse_device::port_poll()
if (m_diry != new_dir)
m_diry = new_dir;
}
-
+
if (var < -127)
{
m_deltay = 0x7f;
@@ -196,14 +196,14 @@ void snes_mouse_device::port_poll()
UINT8 snes_mouse_device::read_pin4()
{
UINT8 res = 0;
-
+
if (m_strobe == 1)
{
// reading with strobe 1, changes mouse speed
m_speed = (m_speed + 1) % 3;
return res;
}
-
+
if (m_idx >= 32)
res |= 0x01;
else if (m_idx >= 24)
@@ -222,7 +222,7 @@ UINT8 snes_mouse_device::read_pin4()
}
else
res |= BIT(m_latch, m_idx++);
-
+
return res;
}
@@ -235,7 +235,6 @@ void snes_mouse_device::write_strobe(UINT8 data)
int old = m_strobe;
m_strobe = data & 0x01;
- if (m_strobe < old) // 1 -> 0 transition
+ if (m_strobe < old) // 1 -> 0 transition
port_poll();
}
-
diff --git a/src/emu/bus/snes_ctrl/mouse.h b/src/emu/bus/snes_ctrl/mouse.h
index fbce1ba6c41..c795b93579a 100644
--- a/src/emu/bus/snes_ctrl/mouse.h
+++ b/src/emu/bus/snes_ctrl/mouse.h
@@ -41,7 +41,7 @@ protected:
virtual UINT8 read_pin4();
virtual void write_strobe(UINT8 data);
virtual void port_poll();
-
+
private:
required_ioport m_buttons;
required_ioport m_xaxis;
diff --git a/src/emu/bus/snes_ctrl/multitap.c b/src/emu/bus/snes_ctrl/multitap.c
index bf1d04cada9..8a18422c19f 100644
--- a/src/emu/bus/snes_ctrl/multitap.c
+++ b/src/emu/bus/snes_ctrl/multitap.c
@@ -121,14 +121,14 @@ UINT8 snes_multitap_device::read_pin4()
ret |= m_select ? m_port1->read_pin4() : m_port3->read_pin4();
else // 1P
ret |= m_select ? m_port1->read_pin4() : 0;
-
+
return ret;
}
UINT8 snes_multitap_device::read_pin5()
{
UINT8 ret = 0;
-
+
if (m_cfg->read() == 0) // 4P
ret |= m_select ? m_port2->read_pin4() : m_port4->read_pin4();
return ret;
diff --git a/src/emu/bus/snes_ctrl/pachinko.c b/src/emu/bus/snes_ctrl/pachinko.c
index 099e4e00f57..e69050a9a78 100644
--- a/src/emu/bus/snes_ctrl/pachinko.c
+++ b/src/emu/bus/snes_ctrl/pachinko.c
@@ -83,7 +83,7 @@ void snes_pachinko_device::device_reset()
void snes_pachinko_device::port_poll()
{
UINT8 dial = BITSWAP8(m_dial->read() ^ 0xff,7,6,5,4,3,2,1,0);
- m_latch = m_button->read() | (dial << 25) | 0xee7000; // add ID
+ m_latch = m_button->read() | (dial << 25) | 0xee7000; // add ID
}
//-------------------------------------------------
@@ -105,7 +105,7 @@ void snes_pachinko_device::write_strobe(UINT8 data)
{
int old = m_strobe;
m_strobe = data & 0x01;
-
- if (m_strobe < old) // 1 -> 0 transition
+
+ if (m_strobe < old) // 1 -> 0 transition
port_poll();
}
diff --git a/src/emu/bus/snes_ctrl/sscope.c b/src/emu/bus/snes_ctrl/sscope.c
index 93e46879a16..178ab25bddd 100644
--- a/src/emu/bus/snes_ctrl/sscope.c
+++ b/src/emu/bus/snes_ctrl/sscope.c
@@ -112,11 +112,11 @@ void snes_sscope_device::port_poll()
// then start elaborating input bits
// 1. only keep old turbo value
m_latch &= 0x04;
-
+
// 2. set onscreen/offscreen
if (!m_port->m_onscreen_cb.isnull())
m_latch |= (m_port->m_onscreen_cb(m_x, m_y) ? 0x00 : 0x40);
-
+
// 3. pause is a button that is always edge sensitive
if (BIT(input, 3) && !m_pause_lock)
{
@@ -134,11 +134,11 @@ void snes_sscope_device::port_poll()
}
else if (!BIT(input, 2))
m_turbo_lock = 0;
-
+
// 5. cursor is a button that is always level sensitive
m_latch |= BIT(input, 1);
-
- // 6. fire is a button with two behaviors: if turbo is active, trigger is level sensitive;
+
+ // 6. fire is a button with two behaviors: if turbo is active, trigger is level sensitive;
// otherwise it is edge sensitive
if (BIT(input, 0) && (BIT(m_latch, 2) || !m_fire_lock))
{
@@ -147,7 +147,7 @@ void snes_sscope_device::port_poll()
}
else if (!BIT(input, 0))
m_fire_lock = 0;
-
+
// If we have pressed fire or cursor and we are on-screen and SuperScope is in Port2, then latch video signal.
// Notice that this only works in Port2 because its IOBit pin is connected to bit7 of the IO Port, while Port1
// has IOBit pin connected to bit6 of the IO Port, and the latter is not detected by the H/V Counters. In other
@@ -163,12 +163,12 @@ void snes_sscope_device::port_poll()
UINT8 snes_sscope_device::read_pin4()
{
UINT8 res = 0;
-
- if (m_idx >= 8) // bits 8-15 = ID = all 1s; bits >= 16 all 1s
+
+ if (m_idx >= 8) // bits 8-15 = ID = all 1s; bits >= 16 all 1s
res |= 0x01;
else
res |= BIT(m_latch, m_idx++);
-
+
return res;
}
@@ -181,7 +181,6 @@ void snes_sscope_device::write_strobe(UINT8 data)
int old = m_strobe;
m_strobe = data & 0x01;
- if (m_strobe < old) // 1 -> 0 transition
+ if (m_strobe < old) // 1 -> 0 transition
port_poll();
}
-
diff --git a/src/emu/bus/snes_ctrl/sscope.h b/src/emu/bus/snes_ctrl/sscope.h
index e6a806038fc..7b9379336dc 100644
--- a/src/emu/bus/snes_ctrl/sscope.h
+++ b/src/emu/bus/snes_ctrl/sscope.h
@@ -41,7 +41,7 @@ protected:
virtual UINT8 read_pin4();
virtual void write_strobe(UINT8 data);
virtual void port_poll();
-
+
private:
required_ioport m_buttons;
required_ioport m_xaxis;
diff --git a/src/emu/bus/snes_ctrl/twintap.c b/src/emu/bus/snes_ctrl/twintap.c
index 6ddcb32b158..d5d38d55ac4 100644
--- a/src/emu/bus/snes_ctrl/twintap.c
+++ b/src/emu/bus/snes_ctrl/twintap.c
@@ -3,12 +3,12 @@
Nintendo Super Famicom - Yonezawa / PartyRoom 21 Twin Tap Controller
This controller consists of two 1-button small units attached to a
- single 7pin connector. You plug the connector to Port2 and two
+ single 7pin connector. You plug the connector to Port2 and two
players can compete on the quiz game (Port1 should have a joypad
plugged in, to start the game and browse the menus). By plugging
a multitap adapter to Port2, up to 4 Twin Tap controllers can be
attached at the same time, allowing for 8 players quiz sessions.
-
+
Copyright MESS Team.
Visit http://mamedev.org for licensing and usage restrictions.
@@ -28,7 +28,7 @@ static INPUT_PORTS_START( snes_twintap )
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Button 2")
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Button 1")
PORT_BIT( 0x8ffc, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_BIT( 0x7000, IP_ACTIVE_LOW, IPT_UNUSED ) // controller ID unknown
+ PORT_BIT( 0x7000, IP_ACTIVE_LOW, IPT_UNUSED ) // controller ID unknown
INPUT_PORTS_END
@@ -108,7 +108,7 @@ void snes_twintap_device::write_strobe(UINT8 data)
{
int old = m_strobe;
m_strobe = data & 0x01;
-
- if (m_strobe < old) // 1 -> 0 transition
+
+ if (m_strobe < old) // 1 -> 0 transition
port_poll();
}
diff --git a/src/emu/cpu/amis2000/amis2000.c b/src/emu/cpu/amis2000/amis2000.c
index ac680096275..d23e2dbdec4 100644
--- a/src/emu/cpu/amis2000/amis2000.c
+++ b/src/emu/cpu/amis2000/amis2000.c
@@ -184,7 +184,7 @@ void amis2152_cpu_device::device_start()
amis2000_base_device::device_start();
m_d2f_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(amis2152_cpu_device::d2f_timer_cb), this));
-
+
// zerofill
m_d2f_latch = 0;
m_fout_state = 0;
@@ -205,7 +205,7 @@ void amis2000_base_device::device_reset()
m_pc = 0;
m_op = 0;
m_skip = false;
-
+
// clear i/o
m_a = 0x1fff;
m_write_a(0, m_a, 0xffff);
@@ -235,14 +235,14 @@ void amis2000_base_device::execute_run()
while (m_icount > 0)
{
m_icount--;
-
+
// remember previous opcode
m_prev_op = m_op;
debugger_instruction_hook(this, m_pc);
m_op = m_program->read_byte(m_pc);
m_pc = (m_pc + 1) & 0x1fff;
-
+
if (m_skip)
{
// always skip over PP prefix
@@ -299,7 +299,7 @@ void amis2000_base_device::execute_run()
case 0x2d: op_sf2(); break;
case 0x2e: op_tf1(); break;
case 0x2f: op_tf2(); break;
-
+
default:
switch (m_op & 0xfc)
{
diff --git a/src/emu/cpu/amis2000/amis2000.h b/src/emu/cpu/amis2000/amis2000.h
index 8adcb4e2f7c..cf7c67c63a3 100644
--- a/src/emu/cpu/amis2000/amis2000.h
+++ b/src/emu/cpu/amis2000/amis2000.h
@@ -95,7 +95,7 @@ protected:
address_space_config m_data_config;
address_space *m_program;
address_space *m_data;
-
+
UINT8 m_bu_bits;
UINT16 m_bu_mask;
UINT8 m_callstack_bits; // number of program counter bits held in callstack
@@ -129,14 +129,14 @@ protected:
devcb_write8 m_write_d;
devcb_write16 m_write_a;
devcb_write_line m_write_f;
-
+
// misc internal helpers
UINT8 ram_r();
void ram_w(UINT8 data);
void pop_callstack();
void push_callstack();
void d_latch_out(bool active);
-
+
// opcode handlers
virtual void op_lai();
virtual void op_lab();
@@ -221,7 +221,7 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
-
+
// digital-to-frequency converter
UINT8 m_d2f_latch;
emu_timer *m_d2f_timer;
@@ -229,7 +229,7 @@ protected:
void d2f_timer_clock();
TIMER_CALLBACK_MEMBER(d2f_timer_cb);
-
+
// opcode handlers
virtual void op_szk();
};
diff --git a/src/emu/cpu/amis2000/amis2000d.c b/src/emu/cpu/amis2000/amis2000d.c
index 971a1a61571..27077170402 100644
--- a/src/emu/cpu/amis2000/amis2000d.c
+++ b/src/emu/cpu/amis2000/amis2000d.c
@@ -108,21 +108,21 @@ CPU_DISASSEMBLE( amis2000 )
char *dst = buffer;
dst += sprintf(dst, "%-5s ", s_mnemonics[instr]);
-
+
// opcode parameter
int mask = s_bits[instr];
bool complement = (mask < 0);
if (mask < 0)
mask = -mask;
mask = (1 << mask) - 1;
-
+
if (mask != 0)
{
UINT8 param = op;
if (complement)
param = ~param;
param &= mask;
-
+
if (mask < 0x10)
dst += sprintf(dst, "%d", param);
else
diff --git a/src/emu/cpu/amis2000/amis2000op.inc b/src/emu/cpu/amis2000/amis2000op.inc
index 85f285e66bc..1b647b071bf 100644
--- a/src/emu/cpu/amis2000/amis2000op.inc
+++ b/src/emu/cpu/amis2000/amis2000op.inc
@@ -307,7 +307,7 @@ void amis2000_base_device::op_jmp()
// JMP X: jump to X(+PP)
UINT16 mask = 0x3f;
UINT16 param = m_op & mask;
-
+
// if previous opcode was PP, change PC high bits too
if ((m_prev_op & 0xf0) == 0x60)
{
@@ -507,7 +507,7 @@ TIMER_CALLBACK_MEMBER(amis2152_cpu_device::d2f_timer_cb)
{
m_write_f(m_fout_state);
m_fout_state ^= 1;
-
+
d2f_timer_clock();
}
diff --git a/src/emu/cpu/i386/i386ops.h b/src/emu/cpu/i386/i386ops.h
index 9edaee19683..66e7782687a 100644
--- a/src/emu/cpu/i386/i386ops.h
+++ b/src/emu/cpu/i386/i386ops.h
@@ -329,7 +329,7 @@ const i386_device::X86_OPCODE i386_device::s_x86_opcode_table[] =
{ 0x32, OP_2BYTE|OP_PENTIUM, &i386_device::pentium_rdmsr, &i386_device::pentium_rdmsr, false},
{ 0x38, OP_2BYTE|OP_PENTIUM, &i386_device::i386_decode_three_byte38, &i386_device::i386_decode_three_byte38,false},
{ 0x3A, OP_2BYTE|OP_PENTIUM, &i386_device::i386_decode_three_byte3a, &i386_device::i386_decode_three_byte3a,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/m6502/m4510.c b/src/emu/cpu/m6502/m4510.c
index a435ae7aa4e..04756fc52ed 100644
--- a/src/emu/cpu/m6502/m4510.c
+++ b/src/emu/cpu/m6502/m4510.c
@@ -86,7 +86,7 @@ bool m4510_device::memory_translate(address_spacenum spacenum, int intention, of
{
address = map(address);
}
-
+
return true;
}
diff --git a/src/emu/cpu/m68000/m68000.h b/src/emu/cpu/m68000/m68000.h
index d9b9200cee6..a7da4266061 100644
--- a/src/emu/cpu/m68000/m68000.h
+++ b/src/emu/cpu/m68000/m68000.h
@@ -357,7 +357,7 @@ public:
UINT32 ic_address[M68K_IC_SIZE]; /* instruction cache address data */
UINT32 ic_data[M68K_IC_SIZE]; /* instruction cache content data */
- bool ic_valid[M68K_IC_SIZE]; /* instruction cache valid flags */
+ bool ic_valid[M68K_IC_SIZE]; /* instruction cache valid flags */
diff --git a/src/emu/cpu/m68000/m68kcpu.h b/src/emu/cpu/m68000/m68kcpu.h
index aeb45aadd91..0ca635c630d 100644
--- a/src/emu/cpu/m68000/m68kcpu.h
+++ b/src/emu/cpu/m68000/m68kcpu.h
@@ -689,14 +689,14 @@ INLINE UINT32 m68ki_ic_readimm16(m68000_base_device *m68k, UINT32 address)
if (m68k->cpu_type & (CPU_TYPE_EC020 | CPU_TYPE_020))
{
UINT32 tag = (address >> 8) | (m68k->s_flag ? 0x1000000 : 0);
- int idx = (address >> 2) & 0x3f; // 1-of-64 select
+ int idx = (address >> 2) & 0x3f; // 1-of-64 select
// do a cache fill if the line is invalid or the tags don't match
if ((!m68k->ic_valid[idx]) || (m68k->ic_address[idx] != tag))
{
m68k->ic_data[idx] = m68k->read32(address & ~3);
-// printf("m68k: doing cache fill at %08x (tag %08x idx %d)\n", address, tag, idx);
+// printf("m68k: doing cache fill at %08x (tag %08x idx %d)\n", address, tag, idx);
// if no buserror occured, validate the tag
if (!m68k->mmu_tmp_buserror_occurred)
diff --git a/src/emu/cpu/ucom4/ucom4.c b/src/emu/cpu/ucom4/ucom4.c
index e7f25a26661..b415595a5b0 100644
--- a/src/emu/cpu/ucom4/ucom4.c
+++ b/src/emu/cpu/ucom4/ucom4.c
@@ -3,7 +3,7 @@
/*
NEC uCOM-4 MCU family cores
-
+
References:
- 1981 NEC Microcomputers Catalog (later editions may have errors!)
- Supplement to uCOM-43 Single Chip Microcomputer Users' Manual
@@ -20,7 +20,7 @@ enum
NEC_UCOM43 = 0,
NEC_UCOM44,
NEC_UCOM45
-};
+};
#include "ucom4.h"
#include "debugger.h"
@@ -115,7 +115,7 @@ enum
void ucom4_cpu_device::device_start()
{
assert(NEC_UCOM4_PORTA == 0);
-
+
m_program = &space(AS_PROGRAM);
m_data = &space(AS_DATA);
m_prgmask = (1 << m_prgwidth) - 1;
@@ -195,12 +195,12 @@ void ucom4_cpu_device::device_reset()
m_skip = false;
m_timer->adjust(attotime::never);
-
+
// clear interrupt
m_int_line = CLEAR_LINE;
m_int_f = 0;
m_inte_f = (m_family == NEC_UCOM43) ? 0 : 1;
-
+
// clear i/o
for (int i = NEC_UCOM4_PORTC; i <= NEC_UCOM4_PORTI; i++)
output_w(i, 0xf);
@@ -221,9 +221,9 @@ void ucom4_cpu_device::execute_set_input(int line, int state)
if (m_int_line == CLEAR_LINE && state)
m_int_f = 1;
m_int_line = state;
-
+
break;
-
+
default:
break;
}
@@ -273,13 +273,13 @@ void ucom4_cpu_device::execute_run()
m_bitmask = 1 << (m_op & 0x03);
increment_pc();
fetch_arg();
-
+
if (m_skip)
{
m_skip = false;
m_op = 0; // nop
}
-
+
// handle opcode
switch (m_op & 0xf0)
{
@@ -287,9 +287,9 @@ void ucom4_cpu_device::execute_run()
case 0x90: op_li(); break;
case 0xa0: op_jmpcal(); break;
case 0xb0: op_czp(); break;
-
+
case 0xc0: case 0xd0: case 0xe0: case 0xf0: op_jcp(); break;
-
+
default:
switch (m_op)
{
@@ -374,7 +374,7 @@ void ucom4_cpu_device::execute_run()
case 0x7c: op_sfb(); break;
}
break; // 0xfc
-
+
}
break; // 0xff
diff --git a/src/emu/cpu/ucom4/ucom4.h b/src/emu/cpu/ucom4/ucom4.h
index 07d80603c67..c215b2336f2 100644
--- a/src/emu/cpu/ucom4/ucom4.h
+++ b/src/emu/cpu/ucom4/ucom4.h
@@ -143,7 +143,7 @@ protected:
bool m_skip; // skip next opcode
int m_icount;
emu_timer *m_timer;
-
+
UINT16 m_pc; // program counter
UINT8 m_acc; // 4-bit accumulator
UINT8 m_dpl; // 4-bit data pointer low (RAM x)
@@ -169,7 +169,7 @@ protected:
devcb_write8 m_write_g;
devcb_write8 m_write_h;
devcb_write8 m_write_i;
-
+
// misc internal helpers
void increment_pc();
void fetch_arg();
diff --git a/src/emu/cpu/ucom4/ucom4d.c b/src/emu/cpu/ucom4/ucom4d.c
index 531be0ed58c..14adfefbc79 100644
--- a/src/emu/cpu/ucom4/ucom4d.c
+++ b/src/emu/cpu/ucom4/ucom4d.c
@@ -121,7 +121,7 @@ CPU_DISASSEMBLE(ucom4)
char *dst = buffer;
dst += sprintf(dst, "%-4s ", s_mnemonics[instr]);
-
+
// opcode parameter
int bits = s_bits[instr];
if (bits)
@@ -133,7 +133,7 @@ CPU_DISASSEMBLE(ucom4)
param = (param << (bits / 10)) | (op2 & ((1 << (bits / 10)) - 1));
bits = (bits % 10) + (bits / 10);
}
-
+
// special case for CZP
if (instr == mCZP)
{
diff --git a/src/emu/cpu/ucom4/ucom4op.inc b/src/emu/cpu/ucom4/ucom4op.inc
index 8de834438b5..8ac0a462145 100644
--- a/src/emu/cpu/ucom4/ucom4op.inc
+++ b/src/emu/cpu/ucom4/ucom4op.inc
@@ -32,7 +32,7 @@ UINT8 ucom4_cpu_device::input_r(int index)
{
index &= 0xf;
UINT8 inp = 0xf;
-
+
switch (index)
{
case NEC_UCOM4_PORTA: inp = m_read_a(index, 0xff); break;
@@ -62,7 +62,7 @@ void ucom4_cpu_device::output_w(int index, UINT8 data)
case NEC_UCOM4_PORTG: m_write_g(index, data, 0xff); break;
case NEC_UCOM4_PORTH: m_write_h(index, data, 0xff); break;
case NEC_UCOM4_PORTI: m_write_i(index, data & 7, 0xff); break;
-
+
default:
logerror("%s write to unknown port %c = $%X at $%03X\n", tag(), 'A' + index, data & 0xf, m_pc);
break;
@@ -370,7 +370,7 @@ void ucom4_cpu_device::op_ci()
{
// CI X: skip next on ACC equals X
m_skip = (m_acc == (m_arg & 0x0f));
-
+
if ((m_arg & 0xf0) != 0xc0)
logerror("%s CI opcode unexpected upper arg $%02X at $%03X\n", tag(), m_arg & 0xf0, m_pc);
}
@@ -397,7 +397,7 @@ void ucom4_cpu_device::op_cli()
{
// CLI X: skip next on DPl equals X
m_skip = (m_dpl == (m_arg & 0x0f));
-
+
if ((m_arg & 0xf0) != 0xe0)
logerror("%s CLI opcode unexpected upper arg $%02X at $%03X\n", tag(), m_arg & 0xf0, m_pc);
}
@@ -530,7 +530,7 @@ void ucom4_cpu_device::op_taw()
void ucom4_cpu_device::op_taz()
{
if (!check_op_43()) return;
-
+
// TAZ: Transfer ACC to Z
m_icount--;
ucom43_reg_w(UCOM43_Z, m_acc);
@@ -539,7 +539,7 @@ void ucom4_cpu_device::op_taz()
void ucom4_cpu_device::op_thx()
{
if (!check_op_43()) return;
-
+
// THX: Transfer DPh to X
m_icount--;
ucom43_reg_w(UCOM43_X, m_dph);
@@ -548,7 +548,7 @@ void ucom4_cpu_device::op_thx()
void ucom4_cpu_device::op_tly()
{
if (!check_op_43()) return;
-
+
// TLY: Transfer DPl to Y
m_icount--;
ucom43_reg_w(UCOM43_Y, m_dpl);
@@ -560,7 +560,7 @@ void ucom4_cpu_device::op_tly()
void ucom4_cpu_device::op_xaw()
{
if (!check_op_43()) return;
-
+
// XAW: Exchange ACC with W
m_icount--;
UINT8 old_acc = m_acc;
@@ -571,7 +571,7 @@ void ucom4_cpu_device::op_xaw()
void ucom4_cpu_device::op_xaz()
{
if (!check_op_43()) return;
-
+
// XAZ: Exchange ACC with Z
m_icount--;
UINT8 old_acc = m_acc;
@@ -582,7 +582,7 @@ void ucom4_cpu_device::op_xaz()
void ucom4_cpu_device::op_xhr()
{
if (!check_op_43()) return;
-
+
// XHR: Exchange DPh with R
m_icount--;
UINT8 old_dph = m_dph;
@@ -593,7 +593,7 @@ void ucom4_cpu_device::op_xhr()
void ucom4_cpu_device::op_xhx()
{
if (!check_op_43()) return;
-
+
// XHX: Exchange DPh with X
m_icount--;
UINT8 old_dph = m_dph;
@@ -604,7 +604,7 @@ void ucom4_cpu_device::op_xhx()
void ucom4_cpu_device::op_xls()
{
if (!check_op_43()) return;
-
+
// XLS: Exchange DPl with S
m_icount--;
UINT8 old_dpl = m_dpl;
@@ -615,7 +615,7 @@ void ucom4_cpu_device::op_xls()
void ucom4_cpu_device::op_xly()
{
if (!check_op_43()) return;
-
+
// XLY: Exchange DPl with Y
m_icount--;
UINT8 old_dpl = m_dpl;
@@ -626,7 +626,7 @@ void ucom4_cpu_device::op_xly()
void ucom4_cpu_device::op_xc()
{
if (!check_op_43()) return;
-
+
// XC: Exchange Carry F/F with Carry Save F/F
UINT8 c = m_carry_f;
m_carry_f = m_carry_s_f;
@@ -639,7 +639,7 @@ void ucom4_cpu_device::op_xc()
void ucom4_cpu_device::op_sfb()
{
if (!check_op_43()) return;
-
+
// SFB B: Set a single bit of FLAG
m_icount--;
ucom43_reg_w(UCOM43_F, ucom43_reg_r(UCOM43_F) | m_bitmask);
@@ -648,7 +648,7 @@ void ucom4_cpu_device::op_sfb()
void ucom4_cpu_device::op_rfb()
{
if (!check_op_43()) return;
-
+
// RFB B: Reset a single bit of FLAG
m_icount--;
ucom43_reg_w(UCOM43_F, ucom43_reg_r(UCOM43_F) & ~m_bitmask);
@@ -657,7 +657,7 @@ void ucom4_cpu_device::op_rfb()
void ucom4_cpu_device::op_fbt()
{
if (!check_op_43()) return;
-
+
// FBT B: skip next on bit(FLAG)
m_icount--;
m_skip = ((ucom43_reg_r(UCOM43_F) & m_bitmask) != 0);
@@ -666,7 +666,7 @@ void ucom4_cpu_device::op_fbt()
void ucom4_cpu_device::op_fbf()
{
if (!check_op_43()) return;
-
+
// FBF B: skip next on not bit(FLAG)
m_icount--;
m_skip = ((ucom43_reg_r(UCOM43_F) & m_bitmask) == 0);
@@ -678,7 +678,7 @@ void ucom4_cpu_device::op_fbf()
void ucom4_cpu_device::op_rar()
{
if (!check_op_43()) return;
-
+
// RAR: Rotate ACC Right through Carry F/F
UINT8 c = m_acc & 1;
m_acc = m_acc >> 1 | m_carry_f << 3;
@@ -691,7 +691,7 @@ void ucom4_cpu_device::op_rar()
void ucom4_cpu_device::op_inm()
{
if (!check_op_43()) return;
-
+
// INM: Increment RAM, skip next on carry
UINT8 val = (ram_r() + 1) & 0xf;
ram_w(val);
@@ -701,7 +701,7 @@ void ucom4_cpu_device::op_inm()
void ucom4_cpu_device::op_dem()
{
if (!check_op_43()) return;
-
+
// DEM: Decrement RAM, skip next on carry
UINT8 val = (ram_r() - 1) & 0xf;
ram_w(val);
@@ -714,7 +714,7 @@ void ucom4_cpu_device::op_dem()
void ucom4_cpu_device::op_stm()
{
if (!check_op_43()) return;
-
+
// STM X: Reset Timer F/F, Start Timer with X
m_timer_f = 0;
@@ -730,7 +730,7 @@ void ucom4_cpu_device::op_stm()
void ucom4_cpu_device::op_ttm()
{
if (!check_op_43()) return;
-
+
// TTM: skip next on Timer F/F
m_skip = (m_timer_f != 0);
}
@@ -741,7 +741,7 @@ void ucom4_cpu_device::op_ttm()
void ucom4_cpu_device::op_ei()
{
if (!check_op_43()) return;
-
+
// EI: Set Interrupt Enable F/F
m_inte_f = 1;
}
@@ -749,7 +749,7 @@ void ucom4_cpu_device::op_ei()
void ucom4_cpu_device::op_di()
{
if (!check_op_43()) return;
-
+
// DI: Reset Interrupt Enable F/F
m_inte_f = 0;
}
diff --git a/src/emu/debug/dvbpoints.c b/src/emu/debug/dvbpoints.c
index b1a2ce8b8fa..10871ad0800 100644
--- a/src/emu/debug/dvbpoints.c
+++ b/src/emu/debug/dvbpoints.c
@@ -234,8 +234,8 @@ void debug_view_breakpoints::view_update()
m_total.y = 10;
// Draw
- debug_view_char *dest = m_viewdata;
- astring linebuf;
+ debug_view_char *dest = m_viewdata;
+ astring linebuf;
// Header
if (m_visible.y > 0)
diff --git a/src/emu/debug/dvwpoints.c b/src/emu/debug/dvwpoints.c
index ddf28ea4863..bf6618ec7bf 100644
--- a/src/emu/debug/dvwpoints.c
+++ b/src/emu/debug/dvwpoints.c
@@ -261,8 +261,8 @@ void debug_view_watchpoints::view_update()
m_total.y = 10;
// Draw
- debug_view_char *dest = m_viewdata;
- astring linebuf;
+ debug_view_char *dest = m_viewdata;
+ astring linebuf;
// Header
if (m_visible.y > 0)
diff --git a/src/emu/drivers/xtal.h b/src/emu/drivers/xtal.h
index f146cfe2f54..7487c434db1 100644
--- a/src/emu/drivers/xtal.h
+++ b/src/emu/drivers/xtal.h
@@ -57,7 +57,7 @@ enum
XTAL_2_5MHz = 2500000, /* Janken Man units */
XTAL_3MHz = 3000000, /* Probably only used to drive 68705 or similar MCUs on 80's Taito PCBs */
XTAL_3_12MHz = 3120000, /* SP0250 clock on Gottlieb games */
- XTAL_3_5MHz = 3500000, /* Reported by Commodore 65 document, true xtal unchecked on PCB */
+ XTAL_3_5MHz = 3500000, /* Reported by Commodore 65 document, true xtal unchecked on PCB */
XTAL_3_52128MHz = 3521280, /* RCA COSMAC VIP */
XTAL_3_579545MHz = 3579545, /* NTSC color subcarrier, extremely common, used on 100's of PCBs (Keytronic custom part #48-300-010 is equivalent) */
XTAL_3_6864MHz = 3686400, /* CPS3 */
diff --git a/src/emu/fileio.h b/src/emu/fileio.h
index 5b2c4d7948c..846f828a6be 100644
--- a/src/emu/fileio.h
+++ b/src/emu/fileio.h
@@ -154,7 +154,7 @@ private:
astring m_fullpath; // full filename
core_file * m_file; // core file pointer
path_iterator m_iterator; // iterator for paths
- path_iterator m_mediapaths; // media-path iterator
+ path_iterator m_mediapaths; // media-path iterator
UINT32 m_crc; // file's CRC
UINT32 m_openflags; // flags we used for the open
hash_collection m_hashes; // collection of hashes
@@ -168,7 +168,7 @@ private:
UINT64 m__7zlength; // 7Z file length
bool m_remove_on_close; // flag: remove the file when closing
- bool m_restrict_to_mediapath; // flag: restrict to paths inside the media-path
+ bool m_restrict_to_mediapath; // flag: restrict to paths inside the media-path
};
diff --git a/src/emu/machine/jvshost.c b/src/emu/machine/jvshost.c
index ec4dd5a0f94..7be67f5dc47 100644
--- a/src/emu/machine/jvshost.c
+++ b/src/emu/machine/jvshost.c
@@ -48,13 +48,13 @@ void jvs_host::commit_raw()
// - have the message length without the two header bytes but with the checksum byte in the second byte
// - have at least one command byte
if(send_size < 3 || send_buffer[0] == 0x00 || send_buffer[1] != send_size-1) {
- logerror("JVS checksum error\n");
- // "This message is crap" doesn't exist so call it checksum error
- recv_buffer[0] = 0x00;
- recv_buffer[1] = 0x02;
- recv_buffer[2] = 0x03;
- recv_size = 3;
- } else {
+ logerror("JVS checksum error\n");
+ // "This message is crap" doesn't exist so call it checksum error
+ recv_buffer[0] = 0x00;
+ recv_buffer[1] = 0x02;
+ recv_buffer[2] = 0x03;
+ recv_size = 3;
+ } else {
if(first_device) {
first_device->message(send_buffer[0], send_buffer+2, send_size-2, recv_buffer+2, recv_size);
recv_is_encoded = false;
diff --git a/src/emu/render.h b/src/emu/render.h
index b434e0db86b..2ee8e108a09 100644
--- a/src/emu/render.h
+++ b/src/emu/render.h
@@ -338,7 +338,7 @@ public:
float width; // width (for line primitives)
render_texinfo texture; // texture info (for quad primitives)
render_quad_texuv texcoords; // texture coordinates (for quad primitives)
- render_container * container; // the render container we belong to
+ render_container * container; // the render container we belong to
private:
// internal state
diff --git a/src/emu/sound/saa1099.c b/src/emu/sound/saa1099.c
index 5fcd843915a..106d0c55935 100644
--- a/src/emu/sound/saa1099.c
+++ b/src/emu/sound/saa1099.c
@@ -161,7 +161,7 @@ void saa1099_device::device_start()
/* for each chip allocate one stream */
m_stream = stream_alloc(0, 2, m_sample_rate);
-
+
save_item(NAME(m_noise_params));
save_item(NAME(m_env_enable));
save_item(NAME(m_env_reverse_right));
@@ -172,7 +172,7 @@ void saa1099_device::device_start()
save_item(NAME(m_all_ch_enable));
save_item(NAME(m_sync_state));
save_item(NAME(m_selected_reg));
-
+
for (int i = 0; i < 6; i++)
{
save_item(NAME(m_channels[i].frequency), i);
@@ -185,7 +185,7 @@ void saa1099_device::device_start()
save_item(NAME(m_channels[i].freq), i);
save_item(NAME(m_channels[i].level), i);
}
-
+
for (int i = 0; i < 2; i++)
{
save_item(NAME(m_noise[i].counter), i);
diff --git a/src/emu/video.c b/src/emu/video.c
index e9ed7a2490b..2518bd101c0 100644
--- a/src/emu/video.c
+++ b/src/emu/video.c
@@ -1048,7 +1048,7 @@ void video_manager::recompute_speed(const attotime &emutime)
if (filerr == FILERR_NONE)
save_snapshot(machine().first_screen(), file);
}
- //printf("Scheduled exit at %f\n", emutime.as_double());
+ //printf("Scheduled exit at %f\n", emutime.as_double());
// schedule our demise
machine().schedule_exit();
}
diff --git a/src/emu/video/scn2674.c b/src/emu/video/scn2674.c
index b581465eda7..025dd231f2c 100644
--- a/src/emu/video/scn2674.c
+++ b/src/emu/video/scn2674.c
@@ -699,16 +699,16 @@ void scn2674_device::device_timer(emu_timer &timer, device_timer_id id, int para
if (!m_display_cb.isnull())
m_display_cb(m_bitmap,
- i * m_hpixels_per_column,
- m_linecounter,
- tilerow,
- space().read_byte(address),
- address,
- (charrow >= m_IR6_cursor_first_scanline) && m_cursor_on,
- dw != 0,
- m_gfx_enabled != 0,
- charrow == m_IR7_cursor_underline_position,
- m_IR7_cursor_blink && (m_screen->frame_number() & (m_IR7_cursor_rate_divisor ? 0x40 : 0x20)));
+ i * m_hpixels_per_column,
+ m_linecounter,
+ tilerow,
+ space().read_byte(address),
+ address,
+ (charrow >= m_IR6_cursor_first_scanline) && m_cursor_on,
+ dw != 0,
+ m_gfx_enabled != 0,
+ charrow == m_IR7_cursor_underline_position,
+ m_IR7_cursor_blink && (m_screen->frame_number() & (m_IR7_cursor_rate_divisor ? 0x40 : 0x20)));
address = (address + 1) & 0xffff;
if(address > ((m_IR9_display_buffer_last_address << 10) | 0x3ff))
diff --git a/src/emu/video/scn2674.h b/src/emu/video/scn2674.h
index 52ec99c3af4..02efaf80fe1 100644
--- a/src/emu/video/scn2674.h
+++ b/src/emu/video/scn2674.h
@@ -19,8 +19,8 @@
#define SCN2674_DRAW_CHARACTER_MEMBER(_name) void _name(bitmap_rgb32 &bitmap, int x, int y, UINT8 linecount, UINT8 charcode, UINT16 address, UINT8 cursor, UINT8 dw, UINT8 lg, UINT8 ul, UINT8 blink)
class scn2674_device : public device_t,
- public device_video_interface,
- public device_memory_interface
+ public device_video_interface,
+ public device_memory_interface
{
public:
scn2674_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
diff --git a/src/lib/formats/ap2_dsk.c b/src/lib/formats/ap2_dsk.c
index 3f3e9d9eeca..c62033eb2ff 100644
--- a/src/lib/formats/ap2_dsk.c
+++ b/src/lib/formats/ap2_dsk.c
@@ -659,7 +659,7 @@ bool a2_16sect_format::load(io_generic *io, UINT32 form_factor, floppy_image *im
else if (!memcmp(pascal2_block1, &sector_data[0x100], 4))
{
m_prodos_order = true;
- } // check for CP/M disks in ProDOS order
+ } // check for CP/M disks in ProDOS order
else if (!memcmp(cpm22_block1, &sector_data[0x100], 8))
{
m_prodos_order = true;
diff --git a/src/lib/lib.mak b/src/lib/lib.mak
index 7729063d4cb..7ee253bce81 100644
--- a/src/lib/lib.mak
+++ b/src/lib/lib.mak
@@ -629,17 +629,17 @@ BGFXOBJS = \
$(LIBOBJ)/bgfx/common/imgui/imgui.o \
$(LIBOBJ)/bgfx/common/nanovg/nanovg.o \
$(LIBOBJ)/bgfx/common/nanovg/nanovg_bgfx.o \
-# $(LIBOBJ)/bgfx/common/entry/cmd.o \
-# $(LIBOBJ)/bgfx/common/entry/dbg.o \
-# $(LIBOBJ)/bgfx/common/entry/entry.o \
-# $(LIBOBJ)/bgfx/common/entry/entry_android.o \
-# $(LIBOBJ)/bgfx/common/entry/entry_asmjs.o \
-# $(LIBOBJ)/bgfx/common/entry/entry_linux.o \
-# $(LIBOBJ)/bgfx/common/entry/entry_nacl.o \
-# $(LIBOBJ)/bgfx/common/entry/entry_qnx.o \
-# $(LIBOBJ)/bgfx/common/entry/entry_sdl.o \
-# $(LIBOBJ)/bgfx/common/entry/entry_windows.o \
-# $(LIBOBJ)/bgfx/common/entry/input.o \
+# $(LIBOBJ)/bgfx/common/entry/cmd.o \
+# $(LIBOBJ)/bgfx/common/entry/dbg.o \
+# $(LIBOBJ)/bgfx/common/entry/entry.o \
+# $(LIBOBJ)/bgfx/common/entry/entry_android.o \
+# $(LIBOBJ)/bgfx/common/entry/entry_asmjs.o \
+# $(LIBOBJ)/bgfx/common/entry/entry_linux.o \
+# $(LIBOBJ)/bgfx/common/entry/entry_nacl.o \
+# $(LIBOBJ)/bgfx/common/entry/entry_qnx.o \
+# $(LIBOBJ)/bgfx/common/entry/entry_sdl.o \
+# $(LIBOBJ)/bgfx/common/entry/entry_windows.o \
+# $(LIBOBJ)/bgfx/common/entry/input.o \
ifeq ($(TARGETOS),macosx)
BGFXOBJS += $(LIBOBJ)/bgfx/glcontext_eagl.o
diff --git a/src/mame/audio/seibu.c b/src/mame/audio/seibu.c
index 8551fe1fcbb..968c4b4fc3d 100644
--- a/src/mame/audio/seibu.c
+++ b/src/mame/audio/seibu.c
@@ -489,7 +489,7 @@ void seibu_adpcm_device::device_start()
m_stream = machine().sound().stream_alloc(*this, 0, 1, clock());
m_base = machine().root_device().memregion(m_rom_tag)->base();
m_adpcm.reset();
-
+
save_item(NAME(m_current));
save_item(NAME(m_end));
save_item(NAME(m_nibble));
diff --git a/src/mame/audio/t5182.c b/src/mame/audio/t5182.c
index d547674403c..1394966a4ed 100644
--- a/src/mame/audio/t5182.c
+++ b/src/mame/audio/t5182.c
@@ -169,7 +169,7 @@ t5182_device::t5182_device(const machine_config &mconfig, const char *tag, devic
void t5182_device::device_start()
{
m_setirq_cb = timer_alloc(SETIRQ_CB);
-
+
save_item(NAME(m_irqstate));
save_item(NAME(m_semaphore_main));
save_item(NAME(m_semaphore_snd));
@@ -314,7 +314,7 @@ ioport_constructor t5182_device::device_input_ports() const
{
return INPUT_PORTS_NAME(t5182);
}
-
+
// 4000-407F RAM shared with main CPU
// 4000 output queue length
diff --git a/src/mame/audio/t5182.h b/src/mame/audio/t5182.h
index 2a4b046403d..6def6027e7a 100644
--- a/src/mame/audio/t5182.h
+++ b/src/mame/audio/t5182.h
@@ -22,7 +22,7 @@ public:
{
SETIRQ_CB
};
-
+
DECLARE_WRITE8_MEMBER(sound_irq_w );
DECLARE_READ8_MEMBER(sharedram_semaphore_snd_r);
DECLARE_WRITE8_MEMBER(sharedram_semaphore_main_acquire_w);
diff --git a/src/mame/drivers/armedf.c b/src/mame/drivers/armedf.c
index 84cd2a4b215..0d93a45c994 100644
--- a/src/mame/drivers/armedf.c
+++ b/src/mame/drivers/armedf.c
@@ -49,7 +49,7 @@ Notes:
01016E: btst #$7, $60621.l ;check dsw2 ram copy bit 15 (debug feature?)
010176: bne $1017e
010178: bra $f9f0 ;timer over event occurs
- btanb perhaps? Currently patched to work, might also be that DSW2 bit 7 is actually a MCU bit ready flag, so it
+ btanb perhaps? Currently patched to work, might also be that DSW2 bit 7 is actually a MCU bit ready flag, so it
definitely needs PCB tests.
@@ -1178,7 +1178,7 @@ static MACHINE_CONFIG_START( terraf, armedf_state )
MCFG_MACHINE_START_OVERRIDE(armedf_state,armedf)
MCFG_MACHINE_RESET_OVERRIDE(armedf_state,armedf)
-
+
MCFG_DEVICE_ADD("nb1414m4", NB1414M4, 0)
/* video hardware */
@@ -1277,7 +1277,7 @@ static MACHINE_CONFIG_START( kozure, armedf_state )
MCFG_MACHINE_START_OVERRIDE(armedf_state,armedf)
MCFG_MACHINE_RESET_OVERRIDE(armedf_state,armedf)
-
+
MCFG_DEVICE_ADD("nb1414m4", NB1414M4, 0)
/* video hardware */
@@ -1371,7 +1371,7 @@ static MACHINE_CONFIG_START( cclimbr2, armedf_state )
MCFG_MACHINE_START_OVERRIDE(armedf_state,armedf)
MCFG_MACHINE_RESET_OVERRIDE(armedf_state,armedf)
-
+
MCFG_DEVICE_ADD("nb1414m4", NB1414M4, 0)
/* video hardware */
@@ -1419,7 +1419,7 @@ static MACHINE_CONFIG_START( legion, armedf_state )
MCFG_MACHINE_START_OVERRIDE(armedf_state,armedf)
MCFG_MACHINE_RESET_OVERRIDE(armedf_state,armedf)
-
+
MCFG_DEVICE_ADD("nb1414m4", NB1414M4, 0)
/* video hardware */
@@ -2128,7 +2128,7 @@ DRIVER_INIT_MEMBER(armedf_state,legiono)
m_maincpu->space(AS_PROGRAM).install_write_handler(0x07c000, 0x07c001, write16_delegate(FUNC(armedf_state::bootleg_io_w),this));
m_scroll_type = 2;
-
+
save_item(NAME(m_legion_cmd));
}
diff --git a/src/mame/drivers/bnstars.c b/src/mame/drivers/bnstars.c
index 249d1cbffd8..c6e341417da 100644
--- a/src/mame/drivers/bnstars.c
+++ b/src/mame/drivers/bnstars.c
@@ -707,7 +707,7 @@ GFXDECODE_END
CUSTOM_INPUT_MEMBER(bnstars_state::mahjong_ctrl_r)
{
required_ioport_array<4> &keys = (param == 0) ? m_p1_keys : m_p2_keys;
-
+
switch (m_bnstars1_mahjong_select & 0x2080)
{
default:
diff --git a/src/mame/drivers/comebaby.c b/src/mame/drivers/comebaby.c
index 7d3ec498771..93ccd1a3775 100644
--- a/src/mame/drivers/comebaby.c
+++ b/src/mame/drivers/comebaby.c
@@ -6,7 +6,7 @@ Nearly everything.
There also appears to be a sequel which may be running on the same hardware, but which does not seem to have been released.
Come On Baby - Ballympic Heroes! (c) 2001
-
+
Other games in this series include:
Come On Baby 2 (c) 2002
Come On Baby Jr (c) 2003 (which seems to be otherwise identical to Come On Baby but in a smaller cabinet)
@@ -20,29 +20,29 @@ Nearly everything.
BIOS String: 07/03/2000-440BX-ITE8671-2A69KV3IC-00
aka. BIOS-I-2M
Award BIOS
- B1120IAG.BIN For Super IO = ITE 8671
- Clock Gen IC : Winbond-39A
- (Nov/2000 built)
-
+ B1120IAG.BIN For Super IO = ITE 8671
+ Clock Gen IC : Winbond-39A
+ (Nov/2000 built)
+
CPU - Slot 1 Celeron 633MHz (66x9.5)
Memory - 65536k SDRAM PC100
Brief motherboard overview (from PC Partner BXAS1-928 motherboard manual)
--
-
+
HARDWARE CONFIGURATION
- This motherboard is based on Intel 82440BX chipset. The chipset is a
- highly integrated solution for a cost-effective and compact motherboard.
- The motherboard supports standard DIMM module, PC-100 DIMM module or
- Registered DIMM Module.
-
+ This motherboard is based on Intel 82440BX chipset. The chipset is a
+ highly integrated solution for a cost-effective and compact motherboard.
+ The motherboard supports standard DIMM module, PC-100 DIMM module or
+ Registered DIMM Module.
+
Features on-board include....
super-I/O, Ultra DMA33 (Ultra DMA66 optional for VIA chipset), PCI bus master IDE, AGP Ver 1.0, PCI Ver 2.1 compliance,
USB, VRM 8.4 compliance, ECC, ATX specification 2.01 compliance, hardware monitoring (optional), On-board PCI Sound
Sub-system(optional, not populated). Supports PC-100 DIMM Module.
Key Features:
-
+
Processor
- Full support for the Intel Pentium II & Intel Pentium III, Intel Celeron and Deschutes processors using Slot 1 connector.
- Slot 1 connector for Intel Pentium II & Intel Pentium III microprocessors.
@@ -50,33 +50,33 @@ Nearly everything.
CPU Speed Setting
- Jumper setting or no jumper is needed to set for various speed of CPU (Factory optional).
-
+
VRM (Voltage Regulator Modules) on Board
- Flexible motherboard design with on-board VRM 8.4, easy to upgrade with
Future Intel Pentium II & Pentium III processors.
-
+
Cache
- Pentium II & Pentium III Processor built-in L2 cache.
-
+
System Memory
- Up to 384MB (SDRAM) or 768MB (Registered SDRAM) - for 440BX.
- A total of three 168-pin DIMM sockets for 440BX.
- Supports SDRAM (only for 66MHz bus speed).
- Supports PC-100.
-
+
Memory Organization
- Supports single-density DIMMs of 1MB, 2MB, 4MB, 8MB and 16MB depth (x64 or 72).
- Supports double-density DIMMs of 2MB, 4MB, 8MB, 16MB and 32MB depth
(x64 or 72).
- Supports error checking correction (ECC) using parity DRAM modules (for 440BX).
- Banks of different DRAM types depths can be mixed.
-
+
Expansion Slots
- Supports SB-LINK Port for Creative Sound PCI Card.
- 1 AGP slot (ver. 1.0, 1x/2x mode supported).
- 5 PCI bus master slots (rev. 2.1 compliant, with 1 PCI slot sharing with 1 ISA slot)
- 2 ISA slots (1 ISA slot sharing with 1 PCI slot).
-
+
On-Board I/O
- Two PCI fast IDE ports supporting up to 4 ATA2, Ultra DMA33 IDE HDDs, Ultra DMA66 (optional only for VIA Chipset)
IDE HDDs, CD-Roms, ZIP devices and LS-120 drives as boot drive.
@@ -91,19 +91,19 @@ Nearly everything.
- PS/2 mouse port.
- Infrared (IrDA) support (via a header).
- One Line / Speaker out, one Mic in, one Line in and MIDI / Gameport
-
+
System BIOS
- 2MB flash BIOS supporting PnP, APM, ATAPI, ACPI and DMI;
- Jumper selection for 5V or 12V flash memory voltage.
- Auto detects and supports LBA hard disks with formatted capacities over
8.4GB.
- Easily upgradable by end-user.
-
+
Plug-and-Play
- Supports Plug-and-Play Specification 1.1.
- Plug-and-play for DOS, Windows 3.X, Windows 95 as well as Windows 98.
- Fully steerable PCI interrupts.
-
+
Power Management
- Supports SMM, APM and ACPI.
- Break switch for instant suspend/resume on system operation.
@@ -111,7 +111,7 @@ Nearly everything.
- Supports WAKE-ON-LAN (WOL).
- Supports Wake on Ring for External Modem.
- Supports ATX specification 2.01.
-
+
Creative PCI Sound (optional, not populated)
- Full DOS game support (DDMA, PC/PCI, CLS).
- PCI 2.1 Bus Master, hardware sound acceleration.
@@ -119,13 +119,13 @@ Nearly everything.
- Full Duplex, 3D Enhancement, Software wavetable.
- PNP and APM 1.2 support.
- Win95/98, NT drivers ready.
-
+
Keyboard Password Turn ON
- Special feature for system security.
-
+
System monitoring (optional)
- Hardware monitoring circuitry is supported, provides voltages, temperature, fan speeds etc. monitoring.
-
+
--
The donor PC looks like a standard Windows 98 setup.
@@ -140,8 +140,8 @@ Nearly everything.
It uses DirectSound and the Microsoft MCI interfaces and 3dfx Glide for video.
The PC that the game was dumped from has Sound Blaster and Ensoniq drivers,
but it works fine with some other sound configurations.
- The sound chip on the motherboard is not populated. There is a cheap Korean
- sound card "CS-6500P Made In Korea OJU CTN CO LTD." plugged into one of the
+ The sound chip on the motherboard is not populated. There is a cheap Korean
+ sound card "CS-6500P Made In Korea OJU CTN CO LTD." plugged into one of the
slots containing a CRYSTAL CS4281-CM chip.
The donor PC has a "3dfxvoodoo3" driver installation directory, but it works
fine with a Voodoo4 4500.
diff --git a/src/mame/drivers/cops.c b/src/mame/drivers/cops.c
index a9479e07150..270cff634d3 100644
--- a/src/mame/drivers/cops.c
+++ b/src/mame/drivers/cops.c
@@ -889,12 +889,12 @@ ROM_START( cops )
ROM_REGION( 0x8000, "system", 0 )
ROM_LOAD( "cops_sys.dat", 0x0000, 0x8000, CRC(0060e5d0) SHA1(b8c9f6fde6a315e33fa7946e5d3bb4ea2fbe76a8) )
-
+
DISK_REGION( "audiocd" )
- DISK_IMAGE_READONLY( "copscd", 0, NO_DUMP )
+ DISK_IMAGE_READONLY( "copscd", 0, NO_DUMP )
DISK_REGION( "laserdisc" )
- DISK_IMAGE_READONLY( "cops", 0, NO_DUMP )
+ DISK_IMAGE_READONLY( "cops", 0, NO_DUMP )
ROM_END
ROM_START( copsuk )
@@ -905,10 +905,10 @@ ROM_START( copsuk )
ROM_LOAD( "cops_sys.dat", 0x0000, 0x8000, CRC(0060e5d0) SHA1(b8c9f6fde6a315e33fa7946e5d3bb4ea2fbe76a8) )
DISK_REGION( "audiocd" )
- DISK_IMAGE_READONLY( "copscd", 0, NO_DUMP )
+ DISK_IMAGE_READONLY( "copscd", 0, NO_DUMP )
DISK_REGION( "laserdisc" )
- DISK_IMAGE_READONLY( "cops", 0, NO_DUMP )
+ DISK_IMAGE_READONLY( "cops", 0, NO_DUMP )
ROM_END
ROM_START( revlatns )
@@ -919,7 +919,7 @@ ROM_START( revlatns )
ROM_LOAD( "revelations_sys.bin", 0x0000, 0x8000, CRC(43e5e3ec) SHA1(fa44b102b5aa7ad2421c575abdc67f1c29f23bc1) )
DISK_REGION( "laserdisc" )
- DISK_IMAGE_READONLY( "revlatns", 0, NO_DUMP )
+ DISK_IMAGE_READONLY( "revlatns", 0, NO_DUMP )
ROM_END
diff --git a/src/mame/drivers/cps2.c b/src/mame/drivers/cps2.c
index c785c28c8df..d730dd6640e 100644
--- a/src/mame/drivers/cps2.c
+++ b/src/mame/drivers/cps2.c
@@ -494,7 +494,7 @@ Notes:
2 RCA cables from A-board CN L/R go in at the top. The audio goes through
Mitsumi MM1326 series "Q Expander" ICs responsible for creating the 3D stereo
effect. The 4-pin connector at the bottom goes to the cabinet speakers.
-
+
IC1 - don't know yet which chip is which
IC2 - "
IC3 - "
diff --git a/src/mame/drivers/cyclemb.c b/src/mame/drivers/cyclemb.c
index ee0d4187f02..f1019c86236 100644
--- a/src/mame/drivers/cyclemb.c
+++ b/src/mame/drivers/cyclemb.c
@@ -97,7 +97,7 @@ public:
required_device<cpu_device> m_audiocpu;
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
-
+
required_shared_ptr<UINT8> m_vram;
required_shared_ptr<UINT8> m_cram;
required_shared_ptr<UINT8> m_obj1_ram;
@@ -121,13 +121,13 @@ public:
DECLARE_WRITE8_MEMBER(cyclemb_flip_w);
DECLARE_READ8_MEMBER(skydest_i8741_0_r);
DECLARE_WRITE8_MEMBER(skydest_i8741_0_w);
-
+
DECLARE_DRIVER_INIT(skydest);
DECLARE_DRIVER_INIT(cyclemb);
virtual void machine_start();
virtual void machine_reset();
DECLARE_PALETTE_INIT(cyclemb);
-
+
UINT32 screen_update_cyclemb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
UINT32 screen_update_skydest(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void cyclemb_draw_tilemap(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/drivers/d9final.c b/src/mame/drivers/d9final.c
index 4c4990b92d2..a9ceacf0656 100644
--- a/src/mame/drivers/d9final.c
+++ b/src/mame/drivers/d9final.c
@@ -39,24 +39,24 @@ public:
required_device<cpu_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode;
-
+
required_shared_ptr<UINT8> m_lo_vram;
required_shared_ptr<UINT8> m_hi_vram;
required_shared_ptr<UINT8> m_cram;
-
+
tilemap_t *m_sc0_tilemap;
-
+
DECLARE_WRITE8_MEMBER(sc0_lovram);
DECLARE_WRITE8_MEMBER(sc0_hivram);
DECLARE_WRITE8_MEMBER(sc0_cram);
DECLARE_WRITE8_MEMBER(bank_w);
DECLARE_READ8_MEMBER(prot_latch_r);
-
+
TILE_GET_INFO_MEMBER(get_sc0_tile_info);
-
+
virtual void machine_start();
virtual void video_start();
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
};
diff --git a/src/mame/drivers/darkmist.c b/src/mame/drivers/darkmist.c
index 834c5434f33..3b18e306571 100644
--- a/src/mame/drivers/darkmist.c
+++ b/src/mame/drivers/darkmist.c
@@ -229,7 +229,7 @@ static MACHINE_CONFIG_START( darkmist, darkmist_state )
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", darkmist_state, scanline, "screen", 0, 1)
MCFG_DEVICE_ADD("t5182", T5182, 0)
-
+
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/dlair2.c b/src/mame/drivers/dlair2.c
index 12a657416f8..23bdbbb480a 100644
--- a/src/mame/drivers/dlair2.c
+++ b/src/mame/drivers/dlair2.c
@@ -205,7 +205,7 @@ MACHINE_CONFIG_END
ROM_START( dlair2 )
ROM_REGION( 0x10000, "ipl", 0 )
ROM_LOAD( "dl2_319.bin", 0x00000, 0x10000, CRC(e9453a1b) SHA1(eb1201abd0124f6edbabd49bec81af827369cb2c) )
-
+
DISK_REGION( "laserdisc" )
DISK_IMAGE_READONLY( "C-910-00002-00", 0, NO_DUMP )
ROM_END
@@ -213,7 +213,7 @@ ROM_END
ROM_START( dlair2_319e )
ROM_REGION( 0x10000, "ipl", 0 )
ROM_LOAD( "dl2euro3.19.bin", 0x00000, 0x10000, CRC(cc23ad9f) SHA1(24add8f03749dcc27b1b166dc2e5d346534a0088) )
-
+
DISK_REGION( "laserdisc" )
DISK_IMAGE_READONLY( "C-910-00002-00", 0, NO_DUMP )
ROM_END
diff --git a/src/mame/drivers/dreambal.c b/src/mame/drivers/dreambal.c
index a2cf7bc3c45..0dbb573189a 100644
--- a/src/mame/drivers/dreambal.c
+++ b/src/mame/drivers/dreambal.c
@@ -48,7 +48,7 @@ public:
DECLARE_DRIVER_INIT(dreambal);
virtual void machine_start();
virtual void machine_reset();
-
+
UINT32 screen_update_dreambal(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECO16IC_BANK_CB_MEMBER(bank_callback);
diff --git a/src/mame/drivers/exidyttl.c b/src/mame/drivers/exidyttl.c
index 93355883342..cf702429a89 100644
--- a/src/mame/drivers/exidyttl.c
+++ b/src/mame/drivers/exidyttl.c
@@ -141,7 +141,7 @@ ROM_START( attckexd )
ROM_LOAD( "attack.k6", 0x0000, 0x0100, CRC(e120839f) SHA1(74dc19a732238d35e467d814ead581a60463aaa2) )
ROM_END
-ROM_START( attckexd2 ) // These are likely an overdump, but we are waiting for confirmation before removing the files
+ROM_START( attckexd2 ) // These are likely an overdump, but we are waiting for confirmation before removing the files
ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 )
ROM_REGION( 0x0400, "roms", ROMREGION_ERASE00 )
diff --git a/src/mame/drivers/expro02.c b/src/mame/drivers/expro02.c
index 11daf1b7d43..f56c061bf2f 100644
--- a/src/mame/drivers/expro02.c
+++ b/src/mame/drivers/expro02.c
@@ -5,21 +5,21 @@
Used by the newer (or possibly older/original) revisions of Gals Panic
also the basis of the various Comad clones
- Fantasia 1994 Comad
- Super Model 1994 Comad
- New Fantasia 1994 Comad
- New Fantasia 1995 Comad (set 2)
- Fantasy '95 1995 Hi-max Technology Inc. (Running on a Comad PCB)
- Miss World '96 1996 Comad
- Ms/Mr World '96 1996 Comad
- Fantasia II 1997 Comad
-
+ Fantasia 1994 Comad
+ Super Model 1994 Comad
+ New Fantasia 1994 Comad
+ New Fantasia 1995 Comad (set 2)
+ Fantasy '95 1995 Hi-max Technology Inc. (Running on a Comad PCB)
+ Miss World '96 1996 Comad
+ Ms/Mr World '96 1996 Comad
+ Fantasia II 1997 Comad
+
The following seem similar but could have other changes
- Pocket Gal VIP /
- Gals Hustler 1997 Ace International
- Zip & Zap 1995 Barko Corp
-
+ Pocket Gal VIP /
+ Gals Hustler 1997 Ace International
+ Zip & Zap 1995 Barko Corp
+
Notes:
- In gfx data banking function, some strange gfx are shown. Timing issue?
@@ -294,7 +294,7 @@ UINT32 expro02_state::screen_update_backgrounds(screen_device &screen, bitmap_in
/*
else
{
- dest[x] = 0x0000;
+ dest[x] = 0x0000;
}
*/
@@ -967,7 +967,7 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( comad_noview2, comad )
MCFG_DEVICE_REMOVE("view2_0")
-
+
MCFG_GFXDECODE_MODIFY("gfxdecode", expro02_noview2)
MACHINE_CONFIG_END
@@ -1001,8 +1001,8 @@ static MACHINE_CONFIG_DERIVED( galhustl, comad_noview2 )
MCFG_OKIM6295_REPLACE("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SCREEN_MODIFY("screen")
- MCFG_SCREEN_UPDATE_DRIVER(expro02_state, screen_update_zipzap)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_UPDATE_DRIVER(expro02_state, screen_update_zipzap)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( zipzap, comad_noview2 )
@@ -1012,8 +1012,8 @@ static MACHINE_CONFIG_DERIVED( zipzap, comad_noview2 )
MCFG_OKIM6295_REPLACE("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SCREEN_MODIFY("screen") // doesn't work with original kaneko_spr implementation
- MCFG_SCREEN_UPDATE_DRIVER(expro02_state, screen_update_zipzap)
+ MCFG_SCREEN_MODIFY("screen") // doesn't work with original kaneko_spr implementation
+ MCFG_SCREEN_UPDATE_DRIVER(expro02_state, screen_update_zipzap)
MACHINE_CONFIG_END
/*************************************
@@ -1764,7 +1764,7 @@ ROM_END
*************************************/
DRIVER_INIT_MEMBER(expro02_state,expro02)
-{
+{
UINT32 *src = (UINT32 *)memregion("gfx3" )->base();
UINT32 *dst = (UINT32 *)memregion("gfx2" )->base();
int x, offset;
diff --git a/src/mame/drivers/fuukifg3.c b/src/mame/drivers/fuukifg3.c
index a5622bffd81..60fc54758f3 100644
--- a/src/mame/drivers/fuukifg3.c
+++ b/src/mame/drivers/fuukifg3.c
@@ -432,7 +432,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( asurabusa )
PORT_INCLUDE(asurabld)
-
+
PORT_MODIFY("INPUTS")
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
diff --git a/src/mame/drivers/galivan.c b/src/mame/drivers/galivan.c
index 150a65bdea1..8c0150ac1a5 100644
--- a/src/mame/drivers/galivan.c
+++ b/src/mame/drivers/galivan.c
@@ -471,7 +471,7 @@ static MACHINE_CONFIG_START( ninjemak, galivan_state )
MCFG_MACHINE_START_OVERRIDE(galivan_state,ninjemak)
MCFG_MACHINE_RESET_OVERRIDE(galivan_state,ninjemak)
-
+
MCFG_DEVICE_ADD("nb1414m4", NB1414M4, 0)
/* video hardware */
@@ -507,7 +507,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(youmab, ninjemak)
-
+
MCFG_DEVICE_REMOVE("nb1414m4")
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/galpani2.c b/src/mame/drivers/galpani2.c
index ef6c9eefa1d..022b9b866f7 100644
--- a/src/mame/drivers/galpani2.c
+++ b/src/mame/drivers/galpani2.c
@@ -125,7 +125,7 @@ void galpani2_state::machine_start()
UINT8 *ROM = memregion("subdata")->base();
membank("subdatabank")->configure_entries(0, 0x2000000/0x0800000, ROM, 0x0800000);
membank("subdatabank")->set_entry(0);
-
+
save_item(NAME(m_eeprom_word));
save_item(NAME(m_old_mcu_nmi1));
save_item(NAME(m_old_mcu_nmi2));
diff --git a/src/mame/drivers/galpani3.c b/src/mame/drivers/galpani3.c
index d245bdae454..6a6f215a955 100644
--- a/src/mame/drivers/galpani3.c
+++ b/src/mame/drivers/galpani3.c
@@ -113,7 +113,7 @@ public:
virtual void video_start();
-
+
UINT32 screen_update_galpani3(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
TIMER_DEVICE_CALLBACK_MEMBER(galpani3_vblank);
int gp3_is_alpha_pen(int pen);
@@ -147,7 +147,7 @@ void galpani3_state::video_start()
{
/* so we can use video/sknsspr.c */
m_spritegen->skns_sprite_kludge(0,0);
-
+
save_item(NAME(m_priority_buffer_scrollx));
save_item(NAME(m_priority_buffer_scrolly));
save_item(NAME(m_spriteram32));
diff --git a/src/mame/drivers/galpanic.c b/src/mame/drivers/galpanic.c
index c3ad639e0a6..590618aa5d1 100644
--- a/src/mame/drivers/galpanic.c
+++ b/src/mame/drivers/galpanic.c
@@ -314,4 +314,3 @@ ROM_END
GAME( 1990, galpanic, 0, galpanic, galpanic, driver_device, 0, ROT90, "Kaneko", "Gals Panic (Unprotected)", GAME_NO_COCKTAIL )
GAME( 1990, galpanica,galpanic, galpanica,galpanica, driver_device, 0, ROT90, "Kaneko", "Gals Panic (MCU Protected)", GAME_NO_COCKTAIL )
-
diff --git a/src/mame/drivers/gladiatr.c b/src/mame/drivers/gladiatr.c
index f571c5a6a77..8f8fb0c37da 100644
--- a/src/mame/drivers/gladiatr.c
+++ b/src/mame/drivers/gladiatr.c
@@ -1032,7 +1032,7 @@ DRIVER_INIT_MEMBER(gladiatr_state,ppking)
}
}
m_maincpu->space(AS_PROGRAM).install_read_handler(0xf6a3,0xf6a3,read8_delegate(FUNC(gladiatr_state::ppking_f6a3_r),this));
-
+
save_item(NAME(m_data1));
save_item(NAME(m_data2));
}
diff --git a/src/mame/drivers/gluck2.c b/src/mame/drivers/gluck2.c
index b5421cc8859..06b0ee36794 100644
--- a/src/mame/drivers/gluck2.c
+++ b/src/mame/drivers/gluck2.c
@@ -211,20 +211,20 @@ public:
required_device<cpu_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode;
-
+
required_shared_ptr<UINT8> m_videoram;
required_shared_ptr<UINT8> m_colorram;
-
+
tilemap_t *m_bg_tilemap;
-
+
DECLARE_WRITE8_MEMBER(videoram_w);
DECLARE_WRITE8_MEMBER(colorram_w);
DECLARE_WRITE8_MEMBER(counters_w);
TILE_GET_INFO_MEMBER(get_tile_info);
-
+
virtual void video_start();
DECLARE_PALETTE_INIT(gluck2);
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
};
diff --git a/src/mame/drivers/goodejan.c b/src/mame/drivers/goodejan.c
index 23283a4f039..c3b531b229b 100644
--- a/src/mame/drivers/goodejan.c
+++ b/src/mame/drivers/goodejan.c
@@ -101,12 +101,12 @@ public:
tilemap_t *m_sc1_tilemap;
tilemap_t *m_sc2_tilemap;
tilemap_t *m_sc3_tilemap;
-
+
UINT16 m_mux_data;
UINT16 m_seibucrtc_sc0bank;
UINT16 m_layer_en;
UINT16 m_scrollram[6];
-
+
DECLARE_WRITE16_MEMBER(gfxbank_w);
DECLARE_READ16_MEMBER(mahjong_panel_r);
DECLARE_WRITE16_MEMBER(mahjong_panel_w);
@@ -116,14 +116,14 @@ public:
DECLARE_WRITE16_MEMBER(seibucrtc_sc3vram_w);
DECLARE_WRITE16_MEMBER(layer_en_w);
DECLARE_WRITE16_MEMBER(layer_scroll_w);
-
+
TILE_GET_INFO_MEMBER(seibucrtc_sc0_tile_info);
TILE_GET_INFO_MEMBER(seibucrtc_sc1_tile_info);
TILE_GET_INFO_MEMBER(seibucrtc_sc2_tile_info);
TILE_GET_INFO_MEMBER(seibucrtc_sc3_tile_info);
-
+
INTERRUPT_GEN_MEMBER(irq);
-
+
void seibucrtc_sc0bank_w(UINT16 data);
void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect,int pri);
virtual void video_start();
@@ -355,7 +355,7 @@ void goodejan_state::video_start()
m_sc3_tilemap->set_transparent_pen(15);
m_seibucrtc_sc0bank = 0;
-
+
save_item(NAME(m_mux_data));
save_item(NAME(m_seibucrtc_sc0bank));
save_item(NAME(m_layer_en));
diff --git a/src/mame/drivers/gunsmoke.c b/src/mame/drivers/gunsmoke.c
index fa5e8dca89b..46359c95f4f 100644
--- a/src/mame/drivers/gunsmoke.c
+++ b/src/mame/drivers/gunsmoke.c
@@ -587,5 +587,5 @@ ROM_END
GAME( 1985, gunsmoke, 0, gunsmoke, gunsmoke, driver_device, 0, ROT270, "Capcom", "Gun.Smoke (World, 851115)", GAME_SUPPORTS_SAVE ) // GSE_03
GAME( 1985, gunsmokeb, gunsmoke, gunsmoke, gunsmoke, driver_device, 0, ROT270, "bootleg", "Gun.Smoke (World, 851115) (bootleg)", GAME_SUPPORTS_SAVE ) // based on above version, warning message patched out
GAME( 1985, gunsmokej, gunsmoke, gunsmoke, gunsmoke, driver_device, 0, ROT270, "Capcom", "Gun.Smoke (Japan, 851115)", GAME_SUPPORTS_SAVE ) // GSJ_03
-GAME( 1985, gunsmokeu, gunsmoke, gunsmoke, gunsmoke, driver_device, 0, ROT270, "Capcom (Romstar license)", "Gun.Smoke (US, 851115)", GAME_SUPPORTS_SAVE ) // GSR_03
+GAME( 1985, gunsmokeu, gunsmoke, gunsmoke, gunsmoke, driver_device, 0, ROT270, "Capcom (Romstar license)", "Gun.Smoke (US, 851115)", GAME_SUPPORTS_SAVE ) // GSR_03
GAME( 1986, gunsmokeua, gunsmoke, gunsmoke, gunsmokeua, driver_device, 0, ROT270, "Capcom (Romstar license)", "Gun.Smoke (US, 860408)", GAME_SUPPORTS_SAVE ) // GSA_03
diff --git a/src/mame/drivers/hornet.c b/src/mame/drivers/hornet.c
index 05947090928..103a099d3e8 100644
--- a/src/mame/drivers/hornet.c
+++ b/src/mame/drivers/hornet.c
@@ -535,7 +535,7 @@ READ8_MEMBER(hornet_state::sysreg_r)
0x02 = ADDOR (ADC DOR)
0x01 = ADDO (ADC DO)
*/
- r = 0xf0;
+ r = 0xf0;
if (m_lan_eeprom)
r |= m_lan_eeprom->do_read() << 3;
r |= m_adc12138->do_r(space, 0) | (m_adc12138->eoc_r(space, 0) << 2);
@@ -987,7 +987,7 @@ static MACHINE_CONFIG_START( hornet, hornet_state )
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
// PCB description at top doesn't mention any EEPROM on the base board...
-// MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
+// MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
MCFG_DEVICE_ADD("voodoo0", VOODOO_1, STD_VOODOO_1_CLOCK)
MCFG_VOODOO_FBMEM(2)
diff --git a/src/mame/drivers/igs011.c b/src/mame/drivers/igs011.c
index c7f42ef3cb3..666714e6289 100644
--- a/src/mame/drivers/igs011.c
+++ b/src/mame/drivers/igs011.c
@@ -1103,14 +1103,14 @@ WRITE16_MEMBER(igs011_state::igs011_prot_addr_w)
sp.install_rom(m_prot1_addr + 0, m_prot1_addr + 9, rom + m_prot1_addr);
m_prot1_addr = (data << 4) ^ 0x8340;
-
+
prot_mem_range_set();
}
void igs011_state::prot_mem_range_set()
-{
+{
address_space &sp = m_maincpu->space(AS_PROGRAM);
-
+
// Add protection memory range
sp.install_write_handler(m_prot1_addr + 0, m_prot1_addr + 7, write16_delegate(FUNC(igs011_state::igs011_prot1_w), this));
sp.install_read_handler (m_prot1_addr + 8, m_prot1_addr + 9, read16_delegate(FUNC(igs011_state::igs011_prot1_r), this));
diff --git a/src/mame/drivers/limenko.c b/src/mame/drivers/limenko.c
index 9f6868de4dd..aafb43123ba 100644
--- a/src/mame/drivers/limenko.c
+++ b/src/mame/drivers/limenko.c
@@ -52,7 +52,7 @@ public:
optional_device<qs1000_device> m_qs1000;
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
-
+
required_shared_ptr<UINT32> m_mainram;
required_shared_ptr<UINT32> m_fg_videoram;
required_shared_ptr<UINT32> m_md_videoram;
@@ -60,17 +60,17 @@ public:
required_shared_ptr<UINT32> m_spriteram;
required_shared_ptr<UINT32> m_spriteram2;
required_shared_ptr<UINT32> m_videoreg;
-
+
tilemap_t *m_bg_tilemap;
tilemap_t *m_md_tilemap;
tilemap_t *m_fg_tilemap;
-
+
int m_spriteram_bit;
bitmap_ind16 m_sprites_bitmap;
bitmap_ind8 m_sprites_bitmap_pri;
int m_prev_sprites_count;
UINT8 m_spotty_sound_cmd;
-
+
DECLARE_WRITE32_MEMBER(limenko_coincounter_w);
DECLARE_WRITE32_MEMBER(bg_videoram_w);
DECLARE_WRITE32_MEMBER(md_videoram_w);
@@ -89,7 +89,7 @@ public:
DECLARE_WRITE8_MEMBER(qs1000_p1_w);
DECLARE_WRITE8_MEMBER(qs1000_p2_w);
DECLARE_WRITE8_MEMBER(qs1000_p3_w);
-
+
DECLARE_CUSTOM_INPUT_MEMBER(spriteram_bit_r);
DECLARE_DRIVER_INIT(common);
@@ -97,11 +97,11 @@ public:
DECLARE_DRIVER_INIT(dynabomb);
DECLARE_DRIVER_INIT(legendoh);
DECLARE_DRIVER_INIT(spotty);
-
+
TILE_GET_INFO_MEMBER(get_bg_tile_info);
TILE_GET_INFO_MEMBER(get_md_tile_info);
TILE_GET_INFO_MEMBER(get_fg_tile_info);
-
+
virtual void video_start();
UINT32 screen_update_limenko(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_single_sprite(bitmap_ind16 &dest_bmp,const rectangle &clip,gfx_element *gfx,UINT32 code,UINT32 color,int flipx,int flipy,int sx,int sy,int priority);
@@ -505,7 +505,7 @@ void limenko_state::video_start()
m_sprites_bitmap.allocate(384,240);
m_sprites_bitmap_pri.allocate(384,240);
-
+
save_item(NAME(m_spriteram_bit));
save_item(NAME(m_prev_sprites_count));
}
@@ -1146,7 +1146,7 @@ DRIVER_INIT_MEMBER(limenko_state,spotty)
m_maincpu->space(AS_PROGRAM).install_read_handler(0x6626c, 0x6626f, read32_delegate(FUNC(limenko_state::spotty_speedup_r), this));
m_spriteram_bit = 1;
-
+
save_item(NAME(m_spotty_sound_cmd));
}
diff --git a/src/mame/drivers/lordgun.c b/src/mame/drivers/lordgun.c
index e025a8347ef..efddf3ea444 100644
--- a/src/mame/drivers/lordgun.c
+++ b/src/mame/drivers/lordgun.c
@@ -1049,9 +1049,9 @@ DRIVER_INIT_MEMBER(lordgun_state, lordgun)
rom[i] = x;
}
-
+
save_item(NAME(m_old));
-
+
for (int i = 0; i < 2; i++)
{
save_item(NAME(m_gun[i].scr_x), i);
diff --git a/src/mame/drivers/mastboy.c b/src/mame/drivers/mastboy.c
index b7388588265..2406291075c 100644
--- a/src/mame/drivers/mastboy.c
+++ b/src/mame/drivers/mastboy.c
@@ -458,12 +458,12 @@ public:
required_device<msm5205_device> m_msm;
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
-
+
required_shared_ptr<UINT8> m_nvram;
required_shared_ptr<UINT8> m_workram;
required_shared_ptr<UINT8> m_tileram;
required_shared_ptr<UINT8> m_colram;
-
+
UINT8* m_vram;
UINT8 m_bank;
int m_irq0_ack;
@@ -503,7 +503,7 @@ public:
void mastboy_state::video_start()
{
m_gfxdecode->gfx(0)->set_source(m_vram);
-
+
save_pointer(NAME(m_vram), 0x10000);
}
@@ -877,7 +877,7 @@ GFXDECODE_END
void mastboy_state::machine_start()
{
m_vram = memregion( "gfx1" )->base(); // makes decoding the RAM based tiles easier this way
-
+
save_item(NAME(m_bank));
save_item(NAME(m_irq0_ack));
save_item(NAME(m_backupram_enabled));
diff --git a/src/mame/drivers/mcr.c b/src/mame/drivers/mcr.c
index 4bdf83fff61..60d6c2b4a61 100644
--- a/src/mame/drivers/mcr.c
+++ b/src/mame/drivers/mcr.c
@@ -2699,9 +2699,9 @@ ROM_START( nflfoot )
ROM_LOAD( "nflvidfg.cp7", 0x0a000, 0x2000, CRC(73f62392) SHA1(18f28be7264f8edff38f8a6aa067eeb1970f544c) )
ROM_LOAD( "nflvidfg.c10", 0x0c000, 0x2000, CRC(1766dcc7) SHA1(df499e3c66ae702d2d56e6cd095a754665569fcd) )
ROM_LOAD( "nflvidfg.cp9", 0x0e000, 0x2000, CRC(46558146) SHA1(4bedfae8cf0fcb9d837706ee13fbe3944ab47216) )
-
+
DISK_REGION( "ced_videodisc" )
- DISK_IMAGE_READONLY( "nflfoot", 0, NO_DUMP )
+ DISK_IMAGE_READONLY( "nflfoot", 0, NO_DUMP )
ROM_END
diff --git a/src/mame/drivers/namcops2.c b/src/mame/drivers/namcops2.c
index c4d524b86b3..7e1e5b11c66 100644
--- a/src/mame/drivers/namcops2.c
+++ b/src/mame/drivers/namcops2.c
@@ -571,7 +571,7 @@ ROM_START( vnight )
ROM_LOAD( "vpn3verb.ic002", 0x000000, 0x800000, CRC(d0011dc6) SHA1(d01a418b4b83057708e8f0ac4b271112b4a24d15) )
ROM_LOAD( "vpn3verb_spr.ic002", 0x800000, 0x040000, CRC(41169c24) SHA1(40bffbe93da65fe5512be9f80254b034a071c38b) )
- DISK_REGION("dvd") // actually single-track CD-ROM
+ DISK_REGION("dvd") // actually single-track CD-ROM
DISK_IMAGE_READONLY( "vpn1cd0", 0, SHA1(714bd19eee3b31a060223003e4567e405ce04cd7) )
ROM_END
diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c
index 65f60e903e3..7f013ab6ebf 100644
--- a/src/mame/drivers/naomi.c
+++ b/src/mame/drivers/naomi.c
@@ -2670,8 +2670,8 @@ MACHINE_CONFIG_END
*/
/*
static MACHINE_CONFIG_DERIVED( naomi2, naomi )
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(naomi2_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(naomi2_map)
MACHINE_CONFIG_END
*/
/*
@@ -3467,13 +3467,13 @@ ROM_START( derbyoc )
// 840-0016 1999 317-0262-JPN Naomi
ROM_PARAMETER( ":rom_board:segam2crypt:key", "280fee35" )
/*
- 838-13661 RS422/RS232C BD DOC
- IC1 - Toshiba TMPZ84C015BF-10 Z80-based MCU
- IC6 - Toshiba TC551001CF-70L 128k x8 SRAM
- IC8 - Sega 315-5338A
- OSC1 - 19.680MHz OSC2 - 32.000MHz
+ 838-13661 RS422/RS232C BD DOC
+ IC1 - Toshiba TMPZ84C015BF-10 Z80-based MCU
+ IC6 - Toshiba TC551001CF-70L 128k x8 SRAM
+ IC8 - Sega 315-5338A
+ OSC1 - 19.680MHz OSC2 - 32.000MHz
- connected between Naomi motherboard and card reader/printer, accessed via MIE MCU ports 0x09-0x0d
+ connected between Naomi motherboard and card reader/printer, accessed via MIE MCU ports 0x09-0x0d
*/
ROM_REGION( 0x10000, "rs422_io", 0 )
ROM_LOAD( "epr-22083.ic7", 0x0000, 0x10000, CRC(c70b0de9) SHA1(329c924b4d29017482b1ecca839fb610ca20b2af) )
diff --git a/src/mame/drivers/nbmj9195.c b/src/mame/drivers/nbmj9195.c
index 8cc1ebf882d..5d479b70920 100644
--- a/src/mame/drivers/nbmj9195.c
+++ b/src/mame/drivers/nbmj9195.c
@@ -3720,9 +3720,9 @@ ROM_START( shabdama )
ROM_LOAD( "6.bin", 0x020000, 0x010000, CRC(0fece809) SHA1(1fe8436af8ead02a3b517b6306f9824cd64b2d26) )
ROM_LOAD( "5.bin", 0x010000, 0x010000, CRC(0706386a) SHA1(29eee363775869dcc9c46285632e8bf745c9110b) )
ROM_LOAD( "4.bin", 0x000000, 0x010000, CRC(199e2127) SHA1(2514d51cb06438b312d1f328c72baa739280416a) )
-
+
DISK_REGION( "laserdisc" )
- DISK_IMAGE_READONLY( "shabdama", 0, NO_DUMP )
+ DISK_IMAGE_READONLY( "shabdama", 0, NO_DUMP )
ROM_END
// YEAR, NAME, PARENT, MACHINE, INPUT, INIT, MONITOR, COMPANY, FULLNAME, FLAGS
diff --git a/src/mame/drivers/nwk-tr.c b/src/mame/drivers/nwk-tr.c
index b5562105c85..d3946c3c3a3 100644
--- a/src/mame/drivers/nwk-tr.c
+++ b/src/mame/drivers/nwk-tr.c
@@ -48,7 +48,7 @@ DIPSW are present on the main board (instead of on the filter board) and the
SOIC8 chip (a secured PIC?) is not populated (the solder pads are there though).
There's an extra sound IC AN7395S (it's not populated on Hornet).
The PALs/PLDs are the same on NWK-TR and Hornet.
-Both Racing JAM/Chapter 2 and Thrill Drive use two video boards.
+Both Racing JAM/Chapter 2 and Thrill Drive use two video boards.
The top video board is set to MASTER/TWIN, lower video board is set to SLAVE
They are otherwise identical.
@@ -91,7 +91,7 @@ Notes:
DRM1M4SJ8 - Fujitsu 81C4256 256kx4 DRAM (SOJ24)
SRAM256K - Cypress CY7C199 32kx8 SRAM (SOJ28)
DRAM16X16 - Fujitsu 8118160A-60 16megx16 DRAM (SOJ42)
- M48T58Y-70PC1 - ST Timekeeper RAM
+ M48T58Y-70PC1 - ST Timekeeper RAM
RF5C400 - Ricoh RF5C400 PCM 32Ch, 44.1 kHz Stereo, 3D Effect Spatializer, clock input 16.9344MHz
056800 - Konami Custom (QFP80)
058232 - Konami Custom Ceramic Package (SIL14)
@@ -130,7 +130,7 @@ Notes:
CN6 - DIN96 joining connector to lower PCB
CN7 - Multi-pin connector (pads only, not used)
CN9 to CN13 - Power Connectors
- CN14 to CN17 - RCA Stereo Audio OUT
+ CN14 to CN17 - RCA Stereo Audio OUT
CN18 - RCA Mono Audio OUT
CN19 - USB Connector
@@ -161,20 +161,20 @@ sticker - GC713AC
| CN1 |
|------------------------|
Notes:
- CN1 - Connector joining to CPU board CN4
- CN2/3 - RCA jacks for network cable
- 2G - Small SOIC8 chip with number 0038323 at location 2G. An identical chip is present on
- *some* Hornet games on the GN715 CPU board at location 30C. It may be a PIC or EEPROM.
- On Hornet, the chip seems to refresh the data in the Timekeeper RAM when the battery
- dies and keeps the game working. It's purpose on the network board is unknown but it may
- 'upgrade' the data in the NVRAM to the network version of the game for a twin cabinet set-up.
- HYC2485S - Hybrid ceramic module for RS485
- CY7C199 - 32k x8 SRAM
- XC5204 - Xilinx XC5204 FPGA
- XC5210 - Xilink XC5210 FPGA
- N676H1 - PALCE16V8Q-15 stamped 'N676H1'
-
-
+ CN1 - Connector joining to CPU board CN4
+ CN2/3 - RCA jacks for network cable
+ 2G - Small SOIC8 chip with number 0038323 at location 2G. An identical chip is present on
+ *some* Hornet games on the GN715 CPU board at location 30C. It may be a PIC or EEPROM.
+ On Hornet, the chip seems to refresh the data in the Timekeeper RAM when the battery
+ dies and keeps the game working. It's purpose on the network board is unknown but it may
+ 'upgrade' the data in the NVRAM to the network version of the game for a twin cabinet set-up.
+ HYC2485S - Hybrid ceramic module for RS485
+ CY7C199 - 32k x8 SRAM
+ XC5204 - Xilinx XC5204 FPGA
+ XC5210 - Xilink XC5210 FPGA
+ N676H1 - PALCE16V8Q-15 stamped 'N676H1'
+
+
Bottom Board (VIDEO PCB)
GN676 PWB(B)B
|-------------------------------------------------------------------------------------------|
@@ -215,9 +215,9 @@ Notes:
TEXELFX - 3DFX 500-0004-02 BD0665.1 TMU (QFP208)
PIXELFX - 3DFX 500-0003-03 F001701.1 FBI (QFP240)
001604 - Konami Custom (QFP208)
- MC44200FT - Motorola MC44200FT 3 Channel Video D/A Converter (QFP44)
+ MC44200FT - Motorola MC44200FT 3 Channel Video D/A Converter (QFP44)
MACH111 - AMD MACH111 CPLD (Stamped '03161A', PLCC44)
- PLCC44_SOCKET - empty PLCC44 socket
+ PLCC44_SOCKET - empty PLCC44 socket
AV9170 - Integrated Circuit Systems Inc. Clock Multiplier (SOIC8)
AM7201 - AMD AM7201 FIFO (PLCC32)
PAL1 - AMD PALCE16V8 (stamped 'N676B4', DIP20)
diff --git a/src/mame/drivers/panicr.c b/src/mame/drivers/panicr.c
index 196ca627634..ae834e3326b 100644
--- a/src/mame/drivers/panicr.c
+++ b/src/mame/drivers/panicr.c
@@ -84,7 +84,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_mainram;
required_shared_ptr<UINT8> m_spriteram;
required_shared_ptr<UINT8> m_textram;
@@ -112,14 +112,14 @@ public:
TILE_GET_INFO_MEMBER(get_infotile_info_3);
TILE_GET_INFO_MEMBER(get_infotile_info_4);
TILE_GET_INFO_MEMBER(get_txttile_info);
-
+
DECLARE_DRIVER_INIT(panicr);
virtual void video_start();
DECLARE_PALETTE_INIT(panicr);
-
+
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(scanline);
};
@@ -243,7 +243,7 @@ void panicr_state::video_start()
m_txttilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(panicr_state::get_txttile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32 );
m_txttilemap->configure_groups(*m_gfxdecode->gfx(0), 0);
-
+
save_item(NAME(m_scrollx));
}
@@ -609,7 +609,7 @@ static MACHINE_CONFIG_START( panicr, panicr_state )
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", panicr_state, scanline, "screen", 0, 1)
MCFG_DEVICE_ADD("t5182", T5182, 0)
-
+
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
diff --git a/src/mame/drivers/peplus.c b/src/mame/drivers/peplus.c
index 44ee4a222dc..63cfb28d8eb 100644
--- a/src/mame/drivers/peplus.c
+++ b/src/mame/drivers/peplus.c
@@ -5017,7 +5017,7 @@ ROM_END
ROM_START( peps0090 ) /* Normal board : Gold, Silver & Bronze (PS0090) - Payout 90.19% */
ROM_REGION( 0x10000, "maincpu", 0 )
ROM_LOAD( "ps0090_569-a2c.u68", 0x00000, 0x10000, CRC(5a727ff0) SHA1(6eed9d85620eff751c598d56807470f8753e8dd5) ) /* 3 Coins Max / 1 Line */
-
+
ROM_REGION( 0x020000, "gfx1", 0 )
ROM_LOAD( "mro-cg1059.u72", 0x00000, 0x8000, CRC(96210de3) SHA1(10daa358f1fc507e9f4c788265c0acc57678fa40) ) /* Also contains graphics for Double Diamonds, use CAP1003 */
ROM_LOAD( "mgo-cg1059.u73", 0x08000, 0x8000, CRC(cfb9a357) SHA1(a390bed240960efd8da6e7815a0b0d272133f20f) )
diff --git a/src/mame/drivers/pipeline.c b/src/mame/drivers/pipeline.c
index 5d82197d16f..daeb32050e8 100644
--- a/src/mame/drivers/pipeline.c
+++ b/src/mame/drivers/pipeline.c
@@ -98,7 +98,7 @@ public:
UINT8 m_toMCU;
UINT8 m_fromMCU;
UINT8 m_ddrA;
-
+
DECLARE_WRITE8_MEMBER(vram2_w);
DECLARE_WRITE8_MEMBER(vram1_w);
DECLARE_WRITE8_MEMBER(mcu_portA_w);
@@ -107,16 +107,16 @@ public:
DECLARE_WRITE8_MEMBER(vidctrl_w);
DECLARE_READ8_MEMBER(protection_r);
DECLARE_WRITE8_MEMBER(protection_w);
-
+
TILE_GET_INFO_MEMBER(get_tile_info);
TILE_GET_INFO_MEMBER(get_tile_info2);
-
+
virtual void machine_start();
virtual void video_start();
DECLARE_PALETTE_INIT(pipeline);
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-
+
TIMER_CALLBACK_MEMBER(protection_deferred_w);
};
@@ -153,7 +153,7 @@ void pipeline_state::video_start()
m_tilemap1 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(pipeline_state::get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32 );
m_tilemap2 = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(pipeline_state::get_tile_info2),this),TILEMAP_SCAN_ROWS,8,8,64,32 );
m_tilemap2->set_transparent_pen(0);
-
+
save_item(NAME(m_vidctrl));
save_pointer(NAME(m_palram), 0x1000);
}
diff --git a/src/mame/drivers/progolf.c b/src/mame/drivers/progolf.c
index 9e1139aaa6f..3af836bab17 100644
--- a/src/mame/drivers/progolf.c
+++ b/src/mame/drivers/progolf.c
@@ -78,7 +78,7 @@ public:
required_shared_ptr<UINT8> m_videoram;
required_shared_ptr<UINT8> m_fbram;
-
+
UINT8 m_char_pen;
UINT8 m_char_pen_vreg;
UINT8 *m_fg_fb;
@@ -86,7 +86,7 @@ public:
UINT8 m_scrollx_lo;
UINT8 m_gfx_switch;
UINT8 m_sound_cmd;
-
+
DECLARE_WRITE8_MEMBER(charram_w);
DECLARE_WRITE8_MEMBER(char_vregs_w);
DECLARE_WRITE8_MEMBER(scrollx_lo_w);
@@ -96,13 +96,13 @@ public:
DECLARE_READ8_MEMBER(audio_command_r);
DECLARE_READ8_MEMBER(videoram_r);
DECLARE_WRITE8_MEMBER(videoram_w);
-
+
DECLARE_INPUT_CHANGED_MEMBER(coin_inserted);
-
+
virtual void machine_start();
virtual void video_start();
DECLARE_PALETTE_INIT(progolf);
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
};
@@ -118,7 +118,7 @@ void progolf_state::video_start()
m_scrollx_lo = 0;
m_fg_fb = auto_alloc_array(machine(), UINT8, 0x2000*8);
-
+
save_item(NAME(m_char_pen));
save_item(NAME(m_char_pen_vreg));
save_pointer(NAME(m_fg_fb), 0x2000*8);
diff --git a/src/mame/drivers/quizo.c b/src/mame/drivers/quizo.c
index 380131fbd19..eb0a1153b9f 100644
--- a/src/mame/drivers/quizo.c
+++ b/src/mame/drivers/quizo.c
@@ -268,7 +268,7 @@ DRIVER_INIT_MEMBER(quizo_state,quizo)
{
m_videoram=auto_alloc_array(machine(), UINT8, 0x4000*2);
membank("bank1")->configure_entries(0, 6, memregion("user1")->base(), 0x4000);
-
+
save_pointer(NAME(m_videoram), 0x4000*2);
//save_item(NAME(m_port60));
save_item(NAME(m_port70));
diff --git a/src/mame/drivers/rabbit.c b/src/mame/drivers/rabbit.c
index 76f83aca4d3..08cef5c0e0b 100644
--- a/src/mame/drivers/rabbit.c
+++ b/src/mame/drivers/rabbit.c
@@ -114,7 +114,7 @@ public:
required_device<eeprom_serial_93cxx_device> m_eeprom;
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
-
+
required_shared_ptr<UINT32> m_viewregs0;
required_shared_ptr<UINT32> m_viewregs6;
required_shared_ptr<UINT32> m_viewregs7;
@@ -124,7 +124,7 @@ public:
required_shared_ptr<UINT32> m_spriteregs;
required_shared_ptr<UINT32> m_blitterregs;
required_shared_ptr<UINT32> m_spriteram;
-
+
bitmap_ind16 *m_sprite_bitmap;
rectangle m_sprite_clip;
int m_vblirqlevel;
@@ -132,7 +132,7 @@ public:
int m_banking;
UINT32 *m_tilemap_ram[4];
tilemap_t *m_tilemap[4];
-
+
DECLARE_WRITE32_MEMBER(tilemap0_w);
DECLARE_WRITE32_MEMBER(tilemap1_w);
DECLARE_WRITE32_MEMBER(tilemap2_w);
@@ -145,18 +145,18 @@ public:
DECLARE_WRITE32_MEMBER(rombank_w);
DECLARE_WRITE32_MEMBER(blitter_w);
DECLARE_WRITE32_MEMBER(eeprom_write);
-
+
DECLARE_DRIVER_INIT(rabbit);
-
+
TILE_GET_INFO_MEMBER(get_tilemap0_tile_info);
TILE_GET_INFO_MEMBER(get_tilemap1_tile_info);
TILE_GET_INFO_MEMBER(get_tilemap2_tile_info);
TILE_GET_INFO_MEMBER(get_tilemap3_tile_info);
-
+
INTERRUPT_GEN_MEMBER(vblank_interrupt);
-
+
virtual void video_start();
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
inline void get_tilemap_info(tile_data &tileinfo, int tile_index, int whichtilemap, int tilesize);
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect );
@@ -437,7 +437,7 @@ void rabbit_state::video_start()
m_sprite_bitmap = auto_bitmap_ind16_alloc(machine(),0x1000,0x1000);
m_sprite_clip.set(0, 0x1000-1, 0, 0x1000-1);
-
+
save_pointer(NAME(m_tilemap_ram[0]), 0x20000/4);
save_pointer(NAME(m_tilemap_ram[1]), 0x20000/4);
save_pointer(NAME(m_tilemap_ram[2]), 0x20000/4);
diff --git a/src/mame/drivers/raiden2.c b/src/mame/drivers/raiden2.c
index ffd6ead6c11..ef0dfa90c54 100644
--- a/src/mame/drivers/raiden2.c
+++ b/src/mame/drivers/raiden2.c
@@ -4,16 +4,16 @@
Seibu Protected 1993-94 era hardware, V30 based (sequel to the 68k based hardware)
- TODO:
- * zeroteam - sort-DMA doesn't seem to work too well, sprite-sprite priorities are broken as per now
+ TODO:
+ * zeroteam - sort-DMA doesn't seem to work too well, sprite-sprite priorities are broken as per now
- * xsedae - it does an "8-liner"-style scroll during attract, doesn't work too well.
+ * xsedae - it does an "8-liner"-style scroll during attract, doesn't work too well.
- * sprite chip is the same as seibuspi.c and feversoc.c, needs device-ification and merging.
+ * sprite chip is the same as seibuspi.c and feversoc.c, needs device-ification and merging.
- * sprite chip also uses first entry for "something" that isn't sprite, some of them looks clipping
- regions (150 - ff in zeroteam, 150 - 0 and 150 - 80 in raiden2). Latter probably do double buffering
- on odd/even frames, by updating only top or bottom part of screen.
+ * sprite chip also uses first entry for "something" that isn't sprite, some of them looks clipping
+ regions (150 - ff in zeroteam, 150 - 0 and 150 - 80 in raiden2). Latter probably do double buffering
+ on odd/even frames, by updating only top or bottom part of screen.
===========================================================================================================
diff --git a/src/mame/drivers/ramtek.c b/src/mame/drivers/ramtek.c
index 099a7f6ad37..76d35865f50 100644
--- a/src/mame/drivers/ramtek.c
+++ b/src/mame/drivers/ramtek.c
@@ -16,11 +16,11 @@
Trivia (1975/11) YES
Volly (1973/03?) YES 500378A 500322A
Wipe Out (1974/01) YES 500986B/C 500963B/?
-
+
Volly Industries Discrete Games List
(Volly was Ramtek's Canada-based affiliate and distributor.)
- Game Name Clone Of
+ Game Name Clone Of
---------------------------------------------------------------------------------
Batter Up (1974/??) Deluxe Baseball (Ramtek, 1975/06)
Crossfire (1974/01) (registered trademark?) Knock Out (Ramtek, 1974/09)?
@@ -31,7 +31,7 @@
Hockey (Cocktail) (1973/??) Soccer (Ramtek, 1973/11)
Scoring (1973/11?) Soccer (Ramtek, 1973/11)?
Tennis (1973/??) Volly (Ramtek, 1973/03?)
-
+
*********************************************************************************/
diff --git a/src/mame/drivers/retofinv.c b/src/mame/drivers/retofinv.c
index a0e78b17adc..293790f6f6d 100644
--- a/src/mame/drivers/retofinv.c
+++ b/src/mame/drivers/retofinv.c
@@ -40,7 +40,7 @@ void retofinv_state::machine_start()
save_item(NAME(m_main_irq_mask));
save_item(NAME(m_sub_irq_mask));
save_item(NAME(m_cpu2_m6000));
-
+
if (m_68705 != NULL) // only for the parent (with MCU)
{
save_item(NAME(m_from_main));
diff --git a/src/mame/drivers/segaorun.c b/src/mame/drivers/segaorun.c
index f3b0efeb2e2..c80dc050f02 100644
--- a/src/mame/drivers/segaorun.c
+++ b/src/mame/drivers/segaorun.c
@@ -2373,7 +2373,7 @@ ROM_END
// VIDEO BD 837-6906
//
// NOTE: This PCB set used EPROMs instead of the OPR (One time PRogram) used by other sets.
-// Same data so the rom numbers are the same, just labeled EPR-xxxxx versus OPR-xxxxx
+// Same data so the rom numbers are the same, just labeled EPR-xxxxx versus OPR-xxxxx
//
ROM_START( toutrunj1 )
ROM_REGION( 0x60000, "maincpu", 0 ) // 68000 code
diff --git a/src/mame/drivers/sengokmj.c b/src/mame/drivers/sengokmj.c
index 28201458db9..553c9864b0b 100644
--- a/src/mame/drivers/sengokmj.c
+++ b/src/mame/drivers/sengokmj.c
@@ -89,12 +89,12 @@ public:
tilemap_t *m_sc1_tilemap;
tilemap_t *m_sc2_tilemap;
tilemap_t *m_sc3_tilemap;
-
+
UINT16 m_mux_data;
UINT8 m_hopper_io;
UINT16 m_layer_en;
UINT16 m_scrollram[6];
-
+
DECLARE_READ16_MEMBER(mahjong_panel_r);
DECLARE_WRITE16_MEMBER(mahjong_panel_w);
DECLARE_WRITE16_MEMBER(out_w);
@@ -105,12 +105,12 @@ public:
DECLARE_WRITE16_MEMBER(seibucrtc_sc3vram_w);
DECLARE_WRITE16_MEMBER(layer_en_w);
DECLARE_WRITE16_MEMBER(layer_scroll_w);
-
+
TILE_GET_INFO_MEMBER(seibucrtc_sc0_tile_info);
TILE_GET_INFO_MEMBER(seibucrtc_sc1_tile_info);
TILE_GET_INFO_MEMBER(seibucrtc_sc2_tile_info);
TILE_GET_INFO_MEMBER(seibucrtc_sc3_tile_info);
-
+
INTERRUPT_GEN_MEMBER(interrupt);
virtual void machine_start();
diff --git a/src/mame/drivers/sidepckt.c b/src/mame/drivers/sidepckt.c
index 31c56af465b..cc319f8f8e2 100644
--- a/src/mame/drivers/sidepckt.c
+++ b/src/mame/drivers/sidepckt.c
@@ -488,7 +488,7 @@ DRIVER_INIT_MEMBER(sidepckt_state,sidepckt)
m_prot_table[0] = sidepckt_prot_table_1;
m_prot_table[1] = sidepckt_prot_table_2;
m_prot_table[2] = sidepckt_prot_table_3;
-
+
save_item(NAME(m_i8751_return));
save_item(NAME(m_current_ptr));
save_item(NAME(m_current_table));
@@ -501,7 +501,7 @@ DRIVER_INIT_MEMBER(sidepckt_state,sidepcktj)
m_prot_table[0] = sidepcktj_prot_table_1;
m_prot_table[1] = sidepcktj_prot_table_2;
m_prot_table[2] = sidepcktj_prot_table_3;
-
+
save_item(NAME(m_i8751_return));
save_item(NAME(m_current_ptr));
save_item(NAME(m_current_table));
diff --git a/src/mame/drivers/silvmil.c b/src/mame/drivers/silvmil.c
index 602a0905d9d..76abb67fd40 100644
--- a/src/mame/drivers/silvmil.c
+++ b/src/mame/drivers/silvmil.c
@@ -296,12 +296,12 @@ static INPUT_PORTS_START( puzzlove )
PORT_DIPUNUSED_DIPLOC( 0x0020, 0x0020, "SW1:6" ) /* Listed as "Unused" */
PORT_DIPUNUSED_DIPLOC( 0x0040, 0x0040, "SW1:7" ) /* Listed as "Unused" */
PORT_DIPUNUSED_DIPLOC( 0x0080, 0x0080, "SW1:8" ) /* Listed as "Unused" */
- PORT_DIPNAME( 0x0300, 0x0100, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:1,2")
+ PORT_DIPNAME( 0x0300, 0x0100, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x0300, DEF_STR( Very_Easy ) ) /* Initial start time 40 secs */
PORT_DIPSETTING( 0x0200, DEF_STR( Easy ) ) /* Initial start time 30 secs - Other in game effects?? */
PORT_DIPSETTING( 0x0100, DEF_STR( Hard ) ) /* Initial start time 30 secs - Other in game effects?? */
PORT_DIPSETTING( 0x0000, DEF_STR( Very_Hard ) ) /* Initial start time 30 secs - Other in game effects?? */
- PORT_DIPNAME( 0x1c00, 0x1c00, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW2:3,4,5")
+ PORT_DIPNAME( 0x1c00, 0x1c00, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW2:3,4,5")
PORT_DIPSETTING( 0x1000, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x1400, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x0000, DEF_STR( 4C_2C ) ) /* Works the same as 2C/1C */
diff --git a/src/mame/drivers/skeetsht.c b/src/mame/drivers/skeetsht.c
index a7791875cdb..6f0238db83c 100644
--- a/src/mame/drivers/skeetsht.c
+++ b/src/mame/drivers/skeetsht.c
@@ -4,7 +4,7 @@
Notes:
Pop Shot is a prototype sequel (or upgrade) to Skeet Shot
-
+
Supposedly Skeet Shot used a laserdisc to supply video for eight
different background "scenes". Pop Shot probably did too, in that case.
@@ -266,9 +266,9 @@ ROM_START( skeetsht )
ROM_REGION16_LE( 0x200000, "tms", 0 )
ROM_LOAD16_BYTE( "even_v1.2.u14", 0x000000, 0x40000, CRC(c7c9515e) SHA1(ce3e813c15085790d5335d9fc751b3cc5b617b20) )
ROM_LOAD16_BYTE( "odd_v1.2.u13", 0x000001, 0x40000, CRC(ea4402fb) SHA1(b0b6b191a8b48bead660a385c638363943a6ffe2) )
-
+
DISK_REGION( "laserdisc" )
- DISK_IMAGE_READONLY( "skeetsht", 0, NO_DUMP ) // unknown disc label?
+ DISK_IMAGE_READONLY( "skeetsht", 0, NO_DUMP ) // unknown disc label?
ROM_END
ROM_START( popshot )
@@ -281,7 +281,7 @@ ROM_START( popshot )
ROM_LOAD16_BYTE( "popshot_tms34_odd.u13", 0x000001, 0x80000, CRC(82d616d8) SHA1(83ab33727ebab882b79c9ebd3557e2c319b3387a) )
DISK_REGION( "laserdisc" )
- DISK_IMAGE_READONLY( "popshot", 0, NO_DUMP ) // unknown disc label?
+ DISK_IMAGE_READONLY( "popshot", 0, NO_DUMP ) // unknown disc label?
ROM_END
diff --git a/src/mame/drivers/skyarmy.c b/src/mame/drivers/skyarmy.c
index 1487a130244..548ee3d095c 100644
--- a/src/mame/drivers/skyarmy.c
+++ b/src/mame/drivers/skyarmy.c
@@ -50,24 +50,24 @@ public:
required_shared_ptr<UINT8> m_colorram;
required_shared_ptr<UINT8> m_spriteram;
required_shared_ptr<UINT8> m_scrollram;
-
+
tilemap_t* m_tilemap;
int m_nmi;
-
+
DECLARE_WRITE8_MEMBER(flip_screen_x_w);
DECLARE_WRITE8_MEMBER(flip_screen_y_w);
DECLARE_WRITE8_MEMBER(videoram_w);
DECLARE_WRITE8_MEMBER(colorram_w);
DECLARE_WRITE8_MEMBER(nmi_enable_w);
-
+
TILE_GET_INFO_MEMBER(get_tile_info);
-
+
virtual void machine_start();
virtual void video_start();
DECLARE_PALETTE_INIT(skyarmy);
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-
+
INTERRUPT_GEN_MEMBER(nmi_source);
};
diff --git a/src/mame/drivers/snowbros.c b/src/mame/drivers/snowbros.c
index e6fd6de7bdb..eaa4b878899 100644
--- a/src/mame/drivers/snowbros.c
+++ b/src/mame/drivers/snowbros.c
@@ -2853,7 +2853,7 @@ DRIVER_INIT_MEMBER(snowbros_state,snowbro3)
buffer[i] = src[BITSWAP24(i,23,22,21,20,19,18,17,16,15,14,13,12,11,10,9,8,7,6,5,3,4,1,2,0)];
memcpy(src,buffer,len);
}
-
+
save_item(NAME(m_sb3_music_is_playing));
save_item(NAME(m_sb3_music));
}
diff --git a/src/mame/drivers/statriv2.c b/src/mame/drivers/statriv2.c
index c7e71c7cfb0..e83b0ca7e95 100644
--- a/src/mame/drivers/statriv2.c
+++ b/src/mame/drivers/statriv2.c
@@ -977,7 +977,7 @@ ROM_START( cstripxi )
ROM_LOAD( "prom.u17", 0x0000, 0x0020, NO_DUMP ) /* Socketted */
ROM_LOAD( "prom.u21", 0x0020, 0x0020, NO_DUMP ) /* Soldered in (Color?) */
ROM_LOAD( "prom.u22", 0x0040, 0x0100, NO_DUMP ) /* Soldered in */
-
+
DISK_REGION( "laserdisc")
DISK_IMAGE_READONLY("cstripxi", 0, NO_DUMP )
ROM_END
diff --git a/src/mame/drivers/taitottl.c b/src/mame/drivers/taitottl.c
index e0df1413fc4..0e46a1d5e84 100644
--- a/src/mame/drivers/taitottl.c
+++ b/src/mame/drivers/taitottl.c
@@ -156,7 +156,7 @@ MACHINE_CONFIG_END
/*
Gunman
-
+
label loc. Part #
==========================================================
CR11 N5 74s287 yes, it says CRxx not GNxx
diff --git a/src/mame/drivers/tecmosys.c b/src/mame/drivers/tecmosys.c
index b64b2c8b7d6..3db6798ac49 100644
--- a/src/mame/drivers/tecmosys.c
+++ b/src/mame/drivers/tecmosys.c
@@ -441,7 +441,7 @@ WRITE_LINE_MEMBER(tecmosys_state::sound_irq)
void tecmosys_state::machine_start()
{
membank("bank1")->configure_entries(0, 16, memregion("audiocpu")->base(), 0x4000);
-
+
save_item(NAME(m_device_read_ptr));
save_item(NAME(m_device_status));
save_item(NAME(m_device_value));
diff --git a/src/mame/drivers/tmmjprd.c b/src/mame/drivers/tmmjprd.c
index a0d1eac8976..b2b6f98c3b4 100644
--- a/src/mame/drivers/tmmjprd.c
+++ b/src/mame/drivers/tmmjprd.c
@@ -366,13 +366,13 @@ void tmmjprd_state::video_start()
m_tilemap_ram[1] = auto_alloc_array_clear(machine(), UINT32, 0x8000);
m_tilemap_ram[2] = auto_alloc_array_clear(machine(), UINT32, 0x8000);
m_tilemap_ram[3] = auto_alloc_array_clear(machine(), UINT32, 0x8000);
-
-
+
+
save_pointer(NAME(m_tilemap_ram[0]), 0x8000);
save_pointer(NAME(m_tilemap_ram[1]), 0x8000);
save_pointer(NAME(m_tilemap_ram[2]), 0x8000);
save_pointer(NAME(m_tilemap_ram[3]), 0x8000);
-
+
save_item(NAME(m_old_brt1));
save_item(NAME(m_old_brt2));
}
diff --git a/src/mame/drivers/welltris.c b/src/mame/drivers/welltris.c
index a1845d09119..6b6b3053c54 100644
--- a/src/mame/drivers/welltris.c
+++ b/src/mame/drivers/welltris.c
@@ -689,7 +689,7 @@ DRIVER_INIT_MEMBER(welltris_state,welltris)
void welltris_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/wink.c b/src/mame/drivers/wink.c
index 1fbfc478c9f..785ab47ab46 100644
--- a/src/mame/drivers/wink.c
+++ b/src/mame/drivers/wink.c
@@ -30,13 +30,13 @@ public:
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
required_device<gfxdecode_device> m_gfxdecode;
-
+
required_shared_ptr<UINT8> m_videoram;
-
+
tilemap_t *m_bg_tilemap;
UINT8 m_sound_flag;
UINT8 m_tile_bank;
-
+
DECLARE_WRITE8_MEMBER(bgram_w);
DECLARE_WRITE8_MEMBER(player_mux_w);
DECLARE_WRITE8_MEMBER(tile_banking_w);
@@ -47,16 +47,16 @@ public:
DECLARE_READ8_MEMBER(prot_r);
DECLARE_WRITE8_MEMBER(prot_w);
DECLARE_READ8_MEMBER(sound_r);
-
+
TILE_GET_INFO_MEMBER(get_bg_tile_info);
-
+
DECLARE_DRIVER_INIT(wink);
virtual void machine_start();
virtual void machine_reset();
virtual void video_start();
-
+
UINT32 screen_update_wink(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-
+
INTERRUPT_GEN_MEMBER(wink_sound);
};
diff --git a/src/mame/drivers/xxmissio.c b/src/mame/drivers/xxmissio.c
index 58633c5e707..f1593af426f 100644
--- a/src/mame/drivers/xxmissio.c
+++ b/src/mame/drivers/xxmissio.c
@@ -79,7 +79,7 @@ void xxmissio_state::machine_start()
{
membank("bank1")->configure_entries(0, 8, memregion("user1")->base(), 0x4000);
membank("bank1")->set_entry(0);
-
+
save_item(NAME(m_status));
}
diff --git a/src/mame/includes/bloodbro.h b/src/mame/includes/bloodbro.h
index 3287986704b..c8396cb5d90 100644
--- a/src/mame/includes/bloodbro.h
+++ b/src/mame/includes/bloodbro.h
@@ -14,7 +14,7 @@ public:
required_device<cpu_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
-
+
required_shared_ptr<UINT16> m_spriteram;
required_shared_ptr<UINT16> m_bgvideoram;
required_shared_ptr<UINT16> m_fgvideoram;
@@ -22,7 +22,7 @@ public:
UINT16 m_scrollram[6];
UINT16 m_layer_en;
-
+
tilemap_t *m_bg_tilemap;
tilemap_t *m_fg_tilemap;
tilemap_t *m_tx_tilemap;
@@ -32,13 +32,13 @@ public:
DECLARE_WRITE16_MEMBER(txvideoram_w);
DECLARE_WRITE16_MEMBER(layer_en_w);
DECLARE_WRITE16_MEMBER(layer_scroll_w);
-
+
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 video_start();
-
+
UINT32 screen_update_bloodbro(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
UINT32 screen_update_weststry(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
UINT32 screen_update_skysmash(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/chaknpop.h b/src/mame/includes/chaknpop.h
index e0a6f7fa4b2..a5c273d5554 100644
--- a/src/mame/includes/chaknpop.h
+++ b/src/mame/includes/chaknpop.h
@@ -42,7 +42,7 @@ public:
UINT8 m_gfxmode;
UINT8 m_flip_x;
UINT8 m_flip_y;
-
+
DECLARE_WRITE8_MEMBER(coinlock_w);
DECLARE_READ8_MEMBER(mcu_port_a_r);
DECLARE_READ8_MEMBER(mcu_port_b_r);
@@ -57,16 +57,16 @@ public:
DECLARE_WRITE8_MEMBER(unknown_port_1_w);
DECLARE_WRITE8_MEMBER(unknown_port_2_w);
TILE_GET_INFO_MEMBER(get_tx_tile_info);
-
+
virtual void machine_start();
virtual void machine_reset();
virtual void video_start();
DECLARE_PALETTE_INIT(chaknpop);
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void tx_tilemap_mark_all_dirty();
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_bitmap(bitmap_ind16 &bitmap, const rectangle &cliprect);
-
+
void mcu_update_seed(UINT8 data);
};
diff --git a/src/mame/includes/darkmist.h b/src/mame/includes/darkmist.h
index 91a5cf0a8c1..bdde9204236 100644
--- a/src/mame/includes/darkmist.h
+++ b/src/mame/includes/darkmist.h
@@ -44,6 +44,6 @@ public:
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void decrypt_gfx();
void decrypt_snd();
-
+
TIMER_DEVICE_CALLBACK_MEMBER(scanline);
};
diff --git a/src/mame/includes/dcon.h b/src/mame/includes/dcon.h
index 70481429399..fa377b68ae6 100644
--- a/src/mame/includes/dcon.h
+++ b/src/mame/includes/dcon.h
@@ -44,10 +44,10 @@ public:
TILE_GET_INFO_MEMBER(get_fore_tile_info);
TILE_GET_INFO_MEMBER(get_mid_tile_info);
TILE_GET_INFO_MEMBER(get_text_tile_info);
-
+
DECLARE_DRIVER_INIT(sdgndmps);
virtual void video_start();
-
+
UINT32 screen_update_dcon(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
UINT32 screen_update_sdgndmps(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites( screen_device &screen, bitmap_ind16 &bitmap,const rectangle &cliprect);
diff --git a/src/mame/includes/exzisus.h b/src/mame/includes/exzisus.h
index 8c14c5928f8..a4cf615a18e 100644
--- a/src/mame/includes/exzisus.h
+++ b/src/mame/includes/exzisus.h
@@ -16,7 +16,7 @@ public:
required_device<cpu_device> m_cpuc;
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
-
+
required_shared_ptr<UINT8> m_objectram1;
required_shared_ptr<UINT8> m_videoram1;
required_shared_ptr<UINT8> m_sharedram_ac;
@@ -28,8 +28,8 @@ public:
DECLARE_WRITE8_MEMBER(cpub_bankswitch_w);
DECLARE_WRITE8_MEMBER(coincounter_w);
DECLARE_WRITE8_MEMBER(cpub_reset_w);
-
+
virtual void machine_start();
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
};
diff --git a/src/mame/includes/fastfred.h b/src/mame/includes/fastfred.h
index 50747bcf6a2..3ca5d622b1b 100644
--- a/src/mame/includes/fastfred.h
+++ b/src/mame/includes/fastfred.h
@@ -22,7 +22,7 @@ public:
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
-
+
required_shared_ptr<UINT8> m_videoram;
required_shared_ptr<UINT8> m_spriteram;
required_shared_ptr<UINT8> m_attributesram;
@@ -37,7 +37,7 @@ public:
UINT8 m_imago_sprites[0x800*3];
UINT16 m_imago_sprites_address;
UINT8 m_imago_sprites_bank;
-
+
tilemap_t *m_bg_tilemap;
tilemap_t *m_fg_tilemap;
tilemap_t *m_web_tilemap;
@@ -76,7 +76,7 @@ public:
TILE_GET_INFO_MEMBER(imago_get_tile_info_bg);
TILE_GET_INFO_MEMBER(imago_get_tile_info_fg);
TILE_GET_INFO_MEMBER(imago_get_tile_info_web);
-
+
INTERRUPT_GEN_MEMBER(vblank_irq);
INTERRUPT_GEN_MEMBER(sound_timer_irq);
diff --git a/src/mame/includes/fuukifg2.h b/src/mame/includes/fuukifg2.h
index c323b2218f4..22baf4a2a86 100644
--- a/src/mame/includes/fuukifg2.h
+++ b/src/mame/includes/fuukifg2.h
@@ -34,7 +34,7 @@ public:
required_device<screen_device> m_screen;
required_device<palette_device> m_palette;
required_device<fuukivid_device> m_fuukivid;
-
+
/* memory pointers */
required_shared_ptr_array<UINT16,4> m_vram;
required_shared_ptr<UINT16> m_vregs;
@@ -57,16 +57,16 @@ public:
DECLARE_WRITE16_MEMBER(vram_2_w);
DECLARE_WRITE16_MEMBER(vram_3_w);
DECLARE_WRITE8_MEMBER(oki_banking_w);
-
+
TILE_GET_INFO_MEMBER(get_tile_info_0);
TILE_GET_INFO_MEMBER(get_tile_info_1);
TILE_GET_INFO_MEMBER(get_tile_info_2);
TILE_GET_INFO_MEMBER(get_tile_info_3);
-
+
virtual void machine_start();
virtual void machine_reset();
virtual void video_start();
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
inline void get_tile_info(tile_data &tileinfo, tilemap_memory_index tile_index, int _N_);
inline void vram_w(offs_t offset, UINT16 data, UINT16 mem_mask, int _N_);
diff --git a/src/mame/includes/fuukifg3.h b/src/mame/includes/fuukifg3.h
index ec689ed614c..d15ac2ecf6a 100644
--- a/src/mame/includes/fuukifg3.h
+++ b/src/mame/includes/fuukifg3.h
@@ -38,7 +38,7 @@ public:
required_device<screen_device> m_screen;
required_device<palette_device> m_palette;
required_device<fuukivid_device> m_fuukivid;
-
+
/* memory pointers */
required_shared_ptr_array<UINT32,4> m_vram;
required_shared_ptr<UINT32> m_vregs;
@@ -68,16 +68,16 @@ public:
DECLARE_WRITE32_MEMBER(vram_1_w);
DECLARE_WRITE32_MEMBER(vram_2_w);
DECLARE_WRITE32_MEMBER(vram_3_w);
-
+
TILE_GET_INFO_MEMBER(get_tile_info_0);
TILE_GET_INFO_MEMBER(get_tile_info_1);
TILE_GET_INFO_MEMBER(get_tile_info_2);
TILE_GET_INFO_MEMBER(get_tile_info_3);
-
+
virtual void machine_start();
virtual void machine_reset();
virtual void video_start();
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void screen_eof(screen_device &screen, bool state);
inline void get_tile_info8bpp(tile_data &tileinfo, tilemap_memory_index tile_index, int _N_);
diff --git a/src/mame/includes/galpani2.h b/src/mame/includes/galpani2.h
index 1db4cabdadb..c0533bfd9b7 100644
--- a/src/mame/includes/galpani2.h
+++ b/src/mame/includes/galpani2.h
@@ -24,7 +24,7 @@ public:
m_ram2(*this, "ram2"),
m_spriteram(*this, "spriteram")
{ }
-
+
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_subcpu;
optional_device<kaneko16_sprite_device> m_kaneko_spr;
@@ -42,7 +42,7 @@ public:
required_shared_ptr<UINT16> m_ram;
required_shared_ptr<UINT16> m_ram2;
optional_shared_ptr<UINT16> m_spriteram;
-
+
UINT16 m_eeprom_word;
UINT16 m_old_mcu_nmi1;
UINT16 m_old_mcu_nmi2;
diff --git a/src/mame/includes/gladiatr.h b/src/mame/includes/gladiatr.h
index e903800fc9f..0e6afa4fabe 100644
--- a/src/mame/includes/gladiatr.h
+++ b/src/mame/includes/gladiatr.h
@@ -16,8 +16,8 @@ public:
m_videoram(*this, "videoram"),
m_colorram(*this, "colorram"),
m_textram(*this, "textram"),
- m_generic_paletteram_8(*this, "paletteram") { }
-
+ m_generic_paletteram_8(*this, "paletteram") { }
+
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
required_device<cpu_device> m_subcpu;
@@ -70,7 +70,7 @@ public:
DECLARE_WRITE8_MEMBER(gladiator_int_control_w);
DECLARE_WRITE8_MEMBER(gladiator_adpcm_w);
DECLARE_WRITE_LINE_MEMBER(gladiator_ym_irq);
-
+
// ppking specific
DECLARE_READ8_MEMBER(ppking_f1_r);
DECLARE_READ8_MEMBER(ppking_f6a3_r);
@@ -83,10 +83,10 @@ public:
DECLARE_READ8_MEMBER(ppking_qx0_r);
DECLARE_READ8_MEMBER(ppking_qx1_r);
DECLARE_WRITE8_MEMBER(ppking_video_registers_w);
-
+
DECLARE_DRIVER_INIT(gladiatr);
DECLARE_DRIVER_INIT(ppking);
-
+
TILE_GET_INFO_MEMBER(bg_get_tile_info);
TILE_GET_INFO_MEMBER(fg_get_tile_info);
@@ -94,7 +94,7 @@ public:
DECLARE_VIDEO_START(ppking);
DECLARE_MACHINE_RESET(gladiator);
DECLARE_VIDEO_START(gladiatr);
-
+
UINT32 screen_update_ppking(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
UINT32 screen_update_gladiatr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/gsword.h b/src/mame/includes/gsword.h
index 16ccd65abad..ef3385aac4d 100644
--- a/src/mame/includes/gsword.h
+++ b/src/mame/includes/gsword.h
@@ -56,7 +56,7 @@ public:
DECLARE_WRITE8_MEMBER(ay8910_control_port_1_w);
DECLARE_READ8_MEMBER(fake_0_r);
DECLARE_READ8_MEMBER(fake_1_r);
-
+
// gsword specific
DECLARE_READ8_MEMBER(gsword_hack_r);
DECLARE_WRITE8_MEMBER(gsword_adpcm_data_w);
@@ -76,5 +76,5 @@ public:
UINT32 screen_update_gsword(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(gsword_snd_interrupt);
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);
- int coins_in(void); //if 0'd
+ int coins_in(void); //if 0'd
};
diff --git a/src/mame/includes/iqblock.h b/src/mame/includes/iqblock.h
index de0e3d53275..f2eccbffdf6 100644
--- a/src/mame/includes/iqblock.h
+++ b/src/mame/includes/iqblock.h
@@ -37,6 +37,6 @@ public:
TILE_GET_INFO_MEMBER(get_bg_tile_info);
TILE_GET_INFO_MEMBER(get_fg_tile_info);
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
};
diff --git a/src/mame/includes/kaneko16.h b/src/mame/includes/kaneko16.h
index b38a0fec47d..15e0aee2b46 100644
--- a/src/mame/includes/kaneko16.h
+++ b/src/mame/includes/kaneko16.h
@@ -56,7 +56,7 @@ public:
optional_shared_ptr<UINT16> m_spriteram;
optional_shared_ptr<UINT16> m_mainram;
-
+
UINT16 m_disp_enable;
int m_VIEW2_2_pri;
diff --git a/src/mame/includes/liberate.h b/src/mame/includes/liberate.h
index a060e564585..97a16e08a46 100644
--- a/src/mame/includes/liberate.h
+++ b/src/mame/includes/liberate.h
@@ -20,7 +20,7 @@ public:
required_shared_ptr<UINT8> m_videoram;
required_shared_ptr<UINT8> m_spriteram;
optional_shared_ptr<UINT8> m_scratchram;
-
+
UINT8 *m_fg_gfx; /* prosoccr */
UINT8 *m_charram; /* prosoccr */
UINT8 m_io_ram[16];
diff --git a/src/mame/includes/lordgun.h b/src/mame/includes/lordgun.h
index 16fabd759b2..89aa2e7c2b8 100644
--- a/src/mame/includes/lordgun.h
+++ b/src/mame/includes/lordgun.h
@@ -39,7 +39,7 @@ public:
required_device<gfxdecode_device> m_gfxdecode;
required_device<screen_device> m_screen;
required_device<palette_device> m_palette;
-
+
required_shared_ptr<UINT16> m_generic_paletteram_16;
required_shared_ptr<UINT16> m_priority_ram;
required_shared_ptr<UINT16> m_scrollram;
diff --git a/src/mame/includes/mustache.h b/src/mame/includes/mustache.h
index f03205e72b4..a0e80f7c258 100644
--- a/src/mame/includes/mustache.h
+++ b/src/mame/includes/mustache.h
@@ -24,19 +24,19 @@ public:
tilemap_t *m_bg_tilemap;
int m_control_byte;
-
+
DECLARE_WRITE8_MEMBER(videoram_w);
DECLARE_WRITE8_MEMBER(video_control_w);
DECLARE_WRITE8_MEMBER(scroll_w);
-
+
TILE_GET_INFO_MEMBER(get_bg_tile_info);
-
+
DECLARE_DRIVER_INIT(mustache);
virtual void video_start();
DECLARE_PALETTE_INIT(mustache);
-
+
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(scanline);
};
diff --git a/src/mame/includes/nb1414m4.h b/src/mame/includes/nb1414m4.h
index b0f4676f646..86e5ad9cb48 100644
--- a/src/mame/includes/nb1414m4.h
+++ b/src/mame/includes/nb1414m4.h
@@ -4,7 +4,7 @@ class nb1414m4_device : public device_t,
public:
nb1414m4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~nb1414m4_device() {}
-
+
void exec(UINT16 mcu_cmd, UINT8 *vram, UINT16 &scrollx, UINT16 &scrolly, tilemap_t *tilemap);
protected:
@@ -21,7 +21,7 @@ private:
void _0200(UINT16 mcu_cmd, UINT8 *vram);
void _0600(UINT8 is2p, UINT8 *vram);
void _0e00(UINT16 mcu_cmd, UINT8 *vram);
-
+
UINT8 *m_data;
};
diff --git a/src/mame/includes/pirates.h b/src/mame/includes/pirates.h
index e43f00d35f4..60b0b55e562 100644
--- a/src/mame/includes/pirates.h
+++ b/src/mame/includes/pirates.h
@@ -38,7 +38,7 @@ public:
DECLARE_WRITE16_MEMBER(fg_tileram_w);
DECLARE_WRITE16_MEMBER(bg_tileram_w);
DECLARE_READ16_MEMBER(genix_prot_r);
-
+
DECLARE_CUSTOM_INPUT_MEMBER(prot_r);
DECLARE_DRIVER_INIT(pirates);
diff --git a/src/mame/includes/quizpani.h b/src/mame/includes/quizpani.h
index 0aba284b38c..5c572d5d73a 100644
--- a/src/mame/includes/quizpani.h
+++ b/src/mame/includes/quizpani.h
@@ -13,25 +13,25 @@ public:
required_device<cpu_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode;
-
+
required_shared_ptr<UINT16> m_scrollreg;
required_shared_ptr<UINT16> m_bg_videoram;
required_shared_ptr<UINT16> m_txt_videoram;
-
+
tilemap_t *m_bg_tilemap;
tilemap_t *m_txt_tilemap;
int m_bgbank;
int m_txtbank;
-
+
DECLARE_WRITE16_MEMBER(bg_videoram_w);
DECLARE_WRITE16_MEMBER(txt_videoram_w);
DECLARE_WRITE16_MEMBER(tilesbank_w);
-
+
TILEMAP_MAPPER_MEMBER(bg_scan);
TILE_GET_INFO_MEMBER(bg_tile_info);
TILE_GET_INFO_MEMBER(txt_tile_info);
-
+
virtual void video_start();
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
};
diff --git a/src/mame/includes/raiden.h b/src/mame/includes/raiden.h
index f8a701126b2..3e696d35ea2 100644
--- a/src/mame/includes/raiden.h
+++ b/src/mame/includes/raiden.h
@@ -29,7 +29,7 @@ public:
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
required_device<buffered_spriteram16_device> m_spriteram;
-
+
required_shared_ptr<UINT16> m_shared_ram;
required_shared_ptr<UINT16> m_videoram;
optional_shared_ptr<UINT16> m_scroll_ram;
@@ -56,20 +56,20 @@ public:
DECLARE_DRIVER_INIT(raidenu);
DECLARE_DRIVER_INIT(raidenk);
DECLARE_DRIVER_INIT(raiden);
-
+
TILE_GET_INFO_MEMBER(get_back_tile_info);
TILE_GET_INFO_MEMBER(get_fore_tile_info);
TILE_GET_INFO_MEMBER(get_text_tile_info);
-
+
virtual void video_start();
DECLARE_VIDEO_START(raidenb);
-
+
UINT32 screen_update_common(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, UINT16 *scrollregs);
UINT32 screen_update_raiden(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
UINT32 screen_update_raidenb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-
+
INTERRUPT_GEN_MEMBER(raiden_interrupt);
-
+
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int pri_mask);
void common_decrypt();
};
diff --git a/src/mame/includes/retofinv.h b/src/mame/includes/retofinv.h
index b4f1f9534a3..6efbbb5b0b8 100644
--- a/src/mame/includes/retofinv.h
+++ b/src/mame/includes/retofinv.h
@@ -19,11 +19,11 @@ public:
optional_device<cpu_device> m_68705;
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
-
+
required_shared_ptr<UINT8> m_fg_videoram;
required_shared_ptr<UINT8> m_sharedram;
required_shared_ptr<UINT8> m_bg_videoram;
-
+
UINT8 m_main_irq_mask;
UINT8 m_sub_irq_mask;
UINT8 m_cpu2_m6000;
@@ -78,10 +78,10 @@ public:
virtual void machine_start();
virtual void video_start();
DECLARE_PALETTE_INIT(retofinv);
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites(bitmap_ind16 &bitmap);
-
+
INTERRUPT_GEN_MEMBER(main_vblank_irq);
INTERRUPT_GEN_MEMBER(sub_vblank_irq);
};
diff --git a/src/mame/includes/rollrace.h b/src/mame/includes/rollrace.h
index ee8c3c1fc0c..d2b1009d7a3 100644
--- a/src/mame/includes/rollrace.h
+++ b/src/mame/includes/rollrace.h
@@ -16,7 +16,7 @@ public:
required_shared_ptr<UINT8> m_videoram;
required_shared_ptr<UINT8> m_colorram;
required_shared_ptr<UINT8> m_spriteram;
-
+
int m_charbank[2];
int m_bkgpage;
int m_bkgflip;
@@ -29,7 +29,7 @@ public:
UINT8 m_nmi_mask;
UINT8 m_sound_nmi_mask;
-
+
DECLARE_READ8_MEMBER(fake_d800_r);
DECLARE_WRITE8_MEMBER(fake_d800_w);
DECLARE_WRITE8_MEMBER(nmi_mask_w);
@@ -41,12 +41,12 @@ public:
DECLARE_WRITE8_MEMBER(backgroundcolor_w);
DECLARE_WRITE8_MEMBER(flipy_w);
DECLARE_WRITE8_MEMBER(flipx_w);
-
+
DECLARE_PALETTE_INIT(rollrace);
virtual void machine_start();
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-
+
INTERRUPT_GEN_MEMBER(vblank_irq);
INTERRUPT_GEN_MEMBER(sound_timer_irq);
};
diff --git a/src/mame/includes/scotrsht.h b/src/mame/includes/scotrsht.h
index c331665db6c..2781c71e806 100644
--- a/src/mame/includes/scotrsht.h
+++ b/src/mame/includes/scotrsht.h
@@ -36,7 +36,7 @@ public:
DECLARE_WRITE8_MEMBER(palettebank_w);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
-
+
INTERRUPT_GEN_MEMBER(interrupt);
virtual void video_start();
diff --git a/src/mame/includes/seicross.h b/src/mame/includes/seicross.h
index 555a396c8f5..c7fe73d763c 100644
--- a/src/mame/includes/seicross.h
+++ b/src/mame/includes/seicross.h
@@ -38,7 +38,7 @@ public:
DECLARE_WRITE8_MEMBER(portB_w);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
-
+
INTERRUPT_GEN_MEMBER(vblank_irq);
virtual void machine_start();
@@ -46,9 +46,9 @@ public:
virtual void video_start();
DECLARE_PALETTE_INIT(seicross);
DECLARE_DRIVER_INIT(friskytb);
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect );
-
+
void nvram_init(nvram_device &nvram, void *data, size_t size);
};
diff --git a/src/mame/includes/shadfrce.h b/src/mame/includes/shadfrce.h
index e2e12198cb8..d3ed454587c 100644
--- a/src/mame/includes/shadfrce.h
+++ b/src/mame/includes/shadfrce.h
@@ -59,7 +59,7 @@ public:
TILE_GET_INFO_MEMBER(get_bg1tile_info);
virtual void video_start();
-
+
TIMER_DEVICE_CALLBACK_MEMBER(scanline);
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/shootout.h b/src/mame/includes/shootout.h
index 3d8f3552ac2..26cfd04ac95 100644
--- a/src/mame/includes/shootout.h
+++ b/src/mame/includes/shootout.h
@@ -23,7 +23,7 @@ public:
tilemap_t *m_background;
tilemap_t *m_foreground;
int m_bFlicker;
-
+
DECLARE_WRITE8_MEMBER(bankswitch_w);
DECLARE_WRITE8_MEMBER(sound_cpu_command_w);
DECLARE_WRITE8_MEMBER(flipscreen_w);
@@ -32,14 +32,14 @@ public:
DECLARE_WRITE8_MEMBER(textram_w);
DECLARE_INPUT_CHANGED_MEMBER(coin_inserted);
-
+
DECLARE_DRIVER_INIT(shootout);
virtual void video_start();
DECLARE_PALETTE_INIT(shootout);
-
+
TILE_GET_INFO_MEMBER(get_bg_tile_info);
TILE_GET_INFO_MEMBER(get_fg_tile_info);
-
+
UINT32 screen_update_shootout(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
UINT32 screen_update_shootouj(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int bank_bits );
diff --git a/src/mame/includes/sidepckt.h b/src/mame/includes/sidepckt.h
index 11bcd51fcf9..e65cd1d699c 100644
--- a/src/mame/includes/sidepckt.h
+++ b/src/mame/includes/sidepckt.h
@@ -26,7 +26,7 @@ public:
required_shared_ptr<UINT8> m_videoram;
required_shared_ptr<UINT8> m_colorram;
required_shared_ptr<UINT8> m_spriteram;
-
+
tilemap_t *m_bg_tilemap;
const UINT8* m_prot_table[3];
UINT8 m_i8751_return;
@@ -41,16 +41,16 @@ public:
DECLARE_WRITE8_MEMBER(videoram_w);
DECLARE_WRITE8_MEMBER(colorram_w);
DECLARE_WRITE8_MEMBER(flipscreen_w);
-
+
DECLARE_DRIVER_INIT(sidepckt);
DECLARE_DRIVER_INIT(sidepcktj);
-
+
TILE_GET_INFO_MEMBER(get_tile_info);
-
+
virtual void machine_reset();
virtual void video_start();
DECLARE_PALETTE_INIT(sidepckt);
-
+
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/silkroad.h b/src/mame/includes/silkroad.h
index bdd169b896d..73a2a689bd4 100644
--- a/src/mame/includes/silkroad.h
+++ b/src/mame/includes/silkroad.h
@@ -20,31 +20,31 @@ public:
required_device<okim6295_device> m_oki1;
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
-
+
required_shared_ptr<UINT32> m_generic_paletteram_32;
required_shared_ptr<UINT32> m_vidram;
required_shared_ptr<UINT32> m_vidram2;
required_shared_ptr<UINT32> m_vidram3;
required_shared_ptr<UINT32> m_sprram;
required_shared_ptr<UINT32> m_regs;
-
+
tilemap_t *m_fg_tilemap;
tilemap_t *m_fg2_tilemap;
tilemap_t *m_fg3_tilemap;
-
+
DECLARE_WRITE32_MEMBER(paletteram32_xRRRRRGGGGGBBBBB_dword_w);
DECLARE_WRITE32_MEMBER(silk_coin_counter_w);
DECLARE_WRITE32_MEMBER(silkroad_fgram_w);
DECLARE_WRITE32_MEMBER(silkroad_fgram2_w);
DECLARE_WRITE32_MEMBER(silkroad_fgram3_w);
DECLARE_WRITE32_MEMBER(silk_6295_bank_w);
-
+
TILE_GET_INFO_MEMBER(get_fg_tile_info);
TILE_GET_INFO_MEMBER(get_fg2_tile_info);
TILE_GET_INFO_MEMBER(get_fg3_tile_info);
-
+
virtual void video_start();
-
+
UINT32 screen_update_silkroad(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
};
diff --git a/src/mame/includes/skydiver.h b/src/mame/includes/skydiver.h
index d7a446e32ea..82bfe2ce1f6 100644
--- a/src/mame/includes/skydiver.h
+++ b/src/mame/includes/skydiver.h
@@ -36,7 +36,7 @@ public:
required_device<palette_device> m_palette;
required_shared_ptr<UINT8> m_videoram;
-
+
int m_nmion;
tilemap_t *m_bg_tilemap;
int m_width;
@@ -56,16 +56,16 @@ public:
DECLARE_WRITE8_MEMBER(_2000_201F_w);
DECLARE_WRITE8_MEMBER(sound_enable_w);
DECLARE_WRITE8_MEMBER(whistle_w);
-
+
TILE_GET_INFO_MEMBER(get_tile_info);
-
+
virtual void machine_reset();
virtual void video_start();
DECLARE_PALETTE_INIT(skydiver);
-
+
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/snowbros.h b/src/mame/includes/snowbros.h
index 2f3cb5dc54c..efb7292e205 100644
--- a/src/mame/includes/snowbros.h
+++ b/src/mame/includes/snowbros.h
@@ -26,7 +26,7 @@ public:
optional_device<kaneko_pandora_device> m_pandora;
optional_shared_ptr<UINT16> m_hyperpac_ram;
optional_shared_ptr<UINT16> m_bootleg_spriteram16;
-
+
int m_sb3_music_is_playing;
int m_sb3_music;
UINT8 m_semicom_prot_offset;
@@ -49,7 +49,7 @@ public:
DECLARE_WRITE8_MEMBER(twinadv_oki_bank_w);
DECLARE_WRITE16_MEMBER(sb3_sound_w);
DECLARE_READ16_MEMBER(toto_read);
-
+
DECLARE_DRIVER_INIT(pzlbreak);
DECLARE_DRIVER_INIT(moremorp);
DECLARE_DRIVER_INIT(snowbro3);
@@ -61,17 +61,17 @@ public:
DECLARE_DRIVER_INIT(hyperpac);
DECLARE_MACHINE_RESET(semiprot);
DECLARE_MACHINE_RESET(finalttr);
-
+
UINT32 screen_update_snowbros(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
UINT32 screen_update_honeydol(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
UINT32 screen_update_twinadv(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
UINT32 screen_update_snowbro3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
UINT32 screen_update_wintbob(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void screen_eof_snowbros(screen_device &screen, bool state);
-
+
TIMER_DEVICE_CALLBACK_MEMBER(snowbros_irq);
TIMER_DEVICE_CALLBACK_MEMBER(snowbros3_irq);
-
+
void sb3_play_music(int data);
void sb3_play_sound(int data);
};
diff --git a/src/mame/includes/speedatk.h b/src/mame/includes/speedatk.h
index 383dc2ed0ef..784ff907dba 100644
--- a/src/mame/includes/speedatk.h
+++ b/src/mame/includes/speedatk.h
@@ -19,7 +19,7 @@ public:
required_shared_ptr<UINT8> m_videoram;
required_shared_ptr<UINT8> m_colorram;
-
+
UINT8 m_crtc_vreg[0x100];
UINT8 m_crtc_index;
UINT8 m_flip_scr;
@@ -27,7 +27,7 @@ public:
UINT8 m_km_status;
UINT8 m_coin_settings;
UINT8 m_coin_impulse;
-
+
DECLARE_READ8_MEMBER(key_matrix_r);
DECLARE_WRITE8_MEMBER(key_matrix_w);
DECLARE_READ8_MEMBER(key_matrix_status_r);
@@ -40,8 +40,8 @@ public:
virtual void machine_start();
virtual void video_start();
DECLARE_PALETTE_INIT(speedatk);
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-
+
UINT8 iox_key_matrix_calc(UINT8 p_side);
};
diff --git a/src/mame/includes/tecmo.h b/src/mame/includes/tecmo.h
index c216e00ca54..c1da585d36f 100644
--- a/src/mame/includes/tecmo.h
+++ b/src/mame/includes/tecmo.h
@@ -15,7 +15,7 @@ public:
m_txvideoram(*this, "txvideoram"),
m_fgvideoram(*this, "fgvideoram"),
m_bgvideoram(*this, "bgvideoram"),
- m_spriteram(*this, "spriteram") { }
+ m_spriteram(*this, "spriteram") { }
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_soundcpu;
@@ -56,22 +56,22 @@ public:
DECLARE_WRITE8_MEMBER(adpcm_start_w);
DECLARE_WRITE8_MEMBER(adpcm_vol_w);
DECLARE_WRITE_LINE_MEMBER(adpcm_int);
-
+
DECLARE_DRIVER_INIT(silkworm);
DECLARE_DRIVER_INIT(rygar);
DECLARE_DRIVER_INIT(backfirt);
DECLARE_DRIVER_INIT(gemini);
-
+
TILE_GET_INFO_MEMBER(get_bg_tile_info);
TILE_GET_INFO_MEMBER(get_fg_tile_info);
TILE_GET_INFO_MEMBER(gemini_get_bg_tile_info);
TILE_GET_INFO_MEMBER(gemini_get_fg_tile_info);
TILE_GET_INFO_MEMBER(get_tx_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);
void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap,const rectangle &cliprect);
};
diff --git a/src/mame/includes/tecmo16.h b/src/mame/includes/tecmo16.h
index 9aa9c30c168..397445a3042 100644
--- a/src/mame/includes/tecmo16.h
+++ b/src/mame/includes/tecmo16.h
@@ -74,6 +74,6 @@ public:
DECLARE_VIDEO_START(riot);
UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
-
+
void save_state();
};
diff --git a/src/mame/includes/tecmosys.h b/src/mame/includes/tecmosys.h
index ea5b99acb42..40ab993345f 100644
--- a/src/mame/includes/tecmosys.h
+++ b/src/mame/includes/tecmosys.h
@@ -52,7 +52,7 @@ public:
required_shared_ptr<UINT16> m_c00000regs;
required_shared_ptr<UINT16> m_c80000regs;
required_shared_ptr<UINT16> m_880000regs;
-
+
int m_spritelist;
bitmap_ind16 m_sprite_bitmap;
bitmap_ind16 m_tmp_tilemap_composebitmap;
@@ -65,7 +65,7 @@ public:
UINT8 m_device_status;
const struct prot_data* m_device_data;
UINT8 m_device_value;
-
+
DECLARE_READ16_MEMBER(sound_r);
DECLARE_WRITE16_MEMBER(sound_w);
DECLARE_WRITE16_MEMBER(unk880000_w);
@@ -87,13 +87,13 @@ public:
DECLARE_READ16_MEMBER(eeprom_r);
DECLARE_WRITE16_MEMBER(eeprom_w);
DECLARE_WRITE_LINE_MEMBER(sound_irq);
-
+
DECLARE_DRIVER_INIT(tkdensha);
DECLARE_DRIVER_INIT(deroon);
DECLARE_DRIVER_INIT(tkdensho);
virtual void machine_start();
virtual void video_start();
-
+
TILE_GET_INFO_MEMBER(get_bg0tile_info);
TILE_GET_INFO_MEMBER(get_bg1tile_info);
TILE_GET_INFO_MEMBER(get_bg2tile_info);
diff --git a/src/mame/includes/tehkanwc.h b/src/mame/includes/tehkanwc.h
index 46c74a19a89..68c90cdfa5a 100644
--- a/src/mame/includes/tehkanwc.h
+++ b/src/mame/includes/tehkanwc.h
@@ -32,7 +32,7 @@ public:
required_shared_ptr<UINT8> m_colorram;
required_shared_ptr<UINT8> m_videoram2;
required_shared_ptr<UINT8> m_spriteram;
-
+
int m_track0[2];
int m_track1[2];
int m_msm_data_offs;
@@ -42,7 +42,7 @@ public:
UINT8 m_led1;
tilemap_t *m_bg_tilemap;
tilemap_t *m_fg_tilemap;
-
+
DECLARE_WRITE8_MEMBER(sub_cpu_halt_w);
DECLARE_READ8_MEMBER(track_0_r);
DECLARE_READ8_MEMBER(track_1_r);
@@ -72,7 +72,7 @@ public:
DECLARE_DRIVER_INIT(teedoff);
virtual void machine_start();
virtual void video_start();
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void gridiron_draw_led(bitmap_ind16 &bitmap, const rectangle &cliprect, UINT8 led,int player);
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/thedeep.h b/src/mame/includes/thedeep.h
index 9d645964b23..301bb0c8b0d 100644
--- a/src/mame/includes/thedeep.h
+++ b/src/mame/includes/thedeep.h
@@ -25,7 +25,7 @@ public:
required_shared_ptr<UINT8> m_vram_1;
required_shared_ptr<UINT8> m_scroll;
required_shared_ptr<UINT8> m_scroll2;
-
+
int m_nmi_enable;
UINT8 m_protection_command;
UINT8 m_protection_data;
@@ -48,7 +48,7 @@ public:
DECLARE_READ8_MEMBER(p0_r);
DECLARE_WRITE8_MEMBER(vram_0_w);
DECLARE_WRITE8_MEMBER(vram_1_w);
-
+
TILEMAP_MAPPER_MEMBER(tilemap_scan_rows_back);
TILE_GET_INFO_MEMBER(get_tile_info_0);
TILE_GET_INFO_MEMBER(get_tile_info_1);
@@ -60,7 +60,7 @@ 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(mcu_irq);
TIMER_DEVICE_CALLBACK_MEMBER(interrupt);
};
diff --git a/src/mame/includes/tnzs.h b/src/mame/includes/tnzs.h
index 6e3401ae0cd..8422417dfb4 100644
--- a/src/mame/includes/tnzs.h
+++ b/src/mame/includes/tnzs.h
@@ -35,7 +35,7 @@ public:
m_palette(*this, "palette"),
m_mainbank(*this, "mainbank")
{ }
-
+
/* devices */
required_device<cpu_device> m_maincpu;
optional_device<cpu_device> m_audiocpu;
@@ -107,13 +107,13 @@ public:
DECLARE_PALETTE_INIT(arknoid2);
DECLARE_MACHINE_START(tnzs_common);
DECLARE_MACHINE_RESET(jpopnics);
-
+
UINT32 screen_update_tnzs(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void screen_eof_tnzs(screen_device &screen, bool state);
-
+
INTERRUPT_GEN_MEMBER(arknoid2_interrupt);
TIMER_CALLBACK_MEMBER(kludge_callback);
-
+
void tnzs_postload();
void mcu_reset();
void mcu_handle_coins(int coin);
diff --git a/src/mame/includes/vball.h b/src/mame/includes/vball.h
index ba2e340f600..cfbf448b75b 100644
--- a/src/mame/includes/vball.h
+++ b/src/mame/includes/vball.h
@@ -23,7 +23,7 @@ public:
required_shared_ptr<UINT8> m_videoram;
required_shared_ptr<UINT8> m_scrolly_lo;
required_shared_ptr<UINT8> m_spriteram;
-
+
int m_scrollx_hi;
int m_scrolly_hi;
int m_scrollx_lo;
@@ -32,7 +32,7 @@ public:
int m_bgprombank;
int m_spprombank;
tilemap_t *m_bg_tilemap;
-
+
DECLARE_WRITE8_MEMBER(irq_ack_w);
DECLARE_WRITE8_MEMBER(bankswitch_w);
DECLARE_WRITE8_MEMBER(cpu_sound_command_w);
@@ -40,13 +40,13 @@ public:
DECLARE_WRITE8_MEMBER(scrollx_lo_w);
DECLARE_WRITE8_MEMBER(videoram_w);
DECLARE_WRITE8_MEMBER(attrib_w);
-
+
TILEMAP_MAPPER_MEMBER(background_scan);
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);
TIMER_DEVICE_CALLBACK_MEMBER(vball_scanline);
void bgprombank_w(int bank);
diff --git a/src/mame/includes/wc90.h b/src/mame/includes/wc90.h
index f8cc077c37e..e2dbad41f15 100644
--- a/src/mame/includes/wc90.h
+++ b/src/mame/includes/wc90.h
@@ -28,7 +28,7 @@ public:
m_spriteram(*this, "spriteram")
{ }
-
+
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
required_device<gfxdecode_device> m_gfxdecode;
@@ -51,7 +51,7 @@ public:
required_shared_ptr<UINT8> m_scroll2ylo;
required_shared_ptr<UINT8> m_scroll2yhi;
required_shared_ptr<UINT8> m_spriteram;
-
+
tilemap_t *m_tx_tilemap;
tilemap_t *m_fg_tilemap;
tilemap_t *m_bg_tilemap;
@@ -63,15 +63,15 @@ public:
DECLARE_WRITE8_MEMBER(fgvideoram_w);
DECLARE_WRITE8_MEMBER(txvideoram_w);
DECLARE_WRITE_LINE_MEMBER(irqhandler);
-
+
TILE_GET_INFO_MEMBER(get_bg_tile_info);
TILE_GET_INFO_MEMBER(get_fg_tile_info);
TILE_GET_INFO_MEMBER(get_tx_tile_info);
TILE_GET_INFO_MEMBER(track_get_bg_tile_info);
TILE_GET_INFO_MEMBER(track_get_fg_tile_info);
-
+
virtual void video_start();
DECLARE_VIDEO_START(wc90t);
-
+
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
};
diff --git a/src/mame/includes/welltris.h b/src/mame/includes/welltris.h
index 92000229bb7..f969c2e36ad 100644
--- a/src/mame/includes/welltris.h
+++ b/src/mame/includes/welltris.h
@@ -31,7 +31,7 @@ public:
UINT16 m_pixelpalettebank;
int m_scrollx;
int m_scrolly;
-
+
DECLARE_WRITE8_MEMBER(sound_bankswitch_w);
DECLARE_WRITE16_MEMBER(sound_command_w);
DECLARE_WRITE8_MEMBER(pending_command_clear_w);
@@ -40,14 +40,14 @@ public:
DECLARE_WRITE16_MEMBER(scrollreg_w);
DECLARE_WRITE16_MEMBER(charvideoram_w);
DECLARE_WRITE_LINE_MEMBER(irqhandler);
-
+
DECLARE_CUSTOM_INPUT_MEMBER(pending_sound_r);
-
+
DECLARE_DRIVER_INIT(quiz18k);
DECLARE_DRIVER_INIT(welltris);
virtual void machine_start();
virtual void video_start();
-
+
TILE_GET_INFO_MEMBER(get_tile_info);
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_background(bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/wrally.h b/src/mame/includes/wrally.h
index 23da251444f..e611d5b8b6c 100644
--- a/src/mame/includes/wrally.h
+++ b/src/mame/includes/wrally.h
@@ -19,7 +19,7 @@ public:
required_shared_ptr<UINT16> m_vregs;
required_shared_ptr<UINT16> m_spriteram;
required_shared_ptr<UINT16> m_shareram;
-
+
tilemap_t *m_pant[2];
DECLARE_READ8_MEMBER(dallas_share_r);
@@ -29,12 +29,12 @@ public:
DECLARE_WRITE16_MEMBER(okim6295_bankswitch_w);
DECLARE_WRITE16_MEMBER(wrally_coin_counter_w);
DECLARE_WRITE16_MEMBER(wrally_coin_lockout_w);
-
+
TILE_GET_INFO_MEMBER(get_tile_info_screen0);
TILE_GET_INFO_MEMBER(get_tile_info_screen1);
-
+
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/includes/wwfsstar.h b/src/mame/includes/wwfsstar.h
index 675b08d9471..7c422216ad7 100644
--- a/src/mame/includes/wwfsstar.h
+++ b/src/mame/includes/wwfsstar.h
@@ -21,24 +21,24 @@ public:
required_shared_ptr<UINT16> m_spriteram;
required_shared_ptr<UINT16> m_fg0_videoram;
required_shared_ptr<UINT16> m_bg0_videoram;
-
+
int m_vblank;
int m_scrollx;
int m_scrolly;
tilemap_t *m_fg0_tilemap;
tilemap_t *m_bg0_tilemap;
-
+
DECLARE_WRITE16_MEMBER(scroll_w);
DECLARE_WRITE16_MEMBER(sound_w);
DECLARE_WRITE16_MEMBER(flipscreen_w);
DECLARE_WRITE16_MEMBER(irqack_w);
DECLARE_WRITE16_MEMBER(fg0_videoram_w);
DECLARE_WRITE16_MEMBER(bg0_videoram_w);
-
+
DECLARE_CUSTOM_INPUT_MEMBER(vblank_r);
-
+
TIMER_DEVICE_CALLBACK_MEMBER(scanline);
-
+
TILE_GET_INFO_MEMBER(get_fg0_tile_info);
TILEMAP_MAPPER_MEMBER(bg0_scan);
TILE_GET_INFO_MEMBER(get_bg0_tile_info);
diff --git a/src/mame/includes/xorworld.h b/src/mame/includes/xorworld.h
index fcbdb9afe35..2c64efc2f6a 100644
--- a/src/mame/includes/xorworld.h
+++ b/src/mame/includes/xorworld.h
@@ -16,25 +16,25 @@ public:
required_device<eeprom_serial_93cxx_device> m_eeprom;
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
-
+
required_shared_ptr<UINT16> m_videoram;
required_shared_ptr<UINT16> m_spriteram;
-
+
tilemap_t *m_bg_tilemap;
-
+
DECLARE_WRITE16_MEMBER(irq2_ack_w);
DECLARE_WRITE16_MEMBER(irq6_ack_w);
DECLARE_WRITE16_MEMBER(videoram_w);
DECLARE_WRITE16_MEMBER(eeprom_chip_select_w);
DECLARE_WRITE16_MEMBER(eeprom_serial_clock_w);
DECLARE_WRITE16_MEMBER(eeprom_data_w);
-
+
TILE_GET_INFO_MEMBER(get_bg_tile_info);
-
+
DECLARE_DRIVER_INIT(xorworld);
virtual void video_start();
DECLARE_PALETTE_INIT(xorworld);
-
+
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/xxmissio.h b/src/mame/includes/xxmissio.h
index aa939a48394..b9910763fbe 100644
--- a/src/mame/includes/xxmissio.h
+++ b/src/mame/includes/xxmissio.h
@@ -26,7 +26,7 @@ public:
UINT8 m_xscroll;
UINT8 m_yscroll;
UINT8 m_flipscreen;
-
+
DECLARE_WRITE8_MEMBER(bank_sel_w);
DECLARE_WRITE8_MEMBER(status_m_w);
DECLARE_WRITE8_MEMBER(status_s_w);
@@ -35,18 +35,18 @@ public:
DECLARE_READ8_MEMBER(bgram_r);
DECLARE_WRITE8_MEMBER(scroll_x_w);
DECLARE_WRITE8_MEMBER(scroll_y_w);
-
+
DECLARE_CUSTOM_INPUT_MEMBER(status_r);
-
+
INTERRUPT_GEN_MEMBER(interrupt_m);
INTERRUPT_GEN_MEMBER(interrupt_s);
-
+
TILE_GET_INFO_MEMBER(get_bg_tile_info);
TILE_GET_INFO_MEMBER(get_fg_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, gfx_element *gfx);
};
diff --git a/src/mame/machine/mie.c b/src/mame/machine/mie.c
index 45cc56b2cd7..c52623f2f1d 100644
--- a/src/mame/machine/mie.c
+++ b/src/mame/machine/mie.c
@@ -33,7 +33,7 @@ static ADDRESS_MAP_START( mie_port, AS_IO, 8, mie_device)
AM_RANGE(0x00, 0x07) AM_READWRITE(gpio_r, gpio_w)
AM_RANGE(0x08, 0x08) AM_READWRITE(gpiodir_r, gpiodir_w)
AM_RANGE(0x0f, 0x0f) AM_READWRITE(adc_r, adc_w)
- AM_RANGE(0x10, 0x10) AM_READWRITE(jvs_r, jvs_w) // ports 1x and 2x is standard UARTs, TODO handle it properly
+ AM_RANGE(0x10, 0x10) AM_READWRITE(jvs_r, jvs_w) // ports 1x and 2x is standard UARTs, TODO handle it properly
AM_RANGE(0x12, 0x12) AM_WRITE(jvs_dest_w)
AM_RANGE(0x13, 0x13) AM_WRITE(jvs_lcr_w)
AM_RANGE(0x15, 0x15) AM_READ(jvs_status_r)
diff --git a/src/mame/machine/nb1414m4.c b/src/mame/machine/nb1414m4.c
index c8886631963..dfdd2af5004 100644
--- a/src/mame/machine/nb1414m4.c
+++ b/src/mame/machine/nb1414m4.c
@@ -55,7 +55,6 @@ void nb1414m4_device::device_start()
void nb1414m4_device::device_reset()
{
-
}
/*****************************************************************************
@@ -142,7 +141,7 @@ void nb1414m4_device::kozure_score_msg(UINT16 dst, UINT8 src_base, UINT8 *vram)
int i;
UINT8 first_digit;
UINT8 res;
-
+
first_digit = 0;
for(i=0;i<6;i++)
diff --git a/src/mame/machine/tait8741.c b/src/mame/machine/tait8741.c
index f1176589ad5..b6b4a6cd75a 100644
--- a/src/mame/machine/tait8741.c
+++ b/src/mame/machine/tait8741.c
@@ -250,7 +250,7 @@ void taito8741_4pack_device::device_start()
m_port_handler_1_r.resolve_safe(0);
m_port_handler_2_r.resolve_safe(0);
m_port_handler_3_r.resolve_safe(0);
-
+
for (int i = 0; i < 4; i++)
{
save_item(NAME(m_taito8741[i].toData), i);
@@ -360,7 +360,7 @@ void josvolly8741_4pack_device::device_start()
m_port_handler_1_r.resolve_safe(0);
m_port_handler_2_r.resolve_safe(0);
m_port_handler_3_r.resolve_safe(0);
-
+
for (int i = 0; i < 4; i++)
{
save_item(NAME(m_i8741[i].cmd), i);
@@ -370,7 +370,7 @@ void josvolly8741_4pack_device::device_start()
save_item(NAME(m_i8741[i].rxd), i);
save_item(NAME(m_i8741[i].rst), i);
};
-
+
save_item(NAME(m_nmi_enable));
}
diff --git a/src/mame/machine/tnzs.c b/src/mame/machine/tnzs.c
index a439f2eef45..25b0ad3640e 100644
--- a/src/mame/machine/tnzs.c
+++ b/src/mame/machine/tnzs.c
@@ -639,7 +639,7 @@ MACHINE_RESET_MEMBER(tnzs_state,jpopnics)
MACHINE_START_MEMBER(tnzs_state,tnzs_common)
{
UINT8 *SUB = memregion("sub")->base();
-
+
membank("subbank")->configure_entries(0, 4, &SUB[0x08000], 0x2000);
membank("subbank")->set_entry(m_bank2);
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index 16cf9c6727a..26cbd889193 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -4713,7 +4713,7 @@ wwallyja // 1992.06 Wally wo Sagase! (Japan, FD1094)
desertbr // 1993.?? Desert Breaker (World, FD1094)
desertbrj // 1992.10 Desert Breaker (Japan, FD1094)
pontoon
-hamaway // prototype
+hamaway // prototype
// System18 Bootlegs
astormbl // BOOTLEG
@@ -4747,7 +4747,7 @@ toutrunj // 1989.02 Turbo Outrun (Japan, FD1094)
toutrun3 // 1987 (FD1094)
toutrun2 // 1987 (FD1094)
toutrun1 // 1987 (FD1094)
-toutrunj1 // 1987 (FD1094)
+toutrunj1 // 1987 (FD1094)
// X Board
aburner // 1987.07 After Burner (Japan)
@@ -5910,7 +5910,7 @@ pcktgalb // bootleg
pcktgal2 // (c) 1989 Data East Corporation (World?)
pcktgal2j // (c) 1989 Data East Corporation (World?)
pokechmp // Korean hack of Pocket Gal
-pokechmpa //
+pokechmpa //
billlist //
spool3 // (c) 1989 Data East Corporation (World?)
spool3i // (c) 1990 Data East Corporation + I-Vics license
@@ -9325,7 +9325,7 @@ missw96 // (c) 1996 Comad
missw96a // (c) 1996 Comad
missw96b // (c) 1996 Comad
missmw96 // (c) 1996 Comad
-smissw //
+smissw //
fantsia2 // (c) 1997 Comad
fantsia2a // (c) 1997 Comad
wownfant // (c) 2002 Comad
@@ -10500,7 +10500,7 @@ crospang // (c) 1998 F2 System
heuksun // (c) 1998 Oksan / F2 System
bestri // (c) F2 System
silvmil // (c) 1995 Para
-puzzlove // (c) 1994 Para
+puzzlove // (c) 1994 Para
funybubl // (c) 1999 In Chang Electronic Co
funybublc // (c) 1999 Comad Industries
dcheese // (c) 1993 HAR
diff --git a/src/mame/video/bloodbro.c b/src/mame/video/bloodbro.c
index 0676cd22f05..5df031809c4 100644
--- a/src/mame/video/bloodbro.c
+++ b/src/mame/video/bloodbro.c
@@ -61,7 +61,7 @@ void bloodbro_state::video_start()
m_fg_tilemap->set_transparent_pen(15);
m_tx_tilemap->set_transparent_pen(15);
-
+
save_item(NAME(m_scrollram));
save_item(NAME(m_layer_en));
}
diff --git a/src/mame/video/chaknpop.c b/src/mame/video/chaknpop.c
index d36e678ed84..cbf94cb3950 100644
--- a/src/mame/video/chaknpop.c
+++ b/src/mame/video/chaknpop.c
@@ -25,7 +25,7 @@
PALETTE_INIT_MEMBER(chaknpop_state, chaknpop)
{
const UINT8 *color_prom = memregion("proms")->base();
-
+
for (int i = 0; i < 1024; i++)
{
int col, r, g, b;
diff --git a/src/mame/video/darkmist.c b/src/mame/video/darkmist.c
index bd335d9bc03..2a2a44e8aa3 100644
--- a/src/mame/video/darkmist.c
+++ b/src/mame/video/darkmist.c
@@ -101,13 +101,12 @@ void darkmist_state::video_start()
m_txtilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(darkmist_state::get_txttile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32 );
m_fgtilemap->set_transparent_pen(0);
m_txtilemap->set_transparent_pen(0);
-
+
save_item(NAME(m_hw));
}
UINT32 darkmist_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
-
#define DM_GETSCROLL(n) (((m_scroll[(n)]<<1)&0xff) + ((m_scroll[(n)]&0x80)?1:0) +( ((m_scroll[(n)-1]<<4) | (m_scroll[(n)-1]<<12) )&0xff00))
m_bgtilemap->set_scrollx(0, DM_GETSCROLL(0x2));
diff --git a/src/mame/video/dcon.c b/src/mame/video/dcon.c
index 78152626753..bca9b9dedb1 100644
--- a/src/mame/video/dcon.c
+++ b/src/mame/video/dcon.c
@@ -106,7 +106,7 @@ void dcon_state::video_start()
m_text_layer->set_transparent_pen(15);
m_gfx_bank_select = 0;
-
+
save_item(NAME(m_gfx_bank_select));
save_item(NAME(m_last_gfx_bank));
save_item(NAME(m_scroll_ram));
diff --git a/src/mame/video/decospr.c b/src/mame/video/decospr.c
index 96940c008dc..348a6385e36 100644
--- a/src/mame/video/decospr.c
+++ b/src/mame/video/decospr.c
@@ -233,8 +233,8 @@ void decospr_device::draw_sprites_common(_BitmapClass &bitmap, const rectangle &
{
sprite = spriteram[offs + 1];
y = spriteram[offs];
-
- if (m_is_bootleg && (m_bootleg_type == 1))
+
+ if (m_is_bootleg && (m_bootleg_type == 1))
{
flash = y & 0x0400;
}
diff --git a/src/mame/video/fastfred.c b/src/mame/video/fastfred.c
index fb4afb7c0cf..3909970fc5c 100644
--- a/src/mame/video/fastfred.c
+++ b/src/mame/video/fastfred.c
@@ -345,7 +345,7 @@ VIDEO_START_MEMBER(fastfred_state,imago)
/* web colors */
m_palette->set_pen_color(256+64+0,rgb_t(0x50,0x00,0x00));
m_palette->set_pen_color(256+64+1,rgb_t(0x00,0x00,0x00));
-
+
save_item(NAME(m_imago_sprites));
save_item(NAME(m_imago_sprites_address));
save_item(NAME(m_imago_sprites_bank));
@@ -356,7 +356,7 @@ VIDEO_START_MEMBER(fastfred_state,imago)
save_item(NAME(m_timer_adjusted));
save_item(NAME(m_stars_colors_start));
save_item(NAME(m_stars_scrollpos));
-
+
for (int i = 0; i < STAR_COUNT; i++)
{
save_item(NAME(m_stars[i].x), i);
diff --git a/src/mame/video/gladiatr.c b/src/mame/video/gladiatr.c
index 34e6c2084b0..519f06b19d6 100644
--- a/src/mame/video/gladiatr.c
+++ b/src/mame/video/gladiatr.c
@@ -50,7 +50,7 @@ VIDEO_START_MEMBER(gladiatr_state,ppking)
m_bg_tilemap->set_scroll_cols(0x10);
m_sprite_bank = 1;
-
+
save_item(NAME(m_video_attributes));
save_item(NAME(m_fg_scrolly));
save_item(NAME(m_sprite_buffer));
@@ -68,7 +68,7 @@ VIDEO_START_MEMBER(gladiatr_state,gladiatr)
m_fg_tilemap->set_scrolldx(-0x30, 0x12f);
m_sprite_bank = 2;
-
+
save_item(NAME(m_video_attributes));
save_item(NAME(m_fg_scrollx));
save_item(NAME(m_fg_scrolly));
diff --git a/src/mame/video/gsword.c b/src/mame/video/gsword.c
index 979ba3420ac..74019bcc8ae 100644
--- a/src/mame/video/gsword.c
+++ b/src/mame/video/gsword.c
@@ -148,7 +148,7 @@ void gsword_state::video_start()
{
m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(gsword_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS,
8, 8, 32, 64);
-
+
save_item(NAME(m_charbank));
save_item(NAME(m_charpalbank));
save_item(NAME(m_flipscreen));
diff --git a/src/mame/video/iqblock.c b/src/mame/video/iqblock.c
index 7333ceac171..b4950297a8c 100644
--- a/src/mame/video/iqblock.c
+++ b/src/mame/video/iqblock.c
@@ -41,7 +41,7 @@ void iqblock_state::video_start()
m_bg_tilemap->set_transparent_pen(0);
m_fg_tilemap->set_scroll_cols(64);
-
+
save_item(NAME(m_videoenable));
}
diff --git a/src/mame/video/kaneko_spr.c b/src/mame/video/kaneko_spr.c
index a55f32ddf0f..c4a0a8873be 100644
--- a/src/mame/video/kaneko_spr.c
+++ b/src/mame/video/kaneko_spr.c
@@ -71,7 +71,7 @@ void kaneko16_sprite_device::device_start()
m_first_sprite = auto_alloc_array(machine(), struct tempsprite, 0x400);
m_sprites_regs = auto_alloc_array_clear(machine(), UINT16, 0x20/2);
m_screen->register_screen_bitmap(m_sprites_bitmap);
-
+
save_item(NAME(m_sprite_flipx));
save_item(NAME(m_sprite_flipy));
save_pointer(NAME(m_sprites_regs), 0x20/2);
@@ -629,7 +629,7 @@ kaneko_kc002_sprite_device::kaneko_kc002_sprite_device(const machine_config &mco
// link features (assuming the bad program roms aren't the cause) it's clearly derived from this sprite system tho.
void kaneko16_sprite_device::bootleg_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, UINT16* spriteram16, int spriteram16_bytes)
{
-// UINT16 *spriteram16 = m_spriteram;
+// UINT16 *spriteram16 = m_spriteram;
int offs;
int sx=0, sy=0;
@@ -662,4 +662,4 @@ void kaneko16_sprite_device::bootleg_draw_sprites(bitmap_ind16 &bitmap, const re
flipx,flipy,
sx,sy,0);
}
-} \ No newline at end of file
+}
diff --git a/src/mame/video/liberate.c b/src/mame/video/liberate.c
index 7d449f4f572..c6827b4831d 100644
--- a/src/mame/video/liberate.c
+++ b/src/mame/video/liberate.c
@@ -209,7 +209,7 @@ VIDEO_START_MEMBER(liberate_state,prosoccr)
m_fg_gfx = memregion("fg_gfx")->base();
m_charram = auto_alloc_array(machine(), UINT8, 0x1800 * 2);
-
+
save_pointer(NAME(m_charram), 0x1800 * 2);
save_pointer(NAME(m_fg_gfx), 0x6000);
}
diff --git a/src/mame/video/mustache.c b/src/mame/video/mustache.c
index ef900a60629..7519dfc2b68 100644
--- a/src/mame/video/mustache.c
+++ b/src/mame/video/mustache.c
@@ -92,7 +92,7 @@ void mustache_state::video_start()
8, 8, 64, 32);
m_bg_tilemap->set_scroll_rows(4);
-
+
save_item(NAME(m_control_byte));
}
diff --git a/src/mame/video/quizpani.c b/src/mame/video/quizpani.c
index dad21bcb10d..d88d66f2829 100644
--- a/src/mame/video/quizpani.c
+++ b/src/mame/video/quizpani.c
@@ -69,7 +69,7 @@ void quizpani_state::video_start()
m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(quizpani_state::bg_tile_info),this), tilemap_mapper_delegate(FUNC(quizpani_state::bg_scan),this),16,16,256,32);
m_txt_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(quizpani_state::txt_tile_info),this),tilemap_mapper_delegate(FUNC(quizpani_state::bg_scan),this),16,16,256,32);
m_txt_tilemap->set_transparent_pen(15);
-
+
save_item(NAME(m_bgbank));
save_item(NAME(m_txtbank));
}
diff --git a/src/mame/video/retofinv.c b/src/mame/video/retofinv.c
index 9c327ad483a..15b2d737900 100644
--- a/src/mame/video/retofinv.c
+++ b/src/mame/video/retofinv.c
@@ -103,7 +103,7 @@ void retofinv_state::video_start()
m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(retofinv_state::fg_get_tile_info),this),tilemap_mapper_delegate(FUNC(retofinv_state::tilemap_scan),this),8,8,36,28);
m_fg_tilemap->configure_groups(*m_gfxdecode->gfx(0), 0);
-
+
save_item(NAME(m_fg_bank));
save_item(NAME(m_bg_bank));
}
diff --git a/src/mame/video/scotrsht.c b/src/mame/video/scotrsht.c
index 89ecab5f091..8115007ddb0 100644
--- a/src/mame/video/scotrsht.c
+++ b/src/mame/video/scotrsht.c
@@ -119,7 +119,7 @@ void scotrsht_state::video_start()
m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(scotrsht_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32);
m_bg_tilemap->set_scroll_cols(64);
-
+
save_item(NAME(m_irq_enable));
save_item(NAME(m_charbank));
save_item(NAME(m_palette_bank));
diff --git a/src/mame/video/shadfrce.c b/src/mame/video/shadfrce.c
index f9c49ecc1ca..986a27bf094 100644
--- a/src/mame/video/shadfrce.c
+++ b/src/mame/video/shadfrce.c
@@ -67,7 +67,7 @@ void shadfrce_state::video_start()
m_bg1tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(shadfrce_state::get_bg1tile_info),this),TILEMAP_SCAN_ROWS, 16, 16,32,32);
m_spvideoram_old = auto_alloc_array(machine(), UINT16, m_spvideoram.bytes()/2);
-
+
save_item(NAME(m_video_enable));
save_item(NAME(m_irqs_enable));
save_item(NAME(m_raster_scanline));
diff --git a/src/mame/video/shootout.c b/src/mame/video/shootout.c
index 8f5f31c9b2f..919330da025 100644
--- a/src/mame/video/shootout.c
+++ b/src/mame/video/shootout.c
@@ -80,7 +80,7 @@ void shootout_state::video_start()
m_background = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(shootout_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32);
m_foreground = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(shootout_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32);
m_foreground->set_transparent_pen(0 );
-
+
save_item(NAME(m_bFlicker));
}
diff --git a/src/mame/video/skydiver.c b/src/mame/video/skydiver.c
index 4ce15fb6d40..ee7f45b4bad 100644
--- a/src/mame/video/skydiver.c
+++ b/src/mame/video/skydiver.c
@@ -52,7 +52,7 @@ TILE_GET_INFO_MEMBER(skydiver_state::get_tile_info)
void skydiver_state::video_start()
{
m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(skydiver_state::get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32);
-
+
save_item(NAME(m_nmion));
save_item(NAME(m_width));
}
diff --git a/src/mame/video/tecmo.c b/src/mame/video/tecmo.c
index eb3567294fa..07f03bd4299 100644
--- a/src/mame/video/tecmo.c
+++ b/src/mame/video/tecmo.c
@@ -94,7 +94,7 @@ void tecmo_state::video_start()
m_bg_tilemap->set_scrolldx(-48,256+48);
m_fg_tilemap->set_scrolldx(-48,256+48);
-
+
save_item(NAME(m_fgscroll));
save_item(NAME(m_bgscroll));
}
diff --git a/src/mame/video/tecmo16.c b/src/mame/video/tecmo16.c
index c75422e0951..be84b01d197 100644
--- a/src/mame/video/tecmo16.c
+++ b/src/mame/video/tecmo16.c
@@ -82,7 +82,7 @@ void tecmo16_state::video_start()
m_tx_tilemap->set_scrolly(0,-16);
m_flipscreen = 0;
m_game_is_riot = 0;
-
+
save_state();
}
@@ -104,7 +104,7 @@ VIDEO_START_MEMBER(tecmo16_state,ginkun)
m_tx_tilemap->set_transparent_pen(0);
m_flipscreen = 0;
m_game_is_riot = 0;
-
+
save_state();
}
@@ -127,7 +127,7 @@ VIDEO_START_MEMBER(tecmo16_state,riot)
m_tx_tilemap->set_scrolldy(-16,-16);
m_flipscreen = 0;
m_game_is_riot = 1;
-
+
save_state();
}
diff --git a/src/mame/video/tecmosys.c b/src/mame/video/tecmosys.c
index 4c2414a015a..56d9e9ca196 100644
--- a/src/mame/video/tecmosys.c
+++ b/src/mame/video/tecmosys.c
@@ -339,6 +339,6 @@ void tecmosys_state::video_start()
m_bg2tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(tecmosys_state::get_bg2tile_info),this),TILEMAP_SCAN_ROWS,16,16,32,32);
m_bg2tilemap->set_transparent_pen(0);
-
+
save_item(NAME(m_spritelist));
}
diff --git a/src/mame/video/tehkanwc.c b/src/mame/video/tehkanwc.c
index 199c402798d..8e78b1b7e73 100644
--- a/src/mame/video/tehkanwc.c
+++ b/src/mame/video/tehkanwc.c
@@ -94,7 +94,7 @@ void tehkanwc_state::video_start()
8, 8, 32, 32);
m_fg_tilemap->set_transparent_pen(0);
-
+
save_item(NAME(m_scroll_x));
save_item(NAME(m_led0));
save_item(NAME(m_led1));
diff --git a/src/mame/video/vball.c b/src/mame/video/vball.c
index 0334da1b23a..f218b71acf0 100644
--- a/src/mame/video/vball.c
+++ b/src/mame/video/vball.c
@@ -44,7 +44,7 @@ void vball_state::video_start()
m_gfxset=0;
m_bgprombank=0xff;
m_spprombank=0xff;
-
+
save_item(NAME(m_scrollx_hi));
save_item(NAME(m_scrolly_hi));
save_item(NAME(m_scrollx_lo));
diff --git a/src/mame/video/welltris.c b/src/mame/video/welltris.c
index ba248c2c6cb..648f036418b 100644
--- a/src/mame/video/welltris.c
+++ b/src/mame/video/welltris.c
@@ -71,7 +71,7 @@ void welltris_state::video_start()
m_char_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(welltris_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32);
m_char_tilemap->set_transparent_pen(15);
-
+
save_item(NAME(m_gfxbank));
save_item(NAME(m_charpalettebank));
save_item(NAME(m_spritepalettebank));
diff --git a/src/mame/video/wwfsstar.c b/src/mame/video/wwfsstar.c
index db5ba06fff4..56956cc37aa 100644
--- a/src/mame/video/wwfsstar.c
+++ b/src/mame/video/wwfsstar.c
@@ -207,7 +207,7 @@ void wwfsstar_state::video_start()
m_bg0_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(wwfsstar_state::get_bg0_tile_info),this),tilemap_mapper_delegate(FUNC(wwfsstar_state::bg0_scan),this), 16, 16,32,32);
m_fg0_tilemap->set_transparent_pen(0);
-
+
save_item(NAME(m_vblank));
save_item(NAME(m_scrollx));
save_item(NAME(m_scrolly));
diff --git a/src/mame/video/xxmissio.c b/src/mame/video/xxmissio.c
index 73ed1754b4e..be678c2db22 100644
--- a/src/mame/video/xxmissio.c
+++ b/src/mame/video/xxmissio.c
@@ -69,7 +69,7 @@ void xxmissio_state::video_start()
m_bg_tilemap->set_scrolldx(2, 12);
m_fg_tilemap->set_transparent_pen(0);
-
+
save_item(NAME(m_xscroll));
save_item(NAME(m_yscroll));
save_item(NAME(m_flipscreen));
diff --git a/src/mess/audio/gamate.c b/src/mess/audio/gamate.c
index 338e38f6e1c..5c682841076 100644
--- a/src/mess/audio/gamate.c
+++ b/src/mess/audio/gamate.c
@@ -35,7 +35,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));
@@ -93,7 +93,7 @@ WRITE8_MEMBER( gamate_sound_device::device_w )
m_mixer_channel->update();
reg[offset] = data;
int chan=-1;
-
+
switch (offset)
{
case 0:
@@ -102,7 +102,7 @@ WRITE8_MEMBER( gamate_sound_device::device_w )
case 3:
case 4:
case 5:
- chan=offset/2;
+ chan=offset/2;
size = reg[chan*2] | ((reg[chan*2+1] & 0xf) << 8);
if (size)
{
@@ -117,11 +117,11 @@ WRITE8_MEMBER( gamate_sound_device::device_w )
case 6:
case 7:
case 8:
- chan=offset-6;
-// m_channels[chan]->on = data & 0x40;
-// channel->waveform = (data & 0x30) >> 4;
+ chan=offset-6;
+// m_channels[chan]->on = data & 0x40;
+// channel->waveform = (data & 0x30) >> 4;
m_channels[chan].volume = data & 0xf;
break;
}
- if (chan!=-1) m_channels[chan].on=m_channels[chan].volume!=0 && m_channels[chan].size>3/* avoid speed loss for unhearable >=23khz*/;
+ if (chan!=-1) m_channels[chan].on=m_channels[chan].volume!=0 && m_channels[chan].size>3/* avoid speed loss for unhearable >=23khz*/;
}
diff --git a/src/mess/drivers/alnchase.c b/src/mess/drivers/alnchase.c
index 28cd542e2d7..1159ed829c6 100644
--- a/src/mess/drivers/alnchase.c
+++ b/src/mess/drivers/alnchase.c
@@ -6,11 +6,11 @@
* boards are labeled TN-16
* NEC uCOM-43 MCU, labeled D553C 258
* red/green VFD display with color overlay, 2-sided*
-
+
*Player one views the VFD from the front (grid+filament side) while the
opposite player views it from the back side (through the conductive traces),
basically a mirror-image.
-
+
This is a space-themed tabletop VFD electronic game. To start, simply
press [UP]. Hold a joystick direction to move around.
@@ -42,7 +42,7 @@ public:
required_device<cpu_device> m_maincpu;
required_ioport_array<2> m_button_matrix;
required_device<speaker_sound_device> m_speaker;
-
+
UINT8 m_input_mux;
UINT32 m_plate;
UINT16 m_grid;
@@ -73,7 +73,7 @@ void alnchase_state::update_vfd()
// on difference, send to output
for (int j = 0; j < 17; j++)
output_set_lamp_value(i*100 + j, m_plate >> j & 1);
-
+
m_vfd_state[i] = m_plate;
}
}
@@ -101,25 +101,25 @@ READ8_MEMBER(alnchase_state::input_r)
WRITE8_MEMBER(alnchase_state::display_w)
{
int shift;
-
+
if (offset <= NEC_UCOM4_PORTE)
{
// C/D/E0: vfd matrix grid
shift = (offset - NEC_UCOM4_PORTC) * 4;
m_grid = (m_grid & ~(0xf << shift)) | (data << shift);
-
+
// C0(grid 0): input enable PL1
// D0(grid 4): input enable PL2
m_input_mux = (m_grid & 1) | (m_grid >> 3 & 2);
}
-
+
if (offset >= NEC_UCOM4_PORTE)
{
// E23/F/G/H/I: vfd matrix plate
shift = (offset - NEC_UCOM4_PORTE) * 4;
m_plate = ((m_plate << 2 & ~(0xf << shift)) | (data << shift)) >> 2;
}
-
+
update_vfd();
}
@@ -143,13 +143,13 @@ WRITE8_MEMBER(alnchase_state::port_e_w)
POWER SOUND LEVEL PLAYER
ON ON PRO TWO START
- o o | |
+ o o | |
| | | | [joystick]
| | o o
OFF OFF AMA ONE GAME 0,1,2,3
-
+
1 PLAYER SIDE
-
+
other player side only has a joystick
*/
diff --git a/src/mess/drivers/c65.c b/src/mess/drivers/c65.c
index 421f56ecfed..3c565125638 100644
--- a/src/mess/drivers/c65.c
+++ b/src/mess/drivers/c65.c
@@ -12,7 +12,7 @@ TODO:
Note:
- VIC-4567 will be eventually be added via compile switch, once that I
- get the hang of the system (and checking where the old code fails
+ get the hang of the system (and checking where the old code fails
eventually)
***************************************************************************/
@@ -60,7 +60,7 @@ public:
UINT8 *m_iplrom;
UINT8 m_keyb_input[10];
UINT8 m_keyb_mux;
-
+
DECLARE_READ8_MEMBER(vic4567_dummy_r);
DECLARE_WRITE8_MEMBER(vic4567_dummy_w);
DECLARE_WRITE8_MEMBER(PalRed_w);
@@ -74,7 +74,7 @@ public:
DECLARE_READ8_MEMBER(cia0_portb_r);
DECLARE_WRITE8_MEMBER(cia0_portb_w);
DECLARE_WRITE_LINE_MEMBER(cia0_irq);
-
+
DECLARE_READ8_MEMBER(dummy_r);
// screen updates
@@ -82,7 +82,7 @@ public:
DECLARE_PALETTE_INIT(c65);
DECLARE_DRIVER_INIT(c65);
DECLARE_DRIVER_INIT(c65pal);
-
+
INTERRUPT_GEN_MEMBER(vic3_vblank_irq);
protected:
// driver_device overrides
@@ -124,7 +124,7 @@ UINT32 c65_state::screen_update( screen_device &screen, bitmap_ind16 &bitmap, co
{
int y,x;
int border_color = m_VIC2_EXTColor & 0xf;
-
+
// TODO: border area
for(y=0;y<m_screen->height();y++)
{
@@ -139,13 +139,13 @@ UINT32 c65_state::screen_update( screen_device &screen, bitmap_ind16 &bitmap, co
UINT8 attr = m_cram[xi+yi*80];
if(attr & 0xf0)
attr = machine().rand() & 0xf;
-
+
int enable_dot = ((m_iplrom[(tile<<3)+ym+0xd000] >> xm) & 1);
-
+
//if(cliprect.contains(x, y))
bitmap.pix16(y, x) = m_palette->pen((enable_dot) ? attr & 0xf : border_color);
-
+
//gfx->opaque(bitmap,cliprect,tile,0,0,0,x*8,y*8);
}
}
@@ -170,10 +170,10 @@ READ8_MEMBER(c65_state::vic4567_dummy_r)
return 0xff; // silence log for now
case 0x19:
return m_VIC2_IRQPend;
-
+
case 0x1a:
return m_VIC2_IRQMask;
-
+
case 0x20:
return m_VIC2_EXTColor;
@@ -182,7 +182,7 @@ READ8_MEMBER(c65_state::vic4567_dummy_r)
case 0x31:
return m_VIC3_ControlB;
}
-
+
if(!space.debugger_access())
printf("%02x\n",offset); // TODO: PC
return res;
@@ -203,23 +203,23 @@ WRITE8_MEMBER(c65_state::vic4567_dummy_w)
case 0x20:
m_VIC2_EXTColor = data & 0xf;
break;
- /* KEY register, handles vic-iii and vic-ii modes via two consecutive writes
+ /* KEY register, handles vic-iii and vic-ii modes via two consecutive writes
0xa5 -> 0x96 vic-iii mode
- any other write vic-ii mode
+ any other write vic-ii mode
*/
//case 0x2f: break;
- case 0x30:
+ case 0x30:
if((data & 0xfe) != 0x64)
- printf("CONTROL A %02x\n",data);
+ printf("CONTROL A %02x\n",data);
m_VIC3_ControlA = data;
break;
case 0x31:
- printf("CONTROL B %02x\n",data);
+ printf("CONTROL B %02x\n",data);
m_VIC3_ControlB = data;
break;
default:
if(!space.debugger_access())
- printf("%02x %02x\n",offset,data);
+ printf("%02x %02x\n",offset,data);
break;
}
@@ -365,12 +365,11 @@ WRITE8_MEMBER(c65_state::CIASelect_w)
break;
}
}
-
+
}
READ8_MEMBER(c65_state::cia0_porta_r)
{
-
return 0xff;
}
@@ -378,11 +377,10 @@ READ8_MEMBER(c65_state::cia0_portb_r)
{
static const char *const c64ports[] = { "ROW0", "ROW1", "ROW2", "ROW3", "ROW4", "ROW5", "ROW6", "ROW7" };
UINT8 res;
-
+
res = 0xff;
for(int i=0;i<8;i++)
{
-
m_keyb_input[i] = machine().root_device().ioport(c64ports[i])->read();
if(m_keyb_mux & 1 << (i))
@@ -400,7 +398,6 @@ WRITE8_MEMBER(c65_state::cia0_porta_w)
WRITE8_MEMBER(c65_state::cia0_portb_w)
{
-
}
READ8_MEMBER(c65_state::dummy_r)
@@ -429,7 +426,7 @@ static ADDRESS_MAP_START( c65_map, AS_PROGRAM, 8, c65_state )
// 0x0de00, 0x0de** Ext I/O Select 1
// 0x0df00, 0x0df** Ext I/O Select 2 (RAM window?)
AM_RANGE(0x0e000, 0x0ffff) AM_ROM AM_REGION("maincpu",0x0e000)
- AM_RANGE(0x10000, 0x1f7ff) AM_RAM
+ AM_RANGE(0x10000, 0x1f7ff) AM_RAM
AM_RANGE(0x1f800, 0x1ffff) AM_RAM // VRAM attributes
AM_RANGE(0x20000, 0x3ffff) AM_ROM AM_REGION("maincpu",0)
ADDRESS_MAP_END
@@ -534,7 +531,7 @@ void c65_state::machine_reset()
PALETTE_INIT_MEMBER(c65_state, c65)
{
- // TODO: initial state?
+ // TODO: initial state?
}
static const gfx_layout charlayout =
@@ -556,7 +553,7 @@ void c65_state::IRQCheck(UINT8 irq_cause)
{
m_VIC2_IRQPend |= (irq_cause != 0) ? 0x80 : 0x00;
m_VIC2_IRQPend |= irq_cause;
-
+
m_maincpu->set_input_line(M4510_IRQ_LINE,m_VIC2_IRQMask & m_VIC2_IRQPend ? ASSERT_LINE : CLEAR_LINE);
}
@@ -564,7 +561,7 @@ INTERRUPT_GEN_MEMBER(c65_state::vic3_vblank_irq)
{
IRQCheck(1);
//if(m_VIC2_IRQMask & 1)
- // m_maincpu->set_input_line(M4510_IRQ_LINE,HOLD_LINE);
+ // m_maincpu->set_input_line(M4510_IRQ_LINE,HOLD_LINE);
}
WRITE_LINE_MEMBER(c65_state::cia0_irq)
@@ -577,10 +574,10 @@ WRITE_LINE_MEMBER(c65_state::cia0_irq)
static const char *const c64ports[] = { "ROW0", "ROW1", "ROW2", "ROW3", "ROW4", "ROW5", "ROW6", "ROW7" };
for(int i=0;i<8;i++)
m_keyb_input[i] = machine().root_device().ioport(c64ports[i])->read();
- }
+ }
#endif
-// m_cia0_irq = state;
-// c65_irq(state || m_vicirq);
+// m_cia0_irq = state;
+// c65_irq(state || m_vicirq);
}
static MACHINE_CONFIG_START( c65, c65_state )
@@ -600,11 +597,11 @@ static MACHINE_CONFIG_START( c65, c65_state )
MCFG_DEVICE_ADD("cia_1", MOS6526, MAIN_CLOCK)
MCFG_MOS6526_TOD(60)
-// MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(c65_state, c65_cia1_interrupt))
-// MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(c65_state, c65_cia1_port_a_r))
-// MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(c65_state, c65_cia1_port_a_w))
+// MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(c65_state, c65_cia1_interrupt))
+// MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(c65_state, c65_cia1_port_a_r))
+// MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(c65_state, c65_cia1_port_a_w))
+
-
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
// MCFG_SCREEN_REFRESH_RATE(60)
@@ -654,15 +651,15 @@ ROM_END
DRIVER_INIT_MEMBER(c65_state,c65)
{
-// m_dma.version = 2;
-// c65_common_driver_init();
+// m_dma.version = 2;
+// c65_common_driver_init();
}
DRIVER_INIT_MEMBER(c65_state,c65pal)
{
-// m_dma.version = 1;
-// c65_common_driver_init();
-// m_pal = 1;
+// m_dma.version = 1;
+// c65_common_driver_init();
+// m_pal = 1;
}
COMP( 1991, c65, 0, 0, c65, c65, c65_state, c65, "Commodore Business Machines", "Commodore 65 Development System (Prototype, NTSC)", GAME_NOT_WORKING )
diff --git a/src/mess/drivers/c65_old.c b/src/mess/drivers/c65_old.c
index 466d32aa269..08d1d123054 100644
--- a/src/mess/drivers/c65_old.c
+++ b/src/mess/drivers/c65_old.c
@@ -644,5 +644,3 @@ ROM_END
COMP( 1991, c65, 0, 0, c65, c65, c65_state, c65, "Commodore Business Machines", "Commodore 65 Development System (Prototype, NTSC)", GAME_NOT_WORKING )
COMP( 1991, c64dx, c65, 0, c65pal, c65ger, c65_state, c65pal, "Commodore Business Machines", "Commodore 64DX Development System (Prototype, PAL, German)", GAME_NOT_WORKING )
-
-
diff --git a/src/mess/drivers/edracula.c b/src/mess/drivers/edracula.c
index b6e0eb8da48..06cb8325eaf 100644
--- a/src/mess/drivers/edracula.c
+++ b/src/mess/drivers/edracula.c
@@ -5,7 +5,7 @@
Epoch Dracula (manufactured in Japan)
* NEC uCOM-43 MCU, labeled D553C 206
* cyan/red/green VFD display NEC FIP8BM20T
-
+
known releases:
- Japan: Dracula House, yellow case
- USA: Dracula, red case
@@ -47,7 +47,7 @@ public:
UINT32 m_vfd_state[0x10];
void update_vfd();
-
+
virtual void machine_start();
};
@@ -67,7 +67,7 @@ void edracula_state::update_vfd()
// on difference, send to output
for (int j = 0; j < 18; j++)
output_set_lamp_value(i*100 + j, m_plate >> j & 1);
-
+
m_vfd_state[i] = m_plate;
}
}
@@ -85,7 +85,7 @@ WRITE8_MEMBER(edracula_state::grid_w)
// port C/D: vfd matrix grid
int shift = (offset - NEC_UCOM4_PORTC) * 4;
m_grid = (m_grid & ~(0xf << shift)) | (data << shift);
-
+
update_vfd();
}
@@ -94,7 +94,7 @@ WRITE8_MEMBER(edracula_state::plate_w)
// port E/F/G/H/I01: vfd matrix plate
int shift = (offset - NEC_UCOM4_PORTE) * 4;
m_plate = (m_plate & ~(0xf << shift)) | (data << shift);
-
+
update_vfd();
}
diff --git a/src/mess/drivers/gamate.c b/src/mess/drivers/gamate.c
index 2645b2e426e..57101df8b0b 100644
--- a/src/mess/drivers/gamate.c
+++ b/src/mess/drivers/gamate.c
@@ -51,25 +51,25 @@ private:
struct
{
- UINT8 reg[8];
- struct {
- bool write;
- bool page2; // else page1
+ UINT8 reg[8];
+ struct {
+ bool write;
+ bool page2; // else page1
UINT8 ypos, xpos/*tennis*/;
- UINT8 data[2][0x100][0x20];
- } bitmap;
- UINT8 x, y;
+ UINT8 data[2][0x100][0x20];
+ } bitmap;
+ UINT8 x, y;
bool y_increment;
} video;
struct {
- bool set;
+ bool set;
int bit_shifter;
UINT8 cartridge_byte;
UINT16 address; // in reality something more like short local cartridge address offset
bool unprotected;
bool failed;
-
+
} card_protection;
required_device<cpu_device> m_maincpu;
@@ -80,13 +80,13 @@ private:
required_shared_ptr<UINT8> m_bios;
emu_timer *timer1;
emu_timer *timer2;
- UINT8 bank_multi;
+ UINT8 bank_multi;
};
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);
-
+ 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:
card_protection.failed= card_protection.failed || ((card_protection.cartridge_byte&0x80)!=0) != ((data&4)!=0);
@@ -112,7 +112,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;
}
@@ -143,13 +143,13 @@ WRITE8_MEMBER( gamate_state::gamate_video_w )
{
video.reg[offset]=data;
switch (offset) {
- case 1:
+ case 1:
if (data&0xf) printf("lcd mode %x\n", data);
video.bitmap.write=data&0xc0; // more addressing mode
video.y_increment=data&0x40;
break;
case 2: video.bitmap.xpos=data;break;
- case 3:
+ case 3:
if (data>=200) printf("lcd ypos: %x\n", data);
video.bitmap.ypos=data;
break;
@@ -181,55 +181,55 @@ WRITE8_MEMBER( gamate_state::cart_bankswitch_w )
READ8_MEMBER( gamate_state::gamate_video_r )
{
- if (offset!=6) return 0;
- UINT8 data=0;
- if (video.bitmap.write) {
- data=video.bitmap.data[video.bitmap.page2][video.y][video.x];
- } else {
- data=video.bitmap.data[0][video.y][video.x&(ARRAY_LENGTH(video.bitmap.data[0][0])-1)];
- }
+ if (offset!=6) return 0;
+ UINT8 data=0;
+ if (video.bitmap.write) {
+ data=video.bitmap.data[video.bitmap.page2][video.y][video.x];
+ } else {
+ data=video.bitmap.data[0][video.y][video.x&(ARRAY_LENGTH(video.bitmap.data[0][0])-1)];
+ }
// if (m_maincpu->pc()<0xf000)
// machine().ui().popup_time(2, "lcd read x:%x y:%x mode:%x data:%x\n", video.x, video.y, video.reg[1], data);
- return data;
+ return data;
}
WRITE8_MEMBER( gamate_state::gamate_audio_w )
{
// printf("audio write %x:%x\n", offset, data);//logerror("%.6f %04x audio write %04x %02x\n",machine().time().as_double(),m_maincpu->pc(),offset,data);
- m_sound->device_w(space, offset, data);
+ m_sound->device_w(space, offset, data);
}
READ8_MEMBER( gamate_state::gamate_audio_r )
{
// legend of dragon knight
// machine().ui().popup_time(2, "%.6f %04x audio read %04x \n",machine().time().as_double(),m_maincpu->pc(),offset);
- return 0;
+ return 0;
}
READ8_MEMBER( gamate_state::gamate_pad_r )
{
- UINT8 data=m_io_joy->read();
- return data;
+ UINT8 data=m_io_joy->read();
+ return data;
}
static ADDRESS_MAP_START( gamate_mem, AS_PROGRAM, 8, gamate_state )
- AM_RANGE(0x0000, 0x03ff) AM_RAM
- AM_RANGE(0x4000, 0x400d) AM_READWRITE(gamate_audio_r, gamate_audio_w)
- AM_RANGE(0x4400, 0x4400) AM_READ(gamate_pad_r)
- AM_RANGE(0x5000, 0x5007) AM_READWRITE(gamate_video_r, gamate_video_w)
- AM_RANGE(0x5800, 0x5800) AM_READ(newer_protection_set)
- AM_RANGE(0x5900, 0x5900) AM_WRITE(protection_reset)
- AM_RANGE(0x5a00, 0x5a00) AM_READ(protection_r)
+ AM_RANGE(0x0000, 0x03ff) AM_RAM
+ AM_RANGE(0x4000, 0x400d) AM_READWRITE(gamate_audio_r, gamate_audio_w)
+ AM_RANGE(0x4400, 0x4400) AM_READ(gamate_pad_r)
+ AM_RANGE(0x5000, 0x5007) AM_READWRITE(gamate_video_r, gamate_video_w)
+ AM_RANGE(0x5800, 0x5800) AM_READ(newer_protection_set)
+ AM_RANGE(0x5900, 0x5900) AM_WRITE(protection_reset)
+ AM_RANGE(0x5a00, 0x5a00) AM_READ(protection_r)
- AM_RANGE(0x6001, 0x9fff) AM_READ_BANK("bankmulti")
- AM_RANGE(0xa000, 0xdfff) AM_READ_BANK("bank")
+ AM_RANGE(0x6001, 0x9fff) AM_READ_BANK("bankmulti")
+ AM_RANGE(0xa000, 0xdfff) AM_READ_BANK("bank")
AM_RANGE(0x6000, 0x6000) AM_READWRITE(gamate_cart_protection_r, gamate_cart_protection_w)
AM_RANGE(0x8000, 0x8000) AM_WRITE(cart_bankswitchmulti_w)
AM_RANGE(0xc000, 0xc000) AM_WRITE(cart_bankswitch_w)
- AM_RANGE(0xf000, 0xffff) AM_ROM AM_SHARE("bios")
+ AM_RANGE(0xf000, 0xffff) AM_ROM AM_SHARE("bios")
ADDRESS_MAP_END
@@ -254,10 +254,10 @@ ATTR_UNUSED static const unsigned short gamate_palette[4] =
/* palette in red, green, blue tribles */
static const unsigned char gamate_colors[4][3] =
{
- { 255,255,255 },
- { 0xa0, 0xa0, 0xa0 },
- { 0x60, 0x60, 0x60 },
- { 0, 0, 0 }
+ { 255,255,255 },
+ { 0xa0, 0xa0, 0xa0 },
+ { 0x60, 0x60, 0x60 },
+ { 0, 0, 0 }
};
PALETTE_INIT_MEMBER(gamate_state, gamate)
@@ -280,27 +280,27 @@ static void BlitPlane(UINT16* line, UINT8 plane1, UINT8 plane2)
UINT32 gamate_state::screen_update_gamate(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- int x, y, j;
- for (y=0;y<152;y++) {
- for (x=-(video.bitmap.xpos&7), j=0;x<160;x+=8, j++) {
- UINT8 d1, d2;
- if (video.bitmap.ypos<200) {
+ int x, y, j;
+ for (y=0;y<152;y++) {
+ for (x=-(video.bitmap.xpos&7), j=0;x<160;x+=8, j++) {
+ UINT8 d1, d2;
+ if (video.bitmap.ypos<200) {
d1=video.bitmap.data[0][(y+video.bitmap.ypos)%200][(j+video.bitmap.xpos/8)&0x1f];
d2=video.bitmap.data[1][(y+video.bitmap.ypos)%200][(j+video.bitmap.xpos/8)&0x1f];
- } else if ((video.bitmap.ypos&0xf)<8) { // lcdtest, of course still some registers not known, my gamate doesn't display bottom lines
+ } else if ((video.bitmap.ypos&0xf)<8) { // lcdtest, of course still some registers not known, my gamate doesn't display bottom lines
int yi=(y+(video.bitmap.ypos&0xf)-8);
if (yi<0) yi=video.bitmap.ypos+y; // in this case only 2nd plane used!?, source of first plane?
d1=video.bitmap.data[0][yi][(j+video.bitmap.xpos/8)&0x1f]; // value of lines bevor 0 chaos
d2=video.bitmap.data[1][yi][(j+video.bitmap.xpos/8)&0x1f];
- } else {
+ } else {
d1=video.bitmap.data[0][y][(j+video.bitmap.xpos/8)&0x1f];
- d2=video.bitmap.data[1][y][(j+video.bitmap.xpos/8)&0x1f];
- }
- BlitPlane(&bitmap.pix16(y, x+4), d1, d2);
- BlitPlane(&bitmap.pix16(y, x), d1>>4, d2>>4);
- }
- }
- return 0;
+ d2=video.bitmap.data[1][y][(j+video.bitmap.xpos/8)&0x1f];
+ }
+ BlitPlane(&bitmap.pix16(y, x+4), d1, d2);
+ BlitPlane(&bitmap.pix16(y, x), d1>>4, d2>>4);
+ }
+ }
+ return 0;
}
DRIVER_INIT_MEMBER(gamate_state,gamate)
@@ -314,11 +314,11 @@ DRIVER_INIT_MEMBER(gamate_state,gamate)
void gamate_state::machine_start()
{
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));
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;
@@ -378,7 +378,7 @@ static MACHINE_CONFIG_START( gamate, gamate_state )
MCFG_SOUND_ADD("custom", GAMATE_SND, 0)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
-
+
MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_linear_slot, "gamate_cart")
MCFG_GENERIC_MANDATORY
@@ -397,5 +397,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", GAME_IMPERFECT_SOUND)
-
-
diff --git a/src/mess/drivers/ngen.c b/src/mess/drivers/ngen.c
index b067e553e12..fe3114b0bee 100644
--- a/src/mess/drivers/ngen.c
+++ b/src/mess/drivers/ngen.c
@@ -405,8 +405,8 @@ READ16_MEMBER(ngen_state::peripheral_r)
case 0x1a0: // I/O control register?
ret = m_control; // end of DMA transfer? (maybe a per-channel EOP?) Bit 6 is set during a transfer?
break;
-// default:
-// logerror("Unknown 80186 peripheral read offset %04x mask %04x returning %04x\n",offset,mem_mask,ret);
+// default:
+// logerror("Unknown 80186 peripheral read offset %04x mask %04x returning %04x\n",offset,mem_mask,ret);
}
return ret;
}
@@ -420,7 +420,7 @@ WRITE16_MEMBER(ngen_state::xbus_w)
{
UINT16 addr = (data & 0x00ff) << 8;
cpu_device* cpu;
-
+
if(m_maincpu)
cpu = m_maincpu;
else
@@ -544,7 +544,7 @@ READ16_MEMBER(ngen_state::fhd_r)
ret = m_fdc->read(space,offset);
m_fdc_timer->write_clk0(1);
m_fdc_timer->write_clk0(0); // Data register access clocks the FDC's PIT channel 0
- }
+ }
break;
case 0x08:
case 0x09:
@@ -706,7 +706,7 @@ READ8_MEMBER(ngen_state::dma_read_word)
else
cpu = m_i386cpu;
address_space& prog_space = cpu->space(AS_PROGRAM); // get the right address space
-
+
if(m_dma_channel == -1)
return 0xff;
offs_t page_offset = (((offs_t) m_dma_offset[m_dma_channel]) << 16) & 0xFE0000;
@@ -727,7 +727,7 @@ WRITE8_MEMBER(ngen_state::dma_write_word)
else
cpu = m_i386cpu;
address_space& prog_space = cpu->space(AS_PROGRAM); // get the right address space
-
+
if(m_dma_channel == -1)
return;
offs_t page_offset = (((offs_t) m_dma_offset[m_dma_channel]) << 16) & 0xFE0000;
@@ -905,7 +905,7 @@ static MACHINE_CONFIG_START( ngen, ngen_state )
// keyboard UART (patent says i8251 is used for keyboard communications, it is located on the video board)
MCFG_DEVICE_ADD("videouart", I8251, 0) // main clock unknown, Rx/Tx clocks are 19.53kHz
-// MCFG_I8251_TXEMPTY_HANDLER(DEVWRITELINE("pic",pic8259_device,ir4_w))
+// MCFG_I8251_TXEMPTY_HANDLER(DEVWRITELINE("pic",pic8259_device,ir4_w))
MCFG_I8251_TXD_HANDLER(DEVWRITELINE("keyboard", rs232_port_device, write_txd))
MCFG_RS232_PORT_ADD("keyboard", keyboard, "ngen")
MCFG_RS232_RXD_HANDLER(DEVWRITELINE("videouart", i8251_device, write_rxd))
@@ -919,12 +919,12 @@ static MACHINE_CONFIG_START( ngen, ngen_state )
MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE("maincpu",i80186_cpu_device,drq1_w))
MCFG_WD_FDC_FORCE_READY
MCFG_DEVICE_ADD("fdc_timer", PIT8253, 0)
- MCFG_PIT8253_CLK0(0)
+ MCFG_PIT8253_CLK0(0)
MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("pic",pic8259_device,ir5_w)) // clocked on FDC data register access
MCFG_PIT8253_CLK1(XTAL_20MHz / 20)
-// MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("pic",pic8259_device,ir5_w)) // 1MHz
+// MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("pic",pic8259_device,ir5_w)) // 1MHz
MCFG_PIT8253_CLK2(XTAL_20MHz / 20)
-// MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("pic",pic8259_device,ir5_w))
+// MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("pic",pic8259_device,ir5_w))
// TODO: WD1010 HDC (not implemented), use WD2010 for now
MCFG_DEVICE_ADD("hdc", WD2010, XTAL_20MHz / 4)
@@ -1015,7 +1015,7 @@ static MACHINE_CONFIG_START( ngen386, ngen386_state )
// keyboard UART (patent says i8251 is used for keyboard communications, it is located on the video board)
MCFG_DEVICE_ADD("videouart", I8251, 0) // main clock unknown, Rx/Tx clocks are 19.53kHz
-// MCFG_I8251_TXEMPTY_HANDLER(DEVWRITELINE("pic",pic8259_device,ir4_w))
+// MCFG_I8251_TXEMPTY_HANDLER(DEVWRITELINE("pic",pic8259_device,ir4_w))
MCFG_I8251_TXD_HANDLER(DEVWRITELINE("keyboard", rs232_port_device, write_txd))
MCFG_RS232_PORT_ADD("keyboard", keyboard, "ngen")
MCFG_RS232_RXD_HANDLER(DEVWRITELINE("videouart", i8251_device, write_rxd))
@@ -1026,15 +1026,15 @@ static MACHINE_CONFIG_START( ngen386, ngen386_state )
// floppy disk / hard disk module (WD2797 FDC, WD1010 HDC, plus an 8253 timer for each)
MCFG_WD2797x_ADD("fdc", XTAL_20MHz / 20)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(ngen_state,fdc_irq_w))
-// MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE("i386cpu",i80186_cpu_device,drq1_w))
+// MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE("i386cpu",i80186_cpu_device,drq1_w))
MCFG_WD_FDC_FORCE_READY
MCFG_DEVICE_ADD("fdc_timer", PIT8253, 0)
- MCFG_PIT8253_CLK0(0)
+ MCFG_PIT8253_CLK0(0)
MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("pic",pic8259_device,ir5_w)) // clocked on FDC data register access
MCFG_PIT8253_CLK1(XTAL_20MHz / 20)
-// MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("pic",pic8259_device,ir5_w)) // 1MHz
+// MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("pic",pic8259_device,ir5_w)) // 1MHz
MCFG_PIT8253_CLK2(XTAL_20MHz / 20)
-// MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("pic",pic8259_device,ir5_w))
+// MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("pic",pic8259_device,ir5_w))
// TODO: WD1010 HDC (not implemented), use WD2010 for now
MCFG_DEVICE_ADD("hdc", WD2010, XTAL_20MHz / 4)
diff --git a/src/mess/drivers/pc9801.c b/src/mess/drivers/pc9801.c
index ef2d725b894..c645533a0e7 100644
--- a/src/mess/drivers/pc9801.c
+++ b/src/mess/drivers/pc9801.c
@@ -886,7 +886,7 @@ UPD7220_DRAW_TEXT_LINE_MEMBER( pc9801_state::hgdc_draw_text )
for(kanji_lr=0;kanji_lr<x_step;kanji_lr++)
{
/* Rori Rori Rolling definitely uses different colors for brake stop PCG elements,
- assume that all attributes are recalculated on different strips */
+ assume that all attributes are recalculated on different strips */
attr = (m_video_ram_1[((tile_addr+kanji_lr) & 0xfff) | 0x1000] & 0xff);
secret = (attr & 1) ^ 1;
@@ -896,7 +896,7 @@ UPD7220_DRAW_TEXT_LINE_MEMBER( pc9801_state::hgdc_draw_text )
v_line = (m_video_ff[ATTRSEL_REG]) ? 0 : attr & 0x10;
gfx_mode = (m_video_ff[ATTRSEL_REG]) ? attr & 0x10 : 0;
color = (attr & 0xe0) >> 5;
-
+
for(yi=0;yi<lr;yi++)
{
for(xi=0;xi<8;xi++)
diff --git a/src/mess/drivers/pcd.c b/src/mess/drivers/pcd.c
index 54e035b918b..0aa0322358e 100644
--- a/src/mess/drivers/pcd.c
+++ b/src/mess/drivers/pcd.c
@@ -306,7 +306,7 @@ static ADDRESS_MAP_START( pcd_io, AS_IO, 16, pcd_state )
AM_RANGE(0xf9c0, 0xf9c3) AM_DEVREADWRITE8("usart1",mc2661_device,read,write,0xffff) // UARTs
AM_RANGE(0xf9d0, 0xf9d3) AM_DEVREADWRITE8("usart2",mc2661_device,read,write,0xffff)
AM_RANGE(0xf9e0, 0xf9e3) AM_DEVREADWRITE8("usart3",mc2661_device,read,write,0xffff)
-// AM_RANGE(0xfa00, 0xfa7f) // pcs4-n (peripheral chip select)
+// AM_RANGE(0xfa00, 0xfa7f) // pcs4-n (peripheral chip select)
AM_RANGE(0xfb00, 0xfb01) AM_READWRITE8(detect_r, detect_w, 0xff00) // expansion card detection?
AM_RANGE(0xfb00, 0xffff) AM_READWRITE8(nmi_io_r, nmi_io_w, 0xffff)
ADDRESS_MAP_END
diff --git a/src/mess/drivers/snes.c b/src/mess/drivers/snes.c
index 24f9ab055f5..8697bb35d85 100644
--- a/src/mess/drivers/snes.c
+++ b/src/mess/drivers/snes.c
@@ -1098,7 +1098,7 @@ WRITE8_MEMBER(snes_console_state::io_read)
UINT16 joy1 = 0, joy2 = 0, joy3 = 0, joy4 = 0;
m_ctrl1->port_poll();
m_ctrl2->port_poll();
-
+
for (int i = 0; i < 16; i++)
{
joy1 |= ((m_ctrl1->read_pin4() & 1) << (15 - i));
@@ -1115,7 +1115,7 @@ WRITE8_MEMBER(snes_console_state::io_read)
SNES_CPU_REG(JOY3H) = (joy3 & 0xff00) >> 8;
SNES_CPU_REG(JOY4L) = (joy4 & 0x00ff) >> 0;
SNES_CPU_REG(JOY4H) = (joy4 & 0xff00) >> 8;
- }
+ }
}
UINT8 snes_console_state::oldjoy1_read(int latched)
@@ -1160,13 +1160,13 @@ SNESCTRL_GUNLATCH_CB(snes_console_state::gun_latch_cb)
x = 0;
if (x > (SNES_SCR_WIDTH - 1))
x = SNES_SCR_WIDTH - 1;
-
+
if (y < 0)
y = 0;
if (y > (m_ppu->m_beam.last_visible_line - 1))
y = m_ppu->m_beam.last_visible_line - 1;
-// m_ppu->set_latch_hv(x, y); // it would be more accurate to write twice to WRIO register, first with bit7 = 0 and then with bit7 = 1
+// m_ppu->set_latch_hv(x, y); // it would be more accurate to write twice to WRIO register, first with bit7 = 0 and then with bit7 = 1
m_ppu->set_latch_hv(m_ppu->current_x(), m_ppu->current_y());
}
diff --git a/src/mess/drivers/splitsec.c b/src/mess/drivers/splitsec.c
index 703cb96fbdf..ced46f6a775 100644
--- a/src/mess/drivers/splitsec.c
+++ b/src/mess/drivers/splitsec.c
@@ -203,7 +203,7 @@ WRITE16_MEMBER(splitsec_state::splitsec_write_r)
// R9,R10: input mux
m_input_mux = data >> 9 & 3;
-
+
// R0-R7: led rows
m_r = data & 0xff;
display_update();
@@ -216,7 +216,7 @@ WRITE16_MEMBER(splitsec_state::bankshot_write_r)
// R2,R3: input mux
m_input_mux = data >> 2 & 3;
-
+
// R2-R10: led rows
m_r = data & ~3;
display_update();
@@ -252,7 +252,7 @@ INPUT_PORTS_END
SCORE]
------ led display ------
-
+
[ANGLE] [AIM] [CUE UP
SHOOT]
*/
diff --git a/src/mess/drivers/tb303.c b/src/mess/drivers/tb303.c
index b37e8c2339a..1631ce2b0a6 100644
--- a/src/mess/drivers/tb303.c
+++ b/src/mess/drivers/tb303.c
@@ -6,7 +6,7 @@
* NEC uCOM-43 MCU, labeled D650C 133
* 3*uPD444C 1024x4 Static CMOS SRAM
* board is packed with discrete components
-
+
x
***************************************************************************/
diff --git a/src/mess/drivers/tc4.c b/src/mess/drivers/tc4.c
index 74ca73b800e..488eb95f95c 100644
--- a/src/mess/drivers/tc4.c
+++ b/src/mess/drivers/tc4.c
@@ -4,13 +4,13 @@
Coleco Total Control 4
* TMS1400NLL MP7334-N2 (die labeled MP7334)
-
+
This is a head to head electronic tabletop LED-display sports console.
One cartridge(Football) was included with the console, the other three were
sold separately. Gameplay has emphasis on strategy, read the official manual
on how to play. Remember that you can rotate the view in MESS: rotate left
for Home(P1) orientation, rotate right for Visitor(P2) orientation.
-
+
Cartridge socket:
1 N/C
2 9V+
@@ -20,7 +20,7 @@
6 K2
7 K1
8 R9
-
+
The cartridge connects pin 8 with one of the K-pins.
Available cartridges:
@@ -166,11 +166,11 @@ READ8_MEMBER(tc4_state::read_k)
for (int i = 0; i < 6; i++)
if (m_r >> i & 1)
k |= m_button_matrix[i]->read();
-
+
// read from cartridge
if (m_r & 0x200)
k |= m_button_matrix[6]->read();
-
+
return k;
}
diff --git a/src/mess/drivers/tispeak.c b/src/mess/drivers/tispeak.c
index c9868a754e3..fa0dde7fee3 100644
--- a/src/mess/drivers/tispeak.c
+++ b/src/mess/drivers/tispeak.c
@@ -3,7 +3,7 @@
/***************************************************************************
Texas Instruments 1st-gen. handheld speech devices,
-
+
These devices, mostly edu-toys, are based around an MCU(TMS0270/TMS1100),
TMS51xx speech, and VSM ROM(s). Newer devices, such as Speak & Music,
are based around the TMP50C40 and belong in another driver, probably.
@@ -246,21 +246,21 @@ Other devices:
- CD2802: 16KB CD2357
- notes: MCU is the same as in Touch & Tell, but instead of a toddler's toy,
you get a serious medical aid device for the voice-impaired.
-
+
Spelling B (US), 1978
- MCU: TMC0272*
- ?: TMC1984* (what is this?)
- notes: this line of toys (Spelling B, Mr. Challenger, Math Marvel) is calculator-sized,
might have been aimed for older kids. Note that Math Marvel is a TMC1986, no speech.
-
+
Spelling B (US), newer
- MCU: TMC0274*
- TMS51xx: ?KB TMC0355 CD2602*
-
+
Spelling B (Germany) "Spelling ABC", 198?
- MCU: TMC0274* (assume same as US version)
- TMS51xx: ?KB TMC0355 CD2607*
-
+
Mr. Challenger (US), 1980
- MCU: TMC0273*
- TMS51xx: ?KB TMC0355 CD2601*
diff --git a/src/mess/drivers/tmtennis.c b/src/mess/drivers/tmtennis.c
index ffece57a31b..4f3e06a5db7 100644
--- a/src/mess/drivers/tmtennis.c
+++ b/src/mess/drivers/tmtennis.c
@@ -6,14 +6,14 @@
* board labeled TOMY TN-04 TENNIS
* NEC uCOM-44 MCU, labeled D552C 048
* VFD display NEC FIP11AM15T (FIP=fluorescent indicator panel)
-
+
The initial release of this game was in 1979, known as Pro-Tennis,
it is unknown if the hardware and/or ROM contents differ.
This is an early VFD simple electronic tennis game. Player 1 is on the right
side, player 2 or CPU on the left. Each player has six possible positions
where to hit the ball. A backdrop behind the VFD shows a tennis court.
-
+
NOTE!: MESS external artwork is required to be able to play
@@ -42,7 +42,7 @@ public:
required_device<cpu_device> m_maincpu;
required_ioport_array<2> m_button_matrix;
required_device<speaker_sound_device> m_speaker;
-
+
UINT8 m_input_mux;
UINT16 m_plate;
UINT16 m_grid;
@@ -88,7 +88,7 @@ void tmtennis_state::update_vfd()
// on difference, send to output
for (int j = 0; j < 12; j++)
output_set_lamp_value(i*100 + j, m_plate >> j & 1);
-
+
m_vfd_state[i] = m_plate;
}
}
@@ -129,7 +129,7 @@ WRITE8_MEMBER(tmtennis_state::plate_w)
if (offset == NEC_UCOM4_PORTF) offset--;
int shift = (offset - NEC_UCOM4_PORTC) * 4;
m_plate = (m_plate & ~(0xf << shift)) | (data << shift);
-
+
update_vfd();
}
@@ -138,7 +138,7 @@ WRITE8_MEMBER(tmtennis_state::grid_w)
// port G/H/I: vfd matrix grid
int shift = (offset - NEC_UCOM4_PORTG) * 4;
m_grid = (m_grid & ~(0xf << shift)) | (data << shift);
-
+
update_vfd();
}
diff --git a/src/mess/drivers/wildfire.c b/src/mess/drivers/wildfire.c
index 28acfdb6c59..d0d66a473ac 100644
--- a/src/mess/drivers/wildfire.c
+++ b/src/mess/drivers/wildfire.c
@@ -62,7 +62,7 @@ public:
TIMER_DEVICE_CALLBACK_MEMBER(display_decay_tick);
bool index_is_7segled(int index);
void display_update();
-
+
TIMER_DEVICE_CALLBACK_MEMBER(reset_q2);
void write_a12(int state);
void sound_update();
@@ -94,16 +94,16 @@ inline bool wildfire_state::index_is_7segled(int index)
// where xx is led column and y is led row, eg. lamp103 is output A10 D3
// (note: 2 mistakes in the patent: the L19 between L12 and L14 should be L13, and L84 should of course be L48)
/*
- L0 = - L10 = lamp60 L20 = lamp41 L30 = lamp53 L40 = lamp57 L50 = lamp110
- L1 = lamp107 L11 = lamp50 L21 = lamp42 L31 = lamp43 L41 = lamp66 L51 = lamp111
- L2 = lamp106 L12 = lamp61 L22 = lamp52 L32 = lamp54 L42 = lamp76 L52 = lamp112
- L3 = lamp105 L13 = lamp71 L23 = lamp63 L33 = lamp55 L43 = lamp86 L53 = lamp113
- L4 = lamp104 L14 = lamp81 L24 = lamp73 L34 = lamp117 L44 = lamp96 L60 = lamp30
+ L0 = - L10 = lamp60 L20 = lamp41 L30 = lamp53 L40 = lamp57 L50 = lamp110
+ L1 = lamp107 L11 = lamp50 L21 = lamp42 L31 = lamp43 L41 = lamp66 L51 = lamp111
+ L2 = lamp106 L12 = lamp61 L22 = lamp52 L32 = lamp54 L42 = lamp76 L52 = lamp112
+ L3 = lamp105 L13 = lamp71 L23 = lamp63 L33 = lamp55 L43 = lamp86 L53 = lamp113
+ L4 = lamp104 L14 = lamp81 L24 = lamp73 L34 = lamp117 L44 = lamp96 L60 = lamp30
L5 = lamp103 L15 = lamp92 L25 = lamp115 L35 = lamp75 L45 = lamp67 L61 = lamp30(!)
- L6 = lamp102 L16 = lamp82 L26 = lamp93 L36 = lamp95 L46 = lamp77 L62 = lamp31
+ L6 = lamp102 L16 = lamp82 L26 = lamp93 L36 = lamp95 L46 = lamp77 L62 = lamp31
L7 = lamp101 L17 = lamp72 L27 = lamp94 L37 = lamp56 L47 = lamp87 L63 = lamp31(!)
- L8 = lamp80 L18 = lamp114 L28 = lamp84 L38 = lamp65 L48 = lamp97 L70 = lamp33
- L9 = lamp70 L19 = lamp51 L29 = lamp116 L39 = lamp85 L49 = -
+ L8 = lamp80 L18 = lamp114 L28 = lamp84 L38 = lamp65 L48 = lamp97 L70 = lamp33
+ L9 = lamp70 L19 = lamp51 L29 = lamp116 L39 = lamp85 L49 = -
*/
void wildfire_state::display_update()
@@ -221,7 +221,7 @@ WRITE8_MEMBER(wildfire_state::write_d)
WRITE16_MEMBER(wildfire_state::write_a)
{
data ^= 0x1fff; // active-low
-
+
// A12: enable speaker
write_a12(data >> 12 & 1);
diff --git a/src/mess/includes/gamate.h b/src/mess/includes/gamate.h
index 51d7fc7037b..ea7f3de5c95 100644
--- a/src/mess/includes/gamate.h
+++ b/src/mess/includes/gamate.h
@@ -14,12 +14,12 @@
struct GAMATE_CHANNEL
{
GAMATE_CHANNEL() :
-// on(0),
-// waveform(0),
+// on(0),
+// waveform(0),
volume(0),
pos(0),
size(0)
-// count(0)
+// count(0)
{
}
@@ -27,7 +27,7 @@ struct GAMATE_CHANNEL
int /*waveform,*/ volume;
int pos;
int size;
-// int count;
+// int count;
};
@@ -51,7 +51,7 @@ public:
DECLARE_WRITE8_MEMBER( device_w );
private:
-
+
sound_stream *m_mixer_channel;
GAMATE_CHANNEL m_channels[3];
UINT8 reg[14];
diff --git a/src/mess/machine/amstrad.c b/src/mess/machine/amstrad.c
index 54997ce7b58..1baa812651e 100644
--- a/src/mess/machine/amstrad.c
+++ b/src/mess/machine/amstrad.c
@@ -2918,7 +2918,7 @@ void amstrad_state::enumerate_roms()
void amstrad_state::amstrad_common_init()
{
-// address_space &space = m_maincpu->space(AS_PROGRAM);
+// address_space &space = m_maincpu->space(AS_PROGRAM);
m_aleste_mode = 0;
@@ -2928,29 +2928,29 @@ void amstrad_state::amstrad_common_init()
m_GateArray_RamConfiguration = 0;
m_gate_array.hsync_counter = 2;
-/* space.install_read_bank(0x0000, 0x1fff, "bank1");
- space.install_read_bank(0x2000, 0x3fff, "bank2");
+/* space.install_read_bank(0x0000, 0x1fff, "bank1");
+ space.install_read_bank(0x2000, 0x3fff, "bank2");
- space.install_read_bank(0x4000, 0x5fff, "bank3");
- space.install_read_bank(0x6000, 0x7fff, "bank4");
+ space.install_read_bank(0x4000, 0x5fff, "bank3");
+ space.install_read_bank(0x6000, 0x7fff, "bank4");
- space.install_read_bank(0x8000, 0x9fff, "bank5");
- space.install_read_bank(0xa000, 0xbfff, "bank6");
+ space.install_read_bank(0x8000, 0x9fff, "bank5");
+ space.install_read_bank(0xa000, 0xbfff, "bank6");
- space.install_read_bank(0xc000, 0xdfff, "bank7");
- space.install_read_bank(0xe000, 0xffff, "bank8");
+ space.install_read_bank(0xc000, 0xdfff, "bank7");
+ space.install_read_bank(0xe000, 0xffff, "bank8");
- space.install_write_bank(0x0000, 0x1fff, "bank9");
- space.install_write_bank(0x2000, 0x3fff, "bank10");
+ space.install_write_bank(0x0000, 0x1fff, "bank9");
+ space.install_write_bank(0x2000, 0x3fff, "bank10");
- space.install_write_bank(0x4000, 0x5fff, "bank11");
- space.install_write_bank(0x6000, 0x7fff, "bank12");
+ space.install_write_bank(0x4000, 0x5fff, "bank11");
+ space.install_write_bank(0x6000, 0x7fff, "bank12");
- space.install_write_bank(0x8000, 0x9fff, "bank13");
- space.install_write_bank(0xa000, 0xbfff, "bank14");
+ space.install_write_bank(0x8000, 0x9fff, "bank13");
+ space.install_write_bank(0xa000, 0xbfff, "bank14");
- space.install_write_bank(0xc000, 0xdfff, "bank15");
- space.install_write_bank(0xe000, 0xffff, "bank16");
+ space.install_write_bank(0xc000, 0xdfff, "bank15");
+ space.install_write_bank(0xe000, 0xffff, "bank16");
*/
enumerate_roms();
diff --git a/src/mess/machine/apple3.c b/src/mess/machine/apple3.c
index c46c7bdf0c8..b33594f5ce8 100644
--- a/src/mess/machine/apple3.c
+++ b/src/mess/machine/apple3.c
@@ -248,7 +248,7 @@ READ8_MEMBER(apple3_state::apple3_c0xx_r)
apple3_write_charmem();
break;
- case 0xE0: case 0xE1:
+ case 0xE0: case 0xE1:
result = m_fdc->read(space, offset&0xf);
m_va = offset & 1;
break;
@@ -258,13 +258,13 @@ READ8_MEMBER(apple3_state::apple3_c0xx_r)
m_vb = offset & 1;
break;
- case 0xE4: case 0xE5:
+ case 0xE4: case 0xE5:
result = m_fdc->read(space, offset&0xf);
m_vc = offset & 1;
break;
- case 0xE6: case 0xE7: case 0xE8: case 0xE9:
- case 0xEA: case 0xEB: case 0xEC: case 0xED:
+ case 0xE6: case 0xE7: case 0xE8: case 0xE9:
+ case 0xEA: case 0xEB: case 0xEC: case 0xED:
case 0xEE: case 0xEF:
result = m_fdc->read(space, offset&0xf);
break;
@@ -1297,4 +1297,3 @@ WRITE_LINE_MEMBER(apple3_state::a2bus_nmi_w)
m_maincpu->set_input_line(INPUT_LINE_NMI, state);
}
}
-
diff --git a/src/mess/machine/beta.c b/src/mess/machine/beta.c
index a77e2fec0b8..6fff0d7dba7 100644
--- a/src/mess/machine/beta.c
+++ b/src/mess/machine/beta.c
@@ -106,7 +106,7 @@ READ8_MEMBER(beta_disk_device::data_r)
READ8_MEMBER(beta_disk_device::state_r)
{
if (m_betadisk_active==1) {
- UINT8 result = 0x3F; // actually open bus
+ UINT8 result = 0x3F; // actually open bus
result |= m_wd179x->drq_r() ? 0x40 : 0;
result |= m_wd179x->intrq_r() ? 0x80 : 0;
return result;
@@ -181,7 +181,7 @@ static SLOT_INTERFACE_START( beta_disk_floppies )
SLOT_INTERFACE_END
static MACHINE_CONFIG_FRAGMENT( beta_disk )
- MCFG_WD2793x_ADD("wd179x", XTAL_8MHz / 8) // KR1818VG93 clone of WD1793
+ MCFG_WD2793x_ADD("wd179x", XTAL_8MHz / 8) // KR1818VG93 clone of WD1793
MCFG_FLOPPY_DRIVE_ADD("wd179x:0", beta_disk_floppies, "drive0", beta_disk_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("wd179x:1", beta_disk_floppies, "drive1", beta_disk_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("wd179x:2", beta_disk_floppies, "drive2", beta_disk_device::floppy_formats)
diff --git a/src/mess/machine/c65_old.c b/src/mess/machine/c65_old.c
index caa68c22fd3..8060f05c54c 100644
--- a/src/mess/machine/c65_old.c
+++ b/src/mess/machine/c65_old.c
@@ -1335,4 +1335,3 @@ INTERRUPT_GEN_MEMBER(c65_state::c65_frame_interrupt)
value &= ~ioport("FUNCT")->read();
m_keyline = value;
}
-
diff --git a/src/mess/osd/windows/windows.mak b/src/mess/osd/windows/windows.mak
index 01b209b936b..0c7ca6125e1 100644
--- a/src/mess/osd/windows/windows.mak
+++ b/src/mess/osd/windows/windows.mak
@@ -28,7 +28,7 @@ $(LIBOCORE_NOMAIN): $(OSDCOREOBJS:$(WINOBJ)/main.o=)
$(MESS_WINOBJ)/%.res: $(MESS_WINSRC)/%.rc
@echo Compiling resources $<...
$(RC) $(RCDEFS) $(RCFLAGS) --include-dir $(MESS_WINOBJ) -o $@ -i $<
-
+
#-------------------------------------------------
# rules for resource file
diff --git a/src/mess/video/apple3.c b/src/mess/video/apple3.c
index 1ab0830bb43..7230811ad30 100644
--- a/src/mess/video/apple3.c
+++ b/src/mess/video/apple3.c
@@ -482,7 +482,7 @@ void apple3_state::apple3_video_graphics_chires(bitmap_ind16 &bitmap)
UINT32 apple3_state::screen_update_apple3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
-// printf("gfx mode %x\n", m_flags & (VAR_VM3|VAR_VM1|VAR_VM0));
+// printf("gfx mode %x\n", m_flags & (VAR_VM3|VAR_VM1|VAR_VM0));
switch(m_flags & (VAR_VM3|VAR_VM1|VAR_VM0))
{
diff --git a/src/osd/modules/debugger/debugwin.c b/src/osd/modules/debugger/debugwin.c
index 448f35b122c..1ae50bc3c8d 100644
--- a/src/osd/modules/debugger/debugwin.c
+++ b/src/osd/modules/debugger/debugwin.c
@@ -73,11 +73,11 @@ protected:
private:
template <typename T> T *create_window();
- running_machine *m_machine;
- auto_pointer<ui_metrics> m_metrics;
- bool m_waiting_for_debugger;
- simple_list<debugwin_info> m_window_list;
- consolewin_info *m_main_console;
+ running_machine *m_machine;
+ auto_pointer<ui_metrics> m_metrics;
+ bool m_waiting_for_debugger;
+ simple_list<debugwin_info> m_window_list;
+ consolewin_info *m_main_console;
};
@@ -207,9 +207,9 @@ bool debugger_windows::seq_pressed() const
int const vkey = wininput_vkey_for_mame_code(code);
bool const pressed = (vkey != 0) && ((GetAsyncKeyState(vkey) & 0x8000) != 0);
- if (first) // if this is the first in the sequence, result is set equal
+ if (first) // if this is the first in the sequence, result is set equal
result = pressed ^ invert;
- else if (result) // further values are ANDed
+ else if (result) // further values are ANDed
result = result && (pressed ^ invert);
// no longer first, and clear the invert flag
diff --git a/src/osd/modules/debugger/osx/debugcommandhistory.h b/src/osd/modules/debugger/osx/debugcommandhistory.h
index 1e77b1f6cfb..02256690ea7 100644
--- a/src/osd/modules/debugger/osx/debugcommandhistory.h
+++ b/src/osd/modules/debugger/osx/debugcommandhistory.h
@@ -16,9 +16,9 @@
@interface MAMEDebugCommandHistory : NSObject
{
- NSInteger length, position;
- NSString *current;
- NSMutableArray *history;
+ NSInteger length, position;
+ NSString *current;
+ NSMutableArray *history;
}
+ (NSInteger)defaultLength;
diff --git a/src/osd/modules/debugger/osx/debugconsole.h b/src/osd/modules/debugger/osx/debugconsole.h
index 4cae426ce9e..87554b4dd6a 100644
--- a/src/osd/modules/debugger/osx/debugconsole.h
+++ b/src/osd/modules/debugger/osx/debugconsole.h
@@ -22,13 +22,13 @@
@interface MAMEDebugConsole : MAMEDebugWindowHandler <NSTextFieldDelegate, NSSplitViewDelegate>
{
- MAMEDebugCommandHistory *history;
- NSMutableArray *auxiliaryWindows;
+ MAMEDebugCommandHistory *history;
+ NSMutableArray *auxiliaryWindows;
- MAMERegistersView *regView;
- MAMEDisassemblyView *dasmView;
- MAMEDebugView *consoleView;
- NSTextField *commandField;
+ MAMERegistersView *regView;
+ MAMEDisassemblyView *dasmView;
+ MAMEDebugView *consoleView;
+ NSTextField *commandField;
}
- (id)initWithMachine:(running_machine &)m;
diff --git a/src/osd/modules/debugger/osx/debugview.h b/src/osd/modules/debugger/osx/debugview.h
index b76e4633f38..d45d6a6e045 100644
--- a/src/osd/modules/debugger/osx/debugview.h
+++ b/src/osd/modules/debugger/osx/debugview.h
@@ -19,19 +19,19 @@
@interface MAMEDebugView : NSView
{
- int type;
- running_machine *machine;
- debug_view *view;
- BOOL wholeLineScroll;
+ int type;
+ running_machine *machine;
+ debug_view *view;
+ BOOL wholeLineScroll;
- INT32 totalWidth, totalHeight, originTop;
+ INT32 totalWidth, totalHeight, originTop;
- NSFont *font;
- CGFloat fontWidth, fontHeight, fontAscent;
+ NSFont *font;
+ CGFloat fontWidth, fontHeight, fontAscent;
- NSTextStorage *text;
- NSTextContainer *textContainer;
- NSLayoutManager *layoutManager;
+ NSTextStorage *text;
+ NSTextContainer *textContainer;
+ NSLayoutManager *layoutManager;
}
+ (NSFont *)defaultFont;
diff --git a/src/osd/modules/debugger/osx/debugwindowhandler.h b/src/osd/modules/debugger/osx/debugwindowhandler.h
index 2764dc4046c..f720da4f6ef 100644
--- a/src/osd/modules/debugger/osx/debugwindowhandler.h
+++ b/src/osd/modules/debugger/osx/debugwindowhandler.h
@@ -28,8 +28,8 @@ extern NSString *const MAMEAuxiliaryDebugWindowWillCloseNotification;
@interface MAMEDebugWindowHandler : NSObject <NSWindowDelegate>
{
- NSWindow *window;
- running_machine *machine;
+ NSWindow *window;
+ running_machine *machine;
}
+ (void)addCommonActionItems:(NSMenu *)menu;
@@ -64,7 +64,7 @@ extern NSString *const MAMEAuxiliaryDebugWindowWillCloseNotification;
@interface MAMEAuxiliaryDebugWindowHandler : MAMEDebugWindowHandler
{
- MAMEDebugConsole *console;
+ MAMEDebugConsole *console;
}
+ (void)cascadeWindow:(NSWindow *)window;
@@ -86,8 +86,8 @@ extern NSString *const MAMEAuxiliaryDebugWindowWillCloseNotification;
@interface MAMEExpressionAuxiliaryDebugWindowHandler : MAMEAuxiliaryDebugWindowHandler <NSTextFieldDelegate>
{
- MAMEDebugCommandHistory *history;
- NSTextField *expressionField;
+ MAMEDebugCommandHistory *history;
+ NSTextField *expressionField;
}
- (id)initWithMachine:(running_machine &)m title:(NSString *)t console:(MAMEDebugConsole *)c;
diff --git a/src/osd/modules/debugger/osx/deviceinfoviewer.h b/src/osd/modules/debugger/osx/deviceinfoviewer.h
index 41243a954de..7b9975d0e73 100644
--- a/src/osd/modules/debugger/osx/deviceinfoviewer.h
+++ b/src/osd/modules/debugger/osx/deviceinfoviewer.h
@@ -22,7 +22,7 @@
@interface MAMEDeviceInfoViewer : MAMEAuxiliaryDebugWindowHandler
{
- device_t *device;
+ device_t *device;
}
- (id)initWithDevice:(device_t &)d machine:(running_machine &)m console:(MAMEDebugConsole *)c;
diff --git a/src/osd/modules/debugger/osx/devicesviewer.h b/src/osd/modules/debugger/osx/devicesviewer.h
index 24a2a2dc415..11408b43b01 100644
--- a/src/osd/modules/debugger/osx/devicesviewer.h
+++ b/src/osd/modules/debugger/osx/devicesviewer.h
@@ -22,8 +22,8 @@
@interface MAMEDevicesViewer : MAMEAuxiliaryDebugWindowHandler <NSOutlineViewDataSource>
{
- MAMEDeviceWrapper *root;
- NSOutlineView *devicesView;
+ MAMEDeviceWrapper *root;
+ NSOutlineView *devicesView;
}
- (id)initWithMachine:(running_machine &)m console:(MAMEDebugConsole *)c;
diff --git a/src/osd/modules/debugger/osx/disassemblyviewer.h b/src/osd/modules/debugger/osx/disassemblyviewer.h
index 732975c5ddd..d9899457abb 100644
--- a/src/osd/modules/debugger/osx/disassemblyviewer.h
+++ b/src/osd/modules/debugger/osx/disassemblyviewer.h
@@ -22,8 +22,8 @@
@interface MAMEDisassemblyViewer : MAMEExpressionAuxiliaryDebugWindowHandler
{
- MAMEDisassemblyView *dasmView;
- NSPopUpButton *subviewButton;
+ MAMEDisassemblyView *dasmView;
+ NSPopUpButton *subviewButton;
}
- (id)initWithMachine:(running_machine &)m console:(MAMEDebugConsole *)c;
diff --git a/src/osd/modules/debugger/osx/errorlogviewer.h b/src/osd/modules/debugger/osx/errorlogviewer.h
index 22538f81307..610c4f609ae 100644
--- a/src/osd/modules/debugger/osx/errorlogviewer.h
+++ b/src/osd/modules/debugger/osx/errorlogviewer.h
@@ -22,7 +22,7 @@
@interface MAMEErrorLogViewer : MAMEAuxiliaryDebugWindowHandler
{
- MAMEErrorLogView *logView;
+ MAMEErrorLogView *logView;
}
- (id)initWithMachine:(running_machine &)m console:(MAMEDebugConsole *)c;
diff --git a/src/osd/modules/debugger/osx/memoryviewer.h b/src/osd/modules/debugger/osx/memoryviewer.h
index 63c9d4eea2b..03fc65571cd 100644
--- a/src/osd/modules/debugger/osx/memoryviewer.h
+++ b/src/osd/modules/debugger/osx/memoryviewer.h
@@ -22,8 +22,8 @@
@interface MAMEMemoryViewer : MAMEExpressionAuxiliaryDebugWindowHandler
{
- MAMEMemoryView *memoryView;
- NSPopUpButton *subviewButton;
+ MAMEMemoryView *memoryView;
+ NSPopUpButton *subviewButton;
}
- (id)initWithMachine:(running_machine &)m console:(MAMEDebugConsole *)c;
diff --git a/src/osd/modules/debugger/osx/pointsviewer.h b/src/osd/modules/debugger/osx/pointsviewer.h
index 3943f6b486f..ad9ef0f62fd 100644
--- a/src/osd/modules/debugger/osx/pointsviewer.h
+++ b/src/osd/modules/debugger/osx/pointsviewer.h
@@ -22,7 +22,7 @@
@interface MAMEPointsViewer : MAMEAuxiliaryDebugWindowHandler
{
- NSTabView *tabs;
+ NSTabView *tabs;
}
- (id)initWithMachine:(running_machine &)m console:(MAMEDebugConsole *)c;
diff --git a/src/osd/modules/debugger/win/consolewininfo.c b/src/osd/modules/debugger/win/consolewininfo.c
index 771f2d604ce..e24271a6f50 100644
--- a/src/osd/modules/debugger/win/consolewininfo.c
+++ b/src/osd/modules/debugger/win/consolewininfo.c
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles, Vas Crabb
//============================================================
//
-// consolewininfo.c - Win32 debug window handling
+// consolewininfo.c - Win32 debug window handling
//
//============================================================
@@ -304,9 +304,9 @@ bool consolewin_info::handle_command(WPARAM wparam, LPARAM lparam)
void consolewin_info::process_string(char const *string)
{
- if (string[0] == 0) // an empty string is a single step
+ if (string[0] == 0) // an empty string is a single step
debug_cpu_get_visible_cpu(machine())->debug()->single_step();
- else // otherwise, just process the command
+ else // otherwise, just process the command
debug_console_execute_command(machine(), string, 1);
// clear the edit text box
diff --git a/src/osd/modules/debugger/win/consolewininfo.h b/src/osd/modules/debugger/win/consolewininfo.h
index 08790fb66b3..b74a189657d 100644
--- a/src/osd/modules/debugger/win/consolewininfo.h
+++ b/src/osd/modules/debugger/win/consolewininfo.h
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles, Vas Crabb
//============================================================
//
-// consolewininfo.h - Win32 debug window handling
+// consolewininfo.h - Win32 debug window handling
//
//============================================================
@@ -47,7 +47,7 @@ private:
static void add_filter_entry(astring &dest, char const *description, char const *extensions);
static void copy_extension_list(astring &dest, char const *extensions);
- HMENU m_devices_menu;
+ HMENU m_devices_menu;
};
#endif
diff --git a/src/osd/modules/debugger/win/debugbaseinfo.c b/src/osd/modules/debugger/win/debugbaseinfo.c
index 34451875063..66824b9f029 100644
--- a/src/osd/modules/debugger/win/debugbaseinfo.c
+++ b/src/osd/modules/debugger/win/debugbaseinfo.c
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles, Vas Crabb
//============================================================
//
-// debugbaseinfo.c - Win32 debug window handling
+// debugbaseinfo.c - Win32 debug window handling
//
//============================================================
diff --git a/src/osd/modules/debugger/win/debugbaseinfo.h b/src/osd/modules/debugger/win/debugbaseinfo.h
index 9aee28b49ef..749e432a6bc 100644
--- a/src/osd/modules/debugger/win/debugbaseinfo.h
+++ b/src/osd/modules/debugger/win/debugbaseinfo.h
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles, Vas Crabb
//============================================================
//
-// debugbaseinfo.h - Win32 debug window handling
+// debugbaseinfo.h - Win32 debug window handling
//
//============================================================
@@ -30,10 +30,10 @@ protected:
static void smart_show_window(HWND wnd, bool show);
private:
- debugger_windows_interface &m_debugger;
- running_machine &m_machine;
- ui_metrics const &m_metrics;
- bool const &m_waiting_for_debugger;
+ debugger_windows_interface &m_debugger;
+ running_machine &m_machine;
+ ui_metrics const &m_metrics;
+ bool const &m_waiting_for_debugger;
};
diff --git a/src/osd/modules/debugger/win/debugviewinfo.c b/src/osd/modules/debugger/win/debugviewinfo.c
index 883a12dac11..f3c12a09f2e 100644
--- a/src/osd/modules/debugger/win/debugviewinfo.c
+++ b/src/osd/modules/debugger/win/debugviewinfo.c
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles, Vas Crabb
//============================================================
//
-// debugview.c - Win32 debug window handling
+// debugview.c - Win32 debug window handling
//
//============================================================
@@ -17,20 +17,20 @@
// debugger view styles
-#define DEBUG_VIEW_STYLE WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN
-#define DEBUG_VIEW_STYLE_EX 0
+#define DEBUG_VIEW_STYLE WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN
+#define DEBUG_VIEW_STYLE_EX 0
// combo box styles
-#define COMBO_BOX_STYLE WS_CHILD | WS_VISIBLE | CBS_DROPDOWNLIST | WS_VSCROLL
-#define COMBO_BOX_STYLE_EX 0
+#define COMBO_BOX_STYLE WS_CHILD | WS_VISIBLE | CBS_DROPDOWNLIST | WS_VSCROLL
+#define COMBO_BOX_STYLE_EX 0
// horizontal scroll bar styles
-#define HSCROLL_STYLE WS_CHILD | WS_VISIBLE | SBS_HORZ
-#define HSCROLL_STYLE_EX 0
+#define HSCROLL_STYLE WS_CHILD | WS_VISIBLE | SBS_HORZ
+#define HSCROLL_STYLE_EX 0
// vertical scroll bar styles
-#define VSCROLL_STYLE WS_CHILD | WS_VISIBLE | SBS_VERT
-#define VSCROLL_STYLE_EX 0
+#define VSCROLL_STYLE WS_CHILD | WS_VISIBLE | SBS_VERT
+#define VSCROLL_STYLE_EX 0
bool debugview_info::s_window_class_registered = false;
@@ -310,7 +310,6 @@ void debugview_info::draw_contents(HDC windc)
// iterate over rows and columns
for (UINT32 row = 0; row < visarea.y; row++)
{
-
// loop twice; once to fill the background and once to draw the text
for (int iter = 0; iter < 2; iter++)
{
@@ -789,16 +788,16 @@ void debugview_info::register_window_class()
WNDCLASS wc = { 0 };
// initialize the description of the window class
- wc.lpszClassName = TEXT("MAMEDebugView");
- wc.hInstance = GetModuleHandle(NULL);
- wc.lpfnWndProc = &debugview_info::static_view_proc;
- wc.hCursor = LoadCursor(NULL, IDC_ARROW);
- wc.hIcon = LoadIcon(wc.hInstance, MAKEINTRESOURCE(2));
- wc.lpszMenuName = NULL;
- wc.hbrBackground = NULL;
- wc.style = 0;
- wc.cbClsExtra = 0;
- wc.cbWndExtra = 0;
+ wc.lpszClassName = TEXT("MAMEDebugView");
+ wc.hInstance = GetModuleHandle(NULL);
+ wc.lpfnWndProc = &debugview_info::static_view_proc;
+ wc.hCursor = LoadCursor(NULL, IDC_ARROW);
+ wc.hIcon = LoadIcon(wc.hInstance, MAKEINTRESOURCE(2));
+ wc.lpszMenuName = NULL;
+ wc.hbrBackground = NULL;
+ wc.style = 0;
+ wc.cbClsExtra = 0;
+ wc.cbWndExtra = 0;
// register the class; fail if we can't
if (!RegisterClass(&wc))
diff --git a/src/osd/modules/debugger/win/debugviewinfo.h b/src/osd/modules/debugger/win/debugviewinfo.h
index d804554778a..ec4eedf2e69 100644
--- a/src/osd/modules/debugger/win/debugviewinfo.h
+++ b/src/osd/modules/debugger/win/debugviewinfo.h
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles, Vas Crabb
//============================================================
//
-// debugviewinfo.h - Win32 debug window handling
+// debugviewinfo.h - Win32 debug window handling
//
//============================================================
@@ -65,13 +65,13 @@ private:
static void register_window_class();
- debugwin_info &m_owner;
- debug_view *m_view;
- HWND m_wnd;
- HWND m_hscroll;
- HWND m_vscroll;
+ debugwin_info &m_owner;
+ debug_view *m_view;
+ HWND m_wnd;
+ HWND m_hscroll;
+ HWND m_vscroll;
- static bool s_window_class_registered;
+ static bool s_window_class_registered;
};
#endif
diff --git a/src/osd/modules/debugger/win/debugwin.h b/src/osd/modules/debugger/win/debugwin.h
index 6971e7f93c0..bedf2b36d43 100644
--- a/src/osd/modules/debugger/win/debugwin.h
+++ b/src/osd/modules/debugger/win/debugwin.h
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles, Vas Crabb
//============================================================
//
-// debugwin.h - Win32 debug window handling
+// debugwin.h - Win32 debug window handling
//
//============================================================
diff --git a/src/osd/modules/debugger/win/debugwininfo.c b/src/osd/modules/debugger/win/debugwininfo.c
index f900715a015..1a3258c1cab 100644
--- a/src/osd/modules/debugger/win/debugwininfo.c
+++ b/src/osd/modules/debugger/win/debugwininfo.c
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles, Vas Crabb
//============================================================
//
-// debugwininfo.c - Win32 debug window handling
+// debugwininfo.c - Win32 debug window handling
//
//============================================================
@@ -579,16 +579,16 @@ void debugwin_info::register_window_class()
WNDCLASS wc = { 0 };
// initialize the description of the window class
- wc.lpszClassName = TEXT("MAMEDebugWindow");
- wc.hInstance = GetModuleHandle(NULL);
- wc.lpfnWndProc = &debugwin_info::static_window_proc;
- wc.hCursor = LoadCursor(NULL, IDC_ARROW);
- wc.hIcon = LoadIcon(wc.hInstance, MAKEINTRESOURCE(2));
- wc.lpszMenuName = NULL;
- wc.hbrBackground = NULL;
- wc.style = 0;
- wc.cbClsExtra = 0;
- wc.cbWndExtra = 0;
+ wc.lpszClassName = TEXT("MAMEDebugWindow");
+ wc.hInstance = GetModuleHandle(NULL);
+ wc.lpfnWndProc = &debugwin_info::static_window_proc;
+ wc.hCursor = LoadCursor(NULL, IDC_ARROW);
+ wc.hIcon = LoadIcon(wc.hInstance, MAKEINTRESOURCE(2));
+ wc.lpszMenuName = NULL;
+ wc.hbrBackground = NULL;
+ wc.style = 0;
+ wc.cbClsExtra = 0;
+ wc.cbWndExtra = 0;
// register the class; fail if we can't
if (!RegisterClass(&wc))
diff --git a/src/osd/modules/debugger/win/debugwininfo.h b/src/osd/modules/debugger/win/debugwininfo.h
index 9ae4ad34aca..51acc70018f 100644
--- a/src/osd/modules/debugger/win/debugwininfo.h
+++ b/src/osd/modules/debugger/win/debugwininfo.h
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles, Vas Crabb
//============================================================
//
-// debugwininfo.h - Win32 debug window handling
+// debugwininfo.h - Win32 debug window handling
//
//============================================================
@@ -54,11 +54,11 @@ public:
virtual bool handle_key(WPARAM wparam, LPARAM lparam);
protected:
- static DWORD const DEBUG_WINDOW_STYLE = (WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN) & (~WS_MINIMIZEBOX & ~WS_MAXIMIZEBOX);
- static DWORD const DEBUG_WINDOW_STYLE_EX = 0;
+ static DWORD const DEBUG_WINDOW_STYLE = (WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN) & (~WS_MINIMIZEBOX & ~WS_MAXIMIZEBOX);
+ static DWORD const DEBUG_WINDOW_STYLE_EX = 0;
- static int const MAX_VIEWS = 4;
- static int const EDGE_WIDTH = 3;
+ static int const MAX_VIEWS = 4;
+ static int const EDGE_WIDTH = 3;
enum
{
@@ -98,7 +98,7 @@ protected:
ID_SHOW_BREAKPOINTS,
ID_SHOW_WATCHPOINTS,
- ID_DEVICE_OPTIONS // always keep this at the end
+ ID_DEVICE_OPTIONS // always keep this at the end
};
bool is_main_console() const { return m_is_main_console; }
@@ -115,7 +115,7 @@ protected:
void draw_border(HDC dc, RECT &bounds);
void draw_border(HDC dc, HWND child);
- auto_pointer<debugview_info> m_views[MAX_VIEWS];
+ auto_pointer<debugview_info> m_views[MAX_VIEWS];
private:
LRESULT window_proc(UINT message, WPARAM wparam, LPARAM lparam);
@@ -126,18 +126,18 @@ private:
static void register_window_class();
- bool const m_is_main_console;
+ bool const m_is_main_console;
- debugwin_info *m_next;
- HWND m_wnd;
- WNDPROC const m_handler;
+ debugwin_info *m_next;
+ HWND m_wnd;
+ WNDPROC const m_handler;
- UINT32 m_minwidth, m_maxwidth;
- UINT32 m_minheight, m_maxheight;
+ UINT32 m_minwidth, m_maxwidth;
+ UINT32 m_minheight, m_maxheight;
- UINT16 m_ignore_char_lparam;
+ UINT16 m_ignore_char_lparam;
- static bool s_window_class_registered;
+ static bool s_window_class_registered;
};
#endif
diff --git a/src/osd/modules/debugger/win/disasmbasewininfo.c b/src/osd/modules/debugger/win/disasmbasewininfo.c
index 886ccc56f24..c1b9ef5759e 100644
--- a/src/osd/modules/debugger/win/disasmbasewininfo.c
+++ b/src/osd/modules/debugger/win/disasmbasewininfo.c
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles, Vas Crabb
//============================================================
//
-// disasmbasewininfo.c - Win32 debug window handling
+// disasmbasewininfo.c - Win32 debug window handling
//
//============================================================
diff --git a/src/osd/modules/debugger/win/disasmbasewininfo.h b/src/osd/modules/debugger/win/disasmbasewininfo.h
index a74b5196b44..085ec351c98 100644
--- a/src/osd/modules/debugger/win/disasmbasewininfo.h
+++ b/src/osd/modules/debugger/win/disasmbasewininfo.h
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles, Vas Crabb
//============================================================
//
-// disasmbasewininfo.h - Win32 debug window handling
+// disasmbasewininfo.h - Win32 debug window handling
//
//============================================================
diff --git a/src/osd/modules/debugger/win/disasmviewinfo.c b/src/osd/modules/debugger/win/disasmviewinfo.c
index 98ff1188188..28069c9c89f 100644
--- a/src/osd/modules/debugger/win/disasmviewinfo.c
+++ b/src/osd/modules/debugger/win/disasmviewinfo.c
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles, Vas Crabb
//============================================================
//
-// disasmviewinfo.c - Win32 debug window handling
+// disasmviewinfo.c - Win32 debug window handling
//
//============================================================
@@ -41,4 +41,4 @@ void disasmview_info::set_expression(char const *string)
void disasmview_info::set_right_column(disasm_right_column contents)
{
view<debug_view_disasm>()->set_right_column(contents);
-} \ No newline at end of file
+}
diff --git a/src/osd/modules/debugger/win/disasmviewinfo.h b/src/osd/modules/debugger/win/disasmviewinfo.h
index bfd8e73cd95..011748517c0 100644
--- a/src/osd/modules/debugger/win/disasmviewinfo.h
+++ b/src/osd/modules/debugger/win/disasmviewinfo.h
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles, Vas Crabb
//============================================================
//
-// disasmviewinfo.h - Win32 debug window handling
+// disasmviewinfo.h - Win32 debug window handling
//
//============================================================
diff --git a/src/osd/modules/debugger/win/disasmwininfo.c b/src/osd/modules/debugger/win/disasmwininfo.c
index 9f2db09919c..9c6c02e23eb 100644
--- a/src/osd/modules/debugger/win/disasmwininfo.c
+++ b/src/osd/modules/debugger/win/disasmwininfo.c
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles, Vas Crabb
//============================================================
//
-// disasmwininfo.c - Win32 debug window handling
+// disasmwininfo.c - Win32 debug window handling
//
//============================================================
diff --git a/src/osd/modules/debugger/win/disasmwininfo.h b/src/osd/modules/debugger/win/disasmwininfo.h
index 7817aa9f456..e55b74ba3c1 100644
--- a/src/osd/modules/debugger/win/disasmwininfo.h
+++ b/src/osd/modules/debugger/win/disasmwininfo.h
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles, Vas Crabb
//============================================================
//
-// disasmwininfo.h - Win32 debug window handling
+// disasmwininfo.h - Win32 debug window handling
//
//============================================================
@@ -30,7 +30,7 @@ private:
void update_caption();
- HWND m_combownd;
+ HWND m_combownd;
};
#endif
diff --git a/src/osd/modules/debugger/win/editwininfo.c b/src/osd/modules/debugger/win/editwininfo.c
index f9dfdb053e1..f89c766ebd4 100644
--- a/src/osd/modules/debugger/win/editwininfo.c
+++ b/src/osd/modules/debugger/win/editwininfo.c
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles, Vas Crabb
//============================================================
//
-// editwininfo.c - Win32 debug window handling
+// editwininfo.c - Win32 debug window handling
//
//============================================================
@@ -15,8 +15,8 @@
// edit box styles
-#define EDIT_BOX_STYLE WS_CHILD | WS_VISIBLE | ES_AUTOHSCROLL
-#define EDIT_BOX_STYLE_EX 0
+#define EDIT_BOX_STYLE WS_CHILD | WS_VISIBLE | ES_AUTOHSCROLL
+#define EDIT_BOX_STYLE_EX 0
editwin_info::editwin_info(debugger_windows_interface &debugger, bool is_main_console, LPCSTR title, WNDPROC handler) :
diff --git a/src/osd/modules/debugger/win/editwininfo.h b/src/osd/modules/debugger/win/editwininfo.h
index b89a710781a..ff5e20f03ec 100644
--- a/src/osd/modules/debugger/win/editwininfo.h
+++ b/src/osd/modules/debugger/win/editwininfo.h
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles, Vas Crabb
//============================================================
//
-// editwininfo.h - Win32 debug window handling
+// editwininfo.h - Win32 debug window handling
//
//============================================================
@@ -25,8 +25,8 @@ public:
virtual bool set_default_focus();
protected:
- static DWORD const COMBO_BOX_STYLE = WS_CHILD | WS_VISIBLE | CBS_DROPDOWNLIST | WS_VSCROLL;
- static DWORD const COMBO_BOX_STYLE_EX = 0;
+ static DWORD const COMBO_BOX_STYLE = WS_CHILD | WS_VISIBLE | CBS_DROPDOWNLIST | WS_VSCROLL;
+ static DWORD const COMBO_BOX_STYLE_EX = 0;
void set_editwnd_bounds(RECT const &bounds);
void set_editwnd_text(char const *text);
@@ -42,15 +42,15 @@ private:
static LRESULT CALLBACK static_edit_proc(HWND wnd, UINT message, WPARAM wparam, LPARAM lparam);
- static int const MAX_EDIT_STRING = 256;
- static int const HISTORY_LENGTH = 20;
+ static int const MAX_EDIT_STRING = 256;
+ static int const HISTORY_LENGTH = 20;
- HWND m_editwnd;
- astring m_edit_defstr;
- WNDPROC m_original_editproc;
- TCHAR m_history[HISTORY_LENGTH][MAX_EDIT_STRING];
- int m_history_count;
- int m_last_history;
+ HWND m_editwnd;
+ astring m_edit_defstr;
+ WNDPROC m_original_editproc;
+ TCHAR m_history[HISTORY_LENGTH][MAX_EDIT_STRING];
+ int m_history_count;
+ int m_last_history;
};
#endif
diff --git a/src/osd/modules/debugger/win/logwininfo.c b/src/osd/modules/debugger/win/logwininfo.c
index 2f2b06c349d..32e31bd48c8 100644
--- a/src/osd/modules/debugger/win/logwininfo.c
+++ b/src/osd/modules/debugger/win/logwininfo.c
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles, Vas Crabb
//============================================================
//
-// logwininfo.c - Win32 debug window handling
+// logwininfo.c - Win32 debug window handling
//
//============================================================
diff --git a/src/osd/modules/debugger/win/logwininfo.h b/src/osd/modules/debugger/win/logwininfo.h
index f26a557b2cb..45c41447491 100644
--- a/src/osd/modules/debugger/win/logwininfo.h
+++ b/src/osd/modules/debugger/win/logwininfo.h
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles, Vas Crabb
//============================================================
//
-// logwininfo.h - Win32 debug window handling
+// logwininfo.h - Win32 debug window handling
//
//============================================================
diff --git a/src/osd/modules/debugger/win/memoryviewinfo.c b/src/osd/modules/debugger/win/memoryviewinfo.c
index 4c5bdc44c7e..644b429e0d9 100644
--- a/src/osd/modules/debugger/win/memoryviewinfo.c
+++ b/src/osd/modules/debugger/win/memoryviewinfo.c
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles, Vas Crabb
//============================================================
//
-// memoryviewinfo.c - Win32 debug window handling
+// memoryviewinfo.c - Win32 debug window handling
//
//============================================================
diff --git a/src/osd/modules/debugger/win/memoryviewinfo.h b/src/osd/modules/debugger/win/memoryviewinfo.h
index 1951473d68b..8089d050a4e 100644
--- a/src/osd/modules/debugger/win/memoryviewinfo.h
+++ b/src/osd/modules/debugger/win/memoryviewinfo.h
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles, Vas Crabb
//============================================================
//
-// memoryviewinfo.h - Win32 debug window handling
+// memoryviewinfo.h - Win32 debug window handling
//
//============================================================
diff --git a/src/osd/modules/debugger/win/memorywininfo.c b/src/osd/modules/debugger/win/memorywininfo.c
index 19a4b121de9..8de8749de7b 100644
--- a/src/osd/modules/debugger/win/memorywininfo.c
+++ b/src/osd/modules/debugger/win/memorywininfo.c
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles, Vas Crabb
//============================================================
//
-// memorywininfo.c - Win32 debug window handling
+// memorywininfo.c - Win32 debug window handling
//
//============================================================
diff --git a/src/osd/modules/debugger/win/memorywininfo.h b/src/osd/modules/debugger/win/memorywininfo.h
index a6e71f8fdcd..a52315829b8 100644
--- a/src/osd/modules/debugger/win/memorywininfo.h
+++ b/src/osd/modules/debugger/win/memorywininfo.h
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles, Vas Crabb
//============================================================
//
-// memorywininfo.h - Win32 debug window handling
+// memorywininfo.h - Win32 debug window handling
//
//============================================================
@@ -33,7 +33,7 @@ private:
void update_caption();
- HWND m_combownd;
+ HWND m_combownd;
};
#endif
diff --git a/src/osd/modules/debugger/win/pointswininfo.c b/src/osd/modules/debugger/win/pointswininfo.c
index a958a285046..87c981ef557 100644
--- a/src/osd/modules/debugger/win/pointswininfo.c
+++ b/src/osd/modules/debugger/win/pointswininfo.c
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles, Vas Crabb
//============================================================
//
-// pointswininfo.c - Win32 debug window handling
+// pointswininfo.c - Win32 debug window handling
//
//============================================================
diff --git a/src/osd/modules/debugger/win/pointswininfo.h b/src/osd/modules/debugger/win/pointswininfo.h
index e04a467bb0a..a6c944bc160 100644
--- a/src/osd/modules/debugger/win/pointswininfo.h
+++ b/src/osd/modules/debugger/win/pointswininfo.h
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles, Vas Crabb
//============================================================
//
-// pointswininfo.h - Win32 debug window handling
+// pointswininfo.h - Win32 debug window handling
//
//============================================================
diff --git a/src/osd/modules/debugger/win/uimetrics.c b/src/osd/modules/debugger/win/uimetrics.c
index f61b90275da..7532518f489 100644
--- a/src/osd/modules/debugger/win/uimetrics.c
+++ b/src/osd/modules/debugger/win/uimetrics.c
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles, Vas Crabb
//============================================================
//
-// uimetrics.c - Win32 debug window handling
+// uimetrics.c - Win32 debug window handling
//
//============================================================
diff --git a/src/osd/modules/debugger/win/uimetrics.h b/src/osd/modules/debugger/win/uimetrics.h
index 54db03c1be4..d8f46c8cc68 100644
--- a/src/osd/modules/debugger/win/uimetrics.h
+++ b/src/osd/modules/debugger/win/uimetrics.h
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles, Vas Crabb
//============================================================
//
-// uimetrics.h - Win32 debug window handling
+// uimetrics.h - Win32 debug window handling
//
//============================================================
diff --git a/src/osd/modules/netdev/pcap.c b/src/osd/modules/netdev/pcap.c
index 7c475c62ee3..756a51f39b8 100644
--- a/src/osd/modules/netdev/pcap.c
+++ b/src/osd/modules/netdev/pcap.c
@@ -15,8 +15,8 @@
#if defined(SDLMAME_WIN32) || defined(OSD_WINDOWS)
-#define LIB_NAME L"wpcap.dll"
-#define LIB_ERROR_STR "Unable to load winpcap: %lx\n"
+#define LIB_NAME L"wpcap.dll"
+#define LIB_ERROR_STR "Unable to load winpcap: %lx\n"
typedef DWORD except_type;
#else
@@ -28,11 +28,11 @@ typedef DWORD except_type;
#endif
#ifdef SDLMAME_MACOSX
-#define LIB_NAME "libpcap.dylib"
+#define LIB_NAME "libpcap.dylib"
#else
-#define LIB_NAME "libpcap.so"
+#define LIB_NAME "libpcap.so"
#endif
-#define LIB_ERROR_STR "Unable to load pcap: %s\n"
+#define LIB_ERROR_STR "Unable to load pcap: %s\n"
typedef void *HMODULE;
typedef const char *except_type;
@@ -178,7 +178,7 @@ void netdev_pcap::set_mac(const char *mac)
sprintf(filter, "not ether src %.2X:%.2X:%.2X:%.2X:%.2X:%.2X and (ether dst %.2X:%.2X:%.2X:%.2X:%.2X:%.2X or ether multicast or ether broadcast or ether dst 09:00:07:ff:ff:ff)", (unsigned char)mac[0], (unsigned char)mac[1], (unsigned char)mac[2],(unsigned char)mac[3], (unsigned char)mac[4], (unsigned char)mac[5], (unsigned char)mac[0], (unsigned char)mac[1], (unsigned char)mac[2],(unsigned char)mac[3], (unsigned char)mac[4], (unsigned char)mac[5]);
#else
sprintf(filter, "ether dst %.2X:%.2X:%.2X:%.2X:%.2X:%.2X or ether multicast or ether broadcast", (unsigned char)mac[0], (unsigned char)mac[1], (unsigned char)mac[2],(unsigned char)mac[3], (unsigned char)mac[4], (unsigned char)mac[5]);
-#endif
+#endif
if(pcap_compile_dl(m_p, &fp, filter, 1, 0) == -1) {
logerror("Error with pcap_compile\n");
}
@@ -300,4 +300,3 @@ void pcap_module::exit()
MODULE_DEFINITION(NETDEV_PCAP, pcap_module)
-
diff --git a/src/osd/sdl/blit13.h b/src/osd/sdl/blit13.h
index ad935941036..3fd229e93da 100644
--- a/src/osd/sdl/blit13.h
+++ b/src/osd/sdl/blit13.h
@@ -35,7 +35,6 @@ inline UINT32 ycc_to_rgb(const UINT8 y, const UINT8 cb, const UINT8 cr)
inline UINT32 pixel_ycc_to_rgb(const UINT16 *pixel)
{
-
const UINT32 p = *(UINT32 *)((FPTR) pixel & ~3);
return ycc_to_rgb((*pixel >> 8) & 0xff, (p) & 0xff, (p>>16) & 0xff);
}
@@ -53,17 +52,17 @@ inline UINT32 pixel_ycc_to_rgb_pal(const UINT16 *pixel, const rgb_t *palette)
#define FUNC_DEF(source) op(const source &src, const rgb_t *palbase) const
#define FUNCTOR(name, x...) \
- template<typename _source, typename _dest> \
- struct name { _dest FUNC_DEF(_source) { x } };
+ template<typename _source, typename _dest> \
+ struct name { _dest FUNC_DEF(_source) { x } };
FUNCTOR(op_argb32_argb32, return src; )
FUNCTOR(op_rgb32_argb32, return src | 0xff000000; )
FUNCTOR(op_pal16_argb32, return 0xff000000 |palbase[src]; )
FUNCTOR(op_pal16_rgb32, return palbase[src]; )
FUNCTOR(op_rgb32pal_argb32,
- return palbase[0x200 + (((src) >> 16) & 0xff) ] |
- palbase[0x100 + (((src) >> 8) & 0xff) ] |
- palbase[((src) & 0xff) ] | 0xff000000; )
+ return palbase[0x200 + (((src) >> 16) & 0xff) ] |
+ palbase[0x100 + (((src) >> 8) & 0xff) ] |
+ palbase[((src) & 0xff) ] | 0xff000000; )
FUNCTOR(op_pal16a_argb32, return palbase[src]; )
@@ -74,21 +73,21 @@ FUNCTOR(op_rgb15_argb32,
FUNCTOR(op_rgb15pal_argb32,
return 0xff000000 | palbase[0x40 + ((src >> 10) & 0x1f)] |
- palbase[0x20 + ((src >> 5) & 0x1f)] | palbase[0x00 + ((src >> 0) & 0x1f)]; )
+ palbase[0x20 + ((src >> 5) & 0x1f)] | palbase[0x00 + ((src >> 0) & 0x1f)]; )
FUNCTOR(op_argb32_rgb32, return premult32(src); )
FUNCTOR(op_pal16a_rgb32, return premult32(palbase[src]); )
FUNCTOR(op_pal16_argb1555,
return (palbase[src]&0xf80000) >> 9 |
- (palbase[src]&0x00f800) >> 6 |
- (palbase[src]&0x0000f8) >> 3 | 0x8000; )
+ (palbase[src]&0x00f800) >> 6 |
+ (palbase[src]&0x0000f8) >> 3 | 0x8000; )
FUNCTOR(op_rgb15_argb1555, return src | 0x8000; )
FUNCTOR(op_rgb15pal_argb1555,
return (palbase[src >> 10] & 0xf8) << 7 |
- (palbase[(src >> 5) & 0x1f] & 0xf8) << 2 |
- (palbase[src & 0x1f] & 0xf8) >> 3 | 0x8000; )
+ (palbase[(src >> 5) & 0x1f] & 0xf8) << 2 |
+ (palbase[src & 0x1f] & 0xf8) >> 3 | 0x8000; )
FUNCTOR(op_yuv16_uyvy, return src; )
FUNCTOR(op_yuv16pal_uyvy, return (palbase[(src >> 8) & 0xff] << 8) | (src & 0x00ff); )
@@ -106,11 +105,11 @@ FUNCTOR(op_yuv16pal_yuy2,
FUNCTOR(op_yuv16_argb32,
return (UINT64) ycc_to_rgb((src >> 8) & 0xff, src & 0xff , (src>>16) & 0xff)
- | ((UINT64)ycc_to_rgb((src >> 24) & 0xff, src & 0xff , (src>>16) & 0xff) << 32); )
+ | ((UINT64)ycc_to_rgb((src >> 24) & 0xff, src & 0xff , (src>>16) & 0xff) << 32); )
FUNCTOR(op_yuv16pal_argb32,
return (UINT64)ycc_to_rgb(palbase[(src >> 8) & 0xff], src & 0xff , (src>>16) & 0xff)
- | ((UINT64)ycc_to_rgb(palbase[(src >> 24) & 0xff], src & 0xff , (src>>16) & 0xff) << 32);)
+ | ((UINT64)ycc_to_rgb(palbase[(src >> 24) & 0xff], src & 0xff , (src>>16) & 0xff) << 32);)
FUNCTOR(op_yuv16_argb32rot, return pixel_ycc_to_rgb(&src) ; )
@@ -121,7 +120,6 @@ FUNCTOR(op_yuv16pal_argb32rot, return pixel_ycc_to_rgb_pal(&src, palbase); )
//============================================================
struct blit_base {
-
blit_base(int dest_bpp, bool is_rot, bool is_passthrough)
: m_dest_bpp(dest_bpp), m_is_rot(is_rot), m_is_passthrough(is_passthrough)
{ }
@@ -137,24 +135,24 @@ template<typename _src_type, typename _dest_type, typename _op, int _len_div>
struct blit_texcopy : public blit_base
{
blit_texcopy() : blit_base(sizeof(_dest_type) / _len_div, false, false) { }
- void texop(const texture_info *texture, const render_texinfo *texsource) const
- {
- ATTR_UNUSED const rgb_t *palbase = texsource->palette;
- int x, y;
- /* loop over Y */
- for (y = 0; y < texsource->height; y++) {
- _src_type *src = (_src_type *)texsource->base + y * texsource->rowpixels / (_len_div);
- _dest_type *dst = (_dest_type *)((UINT8 *)texture->m_pixels + y * texture->m_pitch);
- x = texsource->width / (_len_div);
- while (x > 0) {
- *dst++ = m_op.op(*src, palbase);
- src++;
- x--;
- }
- }
- }
+ void texop(const texture_info *texture, const render_texinfo *texsource) const
+ {
+ ATTR_UNUSED const rgb_t *palbase = texsource->palette;
+ int x, y;
+ /* loop over Y */
+ for (y = 0; y < texsource->height; y++) {
+ _src_type *src = (_src_type *)texsource->base + y * texsource->rowpixels / (_len_div);
+ _dest_type *dst = (_dest_type *)((UINT8 *)texture->m_pixels + y * texture->m_pitch);
+ x = texsource->width / (_len_div);
+ while (x > 0) {
+ *dst++ = m_op.op(*src, palbase);
+ src++;
+ x--;
+ }
+ }
+ }
private:
- _op m_op;
+ _op m_op;
};
#define TEXCOPYA(a, b, c, d) \
@@ -187,7 +185,7 @@ struct blit_texrot : public blit_base
}
}
private:
- _op m_op;
+ _op m_op;
};
#define TEXROTA(a, b, c) \
diff --git a/src/osd/sdl/draw13.c b/src/osd/sdl/draw13.c
index d75e2ca0b2b..fdb02c010e5 100644
--- a/src/osd/sdl/draw13.c
+++ b/src/osd/sdl/draw13.c
@@ -49,12 +49,12 @@ enum
static inline bool is_opaque(const float &a)
{
- return (a >= 1.0f);
+ return (a >= 1.0f);
}
static inline bool is_transparent(const float &a)
{
- return (a < 0.0001f);
+ return (a < 0.0001f);
}
//============================================================
@@ -64,11 +64,11 @@ static inline bool is_transparent(const float &a)
struct quad_setup_data
{
- quad_setup_data()
- : dudx(0), dvdx(0), dudy(0), dvdy(0), startu(0), startv(0),
- rotwidth(0), rotheight(0)
- {}
- void compute(const render_primitive &prim, const int prescale);
+ quad_setup_data()
+ : dudx(0), dvdx(0), dudy(0), dvdy(0), startu(0), startv(0),
+ rotwidth(0), rotheight(0)
+ {}
+ void compute(const render_primitive &prim, const int prescale);
INT32 dudx, dvdx, dudy, dvdy;
INT32 startu, startv;
@@ -85,16 +85,16 @@ struct copy_info_t;
/* texture_info holds information about a texture */
class texture_info
{
- friend class simple_list<texture_info>;
+ friend class simple_list<texture_info>;
public:
- texture_info(SDL_Renderer *renderer, const render_texinfo &texsource, const quad_setup_data &setup, const UINT32 flags);
- ~texture_info();
+ texture_info(SDL_Renderer *renderer, const render_texinfo &texsource, const quad_setup_data &setup, const UINT32 flags);
+ ~texture_info();
- void set_data(const render_texinfo &texsource, const UINT32 flags);
- void render_quad(const render_primitive *prim, const int x, const int y);
- bool matches(const render_primitive &prim, const quad_setup_data &setup);
+ void set_data(const render_texinfo &texsource, const UINT32 flags);
+ void render_quad(const render_primitive *prim, const int x, const int y);
+ bool matches(const render_primitive &prim, const quad_setup_data &setup);
- copy_info_t *compute_size_type();
+ copy_info_t *compute_size_type();
void *m_pixels; // pixels for the texture
int m_pitch;
@@ -105,31 +105,31 @@ public:
osd_ticks_t m_last_access;
int raw_width() const { return m_texinfo.width; }
- int raw_height() const { return m_texinfo.height; }
+ int raw_height() const { return m_texinfo.height; }
- texture_info *next() { return m_next; }
- const render_texinfo &texinfo() const { return m_texinfo; }
- render_texinfo &texinfo() { return m_texinfo; }
+ texture_info *next() { return m_next; }
+ const render_texinfo &texinfo() const { return m_texinfo; }
+ render_texinfo &texinfo() { return m_texinfo; }
- const HashT hash() const { return m_hash; }
- const UINT32 flags() const { return m_flags; }
- // FIXME:
- const bool is_pixels_owned() const;
+ const HashT hash() const { return m_hash; }
+ const UINT32 flags() const { return m_flags; }
+ // FIXME:
+ const bool is_pixels_owned() const;
private:
- Uint32 m_sdl_access;
- SDL_Renderer * m_sdl_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
+ Uint32 m_sdl_access;
+ SDL_Renderer * m_sdl_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
- SDL_Texture * m_texture_id;
- bool m_is_rotated;
+ SDL_Texture * m_texture_id;
+ bool m_is_rotated;
- int m_format; // texture format
- SDL_BlendMode m_sdl_blendmode;
+ int m_format; // texture format
+ SDL_BlendMode m_sdl_blendmode;
- texture_info * m_next; // next texture in the list
+ texture_info * m_next; // next texture in the list
};
//============================================================
@@ -142,13 +142,13 @@ private:
class sdl_info13 : public osd_renderer
{
public:
- sdl_info13(osd_window *w)
- : osd_renderer(w, FLAG_NONE), m_blittimer(0), m_sdl_renderer(NULL),
- m_last_hofs(0), m_last_vofs(0),
- m_width(0), m_height(0),
- m_blitwidth(0), m_blitheight(0),
- m_last_blit_time(0), m_last_blit_pixels(0)
- {}
+ sdl_info13(osd_window *w)
+ : osd_renderer(w, FLAG_NONE), m_blittimer(0), m_sdl_renderer(NULL),
+ m_last_hofs(0), m_last_vofs(0),
+ m_width(0), m_height(0),
+ m_blitwidth(0), m_blitheight(0),
+ m_last_blit_time(0), m_last_blit_pixels(0)
+ {}
/* virtual */ int create();
/* virtual */ int draw(const int update);
@@ -168,12 +168,12 @@ public:
}
private:
- void render_quad(texture_info *texture, const render_primitive *prim, const int x, const int y);
+ void render_quad(texture_info *texture, const render_primitive *prim, const int x, const int y);
- texture_info *texture_find(const render_primitive &prim, const quad_setup_data &setup);
- texture_info *texture_update(const render_primitive &prim);
+ texture_info *texture_find(const render_primitive &prim, const quad_setup_data &setup);
+ texture_info *texture_update(const render_primitive &prim);
- void destroy_all_textures();
+ void destroy_all_textures();
INT32 m_blittimer;
@@ -190,11 +190,11 @@ private:
float m_last_hofs;
float m_last_vofs;
- int m_width;
- int m_height;
+ int m_width;
+ int m_height;
- int m_blitwidth;
- int m_blitheight;
+ int m_blitwidth;
+ int m_blitheight;
// Stats
INT64 m_last_blit_time;
@@ -204,7 +204,7 @@ private:
struct copy_info_t {
int src_fmt;
Uint32 dst_fmt;
- const blit_base *blitter;
+ const blit_base *blitter;
Uint32 bm_mask;
const char *srcname;
const char *dstname;
@@ -241,7 +241,7 @@ static void drawsdl2_exit(void);
static copy_info_t blit_info_default[] =
{
/* no rotation */
- ENTRY(ARGB32, ARGB8888, argb32_argb32),
+ ENTRY(ARGB32, ARGB8888, argb32_argb32),
ENTRY_LR(ARGB32, RGB888, argb32_rgb32),
/* Entry primarily for directfb */
ENTRY_BM(ARGB32, RGB888, argb32_rgb32, SDL_BLENDMODE_ADD),
@@ -249,12 +249,12 @@ static copy_info_t blit_info_default[] =
ENTRY_BM(ARGB32, RGB888, argb32_rgb32, SDL_BLENDMODE_NONE),
ENTRY(RGB32, ARGB8888, rgb32_argb32),
- ENTRY(RGB32, RGB888, rgb32_rgb32),
+ ENTRY(RGB32, RGB888, rgb32_rgb32),
ENTRY(RGB32_PALETTED, ARGB8888, rgb32pal_argb32),
ENTRY(RGB32_PALETTED, RGB888, rgb32pal_argb32),
- ENTRY(YUY16, UYVY, yuv16_uyvy),
+ ENTRY(YUY16, UYVY, yuv16_uyvy),
ENTRY(YUY16, YUY2, yuv16_yuy2),
ENTRY(YUY16, YVYU, yuv16_yvyu),
ENTRY(YUY16, ARGB8888, yuv16_argb32),
@@ -269,7 +269,7 @@ static copy_info_t blit_info_default[] =
ENTRY(PALETTE16, ARGB8888, pal16_argb32),
ENTRY(PALETTE16, RGB888, pal16_argb32),
- ENTRY(RGB15, RGB555, rgb15_rgb555),
+ ENTRY(RGB15, RGB555, rgb15_rgb555),
ENTRY(RGB15, ARGB1555, rgb15_argb1555),
ENTRY(RGB15, ARGB8888, rgb15_argb32),
ENTRY(RGB15, RGB888, rgb15_argb32),
@@ -647,7 +647,6 @@ void sdl_info13::destroy()
int sdl_info13::xy_to_render_target(int x, int y, int *xt, int *yt)
{
-
*xt = x - m_last_hofs;
*yt = y - m_last_vofs;
if (*xt<0 || *xt >= m_blitwidth)
@@ -830,8 +829,8 @@ copy_info_t *texture_info::compute_size_type()
// FIXME:
const bool texture_info::is_pixels_owned() const
{ // do we own / allocated it ?
- return ((m_sdl_access == SDL_TEXTUREACCESS_STATIC)
- && (m_copyinfo->blitter->m_is_passthrough));
+ return ((m_sdl_access == SDL_TEXTUREACCESS_STATIC)
+ && (m_copyinfo->blitter->m_is_passthrough));
}
//============================================================
@@ -1098,4 +1097,3 @@ texture_info * sdl_info13::texture_update(const render_primitive &prim)
}
return texture;
}
-
diff --git a/src/osd/sdl/drawbgfx.c b/src/osd/sdl/drawbgfx.c
index a2dc7fe5649..638bf09a5f1 100644
--- a/src/osd/sdl/drawbgfx.c
+++ b/src/osd/sdl/drawbgfx.c
@@ -33,7 +33,7 @@
#include "osdsdl.h"
#include "window.h"
-#include <bgfxplatform.h>
+#include <bgfxplatform.h>
#include <bgfx.h>
//============================================================
@@ -73,12 +73,12 @@ static void drawbgfx_exit(void);
class sdl_info_bgfx : public osd_renderer
{
public:
- sdl_info_bgfx(osd_window *w)
- : osd_renderer(w, FLAG_NONE), m_blittimer(0), m_renderer(NULL),
- m_blitwidth(0), m_blitheight(0),
- m_last_hofs(0), m_last_vofs(0),
- m_last_blit_time(0), m_last_blit_pixels(0)
- {}
+ sdl_info_bgfx(osd_window *w)
+ : osd_renderer(w, FLAG_NONE), m_blittimer(0), m_renderer(NULL),
+ m_blitwidth(0), m_blitheight(0),
+ m_last_hofs(0), m_last_vofs(0),
+ m_last_blit_time(0), m_last_blit_pixels(0)
+ {}
/* virtual */ int create();
/* virtual */ int draw(const int update);
@@ -97,18 +97,18 @@ public:
return &window().target()->get_primitives();
}
- // void render_quad(texture_info *texture, const render_primitive *prim, const int x, const int y);
+ // void render_quad(texture_info *texture, const render_primitive *prim, const int x, const int y);
- //texture_info *texture_find(const render_primitive &prim, const quad_setup_data &setup);
- //texture_info *texture_update(const render_primitive &prim);
+ //texture_info *texture_find(const render_primitive &prim, const quad_setup_data &setup);
+ //texture_info *texture_update(const render_primitive &prim);
INT32 m_blittimer;
SDL_Renderer * m_renderer;
//simple_list<texture_info> m_texlist; // list of active textures
- int m_blitwidth;
- int m_blitheight;
+ int m_blitwidth;
+ int m_blitheight;
float m_last_hofs;
float m_last_vofs;
@@ -139,7 +139,7 @@ int drawbgfx_init(running_machine &machine, osd_draw_callbacks *callbacks)
// fill in the callbacks
callbacks->exit = drawbgfx_exit;
callbacks->create = drawbgfx_create;
-
+
return 0;
}
@@ -159,7 +159,7 @@ int sdl_info_bgfx::create()
bgfx::sdlSetWindow(window().sdl_window());
bgfx::init();
bgfx::reset(width, height, BGFX_RESET_VSYNC);
-
+
// Enable debug text.
bgfx::setDebug(BGFX_DEBUG_STATS);// BGFX_DEBUG_TEXT);
osd_printf_verbose("Leave drawsdl2_window_create\n");
@@ -187,7 +187,6 @@ int sdl_info_bgfx::xy_to_render_target(int x, int y, int *xt, int *yt)
int sdl_info_bgfx::draw(int update)
{
-
//if (has_flags(FI_CHANGED) || (window().width() != m_last_width) || (window().height() != m_last_height))
// do something
//clear_flags(FI_CHANGED);
@@ -207,10 +206,10 @@ int sdl_info_bgfx::draw(int update)
window().m_primlist->acquire_lock();
window().m_primlist->release_lock();
- // Advance to next frame. Rendering thread will be kicked to
+ // Advance to next frame. Rendering thread will be kicked to
// process submitted rendering primitives.
bgfx::frame();
-
+
return 0;
}
diff --git a/src/osd/sdl/drawogl.c b/src/osd/sdl/drawogl.c
index 09bcf9479eb..e2178fe73e8 100644
--- a/src/osd/sdl/drawogl.c
+++ b/src/osd/sdl/drawogl.c
@@ -202,7 +202,7 @@ class texture_info
{
public:
texture_info()
- : hash(0), flags(0), rawwidth(0), rawheight(0),
+ : hash(0), flags(0), rawwidth(0), rawheight(0),
rawwidth_create(0), rawheight_create(0),
type(0), format(0), borderpix(0), xprescale(0), yprescale(0), nocopy(0),
texture(0), texTarget(0), texpow2(0), mpass_dest_idx(0), pbo(0), data(NULL),
@@ -337,15 +337,15 @@ private:
void texture_all_disable();
INT32 m_blittimer;
- int m_width;
- int m_height;
- int m_blitwidth;
- int m_blitheight;
+ int m_width;
+ int m_height;
+ int m_blitwidth;
+ int m_blitheight;
#if (SDLMAME_SDL2)
SDL_GLContext m_gl_context_id;
#ifdef OSD_WINDOWS
- HDC m_hdc;
+ HDC m_hdc;
#endif
#else
#endif
@@ -792,43 +792,42 @@ void sdl_info_ogl::initialize_gl()
void
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) {
- osd_printf_error("ChoosePixelFormat failed.\n");
- exit(1);
- }
-
- if (SetPixelFormat(hDC, pixelFormat, &pfd) != TRUE) {
- osd_printf_error("SetPixelFormat failed.\n");
- exit(1);
- }
+ 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) {
+ osd_printf_error("ChoosePixelFormat failed.\n");
+ exit(1);
+ }
+
+ if (SetPixelFormat(hDC, pixelFormat, &pfd) != TRUE) {
+ osd_printf_error("SetPixelFormat failed.\n");
+ exit(1);
+ }
}
#endif
int sdl_info_ogl::create()
{
-
#if (SDLMAME_SDL2)
// create renderer
#ifdef OSD_WINDOWS
@@ -889,7 +888,6 @@ int sdl_info_ogl::create()
void sdl_info_ogl::destroy()
{
-
// free the memory in the window
destroy_all_textures();
@@ -912,7 +910,6 @@ void sdl_info_ogl::destroy()
int sdl_info_ogl::xy_to_render_target(int x, int y, int *xt, int *yt)
{
-
*xt = x - m_last_hofs;
*yt = y - m_last_vofs;
if (*xt<0 || *xt >= m_blitwidth)
@@ -3136,6 +3133,3 @@ void sdl_info_ogl::texture_all_disable()
pfn_glBindBuffer( GL_PIXEL_UNPACK_BUFFER_ARB, 0);
}
}
-
-
-
diff --git a/src/osd/sdl/drawsdl.c b/src/osd/sdl/drawsdl.c
index 1c626696ce4..45ac54fa64b 100644
--- a/src/osd/sdl/drawsdl.c
+++ b/src/osd/sdl/drawsdl.c
@@ -434,11 +434,10 @@ static void drawsdl_show_info(struct SDL_RendererInfo *render_info)
int sdl_info::create()
{
-
#if (SDLMAME_SDL2)
const sdl_scale_mode *sm = &scale_modes[video_config.scale_mode];
- // create renderer
+ // create renderer
/* set hints ... */
SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, sm->sdl_scale_mode);
@@ -500,7 +499,6 @@ int sdl_info::create()
void sdl_info::destroy()
{
-
// free the memory in the window
destroy_all_textures();
@@ -726,7 +724,7 @@ int sdl_info::draw(int update)
float fh = (float) mameheight / (float) blitheight;
// FIXME: this could be a lot easier if we get the primlist here!
- // Bounds would be set fit for purpose and done!
+ // Bounds would be set fit for purpose and done!
for (render_primitive *prim = window().m_primlist->first(); prim != NULL; prim = prim->next())
{
diff --git a/src/osd/sdl/sdl.mak b/src/osd/sdl/sdl.mak
index 5fe16406090..83a4bdc6d37 100644
--- a/src/osd/sdl/sdl.mak
+++ b/src/osd/sdl/sdl.mak
@@ -365,8 +365,8 @@ SDL_NETWORK = pcap
INCPATH += -I$(3RDPARTY)/winpcap/Include
# enable UNICODE
-DEFS += -Dmain=utf8_main -DUNICODE -D_UNICODE
-LDFLAGS += -municode
+DEFS += -Dmain=utf8_main -DUNICODE -D_UNICODE
+LDFLAGS += -municode
# Qt
ifndef NO_USE_QTDEBUG
@@ -734,7 +734,7 @@ ifeq ($(SDL_LIBVER),sdl2)
LIBS += -lSDL2 -limm32 -lversion -lole32 -loleaut32 -lws2_32 -static
BASELIBS += -lSDL2 -limm32 -lversion -lole32 -loleaut32 -lws2_32 -static
else
-LIBS += -lSDL -lws2_32 -static
+LIBS += -lSDL -lws2_32 -static
BASELIBS += -lSDL -lws2_32 -static
endif
LIBS += -luser32 -lgdi32 -lddraw -ldsound -ldxguid -lwinmm -ladvapi32 -lcomctl32 -lshlwapi
@@ -809,7 +809,7 @@ OSDOBJS += \
ifdef USE_BGFX
DEFS += -DUSE_BGFX
-OSDOBJS += $(SDLOBJ)/drawbgfx.o
+OSDOBJS += $(SDLOBJ)/drawbgfx.o
INCPATH += -I$(3RDPARTY)/bgfx/include -I$(3RDPARTY)/bx/include
USE_DISPATCH_GL = 0
BGFX_LIB = $(OBJ)/libbgfx.a
diff --git a/src/osd/sdl/video.h b/src/osd/sdl/video.h
index fc601eb48ce..8f3acb8460d 100644
--- a/src/osd/sdl/video.h
+++ b/src/osd/sdl/video.h
@@ -66,7 +66,7 @@ public:
sdl_monitor_info()
: m_next(NULL), m_handle(0), m_aspect(0.0f)
- {}
+ {}
sdl_monitor_info(const UINT64 handle, const char *monitor_device, float aspect)
: m_next(NULL), m_handle(handle), m_aspect(aspect)
{
@@ -84,25 +84,25 @@ public:
void set_aspect(const float aspect) { m_aspect = aspect; }
// STATIC
- static void init();
+ static void init();
static void exit();
static sdl_monitor_info *pick_monitor(sdl_options &options, int index);
#if !defined(SDLMAME_WIN32) && !(SDLMAME_SDL2)
static void add_primary_monitor(void *data);
#endif
- sdl_monitor_info * next() { return m_next; } // pointer to next monitor in list
+ sdl_monitor_info * next() { return m_next; } // pointer to next monitor in list
// STATIC
static sdl_monitor_info *primary_monitor;
static sdl_monitor_info *list;
- sdl_monitor_info * m_next; // pointer to next monitor in list
+ sdl_monitor_info * m_next; // pointer to next monitor in list
private:
void refresh();
UINT64 m_handle; // handle to the monitor
- SDL_Rect m_dimensions;
+ SDL_Rect m_dimensions;
char m_name[64];
float m_aspect; // computed/configured aspect ratio of the physical device
};
diff --git a/src/osd/sdl/window.c b/src/osd/sdl/window.c
index dae4ef5dc18..71054ce32b3 100644
--- a/src/osd/sdl/window.c
+++ b/src/osd/sdl/window.c
@@ -1013,9 +1013,6 @@ void sdl_window_info::update()
// if we're visible and running and not in the middle of a resize, draw
if (m_target != NULL)
{
-
-
-
int tempwidth, tempheight;
// see if the games video mode has changed
@@ -1044,7 +1041,6 @@ void sdl_window_info::update()
if (osd_event_wait(m_rendered_event, event_wait_ticks))
{
-
// ensure the target bounds are up-to-date, and then get the primitives
render_primitive_list &primlist = *m_renderer->get_primitives();
@@ -1150,11 +1146,11 @@ OSDWORK_CALLBACK( sdl_window_info::complete_create_wt )
SDL_GL_SetAttribute( SDL_GL_DOUBLEBUFFER, 1 );
/* FIXME: A reminder that gamma is wrong throughout MAME. Currently, SDL2.0 doesn't seem to
- * support the following attribute although my hardware lists GL_ARB_framebuffer_sRGB as an extension.
- *
- * SDL_GL_SetAttribute( SDL_GL_FRAMEBUFFER_SRGB_CAPABLE, 1 );
- *
- */
+ * support the following attribute although my hardware lists GL_ARB_framebuffer_sRGB as an extension.
+ *
+ * SDL_GL_SetAttribute( SDL_GL_FRAMEBUFFER_SRGB_CAPABLE, 1 );
+ *
+ */
window->m_extra_flags = SDL_WINDOW_OPENGL;
}
else
@@ -1173,7 +1169,7 @@ OSDWORK_CALLBACK( sdl_window_info::complete_create_wt )
window->monitor()->position_size().x, window->monitor()->position_size().y,
tempwidth, tempheight, window->m_extra_flags);
//window().sdl_window() = SDL_CreateWindow(window().m_title, SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED,
- // width, height, m_extra_flags);
+ // width, height, m_extra_flags);
if ( window->m_sdl_window == NULL )
{
@@ -1235,7 +1231,7 @@ OSDWORK_CALLBACK( sdl_window_info::complete_create_wt )
#if (SDL_VERSION_ATLEAST(1,2,10)) && (!defined(SDLMAME_EMSCRIPTEN))
SDL_GL_SetAttribute(SDL_GL_SWAP_CONTROL, video_config.waitvsync ? 1 : 0);
#endif
- // load_gl_lib(window->machine());
+ // load_gl_lib(window->machine());
}
// create the SDL surface (which creates the window in windowed mode)
diff --git a/src/osd/sdl/window.h b/src/osd/sdl/window.h
index 8c10c9130e8..3c0c7278210 100644
--- a/src/osd/sdl/window.h
+++ b/src/osd/sdl/window.h
@@ -53,7 +53,7 @@ public:
#endif
m_prescale(1),
m_primlist(NULL)
- {}
+ {}
virtual ~osd_window() { }
virtual render_target *target() = 0;
@@ -81,18 +81,18 @@ public:
virtual win_monitor_info *winwindow_video_window_monitor(const RECT *proposed) = 0;
// window handle and info
- HWND m_hwnd;
- HDC m_dc; // only used by GDI renderer!
+ HWND m_hwnd;
+ HDC m_dc; // only used by GDI renderer!
// FIXME: this is the same as win_window_list->m_hwnd, i.e. first window.
// During modularization, this should be passed in differently
- HWND m_focus_hwnd;
+ HWND m_focus_hwnd;
- int m_resize_state;
+ int m_resize_state;
#endif
- osd_window_config m_win_config;
- int m_prescale;
- render_primitive_list *m_primlist;
+ osd_window_config m_win_config;
+ int m_prescale;
+ render_primitive_list *m_primlist;
};
class osd_renderer
@@ -100,13 +100,13 @@ class osd_renderer
public:
/* Generic flags */
- static const int FLAG_NONE = 0x0000;
- static const int FLAG_NEEDS_OPENGL = 0x0001;
- static const int FLAG_HAS_VECTOR_SCREEN = 0x0002;
+ static const int FLAG_NONE = 0x0000;
+ static const int FLAG_NEEDS_OPENGL = 0x0001;
+ static const int FLAG_HAS_VECTOR_SCREEN = 0x0002;
/* SDL 1.2 flags */
- static const int FLAG_NEEDS_DOUBLEBUF = 0x0100;
- static const int FLAG_NEEDS_ASYNCBLIT = 0x0200;
+ static const int FLAG_NEEDS_DOUBLEBUF = 0x0100;
+ static const int FLAG_NEEDS_ASYNCBLIT = 0x0200;
osd_renderer(osd_window *window, const int flags)
: m_window(window), m_flags(flags) { }
@@ -139,11 +139,11 @@ public:
protected:
/* Internal flags */
- static const int FI_CHANGED = 0x010000;
+ static const int FI_CHANGED = 0x010000;
private:
- osd_window *m_window;
+ osd_window *m_window;
int m_flags;
};
@@ -161,7 +161,7 @@ public:
m_resize_height(0),
m_last_resize(0),
#endif
- m_minwidth(0), m_minheight(0),
+ m_minwidth(0), m_minheight(0),
m_rendered_event(0), m_target(0),
#if (SDLMAME_SDL2)
m_sdl_window(NULL),
@@ -256,7 +256,7 @@ private:
SDL_Surface *m_sdlsurf;
#endif
- int m_extra_flags;
+ int m_extra_flags;
void set_renderer(osd_renderer *renderer)
{
@@ -281,7 +281,7 @@ private:
sdl_monitor_info * m_monitor;
int m_fullscreen;
int m_index;
- osd_renderer * m_renderer;
+ osd_renderer * m_renderer;
// static callbacks ...
diff --git a/src/osd/windows/d3dhlsl.h b/src/osd/windows/d3dhlsl.h
index 7f3a6bdf169..8b8904123b2 100644
--- a/src/osd/windows/d3dhlsl.h
+++ b/src/osd/windows/d3dhlsl.h
@@ -335,8 +335,8 @@ private:
base * d3dintf; // D3D interface
- running_machine * machine;
- d3d::renderer * d3d; // D3D renderer
+ running_machine * machine;
+ d3d::renderer * d3d; // D3D renderer
bool master_enable; // overall enable flag
bool vector_enable; // vector post-processing enable flag
diff --git a/src/osd/windows/drawbgfx.c b/src/osd/windows/drawbgfx.c
index 1444138a0ad..3061f32b591 100644
--- a/src/osd/windows/drawbgfx.c
+++ b/src/osd/windows/drawbgfx.c
@@ -19,7 +19,7 @@
// MAMEOS headers
#include "window.h"
-#include <bgfxplatform.h>
+#include <bgfxplatform.h>
#include <bgfx.h>
class renderer_bgfx : public osd_renderer
@@ -95,7 +95,7 @@ int renderer_bgfx::create()
bgfx::winSetHwnd(window().m_hwnd);
bgfx::init();
bgfx::reset(rect_width(&client), rect_height(&client), BGFX_RESET_VSYNC);
-
+
// Enable debug text.
bgfx::setDebug(BGFX_DEBUG_STATS);// BGFX_DEBUG_TEXT);
@@ -165,70 +165,70 @@ int renderer_bgfx::draw(int update)
*/
case render_primitive::LINE:
// check if it's really a point
-/*
- if (((prim->bounds.x1 - prim->bounds.x0) == 0) && ((prim->bounds.y1 - prim->bounds.y0) == 0))
- {
- curPrimitive=GL_POINTS;
- } else {
- curPrimitive=GL_LINES;
- }
-
- if(pendingPrimitive!=GL_NO_PRIMITIVE && pendingPrimitive!=curPrimitive)
- {
- glEnd();
- pendingPrimitive=GL_NO_PRIMITIVE;
- }
-
- if ( pendingPrimitive==GL_NO_PRIMITIVE )
- {
- set_blendmode(sdl, PRIMFLAG_GET_BLENDMODE(prim->flags));
- }
-
- glColor4f(prim->color.r, prim->color.g, prim->color.b, prim->color.a);
-
- if(pendingPrimitive!=curPrimitive)
- {
- glBegin(curPrimitive);
- pendingPrimitive=curPrimitive;
- }
-
- // check if it's really a point
- if (curPrimitive==GL_POINTS)
- {
- glVertex2f(prim->bounds.x0+hofs, prim->bounds.y0+vofs);
- }
- else
- {
- glVertex2f(prim->bounds.x0+hofs, prim->bounds.y0+vofs);
- glVertex2f(prim->bounds.x1+hofs, prim->bounds.y1+vofs);
- }*/
+/*
+ if (((prim->bounds.x1 - prim->bounds.x0) == 0) && ((prim->bounds.y1 - prim->bounds.y0) == 0))
+ {
+ curPrimitive=GL_POINTS;
+ } else {
+ curPrimitive=GL_LINES;
+ }
+
+ if(pendingPrimitive!=GL_NO_PRIMITIVE && pendingPrimitive!=curPrimitive)
+ {
+ glEnd();
+ pendingPrimitive=GL_NO_PRIMITIVE;
+ }
+
+ if ( pendingPrimitive==GL_NO_PRIMITIVE )
+ {
+ set_blendmode(sdl, PRIMFLAG_GET_BLENDMODE(prim->flags));
+ }
+
+ glColor4f(prim->color.r, prim->color.g, prim->color.b, prim->color.a);
+
+ if(pendingPrimitive!=curPrimitive)
+ {
+ glBegin(curPrimitive);
+ pendingPrimitive=curPrimitive;
+ }
+
+ // check if it's really a point
+ if (curPrimitive==GL_POINTS)
+ {
+ glVertex2f(prim->bounds.x0+hofs, prim->bounds.y0+vofs);
+ }
+ else
+ {
+ glVertex2f(prim->bounds.x0+hofs, prim->bounds.y0+vofs);
+ glVertex2f(prim->bounds.x1+hofs, prim->bounds.y1+vofs);
+ }*/
break;
case render_primitive::QUAD:
/*
- if(pendingPrimitive!=GL_NO_PRIMITIVE)
- {
- glEnd();
- pendingPrimitive=GL_NO_PRIMITIVE;
- }
+ if(pendingPrimitive!=GL_NO_PRIMITIVE)
+ {
+ glEnd();
+ pendingPrimitive=GL_NO_PRIMITIVE;
+ }
+
+ glColor4f(prim->color.r, prim->color.g, prim->color.b, prim->color.a);
- glColor4f(prim->color.r, prim->color.g, prim->color.b, prim->color.a);
+ set_blendmode(sdl, PRIMFLAG_GET_BLENDMODE(prim->flags));
- set_blendmode(sdl, PRIMFLAG_GET_BLENDMODE(prim->flags));
+ texture = texture_update(window, prim, 0);
- texture = texture_update(window, prim, 0);
-
- sdl->texVerticex[0]=prim->bounds.x0 + hofs;
- sdl->texVerticex[1]=prim->bounds.y0 + vofs;
- sdl->texVerticex[2]=prim->bounds.x1 + hofs;
- sdl->texVerticex[3]=prim->bounds.y0 + vofs;
- sdl->texVerticex[4]=prim->bounds.x1 + hofs;
- sdl->texVerticex[5]=prim->bounds.y1 + vofs;
- sdl->texVerticex[6]=prim->bounds.x0 + hofs;
- sdl->texVerticex[7]=prim->bounds.y1 + vofs;
+ sdl->texVerticex[0]=prim->bounds.x0 + hofs;
+ sdl->texVerticex[1]=prim->bounds.y0 + vofs;
+ sdl->texVerticex[2]=prim->bounds.x1 + hofs;
+ sdl->texVerticex[3]=prim->bounds.y0 + vofs;
+ sdl->texVerticex[4]=prim->bounds.x1 + hofs;
+ sdl->texVerticex[5]=prim->bounds.y1 + vofs;
+ sdl->texVerticex[6]=prim->bounds.x0 + hofs;
+ sdl->texVerticex[7]=prim->bounds.y1 + vofs;
- glDrawArrays(GL_QUADS, 0, 4);
+ glDrawArrays(GL_QUADS, 0, 4);
*/
break;
@@ -238,7 +238,7 @@ int renderer_bgfx::draw(int update)
}
window().m_primlist->release_lock();
- // Advance to next frame. Rendering thread will be kicked to
+ // Advance to next frame. Rendering thread will be kicked to
// process submitted rendering primitives.
bgfx::frame();
diff --git a/src/osd/windows/drawdd.c b/src/osd/windows/drawdd.c
index 195a3190573..f56ffd4b989 100644
--- a/src/osd/windows/drawdd.c
+++ b/src/osd/windows/drawdd.c
@@ -140,8 +140,8 @@ struct monitor_enum_info
/* mode_enum_info holds information during a display mode enumeration */
struct mode_enum_info
{
- renderer_dd * renderer;
- osd_window * window;
+ renderer_dd * renderer;
+ osd_window * window;
INT32 minimum_width, minimum_height;
INT32 target_width, target_height;
double target_refresh;
diff --git a/src/osd/windows/drawgdi.c b/src/osd/windows/drawgdi.c
index 86baf429202..ccbbc6c03eb 100644
--- a/src/osd/windows/drawgdi.c
+++ b/src/osd/windows/drawgdi.c
@@ -94,7 +94,6 @@ static void drawgdi_exit(void)
int renderer_gdi::create()
{
-
// fill in the bitmap info header
bminfo.bmiHeader.biSize = sizeof(bminfo.bmiHeader);
bminfo.bmiHeader.biPlanes = 1;
@@ -117,7 +116,6 @@ int renderer_gdi::create()
void renderer_gdi::destroy()
{
-
// free the bitmap memory
if (bmdata != NULL)
global_free_array(bmdata);
diff --git a/src/osd/windows/video.h b/src/osd/windows/video.h
index 5cd54455213..79aca4d5b4d 100644
--- a/src/osd/windows/video.h
+++ b/src/osd/windows/video.h
@@ -64,7 +64,7 @@ private:
MONITORINFOEX m_info; // most recently retrieved info
float m_aspect; // computed/configured aspect ratio of the physical device
- char * m_name;
+ char * m_name;
};
diff --git a/src/osd/windows/window.h b/src/osd/windows/window.h
index 882f0aef00d..7e99ec04b38 100644
--- a/src/osd/windows/window.h
+++ b/src/osd/windows/window.h
@@ -53,7 +53,7 @@ public:
#endif
m_prescale(1),
m_primlist(NULL)
- {}
+ {}
virtual ~osd_window() { }
virtual render_target *target() = 0;
@@ -81,18 +81,18 @@ public:
virtual win_monitor_info *winwindow_video_window_monitor(const RECT *proposed) = 0;
// window handle and info
- HWND m_hwnd;
- HDC m_dc; // only used by GDI renderer!
+ HWND m_hwnd;
+ HDC m_dc; // only used by GDI renderer!
// FIXME: this is the same as win_window_list->m_hwnd, i.e. first window.
// During modularization, this should be passed in differently
- HWND m_focus_hwnd;
+ HWND m_focus_hwnd;
- int m_resize_state;
+ int m_resize_state;
#endif
- osd_window_config m_win_config;
- int m_prescale;
- render_primitive_list * m_primlist;
+ osd_window_config m_win_config;
+ int m_prescale;
+ render_primitive_list * m_primlist;
};
class osd_renderer
@@ -100,13 +100,13 @@ class osd_renderer
public:
/* Generic flags */
- static const int FLAG_NONE = 0x0000;
- static const int FLAG_NEEDS_OPENGL = 0x0001;
- static const int FLAG_HAS_VECTOR_SCREEN = 0x0002;
+ static const int FLAG_NONE = 0x0000;
+ static const int FLAG_NEEDS_OPENGL = 0x0001;
+ static const int FLAG_HAS_VECTOR_SCREEN = 0x0002;
/* SDL 1.2 flags */
- static const int FLAG_NEEDS_DOUBLEBUF = 0x0100;
- static const int FLAG_NEEDS_ASYNCBLIT = 0x0200;
+ static const int FLAG_NEEDS_DOUBLEBUF = 0x0100;
+ static const int FLAG_NEEDS_ASYNCBLIT = 0x0200;
osd_renderer(osd_window *window, const int flags)
: m_window(window), m_flags(flags) { }
@@ -139,11 +139,11 @@ public:
protected:
/* Internal flags */
- static const int FI_CHANGED = 0x010000;
+ static const int FI_CHANGED = 0x010000;
private:
- osd_window *m_window;
+ osd_window *m_window;
int m_flags;
};
diff --git a/src/osd/windows/windows.mak b/src/osd/windows/windows.mak
index 631c70dc3bb..62c9c11c74c 100644
--- a/src/osd/windows/windows.mak
+++ b/src/osd/windows/windows.mak
@@ -399,7 +399,7 @@ OSDOBJS = \
$(OSDOBJ)/modules/netdev/none.o \
ifdef USE_OPENGL
-OSDOBJS += $(WINOBJ)/../sdl/drawogl.o $(WINOBJ)/../sdl/gl_shader_tool.o $(WINOBJ)/../sdl/gl_shader_mgr.o
+OSDOBJS += $(WINOBJ)/../sdl/drawogl.o $(WINOBJ)/../sdl/gl_shader_tool.o $(WINOBJ)/../sdl/gl_shader_mgr.o
OBJDIRS += $(WINOBJ)/../sdl
DEFS += -DUSE_OPENGL=1
@@ -414,7 +414,7 @@ DEFS += -DUSE_SDL_SOUND
endif
ifndef DONT_USE_NETWORK
-DEFS += -DSDLMAME_NET_PCAP
+DEFS += -DSDLMAME_NET_PCAP
endif
CCOMFLAGS += -DDIRECT3D_VERSION=0x0900
diff --git a/src/version.c b/src/version.c
index ced7e922540..5707b25f031 100644
--- a/src/version.c
+++ b/src/version.c
@@ -8,7 +8,7 @@
***************************************************************************/
-#define BARE_BUILD_VERSION "0.158"
+#define BARE_BUILD_VERSION "0.159"
extern const char bare_build_version[];
extern const char build_version[];